pi-crew 0.1.45 → 0.1.46

package/src/ui/render-diff.ts

@@ -1,119 +1,119 @@
-import * as Diff from "diff";
-import type { CrewTheme } from "./theme-adapter.ts";
-import { asCrewTheme } from "./theme-adapter.ts";
-
-interface ParsedDiffLine {
-	prefix: string;
-	lineNum: string;	content: string;
-}
-
-interface DiffLineContent {
-	lineNum: string;
-	content: string;
-}
-
-function parseDiffLine(line: string): ParsedDiffLine | null {
-	const match = line.match(/^([+-\s])(\s*\d*)\s(.*)$/);
-	if (!match) return null;
-	return { prefix: match[1], lineNum: match[2], content: match[3] };
-}
-
-function replaceTabs(text: string): string {
-	return text.replace(/\t/g, "   ");
-}
-
-function renderIntraLineDiff(theme: CrewTheme, oldContent: string, newContent: string): { removedLine: string; addedLine: string } {
-	const wordDiff = Diff.diffWords(oldContent, newContent);
-	let removedLine = "";
-	let addedLine = "";
-	let isFirstRemoved = true;
-	let isFirstAdded = true;
-
-	for (const part of wordDiff) {
-		if (part.removed) {
-			let value = part.value;
-			if (isFirstRemoved) {
-				const leadingWs = value.match(/^(\s*)/)?.[1] ?? "";
-				value = value.slice(leadingWs.length);
-				removedLine += leadingWs;
-				isFirstRemoved = false;
-			}
-			if (value) removedLine += theme.inverse?.(value) ?? value;
-		} else if (part.added) {
-			let value = part.value;
-			if (isFirstAdded) {
-				const leadingWs = value.match(/^(\s*)/)?.[1] ?? "";
-				value = value.slice(leadingWs.length);
-				addedLine += leadingWs;
-				isFirstAdded = false;
-			}
-			if (value) addedLine += theme.inverse?.(value) ?? value;
-		} else {
-			removedLine += part.value;
-			addedLine += part.value;
-		}
-	}
-
-	return { removedLine, addedLine };
-}
-
-export interface RenderDiffOptions {
-	filePath?: string;
-	theme?: unknown;
-}
-
-export function renderDiff(diffText: string, options: RenderDiffOptions = {}): string {
-	const theme = asCrewTheme(options.theme);
-	const lines = diffText.split("\n");
-	const result: string[] = [];
-	let i = 0;
-
-	while (i < lines.length) {
-		const line = lines[i] ?? "";
-		const parsed = parseDiffLine(line);
-		if (!parsed) {
-			result.push(theme.fg("toolDiffContext", line));
-			i++;
-			continue;
-		}
-
-		if (parsed.prefix === "-") {
-			const removedLines: DiffLineContent[] = [];
-			while (i < lines.length) {
-				const nextParsed = parseDiffLine(lines[i] ?? "");
-				if (!nextParsed || nextParsed.prefix !== "-") break;
-				removedLines.push({ lineNum: nextParsed.lineNum, content: nextParsed.content });
-				i++;
-			}
-
-			const addedLines: DiffLineContent[] = [];
-			while (i < lines.length) {
-				const nextParsed = parseDiffLine(lines[i] ?? "");
-				if (!nextParsed || nextParsed.prefix !== "+") break;
-				addedLines.push({ lineNum: nextParsed.lineNum, content: nextParsed.content });
-				i++;
-			}
-
-			if (removedLines.length === 1 && addedLines.length === 1) {
-				const { removedLine, addedLine } = renderIntraLineDiff(theme, replaceTabs(removedLines[0]!.content), replaceTabs(addedLines[0]!.content));
-				result.push(theme.fg("toolDiffRemoved", `-${removedLines[0]!.lineNum} ${removedLine}`));
-				result.push(theme.fg("toolDiffAdded", `+${addedLines[0]!.lineNum} ${addedLine}`));
-			} else {
-				for (const removed of removedLines) {
-					result.push(theme.fg("toolDiffRemoved", `-${removed.lineNum} ${replaceTabs(removed.content)}`));
-				}
-				for (const added of addedLines) {
-					result.push(theme.fg("toolDiffAdded", `+${added.lineNum} ${replaceTabs(added.content)}`));
-				}
-			}
-		} else if (parsed.prefix === "+") {
-			result.push(theme.fg("toolDiffAdded", `+${parsed.lineNum} ${replaceTabs(parsed.content)}`));
-			i++;
-		} else {
-			result.push(theme.fg("toolDiffContext", ` ${parsed.lineNum} ${replaceTabs(parsed.content)}`));
-			i++;
-		}
-	}
-
-	return result.join("\n");
-}
+import * as Diff from "diff";
+import type { CrewTheme } from "./theme-adapter.ts";
+import { asCrewTheme } from "./theme-adapter.ts";
+
+interface ParsedDiffLine {
+	prefix: string;
+	lineNum: string;	content: string;
+}
+
+interface DiffLineContent {
+	lineNum: string;
+	content: string;
+}
+
+function parseDiffLine(line: string): ParsedDiffLine | null {
+	const match = line.match(/^([+-\s])(\s*\d*)\s(.*)$/);
+	if (!match) return null;
+	return { prefix: match[1], lineNum: match[2], content: match[3] };
+}
+
+function replaceTabs(text: string): string {
+	return text.replace(/\t/g, "   ");
+}
+
+function renderIntraLineDiff(theme: CrewTheme, oldContent: string, newContent: string): { removedLine: string; addedLine: string } {
+	const wordDiff = Diff.diffWords(oldContent, newContent);
+	let removedLine = "";
+	let addedLine = "";
+	let isFirstRemoved = true;
+	let isFirstAdded = true;
+
+	for (const part of wordDiff) {
+		if (part.removed) {
+			let value = part.value;
+			if (isFirstRemoved) {
+				const leadingWs = value.match(/^(\s*)/)?.[1] ?? "";
+				value = value.slice(leadingWs.length);
+				removedLine += leadingWs;
+				isFirstRemoved = false;
+			}
+			if (value) removedLine += theme.inverse?.(value) ?? value;
+		} else if (part.added) {
+			let value = part.value;
+			if (isFirstAdded) {
+				const leadingWs = value.match(/^(\s*)/)?.[1] ?? "";
+				value = value.slice(leadingWs.length);
+				addedLine += leadingWs;
+				isFirstAdded = false;
+			}
+			if (value) addedLine += theme.inverse?.(value) ?? value;
+		} else {
+			removedLine += part.value;
+			addedLine += part.value;
+		}
+	}
+
+	return { removedLine, addedLine };
+}
+
+export interface RenderDiffOptions {
+	filePath?: string;
+	theme?: unknown;
+}
+
+export function renderDiff(diffText: string, options: RenderDiffOptions = {}): string {
+	const theme = asCrewTheme(options.theme);
+	const lines = diffText.split("\n");
+	const result: string[] = [];
+	let i = 0;
+
+	while (i < lines.length) {
+		const line = lines[i] ?? "";
+		const parsed = parseDiffLine(line);
+		if (!parsed) {
+			result.push(theme.fg("toolDiffContext", line));
+			i++;
+			continue;
+		}
+
+		if (parsed.prefix === "-") {
+			const removedLines: DiffLineContent[] = [];
+			while (i < lines.length) {
+				const nextParsed = parseDiffLine(lines[i] ?? "");
+				if (!nextParsed || nextParsed.prefix !== "-") break;
+				removedLines.push({ lineNum: nextParsed.lineNum, content: nextParsed.content });
+				i++;
+			}
+
+			const addedLines: DiffLineContent[] = [];
+			while (i < lines.length) {
+				const nextParsed = parseDiffLine(lines[i] ?? "");
+				if (!nextParsed || nextParsed.prefix !== "+") break;
+				addedLines.push({ lineNum: nextParsed.lineNum, content: nextParsed.content });
+				i++;
+			}
+
+			if (removedLines.length === 1 && addedLines.length === 1) {
+				const { removedLine, addedLine } = renderIntraLineDiff(theme, replaceTabs(removedLines[0]!.content), replaceTabs(addedLines[0]!.content));
+				result.push(theme.fg("toolDiffRemoved", `-${removedLines[0]!.lineNum} ${removedLine}`));
+				result.push(theme.fg("toolDiffAdded", `+${addedLines[0]!.lineNum} ${addedLine}`));
+			} else {
+				for (const removed of removedLines) {
+					result.push(theme.fg("toolDiffRemoved", `-${removed.lineNum} ${replaceTabs(removed.content)}`));
+				}
+				for (const added of addedLines) {
+					result.push(theme.fg("toolDiffAdded", `+${added.lineNum} ${replaceTabs(added.content)}`));
+				}
+			}
+		} else if (parsed.prefix === "+") {
+			result.push(theme.fg("toolDiffAdded", `+${parsed.lineNum} ${replaceTabs(parsed.content)}`));
+			i++;
+		} else {
+			result.push(theme.fg("toolDiffContext", ` ${parsed.lineNum} ${replaceTabs(parsed.content)}`));
+			i++;
+		}
+	}
+
+	return result.join("\n");
+}

