pi-subagents 0.18.1 → 0.19.0

package/subagents-status.ts

@@ -1,3 +1,5 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
 import type { Theme } from "@mariozechner/pi-coding-agent";
 import type { Component, TUI } from "@mariozechner/pi-tui";
 import { matchesKey, truncateToWidth } from "@mariozechner/pi-tui";
@@ -7,6 +9,10 @@ import { formatDuration, formatTokens, shortenPath } from "./formatters.js";
 import { formatScrollInfo, renderFooter, renderHeader, row } from "./render-helpers.js";
 
 const AUTO_REFRESH_MS = 2000;
+const DETAIL_EVENT_LIMIT = 8;
+const OUTPUT_TAIL_LINES = 20;
+const DETAIL_FILE_TAIL_BYTES = 64 * 1024;
+const DETAIL_VIEWPORT_HEIGHT = 18;
 
 interface StatusRow {
 	kind: "section" | "run";
@@ -71,13 +77,103 @@ function buildRows(active: AsyncRunSummary[], recent: AsyncRunSummary[]): Status
 	return rows;
 }
 
+function resolveRunPath(asyncDir: string, filePath: string): string {
+	return path.isAbsolute(filePath) ? filePath : path.join(asyncDir, filePath);
+}
+
+function readTailText(filePath: string): { text?: string; warning?: string } {
+	let fd: number | undefined;
+	try {
+		const stat = fs.statSync(filePath);
+		if (!stat.isFile()) return { warning: `not a file: ${filePath}` };
+		const start = Math.max(0, stat.size - DETAIL_FILE_TAIL_BYTES);
+		const length = stat.size - start;
+		const buffer = Buffer.alloc(length);
+		fd = fs.openSync(filePath, "r");
+		const bytesRead = fs.readSync(fd, buffer, 0, length, start);
+		return { text: buffer.subarray(0, bytesRead).toString("utf-8") };
+	} catch (error) {
+		const code = typeof error === "object" && error !== null && "code" in error
+			? (error as NodeJS.ErrnoException).code
+			: undefined;
+		return { warning: code === "ENOENT" ? `missing ${path.basename(filePath)}: ${filePath}` : `failed to read ${filePath}: ${error instanceof Error ? error.message : String(error)}` };
+	} finally {
+		if (fd !== undefined) {
+			try {
+				fs.closeSync(fd);
+			} catch {
+				// Best effort cleanup after a bounded detail-view read.
+			}
+		}
+	}
+}
+
+function readTailLines(filePath: string, maxLines: number): { lines: string[]; warning?: string } {
+	const tail = readTailText(filePath);
+	if (tail.warning) return { lines: [], warning: tail.warning };
+	const lines = (tail.text ?? "").split("\n").map((line) => line.trimEnd()).filter((line) => line.trim());
+	return { lines: lines.slice(Math.max(0, lines.length - maxLines)) };
+}
+
+function formatEventTimestamp(value: unknown): string | undefined {
+	if (typeof value !== "number" || !Number.isFinite(value)) return undefined;
+	return new Date(value).toISOString();
+}
+
+function formatEventLine(value: Record<string, unknown>): string {
+	const type = typeof value.type === "string" ? value.type : "event";
+	const ts = formatEventTimestamp(value.ts ?? value.observedAt);
+	const stepIndex = typeof value.stepIndex === "number" ? ` step ${value.stepIndex + 1}` : "";
+	const agent = typeof value.agent === "string"
+		? value.agent
+		: typeof value.subagentAgent === "string"
+			? value.subagentAgent
+			: undefined;
+	const status = typeof value.status === "string" ? value.status : undefined;
+	const exitCode = typeof value.exitCode === "number" ? `exit ${value.exitCode}` : undefined;
+	const event = value.event && typeof value.event === "object" && !Array.isArray(value.event)
+		? value.event as { message?: unknown }
+		: undefined;
+	const message = typeof value.message === "string"
+		? value.message
+		: typeof value.error === "string"
+			? value.error
+			: typeof event?.message === "string"
+				? event.message
+				: undefined;
+	return [ts, type, agent ? `${agent}${stepIndex}` : stepIndex.trim(), status, exitCode, message].filter(Boolean).join(" | ");
+}
+
+function readRecentEvents(eventsPath: string, limit: number): { events: string[]; warning?: string } {
+	const tail = readTailText(eventsPath);
+	if (tail.warning) {
+		return tail.warning.startsWith("missing ") ? { events: [] } : { events: [], warning: tail.warning };
+	}
+
+	const events: string[] = [];
+	const lines = (tail.text ?? "").split("\n").filter((line) => line.trim());
+	for (let i = lines.length - 1; i >= 0 && events.length < limit; i--) {
+		try {
+			const parsed = JSON.parse(lines[i]!);
+			if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) continue;
+			events.push(formatEventLine(parsed as Record<string, unknown>));
+		} catch {
+			// Skip malformed event records; async writers can be interrupted mid-line.
+		}
+	}
+	return { events: events.reverse() };
+}
+
 export class SubagentsStatusComponent implements Component {
 	private readonly width = 84;
 	private readonly viewportHeight = 12;
 	private readonly listRunsForOverlay: (asyncDirRoot: string, recentLimit?: number) => AsyncRunOverlayData;
 	private readonly refreshTimer: NodeJS.Timeout;
+	private screen: "list" | "detail" = "list";
 	private cursor = 0;
 	private scrollOffset = 0;
+	private detailScrollOffset = 0;
+	private detailRunId: string | undefined;
 	private active: AsyncRunSummary[] = [];
 	private recent: AsyncRunSummary[] = [];
 	private rows: StatusRow[] = [];
@@ -165,6 +261,12 @@ export class SubagentsStatusComponent implements Component {
 		if (run.sessionFile) {
 			lines.push(row(`session: ${truncateToWidth(shortenPath(run.sessionFile), innerW - 9)}`, width, this.theme));
 		}
+		lines.push(...this.renderStepRows(run, width, innerW));
+		return lines;
+	}
+
+	private renderStepRows(run: AsyncRunSummary, width: number, innerW: number): string[] {
+		const lines: string[] = [];
 		for (const step of run.steps) {
 			const model = step.model ? ` | ${step.model}` : "";
 			const attempts = step.attemptedModels && step.attemptedModels.length > 1
@@ -189,11 +291,114 @@ export class SubagentsStatusComponent implements Component {
 		return lines;
 	}
 
+	private renderDetail(run: AsyncRunSummary, width: number, innerW: number): string[] {
+		const stepCount = run.steps.length || 1;
+		const stepLabel = run.currentStep !== undefined ? `step ${run.currentStep + 1}/${stepCount}` : `steps ${stepCount}`;
+		const duration = run.endedAt !== undefined
+			? formatDuration(Math.max(0, run.endedAt - run.startedAt))
+			: formatDuration(Math.max(0, Date.now() - run.startedAt));
+		const activity = run.lastActivityAt
+			? run.activityState === "needs_attention"
+				? `no activity for ${formatDuration(Math.max(0, Date.now() - run.lastActivityAt))}`
+				: `active ${formatDuration(Math.max(0, Date.now() - run.lastActivityAt))} ago`
+			: undefined;
+
+		const body: string[] = [];
+		body.push(row(`${run.id} | ${statusColor(this.theme, run.state)} | ${run.mode} | ${stepLabel} | ${duration}`, width, this.theme));
+		if (activity) body.push(row(truncateToWidth(activity, innerW), width, this.theme));
+		body.push(row("", width, this.theme));
+		body.push(row(this.theme.fg("accent", "Steps"), width, this.theme));
+		body.push(...this.renderStepRows(run, width, innerW));
+
+		const eventsPath = path.join(run.asyncDir, "events.jsonl");
+		const eventResult = readRecentEvents(eventsPath, DETAIL_EVENT_LIMIT);
+		body.push(row("", width, this.theme));
+		body.push(row(this.theme.fg("accent", "Recent events"), width, this.theme));
+		if (eventResult.warning) body.push(row(this.theme.fg("warning", truncateToWidth(eventResult.warning, innerW)), width, this.theme));
+		if (eventResult.events.length === 0 && !eventResult.warning) body.push(row(this.theme.fg("dim", "  No events recorded."), width, this.theme));
+		for (const event of eventResult.events) {
+			body.push(row(truncateToWidth(`  ${event}`, innerW), width, this.theme));
+		}
+
+		body.push(row("", width, this.theme));
+		body.push(row(this.theme.fg("accent", "Output tail"), width, this.theme));
+		if (run.outputFile) {
+			const outputPath = resolveRunPath(run.asyncDir, run.outputFile);
+			const tail = readTailLines(outputPath, OUTPUT_TAIL_LINES);
+			if (tail.warning) body.push(row(this.theme.fg("warning", truncateToWidth(tail.warning, innerW)), width, this.theme));
+			else if (tail.lines.length === 0) body.push(row(this.theme.fg("dim", "  No output yet."), width, this.theme));
+			for (const line of tail.lines) body.push(row(truncateToWidth(`  ${line}`, innerW), width, this.theme));
+		} else {
+			body.push(row(this.theme.fg("dim", "  No output file recorded."), width, this.theme));
+		}
+
+		body.push(row("", width, this.theme));
+		body.push(row(this.theme.fg("accent", "Paths"), width, this.theme));
+		body.push(row(truncateToWidth(`  cwd: ${shortenPath(run.cwd ?? run.asyncDir)}`, innerW), width, this.theme));
+		body.push(row(truncateToWidth(`  asyncDir: ${shortenPath(run.asyncDir)}`, innerW), width, this.theme));
+		if (run.outputFile) body.push(row(truncateToWidth(`  outputFile: ${shortenPath(resolveRunPath(run.asyncDir, run.outputFile))}`, innerW), width, this.theme));
+		if (run.sessionFile) body.push(row(truncateToWidth(`  sessionFile: ${shortenPath(run.sessionFile)}`, innerW), width, this.theme));
+		if (run.sessionDir) body.push(row(truncateToWidth(`  sessionDir: ${shortenPath(run.sessionDir)}`, innerW), width, this.theme));
+		const logPath = path.join(run.asyncDir, `subagent-log-${run.id}.md`);
+		if (fs.existsSync(logPath)) body.push(row(truncateToWidth(`  runLog: ${shortenPath(logPath)}`, innerW), width, this.theme));
+
+		const maxOffset = Math.max(0, body.length - DETAIL_VIEWPORT_HEIGHT);
+		this.detailScrollOffset = Math.min(this.detailScrollOffset, maxOffset);
+		const visibleBody = body.slice(this.detailScrollOffset, this.detailScrollOffset + DETAIL_VIEWPORT_HEIGHT);
+		const above = this.detailScrollOffset;
+		const below = Math.max(0, body.length - (this.detailScrollOffset + visibleBody.length));
+		const scrollInfo = formatScrollInfo(above, below);
+		return [
+			renderHeader(`Subagent Run ${run.id.slice(0, 8)}`, width, this.theme),
+			...visibleBody,
+			scrollInfo ? row(this.theme.fg("dim", scrollInfo), width, this.theme) : row("", width, this.theme),
+			renderFooter(" ↑↓ scroll  esc summary  q close  read-only detail ", width, this.theme),
+		];
+	}
+
 	handleInput(data: string): void {
+		if (this.screen === "detail" && matchesKey(data, "escape")) {
+			this.screen = "list";
+			this.detailRunId = undefined;
+			this.tui.requestRender();
+			return;
+		}
 		if (matchesKey(data, "escape") || matchesKey(data, "q") || matchesKey(data, "ctrl+c")) {
 			this.done();
 			return;
 		}
+		if (this.screen === "detail") {
+			if (matchesKey(data, "up")) {
+				this.detailScrollOffset = Math.max(0, this.detailScrollOffset - 1);
+				this.tui.requestRender();
+				return;
+			}
+			if (matchesKey(data, "down")) {
+				this.detailScrollOffset++;
+				this.tui.requestRender();
+				return;
+			}
+			if (matchesKey(data, "pageup")) {
+				this.detailScrollOffset = Math.max(0, this.detailScrollOffset - DETAIL_VIEWPORT_HEIGHT);
+				this.tui.requestRender();
+				return;
+			}
+			if (matchesKey(data, "pagedown")) {
+				this.detailScrollOffset += DETAIL_VIEWPORT_HEIGHT;
+				this.tui.requestRender();
+			}
+			return;
+		}
+		if (matchesKey(data, "return")) {
+			const selected = selectedRun(this.rows, this.cursor);
+			if (selected) {
+				this.screen = "detail";
+				this.detailRunId = selected.id;
+				this.detailScrollOffset = 0;
+				this.tui.requestRender();
+			}
+			return;
+		}
 		if (matchesKey(data, "up")) {
 			this.cursor = Math.max(0, this.cursor - 1);
 			this.ensureScrollVisible();
@@ -211,9 +416,18 @@ export class SubagentsStatusComponent implements Component {
 	render(width: number): string[] {
 		const w = Math.min(width, this.width);
 		const innerW = w - 2;
+		const selected = selectedRun(this.rows, this.cursor);
+		if (this.screen === "detail") {
+			const detailRun = this.rows.find((row) => row.kind === "run" && row.run?.id === this.detailRunId)?.run;
+			if (detailRun) return this.renderDetail(detailRun, w, innerW);
+			return [
+				renderHeader("Subagent Run", w, this.theme),
+				row(this.theme.fg("warning", "Selected run is no longer available."), w, this.theme),
+				renderFooter(" esc summary  q close ", w, this.theme),
+			];
+		}
 		const lines: string[] = [renderHeader("Subagents Status", w, this.theme)];
 		const rows = this.rows.length > 0 ? this.rows : [{ kind: "section" as const, label: "No async runs found" }];
-		const selected = selectedRun(this.rows, this.cursor);
 		const visibleRows = rows.slice(this.scrollOffset, this.scrollOffset + this.viewportHeight);
 		for (const statusRow of visibleRows) {
 			if (statusRow.kind === "section") {
@@ -239,7 +453,7 @@ export class SubagentsStatusComponent implements Component {
 			lines.push(row(this.theme.fg("dim", "No runs selected."), w, this.theme));
 		}
 
-		const footer = `↑↓ select  esc close  summary view  ${this.active.length} active / ${this.recent.length} recent`;
+		const footer = `↑↓ select  enter detail  esc close  summary view  ${this.active.length} active / ${this.recent.length} recent`;
 		lines.push(renderFooter(truncateToWidth(footer, innerW), w, this.theme));
 		return lines;
 	}

package/worktree.ts

@@ -100,17 +100,8 @@ function runGitChecked(cwd: string, args: string[]): string {
 }
 
 function resolveRepoState(cwd: string): RepoState {
-	const repoCheck = runGit(cwd, ["rev-parse", "--is-inside-work-tree"]);
-	if (repoCheck.status !== 0 || repoCheck.stdout.trim() !== "true") {
-		throw new Error("worktree isolation requires a git repository");
-	}
-
+	const cwdRelative = resolveRepoCwdRelative(cwd);
 	const toplevel = runGitChecked(cwd, ["rev-parse", "--show-toplevel"]).trim();
-	const rawPrefix = runGitChecked(cwd, ["rev-parse", "--show-prefix"]).trim();
-	const normalizedPrefix = rawPrefix
-		? path.normalize(rawPrefix.replace(/[\\/]+$/, ""))
-		: "";
-	const cwdRelative = normalizedPrefix === "." ? "" : normalizedPrefix;
 
 	const status = runGitChecked(toplevel, ["status", "--porcelain"]);
 	if (status.trim().length > 0) {
@@ -165,6 +156,24 @@ function buildWorktreePath(runId: string, index: number): string {
 	return path.join(os.tmpdir(), `pi-worktree-${runId}-${index}`);
 }
 
+function resolveRepoCwdRelative(cwd: string): string {
+	const repoCheck = runGit(cwd, ["rev-parse", "--is-inside-work-tree"]);
+	if (repoCheck.status !== 0 || repoCheck.stdout.trim() !== "true") {
+		throw new Error("worktree isolation requires a git repository");
+	}
+	const rawPrefix = runGitChecked(cwd, ["rev-parse", "--show-prefix"]).trim();
+	const normalizedPrefix = rawPrefix
+		? path.normalize(rawPrefix.replace(/[\\/]+$/, ""))
+		: "";
+	return normalizedPrefix === "." ? "" : normalizedPrefix;
+}
+
+export function resolveExpectedWorktreeAgentCwd(cwd: string, runId: string, index: number): string {
+	const cwdRelative = resolveRepoCwdRelative(cwd);
+	const worktreePath = buildWorktreePath(runId, index);
+	return cwdRelative ? path.join(worktreePath, cwdRelative) : worktreePath;
+}
+
 function linkNodeModulesIfPresent(toplevel: string, worktreePath: string): boolean {
 	const nodeModulesPath = path.join(toplevel, "node_modules");
 	const nodeModulesLinkPath = path.join(worktreePath, "node_modules");