@qduc/term2 0.7.0 → 0.7.2
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 +0 -1
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +28 -8
- package/dist/agent.js.map +1 -1
- package/dist/app.d.ts +3 -3
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +161 -75
- package/dist/app.js.map +1 -1
- package/dist/app.large-uncached-warning.test.js.map +1 -1
- package/dist/cli.integration.test.d.ts +2 -0
- package/dist/cli.integration.test.d.ts.map +1 -0
- package/dist/cli.integration.test.js +142 -0
- package/dist/cli.integration.test.js.map +1 -0
- package/dist/cli.js +47 -12
- package/dist/cli.js.map +1 -1
- package/dist/commands/auto-approve-command.d.ts +10 -0
- package/dist/commands/auto-approve-command.d.ts.map +1 -0
- package/dist/commands/auto-approve-command.js +40 -0
- package/dist/commands/auto-approve-command.js.map +1 -0
- package/dist/commands/clear-command.d.ts +3 -0
- package/dist/commands/clear-command.d.ts.map +1 -0
- package/dist/commands/clear-command.js +12 -0
- package/dist/commands/clear-command.js.map +1 -0
- package/dist/commands/copy-command.d.ts +10 -0
- package/dist/commands/copy-command.d.ts.map +1 -0
- package/dist/commands/copy-command.js +25 -0
- package/dist/commands/copy-command.js.map +1 -0
- package/dist/commands/effort-command.d.ts +11 -0
- package/dist/commands/effort-command.d.ts.map +1 -0
- package/dist/commands/effort-command.js +34 -0
- package/dist/commands/effort-command.js.map +1 -0
- package/dist/commands/guarded-settings-command.d.ts +14 -0
- package/dist/commands/guarded-settings-command.d.ts.map +1 -0
- package/dist/commands/guarded-settings-command.js +23 -0
- package/dist/commands/guarded-settings-command.js.map +1 -0
- package/dist/commands/handoff-command.d.ts +10 -0
- package/dist/commands/handoff-command.d.ts.map +1 -0
- package/dist/commands/handoff-command.js +17 -0
- package/dist/commands/handoff-command.js.map +1 -0
- package/dist/commands/mode-commands.d.ts +32 -0
- package/dist/commands/mode-commands.d.ts.map +1 -0
- package/dist/commands/mode-commands.js +64 -0
- package/dist/commands/mode-commands.js.map +1 -0
- package/dist/commands/model-command.d.ts +11 -0
- package/dist/commands/model-command.d.ts.map +1 -0
- package/dist/commands/model-command.js +35 -0
- package/dist/commands/model-command.js.map +1 -0
- package/dist/commands/quit-command.d.ts +3 -0
- package/dist/commands/quit-command.d.ts.map +1 -0
- package/dist/commands/quit-command.js +10 -0
- package/dist/commands/quit-command.js.map +1 -0
- package/dist/commands/retry-command.d.ts +19 -0
- package/dist/commands/retry-command.d.ts.map +1 -0
- package/dist/commands/retry-command.js +30 -0
- package/dist/commands/retry-command.js.map +1 -0
- package/dist/commands/undo-command.d.ts +15 -0
- package/dist/commands/undo-command.d.ts.map +1 -0
- package/dist/commands/undo-command.js +28 -0
- package/dist/commands/undo-command.js.map +1 -0
- package/dist/commands/usage-command.d.ts +3 -0
- package/dist/commands/usage-command.d.ts.map +1 -0
- package/dist/commands/usage-command.js +11 -0
- package/dist/commands/usage-command.js.map +1 -0
- package/dist/components/BottomArea.d.ts +7 -0
- package/dist/components/BottomArea.d.ts.map +1 -1
- package/dist/components/BottomArea.js +15 -6
- package/dist/components/BottomArea.js.map +1 -1
- package/dist/components/BottomArea.test.js +36 -4
- package/dist/components/BottomArea.test.js.map +1 -1
- package/dist/components/Common/MenuContainer.d.ts +1 -3
- package/dist/components/Common/MenuContainer.d.ts.map +1 -1
- package/dist/components/Common/MenuContainer.js +1 -13
- package/dist/components/Common/MenuContainer.js.map +1 -1
- package/dist/components/Input/input-width.d.ts +2 -1
- package/dist/components/Input/input-width.d.ts.map +1 -1
- package/dist/components/Input/input-width.js +6 -2
- package/dist/components/Input/input-width.js.map +1 -1
- package/dist/components/InputBox.d.ts +2 -0
- package/dist/components/InputBox.d.ts.map +1 -1
- package/dist/components/InputBox.js +21 -7
- package/dist/components/InputBox.js.map +1 -1
- package/dist/components/InputBox.test.js +44 -0
- package/dist/components/InputBox.test.js.map +1 -1
- package/dist/components/LargeUncachedConfirmationPrompt.d.ts +9 -0
- package/dist/components/LargeUncachedConfirmationPrompt.d.ts.map +1 -0
- package/dist/components/LargeUncachedConfirmationPrompt.js +44 -0
- package/dist/components/LargeUncachedConfirmationPrompt.js.map +1 -0
- package/dist/components/LargeUncachedConfirmationPrompt.test.d.ts +2 -0
- package/dist/components/LargeUncachedConfirmationPrompt.test.d.ts.map +1 -0
- package/dist/components/LargeUncachedConfirmationPrompt.test.js +47 -0
- package/dist/components/LargeUncachedConfirmationPrompt.test.js.map +1 -0
- package/dist/components/MessageList.d.ts +9 -0
- package/dist/components/MessageList.d.ts.map +1 -1
- package/dist/components/MessageList.js +29 -3
- package/dist/components/MessageList.js.map +1 -1
- package/dist/components/MessageList.test.js +28 -1
- package/dist/components/MessageList.test.js.map +1 -1
- package/dist/components/ModelSelectionMenu.d.ts.map +1 -1
- package/dist/components/ModelSelectionMenu.js +1 -4
- package/dist/components/ModelSelectionMenu.js.map +1 -1
- package/dist/components/PathSelectionMenu.d.ts.map +1 -1
- package/dist/components/PathSelectionMenu.js +1 -7
- package/dist/components/PathSelectionMenu.js.map +1 -1
- package/dist/components/SettingsSelectionMenu.d.ts.map +1 -1
- package/dist/components/SettingsSelectionMenu.js +1 -12
- package/dist/components/SettingsSelectionMenu.js.map +1 -1
- package/dist/components/SettingsValueSelectionMenu.d.ts.map +1 -1
- package/dist/components/SettingsValueSelectionMenu.js +1 -8
- package/dist/components/SettingsValueSelectionMenu.js.map +1 -1
- package/dist/components/StatusBar.d.ts +4 -0
- package/dist/components/StatusBar.d.ts.map +1 -1
- package/dist/components/StatusBar.js +25 -6
- package/dist/components/StatusBar.js.map +1 -1
- package/dist/components/StatusBar.test.js +23 -0
- package/dist/components/StatusBar.test.js.map +1 -1
- package/dist/components/UndoSelectionMenu.d.ts.map +1 -1
- package/dist/components/UndoSelectionMenu.js +1 -1
- package/dist/components/UndoSelectionMenu.js.map +1 -1
- package/dist/context/InputContext.d.ts +5 -0
- package/dist/context/InputContext.d.ts.map +1 -1
- package/dist/context/InputContext.images.test.d.ts +2 -0
- package/dist/context/InputContext.images.test.d.ts.map +1 -0
- package/dist/context/InputContext.images.test.js +56 -0
- package/dist/context/InputContext.images.test.js.map +1 -0
- package/dist/context/InputContext.js +3 -2
- package/dist/context/InputContext.js.map +1 -1
- package/dist/contracts/conversation.d.ts +3 -0
- package/dist/contracts/conversation.d.ts.map +1 -1
- package/dist/hooks/use-app-commands.d.ts +11 -32
- package/dist/hooks/use-app-commands.d.ts.map +1 -1
- package/dist/hooks/use-app-commands.js +64 -369
- package/dist/hooks/use-app-commands.js.map +1 -1
- package/dist/hooks/use-app-commands.test.js +24 -15
- package/dist/hooks/use-app-commands.test.js.map +1 -1
- package/dist/hooks/use-conversation.clear.test.js +49 -1
- package/dist/hooks/use-conversation.clear.test.js.map +1 -1
- package/dist/hooks/use-conversation.d.ts +12 -2
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +29 -25
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/hooks/use-conversation.resume.test.js +26 -3
- package/dist/hooks/use-conversation.resume.test.js.map +1 -1
- package/dist/hooks/use-mode-handlers.d.ts +4 -1
- package/dist/hooks/use-mode-handlers.d.ts.map +1 -1
- package/dist/hooks/use-mode-handlers.js +6 -1
- package/dist/hooks/use-mode-handlers.js.map +1 -1
- package/dist/hooks/use-runtime-settings.d.ts.map +1 -1
- package/dist/hooks/use-runtime-settings.js +2 -2
- package/dist/hooks/use-runtime-settings.js.map +1 -1
- package/dist/hooks/use-runtime-settings.test.js +0 -1
- package/dist/hooks/use-runtime-settings.test.js.map +1 -1
- package/dist/hooks/use-settings-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-completion.js +8 -1
- package/dist/hooks/use-settings-completion.js.map +1 -1
- package/dist/hooks/use-settings-completion.test.js +4 -0
- package/dist/hooks/use-settings-completion.test.js.map +1 -1
- package/dist/hooks/use-slash-commands.d.ts.map +1 -1
- package/dist/hooks/use-slash-commands.js +10 -0
- package/dist/hooks/use-slash-commands.js.map +1 -1
- package/dist/hooks/use-slash-commands.test.js +35 -5
- package/dist/hooks/use-slash-commands.test.js.map +1 -1
- package/dist/hooks/use-terminal-width.d.ts +2 -1
- package/dist/hooks/use-terminal-width.d.ts.map +1 -1
- package/dist/hooks/use-terminal-width.js +2 -1
- package/dist/hooks/use-terminal-width.js.map +1 -1
- package/dist/hooks/use-undo-selection.d.ts.map +1 -1
- package/dist/hooks/use-undo-selection.js +3 -1
- package/dist/hooks/use-undo-selection.js.map +1 -1
- package/dist/lib/openai-agent-client.d.ts.map +1 -1
- package/dist/lib/openai-agent-client.flex-tier.test.js +8 -3
- package/dist/lib/openai-agent-client.flex-tier.test.js.map +1 -1
- package/dist/lib/openai-agent-client.js +50 -24
- package/dist/lib/openai-agent-client.js.map +1 -1
- package/dist/lib/tool-execution-limiter.d.ts +16 -0
- package/dist/lib/tool-execution-limiter.d.ts.map +1 -0
- package/dist/lib/tool-execution-limiter.js +112 -0
- package/dist/lib/tool-execution-limiter.js.map +1 -0
- package/dist/lib/tool-execution-limiter.test.d.ts +2 -0
- package/dist/lib/tool-execution-limiter.test.d.ts.map +1 -0
- package/dist/lib/tool-execution-limiter.test.js +70 -0
- package/dist/lib/tool-execution-limiter.test.js.map +1 -0
- package/dist/lib/tool-invoke.test.js +8 -8
- package/dist/lib/tool-invoke.test.js.map +1 -1
- package/dist/lib/tool-selection-policy.d.ts.map +1 -1
- package/dist/lib/tool-selection-policy.js +43 -2
- package/dist/lib/tool-selection-policy.js.map +1 -1
- package/dist/lib/tool-selection-policy.test.js +39 -0
- package/dist/lib/tool-selection-policy.test.js.map +1 -1
- package/dist/prompts/gpt-5-modern.md +105 -97
- package/dist/prompts/gpt-5.5.md +106 -0
- package/dist/prompts/orchestrator.md +2 -5
- package/dist/prompts/prompt-profiles.js +1 -1
- package/dist/prompts/prompt-profiles.js.map +1 -1
- package/dist/prompts/prompt-profiles.ts +1 -1
- package/dist/prompts/prompt-selector.test.js +1 -1
- package/dist/prompts/prompt-selector.test.js.map +1 -1
- package/dist/prompts/prompt-selector.test.ts +1 -1
- package/dist/prompts/search-via-shell.d.ts.map +1 -1
- package/dist/prompts/search-via-shell.js +0 -1
- package/dist/prompts/search-via-shell.js.map +1 -1
- package/dist/prompts/search-via-shell.ts +0 -1
- package/dist/prompts/shell-auto-approval.d.ts +2 -2
- package/dist/prompts/shell-auto-approval.d.ts.map +1 -1
- package/dist/prompts/shell-auto-approval.js +6 -6
- package/dist/prompts/shell-auto-approval.js.map +1 -1
- package/dist/prompts/shell-auto-approval.ts +6 -6
- package/dist/prompts/simple-prev.md +55 -0
- package/dist/prompts/simple.md +31 -53
- package/dist/prompts/subagent-delegation.js +2 -2
- package/dist/prompts/subagent-delegation.js.map +1 -1
- package/dist/prompts/subagent-delegation.ts +2 -2
- package/dist/providers/codex-responses-model.d.ts +5 -3
- package/dist/providers/codex-responses-model.d.ts.map +1 -1
- package/dist/providers/codex-responses-model.js +76 -20
- package/dist/providers/codex-responses-model.js.map +1 -1
- package/dist/providers/codex-responses-model.test.js +242 -1
- package/dist/providers/codex-responses-model.test.js.map +1 -1
- package/dist/providers/codex.provider.d.ts +0 -2
- package/dist/providers/codex.provider.d.ts.map +1 -1
- package/dist/providers/codex.provider.js +2 -6
- package/dist/providers/codex.provider.js.map +1 -1
- package/dist/providers/codex.provider.test.js +4 -31
- package/dist/providers/codex.provider.test.js.map +1 -1
- package/dist/providers/custom-provider-adapter.test.js +3 -3
- package/dist/providers/custom-provider-adapter.test.js.map +1 -1
- package/dist/providers/fallback-responses-model.d.ts.map +1 -1
- package/dist/providers/fallback-responses-model.js +160 -83
- package/dist/providers/fallback-responses-model.js.map +1 -1
- package/dist/providers/fallback-responses-model.test.js +318 -0
- package/dist/providers/fallback-responses-model.test.js.map +1 -1
- package/dist/providers/openai-compatible-lazy.d.ts +4 -0
- package/dist/providers/openai-compatible-lazy.d.ts.map +1 -0
- package/dist/providers/openai-compatible-lazy.js +54 -0
- package/dist/providers/openai-compatible-lazy.js.map +1 -0
- package/dist/providers/openai-compatible.provider.d.ts +2 -2
- package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
- package/dist/providers/openai-compatible.provider.js +3 -3
- package/dist/providers/openai-compatible.provider.js.map +1 -1
- package/dist/providers/openai-compatible.provider.test.js +31 -0
- package/dist/providers/openai-compatible.provider.test.js.map +1 -1
- package/dist/providers/openai.provider.js +5 -3
- package/dist/providers/openai.provider.js.map +1 -1
- package/dist/providers/timed-responses-ws-model.d.ts +20 -0
- package/dist/providers/timed-responses-ws-model.d.ts.map +1 -0
- package/dist/providers/timed-responses-ws-model.js +381 -0
- package/dist/providers/timed-responses-ws-model.js.map +1 -0
- package/dist/providers/timed-responses-ws-model.test.d.ts +2 -0
- package/dist/providers/timed-responses-ws-model.test.d.ts.map +1 -0
- package/dist/providers/timed-responses-ws-model.test.js +441 -0
- package/dist/providers/timed-responses-ws-model.test.js.map +1 -0
- package/dist/providers/timed-ws-connection.d.ts +26 -0
- package/dist/providers/timed-ws-connection.d.ts.map +1 -0
- package/dist/providers/timed-ws-connection.js +156 -0
- package/dist/providers/timed-ws-connection.js.map +1 -0
- package/dist/providers/timed-ws-connection.test.d.ts +2 -0
- package/dist/providers/timed-ws-connection.test.d.ts.map +1 -0
- package/dist/providers/timed-ws-connection.test.js +223 -0
- package/dist/providers/timed-ws-connection.test.js.map +1 -0
- package/dist/providers/timed-ws-timeouts.d.ts +6 -0
- package/dist/providers/timed-ws-timeouts.d.ts.map +1 -0
- package/dist/providers/timed-ws-timeouts.js +6 -0
- package/dist/providers/timed-ws-timeouts.js.map +1 -0
- package/dist/services/command-message-streaming.d.ts.map +1 -1
- package/dist/services/command-message-streaming.js +8 -3
- package/dist/services/command-message-streaming.js.map +1 -1
- package/dist/services/conversation-clear-save.test.js +4 -5
- package/dist/services/conversation-clear-save.test.js.map +1 -1
- package/dist/services/conversation-events.d.ts +4 -0
- package/dist/services/conversation-events.d.ts.map +1 -1
- package/dist/services/conversation-history-repair.d.ts.map +1 -1
- package/dist/services/conversation-history-repair.js +81 -26
- package/dist/services/conversation-history-repair.js.map +1 -1
- package/dist/services/conversation-integration.test.js +109 -0
- package/dist/services/conversation-integration.test.js.map +1 -1
- package/dist/services/conversation-log-events.d.ts +19 -10
- package/dist/services/conversation-log-events.d.ts.map +1 -1
- package/dist/services/conversation-log-events.js +1 -1
- package/dist/services/conversation-log-events.js.map +1 -1
- package/dist/services/conversation-log-writer.d.ts.map +1 -1
- package/dist/services/conversation-log-writer.js +2 -3
- package/dist/services/conversation-log-writer.js.map +1 -1
- package/dist/services/conversation-persistence-types.d.ts +32 -0
- package/dist/services/conversation-persistence-types.d.ts.map +1 -1
- package/dist/services/conversation-persistence.d.ts +7 -1
- package/dist/services/conversation-persistence.d.ts.map +1 -1
- package/dist/services/conversation-persistence.js +95 -44
- package/dist/services/conversation-persistence.js.map +1 -1
- package/dist/services/conversation-persistence.test.js +551 -107
- package/dist/services/conversation-persistence.test.js.map +1 -1
- package/dist/services/conversation-replay.d.ts.map +1 -1
- package/dist/services/conversation-replay.js +234 -11
- package/dist/services/conversation-replay.js.map +1 -1
- package/dist/services/conversation-replay.test.js +426 -31
- package/dist/services/conversation-replay.test.js.map +1 -1
- package/dist/services/conversation-result-builder.d.ts +2 -0
- package/dist/services/conversation-result-builder.d.ts.map +1 -1
- package/dist/services/conversation-result-builder.js +4 -0
- package/dist/services/conversation-result-builder.js.map +1 -1
- package/dist/services/conversation-result-builder.test.js +126 -0
- package/dist/services/conversation-result-builder.test.js.map +1 -1
- package/dist/services/conversation-retry-policy.d.ts.map +1 -1
- package/dist/services/conversation-retry-policy.js +3 -0
- package/dist/services/conversation-retry-policy.js.map +1 -1
- package/dist/services/conversation-retry-policy.test.js +4 -0
- package/dist/services/conversation-retry-policy.test.js.map +1 -1
- package/dist/services/conversation-service.d.ts +3 -3
- package/dist/services/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation-service.js +0 -3
- package/dist/services/conversation-service.js.map +1 -1
- package/dist/services/conversation-session.d.ts +10 -7
- package/dist/services/conversation-session.d.ts.map +1 -1
- package/dist/services/conversation-session.js +283 -86
- package/dist/services/conversation-session.js.map +1 -1
- package/dist/services/conversation-store.d.ts +16 -13
- package/dist/services/conversation-store.d.ts.map +1 -1
- package/dist/services/conversation-store.js +62 -191
- package/dist/services/conversation-store.js.map +1 -1
- package/dist/services/conversation-store.merge-modes.test.d.ts +2 -0
- package/dist/services/conversation-store.merge-modes.test.d.ts.map +1 -0
- package/dist/services/conversation-store.merge-modes.test.js +161 -0
- package/dist/services/conversation-store.merge-modes.test.js.map +1 -0
- package/dist/services/conversation-store.test.js +157 -294
- package/dist/services/conversation-store.test.js.map +1 -1
- package/dist/services/conversation-turn-items.d.ts +5 -0
- package/dist/services/conversation-turn-items.d.ts.map +1 -0
- package/dist/services/conversation-turn-items.js +351 -0
- package/dist/services/conversation-turn-items.js.map +1 -0
- package/dist/services/conversation-turn-items.test.d.ts +2 -0
- package/dist/services/conversation-turn-items.test.d.ts.map +1 -0
- package/dist/services/conversation-turn-items.test.js +68 -0
- package/dist/services/conversation-turn-items.test.js.map +1 -0
- package/dist/services/large-uncached-input-guard.d.ts.map +1 -1
- package/dist/services/large-uncached-input-guard.js +4 -3
- package/dist/services/large-uncached-input-guard.js.map +1 -1
- package/dist/services/large-uncached-input-guard.test.js +22 -0
- package/dist/services/large-uncached-input-guard.test.js.map +1 -1
- package/dist/services/notification-service.d.ts +22 -0
- package/dist/services/notification-service.d.ts.map +1 -0
- package/dist/services/notification-service.js +68 -0
- package/dist/services/notification-service.js.map +1 -0
- package/dist/services/notification-service.test.d.ts +2 -0
- package/dist/services/notification-service.test.d.ts.map +1 -0
- package/dist/services/notification-service.test.js +78 -0
- package/dist/services/notification-service.test.js.map +1 -0
- package/dist/services/provider-traffic.d.ts.map +1 -1
- package/dist/services/provider-traffic.js +1 -0
- package/dist/services/provider-traffic.js.map +1 -1
- package/dist/services/provider-traffic.test.js +51 -0
- package/dist/services/provider-traffic.test.js.map +1 -1
- package/dist/services/settings-schema.d.ts +16 -1
- package/dist/services/settings-schema.d.ts.map +1 -1
- package/dist/services/settings-schema.js +42 -22
- package/dist/services/settings-schema.js.map +1 -1
- package/dist/services/settings-schema.test.js +10 -0
- package/dist/services/settings-schema.test.js.map +1 -1
- package/dist/services/settings-service.js +2 -2
- 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/settings-sources.test.js +2 -0
- package/dist/services/settings-sources.test.js.map +1 -1
- package/dist/services/subagents/subagent-manager.d.ts.map +1 -1
- package/dist/services/subagents/subagent-manager.js +32 -30
- package/dist/services/subagents/subagent-manager.js.map +1 -1
- package/dist/services/subagents/subagent-manager.test.js +8 -12
- package/dist/services/subagents/subagent-manager.test.js.map +1 -1
- package/dist/services/subagents/subagent-session.d.ts +1 -1
- package/dist/services/subagents/subagent-session.d.ts.map +1 -1
- package/dist/services/subagents/subagent-session.js +2 -2
- package/dist/services/subagents/subagent-session.js.map +1 -1
- package/dist/services/subagents/subagent-session.test.js +3 -3
- package/dist/services/subagents/subagent-session.test.js.map +1 -1
- package/dist/services/subagents/types.d.ts +2 -1
- package/dist/services/subagents/types.d.ts.map +1 -1
- package/dist/services/terminal-result-collector.d.ts.map +1 -1
- package/dist/services/terminal-result-collector.js +43 -0
- package/dist/services/terminal-result-collector.js.map +1 -1
- package/dist/services/terminal-result-collector.test.js +44 -0
- package/dist/services/terminal-result-collector.test.js.map +1 -1
- package/dist/services/tool-execution-ledger.d.ts +6 -0
- package/dist/services/tool-execution-ledger.d.ts.map +1 -1
- package/dist/services/tool-execution-ledger.js +90 -25
- package/dist/services/tool-execution-ledger.js.map +1 -1
- package/dist/services/tool-execution-ledger.test.js +177 -2
- package/dist/services/tool-execution-ledger.test.js.map +1 -1
- package/dist/tools/apply-patch.d.ts.map +1 -1
- package/dist/tools/apply-patch.js +41 -23
- package/dist/tools/apply-patch.js.map +1 -1
- package/dist/tools/apply-patch.test.js +6 -6
- package/dist/tools/apply-patch.test.js.map +1 -1
- package/dist/tools/code-context.js +1 -1
- package/dist/tools/code-context.js.map +1 -1
- package/dist/tools/code-context.test.js +278 -0
- package/dist/tools/code-context.test.js.map +1 -1
- package/dist/tools/edit-healing.d.ts.map +1 -1
- package/dist/tools/edit-healing.js +9 -3
- package/dist/tools/edit-healing.js.map +1 -1
- package/dist/tools/language-providers.d.ts.map +1 -1
- package/dist/tools/language-providers.js +379 -0
- package/dist/tools/language-providers.js.map +1 -1
- package/dist/tools/languages/cpp.d.ts +8 -0
- package/dist/tools/languages/cpp.d.ts.map +1 -0
- package/dist/tools/languages/cpp.js +306 -0
- package/dist/tools/languages/cpp.js.map +1 -0
- package/dist/tools/languages/csharp.d.ts +5 -0
- package/dist/tools/languages/csharp.d.ts.map +1 -0
- package/dist/tools/languages/csharp.js +225 -0
- package/dist/tools/languages/csharp.js.map +1 -0
- package/dist/tools/languages/go.d.ts +7 -0
- package/dist/tools/languages/go.d.ts.map +1 -0
- package/dist/tools/languages/go.js +223 -0
- package/dist/tools/languages/go.js.map +1 -0
- package/dist/tools/languages/index.d.ts +6 -0
- package/dist/tools/languages/index.d.ts.map +1 -0
- package/dist/tools/languages/index.js +32 -0
- package/dist/tools/languages/index.js.map +1 -0
- package/dist/tools/languages/java.d.ts +5 -0
- package/dist/tools/languages/java.d.ts.map +1 -0
- package/dist/tools/languages/java.js +183 -0
- package/dist/tools/languages/java.js.map +1 -0
- package/dist/tools/languages/json.d.ts +3 -0
- package/dist/tools/languages/json.d.ts.map +1 -0
- package/dist/tools/languages/json.js +40 -0
- package/dist/tools/languages/json.js.map +1 -0
- package/dist/tools/languages/php.d.ts +8 -0
- package/dist/tools/languages/php.d.ts.map +1 -0
- package/dist/tools/languages/php.js +139 -0
- package/dist/tools/languages/php.js.map +1 -0
- package/dist/tools/languages/python.d.ts +7 -0
- package/dist/tools/languages/python.d.ts.map +1 -0
- package/dist/tools/languages/python.js +189 -0
- package/dist/tools/languages/python.js.map +1 -0
- package/dist/tools/languages/ruby.d.ts +8 -0
- package/dist/tools/languages/ruby.d.ts.map +1 -0
- package/dist/tools/languages/ruby.js +94 -0
- package/dist/tools/languages/ruby.js.map +1 -0
- package/dist/tools/languages/rust.d.ts +7 -0
- package/dist/tools/languages/rust.d.ts.map +1 -0
- package/dist/tools/languages/rust.js +186 -0
- package/dist/tools/languages/rust.js.map +1 -0
- package/dist/tools/languages/types.d.ts +39 -0
- package/dist/tools/languages/types.d.ts.map +1 -0
- package/dist/tools/languages/types.js +2 -0
- package/dist/tools/languages/types.js.map +1 -0
- package/dist/tools/languages/typescript.d.ts +4 -0
- package/dist/tools/languages/typescript.d.ts.map +1 -0
- package/dist/tools/languages/typescript.js +94 -0
- package/dist/tools/languages/typescript.js.map +1 -0
- package/dist/tools/languages/utils.d.ts +14 -0
- package/dist/tools/languages/utils.d.ts.map +1 -0
- package/dist/tools/languages/utils.js +73 -0
- package/dist/tools/languages/utils.js.map +1 -0
- package/dist/tools/run-subagent.d.ts +0 -1
- package/dist/tools/run-subagent.d.ts.map +1 -1
- package/dist/tools/run-subagent.js +1 -8
- package/dist/tools/run-subagent.js.map +1 -1
- package/dist/tools/run-subagent.test.js +0 -18
- package/dist/tools/run-subagent.test.js.map +1 -1
- package/dist/tools/shell.d.ts.map +1 -1
- package/dist/tools/shell.js +13 -1
- package/dist/tools/shell.js.map +1 -1
- package/dist/tools/web-fetch.d.ts.map +1 -1
- package/dist/tools/web-fetch.js +1 -1
- package/dist/tools/web-fetch.js.map +1 -1
- package/dist/utils/clipboard.d.ts +8 -0
- package/dist/utils/clipboard.d.ts.map +1 -1
- package/dist/utils/clipboard.js +50 -4
- package/dist/utils/clipboard.js.map +1 -1
- package/dist/utils/clipboard.test.js +152 -2
- package/dist/utils/clipboard.test.js.map +1 -1
- package/dist/utils/conversation-event-handler.d.ts.map +1 -1
- package/dist/utils/conversation-event-handler.js +3 -0
- package/dist/utils/conversation-event-handler.js.map +1 -1
- package/dist/utils/conversation-event-handler.test.js +13 -0
- package/dist/utils/conversation-event-handler.test.js.map +1 -1
- package/dist/utils/extract-command-messages.d.ts.map +1 -1
- package/dist/utils/extract-command-messages.js +8 -4
- package/dist/utils/extract-command-messages.js.map +1 -1
- package/dist/utils/message-utils.d.ts +7 -0
- package/dist/utils/message-utils.d.ts.map +1 -0
- package/dist/utils/message-utils.js +31 -0
- package/dist/utils/message-utils.js.map +1 -0
- package/dist/utils/resume-list.d.ts +15 -0
- package/dist/utils/resume-list.d.ts.map +1 -0
- package/dist/utils/resume-list.js +68 -0
- package/dist/utils/resume-list.js.map +1 -0
- package/dist/utils/resume-list.test.d.ts +2 -0
- package/dist/utils/resume-list.test.d.ts.map +1 -0
- package/dist/utils/resume-list.test.js +89 -0
- package/dist/utils/resume-list.test.js.map +1 -0
- package/dist/utils/settings-command.d.ts.map +1 -1
- package/dist/utils/settings-command.js +11 -0
- package/dist/utils/settings-command.js.map +1 -1
- package/dist/utils/token-usage.d.ts +3 -1
- package/dist/utils/token-usage.d.ts.map +1 -1
- package/dist/utils/token-usage.js +4 -2
- package/dist/utils/token-usage.js.map +1 -1
- package/dist/utils/tty-osc.d.ts +27 -0
- package/dist/utils/tty-osc.d.ts.map +1 -0
- package/dist/utils/tty-osc.js +66 -0
- package/dist/utils/tty-osc.js.map +1 -0
- package/dist/utils/tty-osc.test.d.ts +2 -0
- package/dist/utils/tty-osc.test.d.ts.map +1 -0
- package/dist/utils/tty-osc.test.js +130 -0
- package/dist/utils/tty-osc.test.js.map +1 -0
- package/package.json +3 -3
- package/readme.md +24 -9
- package/dist/app.large-uncached-warning.test.js +0 -15
|
@@ -0,0 +1,441 @@
|
|
|
1
|
+
import test from 'ava';
|
|
2
|
+
import { EventEmitter } from 'node:events';
|
|
3
|
+
import { TimedResponsesWSModel } from './timed-responses-ws-model.js';
|
|
4
|
+
class MockWebSocket extends EventEmitter {
|
|
5
|
+
openDelayMs;
|
|
6
|
+
readyState = 0; // CONNECTING
|
|
7
|
+
sent = [];
|
|
8
|
+
closeCalls = 0;
|
|
9
|
+
constructor(openDelayMs = 5) {
|
|
10
|
+
super();
|
|
11
|
+
this.openDelayMs = openDelayMs;
|
|
12
|
+
setTimeout(() => {
|
|
13
|
+
this.readyState = 1; // OPEN
|
|
14
|
+
this.emit('open');
|
|
15
|
+
}, this.openDelayMs);
|
|
16
|
+
}
|
|
17
|
+
send(data) {
|
|
18
|
+
this.sent.push(data);
|
|
19
|
+
}
|
|
20
|
+
close() {
|
|
21
|
+
this.closeCalls++;
|
|
22
|
+
this.readyState = 3; // CLOSED
|
|
23
|
+
this.emit('close');
|
|
24
|
+
}
|
|
25
|
+
terminate() {
|
|
26
|
+
this.closeCalls++;
|
|
27
|
+
this.readyState = 3; // CLOSED
|
|
28
|
+
this.emit('close');
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
function createMockRequest(input) {
|
|
32
|
+
return {
|
|
33
|
+
input,
|
|
34
|
+
modelSettings: {},
|
|
35
|
+
tools: [],
|
|
36
|
+
outputType: 'text',
|
|
37
|
+
handoffs: [],
|
|
38
|
+
tracing: false,
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
function createMockClient() {
|
|
42
|
+
return {
|
|
43
|
+
baseURL: 'https://api.openai.com',
|
|
44
|
+
apiKey: 'test-key',
|
|
45
|
+
_options: {},
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
test('TimedResponsesWSModel aborts while the websocket is opening', async (t) => {
|
|
49
|
+
const mockWs = new EventEmitter();
|
|
50
|
+
mockWs.readyState = 0;
|
|
51
|
+
mockWs.terminate = () => {
|
|
52
|
+
mockWs.emit('close');
|
|
53
|
+
};
|
|
54
|
+
mockWs.on('error', () => { });
|
|
55
|
+
const mockClient = createMockClient();
|
|
56
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 5000 }, () => mockWs);
|
|
57
|
+
const controller = new AbortController();
|
|
58
|
+
const responsePromise = model.getResponse({ ...createMockRequest('Hello'), signal: controller.signal });
|
|
59
|
+
setTimeout(() => {
|
|
60
|
+
controller.abort();
|
|
61
|
+
}, 10);
|
|
62
|
+
await t.throwsAsync(responsePromise, { message: 'Aborted' });
|
|
63
|
+
});
|
|
64
|
+
test('TimedResponsesWSModel aborts while websocket headers are being prepared', async (t) => {
|
|
65
|
+
const mockWs = new EventEmitter();
|
|
66
|
+
mockWs.readyState = 0;
|
|
67
|
+
mockWs.terminate = () => {
|
|
68
|
+
mockWs.emit('close');
|
|
69
|
+
};
|
|
70
|
+
mockWs.on('error', () => { });
|
|
71
|
+
const mockClient = {
|
|
72
|
+
...createMockClient(),
|
|
73
|
+
authHeaders: async () => {
|
|
74
|
+
await new Promise((resolve) => setTimeout(resolve, 50));
|
|
75
|
+
return { Authorization: 'Bearer auth-token' };
|
|
76
|
+
},
|
|
77
|
+
};
|
|
78
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 200, idleTimeoutMs: 5000 }, () => mockWs);
|
|
79
|
+
const controller = new AbortController();
|
|
80
|
+
const responsePromise = model.getResponse({ ...createMockRequest('Hello'), signal: controller.signal });
|
|
81
|
+
setTimeout(() => {
|
|
82
|
+
controller.abort();
|
|
83
|
+
}, 10);
|
|
84
|
+
await t.throwsAsync(responsePromise, { message: 'Aborted' });
|
|
85
|
+
});
|
|
86
|
+
test('TimedResponsesWSModel forwards transport overrides into the websocket handshake', async (t) => {
|
|
87
|
+
const mockWs = new MockWebSocket(1);
|
|
88
|
+
const mockClient = {
|
|
89
|
+
...createMockClient(),
|
|
90
|
+
baseURL: 'https://proxy.example/custom/openai',
|
|
91
|
+
authHeaders: async (args) => {
|
|
92
|
+
t.deepEqual(args, {
|
|
93
|
+
method: 'get',
|
|
94
|
+
path: '/custom/openai/responses',
|
|
95
|
+
query: { foo: 'bar' },
|
|
96
|
+
});
|
|
97
|
+
return { Authorization: 'Bearer auth-token' };
|
|
98
|
+
},
|
|
99
|
+
};
|
|
100
|
+
const seenConnections = [];
|
|
101
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 5000 }, (url, options) => {
|
|
102
|
+
seenConnections.push({ url, headers: options.headers });
|
|
103
|
+
return mockWs;
|
|
104
|
+
});
|
|
105
|
+
setTimeout(() => {
|
|
106
|
+
mockWs.emit('message', JSON.stringify({ type: 'response.created', response: { id: 'resp_transport' } }));
|
|
107
|
+
}, 10);
|
|
108
|
+
setTimeout(() => {
|
|
109
|
+
mockWs.emit('message', JSON.stringify({
|
|
110
|
+
type: 'response.completed',
|
|
111
|
+
response: {
|
|
112
|
+
id: 'resp_transport',
|
|
113
|
+
output: [],
|
|
114
|
+
usage: { input_tokens: 10, output_tokens: 20, total_tokens: 30 },
|
|
115
|
+
},
|
|
116
|
+
}));
|
|
117
|
+
}, 20);
|
|
118
|
+
await model.getResponse({
|
|
119
|
+
...createMockRequest('Hello'),
|
|
120
|
+
modelSettings: {
|
|
121
|
+
providerData: {
|
|
122
|
+
extraHeaders: {
|
|
123
|
+
'X-Request-Id': 'abc123',
|
|
124
|
+
},
|
|
125
|
+
extraQuery: {
|
|
126
|
+
foo: 'bar',
|
|
127
|
+
},
|
|
128
|
+
},
|
|
129
|
+
},
|
|
130
|
+
});
|
|
131
|
+
t.is(seenConnections.length, 1);
|
|
132
|
+
t.is(seenConnections[0].url, 'wss://proxy.example/custom/openai/responses?foo=bar');
|
|
133
|
+
t.is(seenConnections[0].headers['X-Request-Id'], 'abc123');
|
|
134
|
+
t.is(seenConnections[0].headers.Authorization, 'Bearer auth-token');
|
|
135
|
+
});
|
|
136
|
+
test('TimedResponsesWSModel keeps the global WebSocket constructor stable during a request', async (t) => {
|
|
137
|
+
const mockWs = new MockWebSocket(1);
|
|
138
|
+
const mockClient = createMockClient();
|
|
139
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 5000 }, () => mockWs);
|
|
140
|
+
const installedWebSocket = globalThis.WebSocket;
|
|
141
|
+
setTimeout(() => {
|
|
142
|
+
mockWs.emit('message', JSON.stringify({ type: 'response.created', response: { id: 'resp_global' } }));
|
|
143
|
+
}, 20);
|
|
144
|
+
setTimeout(() => {
|
|
145
|
+
mockWs.emit('message', JSON.stringify({
|
|
146
|
+
type: 'response.completed',
|
|
147
|
+
response: {
|
|
148
|
+
id: 'resp_global',
|
|
149
|
+
output: [],
|
|
150
|
+
usage: { input_tokens: 10, output_tokens: 20, total_tokens: 30 },
|
|
151
|
+
},
|
|
152
|
+
}));
|
|
153
|
+
}, 30);
|
|
154
|
+
const responsePromise = model.getResponse(createMockRequest('Hello'));
|
|
155
|
+
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
156
|
+
t.is(globalThis.WebSocket, installedWebSocket);
|
|
157
|
+
await t.notThrowsAsync(responsePromise);
|
|
158
|
+
});
|
|
159
|
+
test('TimedResponsesWSModel.close closes the active websocket', async (t) => {
|
|
160
|
+
const mockWs = new MockWebSocket();
|
|
161
|
+
const mockClient = createMockClient();
|
|
162
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 5000 }, () => mockWs);
|
|
163
|
+
const responsePromise = model.getResponse(createMockRequest('Hello'));
|
|
164
|
+
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
165
|
+
await model.close();
|
|
166
|
+
t.true(mockWs.closeCalls > 0);
|
|
167
|
+
await t.throwsAsync(responsePromise, { message: /WebSocket connection closed before response completed/ });
|
|
168
|
+
});
|
|
169
|
+
test('TimedResponsesWSModel closes the previous websocket before creating a new one when reuseConnection is false', async (t) => {
|
|
170
|
+
const sockets = [];
|
|
171
|
+
let secondFactorySawClosedFirst = false;
|
|
172
|
+
const mockClient = createMockClient();
|
|
173
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 5000, reuseConnection: false }, () => {
|
|
174
|
+
const socket = new MockWebSocket(1);
|
|
175
|
+
sockets.push(socket);
|
|
176
|
+
if (sockets.length === 2) {
|
|
177
|
+
secondFactorySawClosedFirst = sockets[0].closeCalls > 0;
|
|
178
|
+
}
|
|
179
|
+
return socket;
|
|
180
|
+
});
|
|
181
|
+
setTimeout(() => {
|
|
182
|
+
sockets[0]?.emit('message', JSON.stringify({ type: 'response.created', response: { id: 'resp_1' } }));
|
|
183
|
+
}, 10);
|
|
184
|
+
setTimeout(() => {
|
|
185
|
+
sockets[0]?.emit('message', JSON.stringify({
|
|
186
|
+
type: 'response.completed',
|
|
187
|
+
response: {
|
|
188
|
+
id: 'resp_1',
|
|
189
|
+
output: [],
|
|
190
|
+
usage: { input_tokens: 10, output_tokens: 20, total_tokens: 30 },
|
|
191
|
+
},
|
|
192
|
+
}));
|
|
193
|
+
}, 20);
|
|
194
|
+
await model.getResponse(createMockRequest('Hello 1'));
|
|
195
|
+
setTimeout(() => {
|
|
196
|
+
sockets[1]?.emit('message', JSON.stringify({ type: 'response.created', response: { id: 'resp_2' } }));
|
|
197
|
+
}, 10);
|
|
198
|
+
setTimeout(() => {
|
|
199
|
+
sockets[1]?.emit('message', JSON.stringify({
|
|
200
|
+
type: 'response.completed',
|
|
201
|
+
response: {
|
|
202
|
+
id: 'resp_2',
|
|
203
|
+
output: [],
|
|
204
|
+
usage: { input_tokens: 10, output_tokens: 20, total_tokens: 30 },
|
|
205
|
+
},
|
|
206
|
+
}));
|
|
207
|
+
}, 20);
|
|
208
|
+
await model.getResponse(createMockRequest('Hello 2'));
|
|
209
|
+
t.is(sockets.length, 2);
|
|
210
|
+
t.true(secondFactorySawClosedFirst, 'expected the previous websocket to be closed before opening the next one');
|
|
211
|
+
t.true(sockets[0].closeCalls > 0);
|
|
212
|
+
});
|
|
213
|
+
test('TimedResponsesWSModel.getResponse sends request and receives response', async (t) => {
|
|
214
|
+
const mockWs = new MockWebSocket();
|
|
215
|
+
const mockClient = createMockClient();
|
|
216
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 5000 }, () => mockWs);
|
|
217
|
+
// Schedule response events
|
|
218
|
+
setTimeout(() => {
|
|
219
|
+
mockWs.emit('message', JSON.stringify({ type: 'response.created', response: { id: 'resp_1' } }));
|
|
220
|
+
}, 10);
|
|
221
|
+
setTimeout(() => {
|
|
222
|
+
mockWs.emit('message', JSON.stringify({
|
|
223
|
+
type: 'response.completed',
|
|
224
|
+
response: {
|
|
225
|
+
id: 'resp_1',
|
|
226
|
+
output: [{ type: 'message', content: [{ type: 'output_text', text: 'test response' }] }],
|
|
227
|
+
usage: { input_tokens: 10, output_tokens: 20, total_tokens: 30 },
|
|
228
|
+
},
|
|
229
|
+
}));
|
|
230
|
+
}, 20);
|
|
231
|
+
const result = await model.getResponse(createMockRequest('Hello'));
|
|
232
|
+
t.truthy(result);
|
|
233
|
+
t.is(mockWs.sent.length, 1);
|
|
234
|
+
const sentPayload = JSON.parse(mockWs.sent[0]);
|
|
235
|
+
t.is(sentPayload.type, 'response.create');
|
|
236
|
+
t.is(sentPayload.model, 'gpt-4');
|
|
237
|
+
t.is(sentPayload.stream, true);
|
|
238
|
+
t.deepEqual(sentPayload.input, [{ role: 'user', content: 'Hello' }]);
|
|
239
|
+
t.truthy(result.output);
|
|
240
|
+
});
|
|
241
|
+
test('TimedResponsesWSModel.getStreamedResponse yields stream events', async (t) => {
|
|
242
|
+
const mockWs = new MockWebSocket();
|
|
243
|
+
const mockClient = createMockClient();
|
|
244
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 5000 }, () => mockWs);
|
|
245
|
+
// Schedule response events
|
|
246
|
+
setTimeout(() => {
|
|
247
|
+
mockWs.emit('message', JSON.stringify({ type: 'response.created', response: { id: 'resp_2' } }));
|
|
248
|
+
}, 10);
|
|
249
|
+
setTimeout(() => {
|
|
250
|
+
mockWs.emit('message', JSON.stringify({
|
|
251
|
+
type: 'response.output_item.added',
|
|
252
|
+
item: { type: 'message', content: [] },
|
|
253
|
+
}));
|
|
254
|
+
}, 20);
|
|
255
|
+
setTimeout(() => {
|
|
256
|
+
mockWs.emit('message', JSON.stringify({
|
|
257
|
+
type: 'response.completed',
|
|
258
|
+
response: {
|
|
259
|
+
id: 'resp_2',
|
|
260
|
+
output: [{ type: 'message', content: [{ type: 'output_text', text: 'streamed response' }] }],
|
|
261
|
+
usage: { input_tokens: 15, output_tokens: 25, total_tokens: 40 },
|
|
262
|
+
},
|
|
263
|
+
}));
|
|
264
|
+
}, 30);
|
|
265
|
+
const events = [];
|
|
266
|
+
for await (const event of model.getStreamedResponse(createMockRequest('Hello'))) {
|
|
267
|
+
events.push(event);
|
|
268
|
+
}
|
|
269
|
+
t.true(events.length > 0);
|
|
270
|
+
t.is(mockWs.sent.length, 1);
|
|
271
|
+
});
|
|
272
|
+
test('TimedResponsesWSModel respects connect timeout', async (t) => {
|
|
273
|
+
const mockWs = new EventEmitter();
|
|
274
|
+
mockWs.readyState = 0;
|
|
275
|
+
mockWs.terminate = () => {
|
|
276
|
+
mockWs.emit('close');
|
|
277
|
+
};
|
|
278
|
+
mockWs.on('error', () => { });
|
|
279
|
+
const mockClient = createMockClient();
|
|
280
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 50, idleTimeoutMs: 5000 }, () => mockWs);
|
|
281
|
+
await t.throwsAsync(model.getResponse(createMockRequest('Hello')), {
|
|
282
|
+
message: /WebSocket open timed out after 50ms/,
|
|
283
|
+
});
|
|
284
|
+
});
|
|
285
|
+
test('TimedResponsesWSModel respects idle timeout', async (t) => {
|
|
286
|
+
const mockWs = new MockWebSocket();
|
|
287
|
+
const mockClient = createMockClient();
|
|
288
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 50 }, () => mockWs);
|
|
289
|
+
// Don't send any response
|
|
290
|
+
await t.throwsAsync(model.getResponse(createMockRequest('Hello')), { message: /WebSocket idle timeout after 50ms/ });
|
|
291
|
+
});
|
|
292
|
+
test('TimedResponsesWSModel handles connection close', async (t) => {
|
|
293
|
+
const mockWs = new MockWebSocket();
|
|
294
|
+
const mockClient = createMockClient();
|
|
295
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 5000 }, () => mockWs);
|
|
296
|
+
// Close connection before response
|
|
297
|
+
setTimeout(() => {
|
|
298
|
+
mockWs.close();
|
|
299
|
+
}, 10);
|
|
300
|
+
await t.throwsAsync(model.getResponse(createMockRequest('Hello')), { message: /WebSocket connection closed/ });
|
|
301
|
+
});
|
|
302
|
+
test('TimedResponsesWSModel includes close code and reason in error message', async (t) => {
|
|
303
|
+
const mockWs = new MockWebSocket();
|
|
304
|
+
const mockClient = createMockClient();
|
|
305
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 5000 }, () => mockWs);
|
|
306
|
+
setTimeout(() => {
|
|
307
|
+
mockWs.emit('close', 1008, Buffer.from('rate limit exceeded'));
|
|
308
|
+
}, 10);
|
|
309
|
+
await t.throwsAsync(model.getResponse(createMockRequest('Hello')), {
|
|
310
|
+
message: /WebSocket connection closed before response completed.*code=1008.*rate limit exceeded/,
|
|
311
|
+
});
|
|
312
|
+
});
|
|
313
|
+
test('TimedResponsesWSModel reuses connection for multiple requests', async (t) => {
|
|
314
|
+
const mockWs = new MockWebSocket();
|
|
315
|
+
const mockClient = createMockClient();
|
|
316
|
+
let connectionCount = 0;
|
|
317
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 5000, reuseConnection: true }, () => {
|
|
318
|
+
connectionCount++;
|
|
319
|
+
return mockWs;
|
|
320
|
+
});
|
|
321
|
+
// First request
|
|
322
|
+
setTimeout(() => {
|
|
323
|
+
mockWs.emit('message', JSON.stringify({ type: 'response.created', response: { id: 'resp_1' } }));
|
|
324
|
+
}, 10);
|
|
325
|
+
setTimeout(() => {
|
|
326
|
+
mockWs.emit('message', JSON.stringify({
|
|
327
|
+
type: 'response.completed',
|
|
328
|
+
response: {
|
|
329
|
+
id: 'resp_1',
|
|
330
|
+
output: [],
|
|
331
|
+
usage: { input_tokens: 10, output_tokens: 20, total_tokens: 30 },
|
|
332
|
+
},
|
|
333
|
+
}));
|
|
334
|
+
}, 20);
|
|
335
|
+
await model.getResponse(createMockRequest('Hello 1'));
|
|
336
|
+
// Second request
|
|
337
|
+
setTimeout(() => {
|
|
338
|
+
mockWs.emit('message', JSON.stringify({ type: 'response.created', response: { id: 'resp_2' } }));
|
|
339
|
+
}, 10);
|
|
340
|
+
setTimeout(() => {
|
|
341
|
+
mockWs.emit('message', JSON.stringify({
|
|
342
|
+
type: 'response.completed',
|
|
343
|
+
response: {
|
|
344
|
+
id: 'resp_2',
|
|
345
|
+
output: [],
|
|
346
|
+
usage: { input_tokens: 10, output_tokens: 20, total_tokens: 30 },
|
|
347
|
+
},
|
|
348
|
+
}));
|
|
349
|
+
}, 20);
|
|
350
|
+
await model.getResponse(createMockRequest('Hello 2'));
|
|
351
|
+
t.is(connectionCount, 1, 'Should reuse the same connection');
|
|
352
|
+
t.is(mockWs.sent.length, 2, 'Should send two requests');
|
|
353
|
+
});
|
|
354
|
+
test('TimedResponsesWSModel.getRetryAdvice returns safe retry advice for connection timeouts', (t) => {
|
|
355
|
+
const mockClient = createMockClient();
|
|
356
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 5000 });
|
|
357
|
+
const error1 = new Error('Responses websocket connection timed out before opening after 15000ms');
|
|
358
|
+
const advice1 = model.getRetryAdvice({ error: error1 });
|
|
359
|
+
t.true(advice1.suggested);
|
|
360
|
+
t.is(advice1.replaySafety, 'safe');
|
|
361
|
+
const error2 = new Error('WebSocket open timed out after 1000ms');
|
|
362
|
+
const advice2 = model.getRetryAdvice({ error: error2 });
|
|
363
|
+
t.true(advice2.suggested);
|
|
364
|
+
t.is(advice2.replaySafety, 'safe');
|
|
365
|
+
const error3 = new Error('WebSocket idle timeout after 5000ms');
|
|
366
|
+
const advice3 = model.getRetryAdvice({ error: error3 });
|
|
367
|
+
t.false(advice3.suggested);
|
|
368
|
+
t.is(advice3.replaySafety, 'unsafe');
|
|
369
|
+
const error4 = new Error('WebSocket first frame timeout after 5000ms');
|
|
370
|
+
const advice4 = model.getRetryAdvice({ error: error4 });
|
|
371
|
+
t.true(advice4.suggested);
|
|
372
|
+
t.is(advice4.replaySafety, 'safe');
|
|
373
|
+
const error5 = new Error('WebSocket connection closed before response completed (code=1006)');
|
|
374
|
+
const advice5 = model.getRetryAdvice({ error: error5 });
|
|
375
|
+
t.true(advice5.suggested);
|
|
376
|
+
t.is(advice5.replaySafety, 'safe');
|
|
377
|
+
const error6 = new Error('WebSocket connection closed before response completed (code=1008, reason="rate limit exceeded")');
|
|
378
|
+
const advice6 = model.getRetryAdvice({ error: error6 });
|
|
379
|
+
t.false(advice6.suggested);
|
|
380
|
+
t.is(advice6.replaySafety, 'unsafe');
|
|
381
|
+
});
|
|
382
|
+
test('TimedResponsesWSModel fails fast when no first frame arrives within firstFrameTimeoutMs', async (t) => {
|
|
383
|
+
const mockWs = new MockWebSocket(1);
|
|
384
|
+
const mockClient = createMockClient();
|
|
385
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 5000, firstFrameTimeoutMs: 60 }, () => mockWs);
|
|
386
|
+
await t.throwsAsync(model.getResponse(createMockRequest('Hello')), {
|
|
387
|
+
message: /WebSocket first frame timeout after 60ms/,
|
|
388
|
+
});
|
|
389
|
+
});
|
|
390
|
+
test('TimedResponsesWSModel uses idleTimeoutMs for mid-stream gaps even when firstFrameTimeoutMs is set', async (t) => {
|
|
391
|
+
const mockWs = new MockWebSocket(1);
|
|
392
|
+
const mockClient = createMockClient();
|
|
393
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 300, firstFrameTimeoutMs: 100 }, () => mockWs);
|
|
394
|
+
// First frame arrives comfortably within firstFrameTimeoutMs.
|
|
395
|
+
setTimeout(() => {
|
|
396
|
+
mockWs.emit('message', JSON.stringify({ type: 'response.created', response: { id: 'resp_x' } }));
|
|
397
|
+
}, 25);
|
|
398
|
+
// Second frame arrives after firstFrameTimeoutMs but within idleTimeoutMs.
|
|
399
|
+
setTimeout(() => {
|
|
400
|
+
mockWs.emit('message', JSON.stringify({
|
|
401
|
+
type: 'response.completed',
|
|
402
|
+
response: {
|
|
403
|
+
id: 'resp_x',
|
|
404
|
+
output: [],
|
|
405
|
+
usage: { input_tokens: 1, output_tokens: 1, total_tokens: 2 },
|
|
406
|
+
},
|
|
407
|
+
}));
|
|
408
|
+
}, 170);
|
|
409
|
+
const result = await model.getResponse(createMockRequest('Hello'));
|
|
410
|
+
t.truthy(result);
|
|
411
|
+
});
|
|
412
|
+
test('TimedResponsesWSModel applies firstFrameTimeoutMs to each request on a reused connection', async (t) => {
|
|
413
|
+
const mockWs = new MockWebSocket(1);
|
|
414
|
+
const mockClient = createMockClient();
|
|
415
|
+
let connectionCount = 0;
|
|
416
|
+
const model = new TimedResponsesWSModel(mockClient, 'gpt-4', { connectTimeoutMs: 1000, idleTimeoutMs: 5000, firstFrameTimeoutMs: 60, reuseConnection: true }, () => {
|
|
417
|
+
connectionCount++;
|
|
418
|
+
return mockWs;
|
|
419
|
+
});
|
|
420
|
+
// First request completes normally.
|
|
421
|
+
setTimeout(() => {
|
|
422
|
+
mockWs.emit('message', JSON.stringify({ type: 'response.created', response: { id: 'resp_a' } }));
|
|
423
|
+
}, 10);
|
|
424
|
+
setTimeout(() => {
|
|
425
|
+
mockWs.emit('message', JSON.stringify({
|
|
426
|
+
type: 'response.completed',
|
|
427
|
+
response: {
|
|
428
|
+
id: 'resp_a',
|
|
429
|
+
output: [],
|
|
430
|
+
usage: { input_tokens: 1, output_tokens: 1, total_tokens: 2 },
|
|
431
|
+
},
|
|
432
|
+
}));
|
|
433
|
+
}, 20);
|
|
434
|
+
await model.getResponse(createMockRequest('Hello 1'));
|
|
435
|
+
// Second request: no response, should hit firstFrameTimeoutMs, not idleTimeoutMs.
|
|
436
|
+
await t.throwsAsync(model.getResponse(createMockRequest('Hello 2')), {
|
|
437
|
+
message: /WebSocket first frame timeout after 60ms/,
|
|
438
|
+
});
|
|
439
|
+
t.is(connectionCount, 1, 'reused connection should be tried before failing');
|
|
440
|
+
});
|
|
441
|
+
//# sourceMappingURL=timed-responses-ws-model.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"timed-responses-ws-model.test.js","sourceRoot":"","sources":["../../source/providers/timed-responses-ws-model.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import WebSocket from 'ws';
|
|
2
|
+
export type WebSocketFactory = (url: string, options: {
|
|
3
|
+
headers: Record<string, string>;
|
|
4
|
+
}) => WebSocket;
|
|
5
|
+
export type WebSocketCloseInfo = {
|
|
6
|
+
code?: number;
|
|
7
|
+
reason?: string;
|
|
8
|
+
};
|
|
9
|
+
export declare class TimedWsConnection {
|
|
10
|
+
private readonly ws;
|
|
11
|
+
private readonly idleTimeoutMs;
|
|
12
|
+
private lastClose;
|
|
13
|
+
private constructor();
|
|
14
|
+
getLastClose(): WebSocketCloseInfo | null;
|
|
15
|
+
static connect(url: string, headers: Record<string, string>, opts: {
|
|
16
|
+
connectTimeoutMs: number;
|
|
17
|
+
idleTimeoutMs: number;
|
|
18
|
+
}, signal?: AbortSignal, wsFactory?: WebSocketFactory): Promise<TimedWsConnection>;
|
|
19
|
+
nextFrame(signal?: AbortSignal, override?: {
|
|
20
|
+
timeoutMs: number;
|
|
21
|
+
timeoutErrorMessage?: string;
|
|
22
|
+
}): Promise<string | null>;
|
|
23
|
+
send(data: string): void;
|
|
24
|
+
close(): Promise<void>;
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=timed-ws-connection.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"timed-ws-connection.d.ts","sourceRoot":"","sources":["../../source/providers/timed-ws-connection.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAE3B,MAAM,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,KAAK,SAAS,CAAC;AAExG,MAAM,MAAM,kBAAkB,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAoBpE,qBAAa,iBAAiB;IAGR,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAa,OAAO,CAAC,QAAQ,CAAC,aAAa;IAFlF,OAAO,CAAC,SAAS,CAAmC;IAEpD,OAAO;IAEP,YAAY,IAAI,kBAAkB,GAAG,IAAI;WAI5B,OAAO,CAClB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,IAAI,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,EACzD,MAAM,CAAC,EAAE,WAAW,EACpB,SAAS,GAAE,gBAAgD,GAC1D,OAAO,CAAC,iBAAiB,CAAC;IAuEvB,SAAS,CACb,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;KAAE,GAC7D,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAoEzB,IAAI,CAAC,IAAI,EAAE,MAAM;IAIX,KAAK;CAGZ"}
|
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
import WebSocket from 'ws';
|
|
2
|
+
function describeCloseInfo(info) {
|
|
3
|
+
if (!info)
|
|
4
|
+
return '';
|
|
5
|
+
const parts = [];
|
|
6
|
+
if (typeof info.code === 'number')
|
|
7
|
+
parts.push(`code=${info.code}`);
|
|
8
|
+
if (info.reason)
|
|
9
|
+
parts.push(`reason="${info.reason}"`);
|
|
10
|
+
return parts.length > 0 ? ` (${parts.join(', ')})` : '';
|
|
11
|
+
}
|
|
12
|
+
function toCloseInfo(code, reason) {
|
|
13
|
+
const info = {};
|
|
14
|
+
if (typeof code === 'number')
|
|
15
|
+
info.code = code;
|
|
16
|
+
if (reason) {
|
|
17
|
+
const text = typeof reason === 'string' ? reason : Buffer.isBuffer(reason) ? reason.toString() : String(reason);
|
|
18
|
+
if (text)
|
|
19
|
+
info.reason = text;
|
|
20
|
+
}
|
|
21
|
+
return info;
|
|
22
|
+
}
|
|
23
|
+
export class TimedWsConnection {
|
|
24
|
+
ws;
|
|
25
|
+
idleTimeoutMs;
|
|
26
|
+
lastClose = null;
|
|
27
|
+
constructor(ws, idleTimeoutMs) {
|
|
28
|
+
this.ws = ws;
|
|
29
|
+
this.idleTimeoutMs = idleTimeoutMs;
|
|
30
|
+
}
|
|
31
|
+
getLastClose() {
|
|
32
|
+
return this.lastClose;
|
|
33
|
+
}
|
|
34
|
+
static async connect(url, headers, opts, signal, wsFactory = (u, o) => new WebSocket(u, o)) {
|
|
35
|
+
if (signal?.aborted) {
|
|
36
|
+
throw new Error('Aborted');
|
|
37
|
+
}
|
|
38
|
+
const ws = wsFactory(url, { headers });
|
|
39
|
+
if (signal?.aborted) {
|
|
40
|
+
ws.terminate();
|
|
41
|
+
throw new Error('Aborted');
|
|
42
|
+
}
|
|
43
|
+
await new Promise((resolve, reject) => {
|
|
44
|
+
let settled = false;
|
|
45
|
+
const settle = (fn) => {
|
|
46
|
+
if (settled)
|
|
47
|
+
return;
|
|
48
|
+
settled = true;
|
|
49
|
+
cleanup();
|
|
50
|
+
fn();
|
|
51
|
+
};
|
|
52
|
+
const timeout = setTimeout(() => {
|
|
53
|
+
settle(() => {
|
|
54
|
+
ws.terminate();
|
|
55
|
+
reject(new Error(`WebSocket open timed out after ${opts.connectTimeoutMs}ms`));
|
|
56
|
+
});
|
|
57
|
+
}, opts.connectTimeoutMs);
|
|
58
|
+
const cleanup = () => {
|
|
59
|
+
clearTimeout(timeout);
|
|
60
|
+
ws.off('open', onOpen);
|
|
61
|
+
ws.off('error', onError);
|
|
62
|
+
ws.off('close', onClose);
|
|
63
|
+
signal?.removeEventListener('abort', onAbort);
|
|
64
|
+
};
|
|
65
|
+
const onOpen = () => {
|
|
66
|
+
settle(() => resolve());
|
|
67
|
+
};
|
|
68
|
+
const onError = (err) => {
|
|
69
|
+
settle(() => reject(err));
|
|
70
|
+
};
|
|
71
|
+
const onClose = (code, reason) => {
|
|
72
|
+
const info = toCloseInfo(code, reason);
|
|
73
|
+
settle(() => reject(new Error(`WebSocket closed before opening${describeCloseInfo(info)}`)));
|
|
74
|
+
};
|
|
75
|
+
const onAbort = () => {
|
|
76
|
+
settle(() => {
|
|
77
|
+
ws.terminate();
|
|
78
|
+
reject(new Error('Aborted'));
|
|
79
|
+
});
|
|
80
|
+
};
|
|
81
|
+
if (signal?.aborted) {
|
|
82
|
+
onAbort();
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
ws.once('open', onOpen);
|
|
86
|
+
ws.once('error', onError);
|
|
87
|
+
ws.once('close', onClose);
|
|
88
|
+
signal?.addEventListener('abort', onAbort, { once: true });
|
|
89
|
+
});
|
|
90
|
+
return new TimedWsConnection(ws, opts.idleTimeoutMs);
|
|
91
|
+
}
|
|
92
|
+
async nextFrame(signal, override) {
|
|
93
|
+
if (signal?.aborted) {
|
|
94
|
+
this.ws.terminate();
|
|
95
|
+
throw new Error('Aborted');
|
|
96
|
+
}
|
|
97
|
+
const effectiveTimeoutMs = override?.timeoutMs ?? this.idleTimeoutMs;
|
|
98
|
+
const timeoutErrorMessage = override?.timeoutErrorMessage ?? `WebSocket idle timeout after ${this.idleTimeoutMs}ms`;
|
|
99
|
+
return await new Promise((resolve, reject) => {
|
|
100
|
+
let settled = false;
|
|
101
|
+
const settle = (fn) => {
|
|
102
|
+
if (settled)
|
|
103
|
+
return;
|
|
104
|
+
settled = true;
|
|
105
|
+
cleanup();
|
|
106
|
+
fn();
|
|
107
|
+
};
|
|
108
|
+
const timeout = setTimeout(() => {
|
|
109
|
+
settle(() => {
|
|
110
|
+
this.ws.terminate();
|
|
111
|
+
reject(new Error(timeoutErrorMessage));
|
|
112
|
+
});
|
|
113
|
+
}, effectiveTimeoutMs);
|
|
114
|
+
const cleanup = () => {
|
|
115
|
+
clearTimeout(timeout);
|
|
116
|
+
this.ws.off('message', onMessage);
|
|
117
|
+
this.ws.off('error', onError);
|
|
118
|
+
this.ws.off('close', onClose);
|
|
119
|
+
signal?.removeEventListener('abort', onAbort);
|
|
120
|
+
};
|
|
121
|
+
const onMessage = (data) => {
|
|
122
|
+
settle(() => {
|
|
123
|
+
resolve(typeof data === 'string' ? data : data.toString());
|
|
124
|
+
});
|
|
125
|
+
};
|
|
126
|
+
const onError = (err) => {
|
|
127
|
+
settle(() => reject(err));
|
|
128
|
+
};
|
|
129
|
+
const onClose = (code, reason) => {
|
|
130
|
+
this.lastClose = toCloseInfo(code, reason);
|
|
131
|
+
settle(() => resolve(null));
|
|
132
|
+
};
|
|
133
|
+
const onAbort = () => {
|
|
134
|
+
settle(() => {
|
|
135
|
+
this.ws.terminate();
|
|
136
|
+
reject(new Error('Aborted'));
|
|
137
|
+
});
|
|
138
|
+
};
|
|
139
|
+
if (signal?.aborted) {
|
|
140
|
+
onAbort();
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
this.ws.once('message', onMessage);
|
|
144
|
+
this.ws.once('error', onError);
|
|
145
|
+
this.ws.once('close', onClose);
|
|
146
|
+
signal?.addEventListener('abort', onAbort, { once: true });
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
send(data) {
|
|
150
|
+
this.ws.send(data);
|
|
151
|
+
}
|
|
152
|
+
async close() {
|
|
153
|
+
this.ws.close();
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
//# sourceMappingURL=timed-ws-connection.js.map
|