Merge pull request #775 from CodinGame/vscode-1.111.0

Vscode 1.111.0

Author: CGNonofr

.ncurc.json

@@ -11,7 +11,6 @@
     "@vscode/spdlog",
     "@vscode/tree-sitter-wasm",
     "@vscode/windows-process-tree",
-    "@vscode/windows-registry",
     "@xterm/addon-clipboard",
     "@xterm/addon-image",
     "@xterm/addon-ligatures",

package-lock.json

@@ -30,9 +30,9 @@
   },
   "config": {
     "vscode": {
-      "version": "1.110.0",
-      "ref": "1.110",
-      "commit": "0870c2a0c7c0564e7631bfed2675573a94ba4455"
+      "version": "1.111.0",
+      "ref": "1.111.0",
+      "commit": "ce099c1ed25d9eb3076c11e4a280f3eb52b4fbeb"
     },
     "monaco": {
       "ref": "v0.55.1",
@@ -49,7 +49,7 @@
     "@codingame/semantic-release-config-github": "^2.2.1",
     "@codingame/tsconfig": "^1.2.1",
     "@commitlint/cli": "^20.4.3",
-    "@rollup/plugin-commonjs": "^29.0.1",
+    "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-dynamic-import-vars": "^2.1.5",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
@@ -61,7 +61,7 @@
     "@types/vscode-semver": "npm:@types/semver@=5.5.0",
     "@types/yargs": "^17.0.35",
     "@types/yauzl": "^2.10.3",
-    "@vscode/codicons": "^0.0.45-11",
+    "@vscode/codicons": "^0.0.45-12",
     "@vscode/tree-sitter-wasm": "^0.3.0",
     "acorn": "^8.16.0",
     "chalk": "^5.6.2",
@@ -100,16 +100,16 @@
     "@vscode/spdlog": "^0.15.7",
     "@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23",
     "@vscode/windows-process-tree": "^0.6.0",
-    "@xterm/addon-clipboard": "^0.3.0-beta.167",
-    "@xterm/addon-image": "^0.10.0-beta.167",
-    "@xterm/addon-ligatures": "^0.11.0-beta.167",
-    "@xterm/addon-progress": "^0.3.0-beta.167",
-    "@xterm/addon-search": "^0.17.0-beta.167",
-    "@xterm/addon-serialize": "^0.15.0-beta.167",
-    "@xterm/addon-unicode11": "^0.10.0-beta.167",
-    "@xterm/addon-webgl": "^0.20.0-beta.166",
-    "@xterm/headless": "^6.1.0-beta.167",
-    "@xterm/xterm": "^6.1.0-beta.167",
+    "@xterm/addon-clipboard": "^0.3.0-beta.168",
+    "@xterm/addon-image": "^0.10.0-beta.168",
+    "@xterm/addon-ligatures": "^0.11.0-beta.168",
+    "@xterm/addon-progress": "^0.3.0-beta.168",
+    "@xterm/addon-search": "^0.17.0-beta.168",
+    "@xterm/addon-serialize": "^0.15.0-beta.168",
+    "@xterm/addon-unicode11": "^0.10.0-beta.168",
+    "@xterm/addon-webgl": "^0.20.0-beta.167",
+    "@xterm/headless": "^6.1.0-beta.168",
+    "@xterm/xterm": "^6.1.0-beta.168",
     "cookie": "^0.7.2",
     "css-url-parser": "^1.1.4",
     "dompurify": "^3.3.2",

package.json

@@ -449,7 +449,7 @@ import { ILanguageModelsConfigurationService } from 'vs/workbench/contrib/chat/c
 import { IAgentPluginRepositoryService } from 'vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service.js'
 import { IAgentPluginService } from 'vs/workbench/contrib/chat/common/plugins/agentPluginService.service.js'
 import { IPluginMarketplaceService } from 'vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service.js'
-import { Target } from 'vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.js'
+import { Target } from 'vs/workbench/contrib/chat/common/promptSyntax/promptTypes.js'
 import { ILanguageModelToolsConfirmationService } from 'vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service'
 import {
   ToolDataSource,
@@ -475,10 +475,12 @@ import { unsupported } from './tools.js'
 import { IChatAttachmentWidgetRegistry } from 'vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgetRegistry.service'
 import { IChatDebugService } from 'vs/workbench/contrib/chat/common/chatDebugService.service.js'
 import { IPluginInstallService } from 'vs/workbench/contrib/chat/common/plugins/pluginInstallService.service'
+import { IChatResponseResourceFileSystemProvider } from 'vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.service.js'
 import { IGitService } from 'vs/workbench/contrib/git/common/gitService.service.js'
 import { IWorkbenchMcpGatewayService } from 'vs/workbench/contrib/mcp/common/mcpGatewayService.service.js'
 import { IMcpSandboxService } from 'vs/workbench/contrib/mcp/common/mcpSandboxService.service.js'
 import { IPowerService } from 'vs/workbench/services/power/common/powerService.service.js'
+import { FileSystemProviderCapabilities } from './service-override/files.js'
 
 function Unsupported(target: object, propertyKey: string, descriptor?: PropertyDescriptor) {
   function unsupported() {
@@ -2765,6 +2767,8 @@ class TerminalService implements ITerminalService {
   @Unsupported
   openResource: ITerminalService['openResource'] = unsupported
   setNextCommandId: ITerminalService['setNextCommandId'] = async () => {}
+  @Unsupported
+  moveToBackground: ITerminalService['moveToBackground'] = unsupported
 }
 registerSingleton(ITerminalService, TerminalService, InstantiationType.Delayed)
 class TerminalConfigurationService implements ITerminalConfigurationService {
@@ -3321,7 +3325,6 @@ class ChatService implements IChatService {
   notifyUserAction: IChatService['notifyUserAction'] = unsupported
   onDidSubmitRequest: IChatService['onDidSubmitRequest'] = Event.None
   requestInProgressObs: IChatService['requestInProgressObs'] = constObservable(false)
-  edits2Enabled: IChatService['edits2Enabled'] = false
   editingSessions: IChatService['editingSessions'] = []
   getChatSessionFromInternalUri: IChatService['getChatSessionFromInternalUri'] = () => undefined
   getLocalSessionHistory: IChatService['getLocalSessionHistory'] = async () => []
@@ -5580,6 +5583,8 @@ class ChatEntitlementsService implements IChatEntitlementService {
 registerSingleton(IChatEntitlementService, ChatEntitlementsService, InstantiationType.Eager)
 class PromptsService implements IPromptsService {
   _serviceBrand: undefined
+  onDidChangeInstructions: IPromptsService['onDidChangeInstructions'] = Event.None
+  onDidChangeSkills: IPromptsService['onDidChangeSkills'] = Event.None
   listPromptFiles: IPromptsService['listPromptFiles'] = async () => []
   getSourceFolders: IPromptsService['getSourceFolders'] = async () => []
   dispose: IPromptsService['dispose'] = (): void => {}
@@ -5857,6 +5862,8 @@ class McpResourceScannerService implements IMcpResourceScannerService {
   addMcpServers: IMcpResourceScannerService['addMcpServers'] = unsupported
   @Unsupported
   removeMcpServers: IMcpResourceScannerService['removeMcpServers'] = unsupported
+  @Unsupported
+  updateSandboxConfig: IMcpResourceScannerService['updateSandboxConfig'] = unsupported
 }
 registerSingleton(IMcpResourceScannerService, McpResourceScannerService, InstantiationType.Eager)
 
@@ -6231,6 +6238,9 @@ class LanguageModelToolsConfirmationService implements ILanguageModelToolsConfir
 
   getPreConfirmActions: ILanguageModelToolsConfirmationService['getPreConfirmActions'] = () => []
   getPostConfirmActions: ILanguageModelToolsConfirmationService['getPostConfirmActions'] = () => []
+
+  toolCanManageConfirmation: ILanguageModelToolsConfirmationService['toolCanManageConfirmation'] =
+    () => false
 }
 registerSingleton(
   ILanguageModelToolsConfirmationService,
@@ -6469,6 +6479,14 @@ class ChatTipService implements IChatTipService {
   hasMultipleTips: IChatTipService['hasMultipleTips'] = unsupported
   @Unsupported
   clearDismissedTips: IChatTipService['clearDismissedTips'] = unsupported
+  @Unsupported
+  dismissTipForSession: IChatTipService['dismissTipForSession'] = unsupported
+  @Unsupported
+  hideTipsForSession: IChatTipService['hideTipsForSession'] = unsupported
+  @Unsupported
+  getNextEligibleTip: IChatTipService['getNextEligibleTip'] = unsupported
+  @Unsupported
+  recordSlashCommandUsage: IChatTipService['recordSlashCommandUsage'] = unsupported
 }
 
 registerSingleton(IChatTipService, ChatTipService, InstantiationType.Delayed)
@@ -6584,6 +6602,18 @@ class AICustomizationWorkspaceService implements IAICustomizationWorkspaceServic
   commitFiles: IAICustomizationWorkspaceService['commitFiles'] = unsupported
   @Unsupported
   generateCustomization: IAICustomizationWorkspaceService['generateCustomization'] = unsupported
+
+  @Unsupported
+  deleteFiles: IAICustomizationWorkspaceService['deleteFiles'] = unsupported
+  hasOverrideProjectRoot: IAICustomizationWorkspaceService['hasOverrideProjectRoot'] =
+    constObservable(false)
+  @Unsupported
+  setOverrideProjectRoot: IAICustomizationWorkspaceService['setOverrideProjectRoot'] = unsupported
+  @Unsupported
+  clearOverrideProjectRoot: IAICustomizationWorkspaceService['clearOverrideProjectRoot'] =
+    unsupported
+  getFilteredPromptSlashCommands: IAICustomizationWorkspaceService['getFilteredPromptSlashCommands'] =
+    async () => []
 }
 
 registerSingleton(
@@ -6624,8 +6654,20 @@ class PluginMarketplaceService implements IPluginMarketplaceService {
   _serviceBrand: undefined
   onDidChangeMarketplaces: IPluginMarketplaceService['onDidChangeMarketplaces'] = Event.None
   fetchMarketplacePlugins: IPluginMarketplaceService['fetchMarketplacePlugins'] = async () => []
-  getMarketplacePluginMetadata: IPluginMarketplaceService['getMarketplacePluginMetadata'] =
-    async () => undefined
+  getMarketplacePluginMetadata: IPluginMarketplaceService['getMarketplacePluginMetadata'] = () =>
+    undefined
+
+  installedPlugins: IPluginMarketplaceService['installedPlugins'] = constObservable([])
+  @Unsupported
+  addInstalledPlugin: IPluginMarketplaceService['addInstalledPlugin'] = unsupported
+  @Unsupported
+  removeInstalledPlugin: IPluginMarketplaceService['removeInstalledPlugin'] = unsupported
+  @Unsupported
+  setInstalledPluginEnabled: IPluginMarketplaceService['setInstalledPluginEnabled'] = unsupported
+  @Unsupported
+  isMarketplaceTrusted: IPluginMarketplaceService['isMarketplaceTrusted'] = unsupported
+  @Unsupported
+  trustMarketplace: IPluginMarketplaceService['trustMarketplace'] = unsupported
 }
 
 registerSingleton(IPluginMarketplaceService, PluginMarketplaceService, InstantiationType.Delayed)
@@ -6641,6 +6683,17 @@ class AgentPluginRepositoryService implements IAgentPluginRepositoryService {
   ensureRepository: IAgentPluginRepositoryService['ensureRepository'] = unsupported
   @Unsupported
   pullRepository: IAgentPluginRepositoryService['pullRepository'] = unsupported
+  @Unsupported
+  getPluginSourceInstallUri: IAgentPluginRepositoryService['getPluginSourceInstallUri'] =
+    unsupported
+  @Unsupported
+  ensurePluginSource: IAgentPluginRepositoryService['ensurePluginSource'] = unsupported
+  @Unsupported
+  updatePluginSource: IAgentPluginRepositoryService['updatePluginSource'] = unsupported
+  @Unsupported
+  getPluginSource: IAgentPluginRepositoryService['getPluginSource'] = unsupported
+  @Unsupported
+  cleanupPluginSource: IAgentPluginRepositoryService['cleanupPluginSource'] = unsupported
 }
 
 registerSingleton(
@@ -6655,8 +6708,6 @@ class PluginInstallService implements IPluginInstallService {
   @Unsupported
   installPlugin: IPluginInstallService['installPlugin'] = unsupported
   @Unsupported
-  uninstallPlugin: IPluginInstallService['uninstallPlugin'] = unsupported
-  @Unsupported
   updatePlugin: IPluginInstallService['updatePlugin'] = unsupported
   @Unsupported
   getPluginInstallUri: IPluginInstallService['getPluginInstallUri'] = unsupported
@@ -6698,6 +6749,12 @@ class ChatDebugService implements IChatDebugService {
   @Unsupported
   resolveEvent: IChatDebugService['resolveEvent'] = unsupported
   dispose: IChatDebugService['dispose'] = () => {}
+
+  onDidClearProviderEvents: IChatDebugService['onDidClearProviderEvents'] = Event.None
+  hasInvokedProviders: IChatDebugService['hasInvokedProviders'] = () => false
+  onDidAttachDebugData: IChatDebugService['onDidAttachDebugData'] = Event.None
+  markDebugDataAttached: IChatDebugService['markDebugDataAttached'] = () => {}
+  hasAttachedDebugData: IChatDebugService['hasAttachedDebugData'] = () => false
 }
 
 registerSingleton(IChatDebugService, ChatDebugService, InstantiationType.Delayed)
@@ -6717,6 +6774,11 @@ class McpSandboxService implements IMcpSandboxService {
   @Unsupported
   launchInSandboxIfEnabled: IMcpSandboxService['launchInSandboxIfEnabled'] = unsupported
   isEnabled: IMcpSandboxService['isEnabled'] = async () => false
+
+  getSandboxConfigSuggestionMessage: IMcpSandboxService['getSandboxConfigSuggestionMessage'] = () =>
+    undefined
+  applySandboxConfigSuggestion: IMcpSandboxService['applySandboxConfigSuggestion'] = async () =>
+    false
 }
 
 registerSingleton(IMcpSandboxService, McpSandboxService, InstantiationType.Delayed)
@@ -6754,3 +6816,33 @@ class PowerService implements IPowerService {
 }
 
 registerSingleton(IPowerService, PowerService, InstantiationType.Delayed)
+
+class ChatResponseResourceFileSystemProvider implements IChatResponseResourceFileSystemProvider {
+  _serviceBrand: undefined
+
+  @Unsupported
+  associate: IChatResponseResourceFileSystemProvider['associate'] = unsupported
+
+  capabilities: IChatResponseResourceFileSystemProvider['capabilities'] =
+    FileSystemProviderCapabilities.None
+  onDidChangeCapabilities: IChatResponseResourceFileSystemProvider['onDidChangeCapabilities'] =
+    Event.None
+  onDidChangeFile: IChatResponseResourceFileSystemProvider['onDidChangeFile'] = Event.None
+  watch: IChatResponseResourceFileSystemProvider['watch'] = () => Disposable.None
+  @Unsupported
+  stat: IChatResponseResourceFileSystemProvider['stat'] = unsupported
+  @Unsupported
+  mkdir: IChatResponseResourceFileSystemProvider['mkdir'] = unsupported
+  @Unsupported
+  readdir: IChatResponseResourceFileSystemProvider['readdir'] = unsupported
+  @Unsupported
+  delete: IChatResponseResourceFileSystemProvider['delete'] = unsupported
+  @Unsupported
+  rename: IChatResponseResourceFileSystemProvider['rename'] = unsupported
+}
+
+registerSingleton(
+  IChatResponseResourceFileSystemProvider,
+  ChatResponseResourceFileSystemProvider,
+  InstantiationType.Delayed
+)

src/missing-services.ts

@@ -112,6 +112,8 @@ import { IChatAttachmentWidgetRegistry } from 'vs/workbench/contrib/chat/browser
 import { ChatAttachmentWidgetRegistry } from 'vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgetRegistry'
 import { IChatDebugService } from 'vs/workbench/contrib/chat/common/chatDebugService.service'
 import { ChatDebugServiceImpl } from 'vs/workbench/contrib/chat/common/chatDebugServiceImpl'
+import { IChatResponseResourceFileSystemProvider } from 'vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.service'
+import { ChatResponseResourceFileSystemProvider } from 'vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider'
 import 'vs/workbench/contrib/chat/browser/chat.contribution'
 import 'vs/workbench/contrib/terminal/terminal.chat.contribution'
 import 'vs/workbench/contrib/inlineChat/browser/inlineChat.contribution'
@@ -247,6 +249,11 @@ export default function getServiceOverride(): IEditorOverrideServices {
       [],
       true
     ),
-    [IChatDebugService.toString()]: new SyncDescriptor(ChatDebugServiceImpl, [], true)
+    [IChatDebugService.toString()]: new SyncDescriptor(ChatDebugServiceImpl, [], true),
+    [IChatResponseResourceFileSystemProvider.toString()]: new SyncDescriptor(
+      ChatResponseResourceFileSystemProvider,
+      [],
+      true
+    )
   }
 }

src/service-override/chat.ts

@@ -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 8abfea0b8d3..871915ebd4a 100644
+index 0bd60212242..63b9db885d9 100644
 --- a/src/vs/workbench/api/common/extHost.protocol.ts
 +++ b/src/vs/workbench/api/common/extHost.protocol.ts
-@@ -1836,6 +1836,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable {
+@@ -1851,6 +1851,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable {
  	$onExtensionRuntimeError(extensionId: ExtensionIdentifier, error: SerializedError): void;
  	$setPerformanceMarks(marks: performance.PerformanceMark[]): Promise<void>;
  	$asBrowserUri(uri: UriComponents): Promise<UriComponents>;

vscode-patches/0005-feat-add-static-asset-url-mechanism.patch

@@ -8,7 +8,7 @@ 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 fb5b0122e91..ee8f98634b9 100644
+index e12a15076e4..cfb4a46c367 100644
 --- a/src/vs/editor/standalone/browser/standaloneServices.ts
 +++ b/src/vs/editor/standalone/browser/standaloneServices.ts
 @@ -559,7 +559,7 @@ export class StandaloneKeybindingService extends AbstractKeybindingService {

vscode-patches/0007-fix-use-existing-method.patch

@@ -9,7 +9,7 @@ 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 ee8f98634b9..9ccfb39b28e 100644
+index cfb4a46c367..04819de2d6d 100644
 --- a/src/vs/editor/standalone/browser/standaloneServices.ts
 +++ b/src/vs/editor/standalone/browser/standaloneServices.ts
 @@ -530,15 +530,19 @@ export class StandaloneKeybindingService extends AbstractKeybindingService {