@qduc/term2 0.3.1 → 0.4.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.map +1 -1
- package/dist/agent.js +46 -6
- package/dist/agent.js.map +1 -1
- package/dist/agent.test.d.ts +2 -0
- package/dist/agent.test.d.ts.map +1 -0
- package/dist/agent.test.js +198 -0
- package/dist/agent.test.js.map +1 -0
- package/dist/app.d.ts +5 -0
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +30 -14
- package/dist/app.js.map +1 -1
- package/dist/app.startup-banner.test.d.ts +2 -0
- package/dist/app.startup-banner.test.d.ts.map +1 -0
- package/dist/app.startup-banner.test.js +11 -0
- package/dist/app.startup-banner.test.js.map +1 -0
- package/dist/cli.d.ts +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +18 -3
- package/dist/cli.js.map +1 -1
- package/dist/components/ApprovalPrompt.d.ts.map +1 -1
- package/dist/components/ApprovalPrompt.js +10 -10
- package/dist/components/ApprovalPrompt.js.map +1 -1
- package/dist/components/Banner.js +1 -1
- package/dist/components/Banner.js.map +1 -1
- package/dist/components/BottomArea.d.ts.map +1 -1
- package/dist/components/BottomArea.js +3 -4
- package/dist/components/BottomArea.js.map +1 -1
- package/dist/components/ChatMessage.d.ts +1 -0
- package/dist/components/ChatMessage.d.ts.map +1 -1
- package/dist/components/ChatMessage.js +2 -2
- package/dist/components/ChatMessage.js.map +1 -1
- package/dist/components/CommandMessage.d.ts.map +1 -1
- package/dist/components/CommandMessage.js +48 -3
- package/dist/components/CommandMessage.js.map +1 -1
- package/dist/components/CommandMessage.test.js +90 -0
- package/dist/components/CommandMessage.test.js.map +1 -1
- package/dist/components/Input/PopupManager.d.ts +3 -0
- package/dist/components/Input/PopupManager.d.ts.map +1 -1
- package/dist/components/Input/PopupManager.js +2 -2
- package/dist/components/Input/PopupManager.js.map +1 -1
- package/dist/components/Input/insertions.d.ts.map +1 -1
- package/dist/components/Input/insertions.js +2 -2
- package/dist/components/Input/insertions.js.map +1 -1
- package/dist/components/Input/popup-key-navigation.d.ts +18 -0
- package/dist/components/Input/popup-key-navigation.d.ts.map +1 -0
- package/dist/components/Input/popup-key-navigation.js +16 -0
- package/dist/components/Input/popup-key-navigation.js.map +1 -0
- package/dist/components/Input/popup-key-navigation.test.d.ts +2 -0
- package/dist/components/Input/popup-key-navigation.test.d.ts.map +1 -0
- package/dist/components/Input/popup-key-navigation.test.js +73 -0
- package/dist/components/Input/popup-key-navigation.test.js.map +1 -0
- package/dist/components/Input/popup-props.d.ts.map +1 -1
- package/dist/components/Input/popup-props.js +2 -0
- package/dist/components/Input/popup-props.js.map +1 -1
- package/dist/components/Input/triggers.d.ts +1 -0
- package/dist/components/Input/triggers.d.ts.map +1 -1
- package/dist/components/Input/triggers.js +1 -0
- package/dist/components/Input/triggers.js.map +1 -1
- package/dist/components/InputBox.d.ts.map +1 -1
- package/dist/components/InputBox.js +130 -6
- package/dist/components/InputBox.js.map +1 -1
- package/dist/components/InputBox.test.js +42 -1
- package/dist/components/InputBox.test.js.map +1 -1
- package/dist/components/LiveResponse.d.ts +1 -3
- package/dist/components/LiveResponse.d.ts.map +1 -1
- package/dist/components/LiveResponse.js +5 -6
- package/dist/components/LiveResponse.js.map +1 -1
- package/dist/components/MarkdownRenderer.d.ts +5 -2
- package/dist/components/MarkdownRenderer.d.ts.map +1 -1
- package/dist/components/MarkdownRenderer.js +66 -45
- package/dist/components/MarkdownRenderer.js.map +1 -1
- package/dist/components/MessageList.d.ts +7 -1
- package/dist/components/MessageList.d.ts.map +1 -1
- package/dist/components/MessageList.js +98 -23
- package/dist/components/MessageList.js.map +1 -1
- package/dist/components/MessageList.test.js +177 -4
- package/dist/components/MessageList.test.js.map +1 -1
- package/dist/components/ModelSelectionMenu.d.ts.map +1 -1
- package/dist/components/ModelSelectionMenu.js +54 -14
- package/dist/components/ModelSelectionMenu.js.map +1 -1
- package/dist/components/PathSelectionMenu.d.ts +2 -0
- package/dist/components/PathSelectionMenu.d.ts.map +1 -1
- package/dist/components/PathSelectionMenu.js +31 -12
- package/dist/components/PathSelectionMenu.js.map +1 -1
- package/dist/components/SettingsSelectionMenu.d.ts +1 -0
- package/dist/components/SettingsSelectionMenu.d.ts.map +1 -1
- package/dist/components/SettingsSelectionMenu.js +32 -23
- package/dist/components/SettingsSelectionMenu.js.map +1 -1
- package/dist/components/SettingsSelectionMenu.scroll.test.d.ts +2 -0
- package/dist/components/SettingsSelectionMenu.scroll.test.d.ts.map +1 -0
- package/dist/components/SettingsSelectionMenu.scroll.test.js +23 -0
- package/dist/components/SettingsSelectionMenu.scroll.test.js.map +1 -0
- package/dist/components/StatusBar.d.ts.map +1 -1
- package/dist/components/StatusBar.js +14 -14
- package/dist/components/StatusBar.js.map +1 -1
- package/dist/components/StatusBar.test.d.ts +2 -0
- package/dist/components/StatusBar.test.d.ts.map +1 -0
- package/dist/components/StatusBar.test.js +30 -0
- package/dist/components/StatusBar.test.js.map +1 -0
- package/dist/contracts/conversation.d.ts +1 -0
- package/dist/contracts/conversation.d.ts.map +1 -1
- package/dist/env-setup.d.ts +2 -0
- package/dist/env-setup.d.ts.map +1 -0
- package/dist/env-setup.js +7 -0
- package/dist/env-setup.js.map +1 -0
- package/dist/env-setup.test.d.ts +2 -0
- package/dist/env-setup.test.d.ts.map +1 -0
- package/dist/env-setup.test.js +6 -0
- package/dist/env-setup.test.js.map +1 -0
- package/dist/hooks/path-completion-filter.d.ts +4 -0
- package/dist/hooks/path-completion-filter.d.ts.map +1 -0
- package/dist/hooks/path-completion-filter.js +27 -0
- package/dist/hooks/path-completion-filter.js.map +1 -0
- package/dist/hooks/path-completion-filter.test.d.ts +2 -0
- package/dist/hooks/path-completion-filter.test.d.ts.map +1 -0
- package/dist/hooks/path-completion-filter.test.js +100 -0
- package/dist/hooks/path-completion-filter.test.js.map +1 -0
- package/dist/hooks/use-app-commands.d.ts +3 -1
- package/dist/hooks/use-app-commands.d.ts.map +1 -1
- package/dist/hooks/use-app-commands.js +74 -6
- package/dist/hooks/use-app-commands.js.map +1 -1
- package/dist/hooks/use-app-commands.test.js +20 -3
- package/dist/hooks/use-app-commands.test.js.map +1 -1
- package/dist/hooks/use-conversation.d.ts +4 -9
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +32 -57
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/hooks/use-mode-handlers.d.ts +3 -1
- package/dist/hooks/use-mode-handlers.d.ts.map +1 -1
- package/dist/hooks/use-mode-handlers.js +8 -0
- package/dist/hooks/use-mode-handlers.js.map +1 -1
- package/dist/hooks/use-model-selection.d.ts +1 -1
- package/dist/hooks/use-model-selection.d.ts.map +1 -1
- package/dist/hooks/use-model-selection.js +31 -16
- package/dist/hooks/use-model-selection.js.map +1 -1
- package/dist/hooks/use-model-selection.test.js +66 -1
- package/dist/hooks/use-model-selection.test.js.map +1 -1
- package/dist/hooks/use-path-completion.d.ts +1 -0
- package/dist/hooks/use-path-completion.d.ts.map +1 -1
- package/dist/hooks/use-path-completion.js +22 -17
- package/dist/hooks/use-path-completion.js.map +1 -1
- package/dist/hooks/use-settings-completion.d.ts +2 -2
- package/dist/hooks/use-settings-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-completion.js +53 -18
- package/dist/hooks/use-settings-completion.js.map +1 -1
- package/dist/hooks/use-settings-completion.scroll.test.d.ts +2 -0
- package/dist/hooks/use-settings-completion.scroll.test.d.ts.map +1 -0
- package/dist/hooks/use-settings-completion.scroll.test.js +55 -0
- package/dist/hooks/use-settings-completion.scroll.test.js.map +1 -0
- package/dist/hooks/use-settings-completion.test.js +69 -79
- package/dist/hooks/use-settings-completion.test.js.map +1 -1
- package/dist/hooks/use-settings-value-completion.d.ts +1 -2
- package/dist/hooks/use-settings-value-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-value-completion.js +47 -19
- package/dist/hooks/use-settings-value-completion.js.map +1 -1
- package/dist/hooks/use-settings-value-completion.test.js +5 -18
- package/dist/hooks/use-settings-value-completion.test.js.map +1 -1
- package/dist/hooks/use-slash-commands.d.ts +7 -0
- package/dist/hooks/use-slash-commands.d.ts.map +1 -1
- package/dist/hooks/use-slash-commands.js +20 -13
- package/dist/hooks/use-slash-commands.js.map +1 -1
- package/dist/hooks/use-slash-commands.test.js +52 -1
- package/dist/hooks/use-slash-commands.test.js.map +1 -1
- package/dist/hooks/use-trigger-detection.d.ts.map +1 -1
- package/dist/hooks/use-trigger-detection.js +7 -3
- package/dist/hooks/use-trigger-detection.js.map +1 -1
- package/dist/hooks/use-trigger-detection.test.d.ts +2 -0
- package/dist/hooks/use-trigger-detection.test.d.ts.map +1 -0
- package/dist/hooks/use-trigger-detection.test.js +59 -0
- package/dist/hooks/use-trigger-detection.test.js.map +1 -0
- package/dist/lib/openai-agent-client.d.ts +21 -0
- package/dist/lib/openai-agent-client.d.ts.map +1 -1
- package/dist/lib/openai-agent-client.js +52 -17
- package/dist/lib/openai-agent-client.js.map +1 -1
- package/dist/lib/openai-agent-client.test.js +63 -0
- package/dist/lib/openai-agent-client.test.js.map +1 -1
- package/dist/lib/tool-invoke.d.ts +3 -2
- package/dist/lib/tool-invoke.d.ts.map +1 -1
- package/dist/lib/tool-invoke.js +69 -4
- package/dist/lib/tool-invoke.js.map +1 -1
- package/dist/lib/tool-invoke.test.js +25 -0
- package/dist/lib/tool-invoke.test.js.map +1 -1
- package/dist/non-interactive.d.ts.map +1 -1
- package/dist/non-interactive.js +3 -0
- package/dist/non-interactive.js.map +1 -1
- package/dist/prompts/gpt-5-modern.md +66 -0
- package/dist/prompts/gpt-5.md +10 -0
- package/dist/prompts/lite.md +10 -27
- package/dist/prompts/prompt-selector.js +2 -2
- package/dist/prompts/prompt-selector.js.map +1 -1
- package/dist/prompts/prompt-selector.test.js +7 -2
- package/dist/prompts/prompt-selector.test.js.map +1 -1
- package/dist/prompts/prompt-selector.test.ts +22 -2
- package/dist/prompts/prompt-selector.ts +2 -2
- package/dist/prompts/search-via-shell.d.ts +7 -0
- package/dist/prompts/search-via-shell.d.ts.map +1 -0
- package/dist/prompts/search-via-shell.js +59 -0
- package/dist/prompts/search-via-shell.js.map +1 -0
- package/dist/prompts/search-via-shell.test.d.ts +2 -0
- package/dist/prompts/search-via-shell.test.d.ts.map +1 -0
- package/dist/prompts/search-via-shell.test.js +40 -0
- package/dist/prompts/search-via-shell.test.js.map +1 -0
- package/dist/prompts/search-via-shell.test.ts +47 -0
- package/dist/prompts/search-via-shell.ts +71 -0
- package/dist/prompts/simple.md +40 -186
- package/dist/providers/ai-sdk-agents-adapter.d.ts +7 -0
- package/dist/providers/ai-sdk-agents-adapter.d.ts.map +1 -0
- package/dist/providers/ai-sdk-agents-adapter.js +80 -0
- package/dist/providers/ai-sdk-agents-adapter.js.map +1 -0
- package/dist/providers/ai-sdk-agents-adapter.test.d.ts +2 -0
- package/dist/providers/ai-sdk-agents-adapter.test.d.ts.map +1 -0
- package/dist/providers/ai-sdk-agents-adapter.test.js +158 -0
- package/dist/providers/ai-sdk-agents-adapter.test.js.map +1 -0
- package/dist/providers/ai-sdk-anthropic.provider.d.ts +14 -0
- package/dist/providers/ai-sdk-anthropic.provider.d.ts.map +1 -0
- package/dist/providers/ai-sdk-anthropic.provider.js +18 -0
- package/dist/providers/ai-sdk-anthropic.provider.js.map +1 -0
- package/dist/providers/ai-sdk-google.provider.d.ts +14 -0
- package/dist/providers/ai-sdk-google.provider.d.ts.map +1 -0
- package/dist/providers/ai-sdk-google.provider.js +18 -0
- package/dist/providers/ai-sdk-google.provider.js.map +1 -0
- package/dist/providers/ai-sdk-logging-fetch.d.ts +11 -0
- package/dist/providers/ai-sdk-logging-fetch.d.ts.map +1 -0
- package/dist/providers/ai-sdk-logging-fetch.js +127 -0
- package/dist/providers/ai-sdk-logging-fetch.js.map +1 -0
- package/dist/providers/ai-sdk-logging-fetch.test.d.ts +2 -0
- package/dist/providers/ai-sdk-logging-fetch.test.d.ts.map +1 -0
- package/dist/providers/ai-sdk-logging-fetch.test.js +107 -0
- package/dist/providers/ai-sdk-logging-fetch.test.js.map +1 -0
- package/dist/providers/ai-sdk-message-normalizer.d.ts +2 -2
- package/dist/providers/ai-sdk-message-normalizer.d.ts.map +1 -1
- package/dist/providers/ai-sdk-message-normalizer.js +92 -47
- package/dist/providers/ai-sdk-message-normalizer.js.map +1 -1
- package/dist/providers/ai-sdk-message-normalizer.test.js +256 -16
- package/dist/providers/ai-sdk-message-normalizer.test.js.map +1 -1
- package/dist/providers/ai-sdk-openai-compatible.provider.d.ts +2 -0
- package/dist/providers/ai-sdk-openai-compatible.provider.d.ts.map +1 -1
- package/dist/providers/ai-sdk-openai-compatible.provider.js +3 -3
- package/dist/providers/ai-sdk-openai-compatible.provider.js.map +1 -1
- package/dist/providers/ai-sdk-openai-compatible.provider.test.js +25 -0
- package/dist/providers/ai-sdk-openai-compatible.provider.test.js.map +1 -1
- package/dist/providers/ai-sdk-openrouter.provider.d.ts +1 -1
- package/dist/providers/ai-sdk-openrouter.provider.d.ts.map +1 -1
- package/dist/providers/ai-sdk-openrouter.provider.js +2 -3
- package/dist/providers/ai-sdk-openrouter.provider.js.map +1 -1
- package/dist/providers/ai-sdk-openrouter.provider.test.js +23 -0
- package/dist/providers/ai-sdk-openrouter.provider.test.js.map +1 -1
- package/dist/providers/common/openai-compatible-messages.d.ts +1 -2
- package/dist/providers/common/openai-compatible-messages.d.ts.map +1 -1
- package/dist/providers/common/openai-compatible-messages.js +22 -48
- package/dist/providers/common/openai-compatible-messages.js.map +1 -1
- package/dist/providers/common/openai-compatible-messages.test.js +93 -1
- package/dist/providers/common/openai-compatible-messages.test.js.map +1 -1
- package/dist/providers/custom-provider-adapter.test.d.ts +2 -0
- package/dist/providers/custom-provider-adapter.test.d.ts.map +1 -0
- package/dist/providers/custom-provider-adapter.test.js +52 -0
- package/dist/providers/custom-provider-adapter.test.js.map +1 -0
- package/dist/providers/openai-compatible-behavior-gate.test.d.ts +2 -0
- package/dist/providers/openai-compatible-behavior-gate.test.d.ts.map +1 -0
- package/dist/providers/openai-compatible-behavior-gate.test.js +216 -0
- package/dist/providers/openai-compatible-behavior-gate.test.js.map +1 -0
- package/dist/providers/openai-compatible.provider.d.ts +10 -1
- package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
- package/dist/providers/openai-compatible.provider.js +341 -31
- package/dist/providers/openai-compatible.provider.js.map +1 -1
- package/dist/providers/openai-compatible.provider.test.d.ts +2 -0
- package/dist/providers/openai-compatible.provider.test.d.ts.map +1 -0
- package/dist/providers/openai-compatible.provider.test.js +462 -0
- package/dist/providers/openai-compatible.provider.test.js.map +1 -0
- package/dist/providers/openai.provider.js +2 -1
- package/dist/providers/openai.provider.js.map +1 -1
- package/dist/providers/openai.provider.test.d.ts +2 -0
- package/dist/providers/openai.provider.test.d.ts.map +1 -0
- package/dist/providers/openai.provider.test.js +22 -0
- package/dist/providers/openai.provider.test.js.map +1 -0
- package/dist/providers/openrouter.provider.js +28 -2
- package/dist/providers/openrouter.provider.js.map +1 -1
- package/dist/scripts/eval-auto-approval/dataset.d.ts +1 -1
- package/dist/services/conversation-events.d.ts +3 -0
- package/dist/services/conversation-events.d.ts.map +1 -1
- package/dist/services/conversation-result-builder.d.ts.map +1 -1
- package/dist/services/conversation-result-builder.js +11 -1
- package/dist/services/conversation-result-builder.js.map +1 -1
- package/dist/services/conversation-result-builder.test.js +72 -0
- package/dist/services/conversation-result-builder.test.js.map +1 -1
- package/dist/services/conversation-session.d.ts +2 -1
- package/dist/services/conversation-session.d.ts.map +1 -1
- package/dist/services/conversation-session.js +30 -1
- package/dist/services/conversation-session.js.map +1 -1
- package/dist/services/file-service.js +1 -1
- package/dist/services/file-service.js.map +1 -1
- package/dist/services/logging-contract.d.ts +3 -3
- package/dist/services/logging-service.d.ts.map +1 -1
- package/dist/services/logging-service.js +18 -1
- package/dist/services/logging-service.js.map +1 -1
- package/dist/services/model-service.d.ts.map +1 -1
- package/dist/services/model-service.js +16 -8
- package/dist/services/model-service.js.map +1 -1
- package/dist/services/model-service.test.js +67 -1
- package/dist/services/model-service.test.js.map +1 -1
- package/dist/services/rtk-service.d.ts +23 -0
- package/dist/services/rtk-service.d.ts.map +1 -0
- package/dist/services/rtk-service.js +165 -0
- package/dist/services/rtk-service.js.map +1 -0
- package/dist/services/rtk-service.test.d.ts +2 -0
- package/dist/services/rtk-service.test.d.ts.map +1 -0
- package/dist/services/rtk-service.test.js +239 -0
- package/dist/services/rtk-service.test.js.map +1 -0
- package/dist/services/settings-persistence.d.ts +1 -0
- package/dist/services/settings-persistence.d.ts.map +1 -1
- package/dist/services/settings-persistence.js +28 -5
- package/dist/services/settings-persistence.js.map +1 -1
- package/dist/services/settings-persistence.test.js +55 -3
- package/dist/services/settings-persistence.test.js.map +1 -1
- package/dist/services/settings-schema.d.ts +55 -16
- package/dist/services/settings-schema.d.ts.map +1 -1
- package/dist/services/settings-schema.js +35 -4
- package/dist/services/settings-schema.js.map +1 -1
- package/dist/services/settings-schema.test.d.ts +2 -0
- package/dist/services/settings-schema.test.d.ts.map +1 -0
- package/dist/services/settings-schema.test.js +77 -0
- package/dist/services/settings-schema.test.js.map +1 -0
- package/dist/services/settings-service.d.ts.map +1 -1
- package/dist/services/settings-service.js +7 -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 +1 -0
- package/dist/services/settings-sources.js.map +1 -1
- package/dist/services/shell-auto-approval-evaluator.d.ts +1 -1
- package/dist/services/shell-auto-approval-evaluator.d.ts.map +1 -1
- package/dist/services/shell-auto-approval-evaluator.js +8 -2
- package/dist/services/shell-auto-approval-evaluator.js.map +1 -1
- package/dist/services/stream-event-processor.d.ts.map +1 -1
- package/dist/services/stream-event-processor.js +10 -8
- package/dist/services/stream-event-processor.js.map +1 -1
- package/dist/services/stream-event-processor.test.js +32 -0
- package/dist/services/stream-event-processor.test.js.map +1 -1
- package/dist/services/terminal-result-collector.d.ts.map +1 -1
- package/dist/services/terminal-result-collector.js +1 -0
- package/dist/services/terminal-result-collector.js.map +1 -1
- package/dist/services/terminal-result-collector.test.js +22 -0
- package/dist/services/terminal-result-collector.test.js.map +1 -1
- package/dist/tools/apply-patch.d.ts +12 -4
- package/dist/tools/apply-patch.d.ts.map +1 -1
- package/dist/tools/apply-patch.js +204 -208
- package/dist/tools/apply-patch.js.map +1 -1
- package/dist/tools/apply-patch.test.js +44 -0
- package/dist/tools/apply-patch.test.js.map +1 -1
- package/dist/tools/code-context.d.ts +27 -0
- package/dist/tools/code-context.d.ts.map +1 -0
- package/dist/tools/code-context.js +512 -0
- package/dist/tools/code-context.js.map +1 -0
- package/dist/tools/code-context.test.d.ts +2 -0
- package/dist/tools/code-context.test.d.ts.map +1 -0
- package/dist/tools/code-context.test.js +368 -0
- package/dist/tools/code-context.test.js.map +1 -0
- package/dist/tools/create-file.d.ts.map +1 -1
- package/dist/tools/create-file.js +3 -2
- package/dist/tools/create-file.js.map +1 -1
- package/dist/tools/edit-healing.d.ts +4 -3
- package/dist/tools/edit-healing.d.ts.map +1 -1
- package/dist/tools/edit-healing.js +50 -20
- package/dist/tools/edit-healing.js.map +1 -1
- package/dist/tools/edit-healing.test.js +62 -0
- package/dist/tools/edit-healing.test.js.map +1 -1
- package/dist/tools/file-locks.d.ts +2 -0
- package/dist/tools/file-locks.d.ts.map +1 -0
- package/dist/tools/file-locks.js +21 -0
- package/dist/tools/file-locks.js.map +1 -0
- package/dist/tools/find-files.d.ts +1 -0
- package/dist/tools/find-files.d.ts.map +1 -1
- package/dist/tools/find-files.js +59 -139
- package/dist/tools/find-files.js.map +1 -1
- package/dist/tools/find-files.test.js +5 -10
- 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 +10 -46
- package/dist/tools/grep.js.map +1 -1
- package/dist/tools/language-providers.d.ts +48 -0
- package/dist/tools/language-providers.d.ts.map +1 -0
- package/dist/tools/language-providers.js +244 -0
- package/dist/tools/language-providers.js.map +1 -0
- package/dist/tools/search-replace.d.ts +5 -2
- package/dist/tools/search-replace.d.ts.map +1 -1
- package/dist/tools/search-replace.js +201 -106
- package/dist/tools/search-replace.js.map +1 -1
- package/dist/tools/search-replace.test.js +111 -1
- package/dist/tools/search-replace.test.js.map +1 -1
- package/dist/tools/search.d.ts.map +1 -1
- package/dist/tools/search.js +5 -15
- package/dist/tools/search.js.map +1 -1
- package/dist/tools/shell.d.ts +2 -0
- package/dist/tools/shell.d.ts.map +1 -1
- package/dist/tools/shell.js +15 -7
- package/dist/tools/shell.js.map +1 -1
- package/dist/tools/shell.test.js +28 -0
- package/dist/tools/shell.test.js.map +1 -1
- package/dist/tools/tool-names.d.ts +3 -0
- package/dist/tools/tool-names.d.ts.map +1 -1
- package/dist/tools/tool-names.js +3 -0
- package/dist/tools/tool-names.js.map +1 -1
- package/dist/tools/tool-names.test.js +4 -1
- package/dist/tools/tool-names.test.js.map +1 -1
- package/dist/tools/tool-parameter-schema.test.js +18 -0
- package/dist/tools/tool-parameter-schema.test.js.map +1 -1
- package/dist/utils/command-safety/constants.d.ts.map +1 -1
- package/dist/utils/command-safety/constants.js +30 -5
- package/dist/utils/command-safety/constants.js.map +1 -1
- package/dist/utils/command-safety/index.d.ts.map +1 -1
- package/dist/utils/command-safety/index.js +3 -0
- package/dist/utils/command-safety/index.js.map +1 -1
- package/dist/utils/command-safety/path-analysis.d.ts.map +1 -1
- package/dist/utils/command-safety/path-analysis.js +8 -0
- package/dist/utils/command-safety/path-analysis.js.map +1 -1
- package/dist/utils/command-safety.find.test.js +1 -1
- package/dist/utils/command-safety.find.test.js.map +1 -1
- package/dist/utils/command-safety.path.test.js +14 -0
- package/dist/utils/command-safety.path.test.js.map +1 -1
- package/dist/utils/command-safety.specialized-handlers.test.d.ts +2 -0
- package/dist/utils/command-safety.specialized-handlers.test.d.ts.map +1 -0
- package/dist/utils/command-safety.specialized-handlers.test.js +20 -0
- package/dist/utils/command-safety.specialized-handlers.test.js.map +1 -0
- package/dist/utils/conversation-event-handler.d.ts +8 -6
- package/dist/utils/conversation-event-handler.d.ts.map +1 -1
- package/dist/utils/conversation-event-handler.js +166 -46
- package/dist/utils/conversation-event-handler.js.map +1 -1
- package/dist/utils/conversation-event-handler.test.js +391 -12
- package/dist/utils/conversation-event-handler.test.js.map +1 -1
- package/dist/utils/conversation-utils.d.ts +2 -0
- package/dist/utils/conversation-utils.d.ts.map +1 -1
- package/dist/utils/conversation-utils.js +2 -0
- package/dist/utils/conversation-utils.js.map +1 -1
- package/dist/utils/execute-shell.d.ts +5 -6
- package/dist/utils/execute-shell.d.ts.map +1 -1
- package/dist/utils/execute-shell.js +21 -11
- package/dist/utils/execute-shell.js.map +1 -1
- package/dist/utils/execute-shell.test.js +37 -6
- package/dist/utils/execute-shell.test.js.map +1 -1
- package/dist/utils/extract-command-messages.d.ts.map +1 -1
- package/dist/utils/extract-command-messages.js +4 -1
- package/dist/utils/extract-command-messages.js.map +1 -1
- package/dist/utils/flex-service-tier.d.ts +2 -0
- package/dist/utils/flex-service-tier.d.ts.map +1 -0
- package/dist/utils/flex-service-tier.js +20 -0
- package/dist/utils/flex-service-tier.js.map +1 -0
- package/dist/utils/flex-service-tier.test.d.ts +2 -0
- package/dist/utils/flex-service-tier.test.d.ts.map +1 -0
- package/dist/utils/flex-service-tier.test.js +25 -0
- package/dist/utils/flex-service-tier.test.js.map +1 -0
- package/dist/utils/log-truncation.d.ts +4 -2
- package/dist/utils/log-truncation.d.ts.map +1 -1
- package/dist/utils/log-truncation.js +143 -41
- package/dist/utils/log-truncation.js.map +1 -1
- package/dist/utils/log-truncation.test.js +131 -1
- package/dist/utils/log-truncation.test.js.map +1 -1
- package/dist/utils/project-tree.d.ts +14 -0
- package/dist/utils/project-tree.d.ts.map +1 -0
- package/dist/utils/project-tree.js +111 -0
- package/dist/utils/project-tree.js.map +1 -0
- package/dist/utils/project-tree.test.d.ts +2 -0
- package/dist/utils/project-tree.test.d.ts.map +1 -0
- package/dist/utils/project-tree.test.js +149 -0
- package/dist/utils/project-tree.test.js.map +1 -0
- package/dist/utils/provider-traffic-extractor.d.ts.map +1 -1
- package/dist/utils/provider-traffic-extractor.js +0 -1
- package/dist/utils/provider-traffic-extractor.js.map +1 -1
- package/dist/utils/streaming-session-factory.d.ts +1 -3
- package/dist/utils/streaming-session-factory.d.ts.map +1 -1
- package/dist/utils/streaming-session-factory.js +29 -10
- package/dist/utils/streaming-session-factory.js.map +1 -1
- package/dist/utils/streaming-session-factory.test.js +47 -15
- package/dist/utils/streaming-session-factory.test.js.map +1 -1
- package/dist/utils/subsequence-filter.d.ts +8 -0
- package/dist/utils/subsequence-filter.d.ts.map +1 -0
- package/dist/utils/subsequence-filter.js +47 -0
- package/dist/utils/subsequence-filter.js.map +1 -0
- package/dist/utils/terminal-clear.d.ts +7 -0
- package/dist/utils/terminal-clear.d.ts.map +1 -0
- package/dist/utils/terminal-clear.js +5 -0
- package/dist/utils/terminal-clear.js.map +1 -0
- package/dist/utils/terminal-clear.test.d.ts +2 -0
- package/dist/utils/terminal-clear.test.d.ts.map +1 -0
- package/dist/utils/terminal-clear.test.js +13 -0
- package/dist/utils/terminal-clear.test.js.map +1 -0
- package/dist/utils/token-usage.d.ts +13 -1
- package/dist/utils/token-usage.d.ts.map +1 -1
- package/dist/utils/token-usage.js +119 -28
- package/dist/utils/token-usage.js.map +1 -1
- package/dist/utils/token-usage.test.js +135 -3
- package/dist/utils/token-usage.test.js.map +1 -1
- package/package.json +4 -4
- package/dist/providers/openai-compatible/api.d.ts +0 -17
- package/dist/providers/openai-compatible/api.d.ts.map +0 -1
- package/dist/providers/openai-compatible/api.js +0 -58
- package/dist/providers/openai-compatible/api.js.map +0 -1
- package/dist/providers/openai-compatible/model.d.ts +0 -17
- package/dist/providers/openai-compatible/model.d.ts.map +0 -1
- package/dist/providers/openai-compatible/model.js +0 -473
- package/dist/providers/openai-compatible/model.js.map +0 -1
- package/dist/providers/openai-compatible/provider.d.ts +0 -22
- package/dist/providers/openai-compatible/provider.d.ts.map +0 -1
- package/dist/providers/openai-compatible/provider.js +0 -43
- package/dist/providers/openai-compatible/provider.js.map +0 -1
- package/dist/providers/openai-compatible/reasoning-content.test.d.ts +0 -2
- package/dist/providers/openai-compatible/reasoning-content.test.d.ts.map +0 -1
- package/dist/providers/openai-compatible/reasoning-content.test.js +0 -258
- package/dist/providers/openai-compatible/reasoning-content.test.js.map +0 -1
- package/dist/providers/openai-compatible/utils.d.ts +0 -3
- package/dist/providers/openai-compatible/utils.d.ts.map +0 -1
- package/dist/providers/openai-compatible/utils.js +0 -11
- package/dist/providers/openai-compatible/utils.js.map +0 -1
- package/dist/providers/openrouter/api.d.ts +0 -39
- package/dist/providers/openrouter/api.d.ts.map +0 -1
- package/dist/providers/openrouter/api.js +0 -164
- package/dist/providers/openrouter/api.js.map +0 -1
- package/dist/providers/openrouter/converters.d.ts +0 -8
- package/dist/providers/openrouter/converters.d.ts.map +0 -1
- package/dist/providers/openrouter/converters.js +0 -391
- package/dist/providers/openrouter/converters.js.map +0 -1
- package/dist/providers/openrouter/converters.test.d.ts +0 -2
- package/dist/providers/openrouter/converters.test.d.ts.map +0 -1
- package/dist/providers/openrouter/converters.test.js +0 -179
- package/dist/providers/openrouter/converters.test.js.map +0 -1
- package/dist/providers/openrouter/index.d.ts +0 -4
- package/dist/providers/openrouter/index.d.ts.map +0 -1
- package/dist/providers/openrouter/index.js +0 -4
- package/dist/providers/openrouter/index.js.map +0 -1
- package/dist/providers/openrouter/model.d.ts +0 -14
- package/dist/providers/openrouter/model.d.ts.map +0 -1
- package/dist/providers/openrouter/model.js +0 -457
- package/dist/providers/openrouter/model.js.map +0 -1
- package/dist/providers/openrouter/provider.d.ts +0 -15
- package/dist/providers/openrouter/provider.d.ts.map +0 -1
- package/dist/providers/openrouter/provider.js +0 -21
- package/dist/providers/openrouter/provider.js.map +0 -1
- package/dist/providers/openrouter/reasoning-content.test.d.ts +0 -2
- package/dist/providers/openrouter/reasoning-content.test.d.ts.map +0 -1
- package/dist/providers/openrouter/reasoning-content.test.js +0 -122
- package/dist/providers/openrouter/reasoning-content.test.js.map +0 -1
- package/dist/providers/openrouter/utils.d.ts +0 -11
- package/dist/providers/openrouter/utils.d.ts.map +0 -1
- package/dist/providers/openrouter/utils.js +0 -29
- package/dist/providers/openrouter/utils.js.map +0 -1
- package/dist/providers/openrouter.api.retry.test.d.ts +0 -2
- package/dist/providers/openrouter.api.retry.test.d.ts.map +0 -1
- package/dist/providers/openrouter.api.retry.test.js +0 -148
- package/dist/providers/openrouter.api.retry.test.js.map +0 -1
- package/dist/providers/openrouter.test.d.ts +0 -2
- package/dist/providers/openrouter.test.d.ts.map +0 -1
- package/dist/providers/openrouter.test.js +0 -1449
- package/dist/providers/openrouter.test.js.map +0 -1
|
@@ -1,21 +1,31 @@
|
|
|
1
1
|
import { exec } from 'child_process';
|
|
2
|
-
import util from 'util';
|
|
3
2
|
import process from 'process';
|
|
4
|
-
const
|
|
3
|
+
const defaultExecImpl = exec;
|
|
5
4
|
export async function executeShellCommand(command, options = {}) {
|
|
6
|
-
const { cwd = process.cwd(), timeout, maxBuffer, sshService, execImpl =
|
|
5
|
+
const { cwd = process.cwd(), timeout, maxBuffer, sshService, execImpl = defaultExecImpl } = options;
|
|
7
6
|
if (sshService) {
|
|
8
7
|
return sshService.executeCommand(command, { cwd });
|
|
9
8
|
}
|
|
10
9
|
try {
|
|
11
|
-
const result = await
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
10
|
+
const result = await new Promise((resolve, reject) => {
|
|
11
|
+
const child = execImpl(command, {
|
|
12
|
+
cwd,
|
|
13
|
+
timeout,
|
|
14
|
+
maxBuffer,
|
|
15
|
+
}, (error, stdout, stderr) => {
|
|
16
|
+
if (error) {
|
|
17
|
+
error.stdout = stdout;
|
|
18
|
+
error.stderr = stderr;
|
|
19
|
+
reject(error);
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
resolve({ stdout, stderr });
|
|
23
|
+
});
|
|
24
|
+
child.stdin?.end();
|
|
15
25
|
});
|
|
16
26
|
return {
|
|
17
|
-
stdout: result.stdout ?? '',
|
|
18
|
-
stderr: result.stderr ?? '',
|
|
27
|
+
stdout: result.stdout?.toString() ?? '',
|
|
28
|
+
stderr: result.stderr?.toString() ?? '',
|
|
19
29
|
exitCode: 0,
|
|
20
30
|
timedOut: false,
|
|
21
31
|
};
|
|
@@ -24,8 +34,8 @@ export async function executeShellCommand(command, options = {}) {
|
|
|
24
34
|
const exitCode = typeof error?.code === 'number' ? error.code : null;
|
|
25
35
|
const timedOut = Boolean(error?.killed || error?.signal === 'SIGTERM');
|
|
26
36
|
return {
|
|
27
|
-
stdout: error?.stdout ?? '',
|
|
28
|
-
stderr: error?.stderr ?? '',
|
|
37
|
+
stdout: error?.stdout?.toString() ?? '',
|
|
38
|
+
stderr: error?.stderr?.toString() ?? '',
|
|
29
39
|
exitCode,
|
|
30
40
|
timedOut,
|
|
31
41
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-shell.js","sourceRoot":"","sources":["../../source/utils/execute-shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"execute-shell.js","sourceRoot":"","sources":["../../source/utils/execute-shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAqB,MAAM,eAAe,CAAC;AACxD,OAAO,OAAO,MAAM,SAAS,CAAC;AAU9B,MAAM,eAAe,GAAa,IAAI,CAAC;AAmBvC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAe,EACf,UAA+B,EAAE;IAEjC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,GAAG,eAAe,EAAE,GAAG,OAAO,CAAC;IAEpG,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,OAAO,CAAyD,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3G,MAAM,KAAK,GAAG,QAAQ,CACpB,OAAO,EACP;gBACE,GAAG;gBACH,OAAO;gBACP,SAAS;aACV,EACD,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBACxB,IAAI,KAAK,EAAE,CAAC;oBACV,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;oBACtB,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;oBACtB,MAAM,CAAC,KAAK,CAAC,CAAC;oBACd,OAAO;gBACT,CAAC;gBAED,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YAC9B,CAAC,CACF,CAAC;YAEF,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACvC,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,QAAQ,GAAG,OAAO,KAAK,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACrE,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,EAAE,MAAM,IAAI,KAAK,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC;QAEvE,OAAO;YACL,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACvC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACvC,QAAQ;YACR,QAAQ;SACT,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import test from 'ava';
|
|
2
|
+
import { PassThrough, Writable } from 'stream';
|
|
2
3
|
import { executeShellCommand } from './execute-shell.js';
|
|
3
4
|
test('executeShellCommand returns stdout and exit code for successful command', async (t) => {
|
|
4
5
|
const result = await executeShellCommand("printf 'hello'", {
|
|
5
|
-
execImpl:
|
|
6
|
+
execImpl: (_command, _options, callback) => {
|
|
7
|
+
queueMicrotask(() => callback(null, 'hello', ''));
|
|
8
|
+
return createFakeChildProcess();
|
|
9
|
+
},
|
|
6
10
|
});
|
|
7
11
|
t.is(result.stdout, 'hello');
|
|
8
12
|
t.is(result.stderr, '');
|
|
@@ -11,11 +15,11 @@ test('executeShellCommand returns stdout and exit code for successful command',
|
|
|
11
15
|
});
|
|
12
16
|
test('executeShellCommand captures stderr and exit code for failed command', async (t) => {
|
|
13
17
|
const result = await executeShellCommand('fails', {
|
|
14
|
-
execImpl:
|
|
18
|
+
execImpl: (_command, _options, callback) => {
|
|
15
19
|
const error = new Error('failed');
|
|
16
20
|
error.code = 2;
|
|
17
|
-
error
|
|
18
|
-
|
|
21
|
+
queueMicrotask(() => callback(error, '', 'oops\n'));
|
|
22
|
+
return createFakeChildProcess();
|
|
19
23
|
},
|
|
20
24
|
});
|
|
21
25
|
t.is(result.stderr.trim(), 'oops');
|
|
@@ -25,12 +29,39 @@ test('executeShellCommand captures stderr and exit code for failed command', asy
|
|
|
25
29
|
test('executeShellCommand reports timeouts', async (t) => {
|
|
26
30
|
const result = await executeShellCommand('long-running', {
|
|
27
31
|
timeout: 50,
|
|
28
|
-
execImpl:
|
|
32
|
+
execImpl: (_command, _options, callback) => {
|
|
29
33
|
const error = new Error('timeout');
|
|
30
34
|
error.signal = 'SIGTERM';
|
|
31
|
-
|
|
35
|
+
queueMicrotask(() => callback(error, '', ''));
|
|
36
|
+
return createFakeChildProcess();
|
|
32
37
|
},
|
|
33
38
|
});
|
|
34
39
|
t.true(result.timedOut);
|
|
35
40
|
});
|
|
41
|
+
test('executeShellCommand closes child stdin immediately', async (t) => {
|
|
42
|
+
let stdinEnded = false;
|
|
43
|
+
const result = await executeShellCommand('waits-for-stdin', {
|
|
44
|
+
execImpl: (_command, _options, callback) => {
|
|
45
|
+
const child = createFakeChildProcess();
|
|
46
|
+
child.stdin = new Writable({
|
|
47
|
+
write(_chunk, _encoding, next) {
|
|
48
|
+
next();
|
|
49
|
+
},
|
|
50
|
+
final(next) {
|
|
51
|
+
stdinEnded = true;
|
|
52
|
+
queueMicrotask(() => callback(null, '', ''));
|
|
53
|
+
next();
|
|
54
|
+
},
|
|
55
|
+
});
|
|
56
|
+
return child;
|
|
57
|
+
},
|
|
58
|
+
});
|
|
59
|
+
t.true(stdinEnded);
|
|
60
|
+
t.is(result.exitCode, 0);
|
|
61
|
+
});
|
|
62
|
+
function createFakeChildProcess() {
|
|
63
|
+
return {
|
|
64
|
+
stdin: new PassThrough(),
|
|
65
|
+
};
|
|
66
|
+
}
|
|
36
67
|
//# sourceMappingURL=execute-shell.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-shell.test.js","sourceRoot":"","sources":["../../source/utils/execute-shell.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,IAAI,CAAC,yEAAyE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC1F,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,gBAAgB,EAAE;QACzD,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"execute-shell.test.js","sourceRoot":"","sources":["../../source/utils/execute-shell.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-command-messages.d.ts","sourceRoot":"","sources":["../../source/utils/extract-command-messages.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"extract-command-messages.d.ts","sourceRoot":"","sources":["../../source/utils/extract-command-messages.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAkBxD,eAAO,MAAM,+BAA+B,GAAI,SAAS,MAAM,GAAG,IAAI,KAAG,IAKxE,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAO,IAEhD,CAAC;AAsDF,eAAO,MAAM,sBAAsB,GAAI,QAAO,GAAG,EAAO,KAAG,cAAc,EAqFxE,CAAC"}
|
|
@@ -6,7 +6,8 @@ import { formatSearchReplaceCommandMessage } from '../tools/search-replace.js';
|
|
|
6
6
|
import { formatAskMentorCommandMessage } from '../tools/ask-mentor.js';
|
|
7
7
|
import { formatReadFileCommandMessage } from '../tools/read-file.js';
|
|
8
8
|
import { formatFindFilesCommandMessage } from '../tools/find-files.js';
|
|
9
|
-
import { TOOL_NAME_APPLY_PATCH, TOOL_NAME_SEARCH_REPLACE } from '../tools/tool-names.js';
|
|
9
|
+
import { TOOL_NAME_APPLY_PATCH, TOOL_NAME_CODE_CONTEXT_SEARCH, TOOL_NAME_READ_CODE_OUTLINE, TOOL_NAME_SEARCH_REPLACE, } from '../tools/tool-names.js';
|
|
10
|
+
import { formatCodeContextSearchCommandMessage, formatReadCodeOutlineCommandMessage } from '../tools/code-context.js';
|
|
10
11
|
const approvalRejectionCallIds = new Set();
|
|
11
12
|
export const markToolCallAsApprovalRejection = (callId) => {
|
|
12
13
|
if (!callId) {
|
|
@@ -56,6 +57,8 @@ const toolFormatters = {
|
|
|
56
57
|
[TOOL_NAME_APPLY_PATCH]: formatApplyPatchCommandMessage,
|
|
57
58
|
read_file: formatReadFileCommandMessage,
|
|
58
59
|
find_files: formatFindFilesCommandMessage,
|
|
60
|
+
[TOOL_NAME_READ_CODE_OUTLINE]: formatReadCodeOutlineCommandMessage,
|
|
61
|
+
[TOOL_NAME_CODE_CONTEXT_SEARCH]: formatCodeContextSearchCommandMessage,
|
|
59
62
|
[TOOL_NAME_SEARCH_REPLACE]: formatSearchReplaceCommandMessage,
|
|
60
63
|
ask_mentor: formatAskMentorCommandMessage,
|
|
61
64
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-command-messages.js","sourceRoot":"","sources":["../../source/utils/extract-command-messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEtG,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,iCAAiC,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,
|
|
1
|
+
{"version":3,"file":"extract-command-messages.js","sourceRoot":"","sources":["../../source/utils/extract-command-messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flex-service-tier.d.ts","sourceRoot":"","sources":["../../source/utils/flex-service-tier.ts"],"names":[],"mappings":"AAmBA,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAKhE"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { APICallError } from '@ai-sdk/provider';
|
|
2
|
+
const getErrorText = (error) => {
|
|
3
|
+
if (APICallError.isInstance(error)) {
|
|
4
|
+
return [
|
|
5
|
+
error.message,
|
|
6
|
+
typeof error.responseBody === 'string' ? error.responseBody : '',
|
|
7
|
+
typeof error.data === 'string' ? error.data : '',
|
|
8
|
+
error.data && typeof error.data === 'object' ? JSON.stringify(error.data) : '',
|
|
9
|
+
].join('\n');
|
|
10
|
+
}
|
|
11
|
+
if (error instanceof Error) {
|
|
12
|
+
return error.message;
|
|
13
|
+
}
|
|
14
|
+
return String(error);
|
|
15
|
+
};
|
|
16
|
+
export function isFlexServiceTierTimeout(error) {
|
|
17
|
+
const text = getErrorText(error).toLowerCase();
|
|
18
|
+
return (/"error_type"\s*:\s*"timeout"/.test(text) && /"code"\s*:\s*504/.test(text) && text.includes('operation was aborted'));
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=flex-service-tier.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flex-service-tier.js","sourceRoot":"","sources":["../../source/utils/flex-service-tier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,YAAY,GAAG,CAAC,KAAc,EAAU,EAAE;IAC9C,IAAI,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO;YACL,KAAK,CAAC,OAAO;YACb,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE;YAChE,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAChD,KAAK,CAAC,IAAI,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;SAC/E,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IAED,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,UAAU,wBAAwB,CAAC,KAAc;IACrD,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IAC/C,OAAO,CACL,8BAA8B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CACrH,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flex-service-tier.test.d.ts","sourceRoot":"","sources":["../../source/utils/flex-service-tier.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import test from 'ava';
|
|
2
|
+
import { APICallError } from '@ai-sdk/provider';
|
|
3
|
+
import { isFlexServiceTierTimeout } from './flex-service-tier.js';
|
|
4
|
+
test('isFlexServiceTierTimeout detects OpenRouter 200 stream timeout payloads', (t) => {
|
|
5
|
+
const error = new APICallError({
|
|
6
|
+
message: 'OpenRouter stream failed',
|
|
7
|
+
url: 'https://openrouter.ai/api/v1/chat/completions',
|
|
8
|
+
requestBodyValues: {},
|
|
9
|
+
statusCode: 200,
|
|
10
|
+
responseBody: ': OPENROUTER PROCESSING\n\n' +
|
|
11
|
+
'data: {"error":{"code":504,"message":"The operation was aborted","metadata":{"error_type":"timeout"}}}\n\n',
|
|
12
|
+
});
|
|
13
|
+
t.true(isFlexServiceTierTimeout(error));
|
|
14
|
+
});
|
|
15
|
+
test('isFlexServiceTierTimeout ignores unrelated retryable errors', (t) => {
|
|
16
|
+
const error = new APICallError({
|
|
17
|
+
message: 'Rate limited',
|
|
18
|
+
url: 'https://openrouter.ai/api/v1/chat/completions',
|
|
19
|
+
requestBodyValues: {},
|
|
20
|
+
statusCode: 429,
|
|
21
|
+
responseBody: '{"error":{"code":429,"message":"Too many requests"}}',
|
|
22
|
+
});
|
|
23
|
+
t.false(isFlexServiceTierTimeout(error));
|
|
24
|
+
});
|
|
25
|
+
//# sourceMappingURL=flex-service-tier.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flex-service-tier.test.js","sourceRoot":"","sources":["../../source/utils/flex-service-tier.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAElE,IAAI,CAAC,yEAAyE,EAAE,CAAC,CAAC,EAAE,EAAE;IACpF,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC;QAC7B,OAAO,EAAE,0BAA0B;QACnC,GAAG,EAAE,+CAA+C;QACpD,iBAAiB,EAAE,EAAE;QACrB,UAAU,EAAE,GAAG;QACf,YAAY,EACV,6BAA6B;YAC7B,4GAA4G;KAC/G,CAAC,CAAC;IAEH,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6DAA6D,EAAE,CAAC,CAAC,EAAE,EAAE;IACxE,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC;QAC7B,OAAO,EAAE,cAAc;QACvB,GAAG,EAAE,+CAA+C;QACpD,iBAAiB,EAAE,EAAE;QACrB,UAAU,EAAE,GAAG;QACf,YAAY,EAAE,sDAAsD;KACrE,CAAC,CAAC;IAEH,CAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Truncates
|
|
3
|
-
*
|
|
2
|
+
* Truncates verbose data in log metadata to prevent log overflow.
|
|
3
|
+
* Targets: base64 images in messages, system/developer prompt content, tool descriptions,
|
|
4
|
+
* tool call arguments, and tool output.
|
|
4
5
|
*/
|
|
5
6
|
export declare function sanitizeLogMetadata(meta: Record<string, any>): Record<string, any>;
|
|
6
7
|
export declare function truncateImageData(meta: Record<string, any>): Record<string, any>;
|
|
8
|
+
export declare function truncateLogText(text: string, maxLen?: number): string;
|
|
7
9
|
//# sourceMappingURL=log-truncation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log-truncation.d.ts","sourceRoot":"","sources":["../../source/utils/log-truncation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"log-truncation.d.ts","sourceRoot":"","sources":["../../source/utils/log-truncation.ts"],"names":[],"mappings":"AAOA;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAgKlF;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAEhF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,SAAmB,GAAG,MAAM,CAY/E"}
|
|
@@ -1,66 +1,168 @@
|
|
|
1
1
|
const MAX_IMAGE_DATA_LEN = 100;
|
|
2
|
+
const MAX_SYSTEM_PROMPT_LEN = 20;
|
|
3
|
+
const MAX_TOOL_DESC_LEN = 20;
|
|
4
|
+
const MAX_TOOL_CALL_LEN = 20;
|
|
5
|
+
const MAX_TOOL_OUTPUT_LEN = 20;
|
|
6
|
+
const MAX_LOG_TEXT_LEN = 100;
|
|
2
7
|
/**
|
|
3
|
-
* Truncates
|
|
4
|
-
*
|
|
8
|
+
* Truncates verbose data in log metadata to prevent log overflow.
|
|
9
|
+
* Targets: base64 images in messages, system/developer prompt content, tool descriptions,
|
|
10
|
+
* tool call arguments, and tool output.
|
|
5
11
|
*/
|
|
6
12
|
export function sanitizeLogMetadata(meta) {
|
|
7
13
|
if (!meta || typeof meta !== 'object') {
|
|
8
14
|
return meta;
|
|
9
15
|
}
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
16
|
+
let result = meta;
|
|
17
|
+
// Truncate image data, system messages, tool calls, and tool output in messages
|
|
18
|
+
if (Array.isArray(result.messages)) {
|
|
19
|
+
let messagesModified = false;
|
|
20
|
+
const messages = result.messages.map((msg) => {
|
|
21
|
+
if (!msg || typeof msg !== 'object') {
|
|
22
|
+
return msg;
|
|
23
|
+
}
|
|
24
|
+
let newMsg = null;
|
|
25
|
+
// Truncate base64 images in content array items
|
|
26
|
+
if (Array.isArray(msg.content)) {
|
|
27
|
+
const newContent = msg.content.map((item) => {
|
|
28
|
+
if (!item || typeof item !== 'object') {
|
|
29
|
+
return item;
|
|
30
|
+
}
|
|
31
|
+
let itemModified = false;
|
|
32
|
+
const newItem = { ...item };
|
|
33
|
+
if (typeof newItem.image === 'string' && newItem.image.startsWith('data:image/')) {
|
|
34
|
+
newItem.image = truncateBase64(newItem.image);
|
|
35
|
+
itemModified = true;
|
|
36
|
+
}
|
|
37
|
+
if (newItem.image_url && typeof newItem.image_url === 'object' && !Array.isArray(newItem.image_url)) {
|
|
38
|
+
const imageUrl = newItem.image_url;
|
|
39
|
+
if (typeof imageUrl.url === 'string' && imageUrl.url.startsWith('data:image/')) {
|
|
40
|
+
newItem.image_url = {
|
|
41
|
+
...imageUrl,
|
|
42
|
+
url: truncateBase64(imageUrl.url),
|
|
43
|
+
};
|
|
44
|
+
itemModified = true;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return itemModified ? newItem : item;
|
|
48
|
+
});
|
|
49
|
+
const contentModified = newContent.some((item, index) => item !== msg.content[index]);
|
|
50
|
+
if (contentModified) {
|
|
51
|
+
newMsg = { ...msg, content: newContent };
|
|
52
|
+
}
|
|
21
53
|
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
54
|
+
// Truncate system/developer message string content
|
|
55
|
+
if ((msg.role === 'system' || msg.role === 'developer') &&
|
|
56
|
+
typeof msg.content === 'string' &&
|
|
57
|
+
msg.content.length > MAX_SYSTEM_PROMPT_LEN) {
|
|
58
|
+
const truncated = truncateString(msg.content, MAX_SYSTEM_PROMPT_LEN);
|
|
59
|
+
const base = newMsg ?? { ...msg };
|
|
60
|
+
newMsg = { ...base, content: truncated };
|
|
28
61
|
}
|
|
29
|
-
//
|
|
30
|
-
if (
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
62
|
+
// Omit reasoning fields from logs
|
|
63
|
+
if ('reasoning' in (newMsg ?? msg) || 'reasoning_content' in (newMsg ?? msg)) {
|
|
64
|
+
const base = newMsg ?? { ...msg };
|
|
65
|
+
delete base['reasoning'];
|
|
66
|
+
delete base['reasoning_content'];
|
|
67
|
+
newMsg = base;
|
|
68
|
+
}
|
|
69
|
+
// Truncate assistant tool call arguments
|
|
70
|
+
if (Array.isArray(msg.tool_calls)) {
|
|
71
|
+
const toolCalls = msg.tool_calls.map((toolCall) => {
|
|
72
|
+
if (!toolCall || typeof toolCall !== 'object') {
|
|
73
|
+
return toolCall;
|
|
74
|
+
}
|
|
75
|
+
const fn = toolCall.function;
|
|
76
|
+
if (!fn || typeof fn !== 'object') {
|
|
77
|
+
return toolCall;
|
|
78
|
+
}
|
|
79
|
+
let fnModified = false;
|
|
80
|
+
const newFn = { ...fn };
|
|
81
|
+
if (typeof newFn.arguments === 'string' && newFn.arguments.length > MAX_TOOL_CALL_LEN) {
|
|
82
|
+
newFn.arguments = truncateString(newFn.arguments, MAX_TOOL_CALL_LEN);
|
|
83
|
+
fnModified = true;
|
|
84
|
+
}
|
|
85
|
+
return fnModified ? { ...toolCall, function: newFn } : toolCall;
|
|
86
|
+
});
|
|
87
|
+
const toolCallsModified = toolCalls.some((toolCall, index) => toolCall !== msg.tool_calls[index]);
|
|
88
|
+
if (toolCallsModified) {
|
|
89
|
+
const base = newMsg ?? { ...msg };
|
|
90
|
+
newMsg = { ...base, tool_calls: toolCalls };
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
// Truncate tool output
|
|
94
|
+
if (msg.role === 'tool') {
|
|
95
|
+
const base = newMsg ?? { ...msg };
|
|
96
|
+
let toolMsgModified = false;
|
|
97
|
+
const updatedToolMsg = { ...base };
|
|
98
|
+
if (typeof updatedToolMsg.content === 'string' && updatedToolMsg.content.length > MAX_TOOL_OUTPUT_LEN) {
|
|
99
|
+
updatedToolMsg.content = truncateString(updatedToolMsg.content, MAX_TOOL_OUTPUT_LEN);
|
|
100
|
+
toolMsgModified = true;
|
|
101
|
+
}
|
|
102
|
+
for (const key of ['output', 'result', 'data']) {
|
|
103
|
+
if (typeof updatedToolMsg[key] === 'string' && updatedToolMsg[key].length > MAX_TOOL_OUTPUT_LEN) {
|
|
104
|
+
updatedToolMsg[key] = truncateString(updatedToolMsg[key], MAX_TOOL_OUTPUT_LEN);
|
|
105
|
+
toolMsgModified = true;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
if (toolMsgModified) {
|
|
109
|
+
newMsg = updatedToolMsg;
|
|
38
110
|
}
|
|
39
111
|
}
|
|
40
|
-
return
|
|
112
|
+
return newMsg ?? msg;
|
|
41
113
|
});
|
|
42
|
-
|
|
43
|
-
if (
|
|
44
|
-
|
|
114
|
+
messagesModified = messages.some((msg, index) => msg !== result.messages[index]);
|
|
115
|
+
if (messagesModified) {
|
|
116
|
+
result = { ...result, messages };
|
|
45
117
|
}
|
|
46
|
-
messagesModified = true;
|
|
47
|
-
return { ...msg, content: newContent };
|
|
48
|
-
});
|
|
49
|
-
if (!messagesModified) {
|
|
50
|
-
return meta;
|
|
51
118
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
119
|
+
// Truncate tool descriptions
|
|
120
|
+
if (Array.isArray(result.tools)) {
|
|
121
|
+
const tools = result.tools.map((tool) => {
|
|
122
|
+
if (!tool || typeof tool !== 'object')
|
|
123
|
+
return tool;
|
|
124
|
+
const fn = tool.function;
|
|
125
|
+
if (!fn || typeof fn !== 'object')
|
|
126
|
+
return tool;
|
|
127
|
+
let fnModified = false;
|
|
128
|
+
const newFn = { ...fn };
|
|
129
|
+
if (typeof newFn.description === 'string' && newFn.description.length > MAX_TOOL_DESC_LEN) {
|
|
130
|
+
newFn.description = truncateString(newFn.description, MAX_TOOL_DESC_LEN);
|
|
131
|
+
fnModified = true;
|
|
132
|
+
}
|
|
133
|
+
return fnModified ? { ...tool, function: newFn } : tool;
|
|
134
|
+
});
|
|
135
|
+
const toolsModified = tools.some((t, i) => t !== result.tools[i]);
|
|
136
|
+
if (toolsModified) {
|
|
137
|
+
result = { ...result, tools };
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
return result;
|
|
56
141
|
}
|
|
57
142
|
export function truncateImageData(meta) {
|
|
58
143
|
return sanitizeLogMetadata(meta);
|
|
59
144
|
}
|
|
145
|
+
export function truncateLogText(text, maxLen = MAX_LOG_TEXT_LEN) {
|
|
146
|
+
if (maxLen < 0)
|
|
147
|
+
return text;
|
|
148
|
+
const normalized = text.replace(/\r\n/g, '\n');
|
|
149
|
+
if (normalized.length <= maxLen) {
|
|
150
|
+
return normalized;
|
|
151
|
+
}
|
|
152
|
+
const headLen = Math.floor(maxLen / 2);
|
|
153
|
+
const tailLen = maxLen - headLen;
|
|
154
|
+
const omitted = normalized.length - headLen - tailLen;
|
|
155
|
+
return `${normalized.slice(0, headLen)}... (truncated, ${omitted} chars omitted) ...${normalized.slice(-tailLen)}`;
|
|
156
|
+
}
|
|
60
157
|
function truncateBase64(data) {
|
|
61
158
|
if (data.length <= MAX_IMAGE_DATA_LEN) {
|
|
62
159
|
return data;
|
|
63
160
|
}
|
|
64
161
|
return `${data.slice(0, MAX_IMAGE_DATA_LEN)}... (truncated)`;
|
|
65
162
|
}
|
|
163
|
+
function truncateString(str, maxLen) {
|
|
164
|
+
if (str.length <= maxLen)
|
|
165
|
+
return str;
|
|
166
|
+
return `${str.slice(0, maxLen)}... (truncated, ${str.length - maxLen} chars omitted)`;
|
|
167
|
+
}
|
|
66
168
|
//# sourceMappingURL=log-truncation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log-truncation.js","sourceRoot":"","sources":["../../source/utils/log-truncation.ts"],"names":[],"mappings":"AAAA,MAAM,kBAAkB,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"log-truncation.js","sourceRoot":"","sources":["../../source/utils/log-truncation.ts"],"names":[],"mappings":"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"}
|