@qduc/term2 0.4.0 → 0.6.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 +5 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +61 -8
- package/dist/agent.js.map +1 -1
- package/dist/agent.test.js +122 -10
- package/dist/agent.test.js.map +1 -1
- package/dist/app.d.ts +13 -0
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +71 -18
- 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 +197 -28
- package/dist/cli.js.map +1 -1
- package/dist/components/ApprovalPrompt.d.ts.map +1 -1
- package/dist/components/ApprovalPrompt.js +11 -34
- 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/ChatMessage.d.ts.map +1 -1
- package/dist/components/ChatMessage.js +2 -1
- package/dist/components/ChatMessage.js.map +1 -1
- package/dist/components/CommandMessage.d.ts.map +1 -1
- package/dist/components/CommandMessage.js +45 -48
- 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 +65 -7
- package/dist/components/MarkdownRenderer.js.map +1 -1
- package/dist/components/MessageList.d.ts.map +1 -1
- package/dist/components/MessageList.js +62 -9
- package/dist/components/MessageList.js.map +1 -1
- package/dist/components/MessageList.test.js +128 -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 +8 -6
- 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 +12 -0
- package/dist/components/SubagentActivityMessage.d.ts.map +1 -0
- package/dist/components/SubagentActivityMessage.js +30 -0
- package/dist/components/SubagentActivityMessage.js.map +1 -0
- 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 +8 -0
- package/dist/components/theme.d.ts.map +1 -0
- package/dist/components/theme.js +20 -0
- package/dist/components/theme.js.map +1 -0
- 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 +20 -2
- package/dist/hooks/use-app-commands.d.ts.map +1 -1
- package/dist/hooks/use-app-commands.js +138 -52
- package/dist/hooks/use-app-commands.js.map +1 -1
- package/dist/hooks/use-app-commands.test.js +264 -1
- package/dist/hooks/use-app-commands.test.js.map +1 -1
- package/dist/hooks/use-conversation.d.ts +20 -2
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +114 -14
- package/dist/hooks/use-conversation.js.map +1 -1
- 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-path-completion.test.d.ts +2 -0
- package/dist/hooks/use-path-completion.test.d.ts.map +1 -0
- package/dist/hooks/use-path-completion.test.js +54 -0
- package/dist/hooks/use-path-completion.test.js.map +1 -0
- 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/editor-impl.test.js +63 -50
- package/dist/lib/editor-impl.test.js.map +1 -1
- package/dist/lib/openai-agent-client.d.ts +9 -0
- package/dist/lib/openai-agent-client.d.ts.map +1 -1
- package/dist/lib/openai-agent-client.js +104 -134
- package/dist/lib/openai-agent-client.js.map +1 -1
- package/dist/lib/openai-agent-client.test.js +30 -0
- package/dist/lib/openai-agent-client.test.js.map +1 -1
- package/dist/non-interactive.d.ts +6 -1
- package/dist/non-interactive.d.ts.map +1 -1
- package/dist/non-interactive.js +70 -4
- package/dist/non-interactive.js.map +1 -1
- package/dist/non-interactive.test.js +176 -1
- 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 +41 -0
- package/dist/prompts/subagents/mentor.md +15 -0
- package/dist/prompts/subagents/researcher.md +39 -0
- package/dist/prompts/subagents/worker.md +40 -0
- 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/common/openai-compatible-messages.d.ts +1 -1
- package/dist/providers/common/openai-compatible-messages.d.ts.map +1 -1
- package/dist/providers/common/openai-compatible-messages.js +47 -16
- package/dist/providers/common/openai-compatible-messages.js.map +1 -1
- package/dist/providers/common/openai-compatible-messages.test.js +77 -14
- 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 +124 -10
- package/dist/providers/openai-compatible.provider.js.map +1 -1
- package/dist/providers/openai-compatible.provider.test.js +62 -1
- package/dist/providers/openai-compatible.provider.test.js.map +1 -1
- package/dist/providers/openrouter.provider.js +1 -1
- package/dist/providers/openrouter.provider.js.map +1 -1
- package/dist/scripts/eval-auto-approval/dataset.d.ts +1 -1
- 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-rejection-interceptor.test.js +5 -0
- package/dist/services/approval-rejection-interceptor.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-events.d.ts +25 -1
- package/dist/services/conversation-events.d.ts.map +1 -1
- package/dist/services/conversation-persistence.d.ts +52 -0
- package/dist/services/conversation-persistence.d.ts.map +1 -0
- package/dist/services/conversation-persistence.js +163 -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 +418 -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-service.d.ts +22 -0
- package/dist/services/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation-service.js +18 -0
- package/dist/services/conversation-service.js.map +1 -1
- package/dist/services/conversation-session.auto-approval.test.js +57 -9
- package/dist/services/conversation-session.auto-approval.test.js.map +1 -1
- package/dist/services/conversation-session.d.ts +25 -0
- package/dist/services/conversation-session.d.ts.map +1 -1
- package/dist/services/conversation-session.js +208 -40
- 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 +182 -1
- package/dist/services/conversation-store.js.map +1 -1
- package/dist/services/conversation-store.test.js +310 -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/interruption-info.js +1 -1
- package/dist/services/interruption-info.js.map +1 -1
- package/dist/services/interruption-info.test.js +12 -0
- package/dist/services/interruption-info.test.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/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/rtk-service.d.ts.map +1 -1
- package/dist/services/rtk-service.js +104 -9
- package/dist/services/rtk-service.js.map +1 -1
- package/dist/services/rtk-service.test.js +55 -20
- package/dist/services/rtk-service.test.js.map +1 -1
- package/dist/services/service-interfaces.d.ts +4 -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 +2 -1
- package/dist/services/shell-auto-approval-evaluator.d.ts.map +1 -1
- package/dist/services/shell-auto-approval-evaluator.js +12 -29
- package/dist/services/shell-auto-approval-evaluator.js.map +1 -1
- package/dist/services/shell-auto-approval-evaluator.test.js +2 -4
- 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 +24 -8
- 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/subagent-manager.d.ts +16 -0
- package/dist/services/subagents/subagent-manager.d.ts.map +1 -0
- package/dist/services/subagents/subagent-manager.js +670 -0
- package/dist/services/subagents/subagent-manager.js.map +1 -0
- package/dist/services/subagents/subagent-manager.test.d.ts +2 -0
- package/dist/services/subagents/subagent-manager.test.d.ts.map +1 -0
- package/dist/services/subagents/subagent-manager.test.js +880 -0
- package/dist/services/subagents/subagent-manager.test.js.map +1 -0
- package/dist/services/subagents/subagent-session.d.ts +26 -0
- package/dist/services/subagents/subagent-session.d.ts.map +1 -0
- package/dist/services/subagents/subagent-session.js +86 -0
- package/dist/services/subagents/subagent-session.js.map +1 -0
- package/dist/services/subagents/subagent-session.test.d.ts +2 -0
- package/dist/services/subagents/subagent-session.test.d.ts.map +1 -0
- package/dist/services/subagents/subagent-session.test.js +118 -0
- package/dist/services/subagents/subagent-session.test.js.map +1 -0
- package/dist/services/subagents/types.d.ts +41 -0
- package/dist/services/subagents/types.d.ts.map +1 -0
- package/dist/services/subagents/types.js +2 -0
- package/dist/services/subagents/types.js.map +1 -0
- package/dist/services/terminal-result-collector.d.ts.map +1 -1
- package/dist/services/terminal-result-collector.js +31 -5
- package/dist/services/terminal-result-collector.js.map +1 -1
- package/dist/services/terminal-result-collector.test.js +81 -0
- package/dist/services/terminal-result-collector.test.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 +2 -2
- 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/ask-mentor.d.ts +2 -2
- package/dist/tools/ask-mentor.d.ts.map +1 -1
- package/dist/tools/ask-mentor.js.map +1 -1
- package/dist/tools/code-context.d.ts +3 -3
- package/dist/tools/code-context.d.ts.map +1 -1
- package/dist/tools/code-context.js.map +1 -1
- package/dist/tools/code-context.test.js +2 -2
- package/dist/tools/code-context.test.js.map +1 -1
- package/dist/tools/command-message-formatters.d.ts +5 -0
- package/dist/tools/command-message-formatters.d.ts.map +1 -0
- package/dist/tools/command-message-formatters.js +13 -0
- package/dist/tools/command-message-formatters.js.map +1 -0
- package/dist/tools/command-message-formatters.test.d.ts +2 -0
- package/dist/tools/command-message-formatters.test.d.ts.map +1 -0
- package/dist/tools/command-message-formatters.test.js +23 -0
- package/dist/tools/command-message-formatters.test.js.map +1 -0
- package/dist/tools/create-file.d.ts +2 -2
- package/dist/tools/create-file.d.ts.map +1 -1
- package/dist/tools/create-file.js +14 -9
- package/dist/tools/create-file.js.map +1 -1
- package/dist/tools/create-file.test.js +13 -13
- 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/file-locks.d.ts +1 -0
- package/dist/tools/file-locks.d.ts.map +1 -1
- package/dist/tools/file-locks.js +16 -0
- package/dist/tools/file-locks.js.map +1 -1
- package/dist/tools/find-files.d.ts +2 -2
- package/dist/tools/find-files.d.ts.map +1 -1
- package/dist/tools/find-files.js.map +1 -1
- package/dist/tools/find-files.test.js +1 -1
- package/dist/tools/find-files.test.js.map +1 -1
- package/dist/tools/grep.d.ts +3 -2
- 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.d.ts +2 -0
- package/dist/tools/grep.test.d.ts.map +1 -0
- package/dist/tools/grep.test.js +39 -0
- package/dist/tools/grep.test.js.map +1 -0
- package/dist/tools/read-file.d.ts +3 -2
- 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 +2 -2
- package/dist/tools/read-file.test.js.map +1 -1
- package/dist/tools/run-subagent.d.ts +14 -0
- package/dist/tools/run-subagent.d.ts.map +1 -0
- package/dist/tools/run-subagent.js +200 -0
- package/dist/tools/run-subagent.js.map +1 -0
- package/dist/tools/run-subagent.test.d.ts +2 -0
- package/dist/tools/run-subagent.test.d.ts.map +1 -0
- package/dist/tools/run-subagent.test.js +206 -0
- package/dist/tools/run-subagent.test.js.map +1 -0
- package/dist/tools/search-replace.d.ts +15 -7
- package/dist/tools/search-replace.d.ts.map +1 -1
- package/dist/tools/search-replace.js +93 -119
- package/dist/tools/search-replace.js.map +1 -1
- package/dist/tools/search-replace.test.js +330 -217
- package/dist/tools/search-replace.test.js.map +1 -1
- package/dist/tools/search.d.ts.map +1 -1
- package/dist/tools/search.js.map +1 -1
- package/dist/tools/shell.d.ts +3 -2
- 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 +189 -11
- 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 +3 -2
- package/dist/tools/types.d.ts.map +1 -1
- package/dist/tools/utils.d.ts.map +1 -1
- package/dist/tools/utils.js +11 -1
- package/dist/tools/utils.js.map +1 -1
- package/dist/tools/utils.test.js +13 -0
- package/dist/tools/utils.test.js.map +1 -1
- package/dist/tools/web-fetch.d.ts +2 -2
- 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/tools/web-search.d.ts +2 -2
- package/dist/tools/web-search.d.ts.map +1 -1
- package/dist/tools/web-search.js.map +1 -1
- package/dist/utils/clipboard.d.ts +2 -2
- package/dist/utils/clipboard.d.ts.map +1 -1
- package/dist/utils/clipboard.js +58 -22
- package/dist/utils/clipboard.js.map +1 -1
- package/dist/utils/clipboard.test.js +25 -6
- package/dist/utils/clipboard.test.js.map +1 -1
- package/dist/utils/command-safety/handlers/sed-handler.d.ts.map +1 -1
- package/dist/utils/command-safety/handlers/sed-handler.js +10 -7
- package/dist/utils/command-safety/handlers/sed-handler.js.map +1 -1
- package/dist/utils/command-safety/index.d.ts.map +1 -1
- package/dist/utils/command-safety/index.js +153 -117
- 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 +6 -2
- package/dist/utils/command-safety/path-analysis.js.map +1 -1
- package/dist/utils/command-safety/utils.js +2 -2
- package/dist/utils/command-safety/utils.js.map +1 -1
- package/dist/utils/command-safety.path.test.js +15 -1
- package/dist/utils/command-safety.path.test.js.map +1 -1
- package/dist/utils/conversation-event-handler.d.ts +15 -0
- package/dist/utils/conversation-event-handler.d.ts.map +1 -1
- package/dist/utils/conversation-event-handler.js +108 -8
- package/dist/utils/conversation-event-handler.js.map +1 -1
- package/dist/utils/conversation-event-handler.test.js +207 -2
- package/dist/utils/conversation-event-handler.test.js.map +1 -1
- package/dist/utils/conversation-utils.d.ts +1 -0
- package/dist/utils/conversation-utils.d.ts.map +1 -1
- package/dist/utils/conversation-utils.js +1 -0
- package/dist/utils/conversation-utils.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/extract-command-messages.d.ts.map +1 -1
- package/dist/utils/extract-command-messages.js +2 -21
- package/dist/utils/extract-command-messages.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/streaming-session-factory.d.ts.map +1 -1
- package/dist/utils/streaming-session-factory.js +16 -1
- package/dist/utils/streaming-session-factory.js.map +1 -1
- package/dist/utils/streaming-session-factory.test.js +42 -0
- package/dist/utils/streaming-session-factory.test.js.map +1 -1
- package/dist/utils/token-usage.d.ts +13 -0
- package/dist/utils/token-usage.d.ts.map +1 -1
- package/dist/utils/token-usage.js +92 -1
- package/dist/utils/token-usage.js.map +1 -1
- package/dist/utils/token-usage.test.js +93 -1
- package/dist/utils/token-usage.test.js.map +1 -1
- package/package.json +4 -4
- package/readme.md +271 -44
|
@@ -66,7 +66,7 @@ function normalizeMessageField(target) {
|
|
|
66
66
|
* while many OpenAI-compatible providers return `reasoning_content` (the official
|
|
67
67
|
* Chat Completions API field name).
|
|
68
68
|
*/
|
|
69
|
-
function applyClientResponseNormalization(client) {
|
|
69
|
+
function applyClientResponseNormalization(client, loggingService) {
|
|
70
70
|
const originalCreate = client.chat.completions.create.bind(client.chat.completions);
|
|
71
71
|
client.chat.completions.create = async (...args) => {
|
|
72
72
|
const result = await originalCreate(...args);
|
|
@@ -81,12 +81,12 @@ function applyClientResponseNormalization(client) {
|
|
|
81
81
|
}
|
|
82
82
|
// Streaming (Stream<ChatCompletionChunk>)
|
|
83
83
|
if (typeof result[Symbol.asyncIterator] === 'function') {
|
|
84
|
-
return createNormalizedReasoningStream(result);
|
|
84
|
+
return createNormalizedReasoningStream(result, loggingService);
|
|
85
85
|
}
|
|
86
86
|
return result;
|
|
87
87
|
};
|
|
88
88
|
}
|
|
89
|
-
function createNormalizedReasoningStream(stream) {
|
|
89
|
+
function createNormalizedReasoningStream(stream, loggingService) {
|
|
90
90
|
const iterator = stream[Symbol.asyncIterator]();
|
|
91
91
|
return {
|
|
92
92
|
[Symbol.asyncIterator]() {
|
|
@@ -94,7 +94,21 @@ function createNormalizedReasoningStream(stream) {
|
|
|
94
94
|
async next() {
|
|
95
95
|
const result = await iterator.next();
|
|
96
96
|
if (!result.done && result.value?.choices) {
|
|
97
|
-
|
|
97
|
+
const choices = result.value.choices;
|
|
98
|
+
const hasMultipleChoices = choices.length > 1;
|
|
99
|
+
const hasNonZeroOrMissingIndex = choices.some((choice) => choice.index === undefined || choice.index !== 0);
|
|
100
|
+
if (hasMultipleChoices || hasNonZeroOrMissingIndex) {
|
|
101
|
+
const chunkStr = JSON.stringify(result.value, null, 2);
|
|
102
|
+
const msg = `[DEBUG_MALFORMED_RESPONSE] Intercepted malformed response chunk: ${chunkStr}`;
|
|
103
|
+
if (loggingService) {
|
|
104
|
+
loggingService.warn(msg);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
// Normalize any non-zero or missing index to 0 for single-choice responses to avoid SDK errors/warnings
|
|
108
|
+
if (choices.length === 1 && choices[0].index !== 0) {
|
|
109
|
+
choices[0].index = 0;
|
|
110
|
+
}
|
|
111
|
+
for (const choice of choices) {
|
|
98
112
|
normalizeMessageField(choice.delta);
|
|
99
113
|
}
|
|
100
114
|
}
|
|
@@ -108,6 +122,12 @@ function sanitizeOpenAICompatibleMessages(messages) {
|
|
|
108
122
|
return messages.map((message) => {
|
|
109
123
|
if (!message || typeof message !== 'object')
|
|
110
124
|
return message;
|
|
125
|
+
// `index` is a choice-level field in Chat Completions responses, never a
|
|
126
|
+
// valid message field. The OpenAI Agents SDK leaks it onto replayed
|
|
127
|
+
// assistant messages when a provider echoes it on tool_calls, which strict
|
|
128
|
+
// (extra=forbid) providers reject with "Extra inputs are not permitted".
|
|
129
|
+
const { index: _strayIndex, ...message_ } = message;
|
|
130
|
+
message = message_;
|
|
111
131
|
let newContent = message.content;
|
|
112
132
|
if (Array.isArray(message.content)) {
|
|
113
133
|
// Check if it's exclusively text parts
|
|
@@ -163,7 +183,7 @@ function createOpenAICompatibleFetch(fetchImpl, providerType, baseUrl) {
|
|
|
163
183
|
let changed = false;
|
|
164
184
|
if (Array.isArray(body?.messages)) {
|
|
165
185
|
body.messages = sanitizeOpenAICompatibleMessages(preserveReasoningContentForOpenAICompatibleMessages(mergeAssistantMessages(body.messages)));
|
|
166
|
-
addCacheControlToLastTwoMessages(body.messages);
|
|
186
|
+
addCacheControlToLastTwoMessages(body.messages, body.model);
|
|
167
187
|
changed = true;
|
|
168
188
|
}
|
|
169
189
|
const reasoningEffort = typeof body.reasoning_effort === 'string' ? body.reasoning_effort : undefined;
|
|
@@ -248,7 +268,7 @@ function createCacheControlFetch(fetchImpl) {
|
|
|
248
268
|
try {
|
|
249
269
|
const body = JSON.parse(init.body);
|
|
250
270
|
if (Array.isArray(body?.messages)) {
|
|
251
|
-
addCacheControlToLastTwoMessages(body.messages);
|
|
271
|
+
addCacheControlToLastTwoMessages(body.messages, body.model);
|
|
252
272
|
return fetchImpl(input, { ...init, body: JSON.stringify(body) });
|
|
253
273
|
}
|
|
254
274
|
}
|
|
@@ -259,6 +279,92 @@ function createCacheControlFetch(fetchImpl) {
|
|
|
259
279
|
return fetchImpl(input, init);
|
|
260
280
|
});
|
|
261
281
|
}
|
|
282
|
+
export function sanitizeResponsesApiBody(body) {
|
|
283
|
+
if (!body || typeof body !== 'object' || !Array.isArray(body.input)) {
|
|
284
|
+
return body;
|
|
285
|
+
}
|
|
286
|
+
const sanitizedInput = body.input.filter((item) => {
|
|
287
|
+
const rawItem = item?.rawItem ?? item;
|
|
288
|
+
if (!rawItem || typeof rawItem !== 'object') {
|
|
289
|
+
return true;
|
|
290
|
+
}
|
|
291
|
+
const isMessage = rawItem.type === 'message' || (rawItem.role && rawItem.content !== undefined);
|
|
292
|
+
if (!isMessage) {
|
|
293
|
+
return true;
|
|
294
|
+
}
|
|
295
|
+
return !Array.isArray(rawItem.content) || rawItem.content.length > 0;
|
|
296
|
+
});
|
|
297
|
+
if (sanitizedInput.length === body.input.length) {
|
|
298
|
+
return body;
|
|
299
|
+
}
|
|
300
|
+
return {
|
|
301
|
+
...body,
|
|
302
|
+
input: sanitizedInput,
|
|
303
|
+
};
|
|
304
|
+
}
|
|
305
|
+
function createOpenAIResponsesFetch(fetchImpl) {
|
|
306
|
+
if (!fetchImpl)
|
|
307
|
+
return undefined;
|
|
308
|
+
return (async (input, init) => {
|
|
309
|
+
if (typeof init?.body === 'string') {
|
|
310
|
+
try {
|
|
311
|
+
const body = sanitizeResponsesApiBody(JSON.parse(init.body));
|
|
312
|
+
return fetchImpl(input, { ...init, body: JSON.stringify(body) });
|
|
313
|
+
}
|
|
314
|
+
catch {
|
|
315
|
+
return fetchImpl(input, init);
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
return fetchImpl(input, init);
|
|
319
|
+
});
|
|
320
|
+
}
|
|
321
|
+
export class OpencodeMinimaxHybridProvider {
|
|
322
|
+
config;
|
|
323
|
+
deps;
|
|
324
|
+
constructor(config, deps) {
|
|
325
|
+
this.config = config;
|
|
326
|
+
this.deps = deps;
|
|
327
|
+
}
|
|
328
|
+
getModel(modelName) {
|
|
329
|
+
const resolvedModel = modelName || this.deps.defaultModel || '';
|
|
330
|
+
if (resolvedModel.toLowerCase().includes('minimax')) {
|
|
331
|
+
const isOpencode = this.config.type === 'opencode' ||
|
|
332
|
+
this.config.name === 'opencode' ||
|
|
333
|
+
(typeof this.config.baseUrl === 'string' && this.config.baseUrl.toLowerCase().includes('opencode.ai'));
|
|
334
|
+
const effectiveBaseUrl = this.config.baseUrl ?? (isOpencode ? 'https://opencode.ai/v1' : '');
|
|
335
|
+
const effectiveApiKey = this.config.apiKey ?? (isOpencode ? process.env.OPENCODE_API_KEY : undefined);
|
|
336
|
+
const anthropicProvider = new AiSdkAnthropicProvider({
|
|
337
|
+
defaultModel: resolvedModel,
|
|
338
|
+
resolveConfig: () => ({
|
|
339
|
+
baseURL: effectiveBaseUrl ? normalizeBaseUrl(effectiveBaseUrl) : undefined,
|
|
340
|
+
apiKey: effectiveApiKey,
|
|
341
|
+
fetch: createCacheControlFetch(this.deps.fetch),
|
|
342
|
+
name: this.config.name,
|
|
343
|
+
headers: {
|
|
344
|
+
'anthropic-version': '2023-06-01',
|
|
345
|
+
},
|
|
346
|
+
}),
|
|
347
|
+
});
|
|
348
|
+
return anthropicProvider.getModel(resolvedModel);
|
|
349
|
+
}
|
|
350
|
+
const isOpencode = this.config.type === 'opencode' ||
|
|
351
|
+
this.config.name === 'opencode' ||
|
|
352
|
+
(typeof this.config.baseUrl === 'string' && this.config.baseUrl.toLowerCase().includes('opencode.ai'));
|
|
353
|
+
const effectiveBaseUrl = this.config.baseUrl ?? (isOpencode ? 'https://opencode.ai/v1' : '');
|
|
354
|
+
const effectiveApiKey = this.config.apiKey ?? (isOpencode ? process.env.OPENCODE_API_KEY : undefined);
|
|
355
|
+
const openAIClient = new OpenAI({
|
|
356
|
+
baseURL: normalizeBaseUrl(effectiveBaseUrl),
|
|
357
|
+
apiKey: effectiveApiKey || 'no-key',
|
|
358
|
+
fetch: createOpenAICompatibleFetch(this.deps.fetch, this.config.type || 'opencode', effectiveBaseUrl),
|
|
359
|
+
});
|
|
360
|
+
applyClientResponseNormalization(openAIClient, this.deps.loggingService);
|
|
361
|
+
const openaiProvider = new OpenAIProvider({
|
|
362
|
+
openAIClient: openAIClient,
|
|
363
|
+
useResponses: false,
|
|
364
|
+
});
|
|
365
|
+
return openaiProvider.getModel(resolvedModel);
|
|
366
|
+
}
|
|
367
|
+
}
|
|
262
368
|
export function createCustomProviderModelProvider(config, deps) {
|
|
263
369
|
const providerType = config.type || 'openai-compatible';
|
|
264
370
|
const resolveConfig = () => ({
|
|
@@ -268,11 +374,17 @@ export function createCustomProviderModelProvider(config, deps) {
|
|
|
268
374
|
name: config.name,
|
|
269
375
|
});
|
|
270
376
|
switch (providerType) {
|
|
271
|
-
case 'openai':
|
|
272
|
-
|
|
377
|
+
case 'openai': {
|
|
378
|
+
const openAIClient = new OpenAI({
|
|
273
379
|
apiKey: config.apiKey,
|
|
274
380
|
baseURL: config.baseUrl ? normalizeBaseUrl(config.baseUrl) : undefined,
|
|
381
|
+
fetch: createOpenAIResponsesFetch(deps.fetch),
|
|
382
|
+
});
|
|
383
|
+
return new OpenAIProvider({
|
|
384
|
+
openAIClient: openAIClient,
|
|
385
|
+
useResponses: true,
|
|
275
386
|
});
|
|
387
|
+
}
|
|
276
388
|
case 'anthropic':
|
|
277
389
|
return new AiSdkAnthropicProvider({
|
|
278
390
|
defaultModel: deps.defaultModel,
|
|
@@ -289,9 +401,10 @@ export function createCustomProviderModelProvider(config, deps) {
|
|
|
289
401
|
defaultModel: deps.defaultModel,
|
|
290
402
|
resolveConfig,
|
|
291
403
|
});
|
|
404
|
+
case 'opencode':
|
|
405
|
+
return new OpencodeMinimaxHybridProvider(config, deps);
|
|
292
406
|
case 'openai-compatible':
|
|
293
407
|
case 'llama.cpp':
|
|
294
|
-
case 'opencode':
|
|
295
408
|
default: {
|
|
296
409
|
const isOpencode = providerType === 'opencode' ||
|
|
297
410
|
config.name === 'opencode' ||
|
|
@@ -303,7 +416,7 @@ export function createCustomProviderModelProvider(config, deps) {
|
|
|
303
416
|
apiKey: effectiveApiKey || 'no-key',
|
|
304
417
|
fetch: createOpenAICompatibleFetch(deps.fetch, providerType, effectiveBaseUrl),
|
|
305
418
|
});
|
|
306
|
-
applyClientResponseNormalization(openAIClient);
|
|
419
|
+
applyClientResponseNormalization(openAIClient, deps.loggingService);
|
|
307
420
|
return new OpenAIProvider({
|
|
308
421
|
openAIClient: openAIClient,
|
|
309
422
|
useResponses: false,
|
|
@@ -336,6 +449,7 @@ export function createOpenAICompatibleProviderDefinition(config) {
|
|
|
336
449
|
model: settingsService.get('agent.model') || '',
|
|
337
450
|
loggingService,
|
|
338
451
|
}),
|
|
452
|
+
loggingService,
|
|
339
453
|
});
|
|
340
454
|
})(),
|
|
341
455
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible.provider.js","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openai-compatible.provider.js","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -132,7 +132,7 @@ test('modelSettings.reasoning.effort is forwarded as reasoning_effort', async (t
|
|
|
132
132
|
test('assistant reasoning_content is passed back with the following tool call', async (t) => {
|
|
133
133
|
const captured = [];
|
|
134
134
|
const provider = buildProvider(captured, successResponse);
|
|
135
|
-
const model = await provider.getModel('
|
|
135
|
+
const model = await provider.getModel('claude-model');
|
|
136
136
|
await runUnderTrace(() => model.getResponse({
|
|
137
137
|
...baseRequest,
|
|
138
138
|
input: [
|
|
@@ -244,6 +244,38 @@ test('assistant reasoning_content from provider stream is preserved as reasoning
|
|
|
244
244
|
rawContent: [{ type: 'reasoning_text', text: 'Need to stream reasoning.' }],
|
|
245
245
|
});
|
|
246
246
|
});
|
|
247
|
+
test('assistant choices with non-zero index in single-choice stream are normalized to 0', async (t) => {
|
|
248
|
+
const captured = [];
|
|
249
|
+
const stream = new ReadableStream({
|
|
250
|
+
start(controller) {
|
|
251
|
+
const encoder = new TextEncoder();
|
|
252
|
+
controller.enqueue(encoder.encode([
|
|
253
|
+
'data: {"id":"chatcmpl-provider-test","choices":[{"index":1,"delta":{"content":"Hello! How can I help you today?"}}]}',
|
|
254
|
+
'data: {"id":"chatcmpl-provider-test","choices":[{"index":1,"delta":{},"finish_reason":"stop"}]}',
|
|
255
|
+
'data: [DONE]',
|
|
256
|
+
'',
|
|
257
|
+
].join('\n\n')));
|
|
258
|
+
controller.close();
|
|
259
|
+
},
|
|
260
|
+
});
|
|
261
|
+
const provider = buildProvider(captured, new Response(stream, {
|
|
262
|
+
status: 200,
|
|
263
|
+
headers: { 'Content-Type': 'text/event-stream' },
|
|
264
|
+
}));
|
|
265
|
+
const model = await provider.getModel('provider-model');
|
|
266
|
+
const events = [];
|
|
267
|
+
for await (const event of model.getStreamedResponse({
|
|
268
|
+
...baseRequest,
|
|
269
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
270
|
+
modelSettings: {},
|
|
271
|
+
})) {
|
|
272
|
+
events.push(event);
|
|
273
|
+
}
|
|
274
|
+
const finalEvent = events.find((event) => event.type === 'response_done');
|
|
275
|
+
t.is(finalEvent.response.output[0].type, 'message');
|
|
276
|
+
t.is(finalEvent.response.output[0].content[0].type, 'output_text');
|
|
277
|
+
t.is(finalEvent.response.output[0].content[0].text, 'Hello! How can I help you today?');
|
|
278
|
+
});
|
|
247
279
|
test('reasoning field is stripped and preserved only as reasoning_content in outgoing requests', async (t) => {
|
|
248
280
|
const captured = [];
|
|
249
281
|
const provider = buildProvider(captured, successResponse);
|
|
@@ -277,6 +309,35 @@ test('reasoning field is stripped and preserved only as reasoning_content in out
|
|
|
277
309
|
t.is(assistantMsg.reasoning_content, 'I should run date.');
|
|
278
310
|
t.false('reasoning' in assistantMsg, 'reasoning field must not be sent to strict Chat Completions providers');
|
|
279
311
|
});
|
|
312
|
+
test('stray top-level index from replayed tool-call providerData is stripped from outgoing messages', async (t) => {
|
|
313
|
+
const captured = [];
|
|
314
|
+
const provider = buildProvider(captured, successResponse);
|
|
315
|
+
const model = await provider.getModel('provider-model');
|
|
316
|
+
await runUnderTrace(() => model.getResponse({
|
|
317
|
+
...baseRequest,
|
|
318
|
+
input: [
|
|
319
|
+
{ role: 'user', type: 'message', content: 'hello' },
|
|
320
|
+
{
|
|
321
|
+
type: 'function_call',
|
|
322
|
+
callId: 'shell:0',
|
|
323
|
+
name: 'shell',
|
|
324
|
+
arguments: '{"command":"date"}',
|
|
325
|
+
providerData: { index: 0 },
|
|
326
|
+
},
|
|
327
|
+
{
|
|
328
|
+
type: 'function_call_result',
|
|
329
|
+
callId: 'shell:0',
|
|
330
|
+
output: 'Mon Jan 01 00:00:00 UTC 2024',
|
|
331
|
+
},
|
|
332
|
+
{ role: 'user', type: 'message', content: 'thanks' },
|
|
333
|
+
],
|
|
334
|
+
modelSettings: {},
|
|
335
|
+
}));
|
|
336
|
+
t.is(captured.length, 1);
|
|
337
|
+
for (const message of captured[0].body.messages) {
|
|
338
|
+
t.false('index' in message, "top-level 'index' must not be sent to strict Chat Completions providers (Extra inputs are not permitted)");
|
|
339
|
+
}
|
|
340
|
+
});
|
|
280
341
|
test('llama.cpp maps high reasoning effort to chat template kwargs', async (t) => {
|
|
281
342
|
const captured = [];
|
|
282
343
|
const provider = buildProvider(captured, successResponse, 'llama.cpp');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible.provider.test.js","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openai-compatible.provider.test.js","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ function createOpenRouterCacheControlFetch(fetchImpl) {
|
|
|
9
9
|
try {
|
|
10
10
|
const body = JSON.parse(init.body);
|
|
11
11
|
if (Array.isArray(body?.messages)) {
|
|
12
|
-
addCacheControlToLastTwoMessages(body.messages);
|
|
12
|
+
addCacheControlToLastTwoMessages(body.messages, body.model);
|
|
13
13
|
return fetchImpl(input, { ...init, body: JSON.stringify(body) });
|
|
14
14
|
}
|
|
15
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openrouter.provider.js","sourceRoot":"","sources":["../../source/providers/openrouter.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAI1F,SAAS,iCAAiC,CAAC,SAAoB;IAC7D,OAAO,CAAC,KAAK,EAAE,KAAwB,EAAE,IAAkB,EAAE,EAAE;QAC7D,IAAI,OAAO,IAAI,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;YACnC,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;oBAClC,gCAAgC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"openrouter.provider.js","sourceRoot":"","sources":["../../source/providers/openrouter.provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-stream.d.ts","sourceRoot":"","sources":["../../source/services/agent-stream.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG;IACjD,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-stream.d.ts","sourceRoot":"","sources":["../../source/services/agent-stream.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG;IACjD,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC"}
|
|
@@ -27,6 +27,8 @@ export declare class ApprovalFlowCoordinator {
|
|
|
27
27
|
/**
|
|
28
28
|
* Drive an aborted-approval resolution: install rejection interceptor and approve the
|
|
29
29
|
* interruption so the agent gets the rejection text via the interceptor.
|
|
30
|
+
* For nested subagent approvals, use SDK-native reject() instead of the
|
|
31
|
+
* parent interceptor path to avoid interceptor stacking issues.
|
|
30
32
|
*/
|
|
31
33
|
prepareAbortResolution(abortedContext: AbortedApprovalContext, userText: string): AbortResolutionPlan;
|
|
32
34
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approval-flow-coordinator.d.ts","sourceRoot":"","sources":["../../source/services/approval-flow-coordinator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,KAAK,sBAAsB,EAAE,KAAK,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAe9G,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,iBAAiB,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,sBAAsB,CAAC;IACvC,2EAA2E;IAC3E,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,gBAAgB;IAC/B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,2EAA2E;IAC3E,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,qBAAa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,2BAA2B;IAE9D,KAAK,IAAI,OAAO;IAehB,cAAc,IAAI,sBAAsB,GAAG,IAAI;IAI/C
|
|
1
|
+
{"version":3,"file":"approval-flow-coordinator.d.ts","sourceRoot":"","sources":["../../source/services/approval-flow-coordinator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,KAAK,sBAAsB,EAAE,KAAK,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAe9G,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,iBAAiB,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,sBAAsB,CAAC;IACvC,2EAA2E;IAC3E,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,gBAAgB;IAC/B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,2EAA2E;IAC3E,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,qBAAa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,2BAA2B;IAE9D,KAAK,IAAI,OAAO;IAehB,cAAc,IAAI,sBAAsB,GAAG,IAAI;IAI/C;;;;;OAKG;IACH,sBAAsB,CAAC,cAAc,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,GAAG,mBAAmB;IA4BrG;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,gBAAgB,GAAG,IAAI;IAoFjG,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI;IAIpD,YAAY,IAAI,IAAI;IAIpB,UAAU,IAAI,sBAAsB,GAAG,IAAI;IAI3C,sBAAsB,IAAI,OAAO;CAGlC"}
|
|
@@ -26,19 +26,32 @@ export class ApprovalFlowCoordinator {
|
|
|
26
26
|
/**
|
|
27
27
|
* Drive an aborted-approval resolution: install rejection interceptor and approve the
|
|
28
28
|
* interruption so the agent gets the rejection text via the interceptor.
|
|
29
|
+
* For nested subagent approvals, use SDK-native reject() instead of the
|
|
30
|
+
* parent interceptor path to avoid interceptor stacking issues.
|
|
29
31
|
*/
|
|
30
32
|
prepareAbortResolution(abortedContext, userText) {
|
|
31
33
|
const interruptionRecord = asRecord(abortedContext.interruption);
|
|
32
34
|
const toolName = getString(interruptionRecord, 'name') ?? 'unknown';
|
|
33
35
|
const expectedCallId = getCallIdFromObject(abortedContext.interruption);
|
|
34
36
|
const rejectionMessage = `Tool execution was not approved. User provided new input instead: ${userText}`;
|
|
35
|
-
const removeInterceptor =
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
37
|
+
const removeInterceptor = abortedContext.nestedSubagent
|
|
38
|
+
? () => {
|
|
39
|
+
// no-op: nested path uses SDK-native reject() instead of
|
|
40
|
+
// a parent interceptor, so there is nothing to clean up.
|
|
41
|
+
}
|
|
42
|
+
: installApprovalRejectionInterceptor(this.deps.agentClient, {
|
|
43
|
+
toolName,
|
|
44
|
+
expectedCallId,
|
|
45
|
+
rejectionMessage,
|
|
46
|
+
});
|
|
47
|
+
if (abortedContext.nestedSubagent) {
|
|
48
|
+
const reject = getMethod(abortedContext.state, 'reject');
|
|
49
|
+
reject?.call(abortedContext.state, abortedContext.interruption);
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
const approve = getMethod(abortedContext.state, 'approve');
|
|
53
|
+
approve?.call(abortedContext.state, abortedContext.interruption);
|
|
54
|
+
}
|
|
42
55
|
return { abortedContext, removeInterceptor };
|
|
43
56
|
}
|
|
44
57
|
/**
|
|
@@ -79,20 +92,34 @@ export class ApprovalFlowCoordinator {
|
|
|
79
92
|
const rejectionMessage = rejectionReason
|
|
80
93
|
? `Tool execution was not approved. User's reason: ${rejectionReason}`
|
|
81
94
|
: 'Tool execution was not approved.';
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
expectedCallId,
|
|
85
|
-
rejectionMessage,
|
|
86
|
-
});
|
|
87
|
-
if (installedInterceptor) {
|
|
88
|
-
const approve = getMethod(state, 'approve');
|
|
89
|
-
approve?.call(state, interruption);
|
|
90
|
-
this.deps.approvalState.setPendingRemoveInterceptor(installedInterceptor);
|
|
91
|
-
}
|
|
92
|
-
else {
|
|
95
|
+
if (pendingApprovalContext.nestedSubagent) {
|
|
96
|
+
// Nested subagent: use SDK-native rejection path (no parent interceptor).
|
|
93
97
|
const reject = getMethod(state, 'reject');
|
|
94
98
|
reject?.call(state, interruption);
|
|
95
99
|
}
|
|
100
|
+
else {
|
|
101
|
+
const installedInterceptor = tryInstallApprovalRejectionInterceptor(this.deps.agentClient, {
|
|
102
|
+
toolName,
|
|
103
|
+
expectedCallId,
|
|
104
|
+
rejectionMessage,
|
|
105
|
+
});
|
|
106
|
+
if (installedInterceptor) {
|
|
107
|
+
const approve = getMethod(state, 'approve');
|
|
108
|
+
approve?.call(state, interruption);
|
|
109
|
+
this.deps.approvalState.setPendingRemoveInterceptor(installedInterceptor);
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
this.deps.logger.warn('Approval rejection interceptor could not be installed — agent client lacks addToolInterceptor support. Falling back to SDK-native reject.', {
|
|
113
|
+
eventType: 'approval.interceptor_missing',
|
|
114
|
+
category: 'approval',
|
|
115
|
+
phase: 'approval',
|
|
116
|
+
sessionId: this.deps.sessionId,
|
|
117
|
+
traceId: this.deps.logger.getCorrelationId(),
|
|
118
|
+
});
|
|
119
|
+
const reject = getMethod(state, 'reject');
|
|
120
|
+
reject?.call(state, interruption);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
96
123
|
this.deps.logger.debug('Tool approval rejected', {
|
|
97
124
|
eventType: 'approval.rejected',
|
|
98
125
|
category: 'approval',
|