pi-crew 0.1.41 → 0.1.44

package/src/ui/loaders.ts

@@ -1,158 +1,158 @@
-import { pad, truncate } from "../utils/visual.ts";
-import type { CrewTheme } from "./theme-adapter.ts";
-import { asCrewTheme } from "./theme-adapter.ts";
-import { DynamicCrewBorder } from "./dynamic-border.ts";
-
-export interface BorderedLoaderOptions {
-	message: string;
-	cancellable?: boolean;
-	frames?: string[];
-	intervalMs?: number;
-	minWidth?: number;
-	onAbort?: () => void;
-}
-
-const DEFAULT_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
-
-export class CrewBorderedLoader {
-	private readonly abortController = new AbortController();
-	private readonly frameOptions: string[];
-	private readonly intervalMs: number;
-	private readonly minWidth: number;
-	private readonly onAbort?: () => void;
-	private theme: CrewTheme;
-	private message: string;
-	private lineCache = "";
-	private width = 0;
-	private startedAt = Date.now();
-
-	constructor(_ui: unknown, themeLike: unknown, options: BorderedLoaderOptions) {
-		const theme = asCrewTheme(themeLike);
-		this.theme = theme;
-		this.message = options.message;
-		this.minWidth = Math.max(12, options.minWidth ?? 24);
-		this.onAbort = options.onAbort;
-		this.frameOptions = options.frames ?? DEFAULT_FRAMES;
-		this.intervalMs = Math.max(40, options.intervalMs ?? 120);
-	}
-
-	private spinnerFrame(): string {
-		if (this.frameOptions.length === 0) return "•";
-		const elapsed = Date.now() - this.startedAt;
-		const index = Math.floor(elapsed / this.intervalMs) % this.frameOptions.length;
-		return this.frameOptions[Math.max(0, index)];
-	}
-
-	setMessage(message: string): void {
-		this.message = message;
-	}
-
-	get signal(): AbortSignal {
-		return this.abortController.signal;
-	}
-
-	handleInput(data: string): void {
-		if (!this.onAbort || this.abortController.signal.aborted) return;
-		if (data === "c" || data === "q" || data === "\u001b" || data === "\u0003") {
-			this.abortController.abort();
-			this.onAbort();
-		}
-	}
-
-	render(width: number): string[] {
-		if (width === this.width && this.lineCache) {
-			return this.lineCache.split("\n");
-		}
-		const innerWidth = Math.max(this.minWidth - 4, 1);
-		const contentWidth = Math.max(1, Math.min(width - 4, innerWidth));
-		const frame = this.spinnerFrame();
-		const loaderLine = ` ${frame} ${truncate(this.message, Math.max(1, contentWidth - 4))} `;
-		const body = ` ${truncate(loaderLine, contentWidth - 2)} `;
-		const inner = ` ${pad(body, contentWidth - 1)} `;
-		const padWidth = Math.max(0, width - (contentWidth + 4));
-		const leftRightPad = " ".repeat(Math.floor(padWidth / 2));
-		const widthAwareInner = contentWidth + padWidth;
-		const border = new DynamicCrewBorder(this.theme).render(widthAwareInner + 2)[0];
-		const top = `${leftRightPad}${this.theme.fg("border", "┌")}${border}${this.theme.fg("border", "┐")}`;
-		const line = `${leftRightPad}${this.theme.fg("border", "│")} ${truncate(inner, widthAwareInner)} ${this.theme.fg("border", "│")}`;
-		const hint = `${leftRightPad}${this.theme.fg("border", "│")}${" ".repeat(widthAwareInner + 2)}${this.theme.fg("border", "│")}`;
-		const bottom = `${leftRightPad}${this.theme.fg("border", "└")}${border}${this.theme.fg("border", "┘")}`;
-		const lineWithHint = optionsHint(this.theme, this.message, widthAwareInner);
-		this.width = width;
-		const lines = [
-			top,
-			line,
-			`${leftRightPad}│ ${pad(lineWithHint, widthAwareInner)} │`,
-			hint,
-			bottom,
-		];
-		this.lineCache = lines.join("\n");
-		return lines;
-	}
-
-	invalidate(): void {
-		this.lineCache = "";
-		this.width = 0;
-	}
-
-	dispose(): void {
-		this.abortController.abort();
-	}
-}
-
-export interface CountdownTimerOptions {
-	timeoutMs: number;
-	onTick: (seconds: number) => void;
-	onExpire: () => void;
-}
-
-export class CountdownTimer {
-	private readonly onExpire: () => void;
-	private readonly onTick: (seconds: number) => void;
-	private readonly startedAt: number;
-	private readonly timeoutMs: number;
-	private timer: ReturnType<typeof setTimeout> | undefined;
-	private expired = false;
-
-	constructor(options: CountdownTimerOptions) {
-		this.timeoutMs = Math.max(0, options.timeoutMs);
-		this.onTick = options.onTick;
-		this.onExpire = options.onExpire;
-		this.startedAt = Date.now();
-		this.onTick(this.secondsLeft());
-		if (this.timeoutMs === 0) {
-			this.emitExpire();
-			return;
-		}
-		this.timer = setInterval(() => {
-			const seconds = this.secondsLeft();
-			this.onTick(seconds);
-			if (seconds <= 0) {
-				this.emitExpire();
-			}
-		}, 1000);
-	}
-
-	private emitExpire(): void {
-		if (this.expired) return;
-		this.expired = true;
-		this.dispose();
-		this.onExpire();
-	}
-
-	private secondsLeft(): number {
-		const remainingMs = this.startedAt + this.timeoutMs - Date.now();
-		return Math.max(0, Math.ceil(remainingMs / 1000));
-	}
-
-	dispose(): void {
-		if (this.timer === undefined) return;
-		clearInterval(this.timer);
-		this.timer = undefined;
-	}
-}
-
-function optionsHint(theme: CrewTheme, message: string, width: number): string {
-	if (!message) return "";
-	return truncate(theme.fg("muted", message), width);
-}
+import { pad, truncate } from "../utils/visual.ts";
+import type { CrewTheme } from "./theme-adapter.ts";
+import { asCrewTheme } from "./theme-adapter.ts";
+import { DynamicCrewBorder } from "./dynamic-border.ts";
+
+export interface BorderedLoaderOptions {
+	message: string;
+	cancellable?: boolean;
+	frames?: string[];
+	intervalMs?: number;
+	minWidth?: number;
+	onAbort?: () => void;
+}
+
+const DEFAULT_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+
+export class CrewBorderedLoader {
+	private readonly abortController = new AbortController();
+	private readonly frameOptions: string[];
+	private readonly intervalMs: number;
+	private readonly minWidth: number;
+	private readonly onAbort?: () => void;
+	private theme: CrewTheme;
+	private message: string;
+	private lineCache = "";
+	private width = 0;
+	private startedAt = Date.now();
+
+	constructor(_ui: unknown, themeLike: unknown, options: BorderedLoaderOptions) {
+		const theme = asCrewTheme(themeLike);
+		this.theme = theme;
+		this.message = options.message;
+		this.minWidth = Math.max(12, options.minWidth ?? 24);
+		this.onAbort = options.onAbort;
+		this.frameOptions = options.frames ?? DEFAULT_FRAMES;
+		this.intervalMs = Math.max(40, options.intervalMs ?? 120);
+	}
+
+	private spinnerFrame(): string {
+		if (this.frameOptions.length === 0) return "•";
+		const elapsed = Date.now() - this.startedAt;
+		const index = Math.floor(elapsed / this.intervalMs) % this.frameOptions.length;
+		return this.frameOptions[Math.max(0, index)];
+	}
+
+	setMessage(message: string): void {
+		this.message = message;
+	}
+
+	get signal(): AbortSignal {
+		return this.abortController.signal;
+	}
+
+	handleInput(data: string): void {
+		if (!this.onAbort || this.abortController.signal.aborted) return;
+		if (data === "c" || data === "q" || data === "\u001b" || data === "\u0003") {
+			this.abortController.abort();
+			this.onAbort();
+		}
+	}
+
+	render(width: number): string[] {
+		if (width === this.width && this.lineCache) {
+			return this.lineCache.split("\n");
+		}
+		const innerWidth = Math.max(this.minWidth - 4, 1);
+		const contentWidth = Math.max(1, Math.min(width - 4, innerWidth));
+		const frame = this.spinnerFrame();
+		const loaderLine = ` ${frame} ${truncate(this.message, Math.max(1, contentWidth - 4))} `;
+		const body = ` ${truncate(loaderLine, contentWidth - 2)} `;
+		const inner = ` ${pad(body, contentWidth - 1)} `;
+		const padWidth = Math.max(0, width - (contentWidth + 4));
+		const leftRightPad = " ".repeat(Math.floor(padWidth / 2));
+		const widthAwareInner = contentWidth + padWidth;
+		const border = new DynamicCrewBorder(this.theme).render(widthAwareInner + 2)[0];
+		const top = `${leftRightPad}${this.theme.fg("border", "┌")}${border}${this.theme.fg("border", "┐")}`;
+		const line = `${leftRightPad}${this.theme.fg("border", "│")} ${truncate(inner, widthAwareInner)} ${this.theme.fg("border", "│")}`;
+		const hint = `${leftRightPad}${this.theme.fg("border", "│")}${" ".repeat(widthAwareInner + 2)}${this.theme.fg("border", "│")}`;
+		const bottom = `${leftRightPad}${this.theme.fg("border", "└")}${border}${this.theme.fg("border", "┘")}`;
+		const lineWithHint = optionsHint(this.theme, this.message, widthAwareInner);
+		this.width = width;
+		const lines = [
+			top,
+			line,
+			`${leftRightPad}│ ${pad(lineWithHint, widthAwareInner)} │`,
+			hint,
+			bottom,
+		];
+		this.lineCache = lines.join("\n");
+		return lines;
+	}
+
+	invalidate(): void {
+		this.lineCache = "";
+		this.width = 0;
+	}
+
+	dispose(): void {
+		this.abortController.abort();
+	}
+}
+
+export interface CountdownTimerOptions {
+	timeoutMs: number;
+	onTick: (seconds: number) => void;
+	onExpire: () => void;
+}
+
+export class CountdownTimer {
+	private readonly onExpire: () => void;
+	private readonly onTick: (seconds: number) => void;
+	private readonly startedAt: number;
+	private readonly timeoutMs: number;
+	private timer: ReturnType<typeof setTimeout> | undefined;
+	private expired = false;
+
+	constructor(options: CountdownTimerOptions) {
+		this.timeoutMs = Math.max(0, options.timeoutMs);
+		this.onTick = options.onTick;
+		this.onExpire = options.onExpire;
+		this.startedAt = Date.now();
+		this.onTick(this.secondsLeft());
+		if (this.timeoutMs === 0) {
+			this.emitExpire();
+			return;
+		}
+		this.timer = setInterval(() => {
+			const seconds = this.secondsLeft();
+			this.onTick(seconds);
+			if (seconds <= 0) {
+				this.emitExpire();
+			}
+		}, 1000);
+	}
+
+	private emitExpire(): void {
+		if (this.expired) return;
+		this.expired = true;
+		this.dispose();
+		this.onExpire();
+	}
+
+	private secondsLeft(): number {
+		const remainingMs = this.startedAt + this.timeoutMs - Date.now();
+		return Math.max(0, Math.ceil(remainingMs / 1000));
+	}
+
+	dispose(): void {
+		if (this.timer === undefined) return;
+		clearInterval(this.timer);
+		this.timer = undefined;
+	}
+}
+
+function optionsHint(theme: CrewTheme, message: string, width: number): string {
+	if (!message) return "";
+	return truncate(theme.fg("muted", message), width);
+}

