@codingame/monaco-vscode-chat-service-override 37.6.1 → 38.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (690) hide show
  1. package/common.js +64 -2
  2. package/index.js +3 -3
  3. package/package.json +5 -5
  4. package/session.js +5 -1
  5. package/vscode/src/vs/platform/agentHost/browser/agentHostConnectionsService.d.ts +13 -2
  6. package/vscode/src/vs/platform/agentHost/browser/agentHostConnectionsService.js +164 -12
  7. package/vscode/src/vs/platform/agentHost/browser/agentHostIpcChannelTransport.d.ts +4 -2
  8. package/vscode/src/vs/platform/agentHost/browser/agentHostIpcChannelTransport.js +8 -2
  9. package/vscode/src/vs/platform/agentHost/browser/remoteAgentHostServiceImpl.d.ts +34 -4
  10. package/vscode/src/vs/platform/agentHost/browser/remoteAgentHostServiceImpl.js +345 -48
  11. package/vscode/src/vs/platform/agentHost/browser/webPubSubRelayTransport.d.ts +135 -0
  12. package/vscode/src/vs/platform/agentHost/browser/webPubSubRelayTransport.js +510 -0
  13. package/vscode/src/vs/platform/agentHost/browser/webSocketClientTransport.d.ts +4 -1
  14. package/vscode/src/vs/platform/agentHost/browser/webSocketClientTransport.js +12 -2
  15. package/vscode/src/vs/platform/agentHost/common/agentHostCustomizationConfig.d.ts +2 -11
  16. package/vscode/src/vs/platform/agentHost/common/agentHostCustomizationConfig.js +14 -27
  17. package/vscode/src/vs/platform/agentHost/common/agentHostOperatingSystem.d.ts +6 -0
  18. package/vscode/src/vs/platform/agentHost/common/agentHostOperatingSystem.js +43 -0
  19. package/vscode/src/vs/platform/agentHost/common/agentHostStarter.config.contribution.js +158 -73
  20. package/vscode/src/vs/platform/agentHost/common/artifactToolsConfiguration.d.ts +16 -0
  21. package/vscode/src/vs/platform/agentHost/common/artifactToolsConfiguration.js +26 -0
  22. package/vscode/src/vs/platform/agentHost/common/cloudSandboxAgentHost.d.ts +273 -0
  23. package/vscode/src/vs/platform/agentHost/common/cloudSandboxAgentHost.js +61 -0
  24. package/vscode/src/vs/platform/agentHost/common/codexAccountPlan.d.ts +3 -0
  25. package/vscode/src/vs/platform/agentHost/common/codexAccountPlan.js +30 -0
  26. package/vscode/src/vs/platform/agentHost/common/copilotConfigSlashCommands.js +8 -8
  27. package/vscode/src/vs/platform/agentHost/common/meta/agentHostChatInputState.d.ts +2 -0
  28. package/vscode/src/vs/platform/agentHost/common/meta/agentModelMeta.d.ts +7 -0
  29. package/vscode/src/vs/platform/agentHost/common/meta/agentModelMeta.js +17 -0
  30. package/vscode/src/vs/platform/agentHost/common/meta/copilotd/cloudSandboxProjectMeta.d.ts +12 -0
  31. package/vscode/src/vs/platform/agentHost/common/meta/copilotd/cloudSandboxProjectMeta.js +48 -0
  32. package/vscode/src/vs/platform/agentHost/common/meta/{agentCustomizationMeta.js → vscode/agentCustomizationMeta.js} +2 -2
  33. package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentHostChatInputState.d.ts +16 -0
  34. package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentHostChatInputState.js +16 -0
  35. package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentModelConfigurationMeta.d.ts +8 -0
  36. package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentModelConfigurationMeta.js +20 -0
  37. package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentModelEnsembleMeta.d.ts +8 -0
  38. package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentModelEnsembleMeta.js +11 -0
  39. package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentModelPricing.js +141 -0
  40. package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentPermissionResponseMeta.d.ts +12 -0
  41. package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentPermissionResponseMeta.js +25 -0
  42. package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentSandboxDiagnostics.d.ts +5 -0
  43. package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentSandboxDiagnostics.js +11 -0
  44. package/vscode/src/vs/platform/agentHost/common/meta/{clientPluginCustomizationMeta.d.ts → vscode/clientPluginCustomizationMeta.d.ts} +10 -0
  45. package/vscode/src/vs/platform/agentHost/common/meta/{clientPluginCustomizationMeta.js → vscode/clientPluginCustomizationMeta.js} +7 -1
  46. package/vscode/src/vs/platform/agentHost/common/sandboxConfigSchema.d.ts +35 -24
  47. package/vscode/src/vs/platform/agentHost/common/sandboxConfigSchema.js +85 -20
  48. package/vscode/src/vs/platform/agentHost/common/sessionDataService.d.ts +440 -0
  49. package/vscode/src/vs/platform/agentHost/common/sessionDataService.js +11 -0
  50. package/vscode/src/vs/platform/agentHost/common/sessionDataService.service.d.ts +104 -0
  51. package/vscode/src/vs/platform/agentHost/common/taskEventReplay.d.ts +48 -0
  52. package/vscode/src/vs/platform/agentHost/common/taskEventReplay.js +238 -0
  53. package/vscode/src/vs/platform/agentHost/common/titleGenerationConfiguration.d.ts +35 -0
  54. package/vscode/src/vs/platform/agentHost/common/titleGenerationConfiguration.js +49 -0
  55. package/vscode/src/vs/platform/agentHost/common/vscodeSandboxPaths.d.ts +9 -0
  56. package/vscode/src/vs/platform/agentHost/common/vscodeSandboxPaths.js +13 -0
  57. package/vscode/src/vs/platform/agentHost/common/webPubSub/chunking.d.ts +102 -0
  58. package/vscode/src/vs/platform/agentHost/common/webPubSub/chunking.js +260 -0
  59. package/vscode/src/vs/platform/agentHost/common/webPubSub/framing.d.ts +102 -0
  60. package/vscode/src/vs/platform/agentHost/common/webPubSub/framing.js +115 -0
  61. package/vscode/src/vs/platform/agentHost/common/webPubSub/groups.d.ts +46 -0
  62. package/vscode/src/vs/platform/agentHost/common/webPubSub/groups.js +92 -0
  63. package/vscode/src/vs/platform/customizationMarketplace/common/mcpGalleryMarketplaceProvider.d.ts +22 -0
  64. package/vscode/src/vs/platform/customizationMarketplace/common/mcpGalleryMarketplaceProvider.js +158 -0
  65. package/vscode/src/vs/platform/networkFilter/common/networkFilterService.d.ts +4 -2
  66. package/vscode/src/vs/platform/networkFilter/common/networkFilterService.js +12 -5
  67. package/vscode/src/vs/platform/otel/common/chatUserInteraction.d.ts +20 -0
  68. package/vscode/src/vs/platform/otel/common/chatUserInteraction.js +45 -0
  69. package/vscode/src/vs/platform/sandbox/browser/sandboxHelperService.d.ts +1 -4
  70. package/vscode/src/vs/platform/sandbox/browser/sandboxHelperService.js +0 -9
  71. package/vscode/src/vs/platform/sandbox/common/sandboxHelperIpc.d.ts +1 -4
  72. package/vscode/src/vs/platform/sandbox/common/sandboxHelperIpc.js +0 -15
  73. package/vscode/src/vs/platform/sandbox/common/terminalSandboxCommandRules.d.ts +1 -1
  74. package/vscode/src/vs/platform/sandbox/common/terminalSandboxEngine.d.ts +6 -24
  75. package/vscode/src/vs/platform/sandbox/common/terminalSandboxEngine.js +51 -109
  76. package/vscode/src/vs/platform/sandbox/common/terminalSandboxReadAllowList.d.ts +1 -1
  77. package/vscode/src/vs/platform/sandbox/common/terminalSandboxRuntimeConfigurationPerOperation.d.ts +1 -1
  78. package/vscode/src/vs/sessions/browser/parts/mobile/contributions/mobileDiffView.js +7 -7
  79. package/vscode/src/vs/sessions/browser/parts/mobile/contributions/mobileMultiDiffView.js +8 -8
  80. package/vscode/src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.d.ts +1 -1
  81. package/vscode/src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.js +11 -10
  82. package/vscode/src/vs/sessions/contrib/chat/browser/branchChatSessionAction.js +2 -2
  83. package/vscode/src/vs/sessions/contrib/chat/browser/btwSlashCommand.contribution.js +6 -6
  84. package/vscode/src/vs/sessions/contrib/chat/browser/chat.contribution.js +460 -94
  85. package/vscode/src/vs/sessions/contrib/chat/browser/chatBackgroundTint.d.ts +35 -0
  86. package/vscode/src/vs/sessions/contrib/chat/browser/chatBackgroundTint.js +652 -0
  87. package/vscode/src/vs/sessions/contrib/chat/browser/newSession.d.ts +9 -0
  88. package/vscode/src/vs/sessions/contrib/chat/browser/newSessionAction.d.ts +11 -0
  89. package/vscode/src/vs/sessions/contrib/chat/browser/newSessionAction.js +118 -0
  90. package/vscode/src/vs/sessions/contrib/chat/browser/newSessionFolderQuickPickAction.js +4 -4
  91. package/vscode/src/vs/sessions/contrib/chat/browser/newSessionOnboardingTargets.d.ts +7 -0
  92. package/vscode/src/vs/sessions/contrib/chat/browser/newSessionOnboardingTargets.js +36 -0
  93. package/vscode/src/vs/sessions/contrib/chat/browser/newSessionPickerTryout.d.ts +26 -0
  94. package/vscode/src/vs/sessions/contrib/chat/browser/newSessionPickerTryout.js +145 -0
  95. package/vscode/src/vs/sessions/contrib/chat/browser/openSessionLinkOpener.contribution.d.ts +1 -1
  96. package/vscode/src/vs/sessions/contrib/chat/browser/openSessionLinkOpener.contribution.js +24 -6
  97. package/vscode/src/vs/sessions/contrib/chat/browser/runScriptAction.js +94 -89
  98. package/vscode/src/vs/sessions/contrib/chat/browser/runScriptCustomTaskWidget.js +21 -21
  99. package/vscode/src/vs/sessions/contrib/chat/browser/sessionTurnChanges.d.ts +0 -1
  100. package/vscode/src/vs/sessions/contrib/chat/browser/sessionTurnChanges.js +28 -29
  101. package/vscode/src/vs/sessions/contrib/chat/browser/sessionsChatAccessibilityHelp.d.ts +7 -0
  102. package/vscode/src/vs/sessions/contrib/chat/browser/sessionsChatAccessibilityHelp.js +501 -107
  103. package/vscode/src/vs/sessions/contrib/chat/browser/voiceBridge.contribution.js +5 -1
  104. package/vscode/src/vs/sessions/contrib/chat/browser/workbenchSessionTaskRunner.d.ts +3 -3
  105. package/vscode/src/vs/sessions/contrib/chat/browser/workbenchSessionTaskRunner.js +4 -4
  106. package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentHostAgentPicker.d.ts +8 -1
  107. package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentHostAgentPicker.js +214 -17
  108. package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentHostSettings.contribution.js +16 -9
  109. package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentHostSettingsFileSystemProvider.js +4 -4
  110. package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentSessionSettings.contribution.js +7 -6
  111. package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentSessionSettingsFileSystemProvider.js +4 -4
  112. package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/mobile/mobileChatPhoneInputPresenter.js +226 -0
  113. package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/openAgentHostStateFileAction.js +1 -1
  114. package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/openSubagentChat.d.ts +11 -0
  115. package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/openSubagentChat.js +122 -0
  116. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/cloudAutomationStore.d.ts +67 -0
  117. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/cloudAutomationStore.js +695 -0
  118. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/cloudSandboxSessionConfig.d.ts +4 -0
  119. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/cloudSandboxSessionConfig.js +39 -0
  120. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessions.contribution.js +39 -22
  121. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsActions.d.ts +1 -19
  122. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsActions.js +42 -158
  123. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsChangesets.d.ts +87 -0
  124. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsChangesets.js +176 -0
  125. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.d.ts +422 -0
  126. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.js +2444 -0
  127. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/githubCloudAutomationStore.d.ts +91 -0
  128. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/githubCloudAutomationStore.js +620 -0
  129. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/modePicker.d.ts +5 -4
  130. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/modePicker.js +21 -12
  131. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxAgentHost.contribution.js +2 -11
  132. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxAgentHostContribution.d.ts +46 -0
  133. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxAgentHostContribution.js +321 -0
  134. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxSessionsProvider.d.ts +104 -0
  135. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxSessionsProvider.js +345 -0
  136. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/entryDrivenProviderContribution.d.ts +14 -1
  137. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/entryDrivenProviderContribution.js +20 -3
  138. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/hostFilter.contribution.d.ts +7 -1
  139. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/hostFilter.contribution.js +8 -12
  140. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/hostFilterActionViewItem.d.ts +8 -4
  141. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/hostFilterActionViewItem.js +88 -84
  142. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/manageRemoteAgentHosts.js +74 -20
  143. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/managedReconnectAgentHostContribution.js +2 -2
  144. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/media/hostFilter.css +34 -19
  145. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/media/hostPickerSheet.css +35 -3
  146. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/missionControlAgentHostContribution.d.ts +37 -0
  147. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/missionControlAgentHostContribution.js +305 -0
  148. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/mobileHostFilterActionViewItem.d.ts +4 -1
  149. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/mobileHostFilterActionViewItem.js +75 -20
  150. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHost.contribution.d.ts +1 -80
  151. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHost.contribution.js +19 -548
  152. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHostActions.d.ts +4 -0
  153. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHostActions.js +218 -122
  154. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/tunnelAgentHost.contribution.d.ts +5 -4
  155. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/tunnelAgentHost.contribution.js +43 -8
  156. package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/wslAgentHost.contribution.js +1 -1
  157. package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/media/sessionWorktreeCleanupEditor.css +223 -0
  158. package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionStorageCleanupConfiguration.d.ts +2 -0
  159. package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionStorageCleanupConfiguration.js +16 -0
  160. package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupAccessibilityHelp.d.ts +15 -0
  161. package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupAccessibilityHelp.js +49 -0
  162. package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupEditor.d.ts +66 -0
  163. package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupEditor.js +458 -0
  164. package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupEditorInput.d.ts +13 -0
  165. package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupEditorInput.js +35 -0
  166. package/vscode/src/vs/sessions/contrib/sessions/browser/customizationMcpServerCount.d.ts +15 -0
  167. package/vscode/src/vs/sessions/contrib/sessions/browser/customizationMcpServerCount.js +37 -0
  168. package/vscode/src/vs/sessions/contrib/sessions/browser/mobile/mobileOverlayContribution.js +4 -4
  169. package/vscode/src/vs/sessions/services/agentHost/browser/agentHostCustomizationService.d.ts +1 -1
  170. package/vscode/src/vs/sessions/services/agentHost/browser/agentHostCustomizationService.js +5 -1
  171. package/vscode/src/vs/sessions/skills/create-draft-pr/SKILL.md +1 -1
  172. package/vscode/src/vs/sessions/skills/create-pr/SKILL.md +1 -1
  173. package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js +1 -0
  174. package/vscode/src/vs/workbench/api/browser/mainThreadChatSessions.js +2 -2
  175. package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js +2 -2
  176. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/agentsVoice.contribution.js +56 -31
  177. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/agentsVoiceSessionsPicker.js +2 -2
  178. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/agentsVoiceWidget.js +21 -21
  179. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/agentsVoiceWidgetBinding.js +3 -3
  180. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/confirmationComponent.js +3 -3
  181. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/feedbackDialog.js +6 -6
  182. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/headerComponent.js +14 -14
  183. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/onboardingComponent.js +11 -11
  184. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/sessionListComponent.js +9 -9
  185. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/statusRowsComponent.js +5 -5
  186. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/voiceBarComponent.js +2 -2
  187. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/transcriptsView/voiceTranscripts.contribution.js +13 -13
  188. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/transcriptsView/voiceTranscriptsView.js +7 -7
  189. package/vscode/src/vs/workbench/contrib/agentsVoice/browser/voiceModeOnboarding.js +30 -29
  190. package/vscode/src/vs/workbench/contrib/agentsVoice/common/voiceTranscriptStore.js +1 -1
  191. package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityService.d.ts +3 -1
  192. package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityService.js +44 -8
  193. package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatBackgroundShellOutputAccessibleView.d.ts +11 -0
  194. package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatBackgroundShellOutputAccessibleView.js +34 -0
  195. package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatResponseAccessibleView.d.ts +1 -1
  196. package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatResponseAccessibleView.js +85 -29
  197. package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatTerminalOutputAccessibleView.js +33 -1
  198. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityActions.js +8 -8
  199. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.d.ts +1 -1
  200. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.js +318 -103
  201. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAgentRecommendationActions.js +1 -1
  202. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.js +60 -28
  203. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.js +41 -16
  204. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatCopyActions.js +49 -10
  205. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.js +7 -7
  206. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatFileTreeActions.js +2 -2
  207. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatFindActions.js +7 -7
  208. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.js +5 -10
  209. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatLanguageModelActions.js +13 -13
  210. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.js +15 -21
  211. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatNewActions.js +16 -15
  212. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatOpenAgentDebugPanelAction.js +12 -12
  213. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatPromptNavigationActions.js +2 -2
  214. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQueueActions.js +24 -23
  215. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js +8 -8
  216. package/vscode/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.d.ts +5 -1
  217. package/vscode/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.js +44 -31
  218. package/vscode/src/vs/workbench/contrib/chat/browser/actions/createPluginAction.js +32 -32
  219. package/vscode/src/vs/workbench/contrib/chat/browser/actions/openAgentHostStateFileAction.js +6 -6
  220. package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginCommands.js +7 -7
  221. package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditor.d.ts +3 -1
  222. package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditor.js +22 -26
  223. package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditorInput.js +2 -2
  224. package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginRepositoryService.d.ts +9 -0
  225. package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginRepositoryService.js +180 -26
  226. package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginsView.d.ts +6 -2
  227. package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginsView.js +82 -69
  228. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentCustomizationItemProvider.d.ts +4 -1
  229. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentCustomizationItemProvider.js +32 -10
  230. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHost.contribution.js +12 -0
  231. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.d.ts +5 -1
  232. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.js +37 -12
  233. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostChatContribution.d.ts +6 -1
  234. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostChatContribution.js +53 -7
  235. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostChatInputState.d.ts +25 -0
  236. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostChatInputState.js +144 -0
  237. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCopilotCliSettingsContribution.d.ts +6 -1
  238. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCopilotCliSettingsContribution.js +88 -12
  239. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationMarketplaceInstallProvider.d.ts +51 -0
  240. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationMarketplaceInstallProvider.js +642 -0
  241. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostFirstResponseTelemetry.d.ts +118 -0
  242. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostFirstResponseTelemetry.js +35 -0
  243. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLanguageModelProvider.d.ts +9 -1
  244. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLanguageModelProvider.js +49 -7
  245. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLocalCustomizations.d.ts +21 -17
  246. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLocalCustomizations.js +38 -10
  247. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostMcpServerMigrationProvider.d.ts +50 -0
  248. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostMcpServerMigrationProvider.js +415 -0
  249. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostMcpServerSupport.d.ts +12 -2
  250. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostMcpServerSupport.js +124 -31
  251. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostMcpServerSupportScope.d.ts +7 -2
  252. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostMcpServerSupportScope.js +116 -5
  253. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostModeSynchronizer.d.ts +3 -1
  254. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostModeSynchronizer.js +6 -6
  255. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostPermissionUiContribution.js +5 -5
  256. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostPromptCacheNotification.js +4 -4
  257. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostRemoteByokNotification.d.ts +23 -0
  258. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostRemoteByokNotification.js +134 -0
  259. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostResponseFileChanges.d.ts +14 -36
  260. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostResponseFileChanges.js +286 -126
  261. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostRootConfigForwarder.d.ts +1 -1
  262. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostRootConfigForwarder.js +3 -2
  263. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSandboxNotification.d.ts +17 -0
  264. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSandboxNotification.js +94 -0
  265. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSandboxNotifications.d.ts +14 -0
  266. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSandboxNotifications.js +63 -0
  267. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.d.ts +52 -88
  268. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.js +1030 -349
  269. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionInputPills.d.ts +20 -4
  270. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionInputPills.js +722 -114
  271. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListContribution.js +1 -1
  272. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListController.d.ts +3 -2
  273. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListController.js +88 -9
  274. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListStore.d.ts +16 -1
  275. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListStore.js +87 -10
  276. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionWorkingDirectorySynchronizer.js +1 -1
  277. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSettings.contribution.js +2 -2
  278. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSettingsFileSystemProvider.js +4 -4
  279. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSignedOutModelsNotification.js +4 -4
  280. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostTerminalContribution.js +4 -3
  281. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostToolUtils.js +2 -1
  282. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.d.ts +12 -4
  283. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.js +191 -60
  284. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentSessionSettings.contribution.js +4 -3
  285. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentSessionSettingsFileSystemProvider.js +6 -6
  286. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/applyAgentHostSessionConfig.d.ts +4 -0
  287. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/applyAgentHostSessionConfig.js +27 -17
  288. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/applyAgentHostSubmitConfig.d.ts +2 -0
  289. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/applyAgentHostSubmitConfig.js +2 -2
  290. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/codexContinuation.contribution.d.ts +1 -0
  291. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/codexContinuation.contribution.js +127 -0
  292. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/codexContinuationGuide.d.ts +44 -0
  293. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/codexContinuationGuide.js +415 -0
  294. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/codexContinuationPresenter.d.ts +25 -0
  295. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/codexContinuationPresenter.js +160 -0
  296. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/copilotConfigSlashSubmitHandler.d.ts +3 -1
  297. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/copilotConfigSlashSubmitHandler.js +5 -1
  298. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/openSessionLinkOpener.contribution.d.ts +7 -2
  299. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/openSessionLinkOpener.contribution.js +122 -34
  300. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/syncedCustomizationBundler.d.ts +22 -4
  301. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/syncedCustomizationBundler.js +74 -39
  302. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.contribution.js +1 -1
  303. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.d.ts +4 -0
  304. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.js +89 -68
  305. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsPicker.js +3 -3
  306. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjection.js +1 -1
  307. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionActions.js +4 -4
  308. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionService.js +1 -1
  309. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionsExperiments.contribution.js +4 -4
  310. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.js +25 -25
  311. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/unifiedQuickAccess.js +17 -17
  312. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/unifiedQuickAccessActions.js +4 -4
  313. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsController.d.ts +4 -2
  314. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsController.js +50 -22
  315. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/repositoryPicker.d.ts +21 -0
  316. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/repositoryPicker.js +122 -0
  317. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessionsConfiguration.d.ts +81 -1
  318. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessionsConfiguration.js +213 -13
  319. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.contribution.js +136 -100
  320. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationUrlHandler.d.ts +16 -0
  321. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationUrlHandler.js +76 -0
  322. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationWorkspaceService.d.ts +1 -1
  323. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationWorkspaceService.js +2 -2
  324. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/copilotConnectorsService.d.ts +139 -0
  325. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/copilotConnectorsService.js +944 -0
  326. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplace.contribution.d.ts +1 -0
  327. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplace.contribution.js +119 -0
  328. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplaceInstallService.d.ts +110 -0
  329. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplaceInstallService.js +1485 -0
  330. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplaceInstallationAssociation.d.ts +38 -0
  331. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplaceInstallationAssociation.js +48 -0
  332. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplaceWorkbenchService.d.ts +50 -0
  333. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplaceWorkbenchService.js +213 -0
  334. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMigrationAccessibility.js +19 -12
  335. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMigrationServiceImpl.d.ts +6 -22
  336. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMigrationServiceImpl.js +87 -263
  337. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationsTelemetryService.d.ts +25 -0
  338. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationsTelemetryService.js +217 -0
  339. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/githubMcpRegistryIcons.d.ts +4 -0
  340. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/githubMcpRegistryIcons.js +605 -0
  341. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/mcpServerCustomizationMigration.d.ts +11 -4
  342. package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/mcpServerCustomizationMigration.js +377 -184
  343. package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.js +1 -1
  344. package/vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.js +2 -0
  345. package/vscode/src/vs/workbench/contrib/chat/browser/chat.shared.contribution.js +753 -617
  346. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/agentHostChatDebugProvider.d.ts +1 -1
  347. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/agentHostChatDebugProvider.js +118 -40
  348. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatCustomizationDiscoveryRenderer.js +32 -32
  349. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugCacheExplorerView.js +124 -124
  350. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugCacheInsights.js +72 -72
  351. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugDetailPanel.js +6 -6
  352. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditorInput.js +2 -2
  353. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEnablement.js +3 -3
  354. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventDetailRenderer.js +20 -20
  355. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventList.js +7 -7
  356. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFilters.js +4 -4
  357. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFlowChartView.js +7 -7
  358. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFlowGraph.js +22 -22
  359. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugHomeView.js +12 -12
  360. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugHookContentRenderer.js +17 -17
  361. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugLogsView.js +24 -24
  362. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugMessageContentRenderer.js +8 -8
  363. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugModelTurnContentRenderer.js +23 -23
  364. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugOverviewView.js +35 -35
  365. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugToolCallContentRenderer.js +11 -11
  366. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugWireLogView.d.ts +4 -2
  367. package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugWireLogView.js +47 -42
  368. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCheckpointTimelineImpl.js +29 -6
  369. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.js +1 -1
  370. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingDeletedFileEntry.d.ts +2 -1
  371. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingDeletedFileEntry.js +6 -3
  372. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.js +14 -14
  373. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.js +7 -7
  374. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.js +3 -3
  375. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationWidget.js +12 -12
  376. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.d.ts +4 -3
  377. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js +10 -7
  378. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.d.ts +5 -3
  379. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.js +11 -5
  380. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.d.ts +4 -3
  381. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.js +10 -7
  382. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.js +10 -10
  383. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.js +24 -11
  384. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelChangeService.d.ts +2 -2
  385. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelChangeService.js +16 -20
  386. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.d.ts +2 -2
  387. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.js +2 -2
  388. package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.js +1 -1
  389. package/vscode/src/vs/workbench/contrib/chat/browser/chatGoalSummaryService.js +1 -1
  390. package/vscode/src/vs/workbench/contrib/chat/browser/chatImageCarouselService.d.ts +12 -4
  391. package/vscode/src/vs/workbench/contrib/chat/browser/chatImageCarouselService.js +52 -61
  392. package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagement.contribution.js +17 -11
  393. package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.d.ts +2 -0
  394. package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.js +3 -0
  395. package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditorInput.js +2 -2
  396. package/vscode/src/vs/workbench/contrib/chat/browser/chatNetworkConfiguration.d.ts +4 -0
  397. package/vscode/src/vs/workbench/contrib/chat/browser/chatNetworkConfiguration.js +136 -0
  398. package/vscode/src/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.js +4 -4
  399. package/vscode/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.js +52 -30
  400. package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievements.contribution.js +71 -17
  401. package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievementsEditor.d.ts +12 -5
  402. package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievementsEditor.js +104 -16
  403. package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievementsEditorInput.d.ts +5 -1
  404. package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievementsEditorInput.js +1 -1
  405. package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievementsWidget.d.ts +3 -1
  406. package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievementsWidget.js +84 -64
  407. package/vscode/src/vs/workbench/contrib/chat/browser/chatPetColorsWidget.d.ts +29 -0
  408. package/vscode/src/vs/workbench/contrib/chat/browser/chatPetColorsWidget.js +221 -0
  409. package/vscode/src/vs/workbench/contrib/chat/browser/chatProgressConfiguration.d.ts +27 -0
  410. package/vscode/src/vs/workbench/contrib/chat/browser/chatProgressConfiguration.js +72 -0
  411. package/vscode/src/vs/workbench/contrib/chat/browser/chatPromoNotification.d.ts +4 -0
  412. package/vscode/src/vs/workbench/contrib/chat/browser/chatPromoNotification.js +4 -2
  413. package/vscode/src/vs/workbench/contrib/chat/browser/chatQuotaNotification.js +25 -25
  414. package/vscode/src/vs/workbench/contrib/chat/browser/chatRepoInfo.js +2 -2
  415. package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionDescription.js +2 -2
  416. package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.d.ts +1 -0
  417. package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.js +52 -32
  418. package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupController.d.ts +3 -1
  419. package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupController.js +65 -57
  420. package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupGrowthSession.js +6 -6
  421. package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupMicrosoftProbe.d.ts +82 -0
  422. package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupMicrosoftProbe.js +213 -0
  423. package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.js +29 -27
  424. package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupRunner.d.ts +5 -12
  425. package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupRunner.js +93 -45
  426. package/vscode/src/vs/workbench/contrib/chat/browser/chatSlashCommands.d.ts +2 -1
  427. package/vscode/src/vs/workbench/contrib/chat/browser/chatSlashCommands.js +54 -55
  428. package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusEntry.d.ts +5 -1
  429. package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusEntry.js +51 -15
  430. package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusPromo.d.ts +43 -0
  431. package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusPromo.js +230 -0
  432. package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/codexStatusEntry.d.ts +20 -0
  433. package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/codexStatusEntry.js +101 -0
  434. package/vscode/src/vs/workbench/contrib/chat/browser/chatTipCatalog.js +30 -19
  435. package/vscode/src/vs/workbench/contrib/chat/browser/chatTipService.js +4 -2
  436. package/vscode/src/vs/workbench/contrib/chat/browser/chatTipStorageKeys.d.ts +2 -0
  437. package/vscode/src/vs/workbench/contrib/chat/browser/chatTipStorageKeys.js +1 -0
  438. package/vscode/src/vs/workbench/contrib/chat/browser/chatUserInteractionOTel.d.ts +27 -0
  439. package/vscode/src/vs/workbench/contrib/chat/browser/chatUserInteractionOTel.js +88 -0
  440. package/vscode/src/vs/workbench/contrib/chat/browser/chatWindowNotifier.js +7 -7
  441. package/vscode/src/vs/workbench/contrib/chat/browser/claudePluginRecommendations.js +2 -2
  442. package/vscode/src/vs/workbench/contrib/chat/browser/contextContrib/chatContext.contribution.js +5 -5
  443. package/vscode/src/vs/workbench/contrib/chat/browser/defaultModelContribution.js +5 -5
  444. package/vscode/src/vs/workbench/contrib/chat/browser/editorChatUsage.contribution.d.ts +34 -0
  445. package/vscode/src/vs/workbench/contrib/chat/browser/editorChatUsage.contribution.js +121 -0
  446. package/vscode/src/vs/workbench/contrib/chat/browser/enablementStatusWidget.js +2 -2
  447. package/vscode/src/vs/workbench/contrib/chat/browser/feedbackSurvey/chatHarnessSwitchFeedbackSurveyService.d.ts +34 -0
  448. package/vscode/src/vs/workbench/contrib/chat/browser/feedbackSurvey/chatHarnessSwitchFeedbackSurveyService.js +192 -0
  449. package/vscode/src/vs/workbench/contrib/chat/browser/feedbackSurvey/chatModelFeedbackSurveyPromptContribution.js +11 -24
  450. package/vscode/src/vs/workbench/contrib/chat/browser/languageModelsConfigurationService.js +3 -3
  451. package/vscode/src/vs/workbench/contrib/chat/browser/media/chatPetAchievements.css +232 -1
  452. package/vscode/src/vs/workbench/contrib/chat/browser/onboarding/modelPickerTryout.contribution.d.ts +3 -0
  453. package/vscode/src/vs/workbench/contrib/chat/browser/onboarding/modelPickerTryout.contribution.js +85 -0
  454. package/vscode/src/vs/workbench/contrib/chat/browser/planReviewFeedback/planReviewFeedbackEditorOverlay.js +6 -6
  455. package/vscode/src/vs/workbench/contrib/chat/browser/pluginGitCommandService.d.ts +0 -7
  456. package/vscode/src/vs/workbench/contrib/chat/browser/pluginGitCommandService.js +11 -28
  457. package/vscode/src/vs/workbench/contrib/chat/browser/pluginGitHubAuthentication.d.ts +6 -0
  458. package/vscode/src/vs/workbench/contrib/chat/browser/pluginGitHubAuthentication.js +18 -0
  459. package/vscode/src/vs/workbench/contrib/chat/browser/pluginInstallService.d.ts +13 -6
  460. package/vscode/src/vs/workbench/contrib/chat/browser/pluginInstallService.js +250 -92
  461. package/vscode/src/vs/workbench/contrib/chat/browser/pluginSources.d.ts +2 -1
  462. package/vscode/src/vs/workbench/contrib/chat/browser/pluginSources.js +39 -47
  463. package/vscode/src/vs/workbench/contrib/chat/browser/pluginUrlHandler.js +6 -6
  464. package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/chatModeActions.js +2 -2
  465. package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptCodingAgentActionOverlay.js +2 -2
  466. package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptToolSetsCodeLensProvider.js +2 -2
  467. package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptToolsCodeLensProvider.js +2 -2
  468. package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptUrlHandler.js +8 -8
  469. package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/runPromptAction.js +7 -7
  470. package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/saveAsPromptFileActions.js +3 -3
  471. package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/skillActions.js +3 -3
  472. package/vscode/src/vs/workbench/contrib/chat/browser/promptTimeline/promptTimeline.contribution.js +5 -5
  473. package/vscode/src/vs/workbench/contrib/chat/browser/promptTimeline/promptTimelineCard.js +4 -4
  474. package/vscode/src/vs/workbench/contrib/chat/browser/promptTimeline/promptTimelineGutterRail.js +4 -4
  475. package/vscode/src/vs/workbench/contrib/chat/browser/promptTimeline/promptTimelineModel.js +3 -3
  476. package/vscode/src/vs/workbench/contrib/chat/browser/promptTimeline/promptTimelineRulerRail.js +1 -1
  477. package/vscode/src/vs/workbench/contrib/chat/browser/promptTimeline/promptTimelineStickyHeader.js +3 -3
  478. package/vscode/src/vs/workbench/contrib/chat/browser/promptsDebugContribution.js +20 -20
  479. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxAgentHostService.d.ts +40 -0
  480. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxAgentHostService.js +561 -0
  481. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxApiService.d.ts +133 -0
  482. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxApiService.js +1176 -0
  483. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxConnectionCustomization.d.ts +17 -0
  484. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxConnectionCustomization.js +76 -0
  485. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxCredentialRefresh.d.ts +54 -0
  486. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxCredentialRefresh.js +220 -0
  487. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxHistoryCache.d.ts +21 -0
  488. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxHistoryCache.js +184 -0
  489. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxLegacySessionPreparation.d.ts +8 -0
  490. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxLegacySessionPreparation.js +165 -0
  491. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxModels.d.ts +43 -0
  492. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxModels.js +162 -0
  493. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxReadOnlySessionHandler.d.ts +40 -0
  494. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxReadOnlySessionHandler.js +129 -0
  495. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxSessionContribution.d.ts +166 -0
  496. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxSessionContribution.js +838 -0
  497. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxSessionHandler.d.ts +40 -0
  498. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxSessionHandler.js +604 -0
  499. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxSessionListController.d.ts +45 -0
  500. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxSessionListController.js +251 -0
  501. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxTelemetry.d.ts +289 -0
  502. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxTelemetry.js +497 -0
  503. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/editorCloudSandboxContribution.d.ts +46 -0
  504. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/editorCloudSandboxContribution.js +277 -0
  505. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlCredentialSealing.d.ts +6 -0
  506. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlCredentialSealing.js +41 -0
  507. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlEnvironmentActions.d.ts +1 -0
  508. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlEnvironmentActions.js +178 -0
  509. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlEnvironmentService.d.ts +73 -0
  510. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlEnvironmentService.js +398 -0
  511. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlSharingService.d.ts +45 -0
  512. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlSharingService.js +296 -0
  513. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHost.contribution.d.ts +1 -0
  514. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHost.contribution.js +96 -0
  515. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHostAuthentication.d.ts +8 -0
  516. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHostAuthentication.js +15 -0
  517. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHostChatContribution.d.ts +75 -0
  518. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHostChatContribution.js +559 -0
  519. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHostConnectionCustomization.d.ts +43 -0
  520. package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHostConnectionCustomization.js +26 -0
  521. package/vscode/src/vs/{sessions/contrib/providers/remoteAgentHost/browser → workbench/contrib/chat/browser/remoteAgentHost}/remoteAgentHostCustomizationHarness.d.ts +1 -1
  522. package/vscode/src/vs/{sessions/contrib/providers/remoteAgentHost/browser → workbench/contrib/chat/browser/remoteAgentHost}/remoteAgentHostCustomizationHarness.js +8 -8
  523. package/vscode/src/vs/workbench/contrib/chat/browser/tools/clientToolSetsContribution.js +26 -10
  524. package/vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsConfirmationService.js +39 -39
  525. package/vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.js +45 -31
  526. package/vscode/src/vs/workbench/contrib/chat/browser/tools/renameTool.js +8 -8
  527. package/vscode/src/vs/workbench/contrib/chat/browser/tools/toolHelpers.d.ts +1 -1
  528. package/vscode/src/vs/workbench/contrib/chat/browser/tools/usagesTool.js +7 -7
  529. package/vscode/src/vs/workbench/contrib/chat/browser/utilityModelContribution.js +2 -2
  530. package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatUpdateRequiredView.d.ts +22 -0
  531. package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatUpdateRequiredView.js +110 -0
  532. package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcomeHandler.js +5 -5
  533. package/vscode/src/vs/workbench/contrib/chat/browser/voiceInputMode/voiceInputMode.js +1 -1
  534. package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatFind/chatFindAccessibilityHelp.js +15 -15
  535. package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatWidgetService.js +39 -35
  536. package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatQueuePickerActionItem.js +11 -11
  537. package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/agentHostInputCompletions.d.ts +5 -1
  538. package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/agentHostInputCompletions.js +68 -16
  539. package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCommandArgumentHint.js +1 -1
  540. package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.d.ts +16 -1
  541. package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.js +23 -18
  542. package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorContrib.js +1 -1
  543. package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorHover.js +7 -5
  544. package/vscode/src/vs/workbench/contrib/chat/browser/widget/media/chatPet/all_/_.png.js +4 -0
  545. package/vscode/src/vs/workbench/contrib/chat/browser/widget/media/chatPet/buddy-painting-insiders-96.png +0 -0
  546. package/vscode/src/vs/workbench/contrib/chat/browser/widget/media/chatPet/buddy-painting-insiders-96.spritesheet.png +0 -0
  547. package/vscode/src/vs/workbench/contrib/chat/browser/widget/media/chatPet/buddy-painting-stable-96.png +0 -0
  548. package/vscode/src/vs/workbench/contrib/chat/browser/widget/media/chatPet/buddy-painting-stable-96.spritesheet.png +0 -0
  549. package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/chatQuick.js +1 -1
  550. package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor.js +15 -18
  551. package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.d.ts +17 -1
  552. package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.js +122 -21
  553. package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.d.ts +7 -1
  554. package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.js +46 -11
  555. package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css +16 -0
  556. package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewTitleControl.css +18 -3
  557. package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.d.ts +24 -7
  558. package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.js +406 -193
  559. package/vscode/src/vs/workbench/contrib/chat/common/customizationMarketplaceInstallService.d.ts +58 -0
  560. package/vscode/src/vs/workbench/contrib/chat/common/customizationMarketplaceInstallService.js +60 -0
  561. package/vscode/src/vs/workbench/contrib/chat/common/model/chatModelStore.d.ts +6 -0
  562. package/vscode/src/vs/workbench/contrib/chat/common/model/chatSessionOperationLog.js +5 -1
  563. package/vscode/src/vs/workbench/contrib/chat/common/model/chatSessionStore.js +6 -6
  564. package/vscode/src/vs/workbench/contrib/chat/common/onboarding/modelPickerTryout.d.ts +4 -0
  565. package/vscode/src/vs/workbench/contrib/chat/common/onboarding/modelPickerTryout.js +8 -0
  566. package/vscode/src/vs/workbench/contrib/chat/common/onboarding/newSessionPickerTryout.d.ts +3 -0
  567. package/vscode/src/vs/workbench/contrib/chat/common/onboarding/newSessionPickerTryout.js +8 -0
  568. package/vscode/src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.d.ts +17 -22
  569. package/vscode/src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.js +455 -237
  570. package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/chatPromptFilesContribution.js +18 -18
  571. package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.d.ts +4 -2
  572. package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.js +25 -17
  573. package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptCodeActions.js +12 -12
  574. package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHeaderAutocompletion.js +5 -5
  575. package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHovers.js +11 -14
  576. package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptLinkProvider.d.ts +1 -1
  577. package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptLinkProvider.js +2 -1
  578. package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.d.ts +1 -1
  579. package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.js +156 -155
  580. package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/customizationMigrationTelemetryService.d.ts +43 -0
  581. package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/customizationMigrationTelemetryService.js +225 -0
  582. package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/manageTodoListTool.js +10 -10
  583. package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/reviewPlanTool.js +7 -7
  584. package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/runSubagentTool.d.ts +6 -0
  585. package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/runSubagentTool.js +65 -9
  586. package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/setArtifactRulesTool.js +3 -3
  587. package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/setArtifactsTool.js +4 -4
  588. package/vscode/src/vs/workbench/contrib/chat/common/tools/chatArtifactsService.d.ts +4 -0
  589. package/vscode/src/vs/workbench/contrib/chat/common/tools/chatArtifactsService.js +11 -3
  590. package/vscode/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.js +22 -22
  591. package/vscode/src/vs/workbench/contrib/chat/common/voiceChatService.js +1 -1
  592. package/vscode/src/vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.d.ts +4 -3
  593. package/vscode/src/vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.js +46 -24
  594. package/vscode/src/vs/workbench/contrib/github/browser/githubCommitResolver.d.ts +15 -0
  595. package/vscode/src/vs/workbench/contrib/github/browser/githubCommitResolver.js +92 -0
  596. package/vscode/src/vs/workbench/contrib/imageCarousel/browser/imageCarousel.contribution.js +10 -10
  597. package/vscode/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditor.d.ts +1 -0
  598. package/vscode/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditor.js +22 -15
  599. package/vscode/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditorInput.js +1 -1
  600. package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js +15 -15
  601. package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatDefaultModel.js +2 -2
  602. package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatEditReviewSession.js +1 -1
  603. package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionResolver.js +1 -1
  604. package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js +4 -4
  605. package/vscode/src/vs/workbench/contrib/mcp/browser/mcpPromptArgumentPick.js +14 -14
  606. package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils.js +1 -1
  607. package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.js +10 -10
  608. package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.js +5 -5
  609. package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js +1 -1
  610. package/vscode/src/vs/workbench/contrib/onboarding/browser/onboarding.d.ts +4 -0
  611. package/vscode/src/vs/workbench/contrib/onboarding/browser/spotlight/spotlightStep.d.ts +10 -0
  612. package/vscode/src/vs/workbench/contrib/remoteCodingAgents/browser/remoteCodingAgents.contribution.js +7 -7
  613. package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.js +10 -10
  614. package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibilityHelp.js +16 -16
  615. package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.js +20 -20
  616. package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatSessionResolver.js +1 -1
  617. package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.js +1 -1
  618. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/agentHostSandboxForwarder.d.ts +0 -1
  619. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/agentHostSandboxForwarder.js +3 -25
  620. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.js +6 -6
  621. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.js +4 -5
  622. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/autoApprove/npmScriptAutoApprover.js +1 -1
  623. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAutoApproveAnalyzer.js +12 -12
  624. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineFileWriteAnalyzer.js +2 -2
  625. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineSandboxRewriter.js +1 -1
  626. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalLastCommandTool.js +3 -3
  627. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalOutputTool.js +3 -3
  628. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalSelectionTool.js +3 -3
  629. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/killTerminalTool.js +3 -3
  630. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.js +4 -4
  631. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.js +4 -4
  632. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.d.ts +0 -1
  633. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.js +79 -82
  634. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/sandboxOutputAnalyzer.js +3 -3
  635. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/sendToTerminalTool.js +10 -10
  636. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.d.ts +9 -1
  637. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.js +103 -26
  638. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/getTaskOutputTool.js +7 -7
  639. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/runTaskTool.js +14 -14
  640. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/taskHelpers.js +1 -1
  641. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/treeSitterCommandParser.d.ts +1 -1
  642. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/sandboxSettingsReader.d.ts +2 -2
  643. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/sandboxSettingsReader.js +8 -4
  644. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.d.ts +1 -5
  645. package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.js +16 -60
  646. package/vscode/src/vs/workbench/services/agentEditorComments/browser/agentEditorCommentsOverlayWidget.js +3 -3
  647. package/vscode/src/vs/workbench/services/agentHost/browser/agentSdkSetupService.d.ts +1 -1
  648. package/vscode/src/vs/workbench/services/agentHost/browser/agentSdkSetupService.js +1 -1
  649. package/vscode/src/vs/workbench/services/agentHost/browser/codexContinuation.d.ts +31 -0
  650. package/vscode/src/vs/workbench/services/agentHost/browser/codexContinuation.js +86 -0
  651. package/vscode/src/vs/workbench/services/agentHost/browser/codexContinuationService.d.ts +76 -0
  652. package/vscode/src/vs/workbench/services/agentHost/browser/codexContinuationService.js +409 -0
  653. package/vscode/src/vs/workbench/services/agentHost/browser/editorRemoteAgentHostServiceClient.d.ts +14 -2
  654. package/vscode/src/vs/workbench/services/agentHost/browser/editorRemoteAgentHostServiceClient.js +56 -7
  655. package/vscode/src/vs/platform/agentHost/common/agentHostFileSystemService.d.ts +0 -8
  656. package/vscode/src/vs/platform/agentHost/common/agentHostFileSystemService.js +0 -19
  657. package/vscode/src/vs/platform/agentHost/common/agentModelByokMeta.d.ts +0 -24
  658. package/vscode/src/vs/platform/agentHost/common/agentModelByokMeta.js +0 -13
  659. package/vscode/src/vs/platform/agentHost/common/agentModelPricing.js +0 -53
  660. package/vscode/src/vs/platform/agentHost/common/agentSdkSetup.d.ts +0 -53
  661. package/vscode/src/vs/platform/agentHost/common/agentSdkSetup.js +0 -45
  662. package/vscode/src/vs/platform/sandbox/common/terminalSandboxService.d.ts +0 -108
  663. package/vscode/src/vs/platform/sandbox/common/terminalSandboxService.js +0 -15
  664. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/branchPicker.d.ts +0 -31
  665. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/branchPicker.js +0 -150
  666. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/mobilePermissionPicker.contribution.js +0 -37
  667. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/sandboxPicker.d.ts +0 -26
  668. package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/sandboxPicker.js +0 -86
  669. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatPluginActions.d.ts +0 -8
  670. package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatPluginActions.js +0 -241
  671. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostAuth.d.ts +0 -142
  672. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostAuth.js +0 -746
  673. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.d.ts +0 -164
  674. package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.js +0 -485
  675. package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSubagentOpenChat.d.ts +0 -137
  676. package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSubagentOpenChat.js +0 -714
  677. package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatSubagentOpenChat.css +0 -379
  678. package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceTelemetry.d.ts +0 -219
  679. package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceTelemetry.js +0 -222
  680. package/vscode/src/vs/workbench/services/agentHost/common/agentHostFileSystemService.d.ts +0 -16
  681. package/vscode/src/vs/workbench/services/agentHost/common/agentHostFileSystemService.js +0 -39
  682. /package/vscode/src/vs/platform/agentHost/common/meta/{agentChatSurfaceMeta.d.ts → vscode/agentChatSurfaceMeta.d.ts} +0 -0
  683. /package/vscode/src/vs/platform/agentHost/common/meta/{agentChatSurfaceMeta.js → vscode/agentChatSurfaceMeta.js} +0 -0
  684. /package/vscode/src/vs/platform/agentHost/common/meta/{agentCustomizationMeta.d.ts → vscode/agentCustomizationMeta.d.ts} +0 -0
  685. /package/vscode/src/vs/platform/agentHost/common/meta/{agentEphemeralSessionMeta.d.ts → vscode/agentEphemeralSessionMeta.d.ts} +0 -0
  686. /package/vscode/src/vs/platform/agentHost/common/meta/{agentEphemeralSessionMeta.js → vscode/agentEphemeralSessionMeta.js} +0 -0
  687. /package/vscode/src/vs/platform/agentHost/common/{agentModelPricing.d.ts → meta/vscode/agentModelPricing.d.ts} +0 -0
  688. /package/vscode/src/vs/sessions/contrib/providers/{copilotChatSessions/browser/mobilePermissionPicker.contribution.d.ts → agentHost/browser/mobile/mobileChatPhoneInputPresenter.d.ts} +0 -0
  689. /package/vscode/src/vs/{sessions/contrib/providers/remoteAgentHost/browser → workbench/contrib/chat/browser/remoteAgentHost}/remoteAgentHostLogForwarder.d.ts +0 -0
  690. /package/vscode/src/vs/{sessions/contrib/providers/remoteAgentHost/browser → workbench/contrib/chat/browser/remoteAgentHost}/remoteAgentHostLogForwarder.js +0 -0
