agent-yes 1.97.0 → 1.99.0

package/ts/serve.ts

@@ -1,5 +1,6 @@
 import { mkdir, open, readFile, writeFile } from "fs/promises";
 import { watch } from "node:fs";
+import { fileURLToPath } from "node:url";
 import { createHash, randomBytes, timingSafeEqual } from "crypto";
 import { homedir } from "os";
 import path from "path";
@@ -38,10 +39,7 @@ async function loadOrCreateToken(tokenFlag?: string): Promise<string> {
   }
 }
 
-function checkAuth(req: Request, expectedToken: string): boolean {
-  const auth = req.headers.get("authorization") ?? "";
-  if (!auth.startsWith("Bearer ")) return false;
-  const provided = auth.slice(7);
+function tokenEqual(provided: string, expectedToken: string): boolean {
   // Constant-time compare; pad both to the same length first
   const maxLen = Math.max(provided.length, expectedToken.length);
   const a = Buffer.from(provided.padEnd(maxLen, "\0"));
@@ -49,6 +47,14 @@ function checkAuth(req: Request, expectedToken: string): boolean {
   return timingSafeEqual(a, b) && provided.length === expectedToken.length;
 }
 
+function checkAuth(req: Request, expectedToken: string): boolean {
+  const auth = req.headers.get("authorization") ?? "";
+  if (auth.startsWith("Bearer ")) return tokenEqual(auth.slice(7), expectedToken);
+  // Fallback: ?token= query param — the web UI's EventSource cannot set headers.
+  const q = new URL(req.url).searchParams.get("token");
+  return q ? tokenEqual(q, expectedToken) : false;
+}
+
 const defaultOpts = (overrides: Partial<CommonOpts> = {}): CommonOpts => ({
   all: false,
   active: false,
@@ -77,20 +83,38 @@ async function cmdServeDaemon(sub: string, args: string[]): Promise<number> {
 
   if (sub === "install") {
     const token = await loadOrCreateToken(undefined);
-    // Build the ay serve command with forwarded args (port, host, etc.)
-    const serveCmd = ["ay", "serve", ...args].join(" ");
+    // Build the ay serve command with forwarded args (port, host, --webrtc, etc.).
+    // Absolute paths: oxmgr's daemon environment may not have ~/.bun/bin in
+    // PATH, so a bare `ay` (or its `#!/usr/bin/env bun` shebang) fails to spawn.
+    const ayBin = Bun.which("ay");
+    const serveCmd = [...(ayBin ? [process.execPath, ayBin] : ["ay"]), "serve", ...args].join(" ");
     const proc = Bun.spawn(
       [oxmgrBin, "start", serveCmd, "--name", DAEMON_NAME, "--restart", "always"],
       { stdio: ["ignore", "inherit", "inherit"] },
     );
     const code = await proc.exited;
     if (code === 0) {
+      const portM = /--port[=\s](\d+)/.exec(args.join(" "));
+      const port = portM ? Number(portM[1]) : DEFAULT_PORT;
+      // Mirror cmdServe's mode resolution: webrtc-only daemons open no HTTP port.
+      const webrtcish = args.some((a) => a.startsWith("--webrtc") || a.startsWith("--share"));
+      const httpish =
+        args.some((a) => a.startsWith("--http") || a.startsWith("--share")) ||
+        !args.some((a) => a.startsWith("--webrtc"));
       process.stdout.write(`\ninstalled '${DAEMON_NAME}' as a daemon via oxmgr\n`);
       process.stdout.write(`token: ${token}\n\n`);
-      process.stdout.write(`  ay ls   ${token}@<host>:${DEFAULT_PORT}\n`);
-      process.stdout.write(`  ay remote add <alias> http://${token}@<host>:${DEFAULT_PORT}\n`);
+      if (httpish) {
+        process.stdout.write(`  ay ls   ${token}@<host>:${port}\n`);
+        process.stdout.write(`  ay remote add <alias> http://${token}@<host>:${port}\n`);
+      }
       process.stdout.write(`  ay serve logs                # view server logs\n`);
       process.stdout.write(`  ay serve uninstall           # remove daemon\n`);
+      if (webrtcish) {
+        process.stdout.write(
+          `\nthe WebRTC share link is printed by the daemon — see: ay serve logs\n` +
+            `(the room persists in ~/.agent-yes/.share-room, so the link survives restarts)\n`,
+        );
+      }
     }
     return code ?? 1;
   }
@@ -120,12 +144,22 @@ export async function cmdServe(rest: string[]): Promise<number> {
   if (rest.includes("-h") || rest.includes("--help")) {
     process.stdout.write(
       `Usage: ay serve [options]\n\n` +
-        `Start an HTTP API server so remote machines can list/tail/send agents.\n\n` +
+        `Start an API server (HTTP and/or WebRTC) so browsers and remote machines\n` +
+        `can list/tail/send agents.\n\n` +
+        `Modes (default: --http):\n` +
+        `  --http            HTTP API + web console on --port; no WebRTC\n` +
+        `  --webrtc [URL]    Share over WebRTC (bare flag mints a room+link on\n` +
+        `                    agent-yes.com, or pass webrtc://room:token@host).\n` +
+        `                    Alone it needs NO port — combine with --http for both.\n` +
+        `                    The minted room persists in ~/.agent-yes/.share-room\n` +
+        `                    (stable link across restarts; delete the file to rotate).\n` +
+        `  --share [URL]     Legacy alias for --http --webrtc\n\n` +
         `Options:\n` +
         `  --port N          Port to listen on (default: ${DEFAULT_PORT})\n` +
         `  --host HOST       Interface to bind (default: 127.0.0.1; use 0.0.0.0 to expose)\n` +
         `  --token TOKEN     Auth token (auto-generated and saved if omitted)\n` +
-        `  --share [URL]     Share over WebRTC to agent-yes.com (bare flag mints a room+link)\n` +
+        `  -d, --daemon      Install these flags as a background daemon via oxmgr\n` +
+        `                    (same as: ay serve install <flags>)\n` +
         `  --allow-spawn     Deprecated no-op — the console can always spawn agents\n` +
         `  --tls-cert FILE   TLS certificate PEM\n` +
         `  --tls-key  FILE   TLS private key PEM\n\n` +
@@ -157,10 +191,24 @@ export async function cmdServe(rest: string[]): Promise<number> {
     .option("token", { type: "string", description: "Auth token (auto-generated if omitted)" })
     .option("tls-cert", { type: "string", description: "TLS certificate file (PEM)" })
     .option("tls-key", { type: "string", description: "TLS private key file (PEM)" })
-    .option("share", {
+    .option("http", {
+      type: "boolean",
+      description: "Serve the HTTP API + web console on --port (default mode)",
+    })
+    .option("webrtc", {
       type: "string",
       description:
-        "Share over WebRTC: bare flag mints a room+link, or pass webrtc://room:token@host",
+        "Share over WebRTC: bare flag mints a room+link, or pass webrtc://room:token@host. Needs no port unless combined with --http",
+    })
+    .option("share", {
+      type: "string",
+      description: "Legacy alias for --http --webrtc",
+    })
+    .option("daemon", {
+      alias: "d",
+      type: "boolean",
+      default: false,
+      description: "Install as a background daemon via oxmgr (same as: ay serve install <flags>)",
     })
     .option("allow-spawn", {
       type: "boolean",
@@ -172,6 +220,14 @@ export async function cmdServe(rest: string[]): Promise<number> {
     .exitProcess(false);
 
   const argv = await y.parseAsync();
+
+  // --daemon/-d: install these exact flags as the oxmgr daemon instead of
+  // serving in the foreground (sugar for `ay serve install <flags>`).
+  if (argv.daemon) {
+    const fwd = rest.filter((a) => a !== "--daemon" && a !== "-d");
+    return cmdServeDaemon("install", fwd);
+  }
+
   const port = (argv.port as number) ?? DEFAULT_PORT;
   const host = (argv.host as string) ?? "127.0.0.1";
   const tokenFlag = typeof argv.token === "string" ? argv.token : undefined;
@@ -185,7 +241,13 @@ export async function cmdServe(rest: string[]): Promise<number> {
   const useHttps = !!(certPath && keyPath);
   const scheme = useHttps ? "https" : "http";
 
-  if (host !== "127.0.0.1" && host !== "localhost") {
+  // Modes: --http (HTTP listener + web console), --webrtc (port-free WebRTC
+  // share), or both. Bare `ay serve` stays HTTP-only; --share keeps its old
+  // meaning (HTTP + WebRTC) for existing invocations.
+  const wantWebrtc = argv.webrtc !== undefined || argv.share !== undefined;
+  const wantHttp = argv.http === true || argv.share !== undefined || argv.webrtc === undefined;
+
+  if (wantHttp && host !== "127.0.0.1" && host !== "localhost") {
     process.stderr.write(
       "ay serve: warning: binding to non-loopback — ensure your network is trusted or use Tailscale/VPN\n",
     );
@@ -198,350 +260,440 @@ export async function cmdServe(rest: string[]): Promise<number> {
   // y/N prompt bought no real safety. We just log each spawn so the host sees it.
   // (--allow-spawn is still accepted as a no-op for older invocations.)
 
-  const serverOpts: any = {
-    hostname: host,
-    port,
-    async fetch(req: Request): Promise<Response> {
-      if (!checkAuth(req, token)) {
-        return new Response("Unauthorized", { status: 401 });
+  // Agents retitle their terminal by writing OSC 0/2 (\x1b]2;name\x07) into the
+  // PTY stream we log; surfacing the most recent one lets the console label list
+  // rows without streaming every log. Cached per (size, mtime) — the UI polls
+  // /api/ls every few seconds and exited agents' logs never change again.
+  const titleCache = new Map<string, { size: number; mtimeMs: number; title: string | null }>();
+  const logTitle = async (logFile: string | null | undefined): Promise<string | null> => {
+    if (!logFile) return null;
+    try {
+      const fh = await open(logFile, "r");
+      try {
+        const { size, mtimeMs } = await fh.stat();
+        const hit = titleCache.get(logFile);
+        if (hit && hit.size === size && hit.mtimeMs === mtimeMs) return hit.title;
+        const len = Math.min(size, 65536);
+        const buf = Buffer.allocUnsafe(len);
+        const { bytesRead } = await fh.read(buf, 0, len, size - len);
+        const text = buf.toString("utf-8", 0, bytesRead);
+        // eslint-disable-next-line no-control-regex
+        const oscTitleRe = /\x1b\][02];([^\x07\x1b]*)(?:\x07|\x1b\\)/g;
+        let title: string | null = null;
+        for (let m; (m = oscTitleRe.exec(text)); ) if (m[1]!.trim()) title = m[1]!.trim();
+        titleCache.set(logFile, { size, mtimeMs, title });
+        return title;
+      } finally {
+        await fh.close();
       }
+    } catch {
+      return null;
+    }
+  };
+
+  // The whole API as a plain handler: served over HTTP by Bun.serve (--http)
+  // and called in-process by the WebRTC bridge (--webrtc) — the latter needs
+  // no TCP port at all.
+  const apiFetch = async (req: Request): Promise<Response> => {
+    if (!checkAuth(req, token)) {
+      return new Response("Unauthorized", { status: 401 });
+    }
 
-      const url = new URL(req.url);
-      const p = url.pathname;
+    const url = new URL(req.url);
+    const p = url.pathname;
 
-      // GET /api/ls
-      if (req.method === "GET" && p === "/api/ls") {
-        const keyword = url.searchParams.get("keyword") ?? undefined;
-        const opts = defaultOpts({
-          all: url.searchParams.get("all") === "1",
-          active: url.searchParams.get("active") === "1",
-        });
-        try {
-          const records = await listRecords(keyword, opts);
-          return Response.json(records);
-        } catch (e) {
-          return new Response((e as Error).message, { status: 500 });
-        }
+    // GET /api/ls
+    if (req.method === "GET" && p === "/api/ls") {
+      const keyword = url.searchParams.get("keyword") ?? undefined;
+      const opts = defaultOpts({
+        all: url.searchParams.get("all") === "1",
+        active: url.searchParams.get("active") === "1",
+      });
+      try {
+        const records = await listRecords(keyword, opts);
+        const withTitles = await Promise.all(
+          records.map(async (r) => ({ ...r, title: await logTitle(r.log_file) })),
+        );
+        return Response.json(withTitles);
+      } catch (e) {
+        return new Response((e as Error).message, { status: 500 });
       }
+    }
 
-      // GET /api/notes
-      if (req.method === "GET" && p === "/api/notes") {
-        const notes = await readNotes();
-        return Response.json(Object.fromEntries(notes));
-      }
+    // GET /api/notes
+    if (req.method === "GET" && p === "/api/notes") {
+      const notes = await readNotes();
+      return Response.json(Object.fromEntries(notes));
+    }
 
-      // GET /api/status/:keyword
-      const statusM = /^\/api\/status\/(.+)$/.exec(p);
-      if (req.method === "GET" && statusM) {
-        const keyword = decodeURIComponent(statusM[1]!);
-        try {
-          const record = await resolveOne(keyword, defaultOpts({ all: true }));
-          const snap = await snapshotStatus(record);
-          return Response.json(snap);
-        } catch (e) {
-          return new Response((e as Error).message, { status: 404 });
-        }
+    // GET /api/status/:keyword
+    const statusM = /^\/api\/status\/(.+)$/.exec(p);
+    if (req.method === "GET" && statusM) {
+      const keyword = decodeURIComponent(statusM[1]!);
+      try {
+        const record = await resolveOne(keyword, defaultOpts({ all: true }));
+        const snap = await snapshotStatus(record);
+        return Response.json(snap);
+      } catch (e) {
+        return new Response((e as Error).message, { status: 404 });
       }
+    }
 
-      // GET /api/read/:keyword?mode=cat|tail|head&n=N  — static log read
-      const readM = /^\/api\/read\/(.+)$/.exec(p);
-      if (req.method === "GET" && readM) {
-        const keyword = decodeURIComponent(readM[1]!);
-        const mode = (url.searchParams.get("mode") ?? "tail") as "cat" | "tail" | "head";
-        const n = parseInt(url.searchParams.get("n") ?? "96", 10) || 96;
-        try {
-          const record = await resolveOne(keyword, defaultOpts());
-          if (!record.log_file)
-            return new Response(`pid ${record.pid}: no log_file`, { status: 404 });
-          const buf = await readFile(record.log_file);
-          const text = await renderRawLog(buf, { mode, n });
-          return new Response(text, { headers: { "Content-Type": "text/plain; charset=utf-8" } });
-        } catch (e) {
-          return new Response((e as Error).message, { status: 404 });
-        }
+    // GET /api/read/:keyword?mode=cat|tail|head&n=N  — static log read
+    const readM = /^\/api\/read\/(.+)$/.exec(p);
+    if (req.method === "GET" && readM) {
+      const keyword = decodeURIComponent(readM[1]!);
+      const mode = (url.searchParams.get("mode") ?? "tail") as "cat" | "tail" | "head";
+      const n = parseInt(url.searchParams.get("n") ?? "96", 10) || 96;
+      try {
+        const record = await resolveOne(keyword, defaultOpts());
+        if (!record.log_file)
+          return new Response(`pid ${record.pid}: no log_file`, { status: 404 });
+        const buf = await readFile(record.log_file);
+        const text = await renderRawLog(buf, { mode, n });
+        return new Response(text, { headers: { "Content-Type": "text/plain; charset=utf-8" } });
+      } catch (e) {
+        return new Response((e as Error).message, { status: 404 });
       }
+    }
 
-      // GET /api/size/:keyword — the agent's current PTY size, so the console can
-      // render the existing buffer at the agent's real width before adapting.
-      const sizeM = /^\/api\/size\/(.+)$/.exec(p);
-      if (req.method === "GET" && sizeM) {
-        const keyword = decodeURIComponent(sizeM[1]!);
+    // GET /api/size/:keyword — the agent's current PTY size, so the console can
+    // render the existing buffer at the agent's real width before adapting.
+    const sizeM = /^\/api\/size\/(.+)$/.exec(p);
+    if (req.method === "GET" && sizeM) {
+      const keyword = decodeURIComponent(sizeM[1]!);
+      try {
+        const record = await resolveOne(keyword, defaultOpts());
+        const ayHome = process.env.AGENT_YES_HOME ?? path.join(homedir(), ".agent-yes");
+        let cols: number | null = null;
+        let rows: number | null = null;
         try {
-          const record = await resolveOne(keyword, defaultOpts());
-          const ayHome = process.env.AGENT_YES_HOME ?? path.join(homedir(), ".agent-yes");
-          let cols: number | null = null;
-          let rows: number | null = null;
-          try {
-            const txt = await readFile(path.join(ayHome, "ptysize", String(record.pid)), "utf-8");
-            const [c, r] = txt.trim().split(/\s+/).map(Number);
-            if (c > 0 && r > 0) {
-              cols = c;
-              rows = r;
-            }
-          } catch {
-            /* no ptysize sidecar (older agent or not yet written) */
+          const txt = await readFile(path.join(ayHome, "ptysize", String(record.pid)), "utf-8");
+          const [c = 0, r = 0] = txt.trim().split(/\s+/).map(Number);
+          if (c > 0 && r > 0) {
+            cols = c;
+            rows = r;
           }
-          return Response.json({ pid: record.pid, cols, rows });
-        } catch (e) {
-          return new Response((e as Error).message, { status: 404 });
+        } catch {
+          /* no ptysize sidecar (older agent or not yet written) */
         }
+        return Response.json({ pid: record.pid, cols, rows });
+      } catch (e) {
+        return new Response((e as Error).message, { status: 404 });
       }
+    }
 
-      // GET /api/tail/:keyword  — SSE streaming
-      const tailM = /^\/api\/tail\/(.+)$/.exec(p);
-      if (req.method === "GET" && tailM) {
-        const keyword = decodeURIComponent(tailM[1]!);
-        // raw=1 streams the unmodified PTY bytes (ANSI/cursor control intact) so a
-        // browser xterm.js can render the real terminal; default stays ANSI-stripped.
-        const raw = url.searchParams.get("raw") === "1";
-        try {
-          const record = await resolveOne(keyword, defaultOpts());
-          if (!record.log_file)
-            return new Response(`pid ${record.pid}: no log_file`, { status: 404 });
-          const logPath = record.log_file;
-
-          const stream = new ReadableStream({
-            async start(ctrl) {
-              const enc = new TextEncoder();
-              const send = (text: string) =>
-                ctrl.enqueue(enc.encode(`data: ${JSON.stringify(text)}\n\n`));
-              const ping = () => ctrl.enqueue(enc.encode(": ping\n\n"));
-
-              // Initial tail. Raw: replay the last ~64 KB of PTY bytes (enough to
-              // contain a recent full-screen redraw so xterm converges fast).
-              const initBuf = await readFile(logPath).catch(() => Buffer.alloc(0));
-              if (raw)
-                send(new TextDecoder().decode(initBuf.slice(Math.max(0, initBuf.length - 65536))));
-              else send(await renderRawLog(initBuf, { mode: "tail", n: 96 }));
-
-              let offset = initBuf.length;
-              let closed = false;
-
-              const heartbeat = setInterval(() => {
-                if (closed) {
-                  clearInterval(heartbeat);
-                  return;
-                }
-                ping();
-              }, 15_000);
-
-              // eslint-disable-next-line no-control-regex
-              const ansiRe =
-                /\x1b\[[0-?]*[ -/]*[@-~]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)|\x1b[@-Z\\-_]/g;
-              // eslint-disable-next-line no-control-regex
-              const ctrlRe = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g;
-
-              // Stream only the bytes appended since `offset` (incremental read,
-              // not a full re-read), driven by fs.watch for near-instant echo with
-              // a short fallback poll in case the watcher misses an event. The old
-              // 300 ms full-file poll was the dominant typing-echo latency.
-              const fh = await open(logPath, "r").catch(() => null);
-              let reading = false;
-              const flush = async () => {
-                if (closed || reading || !fh) return;
-                reading = true;
-                try {
-                  const { size } = await fh.stat();
-                  if (size < offset) offset = size; // truncated/rotated
-                  if (size > offset) {
-                    const len = size - offset;
-                    const buf = Buffer.allocUnsafe(len);
-                    const { bytesRead } = await fh.read(buf, 0, len, offset);
-                    offset += bytesRead;
-                    const chunk = buf.subarray(0, bytesRead);
-                    if (raw) {
-                      send(new TextDecoder().decode(chunk));
-                    } else {
-                      const text = new TextDecoder()
-                        .decode(chunk)
-                        .replace(ansiRe, "")
-                        .replace(ctrlRe, "");
-                      if (text.trim()) send(text.trimStart());
-                    }
+    // GET /api/tail/:keyword  — SSE streaming
+    const tailM = /^\/api\/tail\/(.+)$/.exec(p);
+    if (req.method === "GET" && tailM) {
+      const keyword = decodeURIComponent(tailM[1]!);
+      // raw=1 streams the unmodified PTY bytes (ANSI/cursor control intact) so a
+      // browser xterm.js can render the real terminal; default stays ANSI-stripped.
+      const raw = url.searchParams.get("raw") === "1";
+      try {
+        const record = await resolveOne(keyword, defaultOpts());
+        if (!record.log_file)
+          return new Response(`pid ${record.pid}: no log_file`, { status: 404 });
+        const logPath = record.log_file;
+
+        const stream = new ReadableStream({
+          async start(ctrl) {
+            const enc = new TextEncoder();
+            const send = (text: string) =>
+              ctrl.enqueue(enc.encode(`data: ${JSON.stringify(text)}\n\n`));
+            const ping = () => ctrl.enqueue(enc.encode(": ping\n\n"));
+
+            // Initial tail. Raw: replay the last ~64 KB of PTY bytes (enough to
+            // contain a recent full-screen redraw so xterm converges fast).
+            const initBuf = await readFile(logPath).catch(() => Buffer.alloc(0));
+            if (raw)
+              send(new TextDecoder().decode(initBuf.slice(Math.max(0, initBuf.length - 65536))));
+            else send(await renderRawLog(initBuf, { mode: "tail", n: 96 }));
+
+            let offset = initBuf.length;
+            let closed = false;
+
+            const heartbeat = setInterval(() => {
+              if (closed) {
+                clearInterval(heartbeat);
+                return;
+              }
+              ping();
+            }, 15_000);
+
+            // eslint-disable-next-line no-control-regex
+            const ansiRe =
+              /\x1b\[[0-?]*[ -/]*[@-~]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)|\x1b[@-Z\\-_]/g;
+            // eslint-disable-next-line no-control-regex
+            const ctrlRe = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g;
+
+            // Stream only the bytes appended since `offset` (incremental read,
+            // not a full re-read), driven by fs.watch for near-instant echo with
+            // a short fallback poll in case the watcher misses an event. The old
+            // 300 ms full-file poll was the dominant typing-echo latency.
+            const fh = await open(logPath, "r").catch(() => null);
+            let reading = false;
+            const flush = async () => {
+              if (closed || reading || !fh) return;
+              reading = true;
+              try {
+                const { size } = await fh.stat();
+                if (size < offset) offset = size; // truncated/rotated
+                if (size > offset) {
+                  const len = size - offset;
+                  const buf = Buffer.allocUnsafe(len);
+                  const { bytesRead } = await fh.read(buf, 0, len, offset);
+                  offset += bytesRead;
+                  const chunk = buf.subarray(0, bytesRead);
+                  if (raw) {
+                    send(new TextDecoder().decode(chunk));
+                  } else {
+                    const text = new TextDecoder()
+                      .decode(chunk)
+                      .replace(ansiRe, "")
+                      .replace(ctrlRe, "");
+                    if (text.trim()) send(text.trimStart());
                   }
-                } catch {
-                  /* log gone */
-                } finally {
-                  reading = false;
                 }
-              };
+              } catch {
+                /* log gone */
+              } finally {
+                reading = false;
+              }
+            };
 
-              let watcher: ReturnType<typeof watch> | null = null;
+            let watcher: ReturnType<typeof watch> | null = null;
+            try {
+              watcher = watch(logPath, () => void flush());
+            } catch {
+              /* fs.watch unsupported — the fallback poll below still works */
+            }
+            const poller = setInterval(() => void flush(), 60);
+
+            req.signal.addEventListener("abort", () => {
+              closed = true;
+              clearInterval(heartbeat);
+              clearInterval(poller);
               try {
-                watcher = watch(logPath, () => void flush());
+                watcher?.close();
               } catch {
-                /* fs.watch unsupported — the fallback poll below still works */
+                /* already closed */
               }
-              const poller = setInterval(() => void flush(), 60);
+              void fh?.close().catch(() => {});
+              try {
+                ctrl.close();
+              } catch {
+                /* already closed */
+              }
+            });
+          },
+        });
 
-              req.signal.addEventListener("abort", () => {
-                closed = true;
-                clearInterval(heartbeat);
-                clearInterval(poller);
-                try {
-                  watcher?.close();
-                } catch {
-                  /* already closed */
-                }
-                void fh?.close().catch(() => {});
-                try {
-                  ctrl.close();
-                } catch {
-                  /* already closed */
-                }
-              });
-            },
-          });
-
-          return new Response(stream, {
-            headers: {
-              "Content-Type": "text/event-stream",
-              "Cache-Control": "no-cache",
-              Connection: "keep-alive",
-            },
-          });
-        } catch (e) {
-          return new Response((e as Error).message, { status: 404 });
-        }
+        return new Response(stream, {
+          headers: {
+            "Content-Type": "text/event-stream",
+            "Cache-Control": "no-cache",
+            Connection: "keep-alive",
+          },
+        });
+      } catch (e) {
+        return new Response((e as Error).message, { status: 404 });
       }
+    }
 
-      // POST /api/send  body: {keyword, msg, code?}
-      if (req.method === "POST" && p === "/api/send") {
-        let body: { keyword: string; msg: string; code?: string };
-        try {
-          body = await req.json();
-        } catch {
-          return new Response("invalid JSON body", { status: 400 });
-        }
-        const { keyword, msg = "", code = "enter" } = body;
-        if (!keyword || typeof keyword !== "string") {
-          return new Response("missing keyword", { status: 400 });
-        }
-        try {
-          const record = await resolveOne(keyword, defaultOpts());
-          if (!record.fifo_file)
-            return new Response(`pid ${record.pid}: no fifo_file`, { status: 409 });
-          const trailing = controlCodeFromName(code.toLowerCase());
-          if (msg && trailing) {
-            await writeToIpc(record.fifo_file, msg);
-            await new Promise((r) => setTimeout(r, 200));
-            await writeToIpc(record.fifo_file, trailing);
-          } else {
-            await writeToIpc(record.fifo_file, msg + trailing);
-          }
-          return Response.json({ ok: true, pid: record.pid });
-        } catch (e) {
-          return new Response((e as Error).message, { status: 404 });
+    // POST /api/send  body: {keyword, msg, code?}
+    if (req.method === "POST" && p === "/api/send") {
+      let body: { keyword: string; msg: string; code?: string };
+      try {
+        body = (await req.json()) as typeof body;
+      } catch {
+        return new Response("invalid JSON body", { status: 400 });
+      }
+      const { keyword, msg = "", code = "enter" } = body;
+      if (!keyword || typeof keyword !== "string") {
+        return new Response("missing keyword", { status: 400 });
+      }
+      try {
+        const record = await resolveOne(keyword, defaultOpts());
+        if (!record.fifo_file)
+          return new Response(`pid ${record.pid}: no fifo_file`, { status: 409 });
+        const trailing = controlCodeFromName(code.toLowerCase());
+        if (msg && trailing) {
+          await writeToIpc(record.fifo_file, msg);
+          await new Promise((r) => setTimeout(r, 200));
+          await writeToIpc(record.fifo_file, trailing);
+        } else {
+          await writeToIpc(record.fifo_file, msg + trailing);
         }
+        return Response.json({ ok: true, pid: record.pid });
+      } catch (e) {
+        return new Response((e as Error).message, { status: 404 });
       }
+    }
 
-      // POST /api/resize/:keyword  body {cols, rows} — drive the agent's PTY size.
-      // Mirrors `ay attach`: write ~/.agent-yes/winsize/<pid> then SIGWINCH; the
-      // agent's resize listener picks it up and reflows its TUI to that width.
-      const resizeM = /^\/api\/resize\/(.+)$/.exec(p);
-      if (req.method === "POST" && resizeM) {
-        const keyword = decodeURIComponent(resizeM[1]!);
-        let body: { cols?: number; rows?: number };
+    // POST /api/resize/:keyword  body {cols, rows} — drive the agent's PTY size.
+    // Mirrors `ay attach`: write ~/.agent-yes/winsize/<pid> then SIGWINCH; the
+    // agent's resize listener picks it up and reflows its TUI to that width.
+    const resizeM = /^\/api\/resize\/(.+)$/.exec(p);
+    if (req.method === "POST" && resizeM) {
+      const keyword = decodeURIComponent(resizeM[1]!);
+      let body: { cols?: number; rows?: number };
+      try {
+        body = (await req.json()) as typeof body;
+      } catch {
+        return new Response("invalid JSON body", { status: 400 });
+      }
+      const cols = Math.max(1, Math.floor(Number(body.cols) || 0));
+      const rows = Math.max(1, Math.floor(Number(body.rows) || 0));
+      if (!cols || !rows) return new Response("missing cols/rows", { status: 400 });
+      try {
+        const record = await resolveOne(keyword, defaultOpts());
+        const ayHome = process.env.AGENT_YES_HOME ?? path.join(homedir(), ".agent-yes");
+        const winsizeDir = path.join(ayHome, "winsize");
+        await mkdir(winsizeDir, { recursive: true });
+        await writeFile(
+          path.join(winsizeDir, String(record.pid)),
+          `${cols} ${rows} ${Date.now()}\n`,
+        );
         try {
-          body = await req.json();
+          process.kill(record.pid, "SIGWINCH");
         } catch {
-          return new Response("invalid JSON body", { status: 400 });
-        }
-        const cols = Math.max(1, Math.floor(Number(body.cols) || 0));
-        const rows = Math.max(1, Math.floor(Number(body.rows) || 0));
-        if (!cols || !rows) return new Response("missing cols/rows", { status: 400 });
-        try {
-          const record = await resolveOne(keyword, defaultOpts());
-          const ayHome = process.env.AGENT_YES_HOME ?? path.join(homedir(), ".agent-yes");
-          const winsizeDir = path.join(ayHome, "winsize");
-          await mkdir(winsizeDir, { recursive: true });
-          await writeFile(
-            path.join(winsizeDir, String(record.pid)),
-            `${cols} ${rows} ${Date.now()}\n`,
-          );
-          try {
-            process.kill(record.pid, "SIGWINCH");
-          } catch {
-            /* agent gone */
-          }
-          return Response.json({ ok: true, pid: record.pid, cols, rows });
-        } catch (e) {
-          return new Response((e as Error).message, { status: 404 });
+          /* agent gone */
         }
+        return Response.json({ ok: true, pid: record.pid, cols, rows });
+      } catch (e) {
+        return new Response((e as Error).message, { status: 404 });
       }
+    }
 
-      // POST /api/spawn  body {cli, cwd, prompt} — launch a new agent
-      if (req.method === "POST" && p === "/api/spawn") {
-        let body: { cli?: string; cwd?: string; prompt?: string };
-        try {
-          body = await req.json();
-        } catch {
-          return new Response("invalid JSON body", { status: 400 });
-        }
-        const cli = String(body.cli ?? "claude");
-        if (!SUPPORTED_CLIS.includes(cli as never))
-          return new Response(`unsupported cli: ${cli}`, { status: 400 });
-        const cwd = typeof body.cwd === "string" && body.cwd ? body.cwd : process.cwd();
-        const prompt = String(body.prompt ?? "");
-        process.stderr.write(
-          `→ console spawned:  ay ${cli}${prompt ? ` -- "${prompt.slice(0, 60)}"` : ""}  (cwd: ${cwd})\n`,
-        );
-        try {
-          const child = Bun.spawn(["ay", cli, ...(prompt ? ["--", prompt] : [])], {
-            cwd,
-            stdin: "ignore",
-            stdout: "ignore",
-            stderr: "ignore",
-          });
-          child.unref();
-          return Response.json({ ok: true, pid: child.pid, cli, cwd });
-        } catch (e) {
-          return new Response((e as Error).message, { status: 500 });
-        }
+    // POST /api/spawn  body {cli, cwd, prompt} — launch a new agent
+    if (req.method === "POST" && p === "/api/spawn") {
+      let body: { cli?: string; cwd?: string; prompt?: string };
+      try {
+        body = (await req.json()) as typeof body;
+      } catch {
+        return new Response("invalid JSON body", { status: 400 });
+      }
+      const cli = String(body.cli ?? "claude");
+      if (!SUPPORTED_CLIS.includes(cli as never))
+        return new Response(`unsupported cli: ${cli}`, { status: 400 });
+      const cwd = typeof body.cwd === "string" && body.cwd ? body.cwd : process.cwd();
+      const prompt = String(body.prompt ?? "");
+      process.stderr.write(
+        `→ console spawned:  ay ${cli}${prompt ? ` -- "${prompt.slice(0, 60)}"` : ""}  (cwd: ${cwd})\n`,
+      );
+      try {
+        const child = Bun.spawn(["ay", cli, ...(prompt ? ["--", prompt] : [])], {
+          cwd,
+          stdin: "ignore",
+          stdout: "ignore",
+          stderr: "ignore",
+        });
+        child.unref();
+        return Response.json({ ok: true, pid: child.pid, cli, cwd });
+      } catch (e) {
+        return new Response((e as Error).message, { status: 500 });
       }
+    }
+
+    return new Response("Not Found", { status: 404 });
+  };
 
-      return new Response("Not Found", { status: 404 });
-    },
+  // Web console: the lab UI served straight from the package, so --http needs
+  // no separate proxy and no agent-yes.com. Static routes are unauthenticated
+  // (the page holds no secrets); the page carries the token via the #k= link
+  // and sends it on every /api call.
+  const uiDir = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "lab", "ui");
+  const serveUiFile = async (name: string, type: string): Promise<Response> => {
+    try {
+      const buf = await readFile(path.join(uiDir, name));
+      return new Response(buf, { headers: { "Content-Type": type } });
+    } catch {
+      return new Response("UI assets not found in this install — use the /api endpoints", {
+        status: 404,
+      });
+    }
+  };
+  const httpFetch = async (req: Request): Promise<Response> => {
+    const p = new URL(req.url).pathname;
+    if (req.method === "GET" && (p === "/" || p === "/index.html"))
+      return serveUiFile("index.html", "text/html; charset=utf-8");
+    if (req.method === "GET" && p === "/room-client.js")
+      return serveUiFile("room-client.js", "text/javascript; charset=utf-8");
+    if (req.method === "GET" && p === "/favicon.ico") return new Response(null, { status: 204 });
+    return apiFetch(req);
   };
 
+  const serverOpts: any = {
+    hostname: host,
+    port,
+    idleTimeout: 0, // never time out SSE/tail streams
+    fetch: httpFetch,
+  };
   if (useHttps) {
     serverOpts.tls = { cert: Bun.file(certPath!), key: Bun.file(keyPath!) };
   }
 
-  const server = Bun.serve(serverOpts);
-
-  process.stdout.write(`ay serve  ${scheme}://${host}:${port}\n`);
-  process.stdout.write(`token:    ${token}\n\n`);
-  process.stdout.write(`connect from another machine:\n`);
-  process.stdout.write(`  ay ls   ${token}@<host>:${port}\n`);
-  process.stdout.write(`  ay tail ${token}@<host>:${port}:<keyword>\n`);
-  process.stdout.write(`  ay send ${token}@<host>:${port}:<keyword> "message"\n\n`);
-  process.stdout.write(`save as alias:\n`);
-  process.stdout.write(`  ay remote add <alias> ${scheme}://${token}@<host>:${port}\n\n`);
-  if (!useHttps) {
-    process.stdout.write(
-      `for HTTPS: ay serve --tls-cert cert.pem --tls-key key.pem\n` +
-        `  openssl req -x509 -newkey rsa:2048 -keyout key.pem -out cert.pem -days 365 -nodes -subj '/CN=localhost'\n\n`,
-    );
+  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;
+      }
+      throw e;
+    }
+
+    const uiHost = host === "0.0.0.0" || host === "::" ? "127.0.0.1" : host;
+    process.stdout.write(`ay serve  ${scheme}://${host}:${port}\n`);
+    process.stdout.write(`token:    ${token}\n\n`);
+    process.stdout.write(`web console (token in the # is eaten on open):\n`);
+    process.stdout.write(`  ${scheme}://${uiHost}:${port}/#k=${token}\n\n`);
+    process.stdout.write(`connect from another machine:\n`);
+    process.stdout.write(`  ay ls   ${token}@<host>:${port}\n`);
+    process.stdout.write(`  ay tail ${token}@<host>:${port}:<keyword>\n`);
+    process.stdout.write(`  ay send ${token}@<host>:${port}:<keyword> "message"\n\n`);
+    process.stdout.write(`save as alias:\n`);
+    process.stdout.write(`  ay remote add <alias> ${scheme}://${token}@<host>:${port}\n\n`);
+    if (!useHttps) {
+      process.stdout.write(
+        `for HTTPS: ay serve --tls-cert cert.pem --tls-key key.pem\n` +
+          `  openssl req -x509 -newkey rsa:2048 -keyout key.pem -out cert.pem -days 365 -nodes -subj '/CN=localhost'\n\n`,
+      );
+    }
   }
-  // --share: bridge this local server to a WebRTC room so the agent-yes.com
-  // console can reach it peer-to-peer. Bare flag mints a room; a webrtc:// value
-  // joins an explicit one.
-  if (argv.share !== undefined) {
-    const shareUrl =
-      typeof argv.share === "string" && argv.share.startsWith("webrtc://") ? argv.share : undefined;
+
+  // --webrtc / --share: bridge to a WebRTC room so the agent-yes.com console
+  // can reach this machine peer-to-peer. The bridge calls apiFetch in-process,
+  // so without --http no port is opened at all. Bare flag mints a room; a
+  // webrtc:// value joins an explicit one.
+  if (wantWebrtc) {
+    const webrtcVal = (argv.webrtc ?? argv.share) as string | undefined;
+    const explicitUrl =
+      typeof webrtcVal === "string" && webrtcVal.startsWith("webrtc://") ? webrtcVal : undefined;
     try {
-      const { startShare } = await import("./share.ts");
+      const { startShare, loadOrCreateShareRoom } = await import("./share.ts");
+      // No explicit webrtc:// URL → reuse the persisted room (minted once and
+      // saved like the serve token), so the link is stable across restarts.
       const { link } = await startShare({
-        url: shareUrl,
-        apiUrl: `http://127.0.0.1:${port}`,
+        url: explicitUrl ?? (await loadOrCreateShareRoom()),
+        localFetch: apiFetch,
         apiToken: token,
       });
       process.stdout.write(
-        `\nshared over WebRTC — open this link (the token is eaten from the URL on open):\n  ${link}\n\n`,
+        `${wantHttp ? "\n" : ""}shared over WebRTC — open this link (the token is eaten from the URL on open):\n  ${link}\n` +
+          (explicitUrl
+            ? "\n"
+            : `  (persistent room — same link across restarts; delete ~/.agent-yes/.share-room to rotate)\n\n`),
       );
     } catch (e) {
-      process.stderr.write(`ay serve --share failed: ${(e as Error).message}\n`);
+      process.stderr.write(`ay serve --webrtc failed: ${(e as Error).message}\n`);
+      if (!wantHttp) return 1; // nothing else is running
     }
   }
 
@@ -549,11 +701,11 @@ export async function cmdServe(rest: string[]): Promise<number> {
 
   await new Promise<void>((resolve) => {
     process.on("SIGINT", () => {
-      server.stop();
+      server?.stop();
       resolve();
     });
     process.on("SIGTERM", () => {
-      server.stop();
+      server?.stop();
       resolve();
     });
   });