@pentoshi/clai 4.11.25 → 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/README.md +91 -34
- 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 +8 -7
- package/dist/app/adapters/agent-event-adapter.js.map +1 -1
- package/dist/app/commands/catalog.js +1 -1
- package/dist/app/commands/catalog.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 +6 -6
- package/dist/app/controllers/session-controller.js +51 -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/controllers/session-usage-ledger.d.ts +7 -1
- package/dist/app/controllers/session-usage-ledger.js +76 -2
- package/dist/app/controllers/session-usage-ledger.js.map +1 -1
- package/dist/app/events/app-event.d.ts +5 -6
- 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 +65 -2
- package/dist/llm/kiro-auth.js +463 -130
- 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 +7 -1
- package/dist/llm/kiro.js +757 -228
- 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-layers/model-rules.js +22 -1
- package/dist/llm/model-layers/model-rules.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-balance.d.ts +31 -0
- package/dist/llm/provider-balance.js +118 -0
- package/dist/llm/provider-balance.js.map +1 -0
- 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/provider-info-text.js +19 -7
- package/dist/llm/provider-info-text.js.map +1 -1
- package/dist/llm/provider-profile-layers.js +1 -1
- package/dist/llm/provider-profile-layers.js.map +1 -1
- package/dist/llm/provider.d.ts +1 -0
- package/dist/llm/provider.js.map +1 -1
- 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 +2 -0
- package/dist/llm/reasoning-errors.js +16 -1
- 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/history/jsonl-backend.js +2 -1
- package/dist/store/history/jsonl-backend.js.map +1 -1
- package/dist/store/history/jsonl-lock.js +23 -3
- package/dist/store/history/jsonl-lock.js.map +1 -1
- package/dist/store/history/lifecycle.js +3 -2
- package/dist/store/history/lifecycle.js.map +1 -1
- 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 +10 -1
- package/dist/types.js.map +1 -1
- package/dist/ui-core/bootstrap/composition-root.js +9 -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/picker-commands.js +3 -0
- package/dist/ui-core/commands/picker-commands.js.map +1 -1
- package/dist/ui-core/commands/pickers/search-reasoning.d.ts +2 -0
- package/dist/ui-core/commands/pickers/search-reasoning.js +1 -1
- package/dist/ui-core/commands/pickers/search-reasoning.js.map +1 -1
- package/dist/ui-core/commands/session-commands.d.ts +4 -0
- package/dist/ui-core/commands/session-commands.js +127 -11
- 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/format-usage.js +29 -6
- package/dist/ui-core/rendering/format-usage.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":"plan-create.js","sourceRoot":"","sources":["../../../../src/agent/plan/actions/plan-create.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plan-create.js","sourceRoot":"","sources":["../../../../src/agent/plan/actions/plan-create.ts"],"names":[],"mappings":"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"}
|
|
@@ -115,15 +115,26 @@ export async function handleTaskAdd(call, session, autoApprove, plan) {
|
|
|
115
115
|
modelNote: `task.add failed: ${validation.reason}.`,
|
|
116
116
|
};
|
|
117
117
|
}
|
|
118
|
-
await mutatePlan(plan.sessionId, (draft) => {
|
|
118
|
+
const committed = await mutatePlan(plan.sessionId, (draft) => {
|
|
119
119
|
applyForegroundSnapshot(draft, plan);
|
|
120
120
|
return true;
|
|
121
|
-
})
|
|
121
|
+
});
|
|
122
|
+
if (!committed.ok || !committed.plan) {
|
|
123
|
+
const reason = committed.reason ?? "persist-failed";
|
|
124
|
+
return {
|
|
125
|
+
handled: true,
|
|
126
|
+
ok: false,
|
|
127
|
+
display: chalk.red(` ✗ task.add: durable commit failed (${reason})\n`),
|
|
128
|
+
modelNote: `task.add failed: the new task was not durably committed (${reason}). ` +
|
|
129
|
+
"Reload the active plan before retrying.",
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
const committedPlan = committed.plan;
|
|
122
133
|
return {
|
|
123
134
|
handled: true,
|
|
124
135
|
ok: true,
|
|
125
|
-
plan,
|
|
126
|
-
display: renderPlanForTerminal(
|
|
136
|
+
plan: committedPlan,
|
|
137
|
+
display: renderPlanForTerminal(committedPlan) + "\n",
|
|
127
138
|
modelNote: `Added [${task.id}] "${task.title}"${parentTaskId ? ` under [${parentTaskId}]` : ""} without rewriting existing tasks.${reportDeferral} ` +
|
|
128
139
|
`Open it with task.update when it becomes ready. Preserve completed work and continue the current task unless this new task is the immediate evidence-driven next action.`,
|
|
129
140
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-add.js","sourceRoot":"","sources":["../../../../src/agent/plan/actions/task-add.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"task-add.js","sourceRoot":"","sources":["../../../../src/agent/plan/actions/task-add.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,16 +56,27 @@ export async function handleTaskMove(call, session, autoApprove, plan) {
|
|
|
56
56
|
stepId: taskId,
|
|
57
57
|
index,
|
|
58
58
|
});
|
|
59
|
-
await mutatePlan(plan.sessionId, (draft) => {
|
|
59
|
+
const committed = await mutatePlan(plan.sessionId, (draft) => {
|
|
60
60
|
applyForegroundSnapshot(draft, updated);
|
|
61
61
|
return true;
|
|
62
|
-
})
|
|
62
|
+
});
|
|
63
|
+
if (!committed.ok || !committed.plan) {
|
|
64
|
+
const reason = committed.reason ?? "persist-failed";
|
|
65
|
+
return {
|
|
66
|
+
handled: true,
|
|
67
|
+
ok: false,
|
|
68
|
+
display: chalk.red(` ✗ task.move: durable commit failed (${reason})\n`),
|
|
69
|
+
modelNote: `task.move failed: the new order was not durably committed (${reason}). ` +
|
|
70
|
+
"Reload the active plan before retrying.",
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
const committedPlan = committed.plan;
|
|
63
74
|
return {
|
|
64
75
|
handled: true,
|
|
65
76
|
ok: true,
|
|
66
|
-
plan:
|
|
67
|
-
display: renderPlanForTerminal(
|
|
68
|
-
modelNote: `Moved [${taskId}] to position ${
|
|
77
|
+
plan: committedPlan,
|
|
78
|
+
display: renderPlanForTerminal(committedPlan) + "\n",
|
|
79
|
+
modelNote: `Moved [${taskId}] to position ${committedPlan.tasks.findIndex((task) => task.id === taskId) + 1}. ` +
|
|
69
80
|
"Task id, state, evidence, dependencies, and responder linkage were preserved.",
|
|
70
81
|
};
|
|
71
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-move.js","sourceRoot":"","sources":["../../../../src/agent/plan/actions/task-move.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"task-move.js","sourceRoot":"","sources":["../../../../src/agent/plan/actions/task-move.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ export async function handlePlanTool(call, session, ctx) {
|
|
|
23
23
|
if (call.name === "plan.clear") {
|
|
24
24
|
return handlePlanClear(call, session, autoApprove);
|
|
25
25
|
}
|
|
26
|
-
|
|
26
|
+
let plan = await loadPlan(session.sessionId);
|
|
27
27
|
if (!plan) {
|
|
28
28
|
return {
|
|
29
29
|
handled: true,
|
|
@@ -100,7 +100,8 @@ export async function handlePlanTool(call, session, ctx) {
|
|
|
100
100
|
task.id,
|
|
101
101
|
{ state: task.state, note: task.note },
|
|
102
102
|
]));
|
|
103
|
-
|
|
103
|
+
const desiredStatus = plan.status;
|
|
104
|
+
const committed = await mutatePlan(plan.sessionId, (draft) => {
|
|
104
105
|
for (const task of draft.tasks) {
|
|
105
106
|
const desired = committedStates.get(task.id);
|
|
106
107
|
if (!desired)
|
|
@@ -111,18 +112,31 @@ export async function handlePlanTool(call, session, ctx) {
|
|
|
111
112
|
if (desired.note !== undefined)
|
|
112
113
|
task.note = desired.note;
|
|
113
114
|
}
|
|
114
|
-
draft.status =
|
|
115
|
+
draft.status = desiredStatus;
|
|
115
116
|
return true;
|
|
116
|
-
})
|
|
117
|
+
});
|
|
118
|
+
if (!committed.ok || !committed.plan) {
|
|
119
|
+
const reason = committed.reason ?? "persist-failed";
|
|
120
|
+
return {
|
|
121
|
+
handled: true,
|
|
122
|
+
ok: false,
|
|
123
|
+
display: chalk.red(` ✗ task.update: durable commit failed (${reason})\n`),
|
|
124
|
+
modelNote: `task.update failed: the plan change was not durably committed (${reason}). ` +
|
|
125
|
+
"Reload the active plan before retrying; do not claim the task state changed.",
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
plan = committed.plan;
|
|
129
|
+
const committedTerminal = isPlanTerminal(plan);
|
|
130
|
+
const committedSuccessful = isPlanSuccessful(plan);
|
|
117
131
|
const checklist = renderPlanForTerminal(plan);
|
|
118
132
|
const nextPending = readyPlanTasks(plan)[0];
|
|
119
133
|
let modelNote;
|
|
120
|
-
if (
|
|
134
|
+
if (committedSuccessful) {
|
|
121
135
|
modelNote =
|
|
122
136
|
"Task updated. All required tasks succeeded or were explicitly skipped. Verify the result and give your final summary. " +
|
|
123
137
|
"If a dev server was started: report URL, port, job id, and that it is still running.";
|
|
124
138
|
}
|
|
125
|
-
else if (
|
|
139
|
+
else if (committedTerminal) {
|
|
126
140
|
const failed = plan.tasks.filter((task) => task.state === "failed");
|
|
127
141
|
modelNote =
|
|
128
142
|
`Task updated. The plan is terminal but NOT successful: ${failed.length} task(s) failed. ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-plan-tool.js","sourceRoot":"","sources":["../../../src/agent/plan/handle-plan-tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiH,gBAAgB,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAA6B,cAAc,EAAiC,MAAM,qBAAqB,CAAC;AAGhS,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAO5D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,oBAAoB,EAAyE,wBAAwB,EAAsB,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACrO,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;AAGhH,MAAM,UAAU,wBAAwB,CACtC,KAAa,EACb,KAAa,EACb,OAAe,EACf,KAAe;IAEf,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAiB;IACrD,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAaD,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,IAAc,EACd,OAAsB,EACtB,GAAkE;IAElE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7C,KAAK,GAAG,CAAC,SAAS,CAAC;IACnB,KAAK,GAAG,CAAC,IAAI,CAAC;IACd,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAChC,OAAO,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAC/B,OAAO,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IACrD,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"handle-plan-tool.js","sourceRoot":"","sources":["../../../src/agent/plan/handle-plan-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
import type { ProviderId } from "../types.js";
|
|
2
|
-
export declare const HARD_COMPACT_TOKEN_BUDGET = 200000;
|
|
3
|
-
export declare const DEFAULT_SOFT_COMPACT_TOKEN_BUDGET = 200000;
|
|
4
2
|
export declare const DEFAULT_FS_PASSTHROUGH_CAP_CHARS = 64000;
|
|
5
3
|
export declare const DEFAULT_FREE_TIER_FAIL_THRESHOLD = 2;
|
|
6
4
|
export declare const ADAPTIVE_MAX_TOKENS_TOOL_STEP = 24576;
|
|
@@ -10,9 +8,6 @@ export declare const LEGACY_MAX_TOKENS = 32768;
|
|
|
10
8
|
export declare const MAX_STEP_COMPLETION_TOKENS = 65536;
|
|
11
9
|
export declare const MAX_OUTPUT_BUDGET_CONTINUATIONS = 1;
|
|
12
10
|
export interface ReliabilityPolicy {
|
|
13
|
-
readonly softEarlyCompact: boolean;
|
|
14
|
-
readonly softCompactTokenBudget: number;
|
|
15
|
-
readonly hardCompactTokenBudget: number;
|
|
16
11
|
readonly fsPassthroughCapChars: number;
|
|
17
12
|
readonly adaptiveMaxTokens: boolean;
|
|
18
13
|
readonly freeTierContextGuard: boolean;
|
|
@@ -21,11 +16,6 @@ export interface ReliabilityPolicy {
|
|
|
21
16
|
readonly slimNativePrompt: boolean;
|
|
22
17
|
}
|
|
23
18
|
export declare function getReliabilityPolicy(): ReliabilityPolicy;
|
|
24
|
-
export declare function autoCompactTriggerTokens(policy?: ReliabilityPolicy, target?: {
|
|
25
|
-
provider?: ProviderId | undefined;
|
|
26
|
-
model?: string | undefined;
|
|
27
|
-
contextLimitTokens?: number | undefined;
|
|
28
|
-
}): number;
|
|
29
19
|
export declare function resolveStepMaxTokens(input: {
|
|
30
20
|
nativeToolsActive: boolean;
|
|
31
21
|
toolsAttached: boolean;
|
|
@@ -1,9 +1,5 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import { getConfig, providerCategory } from "../store/config.js";
|
|
3
|
-
import { AUTO_COMPACT_TOKEN_BUDGET } from "./context-manager.js";
|
|
4
|
-
import { DEFAULT_AUTO_COMPACT_REQUEST_TOKENS, MIN_AUTO_COMPACT_REQUEST_TOKENS, configuredRequestTokens, resolveRequestBudget, } from "./request-budget.js";
|
|
5
|
-
export const HARD_COMPACT_TOKEN_BUDGET = AUTO_COMPACT_TOKEN_BUDGET;
|
|
6
|
-
export const DEFAULT_SOFT_COMPACT_TOKEN_BUDGET = DEFAULT_AUTO_COMPACT_REQUEST_TOKENS;
|
|
7
3
|
export const DEFAULT_FS_PASSTHROUGH_CAP_CHARS = 64_000;
|
|
8
4
|
export const DEFAULT_FREE_TIER_FAIL_THRESHOLD = 2;
|
|
9
5
|
export const ADAPTIVE_MAX_TOKENS_TOOL_STEP = 24_576;
|
|
@@ -31,17 +27,11 @@ function intEnv(name) {
|
|
|
31
27
|
}
|
|
32
28
|
export function getReliabilityPolicy() {
|
|
33
29
|
const cfg = getConfig();
|
|
34
|
-
const softEarly = boolEnv("CLAI_SOFT_EARLY_COMPACT") ?? cfg.softEarlyCompact ?? true;
|
|
35
|
-
let softBudget = intEnv("CLAI_SOFT_COMPACT_TOKENS") ?? configuredRequestTokens().tokens;
|
|
36
|
-
softBudget = Math.max(MIN_AUTO_COMPACT_REQUEST_TOKENS, Math.min(softBudget, HARD_COMPACT_TOKEN_BUDGET));
|
|
37
30
|
let fsCap = intEnv("CLAI_FS_PASSTHROUGH_CHARS") ??
|
|
38
31
|
cfg.fsPassthroughCapChars ??
|
|
39
32
|
DEFAULT_FS_PASSTHROUGH_CAP_CHARS;
|
|
40
33
|
fsCap = Math.max(8_000, Math.min(fsCap, 400_000));
|
|
41
34
|
return {
|
|
42
|
-
softEarlyCompact: softEarly,
|
|
43
|
-
softCompactTokenBudget: softBudget,
|
|
44
|
-
hardCompactTokenBudget: HARD_COMPACT_TOKEN_BUDGET,
|
|
45
35
|
fsPassthroughCapChars: fsCap,
|
|
46
36
|
adaptiveMaxTokens: boolEnv("CLAI_ADAPTIVE_MAX_TOKENS") ?? cfg.adaptiveMaxTokens ?? true,
|
|
47
37
|
freeTierContextGuard: boolEnv("CLAI_FREE_TIER_GUARD") ?? cfg.freeTierContextGuard ?? true,
|
|
@@ -52,19 +42,6 @@ export function getReliabilityPolicy() {
|
|
|
52
42
|
slimNativePrompt: boolEnv("CLAI_SLIM_NATIVE_PROMPT") ?? cfg.slimNativePrompt ?? true,
|
|
53
43
|
};
|
|
54
44
|
}
|
|
55
|
-
export function autoCompactTriggerTokens(policy = getReliabilityPolicy(), target) {
|
|
56
|
-
const configured = policy.softEarlyCompact
|
|
57
|
-
? Math.min(policy.softCompactTokenBudget, policy.hardCompactTokenBudget)
|
|
58
|
-
: policy.hardCompactTokenBudget;
|
|
59
|
-
return resolveRequestBudget({
|
|
60
|
-
...(target?.provider ? { provider: target.provider } : {}),
|
|
61
|
-
...(target?.model ? { model: target.model } : {}),
|
|
62
|
-
...(target?.contextLimitTokens
|
|
63
|
-
? { contextLimitTokens: target.contextLimitTokens }
|
|
64
|
-
: {}),
|
|
65
|
-
overrideTokens: configured,
|
|
66
|
-
}).effectiveTrigger;
|
|
67
|
-
}
|
|
68
45
|
export function resolveStepMaxTokens(input) {
|
|
69
46
|
const policy = input.policy ?? getReliabilityPolicy();
|
|
70
47
|
const base = (() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reliability-policy.js","sourceRoot":"","sources":["../../src/agent/reliability-policy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reliability-policy.js","sourceRoot":"","sources":["../../src/agent/reliability-policy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { compileRequestPlan, } from "../llm/request-plan.js";
|
|
2
2
|
import { reasoningArtifactTokensForMessage } from "../llm/reasoning-artifacts.js";
|
|
3
3
|
import { calibratedRequestTokens, requestTokenCalibration, } from "../llm/token-estimate-calibration.js";
|
|
4
|
-
import {
|
|
4
|
+
import { resolveContextWindow } from "../llm/context-windows.js";
|
|
5
5
|
import { readImageDimensions } from "../attachments/image-content.js";
|
|
6
6
|
import { measureToolCallsChars } from "./message-slim.js";
|
|
7
7
|
export const RESERVED_OUTPUT_TOKENS = 24_576;
|
|
@@ -52,14 +52,14 @@ export function estimateToolSchemaTokens(tools) {
|
|
|
52
52
|
}
|
|
53
53
|
export function resolveEffectiveContextLimit(input) {
|
|
54
54
|
const safetyMarginTokens = input?.safetyMarginTokens ?? SAFETY_MARGIN_TOKENS;
|
|
55
|
-
const
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
:
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
55
|
+
const routed = input?.model !== undefined || input?.provider !== undefined;
|
|
56
|
+
const window = resolveContextWindow({
|
|
57
|
+
provider: input?.provider,
|
|
58
|
+
model: input?.model,
|
|
59
|
+
contextLimitTokens: input?.contextLimitTokens,
|
|
60
|
+
});
|
|
61
|
+
const override = window.source === "session-override";
|
|
62
|
+
const limitTokens = override || routed ? window.tokens : undefined;
|
|
63
63
|
if (limitTokens === undefined) {
|
|
64
64
|
return {
|
|
65
65
|
source: "unknown",
|
|
@@ -71,7 +71,7 @@ export function resolveEffectiveContextLimit(input) {
|
|
|
71
71
|
Math.min(RESERVED_OUTPUT_TOKENS, Math.floor(limitTokens * 0.25));
|
|
72
72
|
return {
|
|
73
73
|
limitTokens,
|
|
74
|
-
source: override
|
|
74
|
+
source: override ? "session-override" : "model-window",
|
|
75
75
|
reservedOutputTokens,
|
|
76
76
|
safetyMarginTokens,
|
|
77
77
|
effectiveSafeTokens: Math.max(1, limitTokens - reservedOutputTokens - safetyMarginTokens),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-accounting.js","sourceRoot":"","sources":["../../src/agent/request-accounting.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,kBAAkB,GAEnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iCAAiC,EAAE,MAAM,+BAA+B,CAAC;AAClF,OAAO,EACL,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"request-accounting.js","sourceRoot":"","sources":["../../src/agent/request-accounting.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,30 +1,23 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { type ContextWindowSource } from "../llm/context-windows.js";
|
|
2
2
|
import type { ProviderId } from "../types.js";
|
|
3
3
|
import { RESERVED_OUTPUT_TOKENS, SAFETY_MARGIN_TOKENS } from "./request-accounting.js";
|
|
4
4
|
export { RESERVED_OUTPUT_TOKENS, SAFETY_MARGIN_TOKENS };
|
|
5
|
-
export { DEFAULT_AUTO_COMPACT_REQUEST_TOKENS };
|
|
6
5
|
export declare const AUTO_COMPACT_HEADROOM_TOKENS: number;
|
|
7
|
-
export declare const
|
|
8
|
-
export
|
|
9
|
-
|
|
6
|
+
export declare const AUTO_COMPACT_CONTEXT_RATIO = 0.7;
|
|
7
|
+
export interface RequestBudgetTarget {
|
|
8
|
+
readonly provider?: ProviderId | undefined;
|
|
9
|
+
readonly model?: string | undefined;
|
|
10
|
+
readonly contextLimitTokens?: number | undefined;
|
|
11
|
+
}
|
|
10
12
|
export interface RequestBudget {
|
|
13
|
+
readonly windowTokens: number;
|
|
14
|
+
readonly windowSource: ContextWindowSource;
|
|
11
15
|
readonly configured: number;
|
|
12
16
|
readonly modelSafe: number;
|
|
13
17
|
readonly effectiveTrigger: number;
|
|
14
|
-
readonly source: RequestBudgetSource;
|
|
15
18
|
readonly clampedByModel: boolean;
|
|
16
19
|
}
|
|
17
|
-
export declare function configuredRequestTokens(): {
|
|
18
|
-
tokens: number;
|
|
19
|
-
source: RequestBudgetSource;
|
|
20
|
-
};
|
|
21
20
|
export declare function effectiveSafeTokensForWindow(window: number): number;
|
|
22
21
|
export declare function autoCompactHeadroomTokens(modelSafe: number): number;
|
|
23
|
-
export declare function
|
|
24
|
-
export declare function
|
|
25
|
-
readonly provider?: ProviderId | undefined;
|
|
26
|
-
readonly model?: string | undefined;
|
|
27
|
-
readonly overrideTokens?: number | undefined;
|
|
28
|
-
readonly contextLimitTokens?: number | undefined;
|
|
29
|
-
}): RequestBudget;
|
|
30
|
-
export declare function requestBudgetDenominator(provider: ProviderId | undefined, model: string | undefined, contextLimitTokens?: number | undefined): number;
|
|
22
|
+
export declare function resolveRequestBudget(target?: RequestBudgetTarget): RequestBudget;
|
|
23
|
+
export declare function autoCompactTriggerTokens(target?: RequestBudgetTarget): number;
|
|
@@ -1,28 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { DEFAULT_AUTO_COMPACT_REQUEST_TOKENS } from "../store/config/compaction.js";
|
|
3
|
-
import { modelContextWindow } from "../llm/token-usage.js";
|
|
1
|
+
import { resolveContextWindow, } from "../llm/context-windows.js";
|
|
4
2
|
import { RESERVED_OUTPUT_TOKENS, SAFETY_MARGIN_TOKENS, } from "./request-accounting.js";
|
|
5
3
|
import { COMPACTION_INPUT_SAFETY_TOKENS, COMPACTION_MAX_COMPLETION_TOKENS, } from "./compaction-summary.js";
|
|
6
4
|
export { RESERVED_OUTPUT_TOKENS, SAFETY_MARGIN_TOKENS };
|
|
7
|
-
export { DEFAULT_AUTO_COMPACT_REQUEST_TOKENS };
|
|
8
5
|
export const AUTO_COMPACT_HEADROOM_TOKENS = COMPACTION_MAX_COMPLETION_TOKENS + COMPACTION_INPUT_SAFETY_TOKENS;
|
|
9
|
-
export const
|
|
10
|
-
export const MIN_AUTO_COMPACT_REQUEST_TOKENS = 20_000;
|
|
11
|
-
export function configuredRequestTokens() {
|
|
12
|
-
const config = getConfig();
|
|
13
|
-
if (hasExplicitConfigKey("autoCompactRequestTokens") &&
|
|
14
|
-
typeof config.autoCompactRequestTokens === "number") {
|
|
15
|
-
return { tokens: config.autoCompactRequestTokens, source: "explicit" };
|
|
16
|
-
}
|
|
17
|
-
if (hasExplicitConfigKey("softCompactTokenBudget") &&
|
|
18
|
-
typeof config.softCompactTokenBudget === "number") {
|
|
19
|
-
return { tokens: config.softCompactTokenBudget, source: "legacy" };
|
|
20
|
-
}
|
|
21
|
-
return {
|
|
22
|
-
tokens: DEFAULT_AUTO_COMPACT_REQUEST_TOKENS,
|
|
23
|
-
source: "default",
|
|
24
|
-
};
|
|
25
|
-
}
|
|
6
|
+
export const AUTO_COMPACT_CONTEXT_RATIO = 0.7;
|
|
26
7
|
export function effectiveSafeTokensForWindow(window) {
|
|
27
8
|
const floored = Math.max(0, Math.floor(window));
|
|
28
9
|
const reserved = Math.min(RESERVED_OUTPUT_TOKENS, Math.floor(floored * 0.25));
|
|
@@ -34,45 +15,25 @@ export function autoCompactHeadroomTokens(modelSafe) {
|
|
|
34
15
|
function effectiveAutoCompactTrigger(configured, modelSafe) {
|
|
35
16
|
return Math.max(1, Math.min(configured, modelSafe - autoCompactHeadroomTokens(modelSafe)));
|
|
36
17
|
}
|
|
37
|
-
export function
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
const modelSafe = effectiveSafeTokensForWindow(customLimit);
|
|
46
|
-
const configured = Math.floor(customLimit * CUSTOM_CONTEXT_COMPACTION_RATIO);
|
|
47
|
-
const effectiveTrigger = effectiveAutoCompactTrigger(configured, modelSafe);
|
|
48
|
-
return {
|
|
49
|
-
configured,
|
|
50
|
-
modelSafe,
|
|
51
|
-
effectiveTrigger,
|
|
52
|
-
source: "session",
|
|
53
|
-
clampedByModel: effectiveTrigger < configured,
|
|
54
|
-
};
|
|
55
|
-
}
|
|
56
|
-
const resolved = configuredRequestTokens();
|
|
57
|
-
const raw = input?.overrideTokens ?? resolved.tokens;
|
|
58
|
-
const configured = Number.isFinite(raw)
|
|
59
|
-
? Math.max(MIN_AUTO_COMPACT_REQUEST_TOKENS, Math.floor(raw))
|
|
60
|
-
: DEFAULT_AUTO_COMPACT_REQUEST_TOKENS;
|
|
61
|
-
const modelSafe = modelSafeRequestTokens(input?.provider, input?.model);
|
|
18
|
+
export function resolveRequestBudget(target = {}) {
|
|
19
|
+
const window = resolveContextWindow({
|
|
20
|
+
provider: target.provider,
|
|
21
|
+
model: target.model,
|
|
22
|
+
contextLimitTokens: target.contextLimitTokens,
|
|
23
|
+
});
|
|
24
|
+
const configured = Math.floor(window.tokens * AUTO_COMPACT_CONTEXT_RATIO);
|
|
25
|
+
const modelSafe = effectiveSafeTokensForWindow(window.tokens);
|
|
62
26
|
const effectiveTrigger = effectiveAutoCompactTrigger(configured, modelSafe);
|
|
63
27
|
return {
|
|
28
|
+
windowTokens: window.tokens,
|
|
29
|
+
windowSource: window.source,
|
|
64
30
|
configured,
|
|
65
31
|
modelSafe,
|
|
66
32
|
effectiveTrigger,
|
|
67
|
-
source: input?.overrideTokens === undefined ? resolved.source : "explicit",
|
|
68
33
|
clampedByModel: effectiveTrigger < configured,
|
|
69
34
|
};
|
|
70
35
|
}
|
|
71
|
-
export function
|
|
72
|
-
return resolveRequestBudget(
|
|
73
|
-
...(provider ? { provider } : {}),
|
|
74
|
-
...(model ? { model } : {}),
|
|
75
|
-
...(contextLimitTokens ? { contextLimitTokens } : {}),
|
|
76
|
-
}).effectiveTrigger;
|
|
36
|
+
export function autoCompactTriggerTokens(target = {}) {
|
|
37
|
+
return resolveRequestBudget(target).effectiveTrigger;
|
|
77
38
|
}
|
|
78
39
|
//# sourceMappingURL=request-budget.js.map
|