@qduc/term2 0.15.0 → 0.16.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/README.md +324 -316
- package/dist/agent.d.ts +3 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +15 -63
- package/dist/agent.js.map +1 -1
- package/dist/app.d.ts +1 -1
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +129 -19
- package/dist/app.js.map +1 -1
- package/dist/cli.js +25 -16
- package/dist/cli.js.map +1 -1
- package/dist/commands/compact-command.d.ts.map +1 -1
- package/dist/commands/compact-command.js +4 -0
- package/dist/commands/compact-command.js.map +1 -1
- package/dist/commands/effort-command.js +1 -1
- package/dist/commands/effort-command.js.map +1 -1
- package/dist/commands/guarded-settings-command.d.ts.map +1 -1
- package/dist/commands/guarded-settings-command.js +4 -8
- package/dist/commands/guarded-settings-command.js.map +1 -1
- package/dist/commands/model-command.js +1 -1
- package/dist/commands/model-command.js.map +1 -1
- package/dist/commands/resume-command.d.ts +10 -0
- package/dist/commands/resume-command.d.ts.map +1 -0
- package/dist/commands/resume-command.js +40 -0
- package/dist/commands/resume-command.js.map +1 -0
- package/dist/components/ErrorBoundary.d.ts.map +1 -1
- package/dist/components/ErrorBoundary.js +5 -4
- package/dist/components/ErrorBoundary.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 +56 -18
- package/dist/components/InputBox.js.map +1 -1
- package/dist/components/MarkdownRenderer.d.ts.map +1 -1
- package/dist/components/MarkdownRenderer.js +16 -15
- package/dist/components/MarkdownRenderer.js.map +1 -1
- package/dist/components/common/MenuContainer.d.ts +25 -2
- package/dist/components/common/MenuContainer.d.ts.map +1 -1
- package/dist/components/common/MenuContainer.js +35 -11
- package/dist/components/common/MenuContainer.js.map +1 -1
- package/dist/components/common/ScrollableTabBar.d.ts.map +1 -1
- package/dist/components/common/ScrollableTabBar.js +5 -4
- package/dist/components/common/ScrollableTabBar.js.map +1 -1
- package/dist/components/input/ApplicationInputSurface.d.ts +4 -5
- package/dist/components/input/ApplicationInputSurface.d.ts.map +1 -1
- package/dist/components/input/ApplicationInputSurface.js.map +1 -1
- package/dist/components/input/FirstRunSetupPrompt.d.ts.map +1 -1
- package/dist/components/input/FirstRunSetupPrompt.js +5 -4
- package/dist/components/input/FirstRunSetupPrompt.js.map +1 -1
- package/dist/components/input/MenuSurface.d.ts.map +1 -1
- package/dist/components/input/MenuSurface.js +10 -3
- package/dist/components/input/MenuSurface.js.map +1 -1
- package/dist/components/input/ModelMenuSession.d.ts.map +1 -1
- package/dist/components/input/ModelMenuSession.js +2 -1
- package/dist/components/input/ModelMenuSession.js.map +1 -1
- package/dist/components/input/PendingQueueList.d.ts +2 -0
- package/dist/components/input/PendingQueueList.d.ts.map +1 -1
- package/dist/components/input/PendingQueueList.js +17 -14
- package/dist/components/input/PendingQueueList.js.map +1 -1
- package/dist/components/input/SettingsValueMenuSession.d.ts.map +1 -1
- package/dist/components/input/SettingsValueMenuSession.js +2 -1
- package/dist/components/input/SettingsValueMenuSession.js.map +1 -1
- package/dist/components/layout/BackgroundTaskManager.d.ts.map +1 -1
- package/dist/components/layout/BackgroundTaskManager.js +12 -11
- package/dist/components/layout/BackgroundTaskManager.js.map +1 -1
- package/dist/components/layout/BackgroundTasksPanel.d.ts +2 -2
- package/dist/components/layout/BackgroundTasksPanel.d.ts.map +1 -1
- package/dist/components/layout/BackgroundTasksPanel.js +10 -9
- package/dist/components/layout/BackgroundTasksPanel.js.map +1 -1
- package/dist/components/layout/Banner.d.ts +0 -1
- package/dist/components/layout/Banner.d.ts.map +1 -1
- package/dist/components/layout/Banner.js +43 -73
- package/dist/components/layout/Banner.js.map +1 -1
- package/dist/components/layout/BottomArea.d.ts +6 -5
- package/dist/components/layout/BottomArea.d.ts.map +1 -1
- package/dist/components/layout/BottomArea.js +17 -9
- package/dist/components/layout/BottomArea.js.map +1 -1
- package/dist/components/layout/DiffView.js +5 -5
- package/dist/components/layout/DiffView.js.map +1 -1
- package/dist/components/layout/StatusBar.d.ts +4 -1
- package/dist/components/layout/StatusBar.d.ts.map +1 -1
- package/dist/components/layout/StatusBar.js +305 -95
- package/dist/components/layout/StatusBar.js.map +1 -1
- package/dist/components/layout/background-task-clock.d.ts +43 -0
- package/dist/components/layout/background-task-clock.d.ts.map +1 -0
- package/dist/components/layout/background-task-clock.js +46 -0
- package/dist/components/layout/background-task-clock.js.map +1 -0
- package/dist/components/menu/CopyMenu.d.ts.map +1 -1
- package/dist/components/menu/CopyMenu.js +4 -3
- package/dist/components/menu/CopyMenu.js.map +1 -1
- package/dist/components/menu/MentorPoolSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/MentorPoolSelectionMenu.js +28 -21
- package/dist/components/menu/MentorPoolSelectionMenu.js.map +1 -1
- package/dist/components/menu/ModelSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ModelSelectionMenu.js +26 -13
- package/dist/components/menu/ModelSelectionMenu.js.map +1 -1
- package/dist/components/menu/PathSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/PathSelectionMenu.js +4 -3
- package/dist/components/menu/PathSelectionMenu.js.map +1 -1
- package/dist/components/menu/ProviderSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ProviderSelectionMenu.js +46 -26
- package/dist/components/menu/ProviderSelectionMenu.js.map +1 -1
- package/dist/components/menu/RewindMenu.d.ts.map +1 -1
- package/dist/components/menu/RewindMenu.js +4 -3
- package/dist/components/menu/RewindMenu.js.map +1 -1
- package/dist/components/menu/SettingsSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/SettingsSelectionMenu.js +26 -26
- package/dist/components/menu/SettingsSelectionMenu.js.map +1 -1
- package/dist/components/menu/SettingsValueSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/SettingsValueSelectionMenu.js +22 -20
- package/dist/components/menu/SettingsValueSelectionMenu.js.map +1 -1
- package/dist/components/menu/SkillSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/SkillSelectionMenu.js +33 -23
- package/dist/components/menu/SkillSelectionMenu.js.map +1 -1
- package/dist/components/menu/SlashCommandMenu.d.ts.map +1 -1
- package/dist/components/menu/SlashCommandMenu.js +11 -6
- package/dist/components/menu/SlashCommandMenu.js.map +1 -1
- package/dist/components/message/ChatMessage.js +2 -2
- package/dist/components/message/ChatMessage.js.map +1 -1
- package/dist/components/message/CodeContextSearchRenderer.d.ts.map +1 -1
- package/dist/components/message/CodeContextSearchRenderer.js +8 -11
- package/dist/components/message/CodeContextSearchRenderer.js.map +1 -1
- package/dist/components/message/CommandGroupSummary.d.ts.map +1 -1
- package/dist/components/message/CommandGroupSummary.js +15 -7
- package/dist/components/message/CommandGroupSummary.js.map +1 -1
- package/dist/components/message/CommandMessage.d.ts.map +1 -1
- package/dist/components/message/CommandMessage.js +111 -91
- package/dist/components/message/CommandMessage.js.map +1 -1
- package/dist/components/message/GrepRenderer.d.ts.map +1 -1
- package/dist/components/message/GrepRenderer.js +5 -8
- package/dist/components/message/GrepRenderer.js.map +1 -1
- package/dist/components/message/MemoryRenderer.d.ts +1 -0
- package/dist/components/message/MemoryRenderer.d.ts.map +1 -1
- package/dist/components/message/MemoryRenderer.js +19 -17
- package/dist/components/message/MemoryRenderer.js.map +1 -1
- package/dist/components/message/MessageList.d.ts +1 -2
- package/dist/components/message/MessageList.d.ts.map +1 -1
- package/dist/components/message/MessageList.js +12 -11
- package/dist/components/message/MessageList.js.map +1 -1
- package/dist/components/message/ReadFileRenderer.d.ts.map +1 -1
- package/dist/components/message/ReadFileRenderer.js +5 -6
- package/dist/components/message/ReadFileRenderer.js.map +1 -1
- package/dist/components/message/SubagentActivityMessage.d.ts.map +1 -1
- package/dist/components/message/SubagentActivityMessage.js +17 -13
- package/dist/components/message/SubagentActivityMessage.js.map +1 -1
- package/dist/components/message/WebFetchRenderer.d.ts.map +1 -1
- package/dist/components/message/WebFetchRenderer.js +7 -11
- package/dist/components/message/WebFetchRenderer.js.map +1 -1
- package/dist/components/message/WebSearchRenderer.d.ts.map +1 -1
- package/dist/components/message/WebSearchRenderer.js +5 -10
- package/dist/components/message/WebSearchRenderer.js.map +1 -1
- package/dist/components/message/command-grouping.d.ts +29 -6
- package/dist/components/message/command-grouping.d.ts.map +1 -1
- package/dist/components/message/command-grouping.js +62 -20
- package/dist/components/message/command-grouping.js.map +1 -1
- package/dist/components/message/command-message-helpers.d.ts +5 -32
- package/dist/components/message/command-message-helpers.d.ts.map +1 -1
- package/dist/components/message/command-message-helpers.js +26 -8
- package/dist/components/message/command-message-helpers.js.map +1 -1
- package/dist/components/message/useCommandVisibility.d.ts.map +1 -1
- package/dist/components/message/useCommandVisibility.js +5 -4
- package/dist/components/message/useCommandVisibility.js.map +1 -1
- package/dist/components/prompt/ApprovalPrompt.d.ts.map +1 -1
- package/dist/components/prompt/ApprovalPrompt.js +190 -106
- package/dist/components/prompt/ApprovalPrompt.js.map +1 -1
- package/dist/components/prompt/HandoffConfirmationPrompt.d.ts.map +1 -1
- package/dist/components/prompt/HandoffConfirmationPrompt.js +3 -2
- package/dist/components/prompt/HandoffConfirmationPrompt.js.map +1 -1
- package/dist/components/prompt/InputSurgeConfirmationPrompt.d.ts.map +1 -1
- package/dist/components/prompt/InputSurgeConfirmationPrompt.js +5 -4
- package/dist/components/prompt/InputSurgeConfirmationPrompt.js.map +1 -1
- package/dist/components/prompt/LargeUncachedConfirmationPrompt.d.ts.map +1 -1
- package/dist/components/prompt/LargeUncachedConfirmationPrompt.js +4 -3
- package/dist/components/prompt/LargeUncachedConfirmationPrompt.js.map +1 -1
- package/dist/components/prompt/ModeSwitchConfirmationPrompt.d.ts.map +1 -1
- package/dist/components/prompt/ModeSwitchConfirmationPrompt.js +4 -3
- package/dist/components/prompt/ModeSwitchConfirmationPrompt.js.map +1 -1
- package/dist/components/prompt/QueuePausedPrompt.d.ts.map +1 -1
- package/dist/components/prompt/QueuePausedPrompt.js +6 -5
- package/dist/components/prompt/QueuePausedPrompt.js.map +1 -1
- package/dist/components/prompt/StandardModeConfirmationPrompt.d.ts.map +1 -1
- package/dist/components/prompt/StandardModeConfirmationPrompt.js +3 -2
- package/dist/components/prompt/StandardModeConfirmationPrompt.js.map +1 -1
- package/dist/components/theme.d.ts +58 -3
- package/dist/components/theme.d.ts.map +1 -1
- package/dist/components/theme.js +84 -17
- package/dist/components/theme.js.map +1 -1
- package/dist/contracts/application-stream.d.ts +14 -0
- package/dist/contracts/application-stream.d.ts.map +1 -1
- package/dist/gateway/assertion.d.ts +4 -1
- package/dist/gateway/assertion.d.ts.map +1 -1
- package/dist/gateway/assertion.js +24 -2
- package/dist/gateway/assertion.js.map +1 -1
- package/dist/gateway/contracts.d.ts +21 -4
- package/dist/gateway/contracts.d.ts.map +1 -1
- package/dist/gateway/contracts.js +11 -0
- package/dist/gateway/contracts.js.map +1 -1
- package/dist/gateway/dynamic-workspace-registry.d.ts +76 -0
- package/dist/gateway/dynamic-workspace-registry.d.ts.map +1 -0
- package/dist/gateway/dynamic-workspace-registry.js +403 -0
- package/dist/gateway/dynamic-workspace-registry.js.map +1 -0
- package/dist/gateway/gateway.d.ts +24 -1
- package/dist/gateway/gateway.d.ts.map +1 -1
- package/dist/gateway/gateway.js +704 -21
- package/dist/gateway/gateway.js.map +1 -1
- package/dist/gateway/launcher-seam.d.ts +18 -0
- package/dist/gateway/launcher-seam.d.ts.map +1 -0
- package/dist/gateway/launcher-seam.js +43 -0
- package/dist/gateway/launcher-seam.js.map +1 -0
- package/dist/gateway/pairing.d.ts +25 -0
- package/dist/gateway/pairing.d.ts.map +1 -0
- package/dist/gateway/pairing.js +107 -0
- package/dist/gateway/pairing.js.map +1 -0
- package/dist/gateway/persistence/coordinator.d.ts +2 -0
- package/dist/gateway/persistence/coordinator.d.ts.map +1 -1
- package/dist/gateway/persistence/coordinator.js +13 -0
- package/dist/gateway/persistence/coordinator.js.map +1 -1
- package/dist/gateway/runtime-factory.d.ts +15 -6
- package/dist/gateway/runtime-factory.d.ts.map +1 -1
- package/dist/gateway/runtime-factory.js +38 -9
- package/dist/gateway/runtime-factory.js.map +1 -1
- package/dist/gateway/safe-log.d.ts.map +1 -1
- package/dist/gateway/safe-log.js +19 -0
- package/dist/gateway/safe-log.js.map +1 -1
- package/dist/gateway/server-session.d.ts.map +1 -1
- package/dist/gateway/server-session.js +36 -4
- package/dist/gateway/server-session.js.map +1 -1
- package/dist/gateway/server.d.ts +26 -3
- package/dist/gateway/server.d.ts.map +1 -1
- package/dist/gateway/server.js +105 -17
- package/dist/gateway/server.js.map +1 -1
- package/dist/gateway/settings-rpc.d.ts +95 -0
- package/dist/gateway/settings-rpc.d.ts.map +1 -0
- package/dist/gateway/settings-rpc.js +227 -0
- package/dist/gateway/settings-rpc.js.map +1 -0
- package/dist/gateway/trusted-clients.d.ts +27 -0
- package/dist/gateway/trusted-clients.d.ts.map +1 -0
- package/dist/gateway/trusted-clients.js +157 -0
- package/dist/gateway/trusted-clients.js.map +1 -0
- package/dist/gateway/worker-boundary.d.ts +6 -5
- package/dist/gateway/worker-boundary.d.ts.map +1 -1
- package/dist/gateway/worker-boundary.js +20 -10
- package/dist/gateway/worker-boundary.js.map +1 -1
- package/dist/gateway/workspace-admission.d.ts +11 -0
- package/dist/gateway/workspace-admission.d.ts.map +1 -1
- package/dist/gateway/workspace-admission.js +89 -16
- package/dist/gateway/workspace-admission.js.map +1 -1
- package/dist/gateway/workspace-boundary-probe.d.ts +18 -0
- package/dist/gateway/workspace-boundary-probe.d.ts.map +1 -0
- package/dist/gateway/workspace-boundary-probe.js +37 -0
- package/dist/gateway/workspace-boundary-probe.js.map +1 -0
- package/dist/hooks/conversation-ui-reducer.d.ts +6 -0
- package/dist/hooks/conversation-ui-reducer.d.ts.map +1 -1
- package/dist/hooks/conversation-ui-reducer.js +9 -1
- package/dist/hooks/conversation-ui-reducer.js.map +1 -1
- package/dist/hooks/settings-completion-config.d.ts.map +1 -1
- package/dist/hooks/settings-completion-config.js +11 -3
- package/dist/hooks/settings-completion-config.js.map +1 -1
- package/dist/hooks/use-app-commands.d.ts +6 -1
- package/dist/hooks/use-app-commands.d.ts.map +1 -1
- package/dist/hooks/use-app-commands.js +22 -13
- package/dist/hooks/use-app-commands.js.map +1 -1
- package/dist/hooks/use-app-keyboard-shortcuts.d.ts +1 -3
- package/dist/hooks/use-app-keyboard-shortcuts.d.ts.map +1 -1
- package/dist/hooks/use-app-keyboard-shortcuts.js +11 -9
- package/dist/hooks/use-app-keyboard-shortcuts.js.map +1 -1
- package/dist/hooks/use-conversation.d.ts +8 -0
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +27 -18
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/hooks/use-opencode-go-usage.d.ts +8 -0
- package/dist/hooks/use-opencode-go-usage.d.ts.map +1 -0
- package/dist/hooks/use-opencode-go-usage.js +45 -0
- package/dist/hooks/use-opencode-go-usage.js.map +1 -0
- package/dist/hooks/use-shell-mode.d.ts +3 -4
- package/dist/hooks/use-shell-mode.d.ts.map +1 -1
- package/dist/hooks/use-shell-mode.js +14 -12
- package/dist/hooks/use-shell-mode.js.map +1 -1
- package/dist/hooks/use-terminal-columns.d.ts +15 -0
- package/dist/hooks/use-terminal-columns.d.ts.map +1 -0
- package/dist/hooks/use-terminal-columns.js +45 -0
- package/dist/hooks/use-terminal-columns.js.map +1 -0
- package/dist/lib/agent-client.d.ts +2 -0
- package/dist/lib/agent-client.d.ts.map +1 -1
- package/dist/lib/agent-client.js +1 -0
- package/dist/lib/agent-client.js.map +1 -1
- package/dist/lib/agent-configuration.d.ts +3 -0
- package/dist/lib/agent-configuration.d.ts.map +1 -1
- package/dist/lib/agent-configuration.js +4 -0
- package/dist/lib/agent-configuration.js.map +1 -1
- package/dist/lib/agent-factory.d.ts +3 -0
- package/dist/lib/agent-factory.d.ts.map +1 -1
- package/dist/lib/agent-factory.js +9 -2
- package/dist/lib/agent-factory.js.map +1 -1
- package/dist/lib/harness-input-idle.d.ts.map +1 -1
- package/dist/lib/harness-input-idle.js +1 -1
- package/dist/lib/harness-input-idle.js.map +1 -1
- package/dist/non-interactive.d.ts.map +1 -1
- package/dist/non-interactive.js +9 -2
- package/dist/non-interactive.js.map +1 -1
- package/dist/prompts/approval-model.md +22 -0
- package/dist/prompts/gpt-5.6.md +3 -2
- package/dist/prompts/mentor-mode-stub.md +3 -0
- package/dist/prompts/orchestrator-mode-stub.md +3 -0
- package/dist/prompts/prefix-quality.test.ts +10 -0
- package/dist/prompts/prompt-constructor.d.ts +2 -0
- package/dist/prompts/prompt-constructor.d.ts.map +1 -1
- package/dist/prompts/prompt-constructor.js +23 -13
- package/dist/prompts/prompt-constructor.js.map +1 -1
- package/dist/prompts/prompt-constructor.test.ts +39 -5
- package/dist/prompts/prompt-constructor.ts +27 -15
- package/dist/prompts/prompt-profiles.d.ts +1 -3
- package/dist/prompts/prompt-profiles.d.ts.map +1 -1
- package/dist/prompts/prompt-profiles.js +2 -7
- package/dist/prompts/prompt-profiles.js.map +1 -1
- package/dist/prompts/prompt-profiles.ts +3 -16
- package/dist/prompts/session-browser.md +3 -0
- package/dist/prompts/subagent-delegation.d.ts +3 -2
- package/dist/prompts/subagent-delegation.d.ts.map +1 -1
- package/dist/prompts/subagent-delegation.js +9 -13
- package/dist/prompts/subagent-delegation.js.map +1 -1
- package/dist/prompts/subagent-delegation.ts +9 -13
- package/dist/providers/chained-wire-state.d.ts +7 -2
- package/dist/providers/chained-wire-state.d.ts.map +1 -1
- package/dist/providers/chained-wire-state.js +16 -7
- package/dist/providers/chained-wire-state.js.map +1 -1
- package/dist/providers/codex-auth.d.ts +2 -5
- package/dist/providers/codex-auth.d.ts.map +1 -1
- package/dist/providers/codex-auth.js +2 -0
- package/dist/providers/codex-auth.js.map +1 -1
- package/dist/providers/codex-responses-model.d.ts.map +1 -1
- package/dist/providers/codex-responses-model.js +22 -3
- package/dist/providers/codex-responses-model.js.map +1 -1
- package/dist/providers/grok-auth.d.ts +2 -5
- package/dist/providers/grok-auth.d.ts.map +1 -1
- package/dist/providers/grok-auth.js +2 -0
- package/dist/providers/grok-auth.js.map +1 -1
- package/dist/providers/oauth-account-store.d.ts +5 -0
- package/dist/providers/oauth-account-store.d.ts.map +1 -1
- package/dist/providers/oauth-account-store.js +56 -5
- package/dist/providers/oauth-account-store.js.map +1 -1
- package/dist/providers/oauth-pkce.d.ts +8 -0
- package/dist/providers/oauth-pkce.d.ts.map +1 -1
- package/dist/providers/oauth-pkce.js +91 -19
- package/dist/providers/oauth-pkce.js.map +1 -1
- package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
- package/dist/providers/openai-compatible.provider.js +8 -1
- package/dist/providers/openai-compatible.provider.js.map +1 -1
- package/dist/providers/opencode-go-usage.d.ts +24 -0
- package/dist/providers/opencode-go-usage.d.ts.map +1 -0
- package/dist/providers/opencode-go-usage.js +37 -0
- package/dist/providers/opencode-go-usage.js.map +1 -0
- package/dist/providers/openrouter.provider.d.ts.map +1 -1
- package/dist/providers/openrouter.provider.js +8 -1
- package/dist/providers/openrouter.provider.js.map +1 -1
- package/dist/providers/responses-websocket-sessions.d.ts +1 -0
- package/dist/providers/responses-websocket-sessions.d.ts.map +1 -1
- package/dist/providers/responses-websocket-sessions.js +16 -2
- package/dist/providers/responses-websocket-sessions.js.map +1 -1
- package/dist/providers/retrying-model.d.ts.map +1 -1
- package/dist/providers/retrying-model.js +31 -3
- package/dist/providers/retrying-model.js.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.d.ts +5 -1
- package/dist/services/agent-runtime/application-run-loop.d.ts.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.js +229 -149
- package/dist/services/agent-runtime/application-run-loop.js.map +1 -1
- package/dist/services/agent-runtime/generation-guard.d.ts +39 -25
- package/dist/services/agent-runtime/generation-guard.d.ts.map +1 -1
- package/dist/services/agent-runtime/generation-guard.js +98 -100
- package/dist/services/agent-runtime/generation-guard.js.map +1 -1
- package/dist/services/agent-runtime/run-budget.d.ts +1 -1
- package/dist/services/agent-runtime/run-budget.d.ts.map +1 -1
- package/dist/services/agent-runtime/run-budget.js +4 -0
- package/dist/services/agent-runtime/run-budget.js.map +1 -1
- package/dist/services/agent-stream.d.ts.map +1 -1
- package/dist/services/agent-stream.js +1 -0
- package/dist/services/agent-stream.js.map +1 -1
- package/dist/services/conversation/conversation-adapter.d.ts +13 -2
- package/dist/services/conversation/conversation-adapter.d.ts.map +1 -1
- package/dist/services/conversation/conversation-adapter.js +35 -7
- package/dist/services/conversation/conversation-adapter.js.map +1 -1
- package/dist/services/conversation/conversation-admission-workflow.d.ts +3 -2
- package/dist/services/conversation/conversation-admission-workflow.d.ts.map +1 -1
- package/dist/services/conversation/conversation-admission-workflow.js +6 -1
- package/dist/services/conversation/conversation-admission-workflow.js.map +1 -1
- package/dist/services/conversation/conversation-events.d.ts +43 -2
- package/dist/services/conversation/conversation-events.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.d.ts +14 -1
- package/dist/services/conversation/conversation-orchestrator.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.js +142 -11
- package/dist/services/conversation/conversation-orchestrator.js.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.types.d.ts +3 -1
- package/dist/services/conversation/conversation-orchestrator.types.d.ts.map +1 -1
- package/dist/services/conversation/conversation-persistence.d.ts +22 -1
- package/dist/services/conversation/conversation-persistence.d.ts.map +1 -1
- package/dist/services/conversation/conversation-persistence.js +61 -0
- package/dist/services/conversation/conversation-persistence.js.map +1 -1
- package/dist/services/conversation/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation/conversation-service.js +45 -29
- package/dist/services/conversation/conversation-service.js.map +1 -1
- package/dist/services/conversation/session-audit.d.ts +70 -0
- package/dist/services/conversation/session-audit.d.ts.map +1 -0
- package/dist/services/conversation/session-audit.js +164 -0
- package/dist/services/conversation/session-audit.js.map +1 -0
- package/dist/services/conversation/session-browser.d.ts +46 -0
- package/dist/services/conversation/session-browser.d.ts.map +1 -0
- package/dist/services/conversation/session-browser.js +380 -0
- package/dist/services/conversation/session-browser.js.map +1 -0
- package/dist/services/input-surge-approval.d.ts +21 -0
- package/dist/services/input-surge-approval.d.ts.map +1 -0
- package/dist/services/input-surge-approval.js +42 -0
- package/dist/services/input-surge-approval.js.map +1 -0
- package/dist/services/large-uncached-input-guard.js +4 -4
- package/dist/services/large-uncached-input-guard.js.map +1 -1
- package/dist/services/logging/assistant-turn-journal.d.ts +15 -0
- package/dist/services/logging/assistant-turn-journal.d.ts.map +1 -1
- package/dist/services/logging/assistant-turn-journal.js +27 -0
- package/dist/services/logging/assistant-turn-journal.js.map +1 -1
- package/dist/services/memory/memory-capabilities.js +2 -2
- package/dist/services/memory/memory-search.d.ts +16 -0
- package/dist/services/memory/memory-search.d.ts.map +1 -0
- package/dist/services/memory/memory-search.js +55 -0
- package/dist/services/memory/memory-search.js.map +1 -0
- package/dist/services/memory/memory-store.d.ts +12 -0
- package/dist/services/memory/memory-store.d.ts.map +1 -1
- package/dist/services/memory/memory-store.js +14 -35
- package/dist/services/memory/memory-store.js.map +1 -1
- package/dist/services/mode-notices.d.ts +11 -0
- package/dist/services/mode-notices.d.ts.map +1 -1
- package/dist/services/mode-notices.js +37 -3
- package/dist/services/mode-notices.js.map +1 -1
- package/dist/services/queue/queue-controller.d.ts +13 -0
- package/dist/services/queue/queue-controller.d.ts.map +1 -1
- package/dist/services/queue/queue-controller.js +32 -1
- package/dist/services/queue/queue-controller.js.map +1 -1
- package/dist/services/retry/in-loop-model-retry.d.ts +12 -0
- package/dist/services/retry/in-loop-model-retry.d.ts.map +1 -0
- package/dist/services/retry/in-loop-model-retry.js +115 -0
- package/dist/services/retry/in-loop-model-retry.js.map +1 -0
- package/dist/services/retry/retry-classifier.d.ts.map +1 -1
- package/dist/services/retry/retry-classifier.js +18 -12
- package/dist/services/retry/retry-classifier.js.map +1 -1
- package/dist/services/retry/retry-error-classification.d.ts.map +1 -1
- package/dist/services/retry/retry-error-classification.js +10 -6
- package/dist/services/retry/retry-error-classification.js.map +1 -1
- package/dist/services/retry/upstream-retry-policy.d.ts.map +1 -1
- package/dist/services/retry/upstream-retry-policy.js +40 -7
- package/dist/services/retry/upstream-retry-policy.js.map +1 -1
- package/dist/services/runtime-setting-router.d.ts.map +1 -1
- package/dist/services/runtime-setting-router.js +7 -2
- package/dist/services/runtime-setting-router.js.map +1 -1
- package/dist/services/session/background-check-in-scheduler.d.ts +44 -0
- package/dist/services/session/background-check-in-scheduler.d.ts.map +1 -0
- package/dist/services/session/background-check-in-scheduler.js +88 -0
- package/dist/services/session/background-check-in-scheduler.js.map +1 -0
- package/dist/services/session/background-task-control.js +4 -1
- package/dist/services/session/background-task-control.js.map +1 -1
- package/dist/services/session/initial-input-preparer.d.ts +2 -1
- package/dist/services/session/initial-input-preparer.d.ts.map +1 -1
- package/dist/services/session/initial-input-preparer.js +3 -1
- package/dist/services/session/initial-input-preparer.js.map +1 -1
- package/dist/services/session/repetition-detector.d.ts +0 -4
- package/dist/services/session/repetition-detector.d.ts.map +1 -1
- package/dist/services/session/repetition-detector.js +0 -7
- package/dist/services/session/repetition-detector.js.map +1 -1
- package/dist/services/session/session-composition.d.ts +6 -2
- package/dist/services/session/session-composition.d.ts.map +1 -1
- package/dist/services/session/session-composition.js +99 -29
- package/dist/services/session/session-composition.js.map +1 -1
- package/dist/services/session/session-lifecycle.d.ts +8 -0
- package/dist/services/session/session-lifecycle.d.ts.map +1 -1
- package/dist/services/session/session-lifecycle.js +4 -0
- package/dist/services/session/session-lifecycle.js.map +1 -1
- package/dist/services/session/session-stream-processor.d.ts.map +1 -1
- package/dist/services/session/session-stream-processor.js +5 -15
- package/dist/services/session/session-stream-processor.js.map +1 -1
- package/dist/services/session/turn-attempt-factory.d.ts +2 -1
- package/dist/services/session/turn-attempt-factory.d.ts.map +1 -1
- package/dist/services/session/turn-attempt-factory.js +1 -0
- package/dist/services/session/turn-attempt-factory.js.map +1 -1
- package/dist/services/session/turn-attempt.d.ts +3 -0
- package/dist/services/session/turn-attempt.d.ts.map +1 -1
- package/dist/services/session/turn-attempt.js +5 -0
- package/dist/services/session/turn-attempt.js.map +1 -1
- package/dist/services/session/turn-coordinator.d.ts +1 -1
- package/dist/services/session/turn-coordinator.d.ts.map +1 -1
- package/dist/services/session/turn-workflow.d.ts.map +1 -1
- package/dist/services/session/turn-workflow.js +4 -1
- package/dist/services/session/turn-workflow.js.map +1 -1
- package/dist/services/settings/settings-schema.d.ts +27 -3
- package/dist/services/settings/settings-schema.d.ts.map +1 -1
- package/dist/services/settings/settings-schema.js +35 -11
- package/dist/services/settings/settings-schema.js.map +1 -1
- package/dist/services/settings/settings-service.d.ts +9 -0
- package/dist/services/settings/settings-service.d.ts.map +1 -1
- package/dist/services/settings/settings-service.js +40 -0
- package/dist/services/settings/settings-service.js.map +1 -1
- package/dist/services/settings/settings-sources.d.ts.map +1 -1
- package/dist/services/settings/settings-sources.js +5 -0
- package/dist/services/settings/settings-sources.js.map +1 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.d.ts +2 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.d.ts.map +1 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.js +6 -0
- package/dist/services/settings/test-helpers/settings-consumer-inventory.js.map +1 -1
- package/dist/services/shell/shell-interaction-session.d.ts +4 -5
- package/dist/services/shell/shell-interaction-session.d.ts.map +1 -1
- package/dist/services/shell/shell-interaction-session.js +8 -20
- package/dist/services/shell/shell-interaction-session.js.map +1 -1
- package/dist/services/stream-event-processor.d.ts.map +1 -1
- package/dist/services/stream-event-processor.js +15 -0
- package/dist/services/stream-event-processor.js.map +1 -1
- package/dist/services/subagents/mentor-runner.d.ts.map +1 -1
- package/dist/services/subagents/mentor-runner.js +2 -0
- package/dist/services/subagents/mentor-runner.js.map +1 -1
- package/dist/services/subagents/nested-runner.d.ts.map +1 -1
- package/dist/services/subagents/nested-runner.js +34 -1
- package/dist/services/subagents/nested-runner.js.map +1 -1
- package/dist/services/subagents/subagent-async-registry.js +1 -1
- package/dist/services/subagents/subagent-async-registry.js.map +1 -1
- package/dist/services/subagents/subagent-notification-store.d.ts +28 -1
- package/dist/services/subagents/subagent-notification-store.d.ts.map +1 -1
- package/dist/services/subagents/subagent-notification-store.js +11 -0
- package/dist/services/subagents/subagent-notification-store.js.map +1 -1
- package/dist/services/subagents/tool-policy.d.ts.map +1 -1
- package/dist/services/subagents/tool-policy.js +10 -5
- package/dist/services/subagents/tool-policy.js.map +1 -1
- package/dist/services/subagents/utils.d.ts +2 -0
- package/dist/services/subagents/utils.d.ts.map +1 -1
- package/dist/services/subagents/utils.js +29 -0
- package/dist/services/subagents/utils.js.map +1 -1
- package/dist/services/tool-execution-ledger.d.ts.map +1 -1
- package/dist/services/tool-execution-ledger.js +5 -1
- package/dist/services/tool-execution-ledger.js.map +1 -1
- package/dist/tools/agent/ask-user.d.ts.map +1 -1
- package/dist/tools/agent/ask-user.js +2 -0
- package/dist/tools/agent/ask-user.js.map +1 -1
- package/dist/tools/agent/run-subagent.d.ts.map +1 -1
- package/dist/tools/agent/run-subagent.js +40 -24
- package/dist/tools/agent/run-subagent.js.map +1 -1
- package/dist/tools/memory/memory-tools.d.ts.map +1 -1
- package/dist/tools/memory/memory-tools.js +322 -59
- package/dist/tools/memory/memory-tools.js.map +1 -1
- package/dist/tools/session-browser/session-browser-tools.d.ts +4 -0
- package/dist/tools/session-browser/session-browser-tools.d.ts.map +1 -0
- package/dist/tools/session-browser/session-browser-tools.js +47 -0
- package/dist/tools/session-browser/session-browser-tools.js.map +1 -0
- package/dist/tools/system/shell.d.ts.map +1 -1
- package/dist/tools/system/shell.js +7 -0
- package/dist/tools/system/shell.js.map +1 -1
- package/dist/tools/types.d.ts +4 -0
- package/dist/tools/types.d.ts.map +1 -1
- package/dist/tools/types.js.map +1 -1
- package/dist/utils/busy-turn-guard.d.ts +17 -0
- package/dist/utils/busy-turn-guard.d.ts.map +1 -0
- package/dist/utils/busy-turn-guard.js +24 -0
- package/dist/utils/busy-turn-guard.js.map +1 -0
- package/dist/utils/conversation/conversation-event-handler.d.ts.map +1 -1
- package/dist/utils/conversation/conversation-event-handler.js +28 -7
- package/dist/utils/conversation/conversation-event-handler.js.map +1 -1
- package/dist/utils/output/bounded-json.d.ts +33 -0
- package/dist/utils/output/bounded-json.d.ts.map +1 -0
- package/dist/utils/output/bounded-json.js +59 -0
- package/dist/utils/output/bounded-json.js.map +1 -0
- package/dist/utils/output/output-trim.d.ts.map +1 -1
- package/dist/utils/output/output-trim.js +7 -7
- package/dist/utils/output/output-trim.js.map +1 -1
- package/dist/utils/output/text-snippet.d.ts +6 -0
- package/dist/utils/output/text-snippet.d.ts.map +1 -0
- package/dist/utils/output/text-snippet.js +106 -0
- package/dist/utils/output/text-snippet.js.map +1 -0
- package/dist/utils/resume-list.d.ts +3 -1
- package/dist/utils/resume-list.d.ts.map +1 -1
- package/dist/utils/resume-list.js +3 -2
- package/dist/utils/resume-list.js.map +1 -1
- package/dist/utils/settings-command.d.ts.map +1 -1
- package/dist/utils/settings-command.js +15 -0
- package/dist/utils/settings-command.js.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-policy.d.ts +2 -0
- package/dist/utils/shell/sandbox/sandbox-policy.d.ts.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-policy.js.map +1 -1
- package/dist/utils/shell/sandbox/shell-sandbox-runner.d.ts +1 -0
- package/dist/utils/shell/sandbox/shell-sandbox-runner.d.ts.map +1 -1
- package/dist/utils/shell/sandbox/shell-sandbox-runner.js +20 -1
- package/dist/utils/shell/sandbox/shell-sandbox-runner.js.map +1 -1
- package/dist/utils/value-suggestions.d.ts.map +1 -1
- package/dist/utils/value-suggestions.js +1 -0
- package/dist/utils/value-suggestions.js.map +1 -1
- package/package.json +4 -2
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import crypto from 'node:crypto';
|
|
2
2
|
import http from 'node:http';
|
|
3
|
+
import readline from 'node:readline';
|
|
3
4
|
import { spawn } from 'node:child_process';
|
|
4
5
|
function base64url(buf) {
|
|
5
6
|
return buf.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
|
|
@@ -8,7 +9,13 @@ export function openInBrowser(url) {
|
|
|
8
9
|
const command = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'cmd' : 'xdg-open';
|
|
9
10
|
const args = process.platform === 'win32' ? ['/c', 'start', '', url] : [url];
|
|
10
11
|
try {
|
|
11
|
-
spawn(command, args, { stdio: 'ignore', detached: true })
|
|
12
|
+
const child = spawn(command, args, { stdio: 'ignore', detached: true });
|
|
13
|
+
child.on('error', () => {
|
|
14
|
+
// Ignored: opening a browser in a headless/server/minimal environment or when
|
|
15
|
+
// the browser launcher is missing (e.g. xdg-open ENOENT) is non-fatal.
|
|
16
|
+
// The caller always prints the URL, so the user can complete login manually.
|
|
17
|
+
});
|
|
18
|
+
child.unref();
|
|
12
19
|
}
|
|
13
20
|
catch {
|
|
14
21
|
// The caller always prints the URL, so a failed launcher is not fatal.
|
|
@@ -61,12 +68,63 @@ function bindLoopbackListener(config) {
|
|
|
61
68
|
attempt(0);
|
|
62
69
|
});
|
|
63
70
|
}
|
|
64
|
-
function
|
|
71
|
+
function stripWrappingQuotes(value) {
|
|
72
|
+
const trimmed = value.trim();
|
|
73
|
+
if ((trimmed.startsWith('"') && trimmed.endsWith('"')) || (trimmed.startsWith("'") && trimmed.endsWith("'"))) {
|
|
74
|
+
return trimmed.slice(1, -1).trim();
|
|
75
|
+
}
|
|
76
|
+
return trimmed;
|
|
77
|
+
}
|
|
78
|
+
function isLoopbackHostname(hostname) {
|
|
79
|
+
const host = hostname.replace(/^\[|\]$/g, '').toLowerCase();
|
|
80
|
+
return host === 'localhost' || host === '127.0.0.1' || host === '::1';
|
|
81
|
+
}
|
|
82
|
+
function exampleCallbackUrl(config) {
|
|
83
|
+
return `http://localhost:${config.redirectPorts[0]}${config.callbackPath}?code=...`;
|
|
84
|
+
}
|
|
85
|
+
function interpretCallbackParams(config, expectedState, error, code, state) {
|
|
86
|
+
if (error)
|
|
87
|
+
return new Error(`${config.label} login was rejected: ${error}`);
|
|
88
|
+
if (state !== expectedState) {
|
|
89
|
+
// A mismatched state means this callback did not come from the
|
|
90
|
+
// authorization request we started; the code may be an attacker's.
|
|
91
|
+
return new Error(`${config.label} login failed: OAuth state mismatch`);
|
|
92
|
+
}
|
|
93
|
+
if (!code)
|
|
94
|
+
return new Error(`${config.label} login failed: no authorization code in callback`);
|
|
95
|
+
return code;
|
|
96
|
+
}
|
|
97
|
+
function interpretPastedOAuthRedirect(line, config, expectedState) {
|
|
98
|
+
const raw = stripWrappingQuotes(line);
|
|
99
|
+
if (!raw)
|
|
100
|
+
return { kind: 'ignore', message: '' };
|
|
101
|
+
let url;
|
|
102
|
+
try {
|
|
103
|
+
url = new URL(raw);
|
|
104
|
+
}
|
|
105
|
+
catch {
|
|
106
|
+
return {
|
|
107
|
+
kind: 'ignore',
|
|
108
|
+
message: `That is not a URL. Paste the redirected localhost address (${exampleCallbackUrl(config)}).`,
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
if (!isLoopbackHostname(url.hostname) || url.pathname !== config.callbackPath) {
|
|
112
|
+
return {
|
|
113
|
+
kind: 'ignore',
|
|
114
|
+
message: `Paste the redirected localhost URL from the address bar (${exampleCallbackUrl(config)}).`,
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
const result = interpretCallbackParams(config, expectedState, url.searchParams.get('error'), url.searchParams.get('code'), url.searchParams.get('state'));
|
|
118
|
+
return result instanceof Error ? { kind: 'fail', error: result } : { kind: 'code', code: result };
|
|
119
|
+
}
|
|
120
|
+
function awaitCallback(config, server, redirectUri, expectedState, options = {}) {
|
|
65
121
|
return new Promise((resolve, reject) => {
|
|
66
122
|
let settled = false;
|
|
123
|
+
let paste;
|
|
67
124
|
const cleanup = () => {
|
|
68
|
-
signal?.removeEventListener('abort', onAbort);
|
|
125
|
+
options.signal?.removeEventListener('abort', onAbort);
|
|
69
126
|
server.off('error', onError);
|
|
127
|
+
paste?.close();
|
|
70
128
|
};
|
|
71
129
|
const doResolve = (value) => {
|
|
72
130
|
cleanup();
|
|
@@ -76,7 +134,7 @@ function awaitCallback(config, server, redirectUri, expectedState, signal) {
|
|
|
76
134
|
cleanup();
|
|
77
135
|
reject(err);
|
|
78
136
|
};
|
|
79
|
-
if (signal?.aborted) {
|
|
137
|
+
if (options.signal?.aborted) {
|
|
80
138
|
doReject(new Error(`${config.label} login cancelled`));
|
|
81
139
|
return;
|
|
82
140
|
}
|
|
@@ -86,7 +144,7 @@ function awaitCallback(config, server, redirectUri, expectedState, signal) {
|
|
|
86
144
|
server.closeAllConnections?.();
|
|
87
145
|
doReject(new Error(`${config.label} login cancelled`));
|
|
88
146
|
};
|
|
89
|
-
signal?.addEventListener('abort', onAbort, { once: true });
|
|
147
|
+
options.signal?.addEventListener('abort', onAbort, { once: true });
|
|
90
148
|
// The callback is single-use. A retried or duplicated request after the
|
|
91
149
|
// socket has been torn down must not run the handler a second time.
|
|
92
150
|
server.on('request', (req, res) => {
|
|
@@ -100,18 +158,8 @@ function awaitCallback(config, server, redirectUri, expectedState, signal) {
|
|
|
100
158
|
return;
|
|
101
159
|
}
|
|
102
160
|
settled = true;
|
|
103
|
-
const
|
|
104
|
-
const
|
|
105
|
-
const state = requestUrl.searchParams.get('state');
|
|
106
|
-
const failure = error
|
|
107
|
-
? new Error(`${config.label} login was rejected: ${error}`)
|
|
108
|
-
: state !== expectedState
|
|
109
|
-
? // A mismatched state means this callback did not come from the
|
|
110
|
-
// authorization request we started; the code may be an attacker's.
|
|
111
|
-
new Error(`${config.label} login failed: OAuth state mismatch`)
|
|
112
|
-
: !received
|
|
113
|
-
? new Error(`${config.label} login failed: no authorization code in callback`)
|
|
114
|
-
: null;
|
|
161
|
+
const result = interpretCallbackParams(config, expectedState, requestUrl.searchParams.get('error'), requestUrl.searchParams.get('code'), requestUrl.searchParams.get('state'));
|
|
162
|
+
const failure = result instanceof Error ? result : null;
|
|
115
163
|
res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8', Connection: 'close' });
|
|
116
164
|
res.end(failure ? `${failure.message}\nYou can close this tab.` : 'Login complete. You can close this tab.');
|
|
117
165
|
// Free the callback port immediately: a keep-alive browser socket would
|
|
@@ -121,8 +169,28 @@ function awaitCallback(config, server, redirectUri, expectedState, signal) {
|
|
|
121
169
|
if (failure)
|
|
122
170
|
doReject(failure);
|
|
123
171
|
else
|
|
124
|
-
doResolve(
|
|
172
|
+
doResolve(result);
|
|
125
173
|
});
|
|
174
|
+
if (options.pasteInput) {
|
|
175
|
+
paste = readline.createInterface({ input: options.pasteInput, crlfDelay: Infinity });
|
|
176
|
+
paste.on('line', (line) => {
|
|
177
|
+
if (settled)
|
|
178
|
+
return;
|
|
179
|
+
const interpreted = interpretPastedOAuthRedirect(line, config, expectedState);
|
|
180
|
+
if (interpreted.kind === 'ignore') {
|
|
181
|
+
if (interpreted.message)
|
|
182
|
+
options.onPasteRejected?.(interpreted.message);
|
|
183
|
+
return;
|
|
184
|
+
}
|
|
185
|
+
settled = true;
|
|
186
|
+
server.close();
|
|
187
|
+
server.closeAllConnections?.();
|
|
188
|
+
if (interpreted.kind === 'fail')
|
|
189
|
+
doReject(interpreted.error);
|
|
190
|
+
else
|
|
191
|
+
doResolve(interpreted.code);
|
|
192
|
+
});
|
|
193
|
+
}
|
|
126
194
|
const onError = (err) => {
|
|
127
195
|
doReject(err);
|
|
128
196
|
};
|
|
@@ -148,7 +216,11 @@ export async function runPkceLoopbackLogin(config, options = {}) {
|
|
|
148
216
|
const { server, port } = await bindLoopbackListener(config);
|
|
149
217
|
const redirectUri = config.redirectUriFor(port);
|
|
150
218
|
const authUrl = buildAuthorizeUrl(config, redirectUri, challenge, state).toString();
|
|
151
|
-
const callback = awaitCallback(config, server, redirectUri, state,
|
|
219
|
+
const callback = awaitCallback(config, server, redirectUri, state, {
|
|
220
|
+
signal: options.signal,
|
|
221
|
+
pasteInput: options.pasteInput,
|
|
222
|
+
onPasteRejected: options.onPasteRejected,
|
|
223
|
+
});
|
|
152
224
|
options.onPrompt?.(authUrl);
|
|
153
225
|
openBrowser(authUrl);
|
|
154
226
|
let code;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-pkce.js","sourceRoot":"","sources":["../../source/providers/oauth-pkce.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth-pkce.js","sourceRoot":"","sources":["../../source/providers/oauth-pkce.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible.provider.d.ts","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openai-compatible.provider.d.ts","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAEnH,OAAO,EAAE,KAAK,kBAAkB,EAAyC,MAAM,eAAe,CAAC;AAM/F,OAAO,KAAK,EAAE,iBAAiB,EAA4B,MAAM,qCAAqC,CAAC;AASvG,OAAO,EAAoC,KAAK,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAEtH,OAAO,EAGL,wBAAwB,EACzB,MAAM,mCAAmC,CAAC;AAU3C,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AASF,eAAO,MAAM,iBAAiB,WAAY,oBAAoB,KAAG,MACd,CAAC;AAcpD,MAAM,MAAM,yBAAyB,GAAG;IACtC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;IAC/C,eAAe,CAAC,EAAE,gBAAgB,CAAC;IACnC,8EAA8E;IAC9E,0BAA0B,CAAC,EAAE,0BAA0B,CAAC;CACzD,CAAC;AAwBF,OAAO,EAAE,wBAAwB,EAAE,CAAC;AA+BpC,qBAAa,+BAA+B;IAI9B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAwB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHhF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IACvD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6B;IAEhE,YAA6B,MAAM,EAAE,oBAAoB,EAAmB,IAAI,EAAE,yBAAyB,EAS1G;IAED,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,2BAA2B;IAuBnC,OAAO,CAAC,yBAAyB;IAkBjC,OAAO,CAAC,0BAA0B;IAoBlC,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAetD;IAED,OAAO,CAAC,iBAAiB;CAc1B;AAuBD,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,oBAAoB,EAAE,IAAI,EAAE,yBAAyB,GAAG,GAAG,CA8EpH;AAED,wBAAgB,wCAAwC,CAAC,MAAM,EAAE,oBAAoB,GAAG,kBAAkB,CAyFzG"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import OpenAI from 'openai';
|
|
2
|
+
import { RetryingModel } from './retrying-model.js';
|
|
2
3
|
import { NULL_SESSION_CONTEXT_SERVICE } from '../services/session/session-context-service.js';
|
|
3
4
|
import { AiSdkAnthropicProvider } from './ai-sdk-anthropic.provider.js';
|
|
4
5
|
import { AiSdkGoogleProvider } from './ai-sdk-google.provider.js';
|
|
@@ -275,7 +276,13 @@ export function createOpenAICompatibleProviderDefinition(config) {
|
|
|
275
276
|
if (!('getStreamedModel' in provider) || typeof provider.getStreamedModel !== 'function') {
|
|
276
277
|
throw new Error(`Custom provider '${providerId}' has no application-owned streamed model`);
|
|
277
278
|
}
|
|
278
|
-
|
|
279
|
+
const streamed = provider.getStreamedModel(model);
|
|
280
|
+
const attempts = deps.retryAttempts ?? deps.settingsService.get('agent.retryAttempts') ?? 2;
|
|
281
|
+
return new RetryingModel(streamed, {
|
|
282
|
+
retryAttempts: attempts,
|
|
283
|
+
loggingService: deps.loggingService,
|
|
284
|
+
onRetry: deps.onRetry,
|
|
285
|
+
});
|
|
279
286
|
},
|
|
280
287
|
fetchModels: async (deps, fetchImpl = fetch) => {
|
|
281
288
|
const resolved = findConfigFromSettings(deps.settingsService, providerId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible.provider.js","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openai-compatible.provider.js","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/** Usage meter for the OpenCode Go subscription. */
|
|
2
|
+
export declare const OPENCODE_GO_USAGE_URL = "https://opencode.ai/zen/go/v1/usage";
|
|
3
|
+
export interface OpenCodeGoUsageLimit {
|
|
4
|
+
readonly usagePercent: number;
|
|
5
|
+
readonly resetInSec: number;
|
|
6
|
+
}
|
|
7
|
+
export interface OpenCodeGoUsage {
|
|
8
|
+
readonly useBalance: boolean;
|
|
9
|
+
readonly rollingUsage: OpenCodeGoUsageLimit;
|
|
10
|
+
readonly weeklyUsage: OpenCodeGoUsageLimit;
|
|
11
|
+
readonly monthlyUsage: OpenCodeGoUsageLimit;
|
|
12
|
+
}
|
|
13
|
+
export declare const parseOpenCodeGoUsage: (body: unknown) => OpenCodeGoUsage | null;
|
|
14
|
+
export declare class OpenCodeGoUsageUnauthorizedError extends Error {
|
|
15
|
+
constructor();
|
|
16
|
+
}
|
|
17
|
+
export interface FetchOpenCodeGoUsageOptions {
|
|
18
|
+
readonly apiKey: string;
|
|
19
|
+
readonly fetchImpl?: typeof fetch;
|
|
20
|
+
readonly url?: string;
|
|
21
|
+
readonly signal?: AbortSignal;
|
|
22
|
+
}
|
|
23
|
+
export declare const fetchOpenCodeGoUsage: ({ apiKey, fetchImpl, url, signal, }: FetchOpenCodeGoUsageOptions) => Promise<OpenCodeGoUsage | null>;
|
|
24
|
+
//# sourceMappingURL=opencode-go-usage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencode-go-usage.d.ts","sourceRoot":"","sources":["../../source/providers/opencode-go-usage.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,eAAO,MAAM,qBAAqB,wCAAwC,CAAC;AAC3E,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AACD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC5C,QAAQ,CAAC,WAAW,EAAE,oBAAoB,CAAC;IAC3C,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;CAC7C;AAWD,eAAO,MAAM,oBAAoB,SAAU,OAAO,KAAG,eAAe,GAAG,IAOtE,CAAC;AACF,qBAAa,gCAAiC,SAAQ,KAAK;IACzD,cAGC;CACF;AACD,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IAClC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;CAC/B;AACD,eAAO,MAAM,oBAAoB,wCAK9B,2BAA2B,KAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAQ9D,CAAC"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/** Usage meter for the OpenCode Go subscription. */
|
|
2
|
+
export const OPENCODE_GO_USAGE_URL = 'https://opencode.ai/zen/go/v1/usage';
|
|
3
|
+
const asRecord = (value) => value && typeof value === 'object' && !Array.isArray(value) ? value : undefined;
|
|
4
|
+
const asNonNegativeNumber = (value) => typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : undefined;
|
|
5
|
+
const parseLimit = (value) => {
|
|
6
|
+
const record = asRecord(value);
|
|
7
|
+
const usagePercent = asNonNegativeNumber(record?.usagePercent);
|
|
8
|
+
const resetInSec = asNonNegativeNumber(record?.resetInSec);
|
|
9
|
+
return usagePercent !== undefined && resetInSec !== undefined ? { usagePercent, resetInSec } : undefined;
|
|
10
|
+
};
|
|
11
|
+
export const parseOpenCodeGoUsage = (body) => {
|
|
12
|
+
const record = asRecord(body);
|
|
13
|
+
const rollingUsage = parseLimit(record?.rollingUsage);
|
|
14
|
+
const weeklyUsage = parseLimit(record?.weeklyUsage);
|
|
15
|
+
const monthlyUsage = parseLimit(record?.monthlyUsage);
|
|
16
|
+
if (!rollingUsage || !weeklyUsage || !monthlyUsage)
|
|
17
|
+
return null;
|
|
18
|
+
return { useBalance: record?.useBalance === true, rollingUsage, weeklyUsage, monthlyUsage };
|
|
19
|
+
};
|
|
20
|
+
export class OpenCodeGoUsageUnauthorizedError extends Error {
|
|
21
|
+
constructor() {
|
|
22
|
+
super('OpenCode rejected the credentials for the Go usage endpoint.');
|
|
23
|
+
this.name = 'OpenCodeGoUsageUnauthorizedError';
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
export const fetchOpenCodeGoUsage = async ({ apiKey, fetchImpl = globalThis.fetch, url = OPENCODE_GO_USAGE_URL, signal, }) => {
|
|
27
|
+
const response = await fetchImpl(url, {
|
|
28
|
+
headers: { authorization: `Bearer ${apiKey}`, accept: 'application/json' },
|
|
29
|
+
...(signal ? { signal } : {}),
|
|
30
|
+
});
|
|
31
|
+
if (response.status === 401 || response.status === 403)
|
|
32
|
+
throw new OpenCodeGoUsageUnauthorizedError();
|
|
33
|
+
if (!response.ok)
|
|
34
|
+
throw new Error(`OpenCode Go usage request failed with HTTP ${response.status}.`);
|
|
35
|
+
return parseOpenCodeGoUsage(await response.json());
|
|
36
|
+
};
|
|
37
|
+
//# sourceMappingURL=opencode-go-usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencode-go-usage.js","sourceRoot":"","sources":["../../source/providers/opencode-go-usage.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,MAAM,CAAC,MAAM,qBAAqB,GAAG,qCAAqC,CAAC;AAW3E,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAuC,EAAE,CACvE,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,KAAiC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/G,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAAsB,EAAE,CACjE,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACxF,MAAM,UAAU,GAAG,CAAC,KAAc,EAAoC,EAAE;IACtE,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,MAAM,YAAY,GAAG,mBAAmB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC3D,OAAO,YAAY,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3G,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,IAAa,EAA0B,EAAE;IAC5E,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACtD,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACtD,IAAI,CAAC,YAAY,IAAI,CAAC,WAAW,IAAI,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAChE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AAC9F,CAAC,CAAC;AACF,MAAM,OAAO,gCAAiC,SAAQ,KAAK;IACzD;QACE,KAAK,CAAC,8DAA8D,CAAC,CAAC;QACtE,IAAI,CAAC,IAAI,GAAG,kCAAkC,CAAC;IACjD,CAAC;CACF;AAOD,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,EACzC,MAAM,EACN,SAAS,GAAG,UAAU,CAAC,KAAK,EAC5B,GAAG,GAAG,qBAAqB,EAC3B,MAAM,GACsB,EAAmC,EAAE;IACjE,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE;QACpC,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,MAAM,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE;QAC1E,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9B,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG;QAAE,MAAM,IAAI,gCAAgC,EAAE,CAAC;IACrG,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,8CAA8C,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IACpG,OAAO,oBAAoB,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openrouter.provider.d.ts","sourceRoot":"","sources":["../../source/providers/openrouter.provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openrouter.provider.d.ts","sourceRoot":"","sources":["../../source/providers/openrouter.provider.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAoD1D,eAAO,MAAM,iCAAiC,EAAE,eAc/C,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { RetryingModel } from './retrying-model.js';
|
|
1
2
|
import { registerProvider } from './registry.js';
|
|
2
3
|
import { AiSdkOpenRouterProvider } from './ai-sdk-openrouter.provider.js';
|
|
3
4
|
import { createProviderFetch } from './fetch/composer.js';
|
|
@@ -98,7 +99,13 @@ registerProvider({
|
|
|
98
99
|
const provider = createOpenRouterModel(deps, model);
|
|
99
100
|
if (!provider)
|
|
100
101
|
throw new Error('OpenRouter API key is not configured');
|
|
101
|
-
|
|
102
|
+
const streamedModel = provider.getStreamedModel(model);
|
|
103
|
+
const retryAttempts = deps.retryAttempts ?? deps.settingsService.get('agent.retryAttempts') ?? 2;
|
|
104
|
+
return new RetryingModel(streamedModel, {
|
|
105
|
+
retryAttempts,
|
|
106
|
+
loggingService: deps.loggingService,
|
|
107
|
+
onRetry: deps.onRetry,
|
|
108
|
+
});
|
|
102
109
|
},
|
|
103
110
|
fetchModels: fetchOpenRouterModels,
|
|
104
111
|
sensitiveSettingKeys: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openrouter.provider.js","sourceRoot":"","sources":["../../source/providers/openrouter.provider.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"openrouter.provider.js","sourceRoot":"","sources":["../../source/providers/openrouter.provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responses-websocket-sessions.d.ts","sourceRoot":"","sources":["../../source/providers/responses-websocket-sessions.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,IAAI,IAAI,CAAC;IACd,MAAM,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"responses-websocket-sessions.d.ts","sourceRoot":"","sources":["../../source/providers/responses-websocket-sessions.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,IAAI,IAAI,CAAC;IACd,MAAM,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjC,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAcF;;;;;GAKG;AACH,qBAAa,0BAA0B,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB;;IAGnF,OAAO,CAAC,QAAQ,CAAC,YAAY;IAAzC,YAA6B,YAAY,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,EAAI;IAEtF,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAsC3C;IAED,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,yBAAyB,GAAG,IAAI,CAgB3D;IAED,KAAK,IAAI,IAAI,CAOZ;CASF;AAED,wBAAgB,4BAA4B,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAGrF"}
|
|
@@ -2,6 +2,10 @@ const WEBSOCKET_CONNECTING = 0;
|
|
|
2
2
|
const WEBSOCKET_OPEN = 1;
|
|
3
3
|
const WEBSOCKET_CLOSING = 2;
|
|
4
4
|
const WEBSOCKET_CLOSED = 3;
|
|
5
|
+
// The Codex WebSocket endpoint force-closes connections at ~60 minutes. A
|
|
6
|
+
// retained idle socket must be retired before that lifetime expires, or the
|
|
7
|
+
// next turn is handed a socket the server is about to kill mid-flight.
|
|
8
|
+
const MAX_RETAINED_SOCKET_AGE_MS = 50 * 60 * 1000;
|
|
5
9
|
/**
|
|
6
10
|
* One Responses WebSocket per logical agent/session. A later acquire must not
|
|
7
11
|
* close a sibling that is still connecting or in flight — that is how parallel
|
|
@@ -23,6 +27,10 @@ export class ResponsesWebSocketSessions {
|
|
|
23
27
|
this.#closeSocket(slot.socket);
|
|
24
28
|
continue;
|
|
25
29
|
}
|
|
30
|
+
if (slot.inFlight === 0 && Date.now() - slot.openedAt >= MAX_RETAINED_SOCKET_AGE_MS) {
|
|
31
|
+
this.#closeSocket(slot.socket);
|
|
32
|
+
continue;
|
|
33
|
+
}
|
|
26
34
|
if (slot.inFlight === 0 && slot.fingerprint !== fingerprint) {
|
|
27
35
|
this.#closeSocket(slot.socket);
|
|
28
36
|
continue;
|
|
@@ -36,7 +44,12 @@ export class ResponsesWebSocketSessions {
|
|
|
36
44
|
return reusable.socket;
|
|
37
45
|
}
|
|
38
46
|
const socket = this.createSocket(headers);
|
|
39
|
-
|
|
47
|
+
// The SDK turns an unlistened socket error into a bare `Promise.reject`,
|
|
48
|
+
// which crashes the process when an idle retained socket is closed by
|
|
49
|
+
// the server (e.g. its 60-minute lifetime cap). Active streams attach
|
|
50
|
+
// their own listener and still receive the same emitted event.
|
|
51
|
+
socket.on?.('error', () => { });
|
|
52
|
+
retained.push({ socket, fingerprint, inFlight: 1, openedAt: Date.now() });
|
|
40
53
|
this.#slots.set(key, retained);
|
|
41
54
|
return socket;
|
|
42
55
|
}
|
|
@@ -47,7 +60,8 @@ export class ResponsesWebSocketSessions {
|
|
|
47
60
|
continue;
|
|
48
61
|
const slot = list[index];
|
|
49
62
|
slot.inFlight = Math.max(0, slot.inFlight - 1);
|
|
50
|
-
|
|
63
|
+
const withinLifetime = Date.now() - slot.openedAt < MAX_RETAINED_SOCKET_AGE_MS;
|
|
64
|
+
if (options.keepAlive && withinLifetime && isLive(socket) && slot.inFlight === 0) {
|
|
51
65
|
return;
|
|
52
66
|
}
|
|
53
67
|
this.#closeSocket(socket);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responses-websocket-sessions.js","sourceRoot":"","sources":["../../source/providers/responses-websocket-sessions.ts"],"names":[],"mappings":"AAAA,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAC/B,MAAM,cAAc,GAAG,CAAC,CAAC;AACzB,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,gBAAgB,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"responses-websocket-sessions.js","sourceRoot":"","sources":["../../source/providers/responses-websocket-sessions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retrying-model.d.ts","sourceRoot":"","sources":["../../source/providers/retrying-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACzB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAOzE,KAAK,oBAAoB,GAAG;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACxD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB,CAAC;
|
|
1
|
+
{"version":3,"file":"retrying-model.d.ts","sourceRoot":"","sources":["../../source/providers/retrying-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACzB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAOzE,KAAK,oBAAoB,GAAG;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACxD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB,CAAC;AAsCF,4EAA4E;AAC5E,qBAAa,aAAc,YAAW,iBAAiB;;IAIzC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAqB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAA/E,YAA6B,KAAK,EAAE,iBAAiB,EAAmB,OAAO,EAAE,oBAAoB,EAQpG;IAED,IAAI,YAAY,IAAI,iBAAiB,CAEpC;IAED,iFAAiF;IACjF,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAE5C;IAEM,MAAM,CAAC,OAAO,EAAE,wBAAwB,GAAG,aAAa,CAAC,sBAAsB,CAAC,CAiBtF;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3B;CAqCF"}
|
|
@@ -1,5 +1,33 @@
|
|
|
1
1
|
import { isNetworkProtocolError } from '../services/retry/retry-error-classification.js';
|
|
2
2
|
import { classifyUpstreamRetryableError, computeUpstreamRetryDelayMs, } from '../services/retry/upstream-retry-policy.js';
|
|
3
|
+
/** Watches a signal and rejects with an AbortError when it fires. */
|
|
4
|
+
function abortError() {
|
|
5
|
+
return Object.assign(new Error('The operation was aborted.'), { name: 'AbortError' });
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Resolves when `sleep` settles, or rejects with an AbortError the moment
|
|
9
|
+
* `signal` fires. Lets a user interrupt a turn even while it sits in retry
|
|
10
|
+
* backoff, instead of waiting out the remainder of the delay.
|
|
11
|
+
*/
|
|
12
|
+
async function sleepOrAbort(sleep, delayMs, signal) {
|
|
13
|
+
if (signal?.aborted)
|
|
14
|
+
throw abortError();
|
|
15
|
+
if (!signal) {
|
|
16
|
+
await sleep(delayMs);
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
await new Promise((resolve, reject) => {
|
|
20
|
+
const onAbort = () => reject(abortError());
|
|
21
|
+
signal.addEventListener('abort', onAbort, { once: true });
|
|
22
|
+
sleep(delayMs).then(() => {
|
|
23
|
+
signal.removeEventListener('abort', onAbort);
|
|
24
|
+
resolve();
|
|
25
|
+
}, (error) => {
|
|
26
|
+
signal.removeEventListener('abort', onAbort);
|
|
27
|
+
reject(error);
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
}
|
|
3
31
|
/** Decorates one application-owned streamed turn with pre-event retries. */
|
|
4
32
|
export class RetryingModel {
|
|
5
33
|
model;
|
|
@@ -38,7 +66,7 @@ export class RetryingModel {
|
|
|
38
66
|
this.#logExhaustion(error, attempt);
|
|
39
67
|
throw error;
|
|
40
68
|
}
|
|
41
|
-
await this.#backoff(error, attempt + 1);
|
|
69
|
+
await this.#backoff(request.signal, error, attempt + 1);
|
|
42
70
|
}
|
|
43
71
|
}
|
|
44
72
|
}
|
|
@@ -48,7 +76,7 @@ export class RetryingModel {
|
|
|
48
76
|
#canRetry(error, attempt) {
|
|
49
77
|
return attempt < this.options.retryAttempts && this.#isRetryable(error);
|
|
50
78
|
}
|
|
51
|
-
async #backoff(error, attemptNumber) {
|
|
79
|
+
async #backoff(signal, error, attemptNumber) {
|
|
52
80
|
const delayMs = computeUpstreamRetryDelayMs({
|
|
53
81
|
attemptIndex: attemptNumber - 1,
|
|
54
82
|
random: this.#random,
|
|
@@ -62,7 +90,7 @@ export class RetryingModel {
|
|
|
62
90
|
error: error instanceof Error ? error.message : String(error),
|
|
63
91
|
});
|
|
64
92
|
this.options.onRetry?.();
|
|
65
|
-
await this.#sleep
|
|
93
|
+
await sleepOrAbort(this.#sleep, delayMs, signal);
|
|
66
94
|
}
|
|
67
95
|
#logExhaustion(error, attempt) {
|
|
68
96
|
if (!this.#isRetryable(error))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retrying-model.js","sourceRoot":"","sources":["../../source/providers/retrying-model.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AACzF,OAAO,EACL,8BAA8B,EAC9B,2BAA2B,GAC5B,MAAM,4CAA4C,CAAC;AAUpD,4EAA4E;AAC5E,MAAM,OAAO,aAAa;IAIK,KAAK;IAAsC,OAAO;IAHtE,MAAM,CAAqC;IAC3C,OAAO,CAAe;IAE/B,YAA6B,KAAwB,EAAmB,OAA6B;qBAAxE,KAAK;uBAAsC,OAAO;QAC7E,IAAI,CAAC,MAAM;YACT,OAAO,CAAC,KAAK;gBACb,CAAC,CAAC,OAAO,EAAE,EAAE,CACX,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;oBAC5B,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC/B,CAAC,CAAC,CAAC,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;IAC/C,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,iFAAiF;IACjF,gBAAgB,CAAC,QAAqB;QACpC,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,CAAC,MAAM,CAAC,OAAiC;QAC7C,KAAK,IAAI,OAAO,GAAG,CAAC,GAAI,OAAO,EAAE,EAAE,CAAC;YAClC,IAAI,SAAS,GAAG,KAAK,CAAC;YACtB,IAAI,CAAC;gBACH,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;oBACrD,SAAS,GAAG,IAAI,CAAC;oBACjB,MAAM,KAAK,CAAC;gBACd,CAAC;gBACD,OAAO;YACT,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC;oBACjD,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;oBACpC,MAAM,KAAK,CAAC;gBACd,CAAC;gBACD,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"retrying-model.js","sourceRoot":"","sources":["../../source/providers/retrying-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,8 +24,10 @@ export interface AgentModelSettings {
|
|
|
24
24
|
maxTokens?: number;
|
|
25
25
|
/** Hard per-request stream-output budget across text, reasoning, and tool arguments. */
|
|
26
26
|
maxStreamOutputChars?: number;
|
|
27
|
-
/** Optional total wall-clock
|
|
27
|
+
/** Optional total wall-clock ceiling for each provider request; 0 disables it. Opt-in backstop. */
|
|
28
28
|
maxModelRequestDurationMs?: number;
|
|
29
|
+
/** Provider-neutral inactivity window: abort if no streamed delta arrives within this many ms; 0 disables it. */
|
|
30
|
+
maxModelStreamIdleMs?: number;
|
|
29
31
|
retry?: {
|
|
30
32
|
maxRetries?: number;
|
|
31
33
|
};
|
|
@@ -153,6 +155,8 @@ export interface ApplicationRunLoopDeps {
|
|
|
153
155
|
*/
|
|
154
156
|
readonly logDiagnostic?: (message: string, meta: Record<string, unknown>) => void;
|
|
155
157
|
readonly contextCompactionSessionState?: ContextCompactionSessionState;
|
|
158
|
+
/** Injectable wait boundary so retry behavior can be tested without real timers. */
|
|
159
|
+
readonly waitBeforeModelRetry?: (delayMs: number, signal?: AbortSignal) => Promise<void>;
|
|
156
160
|
}
|
|
157
161
|
/**
|
|
158
162
|
* The fate of a message handed to `steer`/`retractSteer`/`editSteer`.
|