@qduc/term2 0.32.2 → 0.33.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/build-info.json +2 -2
- package/dist/components/menu/ModelSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ModelSelectionMenu.js +12 -14
- package/dist/components/menu/ModelSelectionMenu.js.map +1 -1
- package/dist/lib/agent-chat-service.d.ts.map +1 -1
- package/dist/lib/agent-chat-service.js +2 -6
- package/dist/lib/agent-chat-service.js.map +1 -1
- package/dist/lib/agent-client.d.ts +2 -1
- package/dist/lib/agent-client.d.ts.map +1 -1
- package/dist/lib/agent-client.js +71 -84
- package/dist/lib/agent-client.js.map +1 -1
- package/dist/lib/agent-factory.d.ts.map +1 -1
- package/dist/lib/agent-factory.js +17 -19
- package/dist/lib/agent-factory.js.map +1 -1
- package/dist/prompts/tool-surface-guidance.js +1 -1
- package/dist/prompts/tool-surface-guidance.js.map +1 -1
- package/dist/prompts/tool-surface-guidance.ts +1 -1
- package/dist/providers/ai-sdk-anthropic.provider.d.ts.map +1 -1
- package/dist/providers/ai-sdk-anthropic.provider.js +16 -2
- package/dist/providers/ai-sdk-anthropic.provider.js.map +1 -1
- package/dist/providers/ai-sdk-google.provider.d.ts.map +1 -1
- package/dist/providers/ai-sdk-google.provider.js +16 -2
- package/dist/providers/ai-sdk-google.provider.js.map +1 -1
- package/dist/providers/ai-sdk-openrouter.provider.d.ts.map +1 -1
- package/dist/providers/ai-sdk-openrouter.provider.js +16 -1
- package/dist/providers/ai-sdk-openrouter.provider.js.map +1 -1
- package/dist/providers/ai-sdk-provider-settings.d.ts +2 -0
- package/dist/providers/ai-sdk-provider-settings.d.ts.map +1 -1
- package/dist/providers/ai-sdk-provider-settings.js +5 -0
- package/dist/providers/ai-sdk-provider-settings.js.map +1 -1
- package/dist/providers/ai-sdk-streamed-model.d.ts +3 -3
- package/dist/providers/ai-sdk-streamed-model.d.ts.map +1 -1
- package/dist/providers/ai-sdk-streamed-model.js +5 -69
- package/dist/providers/ai-sdk-streamed-model.js.map +1 -1
- package/dist/providers/anthropic-chat-caching.d.ts +5 -0
- package/dist/providers/anthropic-chat-caching.d.ts.map +1 -0
- package/dist/providers/{common/openai-compatible-messages.js → anthropic-chat-caching.js} +19 -1
- package/dist/providers/anthropic-chat-caching.js.map +1 -0
- package/dist/providers/codex.provider.js +2 -0
- package/dist/providers/codex.provider.js.map +1 -1
- package/dist/providers/custom-provider-runtime.d.ts +18 -0
- package/dist/providers/custom-provider-runtime.d.ts.map +1 -0
- package/dist/providers/custom-provider-runtime.js +26 -0
- package/dist/providers/custom-provider-runtime.js.map +1 -0
- package/dist/providers/llama-cpp.provider.d.ts +3 -0
- package/dist/providers/llama-cpp.provider.d.ts.map +1 -1
- package/dist/providers/llama-cpp.provider.js +17 -0
- package/dist/providers/llama-cpp.provider.js.map +1 -1
- package/dist/providers/neuralwatt.provider.d.ts +6 -0
- package/dist/providers/neuralwatt.provider.d.ts.map +1 -0
- package/dist/providers/neuralwatt.provider.js +8 -0
- package/dist/providers/neuralwatt.provider.js.map +1 -0
- package/dist/providers/openai-compatible-lazy.d.ts.map +1 -1
- package/dist/providers/openai-compatible-lazy.js +2 -0
- package/dist/providers/openai-compatible-lazy.js.map +1 -1
- package/dist/providers/openai-compatible-middleware.d.ts +4 -9
- package/dist/providers/openai-compatible-middleware.d.ts.map +1 -1
- package/dist/providers/openai-compatible-middleware.js +25 -48
- package/dist/providers/openai-compatible-middleware.js.map +1 -1
- package/dist/providers/openai-compatible-response-normalizer.d.ts +1 -1
- package/dist/providers/openai-compatible-response-normalizer.d.ts.map +1 -1
- package/dist/providers/openai-compatible-response-normalizer.js +6 -6
- package/dist/providers/openai-compatible-response-normalizer.js.map +1 -1
- package/dist/providers/openai-compatible.provider.d.ts +2 -32
- package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
- package/dist/providers/openai-compatible.provider.js +18 -144
- package/dist/providers/openai-compatible.provider.js.map +1 -1
- package/dist/providers/openai.provider.d.ts.map +1 -1
- package/dist/providers/openai.provider.js +1 -0
- package/dist/providers/openai.provider.js.map +1 -1
- package/dist/providers/opencode-middleware.d.ts +9 -0
- package/dist/providers/opencode-middleware.d.ts.map +1 -0
- package/dist/providers/opencode-middleware.js +15 -0
- package/dist/providers/opencode-middleware.js.map +1 -0
- package/dist/providers/opencode-model-provider.d.ts +19 -0
- package/dist/providers/opencode-model-provider.d.ts.map +1 -0
- package/dist/providers/opencode-model-provider.js +128 -0
- package/dist/providers/opencode-model-provider.js.map +1 -0
- package/dist/providers/opencode.provider.d.ts +2 -0
- package/dist/providers/opencode.provider.d.ts.map +1 -1
- package/dist/providers/opencode.provider.js +4 -0
- package/dist/providers/opencode.provider.js.map +1 -1
- package/dist/providers/openrouter-decision-models.d.ts +7 -0
- package/dist/providers/openrouter-decision-models.d.ts.map +1 -0
- package/dist/providers/openrouter-decision-models.js +31 -0
- package/dist/providers/openrouter-decision-models.js.map +1 -0
- package/dist/providers/openrouter.provider.js +2 -1
- package/dist/providers/openrouter.provider.js.map +1 -1
- package/dist/providers/orcarouter-models.d.ts +12 -0
- package/dist/providers/orcarouter-models.d.ts.map +1 -0
- package/dist/providers/orcarouter-models.js +34 -0
- package/dist/providers/orcarouter-models.js.map +1 -0
- package/dist/providers/registry.d.ts +7 -0
- package/dist/providers/registry.d.ts.map +1 -1
- package/dist/providers/registry.js.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.d.ts +20 -1
- package/dist/services/agent-runtime/application-run-loop.d.ts.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.js +871 -759
- package/dist/services/agent-runtime/application-run-loop.js.map +1 -1
- package/dist/services/agent-runtime/tool-call-execution.d.ts +1 -1
- package/dist/services/agent-runtime/tool-call-execution.d.ts.map +1 -1
- package/dist/services/agent-runtime/tool-call-execution.js +6 -3
- package/dist/services/agent-runtime/tool-call-execution.js.map +1 -1
- package/dist/services/approval/approval-flow-coordinator.d.ts +4 -2
- package/dist/services/approval/approval-flow-coordinator.d.ts.map +1 -1
- package/dist/services/approval/approval-flow-coordinator.js +2 -1
- package/dist/services/approval/approval-flow-coordinator.js.map +1 -1
- package/dist/services/approval/approval-state.d.ts +0 -13
- package/dist/services/approval/approval-state.d.ts.map +1 -1
- package/dist/services/approval/approval-state.js +0 -5
- package/dist/services/approval/approval-state.js.map +1 -1
- package/dist/services/approval/background-subagent-approval-controller.d.ts.map +1 -1
- package/dist/services/approval/background-subagent-approval-controller.js +0 -2
- package/dist/services/approval/background-subagent-approval-controller.js.map +1 -1
- package/dist/services/approval/nested-approval-owner.d.ts.map +1 -1
- package/dist/services/approval/nested-approval-owner.js +5 -1
- package/dist/services/approval/nested-approval-owner.js.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.d.ts +2 -2
- package/dist/services/approval/shell-auto-approval-resolver.d.ts.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.js +2 -2
- package/dist/services/approval/shell-auto-approval-resolver.js.map +1 -1
- package/dist/services/approval/tool-approval-batch-coordinator.d.ts +2 -2
- package/dist/services/approval/tool-approval-batch-coordinator.d.ts.map +1 -1
- package/dist/services/approval/tool-approval-batch-coordinator.js +4 -4
- package/dist/services/approval/tool-approval-batch-coordinator.js.map +1 -1
- package/dist/services/conversation/conversation-adapter.d.ts +17 -47
- package/dist/services/conversation/conversation-adapter.d.ts.map +1 -1
- package/dist/services/conversation/conversation-adapter.js +114 -88
- package/dist/services/conversation/conversation-adapter.js.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.js +48 -121
- package/dist/services/conversation/conversation-orchestrator.js.map +1 -1
- package/dist/services/conversation/conversation-record-stream.d.ts +21 -0
- package/dist/services/conversation/conversation-record-stream.d.ts.map +1 -0
- package/dist/services/conversation/conversation-record-stream.js +186 -0
- package/dist/services/conversation/conversation-record-stream.js.map +1 -0
- package/dist/services/conversation/conversation-record.d.ts +160 -0
- package/dist/services/conversation/conversation-record.d.ts.map +1 -0
- package/dist/services/conversation/conversation-record.js +371 -0
- package/dist/services/conversation/conversation-record.js.map +1 -0
- package/dist/services/conversation/conversation-result-builder.d.ts +0 -4
- package/dist/services/conversation/conversation-result-builder.d.ts.map +1 -1
- package/dist/services/conversation/conversation-result-builder.js +0 -10
- package/dist/services/conversation/conversation-result-builder.js.map +1 -1
- package/dist/services/conversation/conversation-service.d.ts +2 -1
- package/dist/services/conversation/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation/conversation-service.js +3 -0
- package/dist/services/conversation/conversation-service.js.map +1 -1
- package/dist/services/conversation-agent-client.d.ts +17 -7
- package/dist/services/conversation-agent-client.d.ts.map +1 -1
- package/dist/services/logging/conversation-logger.d.ts +1 -7
- package/dist/services/logging/conversation-logger.d.ts.map +1 -1
- package/dist/services/logging/conversation-logger.js +0 -18
- package/dist/services/logging/conversation-logger.js.map +1 -1
- package/dist/services/model-service.d.ts +2 -6
- package/dist/services/model-service.d.ts.map +1 -1
- package/dist/services/model-service.js +8 -21
- package/dist/services/model-service.js.map +1 -1
- package/dist/services/models/decision-model-listing.d.ts +2 -12
- package/dist/services/models/decision-model-listing.d.ts.map +1 -1
- package/dist/services/models/decision-model-listing.js +2 -29
- package/dist/services/models/decision-model-listing.js.map +1 -1
- package/dist/services/provider-continuity.d.ts +26 -0
- package/dist/services/provider-continuity.d.ts.map +1 -1
- package/dist/services/provider-continuity.js +47 -0
- package/dist/services/provider-continuity.js.map +1 -1
- package/dist/services/retry/recovery-executor.d.ts +3 -4
- package/dist/services/retry/recovery-executor.d.ts.map +1 -1
- package/dist/services/retry/recovery-executor.js +13 -75
- package/dist/services/retry/recovery-executor.js.map +1 -1
- package/dist/services/retry/retry-contracts.d.ts +2 -10
- package/dist/services/retry/retry-contracts.d.ts.map +1 -1
- package/dist/services/session/continuation-plan-applier.d.ts +5 -9
- package/dist/services/session/continuation-plan-applier.d.ts.map +1 -1
- package/dist/services/session/continuation-plan-applier.js +9 -43
- package/dist/services/session/continuation-plan-applier.js.map +1 -1
- package/dist/services/session/continuation-recovery-handler.d.ts +4 -6
- package/dist/services/session/continuation-recovery-handler.d.ts.map +1 -1
- package/dist/services/session/continuation-recovery-handler.js +3 -15
- package/dist/services/session/continuation-recovery-handler.js.map +1 -1
- package/dist/services/session/initial-input-preparer.d.ts +2 -2
- package/dist/services/session/initial-input-preparer.d.ts.map +1 -1
- package/dist/services/session/initial-input-preparer.js +3 -3
- package/dist/services/session/initial-input-preparer.js.map +1 -1
- package/dist/services/session/initial-turn-recovery-handler.d.ts +2 -4
- package/dist/services/session/initial-turn-recovery-handler.d.ts.map +1 -1
- package/dist/services/session/initial-turn-recovery-handler.js +4 -5
- package/dist/services/session/initial-turn-recovery-handler.js.map +1 -1
- package/dist/services/session/live-run.d.ts +9 -3
- package/dist/services/session/live-run.d.ts.map +1 -1
- package/dist/services/session/live-run.js +19 -4
- package/dist/services/session/live-run.js.map +1 -1
- package/dist/services/session/session-composition.d.ts +8 -12
- package/dist/services/session/session-composition.d.ts.map +1 -1
- package/dist/services/session/session-composition.js +41 -87
- package/dist/services/session/session-composition.js.map +1 -1
- package/dist/services/session/session-input-planner.d.ts +2 -2
- package/dist/services/session/session-input-planner.d.ts.map +1 -1
- package/dist/services/session/session-input-planner.js +6 -13
- package/dist/services/session/session-input-planner.js.map +1 -1
- package/dist/services/session/session-lifecycle.d.ts +73 -23
- package/dist/services/session/session-lifecycle.d.ts.map +1 -1
- package/dist/services/session/session-lifecycle.js +127 -45
- package/dist/services/session/session-lifecycle.js.map +1 -1
- package/dist/services/session/session-stream-processor.d.ts +4 -30
- package/dist/services/session/session-stream-processor.d.ts.map +1 -1
- package/dist/services/session/session-stream-processor.js +11 -300
- package/dist/services/session/session-stream-processor.js.map +1 -1
- package/dist/services/session/session-tool-tracker.d.ts +9 -144
- package/dist/services/session/session-tool-tracker.d.ts.map +1 -1
- package/dist/services/session/session-tool-tracker.js +17 -251
- package/dist/services/session/session-tool-tracker.js.map +1 -1
- package/dist/services/session/{turn-workflow.d.ts → session-turn-adapter.d.ts} +10 -43
- package/dist/services/session/session-turn-adapter.d.ts.map +1 -0
- package/dist/services/session/session-turn-adapter.js +734 -0
- package/dist/services/session/session-turn-adapter.js.map +1 -0
- package/dist/services/session/turn-attempt-factory.d.ts +2 -11
- package/dist/services/session/turn-attempt-factory.d.ts.map +1 -1
- package/dist/services/session/turn-attempt-factory.js +4 -12
- package/dist/services/session/turn-attempt-factory.js.map +1 -1
- package/dist/services/session/turn-attempt.d.ts +0 -3
- package/dist/services/session/turn-attempt.d.ts.map +1 -1
- package/dist/services/session/turn-attempt.js +0 -5
- package/dist/services/session/turn-attempt.js.map +1 -1
- package/dist/services/session/turn-coordinator.d.ts +3 -3
- package/dist/services/session/turn-coordinator.d.ts.map +1 -1
- package/dist/services/session/turn-coordinator.js +31 -26
- package/dist/services/session/turn-coordinator.js.map +1 -1
- package/dist/services/session/turn-projection-state.d.ts +45 -0
- package/dist/services/session/turn-projection-state.d.ts.map +1 -0
- package/dist/services/session/turn-projection-state.js +61 -0
- package/dist/services/session/turn-projection-state.js.map +1 -0
- package/dist/services/subagents/tool-policy.d.ts +5 -5
- package/dist/services/subagents/tool-policy.d.ts.map +1 -1
- package/dist/services/subagents/tool-policy.js.map +1 -1
- package/dist/tools/system/run-code/run-code-runtime.d.ts.map +1 -1
- package/dist/tools/system/run-code/run-code-runtime.js +90 -19
- package/dist/tools/system/run-code/run-code-runtime.js.map +1 -1
- package/dist/tools/system/shell.d.ts +2 -2
- package/dist/tools/system/shell.d.ts.map +1 -1
- package/dist/tools/system/shell.js +1 -0
- package/dist/tools/system/shell.js.map +1 -1
- package/dist/tools/tool-names.d.ts +1 -1
- package/dist/tools/tool-names.d.ts.map +1 -1
- package/dist/utils/ai/token-usage.js +9 -8
- package/dist/utils/ai/token-usage.js.map +1 -1
- package/package.json +1 -1
- package/dist/providers/anthropic-middleware.d.ts +0 -25
- package/dist/providers/anthropic-middleware.d.ts.map +0 -1
- package/dist/providers/anthropic-middleware.js +0 -32
- package/dist/providers/anthropic-middleware.js.map +0 -1
- package/dist/providers/common/openai-compatible-messages.d.ts +0 -2
- package/dist/providers/common/openai-compatible-messages.d.ts.map +0 -1
- package/dist/providers/common/openai-compatible-messages.js.map +0 -1
- package/dist/services/session/continuation-call-id-resolver.d.ts +0 -29
- package/dist/services/session/continuation-call-id-resolver.d.ts.map +0 -1
- package/dist/services/session/continuation-call-id-resolver.js +0 -69
- package/dist/services/session/continuation-call-id-resolver.js.map +0 -1
- package/dist/services/session/continuation-state.d.ts +0 -69
- package/dist/services/session/continuation-state.d.ts.map +0 -1
- package/dist/services/session/continuation-state.js +0 -78
- package/dist/services/session/continuation-state.js.map +0 -1
- package/dist/services/session/session-manager.d.ts +0 -87
- package/dist/services/session/session-manager.d.ts.map +0 -1
- package/dist/services/session/session-manager.js +0 -146
- package/dist/services/session/session-manager.js.map +0 -1
- package/dist/services/session/turn-workflow.d.ts.map +0 -1
- package/dist/services/session/turn-workflow.js +0 -1055
- package/dist/services/session/turn-workflow.js.map +0 -1
package/dist/build-info.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelSelectionMenu.d.ts","sourceRoot":"","sources":["../../../source/components/menu/ModelSelectionMenu.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAW,MAAM,OAAO,CAAC;AAE3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAOjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAEnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAK7E,OAAO,EAAgC,KAAK,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAYlG,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,eAAe,CAAC;IACjC,4FAA4F;IAC5F,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3B,4EAA4E;IAC5E,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,6EAA6E;IAC7E,aAAa,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;CAC3C,CAAC;AAEF,QAAA,MAAM,kBAAkB,EAAE,EAAE,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"ModelSelectionMenu.d.ts","sourceRoot":"","sources":["../../../source/components/menu/ModelSelectionMenu.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,EAAE,EAAW,MAAM,OAAO,CAAC;AAE3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAOjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAEnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAK7E,OAAO,EAAgC,KAAK,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAYlG,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,eAAe,CAAC;IACjC,4FAA4F;IAC5F,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3B,4EAA4E;IAC5E,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,6EAA6E;IAC7E,aAAa,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;CAC3C,CAAC;AAEF,QAAA,MAAM,kBAAkB,EAAE,EAAE,CAAC,KAAK,CA8PjC,CAAC;eAEa,kBAAkB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React, { useMemo } from 'react';
|
|
2
2
|
import { Box, Text } from 'ink';
|
|
3
|
-
import { getAllProviders } from '../../providers/index.js';
|
|
3
|
+
import { getAllProviders, getProvider } from '../../providers/index.js';
|
|
4
4
|
import { getAvailableProviderIds, hasProviderCredentials, resolveProviderCredentials, } from '../../utils/ai/provider-credentials.js';
|
|
5
5
|
import { useSetting } from '../../hooks/use-setting.js';
|
|
6
6
|
import { MenuContainer, MenuFooter, SelectionMarker } from '../common/MenuContainer.js';
|
|
@@ -15,6 +15,9 @@ const ModelSelectionMenu = ({ items, selectedIndex, query, provider, modelTab, l
|
|
|
15
15
|
const isFavoritesTab = modelTab === 'favorites' || provider === FAVORITES_TAB_ID;
|
|
16
16
|
const isNicknamesTab = modelTab === 'nicknames';
|
|
17
17
|
const isUnified = provider == null;
|
|
18
|
+
const showProviderColumn = isFavoritesTab || isUnified;
|
|
19
|
+
const providerLabels = useMemo(() => new Map(items.map((item) => [item.provider, getProvider(item.provider)?.label ?? item.provider])), [items]);
|
|
20
|
+
const providerColumnWidth = Math.max(0, ...Array.from(providerLabels.values(), (label) => label.length)) + 2;
|
|
18
21
|
// The footer renders from declared binding tables (menu-bindings.ts), so a
|
|
19
22
|
// hint cannot drift from the behavior the owning session implements. While
|
|
20
23
|
// a nickname draft is open the draft editor owns the input row and only the
|
|
@@ -106,19 +109,18 @@ const ModelSelectionMenu = ({ items, selectedIndex, query, provider, modelTab, l
|
|
|
106
109
|
React.createElement(MenuContainer, { items: items, selectedIndex: selectedIndex, scrollOffset: scrollOffset, maxHeight: maxHeight, title: "Select model", loading: loading && items.length === 0, loadingText: loading ? `Loading models${provider ? ` from ${provider}` : ' from all providers'}…` : 'Loading...', error: error ? `Unable to load models: ${error}` : null, fallbackText: isNicknamesTab && !query ? (React.createElement(Text, { color: theme.textSubtle }, "No nicknames yet \u2014 switch to All and press Ctrl+N on a model to name it.")) : isFavoritesTab && !query ? (React.createElement(Text, { color: theme.textSubtle }, "No favorites yet \u2014 press Ctrl+F on a model to add one.")) : (React.createElement(Text, { color: theme.textSubtle },
|
|
107
110
|
"No models match \"",
|
|
108
111
|
query || '*',
|
|
109
|
-
"\"")), footer: React.createElement(MenuFooter, { hints: bindingHints(footerBindings) }), footerOutsideBorder: true, renderItem: (item,
|
|
112
|
+
"\"")), footer: React.createElement(MenuFooter, { hints: bindingHints(footerBindings) }), footerOutsideBorder: true, renderItem: (item, actualIndex, isSelected) => {
|
|
110
113
|
const isFavorited = favoriteKeys.has(serializeFavorite(item.provider, item.id));
|
|
111
114
|
const nickname = nicknameLabels?.get(serializeFavorite(item.provider, item.id));
|
|
112
|
-
//
|
|
113
|
-
|
|
114
|
-
//
|
|
115
|
-
// provider, nickname, and display name stay intact and in order.
|
|
115
|
+
// Repeat the group label when scrolling starts partway through it.
|
|
116
|
+
const startsVisibleGroup = actualIndex === scrollOffset || items[actualIndex - 1]?.provider !== item.provider;
|
|
117
|
+
// Keep model details in one paragraph so they wrap in reading order.
|
|
116
118
|
return (React.createElement(Box, { key: `${item.provider}/${item.id}`, width: "100%" },
|
|
119
|
+
showProviderColumn && (React.createElement(Box, { width: providerColumnWidth, maxWidth: "35%", flexShrink: 0, paddingRight: 1, marginRight: 1, borderStyle: "single", borderTop: false, borderBottom: false, borderLeft: false, borderColor: theme.border },
|
|
120
|
+
React.createElement(Text, { color: theme.text, bold: true, wrap: "truncate" }, startsVisibleGroup ? providerLabels.get(item.provider) : ' '))),
|
|
117
121
|
React.createElement(SelectionMarker, { selected: isSelected }),
|
|
118
|
-
|
|
119
|
-
React.createElement(Text, { color: theme.accent, wrap: "truncate" },
|
|
120
|
-
GLYPH_FAVORITE,
|
|
121
|
-
' '))),
|
|
122
|
+
favoriteKeys.size > 0 && (React.createElement(Box, { width: 2, flexShrink: 0 },
|
|
123
|
+
React.createElement(Text, { color: theme.accent, wrap: "truncate" }, isFavorited ? `${GLYPH_FAVORITE} ` : ' '))),
|
|
122
124
|
React.createElement(Box, { flexGrow: 1, flexShrink: 1, flexBasis: 0, minWidth: 0 },
|
|
123
125
|
React.createElement(Text, null,
|
|
124
126
|
React.createElement(Text, { color: isSelected ? theme.accent : undefined, bold: isSelected }, item.id),
|
|
@@ -126,10 +128,6 @@ const ModelSelectionMenu = ({ items, selectedIndex, query, provider, modelTab, l
|
|
|
126
128
|
" \u2014 aka \"",
|
|
127
129
|
nickname,
|
|
128
130
|
"\""),
|
|
129
|
-
(isFavoritesTab || isUnified) && React.createElement(Text, { color: theme.textSubtle },
|
|
130
|
-
" (",
|
|
131
|
-
item.provider,
|
|
132
|
-
")"),
|
|
133
131
|
item.unavailableReason === 'missing-codex-login' ? (React.createElement(Text, { color: theme.warning },
|
|
134
132
|
' ',
|
|
135
133
|
"\u2014 unavailable: Not logged in on this host. Run `term2 --codex-login`.")) : item.unavailableReason === 'missing-grok-login' ? (React.createElement(Text, { color: theme.warning },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelSelectionMenu.js","sourceRoot":"","sources":["../../../source/components/menu/ModelSelectionMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAM,OAAO,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"ModelSelectionMenu.js","sourceRoot":"","sources":["../../../source/components/menu/ModelSelectionMenu.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-chat-service.d.ts","sourceRoot":"","sources":["../../source/lib/agent-chat-service.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAO9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAEhF,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAC9G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAGvE,oEAAoE;AACpE,qBAAa,gBAAiB,SAAQ,KAAK;IAC7B,QAAQ,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE;IAA7D,YAAqB,WAAW,EAAE,SAAS,gBAAgB,EAAE,EAAE,KAAK,EAAE,OAAO,EAG5E;CACF;AAED,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,MAAM,EAAE,eAAe,CAAC;IACxB,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;CAChD;AAED;;;;;;GAMG;AACH,qBAAa,gBAAgB;;IAM3B,YAAY,IAAI,EAAE,oBAAoB,EAErC;IAED,wEAAwE;IACxE,eAAe,IAAI,IAAI,CAEtB;IAED,kEAAkE;IAClE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAYvB;IAED,8DAA8D;IAC9D,KAAK,IAAI,IAAI,CAEZ;IA4EK,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,sBAA2B,GAAG,OAAO,CAAC,MAAM,CAAC,CAEjF;IAEK,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,sBAA2B,GAAG,OAAO,CAAC,qBAAqB,CAAC,
|
|
1
|
+
{"version":3,"file":"agent-chat-service.d.ts","sourceRoot":"","sources":["../../source/lib/agent-chat-service.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAO9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAEhF,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAC9G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAGvE,oEAAoE;AACpE,qBAAa,gBAAiB,SAAQ,KAAK;IAC7B,QAAQ,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE;IAA7D,YAAqB,WAAW,EAAE,SAAS,gBAAgB,EAAE,EAAE,KAAK,EAAE,OAAO,EAG5E;CACF;AAED,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,MAAM,EAAE,eAAe,CAAC;IACxB,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;CAChD;AAED;;;;;;GAMG;AACH,qBAAa,gBAAgB;;IAM3B,YAAY,IAAI,EAAE,oBAAoB,EAErC;IAED,wEAAwE;IACxE,eAAe,IAAI,IAAI,CAEtB;IAED,kEAAkE;IAClE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAYvB;IAED,8DAA8D;IAC9D,KAAK,IAAI,IAAI,CAEZ;IA4EK,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,sBAA2B,GAAG,OAAO,CAAC,MAAM,CAAC,CAEjF;IAEK,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,sBAA2B,GAAG,OAAO,CAAC,qBAAqB,CAAC,CA2FxG;IAEK,QAAQ,CACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;QACP,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;QAChD,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,UAAU,EAAE,oBAAoB,CAAC;KAClC,GACA,OAAO,CAAC,OAAO,CAAC,CAqElB;CACF"}
|
|
@@ -158,9 +158,7 @@ export class AgentChatService {
|
|
|
158
158
|
};
|
|
159
159
|
let effectiveEffort = tempEffort;
|
|
160
160
|
if (isDefaultSetting && (!effectiveEffort || effectiveEffort === 'default')) {
|
|
161
|
-
const defaultReasoningLevel = tempProvider
|
|
162
|
-
? getModelDefaultReasoningLevel('codex', tempModel)
|
|
163
|
-
: getProviderDefaultReasoningLevel(tempProvider);
|
|
161
|
+
const defaultReasoningLevel = getModelDefaultReasoningLevel(tempProvider, tempModel) ?? getProviderDefaultReasoningLevel(tempProvider);
|
|
164
162
|
if (defaultReasoningLevel) {
|
|
165
163
|
effectiveEffort = defaultReasoningLevel;
|
|
166
164
|
}
|
|
@@ -225,9 +223,7 @@ export class AgentChatService {
|
|
|
225
223
|
};
|
|
226
224
|
let effectiveEffort = tempEffort;
|
|
227
225
|
if (isDefaultSetting && (!effectiveEffort || effectiveEffort === 'default')) {
|
|
228
|
-
const defaultReasoningLevel = tempProvider
|
|
229
|
-
? getModelDefaultReasoningLevel('codex', tempModel)
|
|
230
|
-
: getProviderDefaultReasoningLevel(tempProvider);
|
|
226
|
+
const defaultReasoningLevel = getModelDefaultReasoningLevel(tempProvider, tempModel) ?? getProviderDefaultReasoningLevel(tempProvider);
|
|
231
227
|
if (defaultReasoningLevel) {
|
|
232
228
|
effectiveEffort = defaultReasoningLevel;
|
|
233
229
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-chat-service.js","sourceRoot":"","sources":["../../source/lib/agent-chat-service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"agent-chat-service.js","sourceRoot":"","sources":["../../source/lib/agent-chat-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { ConversationTurnSession } from '../services/conversation-agent-client.js';
|
|
1
2
|
import type { ModelSelection } from '../services/settings/model-selection.js';
|
|
2
3
|
import { type ApplicationAgent, type SteerOutcome } from '../services/agent-runtime/application-run-loop.js';
|
|
3
4
|
import type { ContinuationHandle } from '../contracts/continuation-handle.js';
|
|
@@ -127,7 +128,6 @@ export declare class AgentClient {
|
|
|
127
128
|
* Wire session tool-ledger dispatch marking. Called after composition creates
|
|
128
129
|
* the tracker so mid-tool stream recovery can settle as `unknown`.
|
|
129
130
|
*/
|
|
130
|
-
setOnToolDispatch(handler: ((callId: string) => void) | undefined): void;
|
|
131
131
|
setLocalCheckpointSink(sink: ((input: {
|
|
132
132
|
history: readonly ProviderInputItem[];
|
|
133
133
|
hotTail: readonly ProviderInputItem[];
|
|
@@ -234,6 +234,7 @@ export declare class AgentClient {
|
|
|
234
234
|
*/
|
|
235
235
|
rolloverRootContext(): void;
|
|
236
236
|
startStream(userInput: ProviderInput, options?: ChainedRunOptions): Promise<AgentStream>;
|
|
237
|
+
runTurn(session: ConversationTurnSession): Promise<void>;
|
|
237
238
|
continueRunStream(state: ContinuationHandle, options?: ChainedRunOptions): Promise<AgentStream>;
|
|
238
239
|
compactCodexSessionHistory(history: readonly ProviderInputItem[], signal?: AbortSignal): Promise<{
|
|
239
240
|
kind: 'unchanged';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-client.d.ts","sourceRoot":"","sources":["../../source/lib/agent-client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"agent-client.d.ts","sourceRoot":"","sources":["../../source/lib/agent-client.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/agent-client.js
CHANGED
|
@@ -79,7 +79,6 @@ export class AgentClient {
|
|
|
79
79
|
#askUserAnswerStore;
|
|
80
80
|
#isDisposed = false;
|
|
81
81
|
#toolLifecycle;
|
|
82
|
-
#onToolDispatch;
|
|
83
82
|
#localCheckpointSink;
|
|
84
83
|
#hookScope = 'root';
|
|
85
84
|
#backgroundShellRegistry;
|
|
@@ -596,7 +595,6 @@ export class AgentClient {
|
|
|
596
595
|
this.#applicationRunLoop = new ApplicationRunLoop({
|
|
597
596
|
toolLifecycle: this.#toolLifecycle,
|
|
598
597
|
...(decisionShadowObserver ? { decisionShadowObserver } : {}),
|
|
599
|
-
getOnToolDispatch: () => this.#onToolDispatch,
|
|
600
598
|
contextCompactionSessionState: this.#contextCompactionSessionState,
|
|
601
599
|
resolveMaxParallelToolCalls: () => deps.settings.get('agent.maxParallelToolCalls'),
|
|
602
600
|
logDiagnostic: (message, meta, options = {}) => {
|
|
@@ -676,9 +674,6 @@ export class AgentClient {
|
|
|
676
674
|
* Wire session tool-ledger dispatch marking. Called after composition creates
|
|
677
675
|
* the tracker so mid-tool stream recovery can settle as `unknown`.
|
|
678
676
|
*/
|
|
679
|
-
setOnToolDispatch(handler) {
|
|
680
|
-
this.#onToolDispatch = handler;
|
|
681
|
-
}
|
|
682
677
|
setLocalCheckpointSink(sink) {
|
|
683
678
|
this.#localCheckpointSink = sink;
|
|
684
679
|
}
|
|
@@ -1111,91 +1106,14 @@ export class AgentClient {
|
|
|
1111
1106
|
run: (operation) => runWithOpenAIRequestPrefixBindingScope(operation),
|
|
1112
1107
|
};
|
|
1113
1108
|
}
|
|
1114
|
-
|
|
1115
|
-
this.#subagentBridge?.resetAbortController();
|
|
1116
|
-
// Stop whatever is streaming without judging the turn's fate: a retry
|
|
1117
|
-
// restarts the stream of the turn already in progress, and the turn-ending
|
|
1118
|
-
// abort() here discarded the injections waiting for the very segment about
|
|
1119
|
-
// to start. Same distinction as continueRunStream. A genuinely new turn is
|
|
1120
|
-
// settled by the run loop instead — see its startStream and openTurn.
|
|
1121
|
-
// Allocate the controller before the first await: Codex model discovery can
|
|
1122
|
-
// suspend startStream, and this must still cancel that not-yet-started run.
|
|
1123
|
-
this.#abortActiveWork(() => this.#applicationRunLoop.abortSegment());
|
|
1124
|
-
const startController = new AbortController();
|
|
1125
|
-
this.#activeStartController = startController;
|
|
1126
|
-
if (options.sessionId)
|
|
1127
|
-
this.#lastLogicalSessionId = options.sessionId;
|
|
1128
|
-
try {
|
|
1129
|
-
await this.#prepareStart(userInput, options, startController.signal);
|
|
1130
|
-
if (startController.signal.aborted) {
|
|
1131
|
-
throw Object.assign(new Error('Operation aborted'), { name: 'AbortError' });
|
|
1132
|
-
}
|
|
1133
|
-
const provider = this.#agentConfig.getProvider();
|
|
1134
|
-
this.#agentConfig.beginTurn();
|
|
1135
|
-
const supportsChaining = this.supportsConversationChaining();
|
|
1136
|
-
const baseAgent = this.#agentConfig.getApplicationAgent(options.sessionId, options.promptCacheKey);
|
|
1137
|
-
const agent = baseAgent;
|
|
1138
|
-
const requestPreparation = this.#openAIRequestPreparation(options);
|
|
1139
|
-
const boundaryCompaction = this.#boundaryCompaction();
|
|
1140
|
-
const runBudget = this.#runBudgetPolicy();
|
|
1141
|
-
const goalStopCheck = this.#goalStopCheck();
|
|
1142
|
-
const run = () => {
|
|
1143
|
-
return this.#applicationRunLoop.startStream(agent, userInput, {
|
|
1144
|
-
requestInputLimit: () => this.#settings.get('agent.maxRequestInputTokens'),
|
|
1145
|
-
...(boundaryCompaction ? { boundaryCompaction } : {}),
|
|
1146
|
-
...(requestPreparation ? { requestPreparation } : {}),
|
|
1147
|
-
...(supportsChaining && options.previousResponseId && !options.disableChainingForAttempt
|
|
1148
|
-
? { previousResponseId: options.previousResponseId }
|
|
1149
|
-
: {}),
|
|
1150
|
-
...(options.providerHistorySnapshot ? { compactionHistory: options.providerHistorySnapshot.history } : {}),
|
|
1151
|
-
...(options.disableChainingForAttempt ? { disableChainingForAttempt: true } : {}),
|
|
1152
|
-
...(options.recoveryBudget ? { recoveryBudget: options.recoveryBudget } : {}),
|
|
1153
|
-
providerId: provider,
|
|
1154
|
-
supportsConversationChaining: supportsChaining,
|
|
1155
|
-
sessionId: options.sessionId,
|
|
1156
|
-
turnId: options.hookTurnId,
|
|
1157
|
-
hookScope: this.#hookScope,
|
|
1158
|
-
...(options.sessionId ? { context: { sessionId: options.sessionId } } : {}),
|
|
1159
|
-
maxTurns: this.#maxTurns,
|
|
1160
|
-
runBudget,
|
|
1161
|
-
...(this.#wrapUpOnCriticalRunBudget ? { wrapUpOnCriticalRunBudget: true } : {}),
|
|
1162
|
-
...(options.onRunBudgetEvent ? { onRunBudgetEvent: options.onRunBudgetEvent } : {}),
|
|
1163
|
-
onRequestBoundary: (history, onReminder, observation) => {
|
|
1164
|
-
if (observation.compactionSkipReason) {
|
|
1165
|
-
this.#logger.debug('Automatic context compaction skipped without aligned chained history', {
|
|
1166
|
-
reason: observation.compactionSkipReason,
|
|
1167
|
-
measuredInputTokens: observation.lastCompletedInputTokens ?? 0,
|
|
1168
|
-
});
|
|
1169
|
-
}
|
|
1170
|
-
return this.#observeContextMilestones(history, onReminder, observation.lastCompletedInputTokens);
|
|
1171
|
-
},
|
|
1172
|
-
...(goalStopCheck ? { onNormalStop: goalStopCheck } : {}),
|
|
1173
|
-
});
|
|
1174
|
-
};
|
|
1175
|
-
const stream = run();
|
|
1176
|
-
this.#activeStartController = null;
|
|
1177
|
-
this.#observeCompletion(stream, userInput, provider, this.#agentConfig.getModel());
|
|
1178
|
-
return stream;
|
|
1179
|
-
}
|
|
1180
|
-
catch (error) {
|
|
1181
|
-
if (this.#activeStartController === startController)
|
|
1182
|
-
this.#activeStartController = null;
|
|
1183
|
-
throw error;
|
|
1184
|
-
}
|
|
1185
|
-
}
|
|
1186
|
-
async continueRunStream(state, options = {}) {
|
|
1187
|
-
this.#subagentBridge?.resetAbortController();
|
|
1188
|
-
// The turn is resuming, not ending: keep anything waiting for this segment.
|
|
1189
|
-
this.#abortActiveWork(() => this.#applicationRunLoop.abortSegment());
|
|
1109
|
+
#applicationOptions(options) {
|
|
1190
1110
|
const provider = this.#agentConfig.getProvider();
|
|
1191
|
-
if (options.sessionId)
|
|
1192
|
-
this.#lastLogicalSessionId = options.sessionId;
|
|
1193
1111
|
const supportsChaining = this.supportsConversationChaining();
|
|
1194
1112
|
const requestPreparation = this.#openAIRequestPreparation(options);
|
|
1195
1113
|
const boundaryCompaction = this.#boundaryCompaction();
|
|
1196
1114
|
const runBudget = this.#runBudgetPolicy();
|
|
1197
1115
|
const goalStopCheck = this.#goalStopCheck();
|
|
1198
|
-
|
|
1116
|
+
return {
|
|
1199
1117
|
requestInputLimit: () => this.#settings.get('agent.maxRequestInputTokens'),
|
|
1200
1118
|
...(boundaryCompaction ? { boundaryCompaction } : {}),
|
|
1201
1119
|
...(requestPreparation ? { requestPreparation } : {}),
|
|
@@ -1210,6 +1128,7 @@ export class AgentClient {
|
|
|
1210
1128
|
sessionId: options.sessionId,
|
|
1211
1129
|
turnId: options.hookTurnId,
|
|
1212
1130
|
hookScope: this.#hookScope,
|
|
1131
|
+
...(options.sessionId ? { context: { sessionId: options.sessionId } } : {}),
|
|
1213
1132
|
maxTurns: this.#maxTurns,
|
|
1214
1133
|
runBudget,
|
|
1215
1134
|
...(this.#wrapUpOnCriticalRunBudget ? { wrapUpOnCriticalRunBudget: true } : {}),
|
|
@@ -1225,7 +1144,75 @@ export class AgentClient {
|
|
|
1225
1144
|
},
|
|
1226
1145
|
...(options.stopAfterApprovalResolution ? { stopAfterApprovalResolution: true } : {}),
|
|
1227
1146
|
...(goalStopCheck ? { onNormalStop: goalStopCheck } : {}),
|
|
1147
|
+
};
|
|
1148
|
+
}
|
|
1149
|
+
async #prepareApplicationTurn(userInput, options = {}) {
|
|
1150
|
+
this.#subagentBridge?.resetAbortController();
|
|
1151
|
+
// Stop whatever is streaming without judging the turn's fate: a retry
|
|
1152
|
+
// restarts the stream of the turn already in progress, and the turn-ending
|
|
1153
|
+
// abort() here discarded the injections waiting for the very segment about
|
|
1154
|
+
// to start. Same distinction as continueRunStream. A genuinely new turn is
|
|
1155
|
+
// settled by the run loop instead — see its startStream and openTurn.
|
|
1156
|
+
// Allocate the controller before the first await: Codex model discovery can
|
|
1157
|
+
// suspend startStream, and this must still cancel that not-yet-started run.
|
|
1158
|
+
this.#abortActiveWork(() => this.#applicationRunLoop.abortSegment());
|
|
1159
|
+
const startController = new AbortController();
|
|
1160
|
+
this.#activeStartController = startController;
|
|
1161
|
+
if (options.sessionId)
|
|
1162
|
+
this.#lastLogicalSessionId = options.sessionId;
|
|
1163
|
+
try {
|
|
1164
|
+
await this.#prepareStart(userInput, options, startController.signal);
|
|
1165
|
+
if (startController.signal.aborted) {
|
|
1166
|
+
throw Object.assign(new Error('Operation aborted'), { name: 'AbortError' });
|
|
1167
|
+
}
|
|
1168
|
+
this.#agentConfig.beginTurn();
|
|
1169
|
+
const agent = this.#agentConfig.getApplicationAgent(options.sessionId, options.promptCacheKey);
|
|
1170
|
+
this.#activeStartController = null;
|
|
1171
|
+
return { agent, input: userInput, options: this.#applicationOptions(options) };
|
|
1172
|
+
}
|
|
1173
|
+
catch (error) {
|
|
1174
|
+
if (this.#activeStartController === startController)
|
|
1175
|
+
this.#activeStartController = null;
|
|
1176
|
+
throw error;
|
|
1177
|
+
}
|
|
1178
|
+
}
|
|
1179
|
+
async startStream(userInput, options = {}) {
|
|
1180
|
+
const start = await this.#prepareApplicationTurn(userInput, options);
|
|
1181
|
+
const stream = this.#applicationRunLoop.startStream(start.agent, start.input, start.options);
|
|
1182
|
+
this.#observeCompletion(stream, userInput, this.#agentConfig.getProvider(), this.#agentConfig.getModel());
|
|
1183
|
+
return stream;
|
|
1184
|
+
}
|
|
1185
|
+
async runTurn(session) {
|
|
1186
|
+
await this.#applicationRunLoop.runTurn({
|
|
1187
|
+
prepare: async (signal) => {
|
|
1188
|
+
const start = await session.prepare(signal);
|
|
1189
|
+
if (!start)
|
|
1190
|
+
return undefined;
|
|
1191
|
+
const prepared = await this.#prepareApplicationTurn(start.input, start.options);
|
|
1192
|
+
return prepared;
|
|
1193
|
+
},
|
|
1194
|
+
beginSegment: (stream) => session.beginSegment(stream),
|
|
1195
|
+
acceptEvent: (event) => session.acceptEvent(event),
|
|
1196
|
+
acceptToolDispatch: (callId) => session.acceptToolDispatch(callId),
|
|
1197
|
+
acceptSegment: (stream) => session.acceptSegment(stream),
|
|
1198
|
+
completed: (stream) => session.completed(stream),
|
|
1199
|
+
consume: async (stream) => {
|
|
1200
|
+
this.#observeCompletion(stream, stream.state, this.#agentConfig.getProvider(), this.#agentConfig.getModel());
|
|
1201
|
+
await session.consume(stream);
|
|
1202
|
+
},
|
|
1203
|
+
interrupted: async (stream) => this.#applicationOptions(await session.interrupted(stream)),
|
|
1204
|
+
recover: (error) => session.recover(error),
|
|
1228
1205
|
});
|
|
1206
|
+
}
|
|
1207
|
+
async continueRunStream(state, options = {}) {
|
|
1208
|
+
this.#subagentBridge?.resetAbortController();
|
|
1209
|
+
// Reconnect to the suspended task. Transport cleanup may reset client
|
|
1210
|
+
// bookkeeping, but aborting the loop here would destroy its approval wait.
|
|
1211
|
+
this.#abortActiveWork(() => undefined);
|
|
1212
|
+
const provider = this.#agentConfig.getProvider();
|
|
1213
|
+
if (options.sessionId)
|
|
1214
|
+
this.#lastLogicalSessionId = options.sessionId;
|
|
1215
|
+
const stream = this.#applicationRunLoop.continueRunStream(state, this.#applicationOptions(options));
|
|
1229
1216
|
this.#observeCompletion(stream, state, provider, this.#agentConfig.getModel());
|
|
1230
1217
|
return stream;
|
|
1231
1218
|
}
|