agent-dag 1.33.48 → 1.33.50

package/dist/web/index.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>agents-deck</title>
     <link rel="icon" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'%3E%3Ctext y='84' font-size='84'%3E%E2%97%89%3C/text%3E%3C/svg%3E" />
-    <script type="module" crossorigin src="/assets/index-Be_fgBgZ.js"></script>
+    <script type="module" crossorigin src="/assets/index-BS3_wQrE.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-CF2yG9oG.css">
   </head>
   <body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-dag",
-  "version": "1.33.48",
+  "version": "1.33.50",
   "description": "Live deck of Claude Code and Codex agents — watch parallel subagents fork, call tools, and return on one calm canvas. Also available as npx ccdeck and npx agent-dag.",
   "type": "module",
   "bin": {

package/src/server/cswap-admin.mjs

@@ -158,7 +158,27 @@ export function extractLoginUrl(text) {
 
 // The prompt the CLI blocks on. Matched rather than assumed: writing a code
 // into a child that is not asking for one would send it somewhere unknown.
-const CODE_PROMPT = /paste code here/i;
+const CODE_PROMPT = /paste code here/gi;
+
+/**
+ * How many times one line of output asks for the code.
+ *
+ * Per LINE, not per delivery. The prompt ends without a newline, so exec.mjs
+ * re-offers the same unterminated line on every chunk as it grows — and both
+ * streams share that buffer, so a progress dot, a `\r` spinner frame on stderr,
+ * or simply the prompt split across two writes all arrive as the ask again,
+ * a few characters longer. Counting an ask whenever the text merely CHANGED, as
+ * this used to, turned any of those into a phantom second prompt, and a second
+ * prompt is exactly how submitLoginCode hears "that code was rejected": a
+ * login the CLI was busy completing came back as `code_rejected`, with the
+ * account unregistered and the live credentials left switched.
+ *
+ * A real re-ask writes the prompt again — on a fresh line, or after a `\r`
+ * redraw of this one — so it shows up as another match, not as a longer tail.
+ */
+export function countCodePrompts(line) {
+  return (stripTerminalEscapes(line).match(CODE_PROMPT) ?? []).length;
+}
 
 /**
  * The whole login, as one object, because the browser talks to it twice: once
@@ -219,23 +239,27 @@ export async function startLogin({ email } = {}) {
     // exit, it just asks again, so waiting for exit would hang for the whole
     // five-minute window on a typo.
     prompts: 0,
-    lastPromptText: "",
   };
   const flow = _login;
 
-  child.onLine((line) => {
+  // How many asks the line currently being written has already contributed.
+  // The prompt is an unterminated line, re-delivered as it grows, so the same
+  // ask arrives over and over — and once more, whole, when something else
+  // finally ends the line.
+  let countedOnLine = 0;
+
+  child.onLine((line, partial) => {
     if (!flow.url) {
       const url = extractLoginUrl(line);
       if (url) { flow.url = url; flow.state = "awaiting_code"; }
     }
-    // The prompt is an unterminated line, re-delivered as it grows, so the
-    // same ask must not count twice.
-    const clean = stripTerminalEscapes(line);
-    if (CODE_PROMPT.test(clean)) {
-      if (clean !== flow.lastPromptText) { flow.prompts += 1; flow.lastPromptText = clean; }
-    } else if (clean.trim()) {
-      flow.lastPromptText = "";
+    const asks = countCodePrompts(line);
+    if (asks > countedOnLine) {
+      flow.prompts += asks - countedOnLine;
+      countedOnLine = asks;
     }
+    // A newline ended that line; whatever comes next is a new one.
+    if (!partial) countedOnLine = 0;
   });
   // The child dying before the code was accepted is a failure of the login, not
   // of the deck; say so rather than leaving the dialog spinning.

package/src/server/index.mjs

@@ -898,9 +898,18 @@ async function codexScanOnce(firstRun) {
   }
 }
 
-function startCodexWatcher(workspace) {
+export function startCodexWatcher(workspace) {
   codexWorkspace = workspace ?? "";
-  if (!existsSync(CODEX_SESSIONS_DIR)) return null;
+  // Deliberately not gated on CODEX_SESSIONS_DIR existing. `codex login`
+  // creates ~/.codex, but sessions/ only appears when the first session
+  // starts — and rollout tailing is the only Codex capture path there is, so
+  // bailing out here meant a fresh install had to restart the deck before any
+  // Codex agent ever showed up, while the banner claimed to be watching.
+  // listRecentCodexRollouts returns [] while the directory is missing, so the
+  // poll below is a cheap no-op that doubles as the existence re-check. A
+  // filesystem watch is no help: fs.watch on a missing path throws, and
+  // watching the parent recursively is macOS/Windows-only.
+  //
   // Initial catalog: create roots for in-progress sessions, skip their
   // history, then poll for new lines.
   codexScanOnce(true).catch(() => {});
@@ -909,6 +918,12 @@ function startCodexWatcher(workspace) {
   return codexWatchTimer;
 }
 
+/** Envelopes newer than `seq` from the ring buffer, oldest first. */
+export function eventsSince(seq) {
+  const after = Number(seq) || 0;
+  return events.filter(e => e.seq > after);
+}
+
 function pushEvent(raw, source, opts = {}) {
   // Synchronous enrichment: if we already know this session's model, stamp
   // it on the payload so the client's recursive scanner picks it up.
@@ -1513,8 +1528,7 @@ export async function startServer({ port = 4317, host = "127.0.0.1", persist = n
     if (req.method === "POST" && url.pathname === "/api/cswap-auto")  return guard(handleCswapAutoAction(req, res), res);
 
     if (req.method === "GET" && url.pathname === "/api/events") {
-      const since = Number(url.searchParams.get("since") ?? 0);
-      return send(res, 200, events.filter(e => e.seq > since));
+      return send(res, 200, eventsSince(url.searchParams.get("since") ?? 0));
     }
 
     // POST /api/clear — wipe in-memory buffer + persistence file (UI reset)