@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
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conversation-persistence.test.js","sourceRoot":"","sources":["../../source/services/conversation-persistence.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-result-builder.d.ts","sourceRoot":"","sources":["../../source/services/conversation-result-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAEnF,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAC1B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,CAAA;CAAE,GAC/E;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAAE,IAAI,EAAE,mBAAmB,CAAA;KAAE,CAAC,CAAA;CAAE,GACjG;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,EAAE,WAAW,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEN,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,uBAAuB,CAAC;IACtC,iBAAiB,EAAE,yBAAyB,CAAC;IAC7C,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,WAAW,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C;
|
|
1
|
+
{"version":3,"file":"conversation-result-builder.d.ts","sourceRoot":"","sources":["../../source/services/conversation-result-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAEnF,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAC1B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,CAAA;CAAE,GAC/E;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAAE,IAAI,EAAE,mBAAmB,CAAA;KAAE,CAAC,CAAA;CAAE,GACjG;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,EAAE,WAAW,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEN,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,uBAAuB,CAAC;IACtC,iBAAiB,EAAE,yBAAyB,CAAC;IAC7C,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,WAAW,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C;AA6BD,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,kBAAkB,CAAC,CAuF7B;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,kBAAkB,KAAG,iBAsB5D,CAAC"}
|
|
@@ -9,6 +9,18 @@ const resolveFinalText = (streamedText, completedText) => {
|
|
|
9
9
|
}
|
|
10
10
|
return streamedText ?? completedText ?? 'Done.';
|
|
11
11
|
};
|
|
12
|
+
const hasPendingNestedAgentToolRun = (state, logger) => {
|
|
13
|
+
if (state == null) {
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
const stateRecord = state;
|
|
17
|
+
if (!('_pendingAgentToolRuns' in stateRecord)) {
|
|
18
|
+
logger?.warn('SDK field _pendingAgentToolRuns is absent from agent state — the SDK may have renamed or restructured this field. Nested subagent detection will default to false. Update the integration if the SDK was upgraded.');
|
|
19
|
+
return false;
|
|
20
|
+
}
|
|
21
|
+
const pendingAgentToolRuns = stateRecord._pendingAgentToolRuns;
|
|
22
|
+
return pendingAgentToolRuns instanceof Map && pendingAgentToolRuns.size > 0;
|
|
23
|
+
};
|
|
12
24
|
export async function buildConversationResult(input, deps) {
|
|
13
25
|
const { result, finalOutputOverride, reasoningOutputOverride, emittedCommandIds, usage, toolCallArgumentsById } = input;
|
|
14
26
|
const { approvalFlow, shellAutoApproval, logger, sessionId } = deps;
|
|
@@ -20,6 +32,7 @@ export async function buildConversationResult(input, deps) {
|
|
|
20
32
|
interruption,
|
|
21
33
|
emittedCommandIds: emittedCommandIds ?? new Set(),
|
|
22
34
|
toolCallArgumentsById: new Map(toolCallArgumentsById),
|
|
35
|
+
nestedSubagent: hasPendingNestedAgentToolRun(result.state, logger),
|
|
23
36
|
});
|
|
24
37
|
const agent = asRecord(interruptionRecord?.agent);
|
|
25
38
|
const callId = getCallIdFromObject(interruption);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-result-builder.js","sourceRoot":"","sources":["../../source/services/conversation-result-builder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,SAAS,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAiC/G,MAAM,gBAAgB,GAAG,CAAC,YAAgC,EAAE,aAAiC,EAAU,EAAE;IACvG,IACE,aAAa,KAAK,SAAS;QAC3B,aAAa,KAAK,EAAE;QACpB,CAAC,CAAC,YAAY,KAAK,SAAS,IAAI,aAAa,KAAK,OAAO,CAAC,EAC1D,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,OAAO,YAAY,IAAI,aAAa,IAAI,OAAO,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,KAAyB,EACzB,IAAuB;IAEvB,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAC7G,KAAK,CAAC;IACR,MAAM,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAEpE,IAAI,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5D,MAAM,YAAY,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,kBAAkB,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QAElD,YAAY,CAAC,aAAa,CAAC;YACzB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,YAAY;YACZ,iBAAiB,EAAE,iBAAiB,IAAI,IAAI,GAAG,EAAE;YACjD,qBAAqB,EAAE,IAAI,GAAG,CAAC,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation-result-builder.js","sourceRoot":"","sources":["../../source/services/conversation-result-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
export declare const MAX_HALLUCINATION_RETRIES = 2;
|
|
2
|
+
export declare const MAX_TRANSIENT_RETRIES = 3;
|
|
3
|
+
/**
|
|
4
|
+
* Returns true when the error is a transient upstream failure (429 / 5xx /
|
|
5
|
+
* connection timeout) that is worth retrying automatically.
|
|
6
|
+
*/
|
|
7
|
+
export declare const isTransientRetryableError: (error: unknown) => boolean;
|
|
2
8
|
export declare const isRecoverableModelError: (error: unknown) => boolean;
|
|
3
9
|
export type RetryType = 'hallucination' | 'parsing_error' | 'behavior';
|
|
4
10
|
export interface RetryEventPayload {
|
|
@@ -7,6 +13,7 @@ export interface RetryEventPayload {
|
|
|
7
13
|
attempt: number;
|
|
8
14
|
maxRetries: number;
|
|
9
15
|
errorMessage: string;
|
|
16
|
+
retryType?: RetryType;
|
|
10
17
|
}
|
|
11
18
|
export interface RetryLogPayload {
|
|
12
19
|
toolName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-retry-policy.d.ts","sourceRoot":"","sources":["../../source/services/conversation-retry-policy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"conversation-retry-policy.d.ts","sourceRoot":"","sources":["../../source/services/conversation-retry-policy.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC;;;GAGG;AACH,eAAO,MAAM,yBAAyB,GAAI,OAAO,OAAO,KAAG,OA+B1D,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,OAAO,OAAO,KAAG,OAYxD,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,eAAe,GAAG,eAAe,GAAG,UAAU,CAAC;AAEvE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GACpB;IACE,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,UAAU,EAAE,eAAe,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,8GAA8G;IAC9G,SAAS,EAAE,OAAO,CAAC;IACnB,+FAA+F;IAC/F,wBAAwB,EAAE,OAAO,CAAC;IAClC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE;QAAE,uBAAuB,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,OAAO,CAAA;KAAE,CAAC;CAC/E,CAAC;AAEN,eAAO,MAAM,WAAW,GACtB,OAAO,OAAO,EACd,cAAc,MAAM,EACpB,WAAW,OAAO,EAClB,qBAAqB,MAAM,KAC1B,aAwCF,CAAC"}
|
|
@@ -1,5 +1,38 @@
|
|
|
1
1
|
import { ModelBehaviorError } from '@openai/agents';
|
|
2
|
+
import { APIConnectionError, APIConnectionTimeoutError, InternalServerError, RateLimitError } from 'openai';
|
|
3
|
+
import { OpenRouterError, OpenAICompatibleError } from '../providers/common/provider-errors.js';
|
|
2
4
|
export const MAX_HALLUCINATION_RETRIES = 2;
|
|
5
|
+
export const MAX_TRANSIENT_RETRIES = 3;
|
|
6
|
+
/**
|
|
7
|
+
* Returns true when the error is a transient upstream failure (429 / 5xx /
|
|
8
|
+
* connection timeout) that is worth retrying automatically.
|
|
9
|
+
*/
|
|
10
|
+
export const isTransientRetryableError = (error) => {
|
|
11
|
+
if (error instanceof APIConnectionError ||
|
|
12
|
+
error instanceof APIConnectionTimeoutError ||
|
|
13
|
+
error instanceof InternalServerError ||
|
|
14
|
+
error instanceof RateLimitError) {
|
|
15
|
+
return true;
|
|
16
|
+
}
|
|
17
|
+
if (error instanceof OpenRouterError && (error.status === 429 || error.status >= 500)) {
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
20
|
+
if (error instanceof OpenAICompatibleError && (error.status === 429 || error.status >= 500)) {
|
|
21
|
+
return true;
|
|
22
|
+
}
|
|
23
|
+
if (error && typeof error === 'object') {
|
|
24
|
+
const statusRaw = error.status ?? error.statusCode;
|
|
25
|
+
const status = typeof statusRaw === 'number' ? statusRaw : parseInt(statusRaw, 10);
|
|
26
|
+
if (Number.isInteger(status) && (status === 429 || status >= 500)) {
|
|
27
|
+
return true;
|
|
28
|
+
}
|
|
29
|
+
const message = String(error.message || '').toLowerCase();
|
|
30
|
+
if (message.includes('rate limit') || message.includes('too many requests') || message.includes('rate_limit')) {
|
|
31
|
+
return true;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return false;
|
|
35
|
+
};
|
|
3
36
|
export const isRecoverableModelError = (error) => {
|
|
4
37
|
if (!(error instanceof ModelBehaviorError)) {
|
|
5
38
|
return false;
|
|
@@ -30,6 +63,7 @@ export const decideRetry = (error, attemptCount, hadStream, streamHistoryLength)
|
|
|
30
63
|
attempt,
|
|
31
64
|
maxRetries: MAX_HALLUCINATION_RETRIES,
|
|
32
65
|
errorMessage: message,
|
|
66
|
+
retryType,
|
|
33
67
|
},
|
|
34
68
|
logPayload: {
|
|
35
69
|
toolName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-retry-policy.js","sourceRoot":"","sources":["../../source/services/conversation-retry-policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation-retry-policy.js","sourceRoot":"","sources":["../../source/services/conversation-retry-policy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import test from 'ava';
|
|
2
2
|
import { ModelBehaviorError } from '@openai/agents';
|
|
3
|
-
import {
|
|
3
|
+
import { APIConnectionError, APIConnectionTimeoutError, InternalServerError, RateLimitError } from 'openai';
|
|
4
|
+
import { OpenRouterError, OpenAICompatibleError } from '../providers/common/provider-errors.js';
|
|
5
|
+
import { decideRetry, isRecoverableModelError, isTransientRetryableError, MAX_HALLUCINATION_RETRIES, } from './conversation-retry-policy.js';
|
|
4
6
|
test('isRecoverableModelError: non-ModelBehaviorError returns false', (t) => {
|
|
5
7
|
t.false(isRecoverableModelError(new Error('boom')));
|
|
6
8
|
t.false(isRecoverableModelError('boom'));
|
|
@@ -67,7 +69,7 @@ test('decideRetry: with stream and empty history sets shouldInjectErrorContext',
|
|
|
67
69
|
t.true(decision.shouldInjectErrorContext);
|
|
68
70
|
t.true(decision.errorContextMessage.includes('Previous attempt failed'));
|
|
69
71
|
});
|
|
70
|
-
test('decideRetry: without stream returns retry with skipUserMessage=false', (t) => {
|
|
72
|
+
test('decideRetry: without stream returns retry with skipUserMessage=false', async (t) => {
|
|
71
73
|
const decision = decideRetry(new ModelBehaviorError('Tool x not found'), 0, false, 0);
|
|
72
74
|
t.is(decision.kind, 'retry');
|
|
73
75
|
if (decision.kind !== 'retry')
|
|
@@ -76,4 +78,44 @@ test('decideRetry: without stream returns retry with skipUserMessage=false', (t)
|
|
|
76
78
|
t.false(decision.shouldInjectErrorContext);
|
|
77
79
|
t.deepEqual(decision.nextRunOptions, { hallucinationRetryCount: 1, skipUserMessage: false });
|
|
78
80
|
});
|
|
81
|
+
function asInstanceOf(prototype, props) {
|
|
82
|
+
return Object.assign(Object.create(prototype), props);
|
|
83
|
+
}
|
|
84
|
+
test('isTransientRetryableError: OpenAI SDK errors are retryable', (t) => {
|
|
85
|
+
t.true(isTransientRetryableError(asInstanceOf(APIConnectionError.prototype, { message: 'conn error' })));
|
|
86
|
+
t.true(isTransientRetryableError(asInstanceOf(APIConnectionTimeoutError.prototype, { message: 'timeout' })));
|
|
87
|
+
t.true(isTransientRetryableError(asInstanceOf(InternalServerError.prototype, { message: 'ise', status: 500 })));
|
|
88
|
+
t.true(isTransientRetryableError(asInstanceOf(RateLimitError.prototype, { message: 'rate limit', status: 429 })));
|
|
89
|
+
});
|
|
90
|
+
test('isTransientRetryableError: OpenRouter 429/5xx are retryable', (t) => {
|
|
91
|
+
t.true(isTransientRetryableError(new OpenRouterError('rate limited', 429, {})));
|
|
92
|
+
t.true(isTransientRetryableError(new OpenRouterError('server error', 500, {})));
|
|
93
|
+
t.true(isTransientRetryableError(new OpenRouterError('bad gateway', 502, {})));
|
|
94
|
+
t.false(isTransientRetryableError(new OpenRouterError('not found', 404, {})));
|
|
95
|
+
});
|
|
96
|
+
test('isTransientRetryableError: OpenAI-compatible 429/5xx are retryable', (t) => {
|
|
97
|
+
t.true(isTransientRetryableError(new OpenAICompatibleError('rate limited', 429, {})));
|
|
98
|
+
t.true(isTransientRetryableError(new OpenAICompatibleError('server error', 503, {})));
|
|
99
|
+
t.false(isTransientRetryableError(new OpenAICompatibleError('bad request', 400, {})));
|
|
100
|
+
});
|
|
101
|
+
test('isTransientRetryableError: generic errors with 429/5xx status are retryable', (t) => {
|
|
102
|
+
const err429 = new Error('too many requests');
|
|
103
|
+
err429.status = 429;
|
|
104
|
+
t.true(isTransientRetryableError(err429));
|
|
105
|
+
const err503 = new Error('service unavailable');
|
|
106
|
+
err503.statusCode = 503;
|
|
107
|
+
t.true(isTransientRetryableError(err503));
|
|
108
|
+
});
|
|
109
|
+
test('isTransientRetryableError: generic errors with rate-limit message are retryable', (t) => {
|
|
110
|
+
t.true(isTransientRetryableError(new Error("We're currently processing too many requests — please try again later.")));
|
|
111
|
+
t.true(isTransientRetryableError(new Error('Rate limit exceeded')));
|
|
112
|
+
t.true(isTransientRetryableError(new Error('rate_limit retry after 10s')));
|
|
113
|
+
});
|
|
114
|
+
test('isTransientRetryableError: non-retryable errors return false', (t) => {
|
|
115
|
+
t.false(isTransientRetryableError(new Error('something else')));
|
|
116
|
+
t.false(isTransientRetryableError(new ModelBehaviorError('Tool x not found')));
|
|
117
|
+
t.false(isTransientRetryableError(null));
|
|
118
|
+
t.false(isTransientRetryableError('string error'));
|
|
119
|
+
t.false(isTransientRetryableError(42));
|
|
120
|
+
});
|
|
79
121
|
//# sourceMappingURL=conversation-retry-policy.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-retry-policy.test.js","sourceRoot":"","sources":["../../source/services/conversation-retry-policy.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"conversation-retry-policy.test.js","sourceRoot":"","sources":["../../source/services/conversation-retry-policy.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,24 +11,47 @@ export type { CommandMessage } from './conversation-session.js';
|
|
|
11
11
|
*/
|
|
12
12
|
export declare class ConversationService {
|
|
13
13
|
#private;
|
|
14
|
-
constructor({ agentClient, deps, sessionId, }: {
|
|
14
|
+
constructor({ agentClient, deps, sessionId, sessionStartedAt, }: {
|
|
15
15
|
agentClient: OpenAIAgentClient;
|
|
16
16
|
deps: {
|
|
17
17
|
logger: ILoggingService;
|
|
18
18
|
settingsService?: ISettingsService;
|
|
19
19
|
};
|
|
20
20
|
sessionId?: string;
|
|
21
|
+
sessionStartedAt?: string;
|
|
21
22
|
});
|
|
22
23
|
get sessionId(): string;
|
|
23
|
-
|
|
24
|
+
resetWithNewId(newId: string): void;
|
|
25
|
+
undoLastUserTurn(): {
|
|
26
|
+
text: string;
|
|
27
|
+
imageCount: number;
|
|
28
|
+
} | null;
|
|
29
|
+
listUserTurns(): {
|
|
30
|
+
index: number;
|
|
31
|
+
text: string;
|
|
32
|
+
imageCount: number;
|
|
33
|
+
}[];
|
|
34
|
+
undoNUserTurns(n: number): {
|
|
35
|
+
text: string;
|
|
36
|
+
imageCount: number;
|
|
37
|
+
} | null;
|
|
24
38
|
setModel(model: string): void;
|
|
25
39
|
setReasoningEffort(effort: ReasoningEffortSetting): void;
|
|
26
40
|
setTemperature(temperature?: number): void;
|
|
27
41
|
setProvider(provider: string): void;
|
|
28
42
|
setRetryCallback(callback: () => void): void;
|
|
29
43
|
addShellContext(historyText: string): void;
|
|
44
|
+
queueModeNotice(text: string): void;
|
|
30
45
|
abort(): void;
|
|
31
46
|
sendMessage(...args: Parameters<ConversationSession['sendMessage']>): Promise<ConversationTerminal>;
|
|
32
47
|
handleApprovalDecision(...args: Parameters<ConversationSession['handleApprovalDecision']>): Promise<ConversationTerminal | null>;
|
|
48
|
+
exportState(): {
|
|
49
|
+
history: unknown[];
|
|
50
|
+
previousResponseId: string | null;
|
|
51
|
+
};
|
|
52
|
+
importState(state: {
|
|
53
|
+
history: unknown[];
|
|
54
|
+
previousResponseId: string | null;
|
|
55
|
+
}): void;
|
|
33
56
|
}
|
|
34
57
|
//# sourceMappingURL=conversation-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-service.d.ts","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEjG,YAAY,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC9G,YAAY,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE;;;;GAIG;AACH,qBAAa,mBAAmB;;
|
|
1
|
+
{"version":3,"file":"conversation-service.d.ts","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEjG,YAAY,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC9G,YAAY,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE;;;;GAIG;AACH,qBAAa,mBAAmB;;gBAKlB,EACV,WAAW,EACX,IAAI,EACJ,SAAqB,EACrB,gBAAgB,GACjB,EAAE;QACD,WAAW,EAAE,iBAAiB,CAAC;QAC/B,IAAI,EAAE;YAAE,MAAM,EAAE,eAAe,CAAC;YAAC,eAAe,CAAC,EAAE,gBAAgB,CAAA;SAAE,CAAC;QACtE,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B;IAMD,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAQnC,gBAAgB,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAI/D,aAAa,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,EAAE;IAItE,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAItE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAI7B,kBAAkB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI;IAIxD,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAI1C,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAInC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAI5C,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI1C,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAInC,KAAK,IAAI,IAAI;IAIb,WAAW,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAInG,sBAAsB,CACpB,GAAG,IAAI,EAAE,UAAU,CAAC,mBAAmB,CAAC,wBAAwB,CAAC,CAAC,GACjE,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;IAIvC,WAAW,IAAI;QACb,OAAO,EAAE,OAAO,EAAE,CAAC;QACnB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;KACnC;IAID,WAAW,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QAAC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI;CAGpF"}
|
|
@@ -6,14 +6,31 @@ import { ConversationSession } from './conversation-session.js';
|
|
|
6
6
|
*/
|
|
7
7
|
export class ConversationService {
|
|
8
8
|
#session;
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
#agentClient;
|
|
10
|
+
#deps;
|
|
11
|
+
constructor({ agentClient, deps, sessionId = 'default', sessionStartedAt, }) {
|
|
12
|
+
this.#agentClient = agentClient;
|
|
13
|
+
this.#deps = deps;
|
|
14
|
+
this.#session = new ConversationSession(sessionId, { agentClient, deps, sessionStartedAt });
|
|
11
15
|
}
|
|
12
16
|
get sessionId() {
|
|
13
17
|
return this.#session.id;
|
|
14
18
|
}
|
|
15
|
-
|
|
19
|
+
resetWithNewId(newId) {
|
|
16
20
|
this.#session.reset();
|
|
21
|
+
this.#session = new ConversationSession(newId, {
|
|
22
|
+
agentClient: this.#agentClient,
|
|
23
|
+
deps: this.#deps,
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
undoLastUserTurn() {
|
|
27
|
+
return this.#session.undoLastUserTurn();
|
|
28
|
+
}
|
|
29
|
+
listUserTurns() {
|
|
30
|
+
return this.#session.listUserTurns();
|
|
31
|
+
}
|
|
32
|
+
undoNUserTurns(n) {
|
|
33
|
+
return this.#session.undoNUserTurns(n);
|
|
17
34
|
}
|
|
18
35
|
setModel(model) {
|
|
19
36
|
this.#session.setModel(model);
|
|
@@ -33,6 +50,9 @@ export class ConversationService {
|
|
|
33
50
|
addShellContext(historyText) {
|
|
34
51
|
this.#session.addShellContext(historyText);
|
|
35
52
|
}
|
|
53
|
+
queueModeNotice(text) {
|
|
54
|
+
this.#session.queueModeNotice(text);
|
|
55
|
+
}
|
|
36
56
|
abort() {
|
|
37
57
|
this.#session.abort();
|
|
38
58
|
}
|
|
@@ -42,5 +62,11 @@ export class ConversationService {
|
|
|
42
62
|
handleApprovalDecision(...args) {
|
|
43
63
|
return this.#session.handleApprovalDecision(...args);
|
|
44
64
|
}
|
|
65
|
+
exportState() {
|
|
66
|
+
return this.#session.exportState();
|
|
67
|
+
}
|
|
68
|
+
importState(state) {
|
|
69
|
+
this.#session.importState(state);
|
|
70
|
+
}
|
|
45
71
|
}
|
|
46
72
|
//# sourceMappingURL=conversation-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-service.js","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAMhE;;;;GAIG;AACH,MAAM,OAAO,mBAAmB;
|
|
1
|
+
{"version":3,"file":"conversation-service.js","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAMhE;;;;GAIG;AACH,MAAM,OAAO,mBAAmB;IAC9B,QAAQ,CAAsB;IACrB,YAAY,CAAoB;IAChC,KAAK,CAAkE;IAEhF,YAAY,EACV,WAAW,EACX,IAAI,EACJ,SAAS,GAAG,SAAS,EACrB,gBAAgB,GAMjB;QACC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,mBAAmB,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC9F,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC1B,CAAC;IAED,cAAc,CAAC,KAAa;QAC1B,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,mBAAmB,CAAC,KAAK,EAAE;YAC7C,WAAW,EAAE,IAAI,CAAC,YAAY;YAC9B,IAAI,EAAE,IAAI,CAAC,KAAK;SACjB,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;IAC1C,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;IACvC,CAAC;IAED,cAAc,CAAC,CAAS;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,kBAAkB,CAAC,MAA8B;QAC/C,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED,cAAc,CAAC,WAAoB;QACjC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAC5C,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,gBAAgB,CAAC,QAAoB;QACnC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,eAAe,CAAC,WAAmB;QACjC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;IAED,eAAe,CAAC,IAAY;QAC1B,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,GAAG,IAAoD;QACjE,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,sBAAsB,CACpB,GAAG,IAA+D;QAElE,OAAO,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,WAAW;QAIT,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;IAED,WAAW,CAAC,KAAgE;QAC1E,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;CACF"}
|
|
@@ -143,7 +143,8 @@ const malformedResponseMacro = {
|
|
|
143
143
|
approved: false,
|
|
144
144
|
source: 'llm',
|
|
145
145
|
});
|
|
146
|
-
t.is(chatCalls.length,
|
|
146
|
+
t.is(chatCalls.length, 2);
|
|
147
|
+
t.true(chatCalls[1].prompt.includes('The previous shell auto-approval response was invalid.'));
|
|
147
148
|
},
|
|
148
149
|
title: (providedTitle = 'malformed LLM advisory response', { llmResponse }) => `${providedTitle}: ${llmResponse.slice(0, 40)}`,
|
|
149
150
|
};
|
|
@@ -170,7 +171,6 @@ test('RED-classified shell command includes LLM rationale but remains a system r
|
|
|
170
171
|
const { session, chatCalls } = createSessionHarness({
|
|
171
172
|
startStreams: [initialStream],
|
|
172
173
|
chatImpl: async (prompt) => {
|
|
173
|
-
t.true(prompt.includes('call-red'));
|
|
174
174
|
t.true(prompt.includes('rm -rf /'));
|
|
175
175
|
return JSON.stringify({
|
|
176
176
|
results: [
|
|
@@ -219,7 +219,6 @@ test('single safe shell command calls the LLM once and attaches its advisory', a
|
|
|
219
219
|
source: 'llm',
|
|
220
220
|
});
|
|
221
221
|
t.is(chatCalls.length, 1);
|
|
222
|
-
t.true(chatCalls[0].prompt.includes('call-safe-1'));
|
|
223
222
|
t.true(chatCalls[0].prompt.includes('ls source'));
|
|
224
223
|
t.true(chatCalls[0].prompt.includes('inspect the source tree'));
|
|
225
224
|
t.is(chatCalls[0].options.model, 'test-auto-model');
|
|
@@ -282,9 +281,7 @@ test('mixed RED and non-RED batch evaluates both while RED remains system reject
|
|
|
282
281
|
startStreams: [initialStream],
|
|
283
282
|
continuationStreams: [continuationStream],
|
|
284
283
|
chatImpl: async (prompt) => {
|
|
285
|
-
t.true(prompt.includes('call-mixed-red'));
|
|
286
284
|
t.true(prompt.includes('rm -rf /'));
|
|
287
|
-
t.true(prompt.includes('call-mixed-safe'));
|
|
288
285
|
t.true(prompt.includes('ls source'));
|
|
289
286
|
return JSON.stringify({
|
|
290
287
|
results: [
|
|
@@ -323,19 +320,19 @@ test('mixed RED and non-RED batch evaluates both while RED remains system reject
|
|
|
323
320
|
for (const scenario of [
|
|
324
321
|
{
|
|
325
322
|
llmResponse: 'not valid json at all',
|
|
326
|
-
expectedReasoning: 'LLM did not provide a valid evaluation for this command.',
|
|
323
|
+
expectedReasoning: 'LLM did not provide a valid ordered evaluation for this command.',
|
|
327
324
|
},
|
|
328
325
|
{
|
|
329
326
|
llmResponse: JSON.stringify({ results: {} }),
|
|
330
|
-
expectedReasoning: 'LLM did not provide a valid evaluation for this command.',
|
|
327
|
+
expectedReasoning: 'LLM did not provide a valid ordered evaluation for this command.',
|
|
331
328
|
},
|
|
332
329
|
{
|
|
333
330
|
llmResponse: JSON.stringify({ results: [{ id: 'call-safe', reasoning: 'Missing approved field' }] }),
|
|
334
|
-
expectedReasoning: 'LLM did not provide a valid evaluation for this command.',
|
|
331
|
+
expectedReasoning: 'LLM did not provide a valid ordered evaluation for this command.',
|
|
335
332
|
},
|
|
336
333
|
{
|
|
337
|
-
llmResponse: JSON.stringify({ results: [
|
|
338
|
-
expectedReasoning: 'LLM did not provide a valid evaluation for this command.',
|
|
334
|
+
llmResponse: JSON.stringify({ results: [] }),
|
|
335
|
+
expectedReasoning: 'LLM did not provide a valid ordered evaluation for this command.',
|
|
339
336
|
},
|
|
340
337
|
]) {
|
|
341
338
|
test(malformedResponseMacro, scenario);
|