diff --git a/demo/package-lock.json b/demo/package-lock.json index b22beaac..021d8d74 100644 --- a/demo/package-lock.json +++ b/demo/package-lock.json @@ -15,13 +15,14 @@ "@codingame/monaco-vscode-bat-default-extension": "file:../dist/default-extension-bat", "@codingame/monaco-vscode-bulk-edit-service-override": "file:../dist/service-override-bulk-edit", "@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common": "file:../dist/common-chat-comments-extensions-interactive-notebook-search", - "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "file:../dist/common-chat-extensions-interactive-notebook-quickaccess-search-terminal", + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common": "file:../dist/common-chat-extensions-interactive-notebook-search-terminal", "@codingame/monaco-vscode-chat-extensions-notebook-common": "file:../dist/common-chat-extensions-notebook", "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "file:../dist/common-chat-extensions-notebook-task-terminal-testing", - "@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": "file:../dist/common-chat-extensions-notebook-terminal", - "@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common": "file:../dist/common-chat-extensions-notebook-terminal-testing", "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "file:../dist/common-chat-interactive-notebook-search", + "@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common": "file:../dist/common-chat-interactive-notebook-search-terminal", "@codingame/monaco-vscode-chat-notebook-common": "file:../dist/common-chat-notebook", + "@codingame/monaco-vscode-chat-notebook-terminal-common": "file:../dist/common-chat-notebook-terminal", + "@codingame/monaco-vscode-chat-notebook-terminal-testing-common": "file:../dist/common-chat-notebook-terminal-testing", "@codingame/monaco-vscode-chat-service-override": "file:../dist/service-override-chat", "@codingame/monaco-vscode-clojure-default-extension": "file:../dist/default-extension-clojure", "@codingame/monaco-vscode-coffeescript-default-extension": "file:../dist/default-extension-coffeescript", @@ -201,6 +202,9 @@ "vite": "~5.4.10" } }, + "../dist/common-@codingame/monaco-vscode-chat-notebook-terminal-testing": { + "extraneous": true + }, "../dist/common-chat-comments-extensions-interactive-notebook-search": { "name": "@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common", "version": "0.0.0-semantic-release", @@ -210,26 +214,23 @@ } }, "../dist/common-chat-extensions-interactive-notebook-quickaccess-search-terminal": { - "name": "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common", + "extraneous": true + }, + "../dist/common-chat-extensions-interactive-notebook-search-terminal": { + "name": "@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common", "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-chat-extensions-notebook-common": "0.0.0-semantic-release", "marked": "~14.0.0", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, - "../dist/common-chat-extensions-interactive-notebook-search-terminal": { - "extraneous": true - }, "../dist/common-chat-extensions-notebook": { "name": "@codingame/monaco-vscode-chat-extensions-notebook-common", "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", - "@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": "0.0.0-semantic-release", - "marked": "~14.0.0", + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -242,33 +243,10 @@ } }, "../dist/common-chat-extensions-notebook-terminal": { - "name": "@codingame/monaco-vscode-chat-extensions-notebook-terminal-common", - "version": "0.0.0-semantic-release", - "license": "MIT", - "dependencies": { - "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", - "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "0.0.0-semantic-release", - "@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common": "0.0.0-semantic-release", - "@xterm/addon-serialize": "^0.14.0-beta.65", - "@xterm/addon-webgl": "^0.19.0-beta.65", - "@xterm/xterm": "^5.6.0-beta.65", - "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" - } + "extraneous": true }, "../dist/common-chat-extensions-notebook-terminal-testing": { - "name": "@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common", - "version": "0.0.0-semantic-release", - "license": "MIT", - "dependencies": { - "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "0.0.0-semantic-release", - "@xterm/addon-clipboard": "^0.2.0-beta.48", - "@xterm/addon-image": "^0.9.0-beta.65", - "@xterm/addon-search": "^0.16.0-beta.65", - "@xterm/addon-serialize": "^0.14.0-beta.65", - "@xterm/addon-unicode11": "^0.9.0-beta.65", - "@xterm/addon-webgl": "^0.19.0-beta.65", - "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" - } + "extraneous": true }, "../dist/common-chat-interactive-notebook-search": { "name": "@codingame/monaco-vscode-chat-interactive-notebook-search-common", @@ -276,30 +254,65 @@ "license": "MIT", "dependencies": { "@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common": "0.0.0-semantic-release", - "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", "marked": "~14.0.0", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, "../dist/common-chat-interactive-notebook-search-terminal": { - "extraneous": true + "name": "@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-notebook-common": "0.0.0-semantic-release", + "marked": "~14.0.0", + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } }, "../dist/common-chat-notebook": { "name": "@codingame/monaco-vscode-chat-notebook-common", "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-chat-extensions-notebook-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-notebook-terminal-common": "0.0.0-semantic-release", + "marked": "~14.0.0", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, "../dist/common-chat-notebook-terminal": { - "extraneous": true + "name": "@codingame/monaco-vscode-chat-notebook-terminal-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-notebook-terminal-testing-common": "0.0.0-semantic-release", + "@xterm/addon-serialize": "^0.14.0-beta.65", + "@xterm/addon-webgl": "^0.19.0-beta.65", + "@xterm/xterm": "^5.6.0-beta.65", + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } }, "../dist/common-chat-notebook-terminal-testing": { - "extraneous": true + "name": "@codingame/monaco-vscode-chat-notebook-terminal-testing-common", + "version": "0.0.0-semantic-release", + "license": "MIT", + "dependencies": { + "@xterm/addon-clipboard": "^0.2.0-beta.48", + "@xterm/addon-image": "^0.9.0-beta.65", + "@xterm/addon-search": "^0.16.0-beta.65", + "@xterm/addon-serialize": "^0.14.0-beta.65", + "@xterm/addon-unicode11": "^0.9.0-beta.65", + "@xterm/addon-webgl": "^0.19.0-beta.65", + "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" + } }, "../dist/common-comments-extensions": { "name": "@codingame/monaco-vscode-comments-extensions-common", @@ -1051,10 +1064,12 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-chat-extensions-notebook-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-chat-notebook-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-notebook-terminal-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1147,9 +1162,8 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-chat-extensions-notebook-common": "0.0.0-semantic-release", - "@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-comments-extensions-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-files-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" @@ -1176,8 +1190,8 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1279,10 +1293,12 @@ "license": "MIT", "dependencies": { "@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common": "0.0.0-semantic-release", - "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-chat-extensions-notebook-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-chat-notebook-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-notebook-terminal-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-debug-notebook-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } @@ -1334,7 +1350,6 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1435,10 +1450,10 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "0.0.0-semantic-release", - "@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": "0.0.0-semantic-release", - "@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-notebook-terminal-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-notebook-terminal-testing-common": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } }, @@ -1447,8 +1462,7 @@ "version": "0.0.0-semantic-release", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "0.0.0-semantic-release", - "@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common": "0.0.0-semantic-release", + "@codingame/monaco-vscode-chat-notebook-terminal-testing-common": "0.0.0-semantic-release", "@codingame/monaco-vscode-terminal-service-override": "0.0.0-semantic-release", "vscode": "npm:@codingame/monaco-vscode-api@^0.0.0-semantic-release" } @@ -1771,8 +1785,8 @@ "resolved": "../dist/common-chat-comments-extensions-interactive-notebook-search", "link": true }, - "node_modules/@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": { - "resolved": "../dist/common-chat-extensions-interactive-notebook-quickaccess-search-terminal", + "node_modules/@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common": { + "resolved": "../dist/common-chat-extensions-interactive-notebook-search-terminal", "link": true }, "node_modules/@codingame/monaco-vscode-chat-extensions-notebook-common": { @@ -1783,22 +1797,26 @@ "resolved": "../dist/common-chat-extensions-notebook-task-terminal-testing", "link": true }, - "node_modules/@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": { - "resolved": "../dist/common-chat-extensions-notebook-terminal", - "link": true - }, - "node_modules/@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common": { - "resolved": "../dist/common-chat-extensions-notebook-terminal-testing", - "link": true - }, "node_modules/@codingame/monaco-vscode-chat-interactive-notebook-search-common": { "resolved": "../dist/common-chat-interactive-notebook-search", "link": true }, + "node_modules/@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common": { + "resolved": "../dist/common-chat-interactive-notebook-search-terminal", + "link": true + }, "node_modules/@codingame/monaco-vscode-chat-notebook-common": { "resolved": "../dist/common-chat-notebook", "link": true }, + "node_modules/@codingame/monaco-vscode-chat-notebook-terminal-common": { + "resolved": "../dist/common-chat-notebook-terminal", + "link": true + }, + "node_modules/@codingame/monaco-vscode-chat-notebook-terminal-testing-common": { + "resolved": "../dist/common-chat-notebook-terminal-testing", + "link": true + }, "node_modules/@codingame/monaco-vscode-chat-service-override": { "resolved": "../dist/service-override-chat", "link": true @@ -2889,9 +2907,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.4.tgz", - "integrity": "sha512-jfUJrFct/hTA0XDM5p/htWKoNNTbDLY0KRwEt6pyOA6k2fmk0WVwl65PdUdJZgzGEHWx+49LilkcSaumQRyNQw==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.2.tgz", + "integrity": "sha512-Tj+j7Pyzd15wAdSJswvs5CJzJNV+qqSUcr/aCD+jpQSBtXvGnV0pnrjoc8zFTe9fcKCatkpFpOO7yAzpO998HA==", "cpu": [ "arm" ], @@ -2903,9 +2921,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.4.tgz", - "integrity": "sha512-j4nrEO6nHU1nZUuCfRKoCcvh7PIywQPUCBa2UsootTHvTHIoIu2BzueInGJhhvQO/2FTRdNYpf63xsgEqH9IhA==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.27.2.tgz", + "integrity": "sha512-xsPeJgh2ThBpUqlLgRfiVYBEf/P1nWlWvReG+aBWfNv3XEBpa6ZCmxSVnxJgLgkNz4IbxpLy64h2gCmAAQLneQ==", "cpu": [ "arm64" ], @@ -2917,9 +2935,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.4.tgz", - "integrity": "sha512-GmU/QgGtBTeraKyldC7cDVVvAJEOr3dFLKneez/n7BvX57UdhOqDsVwzU7UOnYA7AAOt+Xb26lk79PldDHgMIQ==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.27.2.tgz", + "integrity": "sha512-KnXU4m9MywuZFedL35Z3PuwiTSn/yqRIhrEA9j+7OSkji39NzVkgxuxTYg5F8ryGysq4iFADaU5osSizMXhU2A==", "cpu": [ "arm64" ], @@ -2931,9 +2949,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.4.tgz", - "integrity": "sha512-N6oDBiZCBKlwYcsEPXGDE4g9RoxZLK6vT98M8111cW7VsVJFpNEqvJeIPfsCzbf0XEakPslh72X0gnlMi4Ddgg==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.27.2.tgz", + "integrity": "sha512-Hj77A3yTvUeCIx/Vi+4d4IbYhyTwtHj07lVzUgpUq9YpJSEiGJj4vXMKwzJ3w5zp5v3PFvpJNgc/J31smZey6g==", "cpu": [ "x64" ], @@ -2945,9 +2963,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.4.tgz", - "integrity": "sha512-py5oNShCCjCyjWXCZNrRGRpjWsF0ic8f4ieBNra5buQz0O/U6mMXCpC1LvrHuhJsNPgRt36tSYMidGzZiJF6mw==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.27.2.tgz", + "integrity": "sha512-RjgKf5C3xbn8gxvCm5VgKZ4nn0pRAIe90J0/fdHUsgztd3+Zesb2lm2+r6uX4prV2eUByuxJNdt647/1KPRq5g==", "cpu": [ "arm64" ], @@ -2959,9 +2977,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.4.tgz", - "integrity": "sha512-L7VVVW9FCnTTp4i7KrmHeDsDvjB4++KOBENYtNYAiYl96jeBThFfhP6HVxL74v4SiZEVDH/1ILscR5U9S4ms4g==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.27.2.tgz", + "integrity": "sha512-duq21FoXwQtuws+V9H6UZ+eCBc7fxSpMK1GQINKn3fAyd9DFYKPJNcUhdIKOrMFjLEJgQskoMoiuizMt+dl20g==", "cpu": [ "x64" ], @@ -2973,9 +2991,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.4.tgz", - "integrity": "sha512-10ICosOwYChROdQoQo589N5idQIisxjaFE/PAnX2i0Zr84mY0k9zul1ArH0rnJ/fpgiqfu13TFZR5A5YJLOYZA==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.27.2.tgz", + "integrity": "sha512-6npqOKEPRZkLrMcvyC/32OzJ2srdPzCylJjiTJT2c0bwwSGm7nz2F9mNQ1WrAqCBZROcQn91Fno+khFhVijmFA==", "cpu": [ "arm" ], @@ -2987,9 +3005,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.4.tgz", - "integrity": "sha512-ySAfWs69LYC7QhRDZNKqNhz2UKN8LDfbKSMAEtoEI0jitwfAG2iZwVqGACJT+kfYvvz3/JgsLlcBP+WWoKCLcw==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.27.2.tgz", + "integrity": "sha512-V9Xg6eXtgBtHq2jnuQwM/jr2mwe2EycnopO8cbOvpzFuySCGtKlPCI3Hj9xup/pJK5Q0388qfZZy2DqV2J8ftw==", "cpu": [ "arm" ], @@ -3001,9 +3019,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.4.tgz", - "integrity": "sha512-uHYJ0HNOI6pGEeZ/5mgm5arNVTI0nLlmrbdph+pGXpC9tFHFDQmDMOEqkmUObRfosJqpU8RliYoGz06qSdtcjg==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.27.2.tgz", + "integrity": "sha512-uCFX9gtZJoQl2xDTpRdseYuNqyKkuMDtH6zSrBTA28yTfKyjN9hQ2B04N5ynR8ILCoSDOrG/Eg+J2TtJ1e/CSA==", "cpu": [ "arm64" ], @@ -3015,9 +3033,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.4.tgz", - "integrity": "sha512-38yiWLemQf7aLHDgTg85fh3hW9stJ0Muk7+s6tIkSUOMmi4Xbv5pH/5Bofnsb6spIwD5FJiR+jg71f0CH5OzoA==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.27.2.tgz", + "integrity": "sha512-/PU9P+7Rkz8JFYDHIi+xzHabOu9qEWR07L5nWLIUsvserrxegZExKCi2jhMZRd0ATdboKylu/K5yAXbp7fYFvA==", "cpu": [ "arm64" ], @@ -3029,9 +3047,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.4.tgz", - "integrity": "sha512-q73XUPnkwt9ZNF2xRS4fvneSuaHw2BXuV5rI4cw0fWYVIWIBeDZX7c7FWhFQPNTnE24172K30I+dViWRVD9TwA==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.27.2.tgz", + "integrity": "sha512-eCHmol/dT5odMYi/N0R0HC8V8QE40rEpkyje/ZAXJYNNoSfrObOvG/Mn+s1F/FJyB7co7UQZZf6FuWnN6a7f4g==", "cpu": [ "ppc64" ], @@ -3043,9 +3061,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.4.tgz", - "integrity": "sha512-Aie/TbmQi6UXokJqDZdmTJuZBCU3QBDA8oTKRGtd4ABi/nHgXICulfg1KI6n9/koDsiDbvHAiQO3YAUNa/7BCw==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.27.2.tgz", + "integrity": "sha512-DEP3Njr9/ADDln3kNi76PXonLMSSMiCir0VHXxmGSHxCxDfQ70oWjHcJGfiBugzaqmYdTC7Y+8Int6qbnxPBIQ==", "cpu": [ "riscv64" ], @@ -3057,9 +3075,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.4.tgz", - "integrity": "sha512-P8MPErVO/y8ohWSP9JY7lLQ8+YMHfTI4bAdtCi3pC2hTeqFJco2jYspzOzTUB8hwUWIIu1xwOrJE11nP+0JFAQ==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.27.2.tgz", + "integrity": "sha512-NHGo5i6IE/PtEPh5m0yw5OmPMpesFnzMIS/lzvN5vknnC1sXM5Z/id5VgcNPgpD+wHmIcuYYgW+Q53v+9s96lQ==", "cpu": [ "s390x" ], @@ -3071,9 +3089,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.4.tgz", - "integrity": "sha512-K03TljaaoPK5FOyNMZAAEmhlyO49LaE4qCsr0lYHUKyb6QacTNF9pnfPpXnFlFD3TXuFbFbz7tJ51FujUXkXYA==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.27.2.tgz", + "integrity": "sha512-PaW2DY5Tan+IFvNJGHDmUrORadbe/Ceh8tQxi8cmdQVCCYsLoQo2cuaSj+AU+YRX8M4ivS2vJ9UGaxfuNN7gmg==", "cpu": [ "x64" ], @@ -3085,9 +3103,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.4.tgz", - "integrity": "sha512-VJYl4xSl/wqG2D5xTYncVWW+26ICV4wubwN9Gs5NrqhJtayikwCXzPL8GDsLnaLU3WwhQ8W02IinYSFJfyo34Q==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.27.2.tgz", + "integrity": "sha512-dOlWEMg2gI91Qx5I/HYqOD6iqlJspxLcS4Zlg3vjk1srE67z5T2Uz91yg/qA8sY0XcwQrFzWWiZhMNERylLrpQ==", "cpu": [ "x64" ], @@ -3099,9 +3117,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.4.tgz", - "integrity": "sha512-ku2GvtPwQfCqoPFIJCqZ8o7bJcj+Y54cZSr43hHca6jLwAiCbZdBUOrqE6y29QFajNAzzpIOwsckaTFmN6/8TA==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.27.2.tgz", + "integrity": "sha512-euMIv/4x5Y2/ImlbGl88mwKNXDsvzbWUlT7DFky76z2keajCtcbAsN9LUdmk31hAoVmJJYSThgdA0EsPeTr1+w==", "cpu": [ "arm64" ], @@ -3113,9 +3131,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.4.tgz", - "integrity": "sha512-V3nCe+eTt/W6UYNr/wGvO1fLpHUrnlirlypZfKCT1fG6hWfqhPgQV/K/mRBXBpxc0eKLIF18pIOFVPh0mqHjlg==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.27.2.tgz", + "integrity": "sha512-RsnE6LQkUHlkC10RKngtHNLxb7scFykEbEwOFDjr3CeCMG+Rr+cKqlkKc2/wJ1u4u990urRHCbjz31x84PBrSQ==", "cpu": [ "ia32" ], @@ -3127,9 +3145,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.4.tgz", - "integrity": "sha512-LTw1Dfd0mBIEqUVCxbvTE/LLo+9ZxVC9k99v1v4ahg9Aak6FpqOfNu5kRkeTAn0wphoC4JU7No1/rL+bBCEwhg==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.27.2.tgz", + "integrity": "sha512-foJM5vv+z2KQmn7emYdDLyTbkoO5bkHZE1oth2tWbQNGW7mX32d46Hz6T0MqXdWS2vBZhaEtHqdy9WYwGfiliA==", "cpu": [ "x64" ], @@ -3201,9 +3219,9 @@ } }, "node_modules/@types/dockerode": { - "version": "3.3.31", - "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.31.tgz", - "integrity": "sha512-42R9eoVqJDSvVspV89g7RwRqfNExgievLNWoHkg7NoWIqAmavIbgQBb4oc0qRtHkxE+I3Xxvqv7qVXFABKPBTg==", + "version": "3.3.32", + "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.32.tgz", + "integrity": "sha512-xxcG0g5AWKtNyh7I7wswLdFvym4Mlqks5ZlKzxEUrGHS0r0PUOfxm2T0mspwu10mHQqu3Ck3MI3V2HqvLWE1fg==", "dev": true, "license": "MIT", "dependencies": { @@ -4225,9 +4243,9 @@ } }, "node_modules/object-inspect": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", - "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", + "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -4280,9 +4298,9 @@ "license": "ISC" }, "node_modules/postcss": { - "version": "8.4.47", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", - "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", + "version": "8.4.49", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz", + "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==", "dev": true, "funding": [ { @@ -4301,7 +4319,7 @@ "license": "MIT", "dependencies": { "nanoid": "^3.3.7", - "picocolors": "^1.1.0", + "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, "engines": { @@ -4385,9 +4403,9 @@ } }, "node_modules/rollup": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.4.tgz", - "integrity": "sha512-vGorVWIsWfX3xbcyAS+I047kFKapHYivmkaT63Smj77XwvLSJos6M1xGqZnBPFQFBRZDOcG1QnYEIxAvTr/HjA==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.27.2.tgz", + "integrity": "sha512-KreA+PzWmk2yaFmZVwe6GB2uBD86nXl86OsDkt1bJS9p3vqWuEQ6HnJJ+j/mZi/q0920P99/MVRlB4L3crpF5w==", "dev": true, "license": "MIT", "dependencies": { @@ -4401,24 +4419,24 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.24.4", - "@rollup/rollup-android-arm64": "4.24.4", - "@rollup/rollup-darwin-arm64": "4.24.4", - "@rollup/rollup-darwin-x64": "4.24.4", - "@rollup/rollup-freebsd-arm64": "4.24.4", - "@rollup/rollup-freebsd-x64": "4.24.4", - "@rollup/rollup-linux-arm-gnueabihf": "4.24.4", - "@rollup/rollup-linux-arm-musleabihf": "4.24.4", - "@rollup/rollup-linux-arm64-gnu": "4.24.4", - "@rollup/rollup-linux-arm64-musl": "4.24.4", - "@rollup/rollup-linux-powerpc64le-gnu": "4.24.4", - "@rollup/rollup-linux-riscv64-gnu": "4.24.4", - "@rollup/rollup-linux-s390x-gnu": "4.24.4", - "@rollup/rollup-linux-x64-gnu": "4.24.4", - "@rollup/rollup-linux-x64-musl": "4.24.4", - "@rollup/rollup-win32-arm64-msvc": "4.24.4", - "@rollup/rollup-win32-ia32-msvc": "4.24.4", - "@rollup/rollup-win32-x64-msvc": "4.24.4", + "@rollup/rollup-android-arm-eabi": "4.27.2", + "@rollup/rollup-android-arm64": "4.27.2", + "@rollup/rollup-darwin-arm64": "4.27.2", + "@rollup/rollup-darwin-x64": "4.27.2", + "@rollup/rollup-freebsd-arm64": "4.27.2", + "@rollup/rollup-freebsd-x64": "4.27.2", + "@rollup/rollup-linux-arm-gnueabihf": "4.27.2", + "@rollup/rollup-linux-arm-musleabihf": "4.27.2", + "@rollup/rollup-linux-arm64-gnu": "4.27.2", + "@rollup/rollup-linux-arm64-musl": "4.27.2", + "@rollup/rollup-linux-powerpc64le-gnu": "4.27.2", + "@rollup/rollup-linux-riscv64-gnu": "4.27.2", + "@rollup/rollup-linux-s390x-gnu": "4.27.2", + "@rollup/rollup-linux-x64-gnu": "4.27.2", + "@rollup/rollup-linux-x64-musl": "4.27.2", + "@rollup/rollup-win32-arm64-msvc": "4.27.2", + "@rollup/rollup-win32-ia32-msvc": "4.27.2", + "@rollup/rollup-win32-x64-msvc": "4.27.2", "fsevents": "~2.3.2" } }, @@ -4765,9 +4783,9 @@ } }, "node_modules/vite": { - "version": "5.4.10", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.10.tgz", - "integrity": "sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==", + "version": "5.4.11", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz", + "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==", "dev": true, "license": "MIT", "dependencies": { diff --git a/demo/package.json b/demo/package.json index 83b08174..7fcc9c12 100644 --- a/demo/package.json +++ b/demo/package.json @@ -187,7 +187,6 @@ "@codingame/monaco-vscode-xml-default-extension": "file:../dist/default-extension-xml", "@codingame/monaco-vscode-yaml-default-extension": "file:../dist/default-extension-yaml", - "@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": "file:../dist/common-chat-extensions-notebook-terminal", "@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common": "file:../dist/common-chat-extensions-notebook-task-terminal-testing", "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "file:../dist/common-chat-interactive-notebook-search", "@codingame/monaco-vscode-chat-notebook-common": "file:../dist/common-chat-notebook", @@ -199,8 +198,10 @@ "@codingame/monaco-vscode-chat-comments-extensions-interactive-notebook-search-common": "file:../dist/common-chat-comments-extensions-interactive-notebook-search", "@codingame/monaco-vscode-chat-extensions-notebook-common": "file:../dist/common-chat-extensions-notebook", "@codingame/monaco-vscode-user-data-profile-user-data-sync-common": "file:../dist/common-user-data-profile-user-data-sync", - "@codingame/monaco-vscode-chat-extensions-notebook-terminal-testing-common": "file:../dist/common-chat-extensions-notebook-terminal-testing", - "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "file:../dist/common-chat-extensions-interactive-notebook-quickaccess-search-terminal", + "@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common": "file:../dist/common-chat-extensions-interactive-notebook-search-terminal", + "@codingame/monaco-vscode-chat-notebook-terminal-testing-common": "file:../dist/common-chat-notebook-terminal-testing", + "@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common": "file:../dist/common-chat-interactive-notebook-search-terminal", + "@codingame/monaco-vscode-chat-notebook-terminal-common": "file:../dist/common-chat-notebook-terminal", "ansi-colors": "^4.1.3", "dockerode": "^4.0.2", diff --git a/vscode-paches/0055-fix-extract-constants-into-separate-module.patch b/vscode-paches/0055-fix-extract-constants-into-separate-module.patch new file mode 100644 index 00000000..79847839 --- /dev/null +++ b/vscode-paches/0055-fix-extract-constants-into-separate-module.patch @@ -0,0 +1,142 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Tue, 22 Oct 2024 13:04:46 +0200 +Subject: [PATCH] fix: extract constants into separate module + +so that only the constant is pulled from the root instead of the whole module graph +--- + src/vs/workbench/api/browser/mainThreadChatAgents2.ts | 5 +++-- + .../contrib/chat/browser/actions/chatActions.ts | 5 ++--- + .../contrib/chat/browser/actions/chatConstants.ts | 10 ++++++++++ + .../chat/browser/actions/chatQuickInputActions.ts | 3 ++- + .../chat/browser/contrib/chatDynamicVariables.ts | 3 ++- + .../browser/contrib/chatDynamicVariablesConstant.ts | 6 ++++++ + .../contrib/quickaccess/browser/commandsQuickAccess.ts | 3 +-- + 7 files changed, 26 insertions(+), 9 deletions(-) + create mode 100644 src/vs/workbench/contrib/chat/browser/actions/chatConstants.ts + create mode 100644 src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant.ts + +diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts +index 5de097d706d..b8fe352d99f 100644 +--- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts ++++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts +@@ -23,7 +23,7 @@ import { IInstantiationService } from '../../../platform/instantiation/common/in + import { ILogService } from '../../../platform/log/common/log.js'; + import { IChatWidgetService } from '../../contrib/chat/browser/chat.js'; + import { ChatInputPart } from '../../contrib/chat/browser/chatInputPart.js'; +-import { AddDynamicVariableAction, IAddDynamicVariableContext } from '../../contrib/chat/browser/contrib/chatDynamicVariables.js'; ++import { IAddDynamicVariableContext } from '../../contrib/chat/browser/contrib/chatDynamicVariables.js'; + import { ChatAgentLocation, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentRequest, IChatAgentService } from '../../contrib/chat/common/chatAgents.js'; + import { ChatRequestAgentPart } from '../../contrib/chat/common/chatParserTypes.js'; + import { ChatRequestParser } from '../../contrib/chat/common/chatRequestParser.js'; +@@ -32,6 +32,7 @@ import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions + import { IExtensionService } from '../../services/extensions/common/extensions.js'; + import { Dto } from '../../services/extensions/common/proxyIdentifier.js'; + import { ExtHostChatAgentsShape2, ExtHostContext, IChatParticipantMetadata, IChatProgressDto, IDynamicChatAgentProps, IExtensionChatAgentMetadata, MainContext, MainThreadChatAgentsShape2 } from '../common/extHost.protocol.js'; ++import { addDynamicVariableActionId } from '../../contrib/chat/browser/contrib/chatDynamicVariablesConstant.js'; + + interface AgentData { + dispose: () => void; +@@ -313,7 +314,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA + kind: CompletionItemKind.Text, + detail: v.detail, + documentation: v.documentation, +- command: { id: AddDynamicVariableAction.ID, title: '', arguments: [{ id: v.id, widget, range: rangeAfterInsert, variableData: revive(v.value) as any, command: v.command } satisfies IAddDynamicVariableContext] } ++ command: { id: addDynamicVariableActionId, title: '', arguments: [{ id: v.id, widget, range: rangeAfterInsert, variableData: revive(v.value) as any, command: v.command } satisfies IAddDynamicVariableContext] } + } satisfies CompletionItem; + }); + +diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts +index 3b308d96078..0705038398a 100644 +--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts ++++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts +@@ -49,9 +49,8 @@ import { URI } from '../../../../../base/common/uri.js'; + import { IHostService } from '../../../../services/host/browser/host.js'; + import { isCancellationError } from '../../../../../base/common/errors.js'; + import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js'; +- +-export const CHAT_CATEGORY = localize2('chat.category', 'Chat'); +-export const CHAT_OPEN_ACTION_ID = 'workbench.action.chat.open'; ++import { CHAT_CATEGORY, CHAT_OPEN_ACTION_ID } from './chatConstants.js'; ++export { CHAT_CATEGORY, CHAT_OPEN_ACTION_ID } from './chatConstants.js'; + + export interface IChatViewOpenOptions { + /** +diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatConstants.ts b/src/vs/workbench/contrib/chat/browser/actions/chatConstants.ts +new file mode 100644 +index 00000000000..6ce67486a58 +--- /dev/null ++++ b/src/vs/workbench/contrib/chat/browser/actions/chatConstants.ts +@@ -0,0 +1,10 @@ ++/*--------------------------------------------------------------------------------------------- ++ * Copyright (c) Microsoft Corporation. All rights reserved. ++ * Licensed under the MIT License. See License.txt in the project root for license information. ++ *--------------------------------------------------------------------------------------------*/ ++import { localize2 } from '../../../../../nls.js'; ++ ++export const CHAT_CATEGORY = localize2('chat.category', 'Chat'); ++export const CHAT_OPEN_ACTION_ID = 'workbench.action.chat.open'; ++export const ASK_QUICK_QUESTION_ACTION_ID = 'workbench.action.quickchat.toggle'; ++ +diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts +index 43b7bf8b6fa..91987dc1493 100644 +--- a/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts ++++ b/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts +@@ -15,8 +15,9 @@ import { CHAT_CATEGORY } from './chatActions.js'; + import { IQuickChatOpenOptions, IQuickChatService } from '../chat.js'; + import { CONTEXT_CHAT_ENABLED } from '../../common/chatContextKeys.js'; + import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js'; ++import { ASK_QUICK_QUESTION_ACTION_ID } from './chatConstants.js'; ++export { ASK_QUICK_QUESTION_ACTION_ID } from './chatConstants.js'; + +-export const ASK_QUICK_QUESTION_ACTION_ID = 'workbench.action.quickchat.toggle'; + export function registerQuickChatActions() { + registerAction2(QuickChatGlobalAction); + registerAction2(AskQuickChatAction); +diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts +index 29977605ad3..1377fcea1f0 100644 +--- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts ++++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts +@@ -23,6 +23,7 @@ import { IQuickInputService } from '../../../../../platform/quickinput/common/qu + import { IChatWidget } from '../chat.js'; + import { ChatWidget, IChatWidgetContrib } from '../chatWidget.js'; + import { IChatRequestVariableValue, IChatVariablesService, IDynamicVariable } from '../../common/chatVariables.js'; ++import { addDynamicVariableActionId } from './chatDynamicVariablesConstant.js'; + + export const dynamicVariableDecorationType = 'chat-dynamic-variable'; + +@@ -232,7 +233,7 @@ function isAddDynamicVariableContext(context: any): context is IAddDynamicVariab + } + + export class AddDynamicVariableAction extends Action2 { +- static readonly ID = 'workbench.action.chat.addDynamicVariable'; ++ static readonly ID = addDynamicVariableActionId; + + constructor() { + super({ +diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant.ts +new file mode 100644 +index 00000000000..df0794493a8 +--- /dev/null ++++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant.ts +@@ -0,0 +1,6 @@ ++/*--------------------------------------------------------------------------------------------- ++ * Copyright (c) Microsoft Corporation. All rights reserved. ++ * Licensed under the MIT License. See License.txt in the project root for license information. ++ *--------------------------------------------------------------------------------------------*/ ++ ++export const addDynamicVariableActionId = 'workbench.action.chat.addDynamicVariable'; +diff --git a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts +index 3ab1684b9ac..a91549c6daf 100644 +--- a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts ++++ b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts +@@ -30,8 +30,7 @@ import { IQuickInputService, IQuickPickSeparator } from '../../../../platform/qu + import { IStorageService } from '../../../../platform/storage/common/storage.js'; + import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js'; + import { IWorkbenchQuickAccessConfiguration } from '../../../browser/quickaccess.js'; +-import { CHAT_OPEN_ACTION_ID } from '../../chat/browser/actions/chatActions.js'; +-import { ASK_QUICK_QUESTION_ACTION_ID } from '../../chat/browser/actions/chatQuickInputActions.js'; ++import { CHAT_OPEN_ACTION_ID, ASK_QUICK_QUESTION_ACTION_ID } from '../../chat/browser/actions/chatConstants.js'; + import { ChatAgentLocation, IChatAgentService } from '../../chat/common/chatAgents.js'; + import { CommandInformationResult, IAiRelatedInformationService, RelatedInformationType } from '../../../services/aiRelatedInformation/common/aiRelatedInformation.js'; + import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js'; diff --git a/vscode-paches/0056-fix-store-activeChatController-in-another-module.patch b/vscode-paches/0056-fix-store-activeChatController-in-another-module.patch new file mode 100644 index 00000000..099f3561 --- /dev/null +++ b/vscode-paches/0056-fix-store-activeChatController-in-another-module.patch @@ -0,0 +1,260 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= +Date: Thu, 31 Oct 2024 12:20:04 +0100 +Subject: [PATCH] fix: store activeChatController in another module + +--- + .../contrib/chat/browser/chatWidget.ts | 4 +-- + .../actions/voiceChatActions.ts | 4 +-- + .../terminal/terminalContribChatExports.ts | 2 ++ + .../chat/browser/terminalChatActions.ts | 25 ++++++++++--------- + .../chat/browser/terminalChatController.ts | 11 +++----- + .../browser/terminalChatControllerHolder.ts | 15 +++++++++++ + 6 files changed, 38 insertions(+), 23 deletions(-) + create mode 100644 src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatControllerHolder.ts + +diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts +index c3da00e0968..10457719c43 100644 +--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts ++++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts +@@ -32,7 +32,7 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo + import { buttonSecondaryBackground, buttonSecondaryForeground, buttonSecondaryHoverBackground } from '../../../../platform/theme/common/colorRegistry.js'; + import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js'; + import { IThemeService } from '../../../../platform/theme/common/themeService.js'; +-import { TerminalChatController } from '../../terminal/terminalContribChatExports.js'; ++import { activeChatController } from '../../terminal/terminalContribChatExports.js'; + import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService, IChatWelcomeMessageContent, isChatWelcomeMessageContent } from '../common/chatAgents.js'; + import { CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_QUICK_CHAT, CONTEXT_LAST_ITEM_ID, CONTEXT_RESPONSE_FILTERED } from '../common/chatContextKeys.js'; + import { ChatEditingSessionState, IChatEditingService, IChatEditingSession } from '../common/chatEditingService.js'; +@@ -1251,7 +1251,7 @@ export class ChatWidgetService extends Disposable implements IChatWidgetService + readonly onDidAddWidget: Event = this._onDidAddWidget.event; + + get lastFocusedWidget(): IChatWidget | undefined { +- return TerminalChatController.activeChatController?.chatWidget ?? this._lastFocusedWidget; ++ return activeChatController?.chatWidget ?? this._lastFocusedWidget; + } + + getAllWidgets(location: ChatAgentLocation): ReadonlyArray { +diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts +index 3935d4ed235..9b2516c7c74 100644 +--- a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts ++++ b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts +@@ -47,7 +47,7 @@ import { CTX_INLINE_CHAT_FOCUSED, MENU_INLINE_CHAT_WIDGET_SECONDARY } from '../. + import { NOTEBOOK_EDITOR_FOCUSED } from '../../../notebook/common/notebookContextKeys.js'; + import { HasSpeechProvider, ISpeechService, KeywordRecognitionStatus, SpeechToTextInProgress, SpeechToTextStatus, TextToSpeechStatus, TextToSpeechInProgress as GlobalTextToSpeechInProgress } from '../../../speech/common/speechService.js'; + import { ITerminalService } from '../../../terminal/browser/terminal.js'; +-import { TerminalChatContextKeys, TerminalChatController } from '../../../terminal/terminalContribChatExports.js'; ++import { TerminalChatContextKeys, TerminalChatController, activeChatController } from '../../../terminal/terminalContribChatExports.js'; + import { IEditorService } from '../../../../services/editor/common/editorService.js'; + import { IHostService } from '../../../../services/host/browser/host.js'; + import { IWorkbenchLayoutService, Parts } from '../../../../services/layout/browser/layoutService.js'; +@@ -148,7 +148,7 @@ class VoiceChatSessionControllerFactory { + // 1.) probe terminal chat which is not part of chat widget service + const activeInstance = terminalService.activeInstance; + if (activeInstance) { +- const terminalChat = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); ++ const terminalChat = activeChatController || TerminalChatController.get(activeInstance); + if (terminalChat?.hasFocus()) { + return VoiceChatSessionControllerFactory.doCreateForTerminalChat(terminalChat); + } +diff --git a/src/vs/workbench/contrib/terminal/terminalContribChatExports.ts b/src/vs/workbench/contrib/terminal/terminalContribChatExports.ts +index edd22bbfdc5..10e68ca6b62 100644 +--- a/src/vs/workbench/contrib/terminal/terminalContribChatExports.ts ++++ b/src/vs/workbench/contrib/terminal/terminalContribChatExports.ts +@@ -3,8 +3,10 @@ + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + ++ + // HACK: Export chat parts as it's only partially encapsulated within the contrib. This file only + // exists because including it into terminalContribExports would cause a circular dependency on + // startup + export { TerminalChatContextKeys } from '../terminalContrib/chat/browser/terminalChat.js'; + export { TerminalChatController } from '../terminalContrib/chat/browser/terminalChatController.js'; ++export { activeChatController } from '../terminalContrib/chat/browser/terminalChatControllerHolder.js'; +diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts +index 885239c6009..23a46aa2556 100644 +--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts ++++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts +@@ -16,6 +16,7 @@ import { registerActiveXtermAction } from '../../../terminal/browser/terminalAct + import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js'; + import { MENU_TERMINAL_CHAT_INPUT, MENU_TERMINAL_CHAT_WIDGET, MENU_TERMINAL_CHAT_WIDGET_STATUS, TerminalChatCommandId, TerminalChatContextKeys } from './terminalChat.js'; + import { TerminalChatController } from './terminalChatController.js'; ++import { activeChatController } from './terminalChatControllerHolder.js'; + + registerActiveXtermAction({ + id: TerminalChatCommandId.Start, +@@ -37,7 +38,7 @@ registerActiveXtermAction({ + return; + } + +- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); ++ const contr = activeChatController || TerminalChatController.get(activeInstance); + + if (opts) { + opts = typeof opts === 'string' ? { query: opts } : opts; +@@ -77,7 +78,7 @@ registerActiveXtermAction({ + if (isDetachedTerminalInstance(activeInstance)) { + return; + } +- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); ++ const contr = activeChatController || TerminalChatController.get(activeInstance); + contr?.clear(); + } + }); +@@ -105,7 +106,7 @@ registerActiveXtermAction({ + if (isDetachedTerminalInstance(activeInstance)) { + return; + } +- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); ++ const contr = activeChatController || TerminalChatController.get(activeInstance); + contr?.clear(); + } + }); +@@ -137,7 +138,7 @@ registerActiveXtermAction({ + if (isDetachedTerminalInstance(activeInstance)) { + return; + } +- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); ++ const contr = activeChatController || TerminalChatController.get(activeInstance); + contr?.acceptCommand(true); + } + }); +@@ -167,7 +168,7 @@ registerActiveXtermAction({ + if (isDetachedTerminalInstance(activeInstance)) { + return; + } +- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); ++ const contr = activeChatController || TerminalChatController.get(activeInstance); + contr?.acceptCommand(true); + } + }); +@@ -199,7 +200,7 @@ registerActiveXtermAction({ + if (isDetachedTerminalInstance(activeInstance)) { + return; + } +- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); ++ const contr = activeChatController || TerminalChatController.get(activeInstance); + contr?.acceptCommand(false); + } + }); +@@ -229,7 +230,7 @@ registerActiveXtermAction({ + if (isDetachedTerminalInstance(activeInstance)) { + return; + } +- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); ++ const contr = activeChatController || TerminalChatController.get(activeInstance); + contr?.acceptCommand(false); + } + }); +@@ -258,7 +259,7 @@ registerActiveXtermAction({ + if (isDetachedTerminalInstance(activeInstance)) { + return; + } +- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); ++ const contr = activeChatController || TerminalChatController.get(activeInstance); + contr?.viewInChat(); + } + }); +@@ -287,7 +288,7 @@ registerActiveXtermAction({ + if (isDetachedTerminalInstance(activeInstance)) { + return; + } +- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); ++ const contr = activeChatController || TerminalChatController.get(activeInstance); + contr?.acceptInput(); + } + }); +@@ -308,7 +309,7 @@ registerActiveXtermAction({ + if (isDetachedTerminalInstance(activeInstance)) { + return; + } +- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); ++ const contr = activeChatController || TerminalChatController.get(activeInstance); + contr?.cancel(); + } + }); +@@ -327,7 +328,7 @@ registerActiveXtermAction({ + if (isDetachedTerminalInstance(activeInstance)) { + return; + } +- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); ++ const contr = activeChatController || TerminalChatController.get(activeInstance); + contr?.populateHistory(true); + } + }); +@@ -346,7 +347,7 @@ registerActiveXtermAction({ + if (isDetachedTerminalInstance(activeInstance)) { + return; + } +- const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance); ++ const contr = activeChatController || TerminalChatController.get(activeInstance); + contr?.populateHistory(false); + } + }); +diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts +index 17e77a4a945..4a97d085595 100644 +--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts ++++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts +@@ -23,6 +23,7 @@ import { ChatAgentLocation } from '../../../chat/common/chatAgents.js'; + import { ChatModel, IChatResponseModel } from '../../../chat/common/chatModel.js'; + import type { ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js'; + import { TerminalChatContextKeys } from './terminalChat.js'; ++import { setActiveChatController } from './terminalChatControllerHolder.js'; + + const enum Message { + None = 0, +@@ -37,15 +38,11 @@ const enum Message { + + export class TerminalChatController extends Disposable implements ITerminalContribution { + static readonly ID = 'terminal.chat'; ++ static activeChatController: TerminalChatController | null; + + static get(instance: ITerminalInstance): TerminalChatController | null { + return instance.getContribution(TerminalChatController.ID); + } +- /** +- * The controller for the currently focused chat widget. This is used to track action context since 'active terminals' +- * are only tracked for non-detached terminal instanecs. +- */ +- static activeChatController?: TerminalChatController; + + private static _storageKey = 'terminal-inline-chat-history'; + private static _promptHistory: string[] = []; +@@ -145,13 +142,13 @@ export class TerminalChatController extends Disposable implements ITerminalContr + this._terminalChatWidget = new Lazy(() => { + const chatWidget = this._register(this._instantiationService.createInstance(TerminalChatWidget, this._ctx.instance.domElement!, this._ctx.instance, xterm)); + this._register(chatWidget.focusTracker.onDidFocus(() => { +- TerminalChatController.activeChatController = this; ++ setActiveChatController(this); + if (!isDetachedTerminalInstance(this._ctx.instance)) { + this._terminalService.setActiveInstance(this._ctx.instance); + } + })); + this._register(chatWidget.focusTracker.onDidBlur(() => { +- TerminalChatController.activeChatController = undefined; ++ setActiveChatController(undefined); + this._ctx.instance.resetScrollbarVisibility(); + })); + if (!this._ctx.instance.domElement) { +diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatControllerHolder.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatControllerHolder.ts +new file mode 100644 +index 00000000000..bb67971614b +--- /dev/null ++++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatControllerHolder.ts +@@ -0,0 +1,15 @@ ++/*--------------------------------------------------------------------------------------------- ++ * Copyright (c) Microsoft Corporation. All rights reserved. ++ * Licensed under the MIT License. See License.txt in the project root for license information. ++ *--------------------------------------------------------------------------------------------*/ ++import { TerminalChatController } from './terminalChatController.js'; ++ ++/** ++ * The controller for the currently focused chat widget. This is used to track action context since 'active terminals' ++ * are only tracked for non-detached terminal instanecs. ++ */ ++export let activeChatController: TerminalChatController | undefined; ++ ++export function setActiveChatController(_activeChatController: TerminalChatController | undefined) { ++ activeChatController = _activeChatController; ++} diff --git a/vscode-paches/0055-fix-rollback-typescript-as-the-last-version-breaks-t.patch b/vscode-paches/0057-fix-rollback-typescript-as-the-last-version-breaks-t.patch similarity index 98% rename from vscode-paches/0055-fix-rollback-typescript-as-the-last-version-breaks-t.patch rename to vscode-paches/0057-fix-rollback-typescript-as-the-last-version-breaks-t.patch index b298b6df..4734742b 100644 --- a/vscode-paches/0055-fix-rollback-typescript-as-the-last-version-breaks-t.patch +++ b/vscode-paches/0057-fix-rollback-typescript-as-the-last-version-breaks-t.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= -Date: Wed, 6 Nov 2024 19:49:31 +0100 +Date: Mon, 18 Nov 2024 14:04:14 +0100 Subject: [PATCH] fix: rollback typescript as the last version breaks the extractServices script