@umsai/ums-code 0.3.0-v1 → 0.5.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 +4 -4
- package/dist/src/{zed-integration → acp-integration}/acp.d.ts +7 -0
- package/dist/src/{zed-integration → acp-integration}/acp.js +25 -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 +238 -0
- package/dist/src/acp-integration/acpAgent.js.map +1 -0
- package/dist/src/{zed-integration → acp-integration}/schema.d.ts +1030 -43
- package/dist/src/{zed-integration → acp-integration}/schema.js +81 -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/acp-integration/service/filesystem.test.d.ts +6 -0
- 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 +66 -0
- package/dist/src/acp-integration/session/Session.js +760 -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/config/auth.d.ts +1 -0
- package/dist/src/config/auth.js +3 -0
- package/dist/src/config/auth.js.map +1 -1
- package/dist/src/config/config.d.ts +11 -3
- package/dist/src/config/config.js +84 -8
- 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/settingsSchema.d.ts +12 -0
- package/dist/src/config/settingsSchema.js +10 -0
- 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/gemini.js +38 -18
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +7 -0
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/i18n/index.d.ts +1 -1
- package/dist/src/i18n/index.js +4 -0
- package/dist/src/i18n/index.js.map +1 -1
- package/dist/src/i18n/locales/en.js +1 -13
- package/dist/src/i18n/locales/ru.js +1121 -0
- package/dist/src/i18n/locales/zh.js +1 -10
- 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 +189 -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 +54 -2
- package/dist/src/nonInteractive/io/BaseJsonOutputAdapter.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 +25 -46
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.js +5 -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/test-utils/mockCommandContext.js +11 -2
- package/dist/src/test-utils/mockCommandContext.js.map +1 -1
- package/dist/src/ui/AppContainer.js +39 -36
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/auth/useAuth.js +20 -1
- package/dist/src/ui/auth/useAuth.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/languageCommand.js +41 -8
- 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 +463 -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/reviewCommand.d.ts +9 -0
- package/dist/src/ui/commands/reviewCommand.js +1267 -0
- package/dist/src/ui/commands/reviewCommand.js.map +1 -0
- package/dist/src/ui/commands/reviewCommand.test.d.ts +6 -0
- package/dist/src/ui/commands/reviewCommand.test.js +545 -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/types.d.ts +4 -9
- 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 +3 -19
- 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/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/ResumeSessionPicker.d.ts +10 -0
- package/dist/src/ui/components/ResumeSessionPicker.js +249 -0
- package/dist/src/ui/components/ResumeSessionPicker.js.map +1 -0
- package/dist/src/ui/components/SessionSummaryDisplay.js +10 -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/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 +23 -3
- 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/UIStateContext.d.ts +1 -3
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.d.ts +2 -8
- package/dist/src/ui/hooks/slashCommandProcessor.js +68 -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 +49 -9
- package/dist/src/ui/hooks/useGeminiStream.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/useReactToolScheduler.js +2 -2
- package/dist/src/ui/hooks/useReactToolScheduler.js.map +1 -1
- 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 +1 -0
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/models/availableModels.d.ts +8 -2
- package/dist/src/ui/models/availableModels.js +24 -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 +263 -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 +248 -0
- package/dist/src/ui/utils/resumeHistoryUtils.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/gitUtils.js +3 -3
- package/dist/src/utils/gitUtils.js.map +1 -1
- package/dist/src/utils/nonInteractiveHelpers.js +1 -1
- package/dist/src/utils/nonInteractiveHelpers.js.map +1 -1
- package/dist/src/utils/nonInteractiveHelpers.test.js +1 -1
- package/dist/src/utils/nonInteractiveHelpers.test.js.map +1 -1
- package/dist/src/validateNonInterActiveAuth.js +1 -1
- package/dist/src/validateNonInterActiveAuth.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -5
- 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/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/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
|
@@ -0,0 +1,263 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Qwen Code
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { ToolCallStatus } from '../types.js';
|
|
7
|
+
/**
|
|
8
|
+
* Extracts text content from a Content object's parts (excluding thought parts).
|
|
9
|
+
*/
|
|
10
|
+
function extractTextFromParts(parts) {
|
|
11
|
+
if (!parts)
|
|
12
|
+
return '';
|
|
13
|
+
const textParts = [];
|
|
14
|
+
for (const part of parts) {
|
|
15
|
+
if ('text' in part && part.text) {
|
|
16
|
+
// Skip thought parts - they have a 'thought' property
|
|
17
|
+
if (!('thought' in part && part.thought)) {
|
|
18
|
+
textParts.push(part.text);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
return textParts.join('\n');
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Extracts thought text content from a Content object's parts.
|
|
26
|
+
* Thought parts are identified by having `thought: true`.
|
|
27
|
+
*/
|
|
28
|
+
function extractThoughtTextFromParts(parts) {
|
|
29
|
+
if (!parts)
|
|
30
|
+
return '';
|
|
31
|
+
const thoughtParts = [];
|
|
32
|
+
for (const part of parts) {
|
|
33
|
+
if ('text' in part && part.text && 'thought' in part && part.thought) {
|
|
34
|
+
thoughtParts.push(part.text);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return thoughtParts.join('\n');
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Extracts function calls from a Content object's parts.
|
|
41
|
+
*/
|
|
42
|
+
function extractFunctionCalls(parts) {
|
|
43
|
+
if (!parts)
|
|
44
|
+
return [];
|
|
45
|
+
const calls = [];
|
|
46
|
+
for (const part of parts) {
|
|
47
|
+
if ('functionCall' in part && part.functionCall) {
|
|
48
|
+
const fc = part.functionCall;
|
|
49
|
+
calls.push({
|
|
50
|
+
id: fc.id || `call-${calls.length}`,
|
|
51
|
+
name: fc.name || 'unknown',
|
|
52
|
+
args: fc.args || {},
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return calls;
|
|
57
|
+
}
|
|
58
|
+
function getTool(config, name) {
|
|
59
|
+
const toolRegistry = config.getToolRegistry();
|
|
60
|
+
return toolRegistry.getTool(name);
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Formats a tool description from its name and arguments using actual tool instances.
|
|
64
|
+
* This ensures we get the exact same descriptions as during normal operation.
|
|
65
|
+
*/
|
|
66
|
+
function formatToolDescription(tool, args) {
|
|
67
|
+
try {
|
|
68
|
+
// Create tool invocation instance and get description
|
|
69
|
+
const invocation = tool.build(args);
|
|
70
|
+
return invocation.getDescription();
|
|
71
|
+
}
|
|
72
|
+
catch {
|
|
73
|
+
return '';
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Restores a HistoryItemWithoutId from the serialized shape stored in
|
|
78
|
+
* SlashCommandRecordPayload.outputHistoryItems.
|
|
79
|
+
*/
|
|
80
|
+
function restoreHistoryItem(raw) {
|
|
81
|
+
if (!raw || typeof raw !== 'object') {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
const clone = { ...raw };
|
|
85
|
+
if ('timestamp' in clone) {
|
|
86
|
+
const ts = clone['timestamp'];
|
|
87
|
+
if (typeof ts === 'string' || typeof ts === 'number') {
|
|
88
|
+
clone['timestamp'] = new Date(ts);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
if (typeof clone['type'] !== 'string') {
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
return clone;
|
|
95
|
+
}
|
|
96
|
+
/**
|
|
97
|
+
* Converts ChatRecord messages to UI history items for display.
|
|
98
|
+
*
|
|
99
|
+
* This function transforms the raw ChatRecords into a format suitable
|
|
100
|
+
* for the CLI's HistoryItemDisplay component.
|
|
101
|
+
*
|
|
102
|
+
* @param conversation The conversation record from a resumed session
|
|
103
|
+
* @param config The config object for accessing tool registry
|
|
104
|
+
* @returns Array of history items for UI display
|
|
105
|
+
*/
|
|
106
|
+
function convertToHistoryItems(conversation, config) {
|
|
107
|
+
const items = [];
|
|
108
|
+
// Track pending tool calls for grouping with results
|
|
109
|
+
const pendingToolCalls = new Map();
|
|
110
|
+
let currentToolGroup = [];
|
|
111
|
+
for (const record of conversation.messages) {
|
|
112
|
+
if (record.type === 'system') {
|
|
113
|
+
if (record.subtype === 'slash_command') {
|
|
114
|
+
// Flush any pending tool group to avoid mixing contexts.
|
|
115
|
+
if (currentToolGroup.length > 0) {
|
|
116
|
+
items.push({
|
|
117
|
+
type: 'tool_group',
|
|
118
|
+
tools: [...currentToolGroup],
|
|
119
|
+
});
|
|
120
|
+
currentToolGroup = [];
|
|
121
|
+
}
|
|
122
|
+
const payload = record.systemPayload;
|
|
123
|
+
if (!payload)
|
|
124
|
+
continue;
|
|
125
|
+
if (payload.phase === 'invocation' && payload.rawCommand) {
|
|
126
|
+
items.push({ type: 'user', text: payload.rawCommand });
|
|
127
|
+
}
|
|
128
|
+
if (payload.phase === 'result') {
|
|
129
|
+
const outputs = payload.outputHistoryItems ?? [];
|
|
130
|
+
for (const raw of outputs) {
|
|
131
|
+
const restored = restoreHistoryItem(raw);
|
|
132
|
+
if (restored) {
|
|
133
|
+
items.push(restored);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
continue;
|
|
139
|
+
}
|
|
140
|
+
switch (record.type) {
|
|
141
|
+
case 'user': {
|
|
142
|
+
// Flush any pending tool group before user message
|
|
143
|
+
if (currentToolGroup.length > 0) {
|
|
144
|
+
items.push({
|
|
145
|
+
type: 'tool_group',
|
|
146
|
+
tools: [...currentToolGroup],
|
|
147
|
+
});
|
|
148
|
+
currentToolGroup = [];
|
|
149
|
+
}
|
|
150
|
+
const text = extractTextFromParts(record.message?.parts);
|
|
151
|
+
if (text) {
|
|
152
|
+
items.push({ type: 'user', text });
|
|
153
|
+
}
|
|
154
|
+
break;
|
|
155
|
+
}
|
|
156
|
+
case 'assistant': {
|
|
157
|
+
const parts = record.message?.parts;
|
|
158
|
+
// Extract thought content
|
|
159
|
+
const thoughtText = extractThoughtTextFromParts(parts);
|
|
160
|
+
// Extract text content (non-function-call, non-thought)
|
|
161
|
+
const text = extractTextFromParts(parts);
|
|
162
|
+
// Extract function calls
|
|
163
|
+
const functionCalls = extractFunctionCalls(parts);
|
|
164
|
+
// If there's thought content, add it as a gemini_thought message
|
|
165
|
+
if (thoughtText) {
|
|
166
|
+
// Flush any pending tool group before thought
|
|
167
|
+
if (currentToolGroup.length > 0) {
|
|
168
|
+
items.push({
|
|
169
|
+
type: 'tool_group',
|
|
170
|
+
tools: [...currentToolGroup],
|
|
171
|
+
});
|
|
172
|
+
currentToolGroup = [];
|
|
173
|
+
}
|
|
174
|
+
items.push({ type: 'gemini_thought', text: thoughtText });
|
|
175
|
+
}
|
|
176
|
+
// If there's text content, add it as a gemini message
|
|
177
|
+
if (text) {
|
|
178
|
+
// Flush any pending tool group before text
|
|
179
|
+
if (currentToolGroup.length > 0) {
|
|
180
|
+
items.push({
|
|
181
|
+
type: 'tool_group',
|
|
182
|
+
tools: [...currentToolGroup],
|
|
183
|
+
});
|
|
184
|
+
currentToolGroup = [];
|
|
185
|
+
}
|
|
186
|
+
items.push({ type: 'gemini', text });
|
|
187
|
+
}
|
|
188
|
+
// Track function calls for pairing with results
|
|
189
|
+
for (const fc of functionCalls) {
|
|
190
|
+
const tool = getTool(config, fc.name);
|
|
191
|
+
pendingToolCalls.set(fc.id, { name: fc.name, args: fc.args });
|
|
192
|
+
// Add placeholder tool call to current group
|
|
193
|
+
currentToolGroup.push({
|
|
194
|
+
callId: fc.id,
|
|
195
|
+
name: tool?.displayName || fc.name,
|
|
196
|
+
description: tool ? formatToolDescription(tool, fc.args) : '',
|
|
197
|
+
resultDisplay: undefined,
|
|
198
|
+
status: ToolCallStatus.Success, // Will be updated by tool_result
|
|
199
|
+
confirmationDetails: undefined,
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
break;
|
|
203
|
+
}
|
|
204
|
+
case 'tool_result': {
|
|
205
|
+
// Update the corresponding tool call in the current group
|
|
206
|
+
if (record.toolCallResult) {
|
|
207
|
+
const callId = record.toolCallResult.callId;
|
|
208
|
+
const toolCall = currentToolGroup.find((t) => t.callId === callId);
|
|
209
|
+
if (toolCall) {
|
|
210
|
+
// Preserve the resultDisplay as-is - it can be a string or structured object
|
|
211
|
+
const rawDisplay = record.toolCallResult.resultDisplay;
|
|
212
|
+
toolCall.resultDisplay = rawDisplay;
|
|
213
|
+
// Check if status exists and use it
|
|
214
|
+
const rawStatus = record.toolCallResult['status'];
|
|
215
|
+
toolCall.status =
|
|
216
|
+
rawStatus === 'error'
|
|
217
|
+
? ToolCallStatus.Error
|
|
218
|
+
: ToolCallStatus.Success;
|
|
219
|
+
}
|
|
220
|
+
pendingToolCalls.delete(callId || '');
|
|
221
|
+
}
|
|
222
|
+
break;
|
|
223
|
+
}
|
|
224
|
+
default:
|
|
225
|
+
// Skip unknown record types
|
|
226
|
+
break;
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
// Flush any remaining tool group
|
|
230
|
+
if (currentToolGroup.length > 0) {
|
|
231
|
+
items.push({
|
|
232
|
+
type: 'tool_group',
|
|
233
|
+
tools: currentToolGroup,
|
|
234
|
+
});
|
|
235
|
+
}
|
|
236
|
+
return items;
|
|
237
|
+
}
|
|
238
|
+
/**
|
|
239
|
+
* Builds the complete UI history items for a resumed session.
|
|
240
|
+
*
|
|
241
|
+
* This function takes the resumed session data, converts it to UI history format,
|
|
242
|
+
* and assigns unique IDs to each item for use with loadHistory.
|
|
243
|
+
*
|
|
244
|
+
* @param sessionData The resumed session data from SessionService
|
|
245
|
+
* @param config The config object for accessing tool registry
|
|
246
|
+
* @param baseTimestamp Base timestamp for generating unique IDs
|
|
247
|
+
* @returns Array of HistoryItem with proper IDs
|
|
248
|
+
*/
|
|
249
|
+
export function buildResumedHistoryItems(sessionData, config, baseTimestamp = Date.now()) {
|
|
250
|
+
const items = [];
|
|
251
|
+
let idCounter = 1;
|
|
252
|
+
const getNextId = () => baseTimestamp + idCounter++;
|
|
253
|
+
// Convert conversation directly to history items
|
|
254
|
+
const historyItems = convertToHistoryItems(sessionData.conversation, config);
|
|
255
|
+
for (const item of historyItems) {
|
|
256
|
+
items.push({
|
|
257
|
+
...item,
|
|
258
|
+
id: getNextId(),
|
|
259
|
+
});
|
|
260
|
+
}
|
|
261
|
+
return items;
|
|
262
|
+
}
|
|
263
|
+
//# sourceMappingURL=resumeHistoryUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resumeHistoryUtils.js","sourceRoot":"","sources":["../../../../src/ui/utils/resumeHistoryUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,248 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Qwen Code
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
7
|
+
import { buildResumedHistoryItems } from './resumeHistoryUtils.js';
|
|
8
|
+
import { ToolCallStatus } from '../types.js';
|
|
9
|
+
const makeConfig = (tools) => ({
|
|
10
|
+
getToolRegistry: () => ({
|
|
11
|
+
getTool: (name) => tools[name],
|
|
12
|
+
}),
|
|
13
|
+
});
|
|
14
|
+
describe('resumeHistoryUtils', () => {
|
|
15
|
+
let mockTool;
|
|
16
|
+
beforeEach(() => {
|
|
17
|
+
const mockInvocation = {
|
|
18
|
+
getDescription: () => 'Mocked description',
|
|
19
|
+
};
|
|
20
|
+
mockTool = {
|
|
21
|
+
name: 'replace',
|
|
22
|
+
displayName: 'Replace',
|
|
23
|
+
description: 'Replace text',
|
|
24
|
+
build: vi.fn().mockReturnValue(mockInvocation),
|
|
25
|
+
};
|
|
26
|
+
});
|
|
27
|
+
it('converts conversation into history items with incremental ids', () => {
|
|
28
|
+
const conversation = {
|
|
29
|
+
messages: [
|
|
30
|
+
{
|
|
31
|
+
type: 'user',
|
|
32
|
+
message: { parts: [{ text: 'Hello' }] },
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
type: 'assistant',
|
|
36
|
+
message: {
|
|
37
|
+
parts: [
|
|
38
|
+
{ text: 'Hi there' },
|
|
39
|
+
{
|
|
40
|
+
functionCall: {
|
|
41
|
+
id: 'call-1',
|
|
42
|
+
name: 'replace',
|
|
43
|
+
args: { old: 'a', new: 'b' },
|
|
44
|
+
},
|
|
45
|
+
},
|
|
46
|
+
],
|
|
47
|
+
},
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
type: 'tool_result',
|
|
51
|
+
toolCallResult: {
|
|
52
|
+
callId: 'call-1',
|
|
53
|
+
resultDisplay: 'All set',
|
|
54
|
+
status: 'success',
|
|
55
|
+
},
|
|
56
|
+
},
|
|
57
|
+
],
|
|
58
|
+
};
|
|
59
|
+
const session = {
|
|
60
|
+
conversation,
|
|
61
|
+
};
|
|
62
|
+
const baseTimestamp = 1_000;
|
|
63
|
+
const items = buildResumedHistoryItems(session, makeConfig({ replace: mockTool }), baseTimestamp);
|
|
64
|
+
expect(items).toEqual([
|
|
65
|
+
{ id: baseTimestamp + 1, type: 'user', text: 'Hello' },
|
|
66
|
+
{ id: baseTimestamp + 2, type: 'gemini', text: 'Hi there' },
|
|
67
|
+
{
|
|
68
|
+
id: baseTimestamp + 3,
|
|
69
|
+
type: 'tool_group',
|
|
70
|
+
tools: [
|
|
71
|
+
{
|
|
72
|
+
callId: 'call-1',
|
|
73
|
+
name: 'Replace',
|
|
74
|
+
description: 'Mocked description',
|
|
75
|
+
resultDisplay: 'All set',
|
|
76
|
+
status: ToolCallStatus.Success,
|
|
77
|
+
confirmationDetails: undefined,
|
|
78
|
+
},
|
|
79
|
+
],
|
|
80
|
+
},
|
|
81
|
+
]);
|
|
82
|
+
});
|
|
83
|
+
it('marks tool results as error, captures thought text, and falls back when tool is missing', () => {
|
|
84
|
+
const conversation = {
|
|
85
|
+
messages: [
|
|
86
|
+
{
|
|
87
|
+
type: 'assistant',
|
|
88
|
+
message: {
|
|
89
|
+
parts: [
|
|
90
|
+
{
|
|
91
|
+
text: 'should be skipped',
|
|
92
|
+
thought: { subject: 'hidden' },
|
|
93
|
+
},
|
|
94
|
+
{ text: 'visible text' },
|
|
95
|
+
{
|
|
96
|
+
functionCall: {
|
|
97
|
+
id: 'missing-call',
|
|
98
|
+
name: 'unknown_tool',
|
|
99
|
+
args: { foo: 'bar' },
|
|
100
|
+
},
|
|
101
|
+
},
|
|
102
|
+
],
|
|
103
|
+
},
|
|
104
|
+
},
|
|
105
|
+
{
|
|
106
|
+
type: 'tool_result',
|
|
107
|
+
toolCallResult: {
|
|
108
|
+
callId: 'missing-call',
|
|
109
|
+
resultDisplay: { summary: 'failure' },
|
|
110
|
+
status: 'error',
|
|
111
|
+
},
|
|
112
|
+
},
|
|
113
|
+
],
|
|
114
|
+
};
|
|
115
|
+
const session = {
|
|
116
|
+
conversation,
|
|
117
|
+
};
|
|
118
|
+
const items = buildResumedHistoryItems(session, makeConfig({}));
|
|
119
|
+
expect(items).toEqual([
|
|
120
|
+
{
|
|
121
|
+
id: expect.any(Number),
|
|
122
|
+
type: 'gemini_thought',
|
|
123
|
+
text: 'should be skipped',
|
|
124
|
+
},
|
|
125
|
+
{ id: expect.any(Number), type: 'gemini', text: 'visible text' },
|
|
126
|
+
{
|
|
127
|
+
id: expect.any(Number),
|
|
128
|
+
type: 'tool_group',
|
|
129
|
+
tools: [
|
|
130
|
+
{
|
|
131
|
+
callId: 'missing-call',
|
|
132
|
+
name: 'unknown_tool',
|
|
133
|
+
description: '',
|
|
134
|
+
resultDisplay: { summary: 'failure' },
|
|
135
|
+
status: ToolCallStatus.Error,
|
|
136
|
+
confirmationDetails: undefined,
|
|
137
|
+
},
|
|
138
|
+
],
|
|
139
|
+
},
|
|
140
|
+
]);
|
|
141
|
+
});
|
|
142
|
+
it('flushes pending tool groups before subsequent user messages', () => {
|
|
143
|
+
const conversation = {
|
|
144
|
+
messages: [
|
|
145
|
+
{
|
|
146
|
+
type: 'assistant',
|
|
147
|
+
message: {
|
|
148
|
+
parts: [
|
|
149
|
+
{
|
|
150
|
+
functionCall: {
|
|
151
|
+
id: 'call-2',
|
|
152
|
+
name: 'replace',
|
|
153
|
+
args: { target: 'a' },
|
|
154
|
+
},
|
|
155
|
+
},
|
|
156
|
+
],
|
|
157
|
+
},
|
|
158
|
+
},
|
|
159
|
+
{
|
|
160
|
+
type: 'user',
|
|
161
|
+
message: { parts: [{ text: 'next user message' }] },
|
|
162
|
+
},
|
|
163
|
+
],
|
|
164
|
+
};
|
|
165
|
+
const session = {
|
|
166
|
+
conversation,
|
|
167
|
+
};
|
|
168
|
+
const items = buildResumedHistoryItems(session, makeConfig({ replace: mockTool }), 10);
|
|
169
|
+
expect(items[0]).toEqual({
|
|
170
|
+
id: 11,
|
|
171
|
+
type: 'tool_group',
|
|
172
|
+
tools: [
|
|
173
|
+
{
|
|
174
|
+
callId: 'call-2',
|
|
175
|
+
name: 'Replace',
|
|
176
|
+
description: 'Mocked description',
|
|
177
|
+
resultDisplay: undefined,
|
|
178
|
+
status: ToolCallStatus.Success,
|
|
179
|
+
confirmationDetails: undefined,
|
|
180
|
+
},
|
|
181
|
+
],
|
|
182
|
+
});
|
|
183
|
+
expect(items[1]).toEqual({
|
|
184
|
+
id: 12,
|
|
185
|
+
type: 'user',
|
|
186
|
+
text: 'next user message',
|
|
187
|
+
});
|
|
188
|
+
});
|
|
189
|
+
it('replays slash command history items (e.g., /about) on resume', () => {
|
|
190
|
+
const conversation = {
|
|
191
|
+
messages: [
|
|
192
|
+
{
|
|
193
|
+
type: 'system',
|
|
194
|
+
subtype: 'slash_command',
|
|
195
|
+
systemPayload: {
|
|
196
|
+
phase: 'invocation',
|
|
197
|
+
rawCommand: '/about',
|
|
198
|
+
},
|
|
199
|
+
},
|
|
200
|
+
{
|
|
201
|
+
type: 'system',
|
|
202
|
+
subtype: 'slash_command',
|
|
203
|
+
systemPayload: {
|
|
204
|
+
phase: 'result',
|
|
205
|
+
rawCommand: '/about',
|
|
206
|
+
outputHistoryItems: [
|
|
207
|
+
{
|
|
208
|
+
type: 'about',
|
|
209
|
+
systemInfo: {
|
|
210
|
+
cliVersion: '1.2.3',
|
|
211
|
+
osPlatform: 'darwin',
|
|
212
|
+
osArch: 'arm64',
|
|
213
|
+
osRelease: 'test',
|
|
214
|
+
nodeVersion: '20.x',
|
|
215
|
+
npmVersion: '10.x',
|
|
216
|
+
sandboxEnv: 'none',
|
|
217
|
+
modelVersion: 'qwen',
|
|
218
|
+
selectedAuthType: 'none',
|
|
219
|
+
ideClient: 'none',
|
|
220
|
+
sessionId: 'abc',
|
|
221
|
+
memoryUsage: '0 MB',
|
|
222
|
+
},
|
|
223
|
+
},
|
|
224
|
+
],
|
|
225
|
+
},
|
|
226
|
+
},
|
|
227
|
+
{
|
|
228
|
+
type: 'assistant',
|
|
229
|
+
message: { parts: [{ text: 'Follow-up' }] },
|
|
230
|
+
},
|
|
231
|
+
],
|
|
232
|
+
};
|
|
233
|
+
const session = {
|
|
234
|
+
conversation,
|
|
235
|
+
};
|
|
236
|
+
const items = buildResumedHistoryItems(session, makeConfig({}), 5);
|
|
237
|
+
expect(items).toEqual([
|
|
238
|
+
{ id: 6, type: 'user', text: '/about' },
|
|
239
|
+
{
|
|
240
|
+
id: 7,
|
|
241
|
+
type: 'about',
|
|
242
|
+
systemInfo: expect.objectContaining({ cliVersion: '1.2.3' }),
|
|
243
|
+
},
|
|
244
|
+
{ id: 8, type: 'gemini', text: 'Follow-up' },
|
|
245
|
+
]);
|
|
246
|
+
});
|
|
247
|
+
});
|
|
248
|
+
//# sourceMappingURL=resumeHistoryUtils.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resumeHistoryUtils.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/resumeHistoryUtils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ export declare enum AttentionNotificationReason {
|
|
|
9
9
|
}
|
|
10
10
|
export interface TerminalNotificationOptions {
|
|
11
11
|
stream?: Pick<NodeJS.WriteStream, 'write' | 'isTTY'>;
|
|
12
|
+
enabled?: boolean;
|
|
12
13
|
}
|
|
13
14
|
/**
|
|
14
15
|
* Grabs the user's attention by emitting the terminal bell character.
|
|
@@ -18,6 +18,10 @@ const TERMINAL_BELL = '\u0007';
|
|
|
18
18
|
* @returns true when the bell was successfully written to the terminal.
|
|
19
19
|
*/
|
|
20
20
|
export function notifyTerminalAttention(_reason, options = {}) {
|
|
21
|
+
// Check if terminal bell is enabled (default true for backwards compatibility)
|
|
22
|
+
if (options.enabled === false) {
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
21
25
|
const stream = options.stream ?? process.stdout;
|
|
22
26
|
if (!stream?.write || stream.isTTY === false) {
|
|
23
27
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attentionNotification.js","sourceRoot":"","sources":["../../../src/utils/attentionNotification.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,MAAM,CAAN,IAAY,2BAGX;AAHD,WAAY,2BAA2B;IACrC,6DAA8B,CAAA;IAC9B,sEAAuC,CAAA;AACzC,CAAC,EAHW,2BAA2B,KAA3B,2BAA2B,QAGtC;
|
|
1
|
+
{"version":3,"file":"attentionNotification.js","sourceRoot":"","sources":["../../../src/utils/attentionNotification.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,MAAM,CAAN,IAAY,2BAGX;AAHD,WAAY,2BAA2B;IACrC,6DAA8B,CAAA;IAC9B,sEAAuC,CAAA;AACzC,CAAC,EAHW,2BAA2B,KAA3B,2BAA2B,QAGtC;AAOD,MAAM,aAAa,GAAG,QAAQ,CAAC;AAE/B;;;;;;GAMG;AACH,MAAM,UAAU,uBAAuB,CACrC,OAAoC,EACpC,UAAuC,EAAE;IAEzC,+EAA+E;IAC/E,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAChD,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,MAAM,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;QAC7C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;QACrD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
|
|
@@ -44,7 +44,7 @@ export const getGitRepoRoot = () => {
|
|
|
44
44
|
export const getLatestGitHubRelease = async (proxy) => {
|
|
45
45
|
try {
|
|
46
46
|
const controller = new AbortController();
|
|
47
|
-
const endpoint = `https://api.github.com/repos/
|
|
47
|
+
const endpoint = `https://api.github.com/repos/QwenLM/qwen-code-action/releases/latest`;
|
|
48
48
|
const response = await fetch(endpoint, {
|
|
49
49
|
method: 'GET',
|
|
50
50
|
headers: {
|
|
@@ -65,8 +65,8 @@ export const getLatestGitHubRelease = async (proxy) => {
|
|
|
65
65
|
return releaseTag;
|
|
66
66
|
}
|
|
67
67
|
catch (_error) {
|
|
68
|
-
console.debug(`Failed to determine latest
|
|
69
|
-
throw new Error(`Unable to determine the latest
|
|
68
|
+
console.debug(`Failed to determine latest qwen-code-action release:`, _error);
|
|
69
|
+
throw new Error(`Unable to determine the latest qwen-code-action release on GitHub.`);
|
|
70
70
|
}
|
|
71
71
|
};
|
|
72
72
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitUtils.js","sourceRoot":"","sources":["../../../src/utils/gitUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAY,EAAE;IAC9C,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,CACd,QAAQ,CAAC,eAAe,EAAE;YACxB,QAAQ,EAAE,OAAO;SAClB,CAAC,IAAI,EAAE,CACT,CAAC,IAAI,EAAE,CAAC;QAET,MAAM,OAAO,GAAG,aAAa,CAAC;QAE9B,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,wDAAwD;QACxD,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,MAAM,CAAC,CAAC;QACnD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,GAAW,EAAE;IACzC,MAAM,WAAW,GAAG,CAClB,QAAQ,CAAC,+BAA+B,EAAE;QACxC,QAAQ,EAAE,OAAO;KAClB,CAAC,IAAI,EAAE,CACT,CAAC,IAAI,EAAE,CAAC;IAET,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,KAAc,EACG,EAAE;IACnB,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QAEzC,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"gitUtils.js","sourceRoot":"","sources":["../../../src/utils/gitUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -199,7 +199,7 @@ export async function buildSystemMessage(config, sessionId, permissionMode) {
|
|
|
199
199
|
tools,
|
|
200
200
|
mcp_servers: mcpServerList,
|
|
201
201
|
model: config.getModel(),
|
|
202
|
-
permissionMode,
|
|
202
|
+
permission_mode: permissionMode,
|
|
203
203
|
slash_commands: slashCommands,
|
|
204
204
|
qwen_code_version: config.getCliVersion() || 'unknown',
|
|
205
205
|
agents: agentNames,
|