@codingame/monaco-vscode-chat-service-override 37.6.0 → 38.0.0
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.
- package/common.js +64 -2
- package/index.js +3 -3
- package/package.json +5 -5
- package/session.js +5 -1
- package/vscode/src/vs/platform/agentHost/browser/agentHostConnectionsService.d.ts +13 -2
- package/vscode/src/vs/platform/agentHost/browser/agentHostConnectionsService.js +164 -12
- package/vscode/src/vs/platform/agentHost/browser/agentHostIpcChannelTransport.d.ts +4 -2
- package/vscode/src/vs/platform/agentHost/browser/agentHostIpcChannelTransport.js +8 -2
- package/vscode/src/vs/platform/agentHost/browser/remoteAgentHostServiceImpl.d.ts +34 -4
- package/vscode/src/vs/platform/agentHost/browser/remoteAgentHostServiceImpl.js +345 -48
- package/vscode/src/vs/platform/agentHost/browser/webPubSubRelayTransport.d.ts +135 -0
- package/vscode/src/vs/platform/agentHost/browser/webPubSubRelayTransport.js +510 -0
- package/vscode/src/vs/platform/agentHost/browser/webSocketClientTransport.d.ts +4 -1
- package/vscode/src/vs/platform/agentHost/browser/webSocketClientTransport.js +12 -2
- package/vscode/src/vs/platform/agentHost/common/agentHostCustomizationConfig.d.ts +2 -11
- package/vscode/src/vs/platform/agentHost/common/agentHostCustomizationConfig.js +14 -27
- package/vscode/src/vs/platform/agentHost/common/agentHostOperatingSystem.d.ts +6 -0
- package/vscode/src/vs/platform/agentHost/common/agentHostOperatingSystem.js +43 -0
- package/vscode/src/vs/platform/agentHost/common/agentHostStarter.config.contribution.js +158 -73
- package/vscode/src/vs/platform/agentHost/common/artifactToolsConfiguration.d.ts +16 -0
- package/vscode/src/vs/platform/agentHost/common/artifactToolsConfiguration.js +26 -0
- package/vscode/src/vs/platform/agentHost/common/cloudSandboxAgentHost.d.ts +273 -0
- package/vscode/src/vs/platform/agentHost/common/cloudSandboxAgentHost.js +61 -0
- package/vscode/src/vs/platform/agentHost/common/codexAccountPlan.d.ts +3 -0
- package/vscode/src/vs/platform/agentHost/common/codexAccountPlan.js +30 -0
- package/vscode/src/vs/platform/agentHost/common/copilotConfigSlashCommands.js +8 -8
- package/vscode/src/vs/platform/agentHost/common/meta/agentHostChatInputState.d.ts +2 -0
- package/vscode/src/vs/platform/agentHost/common/meta/agentModelMeta.d.ts +7 -0
- package/vscode/src/vs/platform/agentHost/common/meta/agentModelMeta.js +17 -0
- package/vscode/src/vs/platform/agentHost/common/meta/copilotd/cloudSandboxProjectMeta.d.ts +12 -0
- package/vscode/src/vs/platform/agentHost/common/meta/copilotd/cloudSandboxProjectMeta.js +48 -0
- package/vscode/src/vs/platform/agentHost/common/meta/{agentCustomizationMeta.js → vscode/agentCustomizationMeta.js} +2 -2
- package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentHostChatInputState.d.ts +16 -0
- package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentHostChatInputState.js +16 -0
- package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentModelConfigurationMeta.d.ts +8 -0
- package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentModelConfigurationMeta.js +20 -0
- package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentModelEnsembleMeta.d.ts +8 -0
- package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentModelEnsembleMeta.js +11 -0
- package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentModelPricing.js +141 -0
- package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentPermissionResponseMeta.d.ts +12 -0
- package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentPermissionResponseMeta.js +25 -0
- package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentSandboxDiagnostics.d.ts +5 -0
- package/vscode/src/vs/platform/agentHost/common/meta/vscode/agentSandboxDiagnostics.js +11 -0
- package/vscode/src/vs/platform/agentHost/common/meta/{clientPluginCustomizationMeta.d.ts → vscode/clientPluginCustomizationMeta.d.ts} +10 -0
- package/vscode/src/vs/platform/agentHost/common/meta/{clientPluginCustomizationMeta.js → vscode/clientPluginCustomizationMeta.js} +7 -1
- package/vscode/src/vs/platform/agentHost/common/sandboxConfigSchema.d.ts +35 -24
- package/vscode/src/vs/platform/agentHost/common/sandboxConfigSchema.js +85 -20
- package/vscode/src/vs/platform/agentHost/common/sessionDataService.d.ts +440 -0
- package/vscode/src/vs/platform/agentHost/common/sessionDataService.js +11 -0
- package/vscode/src/vs/platform/agentHost/common/sessionDataService.service.d.ts +104 -0
- package/vscode/src/vs/platform/agentHost/common/taskEventReplay.d.ts +48 -0
- package/vscode/src/vs/platform/agentHost/common/taskEventReplay.js +238 -0
- package/vscode/src/vs/platform/agentHost/common/titleGenerationConfiguration.d.ts +35 -0
- package/vscode/src/vs/platform/agentHost/common/titleGenerationConfiguration.js +49 -0
- package/vscode/src/vs/platform/agentHost/common/vscodeSandboxPaths.d.ts +9 -0
- package/vscode/src/vs/platform/agentHost/common/vscodeSandboxPaths.js +13 -0
- package/vscode/src/vs/platform/agentHost/common/webPubSub/chunking.d.ts +102 -0
- package/vscode/src/vs/platform/agentHost/common/webPubSub/chunking.js +260 -0
- package/vscode/src/vs/platform/agentHost/common/webPubSub/framing.d.ts +102 -0
- package/vscode/src/vs/platform/agentHost/common/webPubSub/framing.js +115 -0
- package/vscode/src/vs/platform/agentHost/common/webPubSub/groups.d.ts +46 -0
- package/vscode/src/vs/platform/agentHost/common/webPubSub/groups.js +92 -0
- package/vscode/src/vs/platform/customizationMarketplace/common/mcpGalleryMarketplaceProvider.d.ts +22 -0
- package/vscode/src/vs/platform/customizationMarketplace/common/mcpGalleryMarketplaceProvider.js +158 -0
- package/vscode/src/vs/platform/networkFilter/common/networkFilterService.d.ts +4 -2
- package/vscode/src/vs/platform/networkFilter/common/networkFilterService.js +12 -5
- package/vscode/src/vs/platform/otel/common/chatUserInteraction.d.ts +20 -0
- package/vscode/src/vs/platform/otel/common/chatUserInteraction.js +45 -0
- package/vscode/src/vs/platform/sandbox/browser/sandboxHelperService.d.ts +1 -4
- package/vscode/src/vs/platform/sandbox/browser/sandboxHelperService.js +0 -9
- package/vscode/src/vs/platform/sandbox/common/sandboxHelperIpc.d.ts +1 -4
- package/vscode/src/vs/platform/sandbox/common/sandboxHelperIpc.js +0 -15
- package/vscode/src/vs/platform/sandbox/common/terminalSandboxCommandRules.d.ts +1 -1
- package/vscode/src/vs/platform/sandbox/common/terminalSandboxEngine.d.ts +6 -24
- package/vscode/src/vs/platform/sandbox/common/terminalSandboxEngine.js +51 -109
- package/vscode/src/vs/platform/sandbox/common/terminalSandboxReadAllowList.d.ts +1 -1
- package/vscode/src/vs/platform/sandbox/common/terminalSandboxRuntimeConfigurationPerOperation.d.ts +1 -1
- package/vscode/src/vs/sessions/browser/parts/mobile/contributions/mobileDiffView.js +7 -7
- package/vscode/src/vs/sessions/browser/parts/mobile/contributions/mobileMultiDiffView.js +8 -8
- package/vscode/src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.d.ts +1 -1
- package/vscode/src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.js +11 -10
- package/vscode/src/vs/sessions/contrib/chat/browser/branchChatSessionAction.js +2 -2
- package/vscode/src/vs/sessions/contrib/chat/browser/btwSlashCommand.contribution.js +6 -6
- package/vscode/src/vs/sessions/contrib/chat/browser/chat.contribution.js +460 -94
- package/vscode/src/vs/sessions/contrib/chat/browser/chatBackgroundTint.d.ts +35 -0
- package/vscode/src/vs/sessions/contrib/chat/browser/chatBackgroundTint.js +652 -0
- package/vscode/src/vs/sessions/contrib/chat/browser/newSession.d.ts +9 -0
- package/vscode/src/vs/sessions/contrib/chat/browser/newSessionAction.d.ts +11 -0
- package/vscode/src/vs/sessions/contrib/chat/browser/newSessionAction.js +118 -0
- package/vscode/src/vs/sessions/contrib/chat/browser/newSessionFolderQuickPickAction.js +4 -4
- package/vscode/src/vs/sessions/contrib/chat/browser/newSessionOnboardingTargets.d.ts +7 -0
- package/vscode/src/vs/sessions/contrib/chat/browser/newSessionOnboardingTargets.js +36 -0
- package/vscode/src/vs/sessions/contrib/chat/browser/newSessionPickerTryout.d.ts +26 -0
- package/vscode/src/vs/sessions/contrib/chat/browser/newSessionPickerTryout.js +145 -0
- package/vscode/src/vs/sessions/contrib/chat/browser/openSessionLinkOpener.contribution.d.ts +1 -1
- package/vscode/src/vs/sessions/contrib/chat/browser/openSessionLinkOpener.contribution.js +24 -6
- package/vscode/src/vs/sessions/contrib/chat/browser/runScriptAction.js +94 -89
- package/vscode/src/vs/sessions/contrib/chat/browser/runScriptCustomTaskWidget.js +21 -21
- package/vscode/src/vs/sessions/contrib/chat/browser/sessionTurnChanges.d.ts +0 -1
- package/vscode/src/vs/sessions/contrib/chat/browser/sessionTurnChanges.js +28 -29
- package/vscode/src/vs/sessions/contrib/chat/browser/sessionsChatAccessibilityHelp.d.ts +7 -0
- package/vscode/src/vs/sessions/contrib/chat/browser/sessionsChatAccessibilityHelp.js +501 -107
- package/vscode/src/vs/sessions/contrib/chat/browser/voiceBridge.contribution.js +5 -1
- package/vscode/src/vs/sessions/contrib/chat/browser/workbenchSessionTaskRunner.d.ts +3 -3
- package/vscode/src/vs/sessions/contrib/chat/browser/workbenchSessionTaskRunner.js +4 -4
- package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentHostAgentPicker.d.ts +8 -1
- package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentHostAgentPicker.js +214 -17
- package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentHostSettings.contribution.js +16 -9
- package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentHostSettingsFileSystemProvider.js +4 -4
- package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentSessionSettings.contribution.js +7 -6
- package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentSessionSettingsFileSystemProvider.js +4 -4
- package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/mobile/mobileChatPhoneInputPresenter.js +226 -0
- package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/openAgentHostStateFileAction.js +1 -1
- package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/openSubagentChat.d.ts +11 -0
- package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/openSubagentChat.js +122 -0
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/cloudAutomationStore.d.ts +67 -0
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/cloudAutomationStore.js +695 -0
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/cloudSandboxSessionConfig.d.ts +4 -0
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/cloudSandboxSessionConfig.js +39 -0
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessions.contribution.js +39 -22
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsActions.d.ts +1 -19
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsActions.js +42 -158
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsChangesets.d.ts +87 -0
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsChangesets.js +176 -0
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.d.ts +422 -0
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.js +2444 -0
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/githubCloudAutomationStore.d.ts +91 -0
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/githubCloudAutomationStore.js +620 -0
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/modePicker.d.ts +5 -4
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/modePicker.js +21 -12
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxAgentHost.contribution.js +2 -11
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxAgentHostContribution.d.ts +46 -0
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxAgentHostContribution.js +321 -0
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxSessionsProvider.d.ts +104 -0
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/cloudSandboxSessionsProvider.js +345 -0
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/entryDrivenProviderContribution.d.ts +14 -1
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/entryDrivenProviderContribution.js +20 -3
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/hostFilter.contribution.d.ts +7 -1
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/hostFilter.contribution.js +8 -12
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/hostFilterActionViewItem.d.ts +8 -4
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/hostFilterActionViewItem.js +88 -84
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/manageRemoteAgentHosts.js +74 -20
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/managedReconnectAgentHostContribution.js +2 -2
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/media/hostFilter.css +34 -19
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/media/hostPickerSheet.css +35 -3
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/missionControlAgentHostContribution.d.ts +37 -0
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/missionControlAgentHostContribution.js +305 -0
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/mobileHostFilterActionViewItem.d.ts +4 -1
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/mobileHostFilterActionViewItem.js +75 -20
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHost.contribution.d.ts +1 -80
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHost.contribution.js +19 -548
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHostActions.d.ts +4 -0
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/remoteAgentHostActions.js +218 -122
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/tunnelAgentHost.contribution.d.ts +5 -4
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/tunnelAgentHost.contribution.js +43 -8
- package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/wslAgentHost.contribution.js +1 -1
- package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/media/sessionWorktreeCleanupEditor.css +223 -0
- package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionStorageCleanupConfiguration.d.ts +2 -0
- package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionStorageCleanupConfiguration.js +16 -0
- package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupAccessibilityHelp.d.ts +15 -0
- package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupAccessibilityHelp.js +49 -0
- package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupEditor.d.ts +66 -0
- package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupEditor.js +458 -0
- package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupEditorInput.d.ts +13 -0
- package/vscode/src/vs/sessions/contrib/sessionInputBanners/browser/sessionWorktreeCleanupEditorInput.js +35 -0
- package/vscode/src/vs/sessions/contrib/sessions/browser/customizationMcpServerCount.d.ts +15 -0
- package/vscode/src/vs/sessions/contrib/sessions/browser/customizationMcpServerCount.js +37 -0
- package/vscode/src/vs/sessions/contrib/sessions/browser/mobile/mobileOverlayContribution.js +4 -4
- package/vscode/src/vs/sessions/services/agentHost/browser/agentHostCustomizationService.d.ts +1 -1
- package/vscode/src/vs/sessions/services/agentHost/browser/agentHostCustomizationService.js +5 -1
- package/vscode/src/vs/sessions/skills/create-draft-pr/SKILL.md +1 -1
- package/vscode/src/vs/sessions/skills/create-pr/SKILL.md +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js +1 -0
- package/vscode/src/vs/workbench/api/browser/mainThreadChatSessions.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js +2 -2
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/agentsVoice.contribution.js +56 -31
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/agentsVoiceSessionsPicker.js +2 -2
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/agentsVoiceWidget.js +21 -21
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/agentsVoiceWidgetBinding.js +3 -3
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/confirmationComponent.js +3 -3
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/feedbackDialog.js +6 -6
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/headerComponent.js +14 -14
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/onboardingComponent.js +11 -11
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/sessionListComponent.js +9 -9
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/statusRowsComponent.js +5 -5
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/components/voiceBarComponent.js +2 -2
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/transcriptsView/voiceTranscripts.contribution.js +13 -13
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/transcriptsView/voiceTranscriptsView.js +7 -7
- package/vscode/src/vs/workbench/contrib/agentsVoice/browser/voiceModeOnboarding.js +30 -29
- package/vscode/src/vs/workbench/contrib/agentsVoice/common/voiceTranscriptStore.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityService.d.ts +3 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityService.js +44 -8
- package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatBackgroundShellOutputAccessibleView.d.ts +11 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatBackgroundShellOutputAccessibleView.js +34 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatResponseAccessibleView.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatResponseAccessibleView.js +85 -29
- package/vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatTerminalOutputAccessibleView.js +33 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityActions.js +8 -8
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.js +318 -103
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAgentRecommendationActions.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.js +60 -28
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.js +41 -16
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatCopyActions.js +49 -10
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatFileTreeActions.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatFindActions.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.js +5 -10
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatLanguageModelActions.js +13 -13
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.js +15 -21
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatNewActions.js +16 -15
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatOpenAgentDebugPanelAction.js +12 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatPromptNavigationActions.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQueueActions.js +24 -23
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js +8 -8
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.d.ts +5 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.js +44 -31
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/createPluginAction.js +32 -32
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/openAgentHostStateFileAction.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginCommands.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditor.d.ts +3 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditor.js +22 -26
- package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditorInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginRepositoryService.d.ts +9 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginRepositoryService.js +180 -26
- package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginsView.d.ts +6 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginsView.js +82 -69
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentCustomizationItemProvider.d.ts +4 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentCustomizationItemProvider.js +32 -10
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHost.contribution.js +12 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.d.ts +5 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.js +37 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostChatContribution.d.ts +6 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostChatContribution.js +53 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostChatInputState.d.ts +25 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostChatInputState.js +144 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCopilotCliSettingsContribution.d.ts +6 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCopilotCliSettingsContribution.js +88 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationMarketplaceInstallProvider.d.ts +51 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationMarketplaceInstallProvider.js +642 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostFirstResponseTelemetry.d.ts +118 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostFirstResponseTelemetry.js +35 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLanguageModelProvider.d.ts +9 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLanguageModelProvider.js +49 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLocalCustomizations.d.ts +21 -17
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLocalCustomizations.js +38 -10
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostMcpServerMigrationProvider.d.ts +50 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostMcpServerMigrationProvider.js +415 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostMcpServerSupport.d.ts +12 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostMcpServerSupport.js +124 -31
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostMcpServerSupportScope.d.ts +7 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostMcpServerSupportScope.js +116 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostModeSynchronizer.d.ts +3 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostModeSynchronizer.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostPermissionUiContribution.js +5 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostPromptCacheNotification.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostRemoteByokNotification.d.ts +23 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostRemoteByokNotification.js +134 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostResponseFileChanges.d.ts +14 -36
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostResponseFileChanges.js +286 -126
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostRootConfigForwarder.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostRootConfigForwarder.js +3 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSandboxNotification.d.ts +17 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSandboxNotification.js +94 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSandboxNotifications.d.ts +14 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSandboxNotifications.js +63 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.d.ts +52 -88
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.js +1030 -349
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionInputPills.d.ts +20 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionInputPills.js +722 -114
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListContribution.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListController.d.ts +3 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListController.js +88 -9
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListStore.d.ts +16 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListStore.js +87 -10
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionWorkingDirectorySynchronizer.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSettings.contribution.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSettingsFileSystemProvider.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSignedOutModelsNotification.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostTerminalContribution.js +4 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostToolUtils.js +2 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.d.ts +12 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.js +191 -60
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentSessionSettings.contribution.js +4 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentSessionSettingsFileSystemProvider.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/applyAgentHostSessionConfig.d.ts +4 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/applyAgentHostSessionConfig.js +27 -17
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/applyAgentHostSubmitConfig.d.ts +2 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/applyAgentHostSubmitConfig.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/codexContinuation.contribution.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/codexContinuation.contribution.js +127 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/codexContinuationGuide.d.ts +44 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/codexContinuationGuide.js +415 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/codexContinuationPresenter.d.ts +25 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/codexContinuationPresenter.js +160 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/copilotConfigSlashSubmitHandler.d.ts +3 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/copilotConfigSlashSubmitHandler.js +5 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/openSessionLinkOpener.contribution.d.ts +7 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/openSessionLinkOpener.contribution.js +122 -34
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/syncedCustomizationBundler.d.ts +22 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/syncedCustomizationBundler.js +74 -39
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.contribution.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.d.ts +4 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.js +89 -68
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsPicker.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjection.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionActions.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionService.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionsExperiments.contribution.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.js +25 -25
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/unifiedQuickAccess.js +17 -17
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/unifiedQuickAccessActions.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsController.d.ts +4 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsController.js +50 -22
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/repositoryPicker.d.ts +21 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/repositoryPicker.js +122 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessionsConfiguration.d.ts +81 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessionsConfiguration.js +213 -13
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.contribution.js +136 -100
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationUrlHandler.d.ts +16 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationUrlHandler.js +76 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationWorkspaceService.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationWorkspaceService.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/copilotConnectorsService.d.ts +139 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/copilotConnectorsService.js +944 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplace.contribution.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplace.contribution.js +119 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplaceInstallService.d.ts +110 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplaceInstallService.js +1485 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplaceInstallationAssociation.d.ts +38 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplaceInstallationAssociation.js +48 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplaceWorkbenchService.d.ts +50 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMarketplaceWorkbenchService.js +213 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMigrationAccessibility.js +19 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMigrationServiceImpl.d.ts +6 -22
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationMigrationServiceImpl.js +87 -263
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationsTelemetryService.d.ts +25 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationsTelemetryService.js +217 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/githubMcpRegistryIcons.d.ts +4 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/githubMcpRegistryIcons.js +605 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/mcpServerCustomizationMigration.d.ts +11 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/mcpServerCustomizationMigration.js +377 -184
- package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.js +2 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chat.shared.contribution.js +753 -617
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/agentHostChatDebugProvider.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/agentHostChatDebugProvider.js +118 -40
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatCustomizationDiscoveryRenderer.js +32 -32
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugCacheExplorerView.js +124 -124
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugCacheInsights.js +72 -72
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugDetailPanel.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditorInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEnablement.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventDetailRenderer.js +20 -20
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventList.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFilters.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFlowChartView.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFlowGraph.js +22 -22
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugHomeView.js +12 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugHookContentRenderer.js +17 -17
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugLogsView.js +24 -24
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugMessageContentRenderer.js +8 -8
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugModelTurnContentRenderer.js +23 -23
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugOverviewView.js +35 -35
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugToolCallContentRenderer.js +11 -11
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugWireLogView.d.ts +4 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugWireLogView.js +47 -42
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCheckpointTimelineImpl.js +29 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingDeletedFileEntry.d.ts +2 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingDeletedFileEntry.js +6 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.js +14 -14
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationWidget.js +12 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.d.ts +4 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js +10 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.d.ts +5 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.js +11 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.d.ts +4 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.js +10 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.js +10 -10
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.js +24 -11
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelChangeService.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelChangeService.js +16 -20
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatGoalSummaryService.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatImageCarouselService.d.ts +12 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/chatImageCarouselService.js +52 -61
- package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagement.contribution.js +17 -11
- package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.d.ts +2 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.js +3 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditorInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatNetworkConfiguration.d.ts +4 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatNetworkConfiguration.js +136 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.js +52 -30
- package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievements.contribution.js +71 -17
- package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievementsEditor.d.ts +12 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievementsEditor.js +104 -16
- package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievementsEditorInput.d.ts +5 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievementsEditorInput.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievementsWidget.d.ts +3 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatPetAchievementsWidget.js +84 -64
- package/vscode/src/vs/workbench/contrib/chat/browser/chatPetColorsWidget.d.ts +29 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatPetColorsWidget.js +221 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatProgressConfiguration.d.ts +27 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatProgressConfiguration.js +72 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatPromoNotification.d.ts +4 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatPromoNotification.js +4 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatQuotaNotification.js +25 -25
- package/vscode/src/vs/workbench/contrib/chat/browser/chatRepoInfo.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionDescription.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.js +52 -32
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupController.d.ts +3 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupController.js +65 -57
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupGrowthSession.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupMicrosoftProbe.d.ts +82 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupMicrosoftProbe.js +213 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.js +29 -27
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupRunner.d.ts +5 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupRunner.js +93 -45
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSlashCommands.d.ts +2 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSlashCommands.js +54 -55
- package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusEntry.d.ts +5 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusEntry.js +51 -15
- package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusPromo.d.ts +43 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusPromo.js +230 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/codexStatusEntry.d.ts +20 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/codexStatusEntry.js +101 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatTipCatalog.js +30 -19
- package/vscode/src/vs/workbench/contrib/chat/browser/chatTipService.js +4 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatTipStorageKeys.d.ts +2 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatTipStorageKeys.js +1 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatUserInteractionOTel.d.ts +27 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatUserInteractionOTel.js +88 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatWindowNotifier.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/claudePluginRecommendations.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/contextContrib/chatContext.contribution.js +5 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/defaultModelContribution.js +5 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/editorChatUsage.contribution.d.ts +34 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/editorChatUsage.contribution.js +121 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/enablementStatusWidget.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/feedbackSurvey/chatHarnessSwitchFeedbackSurveyService.d.ts +34 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/feedbackSurvey/chatHarnessSwitchFeedbackSurveyService.js +192 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/feedbackSurvey/chatModelFeedbackSurveyPromptContribution.js +11 -24
- package/vscode/src/vs/workbench/contrib/chat/browser/languageModelsConfigurationService.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/media/chatPetAchievements.css +232 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/onboarding/modelPickerTryout.contribution.d.ts +3 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/onboarding/modelPickerTryout.contribution.js +85 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/planReviewFeedback/planReviewFeedbackEditorOverlay.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/pluginGitCommandService.d.ts +0 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/pluginGitCommandService.js +11 -28
- package/vscode/src/vs/workbench/contrib/chat/browser/pluginGitHubAuthentication.d.ts +6 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/pluginGitHubAuthentication.js +18 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/pluginInstallService.d.ts +13 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/pluginInstallService.js +250 -92
- package/vscode/src/vs/workbench/contrib/chat/browser/pluginSources.d.ts +2 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/pluginSources.js +39 -47
- package/vscode/src/vs/workbench/contrib/chat/browser/pluginUrlHandler.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/chatModeActions.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptCodingAgentActionOverlay.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptToolSetsCodeLensProvider.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptToolsCodeLensProvider.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptUrlHandler.js +8 -8
- package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/runPromptAction.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/saveAsPromptFileActions.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/skillActions.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/promptTimeline/promptTimeline.contribution.js +5 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/promptTimeline/promptTimelineCard.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/promptTimeline/promptTimelineGutterRail.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/promptTimeline/promptTimelineModel.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/promptTimeline/promptTimelineRulerRail.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/promptTimeline/promptTimelineStickyHeader.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/promptsDebugContribution.js +20 -20
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxAgentHostService.d.ts +40 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxAgentHostService.js +561 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxApiService.d.ts +133 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxApiService.js +1176 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxConnectionCustomization.d.ts +17 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxConnectionCustomization.js +76 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxCredentialRefresh.d.ts +54 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxCredentialRefresh.js +220 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxHistoryCache.d.ts +21 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxHistoryCache.js +184 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxLegacySessionPreparation.d.ts +8 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxLegacySessionPreparation.js +165 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxModels.d.ts +43 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxModels.js +162 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxReadOnlySessionHandler.d.ts +40 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxReadOnlySessionHandler.js +129 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxSessionContribution.d.ts +166 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxSessionContribution.js +838 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxSessionHandler.d.ts +40 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxSessionHandler.js +604 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxSessionListController.d.ts +45 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxSessionListController.js +251 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxTelemetry.d.ts +289 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/cloudSandboxTelemetry.js +497 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/editorCloudSandboxContribution.d.ts +46 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/editorCloudSandboxContribution.js +277 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlCredentialSealing.d.ts +6 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlCredentialSealing.js +41 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlEnvironmentActions.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlEnvironmentActions.js +178 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlEnvironmentService.d.ts +73 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlEnvironmentService.js +398 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlSharingService.d.ts +45 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/missionControlSharingService.js +296 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHost.contribution.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHost.contribution.js +96 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHostAuthentication.d.ts +8 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHostAuthentication.js +15 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHostChatContribution.d.ts +75 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHostChatContribution.js +559 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHostConnectionCustomization.d.ts +43 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/remoteAgentHost/remoteAgentHostConnectionCustomization.js +26 -0
- package/vscode/src/vs/{sessions/contrib/providers/remoteAgentHost/browser → workbench/contrib/chat/browser/remoteAgentHost}/remoteAgentHostCustomizationHarness.d.ts +1 -1
- package/vscode/src/vs/{sessions/contrib/providers/remoteAgentHost/browser → workbench/contrib/chat/browser/remoteAgentHost}/remoteAgentHostCustomizationHarness.js +8 -8
- package/vscode/src/vs/workbench/contrib/chat/browser/tools/clientToolSetsContribution.js +26 -10
- package/vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsConfirmationService.js +39 -39
- package/vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.js +45 -31
- package/vscode/src/vs/workbench/contrib/chat/browser/tools/renameTool.js +8 -8
- package/vscode/src/vs/workbench/contrib/chat/browser/tools/toolHelpers.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/tools/usagesTool.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/utilityModelContribution.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatUpdateRequiredView.d.ts +22 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatUpdateRequiredView.js +110 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcomeHandler.js +5 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/voiceInputMode/voiceInputMode.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatFind/chatFindAccessibilityHelp.js +15 -15
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatWidgetService.js +39 -35
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatQueuePickerActionItem.js +11 -11
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/agentHostInputCompletions.d.ts +5 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/agentHostInputCompletions.js +68 -16
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCommandArgumentHint.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.d.ts +16 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.js +23 -18
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorContrib.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorHover.js +7 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/media/chatPet/all_/_.png.js +4 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/media/chatPet/buddy-painting-insiders-96.png +0 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/media/chatPet/buddy-painting-insiders-96.spritesheet.png +0 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/media/chatPet/buddy-painting-stable-96.png +0 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/media/chatPet/buddy-painting-stable-96.spritesheet.png +0 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/chatQuick.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor.js +15 -18
- package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.d.ts +17 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.js +122 -21
- package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.d.ts +7 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.js +46 -11
- package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css +16 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewTitleControl.css +18 -3
- package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.d.ts +24 -7
- package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.js +406 -193
- package/vscode/src/vs/workbench/contrib/chat/common/customizationMarketplaceInstallService.d.ts +58 -0
- package/vscode/src/vs/workbench/contrib/chat/common/customizationMarketplaceInstallService.js +60 -0
- package/vscode/src/vs/workbench/contrib/chat/common/model/chatModelStore.d.ts +6 -0
- package/vscode/src/vs/workbench/contrib/chat/common/model/chatSessionOperationLog.js +5 -1
- package/vscode/src/vs/workbench/contrib/chat/common/model/chatSessionStore.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/common/onboarding/modelPickerTryout.d.ts +4 -0
- package/vscode/src/vs/workbench/contrib/chat/common/onboarding/modelPickerTryout.js +8 -0
- package/vscode/src/vs/workbench/contrib/chat/common/onboarding/newSessionPickerTryout.d.ts +3 -0
- package/vscode/src/vs/workbench/contrib/chat/common/onboarding/newSessionPickerTryout.js +8 -0
- package/vscode/src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.d.ts +17 -22
- package/vscode/src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.js +455 -237
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/chatPromptFilesContribution.js +18 -18
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.d.ts +4 -2
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.js +25 -17
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptCodeActions.js +12 -12
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHeaderAutocompletion.js +5 -5
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHovers.js +11 -14
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptLinkProvider.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptLinkProvider.js +2 -1
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.js +156 -155
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/customizationMigrationTelemetryService.d.ts +43 -0
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/customizationMigrationTelemetryService.js +225 -0
- package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/manageTodoListTool.js +10 -10
- package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/reviewPlanTool.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/runSubagentTool.d.ts +6 -0
- package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/runSubagentTool.js +65 -9
- package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/setArtifactRulesTool.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/setArtifactsTool.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/common/tools/chatArtifactsService.d.ts +4 -0
- package/vscode/src/vs/workbench/contrib/chat/common/tools/chatArtifactsService.js +11 -3
- package/vscode/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.js +22 -22
- package/vscode/src/vs/workbench/contrib/chat/common/voiceChatService.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.d.ts +4 -3
- package/vscode/src/vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.js +46 -24
- package/vscode/src/vs/workbench/contrib/github/browser/githubCommitResolver.d.ts +15 -0
- package/vscode/src/vs/workbench/contrib/github/browser/githubCommitResolver.js +92 -0
- package/vscode/src/vs/workbench/contrib/imageCarousel/browser/imageCarousel.contribution.js +10 -10
- package/vscode/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditor.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditor.js +22 -15
- package/vscode/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditorInput.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js +15 -15
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatDefaultModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatEditReviewSession.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionResolver.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js +4 -4
- package/vscode/src/vs/workbench/contrib/mcp/browser/mcpPromptArgumentPick.js +14 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.js +10 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.js +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js +1 -1
- package/vscode/src/vs/workbench/contrib/onboarding/browser/onboarding.d.ts +4 -0
- package/vscode/src/vs/workbench/contrib/onboarding/browser/spotlight/spotlightStep.d.ts +10 -0
- package/vscode/src/vs/workbench/contrib/remoteCodingAgents/browser/remoteCodingAgents.contribution.js +7 -7
- package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.js +10 -10
- package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibilityHelp.js +16 -16
- package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.js +20 -20
- package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatSessionResolver.js +1 -1
- package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.js +1 -1
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/agentHostSandboxForwarder.d.ts +0 -1
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/agentHostSandboxForwarder.js +3 -25
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.js +6 -6
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.js +4 -5
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/autoApprove/npmScriptAutoApprover.js +1 -1
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAutoApproveAnalyzer.js +12 -12
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineFileWriteAnalyzer.js +2 -2
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineSandboxRewriter.js +1 -1
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalLastCommandTool.js +3 -3
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalOutputTool.js +3 -3
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalSelectionTool.js +3 -3
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/killTerminalTool.js +3 -3
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.js +4 -4
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.js +4 -4
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.d.ts +0 -1
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.js +79 -82
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/sandboxOutputAnalyzer.js +3 -3
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/sendToTerminalTool.js +10 -10
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.d.ts +9 -1
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.js +103 -26
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/getTaskOutputTool.js +7 -7
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/runTaskTool.js +14 -14
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/taskHelpers.js +1 -1
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/treeSitterCommandParser.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/sandboxSettingsReader.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/sandboxSettingsReader.js +8 -4
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.d.ts +1 -5
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.js +16 -60
- package/vscode/src/vs/workbench/services/agentEditorComments/browser/agentEditorCommentsOverlayWidget.js +3 -3
- package/vscode/src/vs/workbench/services/agentHost/browser/agentSdkSetupService.d.ts +1 -1
- package/vscode/src/vs/workbench/services/agentHost/browser/agentSdkSetupService.js +1 -1
- package/vscode/src/vs/workbench/services/agentHost/browser/codexContinuation.d.ts +31 -0
- package/vscode/src/vs/workbench/services/agentHost/browser/codexContinuation.js +86 -0
- package/vscode/src/vs/workbench/services/agentHost/browser/codexContinuationService.d.ts +76 -0
- package/vscode/src/vs/workbench/services/agentHost/browser/codexContinuationService.js +409 -0
- package/vscode/src/vs/workbench/services/agentHost/browser/editorRemoteAgentHostServiceClient.d.ts +14 -2
- package/vscode/src/vs/workbench/services/agentHost/browser/editorRemoteAgentHostServiceClient.js +56 -7
- package/vscode/src/vs/platform/agentHost/common/agentHostFileSystemService.d.ts +0 -8
- package/vscode/src/vs/platform/agentHost/common/agentHostFileSystemService.js +0 -19
- package/vscode/src/vs/platform/agentHost/common/agentModelByokMeta.d.ts +0 -24
- package/vscode/src/vs/platform/agentHost/common/agentModelByokMeta.js +0 -13
- package/vscode/src/vs/platform/agentHost/common/agentModelPricing.js +0 -53
- package/vscode/src/vs/platform/agentHost/common/agentSdkSetup.d.ts +0 -53
- package/vscode/src/vs/platform/agentHost/common/agentSdkSetup.js +0 -45
- package/vscode/src/vs/platform/sandbox/common/terminalSandboxService.d.ts +0 -108
- package/vscode/src/vs/platform/sandbox/common/terminalSandboxService.js +0 -15
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/branchPicker.d.ts +0 -31
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/branchPicker.js +0 -150
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/mobilePermissionPicker.contribution.js +0 -37
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/sandboxPicker.d.ts +0 -26
- package/vscode/src/vs/sessions/contrib/providers/copilotChatSessions/browser/sandboxPicker.js +0 -86
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatPluginActions.d.ts +0 -8
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatPluginActions.js +0 -241
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostAuth.d.ts +0 -142
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostAuth.js +0 -746
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.d.ts +0 -164
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.js +0 -485
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSubagentOpenChat.d.ts +0 -137
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSubagentOpenChat.js +0 -714
- package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatSubagentOpenChat.css +0 -379
- package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceTelemetry.d.ts +0 -219
- package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceTelemetry.js +0 -222
- package/vscode/src/vs/workbench/services/agentHost/common/agentHostFileSystemService.d.ts +0 -16
- package/vscode/src/vs/workbench/services/agentHost/common/agentHostFileSystemService.js +0 -39
- /package/vscode/src/vs/platform/agentHost/common/meta/{agentChatSurfaceMeta.d.ts → vscode/agentChatSurfaceMeta.d.ts} +0 -0
- /package/vscode/src/vs/platform/agentHost/common/meta/{agentChatSurfaceMeta.js → vscode/agentChatSurfaceMeta.js} +0 -0
- /package/vscode/src/vs/platform/agentHost/common/meta/{agentCustomizationMeta.d.ts → vscode/agentCustomizationMeta.d.ts} +0 -0
- /package/vscode/src/vs/platform/agentHost/common/meta/{agentEphemeralSessionMeta.d.ts → vscode/agentEphemeralSessionMeta.d.ts} +0 -0
- /package/vscode/src/vs/platform/agentHost/common/meta/{agentEphemeralSessionMeta.js → vscode/agentEphemeralSessionMeta.js} +0 -0
- /package/vscode/src/vs/platform/agentHost/common/{agentModelPricing.d.ts → meta/vscode/agentModelPricing.d.ts} +0 -0
- /package/vscode/src/vs/sessions/contrib/providers/{copilotChatSessions/browser/mobilePermissionPicker.contribution.d.ts → agentHost/browser/mobile/mobileChatPhoneInputPresenter.d.ts} +0 -0
- /package/vscode/src/vs/{sessions/contrib/providers/remoteAgentHost/browser → workbench/contrib/chat/browser/remoteAgentHost}/remoteAgentHostLogForwarder.d.ts +0 -0
- /package/vscode/src/vs/{sessions/contrib/providers/remoteAgentHost/browser → workbench/contrib/chat/browser/remoteAgentHost}/remoteAgentHostLogForwarder.js +0 -0
|
@@ -1,38 +1,54 @@
|
|
|
1
1
|
|
|
2
2
|
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
|
+
import { isMessageRequestHiddenFromTranscript, isMessageHiddenFromTranscript, readMessageSystemInitiatedLabel, readAgentMessageRoundTripMetadata } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/agentMessageMeta';
|
|
4
|
+
import { withoutAgentMessageDelegationMeta } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/vscode/agentMessageDelegationMeta';
|
|
5
|
+
import { readAgentContextUsage, readUsageInfoMeta } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/agentUsageMeta';
|
|
3
6
|
import { status } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
|
|
4
|
-
import { Delayer, raceCancellation, disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
|
|
7
|
+
import { Delayer, raceCancellation, disposableTimeout, raceCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
|
|
5
8
|
import { decodeBase64, VSBuffer, encodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
|
|
6
9
|
import { CancellationTokenSource, CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
|
|
7
10
|
import { CancellationError, isCancellationError, getErrorCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
|
|
8
11
|
import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
9
12
|
import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
|
|
10
13
|
import { getCopilotPlanFromEntitlement, getChatErrorDetailsFromMeta } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatErrorMessages';
|
|
11
|
-
import { DisposableStore, Disposable, MutableDisposable, DisposableMap, toDisposable, DisposableResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
14
|
+
import { DisposableStore, Disposable, MutableDisposable, DisposableMap, toDisposable, DisposableResourceMap, DisposableSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
12
15
|
import { ResourceMap, ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
|
|
13
16
|
import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
|
|
14
17
|
import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
|
|
15
18
|
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
|
|
16
19
|
import { isEqual, extUriBiasedIgnorePathCase } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
|
|
17
20
|
import { StopWatch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stopwatch';
|
|
21
|
+
import { AgentHostFirstResponseTiming, nextRendererRootInvocationOrdinal } from './agentHostFirstResponseTelemetry.js';
|
|
18
22
|
import { MicrotaskDelay } from '@codingame/monaco-vscode-api/vscode/vs/base/common/symbols';
|
|
19
23
|
import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
|
|
20
24
|
import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
|
|
25
|
+
import { newAgentHostSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostSessionIdentity';
|
|
26
|
+
import { getAgentHostChatId } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostChatIdentity';
|
|
27
|
+
import { IAgentHostConnectionsService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostConnectionsService.service';
|
|
21
28
|
import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
|
|
22
29
|
import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
|
|
23
30
|
import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
24
|
-
import { AgentHostAllowSignedOutWhenUsableSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService';
|
|
25
|
-
import {
|
|
31
|
+
import { AgentHostMcpToolRoutingEnabledSettingId, AgentHostAllowSignedOutWhenUsableSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService';
|
|
32
|
+
import { AgentHostCanvasCollection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/canvases/common/agentHostCanvas';
|
|
33
|
+
import { isCanvasOwner } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/canvases/common/canvas';
|
|
34
|
+
import { fromAgentHostUri, agentHostAuthority, LOCAL_AGENT_HOST_AUTHORITY } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
|
|
35
|
+
import { isCopilotAgentHostSessionType, isCopilotAgentHostProvider } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostSessionType';
|
|
26
36
|
import { isCustomizationEnabled } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/customizationEnablement';
|
|
27
37
|
import { findDeepestContainingWorkingDirectory } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostWorkingDirectories';
|
|
28
|
-
import { getElementAttachmentCorrelationId, toElementAttachmentMeta, AgentHostElementAttachmentDisplayKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/agentElementAttachments';
|
|
29
|
-
import { AgentFeedbackAttachmentDisplayKind, AgentFeedbackAttachmentMetadataKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/agentFeedbackAttachments';
|
|
30
|
-
import { BrowserViewAttachmentMetadataKey, BrowserViewAttachmentDisplayKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/browserViewAttachments';
|
|
31
|
-
import { readToolCallMeta } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/agentToolCallMeta';
|
|
32
|
-
import {
|
|
38
|
+
import { getElementAttachmentCorrelationId, toElementAttachmentMeta, AgentHostElementAttachmentDisplayKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/vscode/agentElementAttachments';
|
|
39
|
+
import { AgentFeedbackAttachmentDisplayKind, AgentFeedbackAttachmentMetadataKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/vscode/agentFeedbackAttachments';
|
|
40
|
+
import { BrowserViewAttachmentMetadataKey, BrowserViewAttachmentDisplayKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/vscode/browserViewAttachments';
|
|
41
|
+
import { readToolCallMeta, readAgentToolOutputDelta } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/agentToolCallMeta';
|
|
42
|
+
import { filterSessionConfigValues } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/sessionConfigProperties';
|
|
43
|
+
import { readAttachmentDetail, withAttachmentDetail } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/attachmentMeta';
|
|
44
|
+
import { toAgentPermissionResponseMeta, readAgentPermissionResponseMeta } from '../../../../../../platform/agentHost/common/meta/vscode/agentPermissionResponseMeta.js';
|
|
45
|
+
import { readCompletionAttachmentMeta } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/vscode/agentCompletionAttachmentMeta';
|
|
46
|
+
import { readSlashCommandResource } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/vscode/agentSlashCommandOutputMeta';
|
|
33
47
|
import { IRemoteAgentHostService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/remoteAgentHostService.service';
|
|
48
|
+
import { agentHostClientConnectionKindValidator, AgentHostClientConnectionKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostTelemetry';
|
|
34
49
|
import { SessionConfigKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/sessionConfigKeys';
|
|
35
|
-
import {
|
|
50
|
+
import { mergeChatSensitiveEditLocations, getChatSensitiveEditLocations, ChatHookFilesLocationsSettingId, ChatAgentFilesLocationsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/chat/common/chatSettings';
|
|
51
|
+
import { resolveAgentHostSessionTrustFolders } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostWorkspaceTrust';
|
|
36
52
|
import { SEMANTIC_SEARCH_TOOL_NAME, CLIENT_SEMANTIC_SEARCH_TOOL_ID } from '../../../../../../platform/agentHost/common/semanticSearchConstants.js';
|
|
37
53
|
import { RUNTIME_TOOL_SEARCH_TOOL_NAME, CLIENT_TOOL_SEARCH_REFERENCE_NAME } from '../../../../../../platform/agentHost/common/toolSearchConstants.js';
|
|
38
54
|
import { observableFromSubscription } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/agentSubscription';
|
|
@@ -42,7 +58,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/p
|
|
|
42
58
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/commands';
|
|
43
59
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
|
|
44
60
|
import { CustomizationType, SessionInputRequestKind, McpServerStatus, SessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
|
|
45
|
-
import { MessageKind, ToolCallConfirmationReason, ToolCallStatus, ChatInputAnswerValueKind, ChatInputAnswerState, ChatInputQuestionKind, ChatInputResponseKind, MessageAttachmentKind, ChatOriginKind, PendingMessageKind,
|
|
61
|
+
import { MessageKind, ToolCallConfirmationReason, ToolCallStatus, ChatInputAnswerValueKind, ChatInputAnswerState, ChatInputQuestionKind, ChatInputResponseKind, BackgroundWorkKind, MessageAttachmentKind, ChatOriginKind, TurnState, PendingMessageKind, ResponsePartKind, ToolCallContributorKind, ConfirmationOptionKind, ToolCallCancellationReason, ToolResultContentType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-chat/state';
|
|
46
62
|
import { TerminalClaimKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-terminal/state';
|
|
47
63
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/state';
|
|
48
64
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-resource-watch/state';
|
|
@@ -51,7 +67,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/p
|
|
|
51
67
|
import { compareProtocolVersions } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/version/registry';
|
|
52
68
|
import { isChatAction } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionActions';
|
|
53
69
|
import { ProtocolError, AHP_NOT_FOUND, AHP_AUTH_REQUIRED } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionProtocol';
|
|
54
|
-
import { parseChatUri, buildSubagentChatUri, isDefaultChatUri, isChatReadOnly,
|
|
70
|
+
import { parseChatUri, buildSubagentChatUri, isDefaultChatUri, isChatReadOnly, isSubagentChatUri, getErrorResponsePart, getTurnError, StateComponents, buildChatUri, buildDefaultChatUri, mergeSessionWithDefaultChat, readSessionWorkspaceless } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
|
|
55
71
|
import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
|
|
56
72
|
import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
|
|
57
73
|
import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
|
|
@@ -59,14 +75,17 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
|
|
|
59
75
|
import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
|
|
60
76
|
import { packErrorForTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/errorTelemetry';
|
|
61
77
|
import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
|
|
78
|
+
import { logSettingExperimentTrigger } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/experimentTrigger';
|
|
62
79
|
import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
|
|
63
|
-
import
|
|
80
|
+
import '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService';
|
|
81
|
+
import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
64
82
|
import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
|
|
65
83
|
import { IWorkspaceTrustRequestService, IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
|
|
66
84
|
import { IAgentHostTerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/agentHostTerminalService.service';
|
|
67
85
|
import { ITerminalChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
|
|
68
86
|
import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
69
87
|
import { isImageVariableEntry, isAgentFeedbackVariableEntry, isBrowserViewVariableEntry, isChatTranscriptContextVariableEntry, toChatTranscriptContextAttachmentMeta, ChatTranscriptContextAttachmentDisplayKind, getAgentHostCompletionReferenceKind, AgentHostCompletionReferenceKind, isChatReferenceVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
|
|
88
|
+
import '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
|
|
70
89
|
import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
|
|
71
90
|
import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
|
|
72
91
|
import { ChatInputStateOrigin, reviveSerializableInputState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
|
|
@@ -75,11 +94,13 @@ import { ToolInvocationPresentation, stringifyPromptTsxPart } from '@codingame/m
|
|
|
75
94
|
import { coerceImageBuffer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatImageBuffer';
|
|
76
95
|
import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
|
|
77
96
|
import { isInConversationModelChoice } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/modelSelection';
|
|
78
|
-
import {
|
|
97
|
+
import { readAgentRuntimeModelConfiguration } from '../../../../../../platform/agentHost/common/meta/vscode/agentModelConfigurationMeta.js';
|
|
98
|
+
import { isTerminalCommandPrompt } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
|
|
79
99
|
import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
|
|
80
100
|
import { IWorkingCopyService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
|
|
81
101
|
import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
|
|
82
102
|
import { CHAT_SUBAGENT_RESOURCE_QUERY_PARAM, ChatModeKind, ChatAgentLocation, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
|
|
103
|
+
import { normalizeAgentHostApprovalConfig } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/agentHostConfigPolicy';
|
|
83
104
|
import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
|
|
84
105
|
import { HIDE_AUTO_EXPLAINABILITY_TREATMENT } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAutoModeExplainability';
|
|
85
106
|
import { AUTO_RAW_MODEL_ID, getLanguageModelDisplayNameWithProvider } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
|
|
@@ -93,6 +114,7 @@ import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/
|
|
|
93
114
|
import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
|
|
94
115
|
import { getAgentSessionProviderIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
|
|
95
116
|
import { IAgentHostActiveClientService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.service';
|
|
117
|
+
import { getMcpServerDisplayLabel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService';
|
|
96
118
|
import { IAgentHostCustomizationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.service';
|
|
97
119
|
import { IAgentHostSessionWorkingDirectoryResolver } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionWorkingDirectoryResolver.service';
|
|
98
120
|
import { IAgentHostSessionWorkingDirectorySynchronizer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionWorkingDirectorySynchronizer.service';
|
|
@@ -101,27 +123,34 @@ import { computeWorkingDirectories } from '@codingame/monaco-vscode-api/vscode/v
|
|
|
101
123
|
import { IAgentHostNewSessionFolderService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostNewSessionFolderService.service';
|
|
102
124
|
import { AgentHostSnapshotController } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSnapshotController';
|
|
103
125
|
import { AgentHostResponseFileChangesProvider } from './agentHostResponseFileChanges.js';
|
|
126
|
+
import { AgentHostChatInputState, codexWriterLockMessage } from './agentHostChatInputState.js';
|
|
127
|
+
import { readChatInputState } from '../../../../../../platform/agentHost/common/meta/vscode/agentHostChatInputState.js';
|
|
128
|
+
import { AgentHostSandboxNotification } from './agentHostSandboxNotification.js';
|
|
104
129
|
import { IChatResponseFileChangesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatResponseFileChangesService.service';
|
|
105
130
|
import { toSessionReferenceModelRepresentation, toSessionReferenceAttachmentMeta, AgentHostSessionReferenceAttachmentDisplayKind, AgentHostSessionReferenceTrajectoryAttachmentDisplayKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionReferenceAttachment';
|
|
106
131
|
import { buildHostLocalEventsPath } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/copilotCliEventsUri';
|
|
107
|
-
import { isCopilotCliSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostToolSetEnablementService';
|
|
108
132
|
import { IAgentHostUntitledProvisionalSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.service';
|
|
109
133
|
import { IAgentHostImportConversationStore } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostImportConversationStore.service';
|
|
110
|
-
import { BOOLEAN_TRUE_OPTION_ID, parseAhpTerminalToolSessionId, turnsToHistory, messageToRequestOrigin, messageToRequestSource, messageToVariableData, activeTurnToProgress, systemNotificationToChatPart, usageInfoToChatUsage, usageInfoToQuotas, shouldObserveSubagentChat, toolCallStateToInvocation,
|
|
111
|
-
import {
|
|
134
|
+
import { BOOLEAN_TRUE_OPTION_ID, parseAhpTerminalToolSessionId, turnsToHistory, messageToRequestOrigin, messageToRequestSource, messageToVariableData, turnToResponseDetails, activeTurnToProgress, systemNotificationToChatPart, getAgentHostActivityProgressId, usageInfoToChatUsage, usageInfoToQuotas, shouldObserveSubagentChat, toolCallStateToInvocation, toolCallStateToStreamingInvocation, appendToolOutput, updateStreamingToolInvocation, toolCallStateToPreparedInvocation, toolCallAuthenticationServer, stringOrMarkdownToString, updateRunningToolSpecificData, canOwnSubagentChat, isSubagentTool, createInputRequestCarousel, convertProtocolAnswers, containsAutomaticReplyAnswer, createInputRequestPlanReview, convertProtocolPlanReviewResult, getUrlInputRequestPresentation, getTerminalContent, makeAhpTerminalToolSessionId, finalizeToolInvocation, completedToolCallToEditParts, completedToolCallToSerialized, messageAttachmentsToVariableData, usageInfoToAutoModeResolution, formatTurnResponseDetails, rewriteAgentHostLinkTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/stateToProgressAdapter';
|
|
135
|
+
import { COPILOT_HYDRA_FUSION_MODEL_NAMES, COPILOT_HYDRA_FUSION_MODEL_ID, AgentHostEnsembleIntelligenceUsesHydraFusionSettingId, isCopilotHydraFusionModelId } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/copilotCliConfig';
|
|
136
|
+
import { getEnsembleTierLabel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/modelPicker/modelPickerPresentation';
|
|
137
|
+
import { agentHostMcpServerId, autoAuthenticateMcpServer, modelRequiresAgentAuthentication } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostAuth';
|
|
112
138
|
import { isUnstartedSubagent, AgentHostSubagentProgress } from './agentHostSubagentProgress.js';
|
|
113
139
|
import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
|
|
140
|
+
import { COPILOT_CLI_AGENT_PROVIDER_ID, AgentSession, CODEX_AGENT_PROVIDER_ID } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agent';
|
|
114
141
|
import { ActionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/actions';
|
|
115
142
|
import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
|
|
116
143
|
import { autorun, autorunPerKeyedItem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
|
|
144
|
+
import { withMessageHiddenFromTranscript } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/meta/vscode/agentMessageMeta';
|
|
117
145
|
import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
|
|
118
146
|
import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
|
|
119
|
-
import {
|
|
147
|
+
import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
|
|
120
148
|
import { waitForState } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utilsCancellation';
|
|
149
|
+
import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/platform/path/common/pathService.service';
|
|
150
|
+
import { getInlineToolInput } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/partialToolInput';
|
|
121
151
|
|
|
122
152
|
var AgentHostSessionHandler_1;
|
|
123
153
|
const MAX_INLINED_UNSAVED_EDITOR_BYTES = 1024 * 1024;
|
|
124
|
-
const CHAT_ACTIVITY_PROGRESS_ID = "agentHost.chatActivity";
|
|
125
154
|
const CUSTOMIZATION_ENABLEMENT_PROTOCOL_VERSION = "0.8.0";
|
|
126
155
|
const UNOBSERVED_CLIENT_TOOL_GRACE_MS = 5000;
|
|
127
156
|
function isResumeTurnConfirmationData(value) {
|
|
@@ -183,11 +212,11 @@ function getSubagentTiming(state) {
|
|
|
183
212
|
duration: endedAt !== undefined ? Math.max(0, endedAt - startedAt) : undefined
|
|
184
213
|
};
|
|
185
214
|
}
|
|
186
|
-
function
|
|
215
|
+
function requestMessage(text, attachments, metadata, isSystemInitiated, origin) {
|
|
187
216
|
return {
|
|
188
217
|
text,
|
|
189
|
-
origin: {
|
|
190
|
-
kind: MessageKind.User
|
|
218
|
+
origin: origin && (origin.kind !== MessageKind.User || !isSystemInitiated) ? origin : {
|
|
219
|
+
kind: isSystemInitiated ? MessageKind.SystemNotification : MessageKind.User
|
|
191
220
|
},
|
|
192
221
|
...(attachments?.length ? {
|
|
193
222
|
attachments: [...attachments]
|
|
@@ -283,6 +312,27 @@ function confirmedReasonToProtocol(reason) {
|
|
|
283
312
|
return ToolCallConfirmationReason.UserAction;
|
|
284
313
|
}
|
|
285
314
|
}
|
|
315
|
+
function confirmedReasonToDecisionSource(reason, cancellationToken) {
|
|
316
|
+
switch (reason.type) {
|
|
317
|
+
case ToolConfirmKind.UserAction:
|
|
318
|
+
return "human_response";
|
|
319
|
+
case ToolConfirmKind.ConfirmationNotNeeded:
|
|
320
|
+
case ToolConfirmKind.Setting:
|
|
321
|
+
case ToolConfirmKind.LmServicePerTool:
|
|
322
|
+
return "host_policy";
|
|
323
|
+
case ToolConfirmKind.Denied:
|
|
324
|
+
case ToolConfirmKind.Skipped:
|
|
325
|
+
switch (reason.source) {
|
|
326
|
+
case "user":
|
|
327
|
+
return "human_response";
|
|
328
|
+
case "hook":
|
|
329
|
+
case "riskAssessment":
|
|
330
|
+
return "host_policy";
|
|
331
|
+
default:
|
|
332
|
+
return cancellationToken.isCancellationRequested ? "unattended_fallback" : undefined;
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
}
|
|
286
336
|
function getClientToolPreApproval(toolCall) {
|
|
287
337
|
if (readToolCallMeta(toolCall).autoApproveBySetting === true) {
|
|
288
338
|
return {
|
|
@@ -462,13 +512,23 @@ function snapshotInvocationToAdopt(opts, toolCallId) {
|
|
|
462
512
|
return emitted instanceof ChatToolInvocation ? emitted : undefined;
|
|
463
513
|
}
|
|
464
514
|
let AgentHostChatSession = class AgentHostChatSession extends Disposable {
|
|
515
|
+
get history() {
|
|
516
|
+
return this._history;
|
|
517
|
+
}
|
|
518
|
+
updateHistory(history) {
|
|
519
|
+
this._history = history;
|
|
520
|
+
this._onDidChangeHistory.fire(history);
|
|
521
|
+
}
|
|
465
522
|
constructor(
|
|
466
523
|
sessionResource,
|
|
467
|
-
|
|
524
|
+
_history,
|
|
468
525
|
title,
|
|
526
|
+
backendSession,
|
|
469
527
|
sessionSubscription,
|
|
470
528
|
chatSubscription,
|
|
529
|
+
canvasProvider,
|
|
471
530
|
_promptCacheNotification,
|
|
531
|
+
refreshChat,
|
|
472
532
|
_forkSession,
|
|
473
533
|
_renameSession,
|
|
474
534
|
inputState,
|
|
@@ -476,27 +536,46 @@ let AgentHostChatSession = class AgentHostChatSession extends Disposable {
|
|
|
476
536
|
historySubagentObservations,
|
|
477
537
|
onDispose,
|
|
478
538
|
interruptActiveResponse,
|
|
479
|
-
_logService
|
|
539
|
+
_logService,
|
|
540
|
+
_instantiationService
|
|
480
541
|
) {
|
|
481
542
|
super();
|
|
482
543
|
this.sessionResource = sessionResource;
|
|
483
|
-
this.
|
|
544
|
+
this._history = _history;
|
|
484
545
|
this.title = title;
|
|
485
546
|
this._promptCacheNotification = _promptCacheNotification;
|
|
486
547
|
this._forkSession = _forkSession;
|
|
487
548
|
this._renameSession = _renameSession;
|
|
488
549
|
this._logService = _logService;
|
|
550
|
+
this._instantiationService = _instantiationService;
|
|
489
551
|
this.progressObs = observableValue("agentHostProgress", []);
|
|
490
552
|
this.isCompleteObs = observableValue("agentHostComplete", true);
|
|
491
553
|
this._sessionState = observableValue(this, constObservable(undefined));
|
|
492
554
|
this._chatState = observableValue(this, constObservable(undefined));
|
|
555
|
+
this.backgroundShellCount = derived(
|
|
556
|
+
this,
|
|
557
|
+
reader => this._chatState.read(reader).read(reader)?.backgroundWork?.filter(work => work.kind === BackgroundWorkKind.Shell).length
|
|
558
|
+
);
|
|
559
|
+
this._canvasDisposed = observableValue(this, false);
|
|
493
560
|
this._promptCacheTracking = this._register(( new MutableDisposable()));
|
|
561
|
+
this._sandboxNotification = this._register(( new MutableDisposable()));
|
|
494
562
|
this._subagentTurnStores = this._register(( new DisposableMap()));
|
|
495
563
|
this._onWillDispose = this._register(( new Emitter()));
|
|
496
564
|
this.onWillDispose = this._onWillDispose.event;
|
|
497
565
|
this._onDidStartServerRequest = this._register(( new Emitter()));
|
|
498
566
|
this.onDidStartServerRequest = this._onDidStartServerRequest.event;
|
|
499
|
-
this.
|
|
567
|
+
this._onDidChangeHistory = this._register(( new Emitter()));
|
|
568
|
+
this.onDidChangeHistory = this._onDidChangeHistory.event;
|
|
569
|
+
const providerInputState = derived(this, reader => {
|
|
570
|
+
const session = this._sessionState.read(reader).read(reader);
|
|
571
|
+
const chat = this._chatState.read(reader).read(reader);
|
|
572
|
+
return session && chat && !((session.status | chat.status) & SessionStatus.IsArchived) ? readChatInputState(session, chat.resource) : undefined;
|
|
573
|
+
});
|
|
574
|
+
this._inputState = refreshChat ? this._register(
|
|
575
|
+
this._instantiationService.createInstance(AgentHostChatInputState, sessionResource, providerInputState, refreshChat)
|
|
576
|
+
) : undefined;
|
|
577
|
+
this.isInputBlocked = this._inputState?.isInputBlocked ?? constObservable(false);
|
|
578
|
+
this.retryInput = this._inputState ? () => this._inputState.retry() : undefined;
|
|
500
579
|
this.isReadOnly = derived(this, reader => {
|
|
501
580
|
const sessionArchived = Boolean(
|
|
502
581
|
(this._sessionState.read(reader).read(reader)?.status ?? 0) & SessionStatus.IsArchived
|
|
@@ -504,6 +583,33 @@ let AgentHostChatSession = class AgentHostChatSession extends Disposable {
|
|
|
504
583
|
const chat = this._chatState.read(reader).read(reader);
|
|
505
584
|
return (!chat && ( ( new URLSearchParams(this.sessionResource.query)).has(CHAT_SUBAGENT_RESOURCE_QUERY_PARAM))) || isChatReadOnly(chat?.interactivity, sessionArchived);
|
|
506
585
|
});
|
|
586
|
+
this.setStateSubscriptions(sessionSubscription, chatSubscription);
|
|
587
|
+
if (canvasProvider) {
|
|
588
|
+
const presentationChat = derived(
|
|
589
|
+
this,
|
|
590
|
+
reader => this._canvasDisposed.read(reader) ? undefined : this._chatState.read(reader).read(reader)
|
|
591
|
+
);
|
|
592
|
+
const references = derived(this, reader => {
|
|
593
|
+
const chat = presentationChat.read(reader);
|
|
594
|
+
return chat?.canvases ?? (chat ? [] : undefined);
|
|
595
|
+
});
|
|
596
|
+
const owner = derivedOpts({
|
|
597
|
+
owner: this,
|
|
598
|
+
equalsFn: (first, second) => first === second || (!!first && !!second && isCanvasOwner(first, second))
|
|
599
|
+
}, reader => {
|
|
600
|
+
const session = this._sessionState.read(reader).read(reader);
|
|
601
|
+
const chat = this._chatState.read(reader).read(reader);
|
|
602
|
+
return !this._canvasDisposed.read(reader) && session && chat ? {
|
|
603
|
+
providerId: canvasProvider.providerId,
|
|
604
|
+
session: backendSession,
|
|
605
|
+
chat: ( URI.parse(chat.resource, true))
|
|
606
|
+
} : undefined;
|
|
607
|
+
});
|
|
608
|
+
this.canvasContext = derived(this, reader => {
|
|
609
|
+
const reference = owner.read(reader);
|
|
610
|
+
return reference ? canvasProvider.createContext(reference, references, presentationChat) : undefined;
|
|
611
|
+
});
|
|
612
|
+
}
|
|
507
613
|
const hasActiveTurn = initialProgress !== undefined;
|
|
508
614
|
this.transferredState = inputState ? {
|
|
509
615
|
editingSession: undefined,
|
|
@@ -522,6 +628,10 @@ let AgentHostChatSession = class AgentHostChatSession extends Disposable {
|
|
|
522
628
|
setStateSubscriptions(sessionSubscription, chatSubscription) {
|
|
523
629
|
this._promptCacheTracking.clear();
|
|
524
630
|
this._promptCacheTracking.value = sessionSubscription ? this._promptCacheNotification?.trackSession(this.sessionResource, sessionSubscription) : undefined;
|
|
631
|
+
this._sandboxNotification.clear();
|
|
632
|
+
if (sessionSubscription) {
|
|
633
|
+
this._sandboxNotification.value = this._instantiationService.createInstance(AgentHostSandboxNotification, this.sessionResource, sessionSubscription);
|
|
634
|
+
}
|
|
525
635
|
transaction(tx => {
|
|
526
636
|
this._sessionState.set(
|
|
527
637
|
sessionSubscription ? observableFromSubscription(this, sessionSubscription) : constObservable(undefined),
|
|
@@ -535,6 +645,8 @@ let AgentHostChatSession = class AgentHostChatSession extends Disposable {
|
|
|
535
645
|
}
|
|
536
646
|
dispose() {
|
|
537
647
|
if (!this._store.isDisposed) {
|
|
648
|
+
this._canvasDisposed.set(true, undefined);
|
|
649
|
+
this.complete();
|
|
538
650
|
this._onWillDispose.fire();
|
|
539
651
|
}
|
|
540
652
|
super.dispose();
|
|
@@ -568,7 +680,14 @@ let AgentHostChatSession = class AgentHostChatSession extends Disposable {
|
|
|
568
680
|
this._onDidStartServerRequest.fire({
|
|
569
681
|
id: turnId,
|
|
570
682
|
prompt,
|
|
683
|
+
...(options?.metadata ? {
|
|
684
|
+
metadata: options.metadata
|
|
685
|
+
} : {}),
|
|
571
686
|
variableData,
|
|
687
|
+
...(options?.modelId ? {
|
|
688
|
+
modelId: options.modelId,
|
|
689
|
+
modelConfiguration: options.modelConfiguration
|
|
690
|
+
} : {}),
|
|
572
691
|
isSystemInitiated: options?.isSystemInitiated,
|
|
573
692
|
requestSource: options?.requestSource,
|
|
574
693
|
systemInitiatedLabel: options?.systemInitiatedLabel,
|
|
@@ -581,7 +700,7 @@ let AgentHostChatSession = class AgentHostChatSession extends Disposable {
|
|
|
581
700
|
});
|
|
582
701
|
}
|
|
583
702
|
};
|
|
584
|
-
AgentHostChatSession = ( __decorate([( __param(
|
|
703
|
+
AgentHostChatSession = ( __decorate([( __param(16, ILogService)), ( __param(17, IInstantiationService))], AgentHostChatSession));
|
|
585
704
|
function offsetToPosition(text, offset) {
|
|
586
705
|
let lineNumber = 1;
|
|
587
706
|
let column = 1;
|
|
@@ -726,6 +845,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
726
845
|
_chatWidgetService,
|
|
727
846
|
_languageModelsService,
|
|
728
847
|
_openerService,
|
|
848
|
+
_editorService,
|
|
729
849
|
_activeClientService,
|
|
730
850
|
_chatEntitlementService,
|
|
731
851
|
_workspaceTrustRequestService,
|
|
@@ -738,7 +858,8 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
738
858
|
_remoteAgentHostService,
|
|
739
859
|
_customizationService,
|
|
740
860
|
_telemetryService,
|
|
741
|
-
assignmentService
|
|
861
|
+
assignmentService,
|
|
862
|
+
_connectionsService
|
|
742
863
|
) {
|
|
743
864
|
super();
|
|
744
865
|
this._chatAgentService = _chatAgentService;
|
|
@@ -759,6 +880,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
759
880
|
this._chatWidgetService = _chatWidgetService;
|
|
760
881
|
this._languageModelsService = _languageModelsService;
|
|
761
882
|
this._openerService = _openerService;
|
|
883
|
+
this._editorService = _editorService;
|
|
762
884
|
this._activeClientService = _activeClientService;
|
|
763
885
|
this._chatEntitlementService = _chatEntitlementService;
|
|
764
886
|
this._workspaceTrustRequestService = _workspaceTrustRequestService;
|
|
@@ -771,6 +893,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
771
893
|
this._remoteAgentHostService = _remoteAgentHostService;
|
|
772
894
|
this._customizationService = _customizationService;
|
|
773
895
|
this._telemetryService = _telemetryService;
|
|
896
|
+
this._connectionsService = _connectionsService;
|
|
774
897
|
this._activeSessions = ( new ResourceMap());
|
|
775
898
|
this._chatURIsBySessionResource = ( new ResourceMap());
|
|
776
899
|
this._pendingMessageSubscriptions = this._register(( new DisposableResourceMap()));
|
|
@@ -789,6 +912,8 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
789
912
|
this._surfacedMcpAuthServers = ( new ResourceMap());
|
|
790
913
|
this._pendingMcpAutoAuthentication = ( new Map());
|
|
791
914
|
this._clientDispatchedTurnIds = ( new Set());
|
|
915
|
+
this._turnObservations = this._register(( new DisposableSet()));
|
|
916
|
+
this._lifetime = ( new CancellationTokenSource());
|
|
792
917
|
this._turnStopWatches = ( new Map());
|
|
793
918
|
this._sessionSubscriptions = ( new Map());
|
|
794
919
|
this._workingDirectoryRegistrations = this._register(( new DisposableMap()));
|
|
@@ -799,6 +924,13 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
799
924
|
this._hydratingChatSessions = ( new Map());
|
|
800
925
|
this._hideAutoExplainability = observableValue("hideAutoExplainability", undefined);
|
|
801
926
|
this._config = config;
|
|
927
|
+
if (config.supportsCanvasPresentation && config.provider === COPILOT_CLI_AGENT_PROVIDER_ID) {
|
|
928
|
+
this._canvasProvider = this._register(this._instantiationService.createInstance(
|
|
929
|
+
AgentHostCanvasCollection,
|
|
930
|
+
`${config.connectionAuthority}/${config.provider}`,
|
|
931
|
+
config.connection
|
|
932
|
+
));
|
|
933
|
+
}
|
|
802
934
|
const readHideAutoExplainability = () => assignmentService.getTreatment(HIDE_AUTO_EXPLAINABILITY_TREATMENT).then(hidden => this._hideAutoExplainability.set(hidden === true, undefined)).catch(err => {
|
|
803
935
|
this._logService.warn(`[AgentHost] Failed to resolve ${HIDE_AUTO_EXPLAINABILITY_TREATMENT}`, err);
|
|
804
936
|
this._hideAutoExplainability.set(false, undefined);
|
|
@@ -869,8 +1001,8 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
869
1001
|
config.connectionAuthority,
|
|
870
1002
|
sessionResource => this._resolveSessionUri(sessionResource),
|
|
871
1003
|
sessionResource => {
|
|
872
|
-
const
|
|
873
|
-
return
|
|
1004
|
+
const backendSession = this._resolveSessionUri(sessionResource);
|
|
1005
|
+
return backendSession ? ( URI.parse(this._getChatURIOrDefault(sessionResource, backendSession))) : undefined;
|
|
874
1006
|
},
|
|
875
1007
|
this._logService
|
|
876
1008
|
))))
|
|
@@ -952,6 +1084,12 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
952
1084
|
isSkill: true
|
|
953
1085
|
} : {}),
|
|
954
1086
|
description: completionMeta.description ?? "",
|
|
1087
|
+
...(completionMeta.retriggerSuggestions ? {
|
|
1088
|
+
retriggerSuggestions: true
|
|
1089
|
+
} : {}),
|
|
1090
|
+
...(completionMeta.submitOnAccept ? {
|
|
1091
|
+
submitOnAccept: true
|
|
1092
|
+
} : {}),
|
|
955
1093
|
...(attachment._meta !== undefined && {
|
|
956
1094
|
_meta: attachment._meta
|
|
957
1095
|
})
|
|
@@ -972,7 +1110,9 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
972
1110
|
})
|
|
973
1111
|
});
|
|
974
1112
|
}
|
|
975
|
-
return
|
|
1113
|
+
return this._createCompletionItem(raw, text, {
|
|
1114
|
+
kind: "text"
|
|
1115
|
+
}, attachment.label !== raw.insertText ? attachment.label : undefined);
|
|
976
1116
|
}
|
|
977
1117
|
case MessageAttachmentKind.Resource:
|
|
978
1118
|
{
|
|
@@ -1028,9 +1168,12 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1028
1168
|
`Agent host chat sessions must be created by the sessions provider: ${( sessionResource.toString())}`
|
|
1029
1169
|
));
|
|
1030
1170
|
}
|
|
1031
|
-
|
|
1171
|
+
let resolvedSession = this._resolveSessionUri(sessionResource);
|
|
1032
1172
|
let chatURI;
|
|
1033
1173
|
const isNewSession = this._isNewSessionResource(sessionResource);
|
|
1174
|
+
if (!isNewSession && !this._provisionalService.get(sessionResource) && !this._resolveAdvertisedSessionUri(sessionResource)) {
|
|
1175
|
+
resolvedSession = await this._discoverSessionIdentity(sessionResource, token);
|
|
1176
|
+
}
|
|
1034
1177
|
this._logService.trace(`[AgentHost] provideChatSessionContent start: ${( resolvedSession.toString())} (isNewSession=${isNewSession})`);
|
|
1035
1178
|
const history = [];
|
|
1036
1179
|
let initialProgress;
|
|
@@ -1097,8 +1240,8 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1097
1240
|
this._chatErrorContext(),
|
|
1098
1241
|
this._config.connection.initializeResult.get()?.terminalCommandPrefix,
|
|
1099
1242
|
this._config.connection.resourceUris,
|
|
1100
|
-
this.
|
|
1101
|
-
|
|
1243
|
+
turn => this._getTurnErrorDetails(turn, allowTurnResume),
|
|
1244
|
+
readAgentContextUsage(sessionState, sessionState.turns.at(-1)?.usage)
|
|
1102
1245
|
));
|
|
1103
1246
|
this._logService.trace(
|
|
1104
1247
|
`[AgentHost] provideChatSessionContent: converted ${sessionState.turns.length} turn(s) into ${history.length} history item(s) for ${( resolvedSession.toString())}`
|
|
@@ -1124,7 +1267,10 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1124
1267
|
type: "request",
|
|
1125
1268
|
prompt: sessionState.activeTurn.message.text,
|
|
1126
1269
|
participant: this._config.agentId,
|
|
1127
|
-
modelId: lookup.toLanguageModelId(activeRawModelId),
|
|
1270
|
+
modelId: lookup.toLanguageModelId(sessionState.activeTurn.message.model?.id ?? activeRawModelId),
|
|
1271
|
+
...(sessionState.activeTurn.message.model?.config ? {
|
|
1272
|
+
modelConfiguration: sessionState.activeTurn.message.model.config
|
|
1273
|
+
} : {}),
|
|
1128
1274
|
timestamp: parseTimestamp(sessionState.activeTurn.startedAt),
|
|
1129
1275
|
variableData: messageToVariableData(sessionState.activeTurn.message, this._config.connectionAuthority),
|
|
1130
1276
|
...(isMessageHiddenFromTranscript(sessionState.activeTurn.message) ? {
|
|
@@ -1139,14 +1285,14 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1139
1285
|
resolvedSession,
|
|
1140
1286
|
sessionState.activeTurn.message,
|
|
1141
1287
|
this._config.agentId,
|
|
1142
|
-
this._config.
|
|
1288
|
+
this._config.connectionAuthority
|
|
1143
1289
|
)
|
|
1144
1290
|
});
|
|
1145
1291
|
history.push({
|
|
1146
1292
|
type: "response",
|
|
1147
1293
|
parts: [],
|
|
1148
1294
|
participant: this._config.agentId,
|
|
1149
|
-
details:
|
|
1295
|
+
details: turnToResponseDetails(sessionState.activeTurn, lookup)
|
|
1150
1296
|
});
|
|
1151
1297
|
initialProgress = activeTurnToProgress(
|
|
1152
1298
|
resolvedSession,
|
|
@@ -1161,7 +1307,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1161
1307
|
)))
|
|
1162
1308
|
);
|
|
1163
1309
|
initialResponsePartCount = sessionState.activeTurn.responseParts.length;
|
|
1164
|
-
const actualModelId =
|
|
1310
|
+
const actualModelId = lookup.toActualModelId(sessionState.activeTurn.usage?.model);
|
|
1165
1311
|
if (actualModelId) {
|
|
1166
1312
|
for (const p of initialProgress) {
|
|
1167
1313
|
if (p.kind === "usage") {
|
|
@@ -1176,20 +1322,20 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1176
1322
|
}
|
|
1177
1323
|
} catch (err) {
|
|
1178
1324
|
this._logService.warn(`[AgentHost] Failed to subscribe to existing session: ${( resolvedSession.toString())}`, err);
|
|
1179
|
-
if (history.length === 0 && (sessionResource.fragment || !isNotFoundError(err))) {
|
|
1325
|
+
if (history.length === 0 && (sessionResource.fragment || ( ( new URLSearchParams(sessionResource.query)).has(CHAT_SUBAGENT_RESOURCE_QUERY_PARAM)) || !isNotFoundError(err))) {
|
|
1180
1326
|
history.push({
|
|
1181
1327
|
type: "request",
|
|
1182
1328
|
prompt: "",
|
|
1183
1329
|
participant: this._config.agentId,
|
|
1184
1330
|
isSystemInitiated: true,
|
|
1185
|
-
systemInitiatedLabel: ( localize(
|
|
1331
|
+
systemInitiatedLabel: ( localize(9762, "Couldn't open session"))
|
|
1186
1332
|
});
|
|
1187
1333
|
history.push({
|
|
1188
1334
|
type: "response",
|
|
1189
1335
|
parts: [],
|
|
1190
1336
|
participant: this._config.agentId,
|
|
1191
1337
|
errorDetails: {
|
|
1192
|
-
message: unwrapSessionLoadErrorMessage(err) ?? ( localize(
|
|
1338
|
+
message: unwrapSessionLoadErrorMessage(err) ?? ( localize(9763, "This session couldn't be loaded."))
|
|
1193
1339
|
}
|
|
1194
1340
|
});
|
|
1195
1341
|
}
|
|
@@ -1210,9 +1356,12 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1210
1356
|
sessionResource,
|
|
1211
1357
|
history,
|
|
1212
1358
|
chatTitle,
|
|
1359
|
+
resolvedSession,
|
|
1213
1360
|
sessionSubscription,
|
|
1214
1361
|
chatSubscription,
|
|
1362
|
+
this._canvasProvider,
|
|
1215
1363
|
this._config.promptCacheNotification,
|
|
1364
|
+
this._config.connection.refreshSubscription ? () => this._config.connection.refreshSubscription(( URI.parse(this._getChatURIOrDefault(sessionResource, resolvedSession)))) : undefined,
|
|
1216
1365
|
(request, token) => {
|
|
1217
1366
|
if (!this._getSessionState(( resolvedSession.toString()))) {
|
|
1218
1367
|
throw ( new Error("Cannot fork session before the initial request"));
|
|
@@ -1220,7 +1369,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1220
1369
|
return this._forkSession(sessionResource, resolvedSession, request, token);
|
|
1221
1370
|
},
|
|
1222
1371
|
(title, _token) => {
|
|
1223
|
-
this._config.connection.dispatch(this.
|
|
1372
|
+
this._config.connection.dispatch(this._getChatURIOrDefault(sessionResource, resolvedSession), {
|
|
1224
1373
|
type: ActionType.SessionTitleChanged,
|
|
1225
1374
|
title
|
|
1226
1375
|
});
|
|
@@ -1285,6 +1434,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1285
1434
|
}
|
|
1286
1435
|
this._activeSessions.set(sessionResource, session);
|
|
1287
1436
|
this._configureActiveClientReconciliation(sessionResource, resolvedSession, sessionSubscription);
|
|
1437
|
+
session.prepareForClientTools = token => this._ensureActiveClient(sessionResource, resolvedSession, token);
|
|
1288
1438
|
if (!isNewSession) {
|
|
1289
1439
|
if (chatURI !== undefined) {
|
|
1290
1440
|
this._ensurePendingMessageSubscription(sessionResource, resolvedSession);
|
|
@@ -1348,46 +1498,63 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1348
1498
|
this._register(this._chatAgentService.registerDynamicAgent(agentData, agentImpl));
|
|
1349
1499
|
}
|
|
1350
1500
|
async _invokeAgent(request, progress, cancellationToken) {
|
|
1351
|
-
|
|
1352
|
-
const
|
|
1353
|
-
|
|
1354
|
-
|
|
1355
|
-
|
|
1356
|
-
|
|
1357
|
-
|
|
1358
|
-
|
|
1359
|
-
|
|
1360
|
-
return {};
|
|
1361
|
-
}
|
|
1501
|
+
const firstResponse = ( new AgentHostFirstResponseTiming());
|
|
1502
|
+
const connectionKind = agentHostClientConnectionKindValidator.validate(this._config.connection.clientConnectionKind).content ?? AgentHostClientConnectionKind.Unknown;
|
|
1503
|
+
let outcome = "notDispatched";
|
|
1504
|
+
let sessionId;
|
|
1505
|
+
let chatId;
|
|
1506
|
+
let sessionTurnKind = "unknown";
|
|
1507
|
+
let invocationKind = "unknown";
|
|
1508
|
+
let rendererRootInvocationOrdinal;
|
|
1509
|
+
let trustInteractionRequired = false;
|
|
1362
1510
|
const preparingStatus = ( new MutableDisposable());
|
|
1363
1511
|
let failureStage = "resolveSession";
|
|
1364
1512
|
try {
|
|
1513
|
+
this._logService.info(`[AgentHost] _invokeAgent called for resource: ${( request.sessionResource.toString())}`);
|
|
1514
|
+
const invocationChat = this._getChatURIOrDefault(request.sessionResource, this._resolveSessionUri(request.sessionResource));
|
|
1515
|
+
if (!isSubagentChatUri(invocationChat)) {
|
|
1516
|
+
rendererRootInvocationOrdinal = nextRendererRootInvocationOrdinal();
|
|
1517
|
+
}
|
|
1518
|
+
if (this._config.requiresWorkspaceTrust !== false) {
|
|
1519
|
+
const trustFolders = await this._resolveSessionTrustFolders(request.sessionResource, cancellationToken);
|
|
1520
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
1521
|
+
return {};
|
|
1522
|
+
}
|
|
1523
|
+
if (trustFolders !== undefined && !(await this._ensureFoldersTrusted(trustFolders, () => trustInteractionRequired = true))) {
|
|
1524
|
+
return {};
|
|
1525
|
+
}
|
|
1526
|
+
}
|
|
1527
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
1528
|
+
return {};
|
|
1529
|
+
}
|
|
1365
1530
|
failureStage = "provisionalSession";
|
|
1366
1531
|
await raceCancellation(
|
|
1367
1532
|
this._provisionalService.waitForPending(request.sessionResource),
|
|
1368
1533
|
cancellationToken
|
|
1369
1534
|
);
|
|
1370
|
-
if (cancellationToken
|
|
1535
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
1371
1536
|
return {};
|
|
1372
1537
|
}
|
|
1373
1538
|
const resolvedSession = this._resolveSessionUri(request.sessionResource);
|
|
1374
1539
|
const sessionKey = ( resolvedSession.toString());
|
|
1540
|
+
sessionId = sessionKey;
|
|
1375
1541
|
const provisionalBackend = this._provisionalService.get(request.sessionResource);
|
|
1376
1542
|
if (provisionalBackend) {
|
|
1377
1543
|
this._ensureSessionSubscription(sessionKey);
|
|
1378
1544
|
}
|
|
1379
1545
|
failureStage = "sessionState";
|
|
1380
1546
|
const existingState = await this._readEagerlyCreatedSessionState(resolvedSession, cancellationToken);
|
|
1381
|
-
if (cancellationToken
|
|
1547
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
1382
1548
|
return {};
|
|
1383
1549
|
}
|
|
1550
|
+
const sensitiveEditLocationsConfig = this._getSensitiveEditLocationsConfig(request.sessionResource, existingState);
|
|
1384
1551
|
if (!existingState) {
|
|
1385
1552
|
const imported = this._importConversationStore.take(request.sessionResource);
|
|
1386
1553
|
if (imported) {
|
|
1387
1554
|
preparingStatus.value = disposableTimeout(() => {
|
|
1388
1555
|
progress([{
|
|
1389
1556
|
kind: "progressMessage",
|
|
1390
|
-
content: ( new MarkdownString(( localize(
|
|
1557
|
+
content: ( new MarkdownString(( localize(9764, "Preparing session…")))),
|
|
1391
1558
|
shimmer: true
|
|
1392
1559
|
}]);
|
|
1393
1560
|
}, 500);
|
|
@@ -1395,17 +1562,21 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1395
1562
|
const model = imported?.model ?? this._createModelSelection(request.userSelectedModelId, request.modelConfiguration);
|
|
1396
1563
|
const initialConfig = {
|
|
1397
1564
|
...this._provisionalService.getInitialSessionConfig(),
|
|
1565
|
+
...sensitiveEditLocationsConfig,
|
|
1398
1566
|
...request.agentHostSessionConfig
|
|
1399
1567
|
};
|
|
1400
1568
|
await this._createAndSubscribe(request.sessionResource, model, ( Object.keys(initialConfig)).length > 0 ? initialConfig : undefined, imported ? {
|
|
1401
1569
|
turns: imported.turns,
|
|
1402
1570
|
model: imported.model
|
|
1403
|
-
} : undefined, stage => failureStage = stage);
|
|
1571
|
+
} : undefined, stage => failureStage = stage, cancellationToken);
|
|
1404
1572
|
} else {
|
|
1405
1573
|
failureStage = "authentication";
|
|
1406
1574
|
await this._ensureRequiredAuthentication(
|
|
1407
1575
|
this._createModelSelection(request.userSelectedModelId, request.modelConfiguration)
|
|
1408
1576
|
);
|
|
1577
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
1578
|
+
return {};
|
|
1579
|
+
}
|
|
1409
1580
|
failureStage = "subscribeSession";
|
|
1410
1581
|
const sessionSub = this._ensureSessionSubscription(sessionKey);
|
|
1411
1582
|
const chatURI = this._resolveChatUriFromState(request.sessionResource, existingState);
|
|
@@ -1413,17 +1584,34 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1413
1584
|
const chatSub = this._ensureChatSubscription(sessionKey, chatURI);
|
|
1414
1585
|
this._activeSessions.get(request.sessionResource)?.setStateSubscriptions(sessionSub, chatSub);
|
|
1415
1586
|
this._ensurePendingMessageSubscription(request.sessionResource, resolvedSession);
|
|
1587
|
+
this._ensureDraftSyncSubscription(request.sessionResource, resolvedSession, chatURI);
|
|
1416
1588
|
this._watchForServerInitiatedTurns(resolvedSession, request.sessionResource);
|
|
1417
|
-
|
|
1589
|
+
const sessionConfig = {
|
|
1590
|
+
...sensitiveEditLocationsConfig,
|
|
1591
|
+
...request.agentHostSessionConfig
|
|
1592
|
+
};
|
|
1593
|
+
if (( Object.keys(sessionConfig)).length > 0) {
|
|
1418
1594
|
this._dispatchAction(resolvedSession, {
|
|
1419
1595
|
type: ActionType.SessionConfigChanged,
|
|
1420
|
-
config:
|
|
1596
|
+
config: sessionConfig
|
|
1421
1597
|
});
|
|
1422
1598
|
}
|
|
1423
1599
|
}
|
|
1600
|
+
chatId = this._getChatURI(request.sessionResource);
|
|
1601
|
+
const state = this._getSessionState(sessionKey, chatId);
|
|
1602
|
+
sessionTurnKind = state && isDefaultChatUri(chatId) ? (state.turns.length > 0 ? "later" : "first") : "unknown";
|
|
1603
|
+
const isExistingTurn = state?.activeTurn?.id === request.requestId || state?.turns.some(turn => turn.id === request.requestId) || request.acceptedConfirmationData?.some(isResumeTurnConfirmationData);
|
|
1604
|
+
invocationKind = isSubagentChatUri(chatId) ? "subagent" : isExistingTurn ? "existingTurn" : "newTurn";
|
|
1424
1605
|
const stopWatch = StopWatch.create(false);
|
|
1425
1606
|
let firstProgress;
|
|
1426
1607
|
const measuredProgress = parts => {
|
|
1608
|
+
if (invocationKind === "newTurn") {
|
|
1609
|
+
for (const part of parts) {
|
|
1610
|
+
if (part.kind === "toolInvocation" && part.subAgentInvocationId === undefined) {
|
|
1611
|
+
firstResponse.observeToolCall(part.toolCallId);
|
|
1612
|
+
}
|
|
1613
|
+
}
|
|
1614
|
+
}
|
|
1427
1615
|
preparingStatus.clear();
|
|
1428
1616
|
if (firstProgress === undefined && ( parts.some(isFirstVisibleProgressPart))) {
|
|
1429
1617
|
firstProgress = stopWatch.elapsed();
|
|
@@ -1436,8 +1624,10 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1436
1624
|
request,
|
|
1437
1625
|
measuredProgress,
|
|
1438
1626
|
cancellationToken,
|
|
1439
|
-
stage => failureStage = stage
|
|
1627
|
+
stage => failureStage = stage,
|
|
1628
|
+
invocationKind === "newTurn" ? text => firstResponse.observeText(text) : undefined
|
|
1440
1629
|
);
|
|
1630
|
+
outcome = completedTurn?.state === TurnState.Error ? "error" : completedTurn?.state === TurnState.Cancelled || cancellationToken.isCancellationRequested ? "cancelled" : completedTurn ? "success" : "notDispatched";
|
|
1441
1631
|
const details = this._getTurnResponseDetails(request.sessionResource, resolvedSession, completedTurn);
|
|
1442
1632
|
const errorDetails = this._getTurnErrorDetails(completedTurn);
|
|
1443
1633
|
return {
|
|
@@ -1453,12 +1643,38 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1453
1643
|
} : {})
|
|
1454
1644
|
};
|
|
1455
1645
|
} catch (error) {
|
|
1646
|
+
outcome = isCancellationError(error) ? "cancelled" : "error";
|
|
1456
1647
|
if (!isCancellationError(error)) {
|
|
1457
1648
|
this._reportInvocationFailure(request, failureStage, error);
|
|
1458
1649
|
}
|
|
1459
1650
|
throw error;
|
|
1460
1651
|
} finally {
|
|
1461
1652
|
preparingStatus.dispose();
|
|
1653
|
+
const timing = firstResponse.finish({
|
|
1654
|
+
requestId: request.requestId,
|
|
1655
|
+
provider: this._config.provider,
|
|
1656
|
+
connectionKind,
|
|
1657
|
+
agentSessionId: sessionId,
|
|
1658
|
+
chatId,
|
|
1659
|
+
sessionTurnKind,
|
|
1660
|
+
invocationKind,
|
|
1661
|
+
outcome: cancellationToken.isCancellationRequested ? "cancelled" : outcome,
|
|
1662
|
+
rendererRootInvocationOrdinal,
|
|
1663
|
+
trustInteractionRequired
|
|
1664
|
+
});
|
|
1665
|
+
this._telemetryService.publicLog2("agentHost.firstResponse", timing);
|
|
1666
|
+
this._logService.info(`[AgentHostFirstResponse] ${JSON.stringify({
|
|
1667
|
+
...timing,
|
|
1668
|
+
sessionId,
|
|
1669
|
+
turnId: request.requestId
|
|
1670
|
+
})}`);
|
|
1671
|
+
void this._config.connection.reportFirstResponse?.({
|
|
1672
|
+
...timing,
|
|
1673
|
+
agentSessionId: sessionId ? AgentSession.id(sessionId) : undefined,
|
|
1674
|
+
chatId: chatId ? parseChatUri(chatId)?.chatId : undefined
|
|
1675
|
+
}).catch(
|
|
1676
|
+
() => this._logService.debug("[AgentHostFirstResponse] OTel diagnostic could not be delivered")
|
|
1677
|
+
);
|
|
1462
1678
|
}
|
|
1463
1679
|
}
|
|
1464
1680
|
_reportInvocationFailure(request, failureStage, error) {
|
|
@@ -1482,6 +1698,16 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1482
1698
|
if (!error) {
|
|
1483
1699
|
return undefined;
|
|
1484
1700
|
}
|
|
1701
|
+
if (error.errorType === "CodexThreadInUse") {
|
|
1702
|
+
return {
|
|
1703
|
+
message: ( localize(
|
|
1704
|
+
9765,
|
|
1705
|
+
"{0} Then send your message again in VS Code. Your message has not been sent.",
|
|
1706
|
+
codexWriterLockMessage()
|
|
1707
|
+
)),
|
|
1708
|
+
isExpectedError: true
|
|
1709
|
+
};
|
|
1710
|
+
}
|
|
1485
1711
|
const isExecutionInterrupted = error.errorType === "executionInterrupted";
|
|
1486
1712
|
const forwardedDetails = getChatErrorDetailsFromMeta(error, this._chatErrorContext());
|
|
1487
1713
|
const details = isExecutionInterrupted ? {
|
|
@@ -1490,7 +1716,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1490
1716
|
isExpectedError: true,
|
|
1491
1717
|
level: ChatErrorLevel.Warning
|
|
1492
1718
|
} : forwardedDetails ?? {
|
|
1493
|
-
message: ( localize(
|
|
1719
|
+
message: ( localize(9766, "Error: ({0}) {1}", error.errorType, error.message))
|
|
1494
1720
|
};
|
|
1495
1721
|
if (!allowResume || errorPart?.resumable !== true || details.responseIsFiltered) {
|
|
1496
1722
|
return details;
|
|
@@ -1501,7 +1727,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1501
1727
|
data: {
|
|
1502
1728
|
agentHostResumeTurn: true
|
|
1503
1729
|
},
|
|
1504
|
-
label: isExecutionInterrupted ? ( localize(
|
|
1730
|
+
label: isExecutionInterrupted ? ( localize(9767, "Keep Going")) : ( localize(9768, "Try Again")),
|
|
1505
1731
|
resend: true,
|
|
1506
1732
|
preserveRequestId: true
|
|
1507
1733
|
}]
|
|
@@ -1550,15 +1776,38 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1550
1776
|
const protocolState = this._getSessionState(session, chatURI);
|
|
1551
1777
|
const prevSteering = protocolState?.steeringMessage;
|
|
1552
1778
|
const prevQueued = protocolState?.queuedMessages ?? [];
|
|
1779
|
+
const previousMessages = ( new Map(prevQueued.map(p => [p.id, p.message])));
|
|
1780
|
+
if (prevSteering) {
|
|
1781
|
+
previousMessages.set(prevSteering.id, prevSteering.message);
|
|
1782
|
+
}
|
|
1553
1783
|
let currentSteering;
|
|
1554
1784
|
const currentQueued = [];
|
|
1555
1785
|
for (const p of pending) {
|
|
1556
1786
|
const variables = p.request.variableData?.variables ?? [];
|
|
1557
1787
|
const messageAttachments = this._variableEntriesToAttachments(variables, sessionResource, p.request.message.text);
|
|
1558
1788
|
const attachments = messageAttachments.length > 0 ? messageAttachments : undefined;
|
|
1789
|
+
const model = this._createModelSelection(
|
|
1790
|
+
p.sendOptions.userSelectedModelId,
|
|
1791
|
+
p.sendOptions.userSelectedModelConfiguration
|
|
1792
|
+
);
|
|
1793
|
+
const previousMessage = previousMessages.get(p.request.id);
|
|
1794
|
+
const isSystemInitiated = p.request.isSystemInitiated ?? p.sendOptions.isSystemInitiated;
|
|
1795
|
+
const metadata = p.sendOptions.metadata ?? previousMessage?._meta;
|
|
1796
|
+
const roundTripMetadata = previousMessage && previousMessage.text !== p.request.message.text ? withoutAgentMessageDelegationMeta(metadata) : metadata;
|
|
1559
1797
|
const snapshot = {
|
|
1560
1798
|
id: p.request.id,
|
|
1561
|
-
message:
|
|
1799
|
+
message: {
|
|
1800
|
+
...requestMessage(
|
|
1801
|
+
p.request.message.text,
|
|
1802
|
+
attachments,
|
|
1803
|
+
roundTripMetadata,
|
|
1804
|
+
isSystemInitiated,
|
|
1805
|
+
previousMessage?.origin ?? p.sendOptions.agentHostMessageOrigin
|
|
1806
|
+
),
|
|
1807
|
+
...(model ? {
|
|
1808
|
+
model
|
|
1809
|
+
} : {})
|
|
1810
|
+
}
|
|
1562
1811
|
};
|
|
1563
1812
|
if (p.kind === ChatRequestQueueKind.Steering) {
|
|
1564
1813
|
currentSteering = snapshot;
|
|
@@ -1632,7 +1881,13 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1632
1881
|
id: pending.id,
|
|
1633
1882
|
kind,
|
|
1634
1883
|
message: pending.message.text,
|
|
1635
|
-
variableData: messageToVariableData(pending.message, this._config.connectionAuthority)
|
|
1884
|
+
variableData: messageToVariableData(pending.message, this._config.connectionAuthority),
|
|
1885
|
+
modelId: this._toLanguageModelId(sessionResource, pending.message.model?.id),
|
|
1886
|
+
modelConfiguration: pending.message.model?.config,
|
|
1887
|
+
agentHostMessageOrigin: pending.message.origin,
|
|
1888
|
+
metadata: pending.message._meta,
|
|
1889
|
+
isSystemInitiated: pending.message.origin.kind === MessageKind.SystemNotification,
|
|
1890
|
+
systemInitiatedLabel: readMessageSystemInitiatedLabel(pending.message)
|
|
1636
1891
|
});
|
|
1637
1892
|
const remote = [];
|
|
1638
1893
|
if (state.steeringMessage) {
|
|
@@ -1650,6 +1905,28 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1650
1905
|
}
|
|
1651
1906
|
_dispatchAction(channel, action, chatURI) {
|
|
1652
1907
|
const target = isChatAction(action) ? this._requireChatURI(chatURI, action.type) : ( channel.toString());
|
|
1908
|
+
if (action.type === ActionType.ChatToolCallConfirmed && action._meta) {
|
|
1909
|
+
const {
|
|
1910
|
+
turnId,
|
|
1911
|
+
toolCallId
|
|
1912
|
+
} = action;
|
|
1913
|
+
const parsed = parseChatUri(target);
|
|
1914
|
+
const state = parsed ? this._getSessionState(parsed.session, target) : undefined;
|
|
1915
|
+
const turn = state?.activeTurn?.id === turnId ? state.activeTurn : state?.turns.find(turn => turn.id === turnId);
|
|
1916
|
+
const part = turn?.responseParts.find(
|
|
1917
|
+
part => part.kind === ResponsePartKind.ToolCall && part.toolCall.toolCallId === toolCallId
|
|
1918
|
+
);
|
|
1919
|
+
const toolCall = part?.kind === ResponsePartKind.ToolCall ? part.toolCall : undefined;
|
|
1920
|
+
action = {
|
|
1921
|
+
...action,
|
|
1922
|
+
_meta: toAgentPermissionResponseMeta(readAgentPermissionResponseMeta(action), {
|
|
1923
|
+
_meta: {
|
|
1924
|
+
...toolCall?._meta,
|
|
1925
|
+
...action._meta
|
|
1926
|
+
}
|
|
1927
|
+
})
|
|
1928
|
+
};
|
|
1929
|
+
}
|
|
1653
1930
|
this._config.connection.dispatch(target, action);
|
|
1654
1931
|
}
|
|
1655
1932
|
_requireChatURI(chatURI, actionType) {
|
|
@@ -1659,24 +1936,13 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1659
1936
|
return chatURI;
|
|
1660
1937
|
}
|
|
1661
1938
|
_resolveChatUriFromState(sessionResource, state) {
|
|
1939
|
+
const explicitChatUri = ( new URLSearchParams(sessionResource.query)).get(CHAT_SUBAGENT_RESOURCE_QUERY_PARAM);
|
|
1940
|
+
if (explicitChatUri) {
|
|
1941
|
+
return explicitChatUri;
|
|
1942
|
+
}
|
|
1662
1943
|
if (sessionResource.fragment) {
|
|
1663
|
-
const explicitChatUri = ( new URLSearchParams(sessionResource.query)).get(CHAT_SUBAGENT_RESOURCE_QUERY_PARAM);
|
|
1664
|
-
if (explicitChatUri) {
|
|
1665
|
-
const parsed = parseChatUri(explicitChatUri);
|
|
1666
|
-
if (!parsed || parsed.chatId !== sessionResource.fragment) {
|
|
1667
|
-
throw ( new Error(
|
|
1668
|
-
`Subagent chat URI does not match editor chat '${sessionResource.fragment}'`
|
|
1669
|
-
));
|
|
1670
|
-
}
|
|
1671
|
-
const owningSession = ( URI.parse(parsed.session));
|
|
1672
|
-
const expectedSession = this._resolveSessionUri(sessionResource);
|
|
1673
|
-
if (!isEqual(owningSession, expectedSession)) {
|
|
1674
|
-
throw ( new Error(`Subagent chat belongs to ${( owningSession.toString())}, expected ${( expectedSession.toString())}`));
|
|
1675
|
-
}
|
|
1676
|
-
return explicitChatUri;
|
|
1677
|
-
}
|
|
1678
1944
|
const match = state.chats.find(
|
|
1679
|
-
summary =>
|
|
1945
|
+
summary => getAgentHostChatId(summary.resource) === sessionResource.fragment
|
|
1680
1946
|
);
|
|
1681
1947
|
if (!match) {
|
|
1682
1948
|
throw ( new Error(
|
|
@@ -1700,16 +1966,16 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1700
1966
|
}
|
|
1701
1967
|
return chatURI;
|
|
1702
1968
|
}
|
|
1703
|
-
|
|
1969
|
+
_getChatURIOrDefault(sessionResource, session) {
|
|
1704
1970
|
const mapped = this._chatURIsBySessionResource.get(sessionResource);
|
|
1705
1971
|
if (mapped) {
|
|
1706
1972
|
return mapped;
|
|
1707
1973
|
}
|
|
1708
|
-
if (!sessionResource.fragment) {
|
|
1709
|
-
return buildDefaultChatUri(session);
|
|
1710
|
-
}
|
|
1711
1974
|
const explicitChat = ( new URLSearchParams(sessionResource.query)).get(CHAT_SUBAGENT_RESOURCE_QUERY_PARAM);
|
|
1712
|
-
|
|
1975
|
+
if (explicitChat) {
|
|
1976
|
+
return explicitChat;
|
|
1977
|
+
}
|
|
1978
|
+
return sessionResource.fragment ? buildChatUri(session, sessionResource.fragment) : buildDefaultChatUri(session);
|
|
1713
1979
|
}
|
|
1714
1980
|
_getCurrentActiveClient(sessionResource) {
|
|
1715
1981
|
const entry = this._activeClientEntries.get(sessionResource);
|
|
@@ -1788,6 +2054,49 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1788
2054
|
disposables.add(turnProgressDisposable);
|
|
1789
2055
|
const sessionSub = this._ensureSessionSubscription(sessionStr);
|
|
1790
2056
|
const chatSub = this._ensureChatSubscription(sessionStr, chatURI);
|
|
2057
|
+
let historyRefreshPending = false;
|
|
2058
|
+
const refreshHistory = () => {
|
|
2059
|
+
const state = this._getSessionState(sessionStr, chatURI);
|
|
2060
|
+
const chatSession = this._activeSessions.get(sessionResource);
|
|
2061
|
+
if (!historyRefreshPending || !state || state.activeTurn || !chatSession) {
|
|
2062
|
+
return;
|
|
2063
|
+
}
|
|
2064
|
+
historyRefreshPending = false;
|
|
2065
|
+
const lookup = this._createTurnModelLookup(sessionResource, lastTurnModelSelection(state)?.id);
|
|
2066
|
+
const allowTurnResume = !this._isChatReadOnly(sessionStr, chatURI);
|
|
2067
|
+
chatSession.updateHistory(turnsToHistory(
|
|
2068
|
+
backendSession,
|
|
2069
|
+
state.turns,
|
|
2070
|
+
this._config.agentId,
|
|
2071
|
+
this._config.connectionAuthority,
|
|
2072
|
+
lookup,
|
|
2073
|
+
this._chatErrorContext(),
|
|
2074
|
+
this._config.connection.initializeResult.get()?.terminalCommandPrefix,
|
|
2075
|
+
this._config.connection.resourceUris,
|
|
2076
|
+
turn => this._getTurnErrorDetails(turn, allowTurnResume),
|
|
2077
|
+
readAgentContextUsage(state, state.turns.at(-1)?.usage)
|
|
2078
|
+
));
|
|
2079
|
+
};
|
|
2080
|
+
let previousContextUsage = currentState ? readAgentContextUsage(currentState, currentState.turns.at(-1)?.usage) : undefined;
|
|
2081
|
+
disposables.add(sessionSub.onDidChange(() => {
|
|
2082
|
+
const state = this._getSessionState(sessionStr, chatURI);
|
|
2083
|
+
if (!state || state.activeTurn) {
|
|
2084
|
+
return;
|
|
2085
|
+
}
|
|
2086
|
+
const contextUsage = readAgentContextUsage(state, state.turns.at(-1)?.usage);
|
|
2087
|
+
if (!equals(previousContextUsage, contextUsage)) {
|
|
2088
|
+
previousContextUsage = contextUsage;
|
|
2089
|
+
historyRefreshPending = true;
|
|
2090
|
+
refreshHistory();
|
|
2091
|
+
}
|
|
2092
|
+
}));
|
|
2093
|
+
disposables.add(chatSub.onDidChange(refreshHistory));
|
|
2094
|
+
disposables.add(chatSub.onDidApplyAction(envelope => {
|
|
2095
|
+
if (envelope.action.type === ActionType.ChatTurnsLoaded) {
|
|
2096
|
+
historyRefreshPending = true;
|
|
2097
|
+
refreshHistory();
|
|
2098
|
+
}
|
|
2099
|
+
}));
|
|
1791
2100
|
const onChange = () => {
|
|
1792
2101
|
const state = this._getSessionState(sessionStr, chatURI);
|
|
1793
2102
|
if (!state) {
|
|
@@ -1848,6 +2157,9 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1848
2157
|
activeTurn.message.text,
|
|
1849
2158
|
messageToVariableData(activeTurn.message, this._config.connectionAuthority),
|
|
1850
2159
|
{
|
|
2160
|
+
modelId: this._toLanguageModelId(sessionResource, activeTurn.message.model?.id),
|
|
2161
|
+
metadata: readAgentMessageRoundTripMetadata(activeTurn.message),
|
|
2162
|
+
modelConfiguration: activeTurn.message.model?.config,
|
|
1851
2163
|
isSystemInitiated: activeTurn.message.origin.kind === MessageKind.SystemNotification,
|
|
1852
2164
|
requestSource: messageToRequestSource(activeTurn.message),
|
|
1853
2165
|
systemInitiatedLabel: readMessageSystemInitiatedLabel(activeTurn.message),
|
|
@@ -1863,7 +2175,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
1863
2175
|
backendSession,
|
|
1864
2176
|
activeTurn.message,
|
|
1865
2177
|
this._config.agentId,
|
|
1866
|
-
this._config.
|
|
2178
|
+
this._config.connectionAuthority
|
|
1867
2179
|
)
|
|
1868
2180
|
}
|
|
1869
2181
|
);
|
|
@@ -2102,7 +2414,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2102
2414
|
return invocation;
|
|
2103
2415
|
}
|
|
2104
2416
|
_resolveClientTool(toolName) {
|
|
2105
|
-
const isCopilotSession =
|
|
2417
|
+
const isCopilotSession = isCopilotAgentHostSessionType(this._config.sessionType);
|
|
2106
2418
|
if (isCopilotSession && toolName === SEMANTIC_SEARCH_TOOL_NAME) {
|
|
2107
2419
|
return this._toolsService.getTool(CLIENT_SEMANTIC_SEARCH_TOOL_ID);
|
|
2108
2420
|
}
|
|
@@ -2123,7 +2435,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2123
2435
|
} : {};
|
|
2124
2436
|
const invocation = toolData ? this._ensureClientToolInvocation(chatURI, request.turnId, toolCall.toolCallId, toolData.id, undefined) : undefined;
|
|
2125
2437
|
const fail = (message, code) => {
|
|
2126
|
-
const pastTenseMessage = ( localize(
|
|
2438
|
+
const pastTenseMessage = ( localize(9769, "Couldn't run {0}", toolCall.displayName));
|
|
2127
2439
|
const result = {
|
|
2128
2440
|
content: [],
|
|
2129
2441
|
toolResultError: message,
|
|
@@ -2146,11 +2458,11 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2146
2458
|
});
|
|
2147
2459
|
};
|
|
2148
2460
|
if (!toolData) {
|
|
2149
|
-
fail(( localize(
|
|
2461
|
+
fail(( localize(9770, "Tool \"{0}\" is not available on this client.", toolName)), "toolUnavailable");
|
|
2150
2462
|
return;
|
|
2151
2463
|
}
|
|
2152
2464
|
if (!invocation) {
|
|
2153
|
-
fail(( localize(
|
|
2465
|
+
fail(( localize(9771, "Could not create invocation for client tool \"{0}\".", toolName)), "invocationFailed");
|
|
2154
2466
|
return;
|
|
2155
2467
|
}
|
|
2156
2468
|
const toolInput = "toolInput" in toolCall ? toolCall.toolInput : undefined;
|
|
@@ -2178,7 +2490,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2178
2490
|
parameters = parsed;
|
|
2179
2491
|
} catch {
|
|
2180
2492
|
fail(( localize(
|
|
2181
|
-
|
|
2493
|
+
9772,
|
|
2182
2494
|
"Invalid tool input for \"{0}\": expected JSON object parameters.",
|
|
2183
2495
|
toolName
|
|
2184
2496
|
)), "invalidInput");
|
|
@@ -2203,7 +2515,8 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2203
2515
|
toolId: toolData.id,
|
|
2204
2516
|
parameters,
|
|
2205
2517
|
context: contextSessionResource ? {
|
|
2206
|
-
sessionResource: contextSessionResource
|
|
2518
|
+
sessionResource: contextSessionResource,
|
|
2519
|
+
sandboxNetworkRestrictions: readToolCallMeta(toolCall)["vscode.copilotSandboxNetworkRestrictions"]
|
|
2207
2520
|
} : undefined,
|
|
2208
2521
|
chatStreamToolCallId: toolCall.toolCallId,
|
|
2209
2522
|
preApproved: toolCall.status === ToolCallStatus.PendingConfirmation ? undefined : getClientToolPreApproval(toolCall)
|
|
@@ -2244,10 +2557,10 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2244
2557
|
toolCallId: toolCall.toolCallId,
|
|
2245
2558
|
result: {
|
|
2246
2559
|
success: false,
|
|
2247
|
-
pastTenseMessage: ( localize(
|
|
2560
|
+
pastTenseMessage: ( localize(9773, "Couldn't run {0}", toolCall.displayName)),
|
|
2248
2561
|
error: {
|
|
2249
2562
|
message: ( localize(
|
|
2250
|
-
|
|
2563
|
+
9774,
|
|
2251
2564
|
"{0} needs confirmation but no session was available to answer it.",
|
|
2252
2565
|
toolCall.displayName
|
|
2253
2566
|
)),
|
|
@@ -2296,6 +2609,15 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2296
2609
|
chatSession.complete();
|
|
2297
2610
|
}
|
|
2298
2611
|
}
|
|
2612
|
+
_createTurnObservation(resolve) {
|
|
2613
|
+
const store = ( new DisposableStore());
|
|
2614
|
+
store.add(toDisposable(() => resolve(undefined)));
|
|
2615
|
+
this._turnObservations.add(store);
|
|
2616
|
+
return store;
|
|
2617
|
+
}
|
|
2618
|
+
_isInvocationAbandoned(cancellationToken) {
|
|
2619
|
+
return cancellationToken.isCancellationRequested || this._store.isDisposed;
|
|
2620
|
+
}
|
|
2299
2621
|
_turnStopWatchKey(chatURI, turnId) {
|
|
2300
2622
|
return `${chatURI}\0${turnId}`;
|
|
2301
2623
|
}
|
|
@@ -2315,8 +2637,15 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2315
2637
|
_clearTurnStopWatch(chatURI, turnId) {
|
|
2316
2638
|
this._turnStopWatches.delete(this._turnStopWatchKey(chatURI, turnId));
|
|
2317
2639
|
}
|
|
2318
|
-
async _handleTurn(
|
|
2319
|
-
|
|
2640
|
+
async _handleTurn(
|
|
2641
|
+
session,
|
|
2642
|
+
request,
|
|
2643
|
+
progress,
|
|
2644
|
+
cancellationToken,
|
|
2645
|
+
onFailureStage,
|
|
2646
|
+
onResponseText
|
|
2647
|
+
) {
|
|
2648
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
2320
2649
|
return;
|
|
2321
2650
|
}
|
|
2322
2651
|
onFailureStage("prepareTurn");
|
|
@@ -2325,23 +2654,23 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2325
2654
|
return this._handleResumedTurn(session, request, progress, cancellationToken);
|
|
2326
2655
|
}
|
|
2327
2656
|
await this._workingDirectorySynchronizer.reconcile(session, cancellationToken);
|
|
2328
|
-
if (cancellationToken
|
|
2657
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
2329
2658
|
return;
|
|
2330
2659
|
}
|
|
2331
2660
|
const turnId = request.requestId;
|
|
2332
2661
|
const chatURI = this._getChatURI(request.sessionResource);
|
|
2333
2662
|
const turnChannel = chatURI;
|
|
2334
2663
|
const messageAttachments = await this._convertVariablesToAttachments(request);
|
|
2335
|
-
if (cancellationToken
|
|
2664
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
2336
2665
|
return;
|
|
2337
2666
|
}
|
|
2338
2667
|
await this._ensureActiveClient(request.sessionResource, session, cancellationToken);
|
|
2339
|
-
if (cancellationToken
|
|
2668
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
2340
2669
|
return;
|
|
2341
2670
|
}
|
|
2342
2671
|
this._clientDispatchedTurnIds.add(turnId);
|
|
2343
2672
|
const selectedModel = this._createModelSelection(request.userSelectedModelId, request.modelConfiguration);
|
|
2344
|
-
const requestedAgentUri = request.modeInstructions?.uri
|
|
2673
|
+
const requestedAgentUri = request.modeInstructions?.uri ? ( fromAgentHostUri(request.modeInstructions.uri).toString()) : undefined;
|
|
2345
2674
|
const chatModel = this._chatService.getSession(request.sessionResource);
|
|
2346
2675
|
const protocolState = this._getSessionState(( session.toString()), chatURI);
|
|
2347
2676
|
if (chatModel && protocolState?.turns.length) {
|
|
@@ -2368,7 +2697,13 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2368
2697
|
turnId,
|
|
2369
2698
|
startedAt: ( new Date()).toISOString(),
|
|
2370
2699
|
message: withMessageHiddenFromTranscript({
|
|
2371
|
-
...
|
|
2700
|
+
...requestMessage(
|
|
2701
|
+
request.message,
|
|
2702
|
+
messageAttachments,
|
|
2703
|
+
request.metadata,
|
|
2704
|
+
request.isSystemInitiated,
|
|
2705
|
+
request.agentHostMessageOrigin
|
|
2706
|
+
),
|
|
2372
2707
|
...(selectedModel ? {
|
|
2373
2708
|
model: selectedModel
|
|
2374
2709
|
} : {}),
|
|
@@ -2384,8 +2719,38 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2384
2719
|
this._config.connection.dispatch(turnChannel, turnAction);
|
|
2385
2720
|
this._ensureSnapshotController(request.sessionResource)?.ensureRequestCheckpoint(request.requestId);
|
|
2386
2721
|
onFailureStage("observeTurn");
|
|
2387
|
-
|
|
2388
|
-
|
|
2722
|
+
const resourceOpens = [];
|
|
2723
|
+
let resourceOpenError;
|
|
2724
|
+
const openResponseResource = async (
|
|
2725
|
+
{
|
|
2726
|
+
resource,
|
|
2727
|
+
preview
|
|
2728
|
+
}
|
|
2729
|
+
) => {
|
|
2730
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
2731
|
+
return;
|
|
2732
|
+
}
|
|
2733
|
+
const editor = await this._editorService.openEditor({
|
|
2734
|
+
resource: this._config.connection.resourceUris.fromAgentHost(resource),
|
|
2735
|
+
options: {
|
|
2736
|
+
pinned: true,
|
|
2737
|
+
...(preview ? {
|
|
2738
|
+
override: "vscode.markdown.preview.editor"
|
|
2739
|
+
} : {})
|
|
2740
|
+
}
|
|
2741
|
+
});
|
|
2742
|
+
if (!editor) {
|
|
2743
|
+
throw ( new Error(( localize(9775, "Could not open the sandbox policy in the editor."))));
|
|
2744
|
+
}
|
|
2745
|
+
if (!this._isInvocationAbandoned(cancellationToken)) {
|
|
2746
|
+
progress([{
|
|
2747
|
+
kind: "markdownContent",
|
|
2748
|
+
content: ( new MarkdownString(( localize(9776, "Opened the sandbox policy in the editor."))))
|
|
2749
|
+
}]);
|
|
2750
|
+
}
|
|
2751
|
+
};
|
|
2752
|
+
return ( new Promise((resolve, reject) => {
|
|
2753
|
+
const store = this._createTurnObservation(resolve);
|
|
2389
2754
|
const cancelSub = store.add(cancellationToken.onCancellationRequested(() => {
|
|
2390
2755
|
cancelSub.dispose();
|
|
2391
2756
|
this._logService.info(`[AgentHost] Cancellation requested for ${( session.toString())}, dispatching turnCancelled`);
|
|
@@ -2403,29 +2768,39 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2403
2768
|
sink: progress,
|
|
2404
2769
|
cancellationToken,
|
|
2405
2770
|
suppressErrorMarkdown: true,
|
|
2406
|
-
|
|
2407
|
-
|
|
2408
|
-
|
|
2409
|
-
|
|
2410
|
-
|
|
2411
|
-
|
|
2412
|
-
|
|
2413
|
-
|
|
2414
|
-
|
|
2415
|
-
|
|
2771
|
+
onResponseText,
|
|
2772
|
+
onOpenResponseResource: request.message.trimStart().startsWith("/") ? resource => {
|
|
2773
|
+
resourceOpens.push(openResponseResource(resource).catch(error => {
|
|
2774
|
+
resourceOpenError = error instanceof Error ? error : ( new Error(String(error)));
|
|
2775
|
+
this._logService.error("[AgentHost] Failed to open slash command resource", resourceOpenError);
|
|
2776
|
+
}));
|
|
2777
|
+
} : undefined,
|
|
2778
|
+
onTurnEnded: async lastTurn => {
|
|
2779
|
+
try {
|
|
2780
|
+
await raceCancellation(Promise.all(resourceOpens), cancellationToken);
|
|
2781
|
+
if (resourceOpenError) {
|
|
2782
|
+
throw resourceOpenError;
|
|
2783
|
+
}
|
|
2784
|
+
resolve(lastTurn);
|
|
2785
|
+
} catch (error) {
|
|
2786
|
+
reject(error);
|
|
2787
|
+
} finally {
|
|
2788
|
+
this._turnObservations.deleteAndDispose(store);
|
|
2789
|
+
this._clientDispatchedTurnIds.delete(turnId);
|
|
2790
|
+
this._completeSessionTurn(session, request.sessionResource, turnId);
|
|
2416
2791
|
}
|
|
2417
2792
|
}
|
|
2418
2793
|
}));
|
|
2419
2794
|
}));
|
|
2420
2795
|
}
|
|
2421
2796
|
async _handleResumedTurn(session, request, progress, cancellationToken) {
|
|
2422
|
-
if (cancellationToken
|
|
2797
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
2423
2798
|
return;
|
|
2424
2799
|
}
|
|
2425
2800
|
const turnId = request.requestId;
|
|
2426
2801
|
const chatURI = this._getChatURI(request.sessionResource);
|
|
2427
2802
|
await this._ensureActiveClient(request.sessionResource, session, cancellationToken);
|
|
2428
|
-
if (cancellationToken
|
|
2803
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
2429
2804
|
return;
|
|
2430
2805
|
}
|
|
2431
2806
|
const state = this._getSessionState(( session.toString()), chatURI);
|
|
@@ -2435,12 +2810,12 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2435
2810
|
const completedResumedTurn = latestTurn?.id === turnId && latestTurn.state !== TurnState.Error ? latestTurn : undefined;
|
|
2436
2811
|
const turn = activeTurn ?? resumableTurn ?? completedResumedTurn;
|
|
2437
2812
|
if (!turn) {
|
|
2438
|
-
throw ( new Error(( localize(
|
|
2813
|
+
throw ( new Error(( localize(9777, "This failed request can no longer be resumed."))));
|
|
2439
2814
|
}
|
|
2440
2815
|
const shouldDispatchResume = resumableTurn !== undefined;
|
|
2441
2816
|
this._clientDispatchedTurnIds.add(turnId);
|
|
2442
2817
|
return (new Promise((resolve, reject) => {
|
|
2443
|
-
const store = (
|
|
2818
|
+
const store = this._createTurnObservation(resolve);
|
|
2444
2819
|
const chatSubscription = this._ensureChatSubscription(( session.toString()), chatURI);
|
|
2445
2820
|
if (shouldDispatchResume) {
|
|
2446
2821
|
let acceptedConcurrentResume = false;
|
|
@@ -2455,13 +2830,13 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2455
2830
|
if (envelope.origin?.clientId !== this._config.connection.clientId || acceptedConcurrentResume) {
|
|
2456
2831
|
return;
|
|
2457
2832
|
}
|
|
2458
|
-
store.dispose();
|
|
2459
|
-
this._clientDispatchedTurnIds.delete(turnId);
|
|
2460
2833
|
reject(( new Error(( localize(
|
|
2461
|
-
|
|
2834
|
+
9778,
|
|
2462
2835
|
"This failed request could not be resumed: {0}",
|
|
2463
2836
|
envelope.rejectionReason
|
|
2464
2837
|
)))));
|
|
2838
|
+
this._turnObservations.deleteAndDispose(store);
|
|
2839
|
+
this._clientDispatchedTurnIds.delete(turnId);
|
|
2465
2840
|
}));
|
|
2466
2841
|
}
|
|
2467
2842
|
const cancelSub = store.add(cancellationToken.onCancellationRequested(() => {
|
|
@@ -2482,16 +2857,10 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2482
2857
|
suppressErrorMarkdown: true,
|
|
2483
2858
|
requireActiveTurn: shouldDispatchResume,
|
|
2484
2859
|
onTurnEnded: lastTurn => {
|
|
2485
|
-
|
|
2860
|
+
resolve(lastTurn);
|
|
2861
|
+
this._turnObservations.deleteAndDispose(store);
|
|
2486
2862
|
this._clientDispatchedTurnIds.delete(turnId);
|
|
2487
2863
|
this._completeSessionTurn(session, request.sessionResource, turnId);
|
|
2488
|
-
resolve(lastTurn);
|
|
2489
|
-
},
|
|
2490
|
-
onFileEdits: toolCall => {
|
|
2491
|
-
const editParts = this._hydrateFileEdits(request.sessionResource, turnId, toolCall);
|
|
2492
|
-
if (editParts.length > 0) {
|
|
2493
|
-
progress(editParts);
|
|
2494
|
-
}
|
|
2495
2864
|
}
|
|
2496
2865
|
}));
|
|
2497
2866
|
if (shouldDispatchResume) {
|
|
@@ -2518,6 +2887,9 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2518
2887
|
selectedOption = protocolOptions.find(o => o.id === reason.selectedButton);
|
|
2519
2888
|
}
|
|
2520
2889
|
const approved = selectedOption ? selectedOption.kind === ConfirmationOptionKind.Approve : reason.type !== ToolConfirmKind.Denied && reason.type !== ToolConfirmKind.Skipped;
|
|
2890
|
+
const responseMeta = toAgentPermissionResponseMeta({
|
|
2891
|
+
decisionSource: confirmedReasonToDecisionSource(reason, cancellationToken)
|
|
2892
|
+
});
|
|
2521
2893
|
this._logService.info(
|
|
2522
2894
|
`[AgentHost] Tool confirmation: toolCallId=${toolCallId}, approved=${approved}, selectedOptionId=${selectedOption?.id}`
|
|
2523
2895
|
);
|
|
@@ -2527,7 +2899,8 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2527
2899
|
turnId,
|
|
2528
2900
|
toolCallId,
|
|
2529
2901
|
approved: true,
|
|
2530
|
-
confirmed:
|
|
2902
|
+
confirmed: confirmedReasonToProtocol(reason),
|
|
2903
|
+
_meta: responseMeta,
|
|
2531
2904
|
...(selectedOption ? {
|
|
2532
2905
|
selectedOptionId: selectedOption.id
|
|
2533
2906
|
} : {})
|
|
@@ -2537,6 +2910,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2537
2910
|
toolCallId,
|
|
2538
2911
|
approved: false,
|
|
2539
2912
|
reason: ToolCallCancellationReason.Denied,
|
|
2913
|
+
_meta: responseMeta,
|
|
2540
2914
|
...(selectedOption ? {
|
|
2541
2915
|
selectedOptionId: selectedOption.id
|
|
2542
2916
|
} : {})
|
|
@@ -2605,15 +2979,27 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2605
2979
|
equalsFn: equals
|
|
2606
2980
|
}, reader => {
|
|
2607
2981
|
const state = mergedState$.read(reader);
|
|
2982
|
+
const sessionServers = this._customizationService.getMcpServers(opts.sessionResource);
|
|
2983
|
+
const backgroundActions = ( new Map(
|
|
2984
|
+
sessionServers.filter(server => server.background !== undefined).map(server => [server.id, server.background])
|
|
2985
|
+
));
|
|
2986
|
+
const displayLabels = ( new Map(
|
|
2987
|
+
sessionServers.map(server => [server.id, getMcpServerDisplayLabel(server)])
|
|
2988
|
+
));
|
|
2608
2989
|
const servers = state?.customizations?.flatMap(
|
|
2609
2990
|
c => c.type === CustomizationType.McpServer ? [c] : c.children?.filter(c => c.type === CustomizationType.McpServer) ?? []
|
|
2610
2991
|
) ?? [];
|
|
2611
2992
|
return servers.filter(
|
|
2612
2993
|
server => isCustomizationEnabled(server) && server.state.kind === McpServerStatus.Starting
|
|
2613
|
-
).map(server =>
|
|
2614
|
-
id
|
|
2615
|
-
|
|
2616
|
-
|
|
2994
|
+
).map(server => {
|
|
2995
|
+
const id = opts.sessionResource.authority + "/" + server.id;
|
|
2996
|
+
return {
|
|
2997
|
+
id,
|
|
2998
|
+
name: displayLabels.get(id) ?? server.name,
|
|
2999
|
+
blocking: server.state.kind === McpServerStatus.Starting && server.state.blocking === true,
|
|
3000
|
+
background: backgroundActions.get(id)
|
|
3001
|
+
};
|
|
3002
|
+
});
|
|
2617
3003
|
});
|
|
2618
3004
|
const subagentContext = this._createSubagentContext(sessionState$, subagentStore);
|
|
2619
3005
|
store.add(toDisposable(() => {
|
|
@@ -2653,6 +3039,11 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2653
3039
|
break;
|
|
2654
3040
|
case ResponsePartKind.SystemNotification:
|
|
2655
3041
|
if (responseParts$.get().indexOf(initial) >= (opts.initialResponsePartCount ?? 0) && opts.subAgentInvocationId === undefined) {
|
|
3042
|
+
const resource = readSlashCommandResource(initial);
|
|
3043
|
+
if (resource && opts.onOpenResponseResource) {
|
|
3044
|
+
opts.onOpenResponseResource(resource);
|
|
3045
|
+
break;
|
|
3046
|
+
}
|
|
2656
3047
|
const progress = systemNotificationToChatPart(initial.content, this._config.connectionAuthority, initial._meta);
|
|
2657
3048
|
if (progress) {
|
|
2658
3049
|
if (progress.kind === "systemNotification" && progress.presentation === "workspaceTransition" && progress.accessibilityLabel) {
|
|
@@ -2669,27 +3060,31 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2669
3060
|
let lastUsage;
|
|
2670
3061
|
let lastAutoModeResolution;
|
|
2671
3062
|
const modelLookup = this._createTurnModelLookup(opts.sessionResource, undefined);
|
|
2672
|
-
this.
|
|
3063
|
+
if (this._configurationService.getValue(AgentHostMcpToolRoutingEnabledSettingId) !== true) {
|
|
3064
|
+
this._setupMcpAuthPrompt(mcpAuthRequired$, store, opts);
|
|
3065
|
+
}
|
|
2673
3066
|
store.add(autorun(reader => {
|
|
2674
3067
|
const activity = chatState$.read(reader)?.activity;
|
|
2675
|
-
|
|
3068
|
+
const progressId = getAgentHostActivityProgressId(responseParts$.read(reader));
|
|
3069
|
+
if (!activity || progressId === undefined) {
|
|
2676
3070
|
return;
|
|
2677
3071
|
}
|
|
2678
3072
|
opts.sink([{
|
|
2679
3073
|
kind: "progressMessage",
|
|
2680
|
-
id:
|
|
3074
|
+
id: progressId,
|
|
2681
3075
|
content: ( new MarkdownString()).appendText(activity),
|
|
2682
3076
|
shimmer: true
|
|
2683
3077
|
}]);
|
|
2684
3078
|
}));
|
|
2685
3079
|
store.add(autorun(reader => {
|
|
2686
|
-
const
|
|
3080
|
+
const turn = turn$.read(reader);
|
|
3081
|
+
const selectedModelId = turn?.message?.model?.id;
|
|
2687
3082
|
const resolution = this._createTurnModelLookup(
|
|
2688
3083
|
opts.sessionResource,
|
|
2689
3084
|
selectedModelId,
|
|
2690
3085
|
this._hideAutoExplainability.read(reader)
|
|
2691
3086
|
).toAutoModeResolution?.(usage$.read(reader));
|
|
2692
|
-
if (!resolution || equals(lastAutoModeResolution, resolution)) {
|
|
3087
|
+
if (!resolution || (!resolution.resolved && turn?.message.text.startsWith("/")) || equals(lastAutoModeResolution, resolution)) {
|
|
2693
3088
|
return;
|
|
2694
3089
|
}
|
|
2695
3090
|
lastAutoModeResolution = resolution;
|
|
@@ -2724,16 +3119,18 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2724
3119
|
}
|
|
2725
3120
|
store.add(autorun(reader => {
|
|
2726
3121
|
const rawUsage = usage$.read(reader);
|
|
2727
|
-
const
|
|
3122
|
+
const session = mergedState$.read(reader);
|
|
3123
|
+
const contextUsage = session ? readAgentContextUsage(session, rawUsage) : undefined;
|
|
3124
|
+
const usage = usageInfoToChatUsage(rawUsage, modelLookup.toModelDisplayName, contextUsage);
|
|
2728
3125
|
if (!usage) {
|
|
2729
3126
|
return;
|
|
2730
3127
|
}
|
|
2731
|
-
const actualModelId =
|
|
3128
|
+
const actualModelId = modelLookup.toActualModelId(rawUsage?.model);
|
|
2732
3129
|
if (actualModelId) {
|
|
2733
3130
|
usage.actualModelId = actualModelId;
|
|
2734
3131
|
}
|
|
2735
3132
|
if (
|
|
2736
|
-
lastUsage && lastUsage.promptTokens === usage.promptTokens && lastUsage.completionTokens === usage.completionTokens && lastUsage.outputBuffer === usage.outputBuffer && lastUsage.copilotCredits === usage.copilotCredits && lastUsage.sessionCopilotCredits === usage.sessionCopilotCredits && equals(lastUsage.promptTokenDetails, usage.promptTokenDetails) && equals(lastUsage.modelTotals, usage.modelTotals)) {
|
|
3133
|
+
lastUsage && lastUsage.actualModelId === usage.actualModelId && lastUsage.promptTokens === usage.promptTokens && lastUsage.completionTokens === usage.completionTokens && lastUsage.outputBuffer === usage.outputBuffer && lastUsage.copilotCredits === usage.copilotCredits && lastUsage.sessionCopilotCredits === usage.sessionCopilotCredits && equals(lastUsage.promptTokenDetails, usage.promptTokenDetails) && equals(lastUsage.modelTotals, usage.modelTotals) && equals(lastUsage.latestModelCall, usage.latestModelCall) && equals(lastUsage.contextUsage, usage.contextUsage)) {
|
|
2737
3134
|
return;
|
|
2738
3135
|
}
|
|
2739
3136
|
lastUsage = usage;
|
|
@@ -2775,14 +3172,21 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2775
3172
|
}
|
|
2776
3173
|
if (opts.subAgentInvocationId !== undefined && opts.subAgentModelObservable) {
|
|
2777
3174
|
const modelObservable = opts.subAgentModelObservable;
|
|
3175
|
+
const modelsChanged = observableSignalFromEvent(this, this._languageModelsService.onDidChangeLanguageModels);
|
|
2778
3176
|
store.add(autorun(reader => {
|
|
3177
|
+
modelsChanged.read(reader);
|
|
2779
3178
|
const hideAutoExplainability = this._hideAutoExplainability.read(reader);
|
|
2780
3179
|
if (hideAutoExplainability === undefined) {
|
|
2781
3180
|
return;
|
|
2782
3181
|
}
|
|
2783
|
-
const
|
|
2784
|
-
|
|
2785
|
-
|
|
3182
|
+
const selection = turn$.read(reader)?.message.model;
|
|
3183
|
+
const modelInfo = this._createTurnModelLookup(opts.sessionResource, selection?.id, hideAutoExplainability).toBilledModelInfo?.(usage$.read(reader));
|
|
3184
|
+
const model = modelInfo && {
|
|
3185
|
+
...modelInfo,
|
|
3186
|
+
modelConfiguration: selection?.config
|
|
3187
|
+
};
|
|
3188
|
+
if (model && !equals(model, modelObservable.read(undefined))) {
|
|
3189
|
+
transaction(tx => modelObservable.set(model, tx));
|
|
2786
3190
|
}
|
|
2787
3191
|
}));
|
|
2788
3192
|
}
|
|
@@ -2823,14 +3227,14 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2823
3227
|
if (!seenActive) {
|
|
2824
3228
|
return;
|
|
2825
3229
|
}
|
|
2826
|
-
|
|
2827
|
-
|
|
2828
|
-
|
|
2829
|
-
|
|
2830
|
-
|
|
2831
|
-
|
|
2832
|
-
|
|
2833
|
-
}
|
|
3230
|
+
if (!opts.suppressErrorMarkdown) {
|
|
3231
|
+
const errorDetails = this._getTurnErrorDetails(lastTurn, false);
|
|
3232
|
+
if (errorDetails) {
|
|
3233
|
+
opts.sink([{
|
|
3234
|
+
kind: "markdownContent",
|
|
3235
|
+
content: ( new MarkdownString(`\n\n${errorDetails.message}`))
|
|
3236
|
+
}]);
|
|
3237
|
+
}
|
|
2834
3238
|
}
|
|
2835
3239
|
finish(lastTurn);
|
|
2836
3240
|
}));
|
|
@@ -2873,7 +3277,11 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2873
3277
|
surfaced.add(server.id);
|
|
2874
3278
|
ownedIds.add(server.id);
|
|
2875
3279
|
}
|
|
2876
|
-
|
|
3280
|
+
const remainingServers = servers.filter(server => ( ownedIds.has(server.id)));
|
|
3281
|
+
if (part.servers.read(undefined).length > 0 && remainingServers.length === 0) {
|
|
3282
|
+
part.isUsed = true;
|
|
3283
|
+
}
|
|
3284
|
+
part.servers.set(remainingServers, undefined);
|
|
2877
3285
|
});
|
|
2878
3286
|
}));
|
|
2879
3287
|
}
|
|
@@ -2920,25 +3328,22 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2920
3328
|
if (pending) {
|
|
2921
3329
|
return pending;
|
|
2922
3330
|
}
|
|
2923
|
-
const operation = this._instantiationService.invokeFunction(
|
|
2924
|
-
|
|
2925
|
-
|
|
2926
|
-
|
|
2927
|
-
|
|
2928
|
-
|
|
2929
|
-
|
|
2930
|
-
|
|
2931
|
-
|
|
2932
|
-
|
|
2933
|
-
|
|
2934
|
-
|
|
2935
|
-
|
|
2936
|
-
|
|
2937
|
-
|
|
2938
|
-
|
|
2939
|
-
},
|
|
2940
|
-
authenticate: request => this._config.connection.authenticate(request)
|
|
2941
|
-
}).catch(err => {
|
|
3331
|
+
const operation = this._instantiationService.invokeFunction(
|
|
3332
|
+
autoAuthenticateMcpServer,
|
|
3333
|
+
this._config.connection,
|
|
3334
|
+
sessionResource,
|
|
3335
|
+
server.name,
|
|
3336
|
+
{
|
|
3337
|
+
resource: {
|
|
3338
|
+
resource: server.resource,
|
|
3339
|
+
resource_name: server.name,
|
|
3340
|
+
authorization_servers: server.authorizationServers ? [...server.authorizationServers] : undefined,
|
|
3341
|
+
scopes_supported: server.supportedScopes ? [...server.supportedScopes] : undefined
|
|
3342
|
+
},
|
|
3343
|
+
oauthClient: server.oauthClient,
|
|
3344
|
+
requiredScopes: server.requiredScopes ? [...server.requiredScopes] : undefined
|
|
3345
|
+
}
|
|
3346
|
+
).catch(err => {
|
|
2942
3347
|
this._logService.error(`[AgentHost] Failed to auto-authenticate MCP server '${server.name}'`, err);
|
|
2943
3348
|
return false;
|
|
2944
3349
|
});
|
|
@@ -2960,6 +3365,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
2960
3365
|
}
|
|
2961
3366
|
const delta = content.substring(lastEmitted);
|
|
2962
3367
|
lastEmitted = content.length;
|
|
3368
|
+
opts.onResponseText?.(delta);
|
|
2963
3369
|
opts.sink([{
|
|
2964
3370
|
kind: "markdownContent",
|
|
2965
3371
|
content: ( new MarkdownString(delta))
|
|
@@ -3041,7 +3447,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3041
3447
|
return;
|
|
3042
3448
|
}
|
|
3043
3449
|
this._resolvedToolCalls.add(key);
|
|
3044
|
-
this.
|
|
3450
|
+
this._dispatchAction(( URI.parse(chatURI)), action, chatURI);
|
|
3045
3451
|
}
|
|
3046
3452
|
_forgetResolvedToolCall(toolCallKey) {
|
|
3047
3453
|
for (const key of this._resolvedToolCalls) {
|
|
@@ -3069,16 +3475,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3069
3475
|
const toolCall = part$.read(reader).toolCall;
|
|
3070
3476
|
this._trackSubagentToolCall(toolCall, invocation, opts, subagentContext);
|
|
3071
3477
|
if ((toolCall.status === ToolCallStatus.Completed || toolCall.status === ToolCallStatus.Cancelled) && !IChatToolInvocation.isComplete(invocation)) {
|
|
3072
|
-
|
|
3073
|
-
invocation,
|
|
3074
|
-
toolCall,
|
|
3075
|
-
opts.backendSession,
|
|
3076
|
-
this._config.connectionAuthority,
|
|
3077
|
-
this._config.connection.resourceUris
|
|
3078
|
-
);
|
|
3079
|
-
if (fileEdits.length > 0) {
|
|
3080
|
-
opts.onFileEdits?.(toolCall, fileEdits);
|
|
3081
|
-
}
|
|
3478
|
+
this._finalizeToolInvocation(invocation, toolCall, opts);
|
|
3082
3479
|
}
|
|
3083
3480
|
}));
|
|
3084
3481
|
store.add(toDisposable(() => {
|
|
@@ -3091,21 +3488,24 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3091
3488
|
return {
|
|
3092
3489
|
currentClientId: this._config.connection.clientId,
|
|
3093
3490
|
cancelOtherClientToolCall: toolCall => {
|
|
3094
|
-
const reasonMessage = ( localize(
|
|
3491
|
+
const reasonMessage = ( localize(9779, "{0} was skipped from another client", toolCall.displayName));
|
|
3095
3492
|
this._dispatchAction(backendSession, toolCall.status === ToolCallStatus.PendingConfirmation ? {
|
|
3096
3493
|
type: ActionType.ChatToolCallConfirmed,
|
|
3097
3494
|
turnId,
|
|
3098
3495
|
toolCallId: toolCall.toolCallId,
|
|
3099
3496
|
approved: false,
|
|
3100
3497
|
reason: ToolCallCancellationReason.Skipped,
|
|
3101
|
-
reasonMessage
|
|
3498
|
+
reasonMessage,
|
|
3499
|
+
_meta: toAgentPermissionResponseMeta({
|
|
3500
|
+
decisionSource: "human_response"
|
|
3501
|
+
})
|
|
3102
3502
|
} : {
|
|
3103
3503
|
type: ActionType.ChatToolCallComplete,
|
|
3104
3504
|
turnId,
|
|
3105
3505
|
toolCallId: toolCall.toolCallId,
|
|
3106
3506
|
result: {
|
|
3107
3507
|
success: false,
|
|
3108
|
-
pastTenseMessage: ( localize(
|
|
3508
|
+
pastTenseMessage: ( localize(9780, "Skipped {0}", toolCall.displayName)),
|
|
3109
3509
|
error: {
|
|
3110
3510
|
message: reasonMessage,
|
|
3111
3511
|
code: "cancelled"
|
|
@@ -3135,6 +3535,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3135
3535
|
opts.sink([invocation]);
|
|
3136
3536
|
}
|
|
3137
3537
|
} else {
|
|
3538
|
+
const mcpServerName = initial.status === ToolCallStatus.AuthRequired ? this._toolAuthenticationServerName(initial, opts) : undefined;
|
|
3138
3539
|
invocation = toolCallStateToInvocation(
|
|
3139
3540
|
initial,
|
|
3140
3541
|
subAgentInvocationId,
|
|
@@ -3142,7 +3543,8 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3142
3543
|
this._config.connectionAuthority,
|
|
3143
3544
|
opts.sessionResource.authority,
|
|
3144
3545
|
undefined,
|
|
3145
|
-
this._config.connection.resourceUris
|
|
3546
|
+
this._config.connection.resourceUris,
|
|
3547
|
+
mcpServerName
|
|
3146
3548
|
);
|
|
3147
3549
|
if (!renderedBySnapshot) {
|
|
3148
3550
|
opts.sink([invocation]);
|
|
@@ -3163,7 +3565,20 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3163
3565
|
const outputTerminalAttachment = {
|
|
3164
3566
|
disposable: store.add(( new MutableDisposable()))
|
|
3165
3567
|
};
|
|
3568
|
+
store.add(this._config.connection.onDidAction(envelope => {
|
|
3569
|
+
const action = envelope.action;
|
|
3570
|
+
if (envelope.rejectionReason || envelope.channel !== opts.chatURI || action.type !== ActionType.ChatToolCallDelta || action.turnId !== opts.turnId || action.toolCallId !== toolCallId || IChatToolInvocation.isComplete(invocation)) {
|
|
3571
|
+
return;
|
|
3572
|
+
}
|
|
3573
|
+
const call = part$.get().toolCall;
|
|
3574
|
+
const chunk = readAgentToolOutputDelta(action, initial, call);
|
|
3575
|
+
if (!chunk) {
|
|
3576
|
+
return;
|
|
3577
|
+
}
|
|
3578
|
+
appendToolOutput(invocation, call, chunk);
|
|
3579
|
+
}));
|
|
3166
3580
|
let previousStatus = initial.status;
|
|
3581
|
+
let silentAuthenticationAttempted = false;
|
|
3167
3582
|
store.add(autorun(reader => {
|
|
3168
3583
|
const tc = part$.read(reader).toolCall;
|
|
3169
3584
|
const status = tc.status;
|
|
@@ -3209,21 +3624,43 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3209
3624
|
invocation.updatePreparedInvocation(prepared, invocation.parameters);
|
|
3210
3625
|
} else if (status === ToolCallStatus.AuthRequired) {
|
|
3211
3626
|
this._ensureLeftStreaming(invocation, tc, opts);
|
|
3212
|
-
|
|
3627
|
+
const onCancelAuthentication = () => {
|
|
3213
3628
|
this._dispatchAction(opts.backendSession, {
|
|
3214
3629
|
type: ActionType.ChatToolCallComplete,
|
|
3215
3630
|
turnId: opts.turnId,
|
|
3216
3631
|
toolCallId,
|
|
3217
3632
|
result: {
|
|
3218
3633
|
success: false,
|
|
3219
|
-
pastTenseMessage: ( localize(
|
|
3634
|
+
pastTenseMessage: ( localize(9781, "Cancelled tool call")),
|
|
3220
3635
|
error: {
|
|
3221
|
-
message: ( localize(
|
|
3636
|
+
message: ( localize(9782, "MCP authentication was cancelled")),
|
|
3222
3637
|
code: "cancelled"
|
|
3223
3638
|
}
|
|
3224
3639
|
}
|
|
3225
3640
|
}, opts.chatURI);
|
|
3226
|
-
}
|
|
3641
|
+
};
|
|
3642
|
+
const showAuthentication = toolCall => invocation.setAuthenticationRequired(toolCallAuthenticationServer(
|
|
3643
|
+
toolCall,
|
|
3644
|
+
opts.sessionResource.authority,
|
|
3645
|
+
this._toolAuthenticationServerName(toolCall, opts)
|
|
3646
|
+
), onCancelAuthentication);
|
|
3647
|
+
if (!silentAuthenticationAttempted) {
|
|
3648
|
+
silentAuthenticationAttempted = true;
|
|
3649
|
+
const server = toolCallAuthenticationServer(tc, opts.sessionResource.authority);
|
|
3650
|
+
const serverName = this._customizationService.getMcpServers(opts.sessionResource).find(candidate => candidate.id === server.id)?.name ?? server.name;
|
|
3651
|
+
this._autoAuthenticateMcpServer(opts.sessionResource, {
|
|
3652
|
+
...server,
|
|
3653
|
+
name: serverName
|
|
3654
|
+
}).then(() => {
|
|
3655
|
+
const current = part$.read(undefined).toolCall;
|
|
3656
|
+
if (store.isDisposed || current.status !== ToolCallStatus.AuthRequired || IChatToolInvocation.isComplete(invocation)) {
|
|
3657
|
+
return;
|
|
3658
|
+
}
|
|
3659
|
+
showAuthentication(current);
|
|
3660
|
+
});
|
|
3661
|
+
} else if (priorStatus !== ToolCallStatus.AuthRequired || invocation.state.read(undefined).type === IChatToolInvocation.StateKind.WaitingForAuthentication) {
|
|
3662
|
+
showAuthentication(tc);
|
|
3663
|
+
}
|
|
3227
3664
|
} else if (status === ToolCallStatus.Running || status === ToolCallStatus.PendingResultConfirmation) {
|
|
3228
3665
|
if (priorStatus === ToolCallStatus.AuthRequired) {
|
|
3229
3666
|
invocation.setAuthenticationResolved();
|
|
@@ -3266,16 +3703,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3266
3703
|
opts.chatURI,
|
|
3267
3704
|
outputTerminalAttachment
|
|
3268
3705
|
);
|
|
3269
|
-
|
|
3270
|
-
invocation,
|
|
3271
|
-
tc,
|
|
3272
|
-
opts.backendSession,
|
|
3273
|
-
this._config.connectionAuthority,
|
|
3274
|
-
this._config.connection.resourceUris
|
|
3275
|
-
);
|
|
3276
|
-
if (fileEdits.length > 0) {
|
|
3277
|
-
opts.onFileEdits?.(tc, fileEdits);
|
|
3278
|
-
}
|
|
3706
|
+
this._finalizeToolInvocation(invocation, tc, opts);
|
|
3279
3707
|
}
|
|
3280
3708
|
}));
|
|
3281
3709
|
store.add(toDisposable(() => {
|
|
@@ -3283,6 +3711,32 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3283
3711
|
invocation.didExecuteTool(undefined);
|
|
3284
3712
|
}
|
|
3285
3713
|
}));
|
|
3714
|
+
this._refreshToolAuthenticationServerName(invocation, opts.sessionResource);
|
|
3715
|
+
store.add(this._customizationService.onDidChangeCustomizations(
|
|
3716
|
+
() => this._refreshToolAuthenticationServerName(invocation, opts.sessionResource)
|
|
3717
|
+
));
|
|
3718
|
+
}
|
|
3719
|
+
_refreshToolAuthenticationServerName(invocation, sessionResource) {
|
|
3720
|
+
const state = invocation.state.get();
|
|
3721
|
+
if (state.type !== IChatToolInvocation.StateKind.WaitingForAuthentication) {
|
|
3722
|
+
return;
|
|
3723
|
+
}
|
|
3724
|
+
const server = this._customizationService.getMcpServers(sessionResource).find(candidate => candidate.id === state.server.id);
|
|
3725
|
+
if (!server) {
|
|
3726
|
+
return;
|
|
3727
|
+
}
|
|
3728
|
+
const name = getMcpServerDisplayLabel(server);
|
|
3729
|
+
if (name !== state.server.name) {
|
|
3730
|
+
invocation.setAuthenticationRequired({
|
|
3731
|
+
...state.server,
|
|
3732
|
+
name
|
|
3733
|
+
});
|
|
3734
|
+
}
|
|
3735
|
+
}
|
|
3736
|
+
_toolAuthenticationServerName(tc, opts) {
|
|
3737
|
+
const id = toolCallAuthenticationServer(tc, opts.sessionResource.authority).id;
|
|
3738
|
+
const server = this._customizationService.getMcpServers(opts.sessionResource).find(candidate => candidate.id === id);
|
|
3739
|
+
return server ? getMcpServerDisplayLabel(server) : undefined;
|
|
3286
3740
|
}
|
|
3287
3741
|
_ensureLeftStreaming(invocation, tc, opts) {
|
|
3288
3742
|
if (invocation.state.read(undefined).type !== IChatToolInvocation.StateKind.Streaming) {
|
|
@@ -3308,12 +3762,13 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3308
3762
|
}, reader => sessionState.read(reader)?.chats.flatMap(chat => chat.origin?.kind === ChatOriginKind.Tool ? [{
|
|
3309
3763
|
resource: chat.resource,
|
|
3310
3764
|
parentChat: chat.origin.chat,
|
|
3311
|
-
toolCallId: chat.origin.toolCallId
|
|
3765
|
+
toolCallId: chat.origin.toolCallId,
|
|
3766
|
+
status: chat.status
|
|
3312
3767
|
}] : []) ?? [])
|
|
3313
3768
|
};
|
|
3314
3769
|
}
|
|
3315
3770
|
_trackSubagentToolCall(toolCall, invocation, opts, context) {
|
|
3316
|
-
if (!
|
|
3771
|
+
if (!canOwnSubagentChat(toolCall)) {
|
|
3317
3772
|
return;
|
|
3318
3773
|
}
|
|
3319
3774
|
let tracked = context.toolCalls.get(toolCall.toolCallId);
|
|
@@ -3351,8 +3806,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3351
3806
|
}
|
|
3352
3807
|
_tryObserveSubagentToolCall(toolCall, invocation, reader, opts, subagentContext) {
|
|
3353
3808
|
const toolCallId = toolCall.toolCallId;
|
|
3354
|
-
|
|
3355
|
-
if (!isSubagentTool(toolCall) && !hasSubagentContent) {
|
|
3809
|
+
if (!canOwnSubagentChat(toolCall)) {
|
|
3356
3810
|
return;
|
|
3357
3811
|
}
|
|
3358
3812
|
const childChat = subagentContext.chats.read(reader).find(chat => chat.parentChat === opts.chatURI && chat.toolCallId === toolCallId);
|
|
@@ -3376,6 +3830,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3376
3830
|
const isChatAvailable = observation ? observation.chatResource === childChatUri && observation.isChatAvailable : currentData?.isChatAvailable === true;
|
|
3377
3831
|
const description = protocolData.description ?? currentData?.description;
|
|
3378
3832
|
const agentName = protocolData.agentName ?? currentData?.agentName;
|
|
3833
|
+
const isPhase = protocolData.presentation === "phase";
|
|
3379
3834
|
if (!currentData || currentData.chatResource !== chatResource || currentData.isChatAvailable !== isChatAvailable || currentData.description !== description || currentData.agentName !== agentName) {
|
|
3380
3835
|
invocation.toolSpecificData = {
|
|
3381
3836
|
...currentData,
|
|
@@ -3385,11 +3840,11 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3385
3840
|
isChatAvailable,
|
|
3386
3841
|
description,
|
|
3387
3842
|
agentName,
|
|
3388
|
-
isActive: currentData?.isActive ?? isObserved
|
|
3843
|
+
isActive: isPhase ? protocolData.isActive : currentData?.isActive ?? isObserved
|
|
3389
3844
|
};
|
|
3390
3845
|
invocation.notifyToolSpecificDataChanged();
|
|
3391
3846
|
}
|
|
3392
|
-
const shouldObserve = shouldObserveSubagentChat(toolCall, !!childChat);
|
|
3847
|
+
const shouldObserve = shouldObserveSubagentChat(toolCall, !!childChat) && (!opts.subagentSnapshot?.waitForActivity || isObserved || !!(childChat && (childChat.status & SessionStatus.InProgress)));
|
|
3393
3848
|
if (observation && (observation.chatResource !== childChatUri || !shouldObserve)) {
|
|
3394
3849
|
subagentContext.observations.deleteAndDispose(toolCallId);
|
|
3395
3850
|
}
|
|
@@ -3405,8 +3860,10 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3405
3860
|
}
|
|
3406
3861
|
const observationStore = ( new SubagentChatObservation(childChatUri));
|
|
3407
3862
|
subagentContext.observations.set(toolCallId, observationStore);
|
|
3408
|
-
|
|
3409
|
-
|
|
3863
|
+
if (!isPhase) {
|
|
3864
|
+
subagentData.isActive = true;
|
|
3865
|
+
invocation.notifyToolSpecificDataChanged();
|
|
3866
|
+
}
|
|
3410
3867
|
const perInvocationCredits = observableValue("subagentInvocationCredits", 0);
|
|
3411
3868
|
observationStore.add(autorun(reader => {
|
|
3412
3869
|
const total = perInvocationCredits.read(reader);
|
|
@@ -3417,9 +3874,15 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3417
3874
|
}));
|
|
3418
3875
|
const perInvocationModel = observableValue("subagentInvocationModel", undefined);
|
|
3419
3876
|
observationStore.add(autorun(reader => {
|
|
3420
|
-
const
|
|
3421
|
-
if (
|
|
3422
|
-
invocation.toolSpecificData.
|
|
3877
|
+
const model = perInvocationModel.read(reader);
|
|
3878
|
+
if (model && invocation.toolSpecificData?.kind === "subagent" && (invocation.toolSpecificData.modelName !== model.modelName || invocation.toolSpecificData.modelId !== model.modelId || !equals(invocation.toolSpecificData.modelConfiguration, model.modelConfiguration) || !equals(
|
|
3879
|
+
invocation.toolSpecificData.runtimeModelConfiguration,
|
|
3880
|
+
model.runtimeModelConfiguration
|
|
3881
|
+
))) {
|
|
3882
|
+
invocation.toolSpecificData.modelId = model.modelId;
|
|
3883
|
+
invocation.toolSpecificData.modelName = model.modelName;
|
|
3884
|
+
invocation.toolSpecificData.modelConfiguration = model.modelConfiguration;
|
|
3885
|
+
invocation.toolSpecificData.runtimeModelConfiguration = model.runtimeModelConfiguration;
|
|
3423
3886
|
invocation.notifyToolSpecificDataChanged();
|
|
3424
3887
|
}
|
|
3425
3888
|
}));
|
|
@@ -3435,7 +3898,8 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3435
3898
|
observationStore,
|
|
3436
3899
|
subagentContext,
|
|
3437
3900
|
perInvocationCredits,
|
|
3438
|
-
perInvocationModel
|
|
3901
|
+
perInvocationModel,
|
|
3902
|
+
opts.subagentSnapshot?.toolCalls
|
|
3439
3903
|
);
|
|
3440
3904
|
}
|
|
3441
3905
|
_setupClientToolCall(initial, part$, store, opts, subagentContext, renderedBySnapshot = false) {
|
|
@@ -3522,6 +3986,9 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3522
3986
|
toolCallId,
|
|
3523
3987
|
approved: true,
|
|
3524
3988
|
confirmed: confirmedReasonToProtocol(state.confirmed),
|
|
3989
|
+
_meta: toAgentPermissionResponseMeta({
|
|
3990
|
+
decisionSource: confirmedReasonToDecisionSource(state.confirmed, opts.cancellationToken)
|
|
3991
|
+
}),
|
|
3525
3992
|
...(selectedOptionId ? {
|
|
3526
3993
|
selectedOptionId
|
|
3527
3994
|
} : {})
|
|
@@ -3531,6 +3998,9 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3531
3998
|
toolCallId,
|
|
3532
3999
|
approved: false,
|
|
3533
4000
|
reason: ToolCallCancellationReason.Denied,
|
|
4001
|
+
_meta: toAgentPermissionResponseMeta({
|
|
4002
|
+
decisionSource: confirmedReasonToDecisionSource(state.confirmed, opts.cancellationToken)
|
|
4003
|
+
}),
|
|
3534
4004
|
...(selectedOptionId ? {
|
|
3535
4005
|
selectedOptionId
|
|
3536
4006
|
} : {})
|
|
@@ -3546,7 +4016,13 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3546
4016
|
turnId: opts.turnId,
|
|
3547
4017
|
toolCallId,
|
|
3548
4018
|
approved: false,
|
|
3549
|
-
reason: ToolCallCancellationReason.Denied
|
|
4019
|
+
reason: ToolCallCancellationReason.Denied,
|
|
4020
|
+
_meta: toAgentPermissionResponseMeta({
|
|
4021
|
+
decisionSource: confirmedReasonToDecisionSource({
|
|
4022
|
+
type: state.reason,
|
|
4023
|
+
source: state.source
|
|
4024
|
+
}, opts.cancellationToken)
|
|
4025
|
+
})
|
|
3550
4026
|
});
|
|
3551
4027
|
}
|
|
3552
4028
|
}));
|
|
@@ -3560,22 +4036,15 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3560
4036
|
reason: ToolConfirmKind.Skipped,
|
|
3561
4037
|
reasonMessage: tc.error.message
|
|
3562
4038
|
} : undefined;
|
|
3563
|
-
if (cancellation && !invocation.cancelFromStreaming(
|
|
4039
|
+
if (cancellation && !invocation.cancelFromStreaming({
|
|
4040
|
+
type: cancellation.reason
|
|
4041
|
+
}, cancellation.reasonMessage)) {
|
|
3564
4042
|
IChatToolInvocation.confirmWith(invocation, {
|
|
3565
4043
|
type: cancellation.reason
|
|
3566
4044
|
});
|
|
3567
4045
|
}
|
|
3568
4046
|
if ((tc.status === ToolCallStatus.Cancelled || tc.status === ToolCallStatus.Completed) && !IChatToolInvocation.isComplete(invocation, reader)) {
|
|
3569
|
-
|
|
3570
|
-
invocation,
|
|
3571
|
-
tc,
|
|
3572
|
-
opts.backendSession,
|
|
3573
|
-
this._config.connectionAuthority,
|
|
3574
|
-
this._config.connection.resourceUris
|
|
3575
|
-
);
|
|
3576
|
-
if (fileEdits.length > 0) {
|
|
3577
|
-
opts.onFileEdits?.(tc, fileEdits);
|
|
3578
|
-
}
|
|
4047
|
+
this._finalizeToolInvocation(invocation, tc, opts);
|
|
3579
4048
|
}
|
|
3580
4049
|
}));
|
|
3581
4050
|
}
|
|
@@ -3745,7 +4214,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3745
4214
|
});
|
|
3746
4215
|
};
|
|
3747
4216
|
const presentation = getUrlInputRequestPresentation(inputReq, url);
|
|
3748
|
-
const part = ( new ChatElicitationRequestPart(( localize(
|
|
4217
|
+
const part = ( new ChatElicitationRequestPart(( localize(9783, "Authorization Required")), presentation.message, "", ( localize(9784, "Open {0}", presentation.authority)), ( localize(9785, "Cancel")), async () => {
|
|
3749
4218
|
try {
|
|
3750
4219
|
const opened = await this._openerService.open(url, {
|
|
3751
4220
|
allowCommands: false
|
|
@@ -3808,8 +4277,8 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3808
4277
|
const terminalCommandUri = ( URI.parse(terminalUri));
|
|
3809
4278
|
const isPty = terminalContent.isPty !== false;
|
|
3810
4279
|
const terminalInstance = isPty ? this._ensureTerminalInstance(terminalUri, sessionId) : undefined;
|
|
3811
|
-
const
|
|
3812
|
-
if (
|
|
4280
|
+
const hasSettledNonPtySnapshot = tc.status === ToolCallStatus.Completed && !isPty && terminalContent.result?.preview !== undefined;
|
|
4281
|
+
if (hasSettledNonPtySnapshot) {
|
|
3813
4282
|
outputTerminalAttachment.disposable.clear();
|
|
3814
4283
|
outputTerminalAttachment.sessionId = undefined;
|
|
3815
4284
|
} else if (!isPty && outputTerminalAttachment.sessionId !== sessionId) {
|
|
@@ -3907,13 +4376,24 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3907
4376
|
part.toolSpecificData.chatResource
|
|
3908
4377
|
);
|
|
3909
4378
|
part.toolSpecificData.chatResource = childChatUri;
|
|
3910
|
-
|
|
4379
|
+
const waitForActivity = !!subagentChat && (subagentChat.status & (SessionStatus.Idle | SessionStatus.Error)) !== 0 && (subagentChat.status & SessionStatus.InProgress) === 0;
|
|
4380
|
+
if (waitForActivity) {
|
|
4381
|
+
part.toolSpecificData.isChatAvailable = true;
|
|
4382
|
+
part.toolSpecificData.isActive = false;
|
|
4383
|
+
delete part.toolSpecificData.hasStarted;
|
|
4384
|
+
if (!parentToolCall || !requestId) {
|
|
4385
|
+
continue;
|
|
4386
|
+
}
|
|
4387
|
+
} else {
|
|
4388
|
+
part.toolSpecificData.isChatAvailable = false;
|
|
4389
|
+
}
|
|
3911
4390
|
subagentInsertions.push({
|
|
3912
4391
|
item,
|
|
3913
4392
|
index: i,
|
|
3914
4393
|
toolCallId: part.toolCallId,
|
|
3915
4394
|
childChatUri,
|
|
3916
|
-
requestId
|
|
4395
|
+
requestId,
|
|
4396
|
+
waitForActivity
|
|
3917
4397
|
});
|
|
3918
4398
|
}
|
|
3919
4399
|
}
|
|
@@ -3936,44 +4416,31 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3936
4416
|
index,
|
|
3937
4417
|
toolCallId,
|
|
3938
4418
|
childChatUri,
|
|
3939
|
-
requestId
|
|
4419
|
+
requestId,
|
|
4420
|
+
waitForActivity
|
|
3940
4421
|
}
|
|
3941
4422
|
) => {
|
|
3942
|
-
|
|
4423
|
+
const parentPart = item.parts[index];
|
|
3943
4424
|
const parentToolCall = parentToolCalls.get(toolCallId);
|
|
4425
|
+
if (waitForActivity) {
|
|
4426
|
+
return {
|
|
4427
|
+
item,
|
|
4428
|
+
index,
|
|
4429
|
+
innerParts: [],
|
|
4430
|
+
parentPart,
|
|
4431
|
+
parentToolCall,
|
|
4432
|
+
requestId,
|
|
4433
|
+
waitForActivity
|
|
4434
|
+
};
|
|
4435
|
+
}
|
|
3944
4436
|
try {
|
|
3945
4437
|
const observedState = await getChildState(childChatUri);
|
|
3946
4438
|
const childState = observedState?.getState();
|
|
3947
4439
|
if (childState) {
|
|
3948
4440
|
this._applySubagentUsageToHistoryPart(parentPart, sessionResource, childState);
|
|
3949
4441
|
}
|
|
3950
|
-
if (childState?.activeTurn && parentToolCall && parentPart.kind === "toolInvocationSerialized") {
|
|
3951
|
-
const serialized = parentPart;
|
|
3952
|
-
const invocation = toolCallStateToInvocation(
|
|
3953
|
-
parentToolCall,
|
|
3954
|
-
undefined,
|
|
3955
|
-
parentSession,
|
|
3956
|
-
this._config.connectionAuthority,
|
|
3957
|
-
undefined,
|
|
3958
|
-
undefined,
|
|
3959
|
-
this._config.connection.resourceUris
|
|
3960
|
-
);
|
|
3961
|
-
finalizeToolInvocation(
|
|
3962
|
-
invocation,
|
|
3963
|
-
parentToolCall,
|
|
3964
|
-
parentSession,
|
|
3965
|
-
this._config.connectionAuthority,
|
|
3966
|
-
this._config.connection.resourceUris
|
|
3967
|
-
);
|
|
3968
|
-
invocation.presentation = serialized.presentation;
|
|
3969
|
-
if (serialized.toolSpecificData?.kind === "subagent") {
|
|
3970
|
-
invocation.toolSpecificData = serialized.toolSpecificData;
|
|
3971
|
-
}
|
|
3972
|
-
item.parts[index] = invocation;
|
|
3973
|
-
parentPart = invocation;
|
|
3974
|
-
}
|
|
3975
4442
|
const innerParts = childState ? this._getSubagentInnerParts(childChatUri, toolCallId, childState) : [];
|
|
3976
|
-
if (observedState && childState && (
|
|
4443
|
+
if (observedState && childState && (!parentToolCall || !requestId) && ( innerParts.some(part => part instanceof ChatToolInvocation))) {
|
|
3977
4444
|
observations.add(observedState.onDidChange(() => {
|
|
3978
4445
|
const latestState = observedState.getState();
|
|
3979
4446
|
if (latestState) {
|
|
@@ -3987,7 +4454,8 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
3987
4454
|
innerParts,
|
|
3988
4455
|
parentPart,
|
|
3989
4456
|
parentToolCall,
|
|
3990
|
-
requestId
|
|
4457
|
+
requestId,
|
|
4458
|
+
waitForActivity
|
|
3991
4459
|
};
|
|
3992
4460
|
} catch (err) {
|
|
3993
4461
|
this._logService.warn(
|
|
@@ -4000,7 +4468,8 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4000
4468
|
innerParts: [],
|
|
4001
4469
|
parentPart,
|
|
4002
4470
|
parentToolCall,
|
|
4003
|
-
requestId
|
|
4471
|
+
requestId,
|
|
4472
|
+
waitForActivity
|
|
4004
4473
|
};
|
|
4005
4474
|
}
|
|
4006
4475
|
}));
|
|
@@ -4013,19 +4482,20 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4013
4482
|
item.parts.splice(index + 1, 0, ...innerParts);
|
|
4014
4483
|
}
|
|
4015
4484
|
}
|
|
4016
|
-
const
|
|
4485
|
+
const observationsByRequest = ( new Map());
|
|
4017
4486
|
for (const {
|
|
4018
4487
|
item,
|
|
4019
4488
|
parentPart,
|
|
4020
4489
|
parentToolCall,
|
|
4021
|
-
requestId
|
|
4490
|
+
requestId,
|
|
4491
|
+
innerParts,
|
|
4492
|
+
waitForActivity
|
|
4022
4493
|
} of enrichedInsertions) {
|
|
4023
|
-
if (!
|
|
4494
|
+
if (!parentToolCall || !requestId || (parentPart.kind !== "toolInvocation" && parentPart.kind !== "toolInvocationSerialized") || parentPart.toolSpecificData?.kind !== "subagent") {
|
|
4024
4495
|
continue;
|
|
4025
4496
|
}
|
|
4026
|
-
|
|
4027
|
-
|
|
4028
|
-
if (!deferred) {
|
|
4497
|
+
let observation = observationsByRequest.get(requestId);
|
|
4498
|
+
if (!observation) {
|
|
4029
4499
|
const store = observations.add(( new DisposableStore()));
|
|
4030
4500
|
const context = this._createSubagentContext(
|
|
4031
4501
|
observableFromSubscription(this, this._ensureSessionSubscription(parentSessionStr)),
|
|
@@ -4043,12 +4513,12 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4043
4513
|
sink: parts => publisher.publish(parts),
|
|
4044
4514
|
cancellationToken: CancellationToken.None
|
|
4045
4515
|
};
|
|
4046
|
-
|
|
4516
|
+
observation = {
|
|
4047
4517
|
context,
|
|
4048
4518
|
options,
|
|
4049
4519
|
publisher
|
|
4050
4520
|
};
|
|
4051
|
-
|
|
4521
|
+
observationsByRequest.set(requestId, observation);
|
|
4052
4522
|
}
|
|
4053
4523
|
const invocation = toolCallStateToInvocation(
|
|
4054
4524
|
parentToolCall,
|
|
@@ -4068,8 +4538,26 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4068
4538
|
);
|
|
4069
4539
|
invocation.toolSpecificData = parentPart.toolSpecificData;
|
|
4070
4540
|
invocation.presentation = parentPart.presentation;
|
|
4071
|
-
|
|
4072
|
-
|
|
4541
|
+
const index = item.parts.indexOf(parentPart);
|
|
4542
|
+
if (isUnstartedSubagent(parentPart)) {
|
|
4543
|
+
item.parts.splice(index, 1);
|
|
4544
|
+
observation.publisher.publish([invocation]);
|
|
4545
|
+
} else {
|
|
4546
|
+
item.parts[index] = invocation;
|
|
4547
|
+
}
|
|
4548
|
+
const snapshotToolCalls = ( new Map());
|
|
4549
|
+
for (const part of innerParts) {
|
|
4550
|
+
if (part instanceof ChatToolInvocation || part.kind === "toolInvocationSerialized") {
|
|
4551
|
+
snapshotToolCalls.set(part.toolCallId, part);
|
|
4552
|
+
}
|
|
4553
|
+
}
|
|
4554
|
+
this._trackSubagentToolCall(parentToolCall, invocation, {
|
|
4555
|
+
...observation.options,
|
|
4556
|
+
subagentSnapshot: {
|
|
4557
|
+
toolCalls: snapshotToolCalls,
|
|
4558
|
+
waitForActivity
|
|
4559
|
+
}
|
|
4560
|
+
}, observation.context);
|
|
4073
4561
|
}
|
|
4074
4562
|
}
|
|
4075
4563
|
async _loadSubagentState(parentSessionUri, childChatUri) {
|
|
@@ -4106,24 +4594,29 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4106
4594
|
return;
|
|
4107
4595
|
}
|
|
4108
4596
|
let credits = 0;
|
|
4109
|
-
let
|
|
4110
|
-
const lookup = this._createTurnModelLookup(sessionResource, undefined);
|
|
4597
|
+
let model;
|
|
4111
4598
|
const turns = childState.activeTurn && !( childState.turns.some(turn => turn.id === childState.activeTurn?.id)) ? [...childState.turns, childState.activeTurn] : childState.turns;
|
|
4112
4599
|
for (const turn of turns) {
|
|
4113
4600
|
const turnCredits = usageInfoToChatUsage(turn.usage)?.copilotCredits;
|
|
4114
4601
|
if (typeof turnCredits === "number") {
|
|
4115
4602
|
credits += turnCredits;
|
|
4116
4603
|
}
|
|
4117
|
-
const
|
|
4118
|
-
if (
|
|
4119
|
-
|
|
4604
|
+
const turnModel = this._createTurnModelLookup(sessionResource, turn.message.model?.id).toBilledModelInfo?.(turn.usage);
|
|
4605
|
+
if (turnModel) {
|
|
4606
|
+
model = {
|
|
4607
|
+
...turnModel,
|
|
4608
|
+
modelConfiguration: turn.message.model?.config
|
|
4609
|
+
};
|
|
4120
4610
|
}
|
|
4121
4611
|
}
|
|
4122
4612
|
if (credits > 0) {
|
|
4123
4613
|
part.toolSpecificData.credits = credits;
|
|
4124
4614
|
}
|
|
4125
|
-
if (
|
|
4126
|
-
part.toolSpecificData.
|
|
4615
|
+
if (model) {
|
|
4616
|
+
part.toolSpecificData.modelId = model.modelId;
|
|
4617
|
+
part.toolSpecificData.modelName = model.modelName;
|
|
4618
|
+
part.toolSpecificData.modelConfiguration = model.modelConfiguration;
|
|
4619
|
+
part.toolSpecificData.runtimeModelConfiguration = model.runtimeModelConfiguration;
|
|
4127
4620
|
}
|
|
4128
4621
|
const timing = getSubagentTiming(childState);
|
|
4129
4622
|
part.toolSpecificData.hasStarted = !!childState.activeTurn || childState.turns.length > 0;
|
|
@@ -4184,7 +4677,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4184
4677
|
const tc = rp.toolCall;
|
|
4185
4678
|
if (tc.status === ToolCallStatus.Completed || tc.status === ToolCallStatus.Cancelled) {
|
|
4186
4679
|
const completedTc = tc;
|
|
4187
|
-
const fileEditParts = completedToolCallToEditParts(completedTc, this._config.connectionAuthority);
|
|
4680
|
+
const fileEditParts = completedToolCallToEditParts(completedTc, this._config.connectionAuthority, toolCallId);
|
|
4188
4681
|
const serialized = completedToolCallToSerialized(completedTc, toolCallId, ( URI.parse(childSessionUri)), this._config.connectionAuthority, this._config.connection.resourceUris);
|
|
4189
4682
|
if (fileEditParts.length > 0) {
|
|
4190
4683
|
serialized.presentation = ToolInvocationPresentation.Hidden;
|
|
@@ -4221,13 +4714,14 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4221
4714
|
disposables,
|
|
4222
4715
|
subagentContext,
|
|
4223
4716
|
perInvocationCreditsAccumulator,
|
|
4224
|
-
perInvocationModel
|
|
4717
|
+
perInvocationModel,
|
|
4718
|
+
snapshotToolCalls
|
|
4225
4719
|
) {
|
|
4226
4720
|
const parentSessionUri = ( parentSession.toString());
|
|
4227
4721
|
const cts = ( new CancellationTokenSource());
|
|
4228
4722
|
disposables.add(toDisposable(() => cts.dispose(true)));
|
|
4229
4723
|
disposables.add(toDisposable(() => {
|
|
4230
|
-
if (parentInvocation.toolSpecificData?.kind === "subagent" && parentInvocation.toolSpecificData.isActive) {
|
|
4724
|
+
if (parentInvocation.toolSpecificData?.kind === "subagent" && parentInvocation.toolSpecificData.presentation !== "phase" && parentInvocation.toolSpecificData.isActive) {
|
|
4231
4725
|
parentInvocation.toolSpecificData.isActive = false;
|
|
4232
4726
|
parentInvocation.notifyToolSpecificDataChanged();
|
|
4233
4727
|
}
|
|
@@ -4288,7 +4782,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4288
4782
|
return;
|
|
4289
4783
|
}
|
|
4290
4784
|
const isActive = !!state.activeTurn;
|
|
4291
|
-
if (parentInvocation.toolSpecificData?.kind === "subagent") {
|
|
4785
|
+
if (parentInvocation.toolSpecificData?.kind === "subagent" && parentInvocation.toolSpecificData.presentation !== "phase") {
|
|
4292
4786
|
const timing = getSubagentTiming(state);
|
|
4293
4787
|
const lastResponsePart = state.activeTurn?.responseParts.at(-1);
|
|
4294
4788
|
const activity = lastResponsePart?.kind === ResponsePartKind.Markdown ? "markdown" : lastResponsePart?.kind === ResponsePartKind.Reasoning ? "reasoning" : undefined;
|
|
@@ -4323,6 +4817,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4323
4817
|
}
|
|
4324
4818
|
return ids;
|
|
4325
4819
|
});
|
|
4820
|
+
const restoredTurnIds = snapshotToolCalls ? ( new Set(childState$.get()?.turns.map(turn => turn.id))) : undefined;
|
|
4326
4821
|
disposables.add(
|
|
4327
4822
|
autorunPerKeyedItem(childTurnIds$, t => t.id, (turnId, _t$, turnStore) => {
|
|
4328
4823
|
turnStore.add(this._observeTurn({
|
|
@@ -4335,7 +4830,9 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4335
4830
|
subAgentInvocationId: rootInvocationId,
|
|
4336
4831
|
subagentStore: disposables,
|
|
4337
4832
|
subAgentCreditsAccumulator: perInvocationCreditsAccumulator,
|
|
4338
|
-
subAgentModelObservable: perInvocationModel
|
|
4833
|
+
subAgentModelObservable: perInvocationModel,
|
|
4834
|
+
snapshotToolCalls,
|
|
4835
|
+
suppressErrorMarkdown: restoredTurnIds?.has(turnId)
|
|
4339
4836
|
}));
|
|
4340
4837
|
})
|
|
4341
4838
|
);
|
|
@@ -4423,6 +4920,20 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4423
4920
|
}
|
|
4424
4921
|
return editingSession;
|
|
4425
4922
|
}
|
|
4923
|
+
_finalizeToolInvocation(invocation, toolCall, opts) {
|
|
4924
|
+
const edits = finalizeToolInvocation(
|
|
4925
|
+
invocation,
|
|
4926
|
+
toolCall,
|
|
4927
|
+
opts.backendSession,
|
|
4928
|
+
this._config.connectionAuthority,
|
|
4929
|
+
this._config.connection.resourceUris
|
|
4930
|
+
);
|
|
4931
|
+
if (edits.length === 0) {
|
|
4932
|
+
return;
|
|
4933
|
+
}
|
|
4934
|
+
const editParts = opts.subAgentInvocationId !== undefined ? completedToolCallToEditParts(toolCall, this._config.connectionAuthority, opts.subAgentInvocationId) : this._hydrateFileEdits(opts.sessionResource, opts.turnId, toolCall);
|
|
4935
|
+
opts.sink(editParts);
|
|
4936
|
+
}
|
|
4426
4937
|
_hydrateFileEdits(sessionResource, requestId, tc) {
|
|
4427
4938
|
const controller = this._ensureSnapshotController(sessionResource);
|
|
4428
4939
|
controller?.addToolCallEdits(requestId, tc);
|
|
@@ -4434,13 +4945,73 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4434
4945
|
_ensureTerminalInstance(terminalUri, terminalToolSessionId) {
|
|
4435
4946
|
return this._agentHostTerminalService.reviveTerminal(this._config.connection, ( URI.parse(terminalUri)), terminalToolSessionId);
|
|
4436
4947
|
}
|
|
4948
|
+
async _discoverSessionIdentity(sessionResource, token) {
|
|
4949
|
+
if (!this._sessionIdentityRefresh) {
|
|
4950
|
+
const refresh = this._loadSessionIdentities(sessionResource).finally(() => {
|
|
4951
|
+
if (this._sessionIdentityRefresh === refresh) {
|
|
4952
|
+
this._sessionIdentityRefresh = undefined;
|
|
4953
|
+
}
|
|
4954
|
+
});
|
|
4955
|
+
this._sessionIdentityRefresh = refresh;
|
|
4956
|
+
}
|
|
4957
|
+
await raceCancellationError(this._sessionIdentityRefresh, token);
|
|
4958
|
+
const advertised = this._resolveAdvertisedSessionUri(sessionResource);
|
|
4959
|
+
if (!advertised) {
|
|
4960
|
+
throw ( new Error(`Session identity was not advertised by its agent host: ${( sessionResource.toString())}`));
|
|
4961
|
+
}
|
|
4962
|
+
return advertised;
|
|
4963
|
+
}
|
|
4964
|
+
async _loadSessionIdentities(sessionResource) {
|
|
4965
|
+
const authority = this._connectionsService.resolveSessionResourceIdentity(sessionResource)?.connectionAuthority ?? this._config.connectionAuthority;
|
|
4966
|
+
for (const metadata of await this._config.connection.listSessions()) {
|
|
4967
|
+
this._connectionsService.registerSessionResource(metadata.session, authority, metadata.provider);
|
|
4968
|
+
}
|
|
4969
|
+
}
|
|
4437
4970
|
_resolveSessionUri(sessionResource) {
|
|
4438
4971
|
const provisionalSession = this._provisionalService.get(sessionResource);
|
|
4439
4972
|
if (provisionalSession) {
|
|
4440
4973
|
return provisionalSession;
|
|
4441
4974
|
}
|
|
4442
4975
|
const rawId = sessionResource.path.substring(1);
|
|
4443
|
-
|
|
4976
|
+
const advertised = this._resolveAdvertisedSessionUri(sessionResource);
|
|
4977
|
+
if (advertised) {
|
|
4978
|
+
return advertised;
|
|
4979
|
+
}
|
|
4980
|
+
if (!this._isNewSessionResource(sessionResource)) {
|
|
4981
|
+
return AgentSession.uri(this._config.backendSessionScheme ?? this._config.provider, rawId);
|
|
4982
|
+
}
|
|
4983
|
+
return this._config.backendSessionScheme ? AgentSession.uri(this._config.backendSessionScheme, rawId) : newAgentHostSessionUri(
|
|
4984
|
+
this._config.provider,
|
|
4985
|
+
rawId,
|
|
4986
|
+
this._config.connection.initializeResult.get()
|
|
4987
|
+
);
|
|
4988
|
+
}
|
|
4989
|
+
_resolveAdvertisedSessionUri(sessionResource) {
|
|
4990
|
+
const identity = this._connectionsService.resolveSessionResourceIdentity(sessionResource);
|
|
4991
|
+
if (identity?.backendSessionIsAdvertised) {
|
|
4992
|
+
return identity.backendSession;
|
|
4993
|
+
}
|
|
4994
|
+
const query = sessionResource.query.split("&").filter(part => !part.startsWith(`${CHAT_SUBAGENT_RESOURCE_QUERY_PARAM}=`)).join("&");
|
|
4995
|
+
const parent = sessionResource.with({
|
|
4996
|
+
query,
|
|
4997
|
+
fragment: ""
|
|
4998
|
+
});
|
|
4999
|
+
const parentIdentity = this._connectionsService.resolveSessionResourceIdentity(parent);
|
|
5000
|
+
if (parentIdentity?.backendSessionIsAdvertised) {
|
|
5001
|
+
return parentIdentity.backendSession;
|
|
5002
|
+
}
|
|
5003
|
+
const authority = identity?.connectionAuthority ?? this._config.connectionAuthority;
|
|
5004
|
+
if (this._connectionsService.findSessionResource(parent, authority)) {
|
|
5005
|
+
return parent;
|
|
5006
|
+
}
|
|
5007
|
+
const legacy = AgentSession.uri(
|
|
5008
|
+
this._config.backendSessionScheme ?? this._config.provider,
|
|
5009
|
+
AgentSession.id(parent)
|
|
5010
|
+
);
|
|
5011
|
+
if (parent.authority || parent.query || legacy.scheme === "ahp-session" || (parent.scheme !== this._config.sessionType && parent.scheme !== legacy.scheme)) {
|
|
5012
|
+
return undefined;
|
|
5013
|
+
}
|
|
5014
|
+
return this._connectionsService.findSessionResource(legacy, authority) ? legacy : undefined;
|
|
4444
5015
|
}
|
|
4445
5016
|
_isNewSessionResource(sessionResource) {
|
|
4446
5017
|
return !!this._config.isNewSession?.(sessionResource) || this._workingDirectoryResolver.isNewSession(sessionResource);
|
|
@@ -4497,7 +5068,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4497
5068
|
fragment: forkedChatId
|
|
4498
5069
|
}));
|
|
4499
5070
|
const now = Date.now();
|
|
4500
|
-
const forkedLabel = forkedSummary.title || chatModel?.title || ( localize(
|
|
5071
|
+
const forkedLabel = forkedSummary.title || chatModel?.title || ( localize(9786, "Forked Session"));
|
|
4501
5072
|
return {
|
|
4502
5073
|
resource: forkedResource,
|
|
4503
5074
|
label: forkedLabel,
|
|
@@ -4517,15 +5088,21 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4517
5088
|
const authenticated = await this._config.resolveAuthentication(protectedResources);
|
|
4518
5089
|
if (!authenticated) {
|
|
4519
5090
|
throw ( new Error(( localize(
|
|
4520
|
-
|
|
5091
|
+
9787,
|
|
4521
5092
|
"Authentication is required to start a session. Please sign in and try again."
|
|
4522
5093
|
))));
|
|
4523
5094
|
}
|
|
4524
5095
|
}
|
|
4525
5096
|
return protectedResources;
|
|
4526
5097
|
}
|
|
4527
|
-
async _createAndSubscribe(
|
|
4528
|
-
|
|
5098
|
+
async _createAndSubscribe(
|
|
5099
|
+
sessionResource,
|
|
5100
|
+
model,
|
|
5101
|
+
config,
|
|
5102
|
+
importConversation,
|
|
5103
|
+
onFailureStage,
|
|
5104
|
+
cancellationToken = CancellationToken.None
|
|
5105
|
+
) {
|
|
4529
5106
|
const requestedSession = this._resolveSessionUri(sessionResource);
|
|
4530
5107
|
const meta = this._provisionalService.getInitialSessionMetadata(sessionResource);
|
|
4531
5108
|
this._logService.trace(
|
|
@@ -4533,12 +5110,47 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4533
5110
|
);
|
|
4534
5111
|
onFailureStage?.("authentication");
|
|
4535
5112
|
const protectedResources = await this._ensureRequiredAuthentication(model);
|
|
5113
|
+
onFailureStage?.("createSession");
|
|
5114
|
+
if (this._config.prepareSession) {
|
|
5115
|
+
const previousDirectory = this._resolveRequestedWorkingDirectory(sessionResource);
|
|
5116
|
+
await raceCancellationError(
|
|
5117
|
+
this._config.prepareSession(sessionResource, cancellationToken),
|
|
5118
|
+
cancellationToken
|
|
5119
|
+
);
|
|
5120
|
+
if (!isEqual(previousDirectory, this._resolveRequestedWorkingDirectory(sessionResource))) {
|
|
5121
|
+
this._disposeActiveClientEntry(sessionResource);
|
|
5122
|
+
}
|
|
5123
|
+
}
|
|
5124
|
+
const workingDirectories = this._resolveRequestedWorkingDirectories(sessionResource);
|
|
5125
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
5126
|
+
throw ( new CancellationError());
|
|
5127
|
+
}
|
|
5128
|
+
if (config && ( Object.keys(config)).length > 0) {
|
|
5129
|
+
const resolved = await raceCancellationError(this._config.connection.resolveSessionConfig({
|
|
5130
|
+
provider: this._config.provider,
|
|
5131
|
+
workingDirectory: workingDirectories?.[0],
|
|
5132
|
+
config
|
|
5133
|
+
}), cancellationToken);
|
|
5134
|
+
const requestedKeys = ( Object.keys(config));
|
|
5135
|
+
config = filterSessionConfigValues(resolved.schema, {
|
|
5136
|
+
...resolved.values,
|
|
5137
|
+
...normalizeAgentHostApprovalConfig(this._configurationService, resolved, config)
|
|
5138
|
+
});
|
|
5139
|
+
const omitted = requestedKeys.filter(key => !Object.hasOwn(config, key));
|
|
5140
|
+
if (omitted.length > 0) {
|
|
5141
|
+
this._logService.warn(
|
|
5142
|
+
`[AgentHost] Session configuration not advertised or writable: ${omitted.join(", ")}`
|
|
5143
|
+
);
|
|
5144
|
+
}
|
|
5145
|
+
}
|
|
4536
5146
|
const activeClientEntry = this._ensureActiveClientEntry(sessionResource);
|
|
4537
|
-
await activeClientEntry.whenSettled();
|
|
5147
|
+
await raceCancellationError(activeClientEntry.whenSettled(), cancellationToken);
|
|
5148
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
5149
|
+
throw ( new CancellationError());
|
|
5150
|
+
}
|
|
4538
5151
|
const activeClient = this._getCurrentActiveClient(sessionResource);
|
|
4539
5152
|
const progressToken = generateUuid();
|
|
4540
5153
|
let session;
|
|
4541
|
-
onFailureStage?.("createSession");
|
|
4542
5154
|
try {
|
|
4543
5155
|
session = await this._config.connection.createSession({
|
|
4544
5156
|
session: requestedSession,
|
|
@@ -4556,6 +5168,9 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4556
5168
|
onFailureStage?.("authentication");
|
|
4557
5169
|
this._logService.info("[AgentHost] Authentication required, prompting user...");
|
|
4558
5170
|
const authenticated = await this._config.resolveAuthentication(protectedResources);
|
|
5171
|
+
if (this._isInvocationAbandoned(cancellationToken)) {
|
|
5172
|
+
throw ( new CancellationError());
|
|
5173
|
+
}
|
|
4559
5174
|
if (authenticated) {
|
|
4560
5175
|
onFailureStage?.("createSession");
|
|
4561
5176
|
session = await this._config.connection.createSession({
|
|
@@ -4571,7 +5186,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4571
5186
|
});
|
|
4572
5187
|
} else {
|
|
4573
5188
|
throw ( new Error(( localize(
|
|
4574
|
-
|
|
5189
|
+
9787,
|
|
4575
5190
|
"Authentication is required to start a session. Please sign in and try again."
|
|
4576
5191
|
))));
|
|
4577
5192
|
}
|
|
@@ -4580,6 +5195,9 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4580
5195
|
}
|
|
4581
5196
|
}
|
|
4582
5197
|
this._provisionalService.clearSessionCreationMetadata(sessionResource);
|
|
5198
|
+
if (this._store.isDisposed) {
|
|
5199
|
+
throw ( new CancellationError());
|
|
5200
|
+
}
|
|
4583
5201
|
if (requestedSession && !isEqual(session, requestedSession)) {
|
|
4584
5202
|
throw ( new Error(`Agent host returned unexpected session URI. Expected ${( requestedSession.toString())}, got ${( session.toString())}`));
|
|
4585
5203
|
}
|
|
@@ -4589,7 +5207,10 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4589
5207
|
const newSub = this._ensureSessionSubscription(( session.toString()));
|
|
4590
5208
|
this._configureActiveClientReconciliation(sessionResource, session, newSub);
|
|
4591
5209
|
if (!this._getSessionState(( session.toString()))) {
|
|
4592
|
-
await this._whenSubscriptionHydrated(newSub,
|
|
5210
|
+
await this._whenSubscriptionHydrated(newSub, this._lifetime.token);
|
|
5211
|
+
if (this._store.isDisposed) {
|
|
5212
|
+
throw ( new CancellationError());
|
|
5213
|
+
}
|
|
4593
5214
|
}
|
|
4594
5215
|
const rawState = this._requireRawSessionState(( session.toString()));
|
|
4595
5216
|
const chatURI = this._resolveChatUriFromState(sessionResource, rawState);
|
|
@@ -4597,6 +5218,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4597
5218
|
const chatSub = this._ensureChatSubscription(( session.toString()), chatURI);
|
|
4598
5219
|
this._activeSessions.get(sessionResource)?.setStateSubscriptions(newSub, chatSub);
|
|
4599
5220
|
this._ensurePendingMessageSubscription(sessionResource, session);
|
|
5221
|
+
this._ensureDraftSyncSubscription(sessionResource, session, chatURI);
|
|
4600
5222
|
this._watchForServerInitiatedTurns(session, sessionResource);
|
|
4601
5223
|
return session;
|
|
4602
5224
|
}
|
|
@@ -4638,17 +5260,28 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4638
5260
|
}
|
|
4639
5261
|
const store = ( new DisposableStore());
|
|
4640
5262
|
this._draftSyncSubscriptions.set(sessionResource, store);
|
|
4641
|
-
this._acquireOrWaitForSession(sessionResource, store).then(chatModel => {
|
|
5263
|
+
this._acquireOrWaitForSession(sessionResource, store).then(async chatModel => {
|
|
4642
5264
|
if (!chatModel || store.isDisposed) {
|
|
4643
5265
|
return;
|
|
4644
5266
|
}
|
|
5267
|
+
const chatSubscription = this._ensureChatSubscription(( backendSession.toString()), chatKey);
|
|
5268
|
+
if (chatSubscription.value === undefined) {
|
|
5269
|
+
const cts = ( new CancellationTokenSource());
|
|
5270
|
+
store.add(toDisposable(() => cts.dispose(true)));
|
|
5271
|
+
await this._whenSubscriptionHydrated(chatSubscription, cts.token);
|
|
5272
|
+
}
|
|
5273
|
+
if (store.isDisposed) {
|
|
5274
|
+
return;
|
|
5275
|
+
}
|
|
5276
|
+
const chatState = chatSubscription.value;
|
|
5277
|
+
if (!chatState || chatState instanceof Error) {
|
|
5278
|
+
throw chatState ?? ( new Error(`Agent host chat state did not hydrate: ${chatKey}`));
|
|
5279
|
+
}
|
|
4645
5280
|
this._installDraftSync(sessionResource, chatModel, backendSession, chatKey, store);
|
|
4646
|
-
}
|
|
5281
|
+
}).catch(err => {
|
|
4647
5282
|
if (!store.isDisposed) {
|
|
4648
|
-
this._logService.error(
|
|
4649
|
-
|
|
4650
|
-
err
|
|
4651
|
-
);
|
|
5283
|
+
this._logService.error(`[AgentHost] Failed to initialize draft sync: ${( sessionResource.toString())}`, err);
|
|
5284
|
+
this._draftSyncSubscriptions.deleteAndDispose(sessionResource);
|
|
4652
5285
|
}
|
|
4653
5286
|
});
|
|
4654
5287
|
}
|
|
@@ -4683,6 +5316,11 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4683
5316
|
return value && !(value instanceof Error) ? value.draft : undefined;
|
|
4684
5317
|
};
|
|
4685
5318
|
const draftState = ( new DraftSyncState(readRemoteDraft()));
|
|
5319
|
+
const initialInputState = inputModel.state.get();
|
|
5320
|
+
const hasLocalDraft = !!initialInputState && initialInputState.origin !== ChatInputStateOrigin.Remote && (initialInputState.inputText.length > 0 || initialInputState.attachments.length > 0 || initialInputState.mode.id !== ChatMode.Agent.id || isInConversationModelChoice(initialInputState.selectedModelReason));
|
|
5321
|
+
if (draftState.synced && !hasLocalDraft) {
|
|
5322
|
+
this._applyRemoteDraft(inputModel, sessionResource, draftState.synced);
|
|
5323
|
+
}
|
|
4686
5324
|
let lastRemoteDraft = draftState.synced;
|
|
4687
5325
|
const syncDraft = state => {
|
|
4688
5326
|
if (state?.origin === ChatInputStateOrigin.Remote) {
|
|
@@ -4767,14 +5405,10 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4767
5405
|
if (!state.inputText && !model && !agentUri && attachments.length === 0) {
|
|
4768
5406
|
return undefined;
|
|
4769
5407
|
}
|
|
5408
|
+
const previous = this._getSessionState(( this._resolveSessionUri(sessionResource).toString()), this._getChatURI(sessionResource))?.draft;
|
|
5409
|
+
const metadata = previous?.text === state.inputText ? readAgentMessageRoundTripMetadata(previous) : undefined;
|
|
4770
5410
|
return {
|
|
4771
|
-
|
|
4772
|
-
origin: {
|
|
4773
|
-
kind: MessageKind.User
|
|
4774
|
-
},
|
|
4775
|
-
...(attachments.length > 0 ? {
|
|
4776
|
-
attachments
|
|
4777
|
-
} : {}),
|
|
5411
|
+
...requestMessage(state.inputText, attachments, metadata, false),
|
|
4778
5412
|
...(model ? {
|
|
4779
5413
|
model
|
|
4780
5414
|
} : {}),
|
|
@@ -4868,7 +5502,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4868
5502
|
}
|
|
4869
5503
|
_getTurnResponseDetails(sessionResource, backendSession, turn) {
|
|
4870
5504
|
const fallbackRawModelId = turn?.message?.model?.id ?? lastTurnModelSelection(this._getSessionState(( backendSession.toString())))?.id;
|
|
4871
|
-
return this._createTurnModelLookup(sessionResource, fallbackRawModelId)
|
|
5505
|
+
return turnToResponseDetails(turn, this._createTurnModelLookup(sessionResource, fallbackRawModelId));
|
|
4872
5506
|
}
|
|
4873
5507
|
_createTurnModelLookup(
|
|
4874
5508
|
sessionResource,
|
|
@@ -4912,12 +5546,12 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4912
5546
|
}
|
|
4913
5547
|
return undefined;
|
|
4914
5548
|
};
|
|
4915
|
-
const resolveBilledModel = (rawModelId, usage) => {
|
|
5549
|
+
const resolveBilledModel = (rawModelId, usage, responseModelId) => {
|
|
4916
5550
|
const routed = !!readUsageInfoMeta(usage).autoModeResolved;
|
|
4917
|
-
const billedId = routed && hideAutoExplainability ? AUTO_RAW_MODEL_ID : rawModelId;
|
|
5551
|
+
const billedId = responseModelId ?? (routed && hideAutoExplainability ? AUTO_RAW_MODEL_ID : rawModelId);
|
|
4918
5552
|
return {
|
|
4919
5553
|
billedId,
|
|
4920
|
-
resolved: lookupModel(billedId)
|
|
5554
|
+
resolved: responseModelId ? lookupRawModel(responseModelId) : lookupModel(billedId)
|
|
4921
5555
|
};
|
|
4922
5556
|
};
|
|
4923
5557
|
const displayName = resolved => {
|
|
@@ -4932,25 +5566,52 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4932
5566
|
};
|
|
4933
5567
|
return {
|
|
4934
5568
|
toLanguageModelId: rawModelId => this._toLanguageModelId(sessionResource, resolveRaw(rawModelId)),
|
|
5569
|
+
isFusionModel: rawModelId => this._config.provider === COPILOT_CLI_AGENT_PROVIDER_ID && isCopilotHydraFusionModelId(rawModelId),
|
|
5570
|
+
toActualModelId: rawModelId => lookupRawModel(rawModelId)?.identifier ?? this._toLanguageModelId(sessionResource, rawModelId),
|
|
4935
5571
|
toModelDisplayName: rawModelId => lookupRawModel(rawModelId)?.model.name,
|
|
4936
|
-
toResponseDetails: (rawModelId, usage) => {
|
|
5572
|
+
toResponseDetails: (rawModelId, usage, responseModelId) => {
|
|
4937
5573
|
const {
|
|
4938
5574
|
billedId,
|
|
4939
5575
|
resolved
|
|
4940
|
-
} = resolveBilledModel(rawModelId, usage);
|
|
5576
|
+
} = resolveBilledModel(rawModelId, usage, responseModelId);
|
|
4941
5577
|
const billedModelId = resolved && !resolved.resolvedFromRaw ? billedId : undefined;
|
|
4942
|
-
const
|
|
5578
|
+
const fusionModelName = responseModelId === undefined ? undefined : COPILOT_HYDRA_FUSION_MODEL_NAMES.get(responseModelId);
|
|
5579
|
+
const ensemble = fusionModelName ? lookupRawModel(AUTO_RAW_MODEL_ID) : undefined;
|
|
5580
|
+
if (ensemble?.model.autoModelEnsemble && responseModelId === COPILOT_HYDRA_FUSION_MODEL_ID) {
|
|
5581
|
+
logSettingExperimentTrigger(
|
|
5582
|
+
this._telemetryService,
|
|
5583
|
+
AgentHostEnsembleIntelligenceUsesHydraFusionSettingId
|
|
5584
|
+
);
|
|
5585
|
+
}
|
|
5586
|
+
const ensembleTier = ensemble && responseModelId ? getEnsembleTierLabel(ensemble.model, responseModelId) : undefined;
|
|
5587
|
+
const responseModel = ensemble && ensembleTier ? {
|
|
5588
|
+
name: ( localize(9788, "{0} {1}", displayName(ensemble), ensembleTier)),
|
|
5589
|
+
pricing: resolved?.model.pricing
|
|
5590
|
+
} : resolved ? {
|
|
4943
5591
|
name: displayName(resolved),
|
|
4944
5592
|
pricing: resolved.model.pricing
|
|
5593
|
+
} : fusionModelName ? {
|
|
5594
|
+
name: fusionModelName
|
|
4945
5595
|
} : undefined;
|
|
4946
5596
|
return formatTurnResponseDetails(responseModel, billedModelId, usage);
|
|
4947
5597
|
},
|
|
4948
|
-
|
|
5598
|
+
toBilledModelInfo: usage => {
|
|
4949
5599
|
const chosenModel = readUsageInfoMeta(usage).autoModeResolved?.chosenModel;
|
|
4950
5600
|
const {
|
|
5601
|
+
billedId,
|
|
4951
5602
|
resolved
|
|
4952
5603
|
} = resolveBilledModel(chosenModel ?? usage?.model, usage);
|
|
4953
|
-
|
|
5604
|
+
const knownModel = resolved && (resolved.resolvedFromRaw || !billedId) ? resolved : undefined;
|
|
5605
|
+
const modelId = knownModel?.identifier ?? this._toLanguageModelId(sessionResource, billedId ?? fallbackRawModelId);
|
|
5606
|
+
const modelName = knownModel ? displayName(knownModel) : billedId ?? fallbackRawModelId;
|
|
5607
|
+
const runtimeModelConfiguration = readAgentRuntimeModelConfiguration(usage);
|
|
5608
|
+
return modelId && modelName ? {
|
|
5609
|
+
modelId,
|
|
5610
|
+
modelName,
|
|
5611
|
+
...(runtimeModelConfiguration ? {
|
|
5612
|
+
runtimeModelConfiguration
|
|
5613
|
+
} : {})
|
|
5614
|
+
} : undefined;
|
|
4954
5615
|
},
|
|
4955
5616
|
toAutoModeResolution: usage => {
|
|
4956
5617
|
const resolution = readUsageInfoMeta(usage).autoModeResolved;
|
|
@@ -4972,6 +5633,21 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
4972
5633
|
_resolveRequestedWorkingDirectory(sessionResource) {
|
|
4973
5634
|
return this._config.resolveWorkingDirectory?.(sessionResource) ?? this._newSessionFolderService?.getFolder(sessionResource) ?? this._workingDirectoryResolver?.resolve(sessionResource) ?? this._newSessionFolderService?.getDefaultFolder() ?? this._workspaceContextService.getWorkspace().folders[0]?.uri;
|
|
4974
5635
|
}
|
|
5636
|
+
_getSensitiveEditLocationsConfig(sessionResource, existingState) {
|
|
5637
|
+
const desired = mergeChatSensitiveEditLocations(...this._resolveCustomizationScopeRoots(sessionResource).map(resource => {
|
|
5638
|
+
const overrides = {
|
|
5639
|
+
resource
|
|
5640
|
+
};
|
|
5641
|
+
return getChatSensitiveEditLocations(
|
|
5642
|
+
this._configurationService.getValue(ChatHookFilesLocationsSettingId, overrides),
|
|
5643
|
+
this._configurationService.getValue(ChatAgentFilesLocationsSettingId, overrides)
|
|
5644
|
+
);
|
|
5645
|
+
}));
|
|
5646
|
+
const current = existingState?.config?.values[SessionConfigKey.SensitiveEditLocations];
|
|
5647
|
+
return (desired.length > 0 || (current !== undefined && !equals(current, desired))) ? {
|
|
5648
|
+
[SessionConfigKey.SensitiveEditLocations]: desired
|
|
5649
|
+
} : {};
|
|
5650
|
+
}
|
|
4975
5651
|
_resolveRequestedWorkingDirectories(sessionResource) {
|
|
4976
5652
|
const primary = this._resolveRequestedWorkingDirectory(sessionResource);
|
|
4977
5653
|
return this._hostAddressableWorkingDirectories(computeWorkingDirectories(
|
|
@@ -5022,46 +5698,19 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
5022
5698
|
if (state?.workingDirectories === undefined) {
|
|
5023
5699
|
state = (await this._readEagerlyCreatedSessionState(backendSession, token)) ?? state;
|
|
5024
5700
|
}
|
|
5025
|
-
if (state && readSessionWorkspaceless(state._meta)) {
|
|
5026
|
-
return
|
|
5027
|
-
}
|
|
5028
|
-
const dirs = state?.workingDirectories;
|
|
5029
|
-
if (state && dirs !== undefined) {
|
|
5030
|
-
await this._inheritWorktreeTrust(state);
|
|
5031
|
-
return dirs.map(directory => typeof directory === "string" ? ( URI.parse(directory)) : directory);
|
|
5701
|
+
if (state && (readSessionWorkspaceless(state._meta) || state.workingDirectories !== undefined)) {
|
|
5702
|
+
return resolveAgentHostSessionTrustFolders(state, this._workspaceTrustManagementService);
|
|
5032
5703
|
}
|
|
5033
5704
|
}
|
|
5034
5705
|
return this._resolveRequestedWorkingDirectories(sessionResource) ?? [];
|
|
5035
5706
|
}
|
|
5036
|
-
async
|
|
5037
|
-
|
|
5038
|
-
return;
|
|
5039
|
-
}
|
|
5040
|
-
const repositoryRootRaw = state.project?.uri;
|
|
5041
|
-
if (!repositoryRootRaw) {
|
|
5042
|
-
return;
|
|
5043
|
-
}
|
|
5044
|
-
const repositoryRoot = typeof repositoryRootRaw === "string" ? ( URI.parse(repositoryRootRaw)) : repositoryRootRaw;
|
|
5045
|
-
const worktreeFolders = (state.workingDirectories ?? []).map(directory => typeof directory === "string" ? ( URI.parse(directory)) : directory).filter(folder => isWorktreeUnderRepository(folder, repositoryRoot));
|
|
5046
|
-
if (worktreeFolders.length === 0) {
|
|
5047
|
-
return;
|
|
5048
|
-
}
|
|
5049
|
-
const [repoTrust, ...folderTrusts] = await Promise.all([
|
|
5050
|
-
this._workspaceTrustManagementService.getUriTrustInfo(repositoryRoot),
|
|
5051
|
-
...worktreeFolders.map(folder => this._workspaceTrustManagementService.getUriTrustInfo(folder))
|
|
5052
|
-
]);
|
|
5053
|
-
if (!repoTrust.trusted) {
|
|
5054
|
-
return;
|
|
5055
|
-
}
|
|
5056
|
-
const untrusted = worktreeFolders.filter((_, index) => !folderTrusts[index].trusted);
|
|
5057
|
-
if (untrusted.length > 0) {
|
|
5058
|
-
await this._workspaceTrustManagementService.setUrisTrust(untrusted, true);
|
|
5059
|
-
}
|
|
5060
|
-
}
|
|
5061
|
-
async _ensureFoldersTrusted(folders) {
|
|
5062
|
-
const message = ( localize(8181, "AI features are currently only supported in trusted workspaces."));
|
|
5707
|
+
async _ensureFoldersTrusted(folders, onInteractionRequired) {
|
|
5708
|
+
const message = ( localize(9789, "AI features are currently only supported in trusted workspaces."));
|
|
5063
5709
|
const localFolders = folders.filter(folder => folder.scheme === Schemas.file);
|
|
5064
5710
|
if (localFolders.length === 0) {
|
|
5711
|
+
if (!this._workspaceTrustManagementService.isWorkspaceTrusted()) {
|
|
5712
|
+
onInteractionRequired();
|
|
5713
|
+
}
|
|
5065
5714
|
return !!(await this._workspaceTrustRequestService.requestWorkspaceTrust({
|
|
5066
5715
|
message
|
|
5067
5716
|
}));
|
|
@@ -5074,6 +5723,9 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
5074
5723
|
return true;
|
|
5075
5724
|
}
|
|
5076
5725
|
for (const folder of untrustedFolders) {
|
|
5726
|
+
if (!this._workspaceContextService.getWorkspaceFolder(folder) || !this._workspaceTrustManagementService.isWorkspaceTrusted()) {
|
|
5727
|
+
onInteractionRequired();
|
|
5728
|
+
}
|
|
5077
5729
|
const trusted = this._workspaceContextService.getWorkspaceFolder(folder) ? await this._workspaceTrustRequestService.requestWorkspaceTrust({
|
|
5078
5730
|
message
|
|
5079
5731
|
}) : await this._workspaceTrustRequestService.requestResourcesTrust({
|
|
@@ -5190,7 +5842,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
5190
5842
|
return `${uri}#${start.line}:${start.character}-${end.line}:${end.character}`;
|
|
5191
5843
|
}
|
|
5192
5844
|
_backendInlinesUnsavedEditors() {
|
|
5193
|
-
return this._config.provider
|
|
5845
|
+
return isCopilotAgentHostProvider(this._config.provider) || this._config.provider === CODEX_AGENT_PROVIDER_ID;
|
|
5194
5846
|
}
|
|
5195
5847
|
_isUnsavedResource(uri) {
|
|
5196
5848
|
return uri.scheme === Schemas.untitled || this._workingCopyService.isDirty(uri);
|
|
@@ -5357,6 +6009,13 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
5357
6009
|
if (v.kind === "string" && typeof v.value === "string") {
|
|
5358
6010
|
return this._toSimpleAttachment(v.name, v.value, v._meta, undefined, referenceRange);
|
|
5359
6011
|
}
|
|
6012
|
+
if (v.kind === "generic") {
|
|
6013
|
+
const detail = readAttachmentDetail(v);
|
|
6014
|
+
if (detail) {
|
|
6015
|
+
const displayKind = detail.type.replaceAll("_", "-");
|
|
6016
|
+
return this._toSimpleAttachment(v.name, v.value instanceof URI ? ( v.value.toString()) : typeof v.value === "string" ? v.value : undefined, v._meta, displayKind, referenceRange);
|
|
6017
|
+
}
|
|
6018
|
+
}
|
|
5360
6019
|
const agentHostCompletionKind = getAgentHostCompletionReferenceKind(v);
|
|
5361
6020
|
if (agentHostCompletionKind === AgentHostCompletionReferenceKind.Command) {
|
|
5362
6021
|
return this._toSimpleAttachment(v.name, undefined, v._meta, "command", referenceRange);
|
|
@@ -5470,6 +6129,27 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
5470
6129
|
if (_meta) {
|
|
5471
6130
|
attachment._meta = _meta;
|
|
5472
6131
|
}
|
|
6132
|
+
if (!readAttachmentDetail(attachment)) {
|
|
6133
|
+
const model = this._modelService.getModel(location.uri);
|
|
6134
|
+
if (model && attachmentUri.scheme === Schemas.file) {
|
|
6135
|
+
return withAttachmentDetail(attachment, {
|
|
6136
|
+
type: "selection",
|
|
6137
|
+
filePath: attachmentUri.fsPath,
|
|
6138
|
+
text: model.getValueInRange(location.range),
|
|
6139
|
+
displayName: label,
|
|
6140
|
+
selection: {
|
|
6141
|
+
start: {
|
|
6142
|
+
line: location.range.startLineNumber - 1,
|
|
6143
|
+
character: location.range.startColumn - 1
|
|
6144
|
+
},
|
|
6145
|
+
end: {
|
|
6146
|
+
line: location.range.endLineNumber - 1,
|
|
6147
|
+
character: location.range.endColumn - 1
|
|
6148
|
+
}
|
|
6149
|
+
}
|
|
6150
|
+
});
|
|
6151
|
+
}
|
|
6152
|
+
}
|
|
5473
6153
|
return attachment;
|
|
5474
6154
|
}
|
|
5475
6155
|
_toImageAttachment(v, sessionResource, range) {
|
|
@@ -5820,6 +6500,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
5820
6500
|
return (value && !(value instanceof Error)) ? value : undefined;
|
|
5821
6501
|
}
|
|
5822
6502
|
dispose() {
|
|
6503
|
+
this._lifetime.dispose(true);
|
|
5823
6504
|
for (const [, session] of this._activeSessions) {
|
|
5824
6505
|
session.dispose();
|
|
5825
6506
|
}
|
|
@@ -5839,7 +6520,7 @@ let AgentHostSessionHandler = class AgentHostSessionHandler extends Disposable {
|
|
|
5839
6520
|
super.dispose();
|
|
5840
6521
|
}
|
|
5841
6522
|
};
|
|
5842
|
-
AgentHostSessionHandler = AgentHostSessionHandler_1 = ( __decorate([( __param(1, IChatAgentService)), ( __param(2, IChatService)), ( __param(3, IChatEditingService)), ( __param(4, ILogService)), ( __param(5, IWorkspaceContextService)), ( __param(6, IInstantiationService)), ( __param(7, ITerminalChatService)), ( __param(8, IAgentHostTerminalService)), ( __param(9, IAgentHostSessionWorkingDirectoryResolver)), ( __param(10, IAgentHostSessionWorkingDirectorySynchronizer)), ( __param(11, IAgentHostShellInitSynchronizer)), ( __param(12, IAgentHostNewSessionFolderService)), ( __param(13, IAgentHostUntitledProvisionalSessionService)), ( __param(14, IAgentHostImportConversationStore)), ( __param(15, ILanguageModelToolsService)), ( __param(16, IChatWidgetService)), ( __param(17, ILanguageModelsService)), ( __param(18, IOpenerService)), ( __param(19,
|
|
6523
|
+
AgentHostSessionHandler = AgentHostSessionHandler_1 = ( __decorate([( __param(1, IChatAgentService)), ( __param(2, IChatService)), ( __param(3, IChatEditingService)), ( __param(4, ILogService)), ( __param(5, IWorkspaceContextService)), ( __param(6, IInstantiationService)), ( __param(7, ITerminalChatService)), ( __param(8, IAgentHostTerminalService)), ( __param(9, IAgentHostSessionWorkingDirectoryResolver)), ( __param(10, IAgentHostSessionWorkingDirectorySynchronizer)), ( __param(11, IAgentHostShellInitSynchronizer)), ( __param(12, IAgentHostNewSessionFolderService)), ( __param(13, IAgentHostUntitledProvisionalSessionService)), ( __param(14, IAgentHostImportConversationStore)), ( __param(15, ILanguageModelToolsService)), ( __param(16, IChatWidgetService)), ( __param(17, ILanguageModelsService)), ( __param(18, IOpenerService)), ( __param(19, IEditorService)), ( __param(20, IAgentHostActiveClientService)), ( __param(21, IChatEntitlementService)), ( __param(22, IWorkspaceTrustRequestService)), ( __param(23, IWorkspaceTrustManagementService)), ( __param(24, IModelService)), ( __param(25, IWorkingCopyService)), ( __param(26, IConfigurationService)), ( __param(27, IChatResponseFileChangesService)), ( __param(28, IPathService)), ( __param(29, IRemoteAgentHostService)), ( __param(30, IAgentHostCustomizationService)), ( __param(31, ITelemetryService)), ( __param(32, IWorkbenchAssignmentService)), ( __param(33, IAgentHostConnectionsService))], AgentHostSessionHandler));
|
|
5843
6524
|
function toolResultToProtocol(result, toolName) {
|
|
5844
6525
|
const isError = !!result.toolResultError;
|
|
5845
6526
|
const defaultPastTense = isError ? `${toolName} failed` : `Ran ${toolName}`;
|