@qduc/term2 0.12.0 → 0.13.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 +6 -1
- package/dist/agent.d.ts +3 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +38 -14
- package/dist/agent.js.map +1 -1
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +90 -17
- package/dist/app.js.map +1 -1
- package/dist/cli.js +34 -23
- package/dist/cli.js.map +1 -1
- package/dist/commands/auto-approve-command.d.ts.map +1 -1
- package/dist/commands/auto-approve-command.js +12 -4
- package/dist/commands/auto-approve-command.js.map +1 -1
- package/dist/commands/copy-command.d.ts +3 -1
- package/dist/commands/copy-command.d.ts.map +1 -1
- package/dist/commands/copy-command.js +36 -9
- package/dist/commands/copy-command.js.map +1 -1
- package/dist/commands/sandbox-command.d.ts.map +1 -1
- package/dist/commands/sandbox-command.js +6 -1
- package/dist/commands/sandbox-command.js.map +1 -1
- package/dist/components/InputBox.d.ts +1 -2
- package/dist/components/InputBox.d.ts.map +1 -1
- package/dist/components/InputBox.js +5 -1
- package/dist/components/InputBox.js.map +1 -1
- package/dist/components/input/ApplicationInputSurface.d.ts +7 -2
- package/dist/components/input/ApplicationInputSurface.d.ts.map +1 -1
- package/dist/components/input/ApplicationInputSurface.js +5 -1
- package/dist/components/input/ApplicationInputSurface.js.map +1 -1
- package/dist/components/input/CopyMenuSession.d.ts +16 -0
- package/dist/components/input/CopyMenuSession.d.ts.map +1 -0
- package/dist/components/input/CopyMenuSession.js +49 -0
- package/dist/components/input/CopyMenuSession.js.map +1 -0
- package/dist/components/input/FirstRunSetupPrompt.d.ts +9 -0
- package/dist/components/input/FirstRunSetupPrompt.d.ts.map +1 -0
- package/dist/components/input/FirstRunSetupPrompt.js +20 -0
- package/dist/components/input/FirstRunSetupPrompt.js.map +1 -0
- package/dist/components/input/MenuSurface.d.ts.map +1 -1
- package/dist/components/input/MenuSurface.js +2 -1
- 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 +11 -1
- package/dist/components/input/ModelMenuSession.js.map +1 -1
- package/dist/components/input/ProviderMenuSession.d.ts.map +1 -1
- package/dist/components/input/ProviderMenuSession.js +8 -2
- package/dist/components/input/ProviderMenuSession.js.map +1 -1
- package/dist/components/input/SkillsMenuSession.d.ts +3 -0
- package/dist/components/input/SkillsMenuSession.d.ts.map +1 -1
- package/dist/components/input/SkillsMenuSession.js +6 -12
- package/dist/components/input/SkillsMenuSession.js.map +1 -1
- package/dist/components/input/SlashMenuSession.d.ts +11 -3
- package/dist/components/input/SlashMenuSession.d.ts.map +1 -1
- package/dist/components/input/SlashMenuSession.js +54 -42
- package/dist/components/input/SlashMenuSession.js.map +1 -1
- package/dist/components/input/menu-registry.d.ts.map +1 -1
- package/dist/components/input/menu-registry.js +2 -0
- package/dist/components/input/menu-registry.js.map +1 -1
- package/dist/components/input/menu-types.d.ts +7 -0
- package/dist/components/input/menu-types.d.ts.map +1 -1
- package/dist/components/layout/BackgroundTaskManager.d.ts.map +1 -1
- package/dist/components/layout/BackgroundTaskManager.js +28 -10
- package/dist/components/layout/BackgroundTaskManager.js.map +1 -1
- package/dist/components/layout/BackgroundTasksPanel.d.ts +2 -1
- package/dist/components/layout/BackgroundTasksPanel.d.ts.map +1 -1
- package/dist/components/layout/BackgroundTasksPanel.js +35 -10
- package/dist/components/layout/BackgroundTasksPanel.js.map +1 -1
- package/dist/components/layout/BottomArea.d.ts +16 -2
- package/dist/components/layout/BottomArea.d.ts.map +1 -1
- package/dist/components/layout/BottomArea.js +7 -4
- package/dist/components/layout/BottomArea.js.map +1 -1
- package/dist/components/layout/StatusBar.d.ts.map +1 -1
- package/dist/components/layout/StatusBar.js +66 -51
- package/dist/components/layout/StatusBar.js.map +1 -1
- package/dist/components/menu/CopyMenu.d.ts +9 -0
- package/dist/components/menu/CopyMenu.d.ts.map +1 -0
- package/dist/components/menu/CopyMenu.js +7 -0
- package/dist/components/menu/CopyMenu.js.map +1 -0
- package/dist/components/menu/ModelSelectionMenu.d.ts +1 -0
- package/dist/components/menu/ModelSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ModelSelectionMenu.js +23 -6
- package/dist/components/menu/ModelSelectionMenu.js.map +1 -1
- package/dist/components/menu/ProviderSelectionMenu.d.ts +1 -0
- package/dist/components/menu/ProviderSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ProviderSelectionMenu.js +12 -4
- package/dist/components/menu/ProviderSelectionMenu.js.map +1 -1
- package/dist/components/message/CommandMessage.js +4 -0
- package/dist/components/message/CommandMessage.js.map +1 -1
- package/dist/components/prompt/ApprovalPrompt.d.ts.map +1 -1
- package/dist/components/prompt/ApprovalPrompt.js +0 -25
- package/dist/components/prompt/ApprovalPrompt.js.map +1 -1
- package/dist/context/InputContext.d.ts +1 -1
- package/dist/context/InputContext.d.ts.map +1 -1
- package/dist/context/InputContext.js +2 -0
- package/dist/context/InputContext.js.map +1 -1
- package/dist/contracts/application-stream.d.ts +6 -0
- package/dist/contracts/application-stream.d.ts.map +1 -1
- 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 +3 -0
- 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 +2 -0
- package/dist/hooks/settings-completion-config.js.map +1 -1
- package/dist/hooks/use-app-commands.d.ts +3 -1
- package/dist/hooks/use-app-commands.d.ts.map +1 -1
- package/dist/hooks/use-app-commands.js +3 -2
- package/dist/hooks/use-app-commands.js.map +1 -1
- package/dist/hooks/use-app-keyboard-shortcuts.d.ts +7 -1
- package/dist/hooks/use-app-keyboard-shortcuts.d.ts.map +1 -1
- package/dist/hooks/use-app-keyboard-shortcuts.js +77 -7
- package/dist/hooks/use-app-keyboard-shortcuts.js.map +1 -1
- package/dist/hooks/use-conversation.d.ts +6 -2
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +12 -2
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/hooks/use-debounced-value.d.ts +13 -0
- package/dist/hooks/use-debounced-value.d.ts.map +1 -0
- package/dist/hooks/use-debounced-value.js +27 -0
- package/dist/hooks/use-debounced-value.js.map +1 -0
- package/dist/hooks/use-first-run-setup.d.ts +24 -0
- package/dist/hooks/use-first-run-setup.d.ts.map +1 -0
- package/dist/hooks/use-first-run-setup.js +114 -0
- package/dist/hooks/use-first-run-setup.js.map +1 -0
- package/dist/hooks/use-model-selection.d.ts +1 -0
- package/dist/hooks/use-model-selection.d.ts.map +1 -1
- package/dist/hooks/use-model-selection.js +44 -1
- package/dist/hooks/use-model-selection.js.map +1 -1
- package/dist/hooks/use-provider-selection.d.ts +5 -1
- package/dist/hooks/use-provider-selection.d.ts.map +1 -1
- package/dist/hooks/use-provider-selection.js +37 -12
- package/dist/hooks/use-provider-selection.js.map +1 -1
- package/dist/hooks/use-slash-commands.d.ts +0 -1
- package/dist/hooks/use-slash-commands.d.ts.map +1 -1
- package/dist/hooks/use-slash-commands.js +1 -9
- package/dist/hooks/use-slash-commands.js.map +1 -1
- package/dist/lib/agent-chat-service.d.ts.map +1 -1
- package/dist/lib/agent-chat-service.js +9 -5
- package/dist/lib/agent-chat-service.js.map +1 -1
- package/dist/lib/agent-client.d.ts +7 -2
- package/dist/lib/agent-client.d.ts.map +1 -1
- package/dist/lib/agent-client.js +32 -3
- 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 +3 -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 +6 -5
- package/dist/lib/agent-factory.js.map +1 -1
- package/dist/lib/input-owner.d.ts +3 -0
- package/dist/lib/input-owner.d.ts.map +1 -1
- package/dist/lib/input-owner.js +5 -0
- package/dist/lib/input-owner.js.map +1 -1
- package/dist/lib/subagent-bridge.d.ts +2 -0
- package/dist/lib/subagent-bridge.d.ts.map +1 -1
- package/dist/lib/subagent-bridge.js +4 -1
- package/dist/lib/subagent-bridge.js.map +1 -1
- package/dist/prompts/background-shell.d.ts +3 -0
- package/dist/prompts/background-shell.d.ts.map +1 -0
- package/dist/prompts/background-shell.js +11 -0
- package/dist/prompts/background-shell.js.map +1 -0
- package/dist/prompts/background-shell.ts +10 -0
- package/dist/prompts/orchestrator-prompt.test.ts +7 -0
- package/dist/prompts/orchestrator.md +1 -1
- package/dist/prompts/prompt-constructor.d.ts +1 -0
- package/dist/prompts/prompt-constructor.d.ts.map +1 -1
- package/dist/prompts/prompt-constructor.js +5 -1
- package/dist/prompts/prompt-constructor.js.map +1 -1
- package/dist/prompts/prompt-constructor.test.ts +16 -1
- package/dist/prompts/prompt-constructor.ts +7 -0
- package/dist/prompts/subagent-delegation.js +1 -1
- package/dist/prompts/subagent-delegation.ts +1 -1
- package/dist/prompts/subagents/worker.md +1 -1
- package/dist/providers/codex-auth.d.ts +6 -0
- package/dist/providers/codex-auth.d.ts.map +1 -0
- package/dist/providers/codex-auth.js +35 -0
- package/dist/providers/codex-auth.js.map +1 -0
- package/dist/providers/codex-responses-model.d.ts.map +1 -1
- package/dist/providers/codex-responses-model.js +17 -8
- package/dist/providers/codex-responses-model.js.map +1 -1
- package/dist/providers/codex.provider.d.ts +2 -1
- package/dist/providers/codex.provider.d.ts.map +1 -1
- package/dist/providers/codex.provider.js +3 -28
- package/dist/providers/codex.provider.js.map +1 -1
- package/dist/providers/model-catalog/catalog.d.ts +35 -2
- package/dist/providers/model-catalog/catalog.d.ts.map +1 -1
- package/dist/providers/model-catalog/catalog.js +93 -29
- package/dist/providers/model-catalog/catalog.js.map +1 -1
- package/dist/providers/openai-chat-completions-model.d.ts +2 -1
- package/dist/providers/openai-chat-completions-model.d.ts.map +1 -1
- package/dist/providers/openai-chat-completions-model.js +223 -53
- package/dist/providers/openai-chat-completions-model.js.map +1 -1
- package/dist/providers/openai-compatible-lazy.d.ts.map +1 -1
- package/dist/providers/openai-compatible-lazy.js +2 -1
- package/dist/providers/openai-compatible-lazy.js.map +1 -1
- package/dist/providers/openai-compatible-middleware.d.ts.map +1 -1
- package/dist/providers/openai-compatible-middleware.js +1 -13
- package/dist/providers/openai-compatible-middleware.js.map +1 -1
- package/dist/providers/openai-compatible-response-normalizer.d.ts +5 -4
- package/dist/providers/openai-compatible-response-normalizer.d.ts.map +1 -1
- package/dist/providers/openai-compatible-response-normalizer.js +6 -17
- package/dist/providers/openai-compatible-response-normalizer.js.map +1 -1
- package/dist/providers/openai-compatible.provider.d.ts +1 -0
- package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
- package/dist/providers/openai-compatible.provider.js +13 -4
- package/dist/providers/openai-compatible.provider.js.map +1 -1
- package/dist/providers/provider-service.d.ts +1 -0
- package/dist/providers/provider-service.d.ts.map +1 -1
- package/dist/providers/provider-service.js +4 -0
- package/dist/providers/provider-service.js.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.d.ts.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.js +30 -8
- package/dist/services/agent-runtime/application-run-loop.js.map +1 -1
- package/dist/services/agent-runtime/scope-resolver.d.ts.map +1 -1
- package/dist/services/agent-runtime/scope-resolver.js +2 -1
- package/dist/services/agent-runtime/scope-resolver.js.map +1 -1
- package/dist/services/agent-stream.d.ts.map +1 -1
- package/dist/services/agent-stream.js +2 -1
- package/dist/services/agent-stream.js.map +1 -1
- package/dist/services/approval/approval-decision-executor.d.ts.map +1 -1
- package/dist/services/approval/approval-decision-executor.js +5 -2
- package/dist/services/approval/approval-decision-executor.js.map +1 -1
- package/dist/services/approval/approval-decision-policy.d.ts.map +1 -1
- package/dist/services/approval/approval-decision-policy.js +0 -2
- package/dist/services/approval/approval-decision-policy.js.map +1 -1
- package/dist/services/approval/session-read-access.d.ts.map +1 -1
- package/dist/services/approval/session-read-access.js +2 -1
- package/dist/services/approval/session-read-access.js.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.d.ts +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.d.ts.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.js +9 -1
- package/dist/services/approval/shell-auto-approval-resolver.js.map +1 -1
- package/dist/services/approval/tool-approval-batch-coordinator.d.ts.map +1 -1
- package/dist/services/approval/tool-approval-batch-coordinator.js +2 -1
- package/dist/services/approval/tool-approval-batch-coordinator.js.map +1 -1
- package/dist/services/conversation/conversation-admission-workflow.d.ts.map +1 -1
- package/dist/services/conversation/conversation-admission-workflow.js +20 -18
- package/dist/services/conversation/conversation-admission-workflow.js.map +1 -1
- package/dist/services/conversation/conversation-decoder.d.ts.map +1 -1
- package/dist/services/conversation/conversation-decoder.js +6 -0
- package/dist/services/conversation/conversation-decoder.js.map +1 -1
- package/dist/services/conversation/conversation-events.d.ts +31 -1
- package/dist/services/conversation/conversation-events.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.d.ts +2 -0
- package/dist/services/conversation/conversation-orchestrator.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.js +113 -1
- 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-replay.d.ts.map +1 -1
- package/dist/services/conversation/conversation-replay.js +45 -0
- package/dist/services/conversation/conversation-replay.js.map +1 -1
- package/dist/services/conversation/conversation-result-builder.d.ts.map +1 -1
- package/dist/services/conversation/conversation-result-builder.js +14 -2
- package/dist/services/conversation/conversation-result-builder.js.map +1 -1
- package/dist/services/conversation/conversation-store.d.ts +9 -0
- package/dist/services/conversation/conversation-store.d.ts.map +1 -1
- package/dist/services/conversation/conversation-store.js +15 -3
- package/dist/services/conversation/conversation-store.js.map +1 -1
- package/dist/services/cost/model-cost.d.ts +13 -2
- package/dist/services/cost/model-cost.d.ts.map +1 -1
- package/dist/services/cost/model-cost.js +1 -0
- package/dist/services/cost/model-cost.js.map +1 -1
- package/dist/services/cost/pricing.d.ts.map +1 -1
- package/dist/services/cost/pricing.js +26 -20
- package/dist/services/cost/pricing.js.map +1 -1
- package/dist/services/execution-context.d.ts +31 -0
- package/dist/services/execution-context.d.ts.map +1 -1
- package/dist/services/execution-context.js +59 -0
- package/dist/services/execution-context.js.map +1 -1
- package/dist/services/file-service.d.ts.map +1 -1
- package/dist/services/file-service.js +12 -3
- package/dist/services/file-service.js.map +1 -1
- package/dist/services/large-uncached-input-guard.d.ts +26 -1
- package/dist/services/large-uncached-input-guard.d.ts.map +1 -1
- package/dist/services/large-uncached-input-guard.js +73 -38
- package/dist/services/large-uncached-input-guard.js.map +1 -1
- package/dist/services/logging/conversation-log-events.d.ts +14 -1
- package/dist/services/logging/conversation-log-events.d.ts.map +1 -1
- package/dist/services/logging/conversation-log-events.js.map +1 -1
- package/dist/services/logging/conversation-logger.d.ts.map +1 -1
- package/dist/services/logging/conversation-logger.js +11 -0
- package/dist/services/logging/conversation-logger.js.map +1 -1
- package/dist/services/logging/logging-contract.d.ts.map +1 -1
- package/dist/services/logging/logging-contract.js +4 -0
- package/dist/services/logging/logging-contract.js.map +1 -1
- package/dist/services/model-service.d.ts +7 -0
- package/dist/services/model-service.d.ts.map +1 -1
- package/dist/services/model-service.js +21 -0
- package/dist/services/model-service.js.map +1 -1
- package/dist/services/models/model-catalog-session.d.ts +2 -0
- package/dist/services/models/model-catalog-session.d.ts.map +1 -1
- package/dist/services/models/model-catalog-session.js +9 -2
- package/dist/services/models/model-catalog-session.js.map +1 -1
- package/dist/services/provider-continuity.d.ts +15 -0
- package/dist/services/provider-continuity.d.ts.map +1 -1
- package/dist/services/provider-continuity.js +33 -0
- package/dist/services/provider-continuity.js.map +1 -1
- package/dist/services/retry/recovery-executor.d.ts.map +1 -1
- package/dist/services/retry/recovery-executor.js +8 -0
- package/dist/services/retry/recovery-executor.js.map +1 -1
- package/dist/services/retry/retry-classifier.d.ts.map +1 -1
- package/dist/services/retry/retry-classifier.js +2 -1
- package/dist/services/retry/retry-classifier.js.map +1 -1
- package/dist/services/retry/retry-error-classification.d.ts +19 -0
- package/dist/services/retry/retry-error-classification.d.ts.map +1 -1
- package/dist/services/retry/retry-error-classification.js +54 -0
- package/dist/services/retry/retry-error-classification.js.map +1 -1
- package/dist/services/session/background-task-control.d.ts +7 -2
- package/dist/services/session/background-task-control.d.ts.map +1 -1
- package/dist/services/session/background-task-control.js +43 -9
- package/dist/services/session/background-task-control.js.map +1 -1
- package/dist/services/session/background-task-liveness.d.ts +24 -0
- package/dist/services/session/background-task-liveness.d.ts.map +1 -0
- package/dist/services/session/background-task-liveness.js +23 -0
- package/dist/services/session/background-task-liveness.js.map +1 -0
- package/dist/services/session/session-access-state.d.ts.map +1 -1
- package/dist/services/session/session-access-state.js +5 -4
- package/dist/services/session/session-access-state.js.map +1 -1
- package/dist/services/session/session-client-factory.d.ts +11 -1
- package/dist/services/session/session-client-factory.d.ts.map +1 -1
- package/dist/services/session/session-client-factory.js +28 -1
- package/dist/services/session/session-client-factory.js.map +1 -1
- package/dist/services/session/session-composition.d.ts.map +1 -1
- package/dist/services/session/session-composition.js +1 -0
- package/dist/services/session/session-composition.js.map +1 -1
- package/dist/services/session/session-input-planner.d.ts +16 -0
- package/dist/services/session/session-input-planner.d.ts.map +1 -1
- package/dist/services/session/session-input-planner.js +117 -10
- package/dist/services/session/session-input-planner.js.map +1 -1
- package/dist/services/session/session-stream-processor.d.ts +1 -0
- package/dist/services/session/session-stream-processor.d.ts.map +1 -1
- package/dist/services/session/session-stream-processor.js +13 -0
- package/dist/services/session/session-stream-processor.js.map +1 -1
- package/dist/services/session/session-tool-tracker.d.ts +6 -0
- package/dist/services/session/session-tool-tracker.d.ts.map +1 -1
- package/dist/services/session/session-tool-tracker.js +9 -0
- package/dist/services/session/session-tool-tracker.js.map +1 -1
- package/dist/services/session/terminal-result-collector.d.ts.map +1 -1
- package/dist/services/session/terminal-result-collector.js +12 -0
- package/dist/services/session/terminal-result-collector.js.map +1 -1
- package/dist/services/session/turn-workflow.d.ts.map +1 -1
- package/dist/services/session/turn-workflow.js +4 -0
- package/dist/services/session/turn-workflow.js.map +1 -1
- package/dist/services/settings/settings-path.d.ts +6 -0
- package/dist/services/settings/settings-path.d.ts.map +1 -0
- package/dist/services/settings/settings-path.js +15 -0
- package/dist/services/settings/settings-path.js.map +1 -0
- package/dist/services/settings/settings-schema.d.ts +7 -1
- package/dist/services/settings/settings-schema.d.ts.map +1 -1
- package/dist/services/settings/settings-schema.js +13 -1
- package/dist/services/settings/settings-schema.js.map +1 -1
- package/dist/services/settings/settings-service.d.ts +8 -0
- package/dist/services/settings/settings-service.d.ts.map +1 -1
- package/dist/services/settings/settings-service.js +82 -4
- 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 +1 -0
- package/dist/services/settings/settings-sources.js.map +1 -1
- package/dist/services/shell/background-shell-output-store.d.ts +90 -0
- package/dist/services/shell/background-shell-output-store.d.ts.map +1 -0
- package/dist/services/shell/background-shell-output-store.js +207 -0
- package/dist/services/shell/background-shell-output-store.js.map +1 -0
- package/dist/services/shell/background-shell-registry.d.ts +18 -0
- package/dist/services/shell/background-shell-registry.d.ts.map +1 -1
- package/dist/services/shell/background-shell-registry.js +17 -2
- package/dist/services/shell/background-shell-registry.js.map +1 -1
- package/dist/services/shell/background-shell-watches.d.ts +141 -0
- package/dist/services/shell/background-shell-watches.d.ts.map +1 -0
- package/dist/services/shell/background-shell-watches.js +245 -0
- package/dist/services/shell/background-shell-watches.js.map +1 -0
- package/dist/services/stream-event-processor.d.ts.map +1 -1
- package/dist/services/stream-event-processor.js +4 -0
- package/dist/services/stream-event-processor.js.map +1 -1
- package/dist/services/subagents/execution-runner.d.ts.map +1 -1
- package/dist/services/subagents/execution-runner.js +47 -3
- package/dist/services/subagents/execution-runner.js.map +1 -1
- package/dist/services/subagents/mentor-runner.d.ts.map +1 -1
- package/dist/services/subagents/mentor-runner.js +9 -2
- 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 +54 -6
- package/dist/services/subagents/nested-runner.js.map +1 -1
- package/dist/services/subagents/subagent-async-registry.d.ts.map +1 -1
- package/dist/services/subagents/subagent-async-registry.js +39 -5
- package/dist/services/subagents/subagent-async-registry.js.map +1 -1
- package/dist/services/subagents/subagent-notification-store.d.ts +20 -1
- package/dist/services/subagents/subagent-notification-store.d.ts.map +1 -1
- package/dist/services/subagents/subagent-notification-store.js +22 -0
- package/dist/services/subagents/subagent-notification-store.js.map +1 -1
- package/dist/services/subagents/test-helpers/subagent-manager-fixtures.js +6 -5
- package/dist/services/subagents/test-helpers/subagent-manager-fixtures.js.map +1 -1
- package/dist/services/subagents/tool-policy.d.ts +3 -1
- package/dist/services/subagents/tool-policy.d.ts.map +1 -1
- package/dist/services/subagents/tool-policy.js +16 -12
- package/dist/services/subagents/tool-policy.js.map +1 -1
- package/dist/services/subagents/types.d.ts +15 -0
- package/dist/services/subagents/types.d.ts.map +1 -1
- package/dist/services/subagents/utils.d.ts.map +1 -1
- package/dist/services/subagents/utils.js +3 -0
- package/dist/services/subagents/utils.js.map +1 -1
- package/dist/services/subagents/worker-worktree.d.ts +25 -0
- package/dist/services/subagents/worker-worktree.d.ts.map +1 -0
- package/dist/services/subagents/worker-worktree.js +74 -0
- package/dist/services/subagents/worker-worktree.js.map +1 -0
- package/dist/services/workspace/active-workspace-root.d.ts +5 -0
- package/dist/services/workspace/active-workspace-root.d.ts.map +1 -0
- package/dist/services/workspace/active-workspace-root.js +24 -0
- package/dist/services/workspace/active-workspace-root.js.map +1 -0
- package/dist/services/workspace/parse-worktree-list.d.ts +24 -0
- package/dist/services/workspace/parse-worktree-list.d.ts.map +1 -0
- package/dist/services/workspace/parse-worktree-list.js +59 -0
- package/dist/services/workspace/parse-worktree-list.js.map +1 -0
- package/dist/services/workspace/worktree-inventory.d.ts +10 -0
- package/dist/services/workspace/worktree-inventory.d.ts.map +1 -0
- package/dist/services/workspace/worktree-inventory.js +28 -0
- package/dist/services/workspace/worktree-inventory.js.map +1 -0
- package/dist/services/workspace/worktree-transition.d.ts +85 -0
- package/dist/services/workspace/worktree-transition.d.ts.map +1 -0
- package/dist/services/workspace/worktree-transition.js +70 -0
- package/dist/services/workspace/worktree-transition.js.map +1 -0
- package/dist/tools/agent/run-subagent-async.d.ts +1 -1
- package/dist/tools/agent/run-subagent-async.d.ts.map +1 -1
- package/dist/tools/agent/run-subagent-async.js +19 -4
- package/dist/tools/agent/run-subagent-async.js.map +1 -1
- package/dist/tools/agent/run-subagent.d.ts +3 -1
- package/dist/tools/agent/run-subagent.d.ts.map +1 -1
- package/dist/tools/agent/run-subagent.js +19 -1
- package/dist/tools/agent/run-subagent.js.map +1 -1
- package/dist/tools/system/shell.d.ts +42 -1
- package/dist/tools/system/shell.d.ts.map +1 -1
- package/dist/tools/system/shell.js +284 -10
- package/dist/tools/system/shell.js.map +1 -1
- package/dist/tools/system/worktree.d.ts +22 -0
- package/dist/tools/system/worktree.d.ts.map +1 -0
- package/dist/tools/system/worktree.js +138 -0
- package/dist/tools/system/worktree.js.map +1 -0
- package/dist/tools/utils.d.ts.map +1 -1
- package/dist/tools/utils.js +3 -2
- package/dist/tools/utils.js.map +1 -1
- package/dist/utils/ai/provider-credentials.d.ts +31 -2
- package/dist/utils/ai/provider-credentials.d.ts.map +1 -1
- package/dist/utils/ai/provider-credentials.js +119 -11
- package/dist/utils/ai/provider-credentials.js.map +1 -1
- package/dist/utils/conversation/message-utils.d.ts +8 -2
- package/dist/utils/conversation/message-utils.d.ts.map +1 -1
- package/dist/utils/conversation/message-utils.js +38 -21
- package/dist/utils/conversation/message-utils.js.map +1 -1
- package/dist/utils/copy-selections.d.ts +8 -0
- package/dist/utils/copy-selections.d.ts.map +1 -0
- package/dist/utils/copy-selections.js +42 -0
- package/dist/utils/copy-selections.js.map +1 -0
- package/dist/utils/settings-command.d.ts.map +1 -1
- package/dist/utils/settings-command.js +5 -0
- package/dist/utils/settings-command.js.map +1 -1
- package/dist/utils/shell/command-safety/path-analysis.d.ts.map +1 -1
- package/dist/utils/shell/command-safety/path-analysis.js +5 -1
- package/dist/utils/shell/command-safety/path-analysis.js.map +1 -1
- package/dist/utils/shell/execute-shell.d.ts +25 -0
- package/dist/utils/shell/execute-shell.d.ts.map +1 -1
- package/dist/utils/shell/execute-shell.js +22 -5
- package/dist/utils/shell/execute-shell.js.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-env.d.ts.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-env.js +2 -1
- package/dist/utils/shell/sandbox/sandbox-env.js.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-network-store.d.ts.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-network-store.js +3 -2
- package/dist/utils/shell/sandbox/sandbox-network-store.js.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-policy.d.ts.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-policy.js +2 -1
- package/dist/utils/shell/sandbox/sandbox-policy.js.map +1 -1
- package/dist/utils/value-suggestions.d.ts.map +1 -1
- package/dist/utils/value-suggestions.js +6 -0
- package/dist/utils/value-suggestions.js.map +1 -1
- package/package.json +1 -1
|
@@ -4,10 +4,12 @@ export class OpenAIChatCompletionsModel {
|
|
|
4
4
|
client;
|
|
5
5
|
model;
|
|
6
6
|
costCapture;
|
|
7
|
-
|
|
7
|
+
providerId;
|
|
8
|
+
constructor(client, model, costCapture, providerId) {
|
|
8
9
|
this.client = client;
|
|
9
10
|
this.model = model.trim();
|
|
10
11
|
this.costCapture = costCapture;
|
|
12
|
+
this.providerId = providerId ?? 'openai-compatible';
|
|
11
13
|
}
|
|
12
14
|
// createCustomProviderModelProvider() (openai-compatible.provider.ts) returns
|
|
13
15
|
// this class for the 'openai'/'openai-compatible'/'llama.cpp' provider types,
|
|
@@ -19,7 +21,7 @@ export class OpenAIChatCompletionsModel {
|
|
|
19
21
|
async *stream(request) {
|
|
20
22
|
const messages = [
|
|
21
23
|
...(request.instructions ? [{ role: 'system', content: request.instructions }] : []),
|
|
22
|
-
...openAICompatibleMessages(request.input),
|
|
24
|
+
...openAICompatibleMessages(request.input, this.providerId),
|
|
23
25
|
];
|
|
24
26
|
assertValidOpenAICompatibleMessages(messages);
|
|
25
27
|
const response = await this.client.chat.completions.create({
|
|
@@ -48,6 +50,7 @@ export class OpenAIChatCompletionsModel {
|
|
|
48
50
|
const calls = new Map();
|
|
49
51
|
let text = '';
|
|
50
52
|
let reasoning = '';
|
|
53
|
+
const rawContinuityMetadata = {};
|
|
51
54
|
let sawFinishReason = false;
|
|
52
55
|
let finishReason;
|
|
53
56
|
let usage;
|
|
@@ -58,13 +61,31 @@ export class OpenAIChatCompletionsModel {
|
|
|
58
61
|
sawFinishReason = true;
|
|
59
62
|
finishReason = choice.finish_reason;
|
|
60
63
|
}
|
|
61
|
-
if (delta
|
|
62
|
-
|
|
64
|
+
if (delta) {
|
|
65
|
+
for (const [key, val] of Object.entries(delta)) {
|
|
66
|
+
// `role` is response-only; `content`/`tool_calls` are modeled above.
|
|
67
|
+
// Everything else is continuity metadata by default — the failure this
|
|
68
|
+
// capture exists to fix was an unknown field being dropped because
|
|
69
|
+
// nobody had enumerated it.
|
|
70
|
+
if (key === 'role' || key === 'content' || key === 'tool_calls' || key === 'finish_reason') {
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
if (val == null)
|
|
74
|
+
continue;
|
|
75
|
+
accumulateContinuityField(rawContinuityMetadata, key, val);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
// deepseek-style servers stream reasoning on `reasoning_content`;
|
|
79
|
+
// OpenRouter-style gateways use `reasoning`. Reading only the former
|
|
80
|
+
// silently dropped every reasoning token from the latter.
|
|
81
|
+
const reasoningDelta = delta?.reasoning_content ?? delta?.reasoning;
|
|
82
|
+
if (reasoningDelta) {
|
|
83
|
+
reasoning += reasoningDelta;
|
|
63
84
|
yield {
|
|
64
85
|
type: 'reasoning_delta',
|
|
65
|
-
text:
|
|
86
|
+
text: reasoningDelta,
|
|
66
87
|
providerMetadata: {
|
|
67
|
-
reasoning_content:
|
|
88
|
+
reasoning_content: reasoningDelta,
|
|
68
89
|
openai_compatible_reasoning_content: true,
|
|
69
90
|
},
|
|
70
91
|
};
|
|
@@ -101,33 +122,38 @@ export class OpenAIChatCompletionsModel {
|
|
|
101
122
|
throw new Error('OpenAI-compatible streamed response ended without a finish reason');
|
|
102
123
|
for (const [index, call] of calls)
|
|
103
124
|
yield { type: 'tool_call', id: call.id ?? `call_${index}`, name: call.name, arguments: call.arguments };
|
|
125
|
+
const output = [];
|
|
126
|
+
if (reasoning) {
|
|
127
|
+
output.push({
|
|
128
|
+
type: 'reasoning',
|
|
129
|
+
text: reasoning,
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
if (Object.keys(rawContinuityMetadata).length > 0) {
|
|
133
|
+
output.push({
|
|
134
|
+
type: 'provider_opaque',
|
|
135
|
+
provider: this.providerId,
|
|
136
|
+
item: rawContinuityMetadata,
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
if (calls.size) {
|
|
140
|
+
output.push(...[...calls].map(([index, call]) => ({
|
|
141
|
+
type: 'tool_call',
|
|
142
|
+
id: call.id ?? `call_${index}`,
|
|
143
|
+
name: call.name,
|
|
144
|
+
arguments: call.arguments,
|
|
145
|
+
})));
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
output.push({ type: 'message', content: [{ type: 'text', text }] });
|
|
149
|
+
}
|
|
104
150
|
yield {
|
|
105
151
|
type: 'completion',
|
|
106
152
|
responseId: `chatcmpl-${Date.now()}`,
|
|
107
153
|
...(finishReason !== undefined ? { finishReason } : {}),
|
|
108
154
|
usage,
|
|
109
|
-
// The normalized reasoning stream captures the cost-only trailer into the
|
|
110
|
-
// shared capture object; surface it as the provider-reported charge.
|
|
111
155
|
...(this.costCapture?.cost !== undefined ? { costUsd: this.costCapture.cost } : {}),
|
|
112
|
-
output
|
|
113
|
-
...(reasoning
|
|
114
|
-
? [
|
|
115
|
-
{
|
|
116
|
-
type: 'reasoning',
|
|
117
|
-
text: reasoning,
|
|
118
|
-
providerMetadata: { reasoning_content: reasoning, openai_compatible_reasoning_content: true },
|
|
119
|
-
},
|
|
120
|
-
]
|
|
121
|
-
: []),
|
|
122
|
-
...(calls.size
|
|
123
|
-
? [...calls].map(([index, call]) => ({
|
|
124
|
-
type: 'tool_call',
|
|
125
|
-
id: call.id ?? `call_${index}`,
|
|
126
|
-
name: call.name,
|
|
127
|
-
arguments: call.arguments,
|
|
128
|
-
}))
|
|
129
|
-
: [{ type: 'message', content: [{ type: 'text', text }] }]),
|
|
130
|
-
],
|
|
156
|
+
output,
|
|
131
157
|
};
|
|
132
158
|
}
|
|
133
159
|
}
|
|
@@ -164,28 +190,131 @@ function normalizeChatUsage(usage) {
|
|
|
164
190
|
...(cacheWriteTokens !== undefined ? { cacheWriteTokens } : {}),
|
|
165
191
|
};
|
|
166
192
|
}
|
|
167
|
-
|
|
193
|
+
const isRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
194
|
+
/**
|
|
195
|
+
* Accumulates one non-modeled `delta` field into the turn's continuity payload.
|
|
196
|
+
*
|
|
197
|
+
* Chat Completions streams `delta.*` as increments, so strings concatenate.
|
|
198
|
+
* Arrays are the case that needs care: providers stream `reasoning_details` as
|
|
199
|
+
* repeated entries carrying the same `index`, and that `index` identifies one
|
|
200
|
+
* logical entry rather than one chunk. Appending blindly replays a single entry
|
|
201
|
+
* as N fragments, which is the opposite of the verbatim round-trip this payload
|
|
202
|
+
* exists for — and would split a signature or encrypted blob across entries.
|
|
203
|
+
*/
|
|
204
|
+
function accumulateContinuityField(target, key, value) {
|
|
205
|
+
if (typeof value === 'string') {
|
|
206
|
+
const existing = typeof target[key] === 'string' ? target[key] : '';
|
|
207
|
+
target[key] = existing + value;
|
|
208
|
+
return;
|
|
209
|
+
}
|
|
210
|
+
if (Array.isArray(value)) {
|
|
211
|
+
const existing = Array.isArray(target[key]) ? target[key] : [];
|
|
212
|
+
target[key] = mergeIndexedEntries(existing, value);
|
|
213
|
+
return;
|
|
214
|
+
}
|
|
215
|
+
target[key] = value;
|
|
216
|
+
}
|
|
217
|
+
function mergeIndexedEntries(existing, incoming) {
|
|
218
|
+
const result = [...existing];
|
|
219
|
+
for (const entry of incoming) {
|
|
220
|
+
const index = isRecord(entry) ? entry.index : undefined;
|
|
221
|
+
const matchAt = typeof index === 'number'
|
|
222
|
+
? result.findIndex((candidate) => isRecord(candidate) && candidate.index === index)
|
|
223
|
+
: -1;
|
|
224
|
+
if (matchAt === -1) {
|
|
225
|
+
result.push(isRecord(entry) ? { ...entry } : entry);
|
|
226
|
+
continue;
|
|
227
|
+
}
|
|
228
|
+
result[matchAt] = mergeEntryFields(result[matchAt], entry);
|
|
229
|
+
}
|
|
230
|
+
return result;
|
|
231
|
+
}
|
|
232
|
+
/**
|
|
233
|
+
* Merges a later chunk of an indexed entry into the entry accumulated so far.
|
|
234
|
+
*
|
|
235
|
+
* Within one entry the payload field (`text`, or whatever a future entry type
|
|
236
|
+
* names it) arrives in pieces while the descriptors (`type`, `format`, `index`)
|
|
237
|
+
* arrive identical on every chunk. There is no type-level way to tell them
|
|
238
|
+
* apart, so an identical repeat is treated as a descriptor and a differing
|
|
239
|
+
* value as a continuation. The one case this reads wrong — two consecutive
|
|
240
|
+
* byte-identical payload chunks — loses a duplicate fragment, which is a
|
|
241
|
+
* smaller harm than fragmenting the entry or truncating a blob.
|
|
242
|
+
*/
|
|
243
|
+
function mergeEntryFields(base, incoming) {
|
|
244
|
+
const merged = { ...base };
|
|
245
|
+
for (const [key, value] of Object.entries(incoming)) {
|
|
246
|
+
if (typeof value === 'string' && typeof merged[key] === 'string' && merged[key] !== value) {
|
|
247
|
+
merged[key] = merged[key] + value;
|
|
248
|
+
continue;
|
|
249
|
+
}
|
|
250
|
+
merged[key] = value;
|
|
251
|
+
}
|
|
252
|
+
return merged;
|
|
253
|
+
}
|
|
254
|
+
/**
|
|
255
|
+
* Opaque items persisted before the provider tag was corrected carry the
|
|
256
|
+
* provider *type* rather than the configured provider, so every
|
|
257
|
+
* chat-completions endpoint shared this one tag. Accept it so conversations
|
|
258
|
+
* recorded in that window still replay; a genuinely foreign provider is still
|
|
259
|
+
* refused.
|
|
260
|
+
*/
|
|
261
|
+
const LEGACY_SHARED_PROVIDER_TAG = 'openai-compatible';
|
|
262
|
+
/** The wire spellings a continuity payload may use for reasoning. */
|
|
263
|
+
const REASONING_WIRE_FIELDS = ['reasoning_content', 'reasoning', 'reasoning_details'];
|
|
264
|
+
const isOwnOpaqueTag = (tag, providerId) => tag === providerId || tag === LEGACY_SHARED_PROVIDER_TAG;
|
|
265
|
+
const opaqueMarkerOf = (item) => item.providerOpaque ?? (item.type === 'provider_opaque' ? { provider: item.provider } : undefined);
|
|
266
|
+
function openAICompatibleMessages(input, providerId = 'openai-compatible') {
|
|
168
267
|
const messages = [];
|
|
169
|
-
|
|
170
|
-
|
|
268
|
+
// Continuity payloads in the order their turns occurred. They are attached
|
|
269
|
+
// after coalescing rather than inline: a payload is only known once the
|
|
270
|
+
// completion arrives, which is after the turn's tool calls were dispatched
|
|
271
|
+
// into history (`application-run-loop.ts`, the provider_opaque loop that runs
|
|
272
|
+
// past the tool results). So an opaque item trails the assistant group it
|
|
273
|
+
// describes, and until coalescing has re-merged that turn's split tool-call
|
|
274
|
+
// messages there is no single group to anchor it on.
|
|
275
|
+
const opaquePayloads = [];
|
|
276
|
+
// Native reasoning restored from a conversation persisted before the opaque
|
|
277
|
+
// lane existed, recognized by its `providerMetadata` marker.
|
|
278
|
+
let pendingLegacyNativeReasoning = '';
|
|
279
|
+
// Whether this history carries any continuity payload of ours. When it does,
|
|
280
|
+
// every bare `reasoning` item in it is the normalized twin of a payload
|
|
281
|
+
// rather than another provider's reasoning, and replaying it as text would
|
|
282
|
+
// send the same tokens twice.
|
|
283
|
+
const historyCarriesOwnOpaque = input.some((item) => isOwnOpaqueTag(opaqueMarkerOf(item)?.provider, providerId));
|
|
284
|
+
const reasoningFields = () => pendingLegacyNativeReasoning ? { reasoning_content: pendingLegacyNativeReasoning } : {};
|
|
285
|
+
const hasReasoningFields = () => pendingLegacyNativeReasoning.length > 0;
|
|
286
|
+
for (const rawItem of input) {
|
|
287
|
+
const item = rawItem;
|
|
288
|
+
const providerOpaque = opaqueMarkerOf(item);
|
|
289
|
+
if (providerOpaque) {
|
|
290
|
+
const tag = providerOpaque.provider;
|
|
291
|
+
if (!isOwnOpaqueTag(tag, providerId)) {
|
|
292
|
+
throw new Error(`Refusing to splice provider_opaque from '${tag}' into '${providerId}' request: opaque items are only valid on the provider that produced them`);
|
|
293
|
+
}
|
|
294
|
+
const rawPayload = item.type === 'provider_opaque' ? item.item : item;
|
|
295
|
+
const { providerOpaque: _marker, type: _type, ...payload } = rawPayload;
|
|
296
|
+
opaquePayloads.push(payload);
|
|
297
|
+
continue;
|
|
298
|
+
}
|
|
171
299
|
if (item.type === 'reasoning') {
|
|
172
300
|
const directNativeReasoning = item.providerMetadata?.reasoning_content;
|
|
173
301
|
// Persistence intentionally removes the duplicate text field from a
|
|
174
|
-
// standalone reasoning item
|
|
175
|
-
//
|
|
176
|
-
|
|
177
|
-
const nativeReasoning = typeof directNativeReasoning === 'string'
|
|
302
|
+
// standalone reasoning item, so the marker is what identifies restored
|
|
303
|
+
// native reasoning from before the opaque lane.
|
|
304
|
+
const legacyNativeReasoning = typeof directNativeReasoning === 'string'
|
|
178
305
|
? directNativeReasoning
|
|
179
306
|
: item.providerMetadata?.openai_compatible_reasoning_content === true
|
|
180
307
|
? item.text
|
|
181
308
|
: undefined;
|
|
182
|
-
if (typeof
|
|
183
|
-
|
|
309
|
+
if (typeof legacyNativeReasoning === 'string') {
|
|
310
|
+
pendingLegacyNativeReasoning += legacyNativeReasoning;
|
|
184
311
|
}
|
|
185
|
-
else {
|
|
186
|
-
//
|
|
187
|
-
//
|
|
188
|
-
// provider
|
|
312
|
+
else if (!historyCarriesOwnOpaque && typeof item.text === 'string') {
|
|
313
|
+
// Reasoning from a provider with no chat-completions wire form (an
|
|
314
|
+
// Anthropic thinking block restored across a model switch, say). It is
|
|
315
|
+
// not this provider's `reasoning_content`, and inventing that field
|
|
316
|
+
// would hand one provider another's private state. Retain it as plain
|
|
317
|
+
// assistant text, the only shape this wire has for it.
|
|
189
318
|
messages.push({ role: 'assistant', content: item.text });
|
|
190
319
|
}
|
|
191
320
|
continue;
|
|
@@ -199,13 +328,14 @@ function openAICompatibleMessages(input) {
|
|
|
199
328
|
}
|
|
200
329
|
return { type: 'text', text: part.text };
|
|
201
330
|
});
|
|
202
|
-
|
|
331
|
+
const message = {
|
|
203
332
|
role: item.role,
|
|
204
333
|
content,
|
|
205
|
-
...(item.role === 'assistant' &&
|
|
206
|
-
}
|
|
334
|
+
...(item.role === 'assistant' && hasReasoningFields() ? reasoningFields() : {}),
|
|
335
|
+
};
|
|
336
|
+
messages.push(message);
|
|
207
337
|
if (item.role === 'assistant')
|
|
208
|
-
|
|
338
|
+
pendingLegacyNativeReasoning = '';
|
|
209
339
|
continue;
|
|
210
340
|
}
|
|
211
341
|
if (item.type === 'tool_call') {
|
|
@@ -215,13 +345,14 @@ function openAICompatibleMessages(input) {
|
|
|
215
345
|
previous.tool_calls.push(toolCall);
|
|
216
346
|
}
|
|
217
347
|
else {
|
|
218
|
-
|
|
348
|
+
const message = {
|
|
219
349
|
role: 'assistant',
|
|
220
|
-
...(
|
|
350
|
+
...(hasReasoningFields() ? { content: null, ...reasoningFields() } : {}),
|
|
221
351
|
tool_calls: [toolCall],
|
|
222
|
-
}
|
|
352
|
+
};
|
|
353
|
+
messages.push(message);
|
|
223
354
|
}
|
|
224
|
-
|
|
355
|
+
pendingLegacyNativeReasoning = '';
|
|
225
356
|
continue;
|
|
226
357
|
}
|
|
227
358
|
if (item.type === 'tool_result') {
|
|
@@ -233,16 +364,53 @@ function openAICompatibleMessages(input) {
|
|
|
233
364
|
}
|
|
234
365
|
}
|
|
235
366
|
// Chat Completions requires assistant messages to contain content or tool
|
|
236
|
-
// calls. Native reasoning is continuation metadata for the matching
|
|
237
|
-
//
|
|
238
|
-
//
|
|
239
|
-
|
|
367
|
+
// calls. Native reasoning is continuation metadata for the matching assistant
|
|
368
|
+
// message/tool call, not a valid standalone message; if no such item follows
|
|
369
|
+
// — an interrupted turn — omit it rather than inventing a message to carry
|
|
370
|
+
// it or back-dating it onto an earlier one that did not produce it.
|
|
371
|
+
return attachOpaquePayloads(coalesceReasoningToolCallBatches(messages), opaquePayloads);
|
|
372
|
+
}
|
|
373
|
+
/**
|
|
374
|
+
* Splices each turn's continuity payload onto the assistant message that turn
|
|
375
|
+
* produced. Both lists are in turn order and coalescing has already collapsed a
|
|
376
|
+
* turn's parallel tool calls into one assistant message, so the i-th payload
|
|
377
|
+
* belongs to the i-th assistant message. Surplus payloads — turns that
|
|
378
|
+
* coalescing merged into a single message — fold into the last one rather than
|
|
379
|
+
* being dropped.
|
|
380
|
+
*/
|
|
381
|
+
function attachOpaquePayloads(messages, payloads) {
|
|
382
|
+
if (!payloads.length)
|
|
383
|
+
return messages;
|
|
384
|
+
const assistants = messages.filter((message) => message?.role === 'assistant');
|
|
385
|
+
if (!assistants.length)
|
|
386
|
+
return messages;
|
|
387
|
+
payloads.forEach((payload, index) => {
|
|
388
|
+
const target = assistants[Math.min(index, assistants.length - 1)];
|
|
389
|
+
// The payload carries this turn's reasoning in the provider's own spelling,
|
|
390
|
+
// so it supersedes any normalized `reasoning_content` reconstructed for the
|
|
391
|
+
// same message — keeping both would send the same tokens twice, in two
|
|
392
|
+
// different fields.
|
|
393
|
+
for (const field of REASONING_WIRE_FIELDS) {
|
|
394
|
+
if (!(field in payload))
|
|
395
|
+
delete target[field];
|
|
396
|
+
}
|
|
397
|
+
Object.assign(target, payload);
|
|
398
|
+
// A reasoning-bearing tool-call message states `content: null` explicitly
|
|
399
|
+
// rather than omitting it; a payload that adds the reasoning has to carry
|
|
400
|
+
// that pairing too, or the two ways a message can acquire reasoning would
|
|
401
|
+
// serialize differently.
|
|
402
|
+
if (Array.isArray(target.tool_calls) && !('content' in target))
|
|
403
|
+
target.content = null;
|
|
404
|
+
});
|
|
405
|
+
return messages;
|
|
240
406
|
}
|
|
241
407
|
function coalesceReasoningToolCallBatches(messages) {
|
|
242
408
|
const result = [];
|
|
243
409
|
for (let index = 0; index < messages.length; index += 1) {
|
|
244
410
|
const message = messages[index];
|
|
245
|
-
|
|
411
|
+
const hasReasoning = message?.role === 'assistant' &&
|
|
412
|
+
(message.reasoning_content != null || message.reasoning != null || message.reasoning_details != null);
|
|
413
|
+
if (!hasReasoning || !Array.isArray(message.tool_calls)) {
|
|
246
414
|
result.push(message);
|
|
247
415
|
continue;
|
|
248
416
|
}
|
|
@@ -257,6 +425,8 @@ function coalesceReasoningToolCallBatches(messages) {
|
|
|
257
425
|
if (next?.role === 'assistant' &&
|
|
258
426
|
Array.isArray(next.tool_calls) &&
|
|
259
427
|
next.reasoning_content == null &&
|
|
428
|
+
next.reasoning == null &&
|
|
429
|
+
next.reasoning_details == null &&
|
|
260
430
|
next.content == null) {
|
|
261
431
|
message.tool_calls.push(...next.tool_calls);
|
|
262
432
|
index += 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-chat-completions-model.js","sourceRoot":"","sources":["../../source/providers/openai-chat-completions-model.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openai-chat-completions-model.js","sourceRoot":"","sources":["../../source/providers/openai-chat-completions-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible-lazy.d.ts","sourceRoot":"","sources":["../../source/providers/openai-compatible-lazy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAyC,MAAM,eAAe,CAAC;AAC/F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"openai-compatible-lazy.d.ts","sourceRoot":"","sources":["../../source/providers/openai-compatible-lazy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAyC,MAAM,eAAe,CAAC;AAC/F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAG5E,wBAAgB,wCAAwC,CAAC,MAAM,EAAE,oBAAoB,GAAG,kBAAkB,CAgDzG"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { resolveProviderCredentialValue } from '../utils/ai/provider-credentials.js';
|
|
1
2
|
export function createOpenAICompatibleProviderDefinition(config) {
|
|
2
3
|
const providerId = config.name;
|
|
3
4
|
const label = config.label ?? config.name;
|
|
@@ -18,7 +19,7 @@ export function createOpenAICompatibleProviderDefinition(config) {
|
|
|
18
19
|
label: entry.name ? String(entry.name) : providerId,
|
|
19
20
|
type: entry.type ? String(entry.type) : 'openai-compatible',
|
|
20
21
|
baseUrl: entry.baseUrl ? String(entry.baseUrl) : undefined,
|
|
21
|
-
apiKey:
|
|
22
|
+
apiKey: resolveProviderCredentialValue(settingsService, providerId),
|
|
22
23
|
};
|
|
23
24
|
const provider = createCustomProviderModelProvider(resolvedConfig, {
|
|
24
25
|
defaultModel: model || settingsService.get('agent.model') || '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible-lazy.js","sourceRoot":"","sources":["../../source/providers/openai-compatible-lazy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openai-compatible-lazy.js","sourceRoot":"","sources":["../../source/providers/openai-compatible-lazy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible-middleware.d.ts","sourceRoot":"","sources":["../../source/providers/openai-compatible-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"openai-compatible-middleware.d.ts","sourceRoot":"","sources":["../../source/providers/openai-compatible-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAuC1D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CA+BvD;AAED,wBAAgB,gCAAgC,CAC9C,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;IACR,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;IAC/C,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACpC,GACA,eAAe,CAkCjB;AAED,wBAAgB,4BAA4B,IAAI,eAAe,CAe9D;AAED,wBAAgB,+BAA+B,CAC7C,YAAY,CAAC,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;IACR,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;IAC/C,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACpC,GACA,eAAe,CAoBjB"}
|
|
@@ -2,18 +2,6 @@ import { mergeAssistantMessages } from './ai-sdk-message-normalizer.js';
|
|
|
2
2
|
import { addCacheControlToLastTwoMessages } from './common/openai-compatible-messages.js';
|
|
3
3
|
import { applyLlamaCppRequestTransform } from './llama-cpp.provider.js';
|
|
4
4
|
import { createOpencodeSessionInjector } from './opencode-session.js';
|
|
5
|
-
function preserveReasoningContentForOpenAICompatibleMessages(messages) {
|
|
6
|
-
return messages.map((message) => {
|
|
7
|
-
if (message?.role !== 'assistant' || typeof message.reasoning !== 'string') {
|
|
8
|
-
return message;
|
|
9
|
-
}
|
|
10
|
-
const { reasoning, ...rest } = message;
|
|
11
|
-
return {
|
|
12
|
-
...rest,
|
|
13
|
-
reasoning_content: typeof message.reasoning_content === 'string' ? message.reasoning_content : reasoning,
|
|
14
|
-
};
|
|
15
|
-
});
|
|
16
|
-
}
|
|
17
5
|
function sanitizeOpenAICompatibleMessages(messages) {
|
|
18
6
|
return messages.map((message) => {
|
|
19
7
|
if (!message || typeof message !== 'object')
|
|
@@ -75,7 +63,7 @@ export function createOpenAICompatibleMiddleware(providerType, baseUrl, options)
|
|
|
75
63
|
const body = JSON.parse(ctx.init.body);
|
|
76
64
|
let changed = false;
|
|
77
65
|
if (Array.isArray(body?.messages)) {
|
|
78
|
-
body.messages = sanitizeOpenAICompatibleMessages(
|
|
66
|
+
body.messages = sanitizeOpenAICompatibleMessages(mergeAssistantMessages(body.messages));
|
|
79
67
|
addCacheControlToLastTwoMessages(body.messages, body.model);
|
|
80
68
|
changed = true;
|
|
81
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible-middleware.js","sourceRoot":"","sources":["../../source/providers/openai-compatible-middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAC1F,OAAO,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAEtE,SAAS,
|
|
1
|
+
{"version":3,"file":"openai-compatible-middleware.js","sourceRoot":"","sources":["../../source/providers/openai-compatible-middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,11 +6,12 @@ export interface CostTrailerCapture {
|
|
|
6
6
|
cost?: string;
|
|
7
7
|
}
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
9
|
+
* Intercepts response stream metadata for OpenAI-compatible client calls.
|
|
10
10
|
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
11
|
+
* Wire fields (`reasoning_content` vs `reasoning`) are preserved verbatim.
|
|
12
|
+
* Cost-only trailers are intercepted: the reported USD charge is captured into
|
|
13
|
+
* `costCapture` (billing metadata) while the trailer itself is kept out of the
|
|
14
|
+
* SDK usage accumulator.
|
|
14
15
|
*/
|
|
15
16
|
export declare function applyClientResponseNormalization(client: OpenAI, loggingService?: ILoggingService, costCapture?: CostTrailerCapture): void;
|
|
16
17
|
//# sourceMappingURL=openai-compatible-response-normalizer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible-response-normalizer.d.ts","sourceRoot":"","sources":["../../source/providers/openai-compatible-response-normalizer.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"openai-compatible-response-normalizer.d.ts","sourceRoot":"","sources":["../../source/providers/openai-compatible-response-normalizer.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAEzE,8EAA8E;AAC9E,MAAM,WAAW,kBAAkB;IACjC,0EAA0E;IAC1E,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AA4DD;;;;;;;GAOG;AACH,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,eAAe,EAChC,WAAW,CAAC,EAAE,kBAAkB,GAC/B,IAAI,CAiBN"}
|
|
@@ -1,8 +1,3 @@
|
|
|
1
|
-
function normalizeMessageField(target) {
|
|
2
|
-
if (target && typeof target.reasoning_content === 'string' && typeof target.reasoning !== 'string') {
|
|
3
|
-
target.reasoning = target.reasoning_content;
|
|
4
|
-
}
|
|
5
|
-
}
|
|
6
1
|
function isCostOnlyTrailer(chunk) {
|
|
7
2
|
if (!chunk || typeof chunk !== 'object')
|
|
8
3
|
return false;
|
|
@@ -45,9 +40,6 @@ function createNormalizedReasoningStream(stream, loggingService, costCapture) {
|
|
|
45
40
|
if (choices.length === 1 && choices[0].index !== 0) {
|
|
46
41
|
choices[0].index = 0;
|
|
47
42
|
}
|
|
48
|
-
for (const choice of choices) {
|
|
49
|
-
normalizeMessageField(choice.delta);
|
|
50
|
-
}
|
|
51
43
|
}
|
|
52
44
|
return result;
|
|
53
45
|
},
|
|
@@ -56,11 +48,12 @@ function createNormalizedReasoningStream(stream, loggingService, costCapture) {
|
|
|
56
48
|
};
|
|
57
49
|
}
|
|
58
50
|
/**
|
|
59
|
-
*
|
|
51
|
+
* Intercepts response stream metadata for OpenAI-compatible client calls.
|
|
60
52
|
*
|
|
61
|
-
*
|
|
62
|
-
*
|
|
63
|
-
*
|
|
53
|
+
* Wire fields (`reasoning_content` vs `reasoning`) are preserved verbatim.
|
|
54
|
+
* Cost-only trailers are intercepted: the reported USD charge is captured into
|
|
55
|
+
* `costCapture` (billing metadata) while the trailer itself is kept out of the
|
|
56
|
+
* SDK usage accumulator.
|
|
64
57
|
*/
|
|
65
58
|
export function applyClientResponseNormalization(client, loggingService, costCapture) {
|
|
66
59
|
const originalCreate = client.chat.completions.create.bind(client.chat.completions);
|
|
@@ -70,12 +63,8 @@ export function applyClientResponseNormalization(client, loggingService, costCap
|
|
|
70
63
|
const result = await originalCreate(...args);
|
|
71
64
|
if (!result || typeof result !== 'object')
|
|
72
65
|
return result;
|
|
73
|
-
if (Array.isArray(result.choices))
|
|
74
|
-
for (const choice of result.choices) {
|
|
75
|
-
normalizeMessageField(choice.message);
|
|
76
|
-
}
|
|
66
|
+
if (Array.isArray(result.choices))
|
|
77
67
|
return result;
|
|
78
|
-
}
|
|
79
68
|
if (typeof result[Symbol.asyncIterator] === 'function') {
|
|
80
69
|
return createNormalizedReasoningStream(result, loggingService, costCapture);
|
|
81
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible-response-normalizer.js","sourceRoot":"","sources":["../../source/providers/openai-compatible-response-normalizer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openai-compatible-response-normalizer.js","sourceRoot":"","sources":["../../source/providers/openai-compatible-response-normalizer.ts"],"names":[],"mappings":"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"}
|