@tekmidian/pai 0.41.0 → 0.42.0

package/dist/{chain-zMjCDW-R.mjs → chain-DGXNoTwc.mjs}

@@ -1,106 +1,13 @@
-import { a as WorkersConfigError, h as resolveModelCapability, l as isModelCapability, m as readWorkersSection, o as assertProviderRunnable, p as providerKeyPath, s as classModelCapability } from "./config-Dl8lT4Lu.mjs";
-import { _ as workersLogDir, d as setCooldown, f as eventsPath, g as statusPath, h as panesDir, i as buildRunEnv, m as noMcpConfigPath, n as ensureProxyRunning, o as isQuotaFailure, p as ledgerPath, s as nextAutoProvider, t as DEFAULT_PROXY_PORT, u as resolveTarget } from "./server-BOuAOj9b.mjs";
-import { appendFileSync, closeSync, existsSync, mkdirSync, mkdtempSync, openSync, readFileSync, readdirSync, renameSync, rmSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
+import { a as WorkersConfigError, h as resolveModelCapability, l as isModelCapability, m as readWorkersSection, o as assertProviderRunnable, p as providerKeyPath, s as classModelCapability } from "./config-DgzR5sfb.mjs";
+import { _ as workersLogDir, d as setCooldown, f as eventsPath, g as statusPath, h as panesDir, i as buildRunEnv, m as noMcpConfigPath, n as ensureProxyRunning, o as isQuotaFailure, p as ledgerPath, s as nextAutoProvider, t as DEFAULT_PROXY_PORT, u as resolveTarget } from "./server-Cp7tNzNC.mjs";
+import { S as stripPromptValues, _ as newWorkerId, a as resolveSpawnerSession, b as parseRunnerArgs, d as alive, g as loadStatuses, h as loadStatus, i as resolveSession, l as UNLABELED, m as describeTool, o as scopeKey, r as itermUuid, v as nowStamp, x as shortText, y as saveStatus } from "./scope-NIwCGxRI.mjs";
+import { appendFileSync, closeSync, existsSync, mkdirSync, mkdtempSync, openSync, readFileSync, readdirSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
-import { dirname, join, relative } from "node:path";
+import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { connect, createServer } from "node:net";
 import { execFileSync, spawn } from "node:child_process";
 import { createInterface } from "node:readline";
 
-//#region src/workers/args.ts
-function parseRunnerArgs(argv) {
-	let prompt = null;
-	let outputFormat = "text";
-	const rest = [];
-	let headless = false;
-	let callerModel = false;
-	let callerMcpConfig = false;
-	let callerSystemPrompt = false;
-	const mcp = [];
-	const allowedTools = [];
-	let i = 0;
-	while (i < argv.length) {
-		const a = argv[i];
-		if (a === "-p" || a === "--print") {
-			headless = true;
-			rest.push(a);
-			if (i + 1 < argv.length && !argv[i + 1].startsWith("-")) {
-				prompt = argv[i + 1];
-				rest.push(prompt);
-				i += 1;
-			}
-		} else if (a === "--output-format") {
-			const v = argv[i + 1];
-			if (v === "json" || v === "stream-json") outputFormat = v;
-			i += 1;
-		} 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") {
-			const v = argv[i + 1];
-			if (v !== void 0 && !v.startsWith("-")) {
-				mcp.push(v);
-				i += 1;
-			}
-		} else if (a.startsWith("--mcp=")) mcp.push(a.slice(6));
-		else if (a === "--allowedTools") {
-			rest.push(a);
-			const v = argv[i + 1];
-			if (v !== void 0 && !v.startsWith("-")) {
-				allowedTools.push(v);
-				rest.push(v);
-				i += 1;
-			}
-		} else if (a.startsWith("--allowedTools=")) {
-			allowedTools.push(a.slice(15));
-			rest.push(a);
-		} else {
-			if (a === "--model") callerModel = true;
-			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 (prompt === null && !a.startsWith("-") && rest.length > 0 && (rest[rest.length - 1] === "-p" || rest[rest.length - 1] === "--print")) prompt = a;
-			rest.push(a);
-		}
-		i += 1;
-	}
-	return {
-		prompt,
-		outputFormat,
-		rest,
-		headless,
-		callerModel,
-		callerMcpConfig,
-		callerSystemPrompt,
-		mcp,
-		allowedTools
-	};
-}
-/**
-* 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
-* following the flag are touched; everything else passes through.
-*/
-function stripPromptValues(argv) {
-	const out = [];
-	for (let i = 0; i < argv.length; i++) {
-		const a = argv[i];
-		const isPrint = a === "-p" || a === "--print";
-		out.push(a);
-		if (isPrint && i + 1 < argv.length && !argv[i + 1].startsWith("-")) i += 1;
-	}
-	return out;
-}
-/** Collapse whitespace and cut to n chars with an ellipsis (label rendering). */
-function shortText(s, n) {
-	const t = String(s ?? "").split(/\s+/).filter(Boolean).join(" ");
-	return t.length <= n ? t : t.slice(0, n - 1) + "…";
-}
-
-//#endregion
 //#region src/workers/ledger.ts
 /**
 * ledger.ts — the routing ledger, one append-only log for every worker event.
@@ -170,231 +77,6 @@ function ledgerSummary(path, scope, lastN = 15, now = /* @__PURE__ */ new Date()
 	};
 }
 
