@qduc/term2 0.5.0 → 0.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent.d.ts +1 -1
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +55 -7
- package/dist/agent.js.map +1 -1
- package/dist/agent.test.js +135 -10
- package/dist/agent.test.js.map +1 -1
- package/dist/app.d.ts +15 -0
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +86 -16
- package/dist/app.js.map +1 -1
- package/dist/app.startup-banner.test.js +48 -1
- package/dist/app.startup-banner.test.js.map +1 -1
- package/dist/cli.js +226 -28
- package/dist/cli.js.map +1 -1
- package/dist/components/ApprovalPrompt.d.ts.map +1 -1
- package/dist/components/ApprovalPrompt.js +11 -35
- package/dist/components/ApprovalPrompt.js.map +1 -1
- package/dist/components/Banner.d.ts.map +1 -1
- package/dist/components/Banner.js +2 -7
- package/dist/components/Banner.js.map +1 -1
- package/dist/components/BottomArea.d.ts +7 -1
- package/dist/components/BottomArea.d.ts.map +1 -1
- package/dist/components/BottomArea.js +2 -2
- package/dist/components/BottomArea.js.map +1 -1
- package/dist/components/CommandMessage.d.ts.map +1 -1
- package/dist/components/CommandMessage.js +38 -42
- package/dist/components/CommandMessage.js.map +1 -1
- package/dist/components/CommandMessage.test.js +69 -0
- package/dist/components/CommandMessage.test.js.map +1 -1
- package/dist/components/DiffView.d.ts +7 -0
- package/dist/components/DiffView.d.ts.map +1 -0
- package/dist/components/DiffView.js +80 -0
- package/dist/components/DiffView.js.map +1 -0
- package/dist/components/DiffView.test.d.ts +2 -0
- package/dist/components/DiffView.test.d.ts.map +1 -0
- package/dist/components/DiffView.test.js +45 -0
- package/dist/components/DiffView.test.js.map +1 -0
- package/dist/components/Input/PopupManager.d.ts +7 -0
- package/dist/components/Input/PopupManager.d.ts.map +1 -1
- package/dist/components/Input/PopupManager.js +4 -2
- package/dist/components/Input/PopupManager.js.map +1 -1
- package/dist/components/Input/determine-active-menu.d.ts.map +1 -1
- package/dist/components/Input/determine-active-menu.js +4 -1
- package/dist/components/Input/determine-active-menu.js.map +1 -1
- package/dist/components/Input/popup-props.d.ts +3 -1
- package/dist/components/Input/popup-props.d.ts.map +1 -1
- package/dist/components/Input/popup-props.js +7 -1
- package/dist/components/Input/popup-props.js.map +1 -1
- package/dist/components/InputBox.d.ts +6 -0
- package/dist/components/InputBox.d.ts.map +1 -1
- package/dist/components/InputBox.js +74 -11
- package/dist/components/InputBox.js.map +1 -1
- package/dist/components/InputBox.menu-logic.test.js +16 -1
- package/dist/components/InputBox.menu-logic.test.js.map +1 -1
- package/dist/components/InputBox.test.js +1 -0
- package/dist/components/InputBox.test.js.map +1 -1
- package/dist/components/MarkdownRenderer.d.ts.map +1 -1
- package/dist/components/MarkdownRenderer.js +52 -1
- package/dist/components/MarkdownRenderer.js.map +1 -1
- package/dist/components/MessageList.d.ts.map +1 -1
- package/dist/components/MessageList.js +3 -2
- package/dist/components/MessageList.js.map +1 -1
- package/dist/components/MessageList.test.js +16 -0
- package/dist/components/MessageList.test.js.map +1 -1
- package/dist/components/SettingsValueSelectionMenu.d.ts.map +1 -1
- package/dist/components/SettingsValueSelectionMenu.js +4 -1
- package/dist/components/SettingsValueSelectionMenu.js.map +1 -1
- package/dist/components/StatusBar.d.ts.map +1 -1
- package/dist/components/StatusBar.js +5 -3
- package/dist/components/StatusBar.js.map +1 -1
- package/dist/components/StatusBar.test.js +24 -0
- package/dist/components/StatusBar.test.js.map +1 -1
- package/dist/components/SubagentActivityMessage.d.ts.map +1 -1
- package/dist/components/SubagentActivityMessage.js +16 -1
- package/dist/components/SubagentActivityMessage.js.map +1 -1
- package/dist/components/UndoSelectionMenu.d.ts +12 -0
- package/dist/components/UndoSelectionMenu.d.ts.map +1 -0
- package/dist/components/UndoSelectionMenu.js +46 -0
- package/dist/components/UndoSelectionMenu.js.map +1 -0
- package/dist/components/UndoSelectionMenu.test.d.ts +2 -0
- package/dist/components/UndoSelectionMenu.test.d.ts.map +1 -0
- package/dist/components/UndoSelectionMenu.test.js +40 -0
- package/dist/components/UndoSelectionMenu.test.js.map +1 -0
- package/dist/components/theme.d.ts +1 -1
- package/dist/components/theme.d.ts.map +1 -1
- package/dist/components/theme.js +1 -3
- package/dist/components/theme.js.map +1 -1
- package/dist/context/InputContext.d.ts +1 -1
- package/dist/context/InputContext.d.ts.map +1 -1
- package/dist/context/InputContext.js.map +1 -1
- package/dist/hooks/use-app-commands.d.ts +14 -2
- package/dist/hooks/use-app-commands.d.ts.map +1 -1
- package/dist/hooks/use-app-commands.js +115 -32
- package/dist/hooks/use-app-commands.js.map +1 -1
- package/dist/hooks/use-app-commands.test.js +231 -1
- package/dist/hooks/use-app-commands.test.js.map +1 -1
- package/dist/hooks/use-conversation.clear.test.d.ts +2 -0
- package/dist/hooks/use-conversation.clear.test.d.ts.map +1 -0
- package/dist/hooks/use-conversation.clear.test.js +49 -0
- package/dist/hooks/use-conversation.clear.test.js.map +1 -0
- package/dist/hooks/use-conversation.d.ts +12 -2
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +88 -5
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/hooks/use-conversation.max-turns-undo.test.d.ts +2 -0
- package/dist/hooks/use-conversation.max-turns-undo.test.d.ts.map +1 -0
- package/dist/hooks/use-conversation.max-turns-undo.test.js +118 -0
- package/dist/hooks/use-conversation.max-turns-undo.test.js.map +1 -0
- package/dist/hooks/use-conversation.resume.test.d.ts +2 -0
- package/dist/hooks/use-conversation.resume.test.d.ts.map +1 -0
- package/dist/hooks/use-conversation.resume.test.js +26 -0
- package/dist/hooks/use-conversation.resume.test.js.map +1 -0
- package/dist/hooks/use-escape-key.d.ts.map +1 -1
- package/dist/hooks/use-escape-key.js +14 -7
- package/dist/hooks/use-escape-key.js.map +1 -1
- package/dist/hooks/use-escape-key.test.js +168 -4
- package/dist/hooks/use-escape-key.test.js.map +1 -1
- package/dist/hooks/use-input-history.d.ts +4 -3
- package/dist/hooks/use-input-history.d.ts.map +1 -1
- package/dist/hooks/use-input-history.js +10 -8
- package/dist/hooks/use-input-history.js.map +1 -1
- package/dist/hooks/use-input-history.test.d.ts +2 -0
- package/dist/hooks/use-input-history.test.d.ts.map +1 -0
- package/dist/hooks/use-input-history.test.js +43 -0
- package/dist/hooks/use-input-history.test.js.map +1 -0
- package/dist/hooks/use-mode-handlers.d.ts +10 -2
- package/dist/hooks/use-mode-handlers.d.ts.map +1 -1
- package/dist/hooks/use-mode-handlers.js +21 -2
- package/dist/hooks/use-mode-handlers.js.map +1 -1
- package/dist/hooks/use-model-selection.d.ts +3 -0
- package/dist/hooks/use-model-selection.d.ts.map +1 -1
- package/dist/hooks/use-model-selection.js +3 -0
- package/dist/hooks/use-model-selection.js.map +1 -1
- package/dist/hooks/use-runtime-settings.d.ts.map +1 -1
- package/dist/hooks/use-runtime-settings.js +15 -6
- package/dist/hooks/use-runtime-settings.js.map +1 -1
- package/dist/hooks/use-settings-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-completion.js +0 -1
- package/dist/hooks/use-settings-completion.js.map +1 -1
- package/dist/hooks/use-settings-value-completion.d.ts +1 -0
- package/dist/hooks/use-settings-value-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-value-completion.js +25 -19
- package/dist/hooks/use-settings-value-completion.js.map +1 -1
- package/dist/hooks/use-shell-mode.d.ts.map +1 -1
- package/dist/hooks/use-shell-mode.js +2 -1
- package/dist/hooks/use-shell-mode.js.map +1 -1
- package/dist/hooks/use-slash-commands.d.ts +1 -0
- package/dist/hooks/use-slash-commands.d.ts.map +1 -1
- package/dist/hooks/use-slash-commands.js +10 -1
- package/dist/hooks/use-slash-commands.js.map +1 -1
- package/dist/hooks/use-undo-selection.d.ts +19 -0
- package/dist/hooks/use-undo-selection.d.ts.map +1 -0
- package/dist/hooks/use-undo-selection.js +76 -0
- package/dist/hooks/use-undo-selection.js.map +1 -0
- package/dist/lib/openai-agent-client.chat.test.js +40 -0
- package/dist/lib/openai-agent-client.chat.test.js.map +1 -1
- package/dist/lib/openai-agent-client.d.ts +10 -1
- package/dist/lib/openai-agent-client.d.ts.map +1 -1
- package/dist/lib/openai-agent-client.js +114 -6
- package/dist/lib/openai-agent-client.js.map +1 -1
- package/dist/lib/openai-agent-client.test.js +23 -0
- package/dist/lib/openai-agent-client.test.js.map +1 -1
- package/dist/lib/retry-executor.js +45 -7
- package/dist/lib/retry-executor.js.map +1 -1
- package/dist/lib/retry-executor.test.js +63 -0
- package/dist/lib/retry-executor.test.js.map +1 -1
- package/dist/non-interactive.d.ts +7 -1
- package/dist/non-interactive.d.ts.map +1 -1
- package/dist/non-interactive.js +73 -5
- package/dist/non-interactive.js.map +1 -1
- package/dist/non-interactive.test.js +184 -2
- package/dist/non-interactive.test.js.map +1 -1
- package/dist/prompts/orchestrator.md +46 -0
- package/dist/prompts/plan-mode-info.md +17 -0
- package/dist/prompts/prompt-selector.d.ts +2 -1
- package/dist/prompts/prompt-selector.d.ts.map +1 -1
- package/dist/prompts/prompt-selector.js +5 -1
- package/dist/prompts/prompt-selector.js.map +1 -1
- package/dist/prompts/prompt-selector.test.js +7 -0
- package/dist/prompts/prompt-selector.test.js.map +1 -1
- package/dist/prompts/prompt-selector.test.ts +18 -0
- package/dist/prompts/prompt-selector.ts +7 -1
- package/dist/prompts/reasoning-efficiency.d.ts +7 -0
- package/dist/prompts/reasoning-efficiency.d.ts.map +1 -0
- package/dist/prompts/reasoning-efficiency.js +19 -0
- package/dist/prompts/reasoning-efficiency.js.map +1 -0
- package/dist/prompts/reasoning-efficiency.ts +18 -0
- package/dist/prompts/search-via-shell.test.js +17 -17
- package/dist/prompts/search-via-shell.test.js.map +1 -1
- package/dist/prompts/search-via-shell.test.ts +17 -17
- package/dist/prompts/shell-auto-approval.d.ts +3 -0
- package/dist/prompts/shell-auto-approval.d.ts.map +1 -0
- package/dist/prompts/shell-auto-approval.js +23 -0
- package/dist/prompts/shell-auto-approval.js.map +1 -0
- package/dist/prompts/shell-auto-approval.ts +23 -0
- package/dist/prompts/subagent-delegation.d.ts +10 -0
- package/dist/prompts/subagent-delegation.d.ts.map +1 -0
- package/dist/prompts/subagent-delegation.js +33 -0
- package/dist/prompts/subagent-delegation.js.map +1 -0
- package/dist/prompts/subagent-delegation.test.d.ts +2 -0
- package/dist/prompts/subagent-delegation.test.d.ts.map +1 -0
- package/dist/prompts/subagent-delegation.test.js +17 -0
- package/dist/prompts/subagent-delegation.test.js.map +1 -0
- package/dist/prompts/subagent-delegation.test.ts +21 -0
- package/dist/prompts/subagent-delegation.ts +40 -0
- package/dist/prompts/subagents/explorer.md +1 -2
- package/dist/prompts/subagents/mentor.md +0 -1
- package/dist/prompts/subagents/researcher.md +0 -1
- package/dist/prompts/subagents/worker.md +3 -4
- package/dist/providers/ai-sdk-anthropic.provider.d.ts +1 -0
- package/dist/providers/ai-sdk-anthropic.provider.d.ts.map +1 -1
- package/dist/providers/ai-sdk-anthropic.provider.js +67 -1
- package/dist/providers/ai-sdk-anthropic.provider.js.map +1 -1
- package/dist/providers/ai-sdk-anthropic.provider.test.d.ts +2 -0
- package/dist/providers/ai-sdk-anthropic.provider.test.d.ts.map +1 -0
- package/dist/providers/ai-sdk-anthropic.provider.test.js +87 -0
- package/dist/providers/ai-sdk-anthropic.provider.test.js.map +1 -0
- package/dist/providers/ai-sdk-logging-fetch.d.ts +1 -1
- package/dist/providers/ai-sdk-logging-fetch.d.ts.map +1 -1
- package/dist/providers/ai-sdk-logging-fetch.js +67 -44
- package/dist/providers/ai-sdk-logging-fetch.js.map +1 -1
- package/dist/providers/ai-sdk-logging-fetch.test.js +59 -5
- package/dist/providers/ai-sdk-logging-fetch.test.js.map +1 -1
- package/dist/providers/common/openai-compatible-messages.d.ts.map +1 -1
- package/dist/providers/common/openai-compatible-messages.js +10 -4
- package/dist/providers/common/openai-compatible-messages.js.map +1 -1
- package/dist/providers/common/openai-compatible-messages.test.js +22 -0
- package/dist/providers/common/openai-compatible-messages.test.js.map +1 -1
- package/dist/providers/custom-provider-adapter.test.js +39 -1
- package/dist/providers/custom-provider-adapter.test.js.map +1 -1
- package/dist/providers/openai-compatible.provider.d.ts +11 -1
- package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
- package/dist/providers/openai-compatible.provider.js +122 -8
- package/dist/providers/openai-compatible.provider.js.map +1 -1
- package/dist/providers/openai-compatible.provider.test.js +61 -0
- package/dist/providers/openai-compatible.provider.test.js.map +1 -1
- package/dist/providers/openai.provider.js +21 -1
- package/dist/providers/openai.provider.js.map +1 -1
- package/dist/providers/openrouter.provider.d.ts +2 -0
- package/dist/providers/openrouter.provider.d.ts.map +1 -1
- package/dist/providers/openrouter.provider.js +20 -2
- package/dist/providers/openrouter.provider.js.map +1 -1
- package/dist/providers/openrouter.provider.request-preprocessing.test.d.ts +2 -0
- package/dist/providers/openrouter.provider.request-preprocessing.test.d.ts.map +1 -0
- package/dist/providers/openrouter.provider.request-preprocessing.test.js +48 -0
- package/dist/providers/openrouter.provider.request-preprocessing.test.js.map +1 -0
- package/dist/providers/registry.test.js +27 -2
- package/dist/providers/registry.test.js.map +1 -1
- package/dist/scripts/eval-auto-approval/dataset.d.ts +2 -2
- package/dist/services/agent-stream.d.ts +1 -0
- package/dist/services/agent-stream.d.ts.map +1 -1
- package/dist/services/approval-flow-coordinator.d.ts +2 -0
- package/dist/services/approval-flow-coordinator.d.ts.map +1 -1
- package/dist/services/approval-flow-coordinator.js +45 -18
- package/dist/services/approval-flow-coordinator.js.map +1 -1
- package/dist/services/approval-flow-coordinator.test.js +87 -0
- package/dist/services/approval-flow-coordinator.test.js.map +1 -1
- package/dist/services/approval-state.d.ts +4 -0
- package/dist/services/approval-state.d.ts.map +1 -1
- package/dist/services/approval-state.js +2 -0
- package/dist/services/approval-state.js.map +1 -1
- package/dist/services/approval-state.test.js +21 -0
- package/dist/services/approval-state.test.js.map +1 -1
- package/dist/services/conversation-clear-save.test.d.ts +2 -0
- package/dist/services/conversation-clear-save.test.d.ts.map +1 -0
- package/dist/services/conversation-clear-save.test.js +85 -0
- package/dist/services/conversation-clear-save.test.js.map +1 -0
- package/dist/services/conversation-history-repair.d.ts +25 -0
- package/dist/services/conversation-history-repair.d.ts.map +1 -0
- package/dist/services/conversation-history-repair.js +227 -0
- package/dist/services/conversation-history-repair.js.map +1 -0
- package/dist/services/conversation-history-repair.test.d.ts +2 -0
- package/dist/services/conversation-history-repair.test.d.ts.map +1 -0
- package/dist/services/conversation-history-repair.test.js +76 -0
- package/dist/services/conversation-history-repair.test.js.map +1 -0
- package/dist/services/conversation-persistence.d.ts +55 -0
- package/dist/services/conversation-persistence.d.ts.map +1 -0
- package/dist/services/conversation-persistence.js +216 -0
- package/dist/services/conversation-persistence.js.map +1 -0
- package/dist/services/conversation-persistence.test.d.ts +2 -0
- package/dist/services/conversation-persistence.test.d.ts.map +1 -0
- package/dist/services/conversation-persistence.test.js +713 -0
- package/dist/services/conversation-persistence.test.js.map +1 -0
- package/dist/services/conversation-result-builder.d.ts.map +1 -1
- package/dist/services/conversation-result-builder.js +13 -0
- package/dist/services/conversation-result-builder.js.map +1 -1
- package/dist/services/conversation-retry-policy.d.ts +7 -0
- package/dist/services/conversation-retry-policy.d.ts.map +1 -1
- package/dist/services/conversation-retry-policy.js +34 -0
- package/dist/services/conversation-retry-policy.js.map +1 -1
- package/dist/services/conversation-retry-policy.test.js +44 -2
- package/dist/services/conversation-retry-policy.test.js.map +1 -1
- package/dist/services/conversation-service.d.ts +25 -2
- package/dist/services/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation-service.js +29 -3
- package/dist/services/conversation-service.js.map +1 -1
- package/dist/services/conversation-session.auto-approval.test.js +7 -10
- package/dist/services/conversation-session.auto-approval.test.js.map +1 -1
- package/dist/services/conversation-session.d.ts +28 -1
- package/dist/services/conversation-session.d.ts.map +1 -1
- package/dist/services/conversation-session.js +300 -95
- package/dist/services/conversation-session.js.map +1 -1
- package/dist/services/conversation-store.d.ts +42 -0
- package/dist/services/conversation-store.d.ts.map +1 -1
- package/dist/services/conversation-store.js +188 -6
- package/dist/services/conversation-store.js.map +1 -1
- package/dist/services/conversation-store.test.js +344 -1
- package/dist/services/conversation-store.test.js.map +1 -1
- package/dist/services/history-service.d.ts +6 -1
- package/dist/services/history-service.d.ts.map +1 -1
- package/dist/services/history-service.js +46 -6
- package/dist/services/history-service.js.map +1 -1
- package/dist/services/history-service.test.d.ts +2 -0
- package/dist/services/history-service.test.d.ts.map +1 -0
- package/dist/services/history-service.test.js +77 -0
- package/dist/services/history-service.test.js.map +1 -0
- package/dist/services/input-surge-guard.d.ts +37 -0
- package/dist/services/input-surge-guard.d.ts.map +1 -0
- package/dist/services/input-surge-guard.js +190 -0
- package/dist/services/input-surge-guard.js.map +1 -0
- package/dist/services/input-surge-guard.test.d.ts +2 -0
- package/dist/services/input-surge-guard.test.d.ts.map +1 -0
- package/dist/services/input-surge-guard.test.js +126 -0
- package/dist/services/input-surge-guard.test.js.map +1 -0
- package/dist/services/logging-contract.d.ts +1 -1
- package/dist/services/logging-service.d.ts +4 -0
- package/dist/services/logging-service.d.ts.map +1 -1
- package/dist/services/logging-service.js +91 -33
- package/dist/services/logging-service.js.map +1 -1
- package/dist/services/mode-notices.d.ts +11 -0
- package/dist/services/mode-notices.d.ts.map +1 -0
- package/dist/services/mode-notices.js +16 -0
- package/dist/services/mode-notices.js.map +1 -0
- package/dist/services/model-service.d.ts.map +1 -1
- package/dist/services/model-service.js +0 -1
- package/dist/services/model-service.js.map +1 -1
- package/dist/services/plan-mode-interceptor.d.ts +10 -0
- package/dist/services/plan-mode-interceptor.d.ts.map +1 -0
- package/dist/services/plan-mode-interceptor.js +38 -0
- package/dist/services/plan-mode-interceptor.js.map +1 -0
- package/dist/services/plan-mode-interceptor.test.d.ts +2 -0
- package/dist/services/plan-mode-interceptor.test.d.ts.map +1 -0
- package/dist/services/plan-mode-interceptor.test.js +55 -0
- package/dist/services/plan-mode-interceptor.test.js.map +1 -0
- package/dist/services/provider-traffic.d.ts +87 -0
- package/dist/services/provider-traffic.d.ts.map +1 -0
- package/dist/services/provider-traffic.js +545 -0
- package/dist/services/provider-traffic.js.map +1 -0
- package/dist/services/provider-traffic.test.d.ts +2 -0
- package/dist/services/provider-traffic.test.d.ts.map +1 -0
- package/dist/services/provider-traffic.test.js +383 -0
- package/dist/services/provider-traffic.test.js.map +1 -0
- package/dist/services/service-interfaces.d.ts +20 -1
- package/dist/services/service-interfaces.d.ts.map +1 -1
- package/dist/services/settings-persistence.js +1 -1
- package/dist/services/settings-schema.d.ts +107 -4
- package/dist/services/settings-schema.d.ts.map +1 -1
- package/dist/services/settings-schema.js +103 -5
- package/dist/services/settings-schema.js.map +1 -1
- package/dist/services/settings-schema.test.js +35 -1
- package/dist/services/settings-schema.test.js.map +1 -1
- package/dist/services/settings-service.d.ts +3 -1
- package/dist/services/settings-service.d.ts.map +1 -1
- package/dist/services/settings-service.js +40 -4
- package/dist/services/settings-service.js.map +1 -1
- package/dist/services/settings-sources.d.ts.map +1 -1
- package/dist/services/settings-sources.js +2 -1
- package/dist/services/settings-sources.js.map +1 -1
- package/dist/services/settings-sources.test.js +4 -0
- package/dist/services/settings-sources.test.js.map +1 -1
- package/dist/services/shell-auto-approval-evaluator.d.ts +3 -2
- package/dist/services/shell-auto-approval-evaluator.d.ts.map +1 -1
- package/dist/services/shell-auto-approval-evaluator.js +287 -101
- package/dist/services/shell-auto-approval-evaluator.js.map +1 -1
- package/dist/services/shell-auto-approval-evaluator.test.js +216 -18
- package/dist/services/shell-auto-approval-evaluator.test.js.map +1 -1
- package/dist/services/shell-auto-approval-resolver.test.js +1 -1
- package/dist/services/shell-auto-approval-resolver.test.js.map +1 -1
- package/dist/services/stream-event-processor.d.ts.map +1 -1
- package/dist/services/stream-event-processor.js +5 -0
- package/dist/services/stream-event-processor.js.map +1 -1
- package/dist/services/stream-event-processor.test.js +27 -0
- package/dist/services/stream-event-processor.test.js.map +1 -1
- package/dist/services/subagents/reasoning-inheritance.test.d.ts +2 -0
- package/dist/services/subagents/reasoning-inheritance.test.d.ts.map +1 -0
- package/dist/services/subagents/reasoning-inheritance.test.js +73 -0
- package/dist/services/subagents/reasoning-inheritance.test.js.map +1 -0
- package/dist/services/subagents/subagent-manager.d.ts +2 -0
- package/dist/services/subagents/subagent-manager.d.ts.map +1 -1
- package/dist/services/subagents/subagent-manager.js +204 -33
- package/dist/services/subagents/subagent-manager.js.map +1 -1
- package/dist/services/subagents/subagent-manager.test.js +331 -42
- package/dist/services/subagents/subagent-manager.test.js.map +1 -1
- package/dist/services/subagents/types.d.ts +6 -0
- package/dist/services/subagents/types.d.ts.map +1 -1
- package/dist/services/terminal-result-collector.d.ts.map +1 -1
- package/dist/services/terminal-result-collector.js +1 -2
- package/dist/services/terminal-result-collector.js.map +1 -1
- package/dist/slash-commands.d.ts +1 -0
- package/dist/slash-commands.d.ts.map +1 -1
- package/dist/slash-commands.js +8 -1
- package/dist/slash-commands.js.map +1 -1
- package/dist/slash-commands.test.d.ts +2 -0
- package/dist/slash-commands.test.d.ts.map +1 -0
- package/dist/slash-commands.test.js +22 -0
- package/dist/slash-commands.test.js.map +1 -0
- package/dist/tools/apply-patch.d.ts.map +1 -1
- package/dist/tools/apply-patch.js +2 -6
- package/dist/tools/apply-patch.js.map +1 -1
- package/dist/tools/apply-patch.test.js +2 -13
- package/dist/tools/apply-patch.test.js.map +1 -1
- package/dist/tools/code-context.test.js +4 -3
- package/dist/tools/code-context.test.js.map +1 -1
- package/dist/tools/create-file.d.ts.map +1 -1
- package/dist/tools/create-file.js +2 -3
- package/dist/tools/create-file.js.map +1 -1
- package/dist/tools/create-file.test.js +3 -14
- package/dist/tools/create-file.test.js.map +1 -1
- package/dist/tools/edit-healing.d.ts +3 -3
- package/dist/tools/edit-healing.d.ts.map +1 -1
- package/dist/tools/edit-healing.js.map +1 -1
- package/dist/tools/edit-healing.test.js +0 -1
- package/dist/tools/edit-healing.test.js.map +1 -1
- package/dist/tools/find-files.test.js +3 -2
- package/dist/tools/find-files.test.js.map +1 -1
- package/dist/tools/grep.d.ts +1 -0
- package/dist/tools/grep.d.ts.map +1 -1
- package/dist/tools/grep.js +65 -4
- package/dist/tools/grep.js.map +1 -1
- package/dist/tools/grep.test.js +39 -0
- package/dist/tools/grep.test.js.map +1 -0
- package/dist/tools/read-file.d.ts +1 -0
- package/dist/tools/read-file.d.ts.map +1 -1
- package/dist/tools/read-file.js +7 -5
- package/dist/tools/read-file.js.map +1 -1
- package/dist/tools/read-file.test.js +3 -2
- package/dist/tools/read-file.test.js.map +1 -1
- package/dist/tools/run-subagent.d.ts +1 -1
- package/dist/tools/run-subagent.d.ts.map +1 -1
- package/dist/tools/run-subagent.js +27 -23
- package/dist/tools/run-subagent.js.map +1 -1
- package/dist/tools/run-subagent.test.js +55 -8
- package/dist/tools/run-subagent.test.js.map +1 -1
- package/dist/tools/search-replace.d.ts +13 -5
- package/dist/tools/search-replace.d.ts.map +1 -1
- package/dist/tools/search-replace.js +46 -115
- package/dist/tools/search-replace.js.map +1 -1
- package/dist/tools/search-replace.test.js +275 -240
- package/dist/tools/search-replace.test.js.map +1 -1
- package/dist/tools/shell.d.ts +1 -0
- package/dist/tools/shell.d.ts.map +1 -1
- package/dist/tools/shell.js +14 -6
- package/dist/tools/shell.js.map +1 -1
- package/dist/tools/shell.test.js +52 -0
- package/dist/tools/shell.test.js.map +1 -1
- package/dist/tools/tool-parameter-schema.test.js +13 -4
- package/dist/tools/tool-parameter-schema.test.js.map +1 -1
- package/dist/tools/types.d.ts +1 -1
- package/dist/tools/types.d.ts.map +1 -1
- package/dist/tools/web-fetch.d.ts.map +1 -1
- package/dist/tools/web-fetch.js +29 -4
- package/dist/tools/web-fetch.js.map +1 -1
- package/dist/tools/web-fetch.test.js +64 -0
- package/dist/tools/web-fetch.test.js.map +1 -1
- package/dist/utils/command-safety/path-analysis.d.ts.map +1 -1
- package/dist/utils/command-safety/path-analysis.js +143 -35
- package/dist/utils/command-safety/path-analysis.js.map +1 -1
- package/dist/utils/conversation-event-handler.d.ts.map +1 -1
- package/dist/utils/conversation-event-handler.js +23 -3
- package/dist/utils/conversation-event-handler.js.map +1 -1
- package/dist/utils/conversation-event-handler.test.js +94 -0
- package/dist/utils/conversation-event-handler.test.js.map +1 -1
- package/dist/utils/execute-shell.d.ts +2 -0
- package/dist/utils/execute-shell.d.ts.map +1 -1
- package/dist/utils/execute-shell.js +25 -1
- package/dist/utils/execute-shell.js.map +1 -1
- package/dist/utils/execute-shell.test.js +22 -0
- package/dist/utils/execute-shell.test.js.map +1 -1
- package/dist/utils/model-settings.d.ts.map +1 -1
- package/dist/utils/model-settings.js +18 -0
- package/dist/utils/model-settings.js.map +1 -1
- package/dist/utils/output-trim.d.ts.map +1 -1
- package/dist/utils/output-trim.js +14 -6
- package/dist/utils/output-trim.js.map +1 -1
- package/dist/utils/token-usage.test.js +31 -0
- package/dist/utils/token-usage.test.js.map +1 -1
- package/package.json +3 -3
- package/readme.md +271 -44
package/dist/agent.d.ts
CHANGED
|
@@ -21,6 +21,6 @@ export declare const getAgentDefinition: (deps: {
|
|
|
21
21
|
role: string;
|
|
22
22
|
task: string;
|
|
23
23
|
writeBoundary?: string[];
|
|
24
|
-
}) => Promise<any>;
|
|
24
|
+
}, context?: unknown, details?: unknown) => Promise<any>;
|
|
25
25
|
}, model?: string) => AgentDefinition;
|
|
26
26
|
//# sourceMappingURL=agent.d.ts.map
|
package/dist/agent.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../source/agent.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../source/agent.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAqBnE,wBAAgB,UAAU,CACxB,eAAe,EAAE,gBAAgB,EACjC,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,IAAI,UAAQ,GACX,MAAM,CAwBR;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAUzD;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACf;AAcD;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM;IACJ,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;IAChC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,CACZ,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,EAChE,OAAO,CAAC,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,KACd,OAAO,CAAC,GAAG,CAAC,CAAC;CACnB,EACD,QAAQ,MAAM,KACb,eA+LF,CAAC"}
|
package/dist/agent.js
CHANGED
|
@@ -17,6 +17,8 @@ import path from 'path';
|
|
|
17
17
|
import { getPromptPath } from './prompts/prompt-selector.js';
|
|
18
18
|
import { shouldPreferPatchEditingModel } from './lib/tool-selection-policy.js';
|
|
19
19
|
import { getSearchViaShellAddendum } from './prompts/search-via-shell.js';
|
|
20
|
+
import { getSubagentDelegationAddendum } from './prompts/subagent-delegation.js';
|
|
21
|
+
import { getReasoningEfficiencyAddendum } from './prompts/reasoning-efficiency.js';
|
|
20
22
|
const BASE_PROMPT_PATH = path.join(import.meta.dirname, './prompts');
|
|
21
23
|
function getTopLevelEntries(cwd, limit = 50) {
|
|
22
24
|
try {
|
|
@@ -38,8 +40,8 @@ export function getEnvInfo(settingsService, executionContext, lite = false) {
|
|
|
38
40
|
const osPlatform = os.platform();
|
|
39
41
|
const now = new Date().toISOString().slice(0, 10);
|
|
40
42
|
if (lite) {
|
|
41
|
-
// Minimal env info for lite mode
|
|
42
|
-
return `OS: ${osType} ${osRelease} (${osPlatform}); shell: ${shellPath}; date: ${now}`;
|
|
43
|
+
// Minimal env info for lite mode
|
|
44
|
+
return `OS: ${osType} ${osRelease} (${osPlatform}); shell: ${shellPath}; cwd: ${cwd}; date: ${now}`;
|
|
43
45
|
}
|
|
44
46
|
// For remote sessions, we might not be able to list top-level entries efficiently or at all easily here synchronously
|
|
45
47
|
// We'll skip top-level entries for now if remote, or maybe we can't get them sync.
|
|
@@ -68,6 +70,10 @@ function resolvePrompt(promptPath) {
|
|
|
68
70
|
return fs.readFileSync(promptPath, 'utf-8').trim();
|
|
69
71
|
}
|
|
70
72
|
catch (e) {
|
|
73
|
+
const sourcePromptPath = path.join(import.meta.dirname, '../source/prompts', path.basename(promptPath));
|
|
74
|
+
if (sourcePromptPath !== promptPath && fs.existsSync(sourcePromptPath)) {
|
|
75
|
+
return fs.readFileSync(sourcePromptPath, 'utf-8').trim();
|
|
76
|
+
}
|
|
71
77
|
throw new Error(`Failed to read prompt file at ${promptPath}: ${e.message}`);
|
|
72
78
|
}
|
|
73
79
|
}
|
|
@@ -80,14 +86,21 @@ export const getAgentDefinition = (deps, model) => {
|
|
|
80
86
|
const resolvedModel = model?.trim() || defaultModel;
|
|
81
87
|
if (!resolvedModel)
|
|
82
88
|
throw new Error('Model cannot be undefined or empty');
|
|
89
|
+
const planMode = settingsService.get('app.planMode');
|
|
83
90
|
const mentorMode = settingsService.get('app.mentorMode');
|
|
84
91
|
const liteMode = settingsService.get('app.liteMode');
|
|
92
|
+
const orchestratorMode = settingsService.get('app.orchestratorMode');
|
|
85
93
|
const searchViaShell = settingsService.get('app.searchViaShell');
|
|
86
94
|
// Code-context tools operate on the local filesystem only; disable them for
|
|
87
95
|
// remote (SSH) execution where the workspace lives on another host.
|
|
88
96
|
const codeContextEnabled = !(executionContext?.isRemote() ?? false);
|
|
89
97
|
const isGpt5 = !liteMode && shouldPreferPatchEditingModel(resolvedModel);
|
|
90
|
-
const promptPath = getPromptPath({
|
|
98
|
+
const promptPath = getPromptPath({
|
|
99
|
+
basePromptDir: BASE_PROMPT_PATH,
|
|
100
|
+
model: resolvedModel,
|
|
101
|
+
liteMode,
|
|
102
|
+
orchestratorMode,
|
|
103
|
+
});
|
|
91
104
|
let prompt = resolvePrompt(promptPath);
|
|
92
105
|
if (mentorMode && !liteMode) {
|
|
93
106
|
const addonPath = path.join(BASE_PROMPT_PATH, 'mentor-addon.md');
|
|
@@ -99,7 +112,7 @@ export const getAgentDefinition = (deps, model) => {
|
|
|
99
112
|
loggingService.error(`Failed to load mentor addon: ${e}`);
|
|
100
113
|
}
|
|
101
114
|
}
|
|
102
|
-
const codeContextDoc = codeContextEnabled
|
|
115
|
+
const codeContextDoc = !orchestratorMode && codeContextEnabled
|
|
103
116
|
? liteMode
|
|
104
117
|
? '### Code Context Tools\n\n- `read_code_outline`: inspect file structure.\n- `code_context_search`: find related files or symbol declarations. Use `read_file` before editing.'
|
|
105
118
|
: '### Code Context Tools\n\n- Use `read_code_outline` for a compact file outline.\n- Use `code_context_search` for related files or symbol declarations.\n- Use `read_file` before editing.'
|
|
@@ -107,7 +120,7 @@ export const getAgentDefinition = (deps, model) => {
|
|
|
107
120
|
if (codeContextDoc) {
|
|
108
121
|
prompt = `${prompt}\n\n${codeContextDoc}`;
|
|
109
122
|
}
|
|
110
|
-
if (searchViaShell) {
|
|
123
|
+
if (!orchestratorMode && searchViaShell) {
|
|
111
124
|
try {
|
|
112
125
|
const addendum = getSearchViaShellAddendum({ executionContext });
|
|
113
126
|
prompt = `${prompt}\n\n${addendum}`;
|
|
@@ -116,7 +129,7 @@ export const getAgentDefinition = (deps, model) => {
|
|
|
116
129
|
loggingService.error(`Failed to load search-via-shell addendum: ${e}`);
|
|
117
130
|
}
|
|
118
131
|
}
|
|
119
|
-
else {
|
|
132
|
+
else if (!orchestratorMode) {
|
|
120
133
|
if (!isGpt5) {
|
|
121
134
|
const searchToolsDoc = liteMode
|
|
122
135
|
? '### Search Tools\n\n- `find_files`: locate files by name or glob.\n- `grep`: search file contents.'
|
|
@@ -124,8 +137,43 @@ export const getAgentDefinition = (deps, model) => {
|
|
|
124
137
|
prompt = `${prompt}\n\n${searchToolsDoc}`;
|
|
125
138
|
}
|
|
126
139
|
}
|
|
127
|
-
|
|
140
|
+
// Delegation guidance is injected only in orchestrator mode when runSubagent is available.
|
|
141
|
+
if (orchestratorMode && runSubagent) {
|
|
142
|
+
prompt = `${prompt}\n\n${getSubagentDelegationAddendum({ orchestratorMode })}`;
|
|
143
|
+
}
|
|
144
|
+
if (planMode) {
|
|
145
|
+
try {
|
|
146
|
+
const planModeInfoPath = path.join(BASE_PROMPT_PATH, 'plan-mode-info.md');
|
|
147
|
+
prompt = `${prompt}\n\n${resolvePrompt(planModeInfoPath)}`;
|
|
148
|
+
}
|
|
149
|
+
catch (e) {
|
|
150
|
+
loggingService.error(`Failed to load plan-mode-info: ${e}`);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
const isOverThinkingModels = ['kimi', 'deepseek', 'glm', 'qwen', 'minimax', 'mimo'].some((key) => resolvedModel.toLowerCase().includes(key));
|
|
154
|
+
if (isOverThinkingModels) {
|
|
155
|
+
prompt += `\n\n${getReasoningEfficiencyAddendum()}`;
|
|
156
|
+
}
|
|
157
|
+
const envInfo = getEnvInfo(settingsService, executionContext, liteMode || orchestratorMode);
|
|
128
158
|
const cwd = executionContext?.getCwd() || process.cwd();
|
|
159
|
+
if (orchestratorMode) {
|
|
160
|
+
if (!runSubagent) {
|
|
161
|
+
throw new Error('orchestratorMode requires runSubagent: cannot build orchestrator agent without a runSubagent implementation.');
|
|
162
|
+
}
|
|
163
|
+
const tools = [
|
|
164
|
+
createRunSubagentToolDefinition(runSubagent),
|
|
165
|
+
createShellToolDefinition({ settingsService, loggingService, executionContext, orchestratorMode: true }),
|
|
166
|
+
createReadFileToolDefinition({ executionContext, allowOutsideWorkspace: true, orchestratorMode: true }),
|
|
167
|
+
createGrepToolDefinition({ executionContext, orchestratorMode: true }),
|
|
168
|
+
];
|
|
169
|
+
registerToolFormatters(tools);
|
|
170
|
+
return {
|
|
171
|
+
name: 'Agent',
|
|
172
|
+
instructions: `${prompt}\n\nEnvironment: ${envInfo}`,
|
|
173
|
+
tools,
|
|
174
|
+
model: resolvedModel,
|
|
175
|
+
};
|
|
176
|
+
}
|
|
129
177
|
const tools = [
|
|
130
178
|
createShellToolDefinition({ settingsService, loggingService, executionContext }),
|
|
131
179
|
createWebSearchToolDefinition({
|
package/dist/agent.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../source/agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,iCAAiC,EAAE,MAAM,2BAA2B,CAAC;AAC9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,qCAAqC,EAAE,mCAAmC,EAAE,MAAM,yBAAyB,CAAC;AACrH,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../source/agent.ts"],"names":[],"mappings":"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"}
|
package/dist/agent.test.js
CHANGED
|
@@ -25,6 +25,105 @@ test('getAgentDefinition includes grep and find_files when searchViaShell is fal
|
|
|
25
25
|
t.true(toolNames.includes('read_code_outline'));
|
|
26
26
|
t.true(toolNames.includes('code_context_search'));
|
|
27
27
|
});
|
|
28
|
+
test('getAgentDefinition injects delegation guidance in orchestrator mode when runSubagent is provided', (t) => {
|
|
29
|
+
const settingsService = createMockSettingsService({
|
|
30
|
+
'agent.model': 'gpt-4o',
|
|
31
|
+
'app.orchestratorMode': true,
|
|
32
|
+
});
|
|
33
|
+
const definition = getAgentDefinition({
|
|
34
|
+
settingsService,
|
|
35
|
+
loggingService: mockLogger,
|
|
36
|
+
runSubagent: async () => ({}),
|
|
37
|
+
});
|
|
38
|
+
t.true(definition.tools.map((tool) => tool.name).includes('run_subagent'));
|
|
39
|
+
t.true(definition.instructions.includes('### Delegating to subagents'));
|
|
40
|
+
});
|
|
41
|
+
test('getAgentDefinition omits delegation guidance in standard mode even if runSubagent is provided', (t) => {
|
|
42
|
+
const settingsService = createMockSettingsService({
|
|
43
|
+
'agent.model': 'gpt-4o',
|
|
44
|
+
});
|
|
45
|
+
const definition = getAgentDefinition({
|
|
46
|
+
settingsService,
|
|
47
|
+
loggingService: mockLogger,
|
|
48
|
+
runSubagent: async () => ({}),
|
|
49
|
+
});
|
|
50
|
+
t.true(definition.tools.map((tool) => tool.name).includes('run_subagent'));
|
|
51
|
+
t.false(definition.instructions.includes('### Delegating to subagents'));
|
|
52
|
+
});
|
|
53
|
+
test('getAgentDefinition omits delegation guidance when runSubagent is absent', (t) => {
|
|
54
|
+
const settingsService = createMockSettingsService({
|
|
55
|
+
'agent.model': 'gpt-4o',
|
|
56
|
+
});
|
|
57
|
+
const definition = getAgentDefinition({
|
|
58
|
+
settingsService,
|
|
59
|
+
loggingService: mockLogger,
|
|
60
|
+
});
|
|
61
|
+
t.false(definition.tools.map((tool) => tool.name).includes('run_subagent'));
|
|
62
|
+
t.false(definition.instructions.includes('### Delegating to subagents'));
|
|
63
|
+
});
|
|
64
|
+
test('getAgentDefinition omits delegation guidance in lite mode', (t) => {
|
|
65
|
+
const settingsService = createMockSettingsService({
|
|
66
|
+
'app.liteMode': true,
|
|
67
|
+
'agent.model': 'gpt-4o',
|
|
68
|
+
});
|
|
69
|
+
const definition = getAgentDefinition({
|
|
70
|
+
settingsService,
|
|
71
|
+
loggingService: mockLogger,
|
|
72
|
+
runSubagent: async () => ({}),
|
|
73
|
+
});
|
|
74
|
+
t.false(definition.tools.map((tool) => tool.name).includes('run_subagent'));
|
|
75
|
+
t.false(definition.instructions.includes('### Delegating to subagents'));
|
|
76
|
+
});
|
|
77
|
+
test('getAgentDefinition in orchestrator mode exposes run_subagent, shell, read_file, and grep', (t) => {
|
|
78
|
+
const settingsService = createMockSettingsService({
|
|
79
|
+
'app.orchestratorMode': true,
|
|
80
|
+
'agent.model': 'gpt-5',
|
|
81
|
+
});
|
|
82
|
+
const definition = getAgentDefinition({
|
|
83
|
+
settingsService,
|
|
84
|
+
loggingService: mockLogger,
|
|
85
|
+
runSubagent: async () => ({}),
|
|
86
|
+
});
|
|
87
|
+
t.deepEqual(definition.tools.map((tool) => tool.name), ['run_subagent', 'shell', 'read_file', 'grep']);
|
|
88
|
+
});
|
|
89
|
+
test('getAgentDefinition in orchestrator mode requires delegated tool work', (t) => {
|
|
90
|
+
const settingsService = createMockSettingsService({
|
|
91
|
+
'app.orchestratorMode': true,
|
|
92
|
+
'agent.model': 'gpt-5',
|
|
93
|
+
});
|
|
94
|
+
const definition = getAgentDefinition({
|
|
95
|
+
settingsService,
|
|
96
|
+
loggingService: mockLogger,
|
|
97
|
+
runSubagent: async () => ({}),
|
|
98
|
+
});
|
|
99
|
+
t.true(definition.instructions.includes('Orchestrator mode'));
|
|
100
|
+
t.true(definition.instructions.includes('must delegate'));
|
|
101
|
+
t.false(definition.instructions.includes('Use `read_code_outline`'));
|
|
102
|
+
// Verify non-orchestrator direct-tool guidance is absent from orchestrator instructions
|
|
103
|
+
t.false(definition.instructions.includes('Prefer `read_file` for reading file contents.'));
|
|
104
|
+
});
|
|
105
|
+
test('getAgentDefinition in orchestrator mode exposes run_subagent, shell, read_file, and grep for non-gpt-5 model', (t) => {
|
|
106
|
+
const settingsService = createMockSettingsService({
|
|
107
|
+
'app.orchestratorMode': true,
|
|
108
|
+
'agent.model': 'gpt-4o',
|
|
109
|
+
});
|
|
110
|
+
const definition = getAgentDefinition({
|
|
111
|
+
settingsService,
|
|
112
|
+
loggingService: mockLogger,
|
|
113
|
+
runSubagent: async () => ({}),
|
|
114
|
+
});
|
|
115
|
+
t.deepEqual(definition.tools.map((tool) => tool.name), ['run_subagent', 'shell', 'read_file', 'grep']);
|
|
116
|
+
});
|
|
117
|
+
test('getAgentDefinition throws if orchestratorMode is true and runSubagent is missing', (t) => {
|
|
118
|
+
const settingsService = createMockSettingsService({
|
|
119
|
+
'app.orchestratorMode': true,
|
|
120
|
+
'agent.model': 'gpt-4o',
|
|
121
|
+
});
|
|
122
|
+
t.throws(() => getAgentDefinition({
|
|
123
|
+
settingsService,
|
|
124
|
+
loggingService: mockLogger,
|
|
125
|
+
}), { instanceOf: Error, message: /orchestratorMode.*runSubagent|runSubagent.*orchestratorMode/i });
|
|
126
|
+
});
|
|
28
127
|
test('getAgentDefinition excludes grep and find_files when searchViaShell is true', (t) => {
|
|
29
128
|
const settingsService = createMockSettingsService({
|
|
30
129
|
'app.searchViaShell': true,
|
|
@@ -111,8 +210,8 @@ test('getAgentDefinition omits dedicated search tool references from prompt when
|
|
|
111
210
|
settingsService,
|
|
112
211
|
loggingService: mockLogger,
|
|
113
212
|
});
|
|
114
|
-
t.false(definition.instructions.includes('
|
|
115
|
-
t.false(definition.instructions.includes('
|
|
213
|
+
t.false(definition.instructions.includes('`find_files`'));
|
|
214
|
+
t.false(definition.instructions.includes('`grep`'));
|
|
116
215
|
});
|
|
117
216
|
test('getAgentDefinition dynamically includes dedicated search tool references when searchViaShell is false', (t) => {
|
|
118
217
|
const settingsService = createMockSettingsService({
|
|
@@ -123,11 +222,11 @@ test('getAgentDefinition dynamically includes dedicated search tool references w
|
|
|
123
222
|
settingsService,
|
|
124
223
|
loggingService: mockLogger,
|
|
125
224
|
});
|
|
126
|
-
t.true(definition.instructions.includes('
|
|
127
|
-
t.true(definition.instructions.includes('
|
|
225
|
+
t.true(definition.instructions.includes('`find_files`'));
|
|
226
|
+
t.true(definition.instructions.includes('`grep`'));
|
|
128
227
|
t.true(definition.instructions.includes('read_code_outline'));
|
|
129
228
|
t.true(definition.instructions.includes('code_context_search'));
|
|
130
|
-
t.true(definition.instructions.includes('
|
|
229
|
+
t.true(definition.instructions.includes('read_file'));
|
|
131
230
|
});
|
|
132
231
|
test('getAgentDefinition dynamically includes code-context tool references when available', (t) => {
|
|
133
232
|
const settingsService = createMockSettingsService({
|
|
@@ -140,7 +239,7 @@ test('getAgentDefinition dynamically includes code-context tool references when
|
|
|
140
239
|
});
|
|
141
240
|
t.true(definition.instructions.includes('read_code_outline'));
|
|
142
241
|
t.true(definition.instructions.includes('code_context_search'));
|
|
143
|
-
t.true(definition.instructions.includes('
|
|
242
|
+
t.true(definition.instructions.includes('read_file'));
|
|
144
243
|
});
|
|
145
244
|
test('getAgentDefinition dynamically includes code-context tool references for gpt-5 models', (t) => {
|
|
146
245
|
const settingsService = createMockSettingsService({
|
|
@@ -170,10 +269,10 @@ test('getAgentDefinition uses fallback search prompt for remote execution', (t)
|
|
|
170
269
|
executionContext: mockExecutionContext,
|
|
171
270
|
});
|
|
172
271
|
// Remote should always fallback to grep/find instructions
|
|
173
|
-
t.true(definition.instructions.includes('
|
|
174
|
-
t.true(definition.instructions.includes('
|
|
175
|
-
t.false(definition.instructions.includes('
|
|
176
|
-
t.false(definition.instructions.includes('
|
|
272
|
+
t.true(definition.instructions.includes('`grep`'));
|
|
273
|
+
t.true(definition.instructions.includes('`find`'));
|
|
274
|
+
t.false(definition.instructions.includes('`rg`'));
|
|
275
|
+
t.false(definition.instructions.includes('`fd`'));
|
|
177
276
|
});
|
|
178
277
|
test('getAgentDefinition excludes code-context tools in remote (SSH) execution', (t) => {
|
|
179
278
|
const settingsService = createMockSettingsService({
|
|
@@ -195,4 +294,30 @@ test('getAgentDefinition excludes code-context tools in remote (SSH) execution',
|
|
|
195
294
|
t.false(toolNames.includes('code_context_search'));
|
|
196
295
|
t.false(definition.instructions.includes('read_code_outline'));
|
|
197
296
|
});
|
|
297
|
+
test('getAgentDefinition conditionalizes plan mode instructions and does not filter tools based on planMode setting', (t) => {
|
|
298
|
+
const settingsService = createMockSettingsService({
|
|
299
|
+
'agent.model': 'gpt-4o',
|
|
300
|
+
'app.planMode': true,
|
|
301
|
+
});
|
|
302
|
+
const definitionWithPlan = getAgentDefinition({
|
|
303
|
+
settingsService,
|
|
304
|
+
loggingService: mockLogger,
|
|
305
|
+
});
|
|
306
|
+
t.true(definitionWithPlan.instructions.includes('restricted from making'));
|
|
307
|
+
const toolsWithPlan = definitionWithPlan.tools.map((tool) => tool.name);
|
|
308
|
+
t.true(toolsWithPlan.includes('create_file'));
|
|
309
|
+
t.true(toolsWithPlan.includes('search_replace'));
|
|
310
|
+
const settingsServiceWithoutPlan = createMockSettingsService({
|
|
311
|
+
'agent.model': 'gpt-4o',
|
|
312
|
+
'app.planMode': false,
|
|
313
|
+
});
|
|
314
|
+
const definitionWithoutPlan = getAgentDefinition({
|
|
315
|
+
settingsService: settingsServiceWithoutPlan,
|
|
316
|
+
loggingService: mockLogger,
|
|
317
|
+
});
|
|
318
|
+
t.false(definitionWithoutPlan.instructions.includes('restricted from making'));
|
|
319
|
+
const toolsWithoutPlan = definitionWithoutPlan.tools.map((tool) => tool.name);
|
|
320
|
+
t.true(toolsWithoutPlan.includes('create_file'));
|
|
321
|
+
t.true(toolsWithoutPlan.includes('search_replace'));
|
|
322
|
+
});
|
|
198
323
|
//# sourceMappingURL=agent.test.js.map
|
package/dist/agent.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.test.js","sourceRoot":"","sources":["../source/agent.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agent.test.js","sourceRoot":"","sources":["../source/agent.test.ts"],"names":[],"mappings":"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"}
|
package/dist/app.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ import type { LoggingService } from './services/logging-service.js';
|
|
|
6
6
|
import { ISSHService } from './services/service-interfaces.js';
|
|
7
7
|
import { SSHInfo } from './hooks/use-shell-mode.js';
|
|
8
8
|
import { type UsageAccumulator } from './utils/token-usage.js';
|
|
9
|
+
import type { Message } from './hooks/use-conversation.js';
|
|
9
10
|
interface AppProps {
|
|
10
11
|
conversationService: ConversationService;
|
|
11
12
|
settingsService: SettingsService;
|
|
@@ -16,8 +17,22 @@ interface AppProps {
|
|
|
16
17
|
usageAccumulator?: UsageAccumulator;
|
|
17
18
|
onPrintUsage?: () => void;
|
|
18
19
|
onExitUsage?: () => void;
|
|
20
|
+
sessionId: string;
|
|
21
|
+
initialMessages?: Message[];
|
|
22
|
+
onSaveConversation: (messages: Message[], overrideSessionId?: string, overrideCreatedAt?: string) => Promise<void>;
|
|
23
|
+
onMessagesChange: (messages: Message[]) => void;
|
|
24
|
+
generateId: () => string;
|
|
25
|
+
onSessionIdChange?: (newId: string, createdAt: string) => void;
|
|
19
26
|
}
|
|
20
27
|
export declare const appendStartupBannerId: (ids: string[]) => string[];
|
|
28
|
+
export declare const hasConversationContent: (messages: Message[]) => boolean;
|
|
29
|
+
export declare const TERMINAL_REDRAW_CLEAR = "\u001B[2J\u001B[3J\u001B[H";
|
|
30
|
+
type TerminalWriter = {
|
|
31
|
+
write: (value: string) => unknown;
|
|
32
|
+
};
|
|
33
|
+
export declare const clearTerminalForRedraw: (stdout: TerminalWriter) => void;
|
|
34
|
+
type ScheduleCallback = (callback: () => void, delay: number) => unknown;
|
|
35
|
+
export declare const scheduleExitSideEffects: (messages: Message[], onSaveConversation: (messages: Message[], overrideSessionId?: string, overrideCreatedAt?: string) => Promise<void>, onExitUsage?: () => void, schedule?: ScheduleCallback) => void;
|
|
21
36
|
declare const App: FC<AppProps>;
|
|
22
37
|
export default App;
|
|
23
38
|
//# sourceMappingURL=app.d.ts.map
|
package/dist/app.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../source/app.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../source/app.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAqD,MAAM,OAAO,CAAC;AAQrF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAI/D,OAAO,EAAgB,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGlE,OAAO,EAAuD,KAAK,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACpH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAI3D,UAAU,QAAQ;IAChB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,EAAE,CAAC;IAC5B,kBAAkB,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,iBAAiB,CAAC,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnH,gBAAgB,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAChD,UAAU,EAAE,MAAM,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CAChE;AAED,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,EAAE,KAAG,MAAM,EAA8C,CAAC;AAE3G,eAAO,MAAM,sBAAsB,GAAI,UAAU,OAAO,EAAE,KAAG,OAA0D,CAAC;AAExH,eAAO,MAAM,qBAAqB,+BAA+B,CAAC;AAElE,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,GAAI,QAAQ,cAAc,KAAG,IAE/D,CAAC;AAEF,KAAK,gBAAgB,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;AAEzE,eAAO,MAAM,uBAAuB,GAClC,UAAU,OAAO,EAAE,EACnB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,iBAAiB,CAAC,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,EAClH,cAAc,MAAM,IAAI,EACxB,WAAU,gBAA6B,KACtC,IAUF,CAAC;AAEF,QAAA,MAAM,GAAG,EAAE,EAAE,CAAC,QAAQ,CAyTrB,CAAC;AAEF,eAAe,GAAG,CAAC"}
|
package/dist/app.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
1
|
+
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
2
2
|
import { useInputActions } from './context/InputContext.js';
|
|
3
|
-
import { Box, useApp, useInput } from 'ink';
|
|
3
|
+
import { Box, useApp, useInput, useStdout } from 'ink';
|
|
4
4
|
import { useConversation } from './hooks/use-conversation.js';
|
|
5
5
|
import MessageList, { MESSAGE_HORIZONTAL_PADDING } from './components/MessageList.js';
|
|
6
6
|
import BottomArea from './components/BottomArea.js';
|
|
@@ -12,20 +12,69 @@ import { useShellMode } from './hooks/use-shell-mode.js';
|
|
|
12
12
|
import { useAppCommands } from './hooks/use-app-commands.js';
|
|
13
13
|
import { hasUserTurnContent } from './types/user-turn.js';
|
|
14
14
|
import { createUsageAccumulator, formatSessionUsageBreakdown } from './utils/token-usage.js';
|
|
15
|
+
import { resolveSlashCommand } from './slash-commands.js';
|
|
15
16
|
export const appendStartupBannerId = (ids) => [...ids, `startup-banner-${ids.length}`];
|
|
16
|
-
const
|
|
17
|
+
export const hasConversationContent = (messages) => messages.some((msg) => msg.sender !== 'system');
|
|
18
|
+
export const TERMINAL_REDRAW_CLEAR = '\u001B[2J\u001B[3J\u001B[H';
|
|
19
|
+
export const clearTerminalForRedraw = (stdout) => {
|
|
20
|
+
stdout.write(TERMINAL_REDRAW_CLEAR);
|
|
21
|
+
};
|
|
22
|
+
export const scheduleExitSideEffects = (messages, onSaveConversation, onExitUsage, schedule = setTimeout) => {
|
|
23
|
+
schedule(() => {
|
|
24
|
+
if (hasConversationContent(messages)) {
|
|
25
|
+
void onSaveConversation(messages).finally(() => {
|
|
26
|
+
onExitUsage?.();
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
onExitUsage?.();
|
|
31
|
+
}
|
|
32
|
+
}, 0);
|
|
33
|
+
};
|
|
34
|
+
const App = ({ conversationService, settingsService, historyService, loggingService, sshInfo, sshService, usageAccumulator, onPrintUsage, onExitUsage, sessionId: initialSessionId, initialMessages = [], onSaveConversation, onMessagesChange, generateId, onSessionIdChange, }) => {
|
|
17
35
|
const { exit } = useApp();
|
|
36
|
+
const { stdout } = useStdout();
|
|
18
37
|
const { setInput } = useInputActions();
|
|
38
|
+
const undoMenuRef = useRef(null);
|
|
39
|
+
const [messageListEpoch, setMessageListEpoch] = useState(0);
|
|
19
40
|
const [startupBannerIds, setStartupBannerIds] = useState(['startup-banner-0']);
|
|
20
41
|
const liteMode = useSetting(settingsService, 'app.liteMode') ?? false;
|
|
21
42
|
const sessionUsage = useMemo(() => usageAccumulator ?? createUsageAccumulator(), [usageAccumulator]);
|
|
22
43
|
const subagentUsage = useMemo(() => createUsageAccumulator(), []);
|
|
23
|
-
const
|
|
44
|
+
const [sessionId, setSessionId] = useState(initialSessionId);
|
|
45
|
+
const handleClearConversationRef = useRef(null);
|
|
46
|
+
const { messages, lastUsage, pendingApproval, waitingForApproval, waitingForRejectionReason, setWaitingForRejectionReason, isProcessing, sendUserMessage, handleApprovalDecision, clearConversation, stopProcessing, undoLastUserMessage, getUserMessages, undoToUserMessage, setModel, setReasoningEffort, addSystemMessage, setTemperature, addShellMessage, getSubagentUsage, } = useConversation({
|
|
24
47
|
conversationService,
|
|
25
48
|
loggingService,
|
|
26
49
|
usageAccumulator: sessionUsage,
|
|
27
50
|
subagentUsageAccumulator: subagentUsage,
|
|
51
|
+
initialMessages,
|
|
52
|
+
sessionId,
|
|
53
|
+
onClear: useCallback(async () => {
|
|
54
|
+
if (handleClearConversationRef.current) {
|
|
55
|
+
await handleClearConversationRef.current();
|
|
56
|
+
}
|
|
57
|
+
}, []),
|
|
28
58
|
});
|
|
59
|
+
const handleClearConversation = useCallback(async () => {
|
|
60
|
+
if (hasConversationContent(messages)) {
|
|
61
|
+
await onSaveConversation(messages, sessionId);
|
|
62
|
+
}
|
|
63
|
+
const newId = generateId();
|
|
64
|
+
const newCreatedAt = new Date().toISOString();
|
|
65
|
+
conversationService.resetWithNewId(newId);
|
|
66
|
+
setSessionId(newId);
|
|
67
|
+
if (onSessionIdChange) {
|
|
68
|
+
onSessionIdChange(newId, newCreatedAt);
|
|
69
|
+
}
|
|
70
|
+
}, [messages, sessionId, onSaveConversation, generateId, conversationService, onSessionIdChange]);
|
|
71
|
+
useEffect(() => {
|
|
72
|
+
handleClearConversationRef.current = handleClearConversation;
|
|
73
|
+
}, [handleClearConversation]);
|
|
74
|
+
// Sync messages to parent for SIGINT save-on-exit
|
|
75
|
+
useEffect(() => {
|
|
76
|
+
onMessagesChange(messages);
|
|
77
|
+
}, [messages, onMessagesChange]);
|
|
29
78
|
useEffect(() => {
|
|
30
79
|
conversationService.setRetryCallback(() => addSystemMessage('Retrying due to upstream error...'));
|
|
31
80
|
}, [conversationService, addSystemMessage]);
|
|
@@ -53,12 +102,16 @@ const App = ({ conversationService, settingsService, historyService, loggingServ
|
|
|
53
102
|
clearConversation();
|
|
54
103
|
refreshStartupBanner();
|
|
55
104
|
}, [clearConversation, onPrintUsage, refreshStartupBanner]);
|
|
105
|
+
const redrawMessageList = useCallback(() => {
|
|
106
|
+
clearTerminalForRedraw(stdout);
|
|
107
|
+
setMessageListEpoch((epoch) => epoch + 1);
|
|
108
|
+
}, [stdout]);
|
|
56
109
|
const getSessionUsage = useCallback(() => formatSessionUsageBreakdown(sessionUsage.get(), getSubagentUsage()), [sessionUsage, getSubagentUsage]);
|
|
57
110
|
const exitWithUsage = useCallback(() => {
|
|
58
|
-
onExitUsage?.();
|
|
59
111
|
exit();
|
|
60
|
-
|
|
61
|
-
|
|
112
|
+
scheduleExitSideEffects(messages, onSaveConversation, onExitUsage);
|
|
113
|
+
}, [exit, onExitUsage, onSaveConversation, messages]);
|
|
114
|
+
const { slashCommands, cycleAppModes } = useAppCommands({
|
|
62
115
|
settingsService,
|
|
63
116
|
addSystemMessage,
|
|
64
117
|
applyRuntimeSetting,
|
|
@@ -68,8 +121,27 @@ const App = ({ conversationService, settingsService, historyService, loggingServ
|
|
|
68
121
|
exit: exitWithUsage,
|
|
69
122
|
messages,
|
|
70
123
|
setModel,
|
|
124
|
+
undoLastUserMessage,
|
|
125
|
+
onUndo: redrawMessageList,
|
|
126
|
+
openUndoMenu: () => {
|
|
127
|
+
const userMessages = getUserMessages().map((m) => ({ uiIndex: m.uiIndex, text: m.text }));
|
|
128
|
+
if (userMessages.length === 0) {
|
|
129
|
+
addSystemMessage('Nothing to undo.');
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
if (undoMenuRef.current) {
|
|
133
|
+
undoMenuRef.current.open(userMessages);
|
|
134
|
+
}
|
|
135
|
+
},
|
|
71
136
|
});
|
|
72
|
-
const
|
|
137
|
+
const handleUndoSelect = useCallback((item) => {
|
|
138
|
+
const text = undoToUserMessage(item.uiIndex);
|
|
139
|
+
if (text !== null) {
|
|
140
|
+
redrawMessageList();
|
|
141
|
+
setInput(text);
|
|
142
|
+
}
|
|
143
|
+
}, [undoToUserMessage, redrawMessageList, setInput]);
|
|
144
|
+
const hasConversationHistory = useMemo(() => hasConversationContent(messages), [messages]);
|
|
73
145
|
// Handle Ctrl+C to exit immediately
|
|
74
146
|
useInput((_input, key) => {
|
|
75
147
|
if (key.ctrl && _input === 'c') {
|
|
@@ -96,7 +168,7 @@ const App = ({ conversationService, settingsService, historyService, loggingServ
|
|
|
96
168
|
const handleReject = useCallback(() => {
|
|
97
169
|
setWaitingForRejectionReason(true);
|
|
98
170
|
}, [setWaitingForRejectionReason]);
|
|
99
|
-
//
|
|
171
|
+
// Switch between Standard and Plan modes with Shift+Tab
|
|
100
172
|
useInput((input, key) => {
|
|
101
173
|
const isShiftTab = (key.shift && key.tab) || input === '\u001b[Z';
|
|
102
174
|
if (!isShiftTab)
|
|
@@ -105,7 +177,7 @@ const App = ({ conversationService, settingsService, historyService, loggingServ
|
|
|
105
177
|
toggleShellMode();
|
|
106
178
|
return;
|
|
107
179
|
}
|
|
108
|
-
|
|
180
|
+
cycleAppModes();
|
|
109
181
|
});
|
|
110
182
|
const handleSubmit = async (turn) => {
|
|
111
183
|
const value = turn.text;
|
|
@@ -134,7 +206,7 @@ const App = ({ conversationService, settingsService, historyService, loggingServ
|
|
|
134
206
|
break;
|
|
135
207
|
}
|
|
136
208
|
// Find matching command
|
|
137
|
-
const command = slashCommands
|
|
209
|
+
const command = resolveSlashCommand(slashCommands, parsed.commandName);
|
|
138
210
|
if (command) {
|
|
139
211
|
// Execute the command
|
|
140
212
|
const shouldClearInput = command.action(parsed.args || undefined);
|
|
@@ -149,9 +221,7 @@ const App = ({ conversationService, settingsService, historyService, loggingServ
|
|
|
149
221
|
}
|
|
150
222
|
case 'message':
|
|
151
223
|
// Regular message, send to AI agent
|
|
152
|
-
|
|
153
|
-
historyService.addMessage(value);
|
|
154
|
-
}
|
|
224
|
+
historyService.addMessage(turn);
|
|
155
225
|
setInput('');
|
|
156
226
|
await sendUserMessage(turn);
|
|
157
227
|
return;
|
|
@@ -163,9 +233,9 @@ const App = ({ conversationService, settingsService, historyService, loggingServ
|
|
|
163
233
|
return (React.createElement(ErrorBoundary, { loggingService: loggingService },
|
|
164
234
|
React.createElement(Box, { flexDirection: "column", flexGrow: 1 },
|
|
165
235
|
React.createElement(Box, { flexDirection: "column", flexGrow: 1 },
|
|
166
|
-
React.createElement(MessageList, { messages: messages, bannerItems: startupBannerIds, settingsService: settingsService, isShellMode: isShellMode })),
|
|
236
|
+
React.createElement(MessageList, { key: messageListEpoch, messages: messages, bannerItems: startupBannerIds, settingsService: settingsService, isShellMode: isShellMode })),
|
|
167
237
|
React.createElement(Box, { paddingX: MESSAGE_HORIZONTAL_PADDING },
|
|
168
|
-
React.createElement(BottomArea, { pendingApproval: pendingApproval, waitingForApproval: waitingForApproval, waitingForRejectionReason: waitingForRejectionReason, isProcessing: isProcessing, isShellMode: isShellMode, lastUsage: lastUsage, onSubmit: handleSubmit, slashCommands: slashCommands, hasConversationHistory: hasConversationHistory, settingsService: settingsService, loggingService: loggingService, historyService: historyService, onApprove: handleApprove, onReject: handleReject, sshInfo: sshInfo })))));
|
|
238
|
+
React.createElement(BottomArea, { pendingApproval: pendingApproval, waitingForApproval: waitingForApproval, waitingForRejectionReason: waitingForRejectionReason, isProcessing: isProcessing, isShellMode: isShellMode, lastUsage: lastUsage, onSubmit: handleSubmit, slashCommands: slashCommands, hasConversationHistory: hasConversationHistory, settingsService: settingsService, loggingService: loggingService, historyService: historyService, onApprove: handleApprove, onReject: handleReject, sshInfo: sshInfo, undoMenuRef: undoMenuRef, onUndoSelect: handleUndoSelect, onSettingChange: applyRuntimeSetting })))));
|
|
169
239
|
};
|
|
170
240
|
export default App;
|
|
171
241
|
//# sourceMappingURL=app.js.map
|