package/src/ui/mascot.ts

@@ -136,9 +136,9 @@ export class AnimatedMascot {
 		this.currentArminGrid = this.style === "armin" ? this.initialArminGrid() : emptyArminGrid();
 		this.initEffect();
 		this.interval = setInterval(() => this.tick(), this.frameIntervalMs);
-		this.interval.unref?.();
+		this.interval.unref();
 		this.timeout = this.autoCloseMs > 0 ? setTimeout(() => this.close(), this.autoCloseMs) : undefined;
-		this.timeout?.unref?.();
+		this.timeout?.unref();
 	}
 
 	private resolveEffect(requested: MascotEffect | undefined): MascotEffect {
@@ -435,6 +435,7 @@ export class AnimatedMascot {
 	}
 
 	dispose(): void {
+		this.doneGuard.called = true;
 		if (this.interval) clearInterval(this.interval);
 		if (this.timeout) clearTimeout(this.timeout);
 	}

package/src/ui/powerbar-publisher.ts

@@ -63,14 +63,14 @@ export function registerPiCrewPowerbarSegments(events: EventBus, config?: CrewUi
 	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, snapshotCache?: RunSnapshotCache, ctx?: StatusContext, notificationCount = 0): void {
+export function updatePiCrewPowerbar(events: EventBus, cwd: string, config?: CrewUiConfig, manifestCache?: ManifestCache, snapshotCache?: RunSnapshotCache, ctx?: StatusContext, notificationCount = 0, preloadedManifests?: TeamRunManifest[]): void {
 	if (config?.powerbar === false) return;
 	const useStatusFallback = !hasPowerbarConsumer(events);
-	const runs = manifestCache ? manifestCache.list(20) : listRecentRuns(cwd, 20);
+	const runs = preloadedManifests ?? (manifestCache ? manifestCache.list(20) : listRecentRuns(cwd, 20));
 	const active = runs.map((run) => {
 		let snapshot: RunUiSnapshot | undefined;
 		try {
-			snapshot = snapshotCache?.refreshIfStale(run.runId);
+			snapshot = snapshotCache?.get(run.runId) ?? snapshotCache?.refreshIfStale(run.runId);
 		} catch (error) {
 			logInternalError("powerbar.snapshot", error, run.runId);
 		}
@@ -92,12 +92,13 @@ export function updatePiCrewPowerbar(events: EventBus, cwd: string, config?: Cre
 	const agents = active.flatMap((item) => item.agents);
 	const tasks = active.flatMap((item) => item.tasks);
 	const running = agents.filter((agent) => agent.status === "running").length;
-	const waiting = active.reduce((sum, item) => sum + (item.snapshot?.progress.queued ?? item.tasks.filter((task) => task.status === "queued").length), 0);
-	const completed = active.reduce((sum, item) => sum + (item.snapshot?.progress.completed ?? item.tasks.filter((task) => task.status === "completed").length), 0);
+	const waiting = active.reduce((sum, item) => sum + (item.snapshot?.progress.queued ?? item.tasks.reduce((s, t) => s + (t.status === "queued" ? 1 : 0), 0)), 0);
+	const completed = active.reduce((sum, item) => sum + (item.snapshot?.progress.completed ?? item.tasks.reduce((s, t) => s + (t.status === "completed" ? 1 : 0), 0)), 0);
 	const total = Math.max(1, active.reduce((sum, item) => sum + (item.snapshot?.progress.total ?? item.tasks.length), 0) || agents.length);
 	const usage = aggregateUsage(tasks);
 	const snapshotTokens = active.reduce((sum, item) => sum + (item.snapshot ? item.snapshot.usage.tokensIn + item.snapshot.usage.tokensOut : 0), 0);
-	const tokenTotal = usage ? (usage.input ?? 0) + (usage.output ?? 0) + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0) : snapshotTokens;
+	const hasUsage = usage && ((usage.input ?? 0) + (usage.output ?? 0) + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0)) > 0;
+	const tokenTotal = hasUsage ? (usage.input ?? 0) + (usage.output ?? 0) + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0) : snapshotTokens;
 	const model = config?.showModel === false ? undefined : agents.find((agent) => agent.model)?.model?.split("/").at(-1);
 	const tokenText = config?.showTokens === false || !tokenTotal ? undefined : compactTokens(tokenTotal);
 	const activeText = `crew ${running}a/${waiting}w${notificationBadge(notificationCount)}`;

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