@@ -1,29 +1,41 @@
1
1
 
2
2
  import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
3
+ import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
4
+ import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
3
5
  import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
4
6
  import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
5
7
  import { applyEdits, setProperty } from '@codingame/monaco-vscode-api/vscode/vs/base/common/jsonEdit';
6
8
  import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
9
+ import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
7
10
  import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
8
11
  import { isEqual, getComparisonKey, dirname, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
9
12
  import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
10
13
  import { normalizeMcpServerConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentPlugins/common/pluginParsers';
14
+ import { hasConfigurationVariable, parseConfigurationVariable } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationVariables';
11
15
  import { toFileOperationResult, FileOperationResult, FileOperationError } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
16
+ import { MAX_ENV_VAR_RESOLVE_LENGTH } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/envVarResolution';
17
+ import { toCopilotMcpServerConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpCopilotConfiguration';
18
+ import { parseCopilotGlobalMcpConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpCopilotGlobalConfiguration';
12
19
  import { McpServerType } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpPlatformTypes';
13
20
  import { ConfigurationResolverExpression } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolverExpression';
14
- import { McpServerCustomizationMigrationFailureReason, CustomizationMigrationType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/customizationMigrationService';
15
- import { AgentHostMcpServerApplicability, AgentHostMcpServerDelivery, AgentHostMcpServerSourceKind } from '../agentSessions/agentHost/agentHostMcpServerSupport.js';
21
+ import { McpServerCustomizationMigrationFailureReason, CustomizationMigrationType, mcpServerCustomizationMigrationRemovableProperties } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/customizationMigrationService';
22
+ import { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
23
+ import { AgentHostMcpServerApplicability, AgentHostMcpServerDelivery, AgentHostMcpServerSourceKind, AgentHostMcpSupportReason } from '../agentSessions/agentHost/agentHostMcpServerSupport.js';
16
24
 
17
25
  const LOG_PREFIX = "[MCP Customization Migration]";
18
26
  function isMcpServerMigrationDeliverable(server) {
19
- return server.enablement.enabled && server.applicability === AgentHostMcpServerApplicability.Applicable && server.delivery === AgentHostMcpServerDelivery.ClientForwarded && server.compatibility.kind === "supported" && server.projectedConfiguration !== undefined;
27
+ return server.applicability === AgentHostMcpServerApplicability.Applicable && (server.delivery === AgentHostMcpServerDelivery.ClientForwarded || (server.delivery === AgentHostMcpServerDelivery.NotDelivered && server.shadowedBy !== undefined && server.source.kind === AgentHostMcpServerSourceKind.VscodeWorkspaceFolder)) && (server.compatibility.kind === "supported" || server.compatibility.kind === "partiallySupported" || (server.compatibility.kind === "unsupported" && (server.source.kind === AgentHostMcpServerSourceKind.UserProfile || server.source.kind === AgentHostMcpServerSourceKind.RemoteUser) && server.compatibility.reasons.every(reason => reason === AgentHostMcpSupportReason.UnresolvedConfiguration))) && server.projectedConfiguration !== undefined;
20
28
  }
21
29
  class McpServerCustomizationMigrator {
22
- constructor(fileService, logService) {
30
+ constructor(fileService, logService, configurationResolverService) {
23
31
  this.fileService = fileService;
24
32
  this.logService = logService;
33
+ this.configurationResolverService = configurationResolverService;
25
34
  }
26
- async createPlan(snapshot, roots) {
35
+ async createPlan(snapshot, roots, token = CancellationToken.None, userTarget) {
36
+ if (token.isCancellationRequested) {
37
+ throw ( new CancellationError());
38
+ }
27
39
  const candidates = [];
28
40
  const exclusions = [];
29
41
  const sourceServers = ( new ResourceMap());
@@ -32,16 +44,19 @@ class McpServerCustomizationMigrator {
32
44
  );
33
45
  for (const server of snapshot.servers) {
34
46
  const sourceUri = server.source.collectionUri;
35
- const root = sourceUri ? roots.find(
47
+ const isUser = server.source.kind === AgentHostMcpServerSourceKind.UserProfile || server.source.kind === AgentHostMcpServerSourceKind.RemoteUser;
48
+ const root = !isUser && sourceUri ? roots.find(
36
49
  candidate => isEqual(sourceUri, URI.joinPath(candidate, ".vscode", "mcp.json"))
37
50
  ) : undefined;
38
- if (server.source.kind !== AgentHostMcpServerSourceKind.VscodeWorkspaceFolder || !sourceUri || !root) {
51
+ const targetUri = isUser ? userTarget && server.source.remoteAuthority === (userTarget.scheme === Schemas.vscodeRemote ? userTarget.authority : null) ? userTarget : undefined : server.source.kind === AgentHostMcpServerSourceKind.VscodeWorkspaceFolder && root ? URI.joinPath(root, ".mcp.json") : undefined;
52
+ if (!sourceUri || !targetUri || (isUser && !isUserSourceTargetPair(sourceUri, targetUri))) {
39
53
  continue;
40
54
  }
41
- const targetUri = URI.joinPath(root, ".mcp.json");
55
+ const storage = isUser ? PromptsStorage.user : PromptsStorage.local;
42
56
  const excluded = (reason, error) => {
43
57
  this.logService.trace(`${LOG_PREFIX} Excluded '${server.name}' from ${( sourceUri.toString())}: reason=${reason}`);
44
58
  exclusions.push({
59
+ storage,
45
60
  id: server.id,
46
61
  name: server.name,
47
62
  sourceUri,
@@ -56,13 +71,16 @@ class McpServerCustomizationMigrator {
56
71
  }
57
72
  let sourceServersPromise = sourceServers.get(sourceUri);
58
73
  if (!sourceServersPromise) {
59
- sourceServersPromise = this.readMcpServers(sourceUri);
74
+ sourceServersPromise = this.readMcpServers(sourceUri, token);
60
75
  sourceServers.set(sourceUri, sourceServersPromise);
61
76
  }
62
77
  let servers;
63
78
  try {
64
79
  servers = await sourceServersPromise;
65
80
  } catch (error) {
81
+ if (token.isCancellationRequested) {
82
+ throw ( new CancellationError());
83
+ }
66
84
  const migrationError = error instanceof McpServerMigrationError ? error : undefined;
67
85
  excluded(
68
86
  migrationError?.reason ?? McpServerCustomizationMigrationFailureReason.SourceUnavailable,
@@ -70,6 +88,9 @@ class McpServerCustomizationMigrator {
70
88
  );
71
89
  continue;
72
90
  }
91
+ if (token.isCancellationRequested) {
92
+ throw ( new CancellationError());
93
+ }
73
94
  if (!servers) {
74
95
  excluded(McpServerCustomizationMigrationFailureReason.SourceUnavailable);
75
96
  continue;
@@ -79,27 +100,36 @@ class McpServerCustomizationMigrator {
79
100
  continue;
80
101
  }
81
102
  const rawConfiguration = servers[server.name];
82
- const sourceConfiguration = canonicalizeSourceConfiguration(rawConfiguration);
83
- const projectedConfiguration = canonicalizeConfiguration(server.projectedConfiguration);
84
- if (!sourceConfiguration) {
85
- excluded(
86
- normalizeMcpServerConfiguration(rawConfiguration) ? McpServerCustomizationMigrationFailureReason.UnrepresentableConfiguration : McpServerCustomizationMigrationFailureReason.InvalidSource
87
- );
103
+ const analysis = await analyzeSourceConfiguration(rawConfiguration, root, storage, this.configurationResolverService);
104
+ if (typeof analysis === "string") {
105
+ excluded(analysis);
88
106
  continue;
89
107
  }
90
- if (!isConfigurationRepresentable(server.projectedConfiguration) || !Iterable.isEmpty(
91
- ConfigurationResolverExpression.parse(server.projectedConfiguration).unresolved()
92
- ) || !equals(sourceConfiguration, projectedConfiguration)) {
108
+ if (!isConfigurationRepresentable(server.projectedConfiguration) || !isConfigurationRepresentable(analysis.migration) || ( Iterable.some(
109
+ ConfigurationResolverExpression.parse(server.projectedConfiguration).unresolved(),
110
+ replacement => !isForwardedUnresolved(replacement, storage)
111
+ )) || !equals(
112
+ analysis.projection,
113
+ canonicalizeConfiguration(server.projectedConfiguration)
114
+ )) {
93
115
  excluded(McpServerCustomizationMigrationFailureReason.UnrepresentableConfiguration);
94
116
  continue;
95
117
  }
118
+ const removedProperties = getRemovedProperties(rawConfiguration);
96
119
  candidates.push({
97
120
  type: CustomizationMigrationType.McpServers,
121
+ storage,
98
122
  id: server.id,
99
123
  name: server.name,
100
124
  sourceUri,
101
125
  targetUri,
102
- projectedConfiguration: server.projectedConfiguration
126
+ projectedConfiguration: server.projectedConfiguration,
127
+ ...(analysis.migration !== analysis.projection ? {
128
+ migratedConfiguration: analysis.migration
129
+ } : {}),
130
+ ...(removedProperties ? {
131
+ removedProperties
132
+ } : {})
103
133
  });
104
134
  }
105
135
  this.logService.trace(
@@ -111,12 +141,18 @@ class McpServerCustomizationMigrator {
111
141
  };
112
142
  }
113
143
  migrate(candidates, options = {}) {
114
- return executeMigration(candidates, this.fileService, this.logService, options);
144
+ return executeMigration(
145
+ candidates,
146
+ this.fileService,
147
+ this.logService,
148
+ this.configurationResolverService,
149
+ options
150
+ );
115
151
  }
116
- async readMcpServers(resource) {
152
+ async readMcpServers(resource, token) {
117
153
  let content;
118
154
  try {
119
- content = ( (await this.fileService.readFile(resource)).value.toString());
155
+ content = ( (await this.fileService.readFile(resource, undefined, token)).value.toString());
120
156
  } catch (error) {
121
157
  if (toFileOperationResult(error) === FileOperationResult.FILE_NOT_FOUND) {
122
158
  return undefined;
@@ -135,12 +171,13 @@ class McpServerCustomizationMigrator {
135
171
  return servers;
136
172
  }
137
173
  }
138
- async function executeMigration(candidates, fileService, logService, options) {
174
+ async function executeMigration(candidates, fileService, logService, configurationResolverService, options) {
139
175
  const groups = ( new Map());
140
176
  const failures = [];
141
177
  for (const candidate of candidates) {
142
- if (!isStrictSourceTargetPair(candidate.sourceUri, candidate.targetUri)) {
143
- logService.trace(`${LOG_PREFIX} Rejected '${candidate.name}': ${( candidate.sourceUri.toString())} to ${( candidate.targetUri.toString())} is not a strict .vscode/mcp.json to .mcp.json pair.`);
178
+ const validPair = candidate.storage === PromptsStorage.user ? options.userTarget && isEqual(candidate.targetUri, options.userTarget) && isUserSourceTargetPair(candidate.sourceUri, candidate.targetUri) : isStrictSourceTargetPair(candidate.sourceUri, candidate.targetUri);
179
+ if (!validPair || isEqual(candidate.sourceUri, candidate.targetUri)) {
180
+ logService.trace(`${LOG_PREFIX} Rejected '${candidate.name}': ${( candidate.sourceUri.toString())} to ${( candidate.targetUri.toString())} is not a supported migration pair.`);
144
181
  failures.push(
145
182
  createFailure(candidate, McpServerCustomizationMigrationFailureReason.InconsistentTarget)
146
183
  );
@@ -151,6 +188,7 @@ async function executeMigration(candidates, fileService, logService, options) {
151
188
  getComparisonKey(candidate.targetUri)
152
189
  ]);
153
190
  const group = groups.get(key) ?? {
191
+ storage: candidate.storage,
154
192
  sourceUri: candidate.sourceUri,
155
193
  targetUri: candidate.targetUri,
156
194
  candidates: []
@@ -161,16 +199,6 @@ async function executeMigration(candidates, fileService, logService, options) {
161
199
  logService.trace(
162
200
  `${LOG_PREFIX} Executing: candidates=${candidates.length}, groups=${groups.size}, rejected=${failures.length}`
163
201
  );
164
- const roots = ( new ResourceMap());
165
- for (const root of options.roots ?? []) {
166
- roots.set(root, root);
167
- }
168
- const selectedCandidates = [...( groups.values())].flatMap(group => group.candidates);
169
- for (const group of ( groups.values())) {
170
- const root = dirname(group.targetUri);
171
- roots.set(root, root);
172
- }
173
- const workingDirectories = [...( roots.values())];
174
202
  let migratedCount = 0;
175
203
  for (const group of ( groups.values())) {
176
204
  if ((await options.isContextCurrent?.(group.candidates)) === false) {
@@ -180,37 +208,14 @@ async function executeMigration(candidates, fileService, logService, options) {
180
208
  ));
181
209
  continue;
182
210
  }
183
- let eligibleCandidates = group.candidates;
184
211
  try {
185
- const conflicts = await findCrossRootConflicts(group, workingDirectories, fileService);
186
- eligibleCandidates = group.candidates.filter(candidate => {
187
- const selectedConflict = selectedCandidates.find(
188
- other => other.name === candidate.name && !isEqual(other.targetUri, candidate.targetUri)
189
- );
190
- const conflictingUri = conflicts.get(candidate.name) ?? selectedConflict?.sourceUri;
191
- if (!conflictingUri) {
192
- return true;
193
- }
194
- logService.warn(`${LOG_PREFIX} Rejected '${candidate.name}' from ${( candidate.sourceUri.toString())}: reason=${McpServerCustomizationMigrationFailureReason.CrossRootConflict}, conflictingUri=${( conflictingUri.toString())}`);
195
- failures.push({
196
- ...createFailure(candidate, McpServerCustomizationMigrationFailureReason.CrossRootConflict),
197
- conflictingUri
198
- });
199
- return false;
200
- });
201
- if (eligibleCandidates.length === 0) {
202
- continue;
203
- }
204
- const result = await migrateGroup({
205
- ...group,
206
- candidates: eligibleCandidates
207
- }, fileService, logService, options, workingDirectories);
212
+ const result = await migrateGroup(group, fileService, logService, configurationResolverService, options);
208
213
  migratedCount += result.migratedCount;
209
214
  failures.push(...result.failures);
210
215
  } catch (error) {
211
216
  const migrationError = toMigrationError(error);
212
217
  logService.trace(`${LOG_PREFIX} Group ${( group.sourceUri.toString())} failed: reason=${migrationError.reason}`);
213
- failures.push(...eligibleCandidates.map(
218
+ failures.push(...group.candidates.map(
214
219
  candidate => createFailure(candidate, migrationError.reason, migrationError)
215
220
  ));
216
221
  }
@@ -220,59 +225,7 @@ async function executeMigration(candidates, fileService, logService, options) {
220
225
  failures
221
226
  };
222
227
  }
223
- async function findCrossRootConflicts(group, roots, fileService) {
224
- const conflicts = ( new Map());
225
- for (const root of roots) {
226
- const targetUri = URI.joinPath(root, ".mcp.json");
227
- if (isEqual(targetUri, group.targetUri)) {
228
- continue;
229
- }
230
- const sourceUri = URI.joinPath(root, ".vscode", "mcp.json");
231
- let target;
232
- try {
233
- target = await readTargetDocument(targetUri, fileService);
234
- } catch (error) {
235
- throw ( new McpServerMigrationError(McpServerCustomizationMigrationFailureReason.InvalidTarget, toError(error)));
236
- }
237
- let sourceServers;
238
- try {
239
- sourceServers = getObjectProperty((await readSourceDocument(sourceUri, fileService)).value, "servers");
240
- } catch (error) {
241
- if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
242
- throw ( new McpServerMigrationError(
243
- McpServerCustomizationMigrationFailureReason.SourceUnavailable,
244
- toError(error)
245
- ));
246
- }
247
- }
248
- const targetServers = getTargetServers(target);
249
- for (const candidate of group.candidates) {
250
- if (( conflicts.has(candidate.name))) {
251
- continue;
252
- }
253
- if (Object.hasOwn(targetServers, candidate.name)) {
254
- conflicts.set(candidate.name, targetUri);
255
- } else if (sourceServers && Object.hasOwn(sourceServers, candidate.name)) {
256
- conflicts.set(candidate.name, sourceUri);
257
- }
258
- }
259
- }
260
- return conflicts;
261
- }
262
- async function ensureNoCrossRootConflicts(group, roots, fileService, logService) {
263
- const conflicts = await findCrossRootConflicts(group, roots, fileService);
264
- for (const [name, conflictingUri] of conflicts) {
265
- logService.warn(
266
- `${LOG_PREFIX} Cross-root conflict during migration of '${name}' from ${( group.sourceUri.toString())}: conflictingUri=${( conflictingUri.toString())}`
267
- );
268
- throw ( new McpServerMigrationError(
269
- McpServerCustomizationMigrationFailureReason.CrossRootConflict,
270
- ( new Error(`MCP server '${name}' is also defined in ${( conflictingUri.toString())}.`)),
271
- conflictingUri
272
- ));
273
- }
274
- }
275
- async function migrateGroup(group, fileService, logService, options, roots) {
228
+ async function migrateGroup(group, fileService, logService, configurationResolverService, options) {
276
229
  logService.trace(
277
230
  `${LOG_PREFIX} Migrating ${group.candidates.length} server(s) from ${( group.sourceUri.toString())} to ${( group.targetUri.toString())}.`
278
231
  );
@@ -294,7 +247,7 @@ async function migrateGroup(group, fileService, logService, options, roots) {
294
247
  }
295
248
  let target;
296
249
  try {
297
- target = await readTargetDocument(group.targetUri, fileService);
250
+ target = await readTargetDocument(group.targetUri, fileService, group.storage === PromptsStorage.user);
298
251
  } catch (error) {
299
252
  throw ( new McpServerMigrationError(McpServerCustomizationMigrationFailureReason.InvalidTarget, toError(error)));
300
253
  }
@@ -309,7 +262,7 @@ async function migrateGroup(group, fileService, logService, options, roots) {
309
262
  failures.push(createFailure(candidate, reason));
310
263
  };
311
264
  for (const candidate of group.candidates) {
312
- if (!isConfigurationRepresentable(candidate.projectedConfiguration)) {
265
+ if (!isConfigurationRepresentable(candidate.projectedConfiguration) || !isConfigurationRepresentable(getMigratedConfiguration(candidate))) {
313
266
  reject(
314
267
  candidate,
315
268
  McpServerCustomizationMigrationFailureReason.UnrepresentableConfiguration
@@ -320,21 +273,25 @@ async function migrateGroup(group, fileService, logService, options, roots) {
320
273
  reject(candidate, McpServerCustomizationMigrationFailureReason.NoLongerEligible);
321
274
  continue;
322
275
  }
323
- const sourceConfiguration = canonicalizeSourceConfiguration(sourceServers[candidate.name]);
324
- const migrationConfiguration = canonicalizeConfiguration(candidate.projectedConfiguration);
325
- if (!sourceConfiguration) {
326
- reject(
327
- candidate,
328
- normalizeMcpServerConfiguration(sourceServers[candidate.name]) ? McpServerCustomizationMigrationFailureReason.UnrepresentableConfiguration : McpServerCustomizationMigrationFailureReason.InvalidSource
329
- );
276
+ const root = group.storage === PromptsStorage.local ? dirname(group.targetUri) : undefined;
277
+ const analysis = await analyzeSourceConfiguration(
278
+ sourceServers[candidate.name],
279
+ root,
280
+ group.storage,
281
+ configurationResolverService
282
+ );
283
+ if (typeof analysis === "string") {
284
+ reject(candidate, analysis);
330
285
  continue;
331
286
  }
332
- if (!equals(sourceConfiguration, migrationConfiguration)) {
287
+ if (!isAnalysisOfCandidate(analysis, candidate) || !equals(
288
+ getRemovedProperties(sourceServers[candidate.name]),
289
+ candidate.removedProperties
290
+ )) {
333
291
  reject(candidate, McpServerCustomizationMigrationFailureReason.SourceChanged);
334
292
  continue;
335
293
  }
336
- const targetConfiguration = canonicalizeSourceConfiguration(targetServers[candidate.name]);
337
- if (Object.hasOwn(targetServers, candidate.name) && (!targetConfiguration || !equals(targetConfiguration, migrationConfiguration))) {
294
+ if (Object.hasOwn(targetServers, candidate.name) && !isEquivalentTargetConfiguration(targetServers[candidate.name], candidate)) {
338
295
  reject(candidate, McpServerCustomizationMigrationFailureReason.TargetConflict);
339
296
  continue;
340
297
  }
@@ -363,7 +320,7 @@ async function migrateGroup(group, fileService, logService, options, roots) {
363
320
  targetContent = setJsonValue(
364
321
  targetContent,
365
322
  target.wrapped ? ["mcpServers", candidate.name] : [candidate.name],
366
- canonicalizeConfiguration(candidate.projectedConfiguration)
323
+ getTargetConfiguration(candidate)
367
324
  );
368
325
  targetChanged = true;
369
326
  }
@@ -401,28 +358,6 @@ async function migrateGroup(group, fileService, logService, options, roots) {
401
358
  } else {
402
359
  logService.trace(`${LOG_PREFIX} Target ${( group.targetUri.toString())} already contains every selected entry.`);
403
360
  }
404
- try {
405
- await ensureNoCrossRootConflicts({
406
- ...group,
407
- candidates: candidatesToMigrate
408
- }, roots, fileService, logService);
409
- } catch (error) {
410
- if (writtenTarget) {
411
- try {
412
- await rollbackTarget(
413
- migrationGroup,
414
- target,
415
- writtenTarget,
416
- targetContent,
417
- fileService,
418
- logService
419
- );
420
- } catch (rollbackError) {
421
- throw rollbackErrorWith(error, rollbackError, group.sourceUri);
422
- }
423
- }
424
- throw error;
425
- }
426
361
  if ((await options.isContextCurrent?.(candidatesToMigrate)) === false) {
427
362
  logService.trace(`${LOG_PREFIX} Aborting ${( group.sourceUri.toString())} after the target write: execution context changed.`);
428
363
  if (writtenTarget) {
@@ -432,7 +367,8 @@ async function migrateGroup(group, fileService, logService, options, roots) {
432
367
  writtenTarget,
433
368
  targetContent,
434
369
  fileService,
435
- logService
370
+ logService,
371
+ configurationResolverService
436
372
  );
437
373
  }
438
374
  return {
@@ -451,7 +387,6 @@ async function migrateGroup(group, fileService, logService, options, roots) {
451
387
  } catch (error) {
452
388
  const sourceChangedBeforeWrite = error instanceof McpServerDocumentChangedError;
453
389
  if (sourceChangedBeforeWrite && (await isConcurrentMigrationComplete(migrationGroup, fileService))) {
454
- await ensureNoCrossRootConflicts(migrationGroup, roots, fileService, logService);
455
390
  logService.info(`${LOG_PREFIX} Concurrent migration already completed for ${( group.sourceUri.toString())}; retaining ${( group.targetUri.toString())}.`);
456
391
  return {
457
392
  migratedCount: candidatesToMigrate.length,
@@ -476,7 +411,8 @@ async function migrateGroup(group, fileService, logService, options, roots) {
476
411
  writtenTarget,
477
412
  targetContent,
478
413
  fileService,
479
- logService
414
+ logService,
415
+ configurationResolverService
480
416
  );
481
417
  } catch (rollbackError) {
482
418
  throw rollbackErrorWith(error, rollbackError, group.sourceUri);
@@ -492,10 +428,6 @@ async function migrateGroup(group, fileService, logService, options, roots) {
492
428
  }
493
429
  try {
494
430
  await verifyMigration(group, candidatesToMigrate, fileService);
495
- await ensureNoCrossRootConflicts({
496
- ...group,
497
- candidates: candidatesToMigrate
498
- }, roots, fileService, logService);
499
431
  } catch (verificationError) {
500
432
  logService.trace(`${LOG_PREFIX} Verification failed for ${( group.sourceUri.toString())}; rolling both files back.`);
501
433
  const rollbackErrors = [];
@@ -514,7 +446,8 @@ async function migrateGroup(group, fileService, logService, options, roots) {
514
446
  writtenTarget,
515
447
  targetContent,
516
448
  fileService,
517
- logService
449
+ logService,
450
+ configurationResolverService
518
451
  );
519
452
  } catch (error) {
520
453
  rollbackErrors.push(toError(error));
@@ -548,13 +481,18 @@ async function migrateGroup(group, fileService, logService, options, roots) {
548
481
  async function isConcurrentMigrationComplete(group, fileService) {
549
482
  try {
550
483
  const sourceServers = getObjectProperty((await readSourceDocument(group.sourceUri, fileService)).value, "servers");
551
- const targetServers = getTargetServers(await readTargetDocument(group.targetUri, fileService));
552
- return sourceServers !== undefined && group.candidates.every(
553
- candidate => !Object.hasOwn(sourceServers, candidate.name) && Object.hasOwn(targetServers, candidate.name) && equals(
554
- canonicalizeSourceConfiguration(targetServers[candidate.name]),
555
- canonicalizeConfiguration(candidate.projectedConfiguration)
556
- )
484
+ const targetServers = getTargetServers(
485
+ await readTargetDocument(group.targetUri, fileService, group.storage === PromptsStorage.user)
557
486
  );
487
+ if (!sourceServers) {
488
+ return false;
489
+ }
490
+ for (const candidate of group.candidates) {
491
+ if (Object.hasOwn(sourceServers, candidate.name) || !Object.hasOwn(targetServers, candidate.name) || !isEquivalentTargetConfiguration(targetServers[candidate.name], candidate)) {
492
+ return false;
493
+ }
494
+ }
495
+ return true;
558
496
  } catch {
559
497
  return false;
560
498
  }
@@ -585,13 +523,10 @@ async function restoreSourceAfterFailedWrite(resource, original, attemptedConten
585
523
  async function verifyMigration(group, candidates, fileService) {
586
524
  const source = await readSourceDocument(group.sourceUri, fileService);
587
525
  const sourceServers = getObjectProperty(source.value, "servers");
588
- const target = await readTargetDocument(group.targetUri, fileService);
526
+ const target = await readTargetDocument(group.targetUri, fileService, group.storage === PromptsStorage.user);
589
527
  const targetServers = getTargetServers(target);
590
528
  for (const candidate of candidates) {
591
- if (sourceServers?.[candidate.name] !== undefined || !equals(
592
- canonicalizeSourceConfiguration(targetServers[candidate.name]),
593
- canonicalizeConfiguration(candidate.projectedConfiguration)
594
- )) {
529
+ if (sourceServers?.[candidate.name] !== undefined || !isEquivalentTargetConfiguration(targetServers[candidate.name], candidate)) {
595
530
  throw ( new Error(`MCP server '${candidate.name}' changed during migration.`));
596
531
  }
597
532
  }
@@ -613,10 +548,13 @@ async function readSourceDocument(resource, fileService) {
613
548
  exists: true
614
549
  };
615
550
  }
616
- async function readTargetDocument(resource, fileService) {
551
+ async function readTargetDocument(resource, fileService, copilotGlobal = false) {
617
552
  try {
618
553
  const file = await fileService.readFile(resource);
619
554
  const content = ( file.value.toString());
555
+ if (copilotGlobal) {
556
+ parseCopilotGlobalMcpConfiguration(content);
557
+ }
620
558
  const errors = [];
621
559
  const value = parse(content, errors, {
622
560
  allowTrailingComma: true,
@@ -625,8 +563,8 @@ async function readTargetDocument(resource, fileService) {
625
563
  if (errors.length > 0 || !isJsonObject(value)) {
626
564
  throw ( new Error(`MCP configuration ${( resource.toString())} contains invalid JSON.`));
627
565
  }
628
- const wrapped = Object.hasOwn(value, "mcpServers");
629
- if (wrapped && !getObjectProperty(value, "mcpServers")) {
566
+ const wrapped = copilotGlobal || Object.hasOwn(value, "mcpServers");
567
+ if (Object.hasOwn(value, "mcpServers") && !getObjectProperty(value, "mcpServers")) {
630
568
  throw ( new Error(`MCP configuration ${( resource.toString())} does not contain a valid mcpServers object.`));
631
569
  }
632
570
  return {
@@ -651,7 +589,25 @@ async function readTargetDocument(resource, fileService) {
651
589
  }
652
590
  }
653
591
  function getTargetServers(target) {
654
- return target.wrapped ? getObjectProperty(target.value, "mcpServers") : target.value;
592
+ return target.wrapped ? getObjectProperty(target.value, "mcpServers") ?? {} : target.value;
593
+ }
594
+ function getTargetConfiguration(candidate) {
595
+ return toCopilotMcpServerConfiguration(getMigratedConfiguration(candidate));
596
+ }
597
+ function getMigratedConfiguration(candidate) {
598
+ return candidate.migratedConfiguration ?? candidate.projectedConfiguration;
599
+ }
600
+ function isEquivalentTargetConfiguration(raw, candidate) {
601
+ if (!isJsonObject(raw)) {
602
+ return false;
603
+ }
604
+ return equals({
605
+ ...(candidate.projectedConfiguration.type === McpServerType.LOCAL ? {
606
+ args: []
607
+ } : {}),
608
+ tools: ["*"],
609
+ ...raw
610
+ }, getTargetConfiguration(candidate));
655
611
  }
656
612
  async function writeDocument(resource, content, document, fileService, beforeWrite) {
657
613
  if (document.exists) {
@@ -681,7 +637,15 @@ async function restoreExistingDocument(resource, original, written, writtenConte
681
637
  }
682
638
  await writeExistingDocument(resource, original.content, writtenContent, fileService);
683
639
  }
684
- async function rollbackTarget(group, original, written, writtenContent, fileService, logService) {
640
+ async function rollbackTarget(
641
+ group,
642
+ original,
643
+ written,
644
+ writtenContent,
645
+ fileService,
646
+ logService,
647
+ configurationResolverService
648
+ ) {
685
649
  const resource = group.targetUri;
686
650
  const current = await fileService.readFile(resource);
687
651
  if (current.etag !== written.etag || current.mtime !== written.mtime || ( current.value.toString()) !== writtenContent) {
@@ -696,12 +660,23 @@ async function rollbackTarget(group, original, written, writtenContent, fileServ
696
660
  await writeExistingDocument(resource, original.content, writtenContent, fileService, async () => {
697
661
  try {
698
662
  const sourceServers = getObjectProperty((await readSourceDocument(group.sourceUri, fileService)).value, "servers");
699
- if (!sourceServers || ( addedCandidates.some(candidate => !Object.hasOwn(sourceServers, candidate.name) || !equals(
700
- canonicalizeSourceConfiguration(sourceServers[candidate.name]),
701
- canonicalizeConfiguration(candidate.projectedConfiguration)
702
- )))) {
663
+ if (!sourceServers) {
703
664
  throw ( new Error(`Source ${( group.sourceUri.toString())} no longer contains all entries added to ${( resource.toString())}.`));
704
665
  }
666
+ for (const candidate of addedCandidates) {
667
+ if (!Object.hasOwn(sourceServers, candidate.name)) {
668
+ throw ( new Error(`Source ${( group.sourceUri.toString())} no longer contains all entries added to ${( resource.toString())}.`));
669
+ }
670
+ const analysis = await analyzeSourceConfiguration(
671
+ sourceServers[candidate.name],
672
+ group.storage === PromptsStorage.local ? dirname(group.targetUri) : undefined,
673
+ group.storage,
674
+ configurationResolverService
675
+ );
676
+ if (typeof analysis === "string" || !isAnalysisOfCandidate(analysis, candidate)) {
677
+ throw ( new Error(`Source ${( group.sourceUri.toString())} no longer contains all entries added to ${( resource.toString())}.`));
678
+ }
679
+ }
705
680
  } catch (error) {
706
681
  logService.warn(`${LOG_PREFIX} Retaining ${( resource.toString())}: cannot verify surviving source entries in ${( group.sourceUri.toString())}.`);
707
682
  throw ( new McpServerMigrationError(
@@ -730,6 +705,9 @@ async function ensureFileExists(resource, fileService) {
730
705
  function isStrictSourceTargetPair(sourceUri, targetUri) {
731
706
  return basename(sourceUri) === "mcp.json" && basename(dirname(sourceUri)) === ".vscode" && isEqual(targetUri, URI.joinPath(dirname(dirname(sourceUri)), ".mcp.json"));
732
707
  }
708
+ function isUserSourceTargetPair(sourceUri, targetUri) {
709
+ return basename(sourceUri) === "mcp.json" && basename(targetUri) === "mcp-config.json" && sourceUri.authority === targetUri.authority && (targetUri.scheme === Schemas.vscodeRemote ? sourceUri.scheme === Schemas.vscodeRemote : targetUri.scheme === Schemas.file && (sourceUri.scheme === Schemas.file || sourceUri.scheme === Schemas.vscodeUserData));
710
+ }
733
711
  function getObjectProperty(value, key) {
734
712
  const property = value[key];
735
713
  return isJsonObject(property) ? property : undefined;
@@ -773,7 +751,7 @@ function isConfigurationRepresentable(configuration) {
773
751
  return false;
774
752
  }
775
753
  if (configuration.type === McpServerType.LOCAL) {
776
- return configuration.envFile === undefined && configuration.cwd === undefined && configuration.sandboxEnabled !== true;
754
+ return configuration.envFile === undefined && configuration.cwd === undefined && configuration.sandboxEnabled !== true && (!configuration.env || ( Object.values(configuration.env)).every(value => value !== null));
777
755
  }
778
756
  return configuration.oauth === undefined && configuration.transport !== "sse";
779
757
  }
@@ -796,10 +774,228 @@ function canonicalizeSourceConfiguration(rawConfiguration) {
796
774
  }
797
775
  return canonicalizeConfiguration(configuration);
798
776
  }
777
+ async function analyzeSourceConfiguration(rawConfiguration, root, storage, configurationResolverService) {
778
+ const configuration = canonicalizeSourceConfiguration(rawConfiguration);
779
+ if (!configuration) {
780
+ return normalizeMcpServerConfiguration(rawConfiguration) ? McpServerCustomizationMigrationFailureReason.UnrepresentableConfiguration : McpServerCustomizationMigrationFailureReason.InvalidSource;
781
+ }
782
+ const isPortable = replacement => isPortableMigrationVariable(replacement.name, replacement.arg) && (!!root || replacement.name === "pathSeparator" || replacement.name === "/");
783
+ let hasEnvironmentVariables = false;
784
+ for (const replacement of ConfigurationResolverExpression.parse(configuration).unresolved()) {
785
+ if (replacement.name === "env") {
786
+ hasEnvironmentVariables = true;
787
+ } else if (!isPortable(replacement)) {
788
+ return McpServerCustomizationMigrationFailureReason.UnrepresentableConfiguration;
789
+ }
790
+ }
791
+ const folder = root ? {
792
+ uri: root,
793
+ name: basename(root),
794
+ index: 0
795
+ } : undefined;
796
+ if (!hasEnvironmentVariables) {
797
+ const resolved = await resolveVariables(configuration, folder, configurationResolverService);
798
+ return resolved ? {
799
+ projection: resolved,
800
+ migration: resolved
801
+ } : McpServerCustomizationMigrationFailureReason.UnrepresentableConfiguration;
802
+ }
803
+ const withEnvironmentVariables = await resolvePortableVariables(configuration, folder, isPortable, configurationResolverService);
804
+ if (!withEnvironmentVariables) {
805
+ return McpServerCustomizationMigrationFailureReason.UnrepresentableConfiguration;
806
+ }
807
+ const migration = rewriteEnvironmentVariables(withEnvironmentVariables);
808
+ if (typeof migration === "string") {
809
+ return migration;
810
+ }
811
+ if (await hasVariablesInEnvironmentValues(configuration, folder, configurationResolverService)) {
812
+ return McpServerCustomizationMigrationFailureReason.UnrepresentableConfiguration;
813
+ }
814
+ const projection = storage === PromptsStorage.user ? withEnvironmentVariables : await resolveVariables(configuration, folder, configurationResolverService);
815
+ return projection ? {
816
+ projection,
817
+ migration
818
+ } : McpServerCustomizationMigrationFailureReason.UnrepresentableConfiguration;
819
+ }
820
+ function isAnalysisOfCandidate(analysis, candidate) {
821
+ return equals(
822
+ analysis.projection,
823
+ canonicalizeConfiguration(candidate.projectedConfiguration)
824
+ ) && equals(
825
+ analysis.migration,
826
+ canonicalizeConfiguration(getMigratedConfiguration(candidate))
827
+ );
828
+ }
829
+ function isForwardedUnresolved(replacement, storage) {
830
+ return storage === PromptsStorage.user && replacement.name === "env";
831
+ }
832
+ async function resolveVariables(configuration, folder, configurationResolverService) {
833
+ const expression = ConfigurationResolverExpression.parse(configuration);
834
+ try {
835
+ await configurationResolverService.resolveAsync(folder, expression);
836
+ } catch {
837
+ return undefined;
838
+ }
839
+ return Iterable.isEmpty(expression.unresolved()) ? expression.toObject() : undefined;
840
+ }
841
+ async function hasVariablesInEnvironmentValues(configuration, folder, configurationResolverService) {
842
+ const expression = ConfigurationResolverExpression.parse(configuration);
843
+ try {
844
+ await configurationResolverService.resolveAsync(folder, expression);
845
+ } catch {
846
+ return true;
847
+ }
848
+ return ( Iterable.some(
849
+ expression.resolved(),
850
+ ([replacement, resolved]) => replacement.name === "env" && resolved.value !== undefined && hasConfigurationVariable(resolved.value)
851
+ ));
852
+ }
853
+ async function resolvePortableVariables(configuration, folder, isPortable, configurationResolverService) {
854
+ const expression = ConfigurationResolverExpression.parse(configuration);
855
+ for (const replacement of expression.unresolved()) {
856
+ if (replacement.name === "env") {
857
+ continue;
858
+ }
859
+ if (!isPortable(replacement)) {
860
+ return undefined;
861
+ }
862
+ let value;
863
+ try {
864
+ value = await configurationResolverService.resolveAsync(folder, replacement.id);
865
+ } catch {
866
+ return undefined;
867
+ }
868
+ if (value === replacement.id) {
869
+ return undefined;
870
+ }
871
+ expression.resolve(replacement, value);
872
+ }
873
+ return expression.toObject();
874
+ }
875
+ function rewriteEnvironmentVariables(configuration) {
876
+ const names = ( Object.keys(
877
+ (configuration.type === McpServerType.LOCAL ? configuration.env : configuration.headers) ?? {}
878
+ ));
879
+ if (( names.some(hasEnvironmentVariableReference))) {
880
+ return McpServerCustomizationMigrationFailureReason.EnvironmentVariableInName;
881
+ }
882
+ const failures = [];
883
+ const rewrite = value => {
884
+ let rewritten = false;
885
+ const result = replaceConfigurationVariables(value, variable => {
886
+ if (variable.name !== "env") {
887
+ failures.push(McpServerCustomizationMigrationFailureReason.UnrepresentableConfiguration);
888
+ } else if (variable.arg === undefined || !environmentVariableNamePattern.test(variable.arg)) {
889
+ failures.push(
890
+ McpServerCustomizationMigrationFailureReason.InvalidEnvironmentVariableName
891
+ );
892
+ } else {
893
+ rewritten = true;
894
+ return `\${${variable.arg}}`;
895
+ }
896
+ return variable.id;
897
+ });
898
+ if (rewritten && result.length > MAX_ENV_VAR_RESOLVE_LENGTH) {
899
+ failures.push(
900
+ McpServerCustomizationMigrationFailureReason.EnvironmentVariableValueTooLong
901
+ );
902
+ }
903
+ return result;
904
+ };
905
+ let migration;
906
+ if (configuration.type === McpServerType.LOCAL) {
907
+ if (configuration.cwd !== undefined && hasEnvironmentVariableReference(configuration.cwd)) {
908
+ return McpServerCustomizationMigrationFailureReason.UnrepresentableConfiguration;
909
+ }
910
+ migration = {
911
+ ...configuration,
912
+ command: rewrite(configuration.command),
913
+ ...(configuration.args ? {
914
+ args: configuration.args.map(rewrite)
915
+ } : {}),
916
+ ...(configuration.env ? {
917
+ env: Object.fromEntries(Object.entries(configuration.env).map(
918
+ ([name, value]) => [name, typeof value === "string" ? rewrite(value) : value]
919
+ ))
920
+ } : {})
921
+ };
922
+ } else {
923
+ const url = rewrite(configuration.url);
924
+ if (url !== configuration.url && failures.length === 0 && !URL.canParse(url)) {
925
+ failures.push(
926
+ McpServerCustomizationMigrationFailureReason.UnsupportedEnvironmentVariableInUrl
927
+ );
928
+ }
929
+ migration = {
930
+ ...configuration,
931
+ url,
932
+ ...(configuration.headers ? {
933
+ headers: Object.fromEntries(
934
+ Object.entries(configuration.headers).map(([name, value]) => [name, rewrite(value)])
935
+ )
936
+ } : {})
937
+ };
938
+ }
939
+ return failures[0] ?? migration;
940
+ }
941
+ const environmentVariableNamePattern = /^[A-Za-z_][A-Za-z0-9_]*$/;
942
+ function hasEnvironmentVariableReference(value) {
943
+ let found = false;
944
+ replaceConfigurationVariables(value, variable => {
945
+ found ||= variable.name === "env";
946
+ return variable.id;
947
+ });
948
+ return found;
949
+ }
950
+ function replaceConfigurationVariables(value, replace) {
951
+ let result = "";
952
+ let copied = 0;
953
+ let position = 0;
954
+ while (position < value.length) {
955
+ const start = value.indexOf("${", position);
956
+ if (start === -1) {
957
+ break;
958
+ }
959
+ const parsed = parseConfigurationVariable(value, start);
960
+ if (!parsed) {
961
+ position = start + 2;
962
+ continue;
963
+ }
964
+ result += value.slice(copied, start) + replace(parsed.replacement);
965
+ copied = position = parsed.end + 1;
966
+ }
967
+ return result + value.slice(copied);
968
+ }
969
+ function isPortableMigrationVariable(name, argument) {
970
+ if (name === "pathSeparator" || name === "/") {
971
+ return argument === undefined;
972
+ }
973
+ return name === "workspaceFolder" || name === "workspaceRoot" || name === "workspaceFolderBasename" || name === "workspaceRootFolderName" || name === "cwd";
974
+ }
799
975
  function hasOnlyRepresentableProperties(rawConfiguration, type) {
800
- const allowed = type === McpServerType.LOCAL ? ( new Set(["type", "command", "args", "env", "cwd"])) : ( new Set(["type", "transport", "url", "headers"]));
976
+ const allowed = type === McpServerType.LOCAL ? ( new Set([
977
+ "type",
978
+ "command",
979
+ "args",
980
+ "env",
981
+ "cwd",
982
+ ...mcpServerCustomizationMigrationRemovableProperties
983
+ ])) : ( new Set([
984
+ "type",
985
+ "transport",
986
+ "url",
987
+ "headers",
988
+ ...mcpServerCustomizationMigrationRemovableProperties.filter(property => property !== "sandboxEnabled")
989
+ ]));
801
990
  return ( Object.keys(rawConfiguration)).every(key => ( allowed.has(key)));
802
991
  }
992
+ function getRemovedProperties(rawConfiguration) {
993
+ if (!isJsonObject(rawConfiguration)) {
994
+ return undefined;
995
+ }
996
+ const entries = mcpServerCustomizationMigrationRemovableProperties.filter(property => Object.hasOwn(rawConfiguration, property)).map(property => [property, rawConfiguration[property]]);
997
+ return entries.length > 0 ? Object.fromEntries(entries) : undefined;
998
+ }
803
999
  function setJsonValue(content, path, value) {
804
1000
  return applyEdits(
805
1001
  content,
@@ -828,11 +1024,10 @@ function toError(error) {
828
1024
  return error instanceof Error ? error : ( new Error(String(error)));
829
1025
  }
830
1026
  class McpServerMigrationError extends Error {
831
- constructor(reason, underlyingError, conflictingUri) {
1027
+ constructor(reason, underlyingError) {
832
1028
  super(underlyingError.message);
833
1029
  this.reason = reason;
834
1030
  this.underlyingError = underlyingError;
835
- this.conflictingUri = conflictingUri;
836
1031
  }
837
1032
  }
838
1033
  class McpServerDocumentChangedError extends Error {
@@ -845,15 +1040,13 @@ function toMigrationError(error) {
845
1040
  }
846
1041
  function createFailure(candidate, reason, error) {
847
1042
  return {
1043
+ storage: candidate.storage,
848
1044
  id: candidate.id,
849
1045
  name: candidate.name,
850
1046
  sourceUri: candidate.sourceUri,
851
1047
  targetUri: candidate.targetUri,
852
1048
  reason,
853
- error,
854
- ...(error instanceof McpServerMigrationError && error.conflictingUri ? {
855
- conflictingUri: error.conflictingUri
856
- } : {})
1049
+ error
857
1050
  };
858
1051
  }
859
1052