@pentoshi/clai 4.11.26 → 4.11.27
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/compaction/summary-execution.js +11 -1
- package/dist/agent/compaction/summary-execution.js.map +1 -1
- package/dist/agent/context-manager.d.ts +0 -1
- package/dist/agent/context-manager.js +0 -1
- package/dist/agent/context-manager.js.map +1 -1
- package/dist/agent/events.d.ts +1 -5
- package/dist/agent/plan/actions/plan-clear.js +1 -1
- package/dist/agent/plan/actions/plan-clear.js.map +1 -1
- package/dist/agent/plan/actions/plan-create.js +38 -17
- package/dist/agent/plan/actions/plan-create.js.map +1 -1
- package/dist/agent/plan/actions/task-add.js +15 -4
- package/dist/agent/plan/actions/task-add.js.map +1 -1
- package/dist/agent/plan/actions/task-move.js +16 -5
- package/dist/agent/plan/actions/task-move.js.map +1 -1
- package/dist/agent/plan/handle-plan-tool.js +20 -6
- package/dist/agent/plan/handle-plan-tool.js.map +1 -1
- package/dist/agent/reliability-policy.d.ts +0 -10
- package/dist/agent/reliability-policy.js +0 -23
- package/dist/agent/reliability-policy.js.map +1 -1
- package/dist/agent/request-accounting.js +10 -10
- package/dist/agent/request-accounting.js.map +1 -1
- package/dist/agent/request-budget.d.ts +11 -18
- package/dist/agent/request-budget.js +14 -53
- package/dist/agent/request-budget.js.map +1 -1
- package/dist/agent/runner.js +16 -12
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/stream-recovery.d.ts +1 -2
- package/dist/agent/stream-recovery.js +5 -10
- package/dist/agent/stream-recovery.js.map +1 -1
- package/dist/agent/subagents/worker.js +3 -2
- package/dist/agent/subagents/worker.js.map +1 -1
- package/dist/agent/turn/automatic-compaction-execution.js +2 -2
- package/dist/agent/turn/automatic-compaction-execution.js.map +1 -1
- package/dist/agent/turn/compaction-admission.d.ts +2 -2
- package/dist/agent/turn/compaction-admission.js +14 -17
- package/dist/agent/turn/compaction-admission.js.map +1 -1
- package/dist/agent/turn/compaction-coordinator.d.ts +2 -1
- package/dist/agent/turn/compaction-coordinator.js +12 -7
- package/dist/agent/turn/compaction-coordinator.js.map +1 -1
- package/dist/agent/turn/compaction-durable-envelope.js +1 -1
- package/dist/agent/turn/compaction-durable-envelope.js.map +1 -1
- package/dist/agent/turn/compaction-replay-selection.js +2 -3
- package/dist/agent/turn/compaction-replay-selection.js.map +1 -1
- package/dist/agent/turn/compaction-summarizer.js +1 -1
- package/dist/agent/turn/compaction-summarizer.js.map +1 -1
- package/dist/agent/turn/loop/answer-path.js +2 -2
- package/dist/agent/turn/loop/answer-path.js.map +1 -1
- package/dist/agent/turn/loop/completion-interpretation.d.ts +0 -1
- package/dist/agent/turn/loop/completion-interpretation.js +2 -7
- package/dist/agent/turn/loop/completion-interpretation.js.map +1 -1
- package/dist/agent/turn/loop/deps.d.ts +1 -0
- package/dist/agent/turn/loop/empty-response.d.ts +1 -1
- package/dist/agent/turn/loop/empty-response.js +2 -4
- package/dist/agent/turn/loop/empty-response.js.map +1 -1
- package/dist/agent/turn/loop/output-budget.d.ts +0 -1
- package/dist/agent/turn/loop/output-budget.js +4 -9
- package/dist/agent/turn/loop/output-budget.js.map +1 -1
- package/dist/agent/turn/loop/request-assembly.d.ts +1 -3
- package/dist/agent/turn/loop/request-assembly.js +15 -15
- package/dist/agent/turn/loop/request-assembly.js.map +1 -1
- package/dist/agent/turn/loop/round-request.js +1 -6
- package/dist/agent/turn/loop/round-request.js.map +1 -1
- package/dist/agent/turn/loop/run-rounds.js +9 -15
- package/dist/agent/turn/loop/run-rounds.js.map +1 -1
- package/dist/agent/turn/loop/state.d.ts +2 -3
- package/dist/agent/turn/loop/state.js +1 -2
- package/dist/agent/turn/loop/state.js.map +1 -1
- package/dist/agent/turn/loop/stream-failure.d.ts +0 -1
- package/dist/agent/turn/loop/stream-failure.js +5 -5
- package/dist/agent/turn/loop/stream-failure.js.map +1 -1
- package/dist/agent/turn/loop/stream-request.d.ts +0 -1
- package/dist/agent/turn/loop/stream-request.js +1 -3
- package/dist/agent/turn/loop/stream-request.js.map +1 -1
- package/dist/agent/turn/plan-persistence.d.ts +4 -5
- package/dist/agent/turn/plan-persistence.js +13 -4
- package/dist/agent/turn/plan-persistence.js.map +1 -1
- package/dist/agent/turn/provider-measurement.d.ts +6 -0
- package/dist/agent/turn/provider-measurement.js +19 -0
- package/dist/agent/turn/provider-measurement.js.map +1 -0
- package/dist/agent/turn/responder-job-linkage.js +2 -2
- package/dist/agent/turn/responder-job-linkage.js.map +1 -1
- package/dist/agent/turn/setup/compaction-services.d.ts +2 -1
- package/dist/agent/turn/setup/compaction-services.js +2 -1
- package/dist/agent/turn/setup/compaction-services.js.map +1 -1
- package/dist/agent/turn/setup/task-gate-setup.d.ts +3 -3
- package/dist/agent/turn/setup/task-gate-setup.js.map +1 -1
- package/dist/agent/turn/task-autostart.d.ts +2 -2
- package/dist/agent/turn/task-autostart.js +7 -9
- package/dist/agent/turn/task-autostart.js.map +1 -1
- package/dist/agent/turn/task-credit.d.ts +2 -2
- package/dist/agent/turn/task-credit.js +8 -5
- package/dist/agent/turn/task-credit.js.map +1 -1
- package/dist/agent/turn/tool-execution/deps.d.ts +3 -3
- package/dist/agent/turn/tool-execution/dispatch.js +3 -5
- package/dist/agent/turn/tool-execution/dispatch.js.map +1 -1
- package/dist/agent/turn/tool-execution/meta-tools.d.ts +1 -1
- package/dist/agent/turn/tool-execution/meta-tools.js +13 -11
- package/dist/agent/turn/tool-execution/meta-tools.js.map +1 -1
- package/dist/agent/turn/tool-execution/plan-tool-ledger.d.ts +2 -2
- package/dist/agent/turn/tool-execution/plan-tool-ledger.js +6 -6
- package/dist/agent/turn/tool-execution/plan-tool-ledger.js.map +1 -1
- package/dist/agent/turn/tool-execution/result-framing.d.ts +1 -1
- package/dist/agent/turn/tool-execution/result-framing.js +1 -2
- package/dist/agent/turn/tool-execution/result-framing.js.map +1 -1
- package/dist/agent/turn/tool-execution/single-tool.js +28 -16
- package/dist/agent/turn/tool-execution/single-tool.js.map +1 -1
- package/dist/app/adapters/agent-event-adapter.js +7 -7
- package/dist/app/adapters/agent-event-adapter.js.map +1 -1
- package/dist/app/controllers/plan-controller.js +4 -1
- package/dist/app/controllers/plan-controller.js.map +1 -1
- package/dist/app/controllers/session-compact-helper.js +11 -8
- package/dist/app/controllers/session-compact-helper.js.map +1 -1
- package/dist/app/controllers/session-context-usage.d.ts +6 -4
- package/dist/app/controllers/session-context-usage.js +94 -33
- package/dist/app/controllers/session-context-usage.js.map +1 -1
- package/dist/app/controllers/session-controller.d.ts +5 -6
- package/dist/app/controllers/session-controller.js +48 -40
- package/dist/app/controllers/session-controller.js.map +1 -1
- package/dist/app/controllers/session-responder.d.ts +2 -0
- package/dist/app/controllers/session-responder.js +18 -0
- package/dist/app/controllers/session-responder.js.map +1 -1
- package/dist/app/events/app-event.d.ts +3 -5
- package/dist/app/events/app-event.js.map +1 -1
- package/dist/classic/panels/pager-panel.js +3 -2
- package/dist/classic/panels/pager-panel.js.map +1 -1
- package/dist/commands/providers.d.ts +2 -0
- package/dist/commands/providers.js +49 -7
- package/dist/commands/providers.js.map +1 -1
- package/dist/llm/anthropic.d.ts +1 -0
- package/dist/llm/anthropic.js +20 -21
- package/dist/llm/anthropic.js.map +1 -1
- package/dist/llm/capabilities.d.ts +1 -4
- package/dist/llm/capabilities.js +24 -19
- package/dist/llm/capabilities.js.map +1 -1
- package/dist/llm/capability/state.js +0 -17
- package/dist/llm/capability/state.js.map +1 -1
- package/dist/llm/catalog-facts.js +40 -11
- package/dist/llm/catalog-facts.js.map +1 -1
- package/dist/llm/catalog-prefetch.js +9 -6
- package/dist/llm/catalog-prefetch.js.map +1 -1
- package/dist/llm/context-snapshot.d.ts +7 -3
- package/dist/llm/context-snapshot.js +35 -14
- package/dist/llm/context-snapshot.js.map +1 -1
- package/dist/llm/context-windows.d.ts +16 -0
- package/dist/llm/context-windows.js +54 -19
- package/dist/llm/context-windows.js.map +1 -1
- package/dist/llm/custom-providers.js +5 -4
- package/dist/llm/custom-providers.js.map +1 -1
- package/dist/llm/explabs.js +35 -26
- package/dist/llm/explabs.js.map +1 -1
- package/dist/llm/free.d.ts +1 -1
- package/dist/llm/free.js +26 -18
- package/dist/llm/free.js.map +1 -1
- package/dist/llm/gemini.js +25 -12
- package/dist/llm/gemini.js.map +1 -1
- package/dist/llm/kiro-auth.d.ts +34 -3
- package/dist/llm/kiro-auth.js +315 -144
- package/dist/llm/kiro-auth.js.map +1 -1
- package/dist/llm/kiro-import-sources.d.ts +10 -0
- package/dist/llm/kiro-import-sources.js +117 -0
- package/dist/llm/kiro-import-sources.js.map +1 -0
- package/dist/llm/kiro-reasoning.d.ts +28 -0
- package/dist/llm/kiro-reasoning.js +150 -0
- package/dist/llm/kiro-reasoning.js.map +1 -0
- package/dist/llm/kiro-social-device.d.ts +21 -0
- package/dist/llm/kiro-social-device.js +101 -0
- package/dist/llm/kiro-social-device.js.map +1 -0
- package/dist/llm/kiro.d.ts +3 -1
- package/dist/llm/kiro.js +653 -187
- package/dist/llm/kiro.js.map +1 -1
- package/dist/llm/learned-capabilities.js +1 -3
- package/dist/llm/learned-capabilities.js.map +1 -1
- package/dist/llm/merge-gateway.js +18 -13
- package/dist/llm/merge-gateway.js.map +1 -1
- package/dist/llm/model-limit-store.d.ts +15 -0
- package/dist/llm/model-limit-store.js +121 -0
- package/dist/llm/model-limit-store.js.map +1 -0
- package/dist/llm/nvidia.d.ts +1 -0
- package/dist/llm/nvidia.js +15 -17
- package/dist/llm/nvidia.js.map +1 -1
- package/dist/llm/ollama-model-limits.d.ts +4 -0
- package/dist/llm/ollama-model-limits.js +91 -0
- package/dist/llm/ollama-model-limits.js.map +1 -0
- package/dist/llm/ollama.js +2 -1
- package/dist/llm/ollama.js.map +1 -1
- package/dist/llm/orcarouter.d.ts +1 -0
- package/dist/llm/orcarouter.js +8 -1
- package/dist/llm/orcarouter.js.map +1 -1
- package/dist/llm/provider-context-usage.d.ts +9 -0
- package/dist/llm/provider-context-usage.js +39 -0
- package/dist/llm/provider-context-usage.js.map +1 -0
- package/dist/llm/qwen-cloud.d.ts +1 -0
- package/dist/llm/qwen-cloud.js +44 -9
- package/dist/llm/qwen-cloud.js.map +1 -1
- package/dist/llm/reasoning-errors.d.ts +1 -0
- package/dist/llm/reasoning-errors.js +6 -0
- package/dist/llm/reasoning-errors.js.map +1 -1
- package/dist/llm/routing/attempt-complete.js +9 -2
- package/dist/llm/routing/attempt-complete.js.map +1 -1
- package/dist/llm/routing/attempt-request.d.ts +1 -0
- package/dist/llm/routing/attempt-request.js +23 -0
- package/dist/llm/routing/attempt-request.js.map +1 -1
- package/dist/llm/routing/attempt-stream.js +15 -2
- package/dist/llm/routing/attempt-stream.js.map +1 -1
- package/dist/llm/token-estimate-calibration.js +1 -2
- package/dist/llm/token-estimate-calibration.js.map +1 -1
- package/dist/llm/token-usage.d.ts +2 -0
- package/dist/llm/token-usage.js +1 -1
- package/dist/llm/token-usage.js.map +1 -1
- package/dist/llm/wire/anthropic-model-catalog.d.ts +1 -0
- package/dist/llm/wire/anthropic-model-catalog.js +30 -0
- package/dist/llm/wire/anthropic-model-catalog.js.map +1 -0
- package/dist/llm/wire/dashscope-model-catalog.d.ts +1 -0
- package/dist/llm/wire/dashscope-model-catalog.js +53 -0
- package/dist/llm/wire/dashscope-model-catalog.js.map +1 -0
- package/dist/llm/wire/orcarouter-model-catalog.d.ts +2 -0
- package/dist/llm/wire/orcarouter-model-catalog.js +91 -0
- package/dist/llm/wire/orcarouter-model-catalog.js.map +1 -0
- package/dist/noninteractive/stream-blocks.d.ts +0 -3
- package/dist/noninteractive/stream-blocks.js +0 -9
- package/dist/noninteractive/stream-blocks.js.map +1 -1
- package/dist/noninteractive/stream-renderer.js +1 -4
- package/dist/noninteractive/stream-renderer.js.map +1 -1
- package/dist/store/config/endpoints.d.ts +0 -6
- package/dist/store/config/endpoints.js +1 -35
- package/dist/store/config/endpoints.js.map +1 -1
- package/dist/store/context-limits.d.ts +4 -0
- package/dist/store/context-limits.js +29 -0
- package/dist/store/context-limits.js.map +1 -0
- package/dist/store/plan/jsonl-backend.js +1 -4
- package/dist/store/plan/jsonl-backend.js.map +1 -1
- package/dist/store/plan/mutation.js +31 -1
- package/dist/store/plan/mutation.js.map +1 -1
- package/dist/store/plan/sqlite-backend.js +27 -9
- package/dist/store/plan/sqlite-backend.js.map +1 -1
- package/dist/tui-v2/components/pager/pager-line.d.ts +2 -0
- package/dist/tui-v2/components/pager/pager-line.js +1 -2
- package/dist/tui-v2/components/pager/pager-line.js.map +1 -1
- package/dist/tui-v2/components/pager/pager.js +5 -2
- package/dist/tui-v2/components/pager/pager.js.map +1 -1
- package/dist/tui-v2/components/transcript/tool-card.js +1 -1
- package/dist/tui-v2/components/transcript/tool-card.js.map +1 -1
- package/dist/types.d.ts +3 -1
- package/dist/types.js.map +1 -1
- package/dist/ui-core/bootstrap/composition-root.js +8 -5
- package/dist/ui-core/bootstrap/composition-root.js.map +1 -1
- package/dist/ui-core/bootstrap/session-resume.js +1 -2
- package/dist/ui-core/bootstrap/session-resume.js.map +1 -1
- package/dist/ui-core/commands/key-commands.d.ts +2 -0
- package/dist/ui-core/commands/key-commands.js +76 -20
- package/dist/ui-core/commands/key-commands.js.map +1 -1
- package/dist/ui-core/commands/session-commands.js +33 -9
- package/dist/ui-core/commands/session-commands.js.map +1 -1
- package/dist/ui-core/rendering/batch-sections.js +10 -1
- package/dist/ui-core/rendering/batch-sections.js.map +1 -1
- package/dist/ui-core/rendering/context-limit.d.ts +0 -1
- package/dist/ui-core/rendering/context-limit.js +2 -2
- package/dist/ui-core/rendering/context-limit.js.map +1 -1
- package/dist/ui-core/rendering/subagent-presentation.d.ts +2 -0
- package/dist/ui-core/rendering/subagent-presentation.js +20 -7
- package/dist/ui-core/rendering/subagent-presentation.js.map +1 -1
- package/dist/ui-core/rendering/subagent-source.js +15 -8
- package/dist/ui-core/rendering/subagent-source.js.map +1 -1
- package/dist/ui-core/state/transcript/apply-app-event.js +0 -1
- package/dist/ui-core/state/transcript/apply-app-event.js.map +1 -1
- package/dist/ui-core/state/transcript-types.js +1 -1
- package/dist/ui-core/state/transcript-types.js.map +1 -1
- package/dist/version.generated.d.ts +2 -2
- package/dist/version.generated.js +2 -2
- package/package.json +1 -1
- package/dist/app/controllers/session-context-limits.d.ts +0 -8
- package/dist/app/controllers/session-context-limits.js +0 -35
- package/dist/app/controllers/session-context-limits.js.map +0 -1
- package/dist/store/config/compaction.d.ts +0 -1
- package/dist/store/config/compaction.js +0 -2
- package/dist/store/config/compaction.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-recovery.js","sourceRoot":"","sources":["../../src/agent/stream-recovery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,yBAAyB,EACzB,sBAAsB,GACvB,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"stream-recovery.js","sourceRoot":"","sources":["../../src/agent/stream-recovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { realpath, stat } from "node:fs/promises";
|
|
2
2
|
import { resolveToolDialect } from "../../llm/capability/tool-dialect.js";
|
|
3
|
-
import {
|
|
3
|
+
import { effectiveContextWindowTokens, modelMaxOutputTokens } from "../../llm/context-windows.js";
|
|
4
4
|
import { lowestReasoningPreference } from "../../llm/lowest-reasoning.js";
|
|
5
5
|
import { streamWithProvider } from "../../llm/router.js";
|
|
6
6
|
import { markStreamEmittedBytes } from "../../llm/stream-progress.js";
|
|
7
7
|
import { withSessionAffinity } from "../../llm/session-affinity.js";
|
|
8
|
+
import { customContextLimit } from "../../store/context-limits.js";
|
|
8
9
|
import { SUBAGENT_LIMITS } from "../../store/subagents.js";
|
|
9
10
|
import { runToolCall } from "../../tools/registry.js";
|
|
10
11
|
import { estimateMessagesTokens, estimateToolSchemaTokens, RESERVED_OUTPUT_TOKENS } from "../request-accounting.js";
|
|
@@ -119,7 +120,7 @@ async function runAttempt({ run, emit, checkpoint, saveCheckpoint, saveSummary,
|
|
|
119
120
|
pending = { ...pending, native };
|
|
120
121
|
}
|
|
121
122
|
activeRouteIndex = index;
|
|
122
|
-
contextLimit =
|
|
123
|
+
contextLimit = effectiveContextWindowTokens(route.provider, route.model, customContextLimit(route.provider, route.model));
|
|
123
124
|
outputLimit = modelMaxOutputTokens(route.provider, route.model) ?? RESERVED_OUTPUT_TOKENS;
|
|
124
125
|
compactionReserve = Math.min(4096, outputLimit, Math.floor(contextLimit / 8));
|
|
125
126
|
contextMargin = Math.min(2048, Math.floor(contextLimit / 16));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/agent/subagents/worker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/agent/subagents/worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAE,4BAA4B,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAClG,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACpH,OAAO,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAChH,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,wBAAwB,GAEzB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,aAAa,GAAG;;slBAEgkB,CAAC;AAEvlB,MAAM,kBAAkB,GAAG,eAAe,CAAC,MAAM,CAAC;AAElD,MAAM,eAAe,GAAG,8LAA8L,CAAC;AAEvN,KAAK,UAAU,eAAe,CAAI,MAAmB,EAAE,SAA2B;IAChF,MAAM,CAAC,cAAc,EAAE,CAAC;IACxB,IAAI,CAAC;QACH,OAAO,MAAM,SAAS,EAAE,CAAC;IAC3B,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,IAAY;IAC/B,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,8BAA8B,CAAC,CAAC,CAAC;IAClE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,GAAa,CAAC;QAClB,IAAI,CAAC;YAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAE,CAAa,CAAC;QAAC,CAAC;QAChD,MAAM,CAAC;YAAC,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QAAC,CAAC;QAC3E,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACpG,MAAM,IAAI,KAAK,CAAC,gBAAgB,GAAG,EAAE,IAAI,IAAI,cAAc,2BAA2B,CAAC,CAAC;QAC1F,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,MAAM,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IAC1I,CAAC;IACD,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,IAAI,0BAA0B,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;IACrJ,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,cAAc,CAAC,GAA+B,EAAE,QAAgB;IACvE,MAAM,MAAM,GAAG,4RAA4R,CAAC;IAC5S,IAAI,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAiB;gBACnF,IAAI,EAAE,+BAA+B,GAAG,CAAC,gBAAgB,CAAC,OAAO,KAAK,GAAG,CAAC,gBAAgB,CAAC,MAAM,OAAO,GAAG,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAClJ,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACjD,IAAI,SAAS,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,CAAC,MAAc,EAAU,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAC5H,OAAO,GAAG,GAAG,IAAI,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC3C,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,SAAS;gBAAE,GAAG,GAAG,MAAM,CAAC;;gBACvC,IAAI,GAAG,MAAM,GAAG,CAAC,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,CAAC;QACpB,SAAS,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACb,OAAO,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,eAAe,CAAC,QAA0B;IACjD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,iIAAiI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;AAChM,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAuB,EAAE,MAAmB;IACzJ,MAAM,CAAC,cAAc,EAAE,CAAC;IACxB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAC1F,MAAM,UAAU,GAAyB,UAAU,EAAE,MAAM;QACzD,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC;QACjB,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,eAAe,CAAC,eAAe,CAAC,CAAC;IAC/C,IAAI,MAAM,GAAG,UAAU,EAAE,WAAW,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,CAAC;IACvH,MAAM,QAAQ,GAAkB,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5F,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,WAAW,GAAG,sBAAsB,CAAC;IACzC,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAC1B,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,IAAI,YAAY,GAAG,UAAU,EAAE,YAAY,CAAC;IAC5C,IAAI,OAAO,GAAG,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACpF,MAAM,cAAc,GAAG,QAAQ,IAAI,UAAU,EAAE,eAAe,CAAC;IAC/D,IAAI,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,GAAG,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IACvH,MAAM,eAAe,GAAG,GAAG,CAAC,QAAQ,IAAI,eAAe,CAAC;IACxD,MAAM,aAAa,GAAG,CAAC,WAAoB,EAAe,EAAE,CAAC,CAAC;QAC5D,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,aAAa,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,eAAe,8BAA8B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;KACxH,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,CAAC,KAAyB,EAAE,KAAa,EAAQ,EAAE;QACtE,MAAM,WAAW,GAAG,UAAU,EAAE,WAAW,KAAK,SAAS,IAAI,CAAC,UAAU,EAAE,MAAM,IAAI,KAAK,KAAK,CAAC;YAC7F,CAAC,CAAC,UAAU,CAAC,WAAW;YACxB,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC;QAC/D,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,GAAG,WAAW,CAAC;YACrB,QAAQ,CAAC,IAAI,CACX,aAAa,CAAC,MAAM,CAAC,EACrB,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,CACvG,CAAC;QACJ,CAAC;aAAM,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;YAClC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,EAAE,GAAG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;YAC5F,MAAM,GAAG,WAAW,CAAC;YACrB,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,QAAQ;gBAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,OAAO;gBAAE,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,CAAC;QAChD,CAAC;QACD,gBAAgB,GAAG,KAAK,CAAC;QACzB,YAAY,GAAG,4BAA4B,CACzC,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,KAAK,EACX,kBAAkB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAChD,CAAC;QACF,WAAW,GAAG,oBAAoB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,sBAAsB,CAAC;QAC1F,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC;QAC9E,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC,CAAC;QAC9D,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,aAAa,GAAG,YAAY,GAAG,CAAC,GAAG,iBAAiB,GAAG,aAAa,GAAG,CAAC,CAAC;QACzE,SAAS,EAAE,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC,CAAC;IACF,YAAY,CAAC,UAAU,CAAC,CAAC,CAAE,EAAE,CAAC,CAAC,CAAC;IAChC,MAAM,QAAQ,GAAG,GAAW,EAAE,CAAC,sBAAsB,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAC;IAC/E,MAAM,IAAI,GAAG,CAAC,QAAQ,GAAG,KAAK,EAAQ,EAAE,CAAC,cAAc,EAAE,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC/I,MAAM,UAAU,GAAG,CAAC,MAAc,EAAQ,EAAE;QAC1C,IAAI,YAAY;YAAE,OAAO;QACzB,YAAY,GAAG,MAAM,CAAC;QACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,yBAAyB,MAAM,ufAAuf,EAAE,CAAC,CAAC;QACjkB,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,oCAAoC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7E,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;IACF,IAAI,UAAU,EAAE,QAAQ,EAAE,CAAC;QACzB,YAAY,GAAG,SAAS,CAAC;QACzB,OAAO,GAAG,SAAS,CAAC;QACpB,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,qMAAqM,EAAE,CAAC,CAAC;IAClP,CAAC;SAAM,IAAI,CAAC,UAAU,IAAI,GAAG,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACzF,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,GAAG,QAAQ,EAAE,GAAG,iBAAiB,GAAG,aAAa,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;QACrH,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,GAAG,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,EAAE,CAAC;IACP,SAAS,CAAC;QACR,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBAC3C,MAAM,CAAC,cAAc,EAAE,CAAC;gBACxB,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAE,CAAC;gBAC1C,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,WAAW,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAClG,IAAI,MAAkB,CAAC;gBACvB,IAAI,CAAC;oBACH,IAAI,YAAY;wBAAE,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;oBAC3G,IAAI,QAAQ,EAAE,IAAI,aAAa;wBAAE,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;oBAClH,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBACnD,MAAM,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE;wBACxF,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,eAAe,aAAa,GAAG,CAAC,EAAE,EAAE;wBAC9D,WAAW,EAAE,UAAU,CAAC,gBAAgB,CAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAE,CAAC,KAAK;qBACnG,CAAC,CAAC,CAAC;gBACN,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,cAAc,EAAE,CAAC;oBACxB,MAAM,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzF,CAAC;gBACD,IAAI,MAAM,GAAG,aAAa,CAAC,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;gBACnF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,GAAG,QAAQ,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;gBACvF,IAAI,MAAM,CAAC,MAAM,GAAG,SAAS;oBAAE,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,2EAA2E,CAAC;gBACjJ,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;gBACrC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM;oBAC1B,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,EAAG,IAAuB,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE;oBAC5G,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,6BAA6B,IAAI,CAAC,IAAI,MAAM,MAAM,EAAE,EAAE,CAAC,CAAC;gBACrF,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBACjD,IAAI,EAAE,CAAC;YACT,CAAC;YACD,OAAO,GAAG,SAAS,CAAC;YACpB,IAAI,EAAE,CAAC;QACT,CAAC;QACD,IAAI,eAAe,EAAE,CAAC;YACpB,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC;YAChD,eAAe,GAAG,SAAS,CAAC;YAC5B,YAAY,GAAG,SAAS,CAAC;YACzB,IAAI,EAAE,CAAC;QACT,CAAC;QACD,IAAI,QAAQ,EAAE,GAAG,iBAAiB,IAAI,aAAa;YAAE,UAAU,CAAC,0CAA0C,CAAC,CAAC;QAC5G,MAAM,UAAU,GAAG,CAAC,MAAM,eAAe,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,wBAAwB,CAAC;YAC/E,UAAU;YACV,MAAM;YACN,UAAU,EAAE,gBAAgB;YAC5B,oBAAoB,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,OAAO,EAAE,YAAY;YACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACzB,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACtE,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,CAAC,8BAA8B,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,KAAK,KAAK,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC;YAC3H,CAAC;YACD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;gBACtB,MAAM,CAAC,cAAc,EAAE,CAAC;gBACxB,YAAY,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC/C,IAAI,QAAQ,EAAE,GAAG,iBAAiB,IAAI,aAAa;oBAAE,UAAU,CAAC,0CAA0C,CAAC,CAAC;gBAC5G,MAAM,WAAW,GAAG,QAAQ,EAAE,CAAC;gBAC/B,IAAI,WAAW,GAAG,iBAAiB,GAAG,aAAa,GAAG,YAAY;oBAAE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;gBAC3I,MAAM,aAAa,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC;gBAClF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC;gBACrE,IAAI,aAAa,GAAG,CAAC,CAAC;gBACtB,IAAI,YAAY,GAAG,IAAI,CAAC;gBACxB,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC;wBACnE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM;wBAC3F,QAAQ,EAAE,yBAAyB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC;wBAChE,kBAAkB,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK;wBACrD,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,MAAe,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBACnF,EAAE,CAAC,IAAI,EAAE,EAAE;wBACV,IAAI,MAAM,CAAC,OAAO,IAAI,CAAC,YAAY;4BAAE,OAAO;wBAC5C,aAAa,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;wBACzC,IAAI,aAAa,GAAG,kBAAkB;4BAAE,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;oBAC5H,CAAC,EAAE;wBACD,qBAAqB,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,eAAe,EAAE,KAAK;wBACzF,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,YAAY;4BAAE,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;qBAClH,CAAC,CAAC,CAAC;oBACJ,MAAM,CAAC,cAAc,EAAE,CAAC;oBACxB,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK;wBAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;oBACnI,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC;wBAAE,MAAM,wBAAwB,CAAC,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC,CAAC;oBAC7J,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,kBAAkB,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,kBAAkB,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,kBAAkB;wBAAE,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;oBACvQ,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;gBAClC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,sBAAsB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;gBACrD,CAAC;wBAAS,CAAC;oBACT,YAAY,GAAG,KAAK,CAAC;gBACvB,CAAC;YACH,CAAC;SACF,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACX,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,kBAAkB,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,kBAAkB,EAAE,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,kBAAkB;YAAE,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;QAC3R,IAAI,UAAU,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YACzC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;YAC/D,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,wEAAwE,YAAY,CAAC,CAAC,CAAC,wDAAwD,CAAC,CAAC,CAAC,uIAAuI,0BAA0B,EAAE,CAAC,CAAC;YAC9V,IAAI,EAAE,CAAC;YACP,SAAS;QACX,CAAC;QACD,IAAI,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YACjC,MAAM,GAAG,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACxD,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,QAAQ,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACrK,CAAC;QACD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACjG,IAAI,KAAK,CAAC,MAAM,IAAI,UAAU,CAAC,IAAI,IAAI,CAAC,YAAY,IAAI,CAAC,kCAAkC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;YAC9H,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,CAAC,IAAI;YAC3C,GAAG,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7F,GAAG,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,eAAe,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChH,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,eAAe,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACrG,CAAC,CAAC;QACH,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACvG,IAAI,EAAE,CAAC;QACP,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,UAAU,CAAC,YAAY,KAAK,YAAY,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;gBACvE,IAAI,CAAC,IAAI,CAAC,CAAC;gBACX,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;gBAClE,OAAO,UAAU,CAAC,IAAI,CAAC;YACzB,CAAC;YACD,IAAI,UAAU,CAAC,YAAY,KAAK,YAAY,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACrE,WAAW,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC/B,IAAI,YAAY,EAAE,CAAC;oBACjB,MAAM,QAAQ,GAAkB;wBAC9B,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;wBACvB,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,2JAA2J,UAAU,CAAC,IAAI,EAAE,EAAE;wBACvM,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;qBAC/D,CAAC;oBACF,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC;oBACjD,IAAI,sBAAsB,CAAC,QAAQ,CAAC,GAAG,YAAY,GAAG,iBAAiB,IAAI,aAAa,EAAE,CAAC;wBACzF,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,uPAAuP,EAAE,CAAC,CAAC;wBAClS,IAAI,EAAE,CAAC;wBACP,SAAS;oBACX,CAAC;oBACD,YAAY,GAAG,SAAS,CAAC;oBACzB,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,0DAA0D,EAAE,CAAC,CAAC;gBAC7F,CAAC;gBACD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,qRAAqR,EAAE,CAAC,CAAC;YAClU,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,8GAA8G,YAAY,CAAC,CAAC,CAAC,+GAA+G,CAAC,CAAC,CAAC,iIAAiI,iDAAiD,EAAE,CAAC,CAAC;YAC9c,CAAC;YACD,IAAI,EAAE,CAAC;QACT,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAmB,KAAK,EAAE,KAAK,EAAE,EAAE;IACjE,IAAI,CAAC;QACH,OAAO,MAAM,mBAAmB,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,eAAe,aAAa,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACnI,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,CAAC,8BAA8B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5I,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { effectiveContextWindowTokens } from "../../llm/context-windows.js";
|
|
2
2
|
import { compactMessagesWithSummary, } from "../context-manager.js";
|
|
3
3
|
import { buildContextBreakdown } from "../context-breakdown.js";
|
|
4
4
|
import { calibratedCompactionSinglePassInputBudget } from "../compaction-summary.js";
|
|
5
5
|
export const executeAutomaticCompaction = (input) => {
|
|
6
6
|
const schemaTokens = buildContextBreakdown([], input.tools).estimatedTotalTokens;
|
|
7
|
-
const contextLimit = input.
|
|
7
|
+
const contextLimit = effectiveContextWindowTokens(input.provider, input.model, input.contextLimitTokens);
|
|
8
8
|
const calibratedInputBudget = calibratedCompactionSinglePassInputBudget(contextLimit, input.provider, input.model);
|
|
9
9
|
return compactMessagesWithSummary(input.messages, input.summarize, {
|
|
10
10
|
budgetTokens: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automatic-compaction-execution.js","sourceRoot":"","sources":["../../../src/agent/turn/automatic-compaction-execution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"automatic-compaction-execution.js","sourceRoot":"","sources":["../../../src/agent/turn/automatic-compaction-execution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EACL,0BAA0B,GAG3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,yCAAyC,EAAE,MAAM,0BAA0B,CAAC;AAkBrF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,KAAwC,EAChB,EAAE;IAC1B,MAAM,YAAY,GAAG,qBAAqB,CACxC,EAAE,EACF,KAAK,CAAC,KAAK,CACZ,CAAC,oBAAoB,CAAC;IACvB,MAAM,YAAY,GAAG,4BAA4B,CAC/C,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,kBAAkB,CACzB,CAAC;IACF,MAAM,qBAAqB,GAAG,yCAAyC,CACrE,YAAY,EACZ,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,KAAK,CACZ,CAAC;IACF,OAAO,0BAA0B,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE;QACjE,YAAY,EAAE,CAAC;QACf,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,eAAe,EAAE,IAAI;QACrB,GAAG,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,2BAA2B,EAAE,IAAI,CAAC,GAAG,CACnC,CAAC,EACD,qBAAqB,GAAG,YAAY,CACrC;QACD,GAAG,CAAC,KAAK,CAAC,eAAe;YACvB,CAAC,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,eAAe,EAAE;YAC5C,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -11,15 +11,15 @@ export interface CompactionAdmissionPorts {
|
|
|
11
11
|
readonly estimateRequestTokens: (messages: readonly ChatMessage[]) => number;
|
|
12
12
|
readonly selectTools: () => readonly ToolDefinition[] | undefined;
|
|
13
13
|
readonly buildDurableEnvelope: () => Promise<string | undefined>;
|
|
14
|
+
readonly prepareMessages?: (() => void) | undefined;
|
|
14
15
|
readonly isSuppressed: (attemptKey: string) => boolean;
|
|
15
16
|
readonly isExhausted?: ((attemptKey: string) => boolean) | undefined;
|
|
16
|
-
readonly
|
|
17
|
+
readonly measureRequestTokens?: ((estimatedTokens: number) => number | undefined) | undefined;
|
|
17
18
|
readonly audit?: CompactionAuditFn | undefined;
|
|
18
19
|
}
|
|
19
20
|
export type CompactionAuditFn = (event: string, payload: Readonly<Record<string, string | number | boolean | undefined>>) => void;
|
|
20
21
|
export type CompactionAdmission = {
|
|
21
22
|
readonly admitted: false;
|
|
22
|
-
readonly skippedByProviderTruth?: boolean;
|
|
23
23
|
} | {
|
|
24
24
|
readonly admitted: true;
|
|
25
25
|
readonly beforeTokens: number;
|
|
@@ -1,41 +1,37 @@
|
|
|
1
1
|
import { compactionAttemptKey } from "../compaction-attempt.js";
|
|
2
2
|
import { toolSchemaHash } from "../context-breakdown.js";
|
|
3
|
-
import { autoCompactTriggerTokens
|
|
3
|
+
import { autoCompactTriggerTokens } from "../request-budget.js";
|
|
4
4
|
import { requestTokenCalibration } from "../../llm/token-estimate-calibration.js";
|
|
5
5
|
const REJECTED = { admitted: false };
|
|
6
6
|
export const planCompactionAdmission = async (ports, options = {}) => {
|
|
7
7
|
const bypassThreshold = options.bypassThreshold === true;
|
|
8
8
|
const retrySuppressed = options.retrySuppressed === true;
|
|
9
|
-
const providerPromptTokens = ports.providerPromptTokens?.();
|
|
10
|
-
const measurement = providerPromptTokens === undefined ? "estimated" : "provider-reported";
|
|
11
9
|
const estimatedTokens = ports.estimateRequestTokens(ports.messages);
|
|
12
|
-
const
|
|
10
|
+
const providerMeasuredTokens = ports.measureRequestTokens?.(estimatedTokens);
|
|
11
|
+
const measurement = providerMeasuredTokens === undefined ? "estimated" : "provider-reported";
|
|
12
|
+
const beforeTokens = providerMeasuredTokens ?? estimatedTokens;
|
|
13
|
+
const compactTrigger = autoCompactTriggerTokens({
|
|
13
14
|
provider: ports.provider,
|
|
14
15
|
model: ports.model,
|
|
15
|
-
|
|
16
|
-
? { contextLimitTokens: ports.contextLimitTokens }
|
|
17
|
-
: {}),
|
|
16
|
+
contextLimitTokens: ports.contextLimitTokens,
|
|
18
17
|
});
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
providerPromptTokens !== undefined &&
|
|
23
|
-
providerPromptTokens < compactTrigger) {
|
|
24
|
-
ports.audit?.("agent.compact.skip-provider-truth", {
|
|
18
|
+
const measured = providerMeasuredTokens !== undefined ? { providerMeasuredTokens } : {};
|
|
19
|
+
if (!bypassThreshold && beforeTokens < compactTrigger) {
|
|
20
|
+
ports.audit?.("agent.compact.skip-threshold", {
|
|
25
21
|
estimatedTokens,
|
|
26
|
-
providerPromptTokens,
|
|
27
22
|
triggerTokens: compactTrigger,
|
|
23
|
+
...measured,
|
|
28
24
|
});
|
|
29
|
-
return
|
|
25
|
+
return REJECTED;
|
|
30
26
|
}
|
|
31
|
-
const beforeTokens = providerPromptTokens ?? estimatedTokens;
|
|
32
27
|
const calibration = requestTokenCalibration(ports.provider, ports.model);
|
|
33
28
|
ports.audit?.("agent.compact.admission", {
|
|
34
29
|
reason: bypassThreshold ? "forced" : "threshold",
|
|
30
|
+
admissionSignal: providerMeasuredTokens === undefined ? "estimate" : "provider",
|
|
35
31
|
estimatedTokens,
|
|
36
32
|
tokenMeasurement: measurement,
|
|
37
33
|
triggerTokens: compactTrigger,
|
|
38
|
-
...
|
|
34
|
+
...measured,
|
|
39
35
|
...(calibration
|
|
40
36
|
? { calibrationRatio: calibration.ratio, calibrationSamples: calibration.samples }
|
|
41
37
|
: {}),
|
|
@@ -43,6 +39,7 @@ export const planCompactionAdmission = async (ports, options = {}) => {
|
|
|
43
39
|
if (ports.messages.length <= 2)
|
|
44
40
|
return REJECTED;
|
|
45
41
|
const durableEnvelope = await ports.buildDurableEnvelope();
|
|
42
|
+
ports.prepareMessages?.();
|
|
46
43
|
const attemptKey = compactionAttemptKey({
|
|
47
44
|
messages: ports.messages,
|
|
48
45
|
provider: ports.provider,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction-admission.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-admission.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,
|
|
1
|
+
{"version":3,"file":"compaction-admission.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-admission.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ export interface CompactionCoordinatorPorts {
|
|
|
26
26
|
readonly newCompactionId: () => string;
|
|
27
27
|
readonly lastSuccessfulRequestSnapshot: () => SuccessfulRequestSnapshot | undefined;
|
|
28
28
|
readonly clearSuccessfulRequestSnapshot: () => void;
|
|
29
|
+
readonly clearProviderMeasurement: () => void;
|
|
29
30
|
readonly summarize: Parameters<typeof executeAutomaticCompaction>[0]["summarize"];
|
|
30
31
|
readonly loadPlan: () => Promise<SessionPlan | undefined>;
|
|
31
32
|
readonly instructionsBlock: () => string | undefined;
|
|
@@ -39,6 +40,6 @@ export interface CompactionCoordinatorPorts {
|
|
|
39
40
|
readonly writeCompleted: (id: string, summary: string, beforeTokens: number, afterTokens: number | undefined, measurement: CompactionMeasurement) => void;
|
|
40
41
|
readonly notify: (level: "info" | "warn", message: string) => void;
|
|
41
42
|
readonly audit: (event: string, payload: CompactionAuditPayload) => void;
|
|
42
|
-
readonly
|
|
43
|
+
readonly measureRequestTokens?: ((estimatedTokens: number) => number | undefined) | undefined;
|
|
43
44
|
}
|
|
44
45
|
export declare const createCompactionCoordinator: (ports: CompactionCoordinatorPorts) => (reason: string, options?: CompactionAdmissionOptions) => Promise<void>;
|
|
@@ -103,24 +103,24 @@ const runAdmittedCompaction = async (ports, reason, force, admitted) => {
|
|
|
103
103
|
ports.clearSuccessfulRequestSnapshot();
|
|
104
104
|
ports.refreshSessionState(livePlan);
|
|
105
105
|
ports.setLastCompactionMsgCount(ports.messages.length);
|
|
106
|
-
const
|
|
106
|
+
const afterEstimate = ports.estimateRequestTokens(ports.messages);
|
|
107
|
+
const afterTokens = ports.measureRequestTokens?.(afterEstimate) ?? afterEstimate;
|
|
108
|
+
ports.clearProviderMeasurement();
|
|
107
109
|
ports.audit("agent.compact", {
|
|
108
110
|
newLength: ports.messages.length,
|
|
109
|
-
estimatedTokens:
|
|
111
|
+
estimatedTokens: afterEstimate,
|
|
112
|
+
afterTokens,
|
|
110
113
|
reason,
|
|
111
114
|
strategy: result.strategy ?? "single",
|
|
112
115
|
compactionAdmissions: ledger.snapshot().attempts.length,
|
|
113
116
|
});
|
|
114
117
|
ports.writeCompleted(compactionId, compactionSummaryText(summaryBodyOf(ports.messages)), beforeTokens, afterTokens, measurement);
|
|
115
118
|
const tokenLabel = measurement === "provider-reported"
|
|
116
|
-
? `${beforeTokens.toLocaleString()} tokens →
|
|
119
|
+
? `${beforeTokens.toLocaleString()} tokens → ~${afterTokens.toLocaleString()} tokens`
|
|
117
120
|
: `~${beforeTokens.toLocaleString()} → ~${afterTokens.toLocaleString()} tokens`;
|
|
118
121
|
ports.notify("info", `context auto-compacted to fit the window (${tokenLabel})${result.strategy === "emergency_prefix_slice" ? " — oldest slice only (lower confidence); run /compact for a full summary" : ""}`);
|
|
119
122
|
};
|
|
120
123
|
export const createCompactionCoordinator = (ports) => async (reason, options = {}) => {
|
|
121
|
-
if (repairToolProtocol(ports.messages) > 0) {
|
|
122
|
-
ports.clearSuccessfulRequestSnapshot();
|
|
123
|
-
}
|
|
124
124
|
const contextLimitTokens = ports.contextLimitTokens();
|
|
125
125
|
const admission = await planCompactionAdmission({
|
|
126
126
|
messages: ports.messages,
|
|
@@ -132,11 +132,16 @@ export const createCompactionCoordinator = (ports) => async (reason, options = {
|
|
|
132
132
|
estimateRequestTokens: ports.estimateRequestTokens,
|
|
133
133
|
selectTools: ports.selectTools,
|
|
134
134
|
buildDurableEnvelope: ports.buildDurableEnvelope,
|
|
135
|
+
prepareMessages: () => {
|
|
136
|
+
if (repairToolProtocol(ports.messages) > 0) {
|
|
137
|
+
ports.clearSuccessfulRequestSnapshot();
|
|
138
|
+
}
|
|
139
|
+
},
|
|
135
140
|
isSuppressed: (key) => ports.attempts.isSuppressed(key),
|
|
136
141
|
isExhausted: ports.attempts.isExhausted
|
|
137
142
|
? (key) => ports.attempts.isExhausted?.(key) === true
|
|
138
143
|
: undefined,
|
|
139
|
-
|
|
144
|
+
measureRequestTokens: ports.measureRequestTokens,
|
|
140
145
|
audit: ports.audit,
|
|
141
146
|
}, options);
|
|
142
147
|
if (!admission.admitted)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction-coordinator.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-coordinator.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,eAAe,EACf,8BAA8B,GAC/B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,yBAAyB,EACzB,sBAAsB,GACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EACL,uBAAuB,GAGxB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,kCAAkC,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EACL,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"compaction-coordinator.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-coordinator.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ const collectJobs = (ports) => {
|
|
|
30
30
|
return { liveJobs, finishedJobs };
|
|
31
31
|
};
|
|
32
32
|
const build = async (ports) => {
|
|
33
|
-
const plan = await ports.loadPlan()
|
|
33
|
+
const plan = await ports.loadPlan();
|
|
34
34
|
const root = ports.getProjectRoot() ?? plan?.meta?.projectRoot;
|
|
35
35
|
const consumed = consumedNotificationIds(ports.messages);
|
|
36
36
|
const unread = [...ports.getUnreadNotificationIds()];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction-durable-envelope.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-durable-envelope.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,GAGrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AAuBzE,MAAM,uBAAuB,GAAG,CAC9B,QAAgC,EACtB,EAAE;IACZ,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,CAAC,8BAA8B,CAAC,OAAO,CAAC;YAAE,SAAS;QACvD,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/C,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC;gBAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,GAA0B,EAAoB,EAAE,CAAC,CAAC;IACrE,EAAE,EAAE,GAAG,CAAC,EAAE;IACV,MAAM,EAAE,GAAG,CAAC,MAAM;IAClB,OAAO,EAAE,GAAG,CAAC,cAAc,IAAI,GAAG,CAAC,OAAO;IAC1C,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;CAChE,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,CAClB,KAAqC,EAIrC,EAAE;IACF,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,KAAK;SACvB,aAAa,EAAE;SACf,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SACrC,GAAG,CAAC,WAAW,CAAC,CAAC;IACpB,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;AACpC,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,KAAK,EACjB,KAAqC,EACR,EAAE;IAC/B,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC
|
|
1
|
+
{"version":3,"file":"compaction-durable-envelope.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-durable-envelope.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { effectiveContextWindowTokens } from "../../llm/context-windows.js";
|
|
2
2
|
import { planCompactionReplay } from "../compaction-executor.js";
|
|
3
3
|
import { projectToolHistory } from "../tool-history.js";
|
|
4
4
|
import { buildDirectCompactionPrompt, COMPACTION_MAX_COMPLETION_TOKENS, } from "../compaction-summary.js";
|
|
@@ -16,8 +16,7 @@ export const selectCompactionReplaySnapshot = (input) => {
|
|
|
16
16
|
: {}),
|
|
17
17
|
}),
|
|
18
18
|
maxTokens: COMPACTION_MAX_COMPLETION_TOKENS,
|
|
19
|
-
contextLimitTokens: input.contextLimitTokens
|
|
20
|
-
modelContextWindow(input.model, input.provider),
|
|
19
|
+
contextLimitTokens: effectiveContextWindowTokens(input.provider, input.model, input.contextLimitTokens),
|
|
21
20
|
stream: true,
|
|
22
21
|
});
|
|
23
22
|
return replayPlan && !replayPlan.accounting.overLimit
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction-replay-selection.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-replay-selection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"compaction-replay-selection.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-replay-selection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EACL,2BAA2B,EAC3B,gCAAgC,GACjC,MAAM,0BAA0B,CAAC;AAWlC,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,KAAqC,EACE,EAAE;IACzC,IAAI,CAAC,KAAK,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IACtC,IAAI,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC1E,MAAM,UAAU,GAAG,oBAAoB,CAAC;QACtC,WAAW,EAAE,KAAK,CAAC,QAAQ;QAC3B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM,EAAE,2BAA2B,CAAC;YAClC,GAAG,CAAC,KAAK,CAAC,eAAe;gBACvB,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,eAAe,EAAE;gBACzC,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;QACF,SAAS,EAAE,gCAAgC;QAC3C,kBAAkB,EAAE,4BAA4B,CAC9C,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,kBAAkB,CACzB;QACD,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IACH,OAAO,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS;QACnD,CAAC,CAAC,KAAK,CAAC,QAAQ;QAChB,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -31,7 +31,7 @@ const summarize = async (ports, summaryPrompt, stage) => {
|
|
|
31
31
|
}),
|
|
32
32
|
...(contextLimitTokens !== undefined ? { contextLimitTokens } : {}),
|
|
33
33
|
...(ports.state.activeLedger ? { operation: ports.state.activeLedger } : {}),
|
|
34
|
-
qualityRetry:
|
|
34
|
+
qualityRetry: true,
|
|
35
35
|
retryOnServerError: false,
|
|
36
36
|
retryOnTruncation: false,
|
|
37
37
|
retryOnRequestShapeRejection: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction-summarizer.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-summarizer.ts"],"names":[],"mappings":"AASA,OAAO,EACL,oCAAoC,EACpC,gCAAgC,EAChC,wBAAwB,GACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAsBrE,MAAM,SAAS,GAAG,KAAK,EACrB,KAAgC,EAChC,aAAqB,EACrB,KAA8B,EACb,EAAE;IACjB,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAAK,KAAK,KAAK,CAAC;IAClD,MAAM,YAAY,GAAG,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3E,MAAM,SAAS,GACb,KAAK,EAAE,KAAK,KAAK,KAAK;QACpB,CAAC,CAAC,oCAAoC;QACtC,CAAC,CAAC,gCAAgC,CAAC;IACvC,MAAM,cAAc,GAAG,KAAK,EAAE,cAAc,CAAC;IAC7C,MAAM,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACpF,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC;IAC1C,MAAM,kBAAkB,GAAG,KAAK,CAAC,yBAAyB,EAAE,CAAC;IAC7D,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,wBAAwB,CAAC;IAC1D,MAAM,eAAe,GAAG,KAAK,CAAC,eAAe,EAAE,EAAE,CAAC;IAClD,OAAO,OAAO,CAAC;QACb,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,aAAa,EAAE,wBAAwB;QACvC,MAAM,EAAE,aAAa;QACrB,SAAS;QACT,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,GAAG,CAAC,MAAM;YACR,CAAC,CAAC;gBACE,WAAW,EAAE,MAAM;gBACnB,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB;YACH,CAAC,CAAC;gBACE,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7C,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC/D,CAAC;QACN,GAAG,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"compaction-summarizer.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-summarizer.ts"],"names":[],"mappings":"AASA,OAAO,EACL,oCAAoC,EACpC,gCAAgC,EAChC,wBAAwB,GACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAsBrE,MAAM,SAAS,GAAG,KAAK,EACrB,KAAgC,EAChC,aAAqB,EACrB,KAA8B,EACb,EAAE;IACjB,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAAK,KAAK,KAAK,CAAC;IAClD,MAAM,YAAY,GAAG,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3E,MAAM,SAAS,GACb,KAAK,EAAE,KAAK,KAAK,KAAK;QACpB,CAAC,CAAC,oCAAoC;QACtC,CAAC,CAAC,gCAAgC,CAAC;IACvC,MAAM,cAAc,GAAG,KAAK,EAAE,cAAc,CAAC;IAC7C,MAAM,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACpF,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC;IAC1C,MAAM,kBAAkB,GAAG,KAAK,CAAC,yBAAyB,EAAE,CAAC;IAC7D,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,wBAAwB,CAAC;IAC1D,MAAM,eAAe,GAAG,KAAK,CAAC,eAAe,EAAE,EAAE,CAAC;IAClD,OAAO,OAAO,CAAC;QACb,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,aAAa,EAAE,wBAAwB;QACvC,MAAM,EAAE,aAAa;QACrB,SAAS;QACT,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,GAAG,CAAC,MAAM;YACR,CAAC,CAAC;gBACE,WAAW,EAAE,MAAM;gBACnB,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB;YACH,CAAC,CAAC;gBACE,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7C,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC/D,CAAC;QACN,GAAG,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,YAAY,EAAE,IAAI;QAClB,kBAAkB,EAAE,KAAK;QACzB,iBAAiB,EAAE,KAAK;QACxB,4BAA4B,EAAE,KAAK;QACnC,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,YAAY;YACnB,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC;YAClE,CAAC,CAAC,SAAS;QACb,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACvD,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,KAAgC,EAAE,EAAE,CAC7E,CAAC,aAAqB,EAAE,KAA8B,EAAmB,EAAE,CACzE,SAAS,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC"}
|
|
@@ -31,7 +31,7 @@ export const resolveAnswerPath = async (deps, input) => {
|
|
|
31
31
|
deps.counters.malformedFenceRetries = recoveryLadderState.malformedFenceRetries;
|
|
32
32
|
if (recoveryDecision === "retry")
|
|
33
33
|
return { kind: "continue" };
|
|
34
|
-
const livePlanAtCompletion = await loadPlan(deps.session.sessionId)
|
|
34
|
+
const livePlanAtCompletion = await loadPlan(deps.session.sessionId);
|
|
35
35
|
const assessment = assessCompletion({
|
|
36
36
|
visible: assistantText.visible,
|
|
37
37
|
canonicalVisible: canonicalAssistantVisible,
|
|
@@ -72,7 +72,7 @@ export const resolveAnswerPath = async (deps, input) => {
|
|
|
72
72
|
const finalOutcome = await resolveFinalOutcome({
|
|
73
73
|
outcomeState: deps.outcomeState,
|
|
74
74
|
planApproved: deps.session.planApproved.value,
|
|
75
|
-
loadPlan: () => loadPlan(deps.session.sessionId)
|
|
75
|
+
loadPlan: () => loadPlan(deps.session.sessionId),
|
|
76
76
|
saveOutcomeState,
|
|
77
77
|
}, cleaned);
|
|
78
78
|
const outcomeStatus = finalOutcome.status;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"answer-path.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/answer-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAQ/E,MAAM,QAAQ,GAAG,CAAC,OAAoB,EAAoB,EAAE,CAAC,CAAC;IAC5D,IAAI,EAAE,UAAU;IAChB,OAAO;CACR,CAAC,CAAC;AAcH,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,IAAkB,EAClB,KAAsB,EACK,EAAE;IAC7B,MAAM,EAAE,aAAa,EAAE,yBAAyB,EAAE,YAAY,EAAE,aAAa,EAAE,oBAAoB,EAAE,GACnG,KAAK,CAAC;IACR,IAAI,CAAC,QAAQ,CAAC,0BAA0B,IAAI,CAAC,CAAC;IAC9C,MAAM,mBAAmB,GAAG;QAC1B,mBAAmB,EAAE,IAAI,CAAC,QAAQ,CAAC,mBAAmB;QACtD,oBAAoB,EAAE,IAAI,CAAC,QAAQ,CAAC,oBAAoB;QACxD,qBAAqB,EAAE,IAAI,CAAC,QAAQ,CAAC,qBAAqB;KAC3D,CAAC;IACF,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CACnD;QACE,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,aAAa;QACb,mBAAmB,EAAE,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU;QACxD,MAAM,EAAE,IAAI,CAAC,WAAW;QACxB,oBAAoB;QACpB,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;QAC7C,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;KAC5C,EACD,mBAAmB,EACnB,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,CACjD,CAAC;IACF,IAAI,CAAC,QAAQ,CAAC,mBAAmB,GAAG,mBAAmB,CAAC,mBAAmB,CAAC;IAC5E,IAAI,CAAC,QAAQ,CAAC,oBAAoB,GAAG,mBAAmB,CAAC,oBAAoB,CAAC;IAC9E,IAAI,CAAC,QAAQ,CAAC,qBAAqB,GAAG,mBAAmB,CAAC,qBAAqB,CAAC;IAChF,IAAI,gBAAgB,KAAK,OAAO;QAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAE9D,MAAM,oBAAoB,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"answer-path.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/answer-path.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,6 @@ export interface CompletionUsagePorts {
|
|
|
13
13
|
api?: string | undefined;
|
|
14
14
|
attempt?: ReturnType<typeof contextAttemptFromOperationUsage> | undefined;
|
|
15
15
|
}) => void;
|
|
16
|
-
readonly emitContextFallback: (estimatedTokens: number) => void;
|
|
17
16
|
readonly audit: (event: string, payload: Readonly<Record<string, string | number | boolean | undefined>>) => Promise<void>;
|
|
18
17
|
}
|
|
19
18
|
export declare const accountCompletionUsage: (ports: CompletionUsagePorts, completion: CompletionResult) => Promise<void>;
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
import { stripThinking } from "../../../ui/thinking.js";
|
|
2
2
|
import { trimExactContinuationOverlap } from "../continuation-overlap.js";
|
|
3
|
-
import {
|
|
3
|
+
import { recordRequestTokenObservation } from "../../../llm/token-estimate-calibration.js";
|
|
4
4
|
import { effectivePromptTokens } from "../../../llm/token-usage.js";
|
|
5
5
|
import { contextAttemptFromOperationUsage } from "../../../llm/context-snapshot.js";
|
|
6
6
|
export const accountCompletionUsage = async (ports, completion) => {
|
|
7
7
|
const usage = completion.usage;
|
|
8
|
-
|
|
9
|
-
if (!usage) {
|
|
10
|
-
reportFallback();
|
|
8
|
+
if (!usage)
|
|
11
9
|
return;
|
|
12
|
-
}
|
|
13
10
|
const requestRouteMatched = ports.dispatchedRequestRoute?.provider === completion.provider &&
|
|
14
11
|
ports.dispatchedRequestRoute.model === completion.model;
|
|
15
12
|
const consumedPromptTokens = effectivePromptTokens(usage) ?? 0;
|
|
@@ -29,8 +26,6 @@ export const accountCompletionUsage = async (ports, completion) => {
|
|
|
29
26
|
...(completion.api ? { api: completion.api } : {}),
|
|
30
27
|
...(attempt.kind === "generation" ? { attempt } : {}),
|
|
31
28
|
});
|
|
32
|
-
if (usage.promptTokensKnown === false)
|
|
33
|
-
reportFallback();
|
|
34
29
|
const cacheRead = usage.cachedPromptTokens ?? 0;
|
|
35
30
|
const cacheCreated = usage.cacheCreationTokens ?? 0;
|
|
36
31
|
if (cacheRead === 0 && cacheCreated === 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion-interpretation.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/completion-interpretation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,
|
|
1
|
+
{"version":3,"file":"completion-interpretation.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/completion-interpretation.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,6 +77,7 @@ export interface TurnLoopDeps extends TurnWriters {
|
|
|
77
77
|
readonly composeCurrentSystemPrompt: (native: boolean) => string;
|
|
78
78
|
readonly currentContextLimitTokens: () => number | undefined;
|
|
79
79
|
readonly estimateNextRequestTokens: (messages: readonly ChatMessage[]) => number;
|
|
80
|
+
readonly measureRequestTokens: (estimatedTokens: number) => number | undefined;
|
|
80
81
|
readonly selectToolDefs: (native: boolean, compact: boolean) => ToolDefinition[] | undefined;
|
|
81
82
|
readonly maybeAutoCompact: (reason: string, options?: CompactionAdmissionOptions) => Promise<void>;
|
|
82
83
|
readonly resolveNativeTools: (provider: ProviderId, model: string) => {
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import type { ChatMessage } from "../../../types.js";
|
|
2
2
|
export interface EmptyResponseState {
|
|
3
3
|
emptyVisibleRetries: number;
|
|
4
|
-
retryWithoutThinking: boolean;
|
|
5
4
|
interruptedReasoning: string;
|
|
6
5
|
}
|
|
7
6
|
export interface EmptyResponsePorts {
|
|
8
7
|
readonly messages: ChatMessage[];
|
|
9
8
|
readonly toolsAttached: boolean;
|
|
10
9
|
readonly planModeWithoutPlan: boolean;
|
|
10
|
+
readonly maxRetries?: number | undefined;
|
|
11
11
|
readonly notify: (level: "info" | "warn", message: string) => void;
|
|
12
12
|
readonly commitAssistantRetry: (text: string) => void;
|
|
13
13
|
readonly recoveryUserMessage: (content: string) => ChatMessage;
|
|
@@ -18,7 +18,8 @@ const baseNudgeFor = (ports, input) => {
|
|
|
18
18
|
};
|
|
19
19
|
export const handleEmptyResponse = (ports, state, input) => {
|
|
20
20
|
state.emptyVisibleRetries += 1;
|
|
21
|
-
|
|
21
|
+
const maxRetries = ports.maxRetries ?? MAX_EMPTY_RETRIES;
|
|
22
|
+
if (state.emptyVisibleRetries > maxRetries) {
|
|
22
23
|
ports.notify("warn", "model returned an empty response after retries — no answer produced");
|
|
23
24
|
return "stop";
|
|
24
25
|
}
|
|
@@ -29,9 +30,6 @@ export const handleEmptyResponse = (ports, state, input) => {
|
|
|
29
30
|
state.interruptedReasoning = appendInterruptedReasoning(state.interruptedReasoning, input.assistantThinkContent);
|
|
30
31
|
}
|
|
31
32
|
const preservedReasoning = state.interruptedReasoning;
|
|
32
|
-
if (input.hasThinking && state.emptyVisibleRetries >= 2) {
|
|
33
|
-
state.retryWithoutThinking = true;
|
|
34
|
-
}
|
|
35
33
|
ports.commitAssistantRetry(input.assistantVisible);
|
|
36
34
|
state.interruptedReasoning = preservedReasoning;
|
|
37
35
|
const baseNudge = baseNudgeFor(ports, input);
|