pi-background 0.3.1 → 0.3.3

package/extensions/background.ts

@@ -1,9 +1,10 @@
 import { createWriteStream, mkdirSync, readFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import { join } from "node:path";
-import { createLocalBashOperations, type ExtensionAPI, type ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { Key, matchesKey, stripTerminalSequences, Text, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { createLocalBashOperations, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Key, matchesKey, stripTerminalSequences, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
+import { shortCommand } from "./command.ts";
 
 const TAIL_LINES = 20;
 const TAIL_BYTES = 64 * 1024;
@@ -65,6 +66,8 @@ function shownCommand(command: string): string {
 	const shown = command
 		.split("\n")[0]
 		.replace(/^\s*(cd\s+("[^"]*"|'[^']*'|\S+)\s*(&&|;)\s*)+/, "")
+		// Leading settings such as PYTHONPATH=/some/src, which the path shortening below would cut at their last /
+		.replace(/^(\w+=("[^"]*"|'[^']*'|\S*)\s+)+/, "")
 		.replace(/^\S*\/(?=[^\s/]+(\s|$))/, "");
 	return shown.length > 50 ? `${shown.slice(0, 49)}…` : shown;
 }
@@ -161,35 +164,40 @@ export default function (pi: ExtensionAPI) {
 	};
 
 	// One line per running job above the input, with its elapsed time and latest output
-	let ui: ExtensionContext["ui"] | undefined;
 	const running = () => [...jobs.values()].filter((job) => job.status === "running");
 	// The job open in /bg, left out of the jobs line meanwhile so it isn't shown twice
 	let viewing: Job | undefined;
 	// "full" (the default), "compact" without the output, or "off", set with "background": { "jobs": ... } in pi's settings.json
 	const jobsLine = () => (pi.getSettings() as { background?: { jobs?: string } }).background?.jobs ?? "full";
+	// The widget is set once per session and redrawn in place: setting it again would move it below the widgets other
+	// extensions added since, while running jobs belong at the top, next to what Pi is doing now
+	let redrawJobs = () => {};
+	let ticker: NodeJS.Timeout | undefined;
 	const showJobs = () => {
-		if (!ui) return;
-		if (jobsLine() === "off" || running().length === 0) return ui.setWidget("background-jobs", undefined);
-		ui.setWidget("background-jobs", (tui, theme) => {
-			const timer = setInterval(() => tui.requestRender(), 1000);
-			return {
-				dispose: () => clearInterval(timer),
-				invalidate() {},
-				render(width: number) {
-					const live = running().filter((job) => job !== viewing);
-					const lines = live.slice(0, MAX_SHOWN_JOBS).map((job) => {
-						const text =
-							theme.fg("accent", " ⏵ ") +
-							theme.fg("toolTitle", `${job.id} ${shownCommand(job.command)}`) +
-							theme.fg("dim", ` · ${elapsed(job)}${jobsLine() === "full" && job.lastLine ? ` · ${job.lastLine}` : ""}`);
-						return truncateToWidth(text, width);
-					});
-					if (live.length > MAX_SHOWN_JOBS) lines.push(theme.fg("dim", `   and ${live.length - MAX_SHOWN_JOBS} more`));
-					return lines;
-				},
-			};
-		});
+		// A running job's elapsed time and latest output change every second
+		if (running().length > 0) ticker ??= setInterval(() => redrawJobs(), 1000);
+		else {
+			clearInterval(ticker);
+			ticker = undefined;
+		}
+		redrawJobs();
 	};
+	const jobsWidget = (theme: any) => ({
+		invalidate() {},
+		render(width: number) {
+			if (jobsLine() === "off") return [];
+			const live = running().filter((job) => job !== viewing);
+			const lines = live.slice(0, MAX_SHOWN_JOBS).map((job) => {
+				const text =
+					theme.fg("accent", "⏵ ") +
+					theme.fg("toolTitle", `${job.id} ${shownCommand(job.command)}`) +
+					theme.fg("dim", ` · ${elapsed(job)}${jobsLine() === "full" && job.lastLine ? ` · ${job.lastLine}` : ""}`);
+				return truncateToWidth(text, width);
+			});
+			if (live.length > MAX_SHOWN_JOBS) lines.push(theme.fg("dim", `  and ${live.length - MAX_SHOWN_JOBS} more`));
+			return lines;
+		},
+	});
 
 	const find = (id: string): Job => {
 		const job = jobs.get(id);
@@ -197,22 +205,38 @@ export default function (pi: ExtensionAPI) {
 		return job;
 	};
 
-	// Compact, Claude-Code-style rows instead of pi's default boxed tool and message rendering
+	// Compact, Claude-Code-style rows instead of pi's default boxed tool and message rendering: quiet grey once done,
+	// with a dot only while running or when something failed
+	// "  └ text" in dim, with long and extra lines wrapped under the text instead of at the left edge
+	const branch = (theme: any, text: string, head?: string) => ({
+		invalidate() {},
+		render: (width: number) => [
+			...(head ? [truncateToWidth(head, width)] : []),
+			...wrapTextWithAnsi(text, Math.max(10, width - 4)).map((line, i) => theme.fg("dim", `${i === 0 ? "  └ " : "    "}${line}`)),
+		],
+	});
 	pi.registerMessageRenderer("background-job", (message, { expanded }, theme) => {
 		const d = (message.details ?? {}) as { headline?: string; last?: string; error?: boolean };
-		const head = theme.fg(d.error ? "error" : "success", "● ") + theme.fg("toolTitle", `Background ${d.headline ?? ""}`);
-		const body = expanded ? String(message.content) : (d.last ?? "");
-		return new Text(`${head}\n${theme.fg("dim", `  └ ${body.replace(/\n/g, "\n    ")}`)}`, 0, 0);
+		const title = `Background ${d.headline ?? ""}`;
+		const head = d.error ? theme.fg("error", "● ") + theme.fg("toolTitle", title) : `  ${theme.fg("dim", title)}`;
+		return branch(theme, expanded ? String(message.content) : (d.last ?? ""), head);
+	});
+	// One line, like pi-polish's shell rows; expanded (ctrl+o) shows the whole text, wrapped under the row
+	const row = (theme: any, text: string, context: any, full = text) => ({
+		invalidate() {},
+		render(width: number) {
+			const color = context.isError ? "error" : context.executionStarted && context.isPartial ? "accent" : undefined;
+			const mark = color ? theme.fg(color, "● ") : "  ";
+			const paint = (line: string) => theme.fg(color ? "toolTitle" : "dim", line);
+			if (!context.expanded) return [mark + paint(truncateToWidth(text, Math.max(10, width - 2)))];
+			return wrapTextWithAnsi(full, Math.max(10, width - 2)).map((line, i) => (i === 0 ? mark : "  ") + paint(line));
+		},
 	});
-	const row = (theme: any, text: string, context: any) => {
-		const color = context.isError ? "error" : context.executionStarted && context.isPartial ? "accent" : "success";
-		return new Text(theme.fg(color, "● ") + theme.fg("toolTitle", text), 0, 0);
-	};
 	const note = (theme: any, result: any, expanded: boolean) => {
 		const text = result.content?.map((c: any) => c.text ?? "").join("\n") ?? "";
 		// Collapsed: first sentence only ("Started bg1"), without the log path
 		const short = text.split("\n")[0].split(";")[0];
-		return new Text(theme.fg("dim", `  └ ${(expanded ? text : short).replace(/\n/g, "\n    ")}`), 0, 0);
+		return branch(theme, expanded ? text : short);
 	};
 
 	pi.registerTool({
@@ -229,25 +253,30 @@ export default function (pi: ExtensionAPI) {
 			"When unsure whether a command is quick, prefer bg_run: a quick job just reports back sooner, while a long bash command blocks the user until it finishes.",
 			"After bg_run, continue with independent work or end your turn; a message with the exit code and log tail arrives automatically when the job exits, so never sleep, poll or tail the log to wait for it.",
 			"Keep using bash for quick commands whose output you need right away, such as git, ls, cat, grep, find, file inspection and short checks.",
-			"To react when a bg_run job prints something specific while it keeps running (a server is ready, an epoch finished, an error appeared), pass wake_on with a regex instead of polling.",
+			"Pass wake_on only when you must act before a bg_run job ends, such as a server becoming ready to test against, or when the user asked to follow its progress. To report a job's result, leave wake_on out: the exit message already brings the exit code and last lines, so waking on every epoch or step only adds turns.",
 			"Don't redirect a bg_run command's output to a file (> file, 2>&1, nohup): bg_run already saves all of it to the job's log, and redirecting hides the job's progress from the user and from wake_on. If the output should be kept, tell the user where the job's log is.",
 			"bg_run starts only after the other tool calls in the same reply have finished, so editing a file and starting a job that uses it in one reply is safe.",
 			"Use bg_status to check progress of a bg_run job and bg_kill to stop one.",
 			`bash commands time out after ${BASH_DEFAULT_TIMEOUT / 60} minutes unless you pass timeout (at most ${BASH_MAX_TIMEOUT / 60} minutes); run anything that may take longer with bg_run instead.`,
 			"Unless the user explicitly asks for that bash command, never wait, poll or sleep in bash (while/until loops with sleep, watch, repeated status checks), not even as part of a larger command; start the wait with bg_run and pass wake_on to be woken when the awaited output appears.",
-			"Unless the user explicitly asks otherwise, start long-running processes (training or evaluation runs, servers, watchers) with bg_run, not with & or nohup in bash followed by sleep; pass wake_on matching the lines you want to see, such as results or Traceback.",
+			"Unless the user explicitly asks otherwise, start long-running processes (training or evaluation runs, servers, watchers) with bg_run, not with & or nohup in bash followed by sleep.",
 		],
 		// Runs after the edits in the same reply, so the job starts from the code pi just wrote
 		executionMode: "sequential",
 		renderShell: "self",
-		renderCall: (args: any, theme, context) => row(theme, `Background $ ${String(args?.command ?? "").split("\n")[0]}`, context),
+		renderCall: (args: any, theme, context) => {
+			const command = String(args?.command ?? "");
+			// Collapsed, without leading settings such as PYTHONPATH=/some/src, like the jobs line; ctrl+o shows them
+			const short = shortCommand(command, args?.cwd ?? process.cwd()).replace(/^(\w+=("[^"]*"|'[^']*'|\S*)\s+)+/, "");
+			return row(theme, `Background $ ${short}`, context, `Background $ ${command.trim()}`);
+		},
 		renderResult: (result, { expanded }, theme) => note(theme, result, expanded),
 		parameters: Type.Object({
 			command: Type.String({ description: "Shell command to run" }),
 			cwd: Type.Optional(Type.String({ description: "Working directory (defaults to the session cwd)" })),
 			wake_on: Type.Optional(
 				Type.String({
-					description: "Regex; also wake you while the job runs whenever an output line matches, e.g. 'listening on|ready' or 'epoch \\d+'. Matches within a second are batched; at most 10 wake-ups per job.",
+					description: "Regex; also wake you while the job runs whenever an output line matches, e.g. 'listening on|ready'. Matches within a second are batched; at most 10 wake-ups per job.",
 				}),
 			),
 		}),
@@ -293,7 +322,6 @@ export default function (pi: ExtensionAPI) {
 					});
 				});
 
-			if (ctx.mode === "tui") ui = ctx.ui;
 			showJobs();
 			return { content: [{ type: "text", text: `Started ${id}; log: ${log}. You will be notified when it exits.` }], details: { id, log } };
 		},
@@ -395,6 +423,12 @@ export default function (pi: ExtensionAPI) {
 
 	// After /reload or a resume, carry on after the ids already in the conversation so "bg3" keeps meaning one job
 	pi.on("session_start", async (_event, ctx) => {
+		if (ctx.mode === "tui") {
+			ctx.ui.setWidget("background-jobs", (tui, theme) => {
+				redrawJobs = () => tui.requestRender();
+				return jobsWidget(theme);
+			});
+		}
 		for (const entry of ctx.sessionManager.getBranch()) {
 			const msg = entry.type === "message" ? (entry.message as any) : undefined;
 			const n = Number(/^bg(\d+)$/.exec(msg?.role === "toolResult" && msg.toolName === "bg_run" ? String(msg.details?.id) : "")?.[1]);
@@ -403,6 +437,7 @@ export default function (pi: ExtensionAPI) {
 	});
 
 	pi.on("session_shutdown", async () => {
+		clearInterval(ticker);
 		for (const timer of holds.values()) clearTimeout(timer);
 		holds.clear();
 		for (const job of jobs.values()) {

package/extensions/command.ts

@@ -0,0 +1,22 @@
+import { realpathSync } from "node:fs";
+import { basename, isAbsolute, resolve } from "node:path";
+
+// Real paths, so a cd through a symlink such as /tmp still counts as cwd
+const real = (path: string) => {
+	try {
+		return realpathSync(path);
+	} catch {
+		return path;
+	}
+};
+
+/** A shell command's first line, without leading cds into cwd; another folder shows as its last part when the path is absolute. */
+export function shortCommand(command: string, cwd: string): string {
+	const rest = command.trim().replace(/^(?:cd\s+(?:"[^"]*"|'[^']*'|\S+)[ \t]*(?:&&|;|\n)\s*)+/, (prefix) => {
+		const [, quoted, separator] = [...prefix.matchAll(/cd\s+("[^"]*"|'[^']*'|\S+)[ \t]*(&&|;|\n)/g)].at(-1)!;
+		const dir = quoted.replace(/^["']|["']$/g, "");
+		if (real(resolve(cwd, dir)) === real(resolve(cwd))) return "";
+		return `cd ${isAbsolute(dir) ? `…/${basename(dir)}` : quoted}${separator === ";" ? ";" : " &&"} `;
+	});
+	return rest.split("\n")[0];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-background",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "license": "MIT",
   "author": "Thomas van Dongen",
   "type": "module",