@pentoshi/clai 4.11.16 → 4.11.18
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 +31 -22
- package/dist/agent/compaction/summary-execution.d.ts +1 -0
- package/dist/agent/compaction/summary-execution.js +25 -16
- package/dist/agent/compaction/summary-execution.js.map +1 -1
- package/dist/agent/context/compact-with-summary.js +18 -0
- package/dist/agent/context/compact-with-summary.js.map +1 -1
- package/dist/agent/context/compaction-source-prefix.d.ts +8 -0
- package/dist/agent/context/compaction-source-prefix.js +26 -0
- package/dist/agent/context/compaction-source-prefix.js.map +1 -0
- package/dist/agent/plan-decision.js +5 -1
- package/dist/agent/plan-decision.js.map +1 -1
- package/dist/agent/runner.js +3 -0
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/subagents/manager.d.ts +5 -0
- package/dist/agent/subagents/manager.js +52 -5
- package/dist/agent/subagents/manager.js.map +1 -1
- package/dist/agent/subagents/model-chain.d.ts +31 -0
- package/dist/agent/subagents/model-chain.js +146 -0
- package/dist/agent/subagents/model-chain.js.map +1 -0
- package/dist/agent/subagents/read-only-tools.js +362 -54
- package/dist/agent/subagents/read-only-tools.js.map +1 -1
- package/dist/agent/subagents/tools.js +21 -1
- package/dist/agent/subagents/tools.js.map +1 -1
- package/dist/agent/subagents/types.d.ts +5 -0
- package/dist/agent/subagents/worker.js +106 -45
- package/dist/agent/subagents/worker.js.map +1 -1
- package/dist/agent/turn/compaction-summarizer.d.ts +1 -0
- package/dist/agent/turn/compaction-summarizer.js +2 -0
- package/dist/agent/turn/compaction-summarizer.js.map +1 -1
- package/dist/agent/turn/loop/run-rounds.js +2 -0
- package/dist/agent/turn/loop/run-rounds.js.map +1 -1
- package/dist/agent/turn/loop/stream-request.js +1 -0
- package/dist/agent/turn/loop/stream-request.js.map +1 -1
- package/dist/agent/turn/setup/compaction-services.d.ts +2 -1
- package/dist/agent/turn/setup/compaction-services.js +14 -0
- package/dist/agent/turn/setup/compaction-services.js.map +1 -1
- package/dist/agent/turn/setup/turn-budget.js +1 -9
- package/dist/agent/turn/setup/turn-budget.js.map +1 -1
- package/dist/agent/turn/subagent-inbox.d.ts +1 -0
- package/dist/agent/turn/subagent-inbox.js +12 -1
- package/dist/agent/turn/subagent-inbox.js.map +1 -1
- package/dist/app/commands/catalog.js +2 -1
- package/dist/app/commands/catalog.js.map +1 -1
- package/dist/app/controllers/session-compact-helper.d.ts +2 -0
- package/dist/app/controllers/session-compact-helper.js +7 -3
- package/dist/app/controllers/session-compact-helper.js.map +1 -1
- package/dist/app/controllers/session-context-usage.d.ts +2 -5
- package/dist/app/controllers/session-context-usage.js +28 -101
- package/dist/app/controllers/session-context-usage.js.map +1 -1
- package/dist/app/controllers/session-controller.d.ts +8 -1
- package/dist/app/controllers/session-controller.js +14 -11
- package/dist/app/controllers/session-controller.js.map +1 -1
- package/dist/app/controllers/session-subagents.d.ts +1 -0
- package/dist/app/controllers/session-subagents.js +7 -1
- package/dist/app/controllers/session-subagents.js.map +1 -1
- package/dist/classic/app/ClassicApp.js +4 -0
- package/dist/classic/app/ClassicApp.js.map +1 -1
- package/dist/classic/chrome/Chrome.d.ts +1 -1
- package/dist/classic/chrome/Chrome.js +1 -0
- package/dist/classic/chrome/Chrome.js.map +1 -1
- package/dist/classic/chrome/SubagentsStrip.d.ts +3 -0
- package/dist/classic/chrome/SubagentsStrip.js +9 -0
- package/dist/classic/chrome/SubagentsStrip.js.map +1 -0
- package/dist/classic/chrome/row-budget.d.ts +2 -0
- package/dist/classic/chrome/row-budget.js +4 -1
- package/dist/classic/chrome/row-budget.js.map +1 -1
- package/dist/classic/chrome/subagents-row.d.ts +9 -0
- package/dist/classic/chrome/subagents-row.js +13 -0
- package/dist/classic/chrome/subagents-row.js.map +1 -0
- package/dist/classic/panels/keys-panel.d.ts +2 -2
- package/dist/classic/panels/keys-panel.js +24 -8
- package/dist/classic/panels/keys-panel.js.map +1 -1
- package/dist/classic/panels/pager-panel.d.ts +2 -2
- package/dist/classic/panels/pager-panel.js +7 -6
- package/dist/classic/panels/pager-panel.js.map +1 -1
- package/dist/classic/panels/panel-host.js +7 -2
- package/dist/classic/panels/panel-host.js.map +1 -1
- package/dist/commands/providers.js +8 -0
- package/dist/commands/providers.js.map +1 -1
- package/dist/llm/anthropic.js +29 -1
- package/dist/llm/anthropic.js.map +1 -1
- package/dist/llm/bynara.js +9 -20
- package/dist/llm/bynara.js.map +1 -1
- package/dist/llm/capabilities.d.ts +6 -1
- package/dist/llm/capabilities.js +130 -6
- package/dist/llm/capabilities.js.map +1 -1
- package/dist/llm/capability/state.d.ts +1 -1
- package/dist/llm/capability/state.js +16 -2
- package/dist/llm/capability/state.js.map +1 -1
- package/dist/llm/capability/tool-dialect.js +4 -0
- package/dist/llm/capability/tool-dialect.js.map +1 -1
- package/dist/llm/capability/vision-patterns.d.ts +1 -0
- package/dist/llm/capability/vision-patterns.js +31 -1
- package/dist/llm/capability/vision-patterns.js.map +1 -1
- package/dist/llm/capability/vision-registry.js +8 -2
- package/dist/llm/capability/vision-registry.js.map +1 -1
- package/dist/llm/context-windows.js +1 -0
- package/dist/llm/context-windows.js.map +1 -1
- package/dist/llm/deepseek.d.ts +2 -0
- package/dist/llm/deepseek.js +91 -0
- package/dist/llm/deepseek.js.map +1 -0
- package/dist/llm/glm.d.ts +2 -0
- package/dist/llm/glm.js +91 -0
- package/dist/llm/glm.js.map +1 -0
- package/dist/llm/kimi.d.ts +2 -0
- package/dist/llm/kimi.js +91 -0
- package/dist/llm/kimi.js.map +1 -0
- package/dist/llm/learned-capabilities.js +9 -3
- package/dist/llm/learned-capabilities.js.map +1 -1
- package/dist/llm/lowest-reasoning.js +20 -7
- package/dist/llm/lowest-reasoning.js.map +1 -1
- package/dist/llm/minimax.d.ts +2 -0
- package/dist/llm/minimax.js +91 -0
- package/dist/llm/minimax.js.map +1 -0
- package/dist/llm/modal.js +5 -0
- package/dist/llm/modal.js.map +1 -1
- package/dist/llm/model-layers/model-rules.js +24 -0
- package/dist/llm/model-layers/model-rules.js.map +1 -1
- package/dist/llm/ollama.js +26 -1
- package/dist/llm/ollama.js.map +1 -1
- package/dist/llm/provider-identity.js +25 -0
- package/dist/llm/provider-identity.js.map +1 -1
- package/dist/llm/provider-info-text.js +121 -3
- package/dist/llm/provider-info-text.js.map +1 -1
- package/dist/llm/provider-profile-layers.js +118 -0
- package/dist/llm/provider-profile-layers.js.map +1 -1
- package/dist/llm/provider.js +14 -2
- package/dist/llm/provider.js.map +1 -1
- package/dist/llm/reasoning-capability.js +4 -0
- package/dist/llm/reasoning-capability.js.map +1 -1
- package/dist/llm/reasoning-errors.js +1 -1
- package/dist/llm/reasoning-errors.js.map +1 -1
- package/dist/llm/request-purpose.d.ts +3 -0
- package/dist/llm/request-purpose.js +11 -0
- package/dist/llm/request-purpose.js.map +1 -0
- package/dist/llm/responses-config.d.ts +1 -0
- package/dist/llm/responses-config.js +6 -0
- package/dist/llm/responses-config.js.map +1 -1
- package/dist/llm/responses-http.d.ts +1 -1
- package/dist/llm/responses-http.js +2 -1
- package/dist/llm/responses-http.js.map +1 -1
- package/dist/llm/responses-stream.d.ts +2 -2
- package/dist/llm/responses-stream.js +3 -2
- package/dist/llm/responses-stream.js.map +1 -1
- package/dist/llm/routing/attempt-complete.js +15 -3
- package/dist/llm/routing/attempt-complete.js.map +1 -1
- package/dist/llm/routing/attempt-request.d.ts +11 -0
- package/dist/llm/routing/attempt-request.js +56 -5
- package/dist/llm/routing/attempt-request.js.map +1 -1
- package/dist/llm/routing/attempt-stream.js +15 -3
- package/dist/llm/routing/attempt-stream.js.map +1 -1
- package/dist/llm/routing/error-classification.d.ts +2 -0
- package/dist/llm/routing/error-classification.js +26 -6
- package/dist/llm/routing/error-classification.js.map +1 -1
- package/dist/llm/routing/key-rotation.js +26 -11
- package/dist/llm/routing/key-rotation.js.map +1 -1
- package/dist/llm/routing/provider-selection.js +12 -0
- package/dist/llm/routing/provider-selection.js.map +1 -1
- package/dist/llm/session-affinity.d.ts +1 -0
- package/dist/llm/session-affinity.js +4 -0
- package/dist/llm/session-affinity.js.map +1 -1
- package/dist/llm/session-route.d.ts +7 -0
- package/dist/llm/session-route.js +16 -0
- package/dist/llm/session-route.js.map +1 -0
- package/dist/llm/wire/capability-errors.js +4 -4
- package/dist/llm/wire/capability-errors.js.map +1 -1
- package/dist/llm/wire/chat-body.js +5 -4
- package/dist/llm/wire/chat-body.js.map +1 -1
- package/dist/llm/wire/effort-preflight.d.ts +15 -0
- package/dist/llm/wire/effort-preflight.js +141 -0
- package/dist/llm/wire/effort-preflight.js.map +1 -0
- package/dist/llm/wire/image-payloads.d.ts +2 -0
- package/dist/llm/wire/image-payloads.js +34 -0
- package/dist/llm/wire/image-payloads.js.map +1 -0
- package/dist/llm/wire/openai-complete.d.ts +4 -1
- package/dist/llm/wire/openai-complete.js +11 -3
- package/dist/llm/wire/openai-complete.js.map +1 -1
- package/dist/llm/wire/openai-stream.d.ts +5 -2
- package/dist/llm/wire/openai-stream.js +17 -8
- package/dist/llm/wire/openai-stream.js.map +1 -1
- package/dist/llm/wire/responses-first.d.ts +4 -1
- package/dist/llm/wire/responses-first.js +11 -7
- package/dist/llm/wire/responses-first.js.map +1 -1
- package/dist/llm/wire/responses-preflight.js +29 -12
- package/dist/llm/wire/responses-preflight.js.map +1 -1
- package/dist/prompts/embedded.js +1 -1
- package/dist/prompts/embedded.js.map +1 -1
- package/dist/prompts/index.js +42 -21
- package/dist/prompts/index.js.map +1 -1
- package/dist/prompts/system.agent.md +3 -3
- package/dist/store/config/endpoints.d.ts +11 -0
- package/dist/store/config/endpoints.js +19 -1
- package/dist/store/config/endpoints.js.map +1 -1
- package/dist/store/config/subagent-models.d.ts +7 -0
- package/dist/store/config/subagent-models.js +73 -0
- package/dist/store/config/subagent-models.js.map +1 -0
- package/dist/store/config.d.ts +4 -3
- package/dist/store/config.js +7 -2
- package/dist/store/config.js.map +1 -1
- package/dist/store/keys.js +8 -1
- package/dist/store/keys.js.map +1 -1
- package/dist/store/subagents.js +8 -1
- package/dist/store/subagents.js.map +1 -1
- package/dist/tools/definitions/subagents.d.ts +1 -1
- package/dist/tools/definitions/subagents.js +15 -6
- package/dist/tools/definitions/subagents.js.map +1 -1
- package/dist/tui-v2/app/App.js +4 -0
- package/dist/tui-v2/app/App.js.map +1 -1
- package/dist/tui-v2/bootstrap/patch-opentui-text.js +14 -13
- package/dist/tui-v2/bootstrap/patch-opentui-text.js.map +1 -1
- package/dist/tui-v2/bootstrap/renderer-handle.d.ts +1 -0
- package/dist/tui-v2/bootstrap/renderer-handle.js +2 -1
- package/dist/tui-v2/bootstrap/renderer-handle.js.map +1 -1
- package/dist/tui-v2/bootstrap/shrink-resize-guard.d.ts +27 -0
- package/dist/tui-v2/bootstrap/shrink-resize-guard.js +118 -0
- package/dist/tui-v2/bootstrap/shrink-resize-guard.js.map +1 -0
- package/dist/tui-v2/bootstrap/start-tui-v2.js +3 -0
- package/dist/tui-v2/bootstrap/start-tui-v2.js.map +1 -1
- package/dist/tui-v2/components/jobs/subagents-panel.d.ts +11 -0
- package/dist/tui-v2/components/jobs/subagents-panel.js +80 -0
- package/dist/tui-v2/components/jobs/subagents-panel.js.map +1 -0
- package/dist/tui-v2/components/modal/keys-modal-pick.d.ts +9 -0
- package/dist/tui-v2/components/modal/keys-modal-pick.js +15 -0
- package/dist/tui-v2/components/modal/keys-modal-pick.js.map +1 -0
- package/dist/tui-v2/components/modal/keys-modal.js +46 -12
- package/dist/tui-v2/components/modal/keys-modal.js.map +1 -1
- package/dist/tui-v2/components/pager/pager-line.js +3 -2
- package/dist/tui-v2/components/pager/pager-line.js.map +1 -1
- package/dist/tui-v2/components/pager/pager.js +47 -35
- package/dist/tui-v2/components/pager/pager.js.map +1 -1
- package/dist/tui-v2/components/transcript/thinking-block.js +1 -3
- package/dist/tui-v2/components/transcript/thinking-block.js.map +1 -1
- package/dist/tui-v2/components/transcript/thinking-presentation.d.ts +0 -1
- package/dist/tui-v2/components/transcript/thinking-presentation.js +1 -3
- package/dist/tui-v2/components/transcript/thinking-presentation.js.map +1 -1
- package/dist/tui-v2/rendering/pager-markdown.d.ts +2 -0
- package/dist/tui-v2/rendering/pager-markdown.js +10 -6
- package/dist/tui-v2/rendering/pager-markdown.js.map +1 -1
- package/dist/tui-v2/rendering/subagent-ansi.d.ts +4 -0
- package/dist/tui-v2/rendering/subagent-ansi.js +10 -0
- package/dist/tui-v2/rendering/subagent-ansi.js.map +1 -0
- package/dist/types.d.ts +2 -1
- package/dist/types.js +4 -0
- package/dist/types.js.map +1 -1
- package/dist/ui-core/commands/picker-commands.d.ts +12 -0
- package/dist/ui-core/commands/picker-commands.js +9 -5
- package/dist/ui-core/commands/picker-commands.js.map +1 -1
- package/dist/ui-core/commands/session-commands.js +5 -3
- package/dist/ui-core/commands/session-commands.js.map +1 -1
- package/dist/ui-core/commands/subagent-commands.d.ts +8 -0
- package/dist/ui-core/commands/subagent-commands.js +81 -21
- package/dist/ui-core/commands/subagent-commands.js.map +1 -1
- package/dist/ui-core/commands/subagent-models-editor.d.ts +2 -0
- package/dist/ui-core/commands/subagent-models-editor.js +123 -0
- package/dist/ui-core/commands/subagent-models-editor.js.map +1 -0
- package/dist/ui-core/controllers/overlay-controller.d.ts +10 -0
- package/dist/ui-core/controllers/overlay-controller.js.map +1 -1
- package/dist/ui-core/rendering/format-usage.js +5 -0
- package/dist/ui-core/rendering/format-usage.js.map +1 -1
- package/dist/ui-core/rendering/markdown.d.ts +2 -0
- package/dist/ui-core/rendering/markdown.js +1 -1
- package/dist/ui-core/rendering/markdown.js.map +1 -1
- package/dist/ui-core/rendering/sanitize-display.d.ts +3 -0
- package/dist/ui-core/rendering/sanitize-display.js +33 -2
- package/dist/ui-core/rendering/sanitize-display.js.map +1 -1
- package/dist/ui-core/rendering/status-segments.js +3 -1
- package/dist/ui-core/rendering/status-segments.js.map +1 -1
- package/dist/ui-core/rendering/subagent-presentation.d.ts +2 -0
- package/dist/ui-core/rendering/subagent-presentation.js +9 -0
- package/dist/ui-core/rendering/subagent-presentation.js.map +1 -1
- package/dist/ui-core/rendering/subagent-source.d.ts +2 -0
- package/dist/ui-core/rendering/subagent-source.js +10 -1
- package/dist/ui-core/rendering/subagent-source.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/llm/effort-fallback.d.ts +0 -6
- package/dist/llm/effort-fallback.js +0 -67
- package/dist/llm/effort-fallback.js.map +0 -1
|
@@ -12,6 +12,7 @@ export declare class SubagentInbox {
|
|
|
12
12
|
private readonly manager;
|
|
13
13
|
private readonly sessionId;
|
|
14
14
|
private readonly messages;
|
|
15
|
+
private launchCheckpointIssued;
|
|
15
16
|
constructor(manager: SubagentManager | undefined, sessionId: string, messages: ChatMessage[]);
|
|
16
17
|
private get available();
|
|
17
18
|
private prefix;
|
|
@@ -9,6 +9,7 @@ export class SubagentInbox {
|
|
|
9
9
|
manager;
|
|
10
10
|
sessionId;
|
|
11
11
|
messages;
|
|
12
|
+
launchCheckpointIssued = false;
|
|
12
13
|
constructor(manager, sessionId, messages) {
|
|
13
14
|
this.manager = manager;
|
|
14
15
|
this.sessionId = sessionId;
|
|
@@ -73,8 +74,18 @@ export class SubagentInbox {
|
|
|
73
74
|
return false;
|
|
74
75
|
if (this.manager.pendingResults().length)
|
|
75
76
|
return true;
|
|
76
|
-
|
|
77
|
+
const active = this.manager.list().filter((run) => run.status === "running" || run.status === "stopping");
|
|
78
|
+
if (!active.length)
|
|
77
79
|
return false;
|
|
80
|
+
if (active.length === 1 && !this.launchCheckpointIssued && onWaiting) {
|
|
81
|
+
this.launchCheckpointIssued = true;
|
|
82
|
+
this.messages.push({
|
|
83
|
+
role: "user",
|
|
84
|
+
internal: true,
|
|
85
|
+
content: "Parallel delegation checkpoint: one context gatherer is active. Before waiting for it or finalizing, launch every other independent context assignment now with subagent.start_many or consecutive subagent.start calls. If no sibling assignment exists, continue; the next final boundary will wait for this child.",
|
|
86
|
+
});
|
|
87
|
+
return true;
|
|
88
|
+
}
|
|
78
89
|
onWaiting?.();
|
|
79
90
|
await this.manager.waitAny(undefined, undefined, signal);
|
|
80
91
|
signal?.throwIfAborted();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-inbox.js","sourceRoot":"","sources":["../../../src/agent/turn/subagent-inbox.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AASvD,MAAM,OAAO,0BAA2B,SAAQ,KAAK;IACnD;QACE,KAAK,CAAC,wGAAwG,CAAC,CAAC;QAChH,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAC;IAC3C,CAAC;CACF;AAED,MAAM,OAAO,aAAa;
|
|
1
|
+
{"version":3,"file":"subagent-inbox.js","sourceRoot":"","sources":["../../../src/agent/turn/subagent-inbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,8 @@ export const slashCommands = [
|
|
|
4
4
|
{ command: "/agent", description: "switch to agent mode" },
|
|
5
5
|
{
|
|
6
6
|
command: "/orchestrator",
|
|
7
|
-
|
|
7
|
+
usage: "[on|off|status|models]",
|
|
8
|
+
description: "show delegation status, configure subagent models, or turn subagents on/off",
|
|
8
9
|
},
|
|
9
10
|
{
|
|
10
11
|
command: "/agents",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/app/commands/catalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAQ3D,MAAM,CAAC,MAAM,aAAa,GAAmB;IAC3C,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,oBAAoB,EAAE;IACtD,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,sBAAsB,EAAE;IAC1D;QACE,OAAO,EAAE,eAAe;QACxB,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/app/commands/catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ export declare function summarizeForSessionCompact(prompt: string, opts: {
|
|
|
11
11
|
stage?: "single" | "map" | "reduce" | undefined;
|
|
12
12
|
sourceMessages?: readonly ChatMessage[] | undefined;
|
|
13
13
|
baseRequest?: SuccessfulRequestSnapshot | undefined;
|
|
14
|
+
requestSettings?: Omit<SuccessfulRequestSnapshot, "messages"> | undefined;
|
|
14
15
|
history?: readonly ChatMessage[] | undefined;
|
|
15
16
|
contextLimitTokens?: number | undefined;
|
|
16
17
|
operation?: OperationLedger | undefined;
|
|
@@ -26,6 +27,7 @@ interface RunSessionCompactionOptions {
|
|
|
26
27
|
readonly provider: ProviderId | undefined;
|
|
27
28
|
readonly model: string | undefined;
|
|
28
29
|
readonly successfulRequest?: SuccessfulRequestSnapshot | undefined;
|
|
30
|
+
readonly requestSettings?: Omit<SuccessfulRequestSnapshot, "messages"> | undefined;
|
|
29
31
|
readonly contextLimitTokens?: number | undefined;
|
|
30
32
|
readonly requestTokensBefore?: number | undefined;
|
|
31
33
|
readonly persist: boolean;
|
|
@@ -2,6 +2,7 @@ import { buildDirectCompactionPrompt, calibratedCompactionSinglePassInputBudget,
|
|
|
2
2
|
import { executeCompactionSummary, isCompactionOverLimitError, planCompactionReplay, } from "../../agent/compaction-executor.js";
|
|
3
3
|
import { compactMessagesWithSummary, estimateMessagesTokens, isCompactionMemoryMessage, } from "../../agent/context-manager.js";
|
|
4
4
|
import { projectToolHistory } from "../../agent/tool-history.js";
|
|
5
|
+
import { buildContextBreakdown } from "../../agent/context-breakdown.js";
|
|
5
6
|
import { calibratedRequestTokens } from "../../llm/token-estimate-calibration.js";
|
|
6
7
|
import { modelContextWindow } from "../../llm/token-usage.js";
|
|
7
8
|
import { contextAttemptFromOperationUsage } from "../../llm/context-snapshot.js";
|
|
@@ -22,6 +23,7 @@ export async function summarizeForSessionCompact(prompt, opts) {
|
|
|
22
23
|
signal: opts.signal,
|
|
23
24
|
...(opts.sourceMessages ? { sourceMessages: opts.sourceMessages } : {}),
|
|
24
25
|
...(opts.baseRequest ? { baseRequest: opts.baseRequest } : {}),
|
|
26
|
+
...(opts.requestSettings ? { requestSettings: opts.requestSettings } : {}),
|
|
25
27
|
...(opts.history ? { history: opts.history } : {}),
|
|
26
28
|
...(opts.contextLimitTokens !== undefined
|
|
27
29
|
? { contextLimitTokens: opts.contextLimitTokens }
|
|
@@ -100,14 +102,16 @@ export async function runSessionCompaction(options) {
|
|
|
100
102
|
const replay = !forcePrefixSlice && replayPlan && !replayPlan.accounting.overLimit
|
|
101
103
|
? replayRequest
|
|
102
104
|
: undefined;
|
|
103
|
-
const
|
|
104
|
-
const
|
|
105
|
+
const requestSettings = successfulRequest ?? options.requestSettings;
|
|
106
|
+
const requestProvider = requestSettings?.provider ?? options.provider;
|
|
107
|
+
const requestModel = requestSettings?.model ?? options.model;
|
|
105
108
|
return compactMessagesWithSummary(history, (prompt, stage) => summarizeForSessionCompact(replay ? instruction : prompt, {
|
|
106
109
|
provider: requestProvider,
|
|
107
110
|
model: requestModel,
|
|
108
111
|
signal: options.signal,
|
|
109
112
|
purpose: options.purpose,
|
|
110
113
|
stage: stage?.phase,
|
|
114
|
+
...(requestSettings ? { requestSettings } : {}),
|
|
111
115
|
...(replay
|
|
112
116
|
? {
|
|
113
117
|
baseRequest: replay,
|
|
@@ -152,7 +156,7 @@ export async function runSessionCompaction(options) {
|
|
|
152
156
|
singleAdmission: true,
|
|
153
157
|
...(replay ? { forceDirectSinglePass: true } : {}),
|
|
154
158
|
...(forcePrefixSlice ? { forcePrefixSlice: true } : {}),
|
|
155
|
-
singlePassInputBudgetTokens: calibratedCompactionSinglePassInputBudget(contextLimitTokens, requestProvider, requestModel),
|
|
159
|
+
singlePassInputBudgetTokens: Math.max(0, calibratedCompactionSinglePassInputBudget(contextLimitTokens, requestProvider, requestModel) - buildContextBreakdown([], requestSettings?.tools).estimatedTotalTokens),
|
|
156
160
|
});
|
|
157
161
|
};
|
|
158
162
|
let result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-compact-helper.js","sourceRoot":"","sources":["../../../src/app/controllers/session-compact-helper.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,2BAA2B,EAC3B,yCAAyC,EACzC,gCAAgC,EAChC,oCAAoC,GACrC,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,oBAAoB,GACrB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,yBAAyB,GAE1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EACL,eAAe,EACf,8BAA8B,GAC/B,MAAM,+BAA+B,CAAC;AAOvC,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,MAAc,EACd,
|
|
1
|
+
{"version":3,"file":"session-compact-helper.js","sourceRoot":"","sources":["../../../src/app/controllers/session-compact-helper.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,2BAA2B,EAC3B,yCAAyC,EACzC,gCAAgC,EAChC,oCAAoC,GACrC,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,oBAAoB,GACrB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,yBAAyB,GAE1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EACL,eAAe,EACf,8BAA8B,GAC/B,MAAM,+BAA+B,CAAC;AAOvC,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,MAAc,EACd,IAcC;IAED,MAAM,SAAS,GACb,IAAI,CAAC,KAAK,KAAK,KAAK;QAClB,CAAC,CAAC,oCAAoC;QACtC,CAAC,CAAC,gCAAgC,CAAC;IACvC,MAAM,aAAa,GACjB,IAAI,CAAC,OAAO,KAAK,gBAAgB;QAC/B,CAAC,CAAC,mhBAAmhB;QACrhB,CAAC,CAAC,4XAA4X,CAAC;IAEnY,OAAO,wBAAwB,CAAC;QAC9B,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,aAAa;QACb,MAAM;QACN,SAAS;QACT,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,GAAG,CAAC,IAAI,CAAC,kBAAkB,KAAK,SAAS;YACvC,CAAC,CAAC,EAAE,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,EAAE;YACjD,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;QAC7B,kBAAkB,EAAE,KAAK;QACzB,iBAAiB,EAAE,KAAK;QACxB,4BAA4B,EAAE,KAAK;QACnC,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;AACL,CAAC;AA6BD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAAoC;IAQpC,MAAM,IAAI,GAAG,CACX,IAAO,EACP,OAA4B,EACtB,EAAE;QACR,OAAO,CAAC,IAAI,CACV,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAgB,CACjE,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;IAC7D,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IACpD,MAAM,aAAa,GAAG,iBAAiB;QACrC,CAAC,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,OAAO;YACtD,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,iBAAiB;QACrB,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,kBAAkB,GACtB,OAAO,CAAC,kBAAkB;QAC1B,kBAAkB,CAChB,iBAAiB,EAAE,KAAK,IAAI,OAAO,CAAC,KAAK,EACzC,iBAAiB,EAAE,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAChD,CAAC;IACJ,MAAM,WAAW,GAAG,2BAA2B,CAAC;QAC9C,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACzD,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,aAAa;QAC9B,CAAC,CAAC,oBAAoB,CAAC;YACnB,WAAW,EAAE,aAAa;YAC1B,OAAO;YACP,MAAM,EAAE,WAAW;YACnB,SAAS,EAAE,gCAAgC;YAC3C,kBAAkB;YAClB,MAAM,EAAE,IAAI;SACb,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,sBAAsB,GAAG,UAAU,EAAE,sBAAsB,CAAC;IAClE,MAAM,2BAA2B,GAC/B,OAAO,OAAO,CAAC,mBAAmB,KAAK,QAAQ;QAC/C,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,mBAAmB,CAAC;QAC5C,OAAO,CAAC,mBAAmB,GAAG,CAAC;QAC7B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC;QACzC,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,yBAAyB,GAC7B,2BAA2B,KAAK,SAAS;QACzC,sBAAsB,KAAK,SAAS,CAAC;IACvC,MAAM,mBAAmB,GACvB,2BAA2B,IAAI,sBAAsB,EAAE,aAAa,CAAC;IACvE,MAAM,KAAK,GACT,mBAAmB,KAAK,SAAS;QAC/B,CAAC,CAAC,iBAAiB;QACnB,CAAC,CAAC,mBAAmB,CAAC;IAC1B,MAAM,YAAY,GAAG,mBAAmB,IAAI,mBAAmB,CAAC;IAChE,MAAM,WAAW,GAAG,CAAC,MAAqB,EAAsB,EAAE;QAChE,MAAM,qBAAqB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QAC9D,MAAM,cAAc,GAAG,CAAC,eAAuB,EAAU,EAAE,CACzD,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,WAAW,GACf,yBAAyB,IAAI,sBAAsB;YACjD,CAAC,CAAC,uBAAuB,CACrB,iBAAiB,EAAE,QAAQ,EAC3B,iBAAiB,EAAE,KAAK,EACxB,qBAAqB;gBACnB,cAAc,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAC1D;YACH,CAAC,CAAC,mBAAmB,KAAK,SAAS;gBACjC,CAAC,CAAC,qBAAqB;gBACvB,CAAC,CAAC,qBAAqB,GAAG,cAAc,CAAC,mBAAmB,CAAC,CAAC;QACpE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC,CAAC;IACF,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,IAAI,CAAC,oBAAoB,EAAE;YACzB,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,YAAY;SACb,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,SAAS,GAAG,IAAI,eAAe,CACnC,8BAA8B,CAAC,YAAY,CAAC,CAC7C,CAAC;IACF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,CAAC,gBAAyB,EAA0B,EAAE;YACpE,MAAM,MAAM,GACV,CAAC,gBAAgB,IAAI,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS;gBACjE,CAAC,CAAC,aAAa;gBACf,CAAC,CAAC,SAAS,CAAC;YAChB,MAAM,eAAe,GAAG,iBAAiB,IAAI,OAAO,CAAC,eAAe,CAAC;YACrE,MAAM,eAAe,GAAG,eAAe,EAAE,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;YACtE,MAAM,YAAY,GAAG,eAAe,EAAE,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC;YAC7D,OAAO,0BAA0B,CAC/B,OAAO,EACP,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAChB,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,EAAE;gBACxD,QAAQ,EAAE,eAAe;gBACzB,KAAK,EAAE,YAAY;gBACnB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,KAAK,EAAE,KAAK,EAAE,KAAK;gBACnB,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/C,GAAG,CAAC,MAAM;oBACR,CAAC,CAAC;wBACE,WAAW,EAAE,MAAM;wBACnB,OAAO;qBACR;oBACH,CAAC,CAAC;wBACE,GAAG,CAAC,KAAK,EAAE,cAAc;4BACvB,CAAC,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE;4BAC1C,CAAC,CAAC,EAAE,CAAC;qBACR,CAAC;gBACN,kBAAkB;gBAClB,SAAS;gBACT,OAAO,EAAE,CAAC,UAAU,EAAE,EAAE;oBACtB,IAAI,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;wBAAE,OAAO;oBACtD,MAAM,OAAO,GAAG,gCAAgC,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;oBAC5E,IAAI,CAAC,aAAa,EAAE;wBAClB,GAAG,UAAU,CAAC,KAAK;wBACnB,QAAQ,EAAE,UAAU,CAAC,QAAQ;wBAC7B,KAAK,EAAE,UAAU,CAAC,KAAK;wBACvB,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBAClD,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBACtD,CAAC,CAAC;gBACL,CAAC;gBACD,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,KAAK,EAAE,KAAK,KAAK,KAAK;oBAC3C,CAAC,CAAC;wBACE,OAAO,EAAE,CAAC,IAAY,EAAE,OAAiB,EAAE,EAAE;4BAC3C,IAAI,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;gCACxB,IAAI,CAAC,kBAAkB,EAAE;oCACvB,YAAY,EAAE,OAAO,CAAC,YAAY;oCAClC,IAAI;oCACJ,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iCACtC,CAAC,CAAC;4BACL,CAAC;wBACH,CAAC;qBACF;oBACH,CAAC,CAAC,EAAE,CAAC;aACR,CAAC,EACJ;gBACE,YAAY,EAAE,CAAC;gBACf,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,eAAe,EAAE,IAAI;gBACrB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClD,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvD,2BAA2B,EACzB,IAAI,CAAC,GAAG,CACN,CAAC,EACD,yCAAyC,CACvC,kBAAkB,EAClB,eAAe,EACf,YAAY,CACb,GAAG,qBAAqB,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC,oBAAoB,CAC3E;aACJ,CACF,CAAC;QACJ,CAAC,CAAC;QAEF,IAAI,MAAqB,CAAC;QAC1B,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;gBAAE,MAAM,KAAK,CAAC;YACpD,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YAAE,OAAO,MAAM,CAAC;QACxC,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QACrC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACjC,IAAI,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACzC,MAAM,OAAO,GACX,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC;iBACjB,OAAO,EAAE;iBACT,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO;gBACjE,mBAAmB,CAAC;YACtB,IAAI,CAAC,sBAAsB,EAAE;gBAC3B,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,OAAO;gBACP,YAAY,EAAE,QAAQ,CAAC,YAAY;gBACnC,WAAW,EAAE,QAAQ,CAAC,WAAW;gBACjC,YAAY,EAAE,QAAQ,CAAC,KAAK;aAC7B,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAC3B,IAAI,CAAC,mBAAmB,EAAE;gBACxB,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,OAAO,EAAE,yCAAyC;gBAClD,cAAc,EAAE,YAAY;aAC7B,CAAC,CAAC;QACL,CAAC;QACD,IAAI,OAAO,CAAC,OAAO;YAAE,OAAO,GAAG,IAAI,CAAC;QACpC,IAAI,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;YAC3E,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAC7B,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;YACvD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,IAAI,CAAC,mBAAmB,EAAE;gBACxB,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,OAAO;gBACzE,cAAc,EAAE,YAAY;aAC7B,CAAC,CAAC;QACL,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -8,7 +8,7 @@ export interface ContextUsageTarget {
|
|
|
8
8
|
}
|
|
9
9
|
export type ContextClock = () => number;
|
|
10
10
|
export declare function contextUsageLimit(target: ContextUsageTarget): number;
|
|
11
|
-
export declare function resolveContextSnapshot(target: ContextUsageTarget,
|
|
11
|
+
export declare function resolveContextSnapshot(target: ContextUsageTarget, current: ContextSnapshotV1 | undefined): ContextSnapshotV1 | undefined;
|
|
12
12
|
export declare function recordContextUsageSnapshot(target: ContextUsageTarget, current: ContextSnapshotV1 | undefined, usage: TokenUsage, attempt: ContextAttemptReference | undefined, now?: ContextClock): ContextSnapshotV1;
|
|
13
13
|
export declare function compactedContextSnapshot(target: ContextUsageTarget, current: ContextSnapshotV1 | undefined, history: readonly ChatMessage[], afterTokens: number | undefined, scope: Extract<ContextSnapshotScope, "message-history" | "assembled-request">, now?: ContextClock): ContextSnapshotV1;
|
|
14
14
|
export declare function estimatedContextSnapshot(target: ContextUsageTarget, current: ContextSnapshotV1 | undefined, estimatedTokens: number, now?: ContextClock, promptUsageMissing?: boolean): ContextSnapshotV1 | undefined;
|
|
@@ -17,7 +17,7 @@ export interface ContextProjection {
|
|
|
17
17
|
readonly contextUsage: ContextUsageSnapshot | undefined;
|
|
18
18
|
readonly contextChip: string | undefined;
|
|
19
19
|
}
|
|
20
|
-
export declare function createContextProjector(formatChip: (snapshot: ContextUsageSnapshot) => string): (target: ContextUsageTarget,
|
|
20
|
+
export declare function createContextProjector(formatChip: (snapshot: ContextUsageSnapshot) => string): (target: ContextUsageTarget, current: ContextSnapshotV1 | undefined) => ContextProjection;
|
|
21
21
|
export interface PartialUsageSnapshot {
|
|
22
22
|
readonly contextTokens: number;
|
|
23
23
|
readonly contextLimit?: number | undefined;
|
|
@@ -28,6 +28,3 @@ export interface PartialUsageSnapshot {
|
|
|
28
28
|
readonly contextSnapshot?: unknown;
|
|
29
29
|
}
|
|
30
30
|
export declare function restoredContextSnapshot(target: ContextUsageTarget, usage: PartialUsageSnapshot | ContextUsageSnapshot | ContextSnapshotV1 | undefined, now?: ContextClock): ContextSnapshotV1 | undefined;
|
|
31
|
-
export declare function resolveContextUsageSnapshot(target: ContextUsageTarget, history: readonly ChatMessage[], current: ContextUsageSnapshot | undefined): ContextUsageSnapshot | undefined;
|
|
32
|
-
export declare function compactedUsageSnapshot(target: ContextUsageTarget, current: ContextUsageSnapshot | undefined, history: readonly ChatMessage[], afterTokens?: number): ContextUsageSnapshot;
|
|
33
|
-
export declare function estimatedUsageSnapshot(target: ContextUsageTarget, current: ContextUsageSnapshot | undefined, estimatedTokens: number): ContextUsageSnapshot | undefined;
|
|
@@ -53,33 +53,12 @@ function estimateHistoryRequestTokens(target, history) {
|
|
|
53
53
|
}).reservedOutputTokens;
|
|
54
54
|
return calibratedRequestTokens(target.provider, target.model, raw + Math.max(0, Math.floor(limit / 4)));
|
|
55
55
|
}
|
|
56
|
-
function
|
|
57
|
-
return createContextSnapshot({
|
|
58
|
-
contextTokens: estimateHistoryRequestTokens(target, history),
|
|
59
|
-
lastCompletionTokens: current?.lastCompletionTokens,
|
|
60
|
-
sessionPromptTokens: current?.sessionPromptTokens,
|
|
61
|
-
sessionCompletionTokens: current?.sessionCompletionTokens,
|
|
62
|
-
scope: "message-history",
|
|
63
|
-
precision: "estimate",
|
|
64
|
-
limit: limitFor(target),
|
|
65
|
-
observedAt: now(),
|
|
66
|
-
});
|
|
67
|
-
}
|
|
68
|
-
const REQUEST_SCOPES = new Set([
|
|
69
|
-
"provider-request",
|
|
70
|
-
"assembled-request",
|
|
71
|
-
]);
|
|
72
|
-
export function resolveContextSnapshot(target, history, current, now = systemNow) {
|
|
56
|
+
export function resolveContextSnapshot(target, current) {
|
|
73
57
|
if (!current)
|
|
74
58
|
return undefined;
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
return sameLimit(current.limit, limit)
|
|
79
|
-
? current
|
|
80
|
-
: withContextSnapshotLimit(current, limit);
|
|
81
|
-
}
|
|
82
|
-
return historyEstimateSnapshot(target, current, history, now);
|
|
59
|
+
return sameLimit(current.limit, limitFor(target))
|
|
60
|
+
? current
|
|
61
|
+
: withContextSnapshotLimit(current, limitFor(target));
|
|
83
62
|
}
|
|
84
63
|
export function recordContextUsageSnapshot(target, current, usage, attempt, now = systemNow) {
|
|
85
64
|
const promptMeasured = hasPromptMeasurement(usage);
|
|
@@ -90,17 +69,28 @@ export function recordContextUsageSnapshot(target, current, usage, attempt, now
|
|
|
90
69
|
(usage.exact ? usage.completionTokens : 0);
|
|
91
70
|
const cache = reportedCache(usage);
|
|
92
71
|
const reasoning = reportedReasoning(usage);
|
|
72
|
+
if (consumedPromptTokens === undefined) {
|
|
73
|
+
return createContextSnapshot({
|
|
74
|
+
contextTokens: current?.contextTokens ?? 0,
|
|
75
|
+
lastCompletionTokens: usage.completionTokens,
|
|
76
|
+
sessionPromptTokens,
|
|
77
|
+
sessionCompletionTokens,
|
|
78
|
+
scope: current?.scope ?? "unknown",
|
|
79
|
+
precision: current?.precision ?? "unknown",
|
|
80
|
+
limit: limitFor(target),
|
|
81
|
+
...(cache ? { cache } : {}),
|
|
82
|
+
...(reasoning ? { reasoning } : {}),
|
|
83
|
+
...(attempt ? { attempt } : {}),
|
|
84
|
+
observedAt: now(),
|
|
85
|
+
});
|
|
86
|
+
}
|
|
93
87
|
return createContextSnapshot({
|
|
94
|
-
contextTokens: consumedPromptTokens
|
|
88
|
+
contextTokens: consumedPromptTokens,
|
|
95
89
|
lastCompletionTokens: usage.completionTokens,
|
|
96
90
|
sessionPromptTokens,
|
|
97
91
|
sessionCompletionTokens,
|
|
98
|
-
scope:
|
|
99
|
-
precision: usage.exact
|
|
100
|
-
? "provider-exact"
|
|
101
|
-
: promptMeasured
|
|
102
|
-
? "estimate"
|
|
103
|
-
: "unknown",
|
|
92
|
+
scope: "provider-request",
|
|
93
|
+
precision: usage.exact ? "provider-exact" : "estimate",
|
|
104
94
|
limit: limitFor(target),
|
|
105
95
|
...(cache ? { cache } : {}),
|
|
106
96
|
...(reasoning ? { reasoning } : {}),
|
|
@@ -123,28 +113,15 @@ export function compactedContextSnapshot(target, current, history, afterTokens,
|
|
|
123
113
|
observedAt: now(),
|
|
124
114
|
});
|
|
125
115
|
}
|
|
126
|
-
function measuredOnTargetRoute(target, snapshot) {
|
|
127
|
-
const attempt = snapshot.attempt;
|
|
128
|
-
if (attempt.kind !== "generation")
|
|
129
|
-
return true;
|
|
130
|
-
return ((target.provider === undefined || attempt.provider === target.provider) &&
|
|
131
|
-
(target.model === undefined || attempt.model === target.model));
|
|
132
|
-
}
|
|
133
116
|
export function estimatedContextSnapshot(target, current, estimatedTokens, now = systemNow, promptUsageMissing = false) {
|
|
134
117
|
if (!current && !promptUsageMissing)
|
|
135
118
|
return undefined;
|
|
136
119
|
if (!Number.isFinite(estimatedTokens) || estimatedTokens <= 0)
|
|
137
120
|
return current;
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
!promptUsageMissing &&
|
|
141
|
-
current.scope === "provider-request" &&
|
|
142
|
-
current.precision === "provider-exact" &&
|
|
143
|
-
measuredOnTargetRoute(target, current)) {
|
|
144
|
-
return sameLimit(current.limit, limitFor(target))
|
|
145
|
-
? current
|
|
146
|
-
: withContextSnapshotLimit(current, limitFor(target));
|
|
121
|
+
if (current?.precision === "provider-exact") {
|
|
122
|
+
return resolveContextSnapshot(target, current);
|
|
147
123
|
}
|
|
124
|
+
const tokens = Math.floor(estimatedTokens);
|
|
148
125
|
return createContextSnapshot({
|
|
149
126
|
contextTokens: tokens,
|
|
150
127
|
lastCompletionTokens: current?.lastCompletionTokens,
|
|
@@ -157,53 +134,16 @@ export function estimatedContextSnapshot(target, current, estimatedTokens, now =
|
|
|
157
134
|
});
|
|
158
135
|
}
|
|
159
136
|
export function createContextProjector(formatChip) {
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
const first = history[0];
|
|
163
|
-
const last = history[history.length - 1];
|
|
164
|
-
const key = [
|
|
165
|
-
target.provider ?? "",
|
|
166
|
-
target.model ?? "",
|
|
167
|
-
target.contextLimitTokens ?? 0,
|
|
168
|
-
history.length,
|
|
169
|
-
first?.content.length ?? 0,
|
|
170
|
-
last?.content.length ?? 0,
|
|
171
|
-
current?.version ?? 0,
|
|
172
|
-
current?.contextTokens ?? -1,
|
|
173
|
-
current?.scope ?? "",
|
|
174
|
-
current?.precision ?? "",
|
|
175
|
-
current?.limit.source ?? "",
|
|
176
|
-
current?.limit.tokens ?? -1,
|
|
177
|
-
current?.cache.kind ?? "",
|
|
178
|
-
current?.cache.kind === "reported" ? current.cache.readTokens ?? -1 : -1,
|
|
179
|
-
current?.cache.kind === "reported"
|
|
180
|
-
? current.cache.creationTokens ?? -1
|
|
181
|
-
: -1,
|
|
182
|
-
current?.cache.kind === "reported"
|
|
183
|
-
? current.cache.uncachedTokens ?? -1
|
|
184
|
-
: -1,
|
|
185
|
-
current?.reasoning.kind ?? "",
|
|
186
|
-
current?.reasoning.kind === "reported"
|
|
187
|
-
? current.reasoning.outputTokens ?? -1
|
|
188
|
-
: -1,
|
|
189
|
-
current?.reasoning.kind === "reported"
|
|
190
|
-
? current.reasoning.inputArtifactTokens ?? -1
|
|
191
|
-
: -1,
|
|
192
|
-
current?.observedAt ?? -1,
|
|
193
|
-
].join("|");
|
|
194
|
-
if (cache?.key === key)
|
|
195
|
-
return cache.value;
|
|
196
|
-
const contextSnapshot = resolveContextSnapshot(target, history, current, now);
|
|
137
|
+
return (target, current) => {
|
|
138
|
+
const contextSnapshot = resolveContextSnapshot(target, current);
|
|
197
139
|
const contextUsage = contextSnapshot
|
|
198
140
|
? toLegacyContextUsage(contextSnapshot)
|
|
199
141
|
: undefined;
|
|
200
|
-
|
|
142
|
+
return {
|
|
201
143
|
contextSnapshot,
|
|
202
144
|
contextUsage,
|
|
203
145
|
contextChip: contextUsage ? formatChip(contextUsage) : undefined,
|
|
204
146
|
};
|
|
205
|
-
cache = { key, value };
|
|
206
|
-
return value;
|
|
207
147
|
};
|
|
208
148
|
}
|
|
209
149
|
export function restoredContextSnapshot(target, usage, now = systemNow) {
|
|
@@ -231,17 +171,4 @@ export function restoredContextSnapshot(target, usage, now = systemNow) {
|
|
|
231
171
|
exact: usage.exact === true,
|
|
232
172
|
}, limitFor(target), now());
|
|
233
173
|
}
|
|
234
|
-
export function resolveContextUsageSnapshot(target, history, current) {
|
|
235
|
-
const canonical = resolveContextSnapshot(target, history, current
|
|
236
|
-
? contextSnapshotFromLegacy(current, limitFor(target))
|
|
237
|
-
: undefined);
|
|
238
|
-
return canonical ? toLegacyContextUsage(canonical) : undefined;
|
|
239
|
-
}
|
|
240
|
-
export function compactedUsageSnapshot(target, current, history, afterTokens) {
|
|
241
|
-
return toLegacyContextUsage(compactedContextSnapshot(target, current ? contextSnapshotFromLegacy(current, limitFor(target)) : undefined, history, afterTokens, "message-history"));
|
|
242
|
-
}
|
|
243
|
-
export function estimatedUsageSnapshot(target, current, estimatedTokens) {
|
|
244
|
-
const canonical = estimatedContextSnapshot(target, current ? contextSnapshotFromLegacy(current, limitFor(target)) : undefined, estimatedTokens);
|
|
245
|
-
return canonical ? toLegacyContextUsage(canonical) : undefined;
|
|
246
|
-
}
|
|
247
174
|
//# sourceMappingURL=session-context-usage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-context-usage.js","sourceRoot":"","sources":["../../../src/app/controllers/session-context-usage.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-context-usage.js","sourceRoot":"","sources":["../../../src/app/controllers/session-context-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,13 @@ import { type Disposable } from "./disposable.js";
|
|
|
21
21
|
import { type TurnDisplayOptions } from "./session-prompt-queue.js";
|
|
22
22
|
import { type ResponderRuntimeState } from "./session-responder.js";
|
|
23
23
|
import { type SessionUsageReport } from "./session-usage-ledger.js";
|
|
24
|
+
export interface SubagentsRuntimeState {
|
|
25
|
+
readonly enabled: boolean;
|
|
26
|
+
readonly running: number;
|
|
27
|
+
readonly settled: number;
|
|
28
|
+
readonly total: number;
|
|
29
|
+
readonly pendingDelivery: number;
|
|
30
|
+
}
|
|
24
31
|
export interface SessionState {
|
|
25
32
|
readonly sessionId: SessionId;
|
|
26
33
|
readonly mode: Mode;
|
|
@@ -31,6 +38,7 @@ export interface SessionState {
|
|
|
31
38
|
readonly historyLength: number;
|
|
32
39
|
readonly queued: readonly string[];
|
|
33
40
|
readonly responder: ResponderRuntimeState;
|
|
41
|
+
readonly subagents: SubagentsRuntimeState;
|
|
34
42
|
readonly title: string | undefined;
|
|
35
43
|
readonly contextSnapshot: ContextSnapshotV1 | undefined;
|
|
36
44
|
readonly contextUsage: ContextUsageSnapshot | undefined;
|
|
@@ -114,7 +122,6 @@ export declare class SessionController implements Disposable {
|
|
|
114
122
|
usageReport(): SessionUsageReport;
|
|
115
123
|
noteContextCompacted(afterTokens?: number, scope?: "message-history" | "assembled-request", compactionId?: string): void;
|
|
116
124
|
noteContextEstimate(estimatedTokens: number, promptUsageMissing?: boolean): void;
|
|
117
|
-
private refreshEstimatedContext;
|
|
118
125
|
get messages(): readonly ChatMessage[];
|
|
119
126
|
subscribe(listener: SessionStateListener): () => void;
|
|
120
127
|
setProvider(provider: ProviderId | undefined): void;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { estimateMessagesTokens, } from "../../agent/context-manager.js";
|
|
2
1
|
import { projectToolHistory, repairToolProtocol, } from "../../agent/tool-history.js";
|
|
3
2
|
import { formatContextChip, } from "../../llm/token-usage.js";
|
|
4
3
|
import { compactedContextSnapshot, recordContextUsageSnapshot, resolveContextSnapshot as resolveSnapshot, restoredContextSnapshot, createContextProjector, estimatedContextSnapshot, } from "./session-context-usage.js";
|
|
@@ -112,6 +111,7 @@ export class SessionController {
|
|
|
112
111
|
displayPrompt: null,
|
|
113
112
|
materializeHistoryImages: false,
|
|
114
113
|
}),
|
|
114
|
+
notifyState: () => this.notifyState(),
|
|
115
115
|
});
|
|
116
116
|
this.subagentDelivery.bind(this.subagentsValue);
|
|
117
117
|
this.namer = new SessionNamer({
|
|
@@ -163,6 +163,14 @@ export class SessionController {
|
|
|
163
163
|
}
|
|
164
164
|
getState() {
|
|
165
165
|
const { contextSnapshot, contextUsage, contextChip } = this.contextUsageProjection();
|
|
166
|
+
const subagentRuns = this.subagentsValue.list();
|
|
167
|
+
const subagents = {
|
|
168
|
+
enabled: this.subagentsValue.enabled,
|
|
169
|
+
running: subagentRuns.filter((run) => run.status === "running" || run.status === "stopping").length,
|
|
170
|
+
settled: subagentRuns.filter((run) => run.status !== "running" && run.status !== "stopping").length,
|
|
171
|
+
total: subagentRuns.length,
|
|
172
|
+
pendingDelivery: subagentRuns.filter((run) => run.status !== "running" && run.status !== "stopping" && !run.resultAcknowledged).length,
|
|
173
|
+
};
|
|
166
174
|
return {
|
|
167
175
|
sessionId: this.sessionIdValue,
|
|
168
176
|
mode: this.mode,
|
|
@@ -174,6 +182,7 @@ export class SessionController {
|
|
|
174
182
|
historyLength: this.history.length,
|
|
175
183
|
queued: this.prompts.snapshot(),
|
|
176
184
|
responder: this.responder?.getState() ?? IDLE_RESPONDER_STATE,
|
|
185
|
+
subagents,
|
|
177
186
|
title: this.sessionTitle,
|
|
178
187
|
contextSnapshot,
|
|
179
188
|
contextUsage,
|
|
@@ -181,7 +190,7 @@ export class SessionController {
|
|
|
181
190
|
};
|
|
182
191
|
}
|
|
183
192
|
contextUsageProjection() {
|
|
184
|
-
return this.projectContext(this.usageTarget, this.
|
|
193
|
+
return this.projectContext(this.usageTarget, this.contextSnapshot);
|
|
185
194
|
}
|
|
186
195
|
get contextLimitTokens() {
|
|
187
196
|
return this.contextLimits.get(this.provider, this.model);
|
|
@@ -201,7 +210,7 @@ export class SessionController {
|
|
|
201
210
|
this.contextSnapshot = snapshot;
|
|
202
211
|
}
|
|
203
212
|
resolveContextSnapshot() {
|
|
204
|
-
return resolveSnapshot(this.usageTarget, this.
|
|
213
|
+
return resolveSnapshot(this.usageTarget, this.contextSnapshot);
|
|
205
214
|
}
|
|
206
215
|
requestScopedContextTokens() {
|
|
207
216
|
const snapshot = this.contextSnapshot;
|
|
@@ -245,9 +254,6 @@ export class SessionController {
|
|
|
245
254
|
this.notifyState();
|
|
246
255
|
}
|
|
247
256
|
}
|
|
248
|
-
refreshEstimatedContext() {
|
|
249
|
-
this.setContextSnapshot(resolveSnapshot(this.usageTarget, this.history, undefined, () => this.contextTimestamp()));
|
|
250
|
-
}
|
|
251
257
|
get messages() {
|
|
252
258
|
return this.history;
|
|
253
259
|
}
|
|
@@ -258,7 +264,6 @@ export class SessionController {
|
|
|
258
264
|
setProvider(provider) {
|
|
259
265
|
this.provider = provider;
|
|
260
266
|
this.lastMainRequestSnapshot = undefined;
|
|
261
|
-
this.preserveCompactionEstimate = false;
|
|
262
267
|
this.setContextSnapshot(this.resolveContextSnapshot());
|
|
263
268
|
clearTextOnlyModels();
|
|
264
269
|
void prefetchProviderCatalog(provider);
|
|
@@ -273,7 +278,6 @@ export class SessionController {
|
|
|
273
278
|
setModel(model) {
|
|
274
279
|
this.model = model;
|
|
275
280
|
this.lastMainRequestSnapshot = undefined;
|
|
276
|
-
this.preserveCompactionEstimate = false;
|
|
277
281
|
this.setContextSnapshot(this.resolveContextSnapshot());
|
|
278
282
|
clearTextOnlyModels();
|
|
279
283
|
publishRouteReasoningVocabulary(this.provider, model);
|
|
@@ -303,7 +307,6 @@ export class SessionController {
|
|
|
303
307
|
}
|
|
304
308
|
else {
|
|
305
309
|
this.setContextSnapshot(undefined);
|
|
306
|
-
this.refreshEstimatedContext();
|
|
307
310
|
}
|
|
308
311
|
if (options.sessionId) {
|
|
309
312
|
const nextSessionId = asSessionId(options.sessionId);
|
|
@@ -407,7 +410,7 @@ export class SessionController {
|
|
|
407
410
|
this.setContextSnapshot(restored);
|
|
408
411
|
}
|
|
409
412
|
else {
|
|
410
|
-
this.
|
|
413
|
+
this.setContextSnapshot(undefined);
|
|
411
414
|
}
|
|
412
415
|
this.notifyState();
|
|
413
416
|
}
|
|
@@ -525,7 +528,7 @@ export class SessionController {
|
|
|
525
528
|
const snapshot = this.resolveContextSnapshot();
|
|
526
529
|
return {
|
|
527
530
|
messages: this.history.length,
|
|
528
|
-
tokens: snapshot?.contextTokens ??
|
|
531
|
+
tokens: snapshot?.contextTokens ?? 0,
|
|
529
532
|
};
|
|
530
533
|
}
|
|
531
534
|
async cancelAll() {
|