claude-yes 1.161.0 → 1.164.0

package/dist/{SUPPORTED_CLIS-DYTnLX8C.js → SUPPORTED_CLIS-C_J_okdw.js}

@@ -1,8 +1,8 @@
-import { t as CLIS_CONFIG } from "./ts-CRo3qQWb.js";
+import { t as CLIS_CONFIG } from "./ts-BzyVSzo1.js";
 
 //#region ts/SUPPORTED_CLIS.ts
 const SUPPORTED_CLIS = Object.keys(CLIS_CONFIG);
 
 //#endregion
 export { SUPPORTED_CLIS as t };
-//# sourceMappingURL=SUPPORTED_CLIS-DYTnLX8C.js.map
+//# sourceMappingURL=SUPPORTED_CLIS-C_J_okdw.js.map

package/dist/SUPPORTED_CLIS-CmJam_wA.js

@@ -0,0 +1,8 @@
+import "./ts-BzyVSzo1.js";
+import "./logger-CDIsZ-Pp.js";
+import "./versionChecker-CCHuozmQ.js";
+import "./pidStore-BfoBWUjc.js";
+import "./globalPidIndex-DlmmJlO8.js";
+import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-C_J_okdw.js";
+
+export { SUPPORTED_CLIS };

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 import { t as invokedCliName } from "./invokedCli-uqM2YYA7.js";
 import { n as logger } from "./logger-CDIsZ-Pp.js";
-import { i as versionString, n as displayVersion, r as getInstalledPackage, t as checkAndAutoUpdate } from "./versionChecker-DrjR4P0K.js";
+import { i as versionString, n as displayVersion, r as getInstalledPackage, t as checkAndAutoUpdate } from "./versionChecker-CCHuozmQ.js";
 import { argv } from "process";
 import { execFileSync, spawn } from "child_process";
 import ms from "ms";
