@pentoshi/clai 5.1.3 → 5.1.5
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/CHANGELOG.md +66 -0
- package/MCP.md +1 -1
- package/README.md +2 -0
- package/dist/agent/context/compaction-recent-history.js +1 -3
- package/dist/agent/context/compaction-recent-history.js.map +1 -1
- package/dist/agent/goal/goal-evaluator.d.ts +22 -0
- package/dist/agent/goal/goal-evaluator.js +146 -0
- package/dist/agent/goal/goal-evaluator.js.map +1 -0
- package/dist/agent/goal/goal-failure.d.ts +7 -0
- package/dist/agent/goal/goal-failure.js +41 -0
- package/dist/agent/goal/goal-failure.js.map +1 -0
- package/dist/agent/goal/goal-prompts.d.ts +14 -0
- package/dist/agent/goal/goal-prompts.js +107 -0
- package/dist/agent/goal/goal-prompts.js.map +1 -0
- package/dist/agent/goal/goal-verdict.d.ts +7 -0
- package/dist/agent/goal/goal-verdict.js +99 -0
- package/dist/agent/goal/goal-verdict.js.map +1 -0
- package/dist/agent/runner.js +6 -0
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/tool-output-formatting.d.ts +1 -1
- package/dist/agent/tool-output-formatting.js +10 -6
- package/dist/agent/tool-output-formatting.js.map +1 -1
- package/dist/agent/turn/compaction-coordinator.js +2 -3
- package/dist/agent/turn/compaction-coordinator.js.map +1 -1
- package/dist/agent/turn/finalizer.d.ts +1 -0
- package/dist/agent/turn/finalizer.js +2 -0
- package/dist/agent/turn/finalizer.js.map +1 -1
- package/dist/agent/turn/mcp-agent-tools.js +1 -1
- package/dist/agent/turn/mcp-agent-tools.js.map +1 -1
- package/dist/agent/turn/responder-claims.d.ts +3 -0
- package/dist/agent/turn/responder-claims.js +35 -0
- package/dist/agent/turn/responder-claims.js.map +1 -1
- package/dist/agent/turn/responder-read-tool.js +4 -10
- package/dist/agent/turn/responder-read-tool.js.map +1 -1
- package/dist/app/adapters/current-store-adapter.js +3 -0
- package/dist/app/adapters/current-store-adapter.js.map +1 -1
- package/dist/app/commands/catalog.js +6 -0
- package/dist/app/commands/catalog.js.map +1 -1
- package/dist/app/controllers/cancel-coordinator.d.ts +3 -0
- package/dist/app/controllers/cancel-coordinator.js +8 -3
- package/dist/app/controllers/cancel-coordinator.js.map +1 -1
- package/dist/app/controllers/goal-types.d.ts +47 -0
- package/dist/app/controllers/goal-types.js +2 -0
- package/dist/app/controllers/goal-types.js.map +1 -0
- package/dist/app/controllers/session-compact-helper.d.ts +1 -0
- package/dist/app/controllers/session-compact-helper.js +24 -1
- package/dist/app/controllers/session-compact-helper.js.map +1 -1
- package/dist/app/controllers/session-controller.d.ts +16 -0
- package/dist/app/controllers/session-controller.js +157 -8
- package/dist/app/controllers/session-controller.js.map +1 -1
- package/dist/app/controllers/session-goal.d.ts +93 -0
- package/dist/app/controllers/session-goal.js +556 -0
- package/dist/app/controllers/session-goal.js.map +1 -0
- package/dist/app/controllers/session-responder.d.ts +1 -0
- package/dist/app/controllers/session-responder.js +7 -4
- package/dist/app/controllers/session-responder.js.map +1 -1
- package/dist/app/controllers/turn-controller.js +14 -5
- package/dist/app/controllers/turn-controller.js.map +1 -1
- package/dist/app/events/app-event.d.ts +2 -0
- package/dist/app/events/app-event.js.map +1 -1
- package/dist/app/ports/persistence-port.d.ts +13 -0
- package/dist/classic/app/ClassicApp.js +4 -0
- package/dist/classic/app/ClassicApp.js.map +1 -1
- package/dist/classic/app/app-wiring.js +1 -1
- package/dist/classic/app/app-wiring.js.map +1 -1
- package/dist/classic/app/paint-pacing.js +1 -5
- package/dist/classic/app/paint-pacing.js.map +1 -1
- package/dist/classic/app/wiring-feed-scroll.d.ts +1 -1
- package/dist/classic/app/wiring-feed-scroll.js +3 -6
- package/dist/classic/app/wiring-feed-scroll.js.map +1 -1
- package/dist/classic/app/wiring-interactions.js +1 -0
- package/dist/classic/app/wiring-interactions.js.map +1 -1
- package/dist/classic/app/wiring-lifecycle.js +2 -4
- package/dist/classic/app/wiring-lifecycle.js.map +1 -1
- package/dist/classic/app/wiring-selection.js +1 -1
- package/dist/classic/app/wiring-selection.js.map +1 -1
- package/dist/classic/blocks/notice-lines.js +17 -3
- package/dist/classic/blocks/notice-lines.js.map +1 -1
- package/dist/classic/blocks/turn-summary-lines.js +2 -3
- package/dist/classic/blocks/turn-summary-lines.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/GoalStrip.d.ts +3 -0
- package/dist/classic/chrome/GoalStrip.js +9 -0
- package/dist/classic/chrome/GoalStrip.js.map +1 -0
- package/dist/classic/chrome/composer-controller.js +5 -2
- package/dist/classic/chrome/composer-controller.js.map +1 -1
- package/dist/classic/chrome/editor-view.js +4 -1
- package/dist/classic/chrome/editor-view.js.map +1 -1
- package/dist/classic/chrome/goal-row.d.ts +11 -0
- package/dist/classic/chrome/goal-row.js +24 -0
- package/dist/classic/chrome/goal-row.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/input/paste-burst.d.ts +4 -1
- package/dist/classic/input/paste-burst.js +9 -2
- package/dist/classic/input/paste-burst.js.map +1 -1
- package/dist/classic/panels/panel-effect.d.ts +4 -0
- package/dist/classic/panels/panel-effect.js.map +1 -1
- package/dist/classic/panels/panel-effects.js +3 -0
- package/dist/classic/panels/panel-effects.js.map +1 -1
- package/dist/classic/panels/picker-panel.js +12 -4
- package/dist/classic/panels/picker-panel.js.map +1 -1
- package/dist/llm/capabilities.js +38 -2
- package/dist/llm/capabilities.js.map +1 -1
- package/dist/llm/capability/vision-patterns.js +7 -1
- package/dist/llm/capability/vision-patterns.js.map +1 -1
- package/dist/llm/catalog-facts.js +3 -1
- package/dist/llm/catalog-facts.js.map +1 -1
- package/dist/llm/context-windows.js +1 -1
- package/dist/llm/context-windows.js.map +1 -1
- package/dist/llm/meta-effort.d.ts +1 -1
- package/dist/llm/meta-effort.js +13 -15
- package/dist/llm/meta-effort.js.map +1 -1
- package/dist/llm/meta-models.d.ts +3 -0
- package/dist/llm/meta-models.js +32 -0
- package/dist/llm/meta-models.js.map +1 -0
- package/dist/llm/meta.js +25 -19
- package/dist/llm/meta.js.map +1 -1
- package/dist/llm/provider-info-text.js +7 -2
- package/dist/llm/provider-info-text.js.map +1 -1
- package/dist/llm/provider-model-layers.js +30 -0
- package/dist/llm/provider-model-layers.js.map +1 -1
- package/dist/llm/provider-profiles.js +5 -4
- package/dist/llm/provider-profiles.js.map +1 -1
- package/dist/llm/request-plan.js +3 -1
- package/dist/llm/request-plan.js.map +1 -1
- package/dist/llm/responses-request.js +1 -1
- package/dist/llm/responses-request.js.map +1 -1
- package/dist/llm/river-docs.d.ts +18 -0
- package/dist/llm/river-docs.js +170 -0
- package/dist/llm/river-docs.js.map +1 -0
- package/dist/llm/river-models.d.ts +2 -1
- package/dist/llm/river-models.js +78 -13
- package/dist/llm/river-models.js.map +1 -1
- package/dist/llm/river.js +9 -6
- package/dist/llm/river.js.map +1 -1
- package/dist/llm/wire/effort-preflight.js +3 -1
- package/dist/llm/wire/effort-preflight.js.map +1 -1
- package/dist/llm/wire/model-catalog.d.ts +2 -0
- package/dist/llm/wire/model-catalog.js +5 -1
- package/dist/llm/wire/model-catalog.js.map +1 -1
- package/dist/llm/wire/reasoning-payload.js +4 -4
- package/dist/llm/wire/reasoning-payload.js.map +1 -1
- package/dist/os/sgr-state.d.ts +3 -0
- package/dist/os/sgr-state.js +80 -0
- package/dist/os/sgr-state.js.map +1 -0
- package/dist/os/terminal-sgr-compactor.d.ts +17 -0
- package/dist/os/terminal-sgr-compactor.js +164 -0
- package/dist/os/terminal-sgr-compactor.js.map +1 -0
- package/dist/prompts/embedded.js +2 -2
- package/dist/prompts/embedded.js.map +1 -1
- package/dist/prompts/system.agent.md +3 -3
- package/dist/prompts/system.ask.md +1 -1
- package/dist/session-runtime/client.js +7 -2
- package/dist/session-runtime/client.js.map +1 -1
- package/dist/store/config/endpoints.d.ts +1 -0
- package/dist/store/config/endpoints.js +2 -0
- package/dist/store/config/endpoints.js.map +1 -1
- package/dist/store/config/settings.d.ts +1 -0
- package/dist/store/config/settings.js +4 -0
- package/dist/store/config/settings.js.map +1 -1
- package/dist/store/session-goal.d.ts +4 -0
- package/dist/store/session-goal.js +75 -0
- package/dist/store/session-goal.js.map +1 -0
- package/dist/store/subagents.js +1 -1
- package/dist/store/subagents.js.map +1 -1
- package/dist/tools/definitions/web-1.js +1 -1
- package/dist/tools/definitions/web-1.js.map +1 -1
- package/dist/tools/shell/artifact.d.ts +1 -1
- package/dist/tools/shell/artifact.js +3 -0
- package/dist/tools/shell/artifact.js.map +1 -1
- package/dist/tui-v2/app/App.js +14 -5
- package/dist/tui-v2/app/App.js.map +1 -1
- package/dist/tui-v2/bootstrap/runtime-view.js +3 -1
- package/dist/tui-v2/bootstrap/runtime-view.js.map +1 -1
- package/dist/tui-v2/bootstrap/start-tui-v2.js +3 -1
- package/dist/tui-v2/bootstrap/start-tui-v2.js.map +1 -1
- package/dist/tui-v2/components/goal/goal-panel.d.ts +11 -0
- package/dist/tui-v2/components/goal/goal-panel.js +54 -0
- package/dist/tui-v2/components/goal/goal-panel.js.map +1 -0
- package/dist/tui-v2/components/jobs/jobs-panel.js +7 -8
- package/dist/tui-v2/components/jobs/jobs-panel.js.map +1 -1
- package/dist/tui-v2/components/pager/pager.js +8 -2
- package/dist/tui-v2/components/pager/pager.js.map +1 -1
- package/dist/tui-v2/components/picker/picker.js +39 -28
- package/dist/tui-v2/components/picker/picker.js.map +1 -1
- package/dist/tui-v2/components/plan/plan-view.d.ts +1 -0
- package/dist/tui-v2/components/plan/plan-view.js +6 -14
- package/dist/tui-v2/components/plan/plan-view.js.map +1 -1
- package/dist/tui-v2/components/status/status-line.js +4 -4
- package/dist/tui-v2/components/status/status-line.js.map +1 -1
- package/dist/tui-v2/components/transcript/notice-row.js +11 -9
- package/dist/tui-v2/components/transcript/notice-row.js.map +1 -1
- package/dist/tui-v2/components/transcript/tool-card.d.ts +0 -4
- package/dist/tui-v2/components/transcript/tool-card.js +29 -27
- package/dist/tui-v2/components/transcript/tool-card.js.map +1 -1
- package/dist/tui-v2/components/transcript/tool-output-branch.d.ts +8 -0
- package/dist/tui-v2/components/transcript/tool-output-branch.js +22 -0
- package/dist/tui-v2/components/transcript/tool-output-branch.js.map +1 -0
- package/dist/tui-v2/components/transcript/transcript-row.js +2 -2
- package/dist/tui-v2/components/transcript/transcript-row.js.map +1 -1
- package/dist/tui-v2/components/transcript/transcript-scroll-port.d.ts +6 -1
- package/dist/tui-v2/components/transcript/transcript-scroll-port.js +40 -27
- package/dist/tui-v2/components/transcript/transcript-scroll-port.js.map +1 -1
- package/dist/tui-v2/components/transcript/transcript-view.js +2 -2
- package/dist/tui-v2/components/transcript/transcript-view.js.map +1 -1
- package/dist/tui-v2/composer/composer-editor.js +2 -1
- package/dist/tui-v2/composer/composer-editor.js.map +1 -1
- package/dist/tui-v2/composer/composer-highlight.d.ts +2 -1
- package/dist/tui-v2/composer/composer-highlight.js +25 -3
- package/dist/tui-v2/composer/composer-highlight.js.map +1 -1
- package/dist/tui-v2/input/paste-burst-guard.d.ts +1 -0
- package/dist/tui-v2/input/paste-burst-guard.js +3 -1
- package/dist/tui-v2/input/paste-burst-guard.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/ui-core/commands/command-handlers.js +4 -0
- package/dist/ui-core/commands/command-handlers.js.map +1 -1
- package/dist/ui-core/commands/goal-commands.d.ts +3 -0
- package/dist/ui-core/commands/goal-commands.js +48 -0
- package/dist/ui-core/commands/goal-commands.js.map +1 -0
- package/dist/ui-core/commands/pickers/search-reasoning.js +10 -6
- package/dist/ui-core/commands/pickers/search-reasoning.js.map +1 -1
- package/dist/ui-core/commands/settings-commands.d.ts +3 -0
- package/dist/ui-core/commands/settings-commands.js +49 -0
- package/dist/ui-core/commands/settings-commands.js.map +1 -0
- package/dist/ui-core/controllers/overlay-controller.d.ts +7 -1
- package/dist/ui-core/controllers/overlay-controller.js +7 -1
- package/dist/ui-core/controllers/overlay-controller.js.map +1 -1
- package/dist/ui-core/motion/wheel-scroll.d.ts +2 -4
- package/dist/ui-core/motion/wheel-scroll.js +4 -20
- package/dist/ui-core/motion/wheel-scroll.js.map +1 -1
- package/dist/ui-core/rendering/artifact-pager-source.d.ts +1 -0
- package/dist/ui-core/rendering/artifact-pager-source.js.map +1 -1
- package/dist/ui-core/rendering/duration.d.ts +1 -1
- package/dist/ui-core/rendering/duration.js +2 -4
- package/dist/ui-core/rendering/duration.js.map +1 -1
- package/dist/ui-core/rendering/format-help.js +1 -1
- package/dist/ui-core/rendering/format-help.js.map +1 -1
- package/dist/ui-core/rendering/goal-format.d.ts +20 -0
- package/dist/ui-core/rendering/goal-format.js +136 -0
- package/dist/ui-core/rendering/goal-format.js.map +1 -0
- package/dist/ui-core/rendering/job-tail-source.js +4 -0
- package/dist/ui-core/rendering/job-tail-source.js.map +1 -1
- package/dist/ui-core/rendering/open-tool-output.d.ts +0 -1
- package/dist/ui-core/rendering/open-tool-output.js +8 -11
- package/dist/ui-core/rendering/open-tool-output.js.map +1 -1
- package/dist/ui-core/rendering/picker-layout.js +12 -1
- package/dist/ui-core/rendering/picker-layout.js.map +1 -1
- package/dist/ui-core/rendering/tool-output-pager-source.d.ts +1 -1
- package/dist/ui-core/rendering/tool-output-pager-source.js +2 -1
- package/dist/ui-core/rendering/tool-output-pager-source.js.map +1 -1
- package/dist/ui-core/state/transcript/apply-app-event.js +8 -2
- package/dist/ui-core/state/transcript/apply-app-event.js.map +1 -1
- package/dist/ui-core/state/transcript-types.d.ts +1 -0
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/app/commands/catalog.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/app/commands/catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,9 @@ export interface CancelCoordinatorSession {
|
|
|
29
29
|
readonly running: boolean;
|
|
30
30
|
readonly compacting: boolean;
|
|
31
31
|
readonly queued: readonly string[];
|
|
32
|
+
readonly goal?: {
|
|
33
|
+
readonly phase?: string | undefined;
|
|
34
|
+
} | undefined;
|
|
32
35
|
};
|
|
33
36
|
abort(): void;
|
|
34
37
|
cancelAll(): Promise<ToolResult>;
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
function goalInterruptible(state) {
|
|
2
|
+
const phase = state.goal?.phase;
|
|
3
|
+
return phase === "evaluating" || phase === "retrying";
|
|
4
|
+
}
|
|
1
5
|
export class CancelCoordinator {
|
|
2
6
|
deps;
|
|
3
7
|
constructor(deps) {
|
|
@@ -23,17 +27,18 @@ export class CancelCoordinator {
|
|
|
23
27
|
snap.responderJobs > 0 ||
|
|
24
28
|
snap.subagents > 0 ||
|
|
25
29
|
snap.pendingNotifications > 0 ||
|
|
26
|
-
snap.interruptible
|
|
30
|
+
snap.interruptible ||
|
|
31
|
+
goalInterruptible(this.deps.session.getState()));
|
|
27
32
|
}
|
|
28
33
|
hasForegroundWork() {
|
|
29
34
|
const state = this.deps.session.getState();
|
|
30
|
-
return state.running || state.compacting || this.deps.interruptible.hasWork();
|
|
35
|
+
return state.running || state.compacting || goalInterruptible(state) || this.deps.interruptible.hasWork();
|
|
31
36
|
}
|
|
32
37
|
abortForeground() {
|
|
33
38
|
const state = this.deps.session.getState();
|
|
34
39
|
const turnAborted = state.running;
|
|
35
40
|
const interruptibleCancelled = this.deps.interruptible.cancelAll();
|
|
36
|
-
if (turnAborted || state.compacting)
|
|
41
|
+
if (turnAborted || state.compacting || goalInterruptible(state))
|
|
37
42
|
this.deps.session.abort();
|
|
38
43
|
return { turnAborted, interruptibleCancelled };
|
|
39
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancel-coordinator.js","sourceRoot":"","sources":["../../../src/app/controllers/cancel-coordinator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cancel-coordinator.js","sourceRoot":"","sources":["../../../src/app/controllers/cancel-coordinator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
export type GoalStatus = "active" | "paused";
|
|
2
|
+
export type GoalPhase = "evaluating" | "waiting" | "retrying";
|
|
3
|
+
export interface GoalView {
|
|
4
|
+
readonly id: string;
|
|
5
|
+
readonly objective: string;
|
|
6
|
+
readonly status: GoalStatus;
|
|
7
|
+
readonly phase?: GoalPhase | undefined;
|
|
8
|
+
readonly startedAt: number;
|
|
9
|
+
readonly turns: number;
|
|
10
|
+
readonly lastReason?: string | undefined;
|
|
11
|
+
readonly pauseReason?: string | undefined;
|
|
12
|
+
readonly resumeOnPrompt?: boolean | undefined;
|
|
13
|
+
readonly retryAt?: number | undefined;
|
|
14
|
+
readonly waitingFor?: readonly string[] | undefined;
|
|
15
|
+
}
|
|
16
|
+
export type GoalReportStatus = GoalStatus | "achieved";
|
|
17
|
+
export interface GoalReport {
|
|
18
|
+
readonly objective: string;
|
|
19
|
+
readonly status: GoalReportStatus;
|
|
20
|
+
readonly phase?: GoalPhase | undefined;
|
|
21
|
+
readonly durationMs: number;
|
|
22
|
+
readonly turns: number;
|
|
23
|
+
readonly tokens: number;
|
|
24
|
+
readonly lastReason?: string | undefined;
|
|
25
|
+
readonly pauseReason?: string | undefined;
|
|
26
|
+
readonly resumeOnPrompt?: boolean | undefined;
|
|
27
|
+
}
|
|
28
|
+
export type GoalUpdateKind = "continuing" | "achieved" | "failed" | "paused" | "resumed" | "cleared" | "replaced" | "unrecoverable" | "retrying" | "waiting";
|
|
29
|
+
export interface GoalUpdate {
|
|
30
|
+
readonly kind: GoalUpdateKind;
|
|
31
|
+
readonly objective: string;
|
|
32
|
+
readonly reason?: string | undefined;
|
|
33
|
+
readonly turns?: number | undefined;
|
|
34
|
+
readonly durationMs?: number | undefined;
|
|
35
|
+
readonly tokens?: number | undefined;
|
|
36
|
+
readonly delayMs?: number | undefined;
|
|
37
|
+
readonly resumeOnPrompt?: boolean | undefined;
|
|
38
|
+
}
|
|
39
|
+
export type GoalSetResult = {
|
|
40
|
+
readonly ok: true;
|
|
41
|
+
readonly objective: string;
|
|
42
|
+
readonly replaced?: string | undefined;
|
|
43
|
+
readonly deferred: boolean;
|
|
44
|
+
} | {
|
|
45
|
+
readonly ok: false;
|
|
46
|
+
readonly error: string;
|
|
47
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"goal-types.js","sourceRoot":"","sources":["../../../src/app/controllers/goal-types.ts"],"names":[],"mappings":""}
|
|
@@ -46,5 +46,6 @@ export interface ReportedCompaction {
|
|
|
46
46
|
readonly measurement: "provider-reported" | "estimated";
|
|
47
47
|
readonly scope: "message-history" | "assembled-request";
|
|
48
48
|
}
|
|
49
|
+
export declare function retainedRequestOverheadTokens(request: SuccessfulRequestSnapshot | undefined, history: readonly ChatMessage[]): number | undefined;
|
|
49
50
|
export declare function runSessionCompaction(options: RunSessionCompactionOptions): Promise<CompactResult>;
|
|
50
51
|
export {};
|
|
@@ -3,6 +3,8 @@ import { executeCompactionSummary, isCompactionOverLimitError, planCompactionRep
|
|
|
3
3
|
import { compactMessagesWithSummary, estimateMessagesTokens, isCompactionMemoryMessage, } from "../../agent/context-manager.js";
|
|
4
4
|
import { projectToolHistory } from "../../agent/tool-history.js";
|
|
5
5
|
import { buildContextBreakdown } from "../../agent/context-breakdown.js";
|
|
6
|
+
import { estimateToolSchemaTokens } from "../../agent/request-accounting.js";
|
|
7
|
+
import { isRequestContextSystemMessage } from "../../llm/system-messages.js";
|
|
6
8
|
import { calibratedRequestTokens } from "../../llm/token-estimate-calibration.js";
|
|
7
9
|
import { effectiveContextWindowTokens } from "../../llm/context-windows.js";
|
|
8
10
|
import { contextAttemptFromOperationUsage } from "../../llm/context-snapshot.js";
|
|
@@ -36,6 +38,18 @@ export async function summarizeForSessionCompact(prompt, opts) {
|
|
|
36
38
|
onUsage: opts.onUsage,
|
|
37
39
|
});
|
|
38
40
|
}
|
|
41
|
+
export function retainedRequestOverheadTokens(request, history) {
|
|
42
|
+
if (!request)
|
|
43
|
+
return undefined;
|
|
44
|
+
const historyHead = history[0];
|
|
45
|
+
const fixed = request.messages.filter((message, index) => index === 0
|
|
46
|
+
? message.role === "system" &&
|
|
47
|
+
!(historyHead?.role === "system" && historyHead.content === message.content)
|
|
48
|
+
: isRequestContextSystemMessage(message));
|
|
49
|
+
if (fixed.length === 0 && !request.tools?.length)
|
|
50
|
+
return undefined;
|
|
51
|
+
return estimateMessagesTokens(fixed) + estimateToolSchemaTokens(request.tools);
|
|
52
|
+
}
|
|
39
53
|
export async function runSessionCompaction(options) {
|
|
40
54
|
const emit = (type, payload) => {
|
|
41
55
|
options.emit(options.sequencer.build(type, payload, undefined));
|
|
@@ -80,10 +94,19 @@ export async function runSessionCompaction(options) {
|
|
|
80
94
|
const calibrationModel = successfulRequest?.model ?? options.model;
|
|
81
95
|
const calibrated = (tokens) => calibratedRequestTokens(calibrationProvider, calibrationModel, Math.max(0, tokens));
|
|
82
96
|
const beforeTokens = requestTokensBefore ?? calibrated(historyTokensBefore);
|
|
97
|
+
const retainedOverheadTokens = retainedRequestOverheadTokens(successfulRequest, history);
|
|
83
98
|
const reportedFor = (result) => {
|
|
99
|
+
const measurement = options.requestTokensBeforeMeasurement ?? "estimated";
|
|
100
|
+
if (retainedOverheadTokens !== undefined) {
|
|
101
|
+
return {
|
|
102
|
+
beforeTokens,
|
|
103
|
+
afterTokens: calibrated(result.afterTokens + retainedOverheadTokens),
|
|
104
|
+
measurement,
|
|
105
|
+
scope: "assembled-request",
|
|
106
|
+
};
|
|
107
|
+
}
|
|
84
108
|
const retainedHistoryTokens = calibrated(result.afterTokens);
|
|
85
109
|
const overheadTokens = (assembledTokens) => Math.max(0, assembledTokens - calibrated(result.beforeTokens));
|
|
86
|
-
const measurement = options.requestTokensBeforeMeasurement ?? "estimated";
|
|
87
110
|
const afterTokens = useContinuationAccounting && continuationAccounting
|
|
88
111
|
? retainedHistoryTokens +
|
|
89
112
|
overheadTokens(calibrated(continuationAccounting.rawRequestTokens))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-compact-helper.js","sourceRoot":"","sources":["../../../src/app/controllers/session-compact-helper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-compact-helper.js","sourceRoot":"","sources":["../../../src/app/controllers/session-compact-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,8 @@ import { type SessionUsageReport } from "./session-usage-ledger.js";
|
|
|
24
24
|
import { SessionPromptStore } from "../../store/session-prompts.js";
|
|
25
25
|
import { type FileLineChanges, type SessionChangesReport } from "./session-changes.js";
|
|
26
26
|
import { type GenerationProgress } from "../../llm/generation-metrics.js";
|
|
27
|
+
import { type GoalTimers } from "./session-goal.js";
|
|
28
|
+
import type { GoalReport, GoalSetResult, GoalView } from "./goal-types.js";
|
|
27
29
|
export interface SubagentsRuntimeState {
|
|
28
30
|
readonly enabled: boolean;
|
|
29
31
|
readonly running: number;
|
|
@@ -48,6 +50,7 @@ export interface SessionState {
|
|
|
48
50
|
readonly contextChip: string | undefined;
|
|
49
51
|
readonly contextLimit?: ContextSnapshotLimit | undefined;
|
|
50
52
|
readonly generation?: GenerationProgress | undefined;
|
|
53
|
+
readonly goal?: GoalView | undefined;
|
|
51
54
|
}
|
|
52
55
|
export type NoticeLevel = "info" | "warn";
|
|
53
56
|
export interface SessionControllerDeps {
|
|
@@ -71,6 +74,7 @@ export interface SessionControllerDeps {
|
|
|
71
74
|
readonly noHistory?: boolean | undefined;
|
|
72
75
|
readonly notifyResponderDelivery?: ((summary: string) => void) | undefined;
|
|
73
76
|
readonly titleCompleter?: ((messages: ChatMessage[]) => Promise<string>) | undefined;
|
|
77
|
+
readonly goalTimers?: GoalTimers | undefined;
|
|
74
78
|
}
|
|
75
79
|
export type TurnEndListener = (result: TurnResult) => void;
|
|
76
80
|
export type SessionStateListener = () => void;
|
|
@@ -90,6 +94,7 @@ export declare class SessionController implements Disposable {
|
|
|
90
94
|
private history;
|
|
91
95
|
private readonly prompts;
|
|
92
96
|
private readonly loopRecovery;
|
|
97
|
+
private readonly goal;
|
|
93
98
|
private readonly responder;
|
|
94
99
|
private provider;
|
|
95
100
|
private model;
|
|
@@ -166,6 +171,17 @@ export declare class SessionController implements Disposable {
|
|
|
166
171
|
}): void;
|
|
167
172
|
private applyRestoredModel;
|
|
168
173
|
notice(level: NoticeLevel, text: string): void;
|
|
174
|
+
setGoal(objective: string): GoalSetResult;
|
|
175
|
+
pauseGoal(): GoalView | undefined;
|
|
176
|
+
resumeGoal(): GoalView | undefined;
|
|
177
|
+
clearGoal(): string | undefined;
|
|
178
|
+
goalReport(): GoalReport | undefined;
|
|
179
|
+
private activateUserWork;
|
|
180
|
+
private goalBackgroundWork;
|
|
181
|
+
private evaluateGoal;
|
|
182
|
+
private emitAuxiliaryUsage;
|
|
183
|
+
private loadGoal;
|
|
184
|
+
private saveGoal;
|
|
169
185
|
allowTool(name: string): void;
|
|
170
186
|
disallowTool(name: string): void;
|
|
171
187
|
allowedTools(): readonly string[];
|
|
@@ -4,7 +4,7 @@ import { isProviderMeasuredPrecision, } from "../../llm/context-snapshot.js";
|
|
|
4
4
|
import { compactedContextSnapshot, recordAuxiliaryUsageSnapshot, recordContextUsageSnapshot, resolveContextSnapshot as resolveSnapshot, contextSnapshotForRoute, restoredContextSnapshot, createContextProjector, } from "./session-context-usage.js";
|
|
5
5
|
import { createSessionPolicy } from "../../agent/session-policy.js";
|
|
6
6
|
import { SubagentManager } from "../../agent/subagents/manager.js";
|
|
7
|
-
import { knownAttemptUsage } from "../../llm/operation-usage.js";
|
|
7
|
+
import { claimDiscardedAttemptUsage, knownAttemptUsage } from "../../llm/operation-usage.js";
|
|
8
8
|
import { getActiveProjectRoot } from "../../agent/project-root.js";
|
|
9
9
|
import { collectCompactionEnvelopeInput, createCompactionDurableEnvelopeBuilder, } from "../../agent/turn/compaction-durable-envelope.js";
|
|
10
10
|
import { summarizeCarriedWork } from "../../agent/durable-envelope.js";
|
|
@@ -42,6 +42,10 @@ import { SessionChanges } from "./session-changes.js";
|
|
|
42
42
|
import { SessionLateWork } from "./session-late-work.js";
|
|
43
43
|
import { isInternalChatMessage } from "../../types.js";
|
|
44
44
|
import { generationTokensPerSecond } from "../../llm/generation-metrics.js";
|
|
45
|
+
import { randomUUID } from "node:crypto";
|
|
46
|
+
import { evaluateGoal } from "../../agent/goal/goal-evaluator.js";
|
|
47
|
+
import { effectiveContextWindowTokens } from "../../llm/context-windows.js";
|
|
48
|
+
import { SessionGoal } from "./session-goal.js";
|
|
45
49
|
export class SessionController {
|
|
46
50
|
deps;
|
|
47
51
|
spool = new OutputSpool();
|
|
@@ -58,6 +62,7 @@ export class SessionController {
|
|
|
58
62
|
history = [];
|
|
59
63
|
prompts;
|
|
60
64
|
loopRecovery;
|
|
65
|
+
goal;
|
|
61
66
|
responder;
|
|
62
67
|
provider;
|
|
63
68
|
model;
|
|
@@ -156,16 +161,43 @@ export class SessionController {
|
|
|
156
161
|
notice: (text) => this.notice("warn", text),
|
|
157
162
|
enqueue: (prompt, label) => this.prompts.enqueuePriority(prompt, label),
|
|
158
163
|
});
|
|
164
|
+
this.goal = new SessionGoal({
|
|
165
|
+
now: () => this.contextTimestamp(),
|
|
166
|
+
mintId: () => randomUUID(),
|
|
167
|
+
isBusy: () => this.closing || this.turn.running || this.compactingFlag || this.unsettledTurns > 0,
|
|
168
|
+
hasQueuedWork: () => this.prompts.hasPending(),
|
|
169
|
+
mode: () => this.mode,
|
|
170
|
+
background: () => this.goalBackgroundWork(),
|
|
171
|
+
tokens: () => this.usageLedger.report().totals.totalTokens,
|
|
172
|
+
evaluate: (objective, signal) => this.evaluateGoal(objective, signal),
|
|
173
|
+
runTurn: (prompt, options) => {
|
|
174
|
+
if (options.kickoff)
|
|
175
|
+
this.activateUserWork();
|
|
176
|
+
return this.runTurn(prompt, { displayPrompt: options.displayPrompt });
|
|
177
|
+
},
|
|
178
|
+
load: () => this.loadGoal(),
|
|
179
|
+
save: (goal) => this.saveGoal(goal),
|
|
180
|
+
emit: (update) => this.deps.emit(this.sequencer.build("goal-updated", update, undefined)),
|
|
181
|
+
notifyState: () => this.notifyState(),
|
|
182
|
+
idle: () => {
|
|
183
|
+
this.responder?.scheduleWake();
|
|
184
|
+
this.subagentDelivery.scheduleWake();
|
|
185
|
+
},
|
|
186
|
+
timers: deps.goalTimers,
|
|
187
|
+
});
|
|
159
188
|
this.subagentDelivery = new SessionSubagents({
|
|
160
189
|
sessionId: () => this.sessionIdValue,
|
|
161
|
-
isBusy: () => this.turn.running || this.compactingFlag || this.unsettledTurns > 0,
|
|
190
|
+
isBusy: () => this.turn.running || this.compactingFlag || this.unsettledTurns > 0 || this.goal.evaluating,
|
|
162
191
|
hasQueuedWork: () => this.prompts.hasPending(),
|
|
163
192
|
continueQueue: () => this.prompts.continue(),
|
|
164
193
|
runTurn: (prompt) => this.runTurn(prompt, {
|
|
165
194
|
displayPrompt: null,
|
|
166
195
|
materializeHistoryImages: false,
|
|
167
196
|
}),
|
|
168
|
-
notifyState: () =>
|
|
197
|
+
notifyState: () => {
|
|
198
|
+
this.notifyState();
|
|
199
|
+
this.goal.scheduleWake();
|
|
200
|
+
},
|
|
169
201
|
});
|
|
170
202
|
this.subagentDelivery.bind(this.subagentsValue);
|
|
171
203
|
this.namer = new SessionNamer({
|
|
@@ -184,7 +216,7 @@ export class SessionController {
|
|
|
184
216
|
jobs: deps.jobs,
|
|
185
217
|
persistence: deps.persistence,
|
|
186
218
|
sessionId: () => this.sessionIdValue,
|
|
187
|
-
isBusy: () => this.turn.running || this.compactingFlag || this.unsettledTurns > 0,
|
|
219
|
+
isBusy: () => this.turn.running || this.compactingFlag || this.unsettledTurns > 0 || this.goal.evaluating,
|
|
188
220
|
hasQueuedWork: () => this.prompts.hasPending(),
|
|
189
221
|
continueQueue: () => this.prompts.continue(),
|
|
190
222
|
runTurn: (prompt, onStarted) => this.runTurn(prompt, {
|
|
@@ -199,6 +231,7 @@ export class SessionController {
|
|
|
199
231
|
});
|
|
200
232
|
const unsubscribe = deps.jobs.subscribe((change) => {
|
|
201
233
|
this.responder?.handleChange(change);
|
|
234
|
+
this.goal.scheduleWake();
|
|
202
235
|
});
|
|
203
236
|
this.disposables.add({ dispose: unsubscribe });
|
|
204
237
|
}
|
|
@@ -273,6 +306,7 @@ export class SessionController {
|
|
|
273
306
|
contextChip,
|
|
274
307
|
contextLimit,
|
|
275
308
|
generation: this.generation,
|
|
309
|
+
goal: this.goal.view(),
|
|
276
310
|
};
|
|
277
311
|
}
|
|
278
312
|
contextUsageProjection() {
|
|
@@ -408,6 +442,7 @@ export class SessionController {
|
|
|
408
442
|
setMode(mode) {
|
|
409
443
|
this.mode = mode;
|
|
410
444
|
this.notifyState();
|
|
445
|
+
this.goal.scheduleWake();
|
|
411
446
|
}
|
|
412
447
|
loadHistory(messages, options = {}) {
|
|
413
448
|
this.beginLifecycleGeneration();
|
|
@@ -454,6 +489,7 @@ export class SessionController {
|
|
|
454
489
|
code: options.workspaceCode,
|
|
455
490
|
});
|
|
456
491
|
this.settlePersistedResponderResults();
|
|
492
|
+
this.goal.restore();
|
|
457
493
|
this.notifyState();
|
|
458
494
|
}
|
|
459
495
|
applyRestoredModel(provider, model) {
|
|
@@ -468,6 +504,104 @@ export class SessionController {
|
|
|
468
504
|
notice(level, text) {
|
|
469
505
|
this.deps.emit(this.sequencer.build("notice", { level, text }, undefined));
|
|
470
506
|
}
|
|
507
|
+
setGoal(objective) {
|
|
508
|
+
return this.goal.set(objective);
|
|
509
|
+
}
|
|
510
|
+
pauseGoal() {
|
|
511
|
+
return this.goal.pause();
|
|
512
|
+
}
|
|
513
|
+
resumeGoal() {
|
|
514
|
+
if (this.goal.view()?.status === "paused")
|
|
515
|
+
this.activateUserWork();
|
|
516
|
+
return this.goal.resume();
|
|
517
|
+
}
|
|
518
|
+
clearGoal() {
|
|
519
|
+
return this.goal.clear();
|
|
520
|
+
}
|
|
521
|
+
goalReport() {
|
|
522
|
+
return this.goal.report();
|
|
523
|
+
}
|
|
524
|
+
activateUserWork() {
|
|
525
|
+
this.responder?.activate();
|
|
526
|
+
this.subagentDelivery.activate();
|
|
527
|
+
this.loopRecovery.clear();
|
|
528
|
+
}
|
|
529
|
+
goalBackgroundWork() {
|
|
530
|
+
const sessionId = this.sessionIdValue;
|
|
531
|
+
const jobs = this.deps.jobs;
|
|
532
|
+
const live = this.subagentsValue.list().filter((run) => run.status === "running" || run.status === "stopping");
|
|
533
|
+
const undeliveredRuns = this.subagentsValue.enabled ? this.subagentsValue.pendingResults().length : 0;
|
|
534
|
+
const undeliveredJobs = this.responder?.getState().ready ?? 0;
|
|
535
|
+
return {
|
|
536
|
+
running: [
|
|
537
|
+
...(jobs?.running(sessionId) ?? []).map((job) => `background job ${job.name ?? job.commandDisplay}`),
|
|
538
|
+
...live.map((run) => `subagent ${run.title}`),
|
|
539
|
+
],
|
|
540
|
+
pendingDeliveries: undeliveredRuns + undeliveredJobs,
|
|
541
|
+
};
|
|
542
|
+
}
|
|
543
|
+
async evaluateGoal(objective, signal) {
|
|
544
|
+
const config = getConfig();
|
|
545
|
+
const base = this.lastMainRequestSnapshot;
|
|
546
|
+
const provider = base?.provider ?? this.provider ?? config.defaultProvider;
|
|
547
|
+
const model = base?.model ?? this.model ?? getProviderModel(provider);
|
|
548
|
+
const generation = this.lifecycleGeneration;
|
|
549
|
+
const evaluation = await withSessionAffinity(this.sessionIdValue, () => evaluateGoal({
|
|
550
|
+
objective,
|
|
551
|
+
history: this.history,
|
|
552
|
+
baseRequest: base,
|
|
553
|
+
provider,
|
|
554
|
+
model,
|
|
555
|
+
...(provider === "codex" ? { thinking: { ...config.thinking } } : {}),
|
|
556
|
+
contextLimitTokens: effectiveContextWindowTokens(provider, model, customContextLimit(provider, model)),
|
|
557
|
+
signal,
|
|
558
|
+
onUsage: (result) => {
|
|
559
|
+
if (generation === this.lifecycleGeneration)
|
|
560
|
+
this.emitAuxiliaryUsage(result);
|
|
561
|
+
},
|
|
562
|
+
}));
|
|
563
|
+
return evaluation.verdict;
|
|
564
|
+
}
|
|
565
|
+
emitAuxiliaryUsage(result) {
|
|
566
|
+
for (const discarded of claimDiscardedAttemptUsage(result.operationUsage)) {
|
|
567
|
+
this.deps.emit(this.sequencer.build("token-usage", {
|
|
568
|
+
...discarded.usage,
|
|
569
|
+
provider: discarded.provider,
|
|
570
|
+
model: discarded.model,
|
|
571
|
+
auxiliary: true,
|
|
572
|
+
}, undefined));
|
|
573
|
+
}
|
|
574
|
+
if (!result.usage)
|
|
575
|
+
return;
|
|
576
|
+
this.deps.emit(this.sequencer.build("token-usage", {
|
|
577
|
+
...result.usage,
|
|
578
|
+
provider: result.provider,
|
|
579
|
+
model: result.model,
|
|
580
|
+
...(result.api ? { api: result.api } : {}),
|
|
581
|
+
auxiliary: true,
|
|
582
|
+
}, undefined));
|
|
583
|
+
}
|
|
584
|
+
loadGoal() {
|
|
585
|
+
if (!this.isPromptHistoryEnabled())
|
|
586
|
+
return undefined;
|
|
587
|
+
try {
|
|
588
|
+
return this.deps.persistence.loadGoal?.(this.sessionIdValue);
|
|
589
|
+
}
|
|
590
|
+
catch (error) {
|
|
591
|
+
this.notice("warn", `could not restore the session goal: ${error instanceof Error ? error.message : String(error)}`);
|
|
592
|
+
return undefined;
|
|
593
|
+
}
|
|
594
|
+
}
|
|
595
|
+
saveGoal(goal) {
|
|
596
|
+
if (!this.isPromptHistoryEnabled())
|
|
597
|
+
return;
|
|
598
|
+
try {
|
|
599
|
+
this.deps.persistence.saveGoal?.(this.sessionIdValue, goal);
|
|
600
|
+
}
|
|
601
|
+
catch (error) {
|
|
602
|
+
this.notice("warn", `could not save the session goal: ${error instanceof Error ? error.message : String(error)}`);
|
|
603
|
+
}
|
|
604
|
+
}
|
|
471
605
|
allowTool(name) {
|
|
472
606
|
this.policy.allow.add(name);
|
|
473
607
|
}
|
|
@@ -627,6 +761,7 @@ export class SessionController {
|
|
|
627
761
|
this.notifyState();
|
|
628
762
|
this.responder?.scheduleWake();
|
|
629
763
|
this.subagentDelivery.scheduleWake();
|
|
764
|
+
this.goal.scheduleWake();
|
|
630
765
|
}
|
|
631
766
|
}
|
|
632
767
|
compactionEnvelopePorts(history) {
|
|
@@ -671,6 +806,7 @@ export class SessionController {
|
|
|
671
806
|
this.closing = true;
|
|
672
807
|
this.responder?.deactivate();
|
|
673
808
|
this.subagentDelivery.deactivate();
|
|
809
|
+
this.goal.halt();
|
|
674
810
|
this.abort("session is closing");
|
|
675
811
|
this.prompts.detach();
|
|
676
812
|
if (this.unsettledTurns > 0) {
|
|
@@ -744,6 +880,7 @@ export class SessionController {
|
|
|
744
880
|
async cancelAll() {
|
|
745
881
|
this.responder?.invalidateWake();
|
|
746
882
|
this.subagentDelivery.deactivate();
|
|
883
|
+
this.goal.interrupt(this.turn.running);
|
|
747
884
|
this.prompts.preservePendingPriority();
|
|
748
885
|
this.turn.abort();
|
|
749
886
|
this.compactAbort?.abort();
|
|
@@ -766,6 +903,7 @@ export class SessionController {
|
|
|
766
903
|
.catch(() => undefined);
|
|
767
904
|
}
|
|
768
905
|
enqueue(prompt, opts) {
|
|
906
|
+
this.goal.noteUserPrompt();
|
|
769
907
|
this.prompts.enqueue(prompt, opts);
|
|
770
908
|
}
|
|
771
909
|
queued() {
|
|
@@ -787,8 +925,11 @@ export class SessionController {
|
|
|
787
925
|
this.prompts.sendNow(index);
|
|
788
926
|
}
|
|
789
927
|
abort(reason) {
|
|
928
|
+
const turnRunning = this.turn.running;
|
|
790
929
|
this.turn.abort(reason);
|
|
791
930
|
this.compactAbort?.abort();
|
|
931
|
+
if (reason !== "steer" && !this.closing)
|
|
932
|
+
this.goal.interrupt(turnRunning);
|
|
792
933
|
}
|
|
793
934
|
async continueQueue() {
|
|
794
935
|
await this.prompts.continue();
|
|
@@ -804,9 +945,8 @@ export class SessionController {
|
|
|
804
945
|
return () => this.turnEndListeners.delete(listener);
|
|
805
946
|
}
|
|
806
947
|
async submit(prompt, opts) {
|
|
807
|
-
this.
|
|
808
|
-
this.
|
|
809
|
-
this.loopRecovery.clear();
|
|
948
|
+
this.activateUserWork();
|
|
949
|
+
this.goal.noteUserPrompt();
|
|
810
950
|
return this.prompts.submit(prompt, opts);
|
|
811
951
|
}
|
|
812
952
|
async drain() {
|
|
@@ -911,8 +1051,10 @@ export class SessionController {
|
|
|
911
1051
|
if (sameGeneration) {
|
|
912
1052
|
this.lastTurnResult = result;
|
|
913
1053
|
this.restoredPreviousTurn = undefined;
|
|
914
|
-
if (!this.closing)
|
|
1054
|
+
if (!this.closing) {
|
|
915
1055
|
this.loopRecovery.handle(result);
|
|
1056
|
+
this.goal.handleTurnEnd(result);
|
|
1057
|
+
}
|
|
916
1058
|
}
|
|
917
1059
|
if (sameGeneration &&
|
|
918
1060
|
(result.status === "completed" ||
|
|
@@ -935,6 +1077,7 @@ export class SessionController {
|
|
|
935
1077
|
}
|
|
936
1078
|
this.responder?.scheduleWake();
|
|
937
1079
|
this.subagentDelivery.scheduleWake();
|
|
1080
|
+
this.goal.scheduleWake();
|
|
938
1081
|
}
|
|
939
1082
|
}
|
|
940
1083
|
scheduleAutosave() {
|
|
@@ -1006,9 +1149,11 @@ export class SessionController {
|
|
|
1006
1149
|
this.activeCompactions.clear();
|
|
1007
1150
|
this.responder?.invalidateWake();
|
|
1008
1151
|
this.subagentDelivery.deactivate();
|
|
1152
|
+
this.goal.reset();
|
|
1009
1153
|
}
|
|
1010
1154
|
dispose() {
|
|
1011
1155
|
this.beginLifecycleGeneration();
|
|
1156
|
+
this.goal.dispose();
|
|
1012
1157
|
this.prompts.detach();
|
|
1013
1158
|
this.namer.reset();
|
|
1014
1159
|
this.subagentDelivery.dispose();
|
|
@@ -1028,6 +1173,10 @@ export class SessionController {
|
|
|
1028
1173
|
this.activeTurnGeneration === this.lifecycleGeneration) {
|
|
1029
1174
|
this.changeLedger.record(`${event.turnId}:${event.payload.toolCallId}`, event.payload.fileChanges);
|
|
1030
1175
|
}
|
|
1176
|
+
if (event.type === "turn-started")
|
|
1177
|
+
this.goal.noteTurnStarted();
|
|
1178
|
+
else if (event.type === "tool-call")
|
|
1179
|
+
this.goal.noteToolCall();
|
|
1031
1180
|
if (event.type === "compaction-started") {
|
|
1032
1181
|
this.activeCompactions.add(event.payload.compactionId);
|
|
1033
1182
|
this.notifyState();
|