@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
|
@@ -7,6 +7,13 @@ import type { ProviderHistorySnapshot } from '../conversation/conversation-store
|
|
|
7
7
|
import { type InputSurgeInputKind, type InputSurgeDecision } from '../input-surge-guard.js';
|
|
8
8
|
import { type LargeUncachedInputDecision } from '../large-uncached-input-guard.js';
|
|
9
9
|
import { type UserTurn } from '../../types/user-turn.js';
|
|
10
|
+
/**
|
|
11
|
+
* Byte size of `JSON.stringify([...finalizedHistory, draftItem])` without
|
|
12
|
+
* re-serializing the finalized prefix. Finalized messages never change while
|
|
13
|
+
* the user types, so callers cache `historyBytes`/`historyLength` once per
|
|
14
|
+
* history identity and only re-measure the draft.
|
|
15
|
+
*/
|
|
16
|
+
export declare const combineHistoryAndDraftBytes: (historyBytes: number, historyLength: number, draftItemBytes: number) => number;
|
|
10
17
|
export type SessionInputPlan = {
|
|
11
18
|
streamInput: ProviderInput;
|
|
12
19
|
inputSurgeKind: 'delta' | 'full_history';
|
|
@@ -34,6 +41,7 @@ export declare class SessionInputPlanner {
|
|
|
34
41
|
toolTracker: SessionToolTracker;
|
|
35
42
|
providerContinuity: ProviderContinuity;
|
|
36
43
|
getProviderHistorySnapshot?: () => ProviderHistorySnapshot;
|
|
44
|
+
getHistoryIdentity?: () => string;
|
|
37
45
|
});
|
|
38
46
|
/**
|
|
39
47
|
* Inspect the input for a potential input surge condition.
|
|
@@ -92,6 +100,14 @@ export declare class SessionInputPlanner {
|
|
|
92
100
|
* Preview what the large-uncached-input guard would decide for the given input.
|
|
93
101
|
*
|
|
94
102
|
* Does not mutate any state or consume the pending mode notice.
|
|
103
|
+
*
|
|
104
|
+
* Cost model while typing:
|
|
105
|
+
* 1. Session risk check (`mightWarn`) — free; skips everything when a warn
|
|
106
|
+
* is impossible (active chat, same config).
|
|
107
|
+
* 2. Finalized history is measured once per history identity and cached —
|
|
108
|
+
* finalized messages never change while the user types.
|
|
109
|
+
* 3. Each preview only re-sizes the draft turn and combines it with the
|
|
110
|
+
* cached history bytes (no full-history `JSON.stringify`).
|
|
95
111
|
*/
|
|
96
112
|
previewLargeUncachedInput(input: string | UserTurn, now?: number, context?: {
|
|
97
113
|
pendingModeNotice?: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-input-planner.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-input-planner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAqB,MAAM,mCAAmC,CAAC;AAC1F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAmB,KAAK,mBAAmB,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7G,OAAO,
|
|
1
|
+
{"version":3,"file":"session-input-planner.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-input-planner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAqB,MAAM,mCAAmC,CAAC;AAC1F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAmB,KAAK,mBAAmB,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7G,OAAO,EAGL,KAAK,0BAA0B,EAChC,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EAAqB,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAY5E;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,iBACxB,MAAM,iBACL,MAAM,kBACL,MAAM,KACrB,MAAwF,CAAC;AAE5F,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,aAAa,CAAC;IAC3B,cAAc,EAAE,OAAO,GAAG,cAAc,CAAC;IACzC,aAAa,EAAE,QAAQ,CAAC;IACxB,0EAA0E;IAC1E,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;CACnD,CAAC;AAUF;;;;;;;;;;;GAWG;AACH,qBAAa,mBAAmB;;IAY9B,YAAY,IAAI,EAAE;QAChB,eAAe,CAAC,EAAE,gBAAgB,CAAC;QACnC,WAAW,EAAE,uBAAuB,CAAC;QACrC,WAAW,EAAE,kBAAkB,CAAC;QAChC,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,0BAA0B,CAAC,EAAE,MAAM,uBAAuB,CAAC;QAC3D,kBAAkB,CAAC,EAAE,MAAM,MAAM,CAAC;KACnC,EAOA;IAED;;;OAGG;IACH,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,mBAAmB,GAAG,kBAAkB,CAE7E;IAED;;;;OAIG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,OAAO,CAAC,EAAE;QAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,kBAAkB,CAO/G;IAED;;OAEG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE;QAAE,IAAI,EAAE,OAAO,GAAG,cAAc,CAAC;QAAC,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAUxG;IAED;;OAEG;IACH,KAAK,IAAI,IAAI,CAIZ;IAED;;OAEG;IACH,kBAAkB,CAAC,OAAO,EAAE;QAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAEhE;IAED;;OAEG;IACH,gBAAgB,IAAI,IAAI,CAEvB;IAED;;OAEG;IACH,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,GAAG,cAAc,GAAG,IAAI,CAE5E;IAED;;;;;;;;;OASG;IACH,KAAK,CACH,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;KAAE,GAC/F,gBAAgB,CA2DlB;IAED;;;;;;;;;;;;OAYG;IACH,yBAAyB,CACvB,KAAK,EAAE,MAAM,GAAG,QAAQ,EACxB,GAAG,CAAC,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAC9C,0BAA0B,CA2B5B;CAiJF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { InputSurgeGuard } from '../input-surge-guard.js';
|
|
2
|
-
import { LargeUncachedInputGuard } from '../large-uncached-input-guard.js';
|
|
2
|
+
import { getSerializedInputBytes, LargeUncachedInputGuard, } from '../large-uncached-input-guard.js';
|
|
3
3
|
import { getProvider } from '../../providers/index.js';
|
|
4
4
|
import { getMethod } from '../interruption-info.js';
|
|
5
5
|
import { normalizeUserTurn } from '../../types/user-turn.js';
|
|
@@ -8,6 +8,13 @@ const supportsConversationChaining = (providerId) => {
|
|
|
8
8
|
const providerDef = getProvider(providerId);
|
|
9
9
|
return providerDef?.capabilities?.supportsConversationChaining ?? false;
|
|
10
10
|
};
|
|
11
|
+
/**
|
|
12
|
+
* Byte size of `JSON.stringify([...finalizedHistory, draftItem])` without
|
|
13
|
+
* re-serializing the finalized prefix. Finalized messages never change while
|
|
14
|
+
* the user types, so callers cache `historyBytes`/`historyLength` once per
|
|
15
|
+
* history identity and only re-measure the draft.
|
|
16
|
+
*/
|
|
17
|
+
export const combineHistoryAndDraftBytes = (historyBytes, historyLength, draftItemBytes) => (historyLength === 0 ? draftItemBytes + 2 : historyBytes + draftItemBytes + 1);
|
|
11
18
|
/**
|
|
12
19
|
* Owns all input construction and guard logic for a conversation session.
|
|
13
20
|
*
|
|
@@ -26,14 +33,18 @@ export class SessionInputPlanner {
|
|
|
26
33
|
#toolTracker;
|
|
27
34
|
#providerContinuity;
|
|
28
35
|
#getProviderHistorySnapshot;
|
|
36
|
+
/** Cheap history identity — must not clone the transcript. */
|
|
37
|
+
#getHistoryIdentity;
|
|
29
38
|
#inputSurgeGuard = new InputSurgeGuard();
|
|
30
39
|
#largeUncachedInputGuard = new LargeUncachedInputGuard();
|
|
40
|
+
#outgoingSizeCache = null;
|
|
31
41
|
constructor(deps) {
|
|
32
42
|
this.#settingsService = deps.settingsService;
|
|
33
43
|
this.#agentClient = deps.agentClient;
|
|
34
44
|
this.#toolTracker = deps.toolTracker;
|
|
35
45
|
this.#providerContinuity = deps.providerContinuity;
|
|
36
46
|
this.#getProviderHistorySnapshot = deps.getProviderHistorySnapshot;
|
|
47
|
+
this.#getHistoryIdentity = deps.getHistoryIdentity;
|
|
37
48
|
}
|
|
38
49
|
/**
|
|
39
50
|
* Inspect the input for a potential input surge condition.
|
|
@@ -75,6 +86,7 @@ export class SessionInputPlanner {
|
|
|
75
86
|
reset() {
|
|
76
87
|
this.#inputSurgeGuard.reset();
|
|
77
88
|
this.#largeUncachedInputGuard.reset();
|
|
89
|
+
this.#outgoingSizeCache = null;
|
|
78
90
|
}
|
|
79
91
|
/**
|
|
80
92
|
* Mark a resumed session on the large-uncached-input guard.
|
|
@@ -128,7 +140,17 @@ export class SessionInputPlanner {
|
|
|
128
140
|
// Fall back to stateless mode where the arguments can be sanitized before
|
|
129
141
|
// sending.
|
|
130
142
|
const hasMalformedArgs = hasMalformedToolCallArguments(outgoingHistory);
|
|
131
|
-
|
|
143
|
+
// Unpaid tool debt means previous_response_id still requires function_call
|
|
144
|
+
// outputs. A text-only delta would 400 ("No tool output found for function
|
|
145
|
+
// call …"). Drop the chain and send self-contained full history instead.
|
|
146
|
+
const hasUnsettledChainDebt = this.#providerContinuity.hasOutstandingToolDebt();
|
|
147
|
+
if (hasUnsettledChainDebt && this.#providerContinuity.previousResponseId) {
|
|
148
|
+
this.#providerContinuity.clear();
|
|
149
|
+
}
|
|
150
|
+
const useChaining = supportsChaining &&
|
|
151
|
+
!hasMalformedArgs &&
|
|
152
|
+
!hasUnsettledChainDebt &&
|
|
153
|
+
this.#providerContinuity.isChainingAvailable(outgoingHistory.length);
|
|
132
154
|
const latestInput = outgoingHistory[outgoingHistory.length - 1] ?? effectiveTurn.text;
|
|
133
155
|
const chainedInput = effectiveTurn.images?.length ? latestInput : effectiveTurn.text;
|
|
134
156
|
// Stateless (full-history) inputs must be self-contained: the Responses
|
|
@@ -155,23 +177,108 @@ export class SessionInputPlanner {
|
|
|
155
177
|
* Preview what the large-uncached-input guard would decide for the given input.
|
|
156
178
|
*
|
|
157
179
|
* Does not mutate any state or consume the pending mode notice.
|
|
180
|
+
*
|
|
181
|
+
* Cost model while typing:
|
|
182
|
+
* 1. Session risk check (`mightWarn`) — free; skips everything when a warn
|
|
183
|
+
* is impossible (active chat, same config).
|
|
184
|
+
* 2. Finalized history is measured once per history identity and cached —
|
|
185
|
+
* finalized messages never change while the user types.
|
|
186
|
+
* 3. Each preview only re-sizes the draft turn and combines it with the
|
|
187
|
+
* cached history bytes (no full-history `JSON.stringify`).
|
|
158
188
|
*/
|
|
159
189
|
previewLargeUncachedInput(input, now, context) {
|
|
160
|
-
const
|
|
161
|
-
const
|
|
162
|
-
|
|
163
|
-
pendingModeNotice: context?.pendingModeNotice ?? null,
|
|
164
|
-
});
|
|
165
|
-
return this.#largeUncachedInputGuard.inspect({
|
|
166
|
-
input: streamInput,
|
|
167
|
-
now: now ?? Date.now(),
|
|
190
|
+
const at = now ?? Date.now();
|
|
191
|
+
const riskContext = {
|
|
192
|
+
now: at,
|
|
168
193
|
provider: this.#getProviderForGuard(),
|
|
169
194
|
model: this.#getModelForGuard(),
|
|
170
195
|
reasoningEffort: this.#getReasoningEffortForGuard(),
|
|
171
196
|
mode: this.#getTrafficMode(),
|
|
197
|
+
};
|
|
198
|
+
if (!this.#largeUncachedInputGuard.mightWarn(riskContext)) {
|
|
199
|
+
return {
|
|
200
|
+
action: 'allow',
|
|
201
|
+
warningKey: '',
|
|
202
|
+
reasons: [],
|
|
203
|
+
estimatedTokens: 0,
|
|
204
|
+
estimatedBytes: 0,
|
|
205
|
+
};
|
|
206
|
+
}
|
|
207
|
+
const turn = normalizeUserTurn(input);
|
|
208
|
+
const effectiveTurn = this.#turnWithModeNotice(turn, context?.pendingModeNotice ?? null);
|
|
209
|
+
const { estimatedBytes, contentKey } = this.#estimateOutgoingInputSize(effectiveTurn);
|
|
210
|
+
return this.#largeUncachedInputGuard.inspect({
|
|
211
|
+
estimatedBytes,
|
|
212
|
+
contentKey,
|
|
213
|
+
...riskContext,
|
|
172
214
|
});
|
|
173
215
|
}
|
|
174
216
|
// ── Private helpers ──────────────────────────────────────────────
|
|
217
|
+
/**
|
|
218
|
+
* Size the next outgoing payload using a cache of the finalized history.
|
|
219
|
+
* Only the draft turn is re-serialized on cache hits.
|
|
220
|
+
*/
|
|
221
|
+
#estimateOutgoingInputSize(effectiveTurn) {
|
|
222
|
+
const cache = this.#getOutgoingSizeCache();
|
|
223
|
+
if (cache.useChaining) {
|
|
224
|
+
if (effectiveTurn.images?.length) {
|
|
225
|
+
const item = this.#makeUserInputItem(effectiveTurn);
|
|
226
|
+
// Chained image turns send `[userItem]`, not the bare text.
|
|
227
|
+
const estimatedBytes = getSerializedInputBytes([item]);
|
|
228
|
+
return { estimatedBytes, contentKey: `${cache.key}\nimg:${estimatedBytes}` };
|
|
229
|
+
}
|
|
230
|
+
const text = effectiveTurn.text ?? '';
|
|
231
|
+
const estimatedBytes = getSerializedInputBytes(text);
|
|
232
|
+
return { estimatedBytes, contentKey: `${cache.key}\n${text}` };
|
|
233
|
+
}
|
|
234
|
+
const draftItem = this.#makeUserInputItem(effectiveTurn);
|
|
235
|
+
const draftItemBytes = getSerializedInputBytes(draftItem);
|
|
236
|
+
const estimatedBytes = combineHistoryAndDraftBytes(cache.finalizedHistoryBytes, cache.finalizedHistoryLength, draftItemBytes);
|
|
237
|
+
return {
|
|
238
|
+
estimatedBytes,
|
|
239
|
+
contentKey: `${cache.key}\n${effectiveTurn.text ?? ''}\n${draftItemBytes}`,
|
|
240
|
+
};
|
|
241
|
+
}
|
|
242
|
+
#getOutgoingSizeCache() {
|
|
243
|
+
const key = this.#outgoingSizeCacheKey();
|
|
244
|
+
if (this.#outgoingSizeCache?.key === key) {
|
|
245
|
+
return this.#outgoingSizeCache;
|
|
246
|
+
}
|
|
247
|
+
const provider = this.#getProviderForGuard() ?? 'openai';
|
|
248
|
+
const dynamicSupportsChaining = getMethod(this.#agentClient, 'supportsConversationChaining');
|
|
249
|
+
const supportsChaining = dynamicSupportsChaining
|
|
250
|
+
? dynamicSupportsChaining.call(this.#agentClient)
|
|
251
|
+
: supportsConversationChaining(provider);
|
|
252
|
+
const history = this.#toolTracker.getReconciledHistory();
|
|
253
|
+
// The draft user turn is never a function_call, so malformed-arg detection
|
|
254
|
+
// on history alone matches build(includeTurn: true).
|
|
255
|
+
const hasMalformedArgs = hasMalformedToolCallArguments(history);
|
|
256
|
+
const useChaining = supportsChaining && !hasMalformedArgs && this.#providerContinuity.isChainingAvailable(history.length + 1);
|
|
257
|
+
if (useChaining) {
|
|
258
|
+
this.#outgoingSizeCache = {
|
|
259
|
+
key,
|
|
260
|
+
useChaining: true,
|
|
261
|
+
finalizedHistoryBytes: 0,
|
|
262
|
+
finalizedHistoryLength: 0,
|
|
263
|
+
};
|
|
264
|
+
return this.#outgoingSizeCache;
|
|
265
|
+
}
|
|
266
|
+
const finalizedHistory = sanitizeMalformedToolCallArguments(dropUnpairedFunctionCalls(history));
|
|
267
|
+
this.#outgoingSizeCache = {
|
|
268
|
+
key,
|
|
269
|
+
useChaining: false,
|
|
270
|
+
finalizedHistoryBytes: getSerializedInputBytes(finalizedHistory),
|
|
271
|
+
finalizedHistoryLength: finalizedHistory.length,
|
|
272
|
+
};
|
|
273
|
+
return this.#outgoingSizeCache;
|
|
274
|
+
}
|
|
275
|
+
#outgoingSizeCacheKey() {
|
|
276
|
+
const historyIdentity = this.#getHistoryIdentity?.() ?? this.#getProviderHistorySnapshot?.()?.identity ?? 'unknown-history';
|
|
277
|
+
// Continuity can flip full-history vs delta without a history revision.
|
|
278
|
+
const continuity = `${this.#providerContinuity.previousResponseId ?? ''}:${this.#providerContinuity.chainingBroken ? 1 : 0}`;
|
|
279
|
+
const provider = this.#getProviderForGuard() ?? '';
|
|
280
|
+
return `${historyIdentity}|${continuity}|${provider}`;
|
|
281
|
+
}
|
|
175
282
|
#getTrafficMode() {
|
|
176
283
|
if (!this.#settingsService)
|
|
177
284
|
return 'standard';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-input-planner.js","sourceRoot":"","sources":["../../../source/services/session/session-input-planner.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAqD,MAAM,yBAAyB,CAAC;AAC7G,OAAO,
|
|
1
|
+
{"version":3,"file":"session-input-planner.js","sourceRoot":"","sources":["../../../source/services/session/session-input-planner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-stream-processor.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-stream-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,iDAAiD,CAAC;AAC7G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAgD,KAAK,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAQpH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG/E,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,mBAAmB,GAAG,iBAAiB,CAAC;AAE1F,MAAM,MAAM,wBAAwB,GAChC;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAmC1B,eAAO,MAAM,oBAAoB,UAAW,SAAS,OAAO,EAAE,KAAG,kBAAkB,GAAG,SAcrF,CAAC;AAqGF,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,kBAAkB,CAAC;IAChC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,8EAA8E;IAC9E,qCAAqC,CAAC,EAAE,qCAAqC,CAAC;IAC9E,eAAe,EAAE,eAAe,CAAC;IACjC,mEAAmE;IACnE,OAAO,EAAE,oBAAoB,CAAC;IAC9B,8EAA8E;IAC9E,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,mBAAmB,CAAC;IAC5B,wBAAwB,EAAE,OAAO,CAAC;IAClC,2BAA2B,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC3C;AAED,qBAAa,sBAAsB
|
|
1
|
+
{"version":3,"file":"session-stream-processor.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-stream-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,iDAAiD,CAAC;AAC7G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAgD,KAAK,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAQpH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG/E,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,mBAAmB,GAAG,iBAAiB,CAAC;AAE1F,MAAM,MAAM,wBAAwB,GAChC;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAmC1B,eAAO,MAAM,oBAAoB,UAAW,SAAS,OAAO,EAAE,KAAG,kBAAkB,GAAG,SAcrF,CAAC;AAqGF,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,kBAAkB,CAAC;IAChC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,8EAA8E;IAC9E,qCAAqC,CAAC,EAAE,qCAAqC,CAAC;IAC9E,eAAe,EAAE,eAAe,CAAC;IACjC,mEAAmE;IACnE,OAAO,EAAE,oBAAoB,CAAC;IAC9B,8EAA8E;IAC9E,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,mBAAmB,CAAC;IAC5B,wBAAwB,EAAE,OAAO,CAAC;IAClC,2BAA2B,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC3C;AAED,qBAAa,sBAAsB;;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,0BAA0B,EAAI;IAEjE;;;OAGG;IACI,OAAO,CACZ,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,oBAAoB,GAC5B,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,IAAI,CAAC,CA0H5D;IAED;;;OAGG;IACH,QAAQ,CACN,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,eAAe,EACtB,SAAS,EAAE,OAAO,GAAG,cAAc,EACnC,MAAM,EAAE,mBAAmB,GAC1B,wBAAwB,CA4G1B;CAWF"}
|
|
@@ -327,6 +327,9 @@ export class SessionStreamProcessor {
|
|
|
327
327
|
const candidateWasObserved = this.deps.providerContinuity.checkpoint?.state === 'candidate';
|
|
328
328
|
const historyCommitted = postCommitSnapshot.revision !== historyRevisionBeforeCommit;
|
|
329
329
|
const promoted = this.deps.providerContinuity.publishTerminalResponse(snapshot.lastResponseId, historyCommitted, postCommitSnapshot);
|
|
330
|
+
// A terminal response that issued function calls opens unpaid chain
|
|
331
|
+
// debt; a response with no remaining unsettled calls settles it.
|
|
332
|
+
this.#syncOutstandingToolDebt();
|
|
330
333
|
if (candidateWasObserved) {
|
|
331
334
|
this.deps.openAIRootCheckpointLifecycleObserver?.publication(!historyCommitted ? 'history_not_committed' : promoted ? 'promoted' : 'candidate_not_promoted');
|
|
332
335
|
}
|
|
@@ -336,10 +339,20 @@ export class SessionStreamProcessor {
|
|
|
336
339
|
// Interrupted streams retain the established response-ID behavior, but
|
|
337
340
|
// cannot corroborate an observed checkpoint without a history commit.
|
|
338
341
|
this.deps.providerContinuity.update(snapshot.lastResponseId);
|
|
342
|
+
// Approvals and other interruptions leave the same unpaid tool debt
|
|
343
|
+
// as a clean terminal that issued function calls.
|
|
344
|
+
this.#syncOutstandingToolDebt();
|
|
339
345
|
result = { kind: 'partial' };
|
|
340
346
|
}
|
|
341
347
|
});
|
|
342
348
|
return ran ? result : { kind: 'stale' };
|
|
343
349
|
}
|
|
350
|
+
/**
|
|
351
|
+
* Mirror the tool ledger's unsettled call ids onto provider continuity so
|
|
352
|
+
* the next request can refuse a text-only delta against an unpaid chain.
|
|
353
|
+
*/
|
|
354
|
+
#syncOutstandingToolDebt() {
|
|
355
|
+
this.deps.providerContinuity.replaceOutstandingToolCallIds(this.deps.toolTracker.unsettledToolCallIdsForCurrentTurn());
|
|
356
|
+
}
|
|
344
357
|
}
|
|
345
358
|
//# sourceMappingURL=session-stream-processor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-stream-processor.js","sourceRoot":"","sources":["../../../source/services/session/session-stream-processor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-stream-processor.js","sourceRoot":"","sources":["../../../source/services/session/session-stream-processor.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,uBAAuB,EAAE,mBAAmB,EAA0B,MAAM,8BAA8B,CAAC;AACpH,OAAO,EAAE,qBAAqB,EAAE,2BAA2B,EAA6B,MAAM,uBAAuB,CAAC;AACtH,OAAO,EAAE,mCAAmC,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,oDAAoD,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,8CAA8C,EAAE,MAAM,4CAA4C,CAAC;AAI5G,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAS1F,MAAM,2BAA2B,GAAG,CAAC,KAAgB,EAAW,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;AAE1G;;;;GAIG;AACH,MAAM,+BAA+B,GAAG,CAAC,IAAa,EAAW,EAAE;IACjE,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3E,MAAM,KAAK,GAAG,IAA+B,CAAC;IAC9C,OAAO,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;AACjF,CAAC,CAAC;AAEF,MAAM,6BAA6B,GAAG,CAAC,KAAyB,EAAa,EAAE,CAC7E,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;IACrB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACxE,MAAM,KAAK,GAAG,IAA+B,CAAC;IAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/F,IACE,KAAK,CAAC,IAAI,KAAK,YAAY;QAC3B,KAAK,CAAC,IAAI,KAAK,iBAAiB;QAChC,KAAK,CAAC,IAAI,KAAK,mBAAmB;QAClC,KAAK,CAAC,IAAI,KAAK,2BAA2B;QAC1C,KAAK,CAAC,IAAI,KAAK,cAAc,EAC7B,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC,CAAC;AAEL,MAAM,kBAAkB,GAAG,CAAC,KAAgB,EAAW,EAAE,CACvD,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC;AAEvG,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAyB,EAAkC,EAAE;IAChG,IAAI,IAAoC,CAAC;IACzC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,KAAK,MAAM,UAAU,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,IACE,UAAU,CAAC,IAAI,KAAK,iBAAiB;gBACrC,UAAU,CAAC,QAAQ,KAAK,QAAQ;gBAChC,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,EACrC,CAAC;gBACD,IAAI,GAAG,UAAU,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAC/B,eAA6C,EAC7C,MAA0B,EACO,EAAE;IACnC,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAChD,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC;IAClC,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QAChD,MAAM,OAAO,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAC;QACjD,OAAO,OAAO,EAAE,IAAI,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IAC1D,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,SAAS,EAAE,8CAA8C,CAAC,UAAU,CAAC,CAAC,CAAC;AACpF,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,IAAa,EAAiB,EAAE;IACzD,KAAK,MAAM,UAAU,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAChD,IAAI,UAAU,CAAC,IAAI,KAAK,WAAW,IAAI,UAAU,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACzE,OAAO,GAAG,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QACnD,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,6BAA6B,GAAG,CACpC,KAAyB,EACzB,eAAmC,EACe,EAAE;IACpD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;QACnC,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,SAAS,EAAE,CAAC;YACd,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAc,EAAE,CAAC;IAC3B,MAAM,iBAAiB,GAAa,EAAE,CAAC;IACvC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,SAAS,IAAI,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1C,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAClC,SAAS;QACX,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACd,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,gCAAgC,GAAG,CAAC,EACxC,MAAM,EACN,SAAS,EACT,MAAM,EACN,QAAQ,GAMT,EAAQ,EAAE;IACT,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAEvC,MAAM,iBAAiB,GAAG,mCAAmC,CAAC,OAAO,CAAC,CAAC;IACvE,MAAM,kBAAkB,GAAG,mCAAmC,CAAC,QAAQ,CAAC,CAAC;IAEzE,IAAI,iBAAiB,CAAC,KAAK,KAAK,CAAC,IAAI,kBAAkB,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;QACpE,OAAO;IACT,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,mEAAmE,EAAE;QAC/E,SAAS,EAAE,4CAA4C;QACvD,QAAQ,EAAE,UAAU;QACpB,KAAK,EAAE,aAAa;QACpB,SAAS;QACT,OAAO,EAAE,MAAM,CAAC,gBAAgB,EAAE;QAClC,MAAM;QACN,aAAa,EAAE,OAAO,CAAC,MAAM;QAC7B,cAAc,EAAE,QAAQ,CAAC,MAAM;QAC/B,qBAAqB,EAAE,iBAAiB,CAAC,KAAK;QAC9C,gBAAgB,EAAE,iBAAiB,CAAC,SAAS;QAC7C,sBAAsB,EAAE,kBAAkB,CAAC,KAAK;QAChD,iBAAiB,EAAE,kBAAkB,CAAC,SAAS;KAChD,CAAC,CAAC;AACL,CAAC,CAAC;AAyBF,MAAM,OAAO,sBAAsB;IACJ,IAAI;IAAjC,YAA6B,IAAgC;oBAAhC,IAAI;IAA+B,CAAC;IAEjE;;;OAGG;IACH,KAAK,CAAC,CAAC,OAAO,CACZ,MAAmB,EACnB,OAA6B;QAE7B,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;QACtC,IAAI,OAAO,CAAC,2BAA2B,EAAE,CAAC;YACxC,GAAG,CAAC,iBAAiB,GAAG,IAAI,GAAG,CAAS,OAAO,CAAC,2BAA2B,CAAC,CAAC;QAC/E,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACtD,OAAO,GAAG,CAAC;QACb,CAAC;QAED,MAAM,oBAAoB,GAAG,OAAO,CAAC,wBAAwB;YAC3D,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC;YAC9C,CAAC,CAAC,IAAI,GAAG,EAAmB,CAAC;QAC/B,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QAC5E,MAAM,mBAAmB,GAAG,GAAS,EAAE;YACrC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;YAC5C,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,oBAAoB,EAAE,CAAC;gBAClD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACxD,CAAC;YACD,KAAK,MAAM,MAAM,IAAI,qBAAqB,EAAE,CAAC;gBAC3C,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACnD,CAAC;QACH,CAAC,CAAC;QACF,IAAI,0BAA0B,GAAG,EAAE,CAAC;QACpC,IAAI,6BAA6B,GAAG,CAAC,CAAC;QACtC,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAEpD,MAAM,SAAS,GAAG,mBAAmB,CACnC,MAAM,EACN,GAAG,EACH;YACE,qBAAqB,EAAE,oBAAoB;YAC3C,6BAA6B,EAAE,qBAAqB;YACpD,wBAAwB,EAAE,IAAI;YAC9B,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC3B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE;oBACvD,MAAM,aAAa,GACjB,0BAA0B,IAAI,GAAG,CAAC,eAAe,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;oBACzF,IAAI,aAAa,EAAE,CAAC;wBAClB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;wBACzD,6BAA6B,GAAG,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC;wBAC3D,0BAA0B,GAAG,EAAE,CAAC;oBAClC,CAAC;oBACD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBACjD,CAAC,CAAC,CAAC;YACL,CAAC;YACD,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC7B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE;oBACvD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;oBACjD,IAAI,OAAO,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;wBACrC,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;wBAC3B,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC;4BAClD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC;4BAC3E,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC;gCAC/B,IAAI,EAAE,aAAa;gCACnB,MAAM,EAAE,GAAG;gCACX,QAAQ,EAAE,KAAK,EAAE,QAAQ,IAAI,UAAU,CAAC,IAAI,CAAC;gCAC7C,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,QAAQ,IAAI,KAAK,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW;gCAC9F,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC;gCACvC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;6BACrE,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;YACD,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;gBAClB,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE;oBACvD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAC;YACL,CAAC;SACF,EACD,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAC7D,CAAC;QAEF,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QACnD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC;YACH,OAAO,IAAI,EAAE,CAAC;gBACZ,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtD,MAAM,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;oBAC1B,MAAM,GAAG,IAAI,CAAC;oBACd,OAAO,GAAG,CAAC;gBACb,CAAC;gBAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACnC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtD,MAAM,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;oBAC1B,MAAM,GAAG,IAAI,CAAC;oBACd,OAAO,GAAG,CAAC;gBACb,CAAC;gBACD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;oBACzE,MAAM,GAAG,IAAI,CAAC;oBACd,OAAO,GAAG,CAAC;gBACb,CAAC;gBAED,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;gBACzE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;oBAC1C,0BAA0B,GAAG,GAAG,CAAC,eAAe,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBACxF,CAAC;gBACD,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;oBACpF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kDAAkD,EAAE;wBACxE,SAAS,EAAE,yCAAyC;wBACpD,QAAQ,EAAE,UAAU;wBACpB,KAAK,EAAE,QAAQ;wBACf,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;wBAC9B,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;wBAC5C,YAAY,EAAE,GAAG,CAAC,WAAW,CAAC,MAAM;qBACrC,CAAC,CAAC;oBACH,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;oBAC1B,MAAM,IAAI,0BAA0B,EAAE,CAAC;gBACzC,CAAC;gBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACrE,IAAI,QAAQ,EAAE,CAAC;oBACb,MAAM,QAAQ,CAAC;gBACjB,CAAC;YACH,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,QAAQ,CACN,MAAmB,EACnB,KAAsB,EACtB,SAAmC,EACnC,MAA2B;QAE3B,IAAI,MAAM,GAA6B,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAEzD,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE;YAC7D,MAAM,QAAQ,GAAG,2BAA2B,CAAC,MAAM,CAAC,CAAC;YACrD,MAAM,gBAAgB,GAAG,6BAA6B,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACzE,MAAM,iBAAiB,GAAG;gBACxB,GAAG,QAAQ;gBACX,OAAO,EAAE,gBAAgB;gBACzB,QAAQ,EAAE,6BAA6B,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAC1D,MAAM,EAAE,6BAA6B,CAAC,QAAQ,CAAC,MAAM,CAAC;aACvD,CAAC;YACF,MAAM,4BAA4B,GAAG,CAAC,GAAG,QAAQ,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAC5F,+BAA+B,CAAC,IAAI,CAAC,CACtC,CAAC;YACF,gCAAgC,CAAC;gBAC/B,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;gBACxB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;gBAC9B,MAAM;gBACN,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC;aACxC,CAAC,CAAC;YACH,MAAM,0BAA0B,GAAG,CAAC,KAAgB,EAAQ,EAAE;gBAC5D,MAAM,aAAa,GAAG,6BAA6B,CAAC,KAAK,CAAC,CAAC;gBAC3D,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,6BAA6B,CAC/D,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,CACzC,CAAC;gBACF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACjC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0EAA0E,EAAE;wBAChG,SAAS,EAAE,4CAA4C;wBACvD,QAAQ,EAAE,UAAU;wBACpB,KAAK,EAAE,aAAa;wBACpB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;wBAC9B,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;wBAC5C,MAAM;wBACN,SAAS;wBACT,YAAY,EAAE,aAAa,CAAC,MAAM;wBAClC,YAAY,EAAE,iBAAiB,CAAC,MAAM;wBACtC,iBAAiB;qBAClB,CAAC,CAAC;gBACL,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,IAA2B,CAAC,CAAC;YACxE,CAAC,CAAC;YAEF,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC;YAC5E,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,2BAA2B,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,EAAE,CAAC,QAAQ,CAAC;gBACtG,MAAM,kBAAkB,GAAG,wBAAwB,CACjD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,EACxC,iBAAiB,CAAC,MAAM,CACzB,CAAC;gBACF,IAAI,kBAAkB,EAAE,CAAC;oBACvB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;gBACjE,CAAC;qBAAM,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;oBACjC,0BAA0B,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBACvD,CAAC;qBAAM,CAAC;oBACN,oEAAoE;oBACpE,qEAAqE;oBACrE,kEAAkE;oBAClE,yEAAyE;oBACzE,oEAAoE;oBACpE,qEAAqE;oBACrE,IAAI,4BAA4B,IAAI,2BAA2B,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;wBAC3F,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,iBAAiB,CAAC,OAA8B,CAAC,CAAC;oBAC/F,CAAC;yBAAM,IAAI,2BAA2B,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;wBACnE,0BAA0B,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;oBACzD,CAAC;yBAAM,IAAI,2BAA2B,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;wBACjE,0BAA0B,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;oBACvD,CAAC;yBAAM,IAAI,2BAA2B,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;wBAClE,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,iBAAiB,CAAC,OAA8B,CAAC,CAAC;oBAC/F,CAAC;yBAAM,IAAI,kBAAkB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAC1D,0BAA0B,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;oBACzD,CAAC;yBAAM,IAAI,kBAAkB,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;wBACxD,0BAA0B,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;oBACvD,CAAC;gBACH,CAAC;gBACD,mEAAmE;gBACnE,mEAAmE;gBACnE,qEAAqE;gBACrE,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,EAAE,CAAC;gBACpF,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,KAAK,KAAK,WAAW,CAAC;gBAC5F,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,QAAQ,KAAK,2BAA2B,CAAC;gBACrF,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,uBAAuB,CACnE,QAAQ,CAAC,cAAc,EACvB,gBAAgB,EAChB,kBAAkB,CACnB,CAAC;gBACF,oEAAoE;gBACpE,iEAAiE;gBACjE,IAAI,CAAC,wBAAwB,EAAE,CAAC;gBAChC,IAAI,oBAAoB,EAAE,CAAC;oBACzB,IAAI,CAAC,IAAI,CAAC,qCAAqC,EAAE,WAAW,CAC1D,CAAC,gBAAgB,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,wBAAwB,CAC/F,CAAC;gBACJ,CAAC;gBACD,MAAM,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACN,uEAAuE;gBACvE,sEAAsE;gBACtE,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;gBAC7D,oEAAoE;gBACpE,kDAAkD;gBAClD,IAAI,CAAC,wBAAwB,EAAE,CAAC;gBAChC,MAAM,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YAC/B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAC1C,CAAC;IAED;;;OAGG;IACH,wBAAwB;QACtB,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,6BAA6B,CACxD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,kCAAkC,EAAE,CAC3D,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -51,6 +51,12 @@ export declare class SessionToolTracker {
|
|
|
51
51
|
activeCallIdsForCurrentTurn(): string[];
|
|
52
52
|
/** Returns only completed tool-result call IDs recorded during the current turn. */
|
|
53
53
|
completedResultCallIdsForCurrentTurn(): string[];
|
|
54
|
+
/**
|
|
55
|
+
* Call ids recorded this turn that still lack a completed tool result.
|
|
56
|
+
* Aborted/failed/started entries count — the provider chain may still be
|
|
57
|
+
* waiting for an output for those calls.
|
|
58
|
+
*/
|
|
59
|
+
unsettledToolCallIdsForCurrentTurn(): string[];
|
|
54
60
|
/**
|
|
55
61
|
* Export the current ledger state.
|
|
56
62
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-tool-tracker.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-tool-tracker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,KAAK,kBAAkB,EAAY,MAAM,6BAA6B,CAAC;AACrG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAG/E;;;;;;;;GAQG;AACH,qBAAa,kBAAkB;IAOjB,OAAO,CAAC,iBAAiB;IANrC,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,qBAAqB,CAA8B;IAC3D,OAAO,CAAC,6BAA6B,CAAqB;IAC1D,OAAO,CAAC,yBAAyB,CAAqB;IACtD,OAAO,CAAC,6BAA6B,CAAqB;IAE1D,YAAoB,iBAAiB,EAAE,iBAAiB,EAAI;IAE5D;;OAEG;IACH,IAAI,MAAM,IAAI,mBAAmB,CAEhC;IAED;;OAEG;IACH,IAAI,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAExC;IAED;;OAEG;IACH,IAAI,cAAc,IAAI,GAAG,CAAC,MAAM,CAAC,CAEhC;IAED;;OAEG;IACH,SAAS,IAAI,IAAI,CAEhB;IAED;;;;OAIG;IACH,gBAAgB,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;IACH,2BAA2B,IAAI,MAAM,EAAE,CAEtC;IAED,oFAAoF;IACpF,oCAAoC,IAAI,MAAM,EAAE,CAE/C;IAED;;OAEG;IACH,MAAM,IAAI,kBAAkB,EAAE,CAE7B;IAED;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,SAAS,GAAG,IAAI,CAEtD;IAED;;OAEG;IACH,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAEtC;IAED;;OAEG;IACH,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEtC;IAED;;OAEG;IACH,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAExC;IAED;;OAEG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAEjF;IAED;;OAEG;IACH,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAEhE;IAED;;OAEG;IACH,kBAAkB,IAAI;QAAE,gBAAgB,EAAE,MAAM,EAAE,CAAC;QAAC,cAAc,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAErG;IAED;;;;;;;OAOG;IACH,uBAAuB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAwB5D;IAED;;OAEG;IACH,qBAAqB,IAAI,IAAI,CAkB5B;IAED;;OAEG;IACH,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,IAAI,CAiBpE;IAED;;OAEG;IACH,oBAAoB,IAAI,iBAAiB,EAAE,CAK1C;IAED;;;OAGG;IACH,yBAAyB,IAAI,OAAO,CAUnC;IAED;;OAEG;IACH,cAAc,IAAI,IAAI,CAErB;IAED;;OAEG;IACH,gBAAgB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAOtD;IAED;;OAEG;IACH,uBAAuB,IAAI,IAAI,CAE9B;IAED;;OAEG;IACH,KAAK,IAAI,IAAI,CAEZ;CACF"}
|
|
1
|
+
{"version":3,"file":"session-tool-tracker.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-tool-tracker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,KAAK,kBAAkB,EAAY,MAAM,6BAA6B,CAAC;AACrG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAG/E;;;;;;;;GAQG;AACH,qBAAa,kBAAkB;IAOjB,OAAO,CAAC,iBAAiB;IANrC,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,qBAAqB,CAA8B;IAC3D,OAAO,CAAC,6BAA6B,CAAqB;IAC1D,OAAO,CAAC,yBAAyB,CAAqB;IACtD,OAAO,CAAC,6BAA6B,CAAqB;IAE1D,YAAoB,iBAAiB,EAAE,iBAAiB,EAAI;IAE5D;;OAEG;IACH,IAAI,MAAM,IAAI,mBAAmB,CAEhC;IAED;;OAEG;IACH,IAAI,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAExC;IAED;;OAEG;IACH,IAAI,cAAc,IAAI,GAAG,CAAC,MAAM,CAAC,CAEhC;IAED;;OAEG;IACH,SAAS,IAAI,IAAI,CAEhB;IAED;;;;OAIG;IACH,gBAAgB,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;IACH,2BAA2B,IAAI,MAAM,EAAE,CAEtC;IAED,oFAAoF;IACpF,oCAAoC,IAAI,MAAM,EAAE,CAE/C;IAED;;;;OAIG;IACH,kCAAkC,IAAI,MAAM,EAAE,CAG7C;IAED;;OAEG;IACH,MAAM,IAAI,kBAAkB,EAAE,CAE7B;IAED;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,SAAS,GAAG,IAAI,CAEtD;IAED;;OAEG;IACH,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAEtC;IAED;;OAEG;IACH,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEtC;IAED;;OAEG;IACH,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAExC;IAED;;OAEG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAEjF;IAED;;OAEG;IACH,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAEhE;IAED;;OAEG;IACH,kBAAkB,IAAI;QAAE,gBAAgB,EAAE,MAAM,EAAE,CAAC;QAAC,cAAc,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAErG;IAED;;;;;;;OAOG;IACH,uBAAuB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAwB5D;IAED;;OAEG;IACH,qBAAqB,IAAI,IAAI,CAkB5B;IAED;;OAEG;IACH,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,IAAI,CAiBpE;IAED;;OAEG;IACH,oBAAoB,IAAI,iBAAiB,EAAE,CAK1C;IAED;;;OAGG;IACH,yBAAyB,IAAI,OAAO,CAUnC;IAED;;OAEG;IACH,cAAc,IAAI,IAAI,CAErB;IAED;;OAEG;IACH,gBAAgB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAOtD;IAED;;OAEG;IACH,uBAAuB,IAAI,IAAI,CAE9B;IAED;;OAEG;IACH,KAAK,IAAI,IAAI,CAEZ;CACF"}
|
|
@@ -65,6 +65,15 @@ export class SessionToolTracker {
|
|
|
65
65
|
completedResultCallIdsForCurrentTurn() {
|
|
66
66
|
return this.toolLedger.completedResultCallIdsForCurrentTurn();
|
|
67
67
|
}
|
|
68
|
+
/**
|
|
69
|
+
* Call ids recorded this turn that still lack a completed tool result.
|
|
70
|
+
* Aborted/failed/started entries count — the provider chain may still be
|
|
71
|
+
* waiting for an output for those calls.
|
|
72
|
+
*/
|
|
73
|
+
unsettledToolCallIdsForCurrentTurn() {
|
|
74
|
+
const completed = new Set(this.completedResultCallIdsForCurrentTurn());
|
|
75
|
+
return this.activeCallIdsForCurrentTurn().filter((callId) => !completed.has(callId));
|
|
76
|
+
}
|
|
68
77
|
/**
|
|
69
78
|
* Export the current ledger state.
|
|
70
79
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-tool-tracker.js","sourceRoot":"","sources":["../../../source/services/session/session-tool-tracker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-tool-tracker.js","sourceRoot":"","sources":["../../../source/services/session/session-tool-tracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-result-collector.d.ts","sourceRoot":"","sources":["../../../source/services/session/terminal-result-collector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACpG,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal-result-collector.d.ts","sourceRoot":"","sources":["../../../source/services/session/terminal-result-collector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACpG,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAItE;;;;GAIG;AACH,qBAAa,sCAAuC,SAAQ,0BAA0B;CAAG;AAEzF,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,CAAC,iBAAiB,CAAC,EACxC,EACE,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,OAAO,EACP,kBAAkB,EAClB,YAAY,GACb,GAAE;IACD,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IACrD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IACnC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;CAC/C,GACL,OAAO,CAAC,oBAAoB,CAAC,CAkK/B"}
|
|
@@ -36,6 +36,12 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
|
|
|
36
36
|
// value for display when a terminal usage figure is unavailable.
|
|
37
37
|
let runUsage;
|
|
38
38
|
let latestStreamedUsage;
|
|
39
|
+
// Cost records are cumulative for the run on the same terms as `runUsage`:
|
|
40
|
+
// each terminal event carries every record so far, so the latest one
|
|
41
|
+
// supersedes rather than appends. Without copying them onto the returned
|
|
42
|
+
// terminal the session cost accumulator — and so the status bar — never sees
|
|
43
|
+
// a single record.
|
|
44
|
+
let runCostRecords;
|
|
39
45
|
const resolvedUsage = () => {
|
|
40
46
|
const usage = !isEmptyUsage(runUsage) ? runUsage : latestStreamedUsage;
|
|
41
47
|
return isEmptyUsage(usage) ? undefined : usage;
|
|
@@ -67,6 +73,7 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
|
|
|
67
73
|
}
|
|
68
74
|
case 'approval_required': {
|
|
69
75
|
const usage = event.usage ?? resolvedUsage();
|
|
76
|
+
const costRecords = event.costRecords?.length ? event.costRecords : runCostRecords;
|
|
70
77
|
return {
|
|
71
78
|
type: 'approval_required',
|
|
72
79
|
approval: {
|
|
@@ -79,6 +86,7 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
|
|
|
79
86
|
postExecute: event.approval.postExecute,
|
|
80
87
|
},
|
|
81
88
|
...(usage ? { usage } : {}),
|
|
89
|
+
...(costRecords?.length ? { costRecords } : {}),
|
|
82
90
|
};
|
|
83
91
|
}
|
|
84
92
|
case 'usage_update': {
|
|
@@ -97,6 +105,9 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
|
|
|
97
105
|
// growing on the same run state.
|
|
98
106
|
runUsage = event.usage;
|
|
99
107
|
}
|
|
108
|
+
if (event.costRecords?.length) {
|
|
109
|
+
runCostRecords = event.costRecords;
|
|
110
|
+
}
|
|
100
111
|
if (event.commandMessages?.length) {
|
|
101
112
|
for (const msg of event.commandMessages) {
|
|
102
113
|
commandMessages.push(msg);
|
|
@@ -147,6 +158,7 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
|
|
|
147
158
|
finalText,
|
|
148
159
|
...(reasoningText ? { reasoningText } : {}),
|
|
149
160
|
...(usage ? { usage } : {}),
|
|
161
|
+
...(runCostRecords?.length ? { costRecords: runCostRecords } : {}),
|
|
150
162
|
turnItems,
|
|
151
163
|
};
|
|
152
164
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-result-collector.js","sourceRoot":"","sources":["../../../source/services/session/terminal-result-collector.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"terminal-result-collector.js","sourceRoot":"","sources":["../../../source/services/session/terminal-result-collector.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,MAAM,YAAY,GAAG,CAAC,KAAkC,EAAW,EAAE,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAEhH;;;;GAIG;AACH,MAAM,OAAO,sCAAuC,SAAQ,0BAA0B;CAAG;AAEzF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,MAAwC,EACxC,EACE,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,OAAO,EACP,kBAAkB,EAClB,YAAY,GACb,GAOG,EAAE;IAEN,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,MAAM,eAAe,GAAqB,EAAE,CAAC;IAC7C,MAAM,SAAS,GAAiC,EAAE,CAAC;IACnD,IAAI,sBAAsB,GAAG,EAAE,CAAC;IAChC,IAAI,iBAAiB,GAAG,EAAE,CAAC;IAE3B,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IAAI,sBAAsB,EAAE,CAAC;YAC3B,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC,CAAC;YACpE,sBAAsB,GAAG,EAAE,CAAC;QAC9B,CAAC;QACD,IAAI,iBAAiB,EAAE,CAAC;YACtB,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;YACpE,iBAAiB,GAAG,EAAE,CAAC;QACzB,CAAC;IACH,CAAC,CAAC;IAEF,4EAA4E;IAC5E,wEAAwE;IACxE,qEAAqE;IACrE,yEAAyE;IACzE,4DAA4D;IAC5D,kEAAkE;IAClE,kEAAkE;IAClE,sEAAsE;IACtE,iEAAiE;IACjE,IAAI,QAAqC,CAAC;IAC1C,IAAI,mBAAgD,CAAC;IAErD,2EAA2E;IAC3E,qEAAqE;IACrE,yEAAyE;IACzE,6EAA6E;IAC7E,mBAAmB;IACnB,IAAI,cAA8C,CAAC;IAEnD,MAAM,aAAa,GAAG,GAAgC,EAAE;QACtD,MAAM,KAAK,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC;QACvE,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IACjD,CAAC,CAAC;IAEF,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;QAEjB,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;gBAClC,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;gBACjC,IAAI,sBAAsB,EAAE,CAAC;oBAC3B,YAAY,EAAE,CAAC;gBACjB,CAAC;gBACD,iBAAiB,IAAI,KAAK,CAAC,KAAK,CAAC;gBACjC,MAAM;YACR,CAAC;YACD,KAAK,iBAAiB,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;gBAClC,gBAAgB,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;gBACtC,IAAI,iBAAiB,EAAE,CAAC;oBACtB,YAAY,EAAE,CAAC;gBACjB,CAAC;gBACD,sBAAsB,IAAI,KAAK,CAAC,KAAK,CAAC;gBACtC,MAAM;YACR,CAAC;YACD,KAAK,iBAAiB,EAAE,CAAC;gBACvB,gBAAgB,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAClC,MAAM;YACR,CAAC;YACD,KAAK,mBAAmB,EAAE,CAAC;gBACzB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,aAAa,EAAE,CAAC;gBAC7C,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC;gBACnF,OAAO;oBACL,IAAI,EAAE,mBAAmB;oBACzB,QAAQ,EAAE;wBACR,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS;wBACnC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ;wBACjC,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa;wBAC3C,eAAe,EAAE,kBAAkB,EAAE,EAAE;wBACvC,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM;wBAC7B,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,WAAW;wBACvC,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,WAAW;qBACxC;oBACD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3B,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAChD,CAAC;YACJ,CAAC;YACD,KAAK,cAAc,EAAE,CAAC;gBACpB,mBAAmB,GAAG,KAAK,CAAC,KAAK,CAAC;gBAClC,MAAM;YACR,CAAC;YACD,KAAK,OAAO,EAAE,CAAC;gBACb,YAAY,EAAE,CAAC,KAAK,CAAC,CAAC;gBACtB,aAAa,GAAG,IAAI,CAAC;gBACrB,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;gBAC5B,aAAa,GAAG,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC;gBAC1C,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;oBAChB,kEAAkE;oBAClE,6DAA6D;oBAC7D,oEAAoE;oBACpE,iCAAiC;oBACjC,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC;gBACzB,CAAC;gBACD,IAAI,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC;oBAC9B,cAAc,GAAG,KAAK,CAAC,WAAW,CAAC;gBACrC,CAAC;gBACD,IAAI,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC;oBAClC,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;wBACxC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAC5B,CAAC;gBACH,CAAC;gBACD,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;oBACpB,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;oBACrB,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;oBACnC,sBAAsB,GAAG,EAAE,CAAC;oBAC5B,iBAAiB,GAAG,EAAE,CAAC;gBACzB,CAAC;qBAAM,CAAC;oBACN,YAAY,EAAE,CAAC;gBACjB,CAAC;gBACD,MAAM;YACR,CAAC;YACD,KAAK,OAAO,EAAE,CAAC;gBACb,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACxG,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBACvC,mFAAmF;gBAClF,GAAW,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;gBACnC,GAAW,CAAC,QAAQ,GAAG,KAAK,CAAC;gBAC9B,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;oBAChB,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC3C,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;oBACtF,IAAI,eAAe,KAAK,CAAC,CAAC,EAAE,CAAC;wBAC3B,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;wBACjD,GAAG,CAAC,KAAK,GAAG,GAAG,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBAClE,CAAC;yBAAM,CAAC;wBACN,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;oBAC1B,CAAC;gBACH,CAAC;gBACD,MAAM,GAAG,CAAC;YACZ,CAAC;YACD;gBACE,MAAM;QACV,CAAC;IACH,CAAC;IAED,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,sCAAsC,CAC9C,yEAAyE,CAC1E,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,aAAa,EAAE,CAAC;IAC9B,YAAY,EAAE,CAAC;IACf,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,eAAe;QACf,SAAS;QACT,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3B,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,SAAS;KACV,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-workflow.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-workflow.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"turn-workflow.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-workflow.ts"],"names":[],"mappings":"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"}
|
|
@@ -698,6 +698,10 @@ export class TurnWorkflow {
|
|
|
698
698
|
finalText: result.finalText,
|
|
699
699
|
...(result.reasoningText ? { reasoningText: result.reasoningText } : {}),
|
|
700
700
|
...(usage && Object.keys(usage).length > 0 ? { usage } : {}),
|
|
701
|
+
// Cost records are run-cumulative, so the continuation cycle must carry
|
|
702
|
+
// forward what the collector observed; dropping them here silently
|
|
703
|
+
// unprices every turn that used a tool or paused for approval.
|
|
704
|
+
...(result.costRecords?.length ? { costRecords: result.costRecords } : {}),
|
|
701
705
|
turnItems: result.turnItems,
|
|
702
706
|
};
|
|
703
707
|
}
|