@ferris1225/pi-subagents 1.0.0 → 2.0.0

package/src/tools.ts

@@ -9,7 +9,8 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import { DEFAULT_MAX_RESULT_LINES, loadConfig } from "./config.ts";
-import { emptyUsage, formatCompletionBlock, formatUsage, matchRunIds } from "./format.ts";
+import { formatCompletionBlock, formatUsage, matchRunIds } from "./format.ts";
+import { emptyUsage } from "./rpc-run.ts";
 import {
 	formatElapsed,
 	formatUsageCompact,
@@ -21,7 +22,6 @@ import {
 } from "./monitor.ts";
 import type { SubagentRuntime, SubagentThread } from "./runtime.ts";
 import { getResultOutput, isFailedResult, type SingleResult } from "./spawn.ts";
-import { trajectoryStore } from "./trajectory.ts";
 
 /** In-turn result lookup. Dispatch already ended the turn and results arrive as
  * wake-up messages, so the default must NOT block: a settled run returns its
@@ -97,7 +97,6 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 							return { content: [{ type: "text", text: `Run #${thread.id} is ${thread.control.getPhase()}; only a running thread can be steered.` }], details: {} };
 						}
 						await thread.control.steer(instruction);
-						trajectoryStore.get(thread.id).trajectory.append({ kind: "steer", instruction });
 						return { content: [{ type: "text", text: `Queued steering instruction for run #${thread.id} after its current tool batch.` }], details: {} };
 					}
 					case "retarget": {
@@ -110,7 +109,6 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 							thread.task = objective;
 							thread.control.retargetPending(objective);
 							monitor.setTask(thread.id, objective);
-							trajectoryStore.get(thread.id).trajectory.append({ kind: "retarget", objective });
 							return { content: [{ type: "text", text: `Updated queued run #${thread.id} to the new objective; no child was spawned by this control action.` }], details: {} };
 						}
 						if (!(["starting", "running", "steering", "interrupting", "retrying"] as const).includes(phase as any)) {
@@ -119,7 +117,6 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 						thread.task = objective;
 						monitor.setTask(thread.id, objective);
 						await thread.control.retarget(objective);
-						trajectoryStore.get(thread.id).trajectory.append({ kind: "retarget", objective });
 						return { content: [{ type: "text", text: `Retargeted run #${thread.id} in the same session; the aborted objective will not be delivered as a completion.` }], details: {} };
 					}
 					case "park": {
@@ -229,8 +226,7 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 				typeof params.timeoutMs === "number" && Number.isFinite(params.timeoutMs) && params.timeoutMs >= 0
 					? params.timeoutMs
 					: SUBAGENT_WAIT_DEFAULT_TIMEOUT_MS;
-			const isActive = (run: { status: RunStatus; retained?: boolean }): boolean =>
-				isRunActiveStatus(run.status) || run.retained === true;
+			const isActive = (run: { status: RunStatus }): boolean => isRunActiveStatus(run.status);
 
 			const requested = params.id?.trim();
 			// A run that already settled resolves immediately with its result.
@@ -239,7 +235,10 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 				if (settledIds.length > 0) {
 					return {
 						content: [
-							{ type: "text", text: settledIds.map((id) => formatCompletionBlock(runtime.settledRuns.get(id)!, config.maxResultLines, ctx.cwd)).join("\n\n") },
+							{ type: "text", text: settledIds.map((id) => {
+								const result = runtime.settledRuns.get(id)!;
+								return formatCompletionBlock(result, config.maxResultLines, result.projectCwd ?? ctx.cwd);
+							}).join("\n\n") },
 						],
 						details: {},
 					};
@@ -334,7 +333,9 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 
 			const outcomes = await Promise.all(targets.map((run) => waitForRun(run.id)));
 			const blocks = outcomes.map((outcome) =>
-				outcome.result ? formatCompletionBlock(outcome.result, config.maxResultLines, ctx.cwd) : (outcome.note ?? "(no outcome)"),
+				outcome.result
+					? formatCompletionBlock(outcome.result, config.maxResultLines, outcome.result.projectCwd ?? ctx.cwd)
+					: (outcome.note ?? "(no outcome)"),
 			);
 			return { content: [{ type: "text", text: blocks.join("\n\n") }], details: {} };
 		},
@@ -387,7 +388,17 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 				if (settledIds.length > 0) {
 					return {
 						content: [
-							{ type: "text", text: settledIds.map((id) => formatCompletionBlock(runtime.settledRuns.get(id)!, config.maxResultLines, ctx.cwd)).join("\n\n") },
+							{
+								type: "text",
+								text: settledIds
+									.map((id) => formatCompletionBlock(
+										runtime.settledRuns.get(id)!,
+										config.maxResultLines,
+										runtime.settledRuns.get(id)!.projectCwd ?? ctx.cwd,
+										{ failedToolDetails: true },
+									))
+									.join("\n\n"),
+							},
 						],
 						details: {},
 					};
@@ -420,12 +431,12 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 
 			const now = Date.now();
 			const activeRuns = monitor.getRuns().filter(
-				(run) => isRunActiveStatus(run.status) || run.retained,
+				(run) => isRunActiveStatus(run.status),
 			);
 			const activeLines = activeRuns.map((run) => {
 				const thread = runtime.threads.get(run.id);
 				const model = run.modelFallbackFrom
-					? `${run.model ?? "?"} (pool fallback from ${run.modelFallbackFrom})`
+					? `${run.model ?? "?"} (main after ${run.modelFallbackFrom} failed)`
 					: (run.model ?? "?");
 				const parts = [
 					`#${run.id} ${run.agent}`,
@@ -454,7 +465,7 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 				const usage = formatUsage(result.usage);
 				const label = runLabel(result.task);
 				const model = result.modelFallbackFrom
-					? `${result.model ?? "?"} (pool fallback from ${result.modelFallbackFrom})`
+					? `${result.model ?? "?"} (main after ${result.modelFallbackFrom} failed)`
 					: (result.model ?? "?");
 				const isolation = result.isolation === "worktree" ? ` · worktree ${result.integrationStatus ?? "unknown"}` : "";
 				const relations = [
@@ -651,7 +662,6 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 						}
 						: {
 							agent: thread.agentName,
-							agentSource: "builtin",
 							task: thread.task,
 							exitCode: 1,
 							messages: [],
@@ -659,12 +669,11 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 							usage: emptyUsage(),
 							model: run?.model,
 							thinking: run?.thinking,
+							projectCwd: thread.cwd,
 							stopReason: "aborted",
 							errorMessage: stopMessage,
 							runId,
 							isolation: thread.isolation,
-							originalCwd: thread.cwd,
-							isolationCwd: thread.executionCwd,
 						};
 					const finalization = await thread.finalizeIsolation(generation, stoppedResult);
 					if (finalization?.status === "retained") retainedIntegration.push(`#${runId}`);
@@ -672,24 +681,7 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 					thread.lastResult = stoppedResult;
 				}
 				monitor.setStatus(runId, "failed");
-				if (stoppedResult) {
-					const trajectoryState = trajectoryStore.get(runId);
-					const alreadyStampedStopped = trajectoryState.trajectory.getGenerationEvents().some(
-						(event) => event.kind === "settled" && event.status === "stopped",
-					);
-					if (!alreadyStampedStopped) {
-						trajectoryState.trajectory.append({
-							kind: "settled",
-							status: "stopped",
-							model: stoppedResult.model ?? run?.model,
-							isolation: thread.isolation,
-							...(stoppedResult.integrationStatus && stoppedResult.integrationStatus !== "pending"
-								? { integrationStatus: stoppedResult.integrationStatus }
-								: {}),
-						});
-					}
-					completionResults.push(stoppedResult);
-				}
+				if (stoppedResult) completionResults.push(stoppedResult);
 				monitor.removeRun(runId);
 				runtime.retireThreadSession(thread);
 				if (thread.lifecycleVersion === stopVersion && thread.lifecycleOperation === "stop") {
@@ -701,7 +693,7 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 				const maxResultLines = (await configPromise)?.maxResultLines ?? DEFAULT_MAX_RESULT_LINES;
 				runtime.sendCompletionGroup(completionResults.map((result) => ({
 					agent: result.agent,
-					block: formatCompletionBlock(result, maxResultLines, ctx.cwd),
+					block: formatCompletionBlock(result, maxResultLines, result.projectCwd ?? ctx.cwd),
 					triggerTurn: true,
 				})));
 				runtime.completionBatcher.flush();

package/src/ui.ts

@@ -45,9 +45,7 @@ export interface PickerStyles {
 	filterEcho: (t: string) => string;
 }
 
-export interface PickerItem extends SelectItem {
-	disabled?: boolean;
-}
+export type PickerItem = SelectItem;
 
 export function pickerItemSearchText(item: PickerItem): string {
 	return `${item.value} ${item.label} ${item.description ?? ""}`;
@@ -118,9 +116,7 @@ export class Picker implements Component, Focusable {
 				const item = visible[i];
 				const isCursor = start + i === this.cursor;
 				const mark = isCursor ? s.cursorMark("❯ ") : "  ";
-				const label = item.disabled
-					? s.dim(item.label)
-					: isCursor ? s.selectedLabel(item.label) : s.label(item.label);
+				const label = isCursor ? s.selectedLabel(item.label) : s.label(item.label);
 				const description = item.description ? s.dim(` — ${item.description}`) : "";
 				const line = this.multi
 					? mark + (this.selected.has(item.value) ? s.checked("[x] ") : s.unchecked("[ ] ")) + label + description
@@ -149,7 +145,7 @@ export class Picker implements Component, Focusable {
 			if (this.multi) this.cb.onConfirm?.([...this.selected]);
 			else {
 				const item = this.filtered[this.cursor];
-				if (item && !item.disabled) this.cb.onSelect?.(item.value);
+				if (item) this.cb.onSelect?.(item.value);
 			}
 			return;
 		} else if (kb.matches(data, "tui.select.cancel")) {

package/src/widget.ts

@@ -0,0 +1,144 @@
+/** Lightweight active-run widget for interactive Pi sessions. */
+
+import type { ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
+import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import {
+	formatElapsed,
+	formatTaskSummary,
+	isRunActiveStatus,
+	monitor,
+	statusIcon,
+	type RunView,
+} from "./monitor.ts";
+
+export const SUBAGENTS_WIDGET_ID = "pi-subagents";
+
+/** Keep the elapsed tail visible while clipping the descriptive left side. */
+function compactLine(left: string, right: string, width: number): string {
+	if (width <= 0) return "";
+	if (!right) return truncateToWidth(left, width, "");
+	const separator = " ";
+	const rightWidth = visibleWidth(right);
+	if (rightWidth >= width) return truncateToWidth(right, width, "");
+	const leftWidth = width - rightWidth - visibleWidth(separator);
+	if (leftWidth <= 0) return truncateToWidth(right, width, "");
+	return `${truncateToWidth(left, leftWidth, "…")}${separator}${right}`;
+}
+
+/** One compact primary line per genuinely active run, plus an optional indented
+ * activity line. The primary line reserves effective model/thinking and elapsed
+ * width before truncating the task. Settled and parked threads never appear, so
+ * elapsed time cannot keep ticking beside a terminal status. */
+export function formatActiveRunLines(
+	runs: readonly RunView[],
+	theme: Theme,
+	width: number,
+	now: number = Date.now(),
+): string[] {
+	const dim = (text: string): string => theme.fg("dim", text);
+	return runs
+		.filter((run) => isRunActiveStatus(run.status))
+		.flatMap((run) => {
+			const icon = statusIcon(run.status, theme);
+			const name = theme.fg("accent", theme.bold(run.agent));
+			const identity = `${icon} ${dim(`#${run.id}`)} ${name}`;
+			const elapsed = formatElapsed(run, now);
+			// Render only the resolved model id plus thinking level. Provider auth and
+			// other configuration never enter monitor state or this line.
+			const modelId = run.model?.split("/").at(-1);
+			const modelSource = formatTaskSummary(
+				modelId ? `${modelId}${run.thinking ? `/${run.thinking}` : ""}` : run.thinking ? `thinking:${run.thinking}` : "",
+				64,
+				false,
+			);
+			const taskSource = formatTaskSummary(run.task, 64);
+			const primaryPartCount = 2 + (modelSource ? 1 : 0) + (elapsed ? 1 : 0);
+			const contentWidth = Math.max(
+				0,
+				width -
+					visibleWidth(identity) -
+					visibleWidth(elapsed) -
+					(primaryPartCount - 1) * visibleWidth(" · "),
+			);
+			const modelDesired = visibleWidth(modelSource);
+			const modelFloor = Math.min(modelDesired, Math.min(12, contentWidth));
+			let modelWidth = modelSource
+				? Math.min(modelDesired, Math.max(modelFloor, contentWidth - 8))
+				: 0;
+			let taskWidth = contentWidth - modelWidth;
+			if (visibleWidth(taskSource) < taskWidth) {
+				modelWidth = Math.min(modelDesired, modelWidth + taskWidth - visibleWidth(taskSource));
+				taskWidth = contentWidth - modelWidth;
+			}
+			const task = taskWidth > 0 ? formatTaskSummary(taskSource, taskWidth) : "";
+			const modelThinking = modelWidth > 0 ? formatTaskSummary(modelSource, modelWidth, false) : "";
+			const primaryLeft = [
+				identity,
+				task ? dim(task) : undefined,
+				modelThinking ? dim(modelThinking) : undefined,
+			].filter((part): part is string => Boolean(part)).join(" · ");
+			const primary = compactLine(primaryLeft, elapsed ? dim(`· ${elapsed}`) : "", width);
+
+			const activity = run.activity?.trim();
+			if (!activity) return [primary];
+			const activityIndent = "  ";
+			const activityWidth = width - visibleWidth(activityIndent);
+			if (activityWidth <= 0) return [primary];
+			const activitySummary = formatTaskSummary(activity, activityWidth);
+			if (!activitySummary) return [primary];
+			return [primary, truncateToWidth(`${activityIndent}${dim(activitySummary)}`, width, "")];
+		});
+}
+
+function hasTickingRun(): boolean {
+	return monitor.getRuns().some(
+		(run) => isRunActiveStatus(run.status) && run.startedAt !== undefined,
+	);
+}
+
+/** Install the widget for one TUI session. Its timer exists only while at least
+ * one active run has started and is disposed with the widget. */
+export function installActiveRunsWidget(ctx: Pick<ExtensionContext, "mode" | "ui">): void {
+	if (ctx.mode !== "tui") return;
+	ctx.ui.setWidget(
+		SUBAGENTS_WIDGET_ID,
+		(tui, theme) => {
+			let timer: ReturnType<typeof setInterval> | undefined;
+			let disposed = false;
+
+			const syncTimer = (): void => {
+				if (disposed) return;
+				if (hasTickingRun()) {
+					if (timer) return;
+					timer = setInterval(() => tui.requestRender(), 1_000);
+					timer.unref?.();
+					return;
+				}
+				if (timer) clearInterval(timer);
+				timer = undefined;
+			};
+
+			const unsubscribe = monitor.subscribe(() => {
+				syncTimer();
+				tui.requestRender();
+			});
+			syncTimer();
+
+			return {
+				render: (width: number) => formatActiveRunLines(monitor.getRuns(), theme, width),
+				invalidate() {},
+				dispose() {
+					disposed = true;
+					unsubscribe();
+					if (timer) clearInterval(timer);
+					timer = undefined;
+				},
+			};
+		},
+		{ placement: "aboveEditor" },
+	);
+}
+
+export function clearActiveRunsWidget(ctx: Pick<ExtensionContext, "mode" | "ui">): void {
+	if (ctx.mode === "tui") ctx.ui.setWidget(SUBAGENTS_WIDGET_ID, undefined);
+}

package/src/worktree.ts

@@ -238,7 +238,7 @@ export interface WorktreeIsolation {
 	 * attempting to apply the same patch twice. */
 	snapshotCheckpoint(): Promise<WorktreeCheckpoint>;
 	/** Remove a newly-created continuation that failed before it was dispatched. */
-	discard?(): Promise<void>;
+	discard(): Promise<void>;
 	/** Idempotent across stale generations and repeated stop/shutdown paths. */
 	finalize(): Promise<WorktreeFinalization>;
 }

package/src/trajectory.ts

@@ -1,312 +0,0 @@
-/**
- * Append-only lifecycle trajectories for logical sub-agent threads.
- *
- * Events cover dispatch, model candidates, retries, controls, tool activity,
- * usage, worktrees, forks, and settlement. Each event keeps its generation and
- * timestamp across resume/restart; mutable summary fields reset per generation.
- * Tool arguments are reduced to a short terminal-safe summary with obvious
- * credential fields and embedded secrets redacted.
- */
-
-import { stripVTControlCharacters } from "node:util";
-import type { UsageStats } from "./rpc-run.ts";
-import type { IsolationMode, WorktreeFinalizationStatus } from "./worktree.ts";
-
-// ---------------------------------------------------------------------------
-// Event types
-// ---------------------------------------------------------------------------
-
-export const TRAJECTORY_VERSION = 1;
-
-/** Typed append-only trajectory events. */
-export type TrajectoryEvent =
-	| { v: number; runId: number; generation: number; at: number; kind: "dispatch"; agent: string; task: string; model?: string; thinking?: string; pool?: readonly string[]; vision?: boolean; resumed?: boolean; isolation?: IsolationMode; originalCwd?: string; isolationCwd?: string }
-	| { v: number; runId: number; generation: number; at: number; kind: "status"; status: string; phase?: string }
-	| { v: number; runId: number; generation: number; at: number; kind: "candidate"; model?: string; index?: number; total?: number; fallbackFrom?: string }
-	| { v: number; runId: number; generation: number; at: number; kind: "retry"; reason: string; delayMs?: number }
-	| { v: number; runId: number; generation: number; at: number; kind: "steer"; instruction: string }
-	| { v: number; runId: number; generation: number; at: number; kind: "retarget"; objective: string }
-	| { v: number; runId: number; generation: number; at: number; kind: "park" }
-	| { v: number; runId: number; generation: number; at: number; kind: "resume"; objective?: string }
-	| { v: number; runId: number; generation: number; at: number; kind: "fork"; sourceRunId: number; childRunId: number; objective?: string }
-	| { v: number; runId: number; generation: number; at: number; kind: "stop"; reason?: string }
-	| { v: number; runId: number; generation: number; at: number; kind: "worktree"; status: "created" | WorktreeFinalizationStatus; originalCwd: string; isolationCwd?: string; worktreePath?: string; patchPath?: string; integrated?: boolean; error?: string }
-	| { v: number; runId: number; generation: number; at: number; kind: "settled"; status: "done" | "failed" | "stopped"; model?: string; isolation?: IsolationMode; integrationStatus?: WorktreeFinalizationStatus }
-	| { v: number; runId: number; generation: number; at: number; kind: "tool_start"; tool: string; toolCallId?: string; summary: string }
-	| { v: number; runId: number; generation: number; at: number; kind: "tool_end"; tool: string; toolCallId?: string; isError: boolean; error?: string }
-	| { v: number; runId: number; generation: number; at: number; kind: "usage"; usage: UsageStats; model?: string };
-
-export type TrajectoryEventKind = TrajectoryEvent["kind"];
-
-/** Distributive Omit: per-variant event payload without the envelope fields
- * (v/runId/generation/at are stamped by TrajectoryLog.append). */
-type DistributiveOmit<T, K extends PropertyKey> = T extends unknown ? Omit<T, K> : never;
-export type NewTrajectoryEvent = DistributiveOmit<TrajectoryEvent, "v" | "runId" | "generation" | "at">;
-
-// ---------------------------------------------------------------------------
-// Tool-arg safety: concise summary + redaction
-// ---------------------------------------------------------------------------
-
-/** Truncation budget for one scalar argument value inside a summary. */
-export const TOOL_ARG_VALUE_MAX = 48;
-/** Total budget for a summarized tool-args blob. */
-export const TOOL_ARG_SUMMARY_MAX = 160;
-
-const SENSITIVE_KEY_RE = /token|password|authorization|api[-_]?key|apikey|secret|credential|cookie|bearer/i;
-const REDACTED = "<redacted>";
-
-function isSensitiveKey(key: string): boolean {
-	return SENSITIVE_KEY_RE.test(key);
-}
-
-/** Redact credentials embedded inside otherwise ordinary scalar fields such as
- * `command`. Key-only filtering is insufficient for shell/header arguments. */
-export function redactSensitiveText(value: string): string {
-	let text = stripVTControlCharacters(value);
-	text = text.replace(
-		/(\bauthorization\s*:\s*(?:bearer|basic)\s+)([^\s'"`;,]+)/giu,
-		`$1${REDACTED}`,
-	);
-	text = text.replace(
-		/(\bbearer\s+)([A-Za-z0-9._~+/=-]{6,})/giu,
-		`$1${REDACTED}`,
-	);
-	text = text.replace(
-		/(\b(?:api[-_]?key|apikey|access[-_]?token|refresh[-_]?token|token|password|passwd|secret|credential|cookie)\b\s*(?:=|:)\s*)(?:"[^"]*"|'[^']*'|[^\s;&,]+)/giu,
-		`$1${REDACTED}`,
-	);
-	text = text.replace(
-		/((?:--?(?:api[-_]?key|access[-_]?token|token|password|secret|credential))\s+)(?:"[^"]*"|'[^']*'|\S+)/giu,
-		`$1${REDACTED}`,
-	);
-	text = text.replace(
-		/\b(?:sk-[A-Za-z0-9_-]{8,}|gh[pousr]_[A-Za-z0-9]{8,}|AKIA[A-Z0-9]{16})\b/gu,
-		REDACTED,
-	);
-	return text;
-}
-
-function summarizeScalar(value: unknown): string | undefined {
-	if (value === null || value === undefined || value === "") return undefined;
-	let text: string;
-	if (typeof value === "string") text = value;
-	else if (typeof value === "number" || typeof value === "boolean") text = String(value);
-	else return undefined; // arrays/objects are dropped from the summary
-	const oneLine = value.toString() === "[object Object]" ? "" : redactSensitiveText(text).replace(/\s+/g, " ").trim();
-	if (!oneLine) return undefined;
-	const chars = [...oneLine];
-	return chars.length > TOOL_ARG_VALUE_MAX ? `${chars.slice(0, TOOL_ARG_VALUE_MAX - 1).join("")}…` : oneLine;
-}
-
-/**
- * Concise, display-safe one-line summary of a tool-args payload. Only the first
- * few scalar fields are shown; sensitive-looking values are redacted; deep
- * structures are collapsed. Never throws. Output is width-agnostic plain text
- * (callers truncate to their display budget with truncateToWidth).
- */
-export function summarizeToolArgs(args: unknown): string {
-	if (args === null || args === undefined) return "";
-	if (typeof args !== "object") {
-		const s = summarizeScalar(args);
-		return s ? truncateSummary(s) : "";
-	}
-	const record = args as Record<string, unknown>;
-	const parts: string[] = [];
-	for (const [key, value] of Object.entries(record)) {
-		if (parts.length >= 5) {
-			parts.push("…");
-			break;
-		}
-		if (isSensitiveKey(key)) {
-			parts.push(`${key}=${REDACTED}`);
-			continue;
-		}
-		const scalar = summarizeScalar(value);
-		if (scalar !== undefined) parts.push(`${key}=${scalar}`);
-		else if (value !== undefined && value !== null) parts.push(`${key}={…}`);
-	}
-	return truncateSummary(parts.filter(Boolean).join(" "));
-}
-
-function truncateSummary(text: string): string {
-	const chars = [...text];
-	return chars.length > TOOL_ARG_SUMMARY_MAX ? `${chars.slice(0, TOOL_ARG_SUMMARY_MAX - 1).join("")}…` : text;
-}
-
-// ---------------------------------------------------------------------------
-// Trajectory log
-// ---------------------------------------------------------------------------
-
-export interface TrajectorySummaryRecord {
-	model?: string;
-	thinking?: string;
-	modelFallbackFrom?: string;
-	toolCount: number;
-	currentTool?: string;
-	activity?: string;
-	lastAt?: number;
-	endedAt?: number;
-	isolation?: IsolationMode;
-	integrationStatus?: WorktreeFinalizationStatus | "pending";
-	originalCwd?: string;
-	isolationCwd?: string;
-	forkedFromRunId?: number;
-	forkChildRunIds?: number[];
-}
-
-/**
- * Append-only event log for one thread id. `clearSummary()` retires the mutable
- * latest-state fields at the start of a new generation while the event history
- * stays. `clearAll()` (parent-session teardown only) drops everything.
- */
-export class TrajectoryLog {
-	private readonly events: TrajectoryEvent[] = [];
-	/** Mutable latest-state summary; NOT append-only — reset per generation. */
-	private summaryRecord: TrajectorySummaryRecord = { toolCount: 0 };
-
-	constructor(
-		readonly runId: number,
-		private readonly notify: () => void,
-	) {}
-
-	get generation(): number {
-		return this.summaryGeneration;
-	}
-
-	/** Internal counter also stored on each event; bumped by restart(). Starts
-	 * at 1 to mirror the thread's generation numbering in the runtime. */
-	private summaryGeneration = 1;
-
-	append(event: NewTrajectoryEvent, now: number = Date.now()): void {
-		const full = { v: TRAJECTORY_VERSION, runId: this.runId, generation: this.summaryGeneration, at: now, ...event } as TrajectoryEvent;
-		this.events.push(full);
-		this.applySummary(full);
-		try {
-			this.notify();
-		} catch {
-			/* observers must never break trajectory capture */
-		}
-	}
-
-	/** All events in append order (oldest first). Generation ascends monotonically. */
-	getEvents(): readonly TrajectoryEvent[] {
-		return this.events;
-	}
-
-	/** Events of the latest generation only (oldest first). */
-	getGenerationEvents(): readonly TrajectoryEvent[] {
-		let start = this.events.length;
-		for (let i = this.events.length - 1; i >= 0; i--) {
-			if (this.events[i].generation === this.summaryGeneration) start = i;
-			else break;
-		}
-		return this.events.slice(start);
-	}
-
-	summary(): Readonly<TrajectorySummaryRecord> {
-		return this.summaryRecord;
-	}
-
-	/** Begin a new generation: same id, bumped generation, fresh mutable summary,
-	 * untouched event history. Appends no event itself — dispatch appends the
-	 * dispatch/resume event with the new-generation attributes. */
-	restart(): number {
-		this.summaryGeneration += 1;
-		this.summaryRecord = { toolCount: 0 };
-		return this.summaryGeneration;
-	}
-
-	private applySummary(event: TrajectoryEvent): void {
-		const s = this.summaryRecord;
-		s.lastAt = event.at;
-		switch (event.kind) {
-			case "dispatch":
-				if (event.model !== undefined) s.model = event.model;
-				if (event.isolation !== undefined) s.isolation = event.isolation;
-				if (event.originalCwd !== undefined) s.originalCwd = event.originalCwd;
-				if (event.isolationCwd !== undefined) s.isolationCwd = event.isolationCwd;
-				if (event.isolation === "worktree") s.integrationStatus = "pending";
-				if (event.thinking !== undefined) s.thinking = event.thinking;
-				s.modelFallbackFrom = undefined;
-				s.endedAt = undefined;
-				s.currentTool = undefined;
-				s.activity = undefined;
-				break;
-			case "candidate":
-				if (event.model !== undefined) s.model = event.model;
-				if (event.fallbackFrom !== undefined) s.modelFallbackFrom = event.fallbackFrom;
-				break;
-			case "tool_start":
-				s.toolCount += 1;
-				s.currentTool = event.tool;
-				s.activity = event.summary ? `${event.tool} ${event.summary}` : event.tool;
-				break;
-			case "tool_end":
-				if (s.currentTool === event.tool) s.currentTool = undefined;
-				break;
-			case "fork":
-				if (event.runId === event.childRunId) s.forkedFromRunId = event.sourceRunId;
-				if (event.runId === event.sourceRunId) {
-					s.forkChildRunIds ??= [];
-					if (!s.forkChildRunIds.includes(event.childRunId)) s.forkChildRunIds.push(event.childRunId);
-				}
-				break;
-			case "worktree":
-				s.isolation = "worktree";
-				s.originalCwd = event.originalCwd;
-				if (event.isolationCwd !== undefined) s.isolationCwd = event.isolationCwd;
-				if (event.status !== "created") s.integrationStatus = event.status;
-				break;
-			case "settled":
-				s.endedAt = event.at;
-				s.currentTool = undefined;
-				if (event.isolation !== undefined) s.isolation = event.isolation;
-				if (event.integrationStatus !== undefined) s.integrationStatus = event.integrationStatus;
-				break;
-			case "status":
-				s.activity = undefined;
-				if (event.status === "parked" || event.status === "done" || event.status === "failed") s.endedAt ??= event.at;
-				break;
-		}
-	}
-
-	/** Parent-session teardown: wipe summary AND history. */
-	clearAll(): void {
-		this.events.length = 0;
-		this.summaryGeneration = 1;
-		this.summaryRecord = { toolCount: 0 };
-	}
-}
-
-export class ThreadTrajectoryState {
-	readonly trajectory: TrajectoryLog;
-
-	constructor(readonly runId: number) {
-		this.trajectory = new TrajectoryLog(runId, () => {});
-	}
-
-	get generation(): number {
-		return this.trajectory.generation;
-	}
-}
-
-/** Session-scoped registry of logical-thread trajectories. */
-export class TrajectoryStore {
-	private readonly states = new Map<number, ThreadTrajectoryState>();
-
-	get(runId: number): ThreadTrajectoryState {
-		let state = this.states.get(runId);
-		if (!state) {
-			state = new ThreadTrajectoryState(runId);
-			this.states.set(runId, state);
-		}
-		return state;
-	}
-
-	clearAll(): void {
-		for (const state of this.states.values()) state.trajectory.clearAll();
-		this.states.clear();
-	}
-}
-
-export const trajectoryStore = new TrajectoryStore();