package/src/ui/render-scheduler.ts

@@ -1,143 +1,143 @@
-import { logInternalError } from "../utils/internal-error.ts";
-
-export interface RenderSchedulerEventBus {
-	on?: (event: string, handler: (payload: unknown) => void) => (() => void) | void;
-}
-
-export interface RenderSchedulerOptions {
-	debounceMs?: number;
-	fallbackMs?: number;
-	events?: string[];
-	onInvalidate?: (payload: unknown) => void;
-}
-
-const DEFAULT_EVENTS = [
-	"crew.run.created",
-	"crew.run.completed",
-	"crew.run.failed",
-	"crew.run.cancelled",
-	"crew.subagent.completed",
-	"crew.subagent.failed",
-	"crew.mailbox.updated",
-	"crew.mailbox.message",
-];
-
-/**
- * Coordinates UI renders with debounce + fallback polling.
- *
- * Critical: uses recursive setTimeout instead of setInterval + a rendering
- * guard (`rendering` / `pendingRender`) so that when render() takes longer
- * than the fallback interval, callbacks do NOT pile up and storm the event
- * loop.  Instead, overlapping schedules are collapsed into a single deferred
- * re-render.
- */
-export class RenderScheduler {
-	private readonly render: () => void;
-	private readonly onInvalidate?: (payload: unknown) => void;
-	private readonly debounceMs: number;
-	private readonly fallbackMs: number;
-	private debounceTimer: ReturnType<typeof setTimeout> | undefined;
-	private fallbackTimer: ReturnType<typeof setTimeout> | undefined;
-	private disposed = false;
-	private lastEventAt = 0;
-	private rendering = false;
-	private pendingRender = false;
-	private readonly unsubs: Array<() => void> = [];
-
-	constructor(events: RenderSchedulerEventBus | undefined, render: () => void, options: RenderSchedulerOptions = {}) {
-		this.render = render;
-		this.onInvalidate = options.onInvalidate;
-		this.debounceMs = options.debounceMs ?? 75;
-		this.fallbackMs = options.fallbackMs ?? 750;
-		for (const event of options.events ?? DEFAULT_EVENTS) this.subscribe(events, event);
-		this.fallbackTimer = setTimeout(() => this.fallbackLoop(), this.fallbackMs);
-		this.fallbackTimer.unref();
-	}
-
-	private subscribe(events: RenderSchedulerEventBus | undefined, event: string): void {
-		if (!events?.on) return;
-		const handler = (payload: unknown): void => this.schedule(payload);
-		try {
-			const unsub = events.on(event, handler);
-			if (typeof unsub === "function") this.unsubs.push(unsub);
-		} catch (error) {
-			logInternalError("render-scheduler.subscribe", error, event);
-		}
-	}
-
-	/** Recursive setTimeout — avoids setInterval timer storms. */
-	private fallbackLoop(): void {
-		if (this.disposed) return;
-		if (Date.now() - this.lastEventAt < this.fallbackMs) {
-			if (this.disposed) return;
-			this.fallbackTimer = setTimeout(() => this.fallbackLoop(), this.fallbackMs);
-			this.fallbackTimer.unref();
-			return;
-		}
-		this.schedule();
-		if (this.disposed) return;
-		this.fallbackTimer = setTimeout(() => this.fallbackLoop(), this.fallbackMs);
-		this.fallbackTimer.unref();
-	}
-
-	schedule(payload?: unknown): void {
-		if (this.disposed) return;
-		this.lastEventAt = Date.now();
-		try {
-			this.onInvalidate?.(payload);
-		} catch (error) {
-			logInternalError("render-scheduler.invalidate", error);
-		}
-		if (this.debounceTimer) clearTimeout(this.debounceTimer);
-		this.debounceTimer = setTimeout(() => {
-			this.debounceTimer = undefined;
-			this.flush();
-		}, this.debounceMs);
-		this.debounceTimer.unref();
-	}
-
-	/**
-	 * Flush a render.  If a render is already in progress the request is
-	 * collapsed: `pendingRender` is set and the caller that holds
-	 * `rendering==true` will loop one more time after finishing.
-	 */
-	flush(): void {
-		if (this.disposed) return;
-		if (this.rendering) {
-			this.pendingRender = true;
-			return;
-		}
-		this.rendering = true;
-		this.pendingRender = false;
-		let iterations = 0;
-		try {
-			do {
-				this.pendingRender = false;
-				this.render();
-				iterations += 1;
-				// Safety valve: 5 re-renders max per flush to prevent infinite loops
-				// if render() itself calls flush() synchronously.
-			} while (this.pendingRender && !this.disposed && iterations < 5);
-		} catch (error) {
-			logInternalError("render-scheduler.render", error);
-		} finally {
-			this.rendering = false;
-			// If we hit the iteration cap, schedule one more render to drain.
-			if (iterations >= 5 && this.pendingRender && !this.disposed) {
-				this.schedule();
-			}
-		}
-	}
-
-	dispose(): void {
-		if (this.disposed) return;
-		this.disposed = true;
-		if (this.debounceTimer) clearTimeout(this.debounceTimer);
-		if (this.fallbackTimer) clearTimeout(this.fallbackTimer);
-		this.debounceTimer = undefined;
-		this.fallbackTimer = undefined;
-		for (const unsub of this.unsubs.splice(0)) {
-			try { unsub(); } catch (error) { logInternalError("render-scheduler.unsubscribe", error); }
-		}
-	}
-}
+import { logInternalError } from "../utils/internal-error.ts";
+
+export interface RenderSchedulerEventBus {
+	on?: (event: string, handler: (payload: unknown) => void) => (() => void) | void;
+}
+
+export interface RenderSchedulerOptions {
+	debounceMs?: number;
+	fallbackMs?: number;
+	events?: string[];
+	onInvalidate?: (payload: unknown) => void;
+}
+
+const DEFAULT_EVENTS = [
+	"crew.run.created",
+	"crew.run.completed",
+	"crew.run.failed",
+	"crew.run.cancelled",
+	"crew.subagent.completed",
+	"crew.subagent.failed",
+	"crew.mailbox.updated",
+	"crew.mailbox.message",
+];
+
+/**
+ * Coordinates UI renders with debounce + fallback polling.
+ *
+ * Critical: uses recursive setTimeout instead of setInterval + a rendering
+ * guard (`rendering` / `pendingRender`) so that when render() takes longer
+ * than the fallback interval, callbacks do NOT pile up and storm the event
+ * loop.  Instead, overlapping schedules are collapsed into a single deferred
+ * re-render.
+ */
+export class RenderScheduler {
+	private readonly render: () => void;
+	private readonly onInvalidate?: (payload: unknown) => void;
+	private readonly debounceMs: number;
+	private readonly fallbackMs: number;
+	private debounceTimer: ReturnType<typeof setTimeout> | undefined;
+	private fallbackTimer: ReturnType<typeof setTimeout> | undefined;
+	private disposed = false;
+	private lastEventAt = 0;
+	private rendering = false;
+	private pendingRender = false;
+	private readonly unsubs: Array<() => void> = [];
+
+	constructor(events: RenderSchedulerEventBus | undefined, render: () => void, options: RenderSchedulerOptions = {}) {
+		this.render = render;
+		this.onInvalidate = options.onInvalidate;
+		this.debounceMs = options.debounceMs ?? 75;
+		this.fallbackMs = options.fallbackMs ?? 750;
+		for (const event of options.events ?? DEFAULT_EVENTS) this.subscribe(events, event);
+		this.fallbackTimer = setTimeout(() => this.fallbackLoop(), this.fallbackMs);
+		this.fallbackTimer.unref();
+	}
+
+	private subscribe(events: RenderSchedulerEventBus | undefined, event: string): void {
+		if (!events?.on) return;
+		const handler = (payload: unknown): void => this.schedule(payload);
+		try {
+			const unsub = events.on(event, handler);
+			if (typeof unsub === "function") this.unsubs.push(unsub);
+		} catch (error) {
+			logInternalError("render-scheduler.subscribe", error, event);
+		}
+	}
+
+	/** Recursive setTimeout — avoids setInterval timer storms. */
+	private fallbackLoop(): void {
+		if (this.disposed) return;
+		if (Date.now() - this.lastEventAt < this.fallbackMs) {
+			if (this.disposed) return;
+			this.fallbackTimer = setTimeout(() => this.fallbackLoop(), this.fallbackMs);
+			this.fallbackTimer.unref();
+			return;
+		}
+		this.schedule();
+		if (this.disposed) return;
+		this.fallbackTimer = setTimeout(() => this.fallbackLoop(), this.fallbackMs);
+		this.fallbackTimer.unref();
+	}
+
+	schedule(payload?: unknown): void {
+		if (this.disposed) return;
+		this.lastEventAt = Date.now();
+		try {
+			this.onInvalidate?.(payload);
+		} catch (error) {
+			logInternalError("render-scheduler.invalidate", error);
+		}
+		if (this.debounceTimer) clearTimeout(this.debounceTimer);
+		this.debounceTimer = setTimeout(() => {
+			this.debounceTimer = undefined;
+			this.flush();
+		}, this.debounceMs);
+		this.debounceTimer.unref();
+	}
+
+	/**
+	 * Flush a render.  If a render is already in progress the request is
+	 * collapsed: `pendingRender` is set and the caller that holds
+	 * `rendering==true` will loop one more time after finishing.
+	 */
+	flush(): void {
+		if (this.disposed) return;
+		if (this.rendering) {
+			this.pendingRender = true;
+			return;
+		}
+		this.rendering = true;
+		this.pendingRender = false;
+		let iterations = 0;
+		try {
+			do {
+				this.pendingRender = false;
+				this.render();
+				iterations += 1;
+				// Safety valve: 5 re-renders max per flush to prevent infinite loops
+				// if render() itself calls flush() synchronously.
+			} while (this.pendingRender && !this.disposed && iterations < 5);
+		} catch (error) {
+			logInternalError("render-scheduler.render", error);
+		} finally {
+			this.rendering = false;
+			// If we hit the iteration cap, schedule one more render to drain.
+			if (iterations >= 5 && this.pendingRender && !this.disposed) {
+				this.schedule();
+			}
+		}
+	}
+
+	dispose(): void {
+		if (this.disposed) return;
+		this.disposed = true;
+		if (this.debounceTimer) clearTimeout(this.debounceTimer);
+		if (this.fallbackTimer) clearTimeout(this.fallbackTimer);
+		this.debounceTimer = undefined;
+		this.fallbackTimer = undefined;
+		for (const unsub of this.unsubs.splice(0)) {
+			try { unsub(); } catch (error) { logInternalError("render-scheduler.unsubscribe", error); }
+		}
+	}
+}

