@pentoshi/clai 4.11.26 → 4.11.28
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/meta-effort.d.ts +4 -0
- package/dist/llm/meta-effort.js +29 -0
- package/dist/llm/meta-effort.js.map +1 -0
- package/dist/llm/meta.js +13 -6
- package/dist/llm/meta.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/provider-info-text.js +3 -2
- package/dist/llm/provider-info-text.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 +1 -0
- package/dist/llm/reasoning-errors.js +6 -0
- package/dist/llm/reasoning-errors.js.map +1 -1
- package/dist/llm/responses-config.d.ts +1 -1
- package/dist/llm/responses-config.js.map +1 -1
- package/dist/llm/responses-request.js +1 -1
- package/dist/llm/responses-request.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/llm/wire/reasoning-payload.js +2 -8
- package/dist/llm/wire/reasoning-payload.js.map +1 -1
- 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,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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-budget.js","sourceRoot":"","sources":["../../src/agent/request-budget.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"request-budget.js","sourceRoot":"","sources":["../../src/agent/request-budget.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,GAErB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,8BAA8B,EAC9B,gCAAgC,GACjC,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,CAAC;AAExD,MAAM,CAAC,MAAM,4BAA4B,GACvC,gCAAgC,GAAG,8BAA8B,CAAC;AAEpE,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAiB9C,MAAM,UAAU,4BAA4B,CAAC,MAAc;IACzD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CACvB,sBAAsB,EACtB,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAC3B,CAAC;IACF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,oBAAoB,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,SAAiB;IACzD,OAAO,IAAI,CAAC,GAAG,CACb,4BAA4B,EAC5B,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,CAC1C,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAClC,UAAkB,EAClB,SAAiB;IAEjB,OAAO,IAAI,CAAC,GAAG,CACb,CAAC,EACD,IAAI,CAAC,GAAG,CACN,UAAU,EACV,SAAS,GAAG,yBAAyB,CAAC,SAAS,CAAC,CACjD,CACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,SAA8B,EAAE;IAEhC,MAAM,MAAM,GAAG,oBAAoB,CAAC;QAClC,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;KAC9C,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,0BAA0B,CAAC,CAAC;IAC1E,MAAM,SAAS,GAAG,4BAA4B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9D,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAC5E,OAAO;QACL,YAAY,EAAE,MAAM,CAAC,MAAM;QAC3B,YAAY,EAAE,MAAM,CAAC,MAAM;QAC3B,UAAU;QACV,SAAS;QACT,gBAAgB;QAChB,cAAc,EAAE,gBAAgB,GAAG,UAAU;KAC9C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,SAA8B,EAAE;IACvE,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,gBAAgB,CAAC;AACvD,CAAC"}
|
package/dist/agent/runner.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { hasMcpMentionSyntax } from "../mcp/mentions.js";
|
|
2
|
-
import {
|
|
2
|
+
import { effectiveContextWindowTokens, providerInputTokenBudget, } from "../llm/context-windows.js";
|
|
3
3
|
import { contextAttemptFromOperationUsage } from "../llm/context-snapshot.js";
|
|
4
4
|
import { createStreamRecoveryState } from "./stream-recovery.js";
|
|
5
5
|
import { createTurnFinisher } from "./turn/finalizer.js";
|
|
@@ -16,6 +16,7 @@ import { runSingleTool } from "./turn/tool-execution/single-tool.js";
|
|
|
16
16
|
import { runTurnRounds } from "./turn/loop/run-rounds.js";
|
|
17
17
|
import { createToolExecutionState } from "./turn/tool-execution/state.js";
|
|
18
18
|
import { createTurnLoopState } from "./turn/loop/state.js";
|
|
19
|
+
import { projectMeasuredTokens, providerContextMeasurement, } from "./turn/provider-measurement.js";
|
|
19
20
|
import { classifyTurnPrompt } from "./turn/setup/prompt-classification.js";
|
|
20
21
|
import { setUpResponderWake } from "./turn/setup/responder-wake.js";
|
|
21
22
|
import { composeTurnMessages } from "./turn/setup/turn-messages.js";
|
|
@@ -163,9 +164,6 @@ export async function runAgentTurn(prompt, options = {}) {
|
|
|
163
164
|
provider: initialProvider,
|
|
164
165
|
model: initialModel,
|
|
165
166
|
previousSuccessfulRequest: options.previousSuccessfulRequest,
|
|
166
|
-
...(options.providerReportedContextTokens !== undefined
|
|
167
|
-
? { providerReportedContextTokens: options.providerReportedContextTokens }
|
|
168
|
-
: {}),
|
|
169
167
|
});
|
|
170
168
|
const toolRouting = createToolRouting({
|
|
171
169
|
mode: agentMode,
|
|
@@ -184,8 +182,7 @@ export async function runAgentTurn(prompt, options = {}) {
|
|
|
184
182
|
? options.getContextLimitTokens(loop.provider, loop.model)
|
|
185
183
|
: options.contextLimitTokens;
|
|
186
184
|
const inputTokenBudget = providerInputTokenBudget(loop.provider, loop.model);
|
|
187
|
-
const
|
|
188
|
-
const effectiveLimit = currentContextLimitTokens() ?? windowTokens;
|
|
185
|
+
const effectiveLimit = effectiveContextWindowTokens(loop.provider, loop.model, currentContextLimitTokens());
|
|
189
186
|
const useCompactSystemPrompt = inputTokenBudget !== undefined || effectiveLimit <= 65_536;
|
|
190
187
|
const selectToolDefs = (native, compact, routeProvider = loop.provider, routeModel = loop.model) => toolRouting.selectToolDefs(native, compact, routeProvider, routeModel);
|
|
191
188
|
const buildStableSystemContent = (native) => toolRouting.buildStableSystemContent(native, loop.provider, loop.model);
|
|
@@ -195,7 +192,7 @@ export async function runAgentTurn(prompt, options = {}) {
|
|
|
195
192
|
beginSessionWorkspace();
|
|
196
193
|
}
|
|
197
194
|
const counters = createTurnCounters();
|
|
198
|
-
const activePlan = await loadPlan(session.sessionId)
|
|
195
|
+
const activePlan = await loadPlan(session.sessionId);
|
|
199
196
|
const toolState = createToolExecutionState(activePlan, createGovernorState());
|
|
200
197
|
if (activePlan && isPlanApprovedByStatus(activePlan.status)) {
|
|
201
198
|
session.planApproved.value = true;
|
|
@@ -441,6 +438,9 @@ export async function runAgentTurn(prompt, options = {}) {
|
|
|
441
438
|
const compactionAttempts = new CompactionAttemptLedger();
|
|
442
439
|
const compactionExecutionState = {};
|
|
443
440
|
const toolResultHashes = new Map();
|
|
441
|
+
const measureRequestTokens = (estimatedTokens) => loop.providerMeasurement
|
|
442
|
+
? projectMeasuredTokens(loop.providerMeasurement, estimatedTokens)
|
|
443
|
+
: undefined;
|
|
444
444
|
const { estimateNextRequestTokens, maybeAutoCompact } = createCompactionServices({
|
|
445
445
|
messages,
|
|
446
446
|
provider: () => loop.provider,
|
|
@@ -459,7 +459,7 @@ export async function runAgentTurn(prompt, options = {}) {
|
|
|
459
459
|
const { native } = resolveNativeTools(loop.provider, loop.model);
|
|
460
460
|
return selectToolDefs(native, useCompactSystemPrompt);
|
|
461
461
|
},
|
|
462
|
-
loadPlan: () => loadPlan(session.sessionId)
|
|
462
|
+
loadPlan: () => loadPlan(session.sessionId),
|
|
463
463
|
loadPlanStrict: () => loadPlan(session.sessionId),
|
|
464
464
|
projectRoot: getActiveProjectRoot,
|
|
465
465
|
detectPackageManager,
|
|
@@ -467,13 +467,14 @@ export async function runAgentTurn(prompt, options = {}) {
|
|
|
467
467
|
runningJobs: () => jobManager.getRunningJobs(session.sessionId),
|
|
468
468
|
recentJobs: () => jobManager.getRecentJobs(12, session.sessionId),
|
|
469
469
|
requestSnapshot: () => loop.lastSuccessfulRequestSnapshot,
|
|
470
|
-
|
|
471
|
-
thinking: () =>
|
|
472
|
-
? { ...config.thinking, enabled: false, effort: "low" }
|
|
473
|
-
: config.thinking,
|
|
470
|
+
measureRequestTokens,
|
|
471
|
+
thinking: () => config.thinking,
|
|
474
472
|
clearRequestSnapshot: () => {
|
|
475
473
|
loop.lastSuccessfulRequestSnapshot = undefined;
|
|
476
474
|
},
|
|
475
|
+
clearProviderMeasurement: () => {
|
|
476
|
+
loop.providerMeasurement = undefined;
|
|
477
|
+
},
|
|
477
478
|
instructionsBlock: () => agentInstructionsBlock,
|
|
478
479
|
skillsBlock: () => activeSkillsBlock,
|
|
479
480
|
planApproved: () => session.planApproved.value,
|
|
@@ -494,6 +495,7 @@ export async function runAgentTurn(prompt, options = {}) {
|
|
|
494
495
|
model: completion.model,
|
|
495
496
|
...(completion.api ? { api: completion.api } : {}),
|
|
496
497
|
...(attempt.kind === "generation" ? { attempt } : {}),
|
|
498
|
+
auxiliary: true,
|
|
497
499
|
});
|
|
498
500
|
},
|
|
499
501
|
writeStarted: writeCompactionStarted,
|
|
@@ -504,6 +506,7 @@ export async function runAgentTurn(prompt, options = {}) {
|
|
|
504
506
|
void auditLog(event, payload);
|
|
505
507
|
},
|
|
506
508
|
});
|
|
509
|
+
loop.providerMeasurement = providerContextMeasurement(options.providerReportedContextTokens, estimateNextRequestTokens(messages.slice(0, 1 + (options.history?.length ?? 0))));
|
|
507
510
|
const loopDeps = {
|
|
508
511
|
...singleToolDeps,
|
|
509
512
|
options,
|
|
@@ -536,6 +539,7 @@ export async function runAgentTurn(prompt, options = {}) {
|
|
|
536
539
|
composeCurrentSystemPrompt,
|
|
537
540
|
currentContextLimitTokens,
|
|
538
541
|
estimateNextRequestTokens,
|
|
542
|
+
measureRequestTokens,
|
|
539
543
|
selectToolDefs,
|
|
540
544
|
maybeAutoCompact,
|
|
541
545
|
resolveNativeTools,
|
package/dist/agent/runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type StreamFailureKind = "aborted" | "empty" | "context-overflow" | "rate-limit" | "server" | "network" | "stall" | "auth" | "not-found" | "unknown";
|
|
1
|
+
export type StreamFailureKind = "aborted" | "content-policy" | "empty" | "context-overflow" | "rate-limit" | "server" | "network" | "stall" | "auth" | "not-found" | "unknown";
|
|
2
2
|
export interface StreamRecoveryState {
|
|
3
3
|
empty: number;
|
|
4
4
|
rateLimit: number;
|
|
@@ -31,7 +31,6 @@ export interface StreamRecoveryPlan {
|
|
|
31
31
|
readonly kind: StreamFailureKind;
|
|
32
32
|
readonly delayMs: number;
|
|
33
33
|
readonly forceCompact: boolean;
|
|
34
|
-
readonly disableThinking: boolean;
|
|
35
34
|
readonly allowModelFallback: boolean;
|
|
36
35
|
readonly preferModelFallback?: boolean | undefined;
|
|
37
36
|
readonly nudge?: string | undefined;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ProviderError, STREAM_STALL_MARKER } from "../llm/http.js";
|
|
2
2
|
import { rateLimitWaitMsFor } from "../llm/key-rotation.js";
|
|
3
|
+
import { isContentPolicyError } from "../llm/reasoning-errors.js";
|
|
3
4
|
import { isEmptyCompletionError } from "../llm/router.js";
|
|
4
5
|
import { SERVER_ERROR_MAX_ATTEMPTS, serverErrorAttemptsFor, } from "../llm/routing/error-classification.js";
|
|
5
6
|
export const DEFAULT_STREAM_RECOVERY_LIMITS = {
|
|
@@ -50,6 +51,8 @@ export function classifyStreamFailure(error) {
|
|
|
50
51
|
if (/\babort(ed)?\b|operation was aborted|the operation was cancelled/.test(msg)) {
|
|
51
52
|
return "aborted";
|
|
52
53
|
}
|
|
54
|
+
if (isContentPolicyError(error))
|
|
55
|
+
return "content-policy";
|
|
53
56
|
if (status === 413 ||
|
|
54
57
|
/\b413\b|input limit|context length|context window|maximum context|too large|reduce the length|exceeded the provider input|prompt is too long|token limit/.test(msg)) {
|
|
55
58
|
return "context-overflow";
|
|
@@ -157,10 +160,9 @@ export function planStreamRecovery(input) {
|
|
|
157
160
|
kind,
|
|
158
161
|
delayMs: 0,
|
|
159
162
|
forceCompact: false,
|
|
160
|
-
disableThinking: false,
|
|
161
163
|
allowModelFallback: false,
|
|
162
164
|
};
|
|
163
|
-
if (kind === "aborted")
|
|
165
|
+
if (kind === "aborted" || kind === "content-policy")
|
|
164
166
|
return giveUp;
|
|
165
167
|
if (state.total >= limits.maxTotal)
|
|
166
168
|
return giveUp;
|
|
@@ -176,8 +178,7 @@ export function planStreamRecovery(input) {
|
|
|
176
178
|
action: "retry",
|
|
177
179
|
kind,
|
|
178
180
|
delayMs: pick([500, 1000, 1500, 2000], n, cap),
|
|
179
|
-
|
|
180
|
-
forceCompact: n >= 2,
|
|
181
|
+
forceCompact: false,
|
|
181
182
|
allowModelFallback: n >= 2,
|
|
182
183
|
nudge: EMPTY_NUDGE,
|
|
183
184
|
notice: n === 0
|
|
@@ -195,7 +196,6 @@ export function planStreamRecovery(input) {
|
|
|
195
196
|
kind,
|
|
196
197
|
delayMs,
|
|
197
198
|
forceCompact: false,
|
|
198
|
-
disableThinking: false,
|
|
199
199
|
allowModelFallback: true,
|
|
200
200
|
notice: n === 0
|
|
201
201
|
? `provider rate limited — retrying in ${Math.ceil(delayMs / 1000)}s and trying alternates`
|
|
@@ -213,7 +213,6 @@ export function planStreamRecovery(input) {
|
|
|
213
213
|
kind,
|
|
214
214
|
delayMs: pick([3_000, 8_000, 15_000], n, cap),
|
|
215
215
|
forceCompact: false,
|
|
216
|
-
disableThinking: false,
|
|
217
216
|
allowModelFallback: true,
|
|
218
217
|
notice: n === 0
|
|
219
218
|
? "upstream provider error — backing off and trying alternates"
|
|
@@ -229,7 +228,6 @@ export function planStreamRecovery(input) {
|
|
|
229
228
|
kind,
|
|
230
229
|
delayMs: pick([2_000, 5_000, 10_000], n, cap),
|
|
231
230
|
forceCompact: false,
|
|
232
|
-
disableThinking: false,
|
|
233
231
|
allowModelFallback: n >= 1,
|
|
234
232
|
notice: n === 0 ? "connection dropped — retrying" : undefined,
|
|
235
233
|
};
|
|
@@ -243,7 +241,6 @@ export function planStreamRecovery(input) {
|
|
|
243
241
|
kind,
|
|
244
242
|
delayMs: pick([1_000, 3_000], n, cap),
|
|
245
243
|
forceCompact: false,
|
|
246
|
-
disableThinking: n >= 1,
|
|
247
244
|
allowModelFallback: true,
|
|
248
245
|
preferModelFallback: true,
|
|
249
246
|
nudge: STALL_NUDGE,
|
|
@@ -261,7 +258,6 @@ export function planStreamRecovery(input) {
|
|
|
261
258
|
kind,
|
|
262
259
|
delayMs: pick([500, 500], n, cap),
|
|
263
260
|
forceCompact: true,
|
|
264
|
-
disableThinking: false,
|
|
265
261
|
allowModelFallback: n >= 1,
|
|
266
262
|
notice: n === 0
|
|
267
263
|
? "request exceeded the context window — compacting and retrying"
|
|
@@ -284,7 +280,6 @@ export function planStreamRecovery(input) {
|
|
|
284
280
|
kind,
|
|
285
281
|
delayMs: Math.min(kind === "unknown" ? 2_000 : 1_000, cap),
|
|
286
282
|
forceCompact: false,
|
|
287
|
-
disableThinking: false,
|
|
288
283
|
allowModelFallback: true,
|
|
289
284
|
notice,
|
|
290
285
|
};
|