@qduc/term2 0.15.0 → 0.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +324 -316
- package/dist/agent.d.ts +5 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +16 -64
- package/dist/agent.js.map +1 -1
- package/dist/app.d.ts +1 -1
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +129 -19
- package/dist/app.js.map +1 -1
- package/dist/cli.js +52 -17
- package/dist/cli.js.map +1 -1
- package/dist/commands/auto-approve-command.d.ts +2 -1
- package/dist/commands/auto-approve-command.d.ts.map +1 -1
- package/dist/commands/auto-approve-command.js +16 -27
- package/dist/commands/auto-approve-command.js.map +1 -1
- package/dist/commands/compact-command.d.ts.map +1 -1
- package/dist/commands/compact-command.js +4 -0
- package/dist/commands/compact-command.js.map +1 -1
- package/dist/commands/effort-command.js +1 -1
- package/dist/commands/effort-command.js.map +1 -1
- package/dist/commands/guarded-settings-command.d.ts.map +1 -1
- package/dist/commands/guarded-settings-command.js +4 -8
- package/dist/commands/guarded-settings-command.js.map +1 -1
- package/dist/commands/model-command.js +1 -1
- package/dist/commands/model-command.js.map +1 -1
- package/dist/commands/resume-command.d.ts +11 -0
- package/dist/commands/resume-command.d.ts.map +1 -0
- package/dist/commands/resume-command.js +41 -0
- package/dist/commands/resume-command.js.map +1 -0
- package/dist/components/ErrorBoundary.d.ts.map +1 -1
- package/dist/components/ErrorBoundary.js +5 -4
- package/dist/components/ErrorBoundary.js.map +1 -1
- package/dist/components/InputBox.d.ts +2 -0
- package/dist/components/InputBox.d.ts.map +1 -1
- package/dist/components/InputBox.js +56 -18
- package/dist/components/InputBox.js.map +1 -1
- package/dist/components/MarkdownRenderer.d.ts.map +1 -1
- package/dist/components/MarkdownRenderer.js +16 -15
- package/dist/components/MarkdownRenderer.js.map +1 -1
- package/dist/components/common/MenuContainer.d.ts +25 -2
- package/dist/components/common/MenuContainer.d.ts.map +1 -1
- package/dist/components/common/MenuContainer.js +35 -11
- package/dist/components/common/MenuContainer.js.map +1 -1
- package/dist/components/common/ScrollableTabBar.d.ts.map +1 -1
- package/dist/components/common/ScrollableTabBar.js +5 -4
- package/dist/components/common/ScrollableTabBar.js.map +1 -1
- package/dist/components/input/ApplicationInputSurface.d.ts +7 -5
- package/dist/components/input/ApplicationInputSurface.d.ts.map +1 -1
- package/dist/components/input/ApplicationInputSurface.js +7 -0
- package/dist/components/input/ApplicationInputSurface.js.map +1 -1
- package/dist/components/input/FirstRunSetupPrompt.d.ts.map +1 -1
- package/dist/components/input/FirstRunSetupPrompt.js +5 -4
- package/dist/components/input/FirstRunSetupPrompt.js.map +1 -1
- package/dist/components/input/MenuSurface.d.ts.map +1 -1
- package/dist/components/input/MenuSurface.js +10 -3
- package/dist/components/input/MenuSurface.js.map +1 -1
- package/dist/components/input/ModelMenuSession.d.ts.map +1 -1
- package/dist/components/input/ModelMenuSession.js +2 -1
- package/dist/components/input/ModelMenuSession.js.map +1 -1
- package/dist/components/input/PendingQueueList.d.ts +2 -0
- package/dist/components/input/PendingQueueList.d.ts.map +1 -1
- package/dist/components/input/PendingQueueList.js +17 -14
- package/dist/components/input/PendingQueueList.js.map +1 -1
- package/dist/components/input/ResumeMenuSession.d.ts +17 -0
- package/dist/components/input/ResumeMenuSession.d.ts.map +1 -0
- package/dist/components/input/ResumeMenuSession.js +57 -0
- package/dist/components/input/ResumeMenuSession.js.map +1 -0
- package/dist/components/input/SettingsValueMenuSession.d.ts.map +1 -1
- package/dist/components/input/SettingsValueMenuSession.js +2 -1
- package/dist/components/input/SettingsValueMenuSession.js.map +1 -1
- package/dist/components/input/determine-active-menu.d.ts +3 -0
- package/dist/components/input/determine-active-menu.d.ts.map +1 -1
- package/dist/components/input/determine-active-menu.js +10 -5
- package/dist/components/input/determine-active-menu.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 +4 -0
- package/dist/components/input/menu-types.d.ts.map +1 -1
- package/dist/components/input/triggers.d.ts +1 -0
- package/dist/components/input/triggers.d.ts.map +1 -1
- package/dist/components/input/triggers.js +26 -0
- package/dist/components/input/triggers.js.map +1 -1
- package/dist/components/layout/BackgroundTaskManager.d.ts.map +1 -1
- package/dist/components/layout/BackgroundTaskManager.js +12 -11
- package/dist/components/layout/BackgroundTaskManager.js.map +1 -1
- package/dist/components/layout/BackgroundTasksPanel.d.ts +2 -2
- package/dist/components/layout/BackgroundTasksPanel.d.ts.map +1 -1
- package/dist/components/layout/BackgroundTasksPanel.js +10 -9
- package/dist/components/layout/BackgroundTasksPanel.js.map +1 -1
- package/dist/components/layout/Banner.d.ts +0 -1
- package/dist/components/layout/Banner.d.ts.map +1 -1
- package/dist/components/layout/Banner.js +43 -73
- package/dist/components/layout/Banner.js.map +1 -1
- package/dist/components/layout/BottomArea.d.ts +8 -5
- package/dist/components/layout/BottomArea.d.ts.map +1 -1
- package/dist/components/layout/BottomArea.js +17 -9
- package/dist/components/layout/BottomArea.js.map +1 -1
- package/dist/components/layout/DiffView.js +5 -5
- package/dist/components/layout/DiffView.js.map +1 -1
- package/dist/components/layout/StatusBar.d.ts +4 -1
- package/dist/components/layout/StatusBar.d.ts.map +1 -1
- package/dist/components/layout/StatusBar.js +305 -95
- package/dist/components/layout/StatusBar.js.map +1 -1
- package/dist/components/layout/background-task-clock.d.ts +43 -0
- package/dist/components/layout/background-task-clock.d.ts.map +1 -0
- package/dist/components/layout/background-task-clock.js +46 -0
- package/dist/components/layout/background-task-clock.js.map +1 -0
- package/dist/components/menu/CopyMenu.d.ts.map +1 -1
- package/dist/components/menu/CopyMenu.js +4 -3
- package/dist/components/menu/CopyMenu.js.map +1 -1
- package/dist/components/menu/MentorPoolSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/MentorPoolSelectionMenu.js +28 -21
- package/dist/components/menu/MentorPoolSelectionMenu.js.map +1 -1
- package/dist/components/menu/ModelSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ModelSelectionMenu.js +26 -13
- package/dist/components/menu/ModelSelectionMenu.js.map +1 -1
- package/dist/components/menu/PathSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/PathSelectionMenu.js +4 -3
- package/dist/components/menu/PathSelectionMenu.js.map +1 -1
- package/dist/components/menu/ProviderSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ProviderSelectionMenu.js +46 -26
- package/dist/components/menu/ProviderSelectionMenu.js.map +1 -1
- package/dist/components/menu/ResumeSelectionMenu.d.ts +11 -0
- package/dist/components/menu/ResumeSelectionMenu.d.ts.map +1 -0
- package/dist/components/menu/ResumeSelectionMenu.js +91 -0
- package/dist/components/menu/ResumeSelectionMenu.js.map +1 -0
- package/dist/components/menu/RewindMenu.d.ts.map +1 -1
- package/dist/components/menu/RewindMenu.js +4 -3
- package/dist/components/menu/RewindMenu.js.map +1 -1
- package/dist/components/menu/SettingsSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/SettingsSelectionMenu.js +26 -26
- package/dist/components/menu/SettingsSelectionMenu.js.map +1 -1
- package/dist/components/menu/SettingsValueSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/SettingsValueSelectionMenu.js +22 -20
- package/dist/components/menu/SettingsValueSelectionMenu.js.map +1 -1
- package/dist/components/menu/SkillSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/SkillSelectionMenu.js +33 -23
- package/dist/components/menu/SkillSelectionMenu.js.map +1 -1
- package/dist/components/menu/SlashCommandMenu.d.ts.map +1 -1
- package/dist/components/menu/SlashCommandMenu.js +11 -6
- package/dist/components/menu/SlashCommandMenu.js.map +1 -1
- package/dist/components/message/ChatMessage.js +2 -2
- package/dist/components/message/ChatMessage.js.map +1 -1
- package/dist/components/message/CodeContextSearchRenderer.d.ts.map +1 -1
- package/dist/components/message/CodeContextSearchRenderer.js +8 -11
- package/dist/components/message/CodeContextSearchRenderer.js.map +1 -1
- package/dist/components/message/CommandGroupSummary.d.ts.map +1 -1
- package/dist/components/message/CommandGroupSummary.js +21 -9
- package/dist/components/message/CommandGroupSummary.js.map +1 -1
- package/dist/components/message/CommandMessage.d.ts.map +1 -1
- package/dist/components/message/CommandMessage.js +111 -91
- package/dist/components/message/CommandMessage.js.map +1 -1
- package/dist/components/message/GrepRenderer.d.ts.map +1 -1
- package/dist/components/message/GrepRenderer.js +5 -8
- package/dist/components/message/GrepRenderer.js.map +1 -1
- package/dist/components/message/MemoryRenderer.d.ts +1 -0
- package/dist/components/message/MemoryRenderer.d.ts.map +1 -1
- package/dist/components/message/MemoryRenderer.js +19 -17
- package/dist/components/message/MemoryRenderer.js.map +1 -1
- package/dist/components/message/MessageList.d.ts +1 -2
- package/dist/components/message/MessageList.d.ts.map +1 -1
- package/dist/components/message/MessageList.js +12 -11
- package/dist/components/message/MessageList.js.map +1 -1
- package/dist/components/message/ReadFileRenderer.d.ts.map +1 -1
- package/dist/components/message/ReadFileRenderer.js +5 -6
- package/dist/components/message/ReadFileRenderer.js.map +1 -1
- package/dist/components/message/SubagentActivityMessage.d.ts.map +1 -1
- package/dist/components/message/SubagentActivityMessage.js +17 -13
- package/dist/components/message/SubagentActivityMessage.js.map +1 -1
- package/dist/components/message/WebFetchRenderer.d.ts.map +1 -1
- package/dist/components/message/WebFetchRenderer.js +7 -11
- package/dist/components/message/WebFetchRenderer.js.map +1 -1
- package/dist/components/message/WebSearchRenderer.d.ts.map +1 -1
- package/dist/components/message/WebSearchRenderer.js +5 -10
- package/dist/components/message/WebSearchRenderer.js.map +1 -1
- package/dist/components/message/command-grouping.d.ts +29 -6
- package/dist/components/message/command-grouping.d.ts.map +1 -1
- package/dist/components/message/command-grouping.js +62 -20
- package/dist/components/message/command-grouping.js.map +1 -1
- package/dist/components/message/command-message-helpers.d.ts +10 -37
- package/dist/components/message/command-message-helpers.d.ts.map +1 -1
- package/dist/components/message/command-message-helpers.js +26 -8
- package/dist/components/message/command-message-helpers.js.map +1 -1
- package/dist/components/message/useCommandVisibility.d.ts.map +1 -1
- package/dist/components/message/useCommandVisibility.js +5 -4
- package/dist/components/message/useCommandVisibility.js.map +1 -1
- package/dist/components/prompt/ApprovalPrompt.d.ts.map +1 -1
- package/dist/components/prompt/ApprovalPrompt.js +232 -106
- package/dist/components/prompt/ApprovalPrompt.js.map +1 -1
- package/dist/components/prompt/HandoffConfirmationPrompt.d.ts.map +1 -1
- package/dist/components/prompt/HandoffConfirmationPrompt.js +3 -2
- package/dist/components/prompt/HandoffConfirmationPrompt.js.map +1 -1
- package/dist/components/prompt/InputSurgeConfirmationPrompt.d.ts.map +1 -1
- package/dist/components/prompt/InputSurgeConfirmationPrompt.js +5 -4
- package/dist/components/prompt/InputSurgeConfirmationPrompt.js.map +1 -1
- package/dist/components/prompt/LargeUncachedConfirmationPrompt.d.ts.map +1 -1
- package/dist/components/prompt/LargeUncachedConfirmationPrompt.js +4 -3
- package/dist/components/prompt/LargeUncachedConfirmationPrompt.js.map +1 -1
- package/dist/components/prompt/ModeSwitchConfirmationPrompt.d.ts.map +1 -1
- package/dist/components/prompt/ModeSwitchConfirmationPrompt.js +4 -3
- package/dist/components/prompt/ModeSwitchConfirmationPrompt.js.map +1 -1
- package/dist/components/prompt/QueuePausedPrompt.d.ts.map +1 -1
- package/dist/components/prompt/QueuePausedPrompt.js +6 -5
- package/dist/components/prompt/QueuePausedPrompt.js.map +1 -1
- package/dist/components/prompt/StandardModeConfirmationPrompt.d.ts.map +1 -1
- package/dist/components/prompt/StandardModeConfirmationPrompt.js +3 -2
- package/dist/components/prompt/StandardModeConfirmationPrompt.js.map +1 -1
- package/dist/components/theme.d.ts +58 -3
- package/dist/components/theme.d.ts.map +1 -1
- package/dist/components/theme.js +84 -17
- package/dist/components/theme.js.map +1 -1
- package/dist/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 +14 -0
- package/dist/contracts/application-stream.d.ts.map +1 -1
- package/dist/contracts/streamed-model-turn.d.ts +13 -1
- package/dist/contracts/streamed-model-turn.d.ts.map +1 -1
- package/dist/gateway/assertion.d.ts +4 -1
- package/dist/gateway/assertion.d.ts.map +1 -1
- package/dist/gateway/assertion.js +24 -2
- package/dist/gateway/assertion.js.map +1 -1
- package/dist/gateway/contracts.d.ts +21 -4
- package/dist/gateway/contracts.d.ts.map +1 -1
- package/dist/gateway/contracts.js +11 -0
- package/dist/gateway/contracts.js.map +1 -1
- package/dist/gateway/dynamic-workspace-registry.d.ts +76 -0
- package/dist/gateway/dynamic-workspace-registry.d.ts.map +1 -0
- package/dist/gateway/dynamic-workspace-registry.js +403 -0
- package/dist/gateway/dynamic-workspace-registry.js.map +1 -0
- package/dist/gateway/gateway.d.ts +24 -1
- package/dist/gateway/gateway.d.ts.map +1 -1
- package/dist/gateway/gateway.js +704 -21
- package/dist/gateway/gateway.js.map +1 -1
- package/dist/gateway/launcher-seam.d.ts +18 -0
- package/dist/gateway/launcher-seam.d.ts.map +1 -0
- package/dist/gateway/launcher-seam.js +43 -0
- package/dist/gateway/launcher-seam.js.map +1 -0
- package/dist/gateway/pairing.d.ts +25 -0
- package/dist/gateway/pairing.d.ts.map +1 -0
- package/dist/gateway/pairing.js +107 -0
- package/dist/gateway/pairing.js.map +1 -0
- package/dist/gateway/persistence/coordinator.d.ts +2 -0
- package/dist/gateway/persistence/coordinator.d.ts.map +1 -1
- package/dist/gateway/persistence/coordinator.js +13 -0
- package/dist/gateway/persistence/coordinator.js.map +1 -1
- package/dist/gateway/runtime-factory.d.ts +15 -6
- package/dist/gateway/runtime-factory.d.ts.map +1 -1
- package/dist/gateway/runtime-factory.js +38 -9
- package/dist/gateway/runtime-factory.js.map +1 -1
- package/dist/gateway/safe-log.d.ts.map +1 -1
- package/dist/gateway/safe-log.js +19 -0
- package/dist/gateway/safe-log.js.map +1 -1
- package/dist/gateway/server-session.d.ts.map +1 -1
- package/dist/gateway/server-session.js +36 -4
- package/dist/gateway/server-session.js.map +1 -1
- package/dist/gateway/server.d.ts +26 -3
- package/dist/gateway/server.d.ts.map +1 -1
- package/dist/gateway/server.js +105 -17
- package/dist/gateway/server.js.map +1 -1
- package/dist/gateway/settings-rpc.d.ts +95 -0
- package/dist/gateway/settings-rpc.d.ts.map +1 -0
- package/dist/gateway/settings-rpc.js +227 -0
- package/dist/gateway/settings-rpc.js.map +1 -0
- package/dist/gateway/trusted-clients.d.ts +27 -0
- package/dist/gateway/trusted-clients.d.ts.map +1 -0
- package/dist/gateway/trusted-clients.js +157 -0
- package/dist/gateway/trusted-clients.js.map +1 -0
- package/dist/gateway/worker-boundary.d.ts +6 -5
- package/dist/gateway/worker-boundary.d.ts.map +1 -1
- package/dist/gateway/worker-boundary.js +20 -10
- package/dist/gateway/worker-boundary.js.map +1 -1
- package/dist/gateway/workspace-admission.d.ts +11 -0
- package/dist/gateway/workspace-admission.d.ts.map +1 -1
- package/dist/gateway/workspace-admission.js +89 -16
- package/dist/gateway/workspace-admission.js.map +1 -1
- package/dist/gateway/workspace-boundary-probe.d.ts +18 -0
- package/dist/gateway/workspace-boundary-probe.d.ts.map +1 -0
- package/dist/gateway/workspace-boundary-probe.js +37 -0
- package/dist/gateway/workspace-boundary-probe.js.map +1 -0
- package/dist/hooks/conversation-ui-reducer.d.ts +6 -0
- package/dist/hooks/conversation-ui-reducer.d.ts.map +1 -1
- package/dist/hooks/conversation-ui-reducer.js +9 -1
- package/dist/hooks/conversation-ui-reducer.js.map +1 -1
- package/dist/hooks/settings-completion-config.d.ts.map +1 -1
- package/dist/hooks/settings-completion-config.js +11 -3
- package/dist/hooks/settings-completion-config.js.map +1 -1
- package/dist/hooks/use-app-commands.d.ts +6 -1
- package/dist/hooks/use-app-commands.d.ts.map +1 -1
- package/dist/hooks/use-app-commands.js +23 -14
- package/dist/hooks/use-app-commands.js.map +1 -1
- package/dist/hooks/use-app-keyboard-shortcuts.d.ts +1 -3
- package/dist/hooks/use-app-keyboard-shortcuts.d.ts.map +1 -1
- package/dist/hooks/use-app-keyboard-shortcuts.js +11 -9
- package/dist/hooks/use-app-keyboard-shortcuts.js.map +1 -1
- package/dist/hooks/use-conversation.d.ts +8 -0
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +27 -18
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/hooks/use-opencode-go-usage.d.ts +8 -0
- package/dist/hooks/use-opencode-go-usage.d.ts.map +1 -0
- package/dist/hooks/use-opencode-go-usage.js +45 -0
- package/dist/hooks/use-opencode-go-usage.js.map +1 -0
- package/dist/hooks/use-resume-selection.d.ts +22 -0
- package/dist/hooks/use-resume-selection.d.ts.map +1 -0
- package/dist/hooks/use-resume-selection.js +76 -0
- package/dist/hooks/use-resume-selection.js.map +1 -0
- package/dist/hooks/use-shell-mode.d.ts +3 -4
- package/dist/hooks/use-shell-mode.d.ts.map +1 -1
- package/dist/hooks/use-shell-mode.js +14 -12
- package/dist/hooks/use-shell-mode.js.map +1 -1
- package/dist/hooks/use-terminal-columns.d.ts +15 -0
- package/dist/hooks/use-terminal-columns.d.ts.map +1 -0
- package/dist/hooks/use-terminal-columns.js +45 -0
- package/dist/hooks/use-terminal-columns.js.map +1 -0
- package/dist/lib/agent-client.d.ts +14 -1
- package/dist/lib/agent-client.d.ts.map +1 -1
- package/dist/lib/agent-client.js +112 -37
- package/dist/lib/agent-client.js.map +1 -1
- package/dist/lib/agent-configuration.d.ts +5 -0
- package/dist/lib/agent-configuration.d.ts.map +1 -1
- package/dist/lib/agent-configuration.js +14 -5
- package/dist/lib/agent-configuration.js.map +1 -1
- package/dist/lib/agent-factory.d.ts +7 -2
- package/dist/lib/agent-factory.d.ts.map +1 -1
- package/dist/lib/agent-factory.js +22 -11
- package/dist/lib/agent-factory.js.map +1 -1
- package/dist/lib/harness-input-idle.d.ts.map +1 -1
- package/dist/lib/harness-input-idle.js +1 -1
- package/dist/lib/harness-input-idle.js.map +1 -1
- package/dist/non-interactive.d.ts +3 -0
- package/dist/non-interactive.d.ts.map +1 -1
- package/dist/non-interactive.js +106 -22
- package/dist/non-interactive.js.map +1 -1
- package/dist/prompts/approval-model.md +22 -0
- package/dist/prompts/gpt-5.6.md +3 -2
- package/dist/prompts/mentor-mode-stub.md +3 -0
- package/dist/prompts/orchestrator-mode-stub.md +3 -0
- package/dist/prompts/prefix-quality.test.ts +10 -0
- package/dist/prompts/prompt-constructor.d.ts +2 -0
- package/dist/prompts/prompt-constructor.d.ts.map +1 -1
- package/dist/prompts/prompt-constructor.js +23 -13
- package/dist/prompts/prompt-constructor.js.map +1 -1
- package/dist/prompts/prompt-constructor.test.ts +39 -5
- package/dist/prompts/prompt-constructor.ts +27 -15
- package/dist/prompts/prompt-profiles.d.ts +1 -3
- package/dist/prompts/prompt-profiles.d.ts.map +1 -1
- package/dist/prompts/prompt-profiles.js +2 -7
- package/dist/prompts/prompt-profiles.js.map +1 -1
- package/dist/prompts/prompt-profiles.ts +3 -16
- package/dist/prompts/session-browser.md +3 -0
- package/dist/prompts/subagent-delegation.d.ts +4 -3
- package/dist/prompts/subagent-delegation.d.ts.map +1 -1
- package/dist/prompts/subagent-delegation.js +14 -18
- package/dist/prompts/subagent-delegation.js.map +1 -1
- package/dist/prompts/subagent-delegation.test.ts +2 -2
- package/dist/prompts/subagent-delegation.ts +13 -20
- package/dist/providers/chained-wire-state.d.ts +7 -2
- package/dist/providers/chained-wire-state.d.ts.map +1 -1
- package/dist/providers/chained-wire-state.js +16 -7
- package/dist/providers/chained-wire-state.js.map +1 -1
- package/dist/providers/codex-auth.d.ts +2 -5
- package/dist/providers/codex-auth.d.ts.map +1 -1
- package/dist/providers/codex-auth.js +2 -0
- package/dist/providers/codex-auth.js.map +1 -1
- package/dist/providers/codex-compact.d.ts +9 -0
- package/dist/providers/codex-compact.d.ts.map +1 -0
- package/dist/providers/codex-compact.js +23 -0
- package/dist/providers/codex-compact.js.map +1 -0
- package/dist/providers/codex-responses-model.d.ts +17 -1
- package/dist/providers/codex-responses-model.d.ts.map +1 -1
- package/dist/providers/codex-responses-model.js +75 -8
- package/dist/providers/codex-responses-model.js.map +1 -1
- package/dist/providers/codex-turn-converter.d.ts.map +1 -1
- package/dist/providers/codex-turn-converter.js +8 -4
- package/dist/providers/codex-turn-converter.js.map +1 -1
- package/dist/providers/codex.provider.js +2 -2
- package/dist/providers/codex.provider.js.map +1 -1
- package/dist/providers/grok-auth.d.ts +2 -5
- package/dist/providers/grok-auth.d.ts.map +1 -1
- package/dist/providers/grok-auth.js +2 -0
- package/dist/providers/grok-auth.js.map +1 -1
- package/dist/providers/oauth-account-store.d.ts +5 -0
- package/dist/providers/oauth-account-store.d.ts.map +1 -1
- package/dist/providers/oauth-account-store.js +56 -5
- package/dist/providers/oauth-account-store.js.map +1 -1
- package/dist/providers/oauth-pkce.d.ts +8 -0
- package/dist/providers/oauth-pkce.d.ts.map +1 -1
- package/dist/providers/oauth-pkce.js +91 -19
- package/dist/providers/oauth-pkce.js.map +1 -1
- package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
- package/dist/providers/openai-compatible.provider.js +8 -1
- package/dist/providers/openai-compatible.provider.js.map +1 -1
- package/dist/providers/openai-responses-model.d.ts.map +1 -1
- package/dist/providers/openai-responses-model.js +2 -0
- package/dist/providers/openai-responses-model.js.map +1 -1
- package/dist/providers/opencode-go-usage.d.ts +24 -0
- package/dist/providers/opencode-go-usage.d.ts.map +1 -0
- package/dist/providers/opencode-go-usage.js +37 -0
- package/dist/providers/opencode-go-usage.js.map +1 -0
- package/dist/providers/openrouter.provider.d.ts.map +1 -1
- package/dist/providers/openrouter.provider.js +8 -1
- package/dist/providers/openrouter.provider.js.map +1 -1
- package/dist/providers/responses-websocket-sessions.d.ts +1 -0
- package/dist/providers/responses-websocket-sessions.d.ts.map +1 -1
- package/dist/providers/responses-websocket-sessions.js +16 -2
- package/dist/providers/responses-websocket-sessions.js.map +1 -1
- package/dist/providers/retrying-model.d.ts +1 -0
- package/dist/providers/retrying-model.d.ts.map +1 -1
- package/dist/providers/retrying-model.js +37 -3
- package/dist/providers/retrying-model.js.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.d.ts +5 -1
- package/dist/services/agent-runtime/application-run-loop.d.ts.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.js +231 -149
- package/dist/services/agent-runtime/application-run-loop.js.map +1 -1
- package/dist/services/agent-runtime/generation-guard.d.ts +39 -25
- package/dist/services/agent-runtime/generation-guard.d.ts.map +1 -1
- package/dist/services/agent-runtime/generation-guard.js +98 -100
- package/dist/services/agent-runtime/generation-guard.js.map +1 -1
- package/dist/services/agent-runtime/run-budget.d.ts +1 -1
- package/dist/services/agent-runtime/run-budget.d.ts.map +1 -1
- package/dist/services/agent-runtime/run-budget.js +4 -0
- package/dist/services/agent-runtime/run-budget.js.map +1 -1
- package/dist/services/agent-stream.d.ts.map +1 -1
- package/dist/services/agent-stream.js +1 -0
- package/dist/services/agent-stream.js.map +1 -1
- package/dist/services/approval/shell-auto-approval-evaluator.d.ts +3 -1
- package/dist/services/approval/shell-auto-approval-evaluator.d.ts.map +1 -1
- package/dist/services/approval/shell-auto-approval-evaluator.js +4 -2
- package/dist/services/approval/shell-auto-approval-evaluator.js.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.d.ts +2 -0
- package/dist/services/approval/shell-auto-approval-resolver.d.ts.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.js +2 -0
- package/dist/services/approval/shell-auto-approval-resolver.js.map +1 -1
- package/dist/services/conversation/conversation-adapter.d.ts +13 -2
- package/dist/services/conversation/conversation-adapter.d.ts.map +1 -1
- package/dist/services/conversation/conversation-adapter.js +35 -7
- package/dist/services/conversation/conversation-adapter.js.map +1 -1
- package/dist/services/conversation/conversation-admission-workflow.d.ts +3 -2
- package/dist/services/conversation/conversation-admission-workflow.d.ts.map +1 -1
- package/dist/services/conversation/conversation-admission-workflow.js +6 -1
- package/dist/services/conversation/conversation-admission-workflow.js.map +1 -1
- package/dist/services/conversation/conversation-events.d.ts +43 -2
- package/dist/services/conversation/conversation-events.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.d.ts +14 -1
- package/dist/services/conversation/conversation-orchestrator.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.js +142 -11
- package/dist/services/conversation/conversation-orchestrator.js.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.types.d.ts +3 -1
- package/dist/services/conversation/conversation-orchestrator.types.d.ts.map +1 -1
- package/dist/services/conversation/conversation-persistence.d.ts +22 -1
- package/dist/services/conversation/conversation-persistence.d.ts.map +1 -1
- package/dist/services/conversation/conversation-persistence.js +61 -0
- package/dist/services/conversation/conversation-persistence.js.map +1 -1
- package/dist/services/conversation/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation/conversation-service.js +45 -29
- package/dist/services/conversation/conversation-service.js.map +1 -1
- package/dist/services/conversation/session-audit.d.ts +70 -0
- package/dist/services/conversation/session-audit.d.ts.map +1 -0
- package/dist/services/conversation/session-audit.js +164 -0
- package/dist/services/conversation/session-audit.js.map +1 -0
- package/dist/services/conversation/session-browser.d.ts +49 -0
- package/dist/services/conversation/session-browser.d.ts.map +1 -0
- package/dist/services/conversation/session-browser.js +411 -0
- package/dist/services/conversation/session-browser.js.map +1 -0
- package/dist/services/input-surge-approval.d.ts +21 -0
- package/dist/services/input-surge-approval.d.ts.map +1 -0
- package/dist/services/input-surge-approval.js +42 -0
- package/dist/services/input-surge-approval.js.map +1 -0
- package/dist/services/large-uncached-input-guard.js +4 -4
- package/dist/services/large-uncached-input-guard.js.map +1 -1
- package/dist/services/logging/assistant-turn-journal.d.ts +15 -0
- package/dist/services/logging/assistant-turn-journal.d.ts.map +1 -1
- package/dist/services/logging/assistant-turn-journal.js +27 -0
- package/dist/services/logging/assistant-turn-journal.js.map +1 -1
- package/dist/services/memory/memory-capabilities.d.ts.map +1 -1
- package/dist/services/memory/memory-capabilities.js +7 -4
- package/dist/services/memory/memory-capabilities.js.map +1 -1
- package/dist/services/memory/memory-search.d.ts +16 -0
- package/dist/services/memory/memory-search.d.ts.map +1 -0
- package/dist/services/memory/memory-search.js +55 -0
- package/dist/services/memory/memory-search.js.map +1 -0
- package/dist/services/memory/memory-store.d.ts +12 -0
- package/dist/services/memory/memory-store.d.ts.map +1 -1
- package/dist/services/memory/memory-store.js +14 -35
- package/dist/services/memory/memory-store.js.map +1 -1
- package/dist/services/mode-notices.d.ts +11 -0
- package/dist/services/mode-notices.d.ts.map +1 -1
- package/dist/services/mode-notices.js +37 -3
- package/dist/services/mode-notices.js.map +1 -1
- package/dist/services/queue/queue-controller.d.ts +13 -0
- package/dist/services/queue/queue-controller.d.ts.map +1 -1
- package/dist/services/queue/queue-controller.js +32 -1
- package/dist/services/queue/queue-controller.js.map +1 -1
- package/dist/services/retry/in-loop-model-retry.d.ts +16 -0
- package/dist/services/retry/in-loop-model-retry.d.ts.map +1 -0
- package/dist/services/retry/in-loop-model-retry.js +125 -0
- package/dist/services/retry/in-loop-model-retry.js.map +1 -0
- package/dist/services/retry/retry-classifier.d.ts.map +1 -1
- package/dist/services/retry/retry-classifier.js +18 -12
- package/dist/services/retry/retry-classifier.js.map +1 -1
- package/dist/services/retry/retry-error-classification.d.ts.map +1 -1
- package/dist/services/retry/retry-error-classification.js +10 -6
- package/dist/services/retry/retry-error-classification.js.map +1 -1
- package/dist/services/retry/upstream-retry-policy.d.ts.map +1 -1
- package/dist/services/retry/upstream-retry-policy.js +40 -7
- package/dist/services/retry/upstream-retry-policy.js.map +1 -1
- package/dist/services/runtime-setting-router.d.ts.map +1 -1
- package/dist/services/runtime-setting-router.js +7 -2
- package/dist/services/runtime-setting-router.js.map +1 -1
- package/dist/services/session/background-check-in-scheduler.d.ts +44 -0
- package/dist/services/session/background-check-in-scheduler.d.ts.map +1 -0
- package/dist/services/session/background-check-in-scheduler.js +88 -0
- package/dist/services/session/background-check-in-scheduler.js.map +1 -0
- package/dist/services/session/background-task-control.js +4 -1
- package/dist/services/session/background-task-control.js.map +1 -1
- package/dist/services/session/initial-input-preparer.d.ts +2 -1
- package/dist/services/session/initial-input-preparer.d.ts.map +1 -1
- package/dist/services/session/initial-input-preparer.js +4 -1
- package/dist/services/session/initial-input-preparer.js.map +1 -1
- package/dist/services/session/repetition-detector.d.ts +0 -4
- package/dist/services/session/repetition-detector.d.ts.map +1 -1
- package/dist/services/session/repetition-detector.js +0 -7
- package/dist/services/session/repetition-detector.js.map +1 -1
- package/dist/services/session/session-access-state.d.ts +3 -0
- package/dist/services/session/session-access-state.d.ts.map +1 -1
- package/dist/services/session/session-access-state.js +12 -0
- package/dist/services/session/session-access-state.js.map +1 -1
- package/dist/services/session/session-client-factory.d.ts +3 -1
- package/dist/services/session/session-client-factory.d.ts.map +1 -1
- package/dist/services/session/session-client-factory.js +2 -1
- package/dist/services/session/session-client-factory.js.map +1 -1
- package/dist/services/session/session-composition.d.ts +6 -2
- package/dist/services/session/session-composition.d.ts.map +1 -1
- package/dist/services/session/session-composition.js +148 -29
- package/dist/services/session/session-composition.js.map +1 -1
- package/dist/services/session/session-input-planner.d.ts +9 -0
- package/dist/services/session/session-input-planner.d.ts.map +1 -1
- package/dist/services/session/session-input-planner.js +23 -0
- package/dist/services/session/session-input-planner.js.map +1 -1
- package/dist/services/session/session-lifecycle.d.ts +8 -0
- package/dist/services/session/session-lifecycle.d.ts.map +1 -1
- package/dist/services/session/session-lifecycle.js +4 -0
- package/dist/services/session/session-lifecycle.js.map +1 -1
- package/dist/services/session/session-stream-processor.d.ts.map +1 -1
- package/dist/services/session/session-stream-processor.js +5 -15
- package/dist/services/session/session-stream-processor.js.map +1 -1
- package/dist/services/session/turn-attempt-factory.d.ts +2 -1
- package/dist/services/session/turn-attempt-factory.d.ts.map +1 -1
- package/dist/services/session/turn-attempt-factory.js +1 -0
- package/dist/services/session/turn-attempt-factory.js.map +1 -1
- package/dist/services/session/turn-attempt.d.ts +3 -0
- package/dist/services/session/turn-attempt.d.ts.map +1 -1
- package/dist/services/session/turn-attempt.js +5 -0
- package/dist/services/session/turn-attempt.js.map +1 -1
- package/dist/services/session/turn-coordinator.d.ts +1 -1
- package/dist/services/session/turn-coordinator.d.ts.map +1 -1
- package/dist/services/session/turn-workflow.d.ts.map +1 -1
- package/dist/services/session/turn-workflow.js +4 -1
- package/dist/services/session/turn-workflow.js.map +1 -1
- package/dist/services/settings/settings-schema.d.ts +27 -3
- package/dist/services/settings/settings-schema.d.ts.map +1 -1
- package/dist/services/settings/settings-schema.js +35 -11
- package/dist/services/settings/settings-schema.js.map +1 -1
- package/dist/services/settings/settings-service.d.ts +9 -0
- package/dist/services/settings/settings-service.d.ts.map +1 -1
- package/dist/services/settings/settings-service.js +40 -0
- package/dist/services/settings/settings-service.js.map +1 -1
- package/dist/services/settings/settings-sources.d.ts.map +1 -1
- package/dist/services/settings/settings-sources.js +5 -0
- package/dist/services/settings/settings-sources.js.map +1 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.d.ts +2 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.d.ts.map +1 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.js +6 -0
- package/dist/services/settings/test-helpers/settings-consumer-inventory.js.map +1 -1
- package/dist/services/shell/shell-interaction-session.d.ts +4 -5
- package/dist/services/shell/shell-interaction-session.d.ts.map +1 -1
- package/dist/services/shell/shell-interaction-session.js +8 -20
- package/dist/services/shell/shell-interaction-session.js.map +1 -1
- package/dist/services/stream-event-processor.d.ts.map +1 -1
- package/dist/services/stream-event-processor.js +15 -0
- package/dist/services/stream-event-processor.js.map +1 -1
- package/dist/services/subagents/mentor-runner.d.ts.map +1 -1
- package/dist/services/subagents/mentor-runner.js +2 -0
- package/dist/services/subagents/mentor-runner.js.map +1 -1
- package/dist/services/subagents/nested-runner.d.ts.map +1 -1
- package/dist/services/subagents/nested-runner.js +34 -1
- package/dist/services/subagents/nested-runner.js.map +1 -1
- package/dist/services/subagents/subagent-async-registry.js +1 -1
- package/dist/services/subagents/subagent-async-registry.js.map +1 -1
- package/dist/services/subagents/subagent-notification-store.d.ts +28 -1
- package/dist/services/subagents/subagent-notification-store.d.ts.map +1 -1
- package/dist/services/subagents/subagent-notification-store.js +11 -0
- package/dist/services/subagents/subagent-notification-store.js.map +1 -1
- package/dist/services/subagents/tool-policy.d.ts.map +1 -1
- package/dist/services/subagents/tool-policy.js +10 -5
- package/dist/services/subagents/tool-policy.js.map +1 -1
- package/dist/services/subagents/utils.d.ts +2 -0
- package/dist/services/subagents/utils.d.ts.map +1 -1
- package/dist/services/subagents/utils.js +29 -0
- package/dist/services/subagents/utils.js.map +1 -1
- package/dist/services/tool-execution-ledger.d.ts.map +1 -1
- package/dist/services/tool-execution-ledger.js +5 -1
- package/dist/services/tool-execution-ledger.js.map +1 -1
- package/dist/slash-commands.d.ts +3 -0
- package/dist/slash-commands.d.ts.map +1 -1
- package/dist/slash-commands.js.map +1 -1
- package/dist/tools/agent/ask-user.d.ts.map +1 -1
- package/dist/tools/agent/ask-user.js +2 -0
- package/dist/tools/agent/ask-user.js.map +1 -1
- package/dist/tools/agent/run-subagent-async.d.ts +0 -1
- package/dist/tools/agent/run-subagent-async.d.ts.map +1 -1
- package/dist/tools/agent/run-subagent-async.js +3 -3
- package/dist/tools/agent/run-subagent-async.js.map +1 -1
- package/dist/tools/agent/run-subagent.d.ts +2 -2
- package/dist/tools/agent/run-subagent.d.ts.map +1 -1
- package/dist/tools/agent/run-subagent.js +44 -28
- package/dist/tools/agent/run-subagent.js.map +1 -1
- package/dist/tools/file/apply-patch.d.ts.map +1 -1
- package/dist/tools/file/apply-patch.js +11 -3
- package/dist/tools/file/apply-patch.js.map +1 -1
- package/dist/tools/file/create-file.d.ts.map +1 -1
- package/dist/tools/file/create-file.js +12 -4
- package/dist/tools/file/create-file.js.map +1 -1
- package/dist/tools/file/search-replace.d.ts.map +1 -1
- package/dist/tools/file/search-replace.js +10 -3
- package/dist/tools/file/search-replace.js.map +1 -1
- package/dist/tools/memory/memory-tools.d.ts +5 -1
- package/dist/tools/memory/memory-tools.d.ts.map +1 -1
- package/dist/tools/memory/memory-tools.js +445 -62
- package/dist/tools/memory/memory-tools.js.map +1 -1
- package/dist/tools/session-browser/session-browser-tools.d.ts +4 -0
- package/dist/tools/session-browser/session-browser-tools.d.ts.map +1 -0
- package/dist/tools/session-browser/session-browser-tools.js +47 -0
- package/dist/tools/session-browser/session-browser-tools.js.map +1 -0
- package/dist/tools/system/shell.d.ts.map +1 -1
- package/dist/tools/system/shell.js +7 -0
- package/dist/tools/system/shell.js.map +1 -1
- package/dist/tools/types.d.ts +4 -0
- package/dist/tools/types.d.ts.map +1 -1
- package/dist/tools/types.js.map +1 -1
- package/dist/utils/busy-turn-guard.d.ts +17 -0
- package/dist/utils/busy-turn-guard.d.ts.map +1 -0
- package/dist/utils/busy-turn-guard.js +24 -0
- package/dist/utils/busy-turn-guard.js.map +1 -0
- package/dist/utils/conversation/conversation-event-handler.d.ts.map +1 -1
- package/dist/utils/conversation/conversation-event-handler.js +28 -7
- package/dist/utils/conversation/conversation-event-handler.js.map +1 -1
- package/dist/utils/output/bounded-json.d.ts +33 -0
- package/dist/utils/output/bounded-json.d.ts.map +1 -0
- package/dist/utils/output/bounded-json.js +59 -0
- package/dist/utils/output/bounded-json.js.map +1 -0
- package/dist/utils/output/output-trim.d.ts.map +1 -1
- package/dist/utils/output/output-trim.js +7 -7
- package/dist/utils/output/output-trim.js.map +1 -1
- package/dist/utils/output/text-snippet.d.ts +6 -0
- package/dist/utils/output/text-snippet.d.ts.map +1 -0
- package/dist/utils/output/text-snippet.js +106 -0
- package/dist/utils/output/text-snippet.js.map +1 -0
- package/dist/utils/resume-list.d.ts +3 -1
- package/dist/utils/resume-list.d.ts.map +1 -1
- package/dist/utils/resume-list.js +3 -2
- package/dist/utils/resume-list.js.map +1 -1
- package/dist/utils/settings-command.d.ts.map +1 -1
- package/dist/utils/settings-command.js +15 -0
- package/dist/utils/settings-command.js.map +1 -1
- package/dist/utils/shell/command-safety/handlers/index.d.ts.map +1 -1
- package/dist/utils/shell/command-safety/handlers/index.js +3 -0
- package/dist/utils/shell/command-safety/handlers/index.js.map +1 -1
- package/dist/utils/shell/command-safety/handlers/rm-handler.d.ts +3 -0
- package/dist/utils/shell/command-safety/handlers/rm-handler.d.ts.map +1 -0
- package/dist/utils/shell/command-safety/handlers/rm-handler.js +97 -0
- package/dist/utils/shell/command-safety/handlers/rm-handler.js.map +1 -0
- package/dist/utils/shell/command-safety/handlers/types.d.ts +1 -0
- package/dist/utils/shell/command-safety/handlers/types.d.ts.map +1 -1
- package/dist/utils/shell/command-safety/index.d.ts +6 -2
- package/dist/utils/shell/command-safety/index.d.ts.map +1 -1
- package/dist/utils/shell/command-safety/index.js +13 -12
- package/dist/utils/shell/command-safety/index.js.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-policy.d.ts +2 -0
- package/dist/utils/shell/sandbox/sandbox-policy.d.ts.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-policy.js.map +1 -1
- package/dist/utils/shell/sandbox/shell-sandbox-runner.d.ts +1 -0
- package/dist/utils/shell/sandbox/shell-sandbox-runner.d.ts.map +1 -1
- package/dist/utils/shell/sandbox/shell-sandbox-runner.js +20 -1
- package/dist/utils/shell/sandbox/shell-sandbox-runner.js.map +1 -1
- package/dist/utils/shell/temp-dir.d.ts +1 -0
- package/dist/utils/shell/temp-dir.d.ts.map +1 -1
- package/dist/utils/shell/temp-dir.js +12 -4
- package/dist/utils/shell/temp-dir.js.map +1 -1
- package/dist/utils/value-suggestions.d.ts.map +1 -1
- package/dist/utils/value-suggestions.js +1 -0
- package/dist/utils/value-suggestions.js.map +1 -1
- package/package.json +4 -2
|
@@ -44,6 +44,7 @@ export type SessionClientHandle = {
|
|
|
44
44
|
export type SessionClientFactory = {
|
|
45
45
|
create(sessionId: string, options?: {
|
|
46
46
|
allowBackgroundShell?: boolean;
|
|
47
|
+
allowAskUser?: boolean;
|
|
47
48
|
}): SessionClientHandle;
|
|
48
49
|
};
|
|
49
50
|
type DisposableConversationAgentClient = ConversationAgentClient & {
|
|
@@ -61,8 +62,9 @@ export declare function createBackgroundShellWatchScheduler(): BackgroundShellWa
|
|
|
61
62
|
* it creates, so replacement sessions cannot retain a prior closure-bound
|
|
62
63
|
* client or its subscriptions.
|
|
63
64
|
*/
|
|
64
|
-
export declare function createOwnedSessionClientFactory(settings: ISettingsService, createClient: (sessionId: string, toolOwnership: ToolOwnershipRegistry, postExecutePauseCapability: PostExecutePauseCapability, access: SessionAccessState, continuationProjectionMode: ContinuationProjectionMode, providerContinuity: ProviderContinuity, requestCapture: OpenAICandidateObserver, toolLifecycle?: ToolExecutionLifecyclePort, backgroundShellRegistry?: BackgroundShellRegistry<BackgroundShellExecutionResult>, allowBackgroundShell?: boolean, backgroundShellOutput?: BackgroundShellOutputBundle) => DisposableConversationAgentClient, hookLifecycle?: HookLifecyclePort, defaults?: {
|
|
65
|
+
export declare function createOwnedSessionClientFactory(settings: ISettingsService, createClient: (sessionId: string, toolOwnership: ToolOwnershipRegistry, postExecutePauseCapability: PostExecutePauseCapability, access: SessionAccessState, continuationProjectionMode: ContinuationProjectionMode, providerContinuity: ProviderContinuity, requestCapture: OpenAICandidateObserver, toolLifecycle?: ToolExecutionLifecyclePort, backgroundShellRegistry?: BackgroundShellRegistry<BackgroundShellExecutionResult>, allowBackgroundShell?: boolean, backgroundShellOutput?: BackgroundShellOutputBundle, allowAskUser?: boolean) => DisposableConversationAgentClient, hookLifecycle?: HookLifecyclePort, defaults?: {
|
|
65
66
|
allowBackgroundShell?: boolean;
|
|
67
|
+
allowAskUser?: boolean;
|
|
66
68
|
}): SessionClientFactory;
|
|
67
69
|
/**
|
|
68
70
|
* Compatibility seam for callers that provide a prebuilt client. Its owner
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-client-factory.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-client-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAEL,KAAK,yCAAyC,EAC/C,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAEL,KAAK,qCAAqC,EAC3C,MAAM,iDAAiD,CAAC;AAEzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAElE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAEhF,OAAO,EAEL,KAAK,2BAA2B,EAChC,KAAK,6BAA6B,EACnC,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAC;AAElF,yEAAyE;AACzE,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,WAAW,EAAE,uBAAuB,CAAC;IAC9C,oFAAoF;IACpF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACjD,qDAAqD;IACrD,QAAQ,CAAC,yCAAyC,CAAC,EAAE,yCAAyC,CAAC;IAC/F,4DAA4D;IAC5D,QAAQ,CAAC,qCAAqC,CAAC,EAAE,qCAAqC,CAAC;IACvF,2EAA2E;IAC3E,QAAQ,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;IAChE,QAAQ,CAAC,aAAa,EAAE,qBAAqB,CAAC;IAC9C,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC;IACrC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,0BAA0B,CAAC;IACzD,QAAQ,CAAC,0BAA0B,CAAC,EAAE,0BAA0B,CAAC;IACjE,QAAQ,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAC3C,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC;IACvC,QAAQ,CAAC,aAAa,CAAC,EAAE,0BAA0B,CAAC;IACpD,qDAAqD;IACrD,QAAQ,CAAC,uBAAuB,CAAC,EAAE,uBAAuB,CAAC,8BAA8B,CAAC,CAAC;IAC3F,qDAAqD;IACrD,QAAQ,CAAC,qBAAqB,CAAC,EAAE,2BAA2B,CAAC;IAC7D,wEAAwE;IACxE,OAAO,IAAI,IAAI,CAAC;CACjB,CAAC;AAEF,qEAAqE;AACrE,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,oBAAoB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"session-client-factory.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-client-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,6 +53,7 @@ export function createOwnedSessionClientFactory(settings, createClient, hookLife
|
|
|
53
53
|
: undefined;
|
|
54
54
|
const toolLifecycle = hookLifecycle && hookEvents ? createToolExecutionLifecyclePort(hookLifecycle, hookEvents) : undefined;
|
|
55
55
|
const allowBackgroundShell = options?.allowBackgroundShell ?? defaults?.allowBackgroundShell ?? true;
|
|
56
|
+
const allowAskUser = options?.allowAskUser ?? defaults?.allowAskUser ?? true;
|
|
56
57
|
const backgroundShellRegistry = allowBackgroundShell
|
|
57
58
|
? new BackgroundShellRegistry()
|
|
58
59
|
: undefined;
|
|
@@ -71,7 +72,7 @@ export function createOwnedSessionClientFactory(settings, createClient, hookLife
|
|
|
71
72
|
const openAIRootFreshTurnSelectorParityObserver = continuationProjectionMode === 'openai-provider'
|
|
72
73
|
? new ProviderContinuityOpenAIRootSelectorParityObserver(providerContinuity, () => settings.get('agent.model'), undefined, () => openAIRootProviderIdentity.current)
|
|
73
74
|
: undefined;
|
|
74
|
-
const agentClient = createClient(sessionId, toolOwnership, postExecutePauseCapability, access, continuationProjectionMode, providerContinuity, requestCapture, toolLifecycle, backgroundShellRegistry, allowBackgroundShell, backgroundShellOutput);
|
|
75
|
+
const agentClient = createClient(sessionId, toolOwnership, postExecutePauseCapability, access, continuationProjectionMode, providerContinuity, requestCapture, toolLifecycle, backgroundShellRegistry, allowBackgroundShell, backgroundShellOutput, allowAskUser);
|
|
75
76
|
let disposed = false;
|
|
76
77
|
return {
|
|
77
78
|
agentClient,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-client-factory.js","sourceRoot":"","sources":["../../../source/services/session/session-client-factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EACL,kDAAkD,GAEnD,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,4CAA4C,GAE7C,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAEjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,gCAAgC,EAAE,MAAM,iCAAiC,CAAC;AAEnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,EACL,sBAAsB,GAGvB,MAAM,sCAAsC,CAAC;AAoC9C;;;;;GAKG;AACH,MAAM,UAAU,mCAAmC;IACjD,OAAO;QACL,QAAQ,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC;QAC9D,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAwB,CAAC;KAC3D,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,+BAA+B,CAC7C,QAA0B,EAC1B,
|
|
1
|
+
{"version":3,"file":"session-client-factory.js","sourceRoot":"","sources":["../../../source/services/session/session-client-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,7 +80,9 @@ export type SessionRuntimeInternals = {
|
|
|
80
80
|
generationGuard: GenerationGuard;
|
|
81
81
|
providerContinuity: ProviderContinuity;
|
|
82
82
|
breakChaining: () => void;
|
|
83
|
-
compactContext: (
|
|
83
|
+
compactContext: (options?: {
|
|
84
|
+
signal?: AbortSignal;
|
|
85
|
+
}) => Promise<LocalCompactionOutcome | {
|
|
84
86
|
kind: 'busy' | 'stale';
|
|
85
87
|
}>;
|
|
86
88
|
recoveryPolicy: DefaultConversationRecoveryPolicy;
|
|
@@ -204,7 +206,9 @@ export type SessionRuntime = {
|
|
|
204
206
|
state: SessionManager;
|
|
205
207
|
/** Controller for runtime model/provider/retry settings. */
|
|
206
208
|
settings: SessionRuntimeController;
|
|
207
|
-
compactContext: (
|
|
209
|
+
compactContext: (options?: {
|
|
210
|
+
signal?: AbortSignal;
|
|
211
|
+
}) => Promise<LocalCompactionOutcome | {
|
|
208
212
|
kind: 'busy' | 'stale';
|
|
209
213
|
}>;
|
|
210
214
|
logs: SessionLogs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-composition.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-composition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAI3E,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,gEAAgE,CAAC;
|
|
1
|
+
{"version":3,"file":"session-composition.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-composition.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { getCatalogModel } from '../../providers/model-catalog/catalog.js';
|
|
|
2
2
|
import { CONTEXT_COMPACTION_INSTRUCTIONS } from '../../prompts/context-compaction.js';
|
|
3
3
|
import { projectConversationMessage } from '../conversation/conversation-message-projection.js';
|
|
4
4
|
import { LocalContextCompactor, } from '../agent-runtime/context-compaction/local-context-compactor.js';
|
|
5
|
+
import { estimateContext } from '../agent-runtime/context-compaction/index.js';
|
|
5
6
|
import { ConversationStore } from '../conversation/conversation-store.js';
|
|
6
7
|
import { ApprovalState } from '../approval/approval-state.js';
|
|
7
8
|
import { TurnItemAccumulator } from './turn-item-accumulator.js';
|
|
@@ -14,6 +15,7 @@ import { SessionInputPlanner } from './session-input-planner.js';
|
|
|
14
15
|
import { SessionLifecycle } from './session-lifecycle.js';
|
|
15
16
|
import { ProviderContinuity } from '../provider-continuity.js';
|
|
16
17
|
import { TurnCoordinator } from './turn-coordinator.js';
|
|
18
|
+
import { BackgroundCheckInScheduler } from './background-check-in-scheduler.js';
|
|
17
19
|
import { SessionStreamProcessor } from './session-stream-processor.js';
|
|
18
20
|
import { SessionManager } from './session-manager.js';
|
|
19
21
|
import { SessionRuntimeController } from './session-runtime-controller.js';
|
|
@@ -58,6 +60,8 @@ export function createSessionRuntimeInternals(options) {
|
|
|
58
60
|
const resolvedBackgroundShellEventSinkHost = asBackgroundShellEventSinkHost(agentClient);
|
|
59
61
|
// Background (async) subagent runs settle whenever they settle, including
|
|
60
62
|
// while the conversation is idle and no per-turn sink is attached.
|
|
63
|
+
let disposed = false;
|
|
64
|
+
let syncPublicStatus = () => { };
|
|
61
65
|
const notificationStore = new SubagentNotificationStore();
|
|
62
66
|
let notificationObserver = null;
|
|
63
67
|
let taskObserver = null;
|
|
@@ -82,6 +86,7 @@ export function createSessionRuntimeInternals(options) {
|
|
|
82
86
|
client: agentClient,
|
|
83
87
|
notifications: notificationStore,
|
|
84
88
|
onNotification: () => {
|
|
89
|
+
syncPublicStatus();
|
|
85
90
|
try {
|
|
86
91
|
notificationObserver?.();
|
|
87
92
|
}
|
|
@@ -95,6 +100,7 @@ export function createSessionRuntimeInternals(options) {
|
|
|
95
100
|
}
|
|
96
101
|
},
|
|
97
102
|
onTaskChange: () => {
|
|
103
|
+
syncPublicStatus();
|
|
98
104
|
try {
|
|
99
105
|
taskObserver?.();
|
|
100
106
|
}
|
|
@@ -133,6 +139,7 @@ export function createSessionRuntimeInternals(options) {
|
|
|
133
139
|
logger,
|
|
134
140
|
settingsService,
|
|
135
141
|
sessionContextService,
|
|
142
|
+
sessionAccess,
|
|
136
143
|
});
|
|
137
144
|
const appState = { statusMachine: new TurnStatusMachine() };
|
|
138
145
|
const hookEvents = suppliedHookEvents ?? (hookLifecycle ? new HookEventFactory({ sessionId: id }) : undefined);
|
|
@@ -200,6 +207,7 @@ export function createSessionRuntimeInternals(options) {
|
|
|
200
207
|
});
|
|
201
208
|
}
|
|
202
209
|
}
|
|
210
|
+
syncPublicStatus();
|
|
203
211
|
if (!notificationStore.enqueue(event))
|
|
204
212
|
return;
|
|
205
213
|
try {
|
|
@@ -217,6 +225,20 @@ export function createSessionRuntimeInternals(options) {
|
|
|
217
225
|
resolvedSubagentEventSinkHost?.setBackgroundSubagentEventSink?.(recordBackgroundEvent);
|
|
218
226
|
resolvedSubagentEventSinkHost?.setBackgroundSubagentApprovalPauseSink?.(backgroundSubagentApprovals.publish);
|
|
219
227
|
resolvedBackgroundShellEventSinkHost?.setBackgroundShellEventSink?.(recordBackgroundEvent);
|
|
228
|
+
// Wakes the launching agent to check on a still-running background shell
|
|
229
|
+
// job or subagent while the session is otherwise idle. See
|
|
230
|
+
// docs/plans/background-work-control/agent-checkin.md. Settings are read
|
|
231
|
+
// fresh on every tick so a runtime change takes effect without restarting
|
|
232
|
+
// the timer.
|
|
233
|
+
const backgroundCheckInScheduler = new BackgroundCheckInScheduler({
|
|
234
|
+
getRunningTasks: () => notificationStore.getTaskSnapshot(),
|
|
235
|
+
emit: recordBackgroundEvent,
|
|
236
|
+
getSettings: () => ({
|
|
237
|
+
enabled: settingsService?.get('agent.backgroundCheckIn.enabled') ?? true,
|
|
238
|
+
intervalMs: settingsService?.get('agent.backgroundCheckIn.intervalMs') ?? 300_000,
|
|
239
|
+
maxCheckInsPerTask: settingsService?.get('agent.backgroundCheckIn.maxCheckInsPerTask') ?? 3,
|
|
240
|
+
}),
|
|
241
|
+
});
|
|
220
242
|
const approvalFlow = new ApprovalFlowCoordinator({
|
|
221
243
|
agentClient,
|
|
222
244
|
approvalState,
|
|
@@ -252,21 +274,48 @@ export function createSessionRuntimeInternals(options) {
|
|
|
252
274
|
generationGuard,
|
|
253
275
|
continuityReset,
|
|
254
276
|
sessionAccess,
|
|
277
|
+
journal,
|
|
255
278
|
terminateActiveTurn: () => terminateActiveTurn?.(),
|
|
256
279
|
});
|
|
257
280
|
let publicStatus = 'idle';
|
|
258
|
-
|
|
259
|
-
|
|
281
|
+
const computePublicStatus = () => {
|
|
282
|
+
const current = appState.statusMachine.current;
|
|
283
|
+
if (current === 'awaiting_approval') {
|
|
284
|
+
const pending = approvalFlow.getPending();
|
|
285
|
+
const pendingTool = pending ? getToolInfoFromInterruption(pending.interruption).toolName : undefined;
|
|
286
|
+
return pendingTool === 'ask_user' ? 'waiting_for_user' : 'waiting_for_approval';
|
|
287
|
+
}
|
|
288
|
+
if (current !== 'idle') {
|
|
289
|
+
return 'working';
|
|
290
|
+
}
|
|
291
|
+
if (backgroundSubagentApprovals.getSnapshot().pendingCount > 0) {
|
|
292
|
+
return 'waiting_for_approval';
|
|
293
|
+
}
|
|
294
|
+
const backgroundDetails = backgroundTaskControl.listDetails();
|
|
295
|
+
for (const detail of backgroundDetails) {
|
|
296
|
+
if (detail.kind === 'subagent') {
|
|
297
|
+
if (detail.status === 'awaiting_approval') {
|
|
298
|
+
return 'waiting_for_approval';
|
|
299
|
+
}
|
|
300
|
+
if (detail.status === 'waiting_for_answer') {
|
|
301
|
+
return 'waiting_for_user';
|
|
302
|
+
}
|
|
303
|
+
if (detail.status === 'running' || detail.status === 'cancelling') {
|
|
304
|
+
return 'working';
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
else if (detail.kind === 'shell') {
|
|
308
|
+
if (detail.status === 'running' || detail.status === 'cancelling') {
|
|
309
|
+
return 'working';
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
}
|
|
313
|
+
return 'idle';
|
|
314
|
+
};
|
|
315
|
+
syncPublicStatus = () => {
|
|
316
|
+
if (disposed || !hookLifecycle || !hookEvents)
|
|
260
317
|
return;
|
|
261
|
-
const
|
|
262
|
-
const pendingTool = pending ? getToolInfoFromInterruption(pending.interruption).toolName : undefined;
|
|
263
|
-
const next = current === 'idle'
|
|
264
|
-
? 'idle'
|
|
265
|
-
: current === 'awaiting_approval'
|
|
266
|
-
? pendingTool === 'ask_user'
|
|
267
|
-
? 'waiting_for_user'
|
|
268
|
-
: 'waiting_for_approval'
|
|
269
|
-
: 'working';
|
|
318
|
+
const next = computePublicStatus();
|
|
270
319
|
if (next === publicStatus)
|
|
271
320
|
return;
|
|
272
321
|
const previous = publicStatus;
|
|
@@ -282,6 +331,12 @@ export function createSessionRuntimeInternals(options) {
|
|
|
282
331
|
? 'turn_finished'
|
|
283
332
|
: 'turn_started',
|
|
284
333
|
}));
|
|
334
|
+
};
|
|
335
|
+
appState.statusMachine.setObserver(() => {
|
|
336
|
+
syncPublicStatus();
|
|
337
|
+
});
|
|
338
|
+
backgroundSubagentApprovals.subscribe(() => {
|
|
339
|
+
syncPublicStatus();
|
|
285
340
|
});
|
|
286
341
|
const streamProcessor = new SessionStreamProcessor({
|
|
287
342
|
logger,
|
|
@@ -420,13 +475,13 @@ export function createSessionRuntimeInternals(options) {
|
|
|
420
475
|
agentClient,
|
|
421
476
|
state,
|
|
422
477
|
});
|
|
423
|
-
let disposed = false;
|
|
424
478
|
let backgroundShellSettlement;
|
|
425
479
|
let backgroundSubagentSettlement;
|
|
426
480
|
const dispose = () => {
|
|
427
481
|
if (disposed)
|
|
428
482
|
return;
|
|
429
483
|
disposed = true;
|
|
484
|
+
backgroundCheckInScheduler.dispose();
|
|
430
485
|
turnWorkflow.abortLiveRun();
|
|
431
486
|
postExecutePending.close();
|
|
432
487
|
generationGuard.invalidate();
|
|
@@ -471,7 +526,7 @@ export function createSessionRuntimeInternals(options) {
|
|
|
471
526
|
})();
|
|
472
527
|
return shutdownPromise;
|
|
473
528
|
};
|
|
474
|
-
const compactContext = async () => {
|
|
529
|
+
const compactContext = async (options) => {
|
|
475
530
|
if (!appState.statusMachine.is('idle'))
|
|
476
531
|
return { kind: 'busy' };
|
|
477
532
|
const snapshot = conversationStore.getProviderHistorySnapshot();
|
|
@@ -483,29 +538,92 @@ export function createSessionRuntimeInternals(options) {
|
|
|
483
538
|
const catalog = getCatalogModel(provider, model);
|
|
484
539
|
const compactThreshold = settingsService?.get('agent.contextCompaction.compactThreshold') ?? 0.8;
|
|
485
540
|
const configuredMaxOutput = settingsService?.get('agent.maxOutputTokens');
|
|
541
|
+
const abortError = () => {
|
|
542
|
+
const error = new Error('Context compaction cancelled.');
|
|
543
|
+
error.name = 'AbortError';
|
|
544
|
+
return error;
|
|
545
|
+
};
|
|
546
|
+
const compactCodex = getMethod(agentClient, 'compactCodexSessionHistory');
|
|
547
|
+
if (provider === 'codex' && compactCodex) {
|
|
548
|
+
const before = estimateContext({
|
|
549
|
+
history: snapshot.history,
|
|
550
|
+
contextWindow: catalog?.contextWindow,
|
|
551
|
+
maxOutputTokens: catalog?.maxTokens,
|
|
552
|
+
});
|
|
553
|
+
const remote = await compactCodex.call(agentClient, snapshot.history, options?.signal);
|
|
554
|
+
if (remote.kind !== 'compacted') {
|
|
555
|
+
return remote.kind === 'failed'
|
|
556
|
+
? {
|
|
557
|
+
kind: 'blocked',
|
|
558
|
+
reason: 'result_still_too_large',
|
|
559
|
+
estimate: before,
|
|
560
|
+
}
|
|
561
|
+
: { kind: 'not_needed', estimate: before };
|
|
562
|
+
}
|
|
563
|
+
if (!conversationStore.replaceHistoryAtRevision(snapshot.revision, remote.history)) {
|
|
564
|
+
return { kind: 'stale' };
|
|
565
|
+
}
|
|
566
|
+
providerContinuity.clear();
|
|
567
|
+
const after = estimateContext({
|
|
568
|
+
history: remote.history,
|
|
569
|
+
contextWindow: catalog?.contextWindow,
|
|
570
|
+
maxOutputTokens: catalog?.maxTokens,
|
|
571
|
+
});
|
|
572
|
+
return {
|
|
573
|
+
kind: 'compacted',
|
|
574
|
+
checkpoint: {
|
|
575
|
+
type: 'message',
|
|
576
|
+
role: 'system',
|
|
577
|
+
content: '',
|
|
578
|
+
contextSummary: {
|
|
579
|
+
version: 1,
|
|
580
|
+
strategy: 'local',
|
|
581
|
+
estimatedTokensBefore: before.renderedInputTokens,
|
|
582
|
+
estimatedTokensAfter: after.renderedInputTokens,
|
|
583
|
+
},
|
|
584
|
+
},
|
|
585
|
+
hotTail: [],
|
|
586
|
+
estimate: after,
|
|
587
|
+
rearmAtTokens: after.renderedInputTokens,
|
|
588
|
+
usage: { inputTokens: 0, outputTokens: 0 },
|
|
589
|
+
costRecords: [],
|
|
590
|
+
droppedOpaqueItems: 0,
|
|
591
|
+
};
|
|
592
|
+
}
|
|
486
593
|
const compactor = new LocalContextCompactor({
|
|
487
|
-
generate: async ({ renderedInput, maxOutputTokens }) => {
|
|
488
|
-
|
|
594
|
+
generate: async ({ renderedInput, maxOutputTokens, signal }) => {
|
|
595
|
+
if (signal?.aborted)
|
|
596
|
+
throw abortError();
|
|
597
|
+
const chatOptions = {
|
|
489
598
|
provider,
|
|
490
599
|
model,
|
|
491
600
|
reasoningEffort,
|
|
492
601
|
instructions: CONTEXT_COMPACTION_INSTRUCTIONS,
|
|
493
602
|
maxTokens: maxOutputTokens,
|
|
494
603
|
};
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
604
|
+
const aborted = new Promise((_, reject) => {
|
|
605
|
+
signal?.addEventListener('abort', () => {
|
|
606
|
+
getMethod(agentClient, 'abort')?.call(agentClient);
|
|
607
|
+
reject(abortError());
|
|
608
|
+
}, { once: true });
|
|
609
|
+
});
|
|
610
|
+
const generate = async () => {
|
|
611
|
+
if (agentClient.chatDetailed) {
|
|
612
|
+
const result = await agentClient.chatDetailed(renderedInput, chatOptions);
|
|
613
|
+
return {
|
|
614
|
+
text: result.text,
|
|
615
|
+
usage: result.usage
|
|
616
|
+
? {
|
|
617
|
+
inputTokens: result.usage.prompt_tokens,
|
|
618
|
+
outputTokens: result.usage.completion_tokens,
|
|
619
|
+
}
|
|
620
|
+
: undefined,
|
|
621
|
+
costRecords: result.costRecords,
|
|
622
|
+
};
|
|
623
|
+
}
|
|
624
|
+
return { text: await agentClient.chat(renderedInput, chatOptions) };
|
|
625
|
+
};
|
|
626
|
+
return signal ? Promise.race([generate(), aborted]) : generate();
|
|
509
627
|
},
|
|
510
628
|
});
|
|
511
629
|
const outcome = await compactor.compactAtBoundary({
|
|
@@ -520,6 +638,7 @@ export function createSessionRuntimeInternals(options) {
|
|
|
520
638
|
compactThreshold,
|
|
521
639
|
compactThresholdTokens: null,
|
|
522
640
|
manual: true,
|
|
641
|
+
signal: options?.signal,
|
|
523
642
|
});
|
|
524
643
|
if (outcome.kind !== 'compacted')
|
|
525
644
|
return outcome;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-composition.js","sourceRoot":"","sources":["../../../source/services/session/session-composition.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-composition.js","sourceRoot":"","sources":["../../../source/services/session/session-composition.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AACtF,OAAO,EAAE,0BAA0B,EAAE,MAAM,oDAAoD,CAAC;AAChG,OAAO,EACL,qBAAqB,GAEtB,MAAM,gEAAgE,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAE/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAA+B,MAAM,+BAA+B,CAAC;AAC3F,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAEL,mCAAmC,GACpC,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AASvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAyB,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EACL,yBAAyB,GAG1B,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAkC,MAAM,8BAA8B,CAAC;AAErG,OAAO,EACL,0BAA0B,GAI3B,MAAM,oCAAoC,CAAC;AAI5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAC9G,OAAO,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AACxF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAA4B,EAAE,CACvE,KAAK,IAAI,OAAQ,KAA2B,CAAC,gBAAgB,KAAK,UAAU,CAAC,CAAC,CAAE,KAA2B,CAAC,CAAC,CAAC,IAAI,CAAC;AAErH,MAAM,uBAAuB,GAAG,CAAC,KAAc,EAAgC,EAAE,CAC/E,KAAK,IAAI,OAAQ,KAA+B,CAAC,oBAAoB,KAAK,UAAU;IAClF,CAAC,CAAE,KAA+B;IAClC,CAAC,CAAC,IAAI,CAAC;AAEX,MAAM,8BAA8B,GAAG,CACrC,KAAc,EACuD,EAAE,CACvE,KAAK,IAAI,OAAQ,KAAiC,CAAC,2BAA2B,KAAK,UAAU;IAC3F,CAAC,CAAE,KAAsE;IACzE,CAAC,CAAC,IAAI,CAAC;AAuNX,qEAAqE;AAErE,MAAM,UAAU,6BAA6B,CAAC,OAA6C;IACzF,MAAM,EACJ,SAAS,EAAE,EAAE,EACb,gBAAgB,EAChB,WAAW,EACX,kBAAkB,EAAE,0BAA0B,EAC9C,yCAAyC,EACzC,qCAAqC,EACrC,aAAa,EACb,kBAAkB,EAAE,0BAA0B,EAC9C,0BAA0B,EAC1B,aAAa,EACb,iBAAiB,EACjB,qBAAqB,EACrB,IAAI,EACJ,YAAY,EACZ,eAAe,EACf,aAAa,EACb,UAAU,EAAE,kBAAkB,EAC9B,eAAe,EAAE,uBAAuB,GACzC,GAAG,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAAC;IAChE,MAAM,SAAS,GAAG,gBAAgB,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC/D,MAAM,uBAAuB,GAAG,eAAe,IAAI,IAAI,mBAAmB,EAAE,CAAC;IAC7E,MAAM,eAAe,GAAG,uBAAuB,IAAI,IAAI,mBAAmB,EAAE,CAAC;IAC7E,MAAM,yBAAyB,GAAG,iBAAiB,IAAI,mBAAmB,CAAC,WAAW,CAAC,CAAC;IACxF,MAAM,6BAA6B,GAAG,qBAAqB,IAAI,uBAAuB,CAAC,WAAW,CAAC,CAAC;IACpG,MAAM,oCAAoC,GAAG,8BAA8B,CAAC,WAAW,CAAC,CAAC;IAEzF,0EAA0E;IAC1E,mEAAmE;IACnE,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,gBAAgB,GAAe,GAAG,EAAE,GAAE,CAAC,CAAC;IAC5C,MAAM,iBAAiB,GAAG,IAAI,yBAAyB,EAAE,CAAC;IAC1D,IAAI,oBAAoB,GAAwB,IAAI,CAAC;IACrD,IAAI,YAAY,GAAwB,IAAI,CAAC;IAC7C,MAAM,+BAA+B,GAA0C;QAC7E,IAAI,YAAY;YACd,OAAO,iBAAiB,CAAC,YAAY,CAAC;QACxC,CAAC;QACD,KAAK,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,KAAK,EAAE;QACtC,MAAM,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,aAAa,CAAC;QAClE,kBAAkB,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,YAAY,CAAC;QACxF,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE;YACxB,oBAAoB,GAAG,QAAQ,CAAC;QAClC,CAAC;KACF,CAAC;IACF,MAAM,uBAAuB,GAAkC;QAC7D,WAAW,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,eAAe,EAAE;QACtD,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE;YACxB,YAAY,GAAG,QAAQ,CAAC;QAC1B,CAAC;KACF,CAAC;IACF,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,CAAC;QACtD,MAAM,EAAE,WAAW;QACnB,aAAa,EAAE,iBAAiB;QAChC,cAAc,EAAE,GAAG,EAAE;YACnB,gBAAgB,EAAE,CAAC;YACnB,IAAI,CAAC;gBACH,oBAAoB,EAAE,EAAE,CAAC;YAC3B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,IAAI,CAAC,qDAAqD,EAAE;oBACjE,SAAS,EAAE,+CAA+C;oBAC1D,QAAQ,EAAE,UAAU;oBACpB,SAAS,EAAE,EAAE;oBACb,YAAY,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;iBACrE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,YAAY,EAAE,GAAG,EAAE;YACjB,gBAAgB,EAAE,CAAC;YACnB,IAAI,CAAC;gBACH,YAAY,EAAE,EAAE,CAAC;YACnB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,IAAI,CAAC,6CAA6C,EAAE;oBACzD,SAAS,EAAE,uCAAuC;oBAClD,QAAQ,EAAE,UAAU;oBACpB,SAAS,EAAE,EAAE;oBACb,YAAY,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;iBACrE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,2EAA2E;IAC3E,2EAA2E;IAC3E,MAAM,2BAA2B,GAAG,IAAI,oCAAoC,CAAC;QAC3E,MAAM;QACN,SAAS,EAAE,EAAE;QACb,aAAa;QACb,mBAAmB,EAAE,SAAS,CAG5B,WAAW,EAAE,iCAAiC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC;KACrE,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAC9C,2EAA2E;IAC3E,kFAAkF;IAClF,MAAM,kBAAkB,GACtB,0BAA0B,IAAI,IAAI,0BAA0B,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAE9G,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;IAClD,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;IAC1C,MAAM,kBAAkB,GAAG,IAAI,uBAAuB,EAAE,CAAC;IACzD,MAAM,WAAW,GAAG,IAAI,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IAE9D,+EAA+E;IAC/E,gFAAgF;IAChF,SAAS,CAA0D,WAAW,EAAE,mBAAmB,CAAC,EAAE,IAAI,CACxG,WAAW,EACX,CAAC,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC,MAAM,CAAC,CAC/C,CAAC;IAEF,MAAM,iBAAiB,GAAG,IAAI,mCAAmC,CAAC;QAChE,iBAAiB;QACjB,WAAW;QACX,MAAM;QACN,eAAe;QACf,qBAAqB;QACrB,aAAa;KACd,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,EAAE,aAAa,EAAE,IAAI,iBAAiB,EAAE,EAAE,CAAC;IAC5D,MAAM,UAAU,GAAG,kBAAkB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,gBAAgB,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC/G,MAAM,kBAAkB,GAAG,0BAA0B,IAAI,IAAI,kBAAkB,EAAE,CAAC;IAElF,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC;QAC3C,eAAe;QACf,WAAW;QACX,WAAW;QACX,kBAAkB;QAClB,0BAA0B,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,0BAA0B,EAAE;QAChF,kBAAkB,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,0BAA0B,EAAE,CAAC,QAAQ;KAClF,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAI,oBAAoB,CAAC;QACvC,gBAAgB,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,gBAAgB,EAAE;KACvD,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAAC;QAChD,eAAe,EAAE,uBAAuB;QACxC,MAAM;QACN,qBAAqB,EAAE,GAAG,EAAE;YAC1B,MAAM,EAAE,GAAG,SAAS,CAAa,WAAW,EAAE,aAAa,CAAC,CAAC;YAC7D,MAAM,QAAQ,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;YACpF,MAAM,KAAK,GAAG,eAAe,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;YAClD,OAAO;gBACL,kBAAkB,EAAE,kBAAkB,CAAC,kBAAkB;gBACzD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3B,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACL,CAAC;QACjC,CAAC;QACD,gBAAgB,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,gBAAgB,EAAE;QACtD,aAAa,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE;QACzC,OAAO;KACR,CAAC,CAAC;IACH,yCAAyC,EAAE,mBAAmB,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC5E,IAAI,CAAC;YACH,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC;YACP,kEAAkE;QACpE,CAAC;IACH,CAAC,CAAC,CAAC;IACH,qCAAqC,EAAE,mBAAmB,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE;QACxE,IAAI,CAAC;YACH,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC;YACP,sEAAsE;QACxE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,wEAAwE;IACxE,0EAA0E;IAC1E,6EAA6E;IAC7E,yBAAyB;IACzB,MAAM,qBAAqB,GAAG,CAAC,KAAwB,EAAE,EAAE;QACzD,kBAAkB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,iBAAiB,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7C,IAAI,CAAC;gBACH,YAAY,EAAE,EAAE,CAAC;YACnB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE;oBACrD,SAAS,EAAE,+BAA+B;oBAC1C,QAAQ,EAAE,UAAU;oBACpB,SAAS,EAAE,EAAE;oBACb,YAAY,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;iBACrE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,gBAAgB,EAAE,CAAC;QACnB,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC;YAAE,OAAO;QAC9C,IAAI,CAAC;YACH,oBAAoB,EAAE,EAAE,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE;gBAC7D,SAAS,EAAE,uCAAuC;gBAClD,QAAQ,EAAE,UAAU;gBACpB,SAAS,EAAE,EAAE;gBACb,YAAY,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aACrE,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IACF,6BAA6B,EAAE,8BAA8B,EAAE,CAAC,qBAAqB,CAAC,CAAC;IACvF,6BAA6B,EAAE,sCAAsC,EAAE,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC7G,oCAAoC,EAAE,2BAA2B,EAAE,CAAC,qBAAqB,CAAC,CAAC;IAE3F,yEAAyE;IACzE,2DAA2D;IAC3D,yEAAyE;IACzE,0EAA0E;IAC1E,aAAa;IACb,MAAM,0BAA0B,GAAG,IAAI,0BAA0B,CAAC;QAChE,eAAe,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,eAAe,EAAE;QAC1D,IAAI,EAAE,qBAAqB;QAC3B,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;YAClB,OAAO,EAAE,eAAe,EAAE,GAAG,CAAC,iCAAiC,CAAC,IAAI,IAAI;YACxE,UAAU,EAAE,eAAe,EAAE,GAAG,CAAC,oCAAoC,CAAC,IAAI,OAAO;YACjF,kBAAkB,EAAE,eAAe,EAAE,GAAG,CAAC,4CAA4C,CAAC,IAAI,CAAC;SAC5F,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAI,uBAAuB,CAAC;QAC/C,WAAW;QACX,aAAa;QACb,MAAM;QACN,SAAS,EAAE,EAAE;QACb,WAAW;QACX,eAAe;QACf,aAAa;QACb,aAAa;QACb,aAAa;QACb,UAAU;QACV,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAI,sBAAsB,CAAC;QACjD,kBAAkB;QAClB,YAAY;QACZ,WAAW;QACX,iBAAiB;QACjB,YAAY;QACZ,eAAe,EAAE,uBAAuB;QACxC,WAAW;KACZ,CAAC,CAAC;IAEH,wCAAwC;IACxC,IAAI,mBAA6C,CAAC;IAClD,MAAM,KAAK,GAAG,IAAI,gBAAgB,CAAC;QACjC,YAAY;QACZ,WAAW;QACX,iBAAiB;QACjB,MAAM;QACN,SAAS,EAAE,EAAE;QACb,QAAQ;QACR,kBAAkB;QAClB,eAAe;QACf,eAAe;QACf,aAAa;QACb,OAAO;QACP,mBAAmB,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,EAAE;KACnD,CAAC,CAAC;IAEH,IAAI,YAAY,GAAqD,MAAM,CAAC;IAC5E,MAAM,mBAAmB,GAAG,GAAqD,EAAE;QACjF,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC;QAC/C,IAAI,OAAO,KAAK,mBAAmB,EAAE,CAAC;YACpC,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;YAC1C,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,2BAA2B,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YACrG,OAAO,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,sBAAsB,CAAC;QAClF,CAAC;QACD,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;YACvB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,IAAI,2BAA2B,CAAC,WAAW,EAAE,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;YAC/D,OAAO,sBAAsB,CAAC;QAChC,CAAC;QACD,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,WAAW,EAAE,CAAC;QAC9D,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE,CAAC;YACvC,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC/B,IAAI,MAAM,CAAC,MAAM,KAAK,mBAAmB,EAAE,CAAC;oBAC1C,OAAO,sBAAsB,CAAC;gBAChC,CAAC;gBACD,IAAI,MAAM,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;oBAC3C,OAAO,kBAAkB,CAAC;gBAC5B,CAAC;gBACD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;oBAClE,OAAO,SAAS,CAAC;gBACnB,CAAC;YACH,CAAC;iBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACnC,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;oBAClE,OAAO,SAAS,CAAC;gBACnB,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,gBAAgB,GAAG,GAAS,EAAE;QAC5B,IAAI,QAAQ,IAAI,CAAC,aAAa,IAAI,CAAC,UAAU;YAAE,OAAO;QACtD,MAAM,IAAI,GAAG,mBAAmB,EAAE,CAAC;QACnC,IAAI,IAAI,KAAK,YAAY;YAAE,OAAO;QAClC,MAAM,QAAQ,GAAG,YAAY,CAAC;QAC9B,YAAY,GAAG,IAAI,CAAC;QACpB,KAAK,aAAa,CAAC,IAAI,CACrB,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE;YACjC,QAAQ;YACR,OAAO,EAAE,IAAI;YACb,MAAM,EACJ,IAAI,KAAK,kBAAkB;gBACzB,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC,IAAI,KAAK,sBAAsB;oBACjC,CAAC,CAAC,oBAAoB;oBACtB,CAAC,CAAC,IAAI,KAAK,MAAM;wBACjB,CAAC,CAAC,eAAe;wBACjB,CAAC,CAAC,cAAc;SACrB,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;IAEF,QAAQ,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,EAAE;QACtC,gBAAgB,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IACH,2BAA2B,CAAC,SAAS,CAAC,GAAG,EAAE;QACzC,gBAAgB,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAI,sBAAsB,CAAC;QACjD,MAAM;QACN,SAAS,EAAE,EAAE;QACb,WAAW;QACX,iBAAiB;QACjB,kBAAkB;QAClB,kBAAkB;QAClB,qCAAqC;QACrC,eAAe;QACf,OAAO;QACP,WAAW,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE;QACtC,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,GAAS,EAAE;QAC/B,kBAAkB,CAAC,aAAa,EAAE,CAAC;QACnC,MAAM,CAAC,IAAI,CAAC,kFAAkF,EAAE;YAC9F,SAAS,EAAE,8BAA8B;YACzC,QAAQ,EAAE,UAAU;YACpB,KAAK,EAAE,aAAa;YACpB,SAAS,EAAE,EAAE;SACd,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,IAAI,iCAAiC,EAAE,CAAC;IAC/D,MAAM,gBAAgB,GAAG,IAAI,uBAAuB,CAAC;QACnD,WAAW;QACX,iBAAiB;QACjB,kBAAkB;KACnB,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,IAAI,sBAAsB,CAAC,WAAW,CAAC,CAAC;IAChE,MAAM,mBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAC;IACtD,MAAM,iBAAiB,GAAG,GAAW,EAAE;QACrC,MAAM,UAAU,GAAG,eAAe,EAAE,GAAG,CAAC,qBAAqB,CAAC,CAAC;QAC/D,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC;YACtF,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC,CAAC;IACF,MAAM,cAAc,GAAG,IAAI,kBAAkB,CAAC;QAC5C,WAAW;QACX,iBAAiB;QACjB,eAAe;QACf,WAAW;QACX,KAAK;QACL,iBAAiB;QACjB,OAAO;KACR,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,IAAI,oBAAoB,CAAC;QAC7C,iBAAiB;QACjB,eAAe;QACf,YAAY;QACZ,MAAM;QACN,SAAS,EAAE,EAAE;QACb,KAAK;KACN,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,IAAI,0BAA0B,CAAC;QACrD,aAAa;QACb,iBAAiB;QACjB,wBAAwB,EAAE,YAAY,EAAE,sBAAsB,IAAI,IAAI;QACtE,eAAe;QACf,YAAY;QACZ,MAAM;QACN,gBAAgB;QAChB,cAAc;QACd,eAAe;QACf,mBAAmB;QACnB,SAAS,EAAE,EAAE;KACd,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAI,uBAAuB,CAAC;QAC9C,YAAY;QACZ,WAAW;QACX,MAAM;QACN,SAAS,EAAE,EAAE;QACb,OAAO;KACR,CAAC,CAAC;IAEH,MAAM,2BAA2B,GAAG,IAAI,2BAA2B,CAAC;QAClE,aAAa;QACb,MAAM;QACN,SAAS,EAAE,EAAE;QACb,eAAe;QACf,eAAe;QACf,cAAc;QACd,gBAAgB;QAChB,mBAAmB;QACnB,iBAAiB;QACjB,WAAW;KACZ,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC;QACpC,WAAW;QACX,MAAM;QACN,SAAS,EAAE,EAAE;QACb,eAAe,EAAE,uBAAuB;QACxC,WAAW;QACX,iBAAiB;QACjB,eAAe;QACf,cAAc;QACd,aAAa;QACb,eAAe;QACf,eAAe;QACf,OAAO;QACP,YAAY;QACZ,iBAAiB;QACjB,YAAY;QACZ,WAAW;QACX,2BAA2B;QAC3B,kBAAkB;QAClB,yCAAyC;QACzC,aAAa;QACb,kBAAkB;QAClB,yBAAyB,EAAE,0BAA0B,EAAE,cAAc,CAAC,IAAI,CAAC,0BAA0B,CAAC;QACtG,eAAe;QACf,aAAa;QACb,UAAU;KACX,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC;QAC1C,aAAa,EAAE,QAAQ,CAAC,aAAa;QACrC,YAAY;QACZ,YAAY;QACZ,kBAAkB;QAClB,iBAAiB;QACjB,SAAS,EAAE,EAAE;QACb,aAAa;QACb,UAAU;KACX,CAAC,CAAC;IACH,mBAAmB,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC;IAExD,MAAM,WAAW,GAAG,IAAI,cAAc,CAAC;QACrC,iBAAiB;QACjB,WAAW;QACX,KAAK;QACL,kBAAkB;QAClB,WAAW;QACX,eAAe;QACf,YAAY;KACb,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,IAAI,wBAAwB,CAAC;QACrD,WAAW;QACX,KAAK;KACN,CAAC,CAAC;IAEH,IAAI,yBAAoD,CAAC;IACzD,IAAI,4BAAuD,CAAC;IAC5D,MAAM,OAAO,GAAG,GAAS,EAAE;QACzB,IAAI,QAAQ;YAAE,OAAO;QACrB,QAAQ,GAAG,IAAI,CAAC;QAChB,0BAA0B,CAAC,OAAO,EAAE,CAAC;QACrC,YAAY,CAAC,YAAY,EAAE,CAAC;QAC5B,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAC3B,eAAe,CAAC,UAAU,EAAE,CAAC;QAC7B,iEAAiE;QACjE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,YAAY,CAAC,KAAK,EAAE,CAAC;YACrB,QAAQ,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QACjC,CAAC;QACD,yEAAyE;QACzE,4DAA4D;QAC5D,SAAS,CAAW,WAAW,EAAE,sBAAsB,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC5E,SAAS,CAAW,WAAW,EAAE,2BAA2B,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACjF,SAAS,CAAW,WAAW,EAAE,sBAAsB,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC5E,oBAAoB,GAAG,IAAI,CAAC;QAC5B,YAAY,GAAG,IAAI,CAAC;QACpB,MAAM,gBAAgB,GAAG,SAAS,CAAoB,WAAW,EAAE,4BAA4B,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACpH,4BAA4B,GAAG,gBAAgB;YAC7C,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;gBAC7C,2BAA2B,CAAC,KAAK,EAAE,CAAC;gBACpC,6BAA6B,EAAE,sCAAsC,EAAE,CAAC,IAAI,CAAC,CAAC;gBAC9E,6BAA6B,EAAE,8BAA8B,EAAE,CAAC,IAAI,CAAC,CAAC;YACxE,CAAC,CAAC;YACJ,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC1B,2BAA2B,CAAC,KAAK,EAAE,CAAC;gBACpC,6BAA6B,EAAE,sCAAsC,EAAE,CAAC,IAAI,CAAC,CAAC;gBAC9E,6BAA6B,EAAE,8BAA8B,EAAE,CAAC,IAAI,CAAC,CAAC;YACxE,CAAC,CAAC,CAAC;QACP,MAAM,aAAa,GAAG,SAAS,CAAoB,WAAW,EAAE,4BAA4B,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACjH,yBAAyB,GAAG,aAAa;YACvC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAC1C,oCAAoC,EAAE,2BAA2B,EAAE,CAAC,IAAI,CAAC,CAC1E;YACH,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,oCAAoC,EAAE,2BAA2B,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5G,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAC3B,kBAAkB,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC,CAAC;IAEF,IAAI,eAA0C,CAAC;IAC/C,MAAM,QAAQ,GAAG,GAAkB,EAAE;QACnC,eAAe,KAAK,CAAC,KAAK,IAAI,EAAE;YAC9B,OAAO,EAAE,CAAC;YACV,MAAM,yBAAyB,CAAC;YAChC,MAAM,4BAA4B,CAAC;YACnC,MAAM,aAAa,EAAE,QAAQ,EAAE,CAAC;QAClC,CAAC,CAAC,EAAE,CAAC;QACL,OAAO,eAAe,CAAC;IACzB,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,KAAK,EAAE,OAE7B,EAAgE,EAAE;QACjE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC;YAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAChE,MAAM,QAAQ,GAAG,iBAAiB,CAAC,0BAA0B,EAAE,CAAC;QAChE,MAAM,QAAQ,GACZ,SAAS,CAAa,WAAW,EAAE,aAAa,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC;YACpE,eAAe,EAAE,GAAG,CAAC,gBAAgB,CAAC;YACtC,QAAQ,CAAC;QACX,MAAM,KAAK,GAAG,eAAe,EAAE,GAAG,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC;QAC7D,MAAM,eAAe,GAAG,eAAe,EAAE,GAAG,CAAC,uBAAuB,CAAC,CAAC;QACtE,MAAM,OAAO,GAAG,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACjD,MAAM,gBAAgB,GAAG,eAAe,EAAE,GAAG,CAAC,0CAA0C,CAAC,IAAI,GAAG,CAAC;QACjG,MAAM,mBAAmB,GAAG,eAAe,EAAE,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,GAAU,EAAE;YAC7B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;YACzD,KAAK,CAAC,IAAI,GAAG,YAAY,CAAC;YAC1B,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QACF,MAAM,YAAY,GAAG,SAAS,CAO5B,WAAW,EAAE,4BAA4B,CAAC,CAAC;QAC7C,IAAI,QAAQ,KAAK,OAAO,IAAI,YAAY,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,eAAe,CAAC;gBAC7B,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,aAAa,EAAE,OAAO,EAAE,aAAa;gBACrC,eAAe,EAAE,OAAO,EAAE,SAAS;aACpC,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACvF,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAChC,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;oBAC7B,CAAC,CAAC;wBACE,IAAI,EAAE,SAAS;wBACf,MAAM,EAAE,wBAAwB;wBAChC,QAAQ,EAAE,MAAM;qBACjB;oBACH,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;YAC/C,CAAC;YACD,IAAI,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnF,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;YAC3B,CAAC;YACD,kBAAkB,CAAC,KAAK,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,eAAe,CAAC;gBAC5B,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,aAAa,EAAE,OAAO,EAAE,aAAa;gBACrC,eAAe,EAAE,OAAO,EAAE,SAAS;aACpC,CAAC,CAAC;YACH,OAAO;gBACL,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE;oBACV,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,EAAE;oBACX,cAAc,EAAE;wBACd,OAAO,EAAE,CAAC;wBACV,QAAQ,EAAE,OAAO;wBACjB,qBAAqB,EAAE,MAAM,CAAC,mBAAmB;wBACjD,oBAAoB,EAAE,KAAK,CAAC,mBAAmB;qBAChD;iBACF;gBACD,OAAO,EAAE,EAAE;gBACX,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,KAAK,CAAC,mBAAmB;gBACxC,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE;gBAC1C,WAAW,EAAE,EAAE;gBACf,kBAAkB,EAAE,CAAC;aACtB,CAAC;QACJ,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,qBAAqB,CAAC;YAC1C,QAAQ,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,EAAE;gBAC7D,IAAI,MAAM,EAAE,OAAO;oBAAE,MAAM,UAAU,EAAE,CAAC;gBACxC,MAAM,WAAW,GAAG;oBAClB,QAAQ;oBACR,KAAK;oBACL,eAAe;oBACf,YAAY,EAAE,+BAA+B;oBAC7C,SAAS,EAAE,eAAe;iBAC3B,CAAC;gBACF,MAAM,OAAO,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;oBAC/C,MAAM,EAAE,gBAAgB,CACtB,OAAO,EACP,GAAG,EAAE;wBACH,SAAS,CAAW,WAAW,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;wBAC7D,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;oBACvB,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;gBACJ,CAAC,CAAC,CAAC;gBACH,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;oBAC1B,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;wBAC7B,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;wBAC1E,OAAO;4BACL,IAAI,EAAE,MAAM,CAAC,IAAI;4BACjB,KAAK,EAAE,MAAM,CAAC,KAAK;gCACjB,CAAC,CAAC;oCACE,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa;oCACvC,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,iBAAiB;iCAC7C;gCACH,CAAC,CAAC,SAAS;4BACb,WAAW,EAAE,MAAM,CAAC,WAAW;yBAChC,CAAC;oBACJ,CAAC;oBACD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,EAAE,CAAC;gBACtE,CAAC,CAAC;gBACF,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACnE,CAAC;SACF,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,iBAAiB,CAAC;YAChD,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,QAAQ;YACR,KAAK;YACL,cAAc,EAAE,QAAQ,CAAC,QAAQ;YACjC,aAAa,EAAE,OAAO,EAAE,aAAa;YACrC,eAAe,EACb,mBAAmB,KAAK,SAAS;gBAC/B,CAAC,CAAC,OAAO,EAAE,SAAS;gBACpB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,OAAO,EAAE,SAAS,IAAI,mBAAmB,CAAC;YAC9E,gBAAgB;YAChB,sBAAsB,EAAE,IAAI;YAC5B,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,OAAO,EAAE,MAAM;SACxB,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW;YAAE,OAAO,OAAO,CAAC;QAEjD,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YACpD,MAAM,OAAO,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAC;YACjD,OAAO,OAAO,EAAE,IAAI,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;QAC1D,CAAC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAC/C,MAAM,OAAO,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAC;YACjD,OAAO,OAAO,EAAE,IAAI,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;QAC1D,CAAC,CAAC,CAAC,MAAM,CAAC;QACV,MAAM,cAAc,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QACxF,IACE,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,QAAQ,CAAC,QAAQ,EAAE;YAC7D,GAAG,cAAc;YACjB,OAAO,CAAC,UAAU;YAClB,GAAG,OAAO,CAAC,OAAO;SACnB,CAAC,EACF,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAC3B,CAAC;QACD,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAC3B,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,OAAO;QACL,SAAS,EAAE,EAAE;QACb,gBAAgB,EAAE,SAAS;QAC3B,MAAM;QACN,iBAAiB;QACjB,aAAa;QACb,WAAW;QACX,eAAe;QACf,iBAAiB;QACjB,YAAY;QACZ,YAAY;QACZ,KAAK;QACL,kBAAkB;QAClB,eAAe;QACf,QAAQ;QACR,eAAe;QACf,WAAW;QACX,iBAAiB;QACjB,OAAO;QACP,QAAQ;QACR,eAAe;QACf,kBAAkB;QAClB,aAAa;QACb,cAAc;QACd,cAAc;QACd,gBAAgB;QAChB,eAAe;QACf,mBAAmB;QACnB,eAAe,EAAE,uBAAuB;QACxC,YAAY;QACZ,wBAAwB,EAAE,YAAY,EAAE,sBAAsB,IAAI,IAAI;QACtE,OAAO;QACP,yBAAyB;QACzB,6BAA6B;QAC7B,oCAAoC;QACpC,+BAA+B;QAC/B,uBAAuB;QACvB,2BAA2B;QAC3B,qBAAqB;QACrB,kBAAkB;QAClB,kBAAkB;KACnB,CAAC;AACJ,CAAC;AAED,2FAA2F;AAC3F,MAAM,CAAC,MAAM,yBAAyB,GACpC,6BAA6B,CAAC;AAEhC,qEAAqE;AAErE,2EAA2E;AAC3E,MAAM,UAAU,mBAAmB,CAAC,SAAkC;IACpE,MAAM,EACJ,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAClB,OAAO,EACP,OAAO,EACP,YAAY,EACZ,yBAAyB,EACzB,6BAA6B,EAC7B,+BAA+B,EAC/B,uBAAuB,EACvB,2BAA2B,EAC3B,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,GACnB,GAAG,SAAS,CAAC;IAEd,OAAO;QACL,SAAS,EAAE,SAAS,CAAC,SAAS;QAC9B,gBAAgB,EAAE,SAAS,CAAC,gBAAgB;QAC5C,KAAK,EAAE;YACL,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;YAClD,qBAAqB,EAAE,eAAe,CAAC,qBAAqB,CAAC,IAAI,CAAC,eAAe,CAAC;YAClF,gCAAgC,EAAE,eAAe,CAAC,gCAAgC,CAAC,IAAI,CAAC,eAAe,CAAC;YACxG,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;YAClD,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;YAClD,YAAY,EAAE,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC;YAChE,SAAS,EAAE,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC;SAC3D;QACD,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,iBAAiB;QAC3B,cAAc,EAAE,SAAS,CAAC,cAAc;QACxC,IAAI,EAAE;YACJ,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;gBACnB,kBAAkB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACpC,OAAO,CAAC,OAAO,CACb,IAAI;oBACF,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;wBACR,IAAI,CAAC;4BACH,IAAI,CAAC,KAAK,CAAC,CAAC;wBACd,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACb,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE;gCAC1C,SAAS,EAAE,8BAA8B;gCACzC,QAAQ,EAAE,aAAa;gCACvB,YAAY,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;6BAC/D,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;oBACH,CAAC,CAAC,IAAI,CACT,CAAC;YACJ,CAAC;YACD,kBAAkB,EAAE,kBAAkB,CAAC,kBAAkB,CAAC,IAAI,CAAC,kBAAkB,CAAC;YAClF,GAAG,EAAE,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC;SACrD;QACD,QAAQ,EAAE;YACR,UAAU,EAAE,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC;YACtD,sBAAsB,EAAE,YAAY,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC;YAC9E,qBAAqB,EAAE,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC;YAC3E,wBAAwB,EAAE,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC;SAC7E;QACD,kBAAkB;QAClB,KAAK,EAAE;YACL,aAAa,EAAE,yBAAyB;YACxC,cAAc,EAAE,6BAA6B;SAC9C;QACD,+BAA+B;QAC/B,uBAAuB;QACvB,2BAA2B;QAC3B,qBAAqB;QACrB,OAAO;QACP,QAAQ,EAAE,SAAS,CAAC,QAAQ;KAC7B,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAyC;IAC5E,MAAM,cAAc,GAAG,sBAAsB,EAAE,CAAC;IAChD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,mBAAmB,CACjC,6BAA6B,CAAC;YAC5B,GAAG,OAAO;YACV,eAAe,EAAE,SAAS;SAC3B,CAAC,CACH,CAAC;QACF,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,MAAM,WAAW,GAAG,GAAS,EAAE;YAC7B,IAAI,QAAQ;gBAAE,OAAO;YACrB,QAAQ,GAAG,IAAI,CAAC;YAChB,cAAc,EAAE,CAAC;QACnB,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAChC,OAAO,CAAC,OAAO,GAAG,GAAS,EAAE;YAC3B,IAAI,CAAC;gBACH,OAAO,EAAE,CAAC;YACZ,CAAC;oBAAS,CAAC;gBACT,WAAW,EAAE,CAAC;YAChB,CAAC;QACH,CAAC,CAAC;QACF,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,OAAO,CAAC,QAAQ,GAAG,KAAK,IAAmB,EAAE;YAC3C,IAAI,CAAC;gBACH,MAAM,QAAQ,EAAE,CAAC;YACnB,CAAC;oBAAS,CAAC;gBACT,WAAW,EAAE,CAAC;YAChB,CAAC;QACH,CAAC,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,cAAc,EAAE,CAAC;QACjB,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -67,6 +67,15 @@ export declare class SessionInputPlanner {
|
|
|
67
67
|
* Reset both surge and uncached-input guards (e.g. after undo or import).
|
|
68
68
|
*/
|
|
69
69
|
reset(): void;
|
|
70
|
+
/**
|
|
71
|
+
* Records the model the just-built plan was actually dispatched to. The next
|
|
72
|
+
* `build()` call compares this against the then-current model to catch a
|
|
73
|
+
* mid-conversation model switch before it reuses a stale `previous_response_id`.
|
|
74
|
+
*
|
|
75
|
+
* Deliberately not folded into `build()` itself: `build()` must stay pure
|
|
76
|
+
* because `previewInputSurge()` calls it without dispatching anything.
|
|
77
|
+
*/
|
|
78
|
+
recordDispatchModel(): void;
|
|
70
79
|
/**
|
|
71
80
|
* Mark a resumed session on the large-uncached-input guard.
|
|
72
81
|
*/
|
|
@@ -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,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;;
|
|
1
|
+
{"version":3,"file":"session-input-planner.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-input-planner.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,8 @@ export class SessionInputPlanner {
|
|
|
38
38
|
#inputSurgeGuard = new InputSurgeGuard();
|
|
39
39
|
#largeUncachedInputGuard = new LargeUncachedInputGuard();
|
|
40
40
|
#outgoingSizeCache = null;
|
|
41
|
+
/** Model the most recently dispatched turn was sent to, for detecting a switch. */
|
|
42
|
+
#lastDispatchModel = null;
|
|
41
43
|
constructor(deps) {
|
|
42
44
|
this.#settingsService = deps.settingsService;
|
|
43
45
|
this.#agentClient = deps.agentClient;
|
|
@@ -87,6 +89,18 @@ export class SessionInputPlanner {
|
|
|
87
89
|
this.#inputSurgeGuard.reset();
|
|
88
90
|
this.#largeUncachedInputGuard.reset();
|
|
89
91
|
this.#outgoingSizeCache = null;
|
|
92
|
+
this.#lastDispatchModel = null;
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* Records the model the just-built plan was actually dispatched to. The next
|
|
96
|
+
* `build()` call compares this against the then-current model to catch a
|
|
97
|
+
* mid-conversation model switch before it reuses a stale `previous_response_id`.
|
|
98
|
+
*
|
|
99
|
+
* Deliberately not folded into `build()` itself: `build()` must stay pure
|
|
100
|
+
* because `previewInputSurge()` calls it without dispatching anything.
|
|
101
|
+
*/
|
|
102
|
+
recordDispatchModel() {
|
|
103
|
+
this.#lastDispatchModel = this.#getModelForGuard();
|
|
90
104
|
}
|
|
91
105
|
/**
|
|
92
106
|
* Mark a resumed session on the large-uncached-input guard.
|
|
@@ -147,9 +161,18 @@ export class SessionInputPlanner {
|
|
|
147
161
|
if (hasUnsettledChainDebt && this.#providerContinuity.previousResponseId) {
|
|
148
162
|
this.#providerContinuity.clear();
|
|
149
163
|
}
|
|
164
|
+
// A held previous_response_id was minted by whatever model produced it.
|
|
165
|
+
// If the user switched models since that turn, the anchor still passes
|
|
166
|
+
// every other chaining check locally but the provider 400s
|
|
167
|
+
// ("Invalid previous_response_id") because the ID does not belong to the
|
|
168
|
+
// model we are about to call. Drop the chain and send full history
|
|
169
|
+
// instead of risking that round trip.
|
|
170
|
+
const currentModel = this.#getModelForGuard();
|
|
171
|
+
const hasModelMismatch = this.#lastDispatchModel !== null && currentModel !== null && this.#lastDispatchModel !== currentModel;
|
|
150
172
|
const useChaining = supportsChaining &&
|
|
151
173
|
!hasMalformedArgs &&
|
|
152
174
|
!hasUnsettledChainDebt &&
|
|
175
|
+
!hasModelMismatch &&
|
|
153
176
|
this.#providerContinuity.isChainingAvailable(outgoingHistory.length);
|
|
154
177
|
const latestInput = outgoingHistory[outgoingHistory.length - 1] ?? effectiveTurn.text;
|
|
155
178
|
const chainedInput = effectiveTurn.images?.length ? latestInput : effectiveTurn.text;
|