package/src/ui/run-snapshot-cache.ts

@@ -478,6 +478,10 @@ async function mailboxFromAsync(manifest: TeamRunManifest, agents: CrewAgentReco
 	return { inboxUnread: inbox.count, outboxPending: outbox.count, needsAttention: inbox.count + attentionAgents, approximate: inbox.approximate || outbox.approximate };
 }
 
+function cancellationReasonFromEvents(events: TeamEvent[]): string | undefined {
+	return [...events].reverse().find((event) => event.type === "run.cancelled" && typeof event.data?.reason === "string")?.data?.reason as string | undefined;
+}
+
 function signatureFor(input: Omit<RunUiSnapshot, "signature" | "fetchedAt">, stamps: SnapshotStamps): string {
 	try {
 		const digest = createHash("sha256");
@@ -489,7 +493,8 @@ function signatureFor(input: Omit<RunUiSnapshot, "signature" | "fetchedAt">, sta
 		usage: input.usage,
 		mailbox: input.mailbox,
 		groupJoins: input.groupJoins,
-		events: input.recentEvents.map((event) => [event.metadata?.seq, event.time, event.type, event.taskId, event.message]),
+		events: input.recentEvents.map((event) => [event.metadata?.seq, event.time, event.type, event.taskId, event.message, event.data?.reason]),
+		cancellationReason: input.cancellationReason,
 		output: input.recentOutputLines,
 		stamps,
 	}));
