From 4eb55c8f470c9b5900b6192571ccca523f9977e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Wed, 21 Jan 2026 12:05:02 +0100 Subject: [PATCH 1/3] fix: use proper import paths --- src/service-override/search.ts | 2 +- src/service-override/telemetry.ts | 2 +- src/service-override/tools/search-utils/base-provider.ts | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/service-override/search.ts b/src/service-override/search.ts index 2368be50..1e8c5b70 100644 --- a/src/service-override/search.ts +++ b/src/service-override/search.ts @@ -24,7 +24,7 @@ import { Schemas } from 'vs/base/common/network' import type { IFileSystemProvider } from 'vs/platform/files/common/files' import { HTMLFileSystemProvider } from 'vs/platform/files/browser/htmlFileSystemProvider' import { WorkspaceSearchProvider } from './tools/search-providers/workspace-search-provider' -import { IWorkspaceContextService } from '../services' +import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace.service' import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService.service' import { IConfigurationService } from 'vs/platform/configuration/common/configuration.service' diff --git a/src/service-override/telemetry.ts b/src/service-override/telemetry.ts index c118bb4c..02d591e4 100644 --- a/src/service-override/telemetry.ts +++ b/src/service-override/telemetry.ts @@ -1,6 +1,6 @@ import { type IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { ITelemetryService } from '../services' +import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry.service' import { TelemetryService } from 'vs/workbench/services/telemetry/browser/telemetryService' import { IDataChannelService } from 'vs/platform/dataChannel/common/dataChannel.service' export type { ITelemetryData, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry' diff --git a/src/service-override/tools/search-utils/base-provider.ts b/src/service-override/tools/search-utils/base-provider.ts index fe1a035b..08af4f03 100644 --- a/src/service-override/tools/search-utils/base-provider.ts +++ b/src/service-override/tools/search-utils/base-provider.ts @@ -5,7 +5,9 @@ import { type SearchConfig, getSearchConfigFromVSCode } from './config' -import type { IFileService, ILogService, IWorkspaceContextService } from '../../../services' +import type { IFileService } from 'vs/platform/files/common/files.service' +import type { ILogService } from 'vs/platform/log/common/log.service' +import type { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace.service' import { IConfigurationService } from 'vs/platform/configuration/common/configuration.service' import type { FileChangesEvent, IFileStat } from 'vs/platform/files/common/files' import * as glob from 'vs/base/common/glob' From 88271e49f98b23426dbe487a8bcbfb3ff1459027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Wed, 21 Jan 2026 14:16:11 +0100 Subject: [PATCH 2/3] lib: update to VSCode 1.108.1 --- package-lock.json | 10 +++++----- package.json | 8 ++++---- vscode-patches/0065-fix-break-cyclic-dependency.patch | 2 +- ...ntralize-element-creation-to-be-able-to-creat.patch | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2e9a1ec7..90bf2a4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "@xterm/addon-search": "^0.17.0-beta.91", "@xterm/addon-serialize": "^0.15.0-beta.91", "@xterm/addon-unicode11": "^0.10.0-beta.91", - "@xterm/addon-webgl": "^0.20.0-beta.90", + "@xterm/addon-webgl": "^0.20.0-beta.101", "@xterm/headless": "^6.1.0-beta.91", "@xterm/xterm": "^6.1.0-beta.91", "cookie": "^0.7.2", @@ -4716,12 +4716,12 @@ } }, "node_modules/@xterm/addon-webgl": { - "version": "0.20.0-beta.96", - "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.96.tgz", - "integrity": "sha512-KtZ6WZlhEDA7wrC4WIKQmKDa3FN5x8CWexo6KQu+9mj1Kwc5EAB7btpthQ0ZKu3z2RJH/4BwF/vdqcdmlHdrvg==", + "version": "0.20.0-beta.104", + "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.104.tgz", + "integrity": "sha512-S9zSxwnLXeF8RK1HZXLIdqZELF83ZHVyFJtqNj6b9SdjVMSFrQpa1wwWuJR1McW54hShX3aC9zLj1/1RKiwAxQ==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.97" + "@xterm/xterm": "^6.1.0-beta.105" } }, "node_modules/@xterm/headless": { diff --git a/package.json b/package.json index 7097c528..b128394a 100644 --- a/package.json +++ b/package.json @@ -30,9 +30,9 @@ }, "config": { "vscode": { - "version": "1.108.0", - "ref": "1.108.0", - "commit": "94e8ae2b28cb5cc932b86e1070569c4463565c37" + "version": "1.108.1", + "ref": "1.108.1", + "commit": "585eba7c0c34fd6b30faac7c62a42050bfbc0086" }, "monaco": { "ref": "v0.55.1", @@ -105,7 +105,7 @@ "@xterm/addon-search": "^0.17.0-beta.91", "@xterm/addon-serialize": "^0.15.0-beta.91", "@xterm/addon-unicode11": "^0.10.0-beta.91", - "@xterm/addon-webgl": "^0.20.0-beta.90", + "@xterm/addon-webgl": "^0.20.0-beta.101", "@xterm/headless": "^6.1.0-beta.91", "@xterm/xterm": "^6.1.0-beta.91", "cookie": "^0.7.2", diff --git a/vscode-patches/0065-fix-break-cyclic-dependency.patch b/vscode-patches/0065-fix-break-cyclic-dependency.patch index b68e4d59..d8304287 100644 --- a/vscode-patches/0065-fix-break-cyclic-dependency.patch +++ b/vscode-patches/0065-fix-break-cyclic-dependency.patch @@ -127,7 +127,7 @@ index 726ce214681..238770697f8 100644 import { ChatConfirmationWidget, IChatConfirmationButton } from '../chatConfirmationWidget.js'; import { IChatContentPartRenderContext } from '../chatContentParts.js'; diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts -index 0358e6a89b2..84993ba0721 100644 +index 868a9a84174..ef85432d97f 100644 --- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts +++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts @@ -36,7 +36,7 @@ import { migrateLegacyTerminalToolSpecificData } from '../../../../common/chat.j diff --git a/vscode-patches/0070-feat-centralize-element-creation-to-be-able-to-creat.patch b/vscode-patches/0070-feat-centralize-element-creation-to-be-able-to-creat.patch index d4ca3027..322ff899 100644 --- a/vscode-patches/0070-feat-centralize-element-creation-to-be-able-to-creat.patch +++ b/vscode-patches/0070-feat-centralize-element-creation-to-be-able-to-creat.patch @@ -3636,7 +3636,7 @@ index 5a53b5423a4..57c88e3ab62 100644 part.id = id; part.setAttribute('role', role); diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts -index abd18da3a4e..d1175818998 100644 +index 376f1dda25e..7b8c2f1a30d 100644 --- a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts +++ b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts @@ -3,7 +3,7 @@ From adb1f36b8256825de47c305375af8c03d46ca218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Wed, 21 Jan 2026 14:16:35 +0100 Subject: [PATCH 3/3] fix: properly import globby --- rollup/plugins/import-meta-assets-plugin.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollup/plugins/import-meta-assets-plugin.ts b/rollup/plugins/import-meta-assets-plugin.ts index e7e45a9e..40d6765a 100644 --- a/rollup/plugins/import-meta-assets-plugin.ts +++ b/rollup/plugins/import-meta-assets-plugin.ts @@ -123,7 +123,7 @@ export default function importMetaAssets({ return } - const { globby } = await import('globby') + const { default: globby } = await import('globby') // execute the glob const result = await globby(glob, { cwd: path.dirname(id) }) const paths = result.map((r) =>