frizz 0.12.1 → 0.12.3

package/dist/dev-child.js

@@ -15575,6 +15575,12 @@ ${DISPATCH_TASK_BANNER}
       // disagree. Additive + optional: absent from a legacy transcript or an older server, and the client
       // falls back to `parseGithubWakeSteer` on the text.
       wakeSteer: GithubWakeSteer.optional(),
+      // Input delivered INTO a sub-agent by its coordinator or another agent. It is a user-side turn in
+      // that CHILD's conversation, but it is not the human speaking. The drawer's live projection keeps
+      // these messages even when the ordinary 300-message tail has moved past them — clicking a parent's
+      // "Steered"/"Followed up" divider promises the corresponding instruction remains readable there.
+      // Additive + optional: ordinary thread transcripts never set it.
+      agentInstruction: external_exports.literal(true).optional(),
       // A SUB-AGENT (or peer session) wrote this user turn, not the human — the same defect class `wake`
       // above corrects. Claude Code's agent-to-agent channel (a background child calling
       // `SendMessage({to:"main"})`) delivers UPWARD into the parent's queue like any follow-up, so the
@@ -16458,7 +16464,14 @@ function resolveProjectIdentity(dir, home = homedir5()) {
   return { id: ensureProjectIdFile(root, home, git2?.id), scope: git2?.scope ?? "repository", root };
 }
 function cwdSlug(absPath) {
-  return absPath.replace(/[/.]/g, "-");
+  const slug = absPath.replace(/[^A-Za-z0-9]/g, "-");
+  if (slug.length <= CWD_SLUG_MAX) return slug;
+  return `${slug.slice(0, CWD_SLUG_MAX)}-${Math.abs(cwdSlugHash(absPath)).toString(36)}`;
+}
+function cwdSlugHash(absPath) {
+  let hash = 0;
+  for (let i = 0; i < absPath.length; i++) hash = (hash << 5) - hash + absPath.charCodeAt(i) | 0;
+  return hash;
 }
 function registerAndReconcile(dir, id, home) {
   const remoteOwner = resolveProjectLabel(dir)?.split("/")[0];
@@ -16541,6 +16554,7 @@ function projectFromLaunchTarget(target, env = process.env) {
     ...target.identityScope === "worktree" ? { identityScope: "worktree" } : {}
   };
 }