@@ -571,6 +576,7 @@ export function createRunSnapshotCache(cwd: string, options: RunSnapshotCacheOpt
 		}
 		const mailbox = mailboxFrom(loaded.manifest, agents);
 		const groupJoins = groupJoinsFrom(loaded.manifest);
+		const recentEvents = safeRecentEvents(loaded.manifest.eventsPath, recentEventsLimit);
 		const base = {
 			runId: loaded.manifest.runId,
 			cwd: loaded.manifest.cwd,
@@ -581,7 +587,8 @@ export function createRunSnapshotCache(cwd: string, options: RunSnapshotCacheOpt
 			usage: usageFrom(tasks, agents),
 			mailbox,
 			groupJoins,
-			recentEvents: safeRecentEvents(loaded.manifest.eventsPath, recentEventsLimit),
+			cancellationReason: cancellationReasonFromEvents(recentEvents),
+			recentEvents,
 			recentOutputLines: recentOutputLines(loaded.manifest, agents, recentOutputLimit),
 		};
 		const stamps = stampsFor(loaded.manifest, agents);
@@ -626,6 +633,7 @@ export function createRunSnapshotCache(cwd: string, options: RunSnapshotCacheOpt
 			usage: usageFrom(tasks, agents),
 			mailbox,
 			groupJoins,
+			cancellationReason: cancellationReasonFromEvents(recentEvents),
 			recentEvents,
 			recentOutputLines: recentOutput,
 		};

package/src/ui/snapshot-types.ts

@@ -46,6 +46,8 @@ export interface RunUiSnapshot {
 	usage: RunUiUsage;
 	mailbox: RunUiMailbox;
 	groupJoins?: RunUiGroupJoin[];
+	/** Structured cancellation reason from run.cancelled event data, when available. */
+	cancellationReason?: string;
 	recentEvents: TeamEvent[];
 	recentOutputLines: string[];
 }

package/src/ui/spinner.ts

@@ -1,17 +1,17 @@
-export const SUBAGENT_SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"] as const;
-export const SUBAGENT_SPINNER_FRAME_MS = 160;
-
-export function spinnerBucket(now = Date.now(), frameMs = SUBAGENT_SPINNER_FRAME_MS): number {
-	return Math.floor(now / Math.max(1, frameMs));
-}
-
-function hashKey(key: string): number {
-	let hash = 0;
-	for (let index = 0; index < key.length; index += 1) hash = (hash * 31 + key.charCodeAt(index)) >>> 0;
-	return hash;
-}
-
-export function spinnerFrame(key = "", now = Date.now()): string {
-	const offset = key ? hashKey(key) % SUBAGENT_SPINNER_FRAMES.length : 0;
-	return SUBAGENT_SPINNER_FRAMES[(spinnerBucket(now) + offset) % SUBAGENT_SPINNER_FRAMES.length] ?? SUBAGENT_SPINNER_FRAMES[0];
-}
+export const SUBAGENT_SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"] as const;
+export const SUBAGENT_SPINNER_FRAME_MS = 160;
+
+export function spinnerBucket(now = Date.now(), frameMs = SUBAGENT_SPINNER_FRAME_MS): number {
+	return Math.floor(now / Math.max(1, frameMs));
+}
+
+function hashKey(key: string): number {
+	let hash = 0;
+	for (let index = 0; index < key.length; index += 1) hash = (hash * 31 + key.charCodeAt(index)) >>> 0;
+	return hash;
+}
+
+export function spinnerFrame(key = "", now = Date.now()): string {
+	const offset = key ? hashKey(key) % SUBAGENT_SPINNER_FRAMES.length : 0;
+	return SUBAGENT_SPINNER_FRAMES[(spinnerBucket(now) + offset) % SUBAGENT_SPINNER_FRAMES.length] ?? SUBAGENT_SPINNER_FRAMES[0];
+}