@tekmidian/pai 0.64.0 → 0.65.1

package/dist/{run-W2rV_9j0.mjs → run-uAkNItb6.mjs}

@@ -1,6 +1,6 @@
-import { i as getRegistryBackend } from "./factory-C4We3xR_.mjs";
-import { E as readWorkersSection, O as resolveModelCapability, T as providerKeyPath, b as isModelCapability, d as NATIVE_ANTHROPIC_MODELS, g as classModelCapability, h as assertProviderRunnable, k as resolveProviderKey, m as WorkersConfigError, n as claudeCommand, t as buildRunEnv } from "./run-env-Br4Bc7Vz.mjs";
-import { _ as statusPath, d as resolveTarget, f as setCooldown, g as panesDir, h as ledgerPath, i as capabilityForRun, m as eventsPath, n as ensureProxyRunning, o as isQuotaFailure, p as ensureNoMcpConfig, s as nextAutoProvider, t as DEFAULT_PROXY_PORT, u as resolveCapabilityRun, v as workersLogDir } from "./server-B71rem4q.mjs";
+import { i as getRegistryBackend } from "./factory-y36qGegI.mjs";
+import { E as readWorkersSection, O as resolveModelCapability, T as providerKeyPath, b as isModelCapability, d as NATIVE_ANTHROPIC_MODELS, g as classModelCapability, h as assertProviderRunnable, k as resolveProviderKey, m as WorkersConfigError, n as claudeCommand, t as buildRunEnv } from "./run-env-BHWnXqle.mjs";
+import { _ as statusPath, d as resolveTarget, f as setCooldown, g as panesDir, h as ledgerPath, i as capabilityForRun, m as eventsPath, n as ensureProxyRunning, o as isQuotaFailure, p as ensureNoMcpConfig, s as nextAutoProvider, t as DEFAULT_PROXY_PORT, u as resolveCapabilityRun, v as workersLogDir } from "./server-DlL1QI2k.mjs";
 import { appendFileSync, closeSync, existsSync, lstatSync, mkdirSync, mkdtempSync, openSync, readFileSync, readdirSync, readlinkSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
 import { homedir, platform, tmpdir } from "node:os";
 import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
@@ -233,6 +233,7 @@ function parseRunnerArgs(argv) {
 	let callerModel = false;
 	let callerMcpConfig = false;
 	let callerSystemPrompt = false;
+	const callerSystemPrompts = [];
 	let callerTools = false;
 	const mcp = [];
 	const allowedTools = [];
@@ -254,7 +255,13 @@ function parseRunnerArgs(argv) {
 		} else if (a.startsWith("--output-format=")) {
 			const v = a.slice(16);
 			if (v === "json" || v === "stream-json") outputFormat = v;
-		} else if (a === "--verbose") {} else if (a === "--mcp") {
+		} else if (a === "--verbose") {} else if (a === "--append-system-prompt") {
+			callerSystemPrompt = true;
+			if (i + 1 < argv.length) callerSystemPrompts.push(argv[++i]);
+		} else if (a.startsWith("--append-system-prompt=")) {
+			callerSystemPrompt = true;
+			callerSystemPrompts.push(a.slice(23));
+		} else if (a === "--mcp") {
 			const v = argv[i + 1];
 			if (v !== void 0 && !v.startsWith("-")) {
 				mcp.push(v);
@@ -277,8 +284,6 @@ function parseRunnerArgs(argv) {
 			if (a.startsWith("--model=")) callerModel = true;
 			if (a === "--mcp-config") callerMcpConfig = true;
 			if (a.startsWith("--mcp-config=")) callerMcpConfig = true;
-			if (a === "--append-system-prompt") callerSystemPrompt = true;
-			if (a.startsWith("--append-system-prompt=")) callerSystemPrompt = true;
 			if (a === "--tools") callerTools = true;
 			if (a.startsWith("--tools=")) callerTools = true;
 			if (prompt === null && !a.startsWith("-") && rest.length > 0 && (rest[rest.length - 1] === "-p" || rest[rest.length - 1] === "--print")) prompt = a;
@@ -294,12 +299,22 @@ function parseRunnerArgs(argv) {
 		callerModel,
 		callerMcpConfig,
 		callerSystemPrompt,
+		callerSystemPrompts,
 		callerTools,
 		mcp,
 		allowedTools
 	};
 }
 /**
+* The one --append-system-prompt flag for a spawn: claude keeps only the LAST
+* occurrence, so every piece is joined (blank line between) into a single flag.
+* Empty parts are dropped; no parts, no flag.
+*/
+function appendSystemPromptArgs(parts) {
+	const text = parts.filter((p) => p.trim()).join("\n\n");
+	return text ? ["--append-system-prompt", text] : [];
+}
+/**
 * Turn `-p "<prompt>"` into bare `-p` (same for --print): for stream-json
 * stdin runs the prompt moves to the first user message on stdin, so the
 * value must not stay on the command line. Only prompt values directly
@@ -903,6 +918,10 @@ function salvageOnExit(ledger, id, label, wtDir, timeoutMs) {
 			paths: committed.join(","),
 			skipped: skipped.length
 		});
+		if (skipped.length) appendLedger(ledger, "WORKER-NOTE", {
+			id,
+			note: `salvage skipped: ${skipped.join("; ")}`
+		});
 		return committed;
 	} catch (e) {
 		try {
@@ -992,8 +1011,10 @@ function salvageUncommitted(wtDir, label, timeoutMs) {
 		skipped: []
 	};
 	const skipped = [];
+	const missing = new Set(git(wtDir, ["ls-files", "--deleted"], timeoutMs).split("\n").filter(Boolean));
 	const toStage = [];
-	for (const p of paths) if (symlinkEscapesWorktree(wtDir, p)) skipped.push(`symlink ${p} -> ${readlinkSync(join(wtDir, p))} (points outside the worktree)`);
+	for (const p of paths) if (missing.has(p)) skipped.push(`${p} (missing, not committed)`);
+	else if (symlinkEscapesWorktree(wtDir, p)) skipped.push(`symlink ${p} -> ${readlinkSync(join(wtDir, p))} (points outside the worktree)`);
 	else toStage.push(p);
 	if (!toStage.length) return {
 		committed: [],
@@ -1002,11 +1023,21 @@ function salvageUncommitted(wtDir, label, timeoutMs) {
 	try {
 		git(wtDir, [
 			"add",
-			"-A",
+			"--ignore-removal",
 			"--",
 			".",
 			...paths.filter((p) => !toStage.includes(p)).map((p) => `:(exclude,literal)${p}`)
 		], timeoutMs);
+		const deleted = git(wtDir, [
+			"diff",
+			"--cached",
+			"--diff-filter=D",
+			"--name-only"
+		], timeoutMs).split("\n").filter(Boolean);
+		if (deleted.length > MAX_SALVAGE_DELETES) {
+			git(wtDir, ["reset", "-q"], timeoutMs);
+			throw new Error(`salvage would delete ${deleted.length} tracked files (${deleted.slice(0, 5).join(", ")}, ...), refused`);
+		}
 		git(wtDir, [
 			"commit",
 			"-m",
@@ -1020,6 +1051,8 @@ function salvageUncommitted(wtDir, label, timeoutMs) {
 		skipped
 	};
 }
+/** A salvage commit that deletes more tracked files than this is refused. */
+const MAX_SALVAGE_DELETES = 5;
 /**
 * The dirty paths of a checkout, parsed from `git status --porcelain -z`:
 * NUL-separated (a path with a newline in it cannot corrupt the parse),
@@ -1338,14 +1371,20 @@ function gcWorktrees(logDir, olderThanHours = 24, dryRun = false, now = Date.now
 	const out = [];
 	const root = worktreesDir(logDir);
 	const known = /* @__PURE__ */ new Set();
-	const archive = (id, dir, repo, st) => {
+	const archive = (id, dir, st) => {
 		const target = `refs/pai-archive/${id}`;
 		if (dryRun) return void out.push({
 			id,
 			archive: target
 		});
 		try {
-			if (!repo) throw new Error("not a git worktree");
+			let repo;
+			try {
+				const raw = git(dir, ["rev-parse", "--git-common-dir"]);
+				repo = isAbsolute(raw) ? raw : resolve(dir, raw);
+			} catch {
+				throw new Error("not a git worktree");
+			}
 			const label = `archive: leftover state of worker ${id}`;
 			if (uncommittedPaths(dir).length) {
 				const res = salvageUncommitted(dir, label);
@@ -1424,7 +1463,7 @@ function gcWorktrees(logDir, olderThanHours = 24, dryRun = false, now = Date.now
 			continue;
 		}
 		if (end > cutoff) continue;
-		archive(st.id, st.worktreeDir, st.cwd, st);
+		archive(st.id, st.worktreeDir, st);
 	}
 	if (existsSync(root)) for (const ent of readdirSync(root, { withFileTypes: true })) {
 		if (!ent.isDirectory() || known.has(ent.name) || existsSync(statusPath(logDir, ent.name))) continue;
@@ -1434,14 +1473,7 @@ function gcWorktrees(logDir, olderThanHours = 24, dryRun = false, now = Date.now
 		} catch {
 			continue;
 		}
-		let repo = null;
-		try {
-			const raw = git(dir, ["rev-parse", "--git-common-dir"]);
-			repo = isAbsolute(raw) ? raw : resolve(dir, raw);
-		} catch {
-			repo = null;
-		}
-		archive(ent.name, dir, repo, null);
+		archive(ent.name, dir, null);
 	}
 	if (!dryRun) for (const repo of new Set(loadStatuses(logDir).map((s) => s.cwd))) try {
 		git(repo, ["worktree", "prune"]);
@@ -2200,12 +2232,51 @@ function absoluteCliPath() {
 	if (argv1.endsWith("pai")) return argv1;
 	return "pai";
 }
+/** The one place that decides where a follow pane opens: tmux (any OS) > iTerm2 (macOS) > nowhere. */
+function paneBackend(env = process.env, platform = process.platform) {
+	if (env.TMUX) return "tmux";
+	if (platform === "darwin" && env.ITERM_SESSION_ID) return "iterm";
+	return "none";
+}
+function noPaneMessage(wid) {
+	return `no pane support here, use: pai worker follow${wid ? ` ${wid}` : ""}`;
+}
+/** Split the current tmux window horizontally (right-hand column) and run cmd in it, focus stays put. */
+function tmuxSplit(cmd) {
+	const target = process.env.TMUX_PANE ? ["-t", process.env.TMUX_PANE] : [];
+	try {
+		execFileSync("tmux", [
+			"split-window",
+			"-h",
+			"-d",
+			"-l",
+			"40%",
+			...target,
+			cmd
+		], { stdio: "pipe" });
+	} catch (e) {
+		const err = e;
+		throw new Error(`pai worker pane: tmux split-window failed: ${(err.stderr?.toString() || err.message || "").trim().slice(0, 200)}`);
+	}
+}
 /** Open (or only report on) the stacked follow pane of one worker. */
 async function openPaneForWorker(logDir, config, wid, term) {
 	if (workerPaneOpen(wid)) return {
 		message: `pane for ${wid} already open`,
 		session: null
 	};
+	const backend = paneBackend();
+	if (backend === "none") return {
+		message: noPaneMessage(wid),
+		session: null
+	};
+	if (backend === "tmux") {
+		tmuxSplit(followCommand(wid, config.pane.autoExitSecs));
+		return {
+			message: `pane opened for ${wid}`,
+			session: null
+		};
+	}
 	const uid = itermUuid(term);
 	const regPath = join(panesDir(logDir), `${scopeKey(term)}.json`);
 	const reg = loadRegistry(regPath);
@@ -2259,6 +2330,7 @@ async function windowBoundsLine(term) {
 */
 async function checkPaneForWorker(wid, fontSize, term) {
 	const lines = [workerPaneOpen(wid) ? `pane for ${wid} open` : `no pane for ${wid}`];
+	if (paneBackend() !== "iterm") return lines.join("\n");
 	lines.push(await windowBoundsLine(term));
 	const path = dynamicProfilePath();
 	if (existsSync(path)) {
@@ -2281,6 +2353,13 @@ async function checkPaneForWorker(wid, fontSize, term) {
 * with the running command, so names cannot serve as idempotence).
 */
 async function openFollowPane(logDir, _config, term, checkOnly) {
+	const backend = paneBackend();
+	if (backend === "none") return noPaneMessage();
+	if (backend === "tmux") {
+		if (checkOnly) return "no follow pane";
+		tmuxSplit(`${process.execPath} ${absoluteCliPath()} worker follow`);
+		return "follow pane opened";
+	}
 	const uid = itermUuid(term);
 	const out = (await osascript(TAB_TTYS_SCRIPT, [uid])).stdout.trim();
 	if (out === "notfound") throw new Error("pai worker pane: no open iTerm2 session matches ITERM_SESSION_ID");
@@ -2399,7 +2478,9 @@ function operatorSocketPath(logDir, id) {
 }
 /**
 * The runner's side: listen on the worker socket, hand every received line to
-* `onLine`. Returns the server (close it when the run ends; the socket file is
+* `onLine`. It acknowledges with "ok" only when `onLine` returns without a
+* string; a returned string (or a throw) is the failure reason, sent back as
+* `err <reason>` so `say` never reports ok for a message nobody received. Returns the server (close it when the run ends; the socket file is
 * unlinked on close, best effort).
 */
 function createOperatorServer(logDir, id, onLine) {
@@ -2409,14 +2490,20 @@ function createOperatorServer(logDir, id, onLine) {
 	} catch {}
 	const server = createServer((socket) => {
 		let buf = "";
-		socket.on("data", (chunk) => {
+		socket.on("error", () => {});
+		socket.on("data", async (chunk) => {
 			buf += chunk.toString("utf8");
 			let nl;
 			while ((nl = buf.indexOf("\n")) >= 0) {
 				const line = buf.slice(0, nl).replace(/\r$/, "");
 				buf = buf.slice(nl + 1);
-				if (line.trim()) onLine(line);
-				socket.write("ok\n");
+				let failure;
+				if (line.trim()) try {
+					failure = await onLine(line);
+				} catch (e) {
+					failure = e.message;
+				}
+				if (!socket.destroyed) socket.write(typeof failure === "string" && failure ? `err ${failure.replace(/\n/g, " ")}\n` : "ok\n");
 			}
 		});
 	});
@@ -2430,7 +2517,7 @@ function createOperatorServer(logDir, id, onLine) {
 }
 /**
 * `pai worker say <id> "<text>"`: forward one line to a running worker.
-* Resolves "ok", rejects with a clear message when the worker is not running.
+* Resolves "ok" only once the worker acknowledged delivery; rejects with the reason otherwise.
 */
 function sayToWorker(logDir, id, text, timeoutMs = 4e3) {
 	const status = loadStatus(logDir, id);
@@ -2449,10 +2536,13 @@ function sayToWorker(logDir, id, text, timeoutMs = 4e3) {
 		sock.once("connect", () => {
 			sock.write(text.replace(/\n/g, " ") + "\n");
 		});
-		sock.once("data", () => {
+		sock.once("data", (d) => {
 			sock.end();
-			resolve("ok");
+			const reply = d.toString("utf8").trim();
+			if (reply === "ok") resolve("ok");
+			else reject(/* @__PURE__ */ new Error(`worker ${id} did not take the message: ${reply.replace(/^err /, "") || "no acknowledgement"}`));
 		});
+		sock.once("close", () => fail(/* @__PURE__ */ new Error("connection closed before the worker acknowledged")));
 	});
 }
 
@@ -2857,10 +2947,10 @@ function fullContractPrompt(format) {
 		"report.",
 		"No narration, no timestamps, no greetings, no summaries of what you read; act, verify, then stop.",
 		"Never sleep-poll: no `sleep N` over 60 seconds, anywhere in a command — standalone, after `&&`/`||`/",
-		"`;`/`|`, or inside a loop or subshell. Ending your turn ends this process, so a background job gets",
-		"no later wake-up here: run the long command in the FOREGROUND with a Bash timeout up to 600000 ms;",
-		"if it can run longer than that, start it in the background and wait with a foreground loop that ends",
-		"when the job ends: `while kill -0 <pid> 2>/dev/null; do sleep 15; done`.",
+		"`;`/`|`, or inside a loop or subshell — and the sleeps of one command add up (`sleep 58; sleep 58` is",
+		"116 s). Ending your turn ends this process, so a background job gets no later wake-up here:",
+		"run_in_background is denied. Run the long command in the FOREGROUND with a Bash timeout up to 600000 ms",
+		"and split longer jobs into steps that each fit it.",
 		...fileNotInlineBlock(),
 		"",
 		`Operator messages: a user turn starting with ${OPERATOR_MARK} was typed by the operator while you`,
@@ -2903,7 +2993,7 @@ function promptTrailer(format) {
 	return format === "ag2" ? "\n\nFinal message: one AG2 R message only, no prose (format in system prompt)." : "\n\nFinal message: a JSON object only, no prose before or after, no code fence (format in system prompt).";
 }
 /** The exact text sent to resend a final message that failed AG2 validation. */
-const AG2_REASK_TEXT = "Your final message was not a valid AG2 R message. Resend it now as a single AG2 R message only: first line R, then i=id r=result G=+ (gate, if r=+) t=tests(Name+) c=path summary p=proof z=the answer/note. No prose.";
+const AG2_REASK_TEXT = "Your final message was not a valid AG2 R message. Resend it now as a single AG2 R message only, no prose, no code fence. Minimal example (one key=value per line, first line R):\nR\ni=task-id\nr=+\nG=+\nc=path summary\nt=Name+\np=proof command\nz=the answer, one line\n(r is + - ~ ? !; r=+ needs G=+ and p; when r is not +, add y=why.)";
 /** The full-contract AG2 prompt — the keepalive path's identical-construction baseline. */
 const WORKER_CONTRACT_PROMPT = fullContractPrompt("ag2");
 /**
@@ -3433,7 +3523,7 @@ async function runWorker(opts) {
 		if (gc?.length) process.stderr.write(`pai worker: archived ${gc.length} leftover worktree(s) (pai worker gc)\n`);
 	} catch {}
 	if (opts.className === "plan" && !opts._planner) {
-		const { runPlanner } = await import("./planner-DgC3oSvb.mjs");
+		const { runPlanner } = await import("./planner-DAq4Yx-H.mjs");
 		return runPlanner(opts);
 	}
 	const parent = launchParent(opts.parent);
@@ -3809,7 +3899,7 @@ async function executeImageRun(a) {
 * ledger line). Fire-and-forget, never blocks the worker.
 */
 async function announcePane(logDir, config, wid, term, noPane, ledger) {
-	const skip = !noPane ? !config.pane.enabled ? "workers.pane.enabled is false" : process.env.PAI_WORKER_AUTOPANE === "0" ? "PAI_WORKER_AUTOPANE=0" : !term ? "not in iTerm2 (no ITERM_SESSION_ID)" : null : "--no-pane";
+	const skip = !noPane ? !config.pane.enabled ? "workers.pane.enabled is false" : process.env.PAI_WORKER_AUTOPANE === "0" ? "PAI_WORKER_AUTOPANE=0" : paneBackend() === "none" ? "no tmux ($TMUX) or iTerm2 (ITERM_SESSION_ID) here" : null : "--no-pane";
 	if (skip) {
 		process.stderr.write(`[pai worker] no pane for ${wid}: ${skip}\n`);
 		return;
@@ -3902,12 +3992,12 @@ async function executeRun(a) {
 	let cmd = [...claudeCmd];
 	cmd.push(...modelFlagArgs(headless, model, Boolean(parsed.callerModel)));
 	cmd.push(...chromeArgs, ...mcpArgs, ...toolArgs, ...toolsFlag, ...restArgs);
-	if (headless) {
-		cmd.push("--output-format", "stream-json", "--verbose", "--input-format", "stream-json");
-		if (!parsed.callerSystemPrompt) cmd.push("--append-system-prompt", workerContractPrompt(a.className, a.reportFormat));
-		if (worktree) cmd.push("--append-system-prompt", worktreeSystemPrompt(wid, worktree.branch, worktree.dir, worktree.snapshot));
-		else cmd.push("--append-system-prompt", inPlaceSystemPrompt());
-	}
+	if (headless) cmd.push("--output-format", "stream-json", "--verbose", "--input-format", "stream-json");
+	cmd.push(...appendSystemPromptArgs([
+		...headless && !parsed.callerSystemPrompt ? [workerContractPrompt(a.className, a.reportFormat)] : [],
+		...headless ? [worktree ? worktreeSystemPrompt(wid, worktree.branch, worktree.dir, worktree.snapshot) : inPlaceSystemPrompt()] : [],
+		...parsed.callerSystemPrompts
+	]));
 	cmd = ensureToolSearch(cmd);
 	if (a.printCmd) {
 		console.log(JSON.stringify({
@@ -3994,7 +4084,9 @@ async function executeRun(a) {
 			}) + "\n");
 		} catch {}
 	};
-	const operatorServer = headless ? createOperatorServer(logDir, wid, (text) => {
+	const operatorServer = headless ? createOperatorServer(logDir, wid, async (text) => {
+		const stdin = proc.stdin;
+		if (!stdin || !stdin.writable || stdin.writableEnded) return "the worker's stdin is already closed (its turn ended) — use: pai worker resume";
 		operatorInFlight += 1;
 		if (closeTimer) {
 			clearTimeout(closeTimer);
@@ -4005,9 +4097,13 @@ async function executeRun(a) {
 			text,
 			handoff: isHandoffMessage(text)
 		});
-		try {
-			proc.stdin?.write(stdinUserMessage(operatorUserText(text)) + "\n");
-		} catch {}
+		return new Promise((resolve) => {
+			try {
+				stdin.write(stdinUserMessage(operatorUserText(text)) + "\n", (e) => resolve(e ? `write to the worker failed: ${e.message}` : void 0));
+			} catch (e) {
+				resolve(`write to the worker failed: ${e.message}`);
+			}
+		});
 	}) : null;
 	let killed = false;
 	const cleanup = () => {
@@ -4595,4 +4691,4 @@ function resultFromOutput(out) {
 
 //#endregion
 export { expandMcpNames as $, ledgerSummary as A, loadStatuses as B, discardWorker as C, uncommittedPaths as D, mergeWorker as E, contextPercent as F, setWorkerLabel as G, nowStamp as H, elapsedOf as I, parseRunnerArgs as J, waitForTerminalStatus as K, isChatPane as L, ageOf as M, alive as N, worktreesDir as O, contextLabel as P, describeMcp as Q, isLive as R, workerInScope as S, git as T, ownsPid as U, newWorkerId as V, saveStatus as W, pinNotices as X, shortText as Y, projectLaunchConfig as Z, itermForClaudeSession as _, parseWorkerReport as a, sessionMapPath as b, readInbox as c, checkPaneForWorker as d, openFollowPane as f, currentTabKey as g, markControlsHeld as h, usageContextTokens as i, UNLABELED as j, appendLedger as k, sayToWorker as l, clickrControlsArgv as m, runWorker as n, renderReport as o, openPaneForWorker as p, longInlinePromptHint as q, testProvider as r, handoffFromInside as s, printResult as t, workerDepth as u, itermUuid as v, gcWorktrees as w, sessionTag as x, resolveSession as y, loadStatus as z };
-//# sourceMappingURL=run-W2rV_9j0.mjs.map
+//# sourceMappingURL=run-uAkNItb6.mjs.map