+var CWD_SLUG_MAX;
 var init_project = __esm({
   "packages/server/src/project.ts"() {
     "use strict";
@@ -16551,6 +16565,7 @@ var init_project = __esm({
     init_project_identity();
     init_github();
     init_project_identity();
+    CWD_SLUG_MAX = 200;
   }
 });
 
@@ -19419,6 +19434,7 @@ function createStorage(source, projectId) {
   `);
   const delThreadQuestions = scope.prepare("DELETE FROM thread_question WHERE project_id = @project_id AND thread_slug = ?");
   const delThreadDone = scope.prepare("DELETE FROM thread_done WHERE project_id = @project_id AND thread_slug = ?");
+  const delSubAgentSteers = scope.prepare("DELETE FROM subagent_steer WHERE project_id = @project_id AND thread_slug = ?");
   const markThreadDoneStmt = scope.prepare(`
     INSERT INTO thread_done (project_id, thread_slug, body, done_at) VALUES (@project_id, ?, ?, ?)
     ON CONFLICT(project_id, thread_slug) DO UPDATE SET body = excluded.body, done_at = excluded.done_at
@@ -19428,6 +19444,17 @@ function createStorage(source, projectId) {
     "SELECT thread_slug, body, done_at FROM thread_done WHERE project_id = @project_id"
   );
   const clearThreadDoneStmt = scope.prepare("DELETE FROM thread_done WHERE project_id = @project_id AND thread_slug = ?");
+  const recordSubAgentSteerStmt = scope.prepare(`
+    INSERT OR IGNORE INTO subagent_steer (
+      project_id, thread_slug, subagent_id, delivery_id, message, sent_at
+    ) VALUES (@project_id, @slug, @subAgentId, @deliveryId, @message, @sentAtMs)
+  `);
+  const listSubAgentSteersStmt = scope.prepare(`
+    SELECT thread_slug, subagent_id, delivery_id, message, sent_at
+    FROM subagent_steer
+    WHERE project_id = @project_id AND thread_slug = ? AND subagent_id = ?
+    ORDER BY sent_at, rowid
+  `);
   const clearExpiredSnoozesStmt = scope.prepare(`
     UPDATE session SET snoozed_until = NULL
     WHERE project_id = @project_id AND snoozed_until IS NOT NULL AND snoozed_until <= ? AND snooze_prompt IS NULL
@@ -19482,6 +19509,7 @@ function createStorage(source, projectId) {
     delThreadWatches.run(existing.slug);
     delThreadQuestions.run(existing.slug);
     delThreadDone.run(existing.slug);
+    delSubAgentSteers.run(existing.slug);
     delSession.run(existing.slug);
     return existing;
   };
@@ -19975,6 +20003,10 @@ function createStorage(source, projectId) {
       return bySlug;
     },
     clearThreadDone: (slug) => clearThreadDoneStmt.run(slug).changes > 0,
+    recordSubAgentSteer: (row) => {
+      recordSubAgentSteerStmt.run(row);
+    },
+    listSubAgentSteers: (slug, subAgentId) => listSubAgentSteersStmt.all(slug, subAgentId),
     dropThreadWatch: (slug, id, settledAtMs) => dropThreadWatchStmt.run(settledAtMs, id, slug).changes === 1,
     settleThreadWatch: (id, settledAtMs, state = "settled") => settleThreadWatchStmt.run(state, settledAtMs, id).changes === 1,
     armThreadTimer: (timer) => void armTimerStmt.run(timer),
@@ -20473,6 +20505,20 @@ var init_storage = __esm({
       done_at     INTEGER NOT NULL,
       PRIMARY KEY (project_id, thread_slug)
     );
+    -- Operator-authored steers sent from a sub-agent drawer. The Claude broker intentionally does not
+    -- persist these as user records in the child's provider transcript, but Frizz possesses the text
+    -- at delivery time and the drawer must not forget what the operator sent.
+    CREATE TABLE IF NOT EXISTS subagent_steer (
+      project_id  TEXT NOT NULL,
+      thread_slug TEXT NOT NULL,
+      subagent_id TEXT NOT NULL,
+      delivery_id TEXT NOT NULL,
+      message     TEXT NOT NULL,
+      sent_at     INTEGER NOT NULL,
+      PRIMARY KEY (project_id, thread_slug, subagent_id, delivery_id)
+    );
+    CREATE INDEX IF NOT EXISTS subagent_steer_timeline
+      ON subagent_steer(project_id, thread_slug, subagent_id, sent_at);
 `;
     STORAGE_TABLES = [
       "session",
@@ -20485,7 +20531,8 @@ var init_storage = __esm({
       "pr_watch",
       "thread_watch",
       "thread_question",
-      "thread_done"
+      "thread_done",
+      "subagent_steer"
     ];
   }
 });
@@ -23746,6 +23793,7 @@ function applyEvent(state, ev) {
       state.sawRecords = true;
       break;
     case "agent-report":
+    case "agent-instruction":
       state.sawRecords = true;
       break;
     case "title":
@@ -25534,32 +25582,47 @@ function parseCodexLine(line) {
     if (pt === "agent_message") {
       const author = typeof p.author === "string" ? p.author : "";
       const recipient = typeof p.recipient === "string" ? p.recipient : "";
-      if (!author || !recipient || !author.startsWith(`${recipient}/`)) return [];
-      const report = parseCodexAgentReport(p.content);
-      return report ? [{ kind: "agent-report", at, author, text: report.body, final: report.final }] : [];
+      if (!author || !recipient) return [];
+      const message = parseCodexAgentMessage(p.content);
+      if (!message) return [];
+      if (author.startsWith(`${recipient}/`)) {
+        if (message.type !== "FINAL_ANSWER" && message.type !== "MESSAGE") return [];
+        return [{ kind: "agent-report", at, author, text: message.body, final: message.type === "FINAL_ANSWER" }];
+      }
+      if (author !== recipient && (message.type === "NEW_TASK" || message.type === "MESSAGE")) {
+        return [{
+          kind: "agent-instruction",
+          at,
+          author,
+          ...message.body ? { text: message.body } : {},
+          encrypted: message.encrypted
+        }];
+      }
+      return [];
     }
     return [];
   }
   return [];
 }
-function parseCodexAgentReport(content) {
+function parseCodexAgentMessage(content) {
   if (!Array.isArray(content)) return void 0;
   let text2;
+  let encrypted = false;
   for (const block of content) {
     if (!block || typeof block !== "object") continue;
     const b = block;
+    if (b.type === "encrypted_content") encrypted = true;
     if (b.type === "input_text" && typeof b.text === "string") {
       text2 = b.text;
-      break;
     }
   }
   if (!text2) return void 0;
   const type = text2.match(/^Message Type:[ \t]*(\S+)/)?.[1];
-  if (type !== "FINAL_ANSWER" && type !== "MESSAGE") return void 0;
+  if (!type) return void 0;
   const marker = text2.match(/^Payload:[ \t]*$/m);
   if (!marker || marker.index === void 0) return void 0;
   const body = text2.slice(marker.index + marker[0].length).replace(/^\n/, "").trim();
-  return { final: type === "FINAL_ANSWER", body };
+  return { type, body, encrypted };
 }
 function parseCodexSubAgentLine(line, toolNameFor) {
   const s = line.trim();
@@ -29931,7 +29994,8 @@ function readNativeRecord(stateDir, projectId) {
       generation: value.generation,
       listenerPid: value.listenerPid,
       socketPath: value.socketPath,
-      createdAt: value.createdAt ?? ""
+      createdAt: value.createdAt ?? "",
+      ...typeof value.authAccountId === "string" && value.authAccountId ? { authAccountId: value.authAccountId } : {}
     };
   } catch {
     return null;
@@ -30101,7 +30165,8 @@ async function startListener(options) {
     generation,
     listenerPid: child.pid ?? -1,
     socketPath,
-    createdAt: (/* @__PURE__ */ new Date()).toISOString()
+    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+    ...options.authAccountId ? { authAccountId: options.authAccountId } : {}
   };
   writeFileSync9(nativeRecordPath(stateDir, projectId), JSON.stringify(record));
   const deadline = Date.now() + (options.timeoutMs ?? 3e4);
@@ -30131,7 +30196,8 @@ var init_codex_app_server_native = __esm({
             generation: existing.generation,
             reattached: true,
             daemonPid: existing.listenerPid,
-            droppedWhileDetached: PRESUMED_LOSSY_REJOIN
+            droppedWhileDetached: PRESUMED_LOSSY_REJOIN,
+            authAccountId: existing.authAccountId
           };
         } catch {
           try {
@@ -30147,7 +30213,8 @@ var init_codex_app_server_native = __esm({
           generation: record.generation,
           reattached: false,
           daemonPid: record.listenerPid,
-          droppedWhileDetached: 0
+          droppedWhileDetached: 0,
+          authAccountId: record.authAccountId
         };
       } catch (error) {
         const raced = liveNativeRecord(options.stateDir, options.projectId);
@@ -30157,12 +30224,13 @@ var init_codex_app_server_native = __esm({
             generation: raced.generation,
             reattached: true,
             daemonPid: raced.listenerPid,
-            droppedWhileDetached: PRESUMED_LOSSY_REJOIN
+            droppedWhileDetached: PRESUMED_LOSSY_REJOIN,
+            authAccountId: raced.authAccountId
           };
         }
         log.error("codex", `codex app-server native listener unavailable (${error.message}); falling back to an in-process app-server \u2014 turns will NOT survive a frizz restart`);
         const child = spawn2(options.codexBin, codexAppServerArgv(["--stdio"], options.frizzMcp), { cwd: options.cwd, env: options.env, stdio: ["pipe", "pipe", "pipe"] });
-        return { process: child, generation: randomUUID9(), reattached: false, daemonPid: process.pid, droppedWhileDetached: 0 };
+        return { process: child, generation: randomUUID9(), reattached: false, daemonPid: process.pid, droppedWhileDetached: 0, authAccountId: options.authAccountId };
       }
     };
   }
@@ -30204,7 +30272,8 @@ function readDaemonRecord(stateDir, projectId) {
       daemonPid: value.daemonPid,
       childPid: typeof value.childPid === "number" ? value.childPid : 0,
       socketPath: value.socketPath,
-      createdAt: value.createdAt ?? ""
+      createdAt: value.createdAt ?? "",
+      ...typeof value.authAccountId === "string" && value.authAccountId ? { authAccountId: value.authAccountId } : {}
     };
   } catch {
     return null;
@@ -30298,6 +30367,7 @@ function forkDaemon(options) {
     generation,
     clientInfo: options.clientInfo,
     capabilities: options.capabilities,
+    ...options.authAccountId ? { authAccountId: options.authAccountId } : {},
     // The argv is built HERE, not in the daemon: the daemon is a bare forked entry that should not have
     // to resolve frizz's MCP descriptors, and building it once keeps this transport identical to the
     // native listener's.
@@ -30425,7 +30495,7 @@ function inProcessCodexAppServer(options) {
       return false;
     }
   });
-  return { process: child, generation: randomUUID10(), reattached: false, daemonPid: process.pid, droppedWhileDetached: 0 };
+  return { process: child, generation: randomUUID10(), reattached: false, daemonPid: process.pid, droppedWhileDetached: 0, authAccountId: options.authAccountId };
 }
 function directChildHost(spawnChild, generationId = randomUUID10) {
   return async (options) => ({
@@ -30433,7 +30503,8 @@ function directChildHost(spawnChild, generationId = randomUUID10) {
     generation: generationId(),
     reattached: false,
     daemonPid: process.pid,
-    droppedWhileDetached: 0
+    droppedWhileDetached: 0,
+    authAccountId: options.authAccountId
   });
 }
 var daemonEntry, daemonCodexAppServerHost;
@@ -30452,7 +30523,7 @@ var init_codex_app_server_host = __esm({
       if (existing) {
         try {
           const attached = await attach2(existing, timeoutMs);
-          return { ...attached, generation: existing.generation, reattached: true, daemonPid: existing.daemonPid };
+          return { ...attached, generation: existing.generation, reattached: true, daemonPid: existing.daemonPid, authAccountId: existing.authAccountId };
         } catch {
           try {
             unlinkSync3(recordPath(options.stateDir, options.projectId));
@@ -30472,7 +30543,7 @@ var init_codex_app_server_host = __esm({
       try {
         const record = await forkDaemon(options);
         const attached = await attach2(record, timeoutMs);
-        return { ...attached, generation: record.generation, reattached: false, daemonPid: record.daemonPid };
+        return { ...attached, generation: record.generation, reattached: false, daemonPid: record.daemonPid, authAccountId: record.authAccountId };
       } catch (error) {
         log.error("codex", `codex app-server daemon unavailable (${error.message}); falling back to an in-process app-server \u2014 turns will NOT survive a frizz restart`);
         return inProcessCodexAppServer(options);
@@ -30481,8 +30552,627 @@ var init_codex_app_server_host = __esm({
   }
 });
 
+// packages/server/src/backend/claude-quota.ts
+import { join as join22 } from "node:path";
+import { homedir as homedir9, platform } from "node:os";
+import { createHash as createHash9 } from "node:crypto";
+import { mkdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
+import { execFile as execFile3 } from "node:child_process";
+import { promisify as promisify3 } from "node:util";
+function claudeConfigDir() {
+  const override = process.env.CLAUDE_CONFIG_DIR;
+  return override && override.trim() ? override : join22(homedir9(), ".claude");
+}
+function tokenFromCredentialsJson(raw2) {
+  let doc;
+  try {
+    doc = JSON.parse(raw2);
+  } catch {
+    return void 0;
+  }
+  if (!doc || typeof doc !== "object") return void 0;
+  const root = doc;
+  const oauth = root.claudeAiOauth && typeof root.claudeAiOauth === "object" ? root.claudeAiOauth : root;
+  const token = oauth.accessToken ?? oauth.access_token;
+  return typeof token === "string" && token ? token : void 0;
+}
+async function readKeychainToken() {
+  if (platform() !== "darwin") return void 0;
+  try {
+    const { stdout } = await execFileAsync2("security", ["find-generic-password", "-s", "Claude Code-credentials", "-w"], {
+      encoding: "utf8",
+      timeout: 4e3
+    });
+    return tokenFromCredentialsJson(String(stdout).trim());
+  } catch {
+    return void 0;
+  }
+}
+async function readAccessToken(configDir) {
+  try {
+    const fromFile = tokenFromCredentialsJson(await readFile(join22(configDir, ".credentials.json"), "utf8"));
+    if (fromFile) return fromFile;
+  } catch {
+  }
+  return readKeychainToken();
+}
+function isoToUnix(value) {
+  const ms = typeof value === "string" ? Date.parse(value) : NaN;
+  return Number.isFinite(ms) ? Math.round(ms / 1e3) : void 0;
+}
+function slugify2(name) {
+  return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+}
+function toWindow(raw2, key, label) {
+  if (!raw2 || typeof raw2 !== "object") return void 0;
+  const w = raw2;
+  const util2 = typeof w.utilization === "number" && Number.isFinite(w.utilization) ? w.utilization : void 0;
+  if (util2 === void 0) return void 0;
+  const resetsAt = isoToUnix(w.resets_at ?? w.reset_at);
+  return { key, label, usedPercent: util2, ...resetsAt === void 0 ? {} : { resetsAt } };
+}
+function windowFromLimit(raw2) {
+  if (!raw2 || typeof raw2 !== "object") return void 0;
+  const l = raw2;
+  const percent = typeof l.percent === "number" && Number.isFinite(l.percent) ? l.percent : void 0;
+  if (percent === void 0) return void 0;
+  const group = typeof l.group === "string" ? l.group : typeof l.kind === "string" ? l.kind : "";
+  const scope = l.scope && typeof l.scope === "object" ? l.scope : void 0;
+  const model = scope?.model && typeof scope.model === "object" ? scope.model : void 0;
+  const scopeName = typeof model?.display_name === "string" && model.display_name ? model.display_name : void 0;
+  let key;
+  let label;
+  if (group === "session") {
+    key = "5h";
+    label = "5h";
+  } else if (group === "weekly") {
+    key = scopeName ? `weekly-${slugify2(scopeName)}` : "weekly";
+    label = scopeName ? `${scopeName} wk` : "Weekly";
+  } else if (group) {
+    key = slugify2(group);
+    label = scopeName ? `${scopeName} ${group}` : group;
+  } else {
+    return void 0;
+  }
+  const resetsAt = isoToUnix(l.resets_at ?? l.reset_at);
+  return { key, label, usedPercent: percent, ...resetsAt === void 0 ? {} : { resetsAt } };
+}
+function parseClaudeUsage(body, planType) {
+  if (!body || typeof body !== "object") return { status: "unavailable", windows: [], detail: "Malformed usage response" };
+  const b = body;
+  const windows = [];
+  const seen = /* @__PURE__ */ new Set();
+  const add = (w) => {
+    if (w && !seen.has(w.key)) {
+      seen.add(w.key);
+      windows.push(w);
+    }
+  };
+  if (Array.isArray(b.limits)) for (const entry of b.limits) add(windowFromLimit(entry));
+  add(toWindow(b.five_hour, "5h", "5h"));
+  add(toWindow(b.seven_day, "weekly", "Weekly"));
+  add(toWindow(b.seven_day_opus, "weekly-opus", "Opus wk"));
+  add(toWindow(b.seven_day_sonnet, "weekly-sonnet", "Sonnet wk"));
+  if (windows.length === 0) return { status: "unavailable", windows: [], detail: "No usage windows reported" };
+  return { status: "ok", planType, windows };
+}
+function cachePaths(cacheDir, configDir) {
+  const profile = createHash9("sha256").update(configDir).digest("hex").slice(0, 12);
+  return {
+    data: join22(cacheDir, `claude-${profile}.json`),
+    lock: join22(cacheDir, `claude-${profile}.lock`)
+  };
+}
+async function readShared(path3) {
+  try {
+    const parsed = JSON.parse(await readFile(path3, "utf8"));
+    if (!Number.isFinite(parsed.at) || !parsed.quota || !Array.isArray(parsed.quota.windows)) return void 0;
+    return parsed;
+  } catch {
+    return void 0;
+  }
+}
+async function writeShared(path3, value) {
+  const tmp = `${path3}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;
+  try {
+    await writeFile(tmp, JSON.stringify(value), { mode: 384 });
+    await rename(tmp, path3);
+  } finally {
+    await rm(tmp, { force: true }).catch(() => {
+    });
+  }
+}
+function delay(ms) {
+  return new Promise((resolve12) => setTimeout(resolve12, ms));
+}
+async function acquireLock(path3) {
+  const deadline = Date.now() + LOCK_WAIT_MS;
+  for (; ; ) {
+    try {
+      await mkdir(path3);
+      return () => rm(path3, { recursive: true, force: true });
+    } catch (err) {
+      if (err.code !== "EEXIST") throw err;
+      try {
+        if (Date.now() - (await stat(path3)).mtimeMs > LOCK_STALE_MS) {
+          await rm(path3, { recursive: true, force: true });
+          continue;
+        }
+      } catch {
+        continue;
+      }
+      if (Date.now() >= deadline) throw new Error("Claude quota refresh lock timed out");
+      await delay(LOCK_POLL_MS2);
+    }
+  }
+}
+async function runClaudeUsage(claudeBin) {
+  const { stdout } = await execFileAsync2(
+    // Never a bare name: on Windows `execFile("claude")` is ENOENT and `execFile("claude.cmd")` is
+    // EINVAL (node refuses .cmd/.bat without a shell since CVE-2024-27980), so this reader could
+    // never reach the CLI there and every quota refresh threw. See auth-status.ts for the measurement.
+    // A resolver throw is a refresh failure like any other — the callers' stale-serving catch owns it.
+    resolveClaudeExecutableAbsolute(claudeBin),
+    ["-p", "/usage", "--safe-mode", "--output-format", "json", "--no-session-persistence", "--tools", ""],
+    { encoding: "utf8", timeout: CLI_TIMEOUT_MS, maxBuffer: 2 * 1024 * 1024 }
+  );
+  return String(stdout);
+}
+async function refreshQuota(claudeBin, deps, now) {
+  const doFetch = deps.fetchImpl ?? fetch;
+  const readToken = deps.readToken ?? readAccessToken;
+  let token;
+  try {
+    token = await readToken(claudeConfigDir());
+  } catch {
+    token = void 0;
+  }
+  if (token) {
+    try {
+      const res = await doFetch(USAGE_URL, {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          "anthropic-beta": OAUTH_BETA,
+          "User-Agent": USER_AGENT,
+          "Content-Type": "application/json"
+        },
+        signal: AbortSignal.timeout(ENDPOINT_TIMEOUT_MS)
+      });
+      if (res.ok) {
+        const body = await res.json();
+        const planType = typeof body.plan_type === "string" ? body.plan_type : void 0;
+        const quota2 = parseClaudeUsage(body, planType);
+        if (quota2.status === "ok") return quota2;
+      } else if (res.status === 429 || res.status === 529) {
+        throw new Error(`Usage endpoint ${res.status}`);
+      }
+    } catch (err) {
+      if (err instanceof Error && /^Usage endpoint (429|529)$/.test(err.message)) throw err;
+    }
+  }
+  const quota = parseClaudeUsageOutput(await (deps.execUsage ?? runClaudeUsage)(claudeBin), now);
+  if (quota.status !== "ok") throw new Error(quota.detail);
+  return quota;
+}
+function windowIdentity(title) {
+  for (const [pattern, key, label] of LINE_WINDOWS) {
+    if (pattern.test(title)) return [key, label];
+  }
+  const scoped = /^Current week \((.+)\)$/i.exec(title);
+  if (!scoped) return void 0;
+  const name = scoped[1].replace(/\s+only$/i, "");
+  const slug = name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+  return slug ? [`weekly-${slug}`, `${name} wk`] : void 0;
+}
+function parseResetLabel(label, now) {
+  if (!label) return void 0;
+  const text2 = label.replace(/\s+\([^)]+\)\s*$/, "").trim();
+  const parts = /^(?:([A-Za-z]{3,9})\s+(\d{1,2})(?:,?\s+(\d{4}))?)?\s*(?:at\s+)?(?:(\d{1,2})(?::(\d{2}))?\s*(am|pm))?$/i.exec(text2);
+  const month = parts?.[1] ? MONTH_INDEX[parts[1].slice(0, 3).toLowerCase()] : void 0;
+  const hasClock = parts?.[6] !== void 0;
+  if (parts && (month !== void 0 || hasClock) && (parts[1] === void 0 || month !== void 0)) {
+    const date2 = new Date(now);
+    if (hasClock) {
+      let hour = Number(parts[4]) % 12;
+      if (parts[6].toLowerCase() === "pm") hour += 12;
+      date2.setHours(hour, Number(parts[5] ?? 0), 0, 0);
+    } else {
+      date2.setHours(0, 0, 0, 0);
+    }
+    if (month !== void 0) {
+      date2.setMonth(month, Number(parts[2]));
+      if (parts[3]) date2.setFullYear(Number(parts[3]));
+      else if (date2.getTime() <= now) date2.setFullYear(date2.getFullYear() + 1);
+    } else if (date2.getTime() <= now) {
+      date2.setDate(date2.getDate() + 1);
+    }
+    return Math.round(date2.getTime() / 1e3);
+  }
+  const parsed = Date.parse(text2);
+  if (!Number.isFinite(parsed)) return void 0;
+  const date = new Date(parsed);
+  if (!/\b\d{4}\b/.test(text2) && date.getTime() <= now) date.setFullYear(date.getFullYear() + 1);
+  return Math.round(date.getTime() / 1e3);
+}
+function parseClaudeUsageOutput(stdout, now = Date.now()) {
+  let text2 = stdout;
+  try {
+    const envelope = JSON.parse(stdout);
+    if (typeof envelope.result === "string") text2 = envelope.result;
+  } catch {
+  }
+  const windows = [];
+  for (const line of text2.split(/\r?\n/)) {
+    const match2 = /^\s*(Current (?:session|week \(.+?\))):\s*(\d+(?:\.\d+)?)%\s+used\b(?:\s*·\s*resets\s+(.+?))?\s*$/i.exec(line);
+    if (!match2) continue;
+    const identity = windowIdentity(match2[1]);
+    if (!identity) continue;
+    const resetsAt = parseResetLabel(match2[3], now);
+    windows.push({
+      key: identity[0],
+      label: identity[1],
+      usedPercent: Number(match2[2]),
+      ...resetsAt === void 0 ? {} : { resetsAt }
+    });
+  }
+  if (windows.length === 0) {
+    return { status: "unavailable", windows: [], detail: "Claude Code did not report subscription quota" };
+  }
+  return { status: "ok", windows };
+}
+async function tryAcquireLock2(path3) {
+  for (let attempt = 0; attempt < 2; attempt++) {
+    try {
+      await mkdir(path3);
+      return () => rm(path3, { recursive: true, force: true });
+    } catch (err) {
+      if (err.code !== "EEXIST") return void 0;
+      try {
+        if (Date.now() - (await stat(path3)).mtimeMs <= LOCK_STALE_MS) return void 0;
+        await rm(path3, { recursive: true, force: true });
+      } catch {
+        return void 0;
+      }
+    }
+  }
+  return void 0;
+}
+function refreshSharedInBackground(paths, claudeBin, deps, now) {
+  if (backgroundRefreshes.has(paths.data)) return;
+  const task = (async () => {
+    const release = await tryAcquireLock2(paths.lock);
+    if (!release) return;
+    try {
+      const quota = await refreshQuota(claudeBin, deps, now);
+      await writeShared(paths.data, { at: now, quota });
+    } finally {
+      await release().catch(() => {
+      });
+    }
+  })().catch(() => {
+  }).finally(() => backgroundRefreshes.delete(paths.data));
+  backgroundRefreshes.set(paths.data, task);
+}
+async function refreshClaudeQuotaInBackground(claudeBin = "claude", deps = {}) {
+  const now = (deps.now ?? Date.now)();
+  const configDir = claudeConfigDir();
+  const cacheDir = deps.cacheDir ?? join22(frizzRoots().cache, "quota-cache");
+  try {
+    await mkdir(cacheDir, { recursive: true, mode: 448 });
+  } catch {
+    return;
+  }
+  refreshSharedInBackground(cachePaths(cacheDir, configDir), claudeBin, deps, now);
+}
+async function readClaudeQuota(claudeBin = "claude", deps = {}, options = {}) {
+  const now = (deps.now ?? Date.now)();
+  const configDir = claudeConfigDir();
+  const cacheDir = deps.cacheDir ?? join22(frizzRoots().cache, "quota-cache");
+  const paths = cachePaths(cacheDir, configDir);
+  try {
+    await mkdir(cacheDir, { recursive: true, mode: 448 });
+  } catch {
+    try {
+      return await refreshQuota(claudeBin, deps, now);
+    } catch {
+      return { status: "unavailable", windows: [], detail: "Claude usage unavailable" };
+    }
+  }
+  const initial = await readShared(paths.data);
+  if (!options.force && initial && now - initial.at < (initial.quota.status === "ok" ? OK_TTL_MS : FAIL_TTL_MS)) {
+    return initial.quota;
+  }
+  if (!options.force && initial?.quota.status === "ok" && now - initial.at < STALE_MAX_AGE_MS) {
+    refreshSharedInBackground(paths, claudeBin, deps, now);
+    const ageMs = now - initial.at;
+    if (ageMs < 10 * 6e4) return initial.quota;
+    return { ...initial.quota, detail: `Refreshing \xB7 last updated ${Math.round(ageMs / 6e4)}m ago` };
+  }
+  let release;
+  try {
+    release = await acquireLock(paths.lock);
+    const afterLock = await readShared(paths.data);
+    if (afterLock && afterLock.at !== initial?.at && now - afterLock.at < OK_TTL_MS) return afterLock.quota;
+    const quota = await refreshQuota(claudeBin, deps, now);
+    await writeShared(paths.data, { at: now, quota }).catch(() => {
+    });
+    return quota;
+  } catch {
+    const fallback = await readShared(paths.data);
+    if (fallback?.quota.status === "ok" && now - fallback.at < STALE_MAX_AGE_MS) {
+      return {
+        ...fallback.quota,
+        detail: `Could not refresh \xB7 last updated ${Math.max(1, Math.round((now - fallback.at) / 6e4))}m ago`
+      };
+    }
+    const unavailable = { status: "unavailable", windows: [], detail: "Claude Code usage unavailable" };
+    await writeShared(paths.data, { at: now, quota: unavailable }).catch(() => {
+    });
+    return unavailable;
+  } finally {
+    await release?.().catch(() => {
+    });
+  }
+}
+var execFileAsync2, USAGE_URL, OAUTH_BETA, USER_AGENT, ENDPOINT_TIMEOUT_MS, OK_TTL_MS, FAIL_TTL_MS, STALE_MAX_AGE_MS, CLI_TIMEOUT_MS, LOCK_STALE_MS, LOCK_WAIT_MS, LOCK_POLL_MS2, LINE_WINDOWS, MONTH_INDEX, backgroundRefreshes;
+var init_claude_quota = __esm({
+  "packages/server/src/backend/claude-quota.ts"() {
+    "use strict";
+    init_frizz_paths();
+    init_claude_broker_host();
+    execFileAsync2 = promisify3(execFile3);
+    USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
+    OAUTH_BETA = "oauth-2025-04-20";
+    USER_AGENT = "claude-code/2.0.0";
+    ENDPOINT_TIMEOUT_MS = 5e3;
+    OK_TTL_MS = 2 * 6e4;
+    FAIL_TTL_MS = 1e4;
+    STALE_MAX_AGE_MS = 24 * 60 * 6e4;
+    CLI_TIMEOUT_MS = 3e4;
+    LOCK_STALE_MS = 4e4;
+    LOCK_WAIT_MS = 15e3;
+    LOCK_POLL_MS2 = 50;
+    LINE_WINDOWS = [
+      [/^Current session$/i, "5h", "5h"],
+      [/^Current week \(all models\)$/i, "weekly", "Weekly"],
+      [/^Current week \(Opus only\)$/i, "weekly-opus", "Opus wk"],
+      [/^Current week \(Sonnet only\)$/i, "weekly-sonnet", "Sonnet wk"]
+    ];
+    MONTH_INDEX = {
+      jan: 0,
+      feb: 1,
+      mar: 2,
+      apr: 3,
+      may: 4,
+      jun: 5,
+      jul: 6,
+      aug: 7,
+      sep: 8,
+      oct: 9,
+      nov: 10,
+      dec: 11
+    };
+    backgroundRefreshes = /* @__PURE__ */ new Map();
+  }
+});
+
+// packages/server/src/backend/auth-status.ts
+import { join as join23 } from "node:path";
+import { homedir as homedir10, platform as platform2 } from "node:os";
+import { readFileSync as readFileSync16, statSync as statSync10 } from "node:fs";
+import { execFile as execFile4 } from "node:child_process";
+import { promisify as promisify4 } from "node:util";
+function claudeConfigDir2() {
+  const override = process.env.CLAUDE_CONFIG_DIR;
+  return override && override.trim() ? override : join23(homedir10(), ".claude");
+}
+function claudeFileState(configDir) {
+  let raw2;
+  try {
+    raw2 = readFileSync16(join23(configDir, ".credentials.json"), "utf8");
+  } catch (err) {
+    return err.code === "ENOENT" ? "absent" : "error";
+  }
+  return tokenFromCredentialsJson(raw2) ? "token" : "empty";
+}
+async function claudeKeychainState() {
+  if (process.env.FRIZZ_KEYCHAIN_DISABLED && process.env.NODE_ENV !== "production") return "absent";
+  if (platform2() !== "darwin") return "absent";
+  try {
+    const { stdout } = await execFileAsync3("security", ["find-generic-password", "-s", "Claude Code-credentials", "-w"], {
+      encoding: "utf8",
+      timeout: 4e3
+    });
+    return tokenFromCredentialsJson(String(stdout).trim()) ? "token" : "empty";
+  } catch (err) {
+    const e = err;
+    const notFound = e.code === 44 || typeof e.stderr === "string" && /could not be found/i.test(e.stderr);
+    return notFound ? "absent" : "error";
+  }
+}
+async function readClaudeAuthState(configDir = claudeConfigDir2()) {
+  const file = claudeFileState(configDir);
+  if (file === "token") return "authed";
+  const keychain = await claudeKeychainState();
+  if (keychain === "token") return "authed";
+  if (file === "error" || keychain === "error") return "unknown";
+  return "signed-out";
+}
+function readCodexAuthState(codexHome = defaultCodexHome()) {
+  if (process.env.OPENAI_API_KEY || process.env.CODEX_API_KEY || process.env.CODEX_ACCESS_TOKEN) return "authed";
+  let raw2;
+  try {
+    raw2 = readFileSync16(join23(codexHome, "auth.json"), "utf8");
+  } catch (err) {
+    return err.code === "ENOENT" ? "signed-out" : "unknown";
+  }
+  let doc;
+  try {
+    doc = JSON.parse(raw2);
+  } catch {
+    return "unknown";
+  }
+  if (!doc || typeof doc !== "object") return "unknown";
+  const root = doc;
+  const apiKey = typeof root.OPENAI_API_KEY === "string" && root.OPENAI_API_KEY ? root.OPENAI_API_KEY : void 0;
+  const tokens = root.tokens && typeof root.tokens === "object" ? root.tokens : void 0;
+  const accessToken = tokens && typeof tokens.access_token === "string" && tokens.access_token ? tokens.access_token : void 0;
+  return apiKey || accessToken ? "authed" : "signed-out";
+}
+function readCodexAccountId(codexHome = defaultCodexHome()) {
+  if (process.env.OPENAI_API_KEY || process.env.CODEX_API_KEY || process.env.CODEX_ACCESS_TOKEN) return void 0;
+  try {
+    const doc = JSON.parse(readFileSync16(join23(codexHome, "auth.json"), "utf8"));
+    if (!doc || typeof doc !== "object") return void 0;
+    const tokens = doc.tokens;
+    if (!tokens || typeof tokens !== "object") return void 0;
+    const accountId = tokens.account_id;
+    return typeof accountId === "string" && accountId.trim() ? accountId : void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function readCodexBinaryState(codexBin = "codex", exec = execFileAsync3) {
+  try {
+    await exec(codexBin, ["--version"], { timeout: 5e3 });
+    return "present";
+  } catch (err) {
+    return err.code === "ENOENT" ? "missing" : "unknown";
+  }
+}
+function parseClaudeAuthStatusJson(stdout) {
+  const start = stdout.indexOf("{");
+  const end = stdout.lastIndexOf("}");
+  if (start === -1 || end <= start) return void 0;
+  try {
+    const doc = JSON.parse(stdout.slice(start, end + 1));
+    return typeof doc.loggedIn === "boolean" ? doc.loggedIn : void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function readClaudeAuthStatusCli(opts) {
+  try {
+    const bin = resolveClaudeExecutableAbsolute(opts?.claudeBin);
+    const { stdout } = await execFileAsync3(bin, ["auth", "status", "--json"], {
+      encoding: "utf8",
+      timeout: opts?.timeoutMs ?? 5e3,
+      ...opts?.cwd ? { cwd: opts.cwd } : {}
+    });
+    return parseClaudeAuthStatusJson(String(stdout)) === false ? "signed-out" : "authed";
+  } catch (err) {
+    const stdout = err.stdout;
+    const loggedIn = typeof stdout === "string" ? parseClaudeAuthStatusJson(stdout) : void 0;
+    if (loggedIn === false) return "signed-out";
+    if (loggedIn === true) return "authed";
+    return "unknown";
+  }
+}
+async function readClaudePreflightAuth(opts) {
+  const local = await readClaudeAuthState();
+  if (local !== "signed-out") return local;
+  return readClaudeAuthStatusCli({ claudeBin: opts?.claudeBin, ...opts?.cwd ? { cwd: opts.cwd } : {} });
+}
+function asEmail(value) {
+  if (typeof value !== "string") return void 0;
+  const email = value.trim();
+  return email.length <= 320 && /^[^\s@]+@[^\s@]+$/.test(email) ? email : void 0;
+}
+function claudeAccountFile() {
+  const override = process.env.CLAUDE_CONFIG_DIR;
+  return override && override.trim() ? join23(override, ".claude.json") : join23(homedir10(), ".claude.json");
+}
+function readClaudeAccountEmail(path3 = claudeAccountFile()) {
+  let stat2;
+  try {
+    stat2 = statSync10(path3);
+  } catch {
+    return void 0;
+  }
+  const memo3 = claudeAccountMemo;
+  if (memo3 && memo3.path === path3 && memo3.mtimeMs === stat2.mtimeMs && memo3.size === stat2.size) return memo3.email;
+  let email;
+  try {
+    const doc = JSON.parse(readFileSync16(path3, "utf8"));
+    email = asEmail(doc?.oauthAccount?.emailAddress);
+  } catch {
+    email = void 0;
+  }
+  claudeAccountMemo = { path: path3, mtimeMs: stat2.mtimeMs, size: stat2.size, email };
+  return email;
+}
+function readCodexAccountEmail(codexHome = defaultCodexHome()) {
+  let doc;
+  try {
+    doc = JSON.parse(readFileSync16(join23(codexHome, "auth.json"), "utf8"));
+  } catch {
+    return void 0;
+  }
+  const idToken = doc?.tokens?.id_token;
+  if (typeof idToken !== "string") return void 0;
+  const payload = idToken.split(".")[1];
+  if (!payload) return void 0;
+  try {
+    return asEmail(JSON.parse(Buffer.from(payload, "base64url").toString("utf8")).email);
+  } catch {
+    return void 0;
+  }
+}
+function readAccountEmails() {
+  const emails = {};
+  const claude = tryRead(readClaudeAccountEmail);
+  const codex = tryRead(readCodexAccountEmail);
+  if (claude) emails.claude = claude;
+  if (codex) emails.codex = codex;
+  return emails;
+}
+function tryRead(read) {
+  try {
+    return read();
+  } catch {
+    return void 0;
+  }
+}
+async function readAuthSnapshot(opts) {
+  const [claude, codex] = await Promise.all([
+    readClaudeAuthState().then(async (local) => {
+      if (local !== "signed-out") return local;
+      const cli = await readClaudeAuthStatusCli({ claudeBin: opts?.claudeBin });
+      return cli === "authed" ? "authed" : local;
+    }).catch(() => "unknown"),
+    Promise.resolve().then(() => readCodexAuthState()).catch(() => "unknown")
+  ]);
+  const emails = readAccountEmails();
+  return {
+    claude,
+    codex,
+    emails: {
+      ...claude === "signed-out" ? {} : emails.claude ? { claude: emails.claude } : {},
+      ...codex === "signed-out" ? {} : emails.codex ? { codex: emails.codex } : {}
+    }
+  };
+}
+var execFileAsync3, ProviderAuthRequiredError, claudeAccountMemo;
+var init_auth_status = __esm({
+  "packages/server/src/backend/auth-status.ts"() {
+    "use strict";
+    init_claude_quota();
+    init_codex();
+    init_claude_broker_host();
+    execFileAsync3 = promisify4(execFile4);
+    ProviderAuthRequiredError = class extends Error {
+      backend;
+      constructor(backend) {
+        super(`AUTH_REQUIRED:${backend}`);
+        this.name = "ProviderAuthRequiredError";
+        this.backend = backend;
+      }
+    };
+  }
+});
+
 // packages/server/src/backend/codex-app-server.ts
-import { createHash as createHash9, randomUUID as randomUUID11 } from "node:crypto";
+import { createHash as createHash10, randomUUID as randomUUID11 } from "node:crypto";
 import { StringDecoder as StringDecoder3 } from "node:string_decoder";
 function selectCodexHostKind(flagValue, platform3, hasSpawn) {
   if (hasSpawn) return "direct";
@@ -30829,7 +31519,7 @@ function canonicalJson2(value) {
   return JSON.stringify(normalize3(value));
 }
 function logicalRequestId(method, parts) {
-  const digest = createHash9("sha256").update(JSON.stringify([method, ...parts])).digest("hex");
+  const digest = createHash10("sha256").update(JSON.stringify([method, ...parts])).digest("hex");
   return `codex-${digest}`;
 }
 function requestFingerprint(value) {
@@ -30839,7 +31529,7 @@ function requestFingerprint(value) {
     delete record.startedAtMs;
     delete record.autoResolutionMs;
   }
-  return createHash9("sha256").update(canonicalJson2(normalized)).digest("hex");
+  return createHash10("sha256").update(canonicalJson2(normalized)).digest("hex");
 }
 function decision(id, semantic, label) {
   return { id, semantic, label };
@@ -31127,7 +31817,7 @@ function createCodexAppServerBridge(options) {
 function codexAppServerBridgeEnabled() {
   return true;
 }
-var CODEX_APP_SERVER_PROVIDER, CODEX_NATIVE_LISTEN_FLAG, CODEX_APP_SERVER_SUPPORTED_VERSION, CODEX_APP_SERVER_PROTOCOL_REVISION, aheadVersionWarned, PROTOCOL_FINGERPRINT, CLIENT_INFO, CLIENT_CAPABILITIES, CODEX_SANDBOX_MODES, CODEX_APPROVAL_POLICY, CODEX_DEFAULT_SANDBOX, SANDBOX_CONFIRM_TIMEOUT_MS, SANDBOX_NOOP_GRACE_MS, MAX_JSONL_BYTES, MAX_INBOUND_RECORDS, MAX_INBOUND_QUEUED_BYTES, MAX_OUTBOUND_REQUESTS, MAX_STDERR_BYTES, DEFAULT_REQUEST_TIMEOUT_MS, BRIDGE_DB_SCHEMA_VERSION, RpcIdSchema, Opaque, SafeTimestampMs, NullableString, CommandAction, NetworkApprovalContext, FileSystemSpecialPath, FileSystemPath, FileSystemSandboxEntry, NetworkPermissions, FileSystemPermissions, RequestedPermissions, NetworkPolicyAmendment, CommandApprovalParams, FileApprovalParams, PatchChangeKind, FileUpdateChange, FileChangeItem, CommandExecutionItem, ItemStartedNotification, ItemCompletedNotification, FileChangePatchUpdatedNotification, PermissionsApprovalParams, UserInputQuestion, UserInputParams, McpBase, McpElicitationParams, ResolvedNotification, RpcProtocolError, JsonlRpcConnection, BindingRowSchema, BridgeMetaRowSchema, DISPLAY_REDACTION, UNSAFE_DISPLAY_TEXT, SECRET_NAME, commandDecisionMap, InitializeResponse, ThreadResponse, TurnResponse, TurnSteerResponse, SkillsListResponse, ThreadResumeSandbox, ThreadResumeStatus, ThreadSettingsUpdated, TurnStarted, TurnCompleted, MAX_CORRELATED_FILE_ITEMS, CODEX_APP_SERVER_TABLES, CodexAppServerBridge;
+var CODEX_APP_SERVER_PROVIDER, CODEX_NATIVE_LISTEN_FLAG, CODEX_APP_SERVER_SUPPORTED_VERSION, CODEX_APP_SERVER_PROTOCOL_REVISION, aheadVersionWarned, PROTOCOL_FINGERPRINT, CLIENT_INFO, CLIENT_CAPABILITIES, CODEX_SANDBOX_MODES, CODEX_APPROVAL_POLICY, CODEX_DEFAULT_SANDBOX, SANDBOX_CONFIRM_TIMEOUT_MS, SANDBOX_NOOP_GRACE_MS, MAX_JSONL_BYTES, MAX_INBOUND_JSONL_BYTES, MAX_INBOUND_RECORDS, MAX_INBOUND_QUEUED_BYTES, MAX_OUTBOUND_REQUESTS, MAX_STDERR_BYTES, DEFAULT_REQUEST_TIMEOUT_MS, BRIDGE_DB_SCHEMA_VERSION, RpcIdSchema, Opaque, SafeTimestampMs, NullableString, CommandAction, NetworkApprovalContext, FileSystemSpecialPath, FileSystemPath, FileSystemSandboxEntry, NetworkPermissions, FileSystemPermissions, RequestedPermissions, NetworkPolicyAmendment, CommandApprovalParams, FileApprovalParams, PatchChangeKind, FileUpdateChange, FileChangeItem, CommandExecutionItem, ItemStartedNotification, ItemCompletedNotification, FileChangePatchUpdatedNotification, PermissionsApprovalParams, UserInputQuestion, UserInputParams, McpBase, McpElicitationParams, ResolvedNotification, RpcProtocolError, JsonlRpcConnection, BindingRowSchema, BridgeMetaRowSchema, DISPLAY_REDACTION, UNSAFE_DISPLAY_TEXT, SECRET_NAME, commandDecisionMap, InitializeResponse, ThreadResponse, TurnResponse, TurnSteerResponse, SkillsListResponse, ThreadResumeSandbox, ThreadResumeStatus, ThreadSettingsUpdated, TurnStarted, TurnCompleted, MAX_CORRELATED_FILE_ITEMS, CODEX_APP_SERVER_TABLES, CodexAppServerBridge;
 var init_codex_app_server = __esm({
   "packages/server/src/backend/codex-app-server.ts"() {
     "use strict";
@@ -31139,15 +31829,16 @@ var init_codex_app_server = __esm({
     init_credential_redaction();
     init_codex_app_server_host();
     init_codex_app_server_native();
+    init_auth_status();
     init_codex_mcp();
     init_logging();
     CODEX_APP_SERVER_PROVIDER = "codex-app-server";
     CODEX_NATIVE_LISTEN_FLAG = "FRIZZ_CODEX_NATIVE_LISTEN";
-    CODEX_APP_SERVER_SUPPORTED_VERSION = "0.153.2";
+    CODEX_APP_SERVER_SUPPORTED_VERSION = "0.153.4";
     CODEX_APP_SERVER_PROTOCOL_REVISION = Object.freeze({
       packageVersion: CODEX_APP_SERVER_SUPPORTED_VERSION,
-      sourceTag: "rust-v0.153.2",
-      sourceCommit: "657a993cbee87acf52d14b758ce49dbd46d1b8eb"
+      sourceTag: "rust-v0.153.4",
+      sourceCommit: "3d2ee51ca2d5db578f328aa75e20aa22c0197c9a"
     });
     PROTOCOL_FINGERPRINT = [
       CODEX_APP_SERVER_PROTOCOL_REVISION.sourceTag,
@@ -31158,7 +31849,22 @@ var init_codex_app_server = __esm({
     CLIENT_CAPABILITIES = Object.freeze({
       experimentalApi: true,
       requestAttestation: false,
-      mcpServerOpenaiFormElicitation: false
+      mcpServerOpenaiFormElicitation: false,
+      // Unused cumulative diff snapshots caused project-wide disconnects under the old 256 KiB frame
+      // limit. Suppress them at the producer regardless of the inbound budget; file approvals use
+      // item/fileChange/*, not these snapshots. Native listeners negotiate on every attach.
+      optOutNotificationMethods: [
+        "turn/diff/updated",
+        // Prose, reasoning, output and usage are read from the rollout, not this control connection.
+        // A replay/burst of these used to consume the 256-record queue before lifecycle events drained.
+        "item/agentMessage/delta",
+        "item/reasoning/summaryTextDelta",
+        "item/reasoning/summaryPartAdded",
+        "item/reasoning/textDelta",
+        "item/commandExecution/outputDelta",
+        "thread/tokenUsage/updated",
+        "account/rateLimits/updated"
+      ]
     });
     CODEX_SANDBOX_MODES = Object.freeze([
       "read-only",
@@ -31170,8 +31876,9 @@ var init_codex_app_server = __esm({
     SANDBOX_CONFIRM_TIMEOUT_MS = 8e3;
     SANDBOX_NOOP_GRACE_MS = 750;
     MAX_JSONL_BYTES = 256 * 1024;
+    MAX_INBOUND_JSONL_BYTES = 8 * 1024 * 1024;
     MAX_INBOUND_RECORDS = 256;
-    MAX_INBOUND_QUEUED_BYTES = MAX_JSONL_BYTES * 2;
+    MAX_INBOUND_QUEUED_BYTES = MAX_INBOUND_JSONL_BYTES * 2;
     MAX_OUTBOUND_REQUESTS = 128;
     MAX_STDERR_BYTES = 16 * 1024;
     DEFAULT_REQUEST_TIMEOUT_MS = 2e4;
@@ -31456,17 +32163,18 @@ var init_codex_app_server = __esm({
       consume(chunk) {
         if (this.closed) return;
         this.buffer += typeof chunk === "string" ? chunk : this.decoder.write(chunk);
-        if (Buffer.byteLength(this.buffer, "utf8") > MAX_JSONL_BYTES * 2) {
-          this.fail("protocol", new Error("Codex app-server JSONL buffer exceeded its limit"));
-          return;
-        }
         while (true) {
           const newline = this.buffer.indexOf("\n");
-          if (newline < 0) return;
+          if (newline < 0) {
+            if (Buffer.byteLength(this.buffer, "utf8") > MAX_INBOUND_JSONL_BYTES) {
+              this.fail("protocol", new Error("Codex app-server JSONL buffer exceeded its limit"));
+            }
+            return;
+          }
           const line = this.buffer.slice(0, newline);
           this.buffer = this.buffer.slice(newline + 1);
           if (line.trim().length === 0) continue;
-          if (Buffer.byteLength(line, "utf8") > MAX_JSONL_BYTES) {
+          if (Buffer.byteLength(line, "utf8") > MAX_INBOUND_JSONL_BYTES) {
             this.fail("protocol", new Error("Codex app-server JSONL message exceeded its limit"));
             return;
           }
@@ -31477,6 +32185,10 @@ var init_codex_app_server = __esm({
             this.fail("protocol", new Error("Codex app-server emitted invalid JSONL"));
             return;
           }
+          if (message !== null && typeof message === "object" && !Array.isArray(message)) {
+            const envelope = message;
+            if (!("id" in envelope) && !("jsonrpc" in envelope) && typeof envelope.method === "string" && CLIENT_CAPABILITIES.optOutNotificationMethods.includes(envelope.method)) continue;
+          }
           const bytes = Buffer.byteLength(line, "utf8");
           if (this.inboundQueue.length >= MAX_INBOUND_RECORDS || this.inboundQueuedBytes + bytes > MAX_INBOUND_QUEUED_BYTES) {
             this.fail("protocol", new Error("Codex app-server inbound queue exceeded its limit"));
@@ -31580,6 +32292,7 @@ var init_codex_app_server = __esm({
       }
       fail(reason, error) {
         if (this.closed) return;
+        if (reason === "protocol") this.diagnostic?.({ event: "protocol-failure", detail: error.message });
         this.closed = true;
         for (const pending of this.pending.values()) {
           clearTimeout(pending.timer);
@@ -31684,6 +32397,11 @@ var init_codex_app_server = __esm({
       timeoutMs;
       /** Identity of the app-server PROCESS behind the current connection (see CodexAppServerAttachment). */
       daemonGeneration = "";
+      /** ChatGPT account the current app-server cached when its process started. */
+      processAuthAccountId;
+      /** Serializes account-driven replacement across concurrent session/turn starts. */
+      authReplacement = null;
+      turnIdleWaiters = /* @__PURE__ */ new Set();
       /**
        * The handshake a FRESHLY FORKED daemon already gave us and we already rejected — i.e. what the
        * codex binary on disk actually reports. Once we have heard it from a new process there is nothing
@@ -31760,7 +32478,7 @@ var init_codex_app_server = __esm({
           if (this.scope.prepare("SELECT 1 FROM codex_app_server_session WHERE project_id = @project_id AND (thread_slug = ? OR frizz_session_id = ?)").get(input.threadSlug, input.sessionId)) {
             throw new Error("Codex app-server thread slug or session id is already bound");
           }
-          const connection = await this.ensureConnected();
+          const connection = await this.ensureCurrentAuth();
           const ephemeral = input.ephemeral ?? true;
           const startedSandbox = input.permissions ? null : input.sandbox ?? "read-only";
           const response = ThreadResponse.parse(await connection.request("thread/start", {
@@ -31905,7 +32623,7 @@ var init_codex_app_server = __esm({
         const releaseOperation = this.beginOperation();
         this.startingTurns.add(startKey);
         try {
-          const connection = await this.ensureConnected();
+          const connection = await this.ensureCurrentAuth();
           let binding = this.bindingForScope(input.threadSlug, input.sessionId);
           if (!binding) throw new Error("Codex app-server turn requires a bridge-owned session");
           if (binding.connection_epoch !== this.connectionEpoch || binding.state !== "active") {
@@ -31939,6 +32657,7 @@ var init_codex_app_server = __esm({
             return { turnId: response.turn.id };
           } finally {
             this.pendingTurnStarts.delete(pendingKey);
+            this.notifyTurnIdleWaiters();
           }
         } finally {
           this.startingTurns.delete(startKey);
@@ -32338,6 +33057,8 @@ var init_codex_app_server = __esm({
             this.openingConnection.close();
             this.openingConnection = null;
           }
+          this.processAuthAccountId = void 0;
+          this.notifyTurnIdleWaiters();
         }
       }
       bindingForScope(threadSlug, sessionId) {
@@ -32363,11 +33084,61 @@ var init_codex_app_server = __esm({
           this.connecting = null;
         }
       }
+      /**
+       * Codex intentionally snapshots auth.json once per AuthManager. A detached app-server therefore
+       * keeps using the account it started with even after ccbroker atomically switches auth.json. Before
+       * starting new model work, replace that stale process — but only after every turn already running
+       * in the shared per-project process has reached its own completion event.
+       */
+      async ensureCurrentAuth() {
+        for (; ; ) {
+          const desiredAccountId = (this.options.codexAuthAccountId ?? readCodexAccountId)();
+          const connection = await this.ensureConnected();
+          if (!desiredAccountId || this.processAuthAccountId === desiredAccountId) return connection;
+          if (!this.authReplacement) {
+            const replacement2 = this.replaceAppServerForAuthChange();
+            this.authReplacement = replacement2;
+            void replacement2.finally(() => {
+              if (this.authReplacement === replacement2) this.authReplacement = null;
+            }).catch(() => void 0);
+          }
+          await this.authReplacement;
+        }
+      }
+      hasInFlightTurns() {
+        if (this.pendingTurnStarts.size > 0) return true;
+        return Boolean(this.scope.prepare(`
+      SELECT 1 FROM codex_app_server_session
+      WHERE project_id = @project_id AND state = 'active' AND connection_epoch = ? AND current_turn_id IS NOT NULL
+      LIMIT 1
+    `).get(this.connectionEpoch));
+      }
+      whenTurnsIdle() {
+        if (!this.hasInFlightTurns()) return Promise.resolve();
+        return new Promise((resolve12) => {
+          this.turnIdleWaiters.add(resolve12);
+          if (!this.hasInFlightTurns() && this.turnIdleWaiters.delete(resolve12)) resolve12();
+        });
+      }
+      notifyTurnIdleWaiters() {
+        if (this.dbReleased || this.hasInFlightTurns()) return;
+        for (const resolve12 of this.turnIdleWaiters) resolve12();
+        this.turnIdleWaiters.clear();
+      }
+      async replaceAppServerForAuthChange() {
+        while (this.hasInFlightTurns()) await this.whenTurnsIdle();
+        if (this.closed || this.dbReleased) throw new Error("Codex app-server bridge is closed");
+        this.disconnectOwnedProcess();
+        await stopCodexAppServerDaemon(this.options.stateDir ?? this.options.projectDir, this.options.projectId);
+        await this.ensureConnected();
+        this.options.diagnostic?.({ event: "auth-account-refreshed" });
+      }
       /**
        * Attach to an app-server and negotiate.
        *
-       * `refork` is the version-skew recovery, and it is the ONLY thing in frizz that ever ends a Codex
-       * daemon's life. The daemon performs `initialize` once and caches the answer for as long as it
+       * `refork` is the version-skew recovery. Alongside the idle-boundary auth refresh above, it is one
+       * of only two things in frizz that ever ends a Codex daemon's life. The daemon performs `initialize`
+       * once and caches the answer for as long as it
        * lives (up to six hours idle, unbounded while a client keeps reattaching). Bump
        * CODEX_APP_SERVER_SUPPORTED_VERSION and Update & Restart — the ordinary upgrade path — and the
        * surviving daemon happily serves the STALE userAgent to every new generation, so the gate below
@@ -32377,6 +33148,7 @@ var init_codex_app_server = __esm({
        * for why a genuinely unsupported codex still fails loudly instead of reforking in a loop.
        */
       async connect(refork = false) {
+        const authAccountId = (this.options.codexAuthAccountId ?? readCodexAccountId)();
         const attachment = await this.host({
           projectId: this.options.projectId,
           stateDir: this.options.stateDir ?? this.options.projectDir,
@@ -32387,7 +33159,8 @@ var init_codex_app_server = __esm({
           env: codexAppServerEnvironment(),
           clientInfo: CLIENT_INFO,
           capabilities: CLIENT_CAPABILITIES,
-          frizzMcp: this.options.frizzMcp
+          frizzMcp: this.options.frizzMcp,
+          authAccountId
         });
         const child = attachment.process;
         let connection;
@@ -32450,6 +33223,7 @@ var init_codex_app_server = __esm({
           this.connectionEpoch = negotiated.connectionEpoch;
           this.capabilityRevision = negotiated.capabilityRevision;
           this.daemonGeneration = attachment.generation;
+          this.processAuthAccountId = attachment.authAccountId;
           if (this.closed) throw new Error("Codex app-server bridge closed during negotiation");
           this.connection = connection;
           this.openingConnection = null;
@@ -32489,6 +33263,7 @@ var init_codex_app_server = __esm({
         if (this.connection !== connection) return;
         const epoch = this.connectionEpoch;
         this.connection = null;
+        this.processAuthAccountId = void 0;
         this.forgetCorrelatedFileItems();
         this.releaseSettingsWaiters();
         if (this.closed || this.dbReleased) return;
@@ -32496,6 +33271,7 @@ var init_codex_app_server = __esm({
       UPDATE codex_app_server_session SET state = 'detached', updated_at = ?
       WHERE project_id = @project_id AND connection_epoch = ? AND state = 'active'
     `).run(this.now().toISOString(), epoch);
+        this.notifyTurnIdleWaiters();
         this.options.diagnostic?.({ event: "disconnected", connectionEpoch: epoch, reason });
       }
       /**
@@ -33353,6 +34129,7 @@ var init_codex_app_server = __esm({
         UPDATE codex_app_server_session SET current_turn_id = NULL, auto_resume_count = 0, updated_at = ?
         WHERE project_id = @project_id AND codex_thread_id = ? AND connection_epoch = ? AND current_turn_id = ?
       `).run(this.now().toISOString(), parsed.data.threadId, this.connectionEpoch, parsed.data.turn.id);
+          this.notifyTurnIdleWaiters();
         }
       }
       providerResponse(record, delivery2, input) {
@@ -33426,11 +34203,11 @@ var init_codex_app_server = __esm({
 });
 
 // packages/server/src/backend/codex-quota.ts
-import { join as join22 } from "node:path";
-import { readdirSync as readdirSync7, statSync as statSync10, openSync as openSync12, readSync as readSync6, fstatSync, closeSync as closeSync11 } from "node:fs";
+import { join as join24 } from "node:path";
+import { readdirSync as readdirSync7, statSync as statSync11, openSync as openSync12, readSync as readSync6, fstatSync, closeSync as closeSync11 } from "node:fs";
 import { spawn as spawn4 } from "node:child_process";
 function sessionsDir2(codexHome) {
-  return join22(codexHome, "sessions");
+  return join24(codexHome, "sessions");
 }
 function newestRollouts(dir, out, budget) {
   if (budget.n <= 0) return;
@@ -33444,610 +34221,206 @@ function newestRollouts(dir, out, budget) {
   const files = entries2.filter((e) => e.isFile() && e.name.startsWith("rollout-") && e.name.endsWith(".jsonl")).map((e) => e.name).sort(descByName2);
   for (const d of dirs) {
     if (budget.n <= 0) return;
-    newestRollouts(join22(dir, d), out, budget);
+    newestRollouts(join24(dir, d), out, budget);
   }
   for (const f of files) {
     if (budget.n <= 0) return;
-    out.push(join22(dir, f));
+    out.push(join24(dir, f));
     budget.n--;
   }
 }
-function readTail(path3) {
-  let fd;
-  try {
-    fd = openSync12(path3, "r");
-    const size = fstatSync(fd).size;
-    const start = Math.max(0, size - TAIL_BYTES);
-    const len = size - start;
-    const buf = Buffer.allocUnsafe(len);
-    let read = 0;
-    while (read < len) {
-      const n = readSync6(fd, buf, read, len - read, start + read);
-      if (n <= 0) break;
-      read += n;
-    }
-    return buf.toString("utf8", 0, read);
-  } catch {
-    return "";
-  } finally {
-    if (fd !== void 0) {
-      try {
-        closeSync11(fd);
-      } catch {
-      }
-    }
-  }
-}
-function makeWindow(used, minutes, resetsAt) {
-  if (used === void 0) return void 0;
-  const key = minutes === 300 ? "5h" : minutes && minutes >= 10080 ? "weekly" : minutes ? `${Math.round(minutes / 60)}h` : "window";
-  const label = key === "weekly" ? "Weekly" : key;
-  return { key, label, usedPercent: used, resetsAt };
-}
-function toWindow(raw2) {
-  if (!raw2 || typeof raw2 !== "object") return void 0;
-  const w = raw2;
-  return makeWindow(num(w.used_percent), num(w.window_minutes), num(w.resets_at));
-}
-function parseCodexQuotaFromRollout(raw2) {
-  const lines = raw2.split("\n");
-  for (let i = lines.length - 1; i >= 0; i--) {
-    const line = lines[i];
-    if (!line.includes('"token_count"') || !line.includes("rate_limits")) continue;
-    let obj;
-    try {
-      obj = JSON.parse(line);
-    } catch {
-      continue;
-    }
-    if (!obj || typeof obj !== "object") continue;
-    const top = obj;
-    const payload = top.payload && typeof top.payload === "object" ? top.payload : void 0;
-    const rl = top.rate_limits ?? payload?.rate_limits;
-    if (!rl || typeof rl !== "object") continue;
-    const r = rl;
-    const windows = [toWindow(r.primary), toWindow(r.secondary)].filter((x) => x !== void 0);
-    if (windows.length === 0) continue;
-    const planType = typeof r.plan_type === "string" ? r.plan_type : void 0;
-    return { status: "ok", planType, windows };
-  }
-  return void 0;
-}
-function readCodexQuotaFromRollouts(codexHome = defaultCodexHome()) {
-  let quota = { status: "unavailable", windows: [], detail: "No recent Codex session" };
-  try {
-    const rollouts = [];
-    newestRollouts(sessionsDir2(codexHome), rollouts, { n: 8 });
-    const byMtime = rollouts.map((path3) => {
-      try {
-        return { path: path3, mtimeMs: statSync10(path3).mtimeMs };
-      } catch {
-        return void 0;
-      }
-    }).filter((x) => x !== void 0).sort((a, b) => b.mtimeMs - a.mtimeMs);
-    for (const { path: path3 } of byMtime) {
-      const parsed = parseCodexQuotaFromRollout(readTail(path3));
-      if (parsed) {
-        quota = parsed;
-        break;
-      }
-    }
-  } catch {
-    quota = { status: "unavailable", windows: [], detail: "Codex rollouts unreadable" };
-  }
-  return quota;
-}
-function toLiveWindow(raw2) {
-  if (!raw2 || typeof raw2 !== "object") return void 0;
-  const w = raw2;
-  return makeWindow(num(w.usedPercent), num(w.windowDurationMins), num(w.resetsAt));
-}
-function parseCodexQuotaFromRateLimits(result) {
-  if (!result || typeof result !== "object") return void 0;
-  const rl = result.rateLimits;
-  if (!rl || typeof rl !== "object") return void 0;
-  const r = rl;
-  const windows = [toLiveWindow(r.primary), toLiveWindow(r.secondary)].filter((x) => x !== void 0);
-  if (windows.length === 0) return void 0;
-  const planType = typeof r.planType === "string" ? r.planType : void 0;
-  return { status: "ok", planType, windows };
-}
-function queryCodexRateLimits(codexHome = defaultCodexHome(), codexBin = "codex", timeoutMs = 12e3) {
-  return new Promise((resolve12) => {
-    let child;
-    try {
-      child = spawn4(codexBin, ["app-server"], {
-        stdio: ["pipe", "pipe", "ignore"],
-        env: { ...process.env, CODEX_HOME: codexHome }
-      });
-    } catch {
-      resolve12(void 0);
-      return;
-    }
-    let settled = false;
-    const finish = (quota) => {
-      if (settled) return;
-      settled = true;
-      clearTimeout(timer);
-      try {
-        child.kill("SIGKILL");
-      } catch {
-      }
-      resolve12(quota);
-    };
-    const timer = setTimeout(() => finish(void 0), timeoutMs);
-    const send = (msg) => {
-      try {
-        child.stdin?.write(JSON.stringify(msg) + "\n");
-      } catch {
-        finish(void 0);
-      }
-    };
-    child.on("error", () => finish(void 0));
-    child.on("exit", () => finish(void 0));
-    let buf = "";
-    child.stdout?.on("data", (chunk) => {
-      buf += chunk.toString("utf8");
-      if (buf.length > 4 * 1024 * 1024) buf = buf.slice(-64 * 1024);
-      let nl;
-      while ((nl = buf.indexOf("\n")) >= 0) {
-        const line = buf.slice(0, nl);
-        buf = buf.slice(nl + 1);
-        if (!line.trim()) continue;
-        let msg;
-        try {
-          msg = JSON.parse(line);
-        } catch {
-          continue;
-        }
-        if (msg.id === 1) {
-          send({ jsonrpc: "2.0", method: "initialized" });
-          send({ jsonrpc: "2.0", id: 2, method: "account/rateLimits/read", params: {} });
-        } else if (msg.id === 2) {
-          finish(parseCodexQuotaFromRateLimits(msg.result));
-        }
-      }
-    });
-    send({
-      jsonrpc: "2.0",
-      id: 1,
-      method: "initialize",
-      params: { clientInfo: CLIENT_INFO, capabilities: CLIENT_CAPABILITIES }
-    });
-  });
-}
-async function readCodexQuota(codexHome = defaultCodexHome(), codexBin = "codex") {
-  const now = Date.now();
-  const hit = memo2.get(codexHome);
-  if (hit && now - hit.at < TTL_MS2) return hit.quota;
-  let quota;
-  try {
-    quota = await queryCodexRateLimits(codexHome, codexBin);
-  } catch {
-    quota = void 0;
-  }
-  if (!quota) {
-    const fallback = readCodexQuotaFromRollouts(codexHome);
-    quota = fallback.status === "ok" ? { ...fallback, detail: "From the last local session \u2014 sign-in state unconfirmed" } : fallback;
-  }
-  memo2.set(codexHome, { at: now, quota });
-  return quota;
-}
-var descByName2, TAIL_BYTES, num, TTL_MS2, memo2;
-var init_codex_quota = __esm({
-  "packages/server/src/backend/codex-quota.ts"() {
-    "use strict";
-    init_codex();
-    init_codex_app_server();
-    descByName2 = (a, b) => a < b ? 1 : a > b ? -1 : 0;
-    TAIL_BYTES = 512 * 1024;
-    num = (v) => typeof v === "number" && Number.isFinite(v) ? v : void 0;
-    TTL_MS2 = 2e4;
-    memo2 = /* @__PURE__ */ new Map();
-  }
-});
-
-// packages/server/src/backend/claude-quota.ts
-import { join as join23 } from "node:path";
-import { homedir as homedir9, platform } from "node:os";
-import { createHash as createHash10 } from "node:crypto";
-import { mkdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
-import { execFile as execFile3 } from "node:child_process";
-import { promisify as promisify3 } from "node:util";
-function claudeConfigDir() {
-  const override = process.env.CLAUDE_CONFIG_DIR;
-  return override && override.trim() ? override : join23(homedir9(), ".claude");
-}
-function tokenFromCredentialsJson(raw2) {
-  let doc;
-  try {
-    doc = JSON.parse(raw2);
-  } catch {
-    return void 0;
-  }
-  if (!doc || typeof doc !== "object") return void 0;
-  const root = doc;
-  const oauth = root.claudeAiOauth && typeof root.claudeAiOauth === "object" ? root.claudeAiOauth : root;
-  const token = oauth.accessToken ?? oauth.access_token;
-  return typeof token === "string" && token ? token : void 0;
-}
-async function readKeychainToken() {
-  if (platform() !== "darwin") return void 0;
-  try {
-    const { stdout } = await execFileAsync2("security", ["find-generic-password", "-s", "Claude Code-credentials", "-w"], {
-      encoding: "utf8",
-      timeout: 4e3
-    });
-    return tokenFromCredentialsJson(String(stdout).trim());
-  } catch {
-    return void 0;
-  }
-}
-async function readAccessToken(configDir) {
-  try {
-    const fromFile = tokenFromCredentialsJson(await readFile(join23(configDir, ".credentials.json"), "utf8"));
-    if (fromFile) return fromFile;
-  } catch {
-  }
-  return readKeychainToken();
-}
-function isoToUnix(value) {
-  const ms = typeof value === "string" ? Date.parse(value) : NaN;
-  return Number.isFinite(ms) ? Math.round(ms / 1e3) : void 0;
-}
-function slugify2(name) {
-  return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
-}
-function toWindow2(raw2, key, label) {
-  if (!raw2 || typeof raw2 !== "object") return void 0;
-  const w = raw2;
-  const util2 = typeof w.utilization === "number" && Number.isFinite(w.utilization) ? w.utilization : void 0;
-  if (util2 === void 0) return void 0;
-  const resetsAt = isoToUnix(w.resets_at ?? w.reset_at);
-  return { key, label, usedPercent: util2, ...resetsAt === void 0 ? {} : { resetsAt } };
-}
-function windowFromLimit(raw2) {
-  if (!raw2 || typeof raw2 !== "object") return void 0;
-  const l = raw2;
-  const percent = typeof l.percent === "number" && Number.isFinite(l.percent) ? l.percent : void 0;
-  if (percent === void 0) return void 0;
-  const group = typeof l.group === "string" ? l.group : typeof l.kind === "string" ? l.kind : "";
-  const scope = l.scope && typeof l.scope === "object" ? l.scope : void 0;
-  const model = scope?.model && typeof scope.model === "object" ? scope.model : void 0;
-  const scopeName = typeof model?.display_name === "string" && model.display_name ? model.display_name : void 0;
-  let key;
-  let label;
-  if (group === "session") {
-    key = "5h";
-    label = "5h";
-  } else if (group === "weekly") {
-    key = scopeName ? `weekly-${slugify2(scopeName)}` : "weekly";
-    label = scopeName ? `${scopeName} wk` : "Weekly";
-  } else if (group) {
-    key = slugify2(group);
-    label = scopeName ? `${scopeName} ${group}` : group;
-  } else {
-    return void 0;
-  }
-  const resetsAt = isoToUnix(l.resets_at ?? l.reset_at);
-  return { key, label, usedPercent: percent, ...resetsAt === void 0 ? {} : { resetsAt } };
-}
-function parseClaudeUsage(body, planType) {
-  if (!body || typeof body !== "object") return { status: "unavailable", windows: [], detail: "Malformed usage response" };
-  const b = body;
-  const windows = [];
-  const seen = /* @__PURE__ */ new Set();
-  const add = (w) => {
-    if (w && !seen.has(w.key)) {
-      seen.add(w.key);
-      windows.push(w);
-    }
-  };
-  if (Array.isArray(b.limits)) for (const entry of b.limits) add(windowFromLimit(entry));
-  add(toWindow2(b.five_hour, "5h", "5h"));
-  add(toWindow2(b.seven_day, "weekly", "Weekly"));
-  add(toWindow2(b.seven_day_opus, "weekly-opus", "Opus wk"));
-  add(toWindow2(b.seven_day_sonnet, "weekly-sonnet", "Sonnet wk"));
-  if (windows.length === 0) return { status: "unavailable", windows: [], detail: "No usage windows reported" };
-  return { status: "ok", planType, windows };
-}
-function cachePaths(cacheDir, configDir) {
-  const profile = createHash10("sha256").update(configDir).digest("hex").slice(0, 12);
-  return {
-    data: join23(cacheDir, `claude-${profile}.json`),
-    lock: join23(cacheDir, `claude-${profile}.lock`)
-  };
-}
-async function readShared(path3) {
-  try {
-    const parsed = JSON.parse(await readFile(path3, "utf8"));
-    if (!Number.isFinite(parsed.at) || !parsed.quota || !Array.isArray(parsed.quota.windows)) return void 0;
-    return parsed;
-  } catch {
-    return void 0;
-  }
-}
-async function writeShared(path3, value) {
-  const tmp = `${path3}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;
-  try {
-    await writeFile(tmp, JSON.stringify(value), { mode: 384 });
-    await rename(tmp, path3);
-  } finally {
-    await rm(tmp, { force: true }).catch(() => {
-    });
-  }
-}
-function delay(ms) {
-  return new Promise((resolve12) => setTimeout(resolve12, ms));
-}
-async function acquireLock(path3) {
-  const deadline = Date.now() + LOCK_WAIT_MS;
-  for (; ; ) {
-    try {
-      await mkdir(path3);
-      return () => rm(path3, { recursive: true, force: true });
-    } catch (err) {
-      if (err.code !== "EEXIST") throw err;
-      try {
-        if (Date.now() - (await stat(path3)).mtimeMs > LOCK_STALE_MS) {
-          await rm(path3, { recursive: true, force: true });
-          continue;
-        }
-      } catch {
-        continue;
-      }
-      if (Date.now() >= deadline) throw new Error("Claude quota refresh lock timed out");
-      await delay(LOCK_POLL_MS2);
-    }
-  }
-}
-async function runClaudeUsage(claudeBin) {
-  const { stdout } = await execFileAsync2(
-    // Never a bare name: on Windows `execFile("claude")` is ENOENT and `execFile("claude.cmd")` is
-    // EINVAL (node refuses .cmd/.bat without a shell since CVE-2024-27980), so this reader could
-    // never reach the CLI there and every quota refresh threw. See auth-status.ts for the measurement.
-    // A resolver throw is a refresh failure like any other — the callers' stale-serving catch owns it.
-    resolveClaudeExecutableAbsolute(claudeBin),
-    ["-p", "/usage", "--safe-mode", "--output-format", "json", "--no-session-persistence", "--tools", ""],
-    { encoding: "utf8", timeout: CLI_TIMEOUT_MS, maxBuffer: 2 * 1024 * 1024 }
-  );
-  return String(stdout);
-}
-async function refreshQuota(claudeBin, deps, now) {
-  const doFetch = deps.fetchImpl ?? fetch;
-  const readToken = deps.readToken ?? readAccessToken;
-  let token;
-  try {
-    token = await readToken(claudeConfigDir());
-  } catch {
-    token = void 0;
-  }
-  if (token) {
-    try {
-      const res = await doFetch(USAGE_URL, {
-        headers: {
-          Authorization: `Bearer ${token}`,
-          "anthropic-beta": OAUTH_BETA,
-          "User-Agent": USER_AGENT,
-          "Content-Type": "application/json"
-        },
-        signal: AbortSignal.timeout(ENDPOINT_TIMEOUT_MS)
-      });
-      if (res.ok) {
-        const body = await res.json();
-        const planType = typeof body.plan_type === "string" ? body.plan_type : void 0;
-        const quota2 = parseClaudeUsage(body, planType);
-        if (quota2.status === "ok") return quota2;
-      } else if (res.status === 429 || res.status === 529) {
-        throw new Error(`Usage endpoint ${res.status}`);
-      }
-    } catch (err) {
-      if (err instanceof Error && /^Usage endpoint (429|529)$/.test(err.message)) throw err;
-    }
-  }
-  const quota = parseClaudeUsageOutput(await (deps.execUsage ?? runClaudeUsage)(claudeBin), now);
-  if (quota.status !== "ok") throw new Error(quota.detail);
-  return quota;
-}
-function windowIdentity(title) {
-  for (const [pattern, key, label] of LINE_WINDOWS) {
-    if (pattern.test(title)) return [key, label];
-  }
-  const scoped = /^Current week \((.+)\)$/i.exec(title);
-  if (!scoped) return void 0;
-  const name = scoped[1].replace(/\s+only$/i, "");
-  const slug = name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
-  return slug ? [`weekly-${slug}`, `${name} wk`] : void 0;
-}
-function parseResetLabel(label, now) {
-  if (!label) return void 0;
-  const text2 = label.replace(/\s+\([^)]+\)\s*$/, "").trim();
-  const parts = /^(?:([A-Za-z]{3,9})\s+(\d{1,2})(?:,?\s+(\d{4}))?)?\s*(?:at\s+)?(?:(\d{1,2})(?::(\d{2}))?\s*(am|pm))?$/i.exec(text2);
-  const month = parts?.[1] ? MONTH_INDEX[parts[1].slice(0, 3).toLowerCase()] : void 0;
-  const hasClock = parts?.[6] !== void 0;
-  if (parts && (month !== void 0 || hasClock) && (parts[1] === void 0 || month !== void 0)) {
-    const date2 = new Date(now);
-    if (hasClock) {
-      let hour = Number(parts[4]) % 12;
-      if (parts[6].toLowerCase() === "pm") hour += 12;
-      date2.setHours(hour, Number(parts[5] ?? 0), 0, 0);
-    } else {
-      date2.setHours(0, 0, 0, 0);
-    }
-    if (month !== void 0) {
-      date2.setMonth(month, Number(parts[2]));
-      if (parts[3]) date2.setFullYear(Number(parts[3]));
-      else if (date2.getTime() <= now) date2.setFullYear(date2.getFullYear() + 1);
-    } else if (date2.getTime() <= now) {
-      date2.setDate(date2.getDate() + 1);
-    }
-    return Math.round(date2.getTime() / 1e3);
-  }
-  const parsed = Date.parse(text2);
-  if (!Number.isFinite(parsed)) return void 0;
-  const date = new Date(parsed);
-  if (!/\b\d{4}\b/.test(text2) && date.getTime() <= now) date.setFullYear(date.getFullYear() + 1);
-  return Math.round(date.getTime() / 1e3);
-}
-function parseClaudeUsageOutput(stdout, now = Date.now()) {
-  let text2 = stdout;
-  try {
-    const envelope = JSON.parse(stdout);
-    if (typeof envelope.result === "string") text2 = envelope.result;
-  } catch {
-  }
-  const windows = [];
-  for (const line of text2.split(/\r?\n/)) {
-    const match2 = /^\s*(Current (?:session|week \(.+?\))):\s*(\d+(?:\.\d+)?)%\s+used\b(?:\s*·\s*resets\s+(.+?))?\s*$/i.exec(line);
-    if (!match2) continue;
-    const identity = windowIdentity(match2[1]);
-    if (!identity) continue;
-    const resetsAt = parseResetLabel(match2[3], now);
-    windows.push({
-      key: identity[0],
-      label: identity[1],
-      usedPercent: Number(match2[2]),
-      ...resetsAt === void 0 ? {} : { resetsAt }
-    });
-  }
-  if (windows.length === 0) {
-    return { status: "unavailable", windows: [], detail: "Claude Code did not report subscription quota" };
-  }
-  return { status: "ok", windows };
-}
-async function tryAcquireLock2(path3) {
-  for (let attempt = 0; attempt < 2; attempt++) {
-    try {
-      await mkdir(path3);
-      return () => rm(path3, { recursive: true, force: true });
-    } catch (err) {
-      if (err.code !== "EEXIST") return void 0;
+function readTail(path3) {
+  let fd;
+  try {
+    fd = openSync12(path3, "r");
+    const size = fstatSync(fd).size;
+    const start = Math.max(0, size - TAIL_BYTES);
+    const len = size - start;
+    const buf = Buffer.allocUnsafe(len);
+    let read = 0;
+    while (read < len) {
+      const n = readSync6(fd, buf, read, len - read, start + read);
+      if (n <= 0) break;
+      read += n;
+    }
+    return buf.toString("utf8", 0, read);
+  } catch {
+    return "";
+  } finally {
+    if (fd !== void 0) {
       try {
-        if (Date.now() - (await stat(path3)).mtimeMs <= LOCK_STALE_MS) return void 0;
-        await rm(path3, { recursive: true, force: true });
+        closeSync11(fd);
       } catch {
-        return void 0;
       }
     }
   }
-  return void 0;
 }
-function refreshSharedInBackground(paths, claudeBin, deps, now) {
-  if (backgroundRefreshes.has(paths.data)) return;
-  const task = (async () => {
-    const release = await tryAcquireLock2(paths.lock);
-    if (!release) return;
+function makeWindow(used, minutes, resetsAt) {
+  if (used === void 0) return void 0;
+  const key = minutes === 300 ? "5h" : minutes && minutes >= 10080 ? "weekly" : minutes ? `${Math.round(minutes / 60)}h` : "window";
+  const label = key === "weekly" ? "Weekly" : key;
+  return { key, label, usedPercent: used, resetsAt };
+}
+function toWindow2(raw2) {
+  if (!raw2 || typeof raw2 !== "object") return void 0;
+  const w = raw2;
+  return makeWindow(num(w.used_percent), num(w.window_minutes), num(w.resets_at));
+}
+function parseCodexQuotaFromRollout(raw2) {
+  const lines = raw2.split("\n");
+  for (let i = lines.length - 1; i >= 0; i--) {
+    const line = lines[i];
+    if (!line.includes('"token_count"') || !line.includes("rate_limits")) continue;
+    let obj;
     try {
-      const quota = await refreshQuota(claudeBin, deps, now);
-      await writeShared(paths.data, { at: now, quota });
-    } finally {
-      await release().catch(() => {
-      });
+      obj = JSON.parse(line);
+    } catch {
+      continue;
     }
-  })().catch(() => {
-  }).finally(() => backgroundRefreshes.delete(paths.data));
-  backgroundRefreshes.set(paths.data, task);
+    if (!obj || typeof obj !== "object") continue;
+    const top = obj;
+    const payload = top.payload && typeof top.payload === "object" ? top.payload : void 0;
+    const rl = top.rate_limits ?? payload?.rate_limits;
+    if (!rl || typeof rl !== "object") continue;
+    const r = rl;
+    const windows = [toWindow2(r.primary), toWindow2(r.secondary)].filter((x) => x !== void 0);
+    if (windows.length === 0) continue;
+    const planType = typeof r.plan_type === "string" ? r.plan_type : void 0;
+    return { status: "ok", planType, windows };
+  }
+  return void 0;
 }
-async function refreshClaudeQuotaInBackground(claudeBin = "claude", deps = {}) {
-  const now = (deps.now ?? Date.now)();
-  const configDir = claudeConfigDir();
-  const cacheDir = deps.cacheDir ?? join23(frizzRoots().cache, "quota-cache");
+function readCodexQuotaFromRollouts(codexHome = defaultCodexHome()) {
+  let quota = { status: "unavailable", windows: [], detail: "No recent Codex session" };
   try {
-    await mkdir(cacheDir, { recursive: true, mode: 448 });
+    const rollouts = [];
+    newestRollouts(sessionsDir2(codexHome), rollouts, { n: 8 });
+    const byMtime = rollouts.map((path3) => {
+      try {
+        return { path: path3, mtimeMs: statSync11(path3).mtimeMs };
+      } catch {
+        return void 0;
+      }
+    }).filter((x) => x !== void 0).sort((a, b) => b.mtimeMs - a.mtimeMs);
+    for (const { path: path3 } of byMtime) {
+      const parsed = parseCodexQuotaFromRollout(readTail(path3));
+      if (parsed) {
+        quota = parsed;
+        break;
+      }
+    }
   } catch {
-    return;
+    quota = { status: "unavailable", windows: [], detail: "Codex rollouts unreadable" };
   }
-  refreshSharedInBackground(cachePaths(cacheDir, configDir), claudeBin, deps, now);
+  return quota;
 }
-async function readClaudeQuota(claudeBin = "claude", deps = {}, options = {}) {
-  const now = (deps.now ?? Date.now)();
-  const configDir = claudeConfigDir();
-  const cacheDir = deps.cacheDir ?? join23(frizzRoots().cache, "quota-cache");
-  const paths = cachePaths(cacheDir, configDir);
-  try {
-    await mkdir(cacheDir, { recursive: true, mode: 448 });
-  } catch {
+function toLiveWindow(raw2) {
+  if (!raw2 || typeof raw2 !== "object") return void 0;
+  const w = raw2;
+  return makeWindow(num(w.usedPercent), num(w.windowDurationMins), num(w.resetsAt));
+}
+function parseCodexQuotaFromRateLimits(result) {
+  if (!result || typeof result !== "object") return void 0;
+  const rl = result.rateLimits;
+  if (!rl || typeof rl !== "object") return void 0;
+  const r = rl;
+  const windows = [toLiveWindow(r.primary), toLiveWindow(r.secondary)].filter((x) => x !== void 0);
+  if (windows.length === 0) return void 0;
+  const planType = typeof r.planType === "string" ? r.planType : void 0;
+  return { status: "ok", planType, windows };
+}
+function queryCodexRateLimits(codexHome = defaultCodexHome(), codexBin = "codex", timeoutMs = 12e3) {
+  return new Promise((resolve12) => {
+    let child;
     try {
-      return await refreshQuota(claudeBin, deps, now);
+      child = spawn4(codexBin, ["app-server"], {
+        stdio: ["pipe", "pipe", "ignore"],
+        env: { ...process.env, CODEX_HOME: codexHome }
+      });
     } catch {
-      return { status: "unavailable", windows: [], detail: "Claude usage unavailable" };
-    }
-  }
-  const initial = await readShared(paths.data);
-  if (!options.force && initial && now - initial.at < (initial.quota.status === "ok" ? OK_TTL_MS : FAIL_TTL_MS)) {
-    return initial.quota;
-  }
-  if (!options.force && initial?.quota.status === "ok" && now - initial.at < STALE_MAX_AGE_MS) {
-    refreshSharedInBackground(paths, claudeBin, deps, now);
-    const ageMs = now - initial.at;
-    if (ageMs < 10 * 6e4) return initial.quota;
-    return { ...initial.quota, detail: `Refreshing \xB7 last updated ${Math.round(ageMs / 6e4)}m ago` };
-  }
-  let release;
-  try {
-    release = await acquireLock(paths.lock);
-    const afterLock = await readShared(paths.data);
-    if (afterLock && afterLock.at !== initial?.at && now - afterLock.at < OK_TTL_MS) return afterLock.quota;
-    const quota = await refreshQuota(claudeBin, deps, now);
-    await writeShared(paths.data, { at: now, quota }).catch(() => {
-    });
-    return quota;
-  } catch {
-    const fallback = await readShared(paths.data);
-    if (fallback?.quota.status === "ok" && now - fallback.at < STALE_MAX_AGE_MS) {
-      return {
-        ...fallback.quota,
-        detail: `Could not refresh \xB7 last updated ${Math.max(1, Math.round((now - fallback.at) / 6e4))}m ago`
-      };
+      resolve12(void 0);
+      return;
     }
-    const unavailable = { status: "unavailable", windows: [], detail: "Claude Code usage unavailable" };
-    await writeShared(paths.data, { at: now, quota: unavailable }).catch(() => {
+    let settled = false;
+    const finish = (quota) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      try {
+        child.kill("SIGKILL");
+      } catch {
+      }
+      resolve12(quota);
+    };
+    const timer = setTimeout(() => finish(void 0), timeoutMs);
+    const send = (msg) => {
+      try {
+        child.stdin?.write(JSON.stringify(msg) + "\n");
+      } catch {
+        finish(void 0);
+      }
+    };
+    child.on("error", () => finish(void 0));
+    child.on("exit", () => finish(void 0));
+    let buf = "";
+    child.stdout?.on("data", (chunk) => {
+      buf += chunk.toString("utf8");
+      if (buf.length > 4 * 1024 * 1024) buf = buf.slice(-64 * 1024);
+      let nl;
+      while ((nl = buf.indexOf("\n")) >= 0) {
+        const line = buf.slice(0, nl);
+        buf = buf.slice(nl + 1);
+        if (!line.trim()) continue;
+        let msg;
+        try {
+          msg = JSON.parse(line);
+        } catch {
+          continue;
+        }
+        if (msg.id === 1) {
+          send({ jsonrpc: "2.0", method: "initialized" });
+          send({ jsonrpc: "2.0", id: 2, method: "account/rateLimits/read", params: {} });
+        } else if (msg.id === 2) {
+          finish(parseCodexQuotaFromRateLimits(msg.result));
+        }
+      }
     });
-    return unavailable;
-  } finally {
-    await release?.().catch(() => {
+    send({
+      jsonrpc: "2.0",
+      id: 1,
+      method: "initialize",
+      params: { clientInfo: CLIENT_INFO, capabilities: CLIENT_CAPABILITIES }
     });
+  });
+}
+async function readCodexQuota(codexHome = defaultCodexHome(), codexBin = "codex") {
+  const now = Date.now();
+  const hit = memo2.get(codexHome);
+  if (hit && now - hit.at < TTL_MS2) return hit.quota;
+  let quota;
+  try {
+    quota = await queryCodexRateLimits(codexHome, codexBin);
+  } catch {
+    quota = void 0;
   }
+  if (!quota) {
+    const fallback = readCodexQuotaFromRollouts(codexHome);
+    quota = fallback.status === "ok" ? { ...fallback, detail: "From the last local session \u2014 sign-in state unconfirmed" } : fallback;
+  }
+  memo2.set(codexHome, { at: now, quota });
+  return quota;
 }
-var execFileAsync2, USAGE_URL, OAUTH_BETA, USER_AGENT, ENDPOINT_TIMEOUT_MS, OK_TTL_MS, FAIL_TTL_MS, STALE_MAX_AGE_MS, CLI_TIMEOUT_MS, LOCK_STALE_MS, LOCK_WAIT_MS, LOCK_POLL_MS2, LINE_WINDOWS, MONTH_INDEX, backgroundRefreshes;
-var init_claude_quota = __esm({
-  "packages/server/src/backend/claude-quota.ts"() {
+var descByName2, TAIL_BYTES, num, TTL_MS2, memo2;
+var init_codex_quota = __esm({
+  "packages/server/src/backend/codex-quota.ts"() {
     "use strict";
-    init_frizz_paths();
-    init_claude_broker_host();
-    execFileAsync2 = promisify3(execFile3);
-    USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
-    OAUTH_BETA = "oauth-2025-04-20";
-    USER_AGENT = "claude-code/2.0.0";
-    ENDPOINT_TIMEOUT_MS = 5e3;
-    OK_TTL_MS = 2 * 6e4;
-    FAIL_TTL_MS = 1e4;
-    STALE_MAX_AGE_MS = 24 * 60 * 6e4;
-    CLI_TIMEOUT_MS = 3e4;
-    LOCK_STALE_MS = 4e4;
-    LOCK_WAIT_MS = 15e3;
-    LOCK_POLL_MS2 = 50;
-    LINE_WINDOWS = [
-      [/^Current session$/i, "5h", "5h"],
-      [/^Current week \(all models\)$/i, "weekly", "Weekly"],
-      [/^Current week \(Opus only\)$/i, "weekly-opus", "Opus wk"],
-      [/^Current week \(Sonnet only\)$/i, "weekly-sonnet", "Sonnet wk"]
-    ];
-    MONTH_INDEX = {
-      jan: 0,
-      feb: 1,
-      mar: 2,
-      apr: 3,
-      may: 4,
-      jun: 5,
-      jul: 6,
-      aug: 7,
-      sep: 8,
-      oct: 9,
-      nov: 10,
-      dec: 11
-    };
-    backgroundRefreshes = /* @__PURE__ */ new Map();
+    init_codex();
+    init_codex_app_server();
+    descByName2 = (a, b) => a < b ? 1 : a > b ? -1 : 0;
+    TAIL_BYTES = 512 * 1024;
+    num = (v) => typeof v === "number" && Number.isFinite(v) ? v : void 0;
+    TTL_MS2 = 2e4;
+    memo2 = /* @__PURE__ */ new Map();
   }
 });
 
@@ -34120,10 +34493,10 @@ var init_quota = __esm({
 });
 
 // packages/server/src/frizz.ts
-import { execFile as execFile4 } from "node:child_process";
+import { execFile as execFile5 } from "node:child_process";
 import { lstatSync as lstatSync2, realpathSync as realpathSync6 } from "node:fs";
-import { basename as basename5, dirname as dirname9, join as join24, resolve as resolve5 } from "node:path";
-import { promisify as promisify4 } from "node:util";
+import { basename as basename5, dirname as dirname9, join as join25, resolve as resolve5 } from "node:path";
+import { promisify as promisify5 } from "node:util";
 function frizzScriptsDir() {
   if (process.env.FRIZZ_SCRIPTS_DIR) return process.env.FRIZZ_SCRIPTS_DIR;
   return resolve5(import.meta.dirname, "..", "..", "..", "board");
@@ -34131,7 +34504,7 @@ function frizzScriptsDir() {
 function directFrizzRoot(projectDir) {
   try {
     const projectRoot = realpathSync6(projectDir);
-    const path3 = join24(projectRoot, ".frizz");
+    const path3 = join25(projectRoot, ".frizz");
     const stat2 = lstatSync2(path3);
     if (!stat2.isDirectory() || stat2.isSymbolicLink()) return null;
     const real = realpathSync6(path3);
@@ -34145,7 +34518,7 @@ function frizzDirExists(projectDir) {
 }
 async function readBoard(projectDir, scriptsDir = frizzScriptsDir()) {
   if (!directFrizzRoot(projectDir)) throw new Error("unsafe or missing .frizz directory");
-  const { stdout } = await execFileP("node", [join24(scriptsDir, "index.mjs"), "--json"], {
+  const { stdout } = await execFileP("node", [join25(scriptsDir, "index.mjs"), "--json"], {
     cwd: projectDir,
     env: { ...process.env, CLAUDE_PROJECT_DIR: projectDir },
     maxBuffer: 32 * 1024 * 1024
@@ -34170,7 +34543,7 @@ async function readBoard(projectDir, scriptsDir = frizzScriptsDir()) {
   };
 }
 async function runThreadUpdate(projectDir, slug, args, scriptsDir = frizzScriptsDir()) {
-  await execFileP("node", [join24(scriptsDir, "thread-update.mjs"), slug, ...args], {
+  await execFileP("node", [join25(scriptsDir, "thread-update.mjs"), slug, ...args], {
     cwd: projectDir,
     env: { ...process.env, CLAUDE_PROJECT_DIR: projectDir }
   });
@@ -34180,7 +34553,7 @@ var init_frizz = __esm({
   "packages/server/src/frizz.ts"() {
     "use strict";
     init_src();
-    execFileP = promisify4(execFile4);
+    execFileP = promisify5(execFile5);
   }
 });
 
@@ -34255,12 +34628,12 @@ var init_awaiting = __esm({
 });
 
 // packages/server/src/backend/project-mcp-servers.ts
-import { readFileSync as readFileSync16 } from "node:fs";
-import { homedir as homedir10 } from "node:os";
-import { join as join25 } from "node:path";
+import { readFileSync as readFileSync17 } from "node:fs";
+import { homedir as homedir11 } from "node:os";
+import { join as join26 } from "node:path";
 function readJsonObject(path3) {
   try {
-    const parsed = JSON.parse(readFileSync16(path3, "utf8"));
+    const parsed = JSON.parse(readFileSync17(path3, "utf8"));
     return parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : void 0;
   } catch {
     return void 0;
@@ -34351,17 +34724,17 @@ function userScopeRemoteServers(account, cwd, env) {
 }
 function projectMcpServers(cwd, options = {}) {
   const env = options.env ?? process.env;
-  const home = options.home ?? homedir10();
+  const home = options.home ?? homedir11();
   const configOverride = options.claudeConfigDir ?? (env.CLAUDE_CONFIG_DIR?.trim() ? env.CLAUDE_CONFIG_DIR.trim() : void 0);
-  const accountFile = configOverride ? join25(configOverride, ".claude.json") : join25(home, ".claude.json");
-  const userSettingsFile = join25(configOverride ?? join25(home, ".claude"), "settings.json");
+  const accountFile = configOverride ? join26(configOverride, ".claude.json") : join26(home, ".claude.json");
+  const userSettingsFile = join26(configOverride ?? join26(home, ".claude"), "settings.json");
   const account = readJsonObject(accountFile);
   const out = userScopeRemoteServers(account, cwd, env);
-  const declared = objectField(readJsonObject(join25(cwd, ".mcp.json")), "mcpServers");
+  const declared = objectField(readJsonObject(join26(cwd, ".mcp.json")), "mcpServers");
   if (!declared) return out;
   const approval = collectApproval([
-    readJsonObject(join25(cwd, ".claude", "settings.json")),
-    readJsonObject(join25(cwd, ".claude", "settings.local.json")),
+    readJsonObject(join26(cwd, ".claude", "settings.json")),
+    readJsonObject(join26(cwd, ".claude", "settings.local.json")),
     readJsonObject(userSettingsFile),
     objectField(objectField(account, "projects"), cwd)
   ]);
@@ -34386,16 +34759,16 @@ var init_project_mcp_servers = __esm({
 
 // packages/server/src/worker-plugin-dir.ts
 import { existsSync as existsSync8 } from "node:fs";
-import { dirname as dirname10, join as join26 } from "node:path";
+import { dirname as dirname10, join as join27 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function resolveWorkerPluginDir(moduleUrl = import.meta.url, env = process.env) {
   const override = env.FRIZZ_WORKER_PLUGIN_DIR;
-  if (override && existsSync8(join26(override, ".claude-plugin", "plugin.json")))
+  if (override && existsSync8(join27(override, ".claude-plugin", "plugin.json")))
     return override;
   let current = dirname10(fileURLToPath2(moduleUrl));
   for (; ; ) {
-    const candidate = join26(current, "cc-worker");
-    if (existsSync8(join26(candidate, ".claude-plugin", "plugin.json"))) return candidate;
+    const candidate = join27(current, "cc-worker");
+    if (existsSync8(join27(candidate, ".claude-plugin", "plugin.json"))) return candidate;
     const parent = dirname10(current);
     if (parent === current) return void 0;
     current = parent;
@@ -35549,12 +35922,12 @@ var init_claude_broker_client = __esm({
 });
 
 // packages/server/src/backend/claude-permission-interactions.ts
-import { homedir as homedir11 } from "node:os";
+import { homedir as homedir12 } from "node:os";
 function clip(text2, max) {
   return text2.length > max ? `${text2.slice(0, max - 1)}\u2026` : text2;
 }
 function tildePath(path3) {
-  const home = homedir11();
+  const home = homedir12();
   if (!path3.startsWith(home)) return path3;
   const rest = path3.slice(home.length);
   return rest === "" ? "~" : rest.startsWith("/") ? `~${rest}` : path3;
@@ -36203,208 +36576,6 @@ var init_claude_agent_broker_bridge = __esm({
   }
 });
 
-// packages/server/src/backend/auth-status.ts
-import { join as join27 } from "node:path";
-import { homedir as homedir12, platform as platform2 } from "node:os";
-import { readFileSync as readFileSync17, statSync as statSync11 } from "node:fs";
-import { execFile as execFile5 } from "node:child_process";
-import { promisify as promisify5 } from "node:util";
-function claudeConfigDir2() {
-  const override = process.env.CLAUDE_CONFIG_DIR;
-  return override && override.trim() ? override : join27(homedir12(), ".claude");
-}
-function claudeFileState(configDir) {
-  let raw2;
-  try {
-    raw2 = readFileSync17(join27(configDir, ".credentials.json"), "utf8");
-  } catch (err) {
-    return err.code === "ENOENT" ? "absent" : "error";
-  }
-  return tokenFromCredentialsJson(raw2) ? "token" : "empty";
-}
-async function claudeKeychainState() {
-  if (process.env.FRIZZ_KEYCHAIN_DISABLED && process.env.NODE_ENV !== "production") return "absent";
-  if (platform2() !== "darwin") return "absent";
-  try {
-    const { stdout } = await execFileAsync3("security", ["find-generic-password", "-s", "Claude Code-credentials", "-w"], {
-      encoding: "utf8",
-      timeout: 4e3
-    });
-    return tokenFromCredentialsJson(String(stdout).trim()) ? "token" : "empty";
-  } catch (err) {
-    const e = err;
-    const notFound = e.code === 44 || typeof e.stderr === "string" && /could not be found/i.test(e.stderr);
-    return notFound ? "absent" : "error";
-  }
-}
-async function readClaudeAuthState(configDir = claudeConfigDir2()) {
-  const file = claudeFileState(configDir);
-  if (file === "token") return "authed";
-  const keychain = await claudeKeychainState();
-  if (keychain === "token") return "authed";
-  if (file === "error" || keychain === "error") return "unknown";
-  return "signed-out";
-}
-function readCodexAuthState(codexHome = defaultCodexHome()) {
-  if (process.env.OPENAI_API_KEY || process.env.CODEX_API_KEY || process.env.CODEX_ACCESS_TOKEN) return "authed";
-  let raw2;
-  try {
-    raw2 = readFileSync17(join27(codexHome, "auth.json"), "utf8");
-  } catch (err) {
-    return err.code === "ENOENT" ? "signed-out" : "unknown";
-  }
-  let doc;
-  try {
-    doc = JSON.parse(raw2);
-  } catch {
-    return "unknown";
-  }
-  if (!doc || typeof doc !== "object") return "unknown";
-  const root = doc;
-  const apiKey = typeof root.OPENAI_API_KEY === "string" && root.OPENAI_API_KEY ? root.OPENAI_API_KEY : void 0;
-  const tokens = root.tokens && typeof root.tokens === "object" ? root.tokens : void 0;
-  const accessToken = tokens && typeof tokens.access_token === "string" && tokens.access_token ? tokens.access_token : void 0;
-  return apiKey || accessToken ? "authed" : "signed-out";
-}
-async function readCodexBinaryState(codexBin = "codex", exec = execFileAsync3) {
-  try {
-    await exec(codexBin, ["--version"], { timeout: 5e3 });
-    return "present";
-  } catch (err) {
-    return err.code === "ENOENT" ? "missing" : "unknown";
-  }
-}
-function parseClaudeAuthStatusJson(stdout) {
-  const start = stdout.indexOf("{");
-  const end = stdout.lastIndexOf("}");
-  if (start === -1 || end <= start) return void 0;
-  try {
-    const doc = JSON.parse(stdout.slice(start, end + 1));
-    return typeof doc.loggedIn === "boolean" ? doc.loggedIn : void 0;
-  } catch {
-    return void 0;
-  }
-}
-async function readClaudeAuthStatusCli(opts) {
-  try {
-    const bin = resolveClaudeExecutableAbsolute(opts?.claudeBin);
-    const { stdout } = await execFileAsync3(bin, ["auth", "status", "--json"], {
-      encoding: "utf8",
-      timeout: opts?.timeoutMs ?? 5e3,
-      ...opts?.cwd ? { cwd: opts.cwd } : {}
-    });
-    return parseClaudeAuthStatusJson(String(stdout)) === false ? "signed-out" : "authed";
-  } catch (err) {
-    const stdout = err.stdout;
-    const loggedIn = typeof stdout === "string" ? parseClaudeAuthStatusJson(stdout) : void 0;
-    if (loggedIn === false) return "signed-out";
-    if (loggedIn === true) return "authed";
-    return "unknown";
-  }
-}
-async function readClaudePreflightAuth(opts) {
-  const local = await readClaudeAuthState();
-  if (local !== "signed-out") return local;
-  return readClaudeAuthStatusCli({ claudeBin: opts?.claudeBin, ...opts?.cwd ? { cwd: opts.cwd } : {} });
-}
-function asEmail(value) {
-  if (typeof value !== "string") return void 0;
-  const email = value.trim();
-  return email.length <= 320 && /^[^\s@]+@[^\s@]+$/.test(email) ? email : void 0;
-}
-function claudeAccountFile() {
-  const override = process.env.CLAUDE_CONFIG_DIR;
-  return override && override.trim() ? join27(override, ".claude.json") : join27(homedir12(), ".claude.json");
-}
-function readClaudeAccountEmail(path3 = claudeAccountFile()) {
-  let stat2;
-  try {
-    stat2 = statSync11(path3);
-  } catch {
-    return void 0;
-  }
-  const memo3 = claudeAccountMemo;
-  if (memo3 && memo3.path === path3 && memo3.mtimeMs === stat2.mtimeMs && memo3.size === stat2.size) return memo3.email;
-  let email;
-  try {
-    const doc = JSON.parse(readFileSync17(path3, "utf8"));
-    email = asEmail(doc?.oauthAccount?.emailAddress);
-  } catch {
-    email = void 0;
-  }
-  claudeAccountMemo = { path: path3, mtimeMs: stat2.mtimeMs, size: stat2.size, email };
-  return email;
-}
-function readCodexAccountEmail(codexHome = defaultCodexHome()) {
-  let doc;
-  try {
-    doc = JSON.parse(readFileSync17(join27(codexHome, "auth.json"), "utf8"));
-  } catch {
-    return void 0;
-  }
-  const idToken = doc?.tokens?.id_token;
-  if (typeof idToken !== "string") return void 0;
-  const payload = idToken.split(".")[1];
-  if (!payload) return void 0;
-  try {
-    return asEmail(JSON.parse(Buffer.from(payload, "base64url").toString("utf8")).email);
-  } catch {
-    return void 0;
-  }
-}
-function readAccountEmails() {
-  const emails = {};
-  const claude = tryRead(readClaudeAccountEmail);
-  const codex = tryRead(readCodexAccountEmail);
-  if (claude) emails.claude = claude;
-  if (codex) emails.codex = codex;
-  return emails;
-}
-function tryRead(read) {
-  try {
-    return read();
-  } catch {
-    return void 0;
-  }
-}
-async function readAuthSnapshot(opts) {
-  const [claude, codex] = await Promise.all([
-    readClaudeAuthState().then(async (local) => {
-      if (local !== "signed-out") return local;
-      const cli = await readClaudeAuthStatusCli({ claudeBin: opts?.claudeBin });
-      return cli === "authed" ? "authed" : local;
-    }).catch(() => "unknown"),
-    Promise.resolve().then(() => readCodexAuthState()).catch(() => "unknown")
-  ]);
-  const emails = readAccountEmails();
-  return {
-    claude,
-    codex,
-    emails: {
-      ...claude === "signed-out" ? {} : emails.claude ? { claude: emails.claude } : {},
-      ...codex === "signed-out" ? {} : emails.codex ? { codex: emails.codex } : {}
-    }
-  };
-}
-var execFileAsync3, ProviderAuthRequiredError, claudeAccountMemo;
-var init_auth_status = __esm({
-  "packages/server/src/backend/auth-status.ts"() {
-    "use strict";
-    init_claude_quota();
-    init_codex();
-    init_claude_broker_host();
-    execFileAsync3 = promisify5(execFile5);
-    ProviderAuthRequiredError = class extends Error {
-      backend;
-      constructor(backend) {
-        super(`AUTH_REQUIRED:${backend}`);
-        this.name = "ProviderAuthRequiredError";
-        this.backend = backend;
-      }
-    };
-  }
-});
-
 // packages/server/src/dispatch.ts
 import { closeSync as closeSync12, constants, existsSync as existsSync9, fstatSync as fstatSync2, lstatSync as lstatSync3, openSync as openSync13, readFileSync as readFileSync18, realpathSync as realpathSync7, statSync as statSync12, writeFileSync as writeFileSync10, mkdirSync as mkdirSync13, rmSync as rmSync9 } from "node:fs";
 import { basename as basename6, join as join28, dirname as dirname11 } from "node:path";
@@ -36601,6 +36772,10 @@ function workerDispatchPermission(kind, settings) {
   if (kind === "claude" && settings.permissionMode === "bypassPermissions") return "bypassPermissions";
   return WORKER_DISPATCH_PERMISSION[kind];
 }
+function coldResumePermission(row, settings) {
+  const saved = PermissionMode.safeParse(row.permission_mode);
+  return saved.success ? saved.data : workerDispatchPermission("claude", settings);
+}
 function effectivePermissionMode(kind, mode) {
   if (kind === "claude") return workerPermissionMode(mode);
   if (mode === "plan" || mode === "bypassPermissions") return mode;
@@ -36912,7 +37087,14 @@ function createDispatcher(deps) {
         transcript_id: null,
         state: "open",
         meta: null,
-        seen_at: null
+        seen_at: null,
+        // The SAME launch mode a dispatched worker gets. The follow-up that triggered this promotion
+        // resumes the session with `row.permission_mode`, and a row with none fell through to the
+        // bridge's `"default"` — Claude's prompt-on-everything mode, which the worker's own perm-policy
+        // hook then DEFERS on every call (`restrictive-mode`), so each Edit became a card. Observed
+        // 2026-09-03 on a terminal session driven from the board: every frizz-sent turn ran at
+        // `default` while the human's own TUI on the same transcript sat at `auto`.
+        permission_mode: workerDispatchPermission(backend, deps.getSettings())
       });
       deps.storage.setBackend(slug, backend);
       if (backend === "codex") deps.storage.setAgentSession(slug, externalId);
@@ -38935,15 +39117,33 @@ function isHeartbeatFenceId(fenceId) {
 function saidDone(tele) {
   return tele.lastFence?.kind === "done" || tele.lastAssistantAllDone === true;
 }
-function threadSaidDone(storage, slug, tele) {
-  return saidDone(tele) || registeredDoneFence(storage.getThreadDone(slug), tele.lastUserAt) !== void 0;
+function threadSaidDone(storage, slug, tele, armedAt) {
+  const registered = registeredDoneFence(storage.getThreadDone(slug), tele.lastUserAt) !== void 0;
+  const fenced = saidDone(tele);
+  if (!registered && !fenced) return false;
+  return !armReopenedTheLoop(storage, slug, tele, registered, fenced, armedAt);
+}
+function armReopenedTheLoop(storage, slug, tele, registered, fenced, armedAt) {
+  const armed = armedAt ? Date.parse(armedAt) : Number.NaN;
+  if (!Number.isFinite(armed)) return false;
+  let signedOffAt = Number.NEGATIVE_INFINITY;
+  if (registered) {
+    const doneAt = storage.getThreadDone(slug)?.doneAt;
+    if (doneAt !== void 0) signedOffAt = Math.max(signedOffAt, doneAt);
+  }
+  if (fenced) {
+    const fencedAt = Date.parse(tele.lastAssistantAt ?? "");
+    if (!Number.isFinite(fencedAt)) return false;
+    signedOffAt = Math.max(signedOffAt, fencedAt);
+  }
+  return Number.isFinite(signedOffAt) && armed > signedOffAt;
 }
 function armedTimerIdsOf(storage, slug) {
   return new Set(storage.listThreadTimers(slug, { armedOnly: true }).map((t) => t.id));
 }
-function restMessageIsSignedOff(storage, slug, tele, _registeredPrWatches = /* @__PURE__ */ new Set(), _armedTimerIds = /* @__PURE__ */ new Set()) {
+function restMessageIsSignedOff(storage, slug, tele, _registeredPrWatches = /* @__PURE__ */ new Set(), _armedTimerIds = /* @__PURE__ */ new Set(), armedAt) {
   if (tele.lastFence?.kind === "awaiting") return true;
-  return threadSaidDone(storage, slug, tele);
+  return threadSaidDone(storage, slug, tele, armedAt);
 }
 function liveActivityOf(tele, registeredPrWatches, armedTimerIds) {
   const shells = /* @__PURE__ */ new Set();
@@ -39202,7 +39402,7 @@ function createScheduler(deps) {
     if (isStopHookFenceId(item.fenceId)) {
       const armed = armedRest(row);
       if (!armed || item.fenceId !== stopHookFenceId(armed.armedAt, tele.lastAssistantAt ?? "")) return "superseded";
-      if (restMessageIsSignedOff(deps.storage, item.slug, tele, registeredPrWatchesOf(deps.storage, item.slug), armedTimerIdsOf(deps.storage, item.slug))) return "superseded";
+      if (restMessageIsSignedOff(deps.storage, item.slug, tele, registeredPrWatchesOf(deps.storage, item.slug), armedTimerIdsOf(deps.storage, item.slug), armed.armedAt)) return "superseded";
       return tele.turn === "idle" ? "current-idle" : "current-busy";
     }
     if (isCompactFenceId(item.fenceId)) {
@@ -40059,7 +40259,7 @@ ${clock}`;
       const armed = armedSchedule(row);
       if (!armed || armed.dueAtMs > nowMs) continue;
       const beatTele = deps.tailer.get(row.slug);
-      if (beatTele && threadSaidDone(deps.storage, row.slug, beatTele)) continue;
+      if (beatTele && threadSaidDone(deps.storage, row.slug, beatTele, armed.armedAt)) continue;
       if (openSchedulePrompt(row.slug, row.session_id)) continue;
       const beat = beatIndex(row.recurring_schedule_fired_at ?? null, armed);
       const fenceId = heartbeatFenceId(armed.armedAt, beat);
@@ -40109,7 +40309,7 @@ ${clock}`;
       if (tele.lastUserAt && Date.parse(tele.lastUserAt) >= Date.parse(restedAt)) continue;
       if (tele.authFault) continue;
       if (tele.apiFault) continue;
-      if (restMessageIsSignedOff(deps.storage, row.slug, tele, registeredPrWatchesOf(deps.storage, row.slug), armedTimerIdsOf(deps.storage, row.slug))) continue;
+      if (restMessageIsSignedOff(deps.storage, row.slug, tele, registeredPrWatchesOf(deps.storage, row.slug), armedTimerIdsOf(deps.storage, row.slug), armed.armedAt)) continue;
       if (answersInFlight(deps.storage.listThreadQuestions(row.slug), tele.lastUserAt, true) !== void 0) continue;
       const reminder = outbox.get(wakeDeliveryId(row.slug, row.session_id, signoffFenceId(restedAt)));
       if (reminder && reminder.state !== "superseded" && reminder.state !== "exhausted") continue;
@@ -41486,7 +41686,7 @@ function deliverCodexWake(deps) {
   })();
 }
 function deliverClaudeBrokerWake(deps) {
-  const { bridge, slug, cwd, row, deliveryMessage, freshProcess } = deps;
+  const { bridge, slug, cwd, row, settings, deliveryMessage, freshProcess } = deps;
   const appendSystemPrompt = [
     loadWorkerPrompt("claude"),
     scratchpadOrientation(row.session_id, "claude"),
@@ -41497,7 +41697,7 @@ function deliverClaudeBrokerWake(deps) {
     sessionId: row.session_id,
     cwd,
     text: deliveryMessage,
-    permissionMode: row.permission_mode ?? void 0,
+    permissionMode: coldResumePermission(row, settings),
     appendSystemPrompt,
     model: row.model ?? void 0,
     effort: row.effort ?? void 0,
@@ -41849,6 +42049,7 @@ ${wakeDeliveryToken(deliveryId)}`;
           slug,
           cwd: project.dir,
           row,
+          settings: getSettings(storage, home),
           deliveryMessage,
           // Recomputed here rather than carried on the delivery: the outbox stores a message, not a
           // runtime decision, and the tail is the live answer to "is this thread still behind a wall
@@ -45127,6 +45328,21 @@ function peerSessionQueuedKey(deliveredText, pendingKeys) {
   for (const key of pendingKeys) if (deliveredText.startsWith(key, PEER_SESSION_PREAMBLE.length)) return key;
   return void 0;
 }
+function claudeSidechainInstruction(text2) {
+  const trimmed = text2.trim();
+  if (trimmed.startsWith(CLAUDE_COORDINATOR_INSTRUCTION_PREFIX) && trimmed.endsWith(CLAUDE_COORDINATOR_INSTRUCTION_SUFFIX)) {
+    const body = trimmed.slice(
+      CLAUDE_COORDINATOR_INSTRUCTION_PREFIX.length,
+      -CLAUDE_COORDINATOR_INSTRUCTION_SUFFIX.length
+    ).trim();
+    return body || void 0;
+  }
+  if (!trimmed.startsWith(CLAUDE_PEER_INSTRUCTION_PREFIX)) return void 0;
+  const wrapperStart = trimmed.indexOf("<agent-message ", CLAUDE_PEER_INSTRUCTION_PREFIX.length);
+  const wrapperEnd = trimmed.lastIndexOf("</agent-message>");
+  if (wrapperStart < 0 || wrapperEnd < 0) return void 0;
+  return parseAgentMessage(trimmed.slice(wrapperStart, wrapperEnd + "</agent-message>".length))?.body.trim() || void 0;
+}
 function retireStaleQueuedBubbles(messages, nowMs = Date.now()) {
   let stale = false;
   for (const m of messages) {
@@ -45315,6 +45531,19 @@ function createTranscriptFold(identityPrefix = "claude") {
             const i = out.indexOf(pending.message);
             if (i !== -1) out.splice(i, 1);
           }
+          const instruction = rec.isSidechain === true ? claudeSidechainInstruction(metaText) : void 0;
+          if (instruction) {
+            out.push({
+              sourceId,
+              role: "user",
+              text: instruction,
+              agentInstruction: true,
+              tools: [],
+              parts: [{ kind: "text", text: instruction }],
+              at: rec.timestamp
+            });
+            lastAssistantId = null;
+          }
         }
         return;
       }
@@ -45457,15 +45686,11 @@ ${block.text}` : block.text;
   return {
     ingest,
     finalize,
-    // The SAME window the paged reader returns (latestWindowStart), because this is the OTHER producer:
+    // The SAME window the paged reader returns (latestTranscriptWindow), because this is the OTHER producer:
     // the /ws push renders from here while the RPC page renders from there, and a push whose head sat
     // further forward than the page's would splice the human's ask straight back out of a card that had
     // just anchored on it (reconcileLiveMessages replaces the window wholesale).
-    messages: () => {
-      const all = projected();
-      const start = latestWindowStart(all);
-      return start === 0 ? all : all.slice(start);
-    },
+    messages: () => latestTranscriptWindow(projected()),
     allMessages: projected,
     consumedBytes: () => offset + Buffer.byteLength(buffer)
   };
@@ -46091,6 +46316,7 @@ function projectCodexTranscript(raw2, identityPrefix = "codex") {
   let prevEventAt;
   let lastContextTokens;
   let openCompaction = null;
+  let agentInstructionCount = 0;
   const openAssistant = (at, sourceId, prose = false) => {
     if (prose && cur?.text) cur = null;
     if (cur) return cur;
@@ -46268,6 +46494,23 @@ ${text2}`;
           });
           break;
         }
+        case "agent-instruction": {
+          cur = null;
+          turnReasoning = null;
+          const first = agentInstructionCount++ === 0;
+          const text2 = ev.text || (ev.encrypted ? `${first ? "Task" : "Follow-up"} instructions received. Codex encrypted the message body, so Frizz can't display it.` : `${first ? "Task" : "Follow-up"} instructions received.`);
+          out.push({
+            sourceId,
+            role: "user",
+            text: text2,
+            displayText: text2,
+            agentInstruction: true,
+            tools: [],
+            parts: [{ kind: "text", text: text2 }],
+            at: ev.at
+          });
+          break;
+        }
         case "compaction": {
           const m = compactionMessage(sourceId, ev.at, lastContextTokens, void 0);
           out.push(m);
@@ -46326,7 +46569,7 @@ function latestWindowStart(messages) {
   let boundary = -1;
   for (let i = tail - 1; i >= 0; i--) {
     const m = messages[i];
-    if (m.role === "user" && !m.wake && !m.queued) {
+    if (m.role === "user" && !m.wake && !m.queued && !m.agentInstruction) {
       boundary = i;
       break;
     }
@@ -46345,6 +46588,7 @@ function latestWindowStart(messages) {
 function latestTranscriptWindow(messages) {
   const start = latestWindowStart(messages);
   if (start === 0) return [...messages];
+  const earlierInstructions = messages.slice(0, start).filter((message) => message.agentInstruction);
   const pinned = [];
   for (let i = 0; i < start; i++) {
     const message = messages[i];
@@ -46363,7 +46607,7 @@ function latestTranscriptWindow(messages) {
       at: message.at
     });
   }
-  return [...messages.slice(start), ...pinned.slice(-MAX_PINNED_BACKGROUND_OPERATIONS)];
+  return [...earlierInstructions, ...messages.slice(start), ...pinned.slice(-MAX_PINNED_BACKGROUND_OPERATIONS)];
 }
 function codexToolCall(name, input, callId) {
   if (name === "exec" && typeof input === "string") return codexExecWrapperCall(input, callId);
@@ -46492,7 +46736,7 @@ function codexReasoningCaption(text2) {
 function codexPeerMessageCall(label, target, obj) {
   const redacted = strField(obj.message);
   const encrypted = redacted === ENCRYPTED_PAYLOAD;
-  const body = !redacted ? void 0 : encrypted ? "_Codex encrypts inter-agent message bodies \u2014 the text is not recoverable from the rollout. Open the recipient's own thread to read what it received._" : capToolInput(redacted);
+  const body = !redacted ? void 0 : encrypted ? "_Codex encrypts inter-agent message bodies \u2014 the text is not recoverable from the rollout. The recipient's transcript marks when it arrived, but can't display the encrypted text._" : capToolInput(redacted);
   return {
     name: label,
     detail: target,
@@ -47185,7 +47429,7 @@ function pageProjectedTranscript(messages, anchor, limits = {}) {
   let boundary = 0;
   for (let i = anchor - 1; i >= 0; i--) {
     const m = messages[i];
-    if (m.role === "user" && !m.wake && !m.queued) {
+    if (m.role === "user" && !m.wake && !m.queued && !m.agentInstruction) {
       boundary = i;
       break;
     }
@@ -47391,7 +47635,7 @@ function readTranscriptFile(absPath) {
     return [];
   }
 }
-var MAX_MESSAGES, LATEST_WINDOW_ASK_REACH_ITEMS, LATEST_WINDOW_ASK_REACH_BYTES, REST_LABEL, LEGACY_TASK_MARKER, LEGACY_BANNER_PREAMBLE, COMMAND_NAME_RE, COMMAND_ARGS_RE, PEER_SESSION_PREAMBLE, QUEUED_STALE_MS, EDIT_CAP, TRUNC_MARKER, ENCRYPTED_PAYLOAD, AGENT_PROMPT_CAP, SEND_BODY_CAP, COMMAND_CAP, TOOL_INPUT_CAP, READ_LINE_CAP, READ_BYTE_CAP, IMAGE_MEDIA_EXT, SCREENSHOT_CACHE_DIR, SCREENSHOT_CACHE_MAX, SCREENSHOT_MAX_BASE64, screenshotTmpSeq, SENT_IMAGE_MAX_BYTES, SENT_FILES_MAX, TODO_ROWS_MAX, TODO_TEXT_CAP, TRANSCRIPT_CACHE_CAP, transcriptCache, PARSE_VERIFY_SAMPLE, TRANSCRIPT_DECODE_WINDOW, FOREIGN_SESSION_ID_RE, MAX_PINNED_BACKGROUND_OPERATIONS, CAPTION_MAX, _defaultCodexBackend, TRANSCRIPT_EARLIER_MAX_ITEMS, TRANSCRIPT_EARLIER_MAX_BYTES, fullDigestCache, FULL_DIGEST_CACHE_CAP, EMPTY_RETIRED_OPS;
+var MAX_MESSAGES, LATEST_WINDOW_ASK_REACH_ITEMS, LATEST_WINDOW_ASK_REACH_BYTES, REST_LABEL, LEGACY_TASK_MARKER, LEGACY_BANNER_PREAMBLE, COMMAND_NAME_RE, COMMAND_ARGS_RE, PEER_SESSION_PREAMBLE, CLAUDE_COORDINATOR_INSTRUCTION_PREFIX, CLAUDE_COORDINATOR_INSTRUCTION_SUFFIX, CLAUDE_PEER_INSTRUCTION_PREFIX, QUEUED_STALE_MS, EDIT_CAP, TRUNC_MARKER, ENCRYPTED_PAYLOAD, AGENT_PROMPT_CAP, SEND_BODY_CAP, COMMAND_CAP, TOOL_INPUT_CAP, READ_LINE_CAP, READ_BYTE_CAP, IMAGE_MEDIA_EXT, SCREENSHOT_CACHE_DIR, SCREENSHOT_CACHE_MAX, SCREENSHOT_MAX_BASE64, screenshotTmpSeq, SENT_IMAGE_MAX_BYTES, SENT_FILES_MAX, TODO_ROWS_MAX, TODO_TEXT_CAP, TRANSCRIPT_CACHE_CAP, transcriptCache, PARSE_VERIFY_SAMPLE, TRANSCRIPT_DECODE_WINDOW, FOREIGN_SESSION_ID_RE, MAX_PINNED_BACKGROUND_OPERATIONS, CAPTION_MAX, _defaultCodexBackend, TRANSCRIPT_EARLIER_MAX_ITEMS, TRANSCRIPT_EARLIER_MAX_BYTES, fullDigestCache, FULL_DIGEST_CACHE_CAP, EMPTY_RETIRED_OPS;
 var init_transcript = __esm({
   "packages/server/src/transcript.ts"() {
     "use strict";
@@ -47417,6 +47661,9 @@ var init_transcript = __esm({
     COMMAND_NAME_RE = /<command-name>([\s\S]*?)<\/command-name>/;
     COMMAND_ARGS_RE = /<command-args>([\s\S]*?)<\/command-args>/;
     PEER_SESSION_PREAMBLE = "Another Claude session sent a message:\n";
+    CLAUDE_COORDINATOR_INSTRUCTION_PREFIX = "The coordinator sent a message while you were working:\n";
+    CLAUDE_COORDINATOR_INSTRUCTION_SUFFIX = "\n\nAddress this before completing your current task.";
+    CLAUDE_PEER_INSTRUCTION_PREFIX = "Another Claude session sent a message while you were working:\n";
     QUEUED_STALE_MS = 2 * 60 * 6e4;
     EDIT_CAP = 4e3;
     TRUNC_MARKER = "\n\u2026 (truncated)";
@@ -48465,6 +48712,31 @@ function setProjectIconFromFile(id, file) {
   if (bytes.length > PROJECT_ICON_MAX_BASE64_CHARS / 4 * 3) throw new Error("That image is too large.");
   return storeProjectIcon(id, file, bytes);
 }
+function mergeSubAgentSteers(messages, steers) {
+  if (!steers.length) return messages;
+  const merged = [...messages];
+  for (const steer of steers) {
+    const at = new Date(steer.sent_at).toISOString();
+    const duplicate = messages.some((message2) => {
+      if (message2.role !== "user" || message2.text.trim() !== steer.message.trim() || !message2.at) return false;
+      return Math.abs(Date.parse(message2.at) - steer.sent_at) <= 5e3;
+    });
+    if (duplicate) continue;
+    const message = {
+      sourceId: `subagent-steer:${steer.delivery_id}`,
+      role: "user",
+      text: steer.message,
+      agentInstruction: true,
+      tools: [],
+      parts: [{ kind: "text", text: steer.message }],
+      at
+    };
+    const next = merged.findIndex((candidate) => candidate.at !== void 0 && Date.parse(candidate.at) > steer.sent_at);
+    if (next === -1) merged.push(message);
+    else merged.splice(next, 0, message);
+  }
+  return merged;
+}
 function createRouter(ctx) {
   const frizzDir = join36(ctx.project.dir, ".frizz");
   const openRoots = openableFileRoots(ctx.project);
@@ -48668,7 +48940,11 @@ function createRouter(ctx) {
         sessionId: row.session_id,
         cwd: ctx.project.dir,
         text: `${shellStopNotice(label)} Whatever it wrote before the kill is still readable in its output file.`,
-        permissionMode: row.permission_mode ?? void 0,
+        // `isDaemonAlive` above is a check, not a hold: the daemon can exit before this frame lands,
+        // and followUp then COLD-RESUMES rather than failing. Take the same floor every other fork
+        // takes, so a notice that loses the race cannot be the thing that rebuilds the worker at
+        // Claude's `default` — see coldResumePermission.
+        permissionMode: coldResumePermission(row, ctx.getSettings()),
         model: row.model ?? void 0,
         effort: row.effort ?? void 0
       });
@@ -48853,7 +49129,10 @@ function createRouter(ctx) {
         const info = ctx.tailer.subAgent(input.slug, input.id);
         if (!info) return { messages: [], state: "gone", steerable: false, steerNote: null, stoppable: false, stopNote: null };
         const read = info.outputFormat === "codex" ? readCodexTranscriptFile : readTranscriptFile;
-        const messages = info.outputFile ? read(info.outputFile) : [];
+        const messages = mergeSubAgentSteers(
+          info.outputFile ? read(info.outputFile) : [],
+          ctx.storage.listSubAgentSteers(input.slug, input.id)
+        );
         const steer = subAgentSteerable(input.slug, input.id);
         const stop = subAgentStoppable(input.slug, input.id);
         return {
@@ -48879,7 +49158,7 @@ function createRouter(ctx) {
     // predicate). So an ungated steer is not a no-op, it is a misdelivery. `subAgentSteerable` is the
     // single predicate that decides, and the drawer's prompt box is rendered off the same answer.
     subAgentSteer: mutation({
-      input: external_exports.object({ slug: ThreadSlug, id: external_exports.string(), message: external_exports.string().min(1), deliveryId: external_exports.string().optional() }).strict(),
+      input: external_exports.object({ slug: ThreadSlug, id: external_exports.string(), message: external_exports.string().min(1), deliveryId: external_exports.string().min(1).max(200).optional() }).strict(),
       output: external_exports.object({ delivered: external_exports.boolean() }),
       handler: async ({ input }) => {
         const target = subAgentSteerable(input.slug, input.id);
@@ -48888,12 +49167,21 @@ function createRouter(ctx) {
         }
         const bridge = ctx.claudeBroker;
         if (!bridge) throw new Error("Claude session broker is unavailable; cannot steer this sub-agent");
+        const deliveryId = input.deliveryId ?? randomUUID16();
+        const sentAtMs = Date.now();
         await bridge.steerSubAgent({
           threadSlug: input.slug,
           sessionId: target.sessionId,
           subAgentId: input.id,
           text: input.message,
-          deliveryId: input.deliveryId
+          deliveryId
+        });
+        ctx.storage.recordSubAgentSteer({
+          slug: input.slug,
+          subAgentId: input.id,
+          deliveryId,
+          message: input.message,
+          sentAtMs
         });
         ctx.board.refresh();
         return { delivered: true };
@@ -49127,7 +49415,9 @@ ${gapNote}` : input.message;
             // Rides through to the SDK as this input's uuid, which the SDK echoes back on the record
             // that delivers it — the ledger then correlates by identity rather than by text.
             deliveryId: input.deliveryId,
-            permissionMode: row.permission_mode ?? void 0,
+            // A persisted per-thread mode, or the dispatch floor for a row that has none — see
+            // coldResumePermission for why a legacy row must not fall through to the bridge's `"default"`.
+            permissionMode: coldResumePermission(row, ctx.getSettings()),
             appendSystemPrompt,
             model: row.model ?? void 0,
             effort: row.effort ?? void 0,