@qduc/term2 0.22.0 → 0.23.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/dist/agent.d.ts +1 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +18 -10
- package/dist/agent.js.map +1 -1
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +19 -1
- package/dist/app.js.map +1 -1
- package/dist/cli.js +26 -0
- package/dist/cli.js.map +1 -1
- package/dist/components/common/MenuContainer.d.ts +10 -0
- package/dist/components/common/MenuContainer.d.ts.map +1 -1
- package/dist/components/common/MenuContainer.js +53 -29
- package/dist/components/common/MenuContainer.js.map +1 -1
- package/dist/components/input/ApplicationInputSurface.js +1 -1
- package/dist/components/input/ApplicationInputSurface.js.map +1 -1
- package/dist/components/input/ModelMenuSession.d.ts.map +1 -1
- package/dist/components/input/ModelMenuSession.js +7 -21
- package/dist/components/input/ModelMenuSession.js.map +1 -1
- package/dist/components/input/SettingsMenuSession.d.ts.map +1 -1
- package/dist/components/input/SettingsMenuSession.js +8 -5
- package/dist/components/input/SettingsMenuSession.js.map +1 -1
- package/dist/components/input/SubagentPoolMenuSession.d.ts +9 -0
- package/dist/components/input/SubagentPoolMenuSession.d.ts.map +1 -0
- package/dist/components/input/{MentorPoolMenuSession.js → SubagentPoolMenuSession.js} +21 -17
- package/dist/components/input/SubagentPoolMenuSession.js.map +1 -0
- package/dist/components/input/menu-controller.d.ts.map +1 -1
- package/dist/components/input/menu-controller.js +4 -3
- package/dist/components/input/menu-controller.js.map +1 -1
- package/dist/components/input/menu-registry.js +2 -2
- package/dist/components/input/menu-registry.js.map +1 -1
- package/dist/components/input/menu-types.d.ts +5 -1
- package/dist/components/input/menu-types.d.ts.map +1 -1
- package/dist/components/input/triggers.d.ts.map +1 -1
- package/dist/components/input/triggers.js +10 -7
- package/dist/components/input/triggers.js.map +1 -1
- package/dist/components/layout/Banner.d.ts.map +1 -1
- package/dist/components/layout/Banner.js +4 -1
- package/dist/components/layout/Banner.js.map +1 -1
- package/dist/components/layout/StatusBar.d.ts.map +1 -1
- package/dist/components/layout/StatusBar.js +10 -17
- package/dist/components/layout/StatusBar.js.map +1 -1
- package/dist/components/menu/ModelSelectionMenu.js +2 -2
- package/dist/components/menu/ModelSelectionMenu.js.map +1 -1
- package/dist/components/menu/ProfileSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ProfileSelectionMenu.js +12 -12
- package/dist/components/menu/ProfileSelectionMenu.js.map +1 -1
- package/dist/components/menu/ResumeSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ResumeSelectionMenu.js +10 -10
- package/dist/components/menu/ResumeSelectionMenu.js.map +1 -1
- package/dist/components/menu/SettingsSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/SettingsSelectionMenu.js +3 -1
- package/dist/components/menu/SettingsSelectionMenu.js.map +1 -1
- package/dist/components/menu/SkillSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/SkillSelectionMenu.js +10 -10
- package/dist/components/menu/SkillSelectionMenu.js.map +1 -1
- package/dist/components/menu/StandaloneModelPickerApp.d.ts +3 -3
- package/dist/components/menu/StandaloneModelPickerApp.d.ts.map +1 -1
- package/dist/components/menu/StandaloneModelPickerApp.js +9 -10
- package/dist/components/menu/StandaloneModelPickerApp.js.map +1 -1
- package/dist/components/menu/SubagentPoolSelectionMenu.d.ts +19 -0
- package/dist/components/menu/SubagentPoolSelectionMenu.d.ts.map +1 -0
- package/dist/components/menu/{MentorPoolSelectionMenu.js → SubagentPoolSelectionMenu.js} +29 -15
- package/dist/components/menu/SubagentPoolSelectionMenu.js.map +1 -0
- package/dist/components/message/MessageList.d.ts +2 -1
- package/dist/components/message/MessageList.d.ts.map +1 -1
- package/dist/components/message/MessageList.js +12 -38
- package/dist/components/message/MessageList.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 -2
- package/dist/context/InputContext.js.map +1 -1
- package/dist/contracts/conversation-items.d.ts +4 -0
- package/dist/contracts/conversation-items.d.ts.map +1 -1
- package/dist/contracts/provider-input.d.ts +2 -0
- package/dist/contracts/provider-input.d.ts.map +1 -1
- package/dist/contracts/provider-input.js.map +1 -1
- package/dist/gateway/assertion.d.ts +1 -1
- package/dist/gateway/assertion.d.ts.map +1 -1
- package/dist/gateway/contracts.d.ts +13 -3
- package/dist/gateway/contracts.d.ts.map +1 -1
- package/dist/gateway/contracts.js +56 -0
- package/dist/gateway/contracts.js.map +1 -1
- package/dist/gateway/gateway.d.ts +40 -1
- package/dist/gateway/gateway.d.ts.map +1 -1
- package/dist/gateway/gateway.js +1319 -76
- package/dist/gateway/gateway.js.map +1 -1
- package/dist/gateway/persistence/admission-persistence.d.ts +3 -3
- package/dist/gateway/persistence/admission-persistence.d.ts.map +1 -1
- package/dist/gateway/persistence/admission-persistence.js +25 -11
- package/dist/gateway/persistence/admission-persistence.js.map +1 -1
- package/dist/gateway/persistence/contracts.d.ts +5 -3
- package/dist/gateway/persistence/contracts.d.ts.map +1 -1
- package/dist/gateway/persistence/contracts.js +13 -0
- package/dist/gateway/persistence/contracts.js.map +1 -1
- package/dist/gateway/persistence/interaction-checkpoint.d.ts +5 -0
- package/dist/gateway/persistence/interaction-checkpoint.d.ts.map +1 -1
- package/dist/gateway/persistence/interaction-checkpoint.js +22 -0
- package/dist/gateway/persistence/interaction-checkpoint.js.map +1 -1
- package/dist/gateway/persistence/projection.d.ts.map +1 -1
- package/dist/gateway/persistence/projection.js +4 -1
- package/dist/gateway/persistence/projection.js.map +1 -1
- package/dist/gateway/persistence/session-index.d.ts +1 -1
- package/dist/gateway/persistence/session-index.d.ts.map +1 -1
- package/dist/gateway/persistence/session-index.js +2 -2
- package/dist/gateway/persistence/session-index.js.map +1 -1
- package/dist/gateway/persistence/session-snapshot.d.ts +32 -0
- package/dist/gateway/persistence/session-snapshot.d.ts.map +1 -0
- package/dist/gateway/persistence/session-snapshot.js +50 -0
- package/dist/gateway/persistence/session-snapshot.js.map +1 -0
- package/dist/gateway/runtime-factory.d.ts +37 -1
- package/dist/gateway/runtime-factory.d.ts.map +1 -1
- package/dist/gateway/runtime-factory.js +155 -24
- package/dist/gateway/runtime-factory.js.map +1 -1
- package/dist/gateway/safe-log.d.ts +1 -1
- package/dist/gateway/safe-log.d.ts.map +1 -1
- package/dist/gateway/safe-log.js +5 -46
- package/dist/gateway/safe-log.js.map +1 -1
- package/dist/gateway/serve-args.d.ts +53 -0
- package/dist/gateway/serve-args.d.ts.map +1 -0
- package/dist/gateway/serve-args.js +172 -0
- package/dist/gateway/serve-args.js.map +1 -0
- package/dist/gateway/serve.d.ts +79 -0
- package/dist/gateway/serve.d.ts.map +1 -0
- package/dist/gateway/serve.js +375 -0
- package/dist/gateway/serve.js.map +1 -0
- package/dist/gateway/server-session.d.ts +9 -0
- package/dist/gateway/server-session.d.ts.map +1 -1
- package/dist/gateway/server-session.js +142 -26
- package/dist/gateway/server-session.js.map +1 -1
- package/dist/gateway/server.d.ts.map +1 -1
- package/dist/gateway/server.js +13 -2
- package/dist/gateway/server.js.map +1 -1
- package/dist/hooks/use-slash-commands.d.ts.map +1 -1
- package/dist/hooks/use-slash-commands.js +19 -13
- package/dist/hooks/use-slash-commands.js.map +1 -1
- package/dist/hooks/use-subagent-pool-selection.d.ts +115 -0
- package/dist/hooks/use-subagent-pool-selection.d.ts.map +1 -0
- package/dist/hooks/{use-mentor-pool-selection.js → use-subagent-pool-selection.js} +168 -100
- package/dist/hooks/use-subagent-pool-selection.js.map +1 -0
- package/dist/lib/agent-client.d.ts +3 -0
- package/dist/lib/agent-client.d.ts.map +1 -1
- package/dist/lib/agent-client.js +7 -0
- package/dist/lib/agent-client.js.map +1 -1
- package/dist/lib/agent-configuration.d.ts +1 -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 +2 -0
- package/dist/lib/agent-factory.d.ts.map +1 -1
- package/dist/lib/agent-factory.js +5 -0
- package/dist/lib/agent-factory.js.map +1 -1
- package/dist/lib/subagent-bridge.d.ts +5 -0
- package/dist/lib/subagent-bridge.d.ts.map +1 -1
- package/dist/lib/subagent-bridge.js +5 -0
- package/dist/lib/subagent-bridge.js.map +1 -1
- package/dist/lib/tool-selection-policy.d.ts +2 -0
- package/dist/lib/tool-selection-policy.d.ts.map +1 -1
- package/dist/lib/tool-selection-policy.js +6 -1
- package/dist/lib/tool-selection-policy.js.map +1 -1
- package/dist/prompts/explorer-delegation-contract.test.ts +1 -1
- package/dist/prompts/prompt-constructor.d.ts.map +1 -1
- package/dist/prompts/prompt-constructor.js +1 -0
- package/dist/prompts/prompt-constructor.js.map +1 -1
- package/dist/prompts/prompt-constructor.test.ts +3 -0
- package/dist/prompts/prompt-constructor.ts +1 -0
- package/dist/prompts/prompt-profiles.d.ts.map +1 -1
- package/dist/prompts/prompt-profiles.js +3 -2
- package/dist/prompts/prompt-profiles.js.map +1 -1
- package/dist/prompts/prompt-profiles.ts +4 -2
- package/dist/prompts/subagent-delegation.d.ts +2 -1
- package/dist/prompts/subagent-delegation.d.ts.map +1 -1
- package/dist/prompts/subagent-delegation.js +10 -5
- package/dist/prompts/subagent-delegation.js.map +1 -1
- package/dist/prompts/subagent-delegation.test.ts +10 -3
- package/dist/prompts/subagent-delegation.ts +16 -4
- package/dist/prompts/subagents/librarian.md +26 -21
- package/dist/prompts/subagents/reviewer.md +33 -0
- package/dist/services/agent-runtime/application-run-loop.d.ts.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.js +10 -5
- package/dist/services/agent-runtime/application-run-loop.js.map +1 -1
- package/dist/services/agent-runtime/context-compaction/local-context-compactor.d.ts +9 -0
- package/dist/services/agent-runtime/context-compaction/local-context-compactor.d.ts.map +1 -1
- package/dist/services/agent-runtime/context-compaction/local-context-compactor.js +6 -0
- package/dist/services/agent-runtime/context-compaction/local-context-compactor.js.map +1 -1
- package/dist/services/agent-runtime/model-resolver.d.ts +6 -0
- package/dist/services/agent-runtime/model-resolver.d.ts.map +1 -1
- package/dist/services/agent-runtime/model-resolver.js +18 -26
- package/dist/services/agent-runtime/model-resolver.js.map +1 -1
- package/dist/services/approval/non-interactive-approval-policy.d.ts.map +1 -1
- package/dist/services/approval/non-interactive-approval-policy.js +2 -1
- package/dist/services/approval/non-interactive-approval-policy.js.map +1 -1
- package/dist/services/approval/shell-auto-approval-evaluator.js +2 -2
- package/dist/services/approval/shell-auto-approval-evaluator.js.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.js +42 -22
- package/dist/services/conversation/conversation-orchestrator.js.map +1 -1
- package/dist/services/conversation/conversation-service.d.ts +28 -0
- package/dist/services/conversation/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation/conversation-service.js +95 -27
- package/dist/services/conversation/conversation-service.js.map +1 -1
- package/dist/services/conversation/run-item-normalizer.d.ts.map +1 -1
- package/dist/services/conversation/run-item-normalizer.js +3 -0
- package/dist/services/conversation/run-item-normalizer.js.map +1 -1
- package/dist/services/conversation/session-browser.d.ts +5 -0
- package/dist/services/conversation/session-browser.d.ts.map +1 -1
- package/dist/services/conversation/session-browser.js +94 -31
- package/dist/services/conversation/session-browser.js.map +1 -1
- package/dist/services/conversation/session-index/session-index-database.d.ts +1 -0
- package/dist/services/conversation/session-index/session-index-database.d.ts.map +1 -1
- package/dist/services/conversation/session-index/session-index-database.js +6 -4
- package/dist/services/conversation/session-index/session-index-database.js.map +1 -1
- package/dist/services/conversation/session-index/session-index-schema.d.ts +1 -1
- package/dist/services/conversation/session-index/session-index-schema.d.ts.map +1 -1
- package/dist/services/conversation/session-index/session-index-schema.js +2 -1
- package/dist/services/conversation/session-index/session-index-schema.js.map +1 -1
- package/dist/services/conversation-agent-client.d.ts +3 -0
- package/dist/services/conversation-agent-client.d.ts.map +1 -1
- package/dist/services/memory/memory-capabilities.d.ts.map +1 -1
- package/dist/services/memory/memory-capabilities.js +2 -5
- package/dist/services/memory/memory-capabilities.js.map +1 -1
- package/dist/services/models/model-picker-host.d.ts +4 -4
- package/dist/services/models/model-picker-host.d.ts.map +1 -1
- package/dist/services/models/model-picker-host.js +9 -6
- package/dist/services/models/model-picker-host.js.map +1 -1
- package/dist/services/plan-mode-interceptor.js +2 -2
- package/dist/services/plan-mode-interceptor.js.map +1 -1
- package/dist/services/sandboxed-code-host/host-types.d.ts +12 -1
- package/dist/services/sandboxed-code-host/host-types.d.ts.map +1 -1
- package/dist/services/sandboxed-code-host/host-types.js.map +1 -1
- package/dist/services/sandboxed-code-host/host-worker.d.ts.map +1 -1
- package/dist/services/sandboxed-code-host/host-worker.js +146 -31
- package/dist/services/sandboxed-code-host/host-worker.js.map +1 -1
- package/dist/services/sandboxed-code-host/sandbox.d.ts +6 -1
- package/dist/services/sandboxed-code-host/sandbox.d.ts.map +1 -1
- package/dist/services/sandboxed-code-host/sandbox.js +5 -0
- package/dist/services/sandboxed-code-host/sandbox.js.map +1 -1
- package/dist/services/sandboxed-code-host/sandboxed-code-host.d.ts +3 -3
- package/dist/services/sandboxed-code-host/sandboxed-code-host.d.ts.map +1 -1
- package/dist/services/sandboxed-code-host/sandboxed-code-host.js +173 -22
- package/dist/services/sandboxed-code-host/sandboxed-code-host.js.map +1 -1
- package/dist/services/session/session-access-state.d.ts +5 -1
- package/dist/services/session/session-access-state.d.ts.map +1 -1
- package/dist/services/session/session-access-state.js +8 -1
- package/dist/services/session/session-access-state.js.map +1 -1
- package/dist/services/session/session-client-factory.d.ts +1 -0
- package/dist/services/session/session-client-factory.d.ts.map +1 -1
- package/dist/services/session/session-client-factory.js +1 -1
- package/dist/services/session/session-client-factory.js.map +1 -1
- package/dist/services/session/session-composition.d.ts +22 -4
- package/dist/services/session/session-composition.d.ts.map +1 -1
- package/dist/services/session/session-composition.js +9 -5
- package/dist/services/session/session-composition.js.map +1 -1
- package/dist/services/settings/ancillary-settings-migration.d.ts.map +1 -1
- package/dist/services/settings/ancillary-settings-migration.js +8 -1
- package/dist/services/settings/ancillary-settings-migration.js.map +1 -1
- package/dist/services/settings/settings-schema.d.ts +12 -40
- package/dist/services/settings/settings-schema.d.ts.map +1 -1
- package/dist/services/settings/settings-schema.js +27 -53
- package/dist/services/settings/settings-schema.js.map +1 -1
- package/dist/services/settings/settings-sources.d.ts +0 -3
- package/dist/services/settings/settings-sources.d.ts.map +1 -1
- package/dist/services/settings/settings-sources.js +0 -3
- package/dist/services/settings/settings-sources.js.map +1 -1
- package/dist/services/settings/settings-ui-metadata.d.ts.map +1 -1
- package/dist/services/settings/settings-ui-metadata.js +3 -3
- package/dist/services/settings/settings-ui-metadata.js.map +1 -1
- package/dist/services/settings/test-helpers/settings-consumer-inventory.d.ts +1 -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 +5 -8
- package/dist/services/settings/test-helpers/settings-consumer-inventory.js.map +1 -1
- package/dist/services/subagents/nested-runner.d.ts +3 -0
- package/dist/services/subagents/nested-runner.d.ts.map +1 -1
- package/dist/services/subagents/nested-runner.js +31 -4
- package/dist/services/subagents/nested-runner.js.map +1 -1
- package/dist/services/subagents/role-loader.d.ts.map +1 -1
- package/dist/services/subagents/role-loader.js +7 -12
- package/dist/services/subagents/role-loader.js.map +1 -1
- package/dist/services/subagents/runtime.d.ts +3 -0
- package/dist/services/subagents/runtime.d.ts.map +1 -1
- package/dist/services/subagents/runtime.js +35 -3
- package/dist/services/subagents/runtime.js.map +1 -1
- package/dist/services/subagents/subagent-async-registry.d.ts +10 -1
- package/dist/services/subagents/subagent-async-registry.d.ts.map +1 -1
- package/dist/services/subagents/subagent-async-registry.js +21 -4
- package/dist/services/subagents/subagent-async-registry.js.map +1 -1
- package/dist/services/subagents/subagent-manager.d.ts +3 -0
- package/dist/services/subagents/subagent-manager.d.ts.map +1 -1
- package/dist/services/subagents/subagent-manager.js.map +1 -1
- package/dist/services/subagents/subagent-pool-config.d.ts +39 -0
- package/dist/services/subagents/subagent-pool-config.d.ts.map +1 -0
- package/dist/services/subagents/subagent-pool-config.js +84 -0
- package/dist/services/subagents/subagent-pool-config.js.map +1 -0
- package/dist/services/subagents/subagent-role-pool-selector.d.ts +29 -0
- package/dist/services/subagents/subagent-role-pool-selector.d.ts.map +1 -0
- package/dist/services/subagents/subagent-role-pool-selector.js +56 -0
- package/dist/services/subagents/subagent-role-pool-selector.js.map +1 -0
- package/dist/services/subagents/tool-policy.d.ts +13 -0
- package/dist/services/subagents/tool-policy.d.ts.map +1 -1
- package/dist/services/subagents/tool-policy.js +36 -4
- package/dist/services/subagents/tool-policy.js.map +1 -1
- package/dist/services/subagents/types.d.ts +1 -1
- package/dist/services/subagents/types.d.ts.map +1 -1
- package/dist/services/subagents/types.js +1 -1
- package/dist/services/subagents/types.js.map +1 -1
- package/dist/test-helpers/outside-sandbox-temp-dir.d.ts +2 -0
- package/dist/test-helpers/outside-sandbox-temp-dir.d.ts.map +1 -0
- package/dist/test-helpers/outside-sandbox-temp-dir.js +38 -0
- package/dist/test-helpers/outside-sandbox-temp-dir.js.map +1 -0
- package/dist/tools/agent/configure-task-check-in.d.ts +2 -0
- package/dist/tools/agent/configure-task-check-in.d.ts.map +1 -1
- package/dist/tools/agent/configure-task-check-in.js +3 -0
- package/dist/tools/agent/configure-task-check-in.js.map +1 -1
- package/dist/tools/agent/run-explorer.d.ts +6 -0
- package/dist/tools/agent/run-explorer.d.ts.map +1 -0
- package/dist/tools/agent/run-explorer.js +58 -0
- package/dist/tools/agent/run-explorer.js.map +1 -0
- package/dist/tools/agent/run-subagent-async.d.ts +2 -0
- 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 +8 -6
- 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 +7 -2
- 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 +4 -0
- package/dist/tools/file/create-file.js.map +1 -1
- package/dist/tools/file/edit-healing.d.ts.map +1 -1
- package/dist/tools/file/edit-healing.js +1 -4
- package/dist/tools/file/edit-healing.js.map +1 -1
- package/dist/tools/file/glob.d.ts.map +1 -1
- package/dist/tools/file/glob.js +6 -0
- package/dist/tools/file/glob.js.map +1 -1
- package/dist/tools/file/patch-healing.d.ts.map +1 -1
- package/dist/tools/file/patch-healing.js +1 -4
- package/dist/tools/file/patch-healing.js.map +1 -1
- package/dist/tools/file/search-replace.d.ts.map +1 -1
- package/dist/tools/file/search-replace.js +7 -5
- package/dist/tools/file/search-replace.js.map +1 -1
- package/dist/tools/format-helpers.d.ts +5 -0
- package/dist/tools/format-helpers.d.ts.map +1 -1
- package/dist/tools/format-helpers.js.map +1 -1
- package/dist/tools/memory/memory-tools.d.ts +0 -1
- package/dist/tools/memory/memory-tools.d.ts.map +1 -1
- package/dist/tools/memory/memory-tools.js +1 -116
- package/dist/tools/memory/memory-tools.js.map +1 -1
- package/dist/tools/scripted-return-contract.d.ts +24 -0
- package/dist/tools/scripted-return-contract.d.ts.map +1 -0
- package/dist/tools/scripted-return-contract.js +36 -0
- package/dist/tools/scripted-return-contract.js.map +1 -0
- package/dist/tools/session-browser/session-browser-tools.d.ts.map +1 -1
- package/dist/tools/session-browser/session-browser-tools.js +21 -8
- package/dist/tools/session-browser/session-browser-tools.js.map +1 -1
- package/dist/tools/system/run-code/index.d.ts +3 -0
- package/dist/tools/system/run-code/index.d.ts.map +1 -1
- package/dist/tools/system/run-code/index.js +3 -0
- package/dist/tools/system/run-code/index.js.map +1 -1
- package/dist/tools/system/run-code/run-code-execution.d.ts +56 -0
- package/dist/tools/system/run-code/run-code-execution.d.ts.map +1 -0
- package/dist/tools/system/run-code/run-code-execution.js +68 -0
- package/dist/tools/system/run-code/run-code-execution.js.map +1 -0
- package/dist/tools/system/run-code/run-code-runtime-contract.d.ts +20 -0
- package/dist/tools/system/run-code/run-code-runtime-contract.d.ts.map +1 -0
- package/dist/tools/system/run-code/run-code-runtime-contract.js +2 -0
- package/dist/tools/system/run-code/run-code-runtime-contract.js.map +1 -0
- package/dist/tools/system/run-code/run-code-runtime.d.ts +99 -0
- package/dist/tools/system/run-code/run-code-runtime.d.ts.map +1 -0
- package/dist/tools/system/run-code/run-code-runtime.js +719 -0
- package/dist/tools/system/run-code/run-code-runtime.js.map +1 -0
- package/dist/tools/system/run-code/run-code-telemetry.d.ts +12 -10
- package/dist/tools/system/run-code/run-code-telemetry.d.ts.map +1 -1
- package/dist/tools/system/run-code/run-code-telemetry.js +48 -72
- package/dist/tools/system/run-code/run-code-telemetry.js.map +1 -1
- package/dist/tools/system/run-code/run-code.d.ts +22 -59
- package/dist/tools/system/run-code/run-code.d.ts.map +1 -1
- package/dist/tools/system/run-code/run-code.js +118 -784
- package/dist/tools/system/run-code/run-code.js.map +1 -1
- package/dist/tools/system/run-code/tools-header.d.ts +16 -4
- package/dist/tools/system/run-code/tools-header.d.ts.map +1 -1
- package/dist/tools/system/run-code/tools-header.js +32 -16
- package/dist/tools/system/run-code/tools-header.js.map +1 -1
- package/dist/tools/system/shell.d.ts +3 -0
- package/dist/tools/system/shell.d.ts.map +1 -1
- package/dist/tools/system/shell.js +13 -3
- package/dist/tools/system/shell.js.map +1 -1
- package/dist/tools/types.d.ts +12 -4
- package/dist/tools/types.d.ts.map +1 -1
- package/dist/tools/types.js.map +1 -1
- package/dist/utils/ai/model-settings.d.ts +6 -0
- package/dist/utils/ai/model-settings.d.ts.map +1 -1
- package/dist/utils/ai/model-settings.js +7 -1
- package/dist/utils/ai/model-settings.js.map +1 -1
- package/dist/utils/ai/token-usage.d.ts +4 -5
- package/dist/utils/ai/token-usage.d.ts.map +1 -1
- package/dist/utils/ai/token-usage.js +3 -3
- package/dist/utils/ai/token-usage.js.map +1 -1
- package/dist/utils/conversation/conversation-utils.d.ts.map +1 -1
- package/dist/utils/conversation/conversation-utils.js +3 -0
- package/dist/utils/conversation/conversation-utils.js.map +1 -1
- package/dist/utils/conversation/static-commit-policy.d.ts +38 -0
- package/dist/utils/conversation/static-commit-policy.d.ts.map +1 -0
- package/dist/utils/conversation/static-commit-policy.js +76 -0
- package/dist/utils/conversation/static-commit-policy.js.map +1 -0
- package/dist/utils/settings-command.d.ts.map +1 -1
- package/dist/utils/settings-command.js +2 -1
- package/dist/utils/settings-command.js.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-policy.d.ts +2 -0
- package/dist/utils/shell/sandbox/sandbox-policy.d.ts.map +1 -1
- package/dist/utils/shell/sandbox/sandbox-policy.js +1 -1
- package/dist/utils/shell/sandbox/sandbox-policy.js.map +1 -1
- package/dist/utils/streaming/streaming-session-factory.d.ts.map +1 -1
- package/dist/utils/streaming/streaming-session-factory.js +22 -22
- package/dist/utils/streaming/streaming-session-factory.js.map +1 -1
- package/package.json +1 -1
- package/dist/components/input/MentorPoolMenuSession.d.ts +0 -9
- package/dist/components/input/MentorPoolMenuSession.d.ts.map +0 -1
- package/dist/components/input/MentorPoolMenuSession.js.map +0 -1
- package/dist/components/menu/MentorPoolSelectionMenu.d.ts +0 -13
- package/dist/components/menu/MentorPoolSelectionMenu.d.ts.map +0 -1
- package/dist/components/menu/MentorPoolSelectionMenu.js.map +0 -1
- package/dist/hooks/use-mentor-pool-selection.d.ts +0 -103
- package/dist/hooks/use-mentor-pool-selection.d.ts.map +0 -1
- package/dist/hooks/use-mentor-pool-selection.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nested-runner.js","sourceRoot":"","sources":["../../../source/services/subagents/nested-runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"nested-runner.js","sourceRoot":"","sources":["../../../source/services/subagents/nested-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EACL,kBAAkB,GAGnB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,cAAc,EAA8B,MAAM,6CAA6C,CAAC;AACzG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAWvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAE3F,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAuB,qBAAqB,EAA2B,MAAM,kBAAkB,CAAC;AACvG,OAAO,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACxG,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EACL,gBAAgB,EAChB,0BAA0B,EAC1B,yBAAyB,EACzB,QAAQ,EACR,0BAA0B,EAC1B,gBAAgB,EAChB,WAAW,EACX,uBAAuB,EACvB,oBAAoB,EACpB,iCAAiC,GAClC,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,eAAe,EAAuB,MAAM,gCAAgC,CAAC;AAEtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAA4C,MAAM,gCAAgC,CAAC;AACnH,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAqBzD,MAAM,uBAAuB,GAAG,oEAAoE,CAAC;AAErG,8EAA8E;AAC9E,6EAA6E;AAC7E,6EAA6E;AAC7E,gCAAgC;AAEhC,SAAS,sBAAsB,CAAC,aAAsB;IACpD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACzC,MAAM,MAAM,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACjD,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,mBAAmB,CAAC,OAAgB;IAC3C,MAAM,MAAM,GAAG,OAAmG,CAAC;IACnH,OAAO,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;AACvC,CAAC;AAED,SAAS,yBAAyB,CAAC,GAAY;IAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3B,IAAI,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QACpE,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,6BAA6B,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAyB,CAAC;AACpD,CAAC;AAED,MAAM,OAAO,oBAAoB;IAC/B,OAAO,CAAkB;IACzB,SAAS,CAAmB;IAC5B,sBAAsB,CAAyB;IAC/C,iBAAiB,CAAoB;IACrC,YAAY,CAAsB;IAClC,QAAQ,CAA0D;IAClE,cAAc,CAA6C;IAC3D,iBAAiB,CAA2B;IAC5C,cAAc,CAAiB;IAC/B,cAAc,CAAwB;IACtC,yEAAyE;IACzE,iBAAiB,GAAG,IAAI,GAAG,EAAoC,CAAC;IAChE,8EAA8E;IAC9E,4BAA4B,CAAkD;IAC9E;;;;;;OAMG;IACM,YAAY,CAAuD;IAE5E,YAAY,IAiBX;QACC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,qBAAqB,CAAC;QACzD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC/C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,IAAI,CAAC,4BAA4B,GAAG,IAAI,CAAC,2BAA2B,CAAC;QACrE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,IAAI,IAAI,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChG,CAAC;IAED,UAAU;QACR,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED,gBAAgB,CAAC,IAA2B;QAC1C,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;IAC9C,CAAC;IAED,YAAY,CAAC,IAA2B;QACtC,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAC/C,CAAC;IAED,yEAAyE;IACzE,kBAAkB,CAAC,KAAa;QAC9B,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;IAClD,CAAC;IAED,sBAAsB,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,uEAAuE;IACvE,wBAAwB;QACtB,OAAO,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC;aACxC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;aACvD,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;IACzD,CAAC;IAED,uFAAuF;IACvF,8BAA8B,CAAC,IAAqD;QAClF,IAAI,CAAC,4BAA4B,GAAG,IAAI,CAAC;IAC3C,CAAC;IAED,4EAA4E;IAC5E,8BAA8B;QAC5B,OAAO,IAAI,CAAC,4BAA4B,KAAK,SAAS,CAAC;IACzD,CAAC;IAED,kBAAkB,CAAC,WAAoB;QACrC,IAAI,CAAC,WAAW;YAAE,OAAO,SAAS,CAAC;QACnC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACvC,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC;YACzC,IACE,OAAO;gBACP,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ;gBACnC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC;gBACnC,OAAO,CAAC,UAAU;gBAClB,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ;gBACtC,OAAO,CAAC,qBAAqB;gBAC7B,OAAO,OAAO,CAAC,qBAAqB,KAAK,QAAQ,EACjD,CAAC;gBACD,OAAO,OAA6B,CAAC;YACvC,CAAC;QACH,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,uDAAuD,EAAE;gBACzE,KAAK,EAAE,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;aACvC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,oBAAoB,CAAC,IAA2B;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;QAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;;;;OAOG;IACH,wBAAwB,CAAC,IAA2B;QAClD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC;IAED;;;;;;;OAOG;IACH,cAAc,CACZ,IAA2B,EAC3B,OAAsE;QAEtE,2EAA2E;QAC3E,sEAAsE;QACtE,IAAI,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACxG,IAAI,OAAO,EAAE,SAAS,EAAE,CAAC;YACvB,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,cAAc,GAAG,6BAA6B,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;QAC/G,MAAM,mBAAmB,GAAG,OAAO,EAAE,gBAAgB,IAAI,IAAI,CAAC,iBAAiB,CAAC;QAChF,MAAM,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAC5D,UAAU,EACV,EAAE,EACF,EAAE,EACF,cAAc,EACd,IAAI,EACJ,SAAS,EACT,SAAS,EACT,SAAS,EACT,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,SAAS,CACvF,CAAC;QACF,MAAM,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAC;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,eAAe,EAAE;YAC/D,UAAU;YACV,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;gBAC/D,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;gBAClD,IAAI,CAAC,UAAU;oBAAE,OAAO;gBACxB,MAAM,MAAM,GAAI,OAAe,EAAE,QAAQ,EAAE,MAAM,IAAI,iBAAiB,UAAU,EAAE,EAAE,CAAC;gBACrF,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;gBACrE,UAAU,CAAC,qBAAqB,CAAC,MAAM,CAAC,GAAG,eAAe,CAAC;gBAC3D,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE;oBACpC,IAAI,EAAE,uBAAuB;oBAC7B,OAAO,EAAE,UAAU,CAAC,OAAO;oBAC3B,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,UAAU,EAAE,MAAM;oBAClB,QAAQ,EAAE,IAAI;oBACd,SAAS,EAAE,MAAM;iBAClB,CAAC,CAAC;gBACH,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE,CAAC;oBACtC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE;wBACpC,IAAI,EAAE,0BAA0B;wBAChC,OAAO,EAAE,UAAU,CAAC,OAAO;wBAC3B,IAAI,EAAE,UAAU,CAAC,IAAI;wBACrB,OAAO;qBACR,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;gBAClD,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;gBAClD,IAAI,CAAC,UAAU;oBAAE,OAAO;gBACxB,MAAM,MAAM,GAAI,OAAe,EAAE,QAAQ,EAAE,MAAM,CAAC;gBAClD,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,UAAU,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC5E,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;oBAC/B,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE;wBACpC,IAAI,EAAE,0BAA0B;wBAChC,OAAO,EAAE,UAAU,CAAC,OAAO;wBAC3B,IAAI,EAAE,UAAU,CAAC,IAAI;wBACrB,OAAO,EAAE;4BACP,GAAG,OAAO;4BACV,MAAM,EAAE,WAAW;4BACnB,MAAM,EAAE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;4BACpE,OAAO,EAAE,IAAI;yBACd;qBACF,CAAC,CAAC;gBACL,CAAC;gBACD,IAAI,MAAM,EAAE,CAAC;oBACX,OAAO,UAAU,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;gBAClD,CAAC;YACH,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,aAAa,GAAuB;YACxC,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE;SACtE,CAAC;QACF,IAAI,UAAU,CAAC,eAAe,IAAI,UAAU,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;YAC3E,aAAa,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QACpF,CAAC;QACD,4DAA4D;QAC5D,IAAI,UAAU,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACvC,aAAa,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;QACjD,CAAC;QAED,MAAM,YAAY,GAAG,iBAAiB,CACpC,UAAU,EACV,eAAe,EACf,cAAc,EACd,IAAI,CAAC,SAAS,EACd,mBAAmB,EACnB,IAAI,CAAC,cAAc,CACpB,CAAC;QAEF,MAAM,KAAK,GAAqB;YAC9B,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,aAAa;YACb,YAAY;YACZ,KAAK;SACN,CAAC;QAEF,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QAC9D,OAAO;YACL,KAAK;YACL,IAAI;YACJ,KAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE,EAAE,UAAU,CAAC,KAAK,EAAE;YAC9D,QAAQ,EAAE,UAAU,CAAC,QAAQ;SAC9B,CAAC;IACJ,CAAC;IAED;;;;;;;;;;OAUG;IACH,kBAAkB,CAChB,IAA2B,EAC3B,UAA8B,EAC9B,KAAuB;QAEvB,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;YAC1B,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;YACrB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;SACjB,CAAC,CAAC;QACH,OAAO;YACL,IAAI,EAAE,gBAAgB,IAAI,EAAE;YAC5B,WAAW,EAAE,WAAW,IAAI,YAAY;YACxC,UAAU;YACV,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;YAC1B,oBAAoB,EAAE,GAAG,EAAE,CAAC,EAAE;YAC9B,OAAO,EAAE,KAAK,EAAE,MAAe,EAAE,OAAgB,EAAE,OAAgB,EAAE,EAAE;gBACrE,MAAM,EAAE,IAAI,EAAE,GAAG,MAA0B,CAAC;gBAC5C,MAAM,WAAW,GAAG,OAAgE,CAAC;gBACrF,MAAM,UAAU,GACd,WAAW,EAAE,OAAO;oBACnB;wBACC,OAAO,EAAE,UAAU,EAAE;wBACrB,IAAI;wBACJ,IAAI;wBACJ,YAAY,EAAE,EAAE;wBAChB,UAAU,EAAE,EAAE;wBACd,qBAAqB,EAAE,EAAE;wBACzB,SAAS,EAAE,CAAC;wBACZ,QAAQ,EAAE,UAAU,CAAC,QAAQ;qBACA,CAAC;gBAClC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC;gBAEvB,MAAM,aAAa,GAAG,OAET,CAAC;gBACd,MAAM,eAAe,GAAG,aAAa,EAAE,uBAAuB,CAAC;gBAC/D,MAAM,MAAM,GAAG,aAAa,EAAE,MAAM,CAAC;gBACrC,MAAM,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAC;gBACvC,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;gBACzC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,EAAE,CAAC;oBACnC,MAAM,IAAI,KAAK,CAAC,aAAa,UAAU,uDAAuD,CAAC,CAAC;gBAClG,CAAC;gBACD,MAAM,mBAAmB,GAAG,QAAQ,CAAC,mBAAmB,CAAC;gBACzD,qEAAqE;gBACrE,kEAAkE;gBAClE,8DAA8D;gBAC9D,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,CAAC;gBAChE,MAAM,IAAI,GAAG,IAAI,kBAAkB,CAAC;oBAClC,2BAA2B,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,4BAA4B,CAAC;oBACnF,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE,CACtB,mBAAmB,CAAC,KAAK,EAAE;wBACzB,eAAe,EAAE,IAAI,CAAC,SAAS;wBAC/B,cAAc,EAAE,IAAI,CAAC,OAAO;wBAC5B,qBAAqB,EAAE,IAAI,CAAC,sBAAsB;qBACnD,CAAC;iBACL,CAAC,CAAC;gBAEH,IAAI,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE;oBACzC,OAAO,EAAE,UAAU;oBACnB,MAAM;oBACN,UAAU;oBACV,4BAA4B,EAAE,QAAQ,CAAC,YAAY,EAAE,4BAA4B,KAAK,IAAI;oBAC1F,oEAAoE;oBACpE,iEAAiE;oBACjE,SAAS,EAAE,WAAW,EAAE,SAAS;oBACjC,qEAAqE;oBACrE,8DAA8D;oBAC9D,QAAQ,EAAE,UAAU,CAAC,QAAQ;oBAC7B,SAAS,EAAE,oBAAoB,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;oBAC5G,yBAAyB,EAAE,IAAI;oBAC/B,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE,CAC1B,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE;wBACpC,IAAI,EAAE,qBAAqB;wBAC3B,OAAO,EAAE,UAAU,CAAC,OAAO;wBAC3B,IAAI;wBACJ,KAAK;qBACN,CAAC;iBACL,CAAC,CAAC;gBACH,IAAI,OAAgB,CAAC;gBACrB,IAAI,aAAoD,CAAC;gBACzD,gEAAgE;gBAChE,sEAAsE;gBACtE,mEAAmE;gBACnE,IAAI,CAAC;oBACH,SAAS,CAAC;wBACR,OAAO,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC;wBACjC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;wBACrC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;4BACtE,IAAI,EAAE,UAAU;4BAChB,OAAO,EAAE,UAAU,CAAC,OAAO;4BAC3B,IAAI;yBACL,CAAC,CAAC;wBACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,IAAI,CAAC,eAAe,EAAE,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK;4BAAE,MAAM;wBACvF,IAAI,OAAkC,CAAC;wBACvC,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,6BAA6B,CACnE,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,EACvB,GAAG,EAAE;4BACH,OAAO,GAAG,cAAc;gCACtB,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC,cAAc,EAAE,GAAG,EAAE,CAC9D,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAM,CAAC,CACtC;gCACH,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAM,CAAC,CAAC;wBAC5C,CAAC,EACD,CAAC,QAAQ,EAAE,EAAE;4BACX,IAAI,CAAC,QAAQ,EAAE,CAAC;gCACd,IAAI,EAAE,4BAA4B;gCAClC,OAAO,EAAE,UAAU,CAAC,OAAO;gCAC3B,IAAI;6BACL,CAAC,CAAC;4BACH,IAAI,CAAC,4BAA4B,EAAE,CAAC;gCAClC,GAAG,QAAQ;gCACX,IAAI;gCACJ,KAAK,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,eAAe,CAAC,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC;6BACjF,CAAC,CAAC;wBACL,CAAC,CACF,CAAC;wBACF,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO;4BAAE,MAAM;wBAClC,MAAM,GAAG,OAAO,CAAC;oBACnB,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,mEAAmE;oBACnE,wEAAwE;oBACxE,IAAI,uBAAuB,CAAC,KAAK,CAAC,IAAI,MAAM,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;wBAC/D,MAAM,QAAQ,GAAG,oBAAoB,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC;wBACpE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE;4BAClD,OAAO,EAAE,UAAU,CAAC,OAAO;4BAC3B,IAAI;4BACJ,QAAQ;yBACT,CAAC,CAAC;wBACH,MAAM,YAAY,GAAyB;4BACzC,OAAO,EAAE,UAAU,CAAC,OAAO;4BAC3B,IAAI;4BACJ,MAAM,EAAE,aAAa;4BACrB,aAAa,EAAE,kBAAkB;4BACjC,SAAS,EAAE,iCAAiC,CAAC;gCAC3C,QAAQ;gCACR,WAAW,EAAE,gBAAgB,CAAC,MAAM,CAAC;6BACtC,CAAC;4BACF,YAAY,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;4BACnD,SAAS,EAAE,yBAAyB,CAAC,UAAU,CAAC,UAAU,CAAC;4BAC3D,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC;4BAC3B,WAAW,EAAE,MAAM,CAAC,cAAgD;yBACrE,CAAC;wBACF,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;oBACtC,CAAC;oBAED,8EAA8E;oBAC9E,gFAAgF;oBAChF,gFAAgF;oBAChF,yDAAyD;oBACzD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;oBACtG,IAAI,aAAa,GAAG,CAAC,IAAI,MAAM,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;wBAClD,MAAM,YAAY,GAAI,KAAe,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;wBAChE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,qEAAqE,EAAE;4BACvF,OAAO,EAAE,UAAU,CAAC,OAAO;4BAC3B,IAAI;4BACJ,KAAK,EAAE,YAAY;4BACnB,aAAa;yBACd,CAAC,CAAC;wBACH,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;wBAC7C,MAAM,mBAAmB,GAAG,MAAM,0BAA0B,CAAC,MAAM,CAAC,CAAC;wBACrE,MAAM,iBAAiB,GAAG,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;wBAC1F,MAAM,aAAa,GAAyB;4BAC1C,OAAO,EAAE,UAAU,CAAC,OAAO;4BAC3B,IAAI;4BACJ,MAAM,EAAE,QAAQ;4BAChB,KAAK,EAAE,YAAY;4BACnB,SAAS,EAAE,iBAAiB;gCAC1B,CAAC,CAAC,GAAG,iBAAiB,uCAAuC,YAAY,GAAG;gCAC5E,CAAC,CAAC,wCAAwC,aAAa,oBAAoB,YAAY,GAAG;4BAC5F,YAAY,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;4BACnD,SAAS,EAAE,yBAAyB,CAAC,UAAU,CAAC,UAAU,CAAC;4BAC3D,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC;4BAC3B,WAAW,EAAE,MAAM,CAAC,cAAgD;yBACrE,CAAC;wBACF,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;oBACvC,CAAC;oBAED,MAAM,KAAK,CAAC;gBACd,CAAC;gBAED,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;gBAC1D,MAAM,SAAS,GAAG,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;gBAC3C,MAAM,MAAM,GAAyB;oBACnC,OAAO,EAAE,UAAU,CAAC,OAAO;oBAC3B,IAAI;oBACJ,kEAAkE;oBAClE,+DAA+D;oBAC/D,0CAA0C;oBAC1C,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW;oBAC3G,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC;oBACnC,YAAY,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;oBACnD,SAAS,EAAE,yBAAyB,CAAC,UAAU,CAAC,UAAU,CAAC;oBAC3D,KAAK,EAAE,sBAAsB,CAAE,OAA2C,EAAE,KAAK,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC;oBAC1G,WAAW,EAAE,MAAM,CAAC,cAAgD;oBACpE,GAAG,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3D,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC5C,CAAC;gBACF,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAChC,CAAC;SACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAwB,EAAE,OAAiB,EAAE,OAAiB;QAC5E,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,IAA6B,CAAC,EAAE,CAAC;YACpE,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,IAAI,GAAG,OAAO,CAAC,IAA6B,CAAC;QACnD,MAAM,aAAa,GAAG,OAET,CAAC;QAEd,IAAI,YAAgC,CAAC;QACrC,IAAI,cAA0C,CAAC;QAC/C,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,MAAM,iBAAiB,CAAC;gBAClC,IAAI,EAAE,OAAO,CAAC,QAAQ;gBACtB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,QAAQ,EAAE,IAAI,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,IAAI,OAAO,CAAC,GAAG,EAAE;gBACrE,QAAQ,EAAE,IAAI,CAAC,iBAAiB,EAAE,QAAQ,EAAE,IAAI,KAAK;aACtD,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,MAAM,OAAO,GAAG,aAAa,EAAE,QAAQ,EAAE,MAAM,IAAI,UAAU,EAAE,CAAC;gBAChE,MAAM,MAAM,GAAyB;oBACnC,OAAO;oBACP,IAAI;oBACJ,MAAM,EAAE,QAAQ;oBAChB,SAAS,EAAE,EAAE;oBACb,YAAY,EAAE,EAAE;oBAChB,SAAS,EAAE,EAAE;oBACb,KAAK,EAAE,GAAG,CAAC,KAAK;iBACjB,CAAC;gBACF,MAAM,QAAQ,CACZ,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,QAAQ,EACb,EAAE,IAAI,EAAE,oBAAoB,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EACvE,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;gBACF,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;YAChC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,gBAAgB,EAAE,GAAG,CAAC,gBAAgB,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1G,CAAC;QAED,2BAA2B;QAC3B,qEAAqE;QACrE,wDAAwD;QACxD,IAAI,SAAwC,CAAC;QAC7C,IAAI,OAAO,CAAC,eAAe,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,CAAC;YAC3D,MAAM,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC;YACvD,IAAI,CAAC,CAAC,IAAI,YAAY,iBAAiB,CAAC,EAAE,CAAC;gBACzC,MAAM,SAAS,GAAG,IAAI,CAAC;gBACvB,MAAM,IAAI,KAAK,CACb,qBAAqB,SAAS,CAAC,MAAM,GACnC,SAAS,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAC7E,EAAE,CACH,CAAC;YACJ,CAAC;YACD,SAAS,GAAG,IAAI,CAAC;QACnB,CAAC;QAED,wEAAwE;QACxE,wEAAwE;QACxE,yEAAyE;QACzE,MAAM,cAAc,GAAG,aAAa,EAAE,QAAQ,EAAE,MAAM,IAAI,UAAU,EAAE,CAAC;QACvE,MAAM,eAAe,GAAG,0BAA0B,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1F,sEAAsE;QACtE,yEAAyE;QACzE,wEAAwE;QACxE,yDAAyD;QACzD,MAAM,QAAQ,GACZ,cAAc;YACd,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,CAAC;QACvG,MAAM,KAAK,GAAG,IAAI,uBAAuB,CAAC;YACxC,KAAK,EAAE,cAAc;YACrB,YAAY,EAAE,eAAe,EAAE,MAAM;YACrC,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,yBAAyB,EAAE,CAAC,YAAY,EAAE,EAAE;gBAC1C,MAAM,MAAM,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;gBACjD,IAAI,MAAM;oBAAE,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAClD,CAAC;SACF,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,EAAE;YACzC,KAAK;YACL,KAAK,EAAE,cAAc;YACrB,IAAI;YACJ,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,KAAK,EAAE,QAAQ,CAAC,KAAK;SACtB,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,0BAA0B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,SAAS,EAAE,MAAM,CAAC;QACjC,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YACpB,SAAS,EAAE,OAAO,EAAE,CAAC;YACrB,MAAM,gBAAgB,CAAC,sCAAsC,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAC5E,MAAM,OAAO,GAAG,eAAe,EAAE,OAAO,IAAI,cAAc,CAAC;QAC3D,MAAM,UAAU,GAAuB,eAAe,IAAI;YACxD,OAAO;YACP,IAAI;YACJ,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,YAAY,EAAE,EAAE;YAChB,UAAU,EAAE,EAAE;YACd,qBAAqB,EAAE,EAAE;YACzB,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,QAAQ,CAAC,QAAQ;SAC5B,CAAC;QACF,UAAU,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QAE/B,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,CAAC;YAChC,MAAM,QAAQ,CACZ,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,QAAQ,EACb;gBACE,IAAI,EAAE,kBAAkB;gBACxB,OAAO;gBACP,IAAI;gBACJ,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,UAAU,EAAE,OAAO,CAAC,UAAU;aAC/B,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;QACJ,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,cAAc,EAAE,CAAC;QAC1C,kFAAkF;QAClF,wEAAwE;QACxE,IAAI,aAAuC,CAAC;QAC5C,IAAI,uBAAuB,GAAG,KAAK,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC;YAC5C,eAAe,CAAC,YAAY,EAAE,mBAAmB,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;YACvE,MAAM,iBAAiB,GAA8C;gBACnE,OAAO,EAAE,UAAU;gBACnB,SAAS,EAAE,YAAY;gBACvB,MAAM;aACP,CAAC;YACF,MAAM,gBAAgB,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,uBAAuB,EAAE,KAAK,EAAE,CAAC;YAE7G,MAAM,YAAY,GAAG,MAAM;gBACzB,CAAC,CAAC,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;oBAC/B,aAAa,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,sCAAsC,CAAC,CAAC,CAAC;oBACvF,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAClE,CAAC,CAAC;gBACJ,CAAC,CAAC,IAAI,CAAC;YAET,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAC/B,IAAI,CAAC,OAAO,CACV,uBAAuB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,EACtE,iBAAiB,EACjB,gBAAgB,CACjB,CACF,CAAC;YACF,MAAM,QAAQ,GAA4B,CAAC,SAAS,CAAC,CAAC;YACtD,IAAI,YAAY,EAAE,CAAC;gBACjB,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC9B,CAAC;YACD,sEAAsE;YACtE,uEAAuE;YACvE,iCAAiC;YACjC,MAAM,WAAW,GAAG,MAAM,CAAC,iCAAiC,CAAC,CAAC;YAC9D,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,OAAO,CAAQ,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjH,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzC,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;gBACxB,uBAAuB,GAAG,IAAI,CAAC;gBAC/B,MAAM,eAAe,GAAG,SAAS,CAAC;gBAClC,MAAM,sBAAsB,GAAG,CAAC,KAAc,EAAQ,EAAE;oBACtD,iEAAiE;oBACjE,mEAAmE;oBACnE,oEAAoE;oBACpE,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE;wBACpC,IAAI,EAAE,oBAAoB;wBAC1B,KAAK,EAAE,IAAI;wBACX,MAAM,EAAE;4BACN,OAAO;4BACP,IAAI;4BACJ,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,IAAI,WAAW,CAAE,KAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ;4BACpG,SAAS,EAAE,EAAE;4BACb,YAAY,EAAE,EAAE;4BAChB,SAAS,EAAE,EAAE;4BACb,KAAK,EAAG,KAAa,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;yBAChD;qBACF,CAAC,CAAC;gBACL,CAAC,CAAC;gBACF,KAAK,SAAS;qBACX,IAAI,CACH,CAAC,QAAQ,EAAE,EAAE;oBACX,IAAI,CAAC;wBACH,MAAM,MAAM,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;wBACnD,IAAI,YAAY,EAAE,CAAC;4BACjB,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;wBACrC,CAAC;wBACD,IAAI,eAAe,IAAI,MAAM,CAAC,KAAK;4BAAE,OAAO,CAAC,eAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBACxF,0DAA0D;wBAC1D,0DAA0D;wBAC1D,0DAA0D;wBAC1D,4DAA4D;wBAC5D,6DAA6D;wBAC7D,2DAA2D;wBAC3D,yDAAyD;wBACzD,4DAA4D;wBAC5D,IAAI,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;4BACrC,MAAM,SAAS,GAAmB,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;4BACvE,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,oBAAoB,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;wBACxG,CAAC;oBACH,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,sBAAsB,CAAC,KAAK,CAAC,CAAC;oBAChC,CAAC;oBACD,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjB,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;oBACR,sBAAsB,CAAC,KAAK,CAAC,CAAC;oBAC9B,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjB,CAAC,CACF;qBACA,OAAO,CAAC,GAAG,EAAE;oBACZ,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;oBAC9C,eAAe,EAAE,OAAO,EAAE,CAAC;gBAC7B,CAAC,CAAC,CAAC;gBACL,SAAS,GAAG,SAAS,CAAC;gBACtB,OAAO;oBACL,OAAO;oBACP,IAAI;oBACJ,MAAM,EAAE,SAA2C;oBACnD,SAAS,EAAE,EAAE;oBACb,YAAY,EAAE,EAAE;oBAChB,SAAS,EAAE,EAAE;oBACb,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC1C,CAAC;YACJ,CAAC;YACD,MAAM,MAAM,GAAG,yBAAyB,CAAC,GAAG,CAAC,CAAC;YAC9C,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;YACrC,CAAC;YACD,+BAA+B;YAC/B,IAAI,SAAS,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC9B,OAAO,CAAC,eAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACrD,CAAC;YACD,wEAAwE;YACxE,oEAAoE;YACpE,oEAAoE;YACpE,sDAAsD;YACtD,sEAAsE;YACtE,uDAAuD;YACvD,IAAI,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;gBACrC,MAAM,SAAS,GAAmB,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;gBACvE,MAAM,QAAQ,CACZ,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,QAAQ,EACb,EAAE,IAAI,EAAE,oBAAoB,EAAE,MAAM,EAAE,SAAS,EAAE,EACjD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;YACJ,CAAC;iBAAM,IAAI,MAAM,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;gBAC3C,MAAM,QAAQ,CACZ,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,QAAQ,EACb;oBACE,IAAI,EAAE,sBAAsB;oBAC5B,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,SAAS,EAAE,MAAM,CAAC,SAAS;iBAC5B,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;YACJ,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE;gBAChD,OAAO;gBACP,IAAI;gBACJ,KAAK,EAAE,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;aACvC,CAAC,CAAC;YACH,MAAM,QAAQ,CACZ,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,QAAQ,EACb;gBACE,IAAI,EAAE,oBAAoB;gBAC1B,MAAM,EAAE;oBACN,OAAO;oBACP,IAAI;oBACJ,MAAM,EAAE,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ;oBACnE,SAAS,EAAE,EAAE;oBACb,YAAY,EAAE,EAAE;oBAChB,SAAS,EAAE,EAAE;oBACb,KAAK,EAAE,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;iBACvC;aACF,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;YACF,MAAM,KAAK,CAAC;QACd,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBAC7B,KAAK,CAAC,MAAM,EAAE,CAAC;gBACf,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;gBAC9C,SAAS,EAAE,OAAO,EAAE,CAAC;YACvB,CAAC;YACD,IAAI,aAAa,IAAI,MAAM,EAAE,CAAC;gBAC5B,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YACrD,CAAC;YACD,SAAS,EAAE,OAAO,EAAE,CAAC;YACrB,eAAe,EAAE,OAAO,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role-loader.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/role-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAG9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"role-loader.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/role-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAG9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAMjE,eAAO,MAAM,WAAW,QAA2C,CAAC;AAEpE;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAK1C,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAexD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAmCpG;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,kBAAkB,CAoDrG;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAYlE;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,OAAO,GACnB,OAAO,CAKT;AAED,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,SAAS,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,EAAE,EAC3D,cAAc,EAAE,OAAO,GACtB,MAAM,CA8CR;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,kBAAkB,EAC9B,eAAe,EAAE,SAAS,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,EAAE,EAC3D,cAAc,EAAE,OAAO,EACvB,QAAQ,EAAE,gBAAgB,EAC1B,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,aAAa,CAAC,EAAE,aAAa,GAC5B,MAAM,CA4CR"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
import fs from 'node:fs';
|
|
3
|
-
import { shouldPreferPatchEditingModel } from '../../lib/tool-selection-policy.js';
|
|
3
|
+
import { isGpt5OrGpt6Model, shouldPreferPatchEditingModel } from '../../lib/tool-selection-policy.js';
|
|
4
4
|
import { getEnvInfo, getAgentsInstructions } from '../../agent.js';
|
|
5
5
|
import { getShellSandboxAddendum } from '../../prompts/shell-sandbox.js';
|
|
6
6
|
import { getSearchViaShellAddendum } from '../../prompts/search-via-shell.js';
|
|
7
7
|
import { MemoryCapabilityBuilder } from '../memory/memory-capabilities.js';
|
|
8
|
-
import { resolveAncillaryModelTier } from '../agent-runtime/model-resolver.js';
|
|
8
|
+
import { getTierModelPool, resolveAncillaryModelTier } from '../agent-runtime/model-resolver.js';
|
|
9
|
+
import { getAncillaryTierForRole } from './subagent-pool-config.js';
|
|
9
10
|
const BASE_PROMPT_PATH = path.join(import.meta.dirname, '../../prompts');
|
|
10
11
|
export const PROMPTS_DIR = path.join(BASE_PROMPT_PATH, 'subagents');
|
|
11
12
|
/**
|
|
@@ -14,12 +15,6 @@ export const PROMPTS_DIR = path.join(BASE_PROMPT_PATH, 'subagents');
|
|
|
14
15
|
* approach it; settlement reports a budget stop rather than failing.
|
|
15
16
|
*/
|
|
16
17
|
export const ROLE_MAX_TURNS_DEFAULT = 200;
|
|
17
|
-
const roleModelTiers = {
|
|
18
|
-
mentor: 'smart',
|
|
19
|
-
worker: 'balanced',
|
|
20
|
-
explorer: 'cheap',
|
|
21
|
-
librarian: 'cheap',
|
|
22
|
-
};
|
|
23
18
|
const isInherited = (value) => value === 'inherit' || value === undefined || value === null || value === '';
|
|
24
19
|
export function resolvePrompt(promptPath) {
|
|
25
20
|
try {
|
|
@@ -82,14 +77,14 @@ export function loadRoleDefinition(role, settings) {
|
|
|
82
77
|
}
|
|
83
78
|
const { frontmatter, body } = parseFrontmatter(content);
|
|
84
79
|
const subagentPrefix = role === 'mentor' ? 'agent.mentor' : `agent.subagent${role.charAt(0).toUpperCase() + role.slice(1)}`;
|
|
85
|
-
const tier =
|
|
80
|
+
const tier = getAncillaryTierForRole(role);
|
|
86
81
|
const tierModel = resolveAncillaryModelTier(tier, settings);
|
|
87
82
|
const legacyModel = settings.getDynamic(`${subagentPrefix}Model`);
|
|
88
83
|
const legacyProvider = settings.getDynamic(`${subagentPrefix}Provider`);
|
|
89
84
|
const configuredLegacyReasoningEffort = settings.getDynamic(`${subagentPrefix}ReasoningEffort`);
|
|
90
85
|
const legacyReasoningEffort = role === 'mentor' && configuredLegacyReasoningEffort === 'default' ? undefined : configuredLegacyReasoningEffort;
|
|
91
86
|
const model = isInherited(frontmatter.model)
|
|
92
|
-
?
|
|
87
|
+
? getTierModelPool(tier, settings)[0] ?? legacyModel ?? tierModel.model
|
|
93
88
|
: frontmatter.model;
|
|
94
89
|
const provider = isInherited(frontmatter.provider)
|
|
95
90
|
? settings.getDynamic(`agent.${tier}Provider`) ?? legacyProvider ?? tierModel.provider
|
|
@@ -116,13 +111,13 @@ export function loadRoleDefinition(role, settings) {
|
|
|
116
111
|
}
|
|
117
112
|
export function selectSubagentBasePromptFile(model) {
|
|
118
113
|
const normalizedModel = model.toLowerCase();
|
|
119
|
-
if (normalizedModel
|
|
114
|
+
if (isGpt5OrGpt6Model(normalizedModel) && normalizedModel.includes('codex')) {
|
|
120
115
|
return 'base-codex.md';
|
|
121
116
|
}
|
|
122
117
|
if (normalizedModel.includes('sonnet') || normalizedModel.includes('haiku')) {
|
|
123
118
|
return 'base-anthropic.md';
|
|
124
119
|
}
|
|
125
|
-
if (normalizedModel
|
|
120
|
+
if (isGpt5OrGpt6Model(normalizedModel)) {
|
|
126
121
|
return 'base-gpt-5-modern.md';
|
|
127
122
|
}
|
|
128
123
|
return 'base-simple.md';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role-loader.js","sourceRoot":"","sources":["../../../source/services/subagents/role-loader.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAIzB,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"role-loader.js","sourceRoot":"","sources":["../../../source/services/subagents/role-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ import { SubagentAsyncRegistry } from './subagent-async-registry.js';
|
|
|
11
11
|
import type { ToolOwnershipRegistry } from '../approval/tool-ownership-registry.js';
|
|
12
12
|
import { NestedToolCompatibilityState } from '../session/nested-tool-compatibility-state.js';
|
|
13
13
|
import type { BackgroundSubagentApprovalPauseSink } from './foreground-subagent-lease.js';
|
|
14
|
+
import type { SessionBrowser } from '../conversation/session-browser.js';
|
|
14
15
|
export interface SubagentRuntimeDeps {
|
|
15
16
|
logger: ILoggingService;
|
|
16
17
|
settings: ISettingsService;
|
|
@@ -25,6 +26,8 @@ export interface SubagentRuntimeDeps {
|
|
|
25
26
|
nestedCompatibility?: NestedToolCompatibilityState;
|
|
26
27
|
/** Session-owned queue/control sink for pauses from adopted child runs. */
|
|
27
28
|
backgroundApprovalPauseSink?: BackgroundSubagentApprovalPauseSink;
|
|
29
|
+
readOnly?: boolean;
|
|
30
|
+
sessionBrowser?: SessionBrowser;
|
|
28
31
|
}
|
|
29
32
|
export interface SubagentRuntime {
|
|
30
33
|
toolPolicy: SubagentToolPolicy;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAuB,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAGrE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AACpF,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAC7F,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,gCAAgC,CAAC;AAE1F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEzE,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,qBAAqB,EAAE,sBAAsB,CAAC;IAC9C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;IACtD,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,EAAE,qBAAqB,CAAC;IACrC,2EAA2E;IAC3E,mBAAmB,CAAC,EAAE,4BAA4B,CAAC;IACnD,2EAA2E;IAC3E,2BAA2B,CAAC,EAAE,mCAAmC,CAAC;IAClE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,kBAAkB,CAAC;IAC/B,WAAW,EAAE,mBAAmB,CAAC;IACjC,YAAY,EAAE,oBAAoB,CAAC;IACnC,eAAe,EAAE,uBAAuB,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,qBAAqB,CAAC;IACrC,sEAAsE;IACtE,mBAAmB,EAAE,4BAA4B,CAAC;CACnD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,GAAG,eAAe,CAyJhF"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
1
2
|
import { SubagentToolPolicy, SubagentToolFactory } from './tool-policy.js';
|
|
2
3
|
import { NestedSubagentRunner } from './nested-runner.js';
|
|
3
4
|
import { ExecutionSubagentRunner } from './execution-runner.js';
|
|
@@ -6,6 +7,7 @@ import { SubagentAsyncRegistry } from './subagent-async-registry.js';
|
|
|
6
7
|
import { SubagentSession } from './subagent-session.js';
|
|
7
8
|
import { loadRoleDefinition } from './role-loader.js';
|
|
8
9
|
import { NestedToolCompatibilityState } from '../session/nested-tool-compatibility-state.js';
|
|
10
|
+
import { SubagentRolePoolSelector } from './subagent-role-pool-selector.js';
|
|
9
11
|
export function createSubagentRuntime(deps) {
|
|
10
12
|
const nestedCompatibility = deps.nestedCompatibility ?? new NestedToolCompatibilityState(deps.settings);
|
|
11
13
|
// Peek (get_subagent_status): route subagent_tool_started events into the
|
|
@@ -38,8 +40,15 @@ export function createSubagentRuntime(deps) {
|
|
|
38
40
|
toolPolicy,
|
|
39
41
|
skillsService: deps.skillsService,
|
|
40
42
|
nestedCompatibility,
|
|
43
|
+
readOnly: deps.readOnly,
|
|
44
|
+
sessionBrowser: deps.sessionBrowser,
|
|
41
45
|
});
|
|
42
46
|
const roleToolCache = new Map();
|
|
47
|
+
// One cursor per role, shared by both spawn paths below (the foreground
|
|
48
|
+
// `run_subagent` tool and the async registry's fresh-run resolution) so a
|
|
49
|
+
// pool round-robins across every spawn regardless of which path it came
|
|
50
|
+
// through.
|
|
51
|
+
const rolePoolSelector = new SubagentRolePoolSelector(deps.settings);
|
|
43
52
|
const nestedRunner = new NestedSubagentRunner({
|
|
44
53
|
logger: deps.logger,
|
|
45
54
|
settings: deps.settings,
|
|
@@ -48,6 +57,7 @@ export function createSubagentRuntime(deps) {
|
|
|
48
57
|
toolFactory,
|
|
49
58
|
onEvent: onEventWithPeek,
|
|
50
59
|
roleToolCache,
|
|
60
|
+
rolePoolSelector,
|
|
51
61
|
skillsService: deps.skillsService,
|
|
52
62
|
toolOwnership: deps.toolOwnership,
|
|
53
63
|
...(deps.backgroundApprovalPauseSink ? { backgroundApprovalPauseSink: deps.backgroundApprovalPauseSink } : {}),
|
|
@@ -63,6 +73,13 @@ export function createSubagentRuntime(deps) {
|
|
|
63
73
|
skillsService: deps.skillsService,
|
|
64
74
|
toolOwnership: deps.toolOwnership,
|
|
65
75
|
});
|
|
76
|
+
// Reviewer explorers are fresh, contained child runs: their events are not
|
|
77
|
+
// forwarded, so they never surface as orphan activity in the parent session.
|
|
78
|
+
toolFactory.setExplorerRunner((task, signal) => {
|
|
79
|
+
const agentId = randomUUID();
|
|
80
|
+
const definition = rolePoolSelector.resolveForSpawn('explorer', loadRoleDefinition('explorer', deps.settings));
|
|
81
|
+
return executionRunner.runInSession(agentId, { role: 'explorer', task, signal, parentTool: 'run_explorer' }, definition, new SubagentSession(agentId, 'explorer'), undefined, signal, () => { });
|
|
82
|
+
});
|
|
66
83
|
const mentorSession = new SubagentSession('mentor', 'mentor');
|
|
67
84
|
const mentorRunner = new MentorRunner({
|
|
68
85
|
logger: deps.logger,
|
|
@@ -74,18 +91,33 @@ export function createSubagentRuntime(deps) {
|
|
|
74
91
|
});
|
|
75
92
|
asyncRegistry = new SubagentAsyncRegistry({
|
|
76
93
|
logger: deps.logger,
|
|
77
|
-
run: async ({ request, runId, session, signal, input, control }) => {
|
|
94
|
+
run: async ({ request, runId, session, signal, input, control, definition }) => {
|
|
78
95
|
if (request.role === 'mentor') {
|
|
79
96
|
return mentorRunner.run(runId, input, signal, session, request.executionBudget);
|
|
80
97
|
}
|
|
81
|
-
|
|
82
|
-
|
|
98
|
+
// `definition` is resolved once per run by `resolveDefinition` below and
|
|
99
|
+
// carried across every later segment (including steering continuations
|
|
100
|
+
// and an explicit `continue_run_id`), so it is never recomputed here —
|
|
101
|
+
// recomputing per segment would draw another pool entry per turn
|
|
102
|
+
// instead of once per spawn. The fallback only covers callers that
|
|
103
|
+
// never went through `resolveDefinition` (e.g. a bare test double).
|
|
104
|
+
const resolvedDefinition = definition ?? loadRoleDefinition(request.role, deps.settings);
|
|
105
|
+
return executionRunner.runInSession(runId, { ...request, signal }, {
|
|
106
|
+
...resolvedDefinition,
|
|
107
|
+
...(request.executionBudget ? { executionBudget: request.executionBudget } : {}),
|
|
108
|
+
}, session, undefined, signal, undefined, control, input);
|
|
83
109
|
},
|
|
84
110
|
onEvent: deps.onEvent,
|
|
85
111
|
sessionContextService: deps.sessionContextService,
|
|
86
112
|
ttlMs: deps.settings.get('subagent.asyncSessionTtlMs') ?? 30 * 60 * 1000,
|
|
87
113
|
messageCap: deps.settings.get('subagent.asyncMessageCap') ?? 50,
|
|
88
114
|
sessionForRole: (role) => (role === 'mentor' ? mentorSession : undefined),
|
|
115
|
+
// Called once per fresh (non-continuation) spawn; a configured pool
|
|
116
|
+
// advances its round-robin cursor here.
|
|
117
|
+
resolveDefinition: (role) => {
|
|
118
|
+
const base = loadRoleDefinition(role, deps.settings);
|
|
119
|
+
return rolePoolSelector.resolveForSpawn(role, base);
|
|
120
|
+
},
|
|
89
121
|
modelForRole: (role) => {
|
|
90
122
|
const mentorPool = role === 'mentor' ? deps.settings.get('agent.mentorPool') : undefined;
|
|
91
123
|
if (Array.isArray(mentorPool) && mentorPool.length > 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ILoggingService, ISessionContextService } from '../service-interfaces.js';
|
|
2
2
|
import type { ConversationEvent } from '../conversation/conversation-events.js';
|
|
3
|
-
import type { SubagentRequest, SubagentResult, SubagentRunHandle, SubagentRunStatus, SubagentSegmentControl, SubagentCancelAcknowledgement, SubagentSteerAcknowledgement } from './types.js';
|
|
3
|
+
import type { SubagentDefinition, SubagentRequest, SubagentResult, SubagentRunHandle, SubagentRunStatus, SubagentSegmentControl, SubagentCancelAcknowledgement, SubagentSteerAcknowledgement } from './types.js';
|
|
4
4
|
import { SubagentSession } from './subagent-session.js';
|
|
5
5
|
import { ForegroundSubagentLease } from './foreground-subagent-lease.js';
|
|
6
6
|
export declare const SUBAGENT_RUN_NAME_PATTERN: RegExp;
|
|
@@ -19,6 +19,8 @@ export interface SubagentAsyncRegistryDeps {
|
|
|
19
19
|
/** A fresh user-turn input for this segment, never SDK RunState reuse. */
|
|
20
20
|
input: string;
|
|
21
21
|
control: SubagentSegmentControl;
|
|
22
|
+
/** The definition resolved once for this run by `resolveDefinition`; see `StoredRun.definition`. */
|
|
23
|
+
definition?: SubagentDefinition;
|
|
22
24
|
}) => Promise<SubagentResult>;
|
|
23
25
|
onEvent?: (event: ConversationEvent) => void;
|
|
24
26
|
/**
|
|
@@ -36,6 +38,13 @@ export interface SubagentAsyncRegistryDeps {
|
|
|
36
38
|
provider: string;
|
|
37
39
|
id: string;
|
|
38
40
|
} | undefined;
|
|
41
|
+
/**
|
|
42
|
+
* Resolves the definition to run a *fresh* spawn on, called at most once
|
|
43
|
+
* per new run (never for a continuation of an existing one). When a
|
|
44
|
+
* round-robin pool is configured for the role, implementations advance
|
|
45
|
+
* that pool's cursor here — see `SubagentRolePoolSelector`.
|
|
46
|
+
*/
|
|
47
|
+
resolveDefinition?: (role: string) => SubagentDefinition;
|
|
39
48
|
setInterval?: (callback: () => void, delay: number) => ReturnType<typeof setInterval>;
|
|
40
49
|
clearInterval?: (timer: ReturnType<typeof setInterval>) => void;
|
|
41
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-async-registry.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-async-registry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAyB,MAAM,0BAA0B,CAAC;AAC/G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,KAAK,EAEV,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,6BAA6B,EAC7B,4BAA4B,EAE7B,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAGzE,eAAO,MAAM,yBAAyB,QAA4B,CAAC;AAanE,MAAM,MAAM,yBAAyB,GACjC,WAAW,GACX,eAAe,GACf,iBAAiB,GACjB,gBAAgB,GAChB,gBAAgB,GAChB,SAAS,GACT,cAAc,GACd,aAAa,CAAC;AAElB,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;IACzC,YAAY,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAE,MAAM,EAI3D;CACF;
|
|
1
|
+
{"version":3,"file":"subagent-async-registry.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-async-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,7 @@ export class SubagentAsyncRegistry {
|
|
|
37
37
|
#sessionCap = 50;
|
|
38
38
|
#sessionForRole;
|
|
39
39
|
#modelForRole;
|
|
40
|
+
#resolveDefinition;
|
|
40
41
|
#timer;
|
|
41
42
|
#clearInterval;
|
|
42
43
|
#disposed = false;
|
|
@@ -51,6 +52,7 @@ export class SubagentAsyncRegistry {
|
|
|
51
52
|
this.#sessionContextService = deps.sessionContextService;
|
|
52
53
|
this.#sessionForRole = deps.sessionForRole;
|
|
53
54
|
this.#modelForRole = deps.modelForRole;
|
|
55
|
+
this.#resolveDefinition = deps.resolveDefinition;
|
|
54
56
|
this.#clearInterval = deps.clearInterval ?? clearInterval;
|
|
55
57
|
this.#timer = (deps.setInterval ?? setInterval)(() => this.#evictExpired(), Math.max(1000, Math.min(this.#ttlMs, 60_000)));
|
|
56
58
|
this.#timer.unref?.();
|
|
@@ -59,7 +61,7 @@ export class SubagentAsyncRegistry {
|
|
|
59
61
|
if (this.#disposed)
|
|
60
62
|
throw new Error('Subagent async registry is disposed');
|
|
61
63
|
const role = request.role;
|
|
62
|
-
if (!['explorer', 'worker', 'mentor', 'librarian'].includes(role)) {
|
|
64
|
+
if (!['explorer', 'worker', 'mentor', 'librarian', 'reviewer'].includes(role)) {
|
|
63
65
|
throw new SubagentRegistryError('not_continuable', `Unknown subagent role: ${role}`);
|
|
64
66
|
}
|
|
65
67
|
const name = request.name;
|
|
@@ -72,8 +74,10 @@ export class SubagentAsyncRegistry {
|
|
|
72
74
|
const continuation = request.continueRunId;
|
|
73
75
|
let session;
|
|
74
76
|
let trafficContext;
|
|
77
|
+
let previousRun;
|
|
75
78
|
if (continuation) {
|
|
76
79
|
const previous = this.#runs.get(continuation);
|
|
80
|
+
previousRun = previous;
|
|
77
81
|
if (!previous) {
|
|
78
82
|
throw new SubagentRegistryError(this.#evicted.has(continuation) ? 'evicted' : 'not_found', `Async subagent run not found: ${continuation}`);
|
|
79
83
|
}
|
|
@@ -85,7 +89,7 @@ export class SubagentAsyncRegistry {
|
|
|
85
89
|
throw new SubagentRegistryError('not_continuable', `Async subagent run ${continuation} cannot be continued from status ${previous.status}`);
|
|
86
90
|
if (role === 'worker')
|
|
87
91
|
throw new SubagentRegistryError('worker_blocked', 'Worker runs cannot be continued asynchronously');
|
|
88
|
-
if (
|
|
92
|
+
if (!['mentor', 'librarian', 'explorer', 'reviewer'].includes(role)) {
|
|
89
93
|
throw new SubagentRegistryError('not_continuable', `Role ${role} cannot be continued`);
|
|
90
94
|
}
|
|
91
95
|
session = previous.session;
|
|
@@ -107,7 +111,18 @@ export class SubagentAsyncRegistry {
|
|
|
107
111
|
trafficContext ??= this.#deriveTrafficContext(runId);
|
|
108
112
|
const control = new SubagentRunControl();
|
|
109
113
|
const startedAt = this.#now();
|
|
110
|
-
|
|
114
|
+
// A continuation (`continueRunId`) inherits the resolved definition and
|
|
115
|
+
// display model of the run it continues rather than resolving again --
|
|
116
|
+
// resolving on continuation would draw another pool entry and rotate the
|
|
117
|
+
// model mid-conversation, which callers must never see.
|
|
118
|
+
const definition = previousRun ? previousRun.definition : this.#resolveDefinition?.(role);
|
|
119
|
+
const model = previousRun
|
|
120
|
+
? previousRun.model
|
|
121
|
+
: role === 'mentor'
|
|
122
|
+
? this.#modelForRole?.(role)
|
|
123
|
+
: definition
|
|
124
|
+
? { provider: definition.provider, id: definition.model }
|
|
125
|
+
: this.#modelForRole?.(role);
|
|
111
126
|
let resolve;
|
|
112
127
|
const promise = new Promise((r) => (resolve = r));
|
|
113
128
|
const stored = {
|
|
@@ -137,6 +152,7 @@ export class SubagentAsyncRegistry {
|
|
|
137
152
|
activityState: 'waiting',
|
|
138
153
|
waitingReason: 'provider',
|
|
139
154
|
...(model === undefined ? {} : { model }),
|
|
155
|
+
...(definition === undefined ? {} : { definition }),
|
|
140
156
|
responseInStream: false,
|
|
141
157
|
...(trafficContext ? { trafficContext } : {}),
|
|
142
158
|
};
|
|
@@ -176,7 +192,7 @@ export class SubagentAsyncRegistry {
|
|
|
176
192
|
if (this.#runs.has(lease.runId) || this.#evicted.has(lease.runId)) {
|
|
177
193
|
throw new Error(`Async subagent run id ${lease.runId} is already retained.`);
|
|
178
194
|
}
|
|
179
|
-
if (!['explorer', 'worker', 'mentor', 'librarian'].includes(request.role)) {
|
|
195
|
+
if (!['explorer', 'worker', 'mentor', 'librarian', 'reviewer'].includes(request.role)) {
|
|
180
196
|
throw new SubagentRegistryError('not_continuable', `Unknown subagent role: ${request.role}`);
|
|
181
197
|
}
|
|
182
198
|
if (request.name !== undefined &&
|
|
@@ -632,6 +648,7 @@ export class SubagentAsyncRegistry {
|
|
|
632
648
|
onToolComplete: () => run.control.onToolComplete(),
|
|
633
649
|
askOrchestrator: (question) => this.#askOrchestrator(run, question),
|
|
634
650
|
},
|
|
651
|
+
definition: run.definition,
|
|
635
652
|
});
|
|
636
653
|
// Every segment — first launch, `continue_run_id`, steering continuation —
|
|
637
654
|
// runs under the run's own context, so they share one provider-side session.
|