pi-crew 0.1.30 → 0.1.32

package/src/ui/powerbar-publisher.ts

@@ -1,94 +1,94 @@
-import * as fs from "node:fs";
-import { listRecentRuns } from "../extension/run-index.ts";
-import type { CrewUiConfig } from "../config/config.ts";
-import { readCrewAgents } from "../runtime/crew-agent-records.ts";
-import { readJsonFileCoalesced } from "../utils/file-coalescer.ts";
-import type { TeamTaskState, TeamRunManifest } from "../state/types.ts";
-import { aggregateUsage } from "../state/usage.ts";
-import { isDisplayActiveRun } from "../runtime/process-status.ts";
-import { logInternalError } from "../utils/internal-error.ts";
-import type { ManifestCache } from "../runtime/manifest-cache.ts";
-
-type EventBus = { emit?: (event: string, data: unknown) => void } | undefined;
-
-const TASK_READ_TTL_MS = 200;
-
-function safeEmit(events: EventBus, event: string, data: unknown): void {
-	try {
-		events?.emit?.(event, data);
-	} catch (error) {
-		logInternalError("powerbar.safeEmit", error, `event=${event}`);
-	}
-}
-
-function readTasks(tasksPath: string): TeamTaskState[] {
-	try {
-		const parse = () => {
-			const parsed = JSON.parse(fs.readFileSync(tasksPath, "utf-8"));
-			return Array.isArray(parsed) ? (parsed as TeamTaskState[]) : [];
-		};
-		return readJsonFileCoalesced(tasksPath, TASK_READ_TTL_MS, parse);
-	} catch (error) {
-		logInternalError("powerbar.readTasks", error, tasksPath);
-		return [];
-	}
-}
-
-export function compactTokens(total: number): string {
-	return total >= 1000 ? `${Math.round(total / 1000)}k` : `${total}`;
-}
-
-export function registerPiCrewPowerbarSegments(events: EventBus, config?: CrewUiConfig): void {
-	if (config?.powerbar === false) return;
-	safeEmit(events, "powerbar:register-segment", { id: "pi-crew-active", label: "pi-crew active agents" });
-	safeEmit(events, "powerbar:register-segment", { id: "pi-crew-progress", label: "pi-crew run progress" });
-}
-
-export function updatePiCrewPowerbar(events: EventBus, cwd: string, config?: CrewUiConfig, manifestCache?: ManifestCache): void {
-	if (config?.powerbar === false) return;
-	const runs = manifestCache ? manifestCache.list(20) : listRecentRuns(cwd, 20);
-	const active = runs.map((run) => {
-		let agents: ReturnType<typeof readCrewAgents> = [];
-		try {
-			agents = readCrewAgents(run);
-		} catch (error) {
-			logInternalError("powerbar.readCrewAgents", error, run.runId);
-		}
-		return { run, agents };
-	}).filter((item) => isDisplayActiveRun(item.run, item.agents));
-	if (!active.length) {
-		safeEmit(events, "powerbar:update", { id: "pi-crew-active" });
-		safeEmit(events, "powerbar:update", { id: "pi-crew-progress" });
-		return;
-	}
-	const agents = active.flatMap((item) => item.agents);
-	const tasks = active.flatMap((item) => readTasks(item.run.tasksPath));
-	const running = agents.filter((agent) => agent.status === "running").length;
-	const waiting = tasks.filter((task) => task.status === "queued").length;
-	const completed = tasks.filter((task) => task.status === "completed").length;
-	const total = Math.max(1, tasks.length || agents.length);
-	const usage = aggregateUsage(tasks);
-	const tokenTotal = usage ? (usage.input ?? 0) + (usage.output ?? 0) + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0) : 0;
-	const model = config?.showModel === false ? undefined : agents.find((agent) => agent.model)?.model?.split("/").at(-1);
-	const tokenText = config?.showTokens === false || !tokenTotal ? undefined : compactTokens(tokenTotal);
-	safeEmit(events, "powerbar:update", {
-		id: "pi-crew-active",
-		icon: "⚙",
-		text: `crew ${running}a/${waiting}w`,
-		suffix: [model, tokenText].filter(Boolean).join(" · ") || undefined,
-		color: running ? "accent" : "warning",
-	});
-	safeEmit(events, "powerbar:update", {
-		id: "pi-crew-progress",
-		text: (active[0]?.run as TeamRunManifest)?.team ?? "crew",
-		bar: Math.round((completed / total) * 100),
-		suffix: `${completed}/${total}${tokenText ? ` · ${tokenText}` : ""}`,
-		color: completed === total ? "success" : "accent",
-		barSegments: 8,
-	});
-}
-
-export function clearPiCrewPowerbar(events: EventBus): void {
-	safeEmit(events, "powerbar:update", { id: "pi-crew-active" });
-	safeEmit(events, "powerbar:update", { id: "pi-crew-progress" });
-}
+import * as fs from "node:fs";
+import { listRecentRuns } from "../extension/run-index.ts";
+import type { CrewUiConfig } from "../config/config.ts";
+import { readCrewAgents } from "../runtime/crew-agent-records.ts";
+import { readJsonFileCoalesced } from "../utils/file-coalescer.ts";
+import type { TeamTaskState, TeamRunManifest } from "../state/types.ts";
+import { aggregateUsage } from "../state/usage.ts";
+import { isDisplayActiveRun } from "../runtime/process-status.ts";
+import { logInternalError } from "../utils/internal-error.ts";
+import type { ManifestCache } from "../runtime/manifest-cache.ts";
+
+type EventBus = { emit?: (event: string, data: unknown) => void } | undefined;
+
+const TASK_READ_TTL_MS = 200;
+
+function safeEmit(events: EventBus, event: string, data: unknown): void {
+	try {
+		events?.emit?.(event, data);
+	} catch (error) {
+		logInternalError("powerbar.safeEmit", error, `event=${event}`);
+	}
+}
+
+function readTasks(tasksPath: string): TeamTaskState[] {
+	try {
+		const parse = () => {
+			const parsed = JSON.parse(fs.readFileSync(tasksPath, "utf-8"));
+			return Array.isArray(parsed) ? (parsed as TeamTaskState[]) : [];
+		};
+		return readJsonFileCoalesced(tasksPath, TASK_READ_TTL_MS, parse);
+	} catch (error) {
+		logInternalError("powerbar.readTasks", error, tasksPath);
+		return [];
+	}
+}
+
+export function compactTokens(total: number): string {
+	return total >= 1000 ? `${Math.round(total / 1000)}k` : `${total}`;
+}
+
+export function registerPiCrewPowerbarSegments(events: EventBus, config?: CrewUiConfig): void {
+	if (config?.powerbar === false) return;
+	safeEmit(events, "powerbar:register-segment", { id: "pi-crew-active", label: "pi-crew active agents" });
+	safeEmit(events, "powerbar:register-segment", { id: "pi-crew-progress", label: "pi-crew run progress" });
+}
+
+export function updatePiCrewPowerbar(events: EventBus, cwd: string, config?: CrewUiConfig, manifestCache?: ManifestCache): void {
+	if (config?.powerbar === false) return;
+	const runs = manifestCache ? manifestCache.list(20) : listRecentRuns(cwd, 20);
+	const active = runs.map((run) => {
+		let agents: ReturnType<typeof readCrewAgents> = [];
+		try {
+			agents = readCrewAgents(run);
+		} catch (error) {
+			logInternalError("powerbar.readCrewAgents", error, run.runId);
+		}
+		return { run, agents };
+	}).filter((item) => isDisplayActiveRun(item.run, item.agents));
+	if (!active.length) {
+		safeEmit(events, "powerbar:update", { id: "pi-crew-active" });
+		safeEmit(events, "powerbar:update", { id: "pi-crew-progress" });
+		return;
+	}
+	const agents = active.flatMap((item) => item.agents);
+	const tasks = active.flatMap((item) => readTasks(item.run.tasksPath));
+	const running = agents.filter((agent) => agent.status === "running").length;
+	const waiting = tasks.filter((task) => task.status === "queued").length;
+	const completed = tasks.filter((task) => task.status === "completed").length;
+	const total = Math.max(1, tasks.length || agents.length);
+	const usage = aggregateUsage(tasks);
+	const tokenTotal = usage ? (usage.input ?? 0) + (usage.output ?? 0) + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0) : 0;
+	const model = config?.showModel === false ? undefined : agents.find((agent) => agent.model)?.model?.split("/").at(-1);
+	const tokenText = config?.showTokens === false || !tokenTotal ? undefined : compactTokens(tokenTotal);
+	safeEmit(events, "powerbar:update", {
+		id: "pi-crew-active",
+		icon: "⚙",
+		text: `crew ${running}a/${waiting}w`,
+		suffix: [model, tokenText].filter(Boolean).join(" · ") || undefined,
+		color: running ? "accent" : "warning",
+	});
+	safeEmit(events, "powerbar:update", {
+		id: "pi-crew-progress",
+		text: (active[0]?.run as TeamRunManifest)?.team ?? "crew",
+		bar: Math.round((completed / total) * 100),
+		suffix: `${completed}/${total}${tokenText ? ` · ${tokenText}` : ""}`,
+		color: completed === total ? "success" : "accent",
+		barSegments: 8,
+	});
+}
+
+export function clearPiCrewPowerbar(events: EventBus): void {
+	safeEmit(events, "powerbar:update", { id: "pi-crew-active" });
+	safeEmit(events, "powerbar:update", { id: "pi-crew-progress" });
+}

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");
+}