@@ -481,7 +481,7 @@ function buildRustArgs(argv, cliFromScript, supportedClis) {
 	const rawArg = process.argv[2];
 	const managerCommands = !invokedCliName(process.argv);
 	const isHelpFlag = rawArg === "-h" || rawArg === "--help";
-	const { isSubcommand, runSubcommand, cmdHelp } = await import("./subcommands-5AXvxB0S.js");
+	const { isSubcommand, runSubcommand, cmdHelp } = await import("./subcommands-C-aCmtre.js");
 	if (isHelpFlag && process.argv.length === 3) {
 		cmdHelp(managerCommands);
 		process.exit(0);
@@ -514,7 +514,7 @@ if (config.useRust) {
 		}
 	}
 	if (rustBinary) {
-		const { SUPPORTED_CLIS } = await import("./SUPPORTED_CLIS-CHmQfHCh.js");
+		const { SUPPORTED_CLIS } = await import("./SUPPORTED_CLIS-CmJam_wA.js");
 		const rustArgs = buildRustArgs(process.argv, config.cli, SUPPORTED_CLIS);
 		if (config.verbose) {
 			console.log(`[rust] Using binary: ${rustBinary}`);
@@ -544,7 +544,7 @@ if (config.showVersion) {
 	process.exit(0);
 }
 if (config.appendPrompt) {
-	const { PidStore } = await import("./pidStore-DfHh3Yt0.js");
+	const { PidStore } = await import("./pidStore-5qyLX3Fh.js");
 	const ipcPath = await PidStore.findActiveFifo(process.cwd());
 	if (!ipcPath) {
 		console.error("No active agent with IPC found in current directory.");

package/dist/index.js

@@ -1,7 +1,7 @@
-import { a as removeControlCharacters, i as AgentContext, n as agentYes, r as config, t as CLIS_CONFIG } from "./ts-CRo3qQWb.js";
+import { a as removeControlCharacters, i as AgentContext, n as agentYes, r as config, t as CLIS_CONFIG } from "./ts-BzyVSzo1.js";
 import "./logger-CDIsZ-Pp.js";
-import "./versionChecker-DrjR4P0K.js";
-import "./pidStore-fqXqTKkh.js";
+import "./versionChecker-CCHuozmQ.js";
+import "./pidStore-BfoBWUjc.js";
 import "./globalPidIndex-DlmmJlO8.js";
 
 export { AgentContext, CLIS_CONFIG, config, agentYes as default, removeControlCharacters };

package/dist/pidStore-5qyLX3Fh.js

@@ -0,0 +1,5 @@
+import "./logger-CDIsZ-Pp.js";
+import { t as PidStore } from "./pidStore-BfoBWUjc.js";
+import "./globalPidIndex-DlmmJlO8.js";
+
+export { PidStore };

package/dist/{pidStore-fqXqTKkh.js → pidStore-BfoBWUjc.js}

@@ -209,8 +209,9 @@ var PidStore = class PidStore {
 		const argsJson = JSON.stringify(args);
 		const logFile = this.getRawLogPath(pid);
 		const fifoFile = this.getFifoPath(pid);
+		const injected = process.env.AGENT_YES_AGENT_ID;
 		const existing = this.store.findOne((doc) => doc.pid === pid);
-		const agentId = existing?.agentId ?? randomBytes(6).toString("hex");
+		const agentId = existing?.agentId ?? (injected && /^[0-9a-f]{6,32}$/i.test(injected) ? injected : randomBytes(6).toString("hex"));
 		const record = {
 			pid,
 			cli,
@@ -367,4 +368,4 @@ pid-db/
 
 //#endregion
 export { PidStore as t };
-//# sourceMappingURL=pidStore-fqXqTKkh.js.map
+//# sourceMappingURL=pidStore-BfoBWUjc.js.map

package/dist/{schedule-CCvB7SCT.js → schedule-B-Ncgklt.js}

@@ -1,9 +1,9 @@
-import "./ts-CRo3qQWb.js";
+import "./ts-BzyVSzo1.js";
 import "./logger-CDIsZ-Pp.js";
-import "./versionChecker-DrjR4P0K.js";
-import "./pidStore-fqXqTKkh.js";
+import "./versionChecker-CCHuozmQ.js";
+import "./pidStore-BfoBWUjc.js";
 import "./globalPidIndex-DlmmJlO8.js";
-import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-DYTnLX8C.js";
+import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-C_J_okdw.js";
 import { o as resolveSpawnCwd } from "./workspaceConfig-B0Q9-q2B.js";
 import { createHash } from "node:crypto";
 
@@ -141,4 +141,4 @@ async function cmdSchedule(rest) {
 
 //#endregion
 export { cmdSchedule };
-//# sourceMappingURL=schedule-CCvB7SCT.js.map
+//# sourceMappingURL=schedule-B-Ncgklt.js.map

package/dist/{serve-BRARQjsC.js → serve-yVh9Y6ot.js}

@@ -1,16 +1,16 @@
-import "./ts-CRo3qQWb.js";
+import "./ts-BzyVSzo1.js";
 import "./logger-CDIsZ-Pp.js";
-import { r as getInstalledPackage } from "./versionChecker-DrjR4P0K.js";
-import "./pidStore-fqXqTKkh.js";
+import { r as getInstalledPackage } from "./versionChecker-CCHuozmQ.js";
+import "./pidStore-BfoBWUjc.js";
 import { a as updateGlobalPidStatus } from "./globalPidIndex-DlmmJlO8.js";
 import { t as pgidForWrapper } from "./reaper-C-eWAxIj.js";
 import "./configShared-CEyhl0WH.js";
-import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-DYTnLX8C.js";
+import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-C_J_okdw.js";
 import "./e2e-Bfw7qL9O.js";
 import "./webrtcLink-CBZkZ-LT.js";
 import "./remotes-DBCvpp3B.js";
 import { a as isProvisionAllowed, i as hasSpawnHook, n as getSpawnHook, o as resolveSpawnCwd, t as getProvisionRoot } from "./workspaceConfig-B0Q9-q2B.js";
-import { D as writeToIpc, T as snapshotStatus, _ as readPtysize, b as resolveOne, c as extractTaskCounts, g as readNotes, i as controlCodeFromName, m as listRecords, o as deriveLiveStatus, v as renderRawLog } from "./subcommands-DGkBxWS5.js";
+import { D as writeToIpc, T as snapshotStatus, _ as readPtysize, b as resolveOne, c as extractTaskCounts, g as readNotes, i as controlCodeFromName, m as listRecords, o as deriveLiveStatus, s as extractNeedsInput, v as renderRawLog } from "./subcommands-BbKngO7F.js";
 import yargs from "yargs";
 import { mkdir, open, readFile, stat, unlink, writeFile } from "fs/promises";
 import { homedir, hostname, userInfo } from "os";
@@ -625,6 +625,24 @@ Options:
 			return null;
 		}
 	};
+	const niCache = /* @__PURE__ */ new Map();
+	const logNeedsInput = async (logFile, cli) => {
+		if (!logFile) return null;
+		try {
+			const { size, mtimeMs } = await stat(logFile);
+			const hit = niCache.get(logFile);
+			if (hit && hit.size === size && hit.mtimeMs === mtimeMs) return hit.question;
+			const question = (await extractNeedsInput(logFile, cli))?.question ?? null;
+			niCache.set(logFile, {
+				size,
+				mtimeMs,
+				question
+			});
+			return question;
+		} catch {
+			return null;
+		}
+	};
 	const GIT_DEBOUNCE_MS = 800;
 	const GIT_SAFETY_MS = 6e4;
 	const runGit = async (args, cwd) => {
@@ -643,17 +661,43 @@ Options:
 		}
 	};
 	const parseGitStatus = (out) => {
-		const lines = out.split("\n");
-		const h = /^## (.+)$/.exec(lines[0] ?? "")?.[1] ?? "";
-		const unborn = /^No commits yet on (.+)$/.exec(h);
-		const branch = unborn ? unborn[1] : /^(.+?)(?:\.\.\.|\s|$)/.exec(h)?.[1] || null;
-		const ahead = Number(/\bahead (\d+)/.exec(h)?.[1] ?? 0);
-		const behind = Number(/\bbehind (\d+)/.exec(h)?.[1] ?? 0);
-		const changed = lines.slice(1).filter((l) => l.trim().length > 0).length;
+		let branch = null;
+		let ahead = 0;
+		let behind = 0;
+		let changed = 0;
+		let pins = 0;
+		let subDirty = 0;
+		for (const line of out.split("\n")) {
+			if (line.length === 0) continue;
+			if (line[0] === "#") {
+				const head = /^# branch\.head (.+)$/.exec(line);
+				if (head) {
+					branch = head[1] === "(detached)" ? null : head[1];
+					continue;
+				}
+				const ab = /^# branch\.ab \+(\d+) -(\d+)/.exec(line);
+				if (ab) {
+					ahead = Number(ab[1]);
+					behind = Number(ab[2]);
+				}
+				continue;
+			}
+			const type = line[0];
+			if (type === "?") changed++;
+			else if (type === "u") changed++;
+			else if (type === "1" || type === "2") {
+				const sub = line.split(" ")[2] ?? "N...";
+				if (sub[0] === "S") if (sub[1] === "C") pins++;
+				else subDirty++;
+				else changed++;
+			}
+		}
 		return {
 			branch,
 			dirty: changed > 0,
 			changed,
+			pins,
+			subDirty,
 			ahead,
 			behind
 		};
@@ -676,7 +720,7 @@ Options:
 			try {
 				const out = await runGit([
 					"status",
-					"--porcelain",
+					"--porcelain=v2",
 					"--branch"
 				], root);
 				if (out != null) rw.val = parseGitStatus(out);
@@ -717,9 +761,11 @@ Options:
 	};
 	const withMeta = async (r) => {
 		const status = await deriveLiveStatus(r);
+		const question = status !== "exited" && !r.unresponsive ? await logNeedsInput(r.log_file, r.cli) : null;
 		return {
 			...r,
-			status: status !== "exited" && r.unresponsive ? "stuck" : status,
+			status: status === "exited" ? status : r.unresponsive ? "stuck" : question ? "needs_input" : status,
+			question,
 			title: await logTitle(r.log_file),
 			git: status === "exited" ? null : await gitStatus(r.cwd),
 			tasks: status === "exited" ? null : await logTasks(r.log_file)
@@ -1200,6 +1246,7 @@ Options:
 				...prompt ? ["--", prompt] : []
 			];
 			const agentEnv = freshAgentEnv();
+			const agentId = randomBytes(6).toString("hex");
 			try {
 				const hook = getSpawnHook();
 				if (hook) {
@@ -1218,7 +1265,8 @@ Options:
 						env: {
 							...agentEnv,
 							AGENT_YES_CWD: cwd,
-							AGENT_YES_CLI: cli
+							AGENT_YES_CLI: cli,
+							AGENT_YES_AGENT_ID: agentId
 						},
 						stdin: "ignore",
 						stdout: "ignore",
@@ -1239,6 +1287,7 @@ Options:
 					return Response.json({
 						ok: true,
 						pid: child.pid,
+						agentId,
 						cli,
 						cwd,
 						hook: true,
@@ -1248,7 +1297,10 @@ Options:
 				const child = Bun.spawn(agentArgv, {
 					cwd,
 					detached: true,
-					env: agentEnv,
+					env: {
+						...agentEnv,
+						AGENT_YES_AGENT_ID: agentId
+					},
 					stdin: "ignore",
 					stdout: "ignore",
 					stderr: "ignore"
@@ -1257,6 +1309,7 @@ Options:
 				return Response.json({
 					ok: true,
 					pid: child.pid,
+					agentId,
 					cli,
 					cwd,
 					...provisioned ? { provisioned } : {}
@@ -1389,4 +1442,4 @@ Options:
 
 //#endregion
 export { cmdServe };
-//# sourceMappingURL=serve-BRARQjsC.js.map
+//# sourceMappingURL=serve-yVh9Y6ot.js.map

package/dist/{setup-Cx7jDKtC.js → setup-BmYrvUsz.js}

@@ -32,7 +32,7 @@ async function cmdSetup(rest) {
 	if (!existsSync(abs)) process.stderr.write(`  note: that directory doesn't exist yet — create it, or agents spawned there will fail\n`);
 	if (noShare) return 0;
 	process.stdout.write(`\nsharing this machine to agent-yes.com…\n`);
-	const { cmdServe } = await import("./serve-BRARQjsC.js");
+	const { cmdServe } = await import("./serve-yVh9Y6ot.js");
 	return cmdServe([
 		"install",
 		"--share",
@@ -42,4 +42,4 @@ async function cmdSetup(rest) {
 
 //#endregion
 export { cmdSetup };
-//# sourceMappingURL=setup-Cx7jDKtC.js.map
+//# sourceMappingURL=setup-BmYrvUsz.js.map

package/dist/{subcommands-DGkBxWS5.js → subcommands-BbKngO7F.js}

@@ -556,15 +556,15 @@ async function runSubcommand(argv) {
 			case "restart": return await cmdRestart(rest);
 			case "note": return await cmdNote(rest);
 			case "serve": {
-				const { cmdServe } = await import("./serve-BRARQjsC.js");
+				const { cmdServe } = await import("./serve-yVh9Y6ot.js");
 				return cmdServe(rest);
 			}
 			case "setup": {
-				const { cmdSetup } = await import("./setup-Cx7jDKtC.js");
+				const { cmdSetup } = await import("./setup-BmYrvUsz.js");
 				return cmdSetup(rest);
 			}
 			case "schedule": {
-				const { cmdSchedule } = await import("./schedule-CCvB7SCT.js");
+				const { cmdSchedule } = await import("./schedule-B-Ncgklt.js");
 				return cmdSchedule(rest);
 			}
 			case "remote": {
@@ -913,7 +913,8 @@ async function runRemoteSpawn(remote, hint, spec) {
 	}
 	const r = await res.json();
 	process.stdout.write(`spawned ${r.cli} on ${remote.url} in ${r.cwd}${r.hook ? " (via spawn hook)" : ""}${r.provisioned ? ` (${r.provisioned.action})` : ""}\n`);
-	process.stderr.write(`\n  ay ls ${hint}    # the new ${r.cli} agent appears here\n`);
+	if (r.agentId && !hint.includes("://")) process.stderr.write(`\n  ay tail ${hint}:${r.agentId}            # watch its output\n  ay status ${hint}:${r.agentId} --wait   # block until it needs you\n`);
+	else process.stderr.write(`\n  ay ls ${hint}    # the new ${r.cli} agent appears here\n`);
 	return 0;
 }
 async function runRemoteStatus(remote) {
@@ -1933,7 +1934,7 @@ async function cmdSend(rest) {
 	const trailing = controlCodeFromName(codeName);
 	const record = await resolveOne(keyword, opts);
 	const fifoPath = record.fifo_file;
-	if (!fifoPath) throw new Error(`pid ${record.pid}: no fifo_file recorded — agent was not started with --stdpush (or was spawned by Rust which doesn't yet support FIFO IPC; see ROADMAP item 10)`);
+	if (!fifoPath) throw new Error(`pid ${record.pid}: no fifo_file recorded — this agent didn't register a stdin FIFO (an older agent, or one not started with --stdpush). Restarting it (ay restart ${record.pid}) re-registers one.`);
 	let body;
 	if (rawMessage === "-") {
 		const chunks = [];
@@ -2794,4 +2795,4 @@ async function cmdResultSet(rest) {
 
 //#endregion
 export { restartHintLines as C, writeToIpc as D, stopTipForCli as E, resolveResumeArgs as S, snapshotStatus as T, readPtysize as _, cursorAbs as a, resolveOne as b, extractTaskCounts as c, isExitRequest as d, isPidAlive as f, readNotes as g, matchKeyword as h, controlCodeFromName as i, finalizedLines as l, listRecords as m, READ_PAGE_DEFAULT as n, deriveLiveStatus as o, isSubcommand as p, cmdHelp as r, extractNeedsInput as s, GRACEFUL_EXIT_COMMANDS as t, isAgentStuck as u, renderRawLog as v, runSubcommand as w, resolveReadWindow as x, renderRawLogLines as y };
-//# sourceMappingURL=subcommands-DGkBxWS5.js.map
+//# sourceMappingURL=subcommands-BbKngO7F.js.map

package/dist/{subcommands-5AXvxB0S.js → subcommands-C-aCmtre.js}

@@ -4,6 +4,6 @@ import "./configShared-CEyhl0WH.js";
 import "./e2e-Bfw7qL9O.js";
 import "./webrtcLink-CBZkZ-LT.js";
 import "./remotes-DBCvpp3B.js";
-import { C as restartHintLines, D as writeToIpc, E as stopTipForCli, S as resolveResumeArgs, T as snapshotStatus, _ as readPtysize, a as cursorAbs, b as resolveOne, c as extractTaskCounts, d as isExitRequest, f as isPidAlive, g as readNotes, h as matchKeyword, i as controlCodeFromName, l as finalizedLines, m as listRecords, n as READ_PAGE_DEFAULT, o as deriveLiveStatus, p as isSubcommand, r as cmdHelp, s as extractNeedsInput, t as GRACEFUL_EXIT_COMMANDS, u as isAgentStuck, v as renderRawLog, w as runSubcommand, x as resolveReadWindow, y as renderRawLogLines } from "./subcommands-DGkBxWS5.js";
+import { C as restartHintLines, D as writeToIpc, E as stopTipForCli, S as resolveResumeArgs, T as snapshotStatus, _ as readPtysize, a as cursorAbs, b as resolveOne, c as extractTaskCounts, d as isExitRequest, f as isPidAlive, g as readNotes, h as matchKeyword, i as controlCodeFromName, l as finalizedLines, m as listRecords, n as READ_PAGE_DEFAULT, o as deriveLiveStatus, p as isSubcommand, r as cmdHelp, s as extractNeedsInput, t as GRACEFUL_EXIT_COMMANDS, u as isAgentStuck, v as renderRawLog, w as runSubcommand, x as resolveReadWindow, y as renderRawLogLines } from "./subcommands-BbKngO7F.js";
 
 export { cmdHelp, isSubcommand, runSubcommand };

package/dist/{ts-CRo3qQWb.js → ts-BzyVSzo1.js}

@@ -1,8 +1,8 @@
 import { n as logger, t as addTransport } from "./logger-CDIsZ-Pp.js";
-import { r as getInstalledPackage } from "./versionChecker-DrjR4P0K.js";
+import { r as getInstalledPackage } from "./versionChecker-CCHuozmQ.js";
 import { t as agentYesHome } from "./agentYesHome-_eJa3DaX.js";
 import { i as shouldUseLock, r as releaseLock, t as acquireLock } from "./runningLock-V4qvXgAw.js";
-import { t as PidStore } from "./pidStore-fqXqTKkh.js";
+import { t as PidStore } from "./pidStore-BfoBWUjc.js";
 import { i as readGlobalPids } from "./globalPidIndex-DlmmJlO8.js";
 import { n as register, r as sweep } from "./reaper-C-eWAxIj.js";
 import { arch, platform } from "process";
@@ -1216,6 +1216,7 @@ async function agentYes({ cli, cliArgs = [], skipPermissions = false, prompt, ro
 	const inheritedAyPid = Number(ptyEnv.AGENT_YES_PID);
 	const parentPid = Number.isInteger(inheritedAyPid) && inheritedAyPid > 0 ? inheritedAyPid : void 0;
 	ptyEnv.AGENT_YES_PID = String(process.pid);
+	delete ptyEnv.AGENT_YES_AGENT_ID;
 	if (cliConf?.env) for (const [key, raw] of Object.entries(cliConf.env)) {
 		let unresolved = false;
 		const value = raw.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)(?::-([^}]*))?\}/g, (_, name, fallback) => {
@@ -1802,4 +1803,4 @@ function sleep(ms) {
 
 //#endregion
 export { removeControlCharacters as a, AgentContext as i, agentYes as n, config as r, CLIS_CONFIG as t };
-//# sourceMappingURL=ts-CRo3qQWb.js.map
+//# sourceMappingURL=ts-BzyVSzo1.js.map

package/dist/{versionChecker-DrjR4P0K.js → versionChecker-CCHuozmQ.js}

@@ -7,7 +7,7 @@ import { fileURLToPath } from "url";
 
 //#region package.json
 var name = "claude-yes";
-var version = "1.161.0";
+var version = "1.164.0";
 
 //#endregion
 //#region ts/versionChecker.ts
@@ -215,4 +215,4 @@ async function displayVersion() {
 
 //#endregion
 export { versionString as i, displayVersion as n, getInstalledPackage as r, checkAndAutoUpdate as t };
-//# sourceMappingURL=versionChecker-DrjR4P0K.js.map
+//# sourceMappingURL=versionChecker-CCHuozmQ.js.map

package/lab/ui/console-logic.js

@@ -153,14 +153,19 @@ export function tagsFor(e) {
 }
 
 // Compact git indicator from the record's `git` snapshot (server-side
-// `git status --porcelain --branch`): "±3" changed files, "↑1" ahead, "↓2"
-// behind. Returns "" when there's no git info or the tree is clean and in sync,
-// so a tidy repo adds no noise. Branch itself is shown via the path identity.
+// `git status --porcelain=v2 --branch`): "±3" real changed files, "⑂2"
+// submodule pin-bumps, "⊙1" submodule internal dirt, "↑1" ahead, "↓2" behind.
+// Pins/sub-dirt are split out of "±" so submodule drift (constant in a repo with
+// many submodules) never buries the real file edits. Returns "" when there's no
+// git info or the tree is clean and in sync, so a tidy repo adds no noise. Branch
+// itself is shown via the path identity.
 export function gitLabel(e) {
   const g = e.git;
   if (!g) return "";
   const parts = [];
   if (g.changed > 0) parts.push("±" + g.changed);
+  if (g.pins > 0) parts.push("⑂" + g.pins);
+  if (g.subDirty > 0) parts.push("⊙" + g.subDirty);
   if (g.ahead > 0) parts.push("↑" + g.ahead);
   if (g.behind > 0) parts.push("↓" + g.behind);
   return parts.join(" ");
@@ -521,10 +526,21 @@ export function fitTransform(gridW, gridH, paneW, paneH) {
 
 // Browser-tab title: "<glyph> <selected agent title> - agent-yes", or the bare
 // console title when nothing is selected (blank/whitespace name). The leading
-// glyph mirrors the agent's status dot — ● active, ○ idle, ✗ exited — so the tab
-// shows liveness at a glance; an unknown status adds no glyph.
+// glyph mirrors the agent's status dot — ⌨ needs_input ("your turn"), ⚠ stuck,
+// ● active, ○ idle, ✗ exited — so the tab shows liveness at a glance even in a
+// background tab; an unknown status adds no glyph.
 export function statusGlyph(status) {
-  return status === "active" ? "●" : status === "idle" ? "○" : status === "exited" ? "✗" : "";
+  return status === "needs_input"
+    ? "⌨"
+    : status === "stuck"
+      ? "⚠"
+      : status === "active"
+        ? "●"
+        : status === "idle"
+          ? "○"
+          : status === "exited"
+            ? "✗"
+            : "";
 }
 export function docTitle(name, status) {
   const n = name && String(name).trim();

package/lab/ui/index.html

@@ -891,6 +891,11 @@
         color: var(--green);
         border-color: #2a3a2a;
       }
+      /* The pending question when an agent needs_input — blue accent to match the
+         needs_input dot, reading as "your turn / here's what it's asking". */
+      .detail.ask {
+        color: var(--accent);
+      }
       .detail {
         color: var(--muted);
         font-size: 12.5px;
@@ -3187,13 +3192,19 @@
         );
       }
 
-      // A small git chip (±changed ↑ahead ↓behind) for a row, amber when the tree
-      // is dirty. Empty for clean/in-sync repos and non-git cwds — no noise.
+      // A small git chip (±changed ⑂pins ⊙sub-dirty ↑ahead ↓behind) for a row,
+      // amber when the tree has real file changes. Submodule pin-drift shows as a
+      // muted "⑂" that never turns the chip amber, so it can't bury real edits.
+      // Empty for clean/in-sync repos and non-git cwds — no noise.
       function gitChipHtml(e) {
         const label = gitLabel(e);
         if (!label) return "";
         const g = e.git || {};
-        const tip = `git: ${g.changed || 0} changed · ${g.ahead || 0} ahead · ${g.behind || 0} behind`;
+        const tip =
+          `git: ${g.changed || 0} changed file${(g.changed || 0) === 1 ? "" : "s"}` +
+          (g.pins ? ` · ${g.pins} submodule pin-bump${g.pins === 1 ? "" : "s"}` : "") +
+          (g.subDirty ? ` · ${g.subDirty} submodule dirty` : "") +
+          ` · ${g.ahead || 0} ahead · ${g.behind || 0} behind`;
         return `<span class="git${g.dirty ? " dirty" : ""}" title="${esc(tip)}">${esc(label)}</span>`;
       }
 
@@ -3285,7 +3296,13 @@
           ${gitChipHtml(e)}
           <span class="age">${age(e)}</span></div>
         ${e.title ? `<div class="rowtitle" title="${esc(e.title)}">${esc(e.title)}</div>` : ""}
-        ${e.prompt ? `<div class="detail" title="${esc(e.prompt)}">${esc(e.prompt)}</div>` : ""}
+        ${
+          e.status === "needs_input" && e.question
+            ? `<div class="detail ask" title="${esc(e.question)}">⌨ ${esc(e.question)}</div>`
+            : e.prompt
+              ? `<div class="detail" title="${esc(e.prompt)}">${esc(e.prompt)}</div>`
+              : ""
+        }
         <div class="rowtags">${tags}</div>
       </div>`;
             })
@@ -3918,7 +3935,7 @@
               return `<div class="omni-row omni-spawn${sc}" data-i="${i}">
                 <span class="dot active"></span>
                 <div class="omni-main">
-                  <div class="omni-title">⑂ Fork <b>${esc(r.srcBranch)}</b> &amp; run <span style="opacity:.55">(carries uncommitted work)</span></div>
+                  <div class="omni-title">⑂ Fork <b>${esc(r.srcBranch)}</b> &amp; run <span style="opacity:.55">(clean — committed work only)</span></div>
                   <div class="omni-sub">${esc(r.fromCwd)} &nbsp;→&nbsp; new branch <b>${esc(r.branch)}</b> &nbsp;·&nbsp; ⏎ to edit &amp; launch</div>
                 </div></div>`;
             }
@@ -4050,14 +4067,12 @@
           return;
         }
         if (row && row.kind === "fork") {
-          // Editable at launch (auto-slug is the default); carries the source's WIP.
+          // Editable at launch (auto-slug is the default). The fork is clean —
+          // committed work only, the source's uncommitted changes stay put.
           // Fork from the source PINNED on the row (row.fromCwd), not a freshly
           // re-resolved anchor — the anchor can drift as the list refreshes, but the
           // branch we fork from must be the one the row was built for.
-          const branch = prompt(
-            "Fork to a new branch (carries your uncommitted work):",
-            row.branch,
-          );
+          const branch = prompt("Fork to a new branch (clean — committed work only):", row.branch);
           if (!branch || !branch.trim()) return; // cancelled — leave the omnibox open
           closeOmni(false);
           await spawnAndSelect(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-yes",
-  "version": "1.161.0",
+  "version": "1.164.0",
   "description": "A wrapper tool that automates interactions with various AI CLI tools by automatically handling common prompts and responses.",
   "keywords": [
     "ai",

package/ts/index.ts

@@ -374,6 +374,12 @@ export default async function agentYes({
   const parentPid =
     Number.isInteger(inheritedAyPid) && inheritedAyPid > 0 ? inheritedAyPid : undefined;
   ptyEnv.AGENT_YES_PID = String(process.pid);
+  // A caller-injected AGENT_YES_AGENT_ID (from `ay serve`'s /api/spawn) is meant
+  // for THIS agent's record only — pidStore.registerProcess reads it from our own
+  // env. Strip it from the wrapped CLI's env so the agent's subagents (a nested
+  // `ay`) don't inherit it and register under the same id (which would make that
+  // id ambiguous). The wrapper's own process.env still carries it for pidStore.
+  delete ptyEnv.AGENT_YES_AGENT_ID;
   // Inject per-CLI env (e.g. glm → Z.AI endpoint). Expand ${VAR} against the
   // launching env; skip entries whose vars are unset so we never blank out an
   // inherited value (e.g. ANTHROPIC_AUTH_TOKEN when ZAI_API_KEY isn't exported).

package/ts/pidStore.ts

@@ -77,9 +77,15 @@ export class PidStore {
     const fifoFile = this.getFifoPath(pid);
 
     // Upsert by pid. Reuse an existing record's agent id so re-registration
-    // (e.g. status churn) keeps the id stable; mint a fresh 12-hex id otherwise.
+    // (e.g. status churn) keeps the id stable; else adopt a caller-injected
+    // AGENT_YES_AGENT_ID (so `ay serve`'s /api/spawn can hand back an id that
+    // addresses this exact agent — index.ts strips it from the wrapped CLI's env
+    // so subagents don't inherit it); else mint a fresh 12-hex id.
+    const injected = process.env.AGENT_YES_AGENT_ID;
     const existing = this.store.findOne((doc) => doc.pid === pid);
-    const agentId = existing?.agentId ?? randomBytes(6).toString("hex");
+    const agentId =
+      existing?.agentId ??
+      (injected && /^[0-9a-f]{6,32}$/i.test(injected) ? injected : randomBytes(6).toString("hex"));
 
     const record: Omit<PidRecord, "_id"> = {
       pid,

package/ts/serve.ts

@@ -9,6 +9,7 @@ import yargs from "yargs";
 import {
   controlCodeFromName,
   deriveLiveStatus,
+  extractNeedsInput,
   extractTaskCounts,
   listRecords,
   readNotes,
@@ -172,12 +173,15 @@ function loginShellEnv(): Record<string, string> | null {
     // Delimiters fence off the env dump from any banner/prompt noise the rc files
     // print to stdout; `env -0` is NUL-separated so values with newlines survive.
     const delim = "_AY_SHELL_ENV_DELIM_";
-    const res = Bun.spawnSync([shell, "-ilc", `printf %s "${delim}"; env -0; printf %s "${delim}"`], {
-      stdin: "ignore",
-      stderr: "ignore",
-      timeout: 5_000,
-      env: process.env as Record<string, string>,
-    });
+    const res = Bun.spawnSync(
+      [shell, "-ilc", `printf %s "${delim}"; env -0; printf %s "${delim}"`],
+      {
+        stdin: "ignore",
+        stderr: "ignore",
+        timeout: 5_000,
+        env: process.env as Record<string, string>,
+      },
+    );
     const out = res.stdout?.toString() ?? "";
     const start = out.indexOf(delim);
     const end = out.lastIndexOf(delim);
@@ -930,8 +934,37 @@ export async function cmdServe(rest: string[]): Promise<number> {
     }
   };
 
+  // Per-agent "waiting on you" detection: the agent is parked on an interactive
+  // menu it did NOT auto-resolve (config `needsInput` patterns). Same source and
+  // classifier as `ay ls` / `ay status`, so the console's dot matches the CLI's
+  // needs_input. Cached per (size, mtime) exactly like logTitle/logTasks — each
+  // miss renders a log window through xterm, so the 1s list tick stays cheap on
+  // an idle fleet. Returns the pending question text (surfaced in the UI), or
+  // null when the agent isn't blocked.
+  const niCache = new Map<string, { size: number; mtimeMs: number; question: string | null }>();
+  const logNeedsInput = async (
+    logFile: string | null | undefined,
+    cli: string,
+  ): Promise<string | null> => {
+    if (!logFile) return null;
+    try {
+      const { size, mtimeMs } = await stat(logFile);
+      const hit = niCache.get(logFile);
+      if (hit && hit.size === size && hit.mtimeMs === mtimeMs) return hit.question;
+      const ni = await extractNeedsInput(logFile, cli);
+      const question = ni?.question ?? null;
+      niCache.set(logFile, { size, mtimeMs, question });
+      return question;
+    } catch {
+      return null;
+    }
+  };
+
   // Per-repo git snapshot for the list (branch + dirty/changed + ahead/behind, from
-  // one `git status --porcelain --branch`). WATCHER-INVALIDATED, not polled: a read
+  // one `git status --porcelain=v2 --branch`). v2 (not v1) so the submodule field
+  // lets us split real file changes from submodule pin-drift, which would otherwise
+  // inflate `changed` — in a superproject with many submodules the constant gitlink
+  // drift buries the real edits. WATCHER-INVALIDATED, not polled: a read
   // returns the cached snapshot instantly and NEVER spawns `git status` on the
   // request path. A per-repo-root fs watcher recomputes (debounced) only when the
   // repo actually changes, so an idle fleet costs ~0 git processes. The old design
@@ -942,7 +975,9 @@ export async function cmdServe(rest: string[]): Promise<number> {
   interface GitInfo {
     branch: string | null;
     dirty: boolean;
-    changed: number;
+    changed: number; // real file changes (excludes submodule pin-bumps & internal dirt)
+    pins: number; // submodule gitlinks pointing at new commit(s) — pin-bump/drift
+    subDirty: number; // submodule has internal changes but its recorded pin is unchanged
     ahead: number;
     behind: number;
   }
@@ -964,16 +999,55 @@ export async function cmdServe(rest: string[]): Promise<number> {
     }
   };
   const parseGitStatus = (out: string): GitInfo => {
-    const lines = out.split("\n");
-    // Branch header, e.g. "## main...origin/main [ahead 1, behind 2]", "## main"
-    // (no upstream), "## HEAD (no branch)", or "## No commits yet on x".
-    const h = /^## (.+)$/.exec(lines[0] ?? "")?.[1] ?? "";
-    const unborn = /^No commits yet on (.+)$/.exec(h);
-    const branch = unborn ? unborn[1]! : /^(.+?)(?:\.\.\.|\s|$)/.exec(h)?.[1] || null;
-    const ahead = Number(/\bahead (\d+)/.exec(h)?.[1] ?? 0);
-    const behind = Number(/\bbehind (\d+)/.exec(h)?.[1] ?? 0);
-    const changed = lines.slice(1).filter((l) => l.trim().length > 0).length;
-    return { branch, dirty: changed > 0, changed, ahead, behind };
+    // porcelain=v2 --branch: "# branch.*" headers then one line per changed entry.
+    let branch: string | null = null;
+    let ahead = 0;
+    let behind = 0;
+    let changed = 0; // real file changes
+    let pins = 0; // submodule pin-bumps (gitlink → new commit)
+    let subDirty = 0; // submodule internal dirt, recorded pin unchanged
+    for (const line of out.split("\n")) {
+      if (line.length === 0) continue;
+      if (line[0] === "#") {
+        // "# branch.head <name|(detached)>" and "# branch.ab +A -B" (ab absent
+        // when there's no upstream). branch.head carries the name even on an
+        // unborn branch, so no special-casing needed.
+        const head = /^# branch\.head (.+)$/.exec(line);
+        if (head) {
+          branch = head[1] === "(detached)" ? null : head[1]!;
+          continue;
+        }
+        const ab = /^# branch\.ab \+(\d+) -(\d+)/.exec(line);
+        if (ab) {
+          ahead = Number(ab[1]);
+          behind = Number(ab[2]);
+        }
+        continue;
+      }
+      // Changed-entry lines. Untracked ("?") and unmerged ("u") are always real
+      // work; ignored ("!") never appears (we don't pass --ignored). For ordinary
+      // ("1") / renamed ("2") entries the 3rd space-delimited token is the
+      // submodule field <sub>: "N..." for a normal path, or "S<c><m><u>" for a
+      // submodule where c=C means its gitlink moved to new commit(s) (pin-bump),
+      // and m/u flag internal dirty/untracked with the recorded pin unchanged.
+      // Paths (which may contain spaces) come after token 2, so counting by token
+      // index is robust without -z.
+      const type = line[0];
+      if (type === "?") {
+        changed++;
+      } else if (type === "u") {
+        changed++;
+      } else if (type === "1" || type === "2") {
+        const sub = line.split(" ")[2] ?? "N...";
+        if (sub[0] === "S") {
+          if (sub[1] === "C") pins++;
+          else subDirty++;
+        } else {
+          changed++;
+        }
+      }
+    }
+    return { branch, dirty: changed > 0, changed, pins, subDirty, ahead, behind };
   };
   // cwd -> repo root ("" = resolved, not a repo). Resolved once per cwd via a cheap
   // `git rev-parse --show-toplevel` (no tree scan) and cached, so many agents in the
@@ -999,7 +1073,7 @@ export async function cmdServe(rest: string[]): Promise<number> {
       if (rw.busy) return void recompute(root, rw); // re-arm if one is in flight
       rw.busy = true;
       try {
-        const out = await runGit(["status", "--porcelain", "--branch"], root);
+        const out = await runGit(["status", "--porcelain=v2", "--branch"], root);
         if (out != null) rw.val = parseGitStatus(out);
       } finally {
         rw.busy = false;
@@ -1051,12 +1125,23 @@ export async function cmdServe(rest: string[]): Promise<number> {
     // the LIVE status here — same liveness+log-mtime basis as `ay ls` — so the
     // console's dot (and the browser tab glyph) flips to idle in step with `ay ls`.
     const status = await deriveLiveStatus(r);
+    // "Waiting on you": alive, quiet, but parked on an unanswered menu. Checked
+    // only for live agents, and skipped when unresponsive (the Rust wedge signal
+    // wins) — mirroring deriveLiveState's precedence in `ay ls` so the console's
+    // dot and the CLI agree.
+    const question =
+      status !== "exited" && !r.unresponsive ? await logNeedsInput(r.log_file, r.cli) : null;
     return {
       ...r,
-      // The Rust supervisor's unresponsive flag is an authoritative wedge signal —
-      // surface it as `stuck` so the console's dot matches `ay ls`. (A dead agent
-      // is never unresponsive — Rust clears the flag on exit.)
-      status: status !== "exited" && r.unresponsive ? "stuck" : status,
+      // Precedence: exited stays exited; the Rust supervisor's unresponsive flag is
+      // an authoritative wedge signal (`stuck`); then a blocked menu (`needs_input`);
+      // else the base live status — so the console's dot matches `ay ls`. (A dead
+      // agent is never unresponsive — Rust clears the flag on exit.)
+      status:
+        status === "exited" ? status : r.unresponsive ? "stuck" : question ? "needs_input" : status,
+      // The pending menu/question text when needs_input, for the console to show
+      // WHAT the agent is waiting on. Null otherwise.
+      question,
       title: await logTitle(r.log_file),
       git: status === "exited" ? null : await gitStatus(r.cwd),
       // Task progress from the rendered todo block (null when none detected → no
@@ -1642,9 +1727,11 @@ export async function cmdServe(rest: string[]): Promise<number> {
         return new Response("fork requires a non-empty fromCwd and branch", { status: 400 });
       const from = typeof body.from === "string" ? body.from.trim() : "";
       if (fork) {
-        // Fork the anchor agent's branch (carrying its WIP) into a new sibling
-        // worktree via codehost/provision (git worktree off HEAD, no clone), then
-        // spawn the agent there.
+        // Fork the anchor agent's branch into a new sibling worktree via
+        // codehost/provision (git worktree off HEAD, no clone), then spawn the
+        // agent there. The fork is clean — committed work only; the source's
+        // uncommitted changes stay put (codehost forkWorktree defaults wip:false,
+        // and we don't opt in).
         let prov: {
           forkWorktree: (o: { fromCwd: string; branch: string; wsRoot?: string }) => Promise<{
             ok: boolean;
@@ -1763,6 +1850,14 @@ export async function cmdServe(rest: string[]): Promise<number> {
       const agentArgv = [...ayCmd, cli, ...(prompt ? ["--", prompt] : [])];
       // don't leak our Claude Code session into the agent
       const agentEnv = freshAgentEnv();
+      // Correlation id: the spawn response returns the `ay` LAUNCHER pid, which is
+      // NOT the agent's registered pid — so the caller can't find the agent it just
+      // spawned. Mint a 12-hex id (the agent_id format), inject it as
+      // AGENT_YES_AGENT_ID, and return it. Both runtimes adopt it as their agent_id
+      // (instead of minting a random one) and strip it from the wrapped CLI's env so
+      // subagents don't inherit and collide. The caller can then address the agent
+      // immediately: `ay <verb> <remote>:<agentId>`.
+      const agentId = randomBytes(6).toString("hex");
       // Detach the agent into its OWN session (setsid). When `ay serve` runs WITH a
       // controlling terminal (started in a shell rather than as a headless daemon),
       // an undetached child inherits the daemon's session + controlling tty and lands
@@ -1792,7 +1887,12 @@ export async function cmdServe(rest: string[]): Promise<number> {
           const child = Bun.spawn([shell, "-c", script, "ay-spawn", ...agentArgv], {
             cwd,
             detached: true,
-            env: { ...agentEnv, AGENT_YES_CWD: cwd, AGENT_YES_CLI: cli },
+            env: {
+              ...agentEnv,
+              AGENT_YES_CWD: cwd,
+              AGENT_YES_CLI: cli,
+              AGENT_YES_AGENT_ID: agentId,
+            },
             stdin: "ignore",
             stdout: "ignore",
             stderr: Bun.file(errPath),
@@ -1829,6 +1929,7 @@ export async function cmdServe(rest: string[]): Promise<number> {
           return Response.json({
             ok: true,
             pid: child.pid,
+            agentId,
             cli,
             cwd,
             hook: true,
@@ -1838,7 +1939,7 @@ export async function cmdServe(rest: string[]): Promise<number> {
         const child = Bun.spawn(agentArgv, {
           cwd,
           detached: true,
-          env: agentEnv,
+          env: { ...agentEnv, AGENT_YES_AGENT_ID: agentId },
           stdin: "ignore",
           stdout: "ignore",
           stderr: "ignore",
@@ -1847,6 +1948,7 @@ export async function cmdServe(rest: string[]): Promise<number> {
         return Response.json({
           ok: true,
           pid: child.pid,
+          agentId,
           cli,
           cwd,
           ...(provisioned ? { provisioned } : {}),

package/ts/subcommands.ts

@@ -897,6 +897,7 @@ async function runRemoteSpawn(
     pid: number;
     cli: string;
     cwd: string;
+    agentId?: string;
     hook?: boolean;
     provisioned?: { action: string };
   };
@@ -905,15 +906,19 @@ async function runRemoteSpawn(
       `${r.hook ? " (via spawn hook)" : ""}` +
       `${r.provisioned ? ` (${r.provisioned.action})` : ""}\n`,
   );
-  // We deliberately do NOT print the agent's own pid. `/api/spawn` returns the
-  // `ay` LAUNCHER pid, which is not the agent's registered pid (the record's
-  // pid/wrapper_pid are the runtime process, not the launcher) — and picking the
-  // freshly-registered agent by "newest" would, under a concurrent spawn,
-  // surface a sibling's (or another user's) pid. Point at the remote's list,
-  // where the new agent reliably appears, instead of guessing.
-  // (A one-step `ay tail <remote>:<pid>` would need /api/spawn to return a
-  // correlatable agent id — a server change left for a follow-up.)
-  process.stderr.write(`\n  ay ls ${hint}    # the new ${r.cli} agent appears here\n`);
+  // `/api/spawn` returns a correlation `agentId` that the agent adopts as its
+  // agent_id — so we address the EXACT agent by it (no pid guessing, no race). A
+  // webrtc:// / share-link target isn't `:keyword`-addressable, so the keyword
+  // hint is only for an alias / token@host:port. Older remotes omit agentId →
+  // fall back to pointing at `ay ls`.
+  if (r.agentId && !hint.includes("://")) {
+    process.stderr.write(
+      `\n  ay tail ${hint}:${r.agentId}            # watch its output\n` +
+        `  ay status ${hint}:${r.agentId} --wait   # block until it needs you\n`,
+    );
+  } else {
+    process.stderr.write(`\n  ay ls ${hint}    # the new ${r.cli} agent appears here\n`);
+  }
   return 0;
 }
 
@@ -2258,7 +2263,7 @@ async function cmdSend(rest: string[]): Promise<number> {
   const fifoPath = record.fifo_file;
   if (!fifoPath) {
     throw new Error(
-      `pid ${record.pid}: no fifo_file recorded — agent was not started with --stdpush (or was spawned by Rust which doesn't yet support FIFO IPC; see ROADMAP item 10)`,
+      `pid ${record.pid}: no fifo_file recorded — this agent didn't register a stdin FIFO (an older agent, or one not started with --stdpush). Restarting it (ay restart ${record.pid}) re-registers one.`,
     );
   }
 

package/dist/SUPPORTED_CLIS-CHmQfHCh.js

@@ -1,8 +0,0 @@
-import "./ts-CRo3qQWb.js";
-import "./logger-CDIsZ-Pp.js";
-import "./versionChecker-DrjR4P0K.js";
-import "./pidStore-fqXqTKkh.js";
-import "./globalPidIndex-DlmmJlO8.js";
-import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-DYTnLX8C.js";
-
-export { SUPPORTED_CLIS };

package/dist/pidStore-DfHh3Yt0.js

@@ -1,5 +0,0 @@
-import "./logger-CDIsZ-Pp.js";
-import { t as PidStore } from "./pidStore-fqXqTKkh.js";
-import "./globalPidIndex-DlmmJlO8.js";
-
-export { PidStore };