@qduc/term2 0.3.1 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +46 -6
- package/dist/agent.js.map +1 -1
- package/dist/agent.test.d.ts +2 -0
- package/dist/agent.test.d.ts.map +1 -0
- package/dist/agent.test.js +198 -0
- package/dist/agent.test.js.map +1 -0
- package/dist/app.d.ts +5 -0
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +30 -14
- package/dist/app.js.map +1 -1
- package/dist/app.startup-banner.test.d.ts +2 -0
- package/dist/app.startup-banner.test.d.ts.map +1 -0
- package/dist/app.startup-banner.test.js +11 -0
- package/dist/app.startup-banner.test.js.map +1 -0
- package/dist/cli.d.ts +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +18 -3
- package/dist/cli.js.map +1 -1
- package/dist/components/ApprovalPrompt.d.ts.map +1 -1
- package/dist/components/ApprovalPrompt.js +10 -10
- package/dist/components/ApprovalPrompt.js.map +1 -1
- package/dist/components/Banner.js +1 -1
- package/dist/components/Banner.js.map +1 -1
- package/dist/components/BottomArea.d.ts.map +1 -1
- package/dist/components/BottomArea.js +3 -4
- package/dist/components/BottomArea.js.map +1 -1
- package/dist/components/ChatMessage.d.ts +1 -0
- package/dist/components/ChatMessage.d.ts.map +1 -1
- package/dist/components/ChatMessage.js +2 -2
- package/dist/components/ChatMessage.js.map +1 -1
- package/dist/components/CommandMessage.d.ts.map +1 -1
- package/dist/components/CommandMessage.js +48 -3
- package/dist/components/CommandMessage.js.map +1 -1
- package/dist/components/CommandMessage.test.js +90 -0
- package/dist/components/CommandMessage.test.js.map +1 -1
- package/dist/components/Input/PopupManager.d.ts +3 -0
- package/dist/components/Input/PopupManager.d.ts.map +1 -1
- package/dist/components/Input/PopupManager.js +2 -2
- package/dist/components/Input/PopupManager.js.map +1 -1
- package/dist/components/Input/insertions.d.ts.map +1 -1
- package/dist/components/Input/insertions.js +2 -2
- package/dist/components/Input/insertions.js.map +1 -1
- package/dist/components/Input/popup-key-navigation.d.ts +18 -0
- package/dist/components/Input/popup-key-navigation.d.ts.map +1 -0
- package/dist/components/Input/popup-key-navigation.js +16 -0
- package/dist/components/Input/popup-key-navigation.js.map +1 -0
- package/dist/components/Input/popup-key-navigation.test.d.ts +2 -0
- package/dist/components/Input/popup-key-navigation.test.d.ts.map +1 -0
- package/dist/components/Input/popup-key-navigation.test.js +73 -0
- package/dist/components/Input/popup-key-navigation.test.js.map +1 -0
- package/dist/components/Input/popup-props.d.ts.map +1 -1
- package/dist/components/Input/popup-props.js +2 -0
- package/dist/components/Input/popup-props.js.map +1 -1
- package/dist/components/Input/triggers.d.ts +1 -0
- package/dist/components/Input/triggers.d.ts.map +1 -1
- package/dist/components/Input/triggers.js +1 -0
- package/dist/components/Input/triggers.js.map +1 -1
- package/dist/components/InputBox.d.ts.map +1 -1
- package/dist/components/InputBox.js +130 -6
- package/dist/components/InputBox.js.map +1 -1
- package/dist/components/InputBox.test.js +42 -1
- package/dist/components/InputBox.test.js.map +1 -1
- package/dist/components/LiveResponse.d.ts +1 -3
- package/dist/components/LiveResponse.d.ts.map +1 -1
- package/dist/components/LiveResponse.js +5 -6
- package/dist/components/LiveResponse.js.map +1 -1
- package/dist/components/MarkdownRenderer.d.ts +5 -2
- package/dist/components/MarkdownRenderer.d.ts.map +1 -1
- package/dist/components/MarkdownRenderer.js +66 -45
- package/dist/components/MarkdownRenderer.js.map +1 -1
- package/dist/components/MessageList.d.ts +7 -1
- package/dist/components/MessageList.d.ts.map +1 -1
- package/dist/components/MessageList.js +98 -23
- package/dist/components/MessageList.js.map +1 -1
- package/dist/components/MessageList.test.js +177 -4
- package/dist/components/MessageList.test.js.map +1 -1
- package/dist/components/ModelSelectionMenu.d.ts.map +1 -1
- package/dist/components/ModelSelectionMenu.js +54 -14
- package/dist/components/ModelSelectionMenu.js.map +1 -1
- package/dist/components/PathSelectionMenu.d.ts +2 -0
- package/dist/components/PathSelectionMenu.d.ts.map +1 -1
- package/dist/components/PathSelectionMenu.js +31 -12
- package/dist/components/PathSelectionMenu.js.map +1 -1
- package/dist/components/SettingsSelectionMenu.d.ts +1 -0
- package/dist/components/SettingsSelectionMenu.d.ts.map +1 -1
- package/dist/components/SettingsSelectionMenu.js +32 -23
- package/dist/components/SettingsSelectionMenu.js.map +1 -1
- package/dist/components/SettingsSelectionMenu.scroll.test.d.ts +2 -0
- package/dist/components/SettingsSelectionMenu.scroll.test.d.ts.map +1 -0
- package/dist/components/SettingsSelectionMenu.scroll.test.js +23 -0
- package/dist/components/SettingsSelectionMenu.scroll.test.js.map +1 -0
- package/dist/components/StatusBar.d.ts.map +1 -1
- package/dist/components/StatusBar.js +14 -14
- package/dist/components/StatusBar.js.map +1 -1
- package/dist/components/StatusBar.test.d.ts +2 -0
- package/dist/components/StatusBar.test.d.ts.map +1 -0
- package/dist/components/StatusBar.test.js +30 -0
- package/dist/components/StatusBar.test.js.map +1 -0
- package/dist/contracts/conversation.d.ts +1 -0
- package/dist/contracts/conversation.d.ts.map +1 -1
- package/dist/env-setup.d.ts +2 -0
- package/dist/env-setup.d.ts.map +1 -0
- package/dist/env-setup.js +7 -0
- package/dist/env-setup.js.map +1 -0
- package/dist/env-setup.test.d.ts +2 -0
- package/dist/env-setup.test.d.ts.map +1 -0
- package/dist/env-setup.test.js +6 -0
- package/dist/env-setup.test.js.map +1 -0
- package/dist/hooks/path-completion-filter.d.ts +4 -0
- package/dist/hooks/path-completion-filter.d.ts.map +1 -0
- package/dist/hooks/path-completion-filter.js +27 -0
- package/dist/hooks/path-completion-filter.js.map +1 -0
- package/dist/hooks/path-completion-filter.test.d.ts +2 -0
- package/dist/hooks/path-completion-filter.test.d.ts.map +1 -0
- package/dist/hooks/path-completion-filter.test.js +100 -0
- package/dist/hooks/path-completion-filter.test.js.map +1 -0
- package/dist/hooks/use-app-commands.d.ts +3 -1
- package/dist/hooks/use-app-commands.d.ts.map +1 -1
- package/dist/hooks/use-app-commands.js +74 -6
- package/dist/hooks/use-app-commands.js.map +1 -1
- package/dist/hooks/use-app-commands.test.js +20 -3
- package/dist/hooks/use-app-commands.test.js.map +1 -1
- package/dist/hooks/use-conversation.d.ts +4 -9
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +32 -57
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/hooks/use-mode-handlers.d.ts +3 -1
- package/dist/hooks/use-mode-handlers.d.ts.map +1 -1
- package/dist/hooks/use-mode-handlers.js +8 -0
- package/dist/hooks/use-mode-handlers.js.map +1 -1
- package/dist/hooks/use-model-selection.d.ts +1 -1
- package/dist/hooks/use-model-selection.d.ts.map +1 -1
- package/dist/hooks/use-model-selection.js +31 -16
- package/dist/hooks/use-model-selection.js.map +1 -1
- package/dist/hooks/use-model-selection.test.js +66 -1
- package/dist/hooks/use-model-selection.test.js.map +1 -1
- package/dist/hooks/use-path-completion.d.ts +1 -0
- package/dist/hooks/use-path-completion.d.ts.map +1 -1
- package/dist/hooks/use-path-completion.js +22 -17
- package/dist/hooks/use-path-completion.js.map +1 -1
- package/dist/hooks/use-settings-completion.d.ts +2 -2
- package/dist/hooks/use-settings-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-completion.js +53 -18
- package/dist/hooks/use-settings-completion.js.map +1 -1
- package/dist/hooks/use-settings-completion.scroll.test.d.ts +2 -0
- package/dist/hooks/use-settings-completion.scroll.test.d.ts.map +1 -0
- package/dist/hooks/use-settings-completion.scroll.test.js +55 -0
- package/dist/hooks/use-settings-completion.scroll.test.js.map +1 -0
- package/dist/hooks/use-settings-completion.test.js +69 -79
- package/dist/hooks/use-settings-completion.test.js.map +1 -1
- package/dist/hooks/use-settings-value-completion.d.ts +1 -2
- package/dist/hooks/use-settings-value-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-value-completion.js +47 -19
- package/dist/hooks/use-settings-value-completion.js.map +1 -1
- package/dist/hooks/use-settings-value-completion.test.js +5 -18
- package/dist/hooks/use-settings-value-completion.test.js.map +1 -1
- package/dist/hooks/use-slash-commands.d.ts +7 -0
- package/dist/hooks/use-slash-commands.d.ts.map +1 -1
- package/dist/hooks/use-slash-commands.js +20 -13
- package/dist/hooks/use-slash-commands.js.map +1 -1
- package/dist/hooks/use-slash-commands.test.js +52 -1
- package/dist/hooks/use-slash-commands.test.js.map +1 -1
- package/dist/hooks/use-trigger-detection.d.ts.map +1 -1
- package/dist/hooks/use-trigger-detection.js +7 -3
- package/dist/hooks/use-trigger-detection.js.map +1 -1
- package/dist/hooks/use-trigger-detection.test.d.ts +2 -0
- package/dist/hooks/use-trigger-detection.test.d.ts.map +1 -0
- package/dist/hooks/use-trigger-detection.test.js +59 -0
- package/dist/hooks/use-trigger-detection.test.js.map +1 -0
- package/dist/lib/openai-agent-client.d.ts +21 -0
- package/dist/lib/openai-agent-client.d.ts.map +1 -1
- package/dist/lib/openai-agent-client.js +52 -17
- package/dist/lib/openai-agent-client.js.map +1 -1
- package/dist/lib/openai-agent-client.test.js +63 -0
- package/dist/lib/openai-agent-client.test.js.map +1 -1
- package/dist/lib/tool-invoke.d.ts +3 -2
- package/dist/lib/tool-invoke.d.ts.map +1 -1
- package/dist/lib/tool-invoke.js +69 -4
- package/dist/lib/tool-invoke.js.map +1 -1
- package/dist/lib/tool-invoke.test.js +25 -0
- package/dist/lib/tool-invoke.test.js.map +1 -1
- package/dist/non-interactive.d.ts.map +1 -1
- package/dist/non-interactive.js +3 -0
- package/dist/non-interactive.js.map +1 -1
- package/dist/prompts/gpt-5-modern.md +66 -0
- package/dist/prompts/gpt-5.md +10 -0
- package/dist/prompts/lite.md +10 -27
- package/dist/prompts/prompt-selector.js +2 -2
- package/dist/prompts/prompt-selector.js.map +1 -1
- package/dist/prompts/prompt-selector.test.js +7 -2
- package/dist/prompts/prompt-selector.test.js.map +1 -1
- package/dist/prompts/prompt-selector.test.ts +22 -2
- package/dist/prompts/prompt-selector.ts +2 -2
- package/dist/prompts/search-via-shell.d.ts +7 -0
- package/dist/prompts/search-via-shell.d.ts.map +1 -0
- package/dist/prompts/search-via-shell.js +59 -0
- package/dist/prompts/search-via-shell.js.map +1 -0
- package/dist/prompts/search-via-shell.test.d.ts +2 -0
- package/dist/prompts/search-via-shell.test.d.ts.map +1 -0
- package/dist/prompts/search-via-shell.test.js +40 -0
- package/dist/prompts/search-via-shell.test.js.map +1 -0
- package/dist/prompts/search-via-shell.test.ts +47 -0
- package/dist/prompts/search-via-shell.ts +71 -0
- package/dist/prompts/simple.md +40 -186
- package/dist/providers/ai-sdk-agents-adapter.d.ts +7 -0
- package/dist/providers/ai-sdk-agents-adapter.d.ts.map +1 -0
- package/dist/providers/ai-sdk-agents-adapter.js +80 -0
- package/dist/providers/ai-sdk-agents-adapter.js.map +1 -0
- package/dist/providers/ai-sdk-agents-adapter.test.d.ts +2 -0
- package/dist/providers/ai-sdk-agents-adapter.test.d.ts.map +1 -0
- package/dist/providers/ai-sdk-agents-adapter.test.js +158 -0
- package/dist/providers/ai-sdk-agents-adapter.test.js.map +1 -0
- package/dist/providers/ai-sdk-anthropic.provider.d.ts +14 -0
- package/dist/providers/ai-sdk-anthropic.provider.d.ts.map +1 -0
- package/dist/providers/ai-sdk-anthropic.provider.js +18 -0
- package/dist/providers/ai-sdk-anthropic.provider.js.map +1 -0
- package/dist/providers/ai-sdk-google.provider.d.ts +14 -0
- package/dist/providers/ai-sdk-google.provider.d.ts.map +1 -0
- package/dist/providers/ai-sdk-google.provider.js +18 -0
- package/dist/providers/ai-sdk-google.provider.js.map +1 -0
- package/dist/providers/ai-sdk-logging-fetch.d.ts +11 -0
- package/dist/providers/ai-sdk-logging-fetch.d.ts.map +1 -0
- package/dist/providers/ai-sdk-logging-fetch.js +127 -0
- package/dist/providers/ai-sdk-logging-fetch.js.map +1 -0
- package/dist/providers/ai-sdk-logging-fetch.test.d.ts +2 -0
- package/dist/providers/ai-sdk-logging-fetch.test.d.ts.map +1 -0
- package/dist/providers/ai-sdk-logging-fetch.test.js +107 -0
- package/dist/providers/ai-sdk-logging-fetch.test.js.map +1 -0
- package/dist/providers/ai-sdk-message-normalizer.d.ts +2 -2
- package/dist/providers/ai-sdk-message-normalizer.d.ts.map +1 -1
- package/dist/providers/ai-sdk-message-normalizer.js +92 -47
- package/dist/providers/ai-sdk-message-normalizer.js.map +1 -1
- package/dist/providers/ai-sdk-message-normalizer.test.js +256 -16
- package/dist/providers/ai-sdk-message-normalizer.test.js.map +1 -1
- package/dist/providers/ai-sdk-openai-compatible.provider.d.ts +2 -0
- package/dist/providers/ai-sdk-openai-compatible.provider.d.ts.map +1 -1
- package/dist/providers/ai-sdk-openai-compatible.provider.js +3 -3
- package/dist/providers/ai-sdk-openai-compatible.provider.js.map +1 -1
- package/dist/providers/ai-sdk-openai-compatible.provider.test.js +25 -0
- package/dist/providers/ai-sdk-openai-compatible.provider.test.js.map +1 -1
- package/dist/providers/ai-sdk-openrouter.provider.d.ts +1 -1
- package/dist/providers/ai-sdk-openrouter.provider.d.ts.map +1 -1
- package/dist/providers/ai-sdk-openrouter.provider.js +2 -3
- package/dist/providers/ai-sdk-openrouter.provider.js.map +1 -1
- package/dist/providers/ai-sdk-openrouter.provider.test.js +23 -0
- package/dist/providers/ai-sdk-openrouter.provider.test.js.map +1 -1
- package/dist/providers/common/openai-compatible-messages.d.ts +1 -2
- package/dist/providers/common/openai-compatible-messages.d.ts.map +1 -1
- package/dist/providers/common/openai-compatible-messages.js +22 -48
- package/dist/providers/common/openai-compatible-messages.js.map +1 -1
- package/dist/providers/common/openai-compatible-messages.test.js +93 -1
- package/dist/providers/common/openai-compatible-messages.test.js.map +1 -1
- package/dist/providers/custom-provider-adapter.test.d.ts +2 -0
- package/dist/providers/custom-provider-adapter.test.d.ts.map +1 -0
- package/dist/providers/custom-provider-adapter.test.js +52 -0
- package/dist/providers/custom-provider-adapter.test.js.map +1 -0
- package/dist/providers/openai-compatible-behavior-gate.test.d.ts +2 -0
- package/dist/providers/openai-compatible-behavior-gate.test.d.ts.map +1 -0
- package/dist/providers/openai-compatible-behavior-gate.test.js +216 -0
- package/dist/providers/openai-compatible-behavior-gate.test.js.map +1 -0
- package/dist/providers/openai-compatible.provider.d.ts +10 -1
- package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
- package/dist/providers/openai-compatible.provider.js +341 -31
- package/dist/providers/openai-compatible.provider.js.map +1 -1
- package/dist/providers/openai-compatible.provider.test.d.ts +2 -0
- package/dist/providers/openai-compatible.provider.test.d.ts.map +1 -0
- package/dist/providers/openai-compatible.provider.test.js +462 -0
- package/dist/providers/openai-compatible.provider.test.js.map +1 -0
- package/dist/providers/openai.provider.js +2 -1
- package/dist/providers/openai.provider.js.map +1 -1
- package/dist/providers/openai.provider.test.d.ts +2 -0
- package/dist/providers/openai.provider.test.d.ts.map +1 -0
- package/dist/providers/openai.provider.test.js +22 -0
- package/dist/providers/openai.provider.test.js.map +1 -0
- package/dist/providers/openrouter.provider.js +28 -2
- package/dist/providers/openrouter.provider.js.map +1 -1
- package/dist/scripts/eval-auto-approval/dataset.d.ts +1 -1
- package/dist/services/conversation-events.d.ts +3 -0
- package/dist/services/conversation-events.d.ts.map +1 -1
- package/dist/services/conversation-result-builder.d.ts.map +1 -1
- package/dist/services/conversation-result-builder.js +11 -1
- package/dist/services/conversation-result-builder.js.map +1 -1
- package/dist/services/conversation-result-builder.test.js +72 -0
- package/dist/services/conversation-result-builder.test.js.map +1 -1
- package/dist/services/conversation-session.d.ts +2 -1
- package/dist/services/conversation-session.d.ts.map +1 -1
- package/dist/services/conversation-session.js +30 -1
- package/dist/services/conversation-session.js.map +1 -1
- package/dist/services/file-service.js +1 -1
- package/dist/services/file-service.js.map +1 -1
- package/dist/services/logging-contract.d.ts +3 -3
- package/dist/services/logging-service.d.ts.map +1 -1
- package/dist/services/logging-service.js +18 -1
- package/dist/services/logging-service.js.map +1 -1
- package/dist/services/model-service.d.ts.map +1 -1
- package/dist/services/model-service.js +16 -8
- package/dist/services/model-service.js.map +1 -1
- package/dist/services/model-service.test.js +67 -1
- package/dist/services/model-service.test.js.map +1 -1
- package/dist/services/rtk-service.d.ts +23 -0
- package/dist/services/rtk-service.d.ts.map +1 -0
- package/dist/services/rtk-service.js +165 -0
- package/dist/services/rtk-service.js.map +1 -0
- package/dist/services/rtk-service.test.d.ts +2 -0
- package/dist/services/rtk-service.test.d.ts.map +1 -0
- package/dist/services/rtk-service.test.js +239 -0
- package/dist/services/rtk-service.test.js.map +1 -0
- package/dist/services/settings-persistence.d.ts +1 -0
- package/dist/services/settings-persistence.d.ts.map +1 -1
- package/dist/services/settings-persistence.js +28 -5
- package/dist/services/settings-persistence.js.map +1 -1
- package/dist/services/settings-persistence.test.js +55 -3
- package/dist/services/settings-persistence.test.js.map +1 -1
- package/dist/services/settings-schema.d.ts +55 -16
- package/dist/services/settings-schema.d.ts.map +1 -1
- package/dist/services/settings-schema.js +35 -4
- package/dist/services/settings-schema.js.map +1 -1
- package/dist/services/settings-schema.test.d.ts +2 -0
- package/dist/services/settings-schema.test.d.ts.map +1 -0
- package/dist/services/settings-schema.test.js +77 -0
- package/dist/services/settings-schema.test.js.map +1 -0
- package/dist/services/settings-service.d.ts.map +1 -1
- package/dist/services/settings-service.js +7 -4
- package/dist/services/settings-service.js.map +1 -1
- package/dist/services/settings-sources.d.ts.map +1 -1
- package/dist/services/settings-sources.js +1 -0
- package/dist/services/settings-sources.js.map +1 -1
- package/dist/services/shell-auto-approval-evaluator.d.ts +1 -1
- package/dist/services/shell-auto-approval-evaluator.d.ts.map +1 -1
- package/dist/services/shell-auto-approval-evaluator.js +8 -2
- package/dist/services/shell-auto-approval-evaluator.js.map +1 -1
- package/dist/services/stream-event-processor.d.ts.map +1 -1
- package/dist/services/stream-event-processor.js +10 -8
- package/dist/services/stream-event-processor.js.map +1 -1
- package/dist/services/stream-event-processor.test.js +32 -0
- package/dist/services/stream-event-processor.test.js.map +1 -1
- package/dist/services/terminal-result-collector.d.ts.map +1 -1
- package/dist/services/terminal-result-collector.js +1 -0
- package/dist/services/terminal-result-collector.js.map +1 -1
- package/dist/services/terminal-result-collector.test.js +22 -0
- package/dist/services/terminal-result-collector.test.js.map +1 -1
- package/dist/tools/apply-patch.d.ts +12 -4
- package/dist/tools/apply-patch.d.ts.map +1 -1
- package/dist/tools/apply-patch.js +204 -208
- package/dist/tools/apply-patch.js.map +1 -1
- package/dist/tools/apply-patch.test.js +44 -0
- package/dist/tools/apply-patch.test.js.map +1 -1
- package/dist/tools/code-context.d.ts +27 -0
- package/dist/tools/code-context.d.ts.map +1 -0
- package/dist/tools/code-context.js +512 -0
- package/dist/tools/code-context.js.map +1 -0
- package/dist/tools/code-context.test.d.ts +2 -0
- package/dist/tools/code-context.test.d.ts.map +1 -0
- package/dist/tools/code-context.test.js +368 -0
- package/dist/tools/code-context.test.js.map +1 -0
- package/dist/tools/create-file.d.ts.map +1 -1
- package/dist/tools/create-file.js +3 -2
- package/dist/tools/create-file.js.map +1 -1
- package/dist/tools/edit-healing.d.ts +4 -3
- package/dist/tools/edit-healing.d.ts.map +1 -1
- package/dist/tools/edit-healing.js +50 -20
- package/dist/tools/edit-healing.js.map +1 -1
- package/dist/tools/edit-healing.test.js +62 -0
- package/dist/tools/edit-healing.test.js.map +1 -1
- package/dist/tools/file-locks.d.ts +2 -0
- package/dist/tools/file-locks.d.ts.map +1 -0
- package/dist/tools/file-locks.js +21 -0
- package/dist/tools/file-locks.js.map +1 -0
- package/dist/tools/find-files.d.ts +1 -0
- package/dist/tools/find-files.d.ts.map +1 -1
- package/dist/tools/find-files.js +59 -139
- package/dist/tools/find-files.js.map +1 -1
- package/dist/tools/find-files.test.js +5 -10
- package/dist/tools/find-files.test.js.map +1 -1
- package/dist/tools/grep.d.ts +1 -0
- package/dist/tools/grep.d.ts.map +1 -1
- package/dist/tools/grep.js +10 -46
- package/dist/tools/grep.js.map +1 -1
- package/dist/tools/language-providers.d.ts +48 -0
- package/dist/tools/language-providers.d.ts.map +1 -0
- package/dist/tools/language-providers.js +244 -0
- package/dist/tools/language-providers.js.map +1 -0
- package/dist/tools/search-replace.d.ts +5 -2
- package/dist/tools/search-replace.d.ts.map +1 -1
- package/dist/tools/search-replace.js +201 -106
- package/dist/tools/search-replace.js.map +1 -1
- package/dist/tools/search-replace.test.js +111 -1
- package/dist/tools/search-replace.test.js.map +1 -1
- package/dist/tools/search.d.ts.map +1 -1
- package/dist/tools/search.js +5 -15
- package/dist/tools/search.js.map +1 -1
- package/dist/tools/shell.d.ts +2 -0
- package/dist/tools/shell.d.ts.map +1 -1
- package/dist/tools/shell.js +15 -7
- package/dist/tools/shell.js.map +1 -1
- package/dist/tools/shell.test.js +28 -0
- package/dist/tools/shell.test.js.map +1 -1
- package/dist/tools/tool-names.d.ts +3 -0
- package/dist/tools/tool-names.d.ts.map +1 -1
- package/dist/tools/tool-names.js +3 -0
- package/dist/tools/tool-names.js.map +1 -1
- package/dist/tools/tool-names.test.js +4 -1
- package/dist/tools/tool-names.test.js.map +1 -1
- package/dist/tools/tool-parameter-schema.test.js +18 -0
- package/dist/tools/tool-parameter-schema.test.js.map +1 -1
- package/dist/utils/command-safety/constants.d.ts.map +1 -1
- package/dist/utils/command-safety/constants.js +30 -5
- package/dist/utils/command-safety/constants.js.map +1 -1
- package/dist/utils/command-safety/index.d.ts.map +1 -1
- package/dist/utils/command-safety/index.js +3 -0
- package/dist/utils/command-safety/index.js.map +1 -1
- package/dist/utils/command-safety/path-analysis.d.ts.map +1 -1
- package/dist/utils/command-safety/path-analysis.js +8 -0
- package/dist/utils/command-safety/path-analysis.js.map +1 -1
- package/dist/utils/command-safety.find.test.js +1 -1
- package/dist/utils/command-safety.find.test.js.map +1 -1
- package/dist/utils/command-safety.path.test.js +14 -0
- package/dist/utils/command-safety.path.test.js.map +1 -1
- package/dist/utils/command-safety.specialized-handlers.test.d.ts +2 -0
- package/dist/utils/command-safety.specialized-handlers.test.d.ts.map +1 -0
- package/dist/utils/command-safety.specialized-handlers.test.js +20 -0
- package/dist/utils/command-safety.specialized-handlers.test.js.map +1 -0
- package/dist/utils/conversation-event-handler.d.ts +8 -6
- package/dist/utils/conversation-event-handler.d.ts.map +1 -1
- package/dist/utils/conversation-event-handler.js +166 -46
- package/dist/utils/conversation-event-handler.js.map +1 -1
- package/dist/utils/conversation-event-handler.test.js +391 -12
- package/dist/utils/conversation-event-handler.test.js.map +1 -1
- package/dist/utils/conversation-utils.d.ts +2 -0
- package/dist/utils/conversation-utils.d.ts.map +1 -1
- package/dist/utils/conversation-utils.js +2 -0
- package/dist/utils/conversation-utils.js.map +1 -1
- package/dist/utils/execute-shell.d.ts +5 -6
- package/dist/utils/execute-shell.d.ts.map +1 -1
- package/dist/utils/execute-shell.js +21 -11
- package/dist/utils/execute-shell.js.map +1 -1
- package/dist/utils/execute-shell.test.js +37 -6
- package/dist/utils/execute-shell.test.js.map +1 -1
- package/dist/utils/extract-command-messages.d.ts.map +1 -1
- package/dist/utils/extract-command-messages.js +4 -1
- package/dist/utils/extract-command-messages.js.map +1 -1
- package/dist/utils/flex-service-tier.d.ts +2 -0
- package/dist/utils/flex-service-tier.d.ts.map +1 -0
- package/dist/utils/flex-service-tier.js +20 -0
- package/dist/utils/flex-service-tier.js.map +1 -0
- package/dist/utils/flex-service-tier.test.d.ts +2 -0
- package/dist/utils/flex-service-tier.test.d.ts.map +1 -0
- package/dist/utils/flex-service-tier.test.js +25 -0
- package/dist/utils/flex-service-tier.test.js.map +1 -0
- package/dist/utils/log-truncation.d.ts +4 -2
- package/dist/utils/log-truncation.d.ts.map +1 -1
- package/dist/utils/log-truncation.js +143 -41
- package/dist/utils/log-truncation.js.map +1 -1
- package/dist/utils/log-truncation.test.js +131 -1
- package/dist/utils/log-truncation.test.js.map +1 -1
- package/dist/utils/project-tree.d.ts +14 -0
- package/dist/utils/project-tree.d.ts.map +1 -0
- package/dist/utils/project-tree.js +111 -0
- package/dist/utils/project-tree.js.map +1 -0
- package/dist/utils/project-tree.test.d.ts +2 -0
- package/dist/utils/project-tree.test.d.ts.map +1 -0
- package/dist/utils/project-tree.test.js +149 -0
- package/dist/utils/project-tree.test.js.map +1 -0
- package/dist/utils/provider-traffic-extractor.d.ts.map +1 -1
- package/dist/utils/provider-traffic-extractor.js +0 -1
- package/dist/utils/provider-traffic-extractor.js.map +1 -1
- package/dist/utils/streaming-session-factory.d.ts +1 -3
- package/dist/utils/streaming-session-factory.d.ts.map +1 -1
- package/dist/utils/streaming-session-factory.js +29 -10
- package/dist/utils/streaming-session-factory.js.map +1 -1
- package/dist/utils/streaming-session-factory.test.js +47 -15
- package/dist/utils/streaming-session-factory.test.js.map +1 -1
- package/dist/utils/subsequence-filter.d.ts +8 -0
- package/dist/utils/subsequence-filter.d.ts.map +1 -0
- package/dist/utils/subsequence-filter.js +47 -0
- package/dist/utils/subsequence-filter.js.map +1 -0
- package/dist/utils/terminal-clear.d.ts +7 -0
- package/dist/utils/terminal-clear.d.ts.map +1 -0
- package/dist/utils/terminal-clear.js +5 -0
- package/dist/utils/terminal-clear.js.map +1 -0
- package/dist/utils/terminal-clear.test.d.ts +2 -0
- package/dist/utils/terminal-clear.test.d.ts.map +1 -0
- package/dist/utils/terminal-clear.test.js +13 -0
- package/dist/utils/terminal-clear.test.js.map +1 -0
- package/dist/utils/token-usage.d.ts +13 -1
- package/dist/utils/token-usage.d.ts.map +1 -1
- package/dist/utils/token-usage.js +119 -28
- package/dist/utils/token-usage.js.map +1 -1
- package/dist/utils/token-usage.test.js +135 -3
- package/dist/utils/token-usage.test.js.map +1 -1
- package/package.json +4 -4
- package/dist/providers/openai-compatible/api.d.ts +0 -17
- package/dist/providers/openai-compatible/api.d.ts.map +0 -1
- package/dist/providers/openai-compatible/api.js +0 -58
- package/dist/providers/openai-compatible/api.js.map +0 -1
- package/dist/providers/openai-compatible/model.d.ts +0 -17
- package/dist/providers/openai-compatible/model.d.ts.map +0 -1
- package/dist/providers/openai-compatible/model.js +0 -473
- package/dist/providers/openai-compatible/model.js.map +0 -1
- package/dist/providers/openai-compatible/provider.d.ts +0 -22
- package/dist/providers/openai-compatible/provider.d.ts.map +0 -1
- package/dist/providers/openai-compatible/provider.js +0 -43
- package/dist/providers/openai-compatible/provider.js.map +0 -1
- package/dist/providers/openai-compatible/reasoning-content.test.d.ts +0 -2
- package/dist/providers/openai-compatible/reasoning-content.test.d.ts.map +0 -1
- package/dist/providers/openai-compatible/reasoning-content.test.js +0 -258
- package/dist/providers/openai-compatible/reasoning-content.test.js.map +0 -1
- package/dist/providers/openai-compatible/utils.d.ts +0 -3
- package/dist/providers/openai-compatible/utils.d.ts.map +0 -1
- package/dist/providers/openai-compatible/utils.js +0 -11
- package/dist/providers/openai-compatible/utils.js.map +0 -1
- package/dist/providers/openrouter/api.d.ts +0 -39
- package/dist/providers/openrouter/api.d.ts.map +0 -1
- package/dist/providers/openrouter/api.js +0 -164
- package/dist/providers/openrouter/api.js.map +0 -1
- package/dist/providers/openrouter/converters.d.ts +0 -8
- package/dist/providers/openrouter/converters.d.ts.map +0 -1
- package/dist/providers/openrouter/converters.js +0 -391
- package/dist/providers/openrouter/converters.js.map +0 -1
- package/dist/providers/openrouter/converters.test.d.ts +0 -2
- package/dist/providers/openrouter/converters.test.d.ts.map +0 -1
- package/dist/providers/openrouter/converters.test.js +0 -179
- package/dist/providers/openrouter/converters.test.js.map +0 -1
- package/dist/providers/openrouter/index.d.ts +0 -4
- package/dist/providers/openrouter/index.d.ts.map +0 -1
- package/dist/providers/openrouter/index.js +0 -4
- package/dist/providers/openrouter/index.js.map +0 -1
- package/dist/providers/openrouter/model.d.ts +0 -14
- package/dist/providers/openrouter/model.d.ts.map +0 -1
- package/dist/providers/openrouter/model.js +0 -457
- package/dist/providers/openrouter/model.js.map +0 -1
- package/dist/providers/openrouter/provider.d.ts +0 -15
- package/dist/providers/openrouter/provider.d.ts.map +0 -1
- package/dist/providers/openrouter/provider.js +0 -21
- package/dist/providers/openrouter/provider.js.map +0 -1
- package/dist/providers/openrouter/reasoning-content.test.d.ts +0 -2
- package/dist/providers/openrouter/reasoning-content.test.d.ts.map +0 -1
- package/dist/providers/openrouter/reasoning-content.test.js +0 -122
- package/dist/providers/openrouter/reasoning-content.test.js.map +0 -1
- package/dist/providers/openrouter/utils.d.ts +0 -11
- package/dist/providers/openrouter/utils.d.ts.map +0 -1
- package/dist/providers/openrouter/utils.js +0 -29
- package/dist/providers/openrouter/utils.js.map +0 -1
- package/dist/providers/openrouter.api.retry.test.d.ts +0 -2
- package/dist/providers/openrouter.api.retry.test.d.ts.map +0 -1
- package/dist/providers/openrouter.api.retry.test.js +0 -148
- package/dist/providers/openrouter.api.retry.test.js.map +0 -1
- package/dist/providers/openrouter.test.d.ts +0 -2
- package/dist/providers/openrouter.test.d.ts.map +0 -1
- package/dist/providers/openrouter.test.js +0 -1449
- package/dist/providers/openrouter.test.js.map +0 -1
|
@@ -0,0 +1,462 @@
|
|
|
1
|
+
import test from 'ava';
|
|
2
|
+
import { setTracingDisabled, withTrace } from '@openai/agents-core';
|
|
3
|
+
import { createCustomProviderModelProvider, createOpenAICompatibleProviderDefinition, } from './openai-compatible.provider.js';
|
|
4
|
+
setTracingDisabled(true);
|
|
5
|
+
const runUnderTrace = (fn) => withTrace('openai-compatible-provider-test', fn);
|
|
6
|
+
function buildProvider(captured, response, providerType = 'openai-compatible', baseUrl = 'https://provider.test/v1') {
|
|
7
|
+
return createCustomProviderModelProvider({
|
|
8
|
+
name: 'provider-test',
|
|
9
|
+
type: providerType,
|
|
10
|
+
baseUrl,
|
|
11
|
+
apiKey: 'provider-key',
|
|
12
|
+
}, {
|
|
13
|
+
defaultModel: 'provider-model',
|
|
14
|
+
fetch: (async (input, init) => {
|
|
15
|
+
const headers = {};
|
|
16
|
+
const rawHeaders = init?.headers;
|
|
17
|
+
if (rawHeaders) {
|
|
18
|
+
if (typeof rawHeaders.forEach === 'function') {
|
|
19
|
+
rawHeaders.forEach((v, k) => {
|
|
20
|
+
headers[k.toLowerCase()] = String(v);
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
for (const [k, v] of Object.entries(rawHeaders)) {
|
|
25
|
+
headers[k.toLowerCase()] = String(v);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
const rawBody = typeof init?.body === 'string' ? init.body : '';
|
|
30
|
+
captured.push({
|
|
31
|
+
url: typeof input === 'string' ? input : input.toString?.() ?? String(input),
|
|
32
|
+
body: rawBody ? JSON.parse(rawBody) : null,
|
|
33
|
+
headers,
|
|
34
|
+
});
|
|
35
|
+
if (response instanceof Response) {
|
|
36
|
+
return response;
|
|
37
|
+
}
|
|
38
|
+
return new Response(JSON.stringify(response), {
|
|
39
|
+
status: 200,
|
|
40
|
+
headers: { 'Content-Type': 'application/json' },
|
|
41
|
+
});
|
|
42
|
+
}),
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
const successResponse = {
|
|
46
|
+
id: 'chatcmpl-provider-test',
|
|
47
|
+
object: 'chat.completion',
|
|
48
|
+
created: 1,
|
|
49
|
+
model: 'provider-model',
|
|
50
|
+
choices: [
|
|
51
|
+
{
|
|
52
|
+
index: 0,
|
|
53
|
+
message: { role: 'assistant', content: 'ok' },
|
|
54
|
+
finish_reason: 'stop',
|
|
55
|
+
},
|
|
56
|
+
],
|
|
57
|
+
usage: { prompt_tokens: 1, completion_tokens: 1, total_tokens: 2 },
|
|
58
|
+
};
|
|
59
|
+
const baseRequest = {
|
|
60
|
+
tools: [],
|
|
61
|
+
handoffs: [],
|
|
62
|
+
outputType: 'text',
|
|
63
|
+
tracing: false,
|
|
64
|
+
};
|
|
65
|
+
test('runtime openai-compatible createRunner returns a runner', (t) => {
|
|
66
|
+
const provider = createOpenAICompatibleProviderDefinition({
|
|
67
|
+
name: 'local-test',
|
|
68
|
+
baseUrl: 'http://localhost:11434',
|
|
69
|
+
});
|
|
70
|
+
const deps = {
|
|
71
|
+
settingsService: {
|
|
72
|
+
get: (key) => {
|
|
73
|
+
const values = {
|
|
74
|
+
'agent.model': 'test-model',
|
|
75
|
+
providers: [
|
|
76
|
+
{
|
|
77
|
+
name: 'local-test',
|
|
78
|
+
baseUrl: 'http://localhost:11434',
|
|
79
|
+
apiKey: 'local-key',
|
|
80
|
+
},
|
|
81
|
+
],
|
|
82
|
+
};
|
|
83
|
+
return values[key];
|
|
84
|
+
},
|
|
85
|
+
set: () => { },
|
|
86
|
+
},
|
|
87
|
+
loggingService: {
|
|
88
|
+
info: () => { },
|
|
89
|
+
warn: () => { },
|
|
90
|
+
error: () => { },
|
|
91
|
+
debug: () => { },
|
|
92
|
+
security: () => { },
|
|
93
|
+
setCorrelationId: () => { },
|
|
94
|
+
getCorrelationId: () => undefined,
|
|
95
|
+
clearCorrelationId: () => { },
|
|
96
|
+
},
|
|
97
|
+
};
|
|
98
|
+
const runner = provider.createRunner(deps);
|
|
99
|
+
t.truthy(runner);
|
|
100
|
+
});
|
|
101
|
+
test('providerData fields are forwarded into the chat-completions request body root', async (t) => {
|
|
102
|
+
const captured = [];
|
|
103
|
+
const provider = buildProvider(captured, successResponse);
|
|
104
|
+
const model = await provider.getModel('provider-model');
|
|
105
|
+
await runUnderTrace(() => model.getResponse({
|
|
106
|
+
...baseRequest,
|
|
107
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
108
|
+
modelSettings: {
|
|
109
|
+
providerData: {
|
|
110
|
+
service_tier: 'flex',
|
|
111
|
+
custom_vendor_flag: 'on',
|
|
112
|
+
},
|
|
113
|
+
},
|
|
114
|
+
}));
|
|
115
|
+
t.is(captured.length, 1);
|
|
116
|
+
const body = captured[0].body;
|
|
117
|
+
t.is(body.service_tier, 'flex');
|
|
118
|
+
t.is(body.custom_vendor_flag, 'on');
|
|
119
|
+
});
|
|
120
|
+
test('modelSettings.reasoning.effort is forwarded as reasoning_effort', async (t) => {
|
|
121
|
+
const captured = [];
|
|
122
|
+
const provider = buildProvider(captured, successResponse);
|
|
123
|
+
const model = await provider.getModel('provider-model');
|
|
124
|
+
await runUnderTrace(() => model.getResponse({
|
|
125
|
+
...baseRequest,
|
|
126
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
127
|
+
modelSettings: { reasoning: { effort: 'high', summary: 'auto' } },
|
|
128
|
+
}));
|
|
129
|
+
t.is(captured.length, 1);
|
|
130
|
+
t.is(captured[0].body.reasoning_effort, 'high');
|
|
131
|
+
});
|
|
132
|
+
test('assistant reasoning_content is passed back with the following tool call', async (t) => {
|
|
133
|
+
const captured = [];
|
|
134
|
+
const provider = buildProvider(captured, successResponse);
|
|
135
|
+
const model = await provider.getModel('provider-model');
|
|
136
|
+
await runUnderTrace(() => model.getResponse({
|
|
137
|
+
...baseRequest,
|
|
138
|
+
input: [
|
|
139
|
+
{ role: 'user', type: 'message', content: 'what time is it?' },
|
|
140
|
+
{
|
|
141
|
+
type: 'reasoning',
|
|
142
|
+
rawContent: [{ type: 'reasoning_text', text: 'Need to use the shell for the exact time.' }],
|
|
143
|
+
},
|
|
144
|
+
{
|
|
145
|
+
type: 'function_call',
|
|
146
|
+
callId: 'shell:0',
|
|
147
|
+
name: 'shell',
|
|
148
|
+
arguments: '{"command":"date"}',
|
|
149
|
+
},
|
|
150
|
+
{
|
|
151
|
+
type: 'function_call_result',
|
|
152
|
+
callId: 'shell:0',
|
|
153
|
+
output: 'Tue May 12 18:40:41 +07 2026',
|
|
154
|
+
},
|
|
155
|
+
{ role: 'user', type: 'message', content: 'thanks' },
|
|
156
|
+
],
|
|
157
|
+
modelSettings: {},
|
|
158
|
+
}));
|
|
159
|
+
t.is(captured.length, 1);
|
|
160
|
+
t.deepEqual(captured[0].body.messages.slice(1, 4), [
|
|
161
|
+
{
|
|
162
|
+
role: 'assistant',
|
|
163
|
+
content: null,
|
|
164
|
+
reasoning_content: 'Need to use the shell for the exact time.',
|
|
165
|
+
tool_calls: [
|
|
166
|
+
{
|
|
167
|
+
id: 'shell:0',
|
|
168
|
+
type: 'function',
|
|
169
|
+
function: {
|
|
170
|
+
name: 'shell',
|
|
171
|
+
arguments: '{"command":"date"}',
|
|
172
|
+
},
|
|
173
|
+
},
|
|
174
|
+
],
|
|
175
|
+
},
|
|
176
|
+
{
|
|
177
|
+
role: 'tool',
|
|
178
|
+
content: [{ type: 'text', text: 'Tue May 12 18:40:41 +07 2026', cache_control: { type: 'ephemeral' } }],
|
|
179
|
+
tool_call_id: 'shell:0',
|
|
180
|
+
},
|
|
181
|
+
{ role: 'user', content: [{ type: 'text', text: 'thanks', cache_control: { type: 'ephemeral' } }] },
|
|
182
|
+
]);
|
|
183
|
+
});
|
|
184
|
+
test('assistant reasoning_content from provider response is preserved as reasoning output', async (t) => {
|
|
185
|
+
const captured = [];
|
|
186
|
+
const provider = buildProvider(captured, {
|
|
187
|
+
...successResponse,
|
|
188
|
+
choices: [
|
|
189
|
+
{
|
|
190
|
+
index: 0,
|
|
191
|
+
message: {
|
|
192
|
+
role: 'assistant',
|
|
193
|
+
content: 'I will check.',
|
|
194
|
+
reasoning_content: 'Need to inspect the project first.',
|
|
195
|
+
},
|
|
196
|
+
finish_reason: 'stop',
|
|
197
|
+
},
|
|
198
|
+
],
|
|
199
|
+
});
|
|
200
|
+
const model = await provider.getModel('provider-model');
|
|
201
|
+
const result = await runUnderTrace(() => model.getResponse({
|
|
202
|
+
...baseRequest,
|
|
203
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
204
|
+
modelSettings: {},
|
|
205
|
+
}));
|
|
206
|
+
t.deepEqual(result.output[0], {
|
|
207
|
+
type: 'reasoning',
|
|
208
|
+
content: [],
|
|
209
|
+
rawContent: [{ type: 'reasoning_text', text: 'Need to inspect the project first.' }],
|
|
210
|
+
});
|
|
211
|
+
});
|
|
212
|
+
test('assistant reasoning_content from provider stream is preserved as reasoning output', async (t) => {
|
|
213
|
+
const captured = [];
|
|
214
|
+
const stream = new ReadableStream({
|
|
215
|
+
start(controller) {
|
|
216
|
+
const encoder = new TextEncoder();
|
|
217
|
+
controller.enqueue(encoder.encode([
|
|
218
|
+
'data: {"id":"chatcmpl-provider-test","choices":[{"delta":{"reasoning_content":"Need to stream reasoning."}}]}',
|
|
219
|
+
'data: {"id":"chatcmpl-provider-test","choices":[{"delta":{"content":"ok"}}]}',
|
|
220
|
+
'data: {"id":"chatcmpl-provider-test","choices":[{"delta":{},"finish_reason":"stop"}]}',
|
|
221
|
+
'data: [DONE]',
|
|
222
|
+
'',
|
|
223
|
+
].join('\n\n')));
|
|
224
|
+
controller.close();
|
|
225
|
+
},
|
|
226
|
+
});
|
|
227
|
+
const provider = buildProvider(captured, new Response(stream, {
|
|
228
|
+
status: 200,
|
|
229
|
+
headers: { 'Content-Type': 'text/event-stream' },
|
|
230
|
+
}));
|
|
231
|
+
const model = await provider.getModel('provider-model');
|
|
232
|
+
const events = [];
|
|
233
|
+
for await (const event of model.getStreamedResponse({
|
|
234
|
+
...baseRequest,
|
|
235
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
236
|
+
modelSettings: {},
|
|
237
|
+
})) {
|
|
238
|
+
events.push(event);
|
|
239
|
+
}
|
|
240
|
+
const finalEvent = events.find((event) => event.type === 'response_done');
|
|
241
|
+
t.deepEqual(finalEvent.response.output[0], {
|
|
242
|
+
type: 'reasoning',
|
|
243
|
+
content: [],
|
|
244
|
+
rawContent: [{ type: 'reasoning_text', text: 'Need to stream reasoning.' }],
|
|
245
|
+
});
|
|
246
|
+
});
|
|
247
|
+
test('reasoning field is stripped and preserved only as reasoning_content in outgoing requests', async (t) => {
|
|
248
|
+
const captured = [];
|
|
249
|
+
const provider = buildProvider(captured, successResponse);
|
|
250
|
+
const model = await provider.getModel('provider-model');
|
|
251
|
+
await runUnderTrace(() => model.getResponse({
|
|
252
|
+
...baseRequest,
|
|
253
|
+
input: [
|
|
254
|
+
{ role: 'user', type: 'message', content: 'hello' },
|
|
255
|
+
{
|
|
256
|
+
type: 'reasoning',
|
|
257
|
+
rawContent: [{ type: 'reasoning_text', text: 'I should run date.' }],
|
|
258
|
+
},
|
|
259
|
+
{
|
|
260
|
+
type: 'function_call',
|
|
261
|
+
callId: 'shell:0',
|
|
262
|
+
name: 'shell',
|
|
263
|
+
arguments: '{"command":"date"}',
|
|
264
|
+
},
|
|
265
|
+
{
|
|
266
|
+
type: 'function_call_result',
|
|
267
|
+
callId: 'shell:0',
|
|
268
|
+
output: 'Mon Jan 01 00:00:00 UTC 2024',
|
|
269
|
+
},
|
|
270
|
+
{ role: 'user', type: 'message', content: 'thanks' },
|
|
271
|
+
],
|
|
272
|
+
modelSettings: {},
|
|
273
|
+
}));
|
|
274
|
+
t.is(captured.length, 1);
|
|
275
|
+
const assistantMsg = captured[0].body.messages.find((m) => m.role === 'assistant' && m.tool_calls);
|
|
276
|
+
t.truthy(assistantMsg);
|
|
277
|
+
t.is(assistantMsg.reasoning_content, 'I should run date.');
|
|
278
|
+
t.false('reasoning' in assistantMsg, 'reasoning field must not be sent to strict Chat Completions providers');
|
|
279
|
+
});
|
|
280
|
+
test('llama.cpp maps high reasoning effort to chat template kwargs', async (t) => {
|
|
281
|
+
const captured = [];
|
|
282
|
+
const provider = buildProvider(captured, successResponse, 'llama.cpp');
|
|
283
|
+
const model = await provider.getModel('provider-model');
|
|
284
|
+
await runUnderTrace(() => model.getResponse({
|
|
285
|
+
...baseRequest,
|
|
286
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
287
|
+
modelSettings: { reasoning: { effort: 'high', summary: 'auto' } },
|
|
288
|
+
}));
|
|
289
|
+
t.is(captured.length, 1);
|
|
290
|
+
t.is(captured[0].body.reasoning_effort, undefined);
|
|
291
|
+
t.deepEqual(captured[0].body.chat_template_kwargs, {
|
|
292
|
+
reasoning_effort: 'high',
|
|
293
|
+
enable_thinking: true,
|
|
294
|
+
thinking_mode: 'high',
|
|
295
|
+
reasoning_budget: 8192,
|
|
296
|
+
});
|
|
297
|
+
});
|
|
298
|
+
test('llama.cpp disables thinking for none reasoning effort', async (t) => {
|
|
299
|
+
const captured = [];
|
|
300
|
+
const provider = buildProvider(captured, successResponse, 'llama.cpp');
|
|
301
|
+
const model = await provider.getModel('provider-model');
|
|
302
|
+
await runUnderTrace(() => model.getResponse({
|
|
303
|
+
...baseRequest,
|
|
304
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
305
|
+
modelSettings: { reasoning: { effort: 'none', summary: 'auto' } },
|
|
306
|
+
}));
|
|
307
|
+
t.is(captured.length, 1);
|
|
308
|
+
t.is(captured[0].body.reasoning_effort, undefined);
|
|
309
|
+
t.deepEqual(captured[0].body.chat_template_kwargs, {
|
|
310
|
+
reasoning_effort: 'low',
|
|
311
|
+
enable_thinking: false,
|
|
312
|
+
thinking_mode: 'disabled',
|
|
313
|
+
reasoning_budget: 0,
|
|
314
|
+
});
|
|
315
|
+
});
|
|
316
|
+
test('llama.cpp maps xhigh to high template mode with xhigh budget', async (t) => {
|
|
317
|
+
const captured = [];
|
|
318
|
+
const provider = buildProvider(captured, successResponse, 'llama.cpp');
|
|
319
|
+
const model = await provider.getModel('provider-model');
|
|
320
|
+
await runUnderTrace(() => model.getResponse({
|
|
321
|
+
...baseRequest,
|
|
322
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
323
|
+
modelSettings: { reasoning: { effort: 'xhigh', summary: 'auto' } },
|
|
324
|
+
}));
|
|
325
|
+
t.is(captured.length, 1);
|
|
326
|
+
t.deepEqual(captured[0].body.chat_template_kwargs, {
|
|
327
|
+
reasoning_effort: 'high',
|
|
328
|
+
enable_thinking: true,
|
|
329
|
+
thinking_mode: 'high',
|
|
330
|
+
reasoning_budget: 16384,
|
|
331
|
+
});
|
|
332
|
+
});
|
|
333
|
+
test('llama.cpp leaves reasoning controls unset when effort is default', async (t) => {
|
|
334
|
+
const captured = [];
|
|
335
|
+
const provider = buildProvider(captured, successResponse, 'llama.cpp');
|
|
336
|
+
const model = await provider.getModel('provider-model');
|
|
337
|
+
await runUnderTrace(() => model.getResponse({
|
|
338
|
+
...baseRequest,
|
|
339
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
340
|
+
modelSettings: {},
|
|
341
|
+
}));
|
|
342
|
+
t.is(captured.length, 1);
|
|
343
|
+
t.is(captured[0].body.reasoning_effort, undefined);
|
|
344
|
+
t.is(captured[0].body.chat_template_kwargs, undefined);
|
|
345
|
+
});
|
|
346
|
+
test('outgoing request hits the configured /chat/completions endpoint with bearer auth', async (t) => {
|
|
347
|
+
const captured = [];
|
|
348
|
+
const provider = buildProvider(captured, successResponse);
|
|
349
|
+
const model = await provider.getModel('provider-model');
|
|
350
|
+
await runUnderTrace(() => model.getResponse({
|
|
351
|
+
...baseRequest,
|
|
352
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
353
|
+
modelSettings: {},
|
|
354
|
+
}));
|
|
355
|
+
t.is(captured.length, 1);
|
|
356
|
+
t.regex(captured[0].url, /\/chat\/completions(\?|$)/);
|
|
357
|
+
t.is(captured[0].headers.authorization, 'Bearer provider-key');
|
|
358
|
+
t.is(captured[0].body.model, 'provider-model');
|
|
359
|
+
});
|
|
360
|
+
test('opencode.ai baseUrl adds x-opencode-session header', async (t) => {
|
|
361
|
+
const captured = [];
|
|
362
|
+
const provider = buildProvider(captured, successResponse, 'openai-compatible', 'https://opencode.ai/v1');
|
|
363
|
+
const model = await provider.getModel('provider-model');
|
|
364
|
+
await runUnderTrace(() => model.getResponse({
|
|
365
|
+
...baseRequest,
|
|
366
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
367
|
+
modelSettings: {},
|
|
368
|
+
}));
|
|
369
|
+
t.is(captured.length, 1);
|
|
370
|
+
t.truthy(captured[0].headers['x-opencode-session'], 'should have x-opencode-session header');
|
|
371
|
+
t.regex(captured[0].headers['x-opencode-session'], /^ses_[0-9a-f]{12}[0-9a-zA-Z]{14}$/, 'session ID should match ses_<12hex><14base62> format (30 chars)');
|
|
372
|
+
t.is(captured[0].headers['x-opencode-session'].length, 30, 'session ID should be exactly 30 characters');
|
|
373
|
+
});
|
|
374
|
+
test('opencode session ID is stable across requests within a session', async (t) => {
|
|
375
|
+
const captured = [];
|
|
376
|
+
const provider = buildProvider(captured, successResponse, 'openai-compatible', 'https://opencode.ai/v1');
|
|
377
|
+
const model = await provider.getModel('provider-model');
|
|
378
|
+
const makeRequest = () => runUnderTrace(() => model.getResponse({
|
|
379
|
+
...baseRequest,
|
|
380
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
381
|
+
modelSettings: {},
|
|
382
|
+
}));
|
|
383
|
+
await makeRequest();
|
|
384
|
+
const firstSessionId = captured[0].headers['x-opencode-session'];
|
|
385
|
+
await makeRequest();
|
|
386
|
+
t.is(captured[1].headers['x-opencode-session'], firstSessionId, 'session ID should be stable across requests in the same session');
|
|
387
|
+
});
|
|
388
|
+
test('non-opencode.ai baseUrl does not add opencode headers or body fields', async (t) => {
|
|
389
|
+
const captured = [];
|
|
390
|
+
const provider = buildProvider(captured, successResponse, 'openai-compatible', 'https://other-provider.com/v1');
|
|
391
|
+
const model = await provider.getModel('provider-model');
|
|
392
|
+
await runUnderTrace(() => model.getResponse({
|
|
393
|
+
...baseRequest,
|
|
394
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
395
|
+
modelSettings: {},
|
|
396
|
+
}));
|
|
397
|
+
t.is(captured.length, 1);
|
|
398
|
+
t.falsy(captured[0].headers['x-opencode-session'], 'should not have x-opencode-session header');
|
|
399
|
+
});
|
|
400
|
+
test('opencode.ai detection is case-insensitive', async (t) => {
|
|
401
|
+
const captured = [];
|
|
402
|
+
const provider = buildProvider(captured, successResponse, 'openai-compatible', 'https://OPENCODE.AI/v1');
|
|
403
|
+
const model = await provider.getModel('provider-model');
|
|
404
|
+
await runUnderTrace(() => model.getResponse({
|
|
405
|
+
...baseRequest,
|
|
406
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
407
|
+
modelSettings: {},
|
|
408
|
+
}));
|
|
409
|
+
t.is(captured.length, 1);
|
|
410
|
+
t.truthy(captured[0].headers['x-opencode-session'], 'should detect OPENCODE.AI case-insensitively');
|
|
411
|
+
});
|
|
412
|
+
test('opencode provider type uses default base URL and falls back to OPENCODE_API_KEY', async (t) => {
|
|
413
|
+
const captured = [];
|
|
414
|
+
process.env.OPENCODE_API_KEY = 'env-opencode-key';
|
|
415
|
+
t.teardown(() => {
|
|
416
|
+
delete process.env.OPENCODE_API_KEY;
|
|
417
|
+
});
|
|
418
|
+
const provider = createCustomProviderModelProvider({
|
|
419
|
+
name: 'opencode-test',
|
|
420
|
+
type: 'opencode',
|
|
421
|
+
// baseUrl and apiKey omitted
|
|
422
|
+
}, {
|
|
423
|
+
defaultModel: 'provider-model',
|
|
424
|
+
fetch: (async (input, init) => {
|
|
425
|
+
const headers = {};
|
|
426
|
+
const rawHeaders = init?.headers;
|
|
427
|
+
if (rawHeaders) {
|
|
428
|
+
if (typeof rawHeaders.forEach === 'function') {
|
|
429
|
+
rawHeaders.forEach((v, k) => {
|
|
430
|
+
headers[k.toLowerCase()] = String(v);
|
|
431
|
+
});
|
|
432
|
+
}
|
|
433
|
+
else {
|
|
434
|
+
for (const [k, v] of Object.entries(rawHeaders)) {
|
|
435
|
+
headers[k.toLowerCase()] = String(v);
|
|
436
|
+
}
|
|
437
|
+
}
|
|
438
|
+
}
|
|
439
|
+
const rawBody = typeof init?.body === 'string' ? init.body : '';
|
|
440
|
+
captured.push({
|
|
441
|
+
url: typeof input === 'string' ? input : input.toString(),
|
|
442
|
+
body: rawBody ? JSON.parse(rawBody) : null,
|
|
443
|
+
headers,
|
|
444
|
+
});
|
|
445
|
+
return new Response(JSON.stringify(successResponse), {
|
|
446
|
+
status: 200,
|
|
447
|
+
headers: { 'Content-Type': 'application/json' },
|
|
448
|
+
});
|
|
449
|
+
}),
|
|
450
|
+
});
|
|
451
|
+
const model = await provider.getModel('provider-model');
|
|
452
|
+
await runUnderTrace(() => model.getResponse({
|
|
453
|
+
...baseRequest,
|
|
454
|
+
input: [{ role: 'user', content: 'hello' }],
|
|
455
|
+
modelSettings: {},
|
|
456
|
+
}));
|
|
457
|
+
t.is(captured.length, 1);
|
|
458
|
+
t.regex(captured[0].url, /^https:\/\/opencode\.ai\/v1\/chat\/completions(\?|$)/);
|
|
459
|
+
t.is(captured[0].headers.authorization, 'Bearer env-opencode-key');
|
|
460
|
+
t.truthy(captured[0].headers['x-opencode-session']);
|
|
461
|
+
});
|
|
462
|
+
//# sourceMappingURL=openai-compatible.provider.test.js.map
|
|
@@ -0,0 +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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"}
|
|
@@ -22,7 +22,8 @@ async function fetchOpenAIModels(_deps, fetchImpl = fetch) {
|
|
|
22
22
|
const name = item?.name || item?.display_name || item?.description;
|
|
23
23
|
return id ? { id, name } : null;
|
|
24
24
|
})
|
|
25
|
-
.filter(Boolean)
|
|
25
|
+
.filter(Boolean)
|
|
26
|
+
.reverse();
|
|
26
27
|
}
|
|
27
28
|
// Register OpenAI provider
|
|
28
29
|
registerProvider({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.provider.js","sourceRoot":"","sources":["../../source/providers/openai.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AAE7D,KAAK,UAAU,iBAAiB,CAC9B,KAAmB,EACnB,YAA2B,KAAY;IAEvC,MAAM,OAAO,GAA2B;QACtC,cAAc,EAAE,kBAAkB;KACnC,CAAC;IACF,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;IAC1C,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,CAAC,aAAa,GAAG,UAAU,MAAM,EAAE,CAAC;IAC7C,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IACjE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,iCAAiC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACnC,MAAM,GAAG,GAAG,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;IAE7B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAEnC,OAAO,GAAG;SACP,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;QACjB,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,IAAI,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,YAAY,IAAI,IAAI,EAAE,WAAW,CAAC;QACnE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAClC,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"openai.provider.js","sourceRoot":"","sources":["../../source/providers/openai.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AAE7D,KAAK,UAAU,iBAAiB,CAC9B,KAAmB,EACnB,YAA2B,KAAY;IAEvC,MAAM,OAAO,GAA2B;QACtC,cAAc,EAAE,kBAAkB;KACnC,CAAC;IACF,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;IAC1C,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,CAAC,aAAa,GAAG,UAAU,MAAM,EAAE,CAAC;IAC7C,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IACjE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,iCAAiC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACnC,MAAM,GAAG,GAAG,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;IAE7B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAEnC,OAAO,GAAG;SACP,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;QACjB,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,IAAI,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,YAAY,IAAI,IAAI,EAAE,WAAW,CAAC;QACnE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAClC,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC;SACf,OAAO,EAA0C,CAAC;AACvD,CAAC;AAED,2BAA2B;AAC3B,gBAAgB,CAAC;IACf,EAAE,EAAE,QAAQ;IACZ,KAAK,EAAE,QAAQ;IACf,YAAY,EAAE,SAAS,EAAE,kBAAkB;IAC3C,WAAW,EAAE,iBAAiB;IAC9B,kBAAkB,EAAE,SAAS,EAAE,iCAAiC;IAChE,oBAAoB,EAAE,EAAE;IACxB,YAAY,EAAE;QACZ,4BAA4B,EAAE,IAAI;QAClC,sBAAsB,EAAE,IAAI;QAC5B,oBAAoB,EAAE,IAAI;QAC1B,wBAAwB,EAAE,CAAC,SAAS,CAAC;KACtC;CACF,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai.provider.test.d.ts","sourceRoot":"","sources":["../../source/providers/openai.provider.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import test from 'ava';
|
|
2
|
+
import { getProvider } from './index.js';
|
|
3
|
+
test.serial('openai provider returns models in reverse order', async (t) => {
|
|
4
|
+
const provider = getProvider('openai');
|
|
5
|
+
t.truthy(provider);
|
|
6
|
+
t.is(typeof provider?.fetchModels, 'function');
|
|
7
|
+
const calls = [];
|
|
8
|
+
const fakeFetch = async (url, options) => {
|
|
9
|
+
calls.push({ url, options });
|
|
10
|
+
return {
|
|
11
|
+
ok: true,
|
|
12
|
+
json: async () => ({
|
|
13
|
+
data: [{ id: 'gpt-4o' }, { id: 'gpt-4.1' }, { id: 'gpt-5' }],
|
|
14
|
+
}),
|
|
15
|
+
};
|
|
16
|
+
};
|
|
17
|
+
const models = await provider.fetchModels({}, fakeFetch);
|
|
18
|
+
t.deepEqual(models.map((model) => model.id), ['gpt-5', 'gpt-4.1', 'gpt-4o']);
|
|
19
|
+
t.is(calls.length, 1);
|
|
20
|
+
t.is(calls[0].url, 'https://api.openai.com/v1/models');
|
|
21
|
+
});
|
|
22
|
+
//# sourceMappingURL=openai.provider.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai.provider.test.js","sourceRoot":"","sources":["../../source/providers/openai.provider.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,IAAI,CAAC,MAAM,CAAC,iDAAiD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACzE,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnB,CAAC,CAAC,EAAE,CAAC,OAAO,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IAE/C,MAAM,KAAK,GAAyC,EAAE,CAAC;IACvD,MAAM,SAAS,GAAG,KAAK,EAAE,GAAW,EAAE,OAAY,EAAE,EAAE;QACpD,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7B,OAAO;YACL,EAAE,EAAE,IAAI;YACR,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;gBACjB,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;aAC7D,CAAC;SACH,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,QAAS,CAAC,WAAY,CAAC,EAAS,EAAE,SAAgB,CAAC,CAAC;IAEzE,CAAC,CAAC,SAAS,CACT,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAC/B,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,CAC/B,CAAC;IACF,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACtB,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,kCAAkC,CAAC,CAAC;AACzD,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,25 @@
|
|
|
1
1
|
import { Runner } from '@openai/agents';
|
|
2
2
|
import { registerProvider } from './registry.js';
|
|
3
3
|
import { AiSdkOpenRouterProvider } from './ai-sdk-openrouter.provider.js';
|
|
4
|
+
import { createAiSdkLoggingFetch } from './ai-sdk-logging-fetch.js';
|
|
5
|
+
import { addCacheControlToLastTwoMessages } from './common/openai-compatible-messages.js';
|
|
6
|
+
function createOpenRouterCacheControlFetch(fetchImpl) {
|
|
7
|
+
return (async (input, init) => {
|
|
8
|
+
if (typeof init?.body === 'string') {
|
|
9
|
+
try {
|
|
10
|
+
const body = JSON.parse(init.body);
|
|
11
|
+
if (Array.isArray(body?.messages)) {
|
|
12
|
+
addCacheControlToLastTwoMessages(body.messages);
|
|
13
|
+
return fetchImpl(input, { ...init, body: JSON.stringify(body) });
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
/* fall through */
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
return fetchImpl(input, init);
|
|
21
|
+
});
|
|
22
|
+
}
|
|
4
23
|
async function fetchOpenRouterModels(deps, fetchImpl = fetch) {
|
|
5
24
|
const { settingsService } = deps;
|
|
6
25
|
const baseUrl = settingsService.get('agent.openrouter.baseUrl') || 'https://openrouter.ai/api/v1';
|
|
@@ -31,14 +50,16 @@ async function fetchOpenRouterModels(deps, fetchImpl = fetch) {
|
|
|
31
50
|
registerProvider({
|
|
32
51
|
id: 'openrouter',
|
|
33
52
|
label: 'OpenRouter',
|
|
34
|
-
createRunner: ({ settingsService }) => {
|
|
53
|
+
createRunner: ({ settingsService, loggingService }) => {
|
|
35
54
|
const apiKey = settingsService.get('agent.openrouter.apiKey');
|
|
36
55
|
if (!apiKey) {
|
|
37
56
|
return null;
|
|
38
57
|
}
|
|
58
|
+
const defaultModel = settingsService.get('agent.model') || 'openrouter/auto';
|
|
39
59
|
return new Runner({
|
|
60
|
+
tracingDisabled: true,
|
|
40
61
|
modelProvider: new AiSdkOpenRouterProvider({
|
|
41
|
-
defaultModel
|
|
62
|
+
defaultModel,
|
|
42
63
|
resolveConfig: () => ({
|
|
43
64
|
baseURL: settingsService.get('agent.openrouter.baseUrl') || 'https://openrouter.ai/api/v1',
|
|
44
65
|
apiKey,
|
|
@@ -48,6 +69,11 @@ registerProvider({
|
|
|
48
69
|
},
|
|
49
70
|
appUrl: settingsService.get('agent.openrouter.referrer') || 'http://localhost',
|
|
50
71
|
appName: settingsService.get('agent.openrouter.title') || 'term2',
|
|
72
|
+
fetch: createOpenRouterCacheControlFetch(createAiSdkLoggingFetch({
|
|
73
|
+
provider: 'openrouter',
|
|
74
|
+
model: settingsService.get('agent.model') || defaultModel,
|
|
75
|
+
loggingService,
|
|
76
|
+
})),
|
|
51
77
|
}),
|
|
52
78
|
}),
|
|
53
79
|
});
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"openrouter.provider.js","sourceRoot":"","sources":["../../source/providers/openrouter.provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export interface RetryEvent {
|
|
|
8
8
|
attempt: number;
|
|
9
9
|
maxRetries: number;
|
|
10
10
|
errorMessage: string;
|
|
11
|
+
retryType?: 'hallucination' | 'parsing_error' | 'behavior' | 'flex_service_tier' | 'upstream';
|
|
11
12
|
}
|
|
12
13
|
/**
|
|
13
14
|
* Transport-friendly text streaming event.
|
|
@@ -43,6 +44,8 @@ export interface ApprovalRequiredEvent {
|
|
|
43
44
|
approval: Omit<ApprovalDescriptor, 'rawInterruption'> & {
|
|
44
45
|
llmAdvisory?: LLMAdvisory;
|
|
45
46
|
};
|
|
47
|
+
/** Token usage for the model turn that requested approval. */
|
|
48
|
+
usage?: NormalizedUsage;
|
|
46
49
|
}
|
|
47
50
|
/**
|
|
48
51
|
* Emitted when token usage information is received during streaming.
|