-//#endregion
-//#region src/workers/status.ts
-/**
-* status.ts — the live per-worker status file.
-*
-* One JSON file per run, rewritten atomically on every turn, read by `ps`,
-* `follow`, the status line and the pane logic. Same field set the Python
-* runner wrote, plus `provider` (routing is multi-provider now) and `session`
-* (the AIBroker identity of the launching session, see scope.ts).
-*/
-/** Label a worker gets when launched with neither --label nor a prompt. */
-const UNLABELED = "unlabeled";
-/** Context-meter percentage 0–100, null when the numbers are missing. */
-function contextPercent(s) {
-	if (!s.contextTokens || !s.contextWindow) return null;
-	return Math.round(s.contextTokens / s.contextWindow * 100);
-}
-/** Compact token count: 84k, 200k, 900. */
-function fmtContextK(n) {
-	return n >= 1e3 ? `${Math.round(n / 1e3)}k` : String(n);
-}
-/**
-* The one context-meter label, shared by every renderer so identical
-* numbers always render identically: `ctx 84k/200k (42%)` — used-style
-* percent. Empty when the numbers are missing (callers drop the part).
-*/
-function contextLabel(s) {
-	const pct = contextPercent(s);
-	if (pct === null) return "";
-	return `ctx ${fmtContextK(s.contextTokens ?? 0)}/${fmtContextK(s.contextWindow ?? 0)} (${pct}%)`;
-}
-/** Timestamp format shared by status files and the ledger. */
-function nowStamp(d = /* @__PURE__ */ new Date()) {
-	const p = (n) => String(n).padStart(2, "0");
-	return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
-}
-let lastId = "";
-let idSeq = 0;
-function newWorkerId(d = /* @__PURE__ */ new Date(), pid = process.pid) {
-	const p = (n) => String(n).padStart(2, "0");
-	const base = `${d.getFullYear()}${p(d.getMonth() + 1)}${p(d.getDate())}-${p(d.getHours())}${p(d.getMinutes())}${p(d.getSeconds())}-${pid}`;
-	if (base === lastId) {
-		idSeq += 1;
-		return `${base}-${String(idSeq).padStart(2, "0")}`;
-	}
-	lastId = base;
-	idSeq = 0;
-	return base;
-}
-/** Write status atomically (temp + rename) and stamp `updated`. */
-function saveStatus(logDir, status, d = /* @__PURE__ */ new Date()) {
-	status.updated = nowStamp(d);
-	const path = statusPath(logDir, status.id);
-	const tmp = `${path}.tmp`;
-	writeFileSync(tmp, JSON.stringify(status), "utf8");
-	renameSync(tmp, path);
-}
-/** Load every status file in the logDir, oldest id first, skipping damage. */
-function loadStatuses(logDir) {
-	if (!existsSync(logDir)) return [];
-	const out = [];
-	for (const name of readdirSync(logDir).sort()) {
-		if (!name.endsWith(".status")) continue;
-		try {
-			out.push(JSON.parse(readFileSync(join(logDir, name), "utf8")));
-		} catch {}
-	}
-	return out;
-}
-function loadStatus(logDir, id) {
-	const path = statusPath(logDir, id);
-	if (!existsSync(path)) return null;
-	try {
-		return JSON.parse(readFileSync(path, "utf8"));
-	} catch {
-		return null;
-	}
-}
-function alive(pid) {
-	if (!pid || pid <= 0) return false;
-	try {
-		process.kill(pid, 0);
-		return true;
-	} catch {
-		return false;
-	}
-}
-/** "42s" under 90s, "7m" above — the coarse age the table and bar show. */
-function ageOf(ts, now = /* @__PURE__ */ new Date()) {
-	const t = Date.parse(ts.replace(" ", "T"));
-	if (Number.isNaN(t)) return "?";
-	const s = Math.max(0, Math.floor((now.getTime() - t) / 1e3));
-	return s < 90 ? `${s}s` : `${Math.floor(s / 60)}m`;
-}
-/** One-line description of a tool call, e.g. "Bash: npm test". */
-function describeTool(name, inp) {
-	if (typeof inp !== "object" || inp === null) return name;
-	const i = inp;
-	const get = (k) => typeof i[k] === "string" ? i[k] : "";
-	if (name === "Bash") return `Bash: ${shortText(get("command"), 70)}`;
-	if (name === "Read" || name === "Edit" || name === "Write" || name === "MultiEdit") return `${name}: ${get("file_path").split("/").pop() ?? ""}`;
-	if (name === "Grep" || name === "Glob") return `${name}: ${shortText(get("pattern"), 50)}`;
-	if (name === "WebSearch") return `${name}: ${shortText(get("query"), 50)}`;
-	if (name === "WebFetch") return `${name}: ${shortText(get("url"), 60)}`;
-	return name;
-}
-
-//#endregion
-//#region src/workers/scope.ts
-/**
-* scope.ts — which workers "belong" to the terminal asking about them.
-*
-* Two identities, in priority order:
-*
-*   1. AIBroker's session registry (~/.aibroker/session-names.json): iTerm
-*      session UUID → session name. The launching session's UUID is stored in
-*      each worker's status file as `session.id`, so every pane of a named
-*      session sees its workers — regardless of tab layout.
-*   2. The iTerm tab key (`w<window>t<tab>` prefix of ITERM_SESSION_ID): the
-*      original heuristic, kept as the fallback when no registry entry
-*      matches (AIBroker absent, unnamed session, non-iTerm terminal).
-*
-* If neither is available, viewers fall back to "all workers".
-*
-* A third case: workers spawned from a Claude Code Bash tool (the
-* orchestrator pattern) have neither — Claude Code exports no terminal or
-* session identity to its Bash children. Those record `spawnerSession`, the
-* orchestrator's claude session id bridged through the status line's
-* session map (see below), so their tab still claims them.
-*/
-const AIBROKER_REGISTRY = join(homedir(), ".aibroker", "session-names.json");
-/**
-* `w<window>t<tab>` prefix of an iTerm session id, "" if empty or malformed.
-* Panes split from the same tab share this prefix and differ only in `p<n>`.
-*/
-function tabKey(term) {
-	if (!term) return "";
-	const head = term.split("p", 1)[0];
-	const parts = head.slice(1).split("t");
-	if (head.startsWith("w") && parts.length === 2 && parts.every((p) => /^\d+$/.test(p))) return head;
-	return "";
-}
-/** Tab key of the iTerm tab this process runs in, "" if not inside iTerm2. */
-function currentTabKey(env = process.env) {
-	return tabKey(env.ITERM_SESSION_ID ?? "");
-}
-/** The iTerm UUID part of an ITERM_SESSION_ID (after the last colon). */
-function itermUuid(term) {
-	if (!term) return "";
-	return term.split(":").pop() ?? "";
-}
-/**
-* Resolve the AIBroker session for an ITERM_SESSION_ID. Reads the persistent
-* name registry (the same store `aibroker_rename` writes); returns null when
-* AIBroker is absent or the session is not in it — callers then use the tab
-* key, which is the pre-AIBroker behaviour.
-*/
-function resolveSession(term, registryPath = AIBROKER_REGISTRY) {
-	const uuid = itermUuid(term);
-	if (!uuid) return null;
-	let names;
-	try {
-		if (!existsSync(registryPath)) return null;
-		names = JSON.parse(readFileSync(registryPath, "utf8"));
-	} catch {
-		return null;
-	}
-	const name = names[uuid];
-	if (typeof name !== "string" || !name) return null;
-	return {
-		id: uuid,
-		name
-	};
-}
-/**
-* True when `worker` was launched from `term` (the terminal asking about it).
-* Session-id match first; the tab key only when no registry entry matched —
-* a session without a name keeps the tab-scoped behaviour it always had.
-*/
-function workerInScope(worker, term) {
-	if (!term) return false;
-	const uuid = itermUuid(term);
-	if (worker.session?.id && uuid) return worker.session.id === uuid;
-	return tabKey(worker.term) === tabKey(term) && tabKey(term) !== "";
-}
-/**
-* Registry key for pane files: the session id when AIBroker knows this
-* terminal, else the tab key, else the raw iTerm UUID.
-*/
-function scopeKey(term) {
-	const session = resolveSession(term);
-	if (session) return session.id;
-	return currentTabKey() || itermUuid(term);
-}
-/** `[Name]` when the worker has an AIBroker session name, else "". */
-function sessionTag(worker) {
-	return worker.session?.name ? `[${worker.session.name}]` : "";
-}
-/** How old a map entry may be for a spawn to adopt it (status lines refresh constantly while a session lives). */
-const SPAWNER_SESSION_TTL_MS = 10 * 6e4;
-/** Map entries not refreshed within this window are pruned on write. */
-const SESSION_MAP_PRUNE_MS = 60 * 6e4;
-function sessionMapPath(logDir) {
-	return join(logDir, "claude-session-map.json");
-}
-/**
-* The claude session a new run was spawned by, when it can be known: a run
-* inside another worker inherits its spawner (chain stages keep the
-* orchestrator's tab that way); otherwise a fresh map entry for `cwd`.
-*/
-function resolveSpawnerSession(logDir, cwd, env = process.env, now = Date.now()) {
-	const parentId = env.PAI_WORKER_ID;
-	if (parentId) {
-		const inherited = loadStatus(logDir, parentId)?.spawnerSession;
-		if (inherited) return inherited;
-	}
-	const path = sessionMapPath(logDir);
-	if (!existsSync(path) || !cwd) return null;
-	try {
-		const entry = JSON.parse(readFileSync(path, "utf8"))[cwd];
-		if (entry && entry.session && now - entry.ts < SPAWNER_SESSION_TTL_MS) return entry.session;
-	} catch {}
-	return null;
-}
-
 //#endregion
 //#region src/workers/pane.ts
 /**
@@ -1232,6 +914,11 @@ function worktreeWanted(flag, opts) {
 * degrade to an in-place run.
 */
 function addWorktree(logDir, id, cwd) {
+	const swept = sweepOrphanWorktrees(logDir);
+	if (swept.length) appendLedger(ledgerPath(logDir), "WORKER-NOTE", {
+		id,
+		note: `swept orphan worktree(s): ${swept.join(", ")}`
+	});
 	const dir = worktreePath(logDir, id);
 	const branch = worktreeBranch(id);
 	const base = git(cwd, ["rev-parse", "HEAD"]);
@@ -1248,6 +935,46 @@ function addWorktree(logDir, id, cwd) {
 		base
 	};
 }
