@selesai/code 0.8.6 → 0.8.8

package/dist/extensions/pi-subagents/src/tui/fleet-transcript.ts

@@ -2,59 +2,12 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { getLanguageFromPath, highlightCode, type ExtensionContext } from "@selesai/code";
 import { Markdown, truncateToWidth, visibleWidth, wrapTextWithAnsi, type MarkdownTheme } from "@earendil-works/pi-tui";
+import { safeTerminalText as safeDisplayText } from "../shared/display-text.ts";
 
 const DEFAULT_MAX_RECORDS = 240;
 const DEFAULT_MAX_BYTES = 2 * 1024 * 1024;
 const MAX_MESSAGE_CHARS = 64 * 1024;
 const TOOL_PREVIEW_LINES = 7;
-const BINARY_CONTENT_PLACEHOLDER = "[binary content omitted for safe display]";
-
-function isUnsafeDisplayCodePoint(codePoint: number): boolean {
-	const terminalControl = (codePoint <= 0x1f && codePoint !== 0x09 && codePoint !== 0x0a)
-		|| (codePoint >= 0x7f && codePoint <= 0x9f);
-	const bidiControl = codePoint === 0x061c
-		|| codePoint === 0x200e
-		|| codePoint === 0x200f
-		|| (codePoint >= 0x202a && codePoint <= 0x202e)
-		|| (codePoint >= 0x2066 && codePoint <= 0x2069);
-	const privateUse = (codePoint >= 0xe000 && codePoint <= 0xf8ff)
-		|| (codePoint >= 0xf0000 && codePoint <= 0xffffd)
-		|| (codePoint >= 0x100000 && codePoint <= 0x10fffd);
-	const invalidScalar = codePoint >= 0xd800 && codePoint <= 0xdfff;
-	const nonCharacter = (codePoint >= 0xfdd0 && codePoint <= 0xfdef)
-		|| (codePoint & 0xffff) === 0xfffe
-		|| (codePoint & 0xffff) === 0xffff;
-	return terminalControl || bidiControl || privateUse || invalidScalar || nonCharacter;
-}
-
-function looksLikeBinaryContent(text: string): boolean {
-	if (text.includes("\0")) return true;
-	let suspiciousControls = 0;
-	let replacementCharacters = 0;
-	let codePoints = 0;
-	for (const character of text) {
-		codePoints++;
-		const codePoint = character.codePointAt(0) ?? 0;
-		if ((codePoint <= 0x08) || (codePoint >= 0x0e && codePoint <= 0x1f)) suspiciousControls++;
-		if (codePoint === 0xfffd) replacementCharacters++;
-	}
-	if (codePoints === 0) return false;
-	return (suspiciousControls >= 4 && suspiciousControls / codePoints >= 0.1)
-		|| (replacementCharacters >= 3 && replacementCharacters / codePoints >= 0.1);
-}
-
-function safeDisplayText(text: string): string {
-	const normalized = text.replace(/\r\n/g, "\n");
-	if (looksLikeBinaryContent(normalized)) return BINARY_CONTENT_PLACEHOLDER;
-	let safe = "";
-	for (const character of normalized) {
-		const codePoint = character.codePointAt(0) ?? 0;
-		safe += isUnsafeDisplayCodePoint(codePoint)
-			? `[U+${codePoint.toString(16).toUpperCase().padStart(4, "0")}]`
-			: character;
-	}
-	return safe;
-}
 
 function sanitizeJsonDisplayValue(value: unknown): { value: unknown; changed: boolean } {
 	if (typeof value === "string") {

package/dist/extensions/pi-subagents/src/tui/fleet.ts

@@ -3,6 +3,7 @@ import * as path from "node:path";
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
 import { getMarkdownTheme, type ExtensionContext } from "@selesai/code";
 import { matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi, type Component, type MarkdownTheme } from "@earendil-works/pi-tui";
+import { snapshotExternalRuns, type ExternalRun } from "../api/external-runs.ts";
 import { getArtifactPaths, getArtifactsDir } from "../shared/artifacts.ts";
 import { formatDuration, formatModelThinking, formatTokens, shortenPath } from "../shared/formatters.ts";
 import { DIRS, type AsyncJobState, type Details, type FleetKeybindingAction, type FleetKeybindingsConfig, type ForegroundChildControl, type ForegroundResumeChild, type ForegroundResumeRun, type ForegroundRunControl, type SubagentState } from "../shared/types.ts";
@@ -20,6 +21,7 @@ import { handleHerdrInspectorAction } from "../inspectors/herdr/actions.ts";
 import { getLivePromptAudit, type LivePromptAudit, type PromptAuditView } from "../runs/foreground/prompt-audit.ts";
 
 const REFRESH_MS = 750;
+const MIN_REFRESH_MS = 250;
 const MAX_RECENT_ASYNC_RUNS = 20;
 const MAX_FLEET_HISTORY_CANDIDATES = 100;
 const TRANSCRIPT_LINES = 200;
@@ -77,6 +79,7 @@ export type FleetItem = (
 	| { key: string; kind: "foreground-active"; runId: string; index?: number; agent: string; state: "running"; updatedAt: number; control: ForegroundRunControl; activeChild?: ForegroundChildControl }
 	| { key: string; kind: "foreground-recent"; runId: string; index: number; agent: string; state: ForegroundResumeChild["status"]; updatedAt: number; run: ForegroundResumeRun; child: ForegroundResumeChild }
 	| { key: string; kind: "async"; runId: string; index?: number; agent: string; state: string; updatedAt: number; run: AsyncRunSummary; step?: AsyncStep }
+	| { key: string; kind: "external"; runId: string; agent: string; state: ExternalRun["state"]; updatedAt: number; run: ExternalRun }
 ) & { description?: string };
 
 export interface FleetSnapshot {
@@ -186,8 +189,13 @@ export function collectFleetSnapshot(
 ): FleetSnapshot {
 	const items: FleetItem[] = [];
 	const activeForegroundIds = new Set<string>();
+	const trackedJobs = state.fleetJobs ?? state.asyncJobs;
+	const workflowParentIds = new Set([...trackedJobs.values()]
+		.filter((job) => job.mode === "workflow" && belongsToCurrentSession(job.sessionId, state.currentSessionId))
+		.map((job) => job.asyncId));
 	for (const control of [...state.foregroundControls.values()].sort((left, right) => right.updatedAt - left.updatedAt)) {
 		activeForegroundIds.add(control.runId);
+		if (control.parentWorkflowRunId && workflowParentIds.has(control.parentWorkflowRunId)) continue;
 		if (control.activeChildren) {
 			for (const child of [...control.activeChildren.values()].sort((left, right) => left.index - right.index)) {
 				items.push({
@@ -222,7 +230,7 @@ export function collectFleetSnapshot(
 	try {
 		let runs: AsyncRunSummary[];
 		const descriptions = new Map<string, string>();
-		const tracked = [...(state.fleetJobs ?? state.asyncJobs).values()]
+		const tracked = [...trackedJobs.values()]
 			.filter((job) => belongsToCurrentSession(job.sessionId, state.currentSessionId));
 		const byUpdate = (left: AsyncJobState, right: AsyncJobState) => (right.updatedAt ?? right.startedAt ?? 0) - (left.updatedAt ?? left.startedAt ?? 0);
 		const active = tracked.filter((job) => job.status === "queued" || job.status === "running").sort(byUpdate);
@@ -255,6 +263,26 @@ export function collectFleetSnapshot(
 		error = cause instanceof Error ? cause.message : String(cause);
 	}
 
+	if (state.currentSessionId) {
+		try {
+			for (const run of snapshotExternalRuns(state.currentSessionId, { ignoreMalformed: true, onMalformedRecord: (message) => console.warn(`[pi-subagents] Removed ${message}`) })) {
+				items.push({
+					key: `external:${run.id}`,
+					kind: "external",
+					runId: run.id,
+					agent: run.label,
+					state: run.state,
+					updatedAt: run.updatedAt ?? run.endedAt ?? run.startedAt,
+					run,
+					...(run.currentAction ? { description: run.currentAction } : {}),
+				});
+			}
+		} catch (cause) {
+			const message = `Failed to inspect external jobs: ${cause instanceof Error ? cause.message : String(cause)}`;
+			error = error ? `${error}; ${message}` : message;
+		}
+	}
+
 	const recentForeground = [...(state.foregroundRuns?.values() ?? [])]
 		.filter((run) => belongsToCurrentSession(run.sessionId, state.currentSessionId) && !activeForegroundIds.has(run.runId))
 		.sort((left, right) => right.updatedAt - left.updatedAt);
@@ -276,6 +304,27 @@ export function collectFleetSnapshot(
 	return { items, ...(error ? { error } : {}) };
 }
 
+function visibleWorkflowParentKeyForForegroundKey(state: SubagentState, key: string, items: FleetItem[]): string | undefined {
+	for (const control of state.foregroundControls.values()) {
+		if (!control.parentWorkflowRunId) continue;
+		let matches = false;
+		if (control.activeChildren) {
+			for (const child of control.activeChildren.values()) {
+				if (`foreground-active:${control.runId}:${child.index}` === key) {
+					matches = true;
+					break;
+				}
+			}
+		} else {
+			matches = `foreground-active:${control.runId}:${control.currentIndex ?? 0}` === key;
+		}
+		if (!matches) continue;
+		const parentKey = `async:${control.parentWorkflowRunId}`;
+		return items.some((item) => item.key === parentKey) ? parentKey : undefined;
+	}
+	return undefined;
+}
+
 function statusGlyph(item: FleetItem, theme: Theme): string {
 	if (item.state === "running") return theme.fg("accent", "●");
 	if (item.state === "queued" || item.state === "pending") return theme.fg("muted", "◦");
@@ -424,6 +473,11 @@ function foregroundRecentDetail(item: Extract<FleetItem, { kind: "foreground-rec
 	return lines.filter((line): line is string => line !== undefined);
 }
 
+function externalElapsedEnd(run: ExternalRun): number {
+	const terminal = run.state !== "queued" && run.state !== "running";
+	return terminal ? (run.endedAt ?? run.updatedAt ?? Date.now()) : Date.now();
+}
+
 function asyncDetail(item: Extract<FleetItem, { kind: "async" }>): string[] {
 	const status = readStatus(item.run.asyncDir);
 	if (status) {
@@ -444,13 +498,36 @@ function asyncDetail(item: Extract<FleetItem, { kind: "async" }>): string[] {
 	].filter((line): line is string => line !== undefined);
 }
 
+function externalDetail(item: Extract<FleetItem, { kind: "external" }>): string[] {
+	return [
+		`Run: ${item.runId}`,
+		"Source: external · display-only",
+		`Owner: ${item.run.source}`,
+		`State: ${item.state}`,
+		`Started: ${new Date(item.run.startedAt).toISOString()}`,
+		item.run.updatedAt !== undefined ? `Updated: ${new Date(item.run.updatedAt).toISOString()}` : undefined,
+		item.run.endedAt !== undefined ? `Ended: ${new Date(item.run.endedAt).toISOString()}` : undefined,
+		`Elapsed: ${formatDuration(Math.max(0, externalElapsedEnd(item.run) - item.run.startedAt))}`,
+		item.run.currentAction ? `Current action: ${item.run.currentAction}` : undefined,
+		item.run.reportPath ? `Report path: ${item.run.reportPath}` : undefined,
+		item.run.transcriptPath ? `Transcript path: ${item.run.transcriptPath}` : undefined,
+		"",
+		"Preview",
+		item.run.preview ?? "(no preview supplied)",
+		"",
+		"The owning extension controls execution, persistence, cancellation, and results.",
+	].filter((line): line is string => line !== undefined);
+}
+
 function detailLines(item: FleetItem | undefined, error: string | undefined, state: SubagentState): string[] {
-	if (!item) return [error ? `Fleet scan failed: ${error}` : "No current-session foreground or recent async children.", "", "New runs appear here automatically while this inspector remains open."];
+	if (!item) return [error ? `Fleet scan failed: ${error}` : "No current-session Fleet jobs.", "", "New jobs appear here automatically while this inspector remains open."];
 	const lines = item.kind === "foreground-active"
 		? foregroundActiveDetail(item, state)
 		: item.kind === "foreground-recent"
 			? foregroundRecentDetail(item, state)
-			: asyncDetail(item);
+			: item.kind === "external"
+				? externalDetail(item)
+				: asyncDetail(item);
 	if (error) lines.unshift(`Fleet scan warning: ${error}`, "");
 	return lines;
 }
@@ -473,11 +550,12 @@ function fleetArtifactsRoot(state: SubagentState, cwd: string): string {
 	return getArtifactsDir(
 		state.parentSessionFile ?? null,
 		cwd,
-		state.artifactDirPreference ?? "project",
+		state.artifactDirPreference,
 	);
 }
 
 function transcriptTarget(item: FleetItem, state: SubagentState): { path: string; trustedRoots: string[] } | undefined {
+	if (item.kind === "external") return undefined;
 	if (item.kind === "foreground-active") {
 		const artifactsRoot = fleetArtifactsRoot(state, item.control.cwd ?? state.baseCwd);
 		return {
@@ -510,6 +588,7 @@ function transcriptTarget(item: FleetItem, state: SubagentState): { path: string
 			item.run.asyncDir,
 			fleetArtifactsRoot(state, state.baseCwd),
 			trackedJob?.cwd ? fleetArtifactsRoot(state, trackedJob.cwd) : undefined,
+			item.run.sessionFile ? getArtifactsDir(item.run.sessionFile, item.run.cwd ?? state.baseCwd, state.artifactDirPreference) : undefined,
 		]),
 	};
 }
@@ -521,10 +600,12 @@ function itemContext(item: FleetItem): string | undefined {
 }
 
 function itemMode(item: FleetItem): string {
+	if (item.kind === "external") return "display-only";
 	return item.kind === "foreground-active" ? item.control.mode : item.run.mode;
 }
 
 function itemSource(item: FleetItem): string {
+	if (item.kind === "external") return `external · ${item.run.source}`;
 	if (item.kind === "async") return "background";
 	return item.kind === "foreground-active" ? "foreground · live" : "foreground · recent";
 }
@@ -544,6 +625,8 @@ function itemStats(item: FleetItem): string[] {
 		model = formatModelThinking(item.child.model, item.child.thinking) || undefined;
 		tokens = item.child.tokens;
 		tools = item.child.toolCount;
+	} else if (item.kind === "external") {
+		durationMs = Math.max(0, externalElapsedEnd(item.run) - item.run.startedAt);
 	} else {
 		model = formatModelThinking(item.step?.model, item.step?.thinking) || undefined;
 		tokens = item.step?.tokens?.total ?? (item.index === undefined ? item.run.totalTokens?.total : undefined);
@@ -563,7 +646,7 @@ function itemStats(item: FleetItem): string[] {
 function structuredHeader(item: FleetItem, width: number, theme: Theme, conversationState: string, promptSummary?: string): string[] {
 	const lines: string[] = [];
 	lines.push(rightAligned(` ${statusGlyph(item, theme)} ${theme.bold(item.agent)}`, theme.fg("dim", item.state), width));
-	const child = item.index !== undefined ? ` · child ${item.index + 1}` : "";
+	const child = "index" in item && item.index !== undefined ? ` · child ${item.index + 1}` : "";
 	const context = itemContext(item);
 	const identity = `${itemSource(item)} · ${item.runId.slice(0, 8)}${child} · ${itemMode(item)}${context ? ` ${context}` : ""}`;
 	lines.push(`  ${theme.fg("dim", identity)}`);
@@ -628,7 +711,8 @@ export class SubagentFleetComponent implements Component {
 	private actionBusy = false;
 	private transcriptCache: FleetTranscriptCache | undefined;
 	private disposed = false;
-	private readonly timer: ReturnType<typeof setInterval>;
+	private refreshTimer: ReturnType<typeof setTimeout> | undefined;
+	private readonly refreshMs: number;
 	private readonly tui: FleetTui;
 	private readonly theme: Theme;
 	private readonly markdownTheme: MarkdownTheme;
@@ -651,20 +735,41 @@ export class SubagentFleetComponent implements Component {
 		this.done = done;
 		this.options = options;
 		this.keybindings = resolveFleetKeybindings(options.fleetKeybindings);
+		this.refreshMs = Math.max(MIN_REFRESH_MS, options.refreshMs ?? REFRESH_MS);
 		this.selectedKey = options.initialKey;
 		this.refresh();
-		this.timer = setInterval(() => {
+		this.scheduleRefresh();
+	}
+
+	private scheduleRefresh(): void {
+		if (this.disposed || this.refreshTimer) return;
+		this.refreshTimer = setTimeout(() => {
+			this.refreshTimer = undefined;
 			if (this.disposed) return;
-			this.invalidate();
-			this.tui.requestRender();
-		}, options.refreshMs ?? REFRESH_MS);
-		this.timer.unref?.();
+			try {
+				this.invalidate();
+				this.tui.requestRender();
+			} finally {
+				this.scheduleRefresh();
+			}
+		}, this.refreshMs);
+		this.refreshTimer.unref?.();
+	}
+
+	private stopRefresh(): void {
+		this.disposed = true;
+		if (this.refreshTimer) clearTimeout(this.refreshTimer);
+		this.refreshTimer = undefined;
 	}
 
 	private refresh(): void {
 		const previousKey = this.snapshot.items[this.selected]?.key ?? this.selectedKey;
 		this.snapshot = collectFleetSnapshot(this.state, this.options);
-		const preserved = previousKey ? this.snapshot.items.findIndex((item) => item.key === previousKey) : -1;
+		let preserved = previousKey ? this.snapshot.items.findIndex((item) => item.key === previousKey) : -1;
+		if (preserved < 0 && previousKey) {
+			const parentKey = visibleWorkflowParentKeyForForegroundKey(this.state, previousKey, this.snapshot.items);
+			if (parentKey) preserved = this.snapshot.items.findIndex((item) => item.key === parentKey);
+		}
 		this.selected = preserved >= 0 ? preserved : Math.min(this.selected, Math.max(0, this.snapshot.items.length - 1));
 		this.selectedKey = this.snapshot.items[this.selected]?.key;
 	}
@@ -724,6 +829,7 @@ export class SubagentFleetComponent implements Component {
 	private selectedAsyncAction(): { item: Extract<FleetItem, { kind: "async" }> } | { reason: string } {
 		const item = this.snapshot.items[this.selected];
 		if (!item) return { reason: "No child is selected." };
+		if (item.kind === "external") return { reason: "External jobs are display-only and remain controlled by their owning extension." };
 		if (item.kind !== "async") return { reason: "Fleet controls are available for current-session top-level async runs only." };
 		if (!isActionableAsyncState(item.run.state) || !isActionableAsyncState(item.state)) return { reason: `Selected child is ${item.state}; controls require a running or queued async child.` };
 		return { item };
@@ -732,6 +838,7 @@ export class SubagentFleetComponent implements Component {
 	private selectedHerdrInspectAction(): { runId: string; asyncDir: string; index?: number } | { reason: string } {
 		const item = this.snapshot.items[this.selected];
 		if (!item) return { reason: "No child is selected." };
+		if (item.kind === "external") return { reason: "External jobs are display-only and have no Herdr controls." };
 		if (item.kind === "async") {
 			if (!isActionableAsyncState(item.run.state) || !isActionableAsyncState(item.state)) return { reason: `Selected child is ${item.state}; controls require a running or queued async child.` };
 			return { runId: item.runId, asyncDir: item.run.asyncDir, ...(item.index !== undefined ? { index: item.index } : {}) };
@@ -927,6 +1034,7 @@ export class SubagentFleetComponent implements Component {
 			return;
 		}
 		if (matchesFleetAction(data, this.keybindings, "close")) {
+			this.stopRefresh();
 			this.done(undefined);
 			return;
 		}
@@ -1116,7 +1224,9 @@ export class SubagentFleetComponent implements Component {
 		];
 		const lines = [this.theme.fg("border", `╭${"─".repeat(innerWidth)}╮`)];
 		const selected = this.snapshot.items[this.selected];
-		const title = ` ${this.theme.bold("Subagent fleet inspector")} ${this.theme.fg("dim", "· live controls")}`;
+		const title = selected?.kind === "external"
+			? ` ${this.theme.bold("Fleet inspector")} ${this.theme.fg("dim", "· external display-only")}`
+			: ` ${this.theme.bold("Subagent fleet inspector")} ${this.theme.fg("dim", "· live controls")}`;
 		const selectedStatus = selected
 			? `${statusGlyph(selected, this.theme)} ${selected.agent} · ${selected.state} `
 			: this.theme.fg("dim", "no children ");
@@ -1135,7 +1245,9 @@ export class SubagentFleetComponent implements Component {
 		const position = this.snapshot.items.length ? `${this.selected + 1}/${this.snapshot.items.length}` : "0/0";
 		const footer = this.promptAuditOpen
 			? ` j/k child · 1/2/3 view · g redo with guidance · c copy · Esc close Prompt Audit · ${position}`
-			: ` ${bindingLabel(this.keybindings, "selectUp")}/${bindingLabel(this.keybindings, "selectDown")} agent · p Prompt Audit · ${bindingLabel(this.keybindings, "inspect")} Herdr · ${bindingLabel(this.keybindings, "steer")} steer · ${bindingLabel(this.keybindings, "stop")} stop · ${bindingLabel(this.keybindings, "toggleTools")} tools · ${bindingLabel(this.keybindings, "refresh")} refresh · ${bindingLabel(this.keybindings, "close")} close · ${position}`;
+			: selected?.kind === "external"
+				? ` ${bindingLabel(this.keybindings, "selectUp")}/${bindingLabel(this.keybindings, "selectDown")} job · display-only · ${bindingLabel(this.keybindings, "refresh")} refresh · ${bindingLabel(this.keybindings, "close")} close · ${position}`
+				: ` ${bindingLabel(this.keybindings, "selectUp")}/${bindingLabel(this.keybindings, "selectDown")} agent · p Prompt Audit · ${bindingLabel(this.keybindings, "inspect")} Herdr · ${bindingLabel(this.keybindings, "steer")} steer · ${bindingLabel(this.keybindings, "stop")} stop · ${bindingLabel(this.keybindings, "toggleTools")} tools · ${bindingLabel(this.keybindings, "refresh")} refresh · ${bindingLabel(this.keybindings, "close")} close · ${position}`;
 		lines.push(this.theme.fg("border", "│") + fit(this.theme.fg("dim", footer), innerWidth) + this.theme.fg("border", "│"));
 		lines.push(this.theme.fg("border", `╰${"─".repeat(innerWidth)}╯`));
 		return lines.map((line) => truncateToWidth(line, width));
@@ -1147,8 +1259,7 @@ export class SubagentFleetComponent implements Component {
 	}
 
 	dispose(): void {
-		this.disposed = true;
-		clearInterval(this.timer);
+		this.stopRefresh();
 	}
 }
 
@@ -1178,6 +1289,7 @@ export async function openSubagentFleet(ctx: ExtensionContext, state: SubagentSt
 			...(input.index !== undefined ? { index: input.index } : {}),
 		}, {
 			state,
+			sessionRoots: state.trustedSessionRoots,
 			cwd: state.baseCwd,
 			...(state.authorityPolicy ? { authorityPolicy: state.authorityPolicy } : {}),
 			...(state.missionStoreConfig ? { missions: state.missionStoreConfig } : {}),