agent-yes 1.129.0 → 1.131.0

package/dist/SUPPORTED_CLIS-BeiCQyhf.js

@@ -0,0 +1,8 @@
+import "./ts-CFyen5cA.js";
+import "./logger-B9h0djqx.js";
+import "./versionChecker-DF1bftgQ.js";
+import "./pidStore-DWQoGxxA.js";
+import "./globalPidIndex-C7r2m6s7.js";
+import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-QtoszbIC.js";
+
+export { SUPPORTED_CLIS };

package/dist/{SUPPORTED_CLIS-CRiTrZVs.js → SUPPORTED_CLIS-QtoszbIC.js}

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

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
 import { n as logger } from "./logger-B9h0djqx.js";
-import { i as versionString, n as displayVersion, r as getInstalledPackage, t as checkAndAutoUpdate } from "./versionChecker-VKD48fzV.js";
+import { i as versionString, n as displayVersion, r as getInstalledPackage, t as checkAndAutoUpdate } from "./versionChecker-DF1bftgQ.js";
 import { argv } from "process";
 import { execFileSync, spawn } from "child_process";
 import ms from "ms";
@@ -482,7 +482,7 @@ function buildRustArgs(argv, cliFromScript, supportedClis) {
 {
 	const rawArg = process.argv[2];
 	const isHelpFlag = rawArg === "-h" || rawArg === "--help";
-	const { isSubcommand, runSubcommand, cmdHelp } = await import("./subcommands-BLUX23IJ.js");
+	const { isSubcommand, runSubcommand, cmdHelp } = await import("./subcommands-BgZ46FBg.js");
 	if (isHelpFlag && process.argv.length === 3) {
 		cmdHelp();
 		process.exit(0);
@@ -515,7 +515,7 @@ if (config.useRust) {
 		}
 	}
 	if (rustBinary) {
-		const { SUPPORTED_CLIS } = await import("./SUPPORTED_CLIS-BEGaVwg2.js");
+		const { SUPPORTED_CLIS } = await import("./SUPPORTED_CLIS-BeiCQyhf.js");
 		const rustArgs = buildRustArgs(process.argv, config.cli, SUPPORTED_CLIS);
 		if (config.verbose) {
 			console.log(`[rust] Using binary: ${rustBinary}`);
@@ -545,7 +545,7 @@ if (config.showVersion) {
 	process.exit(0);
 }
 if (config.appendPrompt) {
-	const { PidStore } = await import("./pidStore-C4c2O15q.js");
+	const { PidStore } = await import("./pidStore-BweOirbR.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-D21pYxoi.js";
+import { a as removeControlCharacters, i as AgentContext, n as agentYes, r as config, t as CLIS_CONFIG } from "./ts-CFyen5cA.js";
 import "./logger-B9h0djqx.js";
-import "./versionChecker-VKD48fzV.js";
-import "./pidStore-CGKIhaJO.js";
+import "./versionChecker-DF1bftgQ.js";
+import "./pidStore-DWQoGxxA.js";
 import "./globalPidIndex-C7r2m6s7.js";
 
 export { AgentContext, CLIS_CONFIG, config, agentYes as default, removeControlCharacters };

package/dist/pidStore-BweOirbR.js

@@ -0,0 +1,5 @@
+import "./logger-B9h0djqx.js";
+import { t as PidStore } from "./pidStore-DWQoGxxA.js";
+import "./globalPidIndex-C7r2m6s7.js";
+
+export { PidStore };

package/dist/{pidStore-CGKIhaJO.js → pidStore-DWQoGxxA.js}

@@ -4,6 +4,7 @@ import { a as updateGlobalPidStatus, n as maybeCompactGlobalPids, r as pruneOldL
 import { closeSync, existsSync, fsyncSync, openSync } from "fs";
 import { appendFile, mkdir, readFile, rename, writeFile } from "fs/promises";
 import path from "path";
+import { randomBytes } from "node:crypto";
 import { lock } from "proper-lockfile";
 
 //#region ts/JsonlStore.ts
@@ -208,6 +209,8 @@ var PidStore = class PidStore {
 		const argsJson = JSON.stringify(args);
 		const logFile = this.getRawLogPath(pid);
 		const fifoFile = this.getFifoPath(pid);
+		const existing = this.store.findOne((doc) => doc.pid === pid);
+		const agentId = existing?.agentId ?? randomBytes(6).toString("hex");
 		const record = {
 			pid,
 			cli,
@@ -218,9 +221,9 @@ var PidStore = class PidStore {
 			fifoFile,
 			status: "active",
 			exitReason: "",
-			startedAt: now
+			startedAt: now,
+			agentId
 		};
-		const existing = this.store.findOne((doc) => doc.pid === pid);
 		if (existing) await this.store.updateById(existing._id, record);
 		else await this.store.append(record);
 		const result = this.store.findOne((doc) => doc.pid === pid);
@@ -242,7 +245,8 @@ var PidStore = class PidStore {
 			exit_reason: null,
 			started_at: now,
 			wrapper_pid: wrapperPid ?? null,
-			parent_pid: parentPid ?? null
+			parent_pid: parentPid ?? null,
+			agent_id: agentId
 		}).then(() => maybeCompactGlobalPids()).catch(() => null);
 		return result;
 	}
@@ -363,4 +367,4 @@ pid-db/
 
 //#endregion
 export { PidStore as t };
-//# sourceMappingURL=pidStore-CGKIhaJO.js.map
+//# sourceMappingURL=pidStore-DWQoGxxA.js.map

package/dist/{schedule-QakndFJf.js → schedule-BGsUo_2s.js}

@@ -1,9 +1,9 @@
-import "./ts-D21pYxoi.js";
+import "./ts-CFyen5cA.js";
 import "./logger-B9h0djqx.js";
-import "./versionChecker-VKD48fzV.js";
-import "./pidStore-CGKIhaJO.js";
+import "./versionChecker-DF1bftgQ.js";
+import "./pidStore-DWQoGxxA.js";
 import "./globalPidIndex-C7r2m6s7.js";
-import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-CRiTrZVs.js";
+import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-QtoszbIC.js";
 import { n as resolveSpawnCwd } from "./workspaceConfig-BJO4fzEn.js";
 import { createHash } from "node:crypto";
 
@@ -141,4 +141,4 @@ async function cmdSchedule(rest) {
 
 //#endregion
 export { cmdSchedule };
-//# sourceMappingURL=schedule-QakndFJf.js.map
+//# sourceMappingURL=schedule-BGsUo_2s.js.map

package/dist/{serve-DpBmExxp.js → serve-C9o_RRVC.js}

@@ -1,13 +1,13 @@
-import "./ts-D21pYxoi.js";
+import "./ts-CFyen5cA.js";
 import "./logger-B9h0djqx.js";
-import { r as getInstalledPackage } from "./versionChecker-VKD48fzV.js";
-import "./pidStore-CGKIhaJO.js";
+import { r as getInstalledPackage } from "./versionChecker-DF1bftgQ.js";
+import "./pidStore-DWQoGxxA.js";
 import { a as updateGlobalPidStatus } from "./globalPidIndex-C7r2m6s7.js";
 import { t as pgidForWrapper } from "./reaper-BkjPN7mw.js";
 import "./configShared-C5QaNPnz.js";
-import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-CRiTrZVs.js";
+import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-QtoszbIC.js";
 import "./remotes-D8GvSbhf.js";
-import { d as listRecords, g as resolveOne, i as controlCodeFromName, m as renderRawLog, p as readNotes, s as extractTaskCounts, x as writeToIpc, y as snapshotStatus } from "./subcommands-D1floyWA.js";
+import { d as listRecords, g as resolveOne, i as controlCodeFromName, m as renderRawLog, p as readNotes, s as extractTaskCounts, x as writeToIpc, y as snapshotStatus } from "./subcommands-DP2XsJNo.js";
 import yargs from "yargs";
 import { mkdir, open, readFile, stat, writeFile } from "fs/promises";
 import { homedir, hostname, userInfo } from "os";
@@ -308,6 +308,8 @@ async function cmdServeDaemon(sub, args) {
 			DAEMON_NAME,
 			"--interpreter",
 			"none",
+			"--exp-backoff-restart-delay",
+			"200",
 			"--",
 			...serveArgv.slice(1)
 		];
@@ -1052,11 +1054,17 @@ Options:
 	};
 	let server = null;
 	if (wantHttp) {
-		try {
+		for (let attempt = 0;; attempt++) try {
 			server = Bun.serve(serverOpts);
+			break;
 		} catch (e) {
-			if (e.code === "EADDRINUSE") {
-				process.stderr.write(`ay serve: port ${port} is already in use — pick another with --port N,\nor run a port-free WebRTC-only share with: ay serve --webrtc\n`);
+			const inUse = e.code === "EADDRINUSE";
+			if (inUse && attempt < 5) {
+				await Bun.sleep(Math.min(2e3, 250 * 2 ** attempt));
+				continue;
+			}
+			if (inUse) {
+				process.stderr.write(`ay serve: port ${port} is still in use after retries — pick another with --port N,\nor run a port-free WebRTC-only share with: ay serve --webrtc\n`);
 				return 1;
 			}
 			throw e;
@@ -1134,4 +1142,4 @@ Options:
 
 //#endregion
 export { cmdServe };
-//# sourceMappingURL=serve-DpBmExxp.js.map
+//# sourceMappingURL=serve-C9o_RRVC.js.map

package/dist/{setup-DCisWuHB.js → setup-C1UKmIoW.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-DpBmExxp.js");
+	const { cmdServe } = await import("./serve-C9o_RRVC.js");
 	return cmdServe([
 		"install",
 		"--share",
@@ -42,4 +42,4 @@ async function cmdSetup(rest) {
 
 //#endregion
 export { cmdSetup };
-//# sourceMappingURL=setup-DCisWuHB.js.map
+//# sourceMappingURL=setup-C1UKmIoW.js.map

package/dist/{subcommands-BLUX23IJ.js → subcommands-BgZ46FBg.js}

@@ -2,6 +2,6 @@ import "./logger-B9h0djqx.js";
 import "./globalPidIndex-C7r2m6s7.js";
 import "./configShared-C5QaNPnz.js";
 import "./remotes-D8GvSbhf.js";
-import { _ as resolveReadWindow, a as cursorAbs, b as stopTipForCli, c as finalizedLines, d as listRecords, f as matchKeyword, g as resolveOne, h as renderRawLogLines, i as controlCodeFromName, l as isPidAlive, m as renderRawLog, n as READ_PAGE_DEFAULT, o as extractNeedsInput, p as readNotes, r as cmdHelp, s as extractTaskCounts, t as GRACEFUL_EXIT_COMMANDS, u as isSubcommand, v as runSubcommand, x as writeToIpc, y as snapshotStatus } from "./subcommands-D1floyWA.js";
+import { _ as resolveReadWindow, a as cursorAbs, b as stopTipForCli, c as finalizedLines, d as listRecords, f as matchKeyword, g as resolveOne, h as renderRawLogLines, i as controlCodeFromName, l as isPidAlive, m as renderRawLog, n as READ_PAGE_DEFAULT, o as extractNeedsInput, p as readNotes, r as cmdHelp, s as extractTaskCounts, t as GRACEFUL_EXIT_COMMANDS, u as isSubcommand, v as runSubcommand, x as writeToIpc, y as snapshotStatus } from "./subcommands-DP2XsJNo.js";
 
 export { cmdHelp, isSubcommand, runSubcommand };

package/dist/{subcommands-D1floyWA.js → subcommands-DP2XsJNo.js}

@@ -524,15 +524,15 @@ async function runSubcommand(argv) {
 			case "restart": return await cmdRestart(rest);
 			case "note": return await cmdNote(rest);
 			case "serve": {
-				const { cmdServe } = await import("./serve-DpBmExxp.js");
+				const { cmdServe } = await import("./serve-C9o_RRVC.js");
 				return cmdServe(rest);
 			}
 			case "setup": {
-				const { cmdSetup } = await import("./setup-DCisWuHB.js");
+				const { cmdSetup } = await import("./setup-C1UKmIoW.js");
 				return cmdSetup(rest);
 			}
 			case "schedule": {
-				const { cmdSchedule } = await import("./schedule-QakndFJf.js");
+				const { cmdSchedule } = await import("./schedule-BGsUo_2s.js");
 				return cmdSchedule(rest);
 			}
 			case "remote": {
@@ -562,6 +562,7 @@ function matchKeyword(record, keyword) {
 	if (record.cwd.toLowerCase().includes(kw)) return true;
 	if (record.cli.toLowerCase() === kw) return true;
 	if (record.prompt && record.prompt.toLowerCase().includes(kw)) return true;
+	if (record.agent_id && record.agent_id.toLowerCase().startsWith(kw)) return true;
 	return false;
 }
 async function listRecords(keyword, opts) {
@@ -2407,4 +2408,4 @@ async function cmdResultSet(rest) {
 
 //#endregion
 export { resolveReadWindow as _, cursorAbs as a, stopTipForCli as b, finalizedLines as c, listRecords as d, matchKeyword as f, resolveOne as g, renderRawLogLines as h, controlCodeFromName as i, isPidAlive as l, renderRawLog as m, READ_PAGE_DEFAULT as n, extractNeedsInput as o, readNotes as p, cmdHelp as r, extractTaskCounts as s, GRACEFUL_EXIT_COMMANDS as t, isSubcommand as u, runSubcommand as v, writeToIpc as x, snapshotStatus as y };
-//# sourceMappingURL=subcommands-D1floyWA.js.map
+//# sourceMappingURL=subcommands-DP2XsJNo.js.map

package/dist/{ts-D21pYxoi.js → ts-CFyen5cA.js}

@@ -1,8 +1,8 @@
 import { n as logger, t as addTransport } from "./logger-B9h0djqx.js";
-import { r as getInstalledPackage } from "./versionChecker-VKD48fzV.js";
+import { r as getInstalledPackage } from "./versionChecker-DF1bftgQ.js";
 import { t as agentYesHome } from "./agentYesHome-BvaUOzCV.js";
 import { i as shouldUseLock, r as releaseLock, t as acquireLock } from "./runningLock-CJxsoGdb.js";
-import { t as PidStore } from "./pidStore-CGKIhaJO.js";
+import { t as PidStore } from "./pidStore-DWQoGxxA.js";
 import { i as readGlobalPids } from "./globalPidIndex-C7r2m6s7.js";
 import { n as register, r as sweep } from "./reaper-BkjPN7mw.js";
 import { arch, platform } from "process";
@@ -1787,4 +1787,4 @@ function sleep(ms) {
 
 //#endregion
 export { removeControlCharacters as a, AgentContext as i, agentYes as n, config as r, CLIS_CONFIG as t };
-//# sourceMappingURL=ts-D21pYxoi.js.map
+//# sourceMappingURL=ts-CFyen5cA.js.map

package/dist/{versionChecker-VKD48fzV.js → versionChecker-DF1bftgQ.js}

@@ -7,7 +7,7 @@ import { fileURLToPath } from "url";
 
 //#region package.json
 var name = "agent-yes";
-var version = "1.129.0";
+var version = "1.131.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-VKD48fzV.js.map
+//# sourceMappingURL=versionChecker-DF1bftgQ.js.map

package/lab/ui/index.html

@@ -2958,38 +2958,46 @@
         // and re-assert our size to the agent so the stream always reflows to OUR
         // viewport (see the visibilitychange hook in startPolling). Push-if-different
         // inside fitAndSync keeps an already-matching agent from a redundant SIGWINCH.
+        // Returns the in-flight sync promise so the initial open can await it
+        // before starting the tail (below); tab-reactivation callers ignore it.
         resyncTerm = () => {
           if (sel !== selKey || !term) return;
-          tx.fetchJSON("/api/size/" + encodeURIComponent(pid))
+          return tx
+            .fetchJSON("/api/size/" + encodeURIComponent(pid))
             .then(fitAndSync)
             .catch(() => fitAndSync(null));
         };
-        resyncTerm();
-
-        // True live tail via ay serve's SSE stream. First event is an xterm-rendered
-        // tail snapshot; later events are incremental deltas. We normalise terminal
-        // carriage returns so the stream reads cleanly as HTML, autoscroll while the
-        // viewer is pinned to the bottom, and cap the buffer so it can't grow forever.
-        $("livedot").className = "dot idle";
-        $("livetxt").textContent = "connecting…";
-        const close = tx.subscribe(
-          "/api/tail/" + encodeURIComponent(pid) + "?raw=1",
-          (raw) => {
-            if (term) {
-              term.write(raw);
-              perfNote("out", raw?.length ?? 0);
-            }
-          },
-          () => {
-            $("livedot").className = "dot active";
-            $("livetxt").textContent = "live";
-          },
-          () => {
-            $("livedot").className = "dot stopped";
-            $("livetxt").textContent = "disconnected";
-          },
-        );
-        es = { close };
+
+        // Start the raw replay only AFTER the initial size sync (fit + resize
+        // push) settles. /api/tail?raw=1 is absolute-cursor-positioned for the
+        // agent's grid; writing it into xterm before fit.fit()/resize would land
+        // the initial snapshot on a wrong-size grid that no later resize can
+        // repair (garbled, overlapping, dim-bleed output). First event is an
+        // xterm-rendered tail snapshot; later events are incremental deltas.
+        const startTail = () => {
+          if (sel !== selKey || !term) return; // switched away during size sync
+          $("livedot").className = "dot idle";
+          $("livetxt").textContent = "connecting…";
+          const close = tx.subscribe(
+            "/api/tail/" + encodeURIComponent(pid) + "?raw=1",
+            (raw) => {
+              if (term) {
+                term.write(raw);
+                perfNote("out", raw?.length ?? 0);
+              }
+            },
+            () => {
+              $("livedot").className = "dot active";
+              $("livetxt").textContent = "live";
+            },
+            () => {
+              $("livedot").className = "dot stopped";
+              $("livetxt").textContent = "disconnected";
+            },
+          );
+          es = { close };
+        };
+        Promise.resolve(resyncTerm()).finally(startTail);
       }
 
       $("list").addEventListener("click", (ev) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-yes",
-  "version": "1.129.0",
+  "version": "1.131.0",
   "description": "A wrapper tool that automates interactions with various AI CLI tools by automatically handling common prompts and responses.",
   "keywords": [
     "ai",
@@ -81,7 +81,7 @@
     "build": "tsdown",
     "check:e2e": "bun scripts/check-e2e.ts",
     "cf": "bun scripts/cf.ts",
-    "build:rs": "cargo install --path rs --features swarm",
+    "build:rs": "bun ./scripts/build-rs.ts",
     "postbuild": "bun ./ts/postbuild.ts",
     "demo": "bun run build && bun link && claude-yes -- demo",
     "dev": "bun ts/index.ts",

package/scripts/build-rs.ts

@@ -0,0 +1,88 @@
+#!/usr/bin/env bun
+// Build + install the Rust binary.
+//
+// On Windows a running `agent-yes.exe` holds its own image file locked, so
+// `cargo install` fails with "Access is denied" when it tries to remove/
+// overwrite the old binary. Windows DOES permit *renaming* a running .exe
+// (the live process keeps using the renamed image), so we move any locked
+// binary aside as `agent-yes.old-<ts>.exe` before building and let cargo write
+// a fresh one. This makes rebuilds lock-free without killing live sessions.
+//
+// On macOS/Linux a running binary can be replaced directly, so this is a no-op
+// there and we just run cargo.
+import { spawnSync } from "child_process";
+import { existsSync, readdirSync, renameSync, rmSync } from "fs";
+import os from "os";
+import path from "path";
+
+const repoRoot = path.resolve(import.meta.dirname, "..");
+const cargoHome = process.env.CARGO_HOME || path.join(os.homedir(), ".cargo");
+
+// Both binaries cargo touches: the build output and the installed copy.
+const targets = [
+  path.join(repoRoot, "rs", "target", "release", "agent-yes.exe"),
+  path.join(cargoHome, "bin", "agent-yes.exe"),
+];
+
+function moveLockedBinariesAside(): Array<{ original: string; aside: string }> {
+  const moved: Array<{ original: string; aside: string }> = [];
+  for (const exe of targets) {
+    const dir = path.dirname(exe);
+    if (!existsSync(dir)) continue;
+    const base = path.basename(exe, ".exe");
+
+    // Sweep stale .old- files from earlier rebuilds. Any still locked by a
+    // live process will fail to delete — that's fine, skip and move on.
+    for (const f of readdirSync(dir)) {
+      if (f.startsWith(`${base}.old-`) && f.endsWith(".exe")) {
+        try {
+          rmSync(path.join(dir, f));
+        } catch {
+          /* still running — leave it */
+        }
+      }
+    }
+
+    // Move the current (possibly locked) binary aside so cargo can write fresh.
+    if (existsSync(exe)) {
+      const aside = path.join(dir, `${base}.old-${Date.now()}.exe`);
+      try {
+        renameSync(exe, aside);
+        moved.push({ original: exe, aside });
+        console.log(`[build-rs] moved locked binary aside: ${path.basename(aside)}`);
+      } catch {
+        // Not locked (or rename unsupported) — try a plain delete instead.
+        try {
+          rmSync(exe);
+        } catch (e) {
+          console.warn(`[build-rs] WARNING: could not free ${exe}: ${e}`);
+        }
+      }
+    }
+  }
+  return moved;
+}
+
+const moved = process.platform === "win32" ? moveLockedBinariesAside() : [];
+
+const args = ["install", "--path", "rs", "--features", "swarm", ...process.argv.slice(2)];
+console.log(`[build-rs] cargo ${args.join(" ")}`);
+const result = spawnSync("cargo", args, { cwd: repoRoot, stdio: "inherit" });
+
+// On failure cargo never wrote the fresh originals, so restore anything we
+// moved aside — otherwise a build error would leave agent-yes.exe missing
+// from PATH until the next successful build.
+if (result.status !== 0) {
+  for (const { original, aside } of moved) {
+    if (!existsSync(original) && existsSync(aside)) {
+      try {
+        renameSync(aside, original);
+        console.warn(`[build-rs] build failed — restored ${path.basename(original)}`);
+      } catch {
+        /* best effort */
+      }
+    }
+  }
+}
+
+process.exit(result.status ?? 1);

package/ts/globalPidIndex.spec.ts

@@ -55,6 +55,29 @@ describe("globalPidIndex", () => {
     });
   });
 
+  it("round-trips agent_id and preserves it through a status update", async () => {
+    const mod = await loadModule();
+    await mod.appendGlobalPid({
+      pid: 31313,
+      cli: "claude",
+      prompt: null,
+      cwd: "/a",
+      log_file: null,
+      status: "active",
+      exit_code: null,
+      exit_reason: null,
+      started_at: 1,
+      agent_id: "deadbeef0001",
+    });
+    // updateStatus appends a merged record by pid; agent_id must survive since
+    // the patch doesn't include it (last-line-wins merge spreads the prior doc).
+    await mod.updateGlobalPidStatus(31313, { status: "idle" });
+
+    const records = await mod.readGlobalPids();
+    expect(records).toHaveLength(1);
+    expect(records[0]).toMatchObject({ pid: 31313, status: "idle", agent_id: "deadbeef0001" });
+  });
+
   it("merges multiple appends for the same pid (last write wins)", async () => {
     const mod = await loadModule();
     await mod.appendGlobalPid({

package/ts/globalPidIndex.ts

@@ -47,6 +47,11 @@ export interface GlobalPidRecord {
   // started from a human shell. Builds the agent>subagent tree: a child links to
   // its parent via child.parent_pid === parent.wrapper_pid. See buildAgentForest.
   parent_pid?: number | null;
+  // Stable id minted once at registration so a share grant or `ay <cmd> <id>`
+  // can reference this agent without its ephemeral pid. Mirrors Rust's `agent_id`
+  // (snake_case). Currently per-process; cross-restart re-binding is a follow-up
+  // (see docs/agent-sharing.md). Preserved verbatim through merges/compaction.
+  agent_id?: string | null;
 }
 
 /**

package/ts/pidStore.ts

@@ -1,4 +1,5 @@
 import { mkdir, writeFile } from "fs/promises";
+import { randomBytes } from "node:crypto";
 import path from "path";
 import { logger } from "./logger.ts";
 import { JsonlStore } from "./JsonlStore.ts";
@@ -23,6 +24,8 @@ export interface PidRecord {
   exitReason: string;
   exitCode?: number;
   startedAt: number;
+  // Stable id minted at registration; mirrored to the global index as `agent_id`.
+  agentId?: string;
 }
 
 export class PidStore {
@@ -73,6 +76,11 @@ export class PidStore {
     const logFile = this.getRawLogPath(pid);
     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.
+    const existing = this.store.findOne((doc) => doc.pid === pid);
+    const agentId = existing?.agentId ?? randomBytes(6).toString("hex");
+
     const record: Omit<PidRecord, "_id"> = {
       pid,
       cli,
@@ -84,10 +92,9 @@ export class PidStore {
       status: "active",
       exitReason: "",
       startedAt: now,
+      agentId,
     };
 
-    // Upsert by pid
-    const existing = this.store.findOne((doc) => doc.pid === pid);
     if (existing) {
       await this.store.updateById(existing._id!, record);
     } else {
@@ -119,6 +126,7 @@ export class PidStore {
       started_at: now,
       wrapper_pid: wrapperPid ?? null,
       parent_pid: parentPid ?? null,
+      agent_id: agentId,
     })
       .then(() => maybeCompactGlobalPids())
       .catch(() => null);

package/ts/serve.ts

@@ -447,6 +447,13 @@ async function cmdServeDaemon(sub: string, args: string[]): Promise<number> {
             DAEMON_NAME,
             "--interpreter",
             "none",
+            // Exponential restart backoff: a persistent crash (e.g. a port held
+            // by a stale instance) must NOT hammer-restart. pm2's default is an
+            // instant respawn, which storms — hundreds of restarts/min, each
+            // briefly grabbing window focus. exp-backoff grows the delay on
+            // repeated quick crashes and resets once the process stays up.
+            "--exp-backoff-restart-delay",
+            "200",
             "--",
             ...serveArgv.slice(1),
           ];
@@ -1453,17 +1460,30 @@ export async function cmdServe(rest: string[]): Promise<number> {
 
   let server: ReturnType<typeof Bun.serve> | null = null;
   if (wantHttp) {
-    try {
-      server = Bun.serve(serverOpts);
-    } catch (e) {
-      if ((e as { code?: string }).code === "EADDRINUSE") {
-        process.stderr.write(
-          `ay serve: port ${port} is already in use — pick another with --port N,\n` +
-            `or run a port-free WebRTC-only share with: ay serve --webrtc\n`,
-        );
-        return 1;
+    // A daemon restart can race the previous instance's port release (TIME_WAIT
+    // / slow shutdown), so a single Bun.serve would EADDRINUSE and the daemon
+    // would exit 1 straight into another restart. Retry with backoff first so a
+    // restart self-heals; only give up (and let the manager back off) if the
+    // port stays held — e.g. by an unrelated/stale process.
+    for (let attempt = 0; ; attempt++) {
+      try {
+        server = Bun.serve(serverOpts);
+        break;
+      } catch (e) {
+        const inUse = (e as { code?: string }).code === "EADDRINUSE";
+        if (inUse && attempt < 5) {
+          await Bun.sleep(Math.min(2000, 250 * 2 ** attempt));
+          continue;
+        }
+        if (inUse) {
+          process.stderr.write(
+            `ay serve: port ${port} is still in use after retries — pick another with --port N,\n` +
+              `or run a port-free WebRTC-only share with: ay serve --webrtc\n`,
+          );
+          return 1;
+        }
+        throw e;
       }
-      throw e;
     }
 
     const uiHost = host === "0.0.0.0" || host === "::" ? "127.0.0.1" : host;

package/ts/subcommands.spec.ts

@@ -140,6 +140,16 @@ describe("subcommands.matchKeyword", () => {
     const r = { ...baseRecord, prompt: null };
     expect(matchKeyword(r, "parser")).toBe(false);
   });
+
+  it("matches by agent_id prefix", async () => {
+    const { matchKeyword } = await loadModule();
+    const r = { ...baseRecord, agent_id: "a1b2c3d4e5f6" };
+    expect(matchKeyword(r, "a1b2c3d4e5f6")).toBe(true); // full id
+    expect(matchKeyword(r, "a1b2c3")).toBe(true); // prefix
+    expect(matchKeyword(r, "A1B2C3")).toBe(true); // case-insensitive
+    expect(matchKeyword(r, "b2c3")).toBe(false); // not a prefix (mid-string)
+    expect(matchKeyword({ ...baseRecord, agent_id: null }, "a1b2")).toBe(false);
+  });
 });
 
 describe("subcommands.runSubcommand routing", () => {

package/dist/SUPPORTED_CLIS-BEGaVwg2.js

@@ -1,8 +0,0 @@
-import "./ts-D21pYxoi.js";
-import "./logger-B9h0djqx.js";
-import "./versionChecker-VKD48fzV.js";
-import "./pidStore-CGKIhaJO.js";
-import "./globalPidIndex-C7r2m6s7.js";
-import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-CRiTrZVs.js";
-
-export { SUPPORTED_CLIS };

package/dist/pidStore-C4c2O15q.js

@@ -1,5 +0,0 @@
-import "./logger-B9h0djqx.js";
-import { t as PidStore } from "./pidStore-CGKIhaJO.js";
-import "./globalPidIndex-C7r2m6s7.js";
-
-export { PidStore };