+/**
+* Remove worktrees (and their `worker/<id>` branches) whose worker no longer
+* exists — no status file left in the log dir. Killed and failed runs clean
+* up after themselves, but a `kill -9` or a crash strands a directory and a
+* branch; every worktree creation sweeps first so they cannot accumulate.
+* Directories younger than `minAgeMin` minutes are left alone: a run that is
+* just starting owns its worktree a moment before its status file exists.
+*/
+function sweepOrphanWorktrees(logDir, minAgeMin = 10) {
+	const root = worktreesDir(logDir);
+	if (!existsSync(root)) return [];
+	const swept = [];
+	for (const ent of readdirSync(root, { withFileTypes: true })) {
+		if (!ent.isDirectory()) continue;
+		const id = ent.name;
+		const dir = join(root, id);
+		if (existsSync(statusPath(logDir, id))) continue;
+		try {
+			if ((Date.now() - statSync(dir).mtimeMs) / 6e4 < minAgeMin) continue;
+		} catch {}
+		let gitDir = null;
+		try {
+			const raw = git(dir, ["rev-parse", "--git-common-dir"]);
+			gitDir = isAbsolute(raw) ? raw : resolve(dir, raw);
+		} catch {
+			gitDir = null;
+		}
+		removeWorktree(gitDir ?? dir, dir, true);
+		if (gitDir) try {
+			git(gitDir, ["worktree", "prune"]);
+			git(gitDir, [
+				"branch",
+				"-D",
+				worktreeBranch(id)
+			]);
+		} catch {}
+		swept.push(id);
+	}
+	return swept;
+}
 /** Commits the branch collected on top of its base. */
 function commitsSince(dir, base) {
 	try {
@@ -1533,6 +1260,9 @@ const WORKER_CONTRACT_PROMPT = [
 	"notes: one line, the headline a reviewer reads first.",
 	"Never write shell heredocs — write the script to a file with the Write tool, then run it",
 	"(heredocs fail silently or get swallowed).",
+	"Never inline code one-liners (python3 -c, node -e, ruby -e and friends) — the permission layer",
+	"denies them (\"ztk: command denied by permission rules\"); write the script to a file with the",
+	"Write tool and run it (python3 script.py), or use jq for JSON inspection.",
 	"",
 	`Operator messages: a user turn starting with ${OPERATOR_MARK} was typed by the operator while you`,
 	"run (the prompt of a resumed run is the operator's too). Answer it FIRST, in one or two plain lines —",
@@ -1890,9 +1620,12 @@ function codexInstalled() {
 *   - env: ANTHROPIC_BASE_URL/AUTH_TOKEN from the provider (token from its
 *     key file, never from the environment), the three DEFAULT_*_MODEL vars,
 *     the provider's extra env, nonessential traffic off, and ANTHROPIC_API_KEY
-*     stripped so nothing can fall back to Anthropic billing. OpenAI-protocol
-*     providers point at the PAI proxy instead (started on demand, the
-*     provider name in the URL path); codex-engine providers run the Codex CLI.
+*     stripped so nothing can fall back to Anthropic billing. Headless runs
+*     also drop the spawner's session identity (messaging socket, session id,
+*     nesting markers) — inherited, a worktree child starts tool-blind.
+*     OpenAI-protocol providers point at the PAI proxy instead (started on
+*     demand, the provider name in the URL path); codex-engine providers run
+*     the Codex CLI.
 *   - headless (-p): strict empty MCP config unless the caller brings one or
 *     names servers via --mcp / a role (then a filtered <id>.mcp.json),
 *     PAI_WORKER=1 so PAI's per-session hooks leave it alone, the worker
@@ -1992,7 +1725,7 @@ async function runWorker(opts) {
 	const logDir = workersLogDir(config);
 	mkdirSync(logDir, { recursive: true });
 	if (opts.className === "plan" && !opts._planner) {
-		const { runPlanner } = await import("./planner-DsmMRIZR.mjs");
+		const { runPlanner } = await import("./planner-BLDJt3ZS.mjs");
 		return runPlanner(opts);
 	}
 	const parent = launchParent(opts.parent);
@@ -2214,6 +1947,9 @@ async function executeRun(a) {
 			killed: 1,
 			label
 		});
+		if (worktree) try {
+			recordWorktree(logDir, status, worktree, false);
+		} catch {}
 		cleanup();
 		try {
 			proc.kill();
@@ -2222,6 +1958,7 @@ async function executeRun(a) {
 	};
 	process.once("SIGTERM", () => onSignal("SIGTERM"));
 	process.once("SIGINT", () => onSignal("SIGINT"));
+	process.once("SIGHUP", () => onSignal("SIGHUP"));
 	const ctx = {
 		resultEvent: null,
 		resultReport: null
@@ -2457,6 +2194,7 @@ async function executeCodexRun(a) {
 	let killed = false;
 	process.once("SIGTERM", onCodexSignal("SIGTERM"));
 	process.once("SIGINT", onCodexSignal("SIGINT"));
+	process.once("SIGHUP", onCodexSignal("SIGHUP"));
 	function onCodexSignal(sig) {
 		return () => {
 			killed = true;
@@ -2465,6 +2203,9 @@ async function executeCodexRun(a) {
 			status.secs = Math.floor((Date.now() - t0) / 1e3);
 			status.last = `killed by signal ${sig}`;
 			saveStatus(logDir, status);
+			if (worktree) try {
+				recordWorktree(logDir, status, worktree, false);
+			} catch {}
 			try {
 				proc.kill();
 			} catch {}
@@ -2825,5 +2566,5 @@ async function runChain(opts, deps = {}) {
 }
 
 //#endregion
-export { appendLedger as A, ageOf as C, loadStatus as D, contextPercent as E, parseRunnerArgs as M, shortText as N, loadStatuses as O, UNLABELED as S, contextLabel as T, openPaneForWorker as _, testProvider as a, sessionTag as b, renderReport as c, handoffFromInside as d, readInbox as f, openFollowPane as g, checkPaneForWorker as h, runWorker as i, ledgerSummary as j, newWorkerId as k, discardWorker as l, workerDepth as m, swapPromptArg as n, describeMcp as o, sayToWorker as p, printResult as r, parseWorkerReport as s, runChain as t, mergeWorker as u, currentTabKey as v, alive as w, workerInScope as x, resolveSession as y };
-//# sourceMappingURL=chain-zMjCDW-R.mjs.map
+export { openPaneForWorker as _, testProvider as a, renderReport as c, handoffFromInside as d, readInbox as f, openFollowPane as g, checkPaneForWorker as h, runWorker as i, discardWorker as l, workerDepth as m, swapPromptArg as n, describeMcp as o, sayToWorker as p, printResult as r, parseWorkerReport as s, runChain as t, mergeWorker as u, appendLedger as v, ledgerSummary as y };
+//# sourceMappingURL=chain-DGXNoTwc.mjs.map