@umsai/ums-code 0.3.0-v2 → 0.6.0-v1
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/dist/package.json +6 -6
- package/dist/src/{zed-integration → acp-integration}/acp.d.ts +13 -0
- package/dist/src/{zed-integration → acp-integration}/acp.js +32 -0
- package/dist/src/acp-integration/acp.js.map +1 -0
- package/dist/src/acp-integration/acpAgent.d.ts +10 -0
- package/dist/src/acp-integration/acpAgent.js +264 -0
- package/dist/src/acp-integration/acpAgent.js.map +1 -0
- package/dist/src/{zed-integration → acp-integration}/schema.d.ts +2235 -905
- package/dist/src/{zed-integration → acp-integration}/schema.js +100 -2
- package/dist/src/acp-integration/schema.js.map +1 -0
- package/dist/src/{zed-integration/fileSystemService.d.ts → acp-integration/service/filesystem.d.ts} +1 -1
- package/dist/src/{zed-integration/fileSystemService.js → acp-integration/service/filesystem.js} +14 -1
- package/dist/src/acp-integration/service/filesystem.js.map +1 -0
- package/dist/src/{ui/hooks/useQuotaAndFallback.test.d.ts → acp-integration/service/filesystem.test.d.ts} +1 -1
- package/dist/src/acp-integration/service/filesystem.test.js +39 -0
- package/dist/src/acp-integration/service/filesystem.test.js.map +1 -0
- package/dist/src/acp-integration/session/HistoryReplayer.d.ts +51 -0
- package/dist/src/acp-integration/session/HistoryReplayer.js +164 -0
- package/dist/src/acp-integration/session/HistoryReplayer.js.map +1 -0
- package/dist/src/acp-integration/session/HistoryReplayer.test.d.ts +6 -0
- package/dist/src/acp-integration/session/HistoryReplayer.test.js +374 -0
- package/dist/src/acp-integration/session/HistoryReplayer.test.js.map +1 -0
- package/dist/src/acp-integration/session/Session.d.ts +61 -0
- package/dist/src/acp-integration/session/Session.js +839 -0
- package/dist/src/acp-integration/session/Session.js.map +1 -0
- package/dist/src/acp-integration/session/SubAgentTracker.d.ts +51 -0
- package/dist/src/acp-integration/session/SubAgentTracker.js +257 -0
- package/dist/src/acp-integration/session/SubAgentTracker.js.map +1 -0
- package/dist/src/acp-integration/session/SubAgentTracker.test.d.ts +6 -0
- package/dist/src/acp-integration/session/SubAgentTracker.test.js +369 -0
- package/dist/src/acp-integration/session/SubAgentTracker.test.js.map +1 -0
- package/dist/src/acp-integration/session/emitters/BaseEmitter.d.ts +27 -0
- package/dist/src/acp-integration/session/emitters/BaseEmitter.js +34 -0
- package/dist/src/acp-integration/session/emitters/BaseEmitter.js.map +1 -0
- package/dist/src/acp-integration/session/emitters/MessageEmitter.d.ts +41 -0
- package/dist/src/acp-integration/session/emitters/MessageEmitter.js +77 -0
- package/dist/src/acp-integration/session/emitters/MessageEmitter.js.map +1 -0
- package/dist/src/acp-integration/session/emitters/MessageEmitter.test.d.ts +6 -0
- package/dist/src/acp-integration/session/emitters/MessageEmitter.test.js +174 -0
- package/dist/src/acp-integration/session/emitters/MessageEmitter.test.js.map +1 -0
- package/dist/src/acp-integration/session/emitters/PlanEmitter.d.ts +39 -0
- package/dist/src/acp-integration/session/emitters/PlanEmitter.js +83 -0
- package/dist/src/acp-integration/session/emitters/PlanEmitter.js.map +1 -0
- package/dist/src/acp-integration/session/emitters/PlanEmitter.test.d.ts +6 -0
- package/dist/src/acp-integration/session/emitters/PlanEmitter.test.js +176 -0
- package/dist/src/acp-integration/session/emitters/PlanEmitter.test.js.map +1 -0
- package/dist/src/acp-integration/session/emitters/ToolCallEmitter.d.ts +80 -0
- package/dist/src/acp-integration/session/emitters/ToolCallEmitter.js +248 -0
- package/dist/src/acp-integration/session/emitters/ToolCallEmitter.js.map +1 -0
- package/dist/src/acp-integration/session/emitters/ToolCallEmitter.test.d.ts +6 -0
- package/dist/src/acp-integration/session/emitters/ToolCallEmitter.test.js +561 -0
- package/dist/src/acp-integration/session/emitters/ToolCallEmitter.test.js.map +1 -0
- package/dist/src/acp-integration/session/emitters/index.d.ts +9 -0
- package/dist/src/acp-integration/session/emitters/index.js +10 -0
- package/dist/src/acp-integration/session/emitters/index.js.map +1 -0
- package/dist/src/acp-integration/session/index.d.ts +24 -0
- package/dist/src/acp-integration/session/index.js +16 -0
- package/dist/src/acp-integration/session/index.js.map +1 -0
- package/dist/src/acp-integration/session/types.d.ts +71 -0
- package/dist/src/acp-integration/session/types.js +7 -0
- package/dist/src/acp-integration/session/types.js.map +1 -0
- package/dist/src/commandMode.d.ts +11 -0
- package/dist/src/commandMode.js +238 -0
- package/dist/src/commandMode.js.map +1 -0
- package/dist/src/config/auth.d.ts +1 -0
- package/dist/src/config/auth.js +29 -0
- package/dist/src/config/auth.js.map +1 -1
- package/dist/src/config/config.d.ts +19 -3
- package/dist/src/config/config.js +175 -24
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/extension.js +0 -2
- package/dist/src/config/extension.js.map +1 -1
- package/dist/src/config/extensions/update.test.js +9 -0
- package/dist/src/config/extensions/update.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +53 -2
- package/dist/src/config/settingsSchema.js +46 -2
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/core/auth.d.ts +1 -1
- package/dist/src/core/auth.js +3 -2
- package/dist/src/core/auth.js.map +1 -1
- package/dist/src/core/initializer.js +3 -0
- package/dist/src/core/initializer.js.map +1 -1
- package/dist/src/gemini.js +75 -35
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +37 -4
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +3 -3
- package/dist/src/generated/git-commit.js +3 -3
- package/dist/src/i18n/index.d.ts +10 -2
- package/dist/src/i18n/index.js +26 -1
- package/dist/src/i18n/index.js.map +1 -1
- package/dist/src/i18n/languages.d.ts +20 -0
- package/dist/src/i18n/languages.js +36 -0
- package/dist/src/i18n/languages.js.map +1 -0
- package/dist/src/i18n/locales/de.js +1073 -0
- package/dist/src/i18n/locales/en.js +121 -175
- package/dist/src/i18n/locales/ru.js +1095 -0
- package/dist/src/i18n/locales/zh.js +52 -174
- package/dist/src/nonInteractive/control/ControlDispatcher.d.ts +24 -1
- package/dist/src/nonInteractive/control/ControlDispatcher.js +46 -17
- package/dist/src/nonInteractive/control/ControlDispatcher.js.map +1 -1
- package/dist/src/nonInteractive/control/ControlService.d.ts +2 -1
- package/dist/src/nonInteractive/control/ControlService.js +22 -37
- package/dist/src/nonInteractive/control/ControlService.js.map +1 -1
- package/dist/src/nonInteractive/control/controllers/baseController.d.ts +2 -1
- package/dist/src/nonInteractive/control/controllers/baseController.js +38 -5
- package/dist/src/nonInteractive/control/controllers/baseController.js.map +1 -1
- package/dist/src/nonInteractive/control/controllers/permissionController.d.ts +1 -22
- package/dist/src/nonInteractive/control/controllers/permissionController.js +38 -38
- package/dist/src/nonInteractive/control/controllers/permissionController.js.map +1 -1
- package/dist/src/nonInteractive/control/controllers/sdkMcpController.d.ts +54 -0
- package/dist/src/nonInteractive/control/controllers/sdkMcpController.js +84 -0
- package/dist/src/nonInteractive/control/controllers/sdkMcpController.js.map +1 -0
- package/dist/src/nonInteractive/control/controllers/systemController.d.ts +16 -6
- package/dist/src/nonInteractive/control/controllers/systemController.js +184 -44
- package/dist/src/nonInteractive/control/controllers/systemController.js.map +1 -1
- package/dist/src/nonInteractive/control/types/serviceAPIs.d.ts +1 -16
- package/dist/src/nonInteractive/io/BaseJsonOutputAdapter.d.ts +11 -0
- package/dist/src/nonInteractive/io/BaseJsonOutputAdapter.js +64 -5
- package/dist/src/nonInteractive/io/BaseJsonOutputAdapter.js.map +1 -1
- package/dist/src/nonInteractive/io/BaseJsonOutputAdapter.test.js +40 -0
- package/dist/src/nonInteractive/io/BaseJsonOutputAdapter.test.js.map +1 -1
- package/dist/src/nonInteractive/io/StreamJsonOutputAdapter.test.js +50 -0
- package/dist/src/nonInteractive/io/StreamJsonOutputAdapter.test.js.map +1 -1
- package/dist/src/nonInteractive/session.d.ts +0 -16
- package/dist/src/nonInteractive/session.js +317 -321
- package/dist/src/nonInteractive/session.js.map +1 -1
- package/dist/src/nonInteractive/session.test.js +6 -0
- package/dist/src/nonInteractive/session.test.js.map +1 -1
- package/dist/src/nonInteractive/types.d.ts +57 -3
- package/dist/src/nonInteractive/types.js +0 -1
- package/dist/src/nonInteractive/types.js.map +1 -1
- package/dist/src/nonInteractiveCli.js +121 -56
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCliCommands.d.ts +48 -9
- package/dist/src/nonInteractiveCliCommands.js +180 -64
- package/dist/src/nonInteractiveCliCommands.js.map +1 -1
- package/dist/src/nonInteractiveCliCommands.test.d.ts +6 -0
- package/dist/src/nonInteractiveCliCommands.test.js +157 -0
- package/dist/src/nonInteractiveCliCommands.test.js.map +1 -0
- package/dist/src/services/BuiltinCommandLoader.js +7 -6
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.test.js +0 -3
- package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -1
- package/dist/src/services/McpPromptLoader.js +4 -2
- package/dist/src/services/McpPromptLoader.js.map +1 -1
- package/dist/src/services/McpPromptLoader.test.js +1 -1
- package/dist/src/services/McpPromptLoader.test.js.map +1 -1
- package/dist/src/test-utils/mockCommandContext.js +11 -2
- package/dist/src/test-utils/mockCommandContext.js.map +1 -1
- package/dist/src/ui/AppContainer.js +62 -56
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +0 -46
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.test.js +4 -4
- package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
- package/dist/src/ui/auth/useAuth.js +31 -4
- package/dist/src/ui/auth/useAuth.js.map +1 -1
- package/dist/src/ui/commands/approvalModeCommand.js +53 -4
- package/dist/src/ui/commands/approvalModeCommand.js.map +1 -1
- package/dist/src/ui/commands/approvalModeCommand.test.js +72 -10
- package/dist/src/ui/commands/approvalModeCommand.test.js.map +1 -1
- package/dist/src/ui/commands/clearCommand.js +22 -10
- package/dist/src/ui/commands/clearCommand.js.map +1 -1
- package/dist/src/ui/commands/compressCommand.js +86 -16
- package/dist/src/ui/commands/compressCommand.js.map +1 -1
- package/dist/src/ui/commands/languageCommand.d.ts +6 -1
- package/dist/src/ui/commands/languageCommand.js +162 -183
- package/dist/src/ui/commands/languageCommand.js.map +1 -1
- package/dist/src/ui/commands/languageCommand.test.d.ts +6 -0
- package/dist/src/ui/commands/languageCommand.test.js +558 -0
- package/dist/src/ui/commands/languageCommand.test.js.map +1 -0
- package/dist/src/ui/commands/modelCommand.js +4 -2
- package/dist/src/ui/commands/modelCommand.js.map +1 -1
- package/dist/src/ui/commands/quitCommand.d.ts +0 -1
- package/dist/src/ui/commands/quitCommand.js +0 -27
- package/dist/src/ui/commands/quitCommand.js.map +1 -1
- package/dist/src/ui/commands/restoreCommand.js +1 -1
- package/dist/src/ui/commands/restoreCommand.js.map +1 -1
- package/dist/src/ui/commands/resumeCommand.d.ts +7 -0
- package/dist/src/ui/commands/resumeCommand.js +19 -0
- package/dist/src/ui/commands/resumeCommand.js.map +1 -0
- package/dist/src/ui/commands/resumeCommand.test.d.ts +6 -0
- package/dist/src/ui/commands/resumeCommand.test.js +32 -0
- package/dist/src/ui/commands/resumeCommand.test.js.map +1 -0
- package/dist/src/ui/commands/reviewCommand.d.ts +9 -0
- package/dist/src/ui/commands/reviewCommand.js +2046 -0
- package/dist/src/ui/commands/reviewCommand.js.map +1 -0
- package/dist/src/ui/commands/reviewCommand.test.js +600 -0
- package/dist/src/ui/commands/reviewCommand.test.js.map +1 -0
- package/dist/src/ui/commands/setupGithubCommand.js +11 -10
- package/dist/src/ui/commands/setupGithubCommand.js.map +1 -1
- package/dist/src/ui/commands/setupGithubCommand.test.js +14 -14
- package/dist/src/ui/commands/setupGithubCommand.test.js.map +1 -1
- package/dist/src/ui/commands/summaryCommand.js +129 -42
- package/dist/src/ui/commands/summaryCommand.js.map +1 -1
- package/dist/src/ui/commands/types.d.ts +24 -10
- package/dist/src/ui/commands/types.js.map +1 -1
- package/dist/src/ui/commands/ums/unittestCommand.d.ts +9 -0
- package/dist/src/ui/commands/ums/unittestCommand.js +387 -0
- package/dist/src/ui/commands/ums/unittestCommand.js.map +1 -0
- package/dist/src/ui/components/Composer.test.js +1 -2
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/ContextUsageDisplay.d.ts +3 -2
- package/dist/src/ui/components/ContextUsageDisplay.js +8 -2
- package/dist/src/ui/components/ContextUsageDisplay.js.map +1 -1
- package/dist/src/ui/components/DialogManager.js +7 -23
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/Footer.js +2 -3
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/Help.js +13 -2
- package/dist/src/ui/components/Help.js.map +1 -1
- package/dist/src/ui/components/Help.test.js +6 -0
- package/dist/src/ui/components/Help.test.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js +3 -1
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.test.js +5 -2
- package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.js +6 -4
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.d.ts +3 -1
- package/dist/src/ui/components/ModelDialog.js +25 -5
- package/dist/src/ui/components/ModelDialog.js.map +1 -1
- package/dist/src/ui/components/OpenAIKeyPrompt.d.ts +3 -0
- package/dist/src/ui/components/OpenAIKeyPrompt.js +1 -0
- package/dist/src/ui/components/OpenAIKeyPrompt.js.map +1 -1
- package/dist/src/ui/components/PermissionsModifyTrustDialog.js +1 -1
- package/dist/src/ui/components/PermissionsModifyTrustDialog.js.map +1 -1
- package/dist/src/ui/components/SessionPicker.d.ts +18 -0
- package/dist/src/ui/components/SessionPicker.js +69 -0
- package/dist/src/ui/components/SessionPicker.js.map +1 -0
- package/dist/src/ui/components/SessionSummaryDisplay.js +14 -2
- package/dist/src/ui/components/SessionSummaryDisplay.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.test.js +2 -2
- package/dist/src/ui/components/StandaloneSessionPicker.d.ts +10 -0
- package/dist/src/ui/components/StandaloneSessionPicker.js +78 -0
- package/dist/src/ui/components/StandaloneSessionPicker.js.map +1 -0
- package/dist/src/ui/components/StandaloneSessionPicker.test.d.ts +6 -0
- package/dist/src/ui/components/StandaloneSessionPicker.test.js +410 -0
- package/dist/src/ui/components/StandaloneSessionPicker.test.js.map +1 -0
- package/dist/src/ui/components/SuggestionsDisplay.js +3 -2
- package/dist/src/ui/components/SuggestionsDisplay.js.map +1 -1
- package/dist/src/ui/components/messages/GeminiThoughtMessage.d.ts +18 -0
- package/dist/src/ui/components/messages/GeminiThoughtMessage.js +14 -0
- package/dist/src/ui/components/messages/GeminiThoughtMessage.js.map +1 -0
- package/dist/src/ui/components/messages/GeminiThoughtMessageContent.d.ts +18 -0
- package/dist/src/ui/components/messages/GeminiThoughtMessageContent.js +14 -0
- package/dist/src/ui/components/messages/GeminiThoughtMessageContent.js.map +1 -0
- package/dist/src/ui/components/subagents/manage/AgentEditStep.js +4 -1
- package/dist/src/ui/components/subagents/manage/AgentEditStep.js.map +1 -1
- package/dist/src/ui/components/subagents/manage/AgentSelectionStep.js +2 -2
- package/dist/src/ui/components/subagents/manage/AgentSelectionStep.js.map +1 -1
- package/dist/src/ui/components/ums/UMSKeyPrompt.d.ts +1 -1
- package/dist/src/ui/components/ums/UMSKeyPrompt.js +24 -4
- package/dist/src/ui/components/ums/UMSKeyPrompt.js.map +1 -1
- package/dist/src/ui/components/ums/umsStartupWarnings.d.ts +6 -0
- package/dist/src/ui/components/ums/umsStartupWarnings.js +47 -0
- package/dist/src/ui/components/ums/umsStartupWarnings.js.map +1 -0
- package/dist/src/ui/contexts/SessionContext.d.ts +2 -0
- package/dist/src/ui/contexts/SessionContext.js +18 -10
- package/dist/src/ui/contexts/SessionContext.js.map +1 -1
- package/dist/src/ui/contexts/UIActionsContext.d.ts +3 -1
- package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +3 -11
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.d.ts +3 -8
- package/dist/src/ui/hooks/slashCommandProcessor.js +77 -101
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/useAttentionNotifications.d.ts +3 -1
- package/dist/src/ui/hooks/useAttentionNotifications.js +10 -5
- package/dist/src/ui/hooks/useAttentionNotifications.js.map +1 -1
- package/dist/src/ui/hooks/useAttentionNotifications.test.js +39 -2
- package/dist/src/ui/hooks/useAttentionNotifications.test.js.map +1 -1
- package/dist/src/ui/hooks/useDialogClose.d.ts +0 -3
- package/dist/src/ui/hooks/useDialogClose.js +0 -2
- package/dist/src/ui/hooks/useDialogClose.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +87 -12
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.test.js +11 -6
- package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/hooks/useLogger.d.ts +1 -1
- package/dist/src/ui/hooks/useLogger.js +6 -3
- package/dist/src/ui/hooks/useLogger.js.map +1 -1
- package/dist/src/ui/hooks/usePhraseCycler.js +12 -136
- package/dist/src/ui/hooks/usePhraseCycler.js.map +1 -1
- package/dist/src/ui/hooks/useQwenAuth.test.js +1 -1
- package/dist/src/ui/hooks/useQwenAuth.test.js.map +1 -1
- package/dist/src/ui/hooks/useReactToolScheduler.js +2 -2
- package/dist/src/ui/hooks/useReactToolScheduler.js.map +1 -1
- package/dist/src/ui/hooks/useResumeCommand.d.ts +20 -0
- package/dist/src/ui/hooks/useResumeCommand.js +49 -0
- package/dist/src/ui/hooks/useResumeCommand.js.map +1 -0
- package/dist/src/ui/hooks/useResumeCommand.test.d.ts +6 -0
- package/dist/src/ui/hooks/useResumeCommand.test.js +144 -0
- package/dist/src/ui/hooks/useResumeCommand.test.js.map +1 -0
- package/dist/src/ui/hooks/useSessionPicker.d.ts +36 -0
- package/dist/src/ui/hooks/useSessionPicker.js +189 -0
- package/dist/src/ui/hooks/useSessionPicker.js.map +1 -0
- package/dist/src/ui/hooks/useSlashCompletion.js +9 -1
- package/dist/src/ui/hooks/useSlashCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.test.js +36 -31
- package/dist/src/ui/hooks/useSlashCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js +2 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/models/availableModels.d.ts +9 -2
- package/dist/src/ui/models/availableModels.js +32 -35
- package/dist/src/ui/models/availableModels.js.map +1 -1
- package/dist/src/ui/noninteractive/nonInteractiveUi.js +0 -1
- package/dist/src/ui/noninteractive/nonInteractiveUi.js.map +1 -1
- package/dist/src/ui/types.d.ts +9 -14
- package/dist/src/ui/types.js +0 -1
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/InlineMarkdownRenderer.d.ts +1 -0
- package/dist/src/ui/utils/InlineMarkdownRenderer.js +2 -2
- package/dist/src/ui/utils/InlineMarkdownRenderer.js.map +1 -1
- package/dist/src/ui/utils/MarkdownDisplay.d.ts +1 -0
- package/dist/src/ui/utils/MarkdownDisplay.js +13 -13
- package/dist/src/ui/utils/MarkdownDisplay.js.map +1 -1
- package/dist/src/ui/utils/formatters.d.ts +6 -0
- package/dist/src/ui/utils/formatters.js +31 -0
- package/dist/src/ui/utils/formatters.js.map +1 -1
- package/dist/src/ui/utils/formatters.test.js +51 -2
- package/dist/src/ui/utils/formatters.test.js.map +1 -1
- package/dist/src/ui/utils/resumeHistoryUtils.d.ts +19 -0
- package/dist/src/ui/utils/resumeHistoryUtils.js +267 -0
- package/dist/src/ui/utils/resumeHistoryUtils.js.map +1 -0
- package/dist/src/ui/utils/resumeHistoryUtils.test.d.ts +6 -0
- package/dist/src/ui/utils/resumeHistoryUtils.test.js +253 -0
- package/dist/src/ui/utils/resumeHistoryUtils.test.js.map +1 -0
- package/dist/src/ui/utils/sessionPickerUtils.d.ts +30 -0
- package/dist/src/ui/utils/sessionPickerUtils.js +41 -0
- package/dist/src/ui/utils/sessionPickerUtils.js.map +1 -0
- package/dist/src/ui/utils/sessionPickerUtils.test.d.ts +6 -0
- package/dist/src/ui/utils/sessionPickerUtils.test.js +38 -0
- package/dist/src/ui/utils/sessionPickerUtils.test.js.map +1 -0
- package/dist/src/utils/attentionNotification.d.ts +1 -0
- package/dist/src/utils/attentionNotification.js +4 -0
- package/dist/src/utils/attentionNotification.js.map +1 -1
- package/dist/src/utils/errors.d.ts +1 -1
- package/dist/src/utils/errors.js +14 -3
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/errors.test.js +43 -1
- package/dist/src/utils/errors.test.js.map +1 -1
- package/dist/src/utils/gitUtils.js +25 -8
- package/dist/src/utils/gitUtils.js.map +1 -1
- package/dist/src/utils/gitUtils.test.js +59 -0
- package/dist/src/utils/gitUtils.test.js.map +1 -1
- package/dist/src/utils/nonInteractiveHelpers.d.ts +3 -1
- package/dist/src/utils/nonInteractiveHelpers.js +14 -15
- package/dist/src/utils/nonInteractiveHelpers.js.map +1 -1
- package/dist/src/utils/nonInteractiveHelpers.test.js +36 -21
- package/dist/src/utils/nonInteractiveHelpers.test.js.map +1 -1
- package/dist/src/utils/relaunch.js +2 -2
- package/dist/src/utils/relaunch.js.map +1 -1
- package/dist/src/utils/relaunch.test.js +5 -5
- package/dist/src/utils/relaunch.test.js.map +1 -1
- package/dist/src/utils/systemInfo.js +2 -1
- package/dist/src/utils/systemInfo.js.map +1 -1
- package/dist/src/validateNonInterActiveAuth.js +10 -1
- package/dist/src/validateNonInterActiveAuth.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -7
- package/dist/src/nonInteractive/control/controllers/mcpController.d.ts +0 -42
- package/dist/src/nonInteractive/control/controllers/mcpController.js +0 -205
- package/dist/src/nonInteractive/control/controllers/mcpController.js.map +0 -1
- package/dist/src/ui/commands/chatCommand.d.ts +0 -9
- package/dist/src/ui/commands/chatCommand.js +0 -351
- package/dist/src/ui/commands/chatCommand.js.map +0 -1
- package/dist/src/ui/commands/corgiCommand.d.ts +0 -7
- package/dist/src/ui/commands/corgiCommand.js +0 -16
- package/dist/src/ui/commands/corgiCommand.js.map +0 -1
- package/dist/src/ui/components/ProQuotaDialog.d.ts +0 -13
- package/dist/src/ui/components/ProQuotaDialog.js +0 -24
- package/dist/src/ui/components/ProQuotaDialog.js.map +0 -1
- package/dist/src/ui/components/ProQuotaDialog.test.js +0 -58
- package/dist/src/ui/components/ProQuotaDialog.test.js.map +0 -1
- package/dist/src/ui/components/QuitConfirmationDialog.d.ts +0 -17
- package/dist/src/ui/components/QuitConfirmationDialog.js +0 -49
- package/dist/src/ui/components/QuitConfirmationDialog.js.map +0 -1
- package/dist/src/ui/hooks/usePromptCompletion.d.ts +0 -23
- package/dist/src/ui/hooks/usePromptCompletion.js +0 -177
- package/dist/src/ui/hooks/usePromptCompletion.js.map +0 -1
- package/dist/src/ui/hooks/useQuitConfirmation.d.ts +0 -14
- package/dist/src/ui/hooks/useQuitConfirmation.js +0 -36
- package/dist/src/ui/hooks/useQuitConfirmation.js.map +0 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.d.ts +0 -21
- package/dist/src/ui/hooks/useQuotaAndFallback.js +0 -122
- package/dist/src/ui/hooks/useQuotaAndFallback.js.map +0 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js +0 -269
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +0 -1
- package/dist/src/zed-integration/acp.js.map +0 -1
- package/dist/src/zed-integration/fileSystemService.js.map +0 -1
- package/dist/src/zed-integration/schema.js.map +0 -1
- package/dist/src/zed-integration/zedIntegration.d.ts +0 -17
- package/dist/src/zed-integration/zedIntegration.js +0 -1135
- package/dist/src/zed-integration/zedIntegration.js.map +0 -1
- /package/dist/src/ui/{components/ProQuotaDialog.test.d.ts → commands/reviewCommand.test.d.ts} +0 -0
|
@@ -12,20 +12,25 @@
|
|
|
12
12
|
* - set_model: Switch model (placeholder)
|
|
13
13
|
*/
|
|
14
14
|
import { BaseController } from './baseController.js';
|
|
15
|
+
import { getAvailableCommands } from '../../../nonInteractiveCliCommands.js';
|
|
16
|
+
import { MCPServerConfig, AuthProviderType, } from '@umsai/ums-code-core';
|
|
15
17
|
export class SystemController extends BaseController {
|
|
16
18
|
/**
|
|
17
19
|
* Handle system control requests
|
|
18
20
|
*/
|
|
19
|
-
async handleRequestPayload(payload,
|
|
21
|
+
async handleRequestPayload(payload, signal) {
|
|
22
|
+
if (signal.aborted) {
|
|
23
|
+
throw new Error('Request aborted');
|
|
24
|
+
}
|
|
20
25
|
switch (payload.subtype) {
|
|
21
26
|
case 'initialize':
|
|
22
|
-
return this.handleInitialize(payload);
|
|
27
|
+
return this.handleInitialize(payload, signal);
|
|
23
28
|
case 'interrupt':
|
|
24
29
|
return this.handleInterrupt();
|
|
25
30
|
case 'set_model':
|
|
26
|
-
return this.handleSetModel(payload);
|
|
31
|
+
return this.handleSetModel(payload, signal);
|
|
27
32
|
case 'supported_commands':
|
|
28
|
-
return this.handleSupportedCommands();
|
|
33
|
+
return this.handleSupportedCommands(signal);
|
|
29
34
|
default:
|
|
30
35
|
throw new Error(`Unsupported request subtype in SystemController`);
|
|
31
36
|
}
|
|
@@ -33,13 +38,97 @@ export class SystemController extends BaseController {
|
|
|
33
38
|
/**
|
|
34
39
|
* Handle initialize request
|
|
35
40
|
*
|
|
36
|
-
*
|
|
41
|
+
* Processes SDK MCP servers config.
|
|
42
|
+
* SDK servers are registered in context.sdkMcpServers
|
|
43
|
+
* and added to config.mcpServers with the sdk type flag.
|
|
44
|
+
* External MCP servers are configured separately in settings.
|
|
37
45
|
*/
|
|
38
|
-
async handleInitialize(payload) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
46
|
+
async handleInitialize(payload, signal) {
|
|
47
|
+
if (signal.aborted) {
|
|
48
|
+
throw new Error('Request aborted');
|
|
49
|
+
}
|
|
50
|
+
this.context.config.setSdkMode(true);
|
|
51
|
+
// Process SDK MCP servers
|
|
52
|
+
if (payload.sdkMcpServers &&
|
|
53
|
+
typeof payload.sdkMcpServers === 'object' &&
|
|
54
|
+
payload.sdkMcpServers !== null) {
|
|
55
|
+
const sdkServers = {};
|
|
56
|
+
for (const [key, wireConfig] of Object.entries(payload.sdkMcpServers)) {
|
|
57
|
+
const name = typeof wireConfig?.name === 'string' && wireConfig.name.trim().length
|
|
58
|
+
? wireConfig.name
|
|
59
|
+
: key;
|
|
60
|
+
this.context.sdkMcpServers.add(name);
|
|
61
|
+
sdkServers[name] = new MCPServerConfig(undefined, // command
|
|
62
|
+
undefined, // args
|
|
63
|
+
undefined, // env
|
|
64
|
+
undefined, // cwd
|
|
65
|
+
undefined, // url
|
|
66
|
+
undefined, // httpUrl
|
|
67
|
+
undefined, // headers
|
|
68
|
+
undefined, // tcp
|
|
69
|
+
undefined, // timeout
|
|
70
|
+
true, // trust - SDK servers are trusted
|
|
71
|
+
undefined, // description
|
|
72
|
+
undefined, // includeTools
|
|
73
|
+
undefined, // excludeTools
|
|
74
|
+
undefined, // extensionName
|
|
75
|
+
undefined, // oauth
|
|
76
|
+
undefined, // authProviderType
|
|
77
|
+
undefined, // targetAudience
|
|
78
|
+
undefined, // targetServiceAccount
|
|
79
|
+
'sdk');
|
|
80
|
+
}
|
|
81
|
+
const sdkServerCount = Object.keys(sdkServers).length;
|
|
82
|
+
if (sdkServerCount > 0) {
|
|
83
|
+
try {
|
|
84
|
+
this.context.config.addMcpServers(sdkServers);
|
|
85
|
+
if (this.context.debugMode) {
|
|
86
|
+
console.error(`[SystemController] Added ${sdkServerCount} SDK MCP servers to config`);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
catch (error) {
|
|
90
|
+
if (this.context.debugMode) {
|
|
91
|
+
console.error('[SystemController] Failed to add SDK MCP servers:', error);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
if (payload.mcpServers &&
|
|
97
|
+
typeof payload.mcpServers === 'object' &&
|
|
98
|
+
payload.mcpServers !== null) {
|
|
99
|
+
const externalServers = {};
|
|
100
|
+
for (const [name, serverConfig] of Object.entries(payload.mcpServers)) {
|
|
101
|
+
const normalized = this.normalizeMcpServerConfig(name, serverConfig);
|
|
102
|
+
if (normalized) {
|
|
103
|
+
externalServers[name] = normalized;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
const externalCount = Object.keys(externalServers).length;
|
|
107
|
+
if (externalCount > 0) {
|
|
108
|
+
try {
|
|
109
|
+
this.context.config.addMcpServers(externalServers);
|
|
110
|
+
if (this.context.debugMode) {
|
|
111
|
+
console.error(`[SystemController] Added ${externalCount} external MCP servers to config`);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
catch (error) {
|
|
115
|
+
if (this.context.debugMode) {
|
|
116
|
+
console.error('[SystemController] Failed to add external MCP servers:', error);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
if (payload.agents && Array.isArray(payload.agents)) {
|
|
122
|
+
try {
|
|
123
|
+
this.context.config.setSessionSubagents(payload.agents);
|
|
124
|
+
if (this.context.debugMode) {
|
|
125
|
+
console.error(`[SystemController] Added ${payload.agents.length} session subagents to config`);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
catch (error) {
|
|
129
|
+
if (this.context.debugMode) {
|
|
130
|
+
console.error('[SystemController] Failed to add session subagents:', error);
|
|
131
|
+
}
|
|
43
132
|
}
|
|
44
133
|
}
|
|
45
134
|
// Build capabilities for response
|
|
@@ -62,28 +151,57 @@ export class SystemController extends BaseController {
|
|
|
62
151
|
buildControlCapabilities() {
|
|
63
152
|
const capabilities = {
|
|
64
153
|
can_handle_can_use_tool: true,
|
|
65
|
-
can_handle_hook_callback:
|
|
154
|
+
can_handle_hook_callback: false,
|
|
66
155
|
can_set_permission_mode: typeof this.context.config.setApprovalMode === 'function',
|
|
67
156
|
can_set_model: typeof this.context.config.setModel === 'function',
|
|
157
|
+
// SDK MCP servers are supported - messages routed through control plane
|
|
158
|
+
can_handle_mcp_message: true,
|
|
68
159
|
};
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
const servers = mcpProvider.getMcpServers();
|
|
74
|
-
capabilities['can_handle_mcp_message'] = Boolean(servers && Object.keys(servers).length > 0);
|
|
75
|
-
}
|
|
76
|
-
else {
|
|
77
|
-
capabilities['can_handle_mcp_message'] = false;
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
catch (error) {
|
|
160
|
+
return capabilities;
|
|
161
|
+
}
|
|
162
|
+
normalizeMcpServerConfig(serverName, config) {
|
|
163
|
+
if (!config || typeof config !== 'object') {
|
|
81
164
|
if (this.context.debugMode) {
|
|
82
|
-
console.error(
|
|
165
|
+
console.error(`[SystemController] Ignoring invalid MCP server config for '${serverName}'`);
|
|
83
166
|
}
|
|
84
|
-
|
|
167
|
+
return null;
|
|
168
|
+
}
|
|
169
|
+
const authProvider = this.normalizeAuthProviderType(config.authProviderType);
|
|
170
|
+
const oauthConfig = this.normalizeOAuthConfig(config.oauth);
|
|
171
|
+
return new MCPServerConfig(config.command, config.args, config.env, config.cwd, config.url, config.httpUrl, config.headers, config.tcp, config.timeout, config.trust, config.description, config.includeTools, config.excludeTools, config.extensionName, oauthConfig, authProvider, config.targetAudience, config.targetServiceAccount);
|
|
172
|
+
}
|
|
173
|
+
normalizeAuthProviderType(value) {
|
|
174
|
+
if (!value) {
|
|
175
|
+
return undefined;
|
|
176
|
+
}
|
|
177
|
+
switch (value) {
|
|
178
|
+
case AuthProviderType.DYNAMIC_DISCOVERY:
|
|
179
|
+
case AuthProviderType.GOOGLE_CREDENTIALS:
|
|
180
|
+
case AuthProviderType.SERVICE_ACCOUNT_IMPERSONATION:
|
|
181
|
+
return value;
|
|
182
|
+
default:
|
|
183
|
+
if (this.context.debugMode) {
|
|
184
|
+
console.error(`[SystemController] Unsupported authProviderType '${value}', skipping`);
|
|
185
|
+
}
|
|
186
|
+
return undefined;
|
|
85
187
|
}
|
|
86
|
-
|
|
188
|
+
}
|
|
189
|
+
normalizeOAuthConfig(oauth) {
|
|
190
|
+
if (!oauth) {
|
|
191
|
+
return undefined;
|
|
192
|
+
}
|
|
193
|
+
return {
|
|
194
|
+
enabled: oauth.enabled,
|
|
195
|
+
clientId: oauth.clientId,
|
|
196
|
+
clientSecret: oauth.clientSecret,
|
|
197
|
+
authorizationUrl: oauth.authorizationUrl,
|
|
198
|
+
tokenUrl: oauth.tokenUrl,
|
|
199
|
+
scopes: oauth.scopes,
|
|
200
|
+
audiences: oauth.audiences,
|
|
201
|
+
redirectUri: oauth.redirectUri,
|
|
202
|
+
tokenParamName: oauth.tokenParamName,
|
|
203
|
+
registrationUrl: oauth.registrationUrl,
|
|
204
|
+
};
|
|
87
205
|
}
|
|
88
206
|
/**
|
|
89
207
|
* Handle interrupt request
|
|
@@ -112,7 +230,10 @@ export class SystemController extends BaseController {
|
|
|
112
230
|
*
|
|
113
231
|
* Implements actual model switching with validation and error handling
|
|
114
232
|
*/
|
|
115
|
-
async handleSetModel(payload) {
|
|
233
|
+
async handleSetModel(payload, signal) {
|
|
234
|
+
if (signal.aborted) {
|
|
235
|
+
throw new Error('Request aborted');
|
|
236
|
+
}
|
|
116
237
|
const model = payload.model;
|
|
117
238
|
// Validate model parameter
|
|
118
239
|
if (typeof model !== 'string' || model.trim() === '') {
|
|
@@ -140,27 +261,46 @@ export class SystemController extends BaseController {
|
|
|
140
261
|
/**
|
|
141
262
|
* Handle supported_commands request
|
|
142
263
|
*
|
|
143
|
-
* Returns list of supported
|
|
144
|
-
*
|
|
145
|
-
* Note: This list should match the ControlRequestType enum in
|
|
146
|
-
* packages/sdk/typescript/src/types/controlRequests.ts
|
|
264
|
+
* Returns list of supported slash commands loaded dynamically
|
|
147
265
|
*/
|
|
148
|
-
async handleSupportedCommands() {
|
|
149
|
-
|
|
150
|
-
'
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
'supported_commands',
|
|
154
|
-
'can_use_tool',
|
|
155
|
-
'set_permission_mode',
|
|
156
|
-
'mcp_message',
|
|
157
|
-
'mcp_server_status',
|
|
158
|
-
'hook_callback',
|
|
159
|
-
];
|
|
266
|
+
async handleSupportedCommands(signal) {
|
|
267
|
+
if (signal.aborted) {
|
|
268
|
+
throw new Error('Request aborted');
|
|
269
|
+
}
|
|
270
|
+
const slashCommands = await this.loadSlashCommandNames(signal);
|
|
160
271
|
return {
|
|
161
272
|
subtype: 'supported_commands',
|
|
162
|
-
commands,
|
|
273
|
+
commands: slashCommands,
|
|
163
274
|
};
|
|
164
275
|
}
|
|
276
|
+
/**
|
|
277
|
+
* Load slash command names using getAvailableCommands
|
|
278
|
+
*
|
|
279
|
+
* @param signal - AbortSignal to respect for cancellation
|
|
280
|
+
* @returns Promise resolving to array of slash command names
|
|
281
|
+
*/
|
|
282
|
+
async loadSlashCommandNames(signal) {
|
|
283
|
+
if (signal.aborted) {
|
|
284
|
+
return [];
|
|
285
|
+
}
|
|
286
|
+
try {
|
|
287
|
+
const commands = await getAvailableCommands(this.context.config, signal);
|
|
288
|
+
if (signal.aborted) {
|
|
289
|
+
return [];
|
|
290
|
+
}
|
|
291
|
+
// Extract command names and sort
|
|
292
|
+
return commands.map((cmd) => cmd.name).sort();
|
|
293
|
+
}
|
|
294
|
+
catch (error) {
|
|
295
|
+
// Check if the error is due to abort
|
|
296
|
+
if (signal.aborted) {
|
|
297
|
+
return [];
|
|
298
|
+
}
|
|
299
|
+
if (this.context.debugMode) {
|
|
300
|
+
console.error('[SystemController] Failed to load slash commands:', error);
|
|
301
|
+
}
|
|
302
|
+
return [];
|
|
303
|
+
}
|
|
304
|
+
}
|
|
165
305
|
}
|
|
166
306
|
//# sourceMappingURL=systemController.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"systemController.js","sourceRoot":"","sources":["../../../../../src/nonInteractive/control/controllers/systemController.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;GAOG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAOrD,MAAM,OAAO,gBAAiB,SAAQ,cAAc;IAClD;;OAEG;IACO,KAAK,CAAC,oBAAoB,CAClC,OAA8B,EAC9B,
|
|
1
|
+
{"version":3,"file":"systemController.js","sourceRoot":"","sources":["../../../../../src/nonInteractive/control/controllers/systemController.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
* for internal CLI code (nonInteractiveCli, session managers, etc.).
|
|
12
12
|
*/
|
|
13
13
|
import type { Client } from '@modelcontextprotocol/sdk/client/index.js';
|
|
14
|
-
import type {
|
|
14
|
+
import type { MCPServerConfig } from '@umsai/ums-code-core';
|
|
15
15
|
import type { PermissionSuggestion } from '../../types.js';
|
|
16
16
|
/**
|
|
17
17
|
* Permission Service API
|
|
@@ -20,21 +20,6 @@ import type { PermissionSuggestion } from '../../types.js';
|
|
|
20
20
|
* permission suggestions, and tool call monitoring callbacks.
|
|
21
21
|
*/
|
|
22
22
|
export interface PermissionServiceAPI {
|
|
23
|
-
/**
|
|
24
|
-
* Check if a tool should be allowed based on current permission settings
|
|
25
|
-
*
|
|
26
|
-
* Evaluates permission mode and tool registry to determine if execution
|
|
27
|
-
* should proceed. Can optionally modify tool arguments based on confirmation details.
|
|
28
|
-
*
|
|
29
|
-
* @param toolRequest - Tool call request information containing name, args, and call ID
|
|
30
|
-
* @param confirmationDetails - Optional confirmation details for UI-driven approvals
|
|
31
|
-
* @returns Promise resolving to permission decision with optional updated arguments
|
|
32
|
-
*/
|
|
33
|
-
shouldAllowTool(toolRequest: ToolCallRequestInfo, confirmationDetails?: unknown): Promise<{
|
|
34
|
-
allowed: boolean;
|
|
35
|
-
message?: string;
|
|
36
|
-
updatedArgs?: Record<string, unknown>;
|
|
37
|
-
}>;
|
|
38
23
|
/**
|
|
39
24
|
* Build UI suggestions for tool confirmation dialogs
|
|
40
25
|
*
|
|
@@ -368,9 +368,19 @@ export declare abstract class BaseJsonOutputAdapter {
|
|
|
368
368
|
* @param parentToolUseId - Optional parent tool use ID for subagent messages
|
|
369
369
|
*/
|
|
370
370
|
emitUserMessage(parts: Part[], parentToolUseId?: string | null): void;
|
|
371
|
+
/**
|
|
372
|
+
* Checks if responseParts contain any functionResponse with an error.
|
|
373
|
+
* This handles cancelled responses and other error cases where the error
|
|
374
|
+
* is embedded in responseParts rather than the top-level error field.
|
|
375
|
+
* @param responseParts - Array of Part objects
|
|
376
|
+
* @returns Error message if found, undefined otherwise
|
|
377
|
+
*/
|
|
378
|
+
private checkResponsePartsForError;
|
|
371
379
|
/**
|
|
372
380
|
* Emits a tool result message.
|
|
373
381
|
* Collects execution denied tool calls for inclusion in result messages.
|
|
382
|
+
* Handles both explicit errors (response.error) and errors embedded in
|
|
383
|
+
* responseParts (e.g., cancelled responses).
|
|
374
384
|
* @param request - Tool call request info
|
|
375
385
|
* @param response - Tool call response info
|
|
376
386
|
* @param parentToolUseId - Parent tool use ID (null for main agent)
|
|
@@ -426,6 +436,7 @@ export declare function partsToString(parts: Part[]): string;
|
|
|
426
436
|
* Uses functionResponsePartsToString to properly handle functionResponse parts,
|
|
427
437
|
* which correctly extracts output content from functionResponse objects rather
|
|
428
438
|
* than simply concatenating text or JSON.stringify.
|
|
439
|
+
* Also handles errors embedded in responseParts (e.g., cancelled responses).
|
|
429
440
|
*
|
|
430
441
|
* @param response - Tool call response
|
|
431
442
|
* @returns String content or undefined
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { randomUUID } from 'node:crypto';
|
|
7
|
-
import { GeminiEventType, ToolErrorType } from '@umsai/ums-code-core';
|
|
7
|
+
import { GeminiEventType, ToolErrorType, parseAndFormatApiError, } from '@umsai/ums-code-core';
|
|
8
8
|
import { functionResponsePartsToString } from '../../utils/nonInteractiveHelpers.js';
|
|
9
9
|
/**
|
|
10
10
|
* Abstract base class for JSON output adapters.
|
|
@@ -376,6 +376,13 @@ export class BaseJsonOutputAdapter {
|
|
|
376
376
|
}
|
|
377
377
|
this.finalizePendingBlocks(state, null);
|
|
378
378
|
break;
|
|
379
|
+
case GeminiEventType.Error: {
|
|
380
|
+
// Format the error message using parseAndFormatApiError for consistency
|
|
381
|
+
// with interactive mode error display
|
|
382
|
+
const errorText = parseAndFormatApiError(event.value.error, this.config.getContentGeneratorConfig()?.authType);
|
|
383
|
+
this.appendText(state, errorText, null);
|
|
384
|
+
break;
|
|
385
|
+
}
|
|
379
386
|
default:
|
|
380
387
|
break;
|
|
381
388
|
}
|
|
@@ -525,9 +532,16 @@ export class BaseJsonOutputAdapter {
|
|
|
525
532
|
*/
|
|
526
533
|
appendThinking(state, subject, description, parentToolUseId) {
|
|
527
534
|
const actualParentToolUseId = parentToolUseId ?? null;
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
535
|
+
// Build fragment without trimming to preserve whitespace in streaming content
|
|
536
|
+
// Only filter out null/undefined/empty values
|
|
537
|
+
const parts = [];
|
|
538
|
+
if (subject && subject.length > 0) {
|
|
539
|
+
parts.push(subject);
|
|
540
|
+
}
|
|
541
|
+
if (description && description.length > 0) {
|
|
542
|
+
parts.push(description);
|
|
543
|
+
}
|
|
544
|
+
const fragment = parts.join(': ');
|
|
531
545
|
if (!fragment) {
|
|
532
546
|
return;
|
|
533
547
|
}
|
|
@@ -638,14 +652,31 @@ export class BaseJsonOutputAdapter {
|
|
|
638
652
|
};
|
|
639
653
|
this.emitMessageImpl(message);
|
|
640
654
|
}
|
|
655
|
+
/**
|
|
656
|
+
* Checks if responseParts contain any functionResponse with an error.
|
|
657
|
+
* This handles cancelled responses and other error cases where the error
|
|
658
|
+
* is embedded in responseParts rather than the top-level error field.
|
|
659
|
+
* @param responseParts - Array of Part objects
|
|
660
|
+
* @returns Error message if found, undefined otherwise
|
|
661
|
+
*/
|
|
662
|
+
checkResponsePartsForError(responseParts) {
|
|
663
|
+
// Use the shared helper function defined at file level
|
|
664
|
+
return checkResponsePartsForError(responseParts);
|
|
665
|
+
}
|
|
641
666
|
/**
|
|
642
667
|
* Emits a tool result message.
|
|
643
668
|
* Collects execution denied tool calls for inclusion in result messages.
|
|
669
|
+
* Handles both explicit errors (response.error) and errors embedded in
|
|
670
|
+
* responseParts (e.g., cancelled responses).
|
|
644
671
|
* @param request - Tool call request info
|
|
645
672
|
* @param response - Tool call response info
|
|
646
673
|
* @param parentToolUseId - Parent tool use ID (null for main agent)
|
|
647
674
|
*/
|
|
648
675
|
emitToolResult(request, response, parentToolUseId = null) {
|
|
676
|
+
// Check for errors in responseParts (e.g., cancelled responses)
|
|
677
|
+
const responsePartsError = this.checkResponsePartsForError(response.responseParts);
|
|
678
|
+
// Determine if this is an error response
|
|
679
|
+
const hasError = Boolean(response.error) || Boolean(responsePartsError);
|
|
649
680
|
// Track permission denials (execution denied errors)
|
|
650
681
|
if (response.error &&
|
|
651
682
|
response.errorType === ToolErrorType.EXECUTION_DENIED) {
|
|
@@ -659,7 +690,7 @@ export class BaseJsonOutputAdapter {
|
|
|
659
690
|
const block = {
|
|
660
691
|
type: 'tool_result',
|
|
661
692
|
tool_use_id: request.callId,
|
|
662
|
-
is_error:
|
|
693
|
+
is_error: hasError,
|
|
663
694
|
};
|
|
664
695
|
const content = toolResultContent(response);
|
|
665
696
|
if (content !== undefined) {
|
|
@@ -841,11 +872,34 @@ export function partsToString(parts) {
|
|
|
841
872
|
})
|
|
842
873
|
.join('');
|
|
843
874
|
}
|
|
875
|
+
/**
|
|
876
|
+
* Checks if responseParts contain any functionResponse with an error.
|
|
877
|
+
* Helper function for extracting error messages from responseParts.
|
|
878
|
+
* @param responseParts - Array of Part objects
|
|
879
|
+
* @returns Error message if found, undefined otherwise
|
|
880
|
+
*/
|
|
881
|
+
function checkResponsePartsForError(responseParts) {
|
|
882
|
+
if (!responseParts || responseParts.length === 0) {
|
|
883
|
+
return undefined;
|
|
884
|
+
}
|
|
885
|
+
for (const part of responseParts) {
|
|
886
|
+
if ('functionResponse' in part &&
|
|
887
|
+
part.functionResponse?.response &&
|
|
888
|
+
typeof part.functionResponse.response === 'object' &&
|
|
889
|
+
'error' in part.functionResponse.response &&
|
|
890
|
+
part.functionResponse.response['error']) {
|
|
891
|
+
const error = part.functionResponse.response['error'];
|
|
892
|
+
return typeof error === 'string' ? error : String(error);
|
|
893
|
+
}
|
|
894
|
+
}
|
|
895
|
+
return undefined;
|
|
896
|
+
}
|
|
844
897
|
/**
|
|
845
898
|
* Extracts content from tool response.
|
|
846
899
|
* Uses functionResponsePartsToString to properly handle functionResponse parts,
|
|
847
900
|
* which correctly extracts output content from functionResponse objects rather
|
|
848
901
|
* than simply concatenating text or JSON.stringify.
|
|
902
|
+
* Also handles errors embedded in responseParts (e.g., cancelled responses).
|
|
849
903
|
*
|
|
850
904
|
* @param response - Tool call response
|
|
851
905
|
* @returns String content or undefined
|
|
@@ -854,6 +908,11 @@ export function toolResultContent(response) {
|
|
|
854
908
|
if (response.error) {
|
|
855
909
|
return response.error.message;
|
|
856
910
|
}
|
|
911
|
+
// Check for errors in responseParts (e.g., cancelled responses)
|
|
912
|
+
const responsePartsError = checkResponsePartsForError(response.responseParts);
|
|
913
|
+
if (responsePartsError) {
|
|
914
|
+
return responsePartsError;
|
|
915
|
+
}
|
|
857
916
|
if (typeof response.resultDisplay === 'string' &&
|
|
858
917
|
response.resultDisplay.trim().length > 0) {
|
|
859
918
|
return response.resultDisplay;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseJsonOutputAdapter.js","sourceRoot":"","sources":["../../../../src/nonInteractive/io/BaseJsonOutputAdapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"BaseJsonOutputAdapter.js","sourceRoot":"","sources":["../../../../src/nonInteractive/io/BaseJsonOutputAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -438,6 +438,46 @@ describe('BaseJsonOutputAdapter', () => {
|
|
|
438
438
|
adapter.exposeAppendThinking(state, '', '', null);
|
|
439
439
|
expect(state.blocks).toHaveLength(0);
|
|
440
440
|
});
|
|
441
|
+
it('should preserve whitespace in thinking content', () => {
|
|
442
|
+
const state = adapter.exposeCreateMessageState();
|
|
443
|
+
adapter.startAssistantMessage();
|
|
444
|
+
adapter.exposeAppendThinking(state, '', 'The user just said "Hello"', null);
|
|
445
|
+
expect(state.blocks).toHaveLength(1);
|
|
446
|
+
expect(state.blocks[0]).toMatchObject({
|
|
447
|
+
type: 'thinking',
|
|
448
|
+
thinking: 'The user just said "Hello"',
|
|
449
|
+
});
|
|
450
|
+
// Verify spaces are preserved
|
|
451
|
+
const block = state.blocks[0];
|
|
452
|
+
expect(block.thinking).toContain('user just');
|
|
453
|
+
expect(block.thinking).not.toContain('userjust');
|
|
454
|
+
});
|
|
455
|
+
it('should preserve whitespace when appending multiple thinking fragments', () => {
|
|
456
|
+
const state = adapter.exposeCreateMessageState();
|
|
457
|
+
adapter.startAssistantMessage();
|
|
458
|
+
// Simulate streaming thinking content in fragments
|
|
459
|
+
adapter.exposeAppendThinking(state, '', 'The user just', null);
|
|
460
|
+
adapter.exposeAppendThinking(state, '', ' said "Hello"', null);
|
|
461
|
+
adapter.exposeAppendThinking(state, '', '. This is a simple greeting', null);
|
|
462
|
+
expect(state.blocks).toHaveLength(1);
|
|
463
|
+
const block = state.blocks[0];
|
|
464
|
+
// Verify the complete text with all spaces preserved
|
|
465
|
+
expect(block.thinking).toBe('The user just said "Hello". This is a simple greeting');
|
|
466
|
+
// Verify specific space preservation
|
|
467
|
+
expect(block.thinking).toContain('user just ');
|
|
468
|
+
expect(block.thinking).toContain(' said');
|
|
469
|
+
expect(block.thinking).toContain('". This');
|
|
470
|
+
expect(block.thinking).not.toContain('userjust');
|
|
471
|
+
expect(block.thinking).not.toContain('justsaid');
|
|
472
|
+
});
|
|
473
|
+
it('should preserve leading and trailing whitespace in description', () => {
|
|
474
|
+
const state = adapter.exposeCreateMessageState();
|
|
475
|
+
adapter.startAssistantMessage();
|
|
476
|
+
adapter.exposeAppendThinking(state, '', ' content with spaces ', null);
|
|
477
|
+
expect(state.blocks).toHaveLength(1);
|
|
478
|
+
const block = state.blocks[0];
|
|
479
|
+
expect(block.thinking).toBe(' content with spaces ');
|
|
480
|
+
});
|
|
441
481
|
});
|
|
442
482
|
describe('appendToolUse', () => {
|
|
443
483
|
it('should create tool_use block', () => {
|