@qduc/term2 0.21.0 → 0.22.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/dist/agent.d.ts +2 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +32 -10
- package/dist/agent.js.map +1 -1
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +83 -6
- package/dist/app.js.map +1 -1
- package/dist/cli.js +84 -2
- package/dist/cli.js.map +1 -1
- package/dist/components/InputBox.js +2 -3
- package/dist/components/InputBox.js.map +1 -1
- package/dist/components/common/MenuContainer.d.ts +5 -0
- package/dist/components/common/MenuContainer.d.ts.map +1 -1
- package/dist/components/common/MenuContainer.js +13 -3
- package/dist/components/common/MenuContainer.js.map +1 -1
- package/dist/components/input/MenuSurface.d.ts.map +1 -1
- package/dist/components/input/MenuSurface.js +12 -2
- package/dist/components/input/MenuSurface.js.map +1 -1
- package/dist/components/input/ModelMenuSession.d.ts.map +1 -1
- package/dist/components/input/ModelMenuSession.js +67 -16
- package/dist/components/input/ModelMenuSession.js.map +1 -1
- package/dist/components/input/SettingsMenuSession.d.ts.map +1 -1
- package/dist/components/input/SettingsMenuSession.js +56 -17
- package/dist/components/input/SettingsMenuSession.js.map +1 -1
- package/dist/components/input/SettingsValueMenuSession.d.ts.map +1 -1
- package/dist/components/input/SettingsValueMenuSession.js +33 -3
- package/dist/components/input/SettingsValueMenuSession.js.map +1 -1
- package/dist/components/input/menu-types.d.ts +1 -1
- package/dist/components/input/menu-types.d.ts.map +1 -1
- package/dist/components/input/triggers.js +2 -2
- package/dist/components/input/triggers.js.map +1 -1
- package/dist/components/layout/BackgroundTasksPanel.d.ts +0 -1
- package/dist/components/layout/BackgroundTasksPanel.d.ts.map +1 -1
- package/dist/components/layout/BackgroundTasksPanel.js +4 -112
- package/dist/components/layout/BackgroundTasksPanel.js.map +1 -1
- package/dist/components/menu/ModelSelectionMenu.d.ts +10 -0
- package/dist/components/menu/ModelSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ModelSelectionMenu.js +85 -16
- package/dist/components/menu/ModelSelectionMenu.js.map +1 -1
- package/dist/components/menu/ProfileSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ProfileSelectionMenu.js +5 -4
- package/dist/components/menu/ProfileSelectionMenu.js.map +1 -1
- package/dist/components/menu/ResumeSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ResumeSelectionMenu.js +3 -5
- package/dist/components/menu/ResumeSelectionMenu.js.map +1 -1
- package/dist/components/menu/SettingsSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/SettingsSelectionMenu.js +4 -32
- package/dist/components/menu/SettingsSelectionMenu.js.map +1 -1
- package/dist/components/menu/SettingsValueSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/SettingsValueSelectionMenu.js +12 -5
- package/dist/components/menu/SettingsValueSelectionMenu.js.map +1 -1
- package/dist/components/menu/SkillSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/SkillSelectionMenu.js +3 -6
- package/dist/components/menu/SkillSelectionMenu.js.map +1 -1
- package/dist/components/menu/SlashCommandMenu.d.ts +8 -0
- package/dist/components/menu/SlashCommandMenu.d.ts.map +1 -1
- package/dist/components/menu/SlashCommandMenu.js +16 -6
- package/dist/components/menu/SlashCommandMenu.js.map +1 -1
- package/dist/components/menu/StandaloneModelPickerApp.d.ts +40 -0
- package/dist/components/menu/StandaloneModelPickerApp.d.ts.map +1 -0
- package/dist/components/menu/StandaloneModelPickerApp.js +106 -0
- package/dist/components/menu/StandaloneModelPickerApp.js.map +1 -0
- package/dist/components/menu/settings-value-formatter.d.ts +11 -0
- package/dist/components/menu/settings-value-formatter.d.ts.map +1 -0
- package/dist/components/menu/settings-value-formatter.js +214 -0
- package/dist/components/menu/settings-value-formatter.js.map +1 -0
- package/dist/components/message/CommandMessage.d.ts.map +1 -1
- package/dist/components/message/CommandMessage.js +22 -17
- package/dist/components/message/CommandMessage.js.map +1 -1
- package/dist/components/message/MessageList.d.ts.map +1 -1
- package/dist/components/message/MessageList.js +13 -2
- package/dist/components/message/MessageList.js.map +1 -1
- package/dist/components/message/RunCodeRenderer.d.ts +16 -0
- package/dist/components/message/RunCodeRenderer.d.ts.map +1 -0
- package/dist/components/message/RunCodeRenderer.js +25 -0
- package/dist/components/message/RunCodeRenderer.js.map +1 -0
- package/dist/components/message/command-message-helpers.d.ts +30 -0
- package/dist/components/message/command-message-helpers.d.ts.map +1 -1
- package/dist/components/message/command-message-helpers.js +85 -0
- package/dist/components/message/command-message-helpers.js.map +1 -1
- package/dist/components/prompt/ApprovalPrompt.d.ts.map +1 -1
- package/dist/components/prompt/ApprovalPrompt.js +12 -21
- package/dist/components/prompt/ApprovalPrompt.js.map +1 -1
- package/dist/components/theme.d.ts +1 -0
- package/dist/components/theme.d.ts.map +1 -1
- package/dist/components/theme.js +1 -0
- package/dist/components/theme.js.map +1 -1
- package/dist/contracts/streamed-model-turn.d.ts +6 -0
- package/dist/contracts/streamed-model-turn.d.ts.map +1 -1
- package/dist/hooks/conversation-ui-reducer.d.ts.map +1 -1
- package/dist/hooks/conversation-ui-reducer.js +5 -2
- package/dist/hooks/conversation-ui-reducer.js.map +1 -1
- package/dist/hooks/settings-completion-config.d.ts +1 -1
- package/dist/hooks/settings-completion-config.d.ts.map +1 -1
- package/dist/hooks/settings-completion-config.js +4 -122
- package/dist/hooks/settings-completion-config.js.map +1 -1
- package/dist/hooks/settings-completion-logic.d.ts +1 -1
- package/dist/hooks/settings-completion-logic.d.ts.map +1 -1
- package/dist/hooks/settings-completion-logic.js.map +1 -1
- package/dist/hooks/use-app-keyboard-shortcuts.d.ts.map +1 -1
- package/dist/hooks/use-app-keyboard-shortcuts.js +33 -20
- package/dist/hooks/use-app-keyboard-shortcuts.js.map +1 -1
- package/dist/hooks/use-conversation.d.ts +3 -0
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +107 -16
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/hooks/use-model-selection.d.ts +33 -4
- package/dist/hooks/use-model-selection.d.ts.map +1 -1
- package/dist/hooks/use-model-selection.js +204 -114
- package/dist/hooks/use-model-selection.js.map +1 -1
- package/dist/hooks/use-settings-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-completion.js +1 -6
- package/dist/hooks/use-settings-completion.js.map +1 -1
- package/dist/hooks/use-settings-value-completion.d.ts +1 -8
- package/dist/hooks/use-settings-value-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-value-completion.js +10 -100
- package/dist/hooks/use-settings-value-completion.js.map +1 -1
- package/dist/hooks/use-standalone-model-picker.d.ts +64 -0
- package/dist/hooks/use-standalone-model-picker.d.ts.map +1 -0
- package/dist/hooks/use-standalone-model-picker.js +310 -0
- package/dist/hooks/use-standalone-model-picker.js.map +1 -0
- package/dist/lib/agent-client.d.ts +17 -1
- package/dist/lib/agent-client.d.ts.map +1 -1
- package/dist/lib/agent-client.js +173 -53
- package/dist/lib/agent-client.js.map +1 -1
- package/dist/lib/agent-configuration.d.ts +12 -3
- package/dist/lib/agent-configuration.d.ts.map +1 -1
- package/dist/lib/agent-configuration.js +26 -7
- package/dist/lib/agent-configuration.js.map +1 -1
- package/dist/lib/agent-factory.d.ts +3 -0
- package/dist/lib/agent-factory.d.ts.map +1 -1
- package/dist/lib/agent-factory.js +49 -7
- package/dist/lib/agent-factory.js.map +1 -1
- package/dist/lib/ask-user-answer-store.d.ts +1 -0
- package/dist/lib/ask-user-answer-store.d.ts.map +1 -1
- package/dist/lib/ask-user-answer-store.js +3 -0
- package/dist/lib/ask-user-answer-store.js.map +1 -1
- package/dist/lib/tool-invoke.d.ts +1 -0
- package/dist/lib/tool-invoke.d.ts.map +1 -1
- package/dist/lib/tool-invoke.js +1 -0
- package/dist/lib/tool-invoke.js.map +1 -1
- package/dist/non-interactive.d.ts +23 -0
- package/dist/non-interactive.d.ts.map +1 -1
- package/dist/non-interactive.js +225 -31
- package/dist/non-interactive.js.map +1 -1
- package/dist/prompts/background-shell.d.ts.map +1 -1
- package/dist/prompts/background-shell.js +4 -2
- package/dist/prompts/background-shell.js.map +1 -1
- package/dist/prompts/background-shell.ts +4 -2
- package/dist/prompts/codex.md +1 -3
- package/dist/prompts/fragments/gpt-6-astra.md +13 -0
- package/dist/prompts/gpt-5-modern.md +1 -3
- package/dist/prompts/gpt-5.4-mini.md +0 -2
- package/dist/prompts/gpt-5.5.md +0 -2
- package/dist/prompts/gpt-5.6.md +0 -1
- package/dist/prompts/lite.md +1 -6
- package/dist/prompts/memory.md +2 -2
- package/dist/prompts/orchestrator.md +4 -4
- package/dist/prompts/prompt-constructor.d.ts +2 -0
- package/dist/prompts/prompt-constructor.d.ts.map +1 -1
- package/dist/prompts/prompt-constructor.js +4 -2
- package/dist/prompts/prompt-constructor.js.map +1 -1
- package/dist/prompts/prompt-constructor.test.ts +178 -5
- package/dist/prompts/prompt-constructor.ts +7 -1
- package/dist/prompts/prompt-profiles.d.ts.map +1 -1
- package/dist/prompts/prompt-profiles.js +6 -0
- package/dist/prompts/prompt-profiles.js.map +1 -1
- package/dist/prompts/prompt-profiles.test.ts +6 -4
- package/dist/prompts/prompt-profiles.ts +6 -0
- package/dist/prompts/session-browser.md +4 -2
- package/dist/prompts/shell-auto-approval.d.ts +1 -1
- package/dist/prompts/shell-auto-approval.d.ts.map +1 -1
- package/dist/prompts/shell-auto-approval.js +2 -2
- package/dist/prompts/shell-auto-approval.ts +2 -2
- package/dist/prompts/subagent-delegation.js +3 -3
- package/dist/prompts/subagent-delegation.js.map +1 -1
- package/dist/prompts/subagent-delegation.test.ts +3 -3
- package/dist/prompts/subagent-delegation.ts +3 -3
- package/dist/prompts/subagents/librarian.md +4 -4
- package/dist/prompts/subagents/worker-prompt.test.ts +7 -0
- package/dist/prompts/tool-surface-guidance.d.ts +4 -0
- package/dist/prompts/tool-surface-guidance.d.ts.map +1 -0
- package/dist/prompts/tool-surface-guidance.js +19 -0
- package/dist/prompts/tool-surface-guidance.js.map +1 -0
- package/dist/prompts/tool-surface-guidance.ts +20 -0
- package/dist/providers/codex-compact.d.ts +2 -0
- package/dist/providers/codex-compact.d.ts.map +1 -1
- package/dist/providers/codex-compact.js +14 -0
- package/dist/providers/codex-compact.js.map +1 -1
- package/dist/providers/codex-responses-model.d.ts +23 -3
- package/dist/providers/codex-responses-model.d.ts.map +1 -1
- package/dist/providers/codex-responses-model.js +121 -33
- package/dist/providers/codex-responses-model.js.map +1 -1
- package/dist/providers/codex.provider.d.ts +2 -0
- package/dist/providers/codex.provider.d.ts.map +1 -1
- package/dist/providers/codex.provider.js +3 -2
- package/dist/providers/codex.provider.js.map +1 -1
- package/dist/providers/grok.provider.d.ts.map +1 -1
- package/dist/providers/grok.provider.js +5 -2
- package/dist/providers/grok.provider.js.map +1 -1
- package/dist/providers/model-catalog/catalog.generated.d.ts +453 -309
- package/dist/providers/model-catalog/catalog.generated.d.ts.map +1 -1
- package/dist/providers/model-catalog/catalog.generated.js +453 -309
- package/dist/providers/model-catalog/catalog.generated.js.map +1 -1
- package/dist/providers/opencode-session.d.ts.map +1 -1
- package/dist/providers/opencode-session.js +5 -0
- package/dist/providers/opencode-session.js.map +1 -1
- package/dist/providers/openrouter.provider.js +8 -1
- package/dist/providers/openrouter.provider.js.map +1 -1
- package/dist/providers/responses-websocket-sessions.d.ts +10 -0
- package/dist/providers/responses-websocket-sessions.d.ts.map +1 -1
- package/dist/providers/responses-websocket-sessions.js +9 -4
- package/dist/providers/responses-websocket-sessions.js.map +1 -1
- package/dist/providers/retrying-model.d.ts +2 -1
- package/dist/providers/retrying-model.d.ts.map +1 -1
- package/dist/providers/retrying-model.js +3 -0
- package/dist/providers/retrying-model.js.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.d.ts +8 -1
- package/dist/services/agent-runtime/application-run-loop.d.ts.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.js +30 -6
- package/dist/services/agent-runtime/application-run-loop.js.map +1 -1
- package/dist/services/agent-runtime/context-compaction/index.d.ts +2 -0
- package/dist/services/agent-runtime/context-compaction/index.d.ts.map +1 -1
- package/dist/services/agent-runtime/context-compaction/index.js +30 -4
- package/dist/services/agent-runtime/context-compaction/index.js.map +1 -1
- package/dist/services/agent-runtime/context-compaction/local-context-compactor.d.ts +3 -0
- package/dist/services/agent-runtime/context-compaction/local-context-compactor.d.ts.map +1 -1
- package/dist/services/agent-runtime/context-compaction/local-context-compactor.js +15 -9
- package/dist/services/agent-runtime/context-compaction/local-context-compactor.js.map +1 -1
- package/dist/services/agent-runtime/tool-invocation-context.d.ts +12 -0
- package/dist/services/agent-runtime/tool-invocation-context.d.ts.map +1 -1
- package/dist/services/agent-runtime/workflow/workflow-evaluator.d.ts +7 -1
- package/dist/services/agent-runtime/workflow/workflow-evaluator.d.ts.map +1 -1
- package/dist/services/agent-runtime/workflow/workflow-evaluator.js +78 -183
- package/dist/services/agent-runtime/workflow/workflow-evaluator.js.map +1 -1
- package/dist/services/agent-runtime/workflow/workflow-sandbox.d.ts +4 -3
- package/dist/services/agent-runtime/workflow/workflow-sandbox.d.ts.map +1 -1
- package/dist/services/agent-runtime/workflow/workflow-sandbox.js +9 -7
- package/dist/services/agent-runtime/workflow/workflow-sandbox.js.map +1 -1
- package/dist/services/agent-runtime/workflow/workflow-types.d.ts +1 -1
- package/dist/services/agent-runtime/workflow/workflow-types.d.ts.map +1 -1
- package/dist/services/agent-runtime/workflow/workflow-types.js.map +1 -1
- package/dist/services/approval/approval-decision-executor.d.ts +2 -1
- package/dist/services/approval/approval-decision-executor.d.ts.map +1 -1
- package/dist/services/approval/approval-decision-executor.js +22 -116
- package/dist/services/approval/approval-decision-executor.js.map +1 -1
- package/dist/services/approval/approval-descriptor.d.ts +10 -0
- package/dist/services/approval/approval-descriptor.d.ts.map +1 -0
- package/dist/services/approval/approval-descriptor.js +23 -0
- package/dist/services/approval/approval-descriptor.js.map +1 -0
- package/dist/services/approval/approval-flow-coordinator.d.ts +2 -1
- package/dist/services/approval/approval-flow-coordinator.d.ts.map +1 -1
- package/dist/services/approval/approval-flow-coordinator.js +2 -1
- package/dist/services/approval/approval-flow-coordinator.js.map +1 -1
- package/dist/services/approval/approval-grant-executor.d.ts +25 -0
- package/dist/services/approval/approval-grant-executor.d.ts.map +1 -0
- package/dist/services/approval/approval-grant-executor.js +125 -0
- package/dist/services/approval/approval-grant-executor.js.map +1 -0
- package/dist/services/approval/background-subagent-approval-controller.d.ts +2 -1
- package/dist/services/approval/background-subagent-approval-controller.d.ts.map +1 -1
- package/dist/services/approval/background-subagent-approval-controller.js.map +1 -1
- package/dist/services/approval/nested-approval-owner.d.ts +52 -0
- package/dist/services/approval/nested-approval-owner.d.ts.map +1 -0
- package/dist/services/approval/nested-approval-owner.js +194 -0
- package/dist/services/approval/nested-approval-owner.js.map +1 -0
- package/dist/services/approval/non-interactive-approval-policy.js +1 -1
- package/dist/services/approval/non-interactive-approval-policy.js.map +1 -1
- package/dist/services/approval/shell-auto-approval-evaluator.d.ts.map +1 -1
- package/dist/services/approval/shell-auto-approval-evaluator.js +2 -4
- package/dist/services/approval/shell-auto-approval-evaluator.js.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.d.ts.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.js +4 -0
- package/dist/services/approval/shell-auto-approval-resolver.js.map +1 -1
- package/dist/services/approval/tool-approval-batch-coordinator.d.ts +10 -3
- package/dist/services/approval/tool-approval-batch-coordinator.d.ts.map +1 -1
- package/dist/services/approval/tool-approval-batch-coordinator.js +16 -5
- package/dist/services/approval/tool-approval-batch-coordinator.js.map +1 -1
- package/dist/services/approval/tool-approval-policy-registry.d.ts +13 -0
- package/dist/services/approval/tool-approval-policy-registry.d.ts.map +1 -1
- package/dist/services/approval/tool-approval-policy-registry.js +16 -1
- package/dist/services/approval/tool-approval-policy-registry.js.map +1 -1
- package/dist/services/conversation/conversation-adapter-factory.d.ts +3 -1
- package/dist/services/conversation/conversation-adapter-factory.d.ts.map +1 -1
- package/dist/services/conversation/conversation-adapter-factory.js +3 -3
- package/dist/services/conversation/conversation-adapter-factory.js.map +1 -1
- package/dist/services/conversation/conversation-adapter.d.ts +3 -2
- package/dist/services/conversation/conversation-adapter.d.ts.map +1 -1
- package/dist/services/conversation/conversation-adapter.js +32 -23
- package/dist/services/conversation/conversation-adapter.js.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.d.ts +11 -0
- package/dist/services/conversation/conversation-orchestrator.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.js +65 -42
- package/dist/services/conversation/conversation-orchestrator.js.map +1 -1
- package/dist/services/conversation/conversation-persistence.d.ts +6 -1
- package/dist/services/conversation/conversation-persistence.d.ts.map +1 -1
- package/dist/services/conversation/conversation-persistence.js +68 -19
- package/dist/services/conversation/conversation-persistence.js.map +1 -1
- package/dist/services/conversation/conversation-result-builder.d.ts +3 -0
- package/dist/services/conversation/conversation-result-builder.d.ts.map +1 -1
- package/dist/services/conversation/conversation-result-builder.js +27 -23
- package/dist/services/conversation/conversation-result-builder.js.map +1 -1
- package/dist/services/conversation/conversation-runtime-factory.d.ts +5 -0
- package/dist/services/conversation/conversation-runtime-factory.d.ts.map +1 -1
- package/dist/services/conversation/conversation-runtime-factory.js +1 -0
- package/dist/services/conversation/conversation-runtime-factory.js.map +1 -1
- package/dist/services/conversation/conversation-service.d.ts +11 -1
- package/dist/services/conversation/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation/conversation-service.js +68 -17
- package/dist/services/conversation/conversation-service.js.map +1 -1
- package/dist/services/conversation/session-browser.d.ts +34 -27
- package/dist/services/conversation/session-browser.d.ts.map +1 -1
- package/dist/services/conversation/session-browser.js +221 -60
- package/dist/services/conversation/session-browser.js.map +1 -1
- package/dist/services/conversation/session-index/session-index-database.d.ts +138 -0
- package/dist/services/conversation/session-index/session-index-database.d.ts.map +1 -0
- package/dist/services/conversation/session-index/session-index-database.js +684 -0
- package/dist/services/conversation/session-index/session-index-database.js.map +1 -0
- package/dist/services/conversation/session-index/session-index-schema.d.ts +35 -0
- package/dist/services/conversation/session-index/session-index-schema.d.ts.map +1 -0
- package/dist/services/conversation/session-index/session-index-schema.js +156 -0
- package/dist/services/conversation/session-index/session-index-schema.js.map +1 -0
- package/dist/services/conversation/session-index/session-index-service.d.ts +30 -0
- package/dist/services/conversation/session-index/session-index-service.d.ts.map +1 -0
- package/dist/services/conversation/session-index/session-index-service.js +234 -0
- package/dist/services/conversation/session-index/session-index-service.js.map +1 -0
- package/dist/services/conversation/session-index/session-index-worker-client.d.ts +36 -0
- package/dist/services/conversation/session-index/session-index-worker-client.d.ts.map +1 -0
- package/dist/services/conversation/session-index/session-index-worker-client.js +143 -0
- package/dist/services/conversation/session-index/session-index-worker-client.js.map +1 -0
- package/dist/services/conversation/session-index/session-index-worker.d.ts +56 -0
- package/dist/services/conversation/session-index/session-index-worker.d.ts.map +1 -0
- package/dist/services/conversation/session-index/session-index-worker.js +96 -0
- package/dist/services/conversation/session-index/session-index-worker.js.map +1 -0
- package/dist/services/conversation/session-search-helpers.d.ts +4 -0
- package/dist/services/conversation/session-search-helpers.d.ts.map +1 -0
- package/dist/services/conversation/session-search-helpers.js +13 -0
- package/dist/services/conversation/session-search-helpers.js.map +1 -0
- package/dist/services/conversation-agent-client.d.ts +8 -0
- package/dist/services/conversation-agent-client.d.ts.map +1 -1
- package/dist/services/execution-context.js +2 -2
- package/dist/services/execution-context.js.map +1 -1
- package/dist/services/hooks/hook-event-factory.d.ts +2 -1
- package/dist/services/hooks/hook-event-factory.d.ts.map +1 -1
- package/dist/services/hooks/hook-event-factory.js +2 -1
- package/dist/services/hooks/hook-event-factory.js.map +1 -1
- package/dist/services/logging/conversation-log-writer.d.ts.map +1 -1
- package/dist/services/logging/conversation-log-writer.js +50 -26
- package/dist/services/logging/conversation-log-writer.js.map +1 -1
- package/dist/services/logging/logging-service.d.ts.map +1 -1
- package/dist/services/logging/logging-service.js +1 -0
- package/dist/services/logging/logging-service.js.map +1 -1
- package/dist/services/logging/provider-traffic.d.ts +22 -2
- package/dist/services/logging/provider-traffic.d.ts.map +1 -1
- package/dist/services/logging/provider-traffic.js +147 -12
- package/dist/services/logging/provider-traffic.js.map +1 -1
- package/dist/services/model-service.d.ts +42 -0
- package/dist/services/model-service.d.ts.map +1 -1
- package/dist/services/model-service.js +161 -26
- package/dist/services/model-service.js.map +1 -1
- package/dist/services/models/model-catalog-session.d.ts.map +1 -1
- package/dist/services/models/model-catalog-session.js +11 -7
- package/dist/services/models/model-catalog-session.js.map +1 -1
- package/dist/services/models/model-favorites.d.ts +56 -0
- package/dist/services/models/model-favorites.d.ts.map +1 -0
- package/dist/services/models/model-favorites.js +93 -0
- package/dist/services/models/model-favorites.js.map +1 -0
- package/dist/services/models/model-listing.d.ts +40 -0
- package/dist/services/models/model-listing.d.ts.map +1 -1
- package/dist/services/models/model-listing.js +35 -2
- package/dist/services/models/model-listing.js.map +1 -1
- package/dist/services/models/model-nicknames.d.ts +113 -0
- package/dist/services/models/model-nicknames.d.ts.map +1 -0
- package/dist/services/models/model-nicknames.js +182 -0
- package/dist/services/models/model-nicknames.js.map +1 -0
- package/dist/services/models/model-picker-host.d.ts +72 -0
- package/dist/services/models/model-picker-host.d.ts.map +1 -0
- package/dist/services/models/model-picker-host.js +83 -0
- package/dist/services/models/model-picker-host.js.map +1 -0
- package/dist/services/models/model-resolution.d.ts +35 -3
- package/dist/services/models/model-resolution.d.ts.map +1 -1
- package/dist/services/models/model-resolution.js +276 -47
- package/dist/services/models/model-resolution.js.map +1 -1
- package/dist/services/models/reasoning-effort.d.ts +20 -0
- package/dist/services/models/reasoning-effort.d.ts.map +1 -0
- package/dist/services/models/reasoning-effort.js +28 -0
- package/dist/services/models/reasoning-effort.js.map +1 -0
- package/dist/services/models/unified-model-catalog.d.ts +4 -0
- package/dist/services/models/unified-model-catalog.d.ts.map +1 -0
- package/dist/services/models/unified-model-catalog.js +54 -0
- package/dist/services/models/unified-model-catalog.js.map +1 -0
- package/dist/services/retry/provider-failure-classification.d.ts +16 -0
- package/dist/services/retry/provider-failure-classification.d.ts.map +1 -1
- package/dist/services/retry/provider-failure-classification.js +45 -0
- package/dist/services/retry/provider-failure-classification.js.map +1 -1
- package/dist/services/retry/retry-recovery-budget.d.ts +26 -1
- package/dist/services/retry/retry-recovery-budget.d.ts.map +1 -1
- package/dist/services/retry/retry-recovery-budget.js +33 -1
- package/dist/services/retry/retry-recovery-budget.js.map +1 -1
- package/dist/services/sandboxed-code-host/host-types.d.ts +135 -0
- package/dist/services/sandboxed-code-host/host-types.d.ts.map +1 -0
- package/dist/services/sandboxed-code-host/host-types.js +6 -0
- package/dist/services/sandboxed-code-host/host-types.js.map +1 -0
- package/dist/services/sandboxed-code-host/host-worker.d.ts +9 -0
- package/dist/services/sandboxed-code-host/host-worker.d.ts.map +1 -0
- package/dist/services/sandboxed-code-host/host-worker.js +351 -0
- package/dist/services/sandboxed-code-host/host-worker.js.map +1 -0
- package/dist/services/sandboxed-code-host/sandbox.d.ts +16 -0
- package/dist/services/sandboxed-code-host/sandbox.d.ts.map +1 -0
- package/dist/services/sandboxed-code-host/sandbox.js +21 -0
- package/dist/services/sandboxed-code-host/sandbox.js.map +1 -0
- package/dist/services/sandboxed-code-host/sandboxed-code-host.d.ts +17 -0
- package/dist/services/sandboxed-code-host/sandboxed-code-host.d.ts.map +1 -0
- package/dist/services/sandboxed-code-host/sandboxed-code-host.js +347 -0
- package/dist/services/sandboxed-code-host/sandboxed-code-host.js.map +1 -0
- package/dist/services/service-interfaces.d.ts +32 -0
- package/dist/services/service-interfaces.d.ts.map +1 -1
- package/dist/services/session/background-task-control.d.ts +3 -1
- package/dist/services/session/background-task-control.d.ts.map +1 -1
- package/dist/services/session/background-task-control.js +4 -0
- package/dist/services/session/background-task-control.js.map +1 -1
- package/dist/services/session/continuation-plan-applier.d.ts +2 -1
- package/dist/services/session/continuation-plan-applier.d.ts.map +1 -1
- package/dist/services/session/continuation-plan-applier.js.map +1 -1
- package/dist/services/session/continuation-recovery-handler.d.ts +2 -1
- package/dist/services/session/continuation-recovery-handler.d.ts.map +1 -1
- package/dist/services/session/continuation-recovery-handler.js +49 -5
- package/dist/services/session/continuation-recovery-handler.js.map +1 -1
- package/dist/services/session/initial-input-preparer.d.ts +2 -1
- package/dist/services/session/initial-input-preparer.d.ts.map +1 -1
- package/dist/services/session/initial-input-preparer.js +2 -1
- package/dist/services/session/initial-input-preparer.js.map +1 -1
- package/dist/services/session/initial-turn-recovery-handler.d.ts +2 -1
- package/dist/services/session/initial-turn-recovery-handler.d.ts.map +1 -1
- package/dist/services/session/initial-turn-recovery-handler.js +51 -16
- package/dist/services/session/initial-turn-recovery-handler.js.map +1 -1
- package/dist/services/session/post-execute-pending-registry.d.ts +2 -1
- package/dist/services/session/post-execute-pending-registry.d.ts.map +1 -1
- package/dist/services/session/post-execute-pending-registry.js +3 -2
- package/dist/services/session/post-execute-pending-registry.js.map +1 -1
- package/dist/services/session/session-client-factory.d.ts +4 -0
- package/dist/services/session/session-client-factory.d.ts.map +1 -1
- package/dist/services/session/session-client-factory.js +12 -4
- package/dist/services/session/session-client-factory.js.map +1 -1
- package/dist/services/session/session-composition.d.ts +26 -2
- package/dist/services/session/session-composition.d.ts.map +1 -1
- package/dist/services/session/session-composition.js +97 -18
- package/dist/services/session/session-composition.js.map +1 -1
- package/dist/services/session/session-continuity-reset.d.ts +2 -1
- package/dist/services/session/session-continuity-reset.d.ts.map +1 -1
- package/dist/services/session/session-continuity-reset.js +5 -2
- package/dist/services/session/session-continuity-reset.js.map +1 -1
- package/dist/services/session/session-identity.d.ts +20 -0
- package/dist/services/session/session-identity.d.ts.map +1 -0
- package/dist/services/session/session-identity.js +43 -0
- package/dist/services/session/session-identity.js.map +1 -0
- package/dist/services/session/session-lifecycle.d.ts +5 -1
- package/dist/services/session/session-lifecycle.d.ts.map +1 -1
- package/dist/services/session/session-lifecycle.js +5 -1
- package/dist/services/session/session-lifecycle.js.map +1 -1
- package/dist/services/session/session-stream-processor.d.ts +2 -1
- package/dist/services/session/session-stream-processor.d.ts.map +1 -1
- package/dist/services/session/session-stream-processor.js +5 -4
- package/dist/services/session/session-stream-processor.js.map +1 -1
- package/dist/services/session/test-helpers/conversation-session-fixtures.d.ts.map +1 -1
- package/dist/services/session/test-helpers/conversation-session-fixtures.js +14 -9
- package/dist/services/session/test-helpers/conversation-session-fixtures.js.map +1 -1
- package/dist/services/session/turn-coordinator.d.ts +2 -1
- package/dist/services/session/turn-coordinator.d.ts.map +1 -1
- package/dist/services/session/turn-coordinator.js +3 -0
- package/dist/services/session/turn-coordinator.js.map +1 -1
- package/dist/services/session/turn-workflow.d.ts +4 -1
- package/dist/services/session/turn-workflow.d.ts.map +1 -1
- package/dist/services/session/turn-workflow.js +58 -21
- package/dist/services/session/turn-workflow.js.map +1 -1
- package/dist/services/session-rollover/session-rollover-brief.d.ts +8 -1
- package/dist/services/session-rollover/session-rollover-brief.d.ts.map +1 -1
- package/dist/services/session-rollover/session-rollover-brief.js +14 -1
- package/dist/services/session-rollover/session-rollover-brief.js.map +1 -1
- package/dist/services/settings/setting-schema-utils.d.ts +2 -0
- package/dist/services/settings/setting-schema-utils.d.ts.map +1 -1
- package/dist/services/settings/setting-schema-utils.js +15 -27
- package/dist/services/settings/setting-schema-utils.js.map +1 -1
- package/dist/services/settings/settings-schema.d.ts +8 -0
- package/dist/services/settings/settings-schema.d.ts.map +1 -1
- package/dist/services/settings/settings-schema.js +23 -6
- package/dist/services/settings/settings-schema.js.map +1 -1
- package/dist/services/settings/settings-sources.d.ts +207 -0
- package/dist/services/settings/settings-sources.d.ts.map +1 -1
- package/dist/services/settings/settings-sources.js +48 -1
- package/dist/services/settings/settings-sources.js.map +1 -1
- package/dist/services/settings/settings-ui-metadata.d.ts +27 -0
- package/dist/services/settings/settings-ui-metadata.d.ts.map +1 -0
- package/dist/services/settings/settings-ui-metadata.js +283 -0
- package/dist/services/settings/settings-ui-metadata.js.map +1 -0
- package/dist/services/settings/test-helpers/settings-consumer-inventory.d.ts +10 -0
- package/dist/services/settings/test-helpers/settings-consumer-inventory.d.ts.map +1 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.js +46 -0
- package/dist/services/settings/test-helpers/settings-consumer-inventory.js.map +1 -1
- package/dist/services/subagents/execution-runner.d.ts.map +1 -1
- package/dist/services/subagents/execution-runner.js +8 -0
- package/dist/services/subagents/execution-runner.js.map +1 -1
- package/dist/services/subagents/role-loader.d.ts.map +1 -1
- package/dist/services/subagents/role-loader.js +4 -0
- package/dist/services/subagents/role-loader.js.map +1 -1
- package/dist/services/subagents/subagent-client-types.d.ts +7 -0
- package/dist/services/subagents/subagent-client-types.d.ts.map +1 -1
- package/dist/services/subagents/subagent-manager.d.ts.map +1 -1
- package/dist/services/subagents/subagent-manager.js +4 -1
- package/dist/services/subagents/subagent-manager.js.map +1 -1
- package/dist/services/subagents/subagent-notification-store.d.ts +2 -0
- package/dist/services/subagents/subagent-notification-store.d.ts.map +1 -1
- package/dist/services/subagents/subagent-notification-store.js +4 -0
- package/dist/services/subagents/subagent-notification-store.js.map +1 -1
- package/dist/services/subagents/test-helpers/subagent-manager-fixtures.d.ts.map +1 -1
- package/dist/services/subagents/test-helpers/subagent-manager-fixtures.js +2 -1
- package/dist/services/subagents/test-helpers/subagent-manager-fixtures.js.map +1 -1
- package/dist/services/subagents/tool-policy.d.ts +8 -0
- package/dist/services/subagents/tool-policy.d.ts.map +1 -1
- package/dist/services/subagents/tool-policy.js +289 -41
- package/dist/services/subagents/tool-policy.js.map +1 -1
- package/dist/services/subagents/types.d.ts +2 -1
- package/dist/services/subagents/types.d.ts.map +1 -1
- package/dist/services/subagents/types.js.map +1 -1
- package/dist/test-helpers/conversation-session-with-adapter.d.ts +1 -1
- package/dist/test-helpers/conversation-session-with-adapter.d.ts.map +1 -1
- package/dist/test-helpers/conversation-session-with-adapter.js +6 -1
- package/dist/test-helpers/conversation-session-with-adapter.js.map +1 -1
- package/dist/test-helpers/vitest-cache-isolation.d.ts +2 -0
- package/dist/test-helpers/vitest-cache-isolation.d.ts.map +1 -0
- package/dist/test-helpers/vitest-cache-isolation.js +17 -0
- package/dist/test-helpers/vitest-cache-isolation.js.map +1 -0
- package/dist/tools/agent/activate-skill.d.ts.map +1 -1
- package/dist/tools/agent/activate-skill.js +1 -0
- package/dist/tools/agent/activate-skill.js.map +1 -1
- package/dist/tools/agent/configure-task-check-in.d.ts.map +1 -1
- package/dist/tools/agent/configure-task-check-in.js +1 -0
- package/dist/tools/agent/configure-task-check-in.js.map +1 -1
- package/dist/tools/agent/run-subagent-async.d.ts.map +1 -1
- package/dist/tools/agent/run-subagent-async.js +16 -12
- package/dist/tools/agent/run-subagent-async.js.map +1 -1
- package/dist/tools/file/apply-patch.d.ts.map +1 -1
- package/dist/tools/file/apply-patch.js +9 -11
- package/dist/tools/file/apply-patch.js.map +1 -1
- package/dist/tools/file/code-context.d.ts.map +1 -1
- package/dist/tools/file/code-context.js +40 -5
- package/dist/tools/file/code-context.js.map +1 -1
- package/dist/tools/file/create-file.d.ts.map +1 -1
- package/dist/tools/file/create-file.js +13 -8
- package/dist/tools/file/create-file.js.map +1 -1
- package/dist/tools/file/glob.d.ts.map +1 -1
- package/dist/tools/file/glob.js +49 -11
- package/dist/tools/file/glob.js.map +1 -1
- package/dist/tools/file/grep.d.ts.map +1 -1
- package/dist/tools/file/grep.js +32 -8
- package/dist/tools/file/grep.js.map +1 -1
- package/dist/tools/file/read-file.d.ts.map +1 -1
- package/dist/tools/file/read-file.js +109 -6
- package/dist/tools/file/read-file.js.map +1 -1
- package/dist/tools/file/search-replace.js +4 -4
- package/dist/tools/file/search-replace.js.map +1 -1
- package/dist/tools/file/upstream-apply-patch.d.ts.map +1 -1
- package/dist/tools/file/upstream-apply-patch.js +4 -1
- package/dist/tools/file/upstream-apply-patch.js.map +1 -1
- package/dist/tools/memory/memory-tools.d.ts.map +1 -1
- package/dist/tools/memory/memory-tools.js +19 -1
- package/dist/tools/memory/memory-tools.js.map +1 -1
- package/dist/tools/session-browser/session-browser-tools.d.ts.map +1 -1
- package/dist/tools/session-browser/session-browser-tools.js +24 -8
- package/dist/tools/session-browser/session-browser-tools.js.map +1 -1
- package/dist/tools/session-rollover/session-rollover-tool.d.ts.map +1 -1
- package/dist/tools/session-rollover/session-rollover-tool.js +8 -2
- package/dist/tools/session-rollover/session-rollover-tool.js.map +1 -1
- package/dist/tools/system/run-code/index.d.ts +2 -0
- package/dist/tools/system/run-code/index.d.ts.map +1 -0
- package/dist/tools/system/run-code/index.js +2 -0
- package/dist/tools/system/run-code/index.js.map +1 -0
- package/dist/tools/system/run-code/run-code-telemetry.d.ts +92 -0
- package/dist/tools/system/run-code/run-code-telemetry.d.ts.map +1 -0
- package/dist/tools/system/run-code/run-code-telemetry.js +189 -0
- package/dist/tools/system/run-code/run-code-telemetry.js.map +1 -0
- package/dist/tools/system/run-code/run-code.d.ts +98 -0
- package/dist/tools/system/run-code/run-code.d.ts.map +1 -0
- package/dist/tools/system/run-code/run-code.js +1078 -0
- package/dist/tools/system/run-code/run-code.js.map +1 -0
- package/dist/tools/system/run-code/tools-header.d.ts +25 -0
- package/dist/tools/system/run-code/tools-header.d.ts.map +1 -0
- package/dist/tools/system/run-code/tools-header.js +136 -0
- package/dist/tools/system/run-code/tools-header.js.map +1 -0
- package/dist/tools/system/shell.d.ts.map +1 -1
- package/dist/tools/system/shell.js +58 -9
- package/dist/tools/system/shell.js.map +1 -1
- package/dist/tools/system/worktree.js +2 -2
- package/dist/tools/system/worktree.js.map +1 -1
- package/dist/tools/types.d.ts +24 -0
- package/dist/tools/types.d.ts.map +1 -1
- package/dist/tools/types.js.map +1 -1
- package/dist/tools/utils.d.ts +10 -0
- package/dist/tools/utils.d.ts.map +1 -1
- package/dist/tools/utils.js +13 -0
- package/dist/tools/utils.js.map +1 -1
- package/dist/tools/web/web-fetch.d.ts.map +1 -1
- package/dist/tools/web/web-fetch.js +14 -6
- package/dist/tools/web/web-fetch.js.map +1 -1
- package/dist/tools/web/web-search.d.ts.map +1 -1
- package/dist/tools/web/web-search.js +2 -1
- package/dist/tools/web/web-search.js.map +1 -1
- package/dist/utils/ai/model-settings.d.ts.map +1 -1
- package/dist/utils/ai/model-settings.js +0 -47
- package/dist/utils/ai/model-settings.js.map +1 -1
- package/dist/utils/conversation/apply-conversation-result.d.ts.map +1 -1
- package/dist/utils/conversation/apply-conversation-result.js +13 -0
- package/dist/utils/conversation/apply-conversation-result.js.map +1 -1
- package/dist/utils/conversation/conversation-utils.d.ts.map +1 -1
- package/dist/utils/conversation/conversation-utils.js +14 -0
- package/dist/utils/conversation/conversation-utils.js.map +1 -1
- package/dist/utils/output/bound-tool-result.d.ts +23 -0
- package/dist/utils/output/bound-tool-result.d.ts.map +1 -1
- package/dist/utils/output/bound-tool-result.js +27 -0
- package/dist/utils/output/bound-tool-result.js.map +1 -1
- package/dist/utils/settings-command.d.ts +8 -0
- package/dist/utils/settings-command.d.ts.map +1 -1
- package/dist/utils/settings-command.js +45 -30
- package/dist/utils/settings-command.js.map +1 -1
- package/dist/utils/shell/execute-shell.d.ts +18 -0
- package/dist/utils/shell/execute-shell.d.ts.map +1 -1
- package/dist/utils/shell/execute-shell.js +48 -6
- package/dist/utils/shell/execute-shell.js.map +1 -1
- package/dist/utils/shell/shell-output.d.ts +7 -1
- package/dist/utils/shell/shell-output.d.ts.map +1 -1
- package/dist/utils/shell/shell-output.js +37 -7
- package/dist/utils/shell/shell-output.js.map +1 -1
- package/dist/utils/streaming/streaming-session-factory.d.ts +9 -0
- package/dist/utils/streaming/streaming-session-factory.d.ts.map +1 -1
- package/dist/utils/streaming/streaming-session-factory.js +1 -1
- package/dist/utils/streaming/streaming-session-factory.js.map +1 -1
- package/dist/utils/tool-args-display.d.ts +21 -0
- package/dist/utils/tool-args-display.d.ts.map +1 -0
- package/dist/utils/tool-args-display.js +34 -0
- package/dist/utils/tool-args-display.js.map +1 -0
- package/dist/utils/value-suggestions.d.ts +4 -10
- package/dist/utils/value-suggestions.d.ts.map +1 -1
- package/dist/utils/value-suggestions.js +77 -144
- package/dist/utils/value-suggestions.js.map +1 -1
- package/dist/utils/worker-bootstrap.d.ts +3 -0
- package/dist/utils/worker-bootstrap.d.ts.map +1 -0
- package/dist/utils/worker-bootstrap.js +7 -0
- package/dist/utils/worker-bootstrap.js.map +1 -0
- package/dist/utils/worker-cwd-preload.cjs +23 -0
- package/dist/utils/worker-cwd-preload.cjs.map +1 -0
- package/dist/utils/worker-cwd-preload.d.cts +2 -0
- package/dist/utils/worker-cwd-preload.d.cts.map +1 -0
- package/package.json +5 -2
- package/dist/services/agent-runtime/workflow/workflow-worker.d.ts +0 -4
- package/dist/services/agent-runtime/workflow/workflow-worker.d.ts.map +0 -1
- package/dist/services/agent-runtime/workflow/workflow-worker.js +0 -55
- package/dist/services/agent-runtime/workflow/workflow-worker.js.map +0 -1
|
@@ -65,6 +65,19 @@ export const computeNextMessages = ({ prev, result, streamingState, createMessag
|
|
|
65
65
|
const merged = mergeCommandMessages(prev, annotatedCommands);
|
|
66
66
|
const finalText = result.finalText;
|
|
67
67
|
if (!finalText || !finalText.trim()) {
|
|
68
|
+
// An empty finalText must not orphan a live streaming message: a message
|
|
69
|
+
// still in status 'streaming' after the terminal settle blocks static
|
|
70
|
+
// commit for the rest of the session. Promote it in place with the text
|
|
71
|
+
// already rendered so the list is settled either way.
|
|
72
|
+
const liveBotMessageId = isStreamingBotMessageId(streamingState, merged);
|
|
73
|
+
if (liveBotMessageId !== null) {
|
|
74
|
+
const live = merged.find((message) => message.id === liveBotMessageId);
|
|
75
|
+
const liveText = live?.sender === 'bot' ? live.text : '';
|
|
76
|
+
return {
|
|
77
|
+
next: trimMessages(finalizeStreamingBotMessage(merged, liveBotMessageId, liveText)),
|
|
78
|
+
finalizedStreamingMessage: true,
|
|
79
|
+
};
|
|
80
|
+
}
|
|
68
81
|
return { next: trimMessages(merged), finalizedStreamingMessage: false };
|
|
69
82
|
}
|
|
70
83
|
const liveBotMessageId = isStreamingBotMessageId(streamingState, merged);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-conversation-result.js","sourceRoot":"","sources":["../../../source/utils/conversation/apply-conversation-result.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"apply-conversation-result.js","sourceRoot":"","sources":["../../../source/utils/conversation/apply-conversation-result.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-utils.d.ts","sourceRoot":"","sources":["../../../source/utils/conversation/conversation-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"conversation-utils.d.ts","sourceRoot":"","sources":["../../../source/utils/conversation/conversation-utils.ts"],"names":[],"mappings":"AAGA;;;GAGG;AAEH;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,wBAAwB,EAAE,MAAM,CAAC;IACjC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,cAAc,EAAE,OAAO,CAAC;IACxB,yBAAyB,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC;;;OAGG;IACH,0BAA0B,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,WAAW,EAAE,OAAO,sBAAsB,EAAE,eAAe,GAAG,IAAI,CAAC;CACpE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAa5D;AAED;;;GAGG;AAEH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAkD5G;AAwCD;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,cAAc,CAYrD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAW1D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAExD;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAsB1G"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { TOOL_NAME_APPLY_PATCH, TOOL_NAME_SEARCH_REPLACE } from '../../tools/tool-names.js';
|
|
2
|
+
import { parseUpstreamApplyPatch } from '../../tools/file/upstream-apply-patch.js';
|
|
2
3
|
/**
|
|
3
4
|
* Normalize tool arguments from JSON string or object.
|
|
4
5
|
* Provider implementations may send arguments as either format.
|
|
@@ -46,6 +47,19 @@ export function formatToolCommand(toolName, args) {
|
|
|
46
47
|
return `${TOOL_NAME_SEARCH_REPLACE} "${args.search_content ?? ''}" → "${args.replace_content ?? ''}" ${args.path ?? ''}`;
|
|
47
48
|
}
|
|
48
49
|
if (toolName === TOOL_NAME_APPLY_PATCH) {
|
|
50
|
+
if (typeof args.patch === 'string') {
|
|
51
|
+
try {
|
|
52
|
+
const operations = parseUpstreamApplyPatch(args.patch).operations;
|
|
53
|
+
const firstOperation = operations[0];
|
|
54
|
+
if (firstOperation) {
|
|
55
|
+
const remaining = operations.length > 1 ? ` (+${operations.length - 1} more)` : '';
|
|
56
|
+
return `${TOOL_NAME_APPLY_PATCH} ${firstOperation.type} ${firstOperation.path}${remaining}`;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
catch {
|
|
60
|
+
// Keep the generic legacy fallback for malformed/incomplete patches.
|
|
61
|
+
}
|
|
62
|
+
}
|
|
49
63
|
return `${TOOL_NAME_APPLY_PATCH} ${args.type ?? 'unknown'} ${args.path ?? ''}`;
|
|
50
64
|
}
|
|
51
65
|
if (toolName === 'ask_mentor') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-utils.js","sourceRoot":"","sources":["../../../source/utils/conversation/conversation-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation-utils.js","sourceRoot":"","sources":["../../../source/utils/conversation/conversation-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,28 @@
|
|
|
1
1
|
/** Default byte cap for tool results that enter model context. */
|
|
2
2
|
export declare const DEFAULT_TOOL_RESULT_MAX_BYTES = 40000;
|
|
3
|
+
/**
|
|
4
|
+
* True when `run_code` made this call from inside a script.
|
|
5
|
+
*
|
|
6
|
+
* `run_code` sets `scripted` on the invocation context it passes to nested
|
|
7
|
+
* tools. Tools consult it to decide whether a context-protection cap applies:
|
|
8
|
+
* a scripted result goes to the script, not into model context.
|
|
9
|
+
*/
|
|
10
|
+
export declare function isScriptedToolCall(context: unknown): boolean;
|
|
11
|
+
/**
|
|
12
|
+
* Resolves the result byte cap for a call, honouring the scripted boundary.
|
|
13
|
+
*
|
|
14
|
+
* An explicit override always wins; otherwise a scripted call gets the larger
|
|
15
|
+
* scripted cap and a direct call gets the context default.
|
|
16
|
+
*/
|
|
17
|
+
export declare function resolveResultMaxBytesForCall(context: unknown, override?: number): number;
|
|
18
|
+
/**
|
|
19
|
+
* Byte cap for a result delivered to a script instead of to model context.
|
|
20
|
+
*
|
|
21
|
+
* Matches `RUN_CODE_LIMITS.maxResultChars`, which bounds the same value one
|
|
22
|
+
* layer out; duplicated as a literal to keep this module free of a dependency
|
|
23
|
+
* on the tool layer.
|
|
24
|
+
*/
|
|
25
|
+
export declare const SCRIPTED_TOOL_RESULT_MAX_BYTES = 100000;
|
|
3
26
|
export declare function utf8ByteLength(text: string): number;
|
|
4
27
|
/**
|
|
5
28
|
* Truncate to at most `maxBytes` UTF-8 bytes without splitting a multi-byte
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bound-tool-result.d.ts","sourceRoot":"","sources":["../../../source/utils/output/bound-tool-result.ts"],"names":[],"mappings":"AAGA,kEAAkE;AAClE,eAAO,MAAM,6BAA6B,QAAS,CAAC;AAEpD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAiB1D;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAiBvD;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAMnE;AAED,MAAM,WAAW,yBAAyB;IACxC,sDAAsD;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,yBAAyB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAmB/G"}
|
|
1
|
+
{"version":3,"file":"bound-tool-result.d.ts","sourceRoot":"","sources":["../../../source/utils/output/bound-tool-result.ts"],"names":[],"mappings":"AAGA,kEAAkE;AAClE,eAAO,MAAM,6BAA6B,QAAS,CAAC;AAEpD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAE5D;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAIxF;AAED;;;;;;GAMG;AACH,eAAO,MAAM,8BAA8B,SAAU,CAAC;AAEtD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAiB1D;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAiBvD;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAMnE;AAED,MAAM,WAAW,yBAAyB;IACxC,sDAAsD;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,yBAAyB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAmB/G"}
|
|
@@ -2,6 +2,33 @@ import { getTrimConfig } from './output-trim.js';
|
|
|
2
2
|
import { formatFullOutputSavedNote, saveOutputArtifact } from '../shell/shell-output.js';
|
|
3
3
|
/** Default byte cap for tool results that enter model context. */
|
|
4
4
|
export const DEFAULT_TOOL_RESULT_MAX_BYTES = 40_000;
|
|
5
|
+
/**
|
|
6
|
+
* True when `run_code` made this call from inside a script.
|
|
7
|
+
*
|
|
8
|
+
* `run_code` sets `scripted` on the invocation context it passes to nested
|
|
9
|
+
* tools. Tools consult it to decide whether a context-protection cap applies:
|
|
10
|
+
* a scripted result goes to the script, not into model context.
|
|
11
|
+
*/
|
|
12
|
+
export function isScriptedToolCall(context) {
|
|
13
|
+
return !!context && typeof context === 'object' && context.scripted === true;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Resolves the result byte cap for a call, honouring the scripted boundary.
|
|
17
|
+
*
|
|
18
|
+
* An explicit override always wins; otherwise a scripted call gets the larger
|
|
19
|
+
* scripted cap and a direct call gets the context default.
|
|
20
|
+
*/
|
|
21
|
+
export function resolveResultMaxBytesForCall(context, override) {
|
|
22
|
+
return resolveToolResultMaxBytes(override ?? (isScriptedToolCall(context) ? SCRIPTED_TOOL_RESULT_MAX_BYTES : undefined));
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Byte cap for a result delivered to a script instead of to model context.
|
|
26
|
+
*
|
|
27
|
+
* Matches `RUN_CODE_LIMITS.maxResultChars`, which bounds the same value one
|
|
28
|
+
* layer out; duplicated as a literal to keep this module free of a dependency
|
|
29
|
+
* on the tool layer.
|
|
30
|
+
*/
|
|
31
|
+
export const SCRIPTED_TOOL_RESULT_MAX_BYTES = 100_000;
|
|
5
32
|
export function utf8ByteLength(text) {
|
|
6
33
|
return Buffer.byteLength(text, 'utf8');
|
|
7
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bound-tool-result.js","sourceRoot":"","sources":["../../../source/utils/output/bound-tool-result.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bound-tool-result.js","sourceRoot":"","sources":["../../../source/utils/output/bound-tool-result.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
import type { SlashCommand } from '../slash-commands.js';
|
|
2
2
|
import type { SettingsService, SettingsWithSources } from '../services/settings/settings-service.js';
|
|
3
3
|
export declare function parseSettingValue(raw: string): any;
|
|
4
|
+
/**
|
|
5
|
+
* Key-aware variant of parseSettingValue: for array-typed settings, plain
|
|
6
|
+
* comma-separated input is split and each element parsed individually, so
|
|
7
|
+
* `200000,300000,400000` is accepted for `z.array(z.number())` settings
|
|
8
|
+
* without requiring JSON brackets. Non-array settings parse unchanged, so
|
|
9
|
+
* string values containing commas are never mangled.
|
|
10
|
+
*/
|
|
11
|
+
export declare function parseSettingValueForKey(key: string, raw: string): any;
|
|
4
12
|
export declare function formatSettingsSummary(settings: SettingsWithSources): string;
|
|
5
13
|
interface CreateSettingsCommandDeps {
|
|
6
14
|
settingsService: SettingsService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-command.d.ts","sourceRoot":"","sources":["../../source/utils/settings-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EAEpB,MAAM,0CAA0C,CAAC;AA4ClD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAqBlD;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"settings-command.d.ts","sourceRoot":"","sources":["../../source/utils/settings-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EAEpB,MAAM,0CAA0C,CAAC;AA4ClD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAqBlD;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,CAgBrE;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,MAAM,CAoR3E;AAED,UAAU,yBAAyB;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACxD,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAED,wBAAgB,qBAAqB,CAAC,EACpC,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,GACb,EAAE,yBAAyB,GAAG,YAAY,CAiK1C"}
|
|
@@ -3,8 +3,8 @@ import { SETTING_KEYS } from '../services/settings/settings-service.js';
|
|
|
3
3
|
import { getProvider } from '../providers/index.js';
|
|
4
4
|
import { parseModelProviderArg } from './ai/model-provider-arg.js';
|
|
5
5
|
import { getModelSettingConfig } from './ai/model-settings.js';
|
|
6
|
-
import { profileIdFromLegacyModeSetting } from '../services/profiles/legacy-adapter.js';
|
|
7
|
-
import {
|
|
6
|
+
import { isLegacyModeSettingKey, profileIdFromLegacyModeSetting } from '../services/profiles/legacy-adapter.js';
|
|
7
|
+
import { isArraySetting, isStringSetting } from '../services/settings/settings-ui-metadata.js';
|
|
8
8
|
/**
|
|
9
9
|
* Render the durable settlement of a mutation truthfully. Only a `saved`
|
|
10
10
|
* result (or a caller that provided no settlement evidence) reports the
|
|
@@ -56,6 +56,31 @@ export function parseSettingValue(raw) {
|
|
|
56
56
|
}
|
|
57
57
|
return value;
|
|
58
58
|
}
|
|
59
|
+
/**
|
|
60
|
+
* Key-aware variant of parseSettingValue: for array-typed settings, plain
|
|
61
|
+
* comma-separated input is split and each element parsed individually, so
|
|
62
|
+
* `200000,300000,400000` is accepted for `z.array(z.number())` settings
|
|
63
|
+
* without requiring JSON brackets. Non-array settings parse unchanged, so
|
|
64
|
+
* string values containing commas are never mangled.
|
|
65
|
+
*/
|
|
66
|
+
export function parseSettingValueForKey(key, raw) {
|
|
67
|
+
// A string setting round-trips its text verbatim (trimmed). The generic
|
|
68
|
+
// parse below would coerce "true" and numeric-looking text before the schema
|
|
69
|
+
// saw it, making perfectly valid string values (a model id "3.0", a flag
|
|
70
|
+
// named "true") impossible to set.
|
|
71
|
+
if (isStringSetting(key))
|
|
72
|
+
return raw.trim();
|
|
73
|
+
const value = parseSettingValue(raw);
|
|
74
|
+
if (typeof value !== 'string' || !isArraySetting(key))
|
|
75
|
+
return value;
|
|
76
|
+
const parts = value
|
|
77
|
+
.split(',')
|
|
78
|
+
.map((part) => part.trim())
|
|
79
|
+
.filter((part) => part !== '');
|
|
80
|
+
if (parts.length === 0)
|
|
81
|
+
return value;
|
|
82
|
+
return parts.map((part) => parseSettingValue(part));
|
|
83
|
+
}
|
|
59
84
|
export function formatSettingsSummary(settings) {
|
|
60
85
|
const lines = [];
|
|
61
86
|
const entries = [
|
|
@@ -65,14 +90,24 @@ export function formatSettingsSummary(settings) {
|
|
|
65
90
|
source: settings.agent.model.source,
|
|
66
91
|
},
|
|
67
92
|
{
|
|
68
|
-
key: SETTING_KEYS.
|
|
69
|
-
value: settings.agent.
|
|
70
|
-
source: settings.agent.
|
|
93
|
+
key: SETTING_KEYS.AGENT_SMART_MODEL,
|
|
94
|
+
value: settings.agent.smartModel.value,
|
|
95
|
+
source: settings.agent.smartModel.source,
|
|
96
|
+
},
|
|
97
|
+
{
|
|
98
|
+
key: SETTING_KEYS.AGENT_BALANCED_MODEL,
|
|
99
|
+
value: settings.agent.balancedModel.value,
|
|
100
|
+
source: settings.agent.balancedModel.source,
|
|
101
|
+
},
|
|
102
|
+
{
|
|
103
|
+
key: SETTING_KEYS.AGENT_CHEAP_MODEL,
|
|
104
|
+
value: settings.agent.cheapModel.value,
|
|
105
|
+
source: settings.agent.cheapModel.source,
|
|
71
106
|
},
|
|
72
107
|
{
|
|
73
|
-
key: SETTING_KEYS.
|
|
74
|
-
value: settings.agent.
|
|
75
|
-
source: settings.agent.
|
|
108
|
+
key: SETTING_KEYS.AGENT_CHORE_MODEL,
|
|
109
|
+
value: settings.agent.choreModel.value,
|
|
110
|
+
source: settings.agent.choreModel.source,
|
|
76
111
|
},
|
|
77
112
|
{
|
|
78
113
|
key: SETTING_KEYS.AGENT_REASONING_EFFORT,
|
|
@@ -84,26 +119,6 @@ export function formatSettingsSummary(settings) {
|
|
|
84
119
|
value: settings.agent.temperature.value,
|
|
85
120
|
source: settings.agent.temperature.source,
|
|
86
121
|
},
|
|
87
|
-
{
|
|
88
|
-
key: SETTING_KEYS.AGENT_MENTOR_MODEL,
|
|
89
|
-
value: settings.agent.mentorModel.value,
|
|
90
|
-
source: settings.agent.mentorModel.source,
|
|
91
|
-
},
|
|
92
|
-
{
|
|
93
|
-
key: SETTING_KEYS.AGENT_MENTOR_PROVIDER,
|
|
94
|
-
value: settings.agent.mentorProvider.value,
|
|
95
|
-
source: settings.agent.mentorProvider.source,
|
|
96
|
-
},
|
|
97
|
-
{
|
|
98
|
-
key: SETTING_KEYS.AGENT_MENTOR_REASONING_EFFORT,
|
|
99
|
-
value: settings.agent.mentorReasoningEffort.value,
|
|
100
|
-
source: settings.agent.mentorReasoningEffort.source,
|
|
101
|
-
},
|
|
102
|
-
{
|
|
103
|
-
key: SETTING_KEYS.AGENT_MENTOR_SAMPLES,
|
|
104
|
-
value: settings.agent.mentorSamples.value,
|
|
105
|
-
source: settings.agent.mentorSamples.source,
|
|
106
|
-
},
|
|
107
122
|
{
|
|
108
123
|
key: SETTING_KEYS.AGENT_USE_FLEX_SERVICE_TIER,
|
|
109
124
|
value: settings.agent.useFlexServiceTier.value,
|
|
@@ -386,7 +401,7 @@ export function createSettingsCommand({ settingsService, addSystemMessage, apply
|
|
|
386
401
|
}
|
|
387
402
|
const key = parts[0];
|
|
388
403
|
const rawValue = parts.slice(1).join(' ');
|
|
389
|
-
let parsedValue =
|
|
404
|
+
let parsedValue = parseSettingValueForKey(key, rawValue);
|
|
390
405
|
// Special handling for model settings: handle --provider flag and save
|
|
391
406
|
// the associated provider setting.
|
|
392
407
|
const modelSettingConfig = getModelSettingConfig(key);
|
|
@@ -411,7 +426,7 @@ export function createSettingsCommand({ settingsService, addSystemMessage, apply
|
|
|
411
426
|
// Prevent changing provider via settings command - it can only be changed
|
|
412
427
|
// at the start of a new conversation via the model selection menu
|
|
413
428
|
if (key === 'agent.provider') {
|
|
414
|
-
addSystemMessage(`Cannot change provider mid-conversation.
|
|
429
|
+
addSystemMessage(`Cannot change provider mid-conversation. Choose a model from the desired provider in the model menu at the start of a new conversation.`);
|
|
415
430
|
return true;
|
|
416
431
|
}
|
|
417
432
|
// Validate temperature values early for a nicer UX.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-command.js","sourceRoot":"","sources":["../../source/utils/settings-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"settings-command.js","sourceRoot":"","sources":["../../source/utils/settings-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,14 @@ type ExecOptions = {
|
|
|
30
30
|
registerFinalizer?: (finalize: () => void) => void;
|
|
31
31
|
};
|
|
32
32
|
type ExecImpl = (command: string, options: ExecOptions, callback: ExecCallback) => ChildProcess;
|
|
33
|
+
/**
|
|
34
|
+
* Why the executor stopped a command, when the executor itself stopped it.
|
|
35
|
+
* Distinct from `timedOut`, which is the deadline (or legacy cancellation) bit:
|
|
36
|
+
* an investigator must be able to tell a deliberate deadline from a caller
|
|
37
|
+
* cancellation, an independently terminated process, or a retained-output
|
|
38
|
+
* overflow kill without inferring a deadline from the signal.
|
|
39
|
+
*/
|
|
40
|
+
export type ShellTerminationKind = 'deadline' | 'cancelled' | 'process-terminated' | 'output-overflow';
|
|
33
41
|
export interface ShellExecutionResult {
|
|
34
42
|
stdout: string;
|
|
35
43
|
stderr: string;
|
|
@@ -39,6 +47,16 @@ export interface ShellExecutionResult {
|
|
|
39
47
|
signal?: NodeJS.Signals | null;
|
|
40
48
|
/** False when output was cut short at the drain deadline rather than at EOF. */
|
|
41
49
|
outputComplete?: boolean;
|
|
50
|
+
/**
|
|
51
|
+
* Typed reason for a non-ordinary termination. Executor-owned causes are
|
|
52
|
+
* recorded at the termination boundary; process termination is inferred only
|
|
53
|
+
* from the child-process error after an external signal/kill. Absent for
|
|
54
|
+
* ordinary exits, spawn/command failures, and injected implementations that
|
|
55
|
+
* settle without a termination signal or error.
|
|
56
|
+
*/
|
|
57
|
+
terminationKind?: ShellTerminationKind;
|
|
58
|
+
/** Total wall-clock time the command spent paused (e.g. network approval). */
|
|
59
|
+
pausedMs?: number;
|
|
42
60
|
}
|
|
43
61
|
import { ISSHService } from '../../services/service-interfaces.js';
|
|
44
62
|
export declare class GatewayShellEnvironmentError extends Error {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-shell.d.ts","sourceRoot":"","sources":["../../../source/utils/shell/execute-shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAIzD,OAAO,EAAqC,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAqDlG,KAAK,gBAAgB,GAAG;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAErD,KAAK,YAAY,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB,KAAK,IAAI,CAAC;AAEpH,KAAK,WAAW,GAAG;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAC/B;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,GAAG,QAAQ,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACpE;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;CACpD,CAAC;AAEF,KAAK,QAAQ,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,KAAK,YAAY,CAAC;AAmIhG,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,4DAA4D;IAC5D,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IAC/B,gFAAgF;IAChF,cAAc,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"execute-shell.d.ts","sourceRoot":"","sources":["../../../source/utils/shell/execute-shell.ts"],"names":[],"mappings":"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"}
|
|
@@ -232,6 +232,20 @@ async function executeShellCommandUnleased(command, options = {}) {
|
|
|
232
232
|
// happens to exit 0 is still a timeout, so this is never cleared.
|
|
233
233
|
let timedOutLatched = false;
|
|
234
234
|
let outputCompleteResult;
|
|
235
|
+
// Typed reason the executor itself ended the command (deadline, caller
|
|
236
|
+
// cancellation, retained-output overflow), plus paused-time accounting for
|
|
237
|
+
// the network-approval pause. The reason is recorded when termination
|
|
238
|
+
// begins; overflow is classified from the retained-buffer error in the catch
|
|
239
|
+
// below because that kill happens inside the exec implementation.
|
|
240
|
+
let terminationKind;
|
|
241
|
+
let pausedTotalMs = 0;
|
|
242
|
+
let pausedSinceMs;
|
|
243
|
+
const endPauseAccounting = () => {
|
|
244
|
+
if (pausedSinceMs === undefined)
|
|
245
|
+
return;
|
|
246
|
+
pausedTotalMs += Date.now() - pausedSinceMs;
|
|
247
|
+
pausedSinceMs = undefined;
|
|
248
|
+
};
|
|
235
249
|
try {
|
|
236
250
|
const result = await new Promise((resolve, reject) => {
|
|
237
251
|
let unregisterPauseController;
|
|
@@ -270,11 +284,15 @@ async function executeShellCommandUnleased(command, options = {}) {
|
|
|
270
284
|
* only real guarantee is that this settles on a deadline regardless of
|
|
271
285
|
* whether anything actually died.
|
|
272
286
|
*/
|
|
273
|
-
const beginTermination = () => {
|
|
287
|
+
const beginTermination = (kind) => {
|
|
274
288
|
if (settled || hardFinishTimer)
|
|
275
289
|
return;
|
|
290
|
+
// The first cause wins: once the deadline has fired, a later caller
|
|
291
|
+
// cancellation must not relabel the termination.
|
|
292
|
+
terminationKind ??= kind;
|
|
276
293
|
if (paused) {
|
|
277
294
|
paused = false;
|
|
295
|
+
endPauseAccounting();
|
|
278
296
|
signalChildProcess(child, 'SIGCONT');
|
|
279
297
|
}
|
|
280
298
|
stopChildProcess(child);
|
|
@@ -296,7 +314,7 @@ async function executeShellCommandUnleased(command, options = {}) {
|
|
|
296
314
|
}
|
|
297
315
|
}, terminationGraceMs + drainGraceMs);
|
|
298
316
|
};
|
|
299
|
-
const stopChild = () => beginTermination();
|
|
317
|
+
const stopChild = () => beginTermination('cancelled');
|
|
300
318
|
const cleanupListeners = () => {
|
|
301
319
|
// The termination grace is owed to the direct child. Once it has exited,
|
|
302
320
|
// anything still in its group ignored SIGTERM or never saw it, and there
|
|
@@ -324,7 +342,7 @@ async function executeShellCommandUnleased(command, options = {}) {
|
|
|
324
342
|
timeoutId = undefined;
|
|
325
343
|
remainingTimeoutMs = 0;
|
|
326
344
|
timedOutLatched = true;
|
|
327
|
-
beginTermination();
|
|
345
|
+
beginTermination('deadline');
|
|
328
346
|
}, remainingTimeoutMs);
|
|
329
347
|
};
|
|
330
348
|
const pauseCommandTimeout = () => {
|
|
@@ -369,12 +387,14 @@ async function executeShellCommandUnleased(command, options = {}) {
|
|
|
369
387
|
return;
|
|
370
388
|
pauseCommandTimeout();
|
|
371
389
|
paused = true;
|
|
390
|
+
pausedSinceMs = Date.now();
|
|
372
391
|
signalChildProcess(child, 'SIGSTOP');
|
|
373
392
|
},
|
|
374
393
|
resume: () => {
|
|
375
394
|
if (settled || !paused)
|
|
376
395
|
return;
|
|
377
396
|
paused = false;
|
|
397
|
+
endPauseAccounting();
|
|
378
398
|
startCommandTimeout();
|
|
379
399
|
signalChildProcess(child, 'SIGCONT');
|
|
380
400
|
},
|
|
@@ -396,14 +416,34 @@ async function executeShellCommandUnleased(command, options = {}) {
|
|
|
396
416
|
timedOut: timedOutLatched,
|
|
397
417
|
signal: null,
|
|
398
418
|
outputComplete: outputCompleteResult ?? true,
|
|
419
|
+
...(terminationKind === undefined ? {} : { terminationKind }),
|
|
420
|
+
...(pausedTotalMs > 0 ? { pausedMs: pausedTotalMs } : {}),
|
|
399
421
|
};
|
|
400
422
|
}
|
|
401
423
|
catch (error) {
|
|
402
424
|
const exitCode = typeof error?.code === 'number' ? error.code : null;
|
|
403
425
|
const signal = error?.signal ?? null;
|
|
404
|
-
// The latch is authoritative
|
|
405
|
-
//
|
|
406
|
-
|
|
426
|
+
// The deadline latch is authoritative. A child can receive SIGTERM from
|
|
427
|
+
// outside this executor (for example, a process-control command matching
|
|
428
|
+
// its own supervision shell), and that must not be mistaken for expiry.
|
|
429
|
+
// Preserve the legacy cancellation bit for callers that still consume it;
|
|
430
|
+
// the typed reason is what distinguishes cancellation from a deadline.
|
|
431
|
+
const timedOut = timedOutLatched || terminationKind === 'cancelled';
|
|
432
|
+
// The retained-buffer overflow kill happens inside defaultExecImpl, so the
|
|
433
|
+
// executor never began termination for it; classify it from the error the
|
|
434
|
+
// implementation reports instead of leaving it as an unexplained signal.
|
|
435
|
+
let classifiedKind = terminationKind;
|
|
436
|
+
if (classifiedKind === undefined) {
|
|
437
|
+
if (typeof error?.message === 'string' && error.message.includes('maxBuffer length exceeded')) {
|
|
438
|
+
classifiedKind = 'output-overflow';
|
|
439
|
+
}
|
|
440
|
+
else if (error?.killed || signal !== null) {
|
|
441
|
+
// This is a process termination observed by the executor, not an
|
|
442
|
+
// executor-owned deadline. Keep it explicit so callers do not need to
|
|
443
|
+
// infer timeout attribution from SIGTERM/SIGKILL.
|
|
444
|
+
classifiedKind = 'process-terminated';
|
|
445
|
+
}
|
|
446
|
+
}
|
|
407
447
|
return {
|
|
408
448
|
stdout: error?.stdout?.toString() ?? '',
|
|
409
449
|
stderr: error?.stderr?.toString() ?? '',
|
|
@@ -411,6 +451,8 @@ async function executeShellCommandUnleased(command, options = {}) {
|
|
|
411
451
|
timedOut,
|
|
412
452
|
signal,
|
|
413
453
|
outputComplete: outputCompleteResult ?? true,
|
|
454
|
+
...(classifiedKind === undefined ? {} : { terminationKind: classifiedKind }),
|
|
455
|
+
...(pausedTotalMs > 0 ? { pausedMs: pausedTotalMs } : {}),
|
|
414
456
|
};
|
|
415
457
|
}
|
|
416
458
|
}
|