From 4add350e1995df6c9bfc17b5fa1f60db060555ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Thu, 11 Jun 2026 15:27:36 +0200 Subject: [PATCH 1/8] lib!: update VSCode to 1.124 --- .ncurc.json | 2 +- mise.vscode.toml | 4 +- package-lock.json | 192 +++++++--------- package.json | 37 +-- rollup/tools/configuredSubpackagePlugin.ts | 3 +- src/missing-services.ts | 217 ++++++++++++++++-- src/service-override/chat.ts | 34 ++- src/service-override/issue.ts | 11 +- src/service-override/terminal.ts | 9 +- src/services.ts | 6 + src/workbench.ts | 2 +- ...-feat-add-static-asset-url-mechanism.patch | 4 +- .../0007-fix-use-existing-method.patch | 4 +- vscode-patches/0008-refactor-split-code.patch | 4 +- ...ode-already-done-in-EditorFeaturesIn.patch | 4 +- ...imports-by-regular-esm-dynamic-impor.patch | 28 ++- ...-classes-and-make-some-methods-acces.patch | 24 +- ...ome-modules-to-be-able-to-import-the.patch | 2 +- ...t-only-apply-style-on-specific-class.patch | 20 +- ...FileAccess.asBrowserUri-at-the-root-.patch | 4 +- ...anup-remove-some-checks-and-warnings.patch | 2 +- ...x-use-asBrowserUri-to-get-iframe-src.patch | 2 +- ...dd-some-parameter-to-webview-iframes.patch | 6 +- ...etect-fullscreen-if-it-s-not-a-guess.patch | 2 +- ...efactor-split-workbench-contribution.patch | 10 +- ...x-that-language-service-refactor-doe.patch | 32 ++- ...-fix-just-use-regular-dynamic-import.patch | 4 +- ...046-fix-stop-expecting-a-git-context.patch | 6 +- ...tract-constants-into-separate-module.patch | 4 +- ...t-support-configuring-worker-options.patch | 6 +- ...eird-type-reference-to-fix-the-build.patch | 2 +- .../0056-fix-break-cyclic-dependency.patch | 2 +- ...e-tree-sitter-wasm-until-MS-fixes-it.patch | 4 +- ...w-task-that-only-export-editor-types.patch | 8 +- .../0060-feat-support-shadow-dom.patch | 32 +-- ...ix-prevent-NPE-when-using-shadow-dom.patch | 4 +- ...xt-key-to-enable-further-customizati.patch | 2 +- .../0064-fix-break-cyclic-dependency.patch | 24 +- ...-feat-allow-to-override-product-icon.patch | 6 +- ...-from-entering-fullscreen-if-not-occ.patch | 6 +- ...-support-loading-VSCode-in-an-iframe.patch | 24 +- ...element-creation-to-be-able-to-creat.patch | 201 ++++++++-------- ...actor-make-editors-register-themself.patch | 4 +- ...so-register-the-quickinput-container.patch | 2 +- .../0073-refactor-split-contribution.patch | 16 +- .../0076-feat-add-customEditorRestore.patch | 2 +- ...0083-fix-make-product-field-optional.patch | 24 +- ...at-support-disabling-view-containers.patch | 12 +- ...l.integrated.preserveDrawingBuffer-s.patch | 2 +- ...port-chat-related-stuff-from-chat-co.patch | 4 +- ...feat-allow-defining-the-workspace-id.patch | 54 ++--- ...x-do-not-hide-copilot-ui-on-web-mode.patch | 4 +- .../0091-feat-add-AIDisabled-policy.patch | 6 +- ...abling-specific-extension-from-workb.patch | 4 +- ...fix-chat-always-update-auxiliary-bar.patch | 4 +- ...the-sidebar-forcefully-if-the-settin.patch | 4 +- vscode-patches/0095-fix-dedup-import.patch | 2 +- .../0096-fix-workaround-firefox-bug.patch | 14 +- .../0097-fix-remove-unused-import.patch | 4 +- ...fix-remove-webview-hash-verification.patch | 6 +- 60 files changed, 685 insertions(+), 483 deletions(-) diff --git a/.ncurc.json b/.ncurc.json index 66bf2fc0..012a4674 100644 --- a/.ncurc.json +++ b/.ncurc.json @@ -5,9 +5,9 @@ "@types/node", "@types/vscode-semver", "@vscode/codicons", + "@vscode/diff", "@vscode/iconv-lite-umd", "@vscode/proxy-agent", - "@vscode/ripgrep", "@vscode/spdlog", "@vscode/tree-sitter-wasm", "@vscode/windows-process-tree", diff --git a/mise.vscode.toml b/mise.vscode.toml index a264a125..d56ba756 100644 --- a/mise.vscode.toml +++ b/mise.vscode.toml @@ -1,6 +1,6 @@ [tools] -node = "22.22.1" -npm = "11.1.0" +node = "24.15.0" +npm = "11.16.0" [env] npm_config_user_agent = "npm/11.1.0 node/v22.22.1 linux x64 workspaces/false" diff --git a/package-lock.json b/package-lock.json index 8fc4b122..6a9d5b6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,22 +12,23 @@ "@microsoft/1ds-core-js": "^3.2.13", "@microsoft/1ds-post-js": "^3.2.13", "@rollup/pluginutils": "^5.3.0", + "@vscode/diff": "0.0.2-7", "@vscode/iconv-lite-umd": "0.7.1", - "@vscode/proxy-agent": "^0.41.0", + "@vscode/proxy-agent": "^0.42.0", "@vscode/ripgrep": "^1.17.1", "@vscode/spdlog": "^0.15.8", "@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23", "@vscode/windows-process-tree": "^0.7.0", - "@xterm/addon-clipboard": "^0.3.0-beta.213", - "@xterm/addon-image": "^0.10.0-beta.213", - "@xterm/addon-ligatures": "^0.11.0-beta.213", - "@xterm/addon-progress": "^0.3.0-beta.213", - "@xterm/addon-search": "^0.17.0-beta.213", - "@xterm/addon-serialize": "^0.15.0-beta.213", - "@xterm/addon-unicode11": "^0.10.0-beta.213", - "@xterm/addon-webgl": "^0.20.0-beta.212", - "@xterm/headless": "^6.1.0-beta.213", - "@xterm/xterm": "^6.1.0-beta.213", + "@xterm/addon-clipboard": "^0.3.0-beta.220", + "@xterm/addon-image": "^0.10.0-beta.220", + "@xterm/addon-ligatures": "^0.11.0-beta.220", + "@xterm/addon-progress": "^0.3.0-beta.220", + "@xterm/addon-search": "^0.17.0-beta.220", + "@xterm/addon-serialize": "^0.15.0-beta.220", + "@xterm/addon-unicode11": "^0.10.0-beta.220", + "@xterm/addon-webgl": "^0.20.0-beta.219", + "@xterm/headless": "^6.1.0-beta.220", + "@xterm/xterm": "^6.1.0-beta.220", "cookie": "^0.7.2", "css-url-parser": "^1.1.4", "dompurify": "^3.4.5", @@ -47,7 +48,7 @@ "vscode-json-languageservice": "5.3.11", "vscode-regexpp": "^3.1.0", "vscode-uri": "3.0.8", - "yauzl": "^3.0.0", + "yauzl": "^3.3.1", "yazl": "^2.4.3" }, "devDependencies": { @@ -72,7 +73,7 @@ "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.35", "@types/yauzl": "^2.10.3", - "@vscode/codicons": "^0.0.46-10", + "@vscode/codicons": "^0.0.46-15", "@vscode/tree-sitter-wasm": "^0.3.1", "acorn": "^8.16.0", "chalk": "^5.6.2", @@ -3738,7 +3739,6 @@ "cpu": [ "arm" ], - "dev": true, "optional": true, "os": [ "android" @@ -3751,7 +3751,6 @@ "cpu": [ "arm64" ], - "dev": true, "optional": true, "os": [ "android" @@ -3764,7 +3763,6 @@ "cpu": [ "arm64" ], - "dev": true, "optional": true, "os": [ "darwin" @@ -3777,7 +3775,6 @@ "cpu": [ "x64" ], - "dev": true, "optional": true, "os": [ "darwin" @@ -3790,7 +3787,6 @@ "cpu": [ "arm64" ], - "dev": true, "optional": true, "os": [ "freebsd" @@ -3803,7 +3799,6 @@ "cpu": [ "x64" ], - "dev": true, "optional": true, "os": [ "freebsd" @@ -3816,7 +3811,6 @@ "cpu": [ "arm" ], - "dev": true, "optional": true, "os": [ "linux" @@ -3829,7 +3823,6 @@ "cpu": [ "arm" ], - "dev": true, "optional": true, "os": [ "linux" @@ -3842,7 +3835,6 @@ "cpu": [ "arm64" ], - "dev": true, "optional": true, "os": [ "linux" @@ -3855,7 +3847,6 @@ "cpu": [ "arm64" ], - "dev": true, "optional": true, "os": [ "linux" @@ -3868,7 +3859,6 @@ "cpu": [ "loong64" ], - "dev": true, "optional": true, "os": [ "linux" @@ -3881,7 +3871,6 @@ "cpu": [ "loong64" ], - "dev": true, "optional": true, "os": [ "linux" @@ -3894,7 +3883,6 @@ "cpu": [ "ppc64" ], - "dev": true, "optional": true, "os": [ "linux" @@ -3907,7 +3895,6 @@ "cpu": [ "ppc64" ], - "dev": true, "optional": true, "os": [ "linux" @@ -3920,7 +3907,6 @@ "cpu": [ "riscv64" ], - "dev": true, "optional": true, "os": [ "linux" @@ -3933,7 +3919,6 @@ "cpu": [ "riscv64" ], - "dev": true, "optional": true, "os": [ "linux" @@ -3946,7 +3931,6 @@ "cpu": [ "s390x" ], - "dev": true, "optional": true, "os": [ "linux" @@ -3959,7 +3943,6 @@ "cpu": [ "x64" ], - "dev": true, "optional": true, "os": [ "linux" @@ -3972,7 +3955,6 @@ "cpu": [ "x64" ], - "dev": true, "optional": true, "os": [ "linux" @@ -3985,7 +3967,6 @@ "cpu": [ "x64" ], - "dev": true, "optional": true, "os": [ "openbsd" @@ -3998,7 +3979,6 @@ "cpu": [ "arm64" ], - "dev": true, "optional": true, "os": [ "openharmony" @@ -4011,7 +3991,6 @@ "cpu": [ "arm64" ], - "dev": true, "optional": true, "os": [ "win32" @@ -4024,7 +4003,6 @@ "cpu": [ "ia32" ], - "dev": true, "optional": true, "os": [ "win32" @@ -4037,7 +4015,6 @@ "cpu": [ "x64" ], - "dev": true, "optional": true, "os": [ "win32" @@ -4050,7 +4027,6 @@ "cpu": [ "x64" ], - "dev": true, "optional": true, "os": [ "win32" @@ -6620,12 +6596,18 @@ } }, "node_modules/@vscode/codicons": { - "version": "0.0.46-11", - "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.46-11.tgz", - "integrity": "sha512-knEiPZ5T3XYoVEVpbp4uqi91qCuV9D7VphofToW5uPwyXyLmwjZcmIvOA2gsYk4Xi7fYE9W4HbPS+xAqIgaZmQ==", + "version": "0.0.46-16", + "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.46-16.tgz", + "integrity": "sha512-pjgpzU5fMIuI3atUdpbWiaUxZtpTak57vjp1hIEvmmmd1dSOTB++5DoKeQCtRLapbB9DU24EHk31njP2ayPvmA==", "dev": true, "license": "CC-BY-4.0" }, + "node_modules/@vscode/diff": { + "version": "0.0.2-7", + "resolved": "https://registry.npmjs.org/@vscode/diff/-/diff-0.0.2-7.tgz", + "integrity": "sha512-zGPIPeUAmQs79u7g6FTLmhlXFIocUTtuHYmCV5lRZf6vlDk7SWEOpBlYY6SsShC3TB/lm2KxXMj9tP32YOPrhg==", + "license": "MIT" + }, "node_modules/@vscode/iconv-lite-umd": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.1.tgz", @@ -6639,9 +6621,9 @@ "license": "MIT" }, "node_modules/@vscode/proxy-agent": { - "version": "0.41.0", - "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.41.0.tgz", - "integrity": "sha512-xdjSPUu6DyC7+RBRftrj06OBG/xVLc0dsxhhwMzwfd9/pOGm8j4Zc70arq1jQb0s7EF4m9dAFoNjmSigfzN25A==", + "version": "0.42.0", + "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.42.0.tgz", + "integrity": "sha512-uFEBHiWPtBdbn+BFBVzyCMqqhdxRaRdPawLen1JZ+zM8pdKHsrVO+smmo/PbM6HgHr+MKGezDmxZ9cEHv49gEQ==", "license": "MIT", "dependencies": { "@tootallnate/once": "^3.0.0", @@ -6745,115 +6727,106 @@ } }, "node_modules/@xterm/addon-clipboard": { - "version": "0.3.0-beta.219", - "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.219.tgz", - "integrity": "sha512-KKN1BFJJbHoKKd1YZaq5Fjn85hv6/nu7Sbsobd0rhK0Ei6UBCaX+Q7xO+CtxatcOT/zaRGcCFsRvwSv92Hmk0w==", + "version": "0.3.0-beta.285", + "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.285.tgz", + "integrity": "sha512-3Sw2VvUqTc8r7OWzizLlbVcbJXUwduWqS7jQzWyIVZiRer+olG1++oyE5tD6VLbt5mFwTEm1jdINYE0HRjF26w==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.219" + "@xterm/xterm": "^6.1.0-beta.285" } }, "node_modules/@xterm/addon-image": { - "version": "0.10.0-beta.219", - "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.219.tgz", - "integrity": "sha512-qt/khIK4YB/uFPi/D03hrqr1ftqswBJ4C5Kid2cBUUJgDxxyRwNqNidRcdYa9/g9W5CqOR98EJv9cMGdRBrlmg==", + "version": "0.10.0-beta.285", + "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.285.tgz", + "integrity": "sha512-ffpIrUlFj88FVBLdZCThdbwDOAeuKadHNpaJdXbDo5O0ObYyfnXYTL1JmVQxqusJToROnogTPL/MMoqP2oA49g==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.219" + "@xterm/xterm": "^6.1.0-beta.285" } }, "node_modules/@xterm/addon-ligatures": { - "version": "0.11.0-beta.219", - "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.219.tgz", - "integrity": "sha512-81dFqoT9d+OoYdmKcJ+bGPbkyfzqA48Zill1VU29BoKHfLMqGAzJ+kfIIDwU4giSc7zW2qK5AVu/XaV9SonVeg==", + "version": "0.11.0-beta.285", + "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.285.tgz", + "integrity": "sha512-ZBqrv60zrIKGspVfv5+m3lRGHeAGDW2U/imu6vER8D2vhxs75FXh/bA+X2/oSdDJQVgpygsN8G3gNQqt16v3eg==", "license": "MIT", "dependencies": { - "lru-cache": "^6.0.0", - "opentype.js": "^0.8.0" + "lru-cache": "^11.3.6", + "opentype.js": "^2.0.0" }, "engines": { "node": ">8.0.0" }, "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.219" + "@xterm/xterm": "^6.1.0-beta.285" } }, "node_modules/@xterm/addon-ligatures/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, + "version": "11.5.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.1.tgz", + "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==", + "license": "BlueOak-1.0.0", "engines": { - "node": ">=10" + "node": "20 || >=22" } }, - "node_modules/@xterm/addon-ligatures/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "license": "ISC" - }, "node_modules/@xterm/addon-progress": { - "version": "0.3.0-beta.219", - "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.219.tgz", - "integrity": "sha512-DuBEpVcsV4s63kQ0NU79JauLM1qK/UF6vDei94drV1wgTq5k0Hmd/c+ULe9aX8siUHkPkKs8WyU0HWR0/wqdZg==", + "version": "0.3.0-beta.285", + "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.285.tgz", + "integrity": "sha512-5iD2ANyyIgSexa+Hkf4OmMwNxfpLrPuDAQihGoMXMMjALgESBb6JYvob4C6H+4o5uoNSMV33sb+iwlkCqww32A==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.219" + "@xterm/xterm": "^6.1.0-beta.285" } }, "node_modules/@xterm/addon-search": { - "version": "0.17.0-beta.219", - "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.219.tgz", - "integrity": "sha512-Qx65+aPPZlvzqccTE1FTtsTrWYIjf4/1XWD6TsLiIWl2IwGId76Ja9Q01YYYpPf7E3dzqWIw6zMeM+cHyg39XA==", + "version": "0.17.0-beta.285", + "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.285.tgz", + "integrity": "sha512-cGjvwxsCnzlLbDWhMaHF9ZxTbYt6foAvUlURe63XyonXR2DVYH6/sr4YoUhM4S5tUMtdIhPxJhtQ8uF6r+ch3g==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.219" + "@xterm/xterm": "^6.1.0-beta.285" } }, "node_modules/@xterm/addon-serialize": { - "version": "0.15.0-beta.219", - "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.219.tgz", - "integrity": "sha512-xutWzMsTZIgajaHTrejDKK2Xp6ucO1ltakxn+T0AYkzTrdGbzfUf97/b1tB7dfzMoyXNuBKXuPNbBD8nPdkv0w==", + "version": "0.15.0-beta.285", + "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.285.tgz", + "integrity": "sha512-ae1Fi0Rceby+Ctf39aCjVlJ5+K3OJMEdeU3LIw0Su4z58k6Yz577laM4OJ7CIAUQTCp7K7WliYaTo29vNVCdBw==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.219" + "@xterm/xterm": "^6.1.0-beta.285" } }, "node_modules/@xterm/addon-unicode11": { - "version": "0.10.0-beta.219", - "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.219.tgz", - "integrity": "sha512-2EJjnULMg1Fk8XMS8TLb1jLNhfT7dKf/pf3AXqUdehs33mKhHxpx4nPR/Oz8NcxHtlsnVNeRXxOOIsFpela18g==", + "version": "0.10.0-beta.285", + "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.285.tgz", + "integrity": "sha512-rfijFu7UcYpaFx5wzxvTpQbIyyq/amf2PuS9pktywcFQr4ITxRgid5EVzKLRG1vchkApNcQplWeYxGEtjiw0Cw==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.219" + "@xterm/xterm": "^6.1.0-beta.285" } }, "node_modules/@xterm/addon-webgl": { - "version": "0.20.0-beta.218", - "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.218.tgz", - "integrity": "sha512-TihrC07cUULEcmLQ0Wsj8f9a6vikrWKUx7JWrFFG/Ip31uYohcHY0X46JP+WdAIzPhnE2iVr6OpJG3G5uSKE+w==", + "version": "0.20.0-beta.284", + "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.284.tgz", + "integrity": "sha512-tzkUiEfdpHCY8mXCbuIaP9V67QDfBJvDr9jdxs5jjxNCIQvw+NCoKD97y5sUrQhrIlr7xrDGniPgPYThQ/1FWg==", "license": "MIT", "peerDependencies": { - "@xterm/xterm": "^6.1.0-beta.219" + "@xterm/xterm": "^6.1.0-beta.285" } }, "node_modules/@xterm/headless": { - "version": "6.1.0-beta.219", - "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.1.0-beta.219.tgz", - "integrity": "sha512-k0ilgU1jmvW8L1GfR6Zo5tIFEhOZdwsNdmYKx+CkDBobxpu+rHb5O4iD/ehIlxSupGPzOvIw6+1tRJq3Ky+kZw==", + "version": "6.1.0-beta.285", + "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.1.0-beta.285.tgz", + "integrity": "sha512-NJud+XEUjKMT2LwPqcIh/gazktV+R2AHjEPMQsn/l6+53rgFusuifmJjVkWLwZ228YYsUaN5+lJELeExS26q4A==", "license": "MIT", "workspaces": [ "addons/*" ] }, "node_modules/@xterm/xterm": { - "version": "6.1.0-beta.219", - "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.219.tgz", - "integrity": "sha512-cQDv5UMEooIqjlybDPfNO0uI0sB0SWaaOxubHcFNXah8umLHR8SfKQbj5BPaa5gqoTKGYFkVdpowyhZlV+xywQ==", + "version": "6.1.0-beta.285", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.285.tgz", + "integrity": "sha512-S3K58tepMkbpWRBzOGKd0In6AVvt9QPAnNs8DJ8rPUPODYtsCYWAtINHKYtC2OpXcE5EBKM35dl+Dgv03OoE/w==", "license": "MIT", "workspaces": [ "addons/*" @@ -8961,7 +8934,6 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, @@ -10748,13 +10720,10 @@ } }, "node_modules/opentype.js": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/opentype.js/-/opentype.js-0.8.0.tgz", - "integrity": "sha512-FQHR4oGP+a0m/f6yHoRpBOIbn/5ZWxKd4D/djHVJu8+KpBTYrJda0b7mLcgDEMWXE9xBCJm+qb0yv6FcvPjukg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/opentype.js/-/opentype.js-2.0.0.tgz", + "integrity": "sha512-kCyjv6xdDY1W/jLWZ/L3QhhTlKUqDZMQ5+Jdlw12b3dXkKNpYBqqlMMj0YDQPShWFTMwgZI1hG14kN3XUDSg/A==", "license": "MIT", - "dependencies": { - "tiny-inflate": "^1.0.2" - }, "bin": { "ot": "bin/ot" } @@ -12862,12 +12831,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/tiny-inflate": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz", - "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==", - "license": "MIT" - }, "node_modules/tiny-invariant": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz", @@ -13606,12 +13569,11 @@ } }, "node_modules/yauzl": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.3.0.tgz", - "integrity": "sha512-PtGEvEP30p7sbIBJKUBjUnqgTVOyMURc4dLo9iNyAJnNIEz9pm88cCXF21w94Kg3k6RXkeZh5DHOGS0qEONvNQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz", + "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==", "license": "MIT", "dependencies": { - "buffer-crc32": "~0.2.3", "pend": "~1.2.0" }, "engines": { diff --git a/package.json b/package.json index fa0643e0..40e4b63a 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ }, "config": { "vscode": { - "version": "1.121.0", - "ref": "1.121.0", - "commit": "987c9597516278c9fcf10d963a0592ce1384ab93" + "version": "1.124.0", + "ref": "1.124.0", + "commit": "1b50d58d73426c9171299ec4037d01365d995b78" }, "monaco": { "ref": "v0.55.1", @@ -62,7 +62,7 @@ "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.35", "@types/yauzl": "^2.10.3", - "@vscode/codicons": "^0.0.46-10", + "@vscode/codicons": "^0.0.46-15", "@vscode/tree-sitter-wasm": "^0.3.1", "acorn": "^8.16.0", "chalk": "^5.6.2", @@ -96,22 +96,23 @@ "@microsoft/1ds-core-js": "^3.2.13", "@microsoft/1ds-post-js": "^3.2.13", "@rollup/pluginutils": "^5.3.0", + "@vscode/diff": "0.0.2-7", "@vscode/iconv-lite-umd": "0.7.1", - "@vscode/proxy-agent": "^0.41.0", + "@vscode/proxy-agent": "^0.42.0", "@vscode/ripgrep": "^1.17.1", "@vscode/spdlog": "^0.15.8", "@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23", "@vscode/windows-process-tree": "^0.7.0", - "@xterm/addon-clipboard": "^0.3.0-beta.213", - "@xterm/addon-image": "^0.10.0-beta.213", - "@xterm/addon-ligatures": "^0.11.0-beta.213", - "@xterm/addon-progress": "^0.3.0-beta.213", - "@xterm/addon-search": "^0.17.0-beta.213", - "@xterm/addon-serialize": "^0.15.0-beta.213", - "@xterm/addon-unicode11": "^0.10.0-beta.213", - "@xterm/addon-webgl": "^0.20.0-beta.212", - "@xterm/headless": "^6.1.0-beta.213", - "@xterm/xterm": "^6.1.0-beta.213", + "@xterm/addon-clipboard": "^0.3.0-beta.220", + "@xterm/addon-image": "^0.10.0-beta.220", + "@xterm/addon-ligatures": "^0.11.0-beta.220", + "@xterm/addon-progress": "^0.3.0-beta.220", + "@xterm/addon-search": "^0.17.0-beta.220", + "@xterm/addon-serialize": "^0.15.0-beta.220", + "@xterm/addon-unicode11": "^0.10.0-beta.220", + "@xterm/addon-webgl": "^0.20.0-beta.219", + "@xterm/headless": "^6.1.0-beta.220", + "@xterm/xterm": "^6.1.0-beta.220", "cookie": "^0.7.2", "css-url-parser": "^1.1.4", "dompurify": "^3.4.5", @@ -131,11 +132,11 @@ "vscode-json-languageservice": "5.3.11", "vscode-regexpp": "^3.1.0", "vscode-uri": "3.0.8", - "yauzl": "^3.0.0", + "yauzl": "^3.3.1", "yazl": "^2.4.3" }, "volta": { - "node": "22.22.1", - "npm": "11.15.0" + "node": "26.3.0", + "npm": "11.16.0" } } diff --git a/rollup/tools/configuredSubpackagePlugin.ts b/rollup/tools/configuredSubpackagePlugin.ts index b908df15..9918bc3c 100644 --- a/rollup/tools/configuredSubpackagePlugin.ts +++ b/rollup/tools/configuredSubpackagePlugin.ts @@ -62,7 +62,8 @@ const ALLOWED_MAIN_DEPENDENCIES = new Set([ '@vscode/iconv-lite-umd', 'jschardet', 'marked', - 'dompurify' + 'dompurify', + '@vscode/diff' ]) const workerGroups: Record = { diff --git a/src/missing-services.ts b/src/missing-services.ts index 1a99a053..2ed77853 100644 --- a/src/missing-services.ts +++ b/src/missing-services.ts @@ -470,7 +470,7 @@ import { unsupported } from './tools.js' import { NullAgentHostService } from 'vs/platform/agentHost/browser/nullAgentHostService' import { NullSSHRemoteAgentHostService } from 'vs/platform/agentHost/browser/nullSshRemoteAgentHostService' -import { IAgentHostPermissionService } from 'vs/platform/agentHost/common/agentHostPermissionService.service' +import { IAgentHostResourceService } from 'vs/platform/agentHost/common/agentHostResourceService.service' import { IAgentHostService } from 'vs/platform/agentHost/common/agentService.service' import { NullRemoteAgentHostService } from 'vs/platform/agentHost/common/remoteAgentHostService.js' import { IRemoteAgentHostService } from 'vs/platform/agentHost/common/remoteAgentHostService.service' @@ -493,10 +493,7 @@ import { IChatInputNotificationService } from 'vs/workbench/contrib/chat/browser import { IChatPhoneInputPresenter } from 'vs/workbench/contrib/chat/browser/widget/input/chatPhoneInputPresenter.service' import { IChatImageCarouselService } from 'vs/workbench/contrib/chat/browser/chatImageCarouselService.service.js' import { IChatDebugService } from 'vs/workbench/contrib/chat/common/chatDebugService.service.js' -import { - createVSCodeHarnessDescriptor, - type ICustomizationItemProvider -} from 'vs/workbench/contrib/chat/common/customizationHarnessService' +import { createVSCodeHarnessDescriptor } from 'vs/workbench/contrib/chat/common/customizationHarnessService' import { ICustomizationHarnessService } from 'vs/workbench/contrib/chat/common/customizationHarnessService.service' import type { IEnablementModel } from 'vs/workbench/contrib/chat/common/enablement.js' import { IPluginGitService } from 'vs/workbench/contrib/chat/common/plugins/pluginGitService.service.js' @@ -516,6 +513,14 @@ import { IPowerService } from 'vs/workbench/services/power/common/powerService.s import { FileSystemProviderCapabilities } from './service-override/files.js' import { IAgentHostDebugLogsExportService } from 'vs/workbench/contrib/chat/browser/actions/exportAgentHostDebugLogsAction.service' import { IAgentHostUntitledProvisionalSessionService } from 'vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.service' +import { IWindowsMxcTerminalSandboxRuntime } from 'vs/platform/sandbox/common/terminalSandboxMxcRuntime.service.js' +import { IScreenshotService } from 'vs/workbench/contrib/issue/browser/screenshotService.service' +import { IRecordingService } from 'vs/workbench/contrib/issue/browser/recordingService.service' +import { RecordingState } from 'vs/workbench/contrib/issue/browser/recordingService' +import { IGitHubUploadService } from 'vs/workbench/contrib/issue/browser/githubUploadService.service' +import { IChatGoalSummaryService } from 'vs/workbench/contrib/chat/browser/chatGoalSummaryService.service' +import { IAgentHostCustomizationService } from 'vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.service' +import { IAgentHostActiveClientService } from 'vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.service' function Unsupported(target: object, propertyKey: string, descriptor?: PropertyDescriptor) { function unsupported() { @@ -1929,6 +1934,8 @@ class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { unsupported @Unsupported getAutoUpdateValue: IExtensionsWorkbenchService['getAutoUpdateValue'] = unsupported + isAutoUpdateDelayed: IExtensionsWorkbenchService['isAutoUpdateDelayed'] = () => false + getAutoUpdateDelayRemaining: IExtensionsWorkbenchService['getAutoUpdateDelayRemaining'] = () => 0 @Unsupported updateAll: IExtensionsWorkbenchService['updateAll'] = unsupported @Unsupported @@ -2528,6 +2535,7 @@ class ExplorerService implements IExplorerService { applyBulkEdit: IExplorerService['applyBulkEdit'] = unsupported @Unsupported select: IExplorerService['select'] = unsupported + getViewId: IExplorerService['getViewId'] = () => undefined registerView: IExplorerService['registerView'] = async () => {} } registerSingleton(IExplorerService, ExplorerService, InstantiationType.Delayed) @@ -4150,6 +4158,7 @@ class AuthenticationService implements IAuthenticationService { () => Disposable.None createDynamicAuthenticationProvider: IAuthenticationService['createDynamicAuthenticationProvider'] = async () => undefined + createOrGetXaaProvider: IAuthenticationService['createOrGetXaaProvider'] = async () => undefined isDynamicAuthenticationProvider: IAuthenticationService['isDynamicAuthenticationProvider'] = () => false @@ -4535,6 +4544,18 @@ class LanguageModelsService implements ILanguageModelsService { configureLanguageModelsProviderGroup: ILanguageModelsService['configureLanguageModelsProviderGroup'] = unsupported @Unsupported + renameLanguageModelsProviderGroup: ILanguageModelsService['renameLanguageModelsProviderGroup'] = + unsupported + @Unsupported + updateLanguageModelsProviderGroupApiKey: ILanguageModelsService['updateLanguageModelsProviderGroupApiKey'] = + unsupported + @Unsupported + addLanguageModelsProviderGroupModel: ILanguageModelsService['addLanguageModelsProviderGroupModel'] = + unsupported + @Unsupported + openLanguageModelsProviderGroupSettings: ILanguageModelsService['openLanguageModelsProviderGroupSettings'] = + unsupported + @Unsupported migrateLanguageModelsProviderGroup: ILanguageModelsService['migrateLanguageModelsProviderGroup'] = unsupported @@ -4558,6 +4579,12 @@ class LanguageModelsService implements ILanguageModelsService { unpinModel: ILanguageModelsService['unpinModel'] = () => {} isModelPinned: ILanguageModelsService['isModelPinned'] = () => false onDidChangePinnedModels: ILanguageModelsService['onDidChangePinnedModels'] = Event.None + isModelHidden: ILanguageModelsService['isModelHidden'] = () => false + isGroupHidden: ILanguageModelsService['isGroupHidden'] = () => false + setModelHidden: ILanguageModelsService['setModelHidden'] = () => {} + setGroupHidden: ILanguageModelsService['setGroupHidden'] = () => {} + getHiddenModelIds: ILanguageModelsService['getHiddenModelIds'] = () => [] + onDidChangeModelVisibility: ILanguageModelsService['onDidChangeModelVisibility'] = Event.None } registerSingleton(ILanguageModelsService, LanguageModelsService, InstantiationType.Delayed) class ChatSlashCommandService implements IChatSlashCommandService { @@ -4783,6 +4810,7 @@ class ChatWidgetHistoryService implements IChatWidgetHistoryService { onDidChangeHistory: IChatWidgetHistoryService['onDidChangeHistory'] = Event.None @Unsupported append: IChatWidgetHistoryService['append'] = unsupported + moveHistory: IChatWidgetHistoryService['moveHistory'] = () => {} } registerSingleton(IChatWidgetHistoryService, ChatWidgetHistoryService, InstantiationType.Delayed) class ChatCodeBlockContextProviderService implements IChatCodeBlockContextProviderService { @@ -5471,6 +5499,8 @@ class IssueFormService implements IIssueFormService { sendReporterMenu: IIssueFormService['sendReporterMenu'] = unsupported @Unsupported closeReporter: IIssueFormService['closeReporter'] = unsupported + @Unsupported + submitIssue: IIssueFormService['submitIssue'] = unsupported } registerSingleton(IIssueFormService, IssueFormService, InstantiationType.Delayed) class CodeMapperService implements ICodeMapperService { @@ -5653,6 +5683,8 @@ class ChatEntitlementsService implements IChatEntitlementService { copilotTrackingId: IChatEntitlementService['copilotTrackingId'] = undefined markAnonymousRateLimited: IChatEntitlementService['markAnonymousRateLimited'] = () => {} markSetupCompleted: IChatEntitlementService['markSetupCompleted'] = () => {} + acceptQuotas: IChatEntitlementService['acceptQuotas'] = () => {} + clearQuotas: IChatEntitlementService['clearQuotas'] = () => {} setForceHidden: IChatEntitlementService['setForceHidden'] = () => {} hasByokModels = false onDidChangeUsageBasedBilling = Event.None @@ -5664,6 +5696,7 @@ class PromptsService implements IPromptsService { onDidChangeSkills: IPromptsService['onDidChangeSkills'] = Event.None listPromptFiles: IPromptsService['listPromptFiles'] = async () => [] getSourceFolders: IPromptsService['getSourceFolders'] = async () => [] + hasPromptSlashCommand: IPromptsService['hasPromptSlashCommand'] = () => false dispose: IPromptsService['dispose'] = (): void => {} resolvePromptSlashCommand: IPromptsService['resolvePromptSlashCommand'] = async () => undefined @Unsupported @@ -5795,6 +5828,8 @@ class NullDefaultAccountService extends Disposable implements IDefaultAccountSer declare _serviceBrand: undefined onDidChangePolicyData: IDefaultAccountService['onDidChangePolicyData'] = Event.None policyData: IDefaultAccountService['policyData'] = null + managedSettingsFetchStatus: IDefaultAccountService['managedSettingsFetchStatus'] = null + managedSettingsFetchedAt: IDefaultAccountService['managedSettingsFetchedAt'] = null currentDefaultAccount: IDefaultAccountService['currentDefaultAccount'] = null @Unsupported getDefaultAccountAuthenticationProvider: IDefaultAccountService['getDefaultAccountAuthenticationProvider'] = @@ -5859,6 +5894,7 @@ class AuthenticationMcpAccessService implements IAuthenticationMcpAccessService onDidChangeMcpSessionAccess: IAuthenticationMcpAccessService['onDidChangeMcpSessionAccess'] = Event.None isAccessAllowed: IAuthenticationMcpAccessService['isAccessAllowed'] = () => undefined + isAccessAllowedForUrl: IAuthenticationMcpAccessService['isAccessAllowedForUrl'] = () => undefined readAllowedMcpServers: IAuthenticationMcpAccessService['readAllowedMcpServers'] = () => [] updateAllowedMcpServers: IAuthenticationMcpAccessService['updateAllowedMcpServers'] = () => undefined @@ -6190,9 +6226,12 @@ class ChatSessionsService implements IChatSessionsService { supportsDelegationForSessionType: IChatSessionsService['supportsDelegationForSessionType'] = () => false sessionSupportsFork: IChatSessionsService['sessionSupportsFork'] = () => false + sessionSupportsRename: IChatSessionsService['sessionSupportsRename'] = () => false @Unsupported forkChatSession: IChatSessionsService['forkChatSession'] = unsupported + @Unsupported + renameChatSession: IChatSessionsService['renameChatSession'] = unsupported getSessionOptions: IChatSessionsService['getSessionOptions'] = () => undefined @@ -6275,6 +6314,7 @@ registerSingleton( class NullChatInputNotificationService implements IChatInputNotificationService { _serviceBrand: undefined onDidChange: IChatInputNotificationService['onDidChange'] = Event.None + onDidDismiss: IChatInputNotificationService['onDidDismiss'] = Event.None setNotification: IChatInputNotificationService['setNotification'] = () => {} deleteNotification: IChatInputNotificationService['deleteNotification'] = () => {} dismissNotification: IChatInputNotificationService['dismissNotification'] = () => {} @@ -6454,8 +6494,12 @@ class TerminalChatService implements ITerminalChatService { registerTerminalInstanceWithToolSession: ITerminalChatService['registerTerminalInstanceWithToolSession'] = () => {} + registerTerminalInstanceWithExecutionId: ITerminalChatService['registerTerminalInstanceWithExecutionId'] = + () => Disposable.None getTerminalInstanceByToolSessionId: ITerminalChatService['getTerminalInstanceByToolSessionId'] = async () => undefined + getTerminalInstanceByExecutionId: ITerminalChatService['getTerminalInstanceByExecutionId'] = () => + undefined getToolSessionTerminalInstances: ITerminalChatService['getToolSessionTerminalInstances'] = () => [] @@ -6581,6 +6625,7 @@ registerSingleton( class LanguageModelsConfigurationService implements ILanguageModelsConfigurationService { _serviceBrand: undefined + whenReady: ILanguageModelsConfigurationService['whenReady'] = Promise.resolve() @Unsupported get configurationFile(): ILanguageModelsConfigurationService['configurationFile'] { return unsupported() @@ -6754,13 +6799,11 @@ registerSingleton( ) const nullAICustomizationItemSource: IAICustomizationItemSource = { - onDidChange: Event.None, - fetchItems: async () => [] -} - -const nullCustomizationItemProviderForAICustomizationItemsModel: ICustomizationItemProvider = { - onDidChange: Event.None, - provideChatSessionCustomizations: async () => undefined + sessionResource: URI.parse('ai-customization://null/source'), + onDidAICustomizationItemsChange: Event.None, + fetchProviderItems: async () => [], + fetchAICustomizationItems: async () => [], + dispose: () => {} } class NullAICustomizationItemsModel implements IAICustomizationItemsModel { @@ -6770,8 +6813,6 @@ class NullAICustomizationItemsModel implements IAICustomizationItemsModel { nullAICustomizationItemSource getCount: IAICustomizationItemsModel['getCount'] = () => constObservable(0) getPluginCount: IAICustomizationItemsModel['getPluginCount'] = () => constObservable(0) - getPromptsServiceItemProvider: IAICustomizationItemsModel['getPromptsServiceItemProvider'] = () => - nullCustomizationItemProviderForAICustomizationItemsModel whenSectionLoaded: IAICustomizationItemsModel['whenSectionLoaded'] = async () => {} } @@ -7045,6 +7086,9 @@ registerSingleton(IBrowserViewCDPService, WebBrowserViewCDPService, Instantiatio class CustomizationHarnessService implements ICustomizationHarnessService { _serviceBrand: undefined + activeSessionResource: ICustomizationHarnessService['activeSessionResource'] = constObservable( + URI.parse('chat-session://local/default') + ) activeHarness: ICustomizationHarnessService['activeHarness'] = constObservable(SessionType.Local) availableHarnesses: ICustomizationHarnessService['availableHarnesses'] = constObservable([ createVSCodeHarnessDescriptor([]) @@ -7053,7 +7097,7 @@ class CustomizationHarnessService implements ICustomizationHarnessService { onDidChangeCustomAgents: ICustomizationHarnessService['onDidChangeCustomAgents'] = Event.None findHarnessById: ICustomizationHarnessService['findHarnessById'] = () => undefined - setActiveHarness: ICustomizationHarnessService['setActiveHarness'] = () => {} + setActiveSession: ICustomizationHarnessService['setActiveSession'] = () => {} @Unsupported getStorageSourceFilter: ICustomizationHarnessService['getStorageSourceFilter'] = unsupported @Unsupported @@ -7064,6 +7108,8 @@ class CustomizationHarnessService implements ICustomizationHarnessService { getCustomAgents: ICustomizationHarnessService['getCustomAgents'] = async () => [] resolvePromptSlashCommand: ICustomizationHarnessService['resolvePromptSlashCommand'] = async () => undefined + getSessionResourceForHarness: ICustomizationHarnessService['getSessionResourceForHarness'] = () => + URI.parse('chat-session://local/default') } registerSingleton( @@ -7157,25 +7203,50 @@ class SandboxHelperService implements ISandboxHelperService { _serviceBrand: undefined checkSandboxDependencies: ISandboxHelperService['checkSandboxDependencies'] = async () => undefined + getWindowsMxcFilesystemPolicy: ISandboxHelperService['getWindowsMxcFilesystemPolicy'] = + async () => undefined + getWindowsMxcEnvironment: ISandboxHelperService['getWindowsMxcEnvironment'] = async () => + undefined + @Unsupported + buildWindowsMxcSandboxPayload: ISandboxHelperService['buildWindowsMxcSandboxPayload'] = + unsupported } registerSingleton(ISandboxHelperService, SandboxHelperService, InstantiationType.Delayed) -class NullAgentHostPermissionService implements IAgentHostPermissionService { +class NullAgentHostResourceService implements IAgentHostResourceService { _serviceBrand: undefined - check: IAgentHostPermissionService['check'] = async () => false - request: IAgentHostPermissionService['request'] = async () => {} - pendingFor: IAgentHostPermissionService['pendingFor'] = () => constObservable([]) - allPending: IAgentHostPermissionService['allPending'] = constObservable([]) - findPending: IAgentHostPermissionService['findPending'] = () => undefined - grantImplicitRead: IAgentHostPermissionService['grantImplicitRead'] = () => Disposable.None - connectionClosed: IAgentHostPermissionService['connectionClosed'] = () => {} + + @Unsupported + list: IAgentHostResourceService['list'] = unsupported + @Unsupported + read: IAgentHostResourceService['read'] = unsupported + @Unsupported + write: IAgentHostResourceService['write'] = unsupported + @Unsupported + del: IAgentHostResourceService['del'] = unsupported + @Unsupported + move: IAgentHostResourceService['move'] = unsupported + @Unsupported + copy: IAgentHostResourceService['copy'] = unsupported + @Unsupported + resolve: IAgentHostResourceService['resolve'] = unsupported + @Unsupported + mkdir: IAgentHostResourceService['mkdir'] = unsupported + + check: IAgentHostResourceService['check'] = async () => false + request: IAgentHostResourceService['request'] = async () => {} + pendingFor: IAgentHostResourceService['pendingFor'] = () => constObservable([]) + allPending: IAgentHostResourceService['allPending'] = constObservable([]) + findPending: IAgentHostResourceService['findPending'] = () => undefined + grantImplicitRead: IAgentHostResourceService['grantImplicitRead'] = () => Disposable.None + connectionClosed: IAgentHostResourceService['connectionClosed'] = () => {} } registerSingleton(IAgentHostService, NullAgentHostService, InstantiationType.Delayed) registerSingleton( - IAgentHostPermissionService, - NullAgentHostPermissionService, + IAgentHostResourceService, + NullAgentHostResourceService, InstantiationType.Delayed ) @@ -7305,6 +7376,8 @@ class AgentHostUntitledProvisionalSessionService implements IAgentHostUntitledPr disposeSession: IAgentHostUntitledProvisionalSessionService['disposeSession'] = async () => {} getResolvedConfig: IAgentHostUntitledProvisionalSessionService['getResolvedConfig'] = () => undefined + refreshResolvedConfig: IAgentHostUntitledProvisionalSessionService['refreshResolvedConfig'] = + async () => {} } registerSingleton( @@ -7312,3 +7385,97 @@ registerSingleton( AgentHostUntitledProvisionalSessionService, InstantiationType.Delayed ) + +class WindowsMxcTerminalSandboxRuntime implements IWindowsMxcTerminalSandboxRuntime { + _serviceBrand: undefined + @Unsupported + getExecutablePath: IWindowsMxcTerminalSandboxRuntime['getExecutablePath'] = unsupported + getRuntimeReadPaths: IWindowsMxcTerminalSandboxRuntime['getRuntimeReadPaths'] = () => [] + @Unsupported + createConfig: IWindowsMxcTerminalSandboxRuntime['createConfig'] = unsupported + @Unsupported + wrapCommand: IWindowsMxcTerminalSandboxRuntime['wrapCommand'] = unsupported + wrapUnsandboxedCommand: IWindowsMxcTerminalSandboxRuntime['wrapUnsandboxedCommand'] = (command) => + command + toWindowsPath: IWindowsMxcTerminalSandboxRuntime['toWindowsPath'] = (uri) => uri.fsPath +} + +registerSingleton( + IWindowsMxcTerminalSandboxRuntime, + WindowsMxcTerminalSandboxRuntime, + InstantiationType.Delayed +) + +class ScreenshotService implements IScreenshotService { + _serviceBrand: undefined + captureScreenshot: IScreenshotService['captureScreenshot'] = async () => undefined +} + +registerSingleton(IScreenshotService, ScreenshotService, InstantiationType.Delayed) + +class RecordingService implements IRecordingService { + _serviceBrand: undefined + isSupported: IRecordingService['isSupported'] = false + state: IRecordingService['state'] = RecordingState.Stopped + onDidChangeState: IRecordingService['onDidChangeState'] = Event.None + getSupportedFormats: IRecordingService['getSupportedFormats'] = () => [] + @Unsupported + startRecording: IRecordingService['startRecording'] = unsupported + stopRecording: IRecordingService['stopRecording'] = async () => undefined + discardRecording: IRecordingService['discardRecording'] = () => {} + getScreenCapturePermissionStatus: IRecordingService['getScreenCapturePermissionStatus'] = + async () => 'granted' + openScreenCapturePermissionSettings: IRecordingService['openScreenCapturePermissionSettings'] = + () => {} +} + +registerSingleton(IRecordingService, RecordingService, InstantiationType.Delayed) + +class GitHubUploadService implements IGitHubUploadService { + _serviceBrand: undefined + @Unsupported + resolveRepositoryId: IGitHubUploadService['resolveRepositoryId'] = unsupported + @Unsupported + uploadViaMobileApi: IGitHubUploadService['uploadViaMobileApi'] = unsupported +} + +registerSingleton(IGitHubUploadService, GitHubUploadService, InstantiationType.Delayed) + +class ChatGoalSummaryService implements IChatGoalSummaryService { + _serviceBrand: undefined + summarize: IChatGoalSummaryService['summarize'] = async () => undefined +} + +registerSingleton(IChatGoalSummaryService, ChatGoalSummaryService, InstantiationType.Delayed) + +class AgentHostCustomizationService implements IAgentHostCustomizationService { + _serviceBrand: undefined + onDidChangeCustomAgents: IAgentHostCustomizationService['onDidChangeCustomAgents'] = Event.None + onDidChangeCustomizations: IAgentHostCustomizationService['onDidChangeCustomizations'] = + Event.None + getCustomAgents: IAgentHostCustomizationService['getCustomAgents'] = () => [] + getCustomizations: IAgentHostCustomizationService['getCustomizations'] = () => [] + getWorkingDirectory: IAgentHostCustomizationService['getWorkingDirectory'] = () => undefined +} + +registerSingleton( + IAgentHostCustomizationService, + AgentHostCustomizationService, + InstantiationType.Delayed +) + +class AgentHostActiveClientService implements IAgentHostActiveClientService { + _serviceBrand: undefined + @Unsupported + registerForAgent: IAgentHostActiveClientService['registerForAgent'] = unsupported + @Unsupported + getActiveClient: IAgentHostActiveClientService['getActiveClient'] = unsupported + getCustomizations: IAgentHostActiveClientService['getCustomizations'] = () => constObservable([]) + clientTools: IAgentHostActiveClientService['clientTools'] = constObservable([]) +} + +registerSingleton( + IAgentHostActiveClientService, + AgentHostActiveClientService, + InstantiationType.Delayed +) diff --git a/src/service-override/chat.ts b/src/service-override/chat.ts index e49cbd00..7fe5f639 100644 --- a/src/service-override/chat.ts +++ b/src/service-override/chat.ts @@ -135,7 +135,7 @@ import { IRemoteAgentHostService } from 'vs/platform/agentHost/common/remoteAgen import { RemoteAgentHostService } from 'vs/platform/agentHost/browser/remoteAgentHostServiceImpl' import { AgentHostFileSystemService } from 'vs/workbench/services/agentHost/common/agentHostFileSystemService' import { AgentHostSessionWorkingDirectoryResolver } from 'vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionWorkingDirectoryResolver' -import { IAgentHostPermissionService } from 'vs/platform/agentHost/common/agentHostPermissionService.service' +import { IAgentHostResourceService } from 'vs/platform/agentHost/common/agentHostResourceService.service' import { IToolResultCompressor } from 'vs/workbench/contrib/chat/common/tools/toolResultCompressor.service' import { IChatToolRiskAssessmentService } from 'vs/workbench/contrib/chat/browser/tools/chatToolRiskAssessmentService.service' import { IPlanReviewFeedbackService } from 'vs/workbench/contrib/chat/browser/planReviewFeedback/planReviewFeedbackService.service' @@ -143,7 +143,7 @@ import { IChatInputNotificationService } from 'vs/workbench/contrib/chat/browser import { IChatPhoneInputPresenter } from 'vs/workbench/contrib/chat/browser/widget/input/chatPhoneInputPresenter.service' import { ChatToolRiskAssessmentService } from 'vs/workbench/contrib/chat/browser/tools/chatToolRiskAssessmentService' import { PlanReviewFeedbackService } from 'vs/workbench/contrib/chat/browser/planReviewFeedback/planReviewFeedbackService' -import { AgentHostPermissionService } from 'vs/workbench/services/agentHost/common/agentHostPermissionService' +import { AgentHostResourceService } from 'vs/workbench/services/agentHost/common/agentHostResourceService' import { ToolResultCompressorService } from 'vs/workbench/contrib/chat/browser/tools/toolResultCompressorService' import { ChatInputNotificationService } from 'vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService' import { ChatPhoneInputPresenterService } from 'vs/workbench/contrib/chat/browser/widget/input/chatPhoneInputPresenter' @@ -151,6 +151,14 @@ import { IAgentHostUntitledProvisionalSessionService } from 'vs/workbench/contri import { IAgentHostDebugLogsExportService } from 'vs/workbench/contrib/chat/browser/actions/exportAgentHostDebugLogsAction.service' import { AgentHostUntitledProvisionalSessionService } from 'vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService' import { BrowserAgentHostDebugLogsExportService } from 'vs/workbench/contrib/chat/browser/actions/exportAgentHostDebugLogsAction' +import { IAgentHostActiveClientService } from 'vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.service' +import { AgentHostActiveClientService } from 'vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService' +import { IAgentHostCustomizationService } from 'vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.service' +import { NullAgentHostCustomizationService } from 'vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService' +import { IChatGoalSummaryService } from 'vs/workbench/contrib/chat/browser/chatGoalSummaryService.service' +import { ChatGoalSummaryService } from 'vs/workbench/contrib/chat/browser/chatGoalSummaryService' +import { EditorRemoteAgentHostServiceClient } from 'vs/workbench/services/agentHost/browser/editorRemoteAgentHostServiceClient' +import { IAgentHostService } from 'vs/platform/agentHost/common/agentService.service' import 'vs/workbench/contrib/chat/browser/chat.contribution' import 'vs/workbench/contrib/chat/browser/chat.shared.contribution' import 'vs/workbench/contrib/chat/browser/chat.view.contribution' @@ -169,6 +177,8 @@ class DefaultAccountService implements IDefaultAccountService { onDidChangePolicyData: IDefaultAccountService['onDidChangePolicyData'] = Event.None policyData: IDefaultAccountService['policyData'] = null + managedSettingsFetchStatus: IDefaultAccountService['managedSettingsFetchStatus'] = null + managedSettingsFetchedAt: IDefaultAccountService['managedSettingsFetchedAt'] = null getDefaultAccountAuthenticationProvider: IDefaultAccountService['getDefaultAccountAuthenticationProvider'] = () => ({ id: 'default', name: 'Default', enterprise: false }) @@ -353,7 +363,18 @@ export default function getServiceOverride({ true ), [IAgentHostTerminalService.toString()]: new SyncDescriptor(AgentHostTerminalService, [], true), + [IAgentHostActiveClientService.toString()]: new SyncDescriptor( + AgentHostActiveClientService, + [], + true + ), + [IAgentHostCustomizationService.toString()]: new SyncDescriptor( + NullAgentHostCustomizationService, + [], + true + ), [IToolResultCompressor.toString()]: new SyncDescriptor(ToolResultCompressorService, [], true), + [IChatGoalSummaryService.toString()]: new SyncDescriptor(ChatGoalSummaryService, [], true), [IChatToolRiskAssessmentService.toString()]: new SyncDescriptor( ChatToolRiskAssessmentService, [], @@ -374,11 +395,7 @@ export default function getServiceOverride({ [], true ), - [IAgentHostPermissionService.toString()]: new SyncDescriptor( - AgentHostPermissionService, - [], - true - ), + [IAgentHostResourceService.toString()]: new SyncDescriptor(AgentHostResourceService, [], true), [IAgentHostUntitledProvisionalSessionService.toString()]: new SyncDescriptor( AgentHostUntitledProvisionalSessionService, [], @@ -388,7 +405,8 @@ export default function getServiceOverride({ BrowserAgentHostDebugLogsExportService, [], true - ) + ), + [IAgentHostService.toString()]: new SyncDescriptor(EditorRemoteAgentHostServiceClient, [], true) } } diff --git a/src/service-override/issue.ts b/src/service-override/issue.ts index 33209f2a..4a57041b 100644 --- a/src/service-override/issue.ts +++ b/src/service-override/issue.ts @@ -8,12 +8,21 @@ import { TroubleshootIssueService } from 'vs/workbench/contrib/issue/browser/iss import { ITroubleshootIssueService } from 'vs/workbench/contrib/issue/browser/issueTroubleshoot.service' import { BrowserIssueService } from 'vs/workbench/contrib/issue/browser/issueService' import { IssueFormService } from 'vs/workbench/contrib/issue/browser/issueFormService' +import { IScreenshotService } from 'vs/workbench/contrib/issue/browser/screenshotService.service' +import { BrowserScreenshotService } from 'vs/workbench/contrib/issue/browser/screenshotService' +import { IRecordingService } from 'vs/workbench/contrib/issue/browser/recordingService.service' +import { BrowserRecordingService } from 'vs/workbench/contrib/issue/browser/recordingService' +import { IGitHubUploadService } from 'vs/workbench/contrib/issue/browser/githubUploadService.service' +import { BrowserGitHubUploadService } from 'vs/workbench/contrib/issue/browser/githubUploadService' import 'vs/workbench/contrib/issue/browser/issue.contribution' export default function getServiceOverride(): IEditorOverrideServices { return { [IWorkbenchIssueService.toString()]: new SyncDescriptor(BrowserIssueService, [], false), [ITroubleshootIssueService.toString()]: new SyncDescriptor(TroubleshootIssueService, [], false), - [IIssueFormService.toString()]: new SyncDescriptor(IssueFormService, [], false) + [IIssueFormService.toString()]: new SyncDescriptor(IssueFormService, [], false), + [IScreenshotService.toString()]: new SyncDescriptor(BrowserScreenshotService, [], false), + [IRecordingService.toString()]: new SyncDescriptor(BrowserRecordingService, [], false), + [IGitHubUploadService.toString()]: new SyncDescriptor(BrowserGitHubUploadService, [], false) } } diff --git a/src/service-override/terminal.ts b/src/service-override/terminal.ts index 22e9315d..c02c80f2 100644 --- a/src/service-override/terminal.ts +++ b/src/service-override/terminal.ts @@ -52,6 +52,8 @@ import { TerminalCompletionService } from 'vs/workbench/contrib/terminalContrib/ import { unsupported } from '../tools.js' import type { ISerializedCommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/capabilities' import { TerminalEditingService } from 'vs/workbench/contrib/terminal/browser/terminalEditingService' +import { IWindowsMxcTerminalSandboxRuntime } from 'vs/platform/sandbox/common/terminalSandboxMxcRuntime.service' +import { WindowsMxcTerminalSandboxRuntime } from 'vs/platform/sandbox/common/terminalSandboxMxcRuntime' export { ITerminalService, ITerminalInstanceService @@ -214,7 +216,12 @@ export default function getServiceOverride(backend?: ITerminalBackend): IEditorO [], true ), - [ITerminalEditingService.toString()]: new SyncDescriptor(TerminalEditingService, [], true) + [ITerminalEditingService.toString()]: new SyncDescriptor(TerminalEditingService, [], true), + [IWindowsMxcTerminalSandboxRuntime.toString()]: new SyncDescriptor( + WindowsMxcTerminalSandboxRuntime, + [], + true + ) } } diff --git a/src/services.ts b/src/services.ts index f21bcc0c..1997da34 100644 --- a/src/services.ts +++ b/src/services.ts @@ -709,3 +709,9 @@ export { IAgentHostFileSystemService } from 'vs/workbench/services/agentHost/com export { IAgentHostUntitledProvisionalSessionService } from 'vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.service' export { IChatOutputPartStateCache } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/chatOutputPartStateCache.service' export { IAgentHostDebugLogsExportService } from 'vs/workbench/contrib/chat/browser/actions/exportAgentHostDebugLogsAction.service' +export { IScreenshotService } from 'vs/workbench/contrib/issue/browser/screenshotService.service' +export { IRecordingService } from 'vs/workbench/contrib/issue/browser/recordingService.service' +export { IGitHubUploadService } from 'vs/workbench/contrib/issue/browser/githubUploadService.service' +export { IChatGoalSummaryService } from 'vs/workbench/contrib/chat/browser/chatGoalSummaryService.service' +export { IAgentHostCustomizationService } from 'vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.service' +export { IAgentHostActiveClientService } from 'vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.service' diff --git a/src/workbench.ts b/src/workbench.ts index 4757a485..719cead4 100644 --- a/src/workbench.ts +++ b/src/workbench.ts @@ -7,7 +7,7 @@ import { isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/window/common/win import { getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier as getWorkspaceIdentifierFromUri -} from 'vs/workbench/services/workspaces/browser/workspaces' +} from 'vs/platform/workspaces/common/workspaceIdentifier' import { URI } from 'vs/base/common/uri' import { toLocalISOString } from 'vs/base/common/date' diff --git a/vscode-patches/0005-feat-add-static-asset-url-mechanism.patch b/vscode-patches/0005-feat-add-static-asset-url-mechanism.patch index 239e11ad..ba146714 100644 --- a/vscode-patches/0005-feat-add-static-asset-url-mechanism.patch +++ b/vscode-patches/0005-feat-add-static-asset-url-mechanism.patch @@ -119,10 +119,10 @@ index 4cfaf6a58cb..b7f63a0d276 100644 class ExtensionHostProxy implements IExtensionHostProxy { diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts -index 4a874a6e9ad..0bda6e4b127 100644 +index 18b9d89ac06..6cd315046fe 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts -@@ -2017,6 +2017,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable { +@@ -2026,6 +2026,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable { $onExtensionRuntimeError(extensionId: ExtensionIdentifier, error: SerializedError): void; $setPerformanceMarks(marks: performance.PerformanceMark[]): Promise; $asBrowserUri(uri: UriComponents): Promise; diff --git a/vscode-patches/0007-fix-use-existing-method.patch b/vscode-patches/0007-fix-use-existing-method.patch index 0351d1e4..1eefbd39 100644 --- a/vscode-patches/0007-fix-use-existing-method.patch +++ b/vscode-patches/0007-fix-use-existing-method.patch @@ -8,10 +8,10 @@ Subject: [PATCH] fix: use existing method 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts -index 47555ac5fb9..f3de99cd45e 100644 +index 09100764ebe..75d01b958d7 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts -@@ -560,7 +560,7 @@ export class StandaloneKeybindingService extends AbstractKeybindingService { +@@ -561,7 +561,7 @@ export class StandaloneKeybindingService extends AbstractKeybindingService { // This might be a removal keybinding item in user settings => accept it result[resultLen++] = new ResolvedKeybindingItem(undefined, item.command, item.commandArgs, when, isDefault, null, false); } else { diff --git a/vscode-patches/0008-refactor-split-code.patch b/vscode-patches/0008-refactor-split-code.patch index e3334c59..c7e8230a 100644 --- a/vscode-patches/0008-refactor-split-code.patch +++ b/vscode-patches/0008-refactor-split-code.patch @@ -9,10 +9,10 @@ Subject: [PATCH] refactor: split code 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts -index f3de99cd45e..5c4e7d68ba4 100644 +index 75d01b958d7..f806a8c43f3 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts -@@ -531,15 +531,19 @@ export class StandaloneKeybindingService extends AbstractKeybindingService { +@@ -532,15 +532,19 @@ export class StandaloneKeybindingService extends AbstractKeybindingService { }); } diff --git a/vscode-patches/0009-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch b/vscode-patches/0009-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch index 7ef1dba7..8664fb59 100644 --- a/vscode-patches/0009-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch +++ b/vscode-patches/0009-cleanup-remove-code-already-done-in-EditorFeaturesIn.patch @@ -9,7 +9,7 @@ Subject: [PATCH] cleanup: remove code already done in 1 file changed, 12 deletions(-) diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts -index 5c4e7d68ba4..3723065604f 100644 +index f806a8c43f3..7bad06a8c75 100644 --- a/src/vs/editor/standalone/browser/standaloneServices.ts +++ b/src/vs/editor/standalone/browser/standaloneServices.ts @@ -16,7 +16,6 @@ import * as dom from '../../../base/browser/dom.js'; @@ -28,7 +28,7 @@ index 5c4e7d68ba4..3723065604f 100644 import { WorkspaceEdit } from '../../common/languages.js'; import { ILanguageService } from '../../common/languages/language.js'; import { ITextModel, ITextSnapshot } from '../../common/model.js'; -@@ -1264,16 +1262,6 @@ export namespace StandaloneServices { +@@ -1267,16 +1265,6 @@ export namespace StandaloneServices { } } diff --git a/vscode-patches/0010-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch b/vscode-patches/0010-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch index 5d8cfe25..439ed77b 100644 --- a/vscode-patches/0010-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch +++ b/vscode-patches/0010-fix-replace-amd-imports-by-regular-esm-dynamic-impor.patch @@ -4,6 +4,7 @@ Date: Mon, 11 Mar 2024 17:22:31 +0100 Subject: [PATCH] fix: replace amd imports by regular esm dynamic imports --- + .../common/diff/externalLinesDiffComputer.ts | 5 +---- src/vs/platform/telemetry/common/1dsAppender.ts | 9 ++------- .../markdown/browser/markedKatexSupport.ts | 5 ++--- .../terminal/browser/terminalInstance.ts | 3 +-- @@ -15,8 +16,31 @@ Subject: [PATCH] fix: replace amd imports by regular esm dynamic imports .../browser/textMateTokenizationFeatureImpl.ts | 6 +++--- .../services/textfile/common/encoding.ts | 9 ++++----- .../browser/treeSitterLibraryService.ts | 4 ++-- - 11 files changed, 27 insertions(+), 40 deletions(-) + 12 files changed, 28 insertions(+), 44 deletions(-) +diff --git a/src/vs/editor/common/diff/externalLinesDiffComputer.ts b/src/vs/editor/common/diff/externalLinesDiffComputer.ts +index f97be2154b9..5dbd6eb7572 100644 +--- a/src/vs/editor/common/diff/externalLinesDiffComputer.ts ++++ b/src/vs/editor/common/diff/externalLinesDiffComputer.ts +@@ -4,7 +4,6 @@ + *--------------------------------------------------------------------------------------------*/ + + import type { IDiffComputer as IExternalDiffComputer, createDiffComputer as createExternalDiffComputer } from '@vscode/diff'; +-import { resolveAmdNodeModulePath } from '../../../amdX.js'; + import { LineRange } from '../core/ranges/lineRange.js'; + import { OffsetRange } from '../core/ranges/offsetRange.js'; + import { StringText } from '../core/text/abstractText.js'; +@@ -20,9 +19,7 @@ let externalWasmDiffComputerPromise: Promise | undefined; + + function loadExternalModule(): Promise { + if (!externalModulePromise) { +- const url = resolveAmdNodeModulePath('@vscode/diff', 'dist/index.js'); +- // Use a runtime-computed URL to keep bundlers from rewriting the import. +- externalModulePromise = import(/* webpackIgnore: true */ /* @vite-ignore */ `${url}`) as Promise; ++ externalModulePromise = import('@vscode/diff') as Promise; + } + return externalModulePromise; + } diff --git a/src/vs/platform/telemetry/common/1dsAppender.ts b/src/vs/platform/telemetry/common/1dsAppender.ts index 0daaabd02b5..316500b563c 100644 --- a/src/vs/platform/telemetry/common/1dsAppender.ts @@ -77,7 +101,7 @@ index 3d83476e176..a80f0b9a7f2 100644 } } diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts -index e4edd32b8e2..84bc22efacc 100644 +index 8e0a30cea2b..2b0ce2561f1 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts @@ -79,7 +79,6 @@ import { IHistoryService } from '../../../services/history/common/history.js'; diff --git a/vscode-patches/0011-feat-export-some-classes-and-make-some-methods-acces.patch b/vscode-patches/0011-feat-export-some-classes-and-make-some-methods-acces.patch index 50edf005..df5eaee2 100644 --- a/vscode-patches/0011-feat-export-some-classes-and-make-some-methods-acces.patch +++ b/vscode-patches/0011-feat-export-some-classes-and-make-some-methods-acces.patch @@ -194,12 +194,12 @@ index 493471fe856..3a098814ba1 100644 // convert to file stat diff --git a/src/vs/platform/sandbox/browser/sandboxHelperService.ts b/src/vs/platform/sandbox/browser/sandboxHelperService.ts -index 2506ae2e49f..1f2051f50a3 100644 +index 3ce552fee34..79222e0d134 100644 --- a/src/vs/platform/sandbox/browser/sandboxHelperService.ts +++ b/src/vs/platform/sandbox/browser/sandboxHelperService.ts @@ -6,7 +6,7 @@ import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js'; - import { ISandboxDependencyStatus, ISandboxHelperService } from '../common/sandboxHelperService.js'; + import { ISandboxDependencyStatus, ISandboxHelperService, type IWindowsMxcConfig, IWindowsMxcFilesystemPolicy, type IWindowsMxcPolicyContainment, type IWindowsMxcSandboxPolicy } from '../common/sandboxHelperService.js'; -class NullSandboxHelperService implements ISandboxHelperService { +export class NullSandboxHelperService implements ISandboxHelperService { @@ -220,7 +220,7 @@ index c8d1765a7ab..91d78dc1be0 100644 declare readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts -index 3480283a217..b83c25cc4bb 100644 +index ea2da133d86..1f1026f5ad8 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -50,7 +50,7 @@ import { CodeWindow, mainWindow } from '../../base/browser/window.js'; @@ -355,17 +355,17 @@ index 4b0c29c92a8..fd065bcab61 100644 readonly activeProjectRoot: IObservable; diff --git a/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationHarnessService.ts b/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationHarnessService.ts -index 519a41f869a..32bc0830566 100644 +index 91218d8a9de..95203211afc 100644 --- a/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationHarnessService.ts +++ b/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationHarnessService.ts -@@ -19,7 +19,7 @@ import { SessionType } from '../../common/chatSessionsService.js'; +@@ -21,7 +21,7 @@ import { URI } from '../../../../../base/common/uri.js'; * Only the Local harness is registered statically. All other harnesses * (e.g. Copilot CLI) are contributed by extensions via the provider API. */ -class CustomizationHarnessService extends CustomizationHarnessServiceBase { +export class CustomizationHarnessService extends CustomizationHarnessServiceBase { constructor( - @IPromptsService promptsService: IPromptsService + @IPromptsService promptsService: IPromptsService, ) { diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.ts b/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.ts index 54a136fe08a..24d14a1f6ff 100644 @@ -406,10 +406,10 @@ index 4305cc54d72..d4d363592a2 100644 declare readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService.ts -index a20b8ef8031..36454ef8d4f 100644 +index 3e29d31feb0..bcde32c9b35 100644 --- a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService.ts +++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService.ts -@@ -70,7 +70,7 @@ export interface IChatInputNotificationService { +@@ -82,7 +82,7 @@ export interface IChatInputNotificationService { handleMessageSent(): void; } @@ -419,10 +419,10 @@ index a20b8ef8031..36454ef8d4f 100644 private readonly _notifications = new Map(); diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatPhoneInputPresenter.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatPhoneInputPresenter.ts -index ef536ce9eb3..2cb12951538 100644 +index bdfb9ecdc1d..daed3994f25 100644 --- a/src/vs/workbench/contrib/chat/browser/widget/input/chatPhoneInputPresenter.ts +++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatPhoneInputPresenter.ts -@@ -89,7 +89,7 @@ export interface IChatPhoneInputPresenter { +@@ -88,7 +88,7 @@ export interface IChatPhoneInputPresenter { setImpl(impl: IChatPhonePresenterImpl): IDisposable; } @@ -601,7 +601,7 @@ index b4f6cf16e7b..7222a9b6b89 100644 getInitData: async (): Promise => { if (isInitialStart) { diff --git a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts -index a7b67f152e3..2e8f9e75f51 100644 +index ae304b23861..0b8b5cdc600 100644 --- a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts +++ b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts @@ -112,7 +112,7 @@ export class ExtensionUrlHandlerOverrideRegistry { @@ -627,7 +627,7 @@ index 3d0f306ac45..61da9bc65b5 100644 if (this._environmentService.debugExtensionHost && this._environmentService.debugRenderer) { suffixSearchParams.set('debugged', '1'); diff --git a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts -index 6a83d64d718..d504ede062b 100644 +index 514873c2d59..707a6a12108 100644 --- a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts +++ b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts @@ -100,9 +100,9 @@ export abstract class AbstractExtensionService extends Disposable implements IEx diff --git a/vscode-patches/0019-refactor-split-some-modules-to-be-able-to-import-the.patch b/vscode-patches/0019-refactor-split-some-modules-to-be-able-to-import-the.patch index e518a90f..5168bed5 100644 --- a/vscode-patches/0019-refactor-split-some-modules-to-be-able-to-import-the.patch +++ b/vscode-patches/0019-refactor-split-some-modules-to-be-able-to-import-the.patch @@ -38,7 +38,7 @@ index 00000000000..185a77baafb + +registerWorkbenchContribution2(EditorAutoSave.ID, EditorAutoSave, WorkbenchPhase.BlockRestore); diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts -index 55b2e787779..4e42a582a64 100644 +index 5ac74d36518..b41fecc0b12 100644 --- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts +++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts @@ -61,7 +61,6 @@ import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keyb diff --git a/vscode-patches/0021-feat-only-apply-style-on-specific-class.patch b/vscode-patches/0021-feat-only-apply-style-on-specific-class.patch index f4644231..7996e892 100644 --- a/vscode-patches/0021-feat-only-apply-style-on-specific-class.patch +++ b/vscode-patches/0021-feat-only-apply-style-on-specific-class.patch @@ -10,7 +10,7 @@ Subject: [PATCH] feat: only apply style on specific class 3 files changed, 114 insertions(+), 110 deletions(-) diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css -index 1f6e583f5e0..0b2a6544e7b 100644 +index b04b3c70daf..2837bbd0d96 100644 --- a/src/vs/workbench/browser/media/style.css +++ b/src/vs/workbench/browser/media/style.css @@ -9,50 +9,37 @@ @@ -85,7 +85,7 @@ index 1f6e583f5e0..0b2a6544e7b 100644 /* Elevation shadows */ --vscode-shadow-sm: 0 0 4px rgba(0, 0, 0, 0.08); -@@ -68,18 +55,18 @@ body { +@@ -67,18 +54,18 @@ body { } /* Disable panel/part shadows when the setting is off (preserves floating modals, notifications, etc.) */ @@ -112,7 +112,7 @@ index 1f6e583f5e0..0b2a6544e7b 100644 /* Use zero-offset transparent shadows instead of 'none' because these * variables are interpolated into multi-value box-shadow declarations. */ --vscode-shadow-active-tab: 0 0 0 0 transparent; -@@ -88,7 +75,7 @@ body { +@@ -87,7 +74,7 @@ body { --vscode-shadow-sm: 0 0 0 0 transparent; } @@ -121,7 +121,7 @@ index 1f6e583f5e0..0b2a6544e7b 100644 touch-action: none; /* Disable browser handling of all panning and zooming gestures. Removes 300ms touch delay. */ overscroll-behavior: none; /* Prevent bounce effect */ } -@@ -106,55 +93,56 @@ body { +@@ -105,55 +92,56 @@ body { border-radius: 16px; /* macOS Tahoe increased rounded corners size */ } @@ -192,7 +192,7 @@ index 1f6e583f5e0..0b2a6544e7b 100644 /* * Somehow this is required when tables show in floating windows * to override the user-agent style which sets a specific color -@@ -164,48 +152,48 @@ body { +@@ -163,48 +151,48 @@ body { font-size: inherit; } @@ -255,7 +255,7 @@ index 1f6e583f5e0..0b2a6544e7b 100644 width: 16px; padding-left: 3px; /* width (16px) - font-size (13px) = padding-left (3px) */ padding-right: 3px; -@@ -225,7 +213,7 @@ body { +@@ -224,7 +212,7 @@ body { /* Custom Dropdown (select) Arrows */ @@ -264,7 +264,7 @@ index 1f6e583f5e0..0b2a6544e7b 100644 font-family: inherit; appearance: none; -webkit-appearance: none; -@@ -234,11 +222,11 @@ body { +@@ -233,11 +221,11 @@ body { border: 1px solid; } @@ -278,7 +278,7 @@ index 1f6e583f5e0..0b2a6544e7b 100644 content: var(--vscode-icon-chevron-down-content); font-family: var(--vscode-icon-chevron-down-font-family); font-size: 16px; -@@ -255,16 +243,16 @@ body { +@@ -254,16 +242,16 @@ body { /* Keyboard Focus Indication Styles */ @@ -305,7 +305,7 @@ index 1f6e583f5e0..0b2a6544e7b 100644 outline-width: 1px; outline-style: solid; outline-offset: -1px; -@@ -277,19 +265,19 @@ body { +@@ -276,19 +264,19 @@ body { background: transparent; /* Search input focus fix when in high contrast */ } @@ -332,7 +332,7 @@ index 1f6e583f5e0..0b2a6544e7b 100644 border-color: transparent; /* outline is a square, but border has a radius, so we avoid this glitch when focused (https://github.com/microsoft/vscode/issues/26045) */ } -@@ -319,38 +307,38 @@ body { +@@ -318,38 +306,38 @@ body { color: var(--vscode-list-focusHighlightForeground); } diff --git a/vscode-patches/0022-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch b/vscode-patches/0022-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch index 661b5d9c..30c437fa 100644 --- a/vscode-patches/0022-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch +++ b/vscode-patches/0022-fix-do-not-call-FileAccess.asBrowserUri-at-the-root-.patch @@ -10,7 +10,7 @@ to be able to register the file before 1 file changed, 60 insertions(+), 48 deletions(-) diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -index 49b3ec6a6eb..918558ce6e2 100644 +index 13453678183..c392afc7f7e 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts @@ -3,77 +3,89 @@ @@ -22,7 +22,7 @@ index 49b3ec6a6eb..918558ce6e2 100644 -import { Event, Emitter } from '../../../../base/common/event.js'; +import { mainWindow } from '../../../../base/browser/window.js'; import { index } from '../../../../base/common/arrays.js'; - import { CancelablePromise, Promises, ThrottledDelayer, createCancelablePromise } from '../../../../base/common/async.js'; + import { CancelablePromise, Promises, ThrottledDelayer, createCancelablePromise, disposableTimeout } from '../../../../base/common/async.js'; import { CancellationError, getErrorMessage, isCancellationError } from '../../../../base/common/errors.js'; +import { CancellationToken } from '../../../../base/common/cancellation.js'; +import { fromNow } from '../../../../base/common/date.js'; diff --git a/vscode-patches/0023-cleanup-remove-some-checks-and-warnings.patch b/vscode-patches/0023-cleanup-remove-some-checks-and-warnings.patch index 688fbbb0..8842000f 100644 --- a/vscode-patches/0023-cleanup-remove-some-checks-and-warnings.patch +++ b/vscode-patches/0023-cleanup-remove-some-checks-and-warnings.patch @@ -26,7 +26,7 @@ index ed965aae607..35a2ab17e71 100644 } diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index 17fa9d1d90b..cdc75a68e15 100644 +index eae70bdf806..c62826ef448 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts @@ -513,11 +513,6 @@ export class WebviewElement extends Disposable implements IWebviewElement, Webvi diff --git a/vscode-patches/0026-fix-use-asBrowserUri-to-get-iframe-src.patch b/vscode-patches/0026-fix-use-asBrowserUri-to-get-iframe-src.patch index 8d1435b5..704f2d5d 100644 --- a/vscode-patches/0026-fix-use-asBrowserUri-to-get-iframe-src.patch +++ b/vscode-patches/0026-fix-use-asBrowserUri-to-get-iframe-src.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fix: use asBrowserUri to get iframe src 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index cdc75a68e15..8be0cf34aaf 100644 +index c62826ef448..37558e01484 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts @@ -13,9 +13,9 @@ import { CancellationToken, CancellationTokenSource } from '../../../../base/com diff --git a/vscode-patches/0027-feat-add-some-parameter-to-webview-iframes.patch b/vscode-patches/0027-feat-add-some-parameter-to-webview-iframes.patch index 8faf726d..82a14249 100644 --- a/vscode-patches/0027-feat-add-some-parameter-to-webview-iframes.patch +++ b/vscode-patches/0027-feat-add-some-parameter-to-webview-iframes.patch @@ -9,7 +9,7 @@ Subject: [PATCH] feat: add some parameter to webview iframes 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/webview/browser/pre/index.html b/src/vs/workbench/contrib/webview/browser/pre/index.html -index 8b9850b3077..db91ed3f9fc 100644 +index 1b722167644..39088a04919 100644 --- a/src/vs/workbench/contrib/webview/browser/pre/index.html +++ b/src/vs/workbench/contrib/webview/browser/pre/index.html @@ -35,6 +35,8 @@ @@ -30,7 +30,7 @@ index 8b9850b3077..db91ed3f9fc 100644 navigator.serviceWorker.register(swPath, { type: 'module', updateViaCache: 'none' }) .then(async registration => { if (navigator.serviceWorker.controller) { -@@ -1038,7 +1040,7 @@ +@@ -1044,7 +1046,7 @@ if (globalThis.crossOriginIsolated) { fakeUrlParams.set('vscode-coi', '3'); /*COOP+COEP*/ } @@ -40,7 +40,7 @@ index 8b9850b3077..db91ed3f9fc 100644 newFrame.style.cssText = 'display: block; margin: 0; overflow: hidden; position: absolute; width: 100%; height: 100%; visibility: hidden'; document.body.appendChild(newFrame); diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index 8be0cf34aaf..d6142df6e9f 100644 +index 37558e01484..9f6018c77f5 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts @@ -462,6 +462,9 @@ export class WebviewElement extends Disposable implements IWebviewElement, Webvi diff --git a/vscode-patches/0028-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch b/vscode-patches/0028-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch index 53e2c82d..b529b925 100644 --- a/vscode-patches/0028-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch +++ b/vscode-patches/0028-fix-only-detect-fullscreen-if-it-s-not-a-guess.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fix: only detect fullscreen if it's not a guess 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts -index 621349135a8..8bec9d30a32 100644 +index 3815713423e..33fbc9c488e 100644 --- a/src/vs/workbench/services/host/browser/browserHostService.ts +++ b/src/vs/workbench/services/host/browser/browserHostService.ts @@ -226,13 +226,18 @@ export class BrowserHostService extends Disposable implements IHostService { diff --git a/vscode-patches/0037-refactor-split-workbench-contribution.patch b/vscode-patches/0037-refactor-split-workbench-contribution.patch index 38fbe837..aeb4e941 100644 --- a/vscode-patches/0037-refactor-split-workbench-contribution.patch +++ b/vscode-patches/0037-refactor-split-workbench-contribution.patch @@ -16,7 +16,7 @@ Subject: [PATCH] refactor: split workbench contribution 9 files changed, 115 insertions(+), 30 deletions(-) diff --git a/src/vs/workbench/api/browser/extensionHost.contribution.ts b/src/vs/workbench/api/browser/extensionHost.contribution.ts -index c5bc15deaf9..334486e1184 100644 +index e3c082b0ff4..d74f5f908a7 100644 --- a/src/vs/workbench/api/browser/extensionHost.contribution.ts +++ b/src/vs/workbench/api/browser/extensionHost.contribution.ts @@ -3,17 +3,15 @@ @@ -44,7 +44,7 @@ index c5bc15deaf9..334486e1184 100644 // --- mainThread participants import './mainThreadLocalization.js'; -@@ -103,23 +101,3 @@ import './mainThreadDataChannels.js'; +@@ -104,23 +102,3 @@ import './mainThreadDataChannels.js'; import './mainThreadMeteredConnection.js'; import './mainThreadGitExtensionService.js'; import './mainThreadBrowsers.js'; @@ -137,7 +137,7 @@ index 24559bee3f8..574f4f8cb44 100644 + +registerWorkbenchContribution2(JSONValidationExtensionPointWorkbenchContribution.ID, JSONValidationExtensionPointWorkbenchContribution, WorkbenchPhase.BlockStartup); diff --git a/src/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.ts b/src/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.ts -index 9b12b00eb96..fb720cb8c0c 100644 +index a91f1a28aae..1c3f67223a9 100644 --- a/src/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.ts +++ b/src/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.ts @@ -18,6 +18,8 @@ import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages. @@ -149,7 +149,7 @@ index 9b12b00eb96..fb720cb8c0c 100644 interface IRegExp { pattern: string; -@@ -858,3 +860,16 @@ const schema: IJSONSchema = { +@@ -886,3 +888,16 @@ const schema: IJSONSchema = { }; const schemaRegistry = Registry.as(Extensions.JSONContribution); schemaRegistry.registerSchema(schemaId, schema); @@ -286,7 +286,7 @@ index d78e65afc3f..56bd057fb3e 100644 + +registerWorkbenchContribution2(TokenClassificationExtensionPointWorkbenchContribution.ID, TokenClassificationExtensionPointWorkbenchContribution, WorkbenchPhase.BlockStartup); diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts -index 532c20d1cf1..2d5f39ef987 100644 +index 5eb62e5e261..82dd7e4a8e8 100644 --- a/src/vs/workbench/workbench.common.main.ts +++ b/src/vs/workbench/workbench.common.main.ts @@ -44,6 +44,12 @@ import './browser/actions/widgetNavigationCommands.js'; diff --git a/vscode-patches/0041-fix-change-syntax-that-language-service-refactor-doe.patch b/vscode-patches/0041-fix-change-syntax-that-language-service-refactor-doe.patch index 8a54bacc..285390f3 100644 --- a/vscode-patches/0041-fix-change-syntax-that-language-service-refactor-doe.patch +++ b/vscode-patches/0041-fix-change-syntax-that-language-service-refactor-doe.patch @@ -1,14 +1,13 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= -Date: Thu, 25 Apr 2024 19:14:25 +0200 +Date: Wed, 10 Jun 2026 18:48:57 +0200 Subject: [PATCH] fix: change syntax that language service refactor doesn't support well -the re-exports source are removed during "Move to new file" refactor --- - src/vs/workbench/contrib/tasks/common/taskService.ts | 5 ++++- - .../chatAgentTools/common/terminalSandboxService.ts | 4 +++- - 2 files changed, 7 insertions(+), 2 deletions(-) + src/vs/workbench/contrib/tasks/common/taskService.ts | 5 ++++- + .../chatAgentTools/common/terminalSandboxService.ts | 8 +++++--- + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/contrib/tasks/common/taskService.ts b/src/vs/workbench/contrib/tasks/common/taskService.ts index ec8414ee339..35ac0b396d8 100644 @@ -27,17 +26,28 @@ index ec8414ee339..35ac0b396d8 100644 export const ShellExecutionSupportedContext = new RawContextKey('shellExecutionSupported', false, nls.localize('tasks.shellExecutionSupported', "Whether ShellExecution tasks are supported. Consider using in the when clause of a \'taskDefinition\' contribution.")); export const TaskCommandsRegistered = new RawContextKey('taskCommandsRegistered', false, nls.localize('tasks.taskCommandsRegistered', "Whether the task commands have been registered yet")); diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.ts -index 3fa97e4e391..8695c34315d 100644 +index dfef15b9945..0f3c4f6a425 100644 --- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.ts +++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.ts -@@ -38,7 +38,9 @@ import { ITerminalSandboxService, TerminalSandboxPrerequisiteCheck, type ISandbo - import { getTerminalSandboxReadAllowListForCommands } from './terminalSandboxReadAllowList.js'; - import { getTerminalSandboxRuntimeConfigurationForCommands } from './terminalSandboxRuntimeConfigurationPerOperation.js'; +@@ -25,7 +25,7 @@ import { SANDBOX_HELPER_CHANNEL_NAME, SandboxHelperChannelClient } from '../../. + import { ISandboxDependencyStatus, ISandboxHelperService, type IWindowsMxcConfig, IWindowsMxcFilesystemPolicy, type IWindowsMxcPolicyContainment, type IWindowsMxcSandboxPolicy } from '../../../../../platform/sandbox/common/sandboxHelperService.js'; + import { ITerminalSandboxEngineHost, ITerminalSandboxRuntimeInfo, TerminalSandboxEngine } from '../../../../../platform/sandbox/common/terminalSandboxEngine.js'; + import { readSandboxSetting, SANDBOX_SETTING_KEYS } from './sandboxSettingsReader.js'; +-import { ITerminalSandboxService, type ISandboxDependencyInstallOptions, type ISandboxDependencyInstallResult, type ITerminalSandboxCommand, type ITerminalSandboxPrecheckInputs, type ITerminalSandboxPrerequisiteCheckResult, type ITerminalSandboxResolvedNetworkDomains, type ITerminalSandboxWrapResult } from '../../../../../platform/sandbox/common/terminalSandboxService.js'; ++import { ISandboxDependencyInstallTerminal, ITerminalSandboxService, TerminalSandboxPrerequisiteCheck, type ISandboxDependencyInstallOptions, type ISandboxDependencyInstallResult, type ITerminalSandboxCommand, type ITerminalSandboxPrecheckInputs, type ITerminalSandboxPrerequisiteCheckResult, type ITerminalSandboxResolvedNetworkDomains, type ITerminalSandboxWrapResult } from '../../../../../platform/sandbox/common/terminalSandboxService.js'; + import { TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js'; + import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js'; + import { ChatModel } from '../../../chat/common/model/chatModel.js'; +@@ -34,8 +34,10 @@ import { ElicitationState, IChatService } from '../../../chat/common/chatService + import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js'; + import { ILifecycleService, WillShutdownJoinerOrder } from '../../../../services/lifecycle/common/lifecycle.js'; -export { ITerminalSandboxService, TerminalSandboxPrerequisiteCheck } from '../../../../../platform/sandbox/common/terminalSandboxService.js'; +-export type { ISandboxDependencyInstallOptions, ISandboxDependencyInstallResult, ISandboxDependencyInstallTerminal, ITerminalSandboxCommand, ITerminalSandboxPrecheckInputs, ITerminalSandboxPrerequisiteCheckResult, ITerminalSandboxResolvedNetworkDomains, ITerminalSandboxWrapResult } from '../../../../../platform/sandbox/common/terminalSandboxService.js'; +export { -+ ITerminalSandboxService, TerminalSandboxPrerequisiteCheck ++ ITerminalSandboxService, TerminalSandboxPrerequisiteCheck, ++ ISandboxDependencyInstallOptions, ISandboxDependencyInstallResult, ISandboxDependencyInstallTerminal, ITerminalSandboxCommand, ITerminalSandboxPrecheckInputs, ITerminalSandboxPrerequisiteCheckResult, ITerminalSandboxResolvedNetworkDomains, ITerminalSandboxWrapResult +}; - export type { ISandboxDependencyInstallOptions, ISandboxDependencyInstallResult, ISandboxDependencyInstallTerminal, ITerminalSandboxCommand, ITerminalSandboxPrerequisiteCheckResult, ITerminalSandboxResolvedNetworkDomains, ITerminalSandboxWrapResult } from '../../../../../platform/sandbox/common/terminalSandboxService.js'; /** + * Context passed to the password prompt during dependency installation. diff --git a/vscode-patches/0044-fix-just-use-regular-dynamic-import.patch b/vscode-patches/0044-fix-just-use-regular-dynamic-import.patch index 61c97862..1137ffd4 100644 --- a/vscode-patches/0044-fix-just-use-regular-dynamic-import.patch +++ b/vscode-patches/0044-fix-just-use-regular-dynamic-import.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fix: just use regular dynamic import 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts -index e5a4de65f0b..e21ea6d5335 100644 +index f155e27685f..91c827ba5a9 100644 --- a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts +++ b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts @@ -5,7 +5,6 @@ @@ -19,7 +19,7 @@ index e5a4de65f0b..e21ea6d5335 100644 import { Disposable } from '../../../../base/common/lifecycle.js'; import { KeymapInfo, IRawMixedKeyboardMapping, IKeymapInfo } from '../common/keymapInfo.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; -@@ -456,7 +455,7 @@ export class BrowserKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBa +@@ -460,7 +459,7 @@ export class BrowserKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBa const platform = isWindows ? 'win' : isMacintosh ? 'darwin' : 'linux'; diff --git a/vscode-patches/0046-fix-stop-expecting-a-git-context.patch b/vscode-patches/0046-fix-stop-expecting-a-git-context.patch index 350e1957..635ee113 100644 --- a/vscode-patches/0046-fix-stop-expecting-a-git-context.patch +++ b/vscode-patches/0046-fix-stop-expecting-a-git-context.patch @@ -8,10 +8,10 @@ Subject: [PATCH] fix: stop expecting a git context 1 file changed, 5 deletions(-) diff --git a/build/npm/postinstall.ts b/build/npm/postinstall.ts -index dc154d4be9a..4fad23298b0 100644 +index 0d00ac39261..2a72ad3e393 100644 --- a/build/npm/postinstall.ts +++ b/build/npm/postinstall.ts -@@ -236,8 +236,6 @@ async function runWithConcurrency(tasks: (() => Promise)[], concurrency: n +@@ -240,8 +240,6 @@ async function runWithConcurrency(tasks: (() => Promise)[], concurrency: n async function main() { if (!process.env['VSCODE_FORCE_INSTALL'] && isUpToDate()) { log('.', 'All dependencies up to date, skipping postinstall.'); @@ -20,7 +20,7 @@ index dc154d4be9a..4fad23298b0 100644 return; } -@@ -309,9 +307,6 @@ async function main() { +@@ -313,9 +311,6 @@ async function main() { log('.', `Running ${parallelTasks.length} npm installs with concurrency ${concurrency}...`); await runWithConcurrency(parallelTasks, concurrency); diff --git a/vscode-patches/0047-fix-extract-constants-into-separate-module.patch b/vscode-patches/0047-fix-extract-constants-into-separate-module.patch index 556c36b1..e7928f5d 100644 --- a/vscode-patches/0047-fix-extract-constants-into-separate-module.patch +++ b/vscode-patches/0047-fix-extract-constants-into-separate-module.patch @@ -17,7 +17,7 @@ so that only the constant is pulled from the root instead of the whole module gr create mode 100644 src/vs/workbench/contrib/chat/browser/widget/input/editor/chatDynamicVariablesConstant.ts diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts -index a1efe056b93..fdb522fd410 100644 +index 240f5190d83..cb5f4955086 100644 --- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts +++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts @@ -27,8 +27,6 @@ import { ILogService } from '../../../platform/log/common/log.js'; @@ -30,7 +30,7 @@ index a1efe056b93..fdb522fd410 100644 import { IAgentSkill, IChatPromptSlashCommand, ICustomAgent, IInstructionFile, IPromptFileContext, IPromptPath, IPromptsService, PromptsStorage } from '../../contrib/chat/common/promptSyntax/service/promptsService.js'; import { isValidPromptType, PromptsType } from '../../contrib/chat/common/promptSyntax/promptTypes.js'; @@ -50,6 +48,9 @@ import { ICustomizationHarnessService, ICustomizationItem, ICustomizationItemPro - import { AICustomizationManagementSection, BUILTIN_STORAGE } from '../../contrib/chat/common/aiCustomizationWorkspaceService.js'; + import { AICustomizationManagementSection, AICustomizationSources } from '../../contrib/chat/common/aiCustomizationWorkspaceService.js'; import { IAgentPlugin, IAgentPluginService } from '../../contrib/chat/common/plugins/agentPluginService.js'; import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js'; +import { AgentSessionProviders, getAgentSessionProvider } from '../../contrib/chat/browser/agentSessions/agentSessions.js'; diff --git a/vscode-patches/0052-feat-support-configuring-worker-options.patch b/vscode-patches/0052-feat-support-configuring-worker-options.patch index 89dedcfa..bbe2919b 100644 --- a/vscode-patches/0052-feat-support-configuring-worker-options.patch +++ b/vscode-patches/0052-feat-support-configuring-worker-options.patch @@ -73,7 +73,7 @@ index 1ff3fb838d9..6400775c42d 100644 + } } diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts -index 5b0047e74a3..f89a2cfc847 100644 +index d93410d667a..eb11d18504b 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -24,12 +24,16 @@ declare namespace monaco { @@ -183,10 +183,10 @@ index b7f9f12ec30..987ef8a666c 100644 nls: { messages: getNLSMessages(), diff --git a/src/vs/workbench/services/extensions/electron-browser/nativeExtensionService.ts b/src/vs/workbench/services/extensions/electron-browser/nativeExtensionService.ts -index 2b6104a77d9..a04b23ea698 100644 +index 4340604b3bd..881dc2fc9b0 100644 --- a/src/vs/workbench/services/extensions/electron-browser/nativeExtensionService.ts +++ b/src/vs/workbench/services/extensions/electron-browser/nativeExtensionService.ts -@@ -548,7 +548,12 @@ class NativeExtensionHostFactory implements IExtensionHostFactory { +@@ -575,7 +575,12 @@ class NativeExtensionHostFactory implements IExtensionHostFactory { case ExtensionHostKind.LocalWebWorker: { if (this._webWorkerExtHostEnablement !== LocalWebWorkerExtHostEnablement.Disabled) { const startup = this._webWorkerExtHostEnablement === LocalWebWorkerExtHostEnablement.Lazy ? ExtensionHostStartup.LazyAutoStart : ExtensionHostStartup.EagerManualStart; diff --git a/vscode-patches/0055-fix-remove-weird-type-reference-to-fix-the-build.patch b/vscode-patches/0055-fix-remove-weird-type-reference-to-fix-the-build.patch index 930a6eed..09e3fa38 100644 --- a/vscode-patches/0055-fix-remove-weird-type-reference-to-fix-the-build.patch +++ b/vscode-patches/0055-fix-remove-weird-type-reference-to-fix-the-build.patch @@ -8,7 +8,7 @@ Subject: [PATCH] fix: remove weird type reference to fix the build 1 file changed, 2 deletions(-) diff --git a/src/vs/editor/common/services/editorWorker.ts b/src/vs/editor/common/services/editorWorker.ts -index 6b0720d60ff..1ce8edd852c 100644 +index fd9efc5b2ce..57faaa801f5 100644 --- a/src/vs/editor/common/services/editorWorker.ts +++ b/src/vs/editor/common/services/editorWorker.ts @@ -10,7 +10,6 @@ import { IChange } from '../diff/legacyLinesDiffComputer.js'; diff --git a/vscode-patches/0056-fix-break-cyclic-dependency.patch b/vscode-patches/0056-fix-break-cyclic-dependency.patch index 992a6054..a834ef27 100644 --- a/vscode-patches/0056-fix-break-cyclic-dependency.patch +++ b/vscode-patches/0056-fix-break-cyclic-dependency.patch @@ -63,7 +63,7 @@ index 1ad6a06d008..d619311bc2b 100644 const workbenchRegistry = Registry.as(WorkbenchExtensions.Workbench); workbenchRegistry.registerWorkbenchContribution(RunAutomaticTasks, LifecyclePhase.Eventually); diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts -index 348a6988d91..191b84efcb2 100644 +index 178cdf324c1..8af9e906ae1 100644 --- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts +++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts @@ -40,7 +40,7 @@ import { TaskTerminalStatus } from './taskTerminalStatus.js'; diff --git a/vscode-patches/0057-fix-ignore-vscode-tree-sitter-wasm-until-MS-fixes-it.patch b/vscode-patches/0057-fix-ignore-vscode-tree-sitter-wasm-until-MS-fixes-it.patch index 1f64c97b..e4caefdb 100644 --- a/vscode-patches/0057-fix-ignore-vscode-tree-sitter-wasm-until-MS-fixes-it.patch +++ b/vscode-patches/0057-fix-ignore-vscode-tree-sitter-wasm-until-MS-fixes-it.patch @@ -8,10 +8,10 @@ Subject: [PATCH] fix: ignore @vscode/tree-sitter-wasm until MS fixes it 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/gulpfile.editor.ts b/build/gulpfile.editor.ts -index 338c678b7de..4322e06aec5 100644 +index bb3b3584a37..2222311669f 100644 --- a/build/gulpfile.editor.ts +++ b/build/gulpfile.editor.ts -@@ -63,7 +63,7 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => { +@@ -62,7 +62,7 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => { 'vs/base/common/marked/marked.js', ], shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers diff --git a/vscode-patches/0058-feat-add-new-task-that-only-export-editor-types.patch b/vscode-patches/0058-feat-add-new-task-that-only-export-editor-types.patch index 0a9e8315..0df2e0b9 100644 --- a/vscode-patches/0058-feat-add-new-task-that-only-export-editor-types.patch +++ b/vscode-patches/0058-feat-add-new-task-that-only-export-editor-types.patch @@ -8,17 +8,17 @@ Subject: [PATCH] feat: add new task that only export editor types 1 file changed, 4 insertions(+) diff --git a/build/gulpfile.editor.ts b/build/gulpfile.editor.ts -index 4322e06aec5..9ca6678964f 100644 +index 2222311669f..4cab298ef33 100644 --- a/build/gulpfile.editor.ts +++ b/build/gulpfile.editor.ts -@@ -224,6 +224,10 @@ gulp.task('editor-distro', +@@ -223,6 +223,10 @@ task.task('editor-distro', ) ); -+gulp.task('editor-distro-resources', ++task.task('editor-distro-resources', + task.series(finalEditorResourcesTask) +); + - gulp.task('monacodts', task.define('monacodts', () => { + task.task('monacodts', task.define('monacodts', () => { const result = monacoapi.execute(); fs.writeFileSync(result.filePath, result.content); diff --git a/vscode-patches/0060-feat-support-shadow-dom.patch b/vscode-patches/0060-feat-support-shadow-dom.patch index 79bc8dad..6d918533 100644 --- a/vscode-patches/0060-feat-support-shadow-dom.patch +++ b/vscode-patches/0060-feat-support-shadow-dom.patch @@ -271,10 +271,10 @@ index 6b675d06535..672eeabd7b6 100644 this.ctrlKey = e.ctrlKey; this.shiftKey = e.shiftKey; diff --git a/src/vs/base/browser/ui/contextview/contextview.ts b/src/vs/base/browser/ui/contextview/contextview.ts -index 3aa5f3828dc..ce40982b226 100644 +index 33562d5d605..4de7d7edf3e 100644 --- a/src/vs/base/browser/ui/contextview/contextview.ts +++ b/src/vs/base/browser/ui/contextview/contextview.ts -@@ -279,7 +279,7 @@ export class ContextView extends Disposable { +@@ -281,7 +281,7 @@ export class ContextView extends Disposable { private onDOMEvent(e: UIEvent, onCapture: boolean): void { if (this.delegate) { if (this.delegate.onDOMEvent) { @@ -337,7 +337,7 @@ index 39ce04a13a8..06cdc96e51d 100644 const dragContainer = getDragImageContainer(container); diff --git a/src/vs/base/browser/ui/findinput/findInput.ts b/src/vs/base/browser/ui/findinput/findInput.ts -index aefd0b69b1e..12cedc93b32 100644 +index db42e9055ec..60261d2b10e 100644 --- a/src/vs/base/browser/ui/findinput/findInput.ts +++ b/src/vs/base/browser/ui/findinput/findInput.ts @@ -20,6 +20,7 @@ import * as nls from '../../../../nls.js'; @@ -379,7 +379,7 @@ index a9ae899d424..5ccfd049fbb 100644 let newIndex: number = -1; if (event.equals(KeyCode.RightArrow)) { diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts -index 9b55cd2ec68..bdc8f7f689b 100644 +index d8c041c95ac..85053deefd3 100644 --- a/src/vs/base/browser/ui/inputbox/inputBox.ts +++ b/src/vs/base/browser/ui/inputbox/inputBox.ts @@ -174,7 +174,12 @@ export class InputBox extends Widget { @@ -540,7 +540,7 @@ index 52291332b2a..966cd035029 100644 // went outside the editor! this._onMouseLeave(new EditorMouseEvent(e, false, this.viewHelper.viewDomNode)); diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts -index 8256f6b487c..6bc03be79e1 100644 +index 98694f0d9f6..2c9e6dabf73 100644 --- a/src/vs/editor/browser/controller/mouseTarget.ts +++ b/src/vs/editor/browser/controller/mouseTarget.ts @@ -351,7 +351,7 @@ export class HitTestContext { @@ -621,10 +621,10 @@ index c5226cb273f..08f5ace9b37 100644 this._configurationService.getValue('accessibility.verbosity.hover') === true && this._accessibilityService.isScreenReaderOptimized(), this._keybindingService.lookupKeybinding('editor.action.accessibleView')?.getAriaLabel() ?? '' diff --git a/src/vs/platform/actionWidget/browser/actionList.ts b/src/vs/platform/actionWidget/browser/actionList.ts -index ba28b5f9227..67fe5daa262 100644 +index d137009d1ef..d8909be2aec 100644 --- a/src/vs/platform/actionWidget/browser/actionList.ts +++ b/src/vs/platform/actionWidget/browser/actionList.ts -@@ -1384,8 +1384,11 @@ export class ActionListWidget extends Disposable { +@@ -1388,8 +1388,11 @@ export class ActionListWidget extends Disposable { } private _getRowElement(index: number): HTMLElement | null { @@ -743,7 +743,7 @@ index 1ca3e989f57..2d24d79d066 100644 if (accessibleViewHint) { diff --git a/src/vs/workbench/browser/actions/developerActions.ts b/src/vs/workbench/browser/actions/developerActions.ts -index c0e1300be4a..6cc0014212b 100644 +index cdc59743913..14713c199ce 100644 --- a/src/vs/workbench/browser/actions/developerActions.ts +++ b/src/vs/workbench/browser/actions/developerActions.ts @@ -79,7 +79,7 @@ class InspectContextKeysAction extends Action2 { @@ -765,7 +765,7 @@ index c0e1300be4a..6cc0014212b 100644 dispose(disposables); diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts -index b83c25cc4bb..a06de19bb58 100644 +index 1f1026f5ad8..6a51d30679d 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -47,6 +47,7 @@ import { AuxiliaryBarPart } from './parts/auxiliarybar/auxiliaryBarPart.js'; @@ -832,10 +832,10 @@ index 7796aae8a15..1c304a11a9e 100644 private createPart(id: string, role: string, classes: string[]): HTMLElement { diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts -index feadd701bc5..733589db570 100644 +index 2c67995e535..f11bf0d7a09 100644 --- a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts +++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts -@@ -3033,7 +3033,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge +@@ -3257,7 +3257,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge return; } @@ -1002,7 +1002,7 @@ index c9d5a62989d..4ed8197a376 100644 } diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts -index d3c4ea3f178..ff3d9c4b33a 100644 +index 1de54375c42..53d6713f596 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts @@ -3,7 +3,6 @@ @@ -1101,7 +1101,7 @@ index 9a745727415..32b87509ab3 100644 const listener = this._register(Event.once(this._terminalService.onDidChangeConnectionState)(() => { // Only focus the terminal if the activeElement has not changed since focus() was called diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts -index d6142df6e9f..0a78c540fe5 100644 +index 9f6018c77f5..e065c4bcc81 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts @@ -4,7 +4,7 @@ @@ -1123,7 +1123,7 @@ index d6142df6e9f..0a78c540fe5 100644 // looks like https://github.com/microsoft/vscode/issues/132641 // where the focus is actually not in the `