cubefarm 0.3.8 → 0.3.10

package/dist-server/index.js

@@ -1,9 +1,10 @@
 // server/index.ts
 import http2 from "node:http";
-import path14 from "node:path";
-import fs12 from "node:fs";
+import path16 from "node:path";
+import fs14 from "node:fs";
 import express from "express";
 import { WebSocketServer } from "ws";
+import { z as z3 } from "zod";
 
 // server/config.ts
 import fs from "node:fs";
@@ -146,11 +147,11 @@ async function ensureLabel(fullName, name) {
   await gh(["label", "create", name, "-R", fullName, "--color", "c77dff", "--description", "cubefarm: routed to this specialty", "--force"]);
   labelsMade.add(key);
 }
-async function createIssue(fullName, title, body, labels = []) {
+async function createIssue(fullName, title, body2, labels = []) {
   for (const l of labels) await ensureLabel(fullName, l);
   const args = ["issue", "create", "-R", fullName, "--title", title, "--body-file", "-"];
   for (const l of labels) args.push("--label", l);
-  const out = await gh(args, { input: body || " " });
+  const out = await gh(args, { input: body2 || " " });
   const match = out.match(/\/issues\/(\d+)/);
   if (!match) throw new Error(`Could not read the new issue number from gh output: ${out}`);
   return Number(match[1]);
@@ -194,8 +195,10 @@ async function prForBranch(fullName, branch) {
   const list = await ghJson(["pr", "list", "-R", fullName, "--head", branch, "--state", "all", "--json", "number,url", "--limit", "1"]);
   return list[0] ?? null;
 }
+var uniqueNames = (checks) => [...new Set(checks.map(checkName))];
 async function prDetails(fullName, number) {
-  const raw = await ghJson(["pr", "view", String(number), "-R", fullName, "--json", "number,title,body,url,headRefName,headRefOid,isCrossRepository,closingIssuesReferences,state,mergeable,mergeStateStatus"]);
+  const raw = await ghJson(["pr", "view", String(number), "-R", fullName, "--json", "number,title,body,url,headRefName,headRefOid,isCrossRepository,closingIssuesReferences,state,mergeable,mergeStateStatus,statusCheckRollup"]);
+  const rollup = raw.statusCheckRollup ?? [];
   return {
     number: raw.number,
     title: raw.title,
@@ -207,20 +210,24 @@ async function prDetails(fullName, number) {
     closesIssues: (raw.closingIssuesReferences ?? []).map((r) => r.number),
     state: raw.state,
     mergeable: raw.mergeable,
-    mergeState: raw.mergeStateStatus || "UNKNOWN"
+    mergeState: raw.mergeStateStatus || "UNKNOWN",
+    checks: checksOf(rollup),
+    checkNames: uniqueNames(rollup),
+    failedChecks: uniqueNames(rollup.filter(failed)),
+    pendingChecks: uniqueNames(rollup.filter(pending))
   };
 }
 async function issueDetails(fullName, number) {
   const raw = await ghJson(["issue", "view", String(number), "-R", fullName, "--json", "title,body"]);
   return { title: raw.title, body: raw.body ?? "" };
 }
-async function commentPull(fullName, number, body) {
-  const out = await gh(["pr", "comment", String(number), "-R", fullName, "--body-file", "-"], { input: body });
+async function commentPull(fullName, number, body2) {
+  const out = await gh(["pr", "comment", String(number), "-R", fullName, "--body-file", "-"], { input: body2 });
   return out.match(/https:\/\/github\.com\/\S+/)?.[0] ?? "";
 }
 var EVIDENCE_BRANCH = "swarm-qa-evidence";
 var evidenceReady = /* @__PURE__ */ new Set();
-var ghApiJson = (method, endpoint, body) => gh(["api", "-X", method, endpoint, "-H", "Content-Type: application/json", "--input", "-"], { input: JSON.stringify(body), timeoutMs: 12e4 }).then(
+var ghApiJson = (method, endpoint, body2) => gh(["api", "-X", method, endpoint, "-H", "Content-Type: application/json", "--input", "-"], { input: JSON.stringify(body2), timeoutMs: 12e4 }).then(
   (out) => out ? JSON.parse(out) : null
 );
 async function ensureEvidenceBranch(fullName) {
@@ -457,7 +464,32 @@ async function createProject(root, name, opts) {
 async function removeDir(dir) {
   await fs2.rm(dir, { recursive: true, force: true, maxRetries: 8, retryDelay: 250 });
 }
-function prepareDesk(fullName, base, agentSlug, branch) {
+var STALE_LOCK_MS = 10 * 6e4;
+async function staleIndexLock(wt) {
+  const ref = (await fs2.readFile(path2.join(wt, ".git"), "utf8").catch(() => "")).match(/gitdir:\s*(.+)/)?.[1]?.trim();
+  if (!ref) return null;
+  const lock = path2.join(path2.resolve(wt, ref), "index.lock");
+  const stat = await fs2.stat(lock).catch(() => null);
+  return stat && Date.now() - stat.mtimeMs > STALE_LOCK_MS ? lock : null;
+}
+async function reuseDesk(wt, branch, ref) {
+  await git(["checkout", "--force", "-B", branch, ref], { cwd: wt });
+  await git(["reset", "--hard", ref], { cwd: wt });
+  await git(["clean", "-fd"], { cwd: wt }).catch(() => void 0);
+}
+async function clearDeskFolder(wt) {
+  try {
+    await removeDir(wt);
+  } catch (err) {
+    const left = await fs2.readdir(wt).catch(() => null);
+    if (left?.length !== 0) {
+      throw new Error(
+        `Could not clear the desk folder ${wt}: ${err.message}. A program started by the previous task is probably still running there. Close it and try again.`
+      );
+    }
+  }
+}
+function prepareDesk(fullName, base, agentSlug, branch, note) {
   return withRepoLock(fullName, async () => {
     const main = mainDir(fullName);
     await git(["fetch", "origin", "--prune"], { cwd: main, timeoutMs: 18e4 });
@@ -476,22 +508,25 @@ function prepareDesk(fullName, base, agentSlug, branch) {
     const wt = deskDir(fullName, agentSlug);
     if (await exists(path2.join(wt, ".git"))) {
       try {
-        await git(["checkout", "--force", "-B", branch, ref], { cwd: wt });
-        await git(["reset", "--hard", ref], { cwd: wt });
-        await git(["clean", "-fd"], { cwd: wt }).catch(() => void 0);
+        try {
+          await reuseDesk(wt, branch, ref);
+        } catch (err) {
+          const lock = /index\.lock/.test(err.message) ? await staleIndexLock(wt) : null;
+          if (!lock) throw err;
+          await fs2.rm(lock, { force: true, maxRetries: 3 });
+          note?.(`Removed a stale git lock (${lock}) left in the desk.`);
+          await reuseDesk(wt, branch, ref);
+        }
         return wt;
-      } catch {
+      } catch (err) {
+        const why = `Couldn't reuse the desk in place, so it's rebuilt: ${err.message}`;
+        console.warn(`${wt}: ${why}`);
+        note?.(why);
       }
     }
     if (await exists(wt)) {
       await git(["worktree", "remove", "--force", wt], { cwd: main }).catch(() => void 0);
-      try {
-        await removeDir(wt);
-      } catch (err) {
-        throw new Error(
-          `Could not clear the desk folder ${wt}: ${err.message}. A program started by the previous task is probably still running there. Close it and try again.`
-        );
-      }
+      await clearDeskFolder(wt);
     }
     await git(["worktree", "prune"], { cwd: main });
     await fs2.mkdir(path2.dirname(wt), { recursive: true });
@@ -785,14 +820,14 @@ function newScreenshots(dir, seen, now2 = Date.now()) {
   }
   return found2;
 }
-var clip = (s, n) => s.length > n ? `${s.slice(0, n - 1)}\u2026` : s;
+var clip = (s2, n) => s2.length > n ? `${s2.slice(0, n - 1)}\u2026` : s2;
 function rel(cwd, p) {
-  const s = String(p ?? "");
-  if (!s) return "";
-  const r = path4.relative(cwd, path4.resolve(cwd, s));
-  return r && !r.startsWith("..") ? r.replaceAll("\\", "/") : s;
+  const s2 = String(p ?? "");
+  if (!s2) return "";
+  const r = path4.relative(cwd, path4.resolve(cwd, s2));
+  return r && !r.startsWith("..") ? r.replaceAll("\\", "/") : s2;
 }
-var escapeRe = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+var escapeRe = (s2) => s2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 function tidyPaths(cwd, text) {
   let out = text;
   for (const v of /* @__PURE__ */ new Set([cwd, cwd.replaceAll("\\", "/")])) {
@@ -972,7 +1007,7 @@ function startSession(opts, callbacks) {
       case "system": {
         if (msg.subtype === "init") {
           cb.sessionId(msg.session_id);
-          const mcp = msg.mcp_servers.map((s) => `${s.name}:${s.status}`).join(", ");
+          const mcp = msg.mcp_servers.map((s2) => `${s2.name}:${s2.status}`).join(", ");
           cb.log([
             { kind: "system", text: `\u273B Claude Code ${msg.claude_code_version} \xB7 ${msg.model} \xB7 ${msg.effort ?? opts.effort} effort` },
             { kind: "system", text: `  cwd ${msg.cwd}${mcp ? ` \xB7 mcp ${mcp}` : ""}` }
@@ -1189,7 +1224,7 @@ async function detectClis() {
 var EFFORT_CODEX = { low: "low", medium: "medium", high: "high", xhigh: "xhigh", max: "xhigh" };
 var CODEX_HOOK_EVENTS = ["SessionStart", "UserPromptSubmit", "PreToolUse", "PostToolUse", "Interrupt"];
 function codexHookCommand(node, script, win = WIN) {
-  return win ? `node "${script}"` : [node, script].map((s) => `'${s.replaceAll("'", `'"'"'`)}'`).join(" ");
+  return win ? `node "${script}"` : [node, script].map((s2) => `'${s2.replaceAll("'", `'"'"'`)}'`).join(" ");
 }
 function launchArgs(id, ctx) {
   switch (id) {
@@ -1219,7 +1254,7 @@ function launchArgs(id, ctx) {
       return { args, env: { DISABLE_AUTOUPDATER: "1" } };
     }
     case "codex": {
-      const toml = (s) => JSON.stringify(s);
+      const toml = (s2) => JSON.stringify(s2);
       const args = [
         "--no-alt-screen",
         "-c",
@@ -1623,11 +1658,11 @@ function setOfficeUrl(url) {
   officeUrl = url;
 }
 var routes = /* @__PURE__ */ new Map();
-function handleHook(token, body) {
+function handleHook(token, body2) {
   const route2 = routes.get(token);
-  if (!route2 || !body || typeof body !== "object" || Array.isArray(body)) return {};
+  if (!route2 || !body2 || typeof body2 !== "object" || Array.isArray(body2)) return {};
   try {
-    return route2.hook(body);
+    return route2.hook(body2);
   } catch (err) {
     console.warn("hook failed", err);
     return {};
@@ -1674,7 +1709,7 @@ function toolOutput(response) {
   if (typeof response === "string") return { text: response, images };
   const r = response;
   if (r && typeof r === "object") {
-    if (typeof r.stdout === "string" || typeof r.stderr === "string") return { text: [r.stdout, r.stderr].filter((s) => typeof s === "string" && s).join("\n"), images };
+    if (typeof r.stdout === "string" || typeof r.stderr === "string") return { text: [r.stdout, r.stderr].filter((s2) => typeof s2 === "string" && s2).join("\n"), images };
     if (typeof r.file?.content === "string") return { text: r.file.content, images };
     if (Array.isArray(r.filenames)) return { text: r.filenames.join("\n"), images };
   }
@@ -1702,12 +1737,13 @@ function endLive(live) {
   routes.delete(live.token);
   live.term.releaseIdle = null;
   live.term.bind(null);
-  const gone = live.proc ? exitOf(live.proc) : void 0;
+  const gone = live.proc ? exitOf(live.proc) : Promise.resolve();
   live.proc?.kill();
   live.proc = null;
   live.term.note(`\u2500\u2500 ${cliLabel(live.cli)} session ended \u2500\u2500`);
   fs7.rm(live.dir, { recursive: true, force: true, maxRetries: 5 }, () => void 0);
-  return live.cli === "codex" && live.resumeId ? codexThread("archive", live.resumeId, gone) : Promise.resolve();
+  if (live.cli === "codex" && live.resumeId) void codexThread("archive", live.resumeId, gone);
+  return gone;
 }
 var metaOf = (l) => ({ agentId: l.agentId, cli: l.cli, token: l.token, dir: l.dir, resumeId: l.resumeId, busy: !!l.session });
 var remember = (l) => l.proc?.setMeta(metaOf(l));
@@ -2156,19 +2192,137 @@ ${JSON.stringify(opts.outputSchema)}`;
   return handle;
 }
 
-// server/previewRunner.ts
+// server/deps.ts
 import { spawn as spawn2 } from "node:child_process";
 import crypto4 from "node:crypto";
 import fs8 from "node:fs/promises";
-import net2 from "node:net";
 import path9 from "node:path";
+var INSTALL_MARKER = ".cubefarm-preview-install";
+var INSTALL_TIMEOUT_MS = 15 * 6e4;
+var MAX_DESK_INSTALLS = 2;
+var depsHash = (pkg, lock) => crypto4.createHash("sha256").update(pkg).update("\0").update(lock ?? "").digest("hex");
+async function readDeps(dir) {
+  const read = (file) => fs8.readFile(path9.join(dir, file), "utf8").catch(() => null);
+  const [pkg, lock, marker, nodeModules] = await Promise.all([
+    read("package.json"),
+    read("package-lock.json"),
+    read(path9.join("node_modules", INSTALL_MARKER)),
+    fs8.stat(path9.join(dir, "node_modules")).then((s2) => s2.isDirectory()).catch(() => false)
+  ]);
+  return { pkg, lock, hash: depsHash(pkg ?? "", lock), marker: marker ?? "", nodeModules };
+}
+var depsCurrent = (s2) => s2.nodeModules && s2.marker === s2.hash;
+var writeMarker = (dir, hash) => fs8.writeFile(path9.join(dir, "node_modules", INSTALL_MARKER), hash).catch(() => void 0);
+function deskDepsPlan(s2) {
+  if (s2.pkg === null) return "none";
+  if (s2.lock === null) return "agent";
+  return depsCurrent(s2) ? "skip" : "install";
+}
+function depsPromptLine(outcome) {
+  if (outcome === "installed" || outcome === "skipped") return "Dependencies are already installed for this checkout; run npm install only if you change package.json.";
+  if (outcome === "failed") return "The office couldn't install this checkout's dependencies: run npm install yourself first.";
+  return "";
+}
+function createLimiter(max) {
+  let active = 0;
+  const waiting = [];
+  return async function limit(fn) {
+    if (active >= max) await new Promise((r) => waiting.push(r));
+    else active++;
+    try {
+      return await fn();
+    } finally {
+      const next = waiting.shift();
+      if (next) next();
+      else active--;
+    }
+  };
+}
+var deskInstalls = createLimiter(MAX_DESK_INSTALLS);
+function killTree2(child) {
+  if (child.pid === void 0 || child.exitCode !== null || child.signalCode !== null) return Promise.resolve();
+  if (process.platform === "win32") {
+    return new Promise((resolve) => {
+      const tk = spawn2("taskkill", ["/PID", String(child.pid), "/T", "/F"], { windowsHide: true, stdio: "ignore" });
+      tk.once("error", () => resolve());
+      tk.once("close", () => resolve());
+    });
+  }
+  try {
+    process.kill(-child.pid, "SIGKILL");
+  } catch {
+    child.kill("SIGKILL");
+  }
+  return Promise.resolve();
+}
+function npmCi(dir, timeoutMs = INSTALL_TIMEOUT_MS) {
+  const env = {};
+  for (const [k, v] of Object.entries(process.env)) {
+    if (v !== void 0 && !/^(ANTHROPIC_|CLAUDE|SWARM_)/i.test(k)) env[k] = v;
+  }
+  env.NO_COLOR = "1";
+  const win = process.platform === "win32";
+  const child = win ? spawn2("cmd.exe", ["/d", "/s", "/c", "npm ci --no-audit --no-fund"], { cwd: dir, env, windowsHide: true, stdio: ["ignore", "pipe", "pipe"] }) : spawn2("npm", ["ci", "--no-audit", "--no-fund"], { cwd: dir, env, windowsHide: true, detached: true, stdio: ["ignore", "pipe", "pipe"] });
+  let tail = "";
+  const keep = (buf) => tail = (tail + buf.toString()).slice(-4e3);
+  child.stdout?.on("data", keep);
+  child.stderr?.on("data", keep);
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      void killTree2(child);
+      reject(new Error(`npm ci took longer than ${Math.round(timeoutMs / 6e4)} minutes`));
+    }, timeoutMs);
+    child.once("error", (err) => {
+      clearTimeout(timer);
+      reject(err);
+    });
+    child.once("close", (code) => {
+      clearTimeout(timer);
+      if (code === 0) return resolve();
+      const last = tail.split(/\r?\n/).filter((l) => l.trim()).slice(-3).join(" \xB7 ");
+      reject(new Error(`npm ci failed (code ${code})${last ? `: ${last.slice(0, 300)}` : ""}`));
+    });
+  });
+}
+async function installDesk(dir, cb, install = npmCi) {
+  const { log } = cb;
+  try {
+    const state = await readDeps(dir);
+    const plan = deskDepsPlan(state);
+    if (plan === "none") return "none";
+    if (plan === "agent") {
+      log(["No package-lock.json; leaving the dependencies to the agent."]);
+      return "agent";
+    }
+    if (plan === "skip") {
+      log(["Dependencies unchanged since the last install; skipping it."]);
+      return "skipped";
+    }
+    log(["Installing dependencies\u2026"]);
+    cb.installing();
+    await deskInstalls(async () => {
+      log(["$ npm ci"]);
+      await install(dir);
+    });
+    await writeMarker(dir, state.hash);
+    log(["Dependencies installed."]);
+    return "installed";
+  } catch (err) {
+    log([`\u26A0 Could not install the dependencies (${err.message.split(/\r?\n/)[0].slice(0, 300)}); the agent will run npm install itself.`]);
+    return "failed";
+  }
+}
+
+// server/previewRunner.ts
+import { spawn as spawn3 } from "node:child_process";
+import fs9 from "node:fs/promises";
+import net2 from "node:net";
+import path10 from "node:path";
 var PREVIEW_SLUG = "preview";
 var PREVIEW_BRANCH = "swarm-preview";
 var PREVIEW_TMP = ".preview-tmp";
-var INSTALL_MARKER = ".cubefarm-preview-install";
 var START_TIMEOUT_MS = 3 * 6e4;
-var INSTALL_TIMEOUT_MS = 15 * 6e4;
-var fillPlaceholders = (s, port, tmp) => s.replaceAll("{port}", String(port)).replaceAll("{tmp}", tmp);
+var fillPlaceholders = (s2, port, tmp) => s2.replaceAll("{port}", String(port)).replaceAll("{tmp}", tmp);
 function previewEnv(extra, port, tmp) {
   const env = {};
   for (const [k, v] of Object.entries(process.env)) {
@@ -2197,35 +2351,19 @@ async function portOpen(port) {
 var sleep2 = (ms) => new Promise((r) => setTimeout(r, ms));
 async function readJson(file) {
   try {
-    return JSON.parse(await fs8.readFile(file, "utf8"));
+    return JSON.parse(await fs9.readFile(file, "utf8"));
   } catch {
     return null;
   }
 }
 function defaultCommand(pkg) {
   const scripts = pkg?.scripts ?? {};
-  const name = ["dev", "start", "preview"].find((s) => typeof scripts[s] === "string" && scripts[s].trim());
+  const name = ["dev", "start", "preview"].find((s2) => typeof scripts[s2] === "string" && scripts[s2].trim());
   if (!name) return null;
   const script = scripts[name];
   const vite = /^\s*vite(\s|$)/.test(script) && !/--port\b/.test(script);
   return `npm run ${name}${vite ? " -- --port {port} --strictPort" : ""}`;
 }
-function killTree2(child) {
-  if (child.pid === void 0 || child.exitCode !== null || child.signalCode !== null) return Promise.resolve();
-  if (process.platform === "win32") {
-    return new Promise((resolve) => {
-      const tk = spawn2("taskkill", ["/PID", String(child.pid), "/T", "/F"], { windowsHide: true, stdio: "ignore" });
-      tk.once("error", () => resolve());
-      tk.once("close", () => resolve());
-    });
-  }
-  try {
-    process.kill(-child.pid, "SIGKILL");
-  } catch {
-    child.kill("SIGKILL");
-  }
-  return Promise.resolve();
-}
 var Stopped = class extends Error {
 };
 var RealPreview = class {
@@ -2258,9 +2396,9 @@ var RealPreview = class {
     this.check();
     await ensureLocalExcludes(job.fullName).catch(() => void 0);
     cb.commit(await git(["rev-parse", "--short", "HEAD"], { cwd: wt }).catch(() => ""));
-    const tmp = path9.join(wt, PREVIEW_TMP);
-    await fs8.mkdir(tmp, { recursive: true });
-    const pkg = await readJson(path9.join(wt, "package.json"));
+    const tmp = path10.join(wt, PREVIEW_TMP);
+    await fs9.mkdir(tmp, { recursive: true });
+    const pkg = await readJson(path10.join(wt, "package.json"));
     const command = job.command ?? defaultCommand(pkg);
     if (!command) {
       this.stopped = true;
@@ -2299,15 +2437,12 @@ var RealPreview = class {
   }
   /** npm ci (or npm install without a lockfile), skipped when package.json and the lockfile haven't changed. */
   async install(wt, env) {
-    const lockFile = path9.join(wt, "package-lock.json");
-    const lock = await fs8.readFile(lockFile, "utf8").catch(() => null);
-    const hash = crypto4.createHash("sha256").update(await fs8.readFile(path9.join(wt, "package.json"), "utf8")).update("\0").update(lock ?? "").digest("hex");
-    const marker = path9.join(wt, "node_modules", INSTALL_MARKER);
-    if (await fs8.readFile(marker, "utf8").catch(() => "") === hash) {
+    const deps = await readDeps(wt);
+    if (depsCurrent(deps)) {
       this.cb.log(["Dependencies unchanged since the last install; skipping it."]);
       return;
     }
-    const cmd = lock !== null ? "npm ci" : "npm install";
+    const cmd = deps.lock !== null ? "npm ci" : "npm install";
     this.cb.log([`$ ${cmd}`]);
     const code = await Promise.race([this.spawn(cmd, wt, env), sleep2(INSTALL_TIMEOUT_MS).then(() => "timeout")]);
     this.check();
@@ -2317,12 +2452,12 @@ var RealPreview = class {
     }
     if (code !== 0) throw new Error(`${cmd} failed (code ${code}).`);
     this.child = null;
-    await fs8.writeFile(marker, hash).catch(() => void 0);
+    await writeMarker(wt, deps.hash);
   }
   /** Run a command line through the platform shell; resolves with its exit code. */
   spawn(cmd, cwd, env) {
     this.check();
-    const child = spawn2(cmd, { cwd, env, shell: true, windowsHide: true, detached: process.platform !== "win32", stdio: ["ignore", "pipe", "pipe"] });
+    const child = spawn3(cmd, { cwd, env, shell: true, windowsHide: true, detached: process.platform !== "win32", stdio: ["ignore", "pipe", "pipe"] });
     this.child = child;
     const onData = (buf) => {
       const text = this.partial + buf.toString().replace(/\x1b\[[0-9;?]*[A-Za-z]/g, "");
@@ -2348,29 +2483,29 @@ var RealPreview = class {
 };
 var realPreviews = {
   start: (job, cb) => new RealPreview(job, cb),
-  hasDefault: async (fullName) => fs8.access(path9.join(mainDir(fullName), "package.json")).then(() => true).catch(() => false)
+  hasDefault: async (fullName) => fs9.access(path10.join(mainDir(fullName), "package.json")).then(() => true).catch(() => false)
 };
 
 // server/officeUpdate.ts
-import fs9 from "node:fs/promises";
-import path10 from "node:path";
+import fs10 from "node:fs/promises";
+import path11 from "node:path";
 var DRAIN_TIMEOUT_MS = 20 * 6e4;
 var POSTPONE_MS = 2 * 60 * 6e4;
 function underLauncher(proc = process) {
   return typeof proc.send === "function" && proc.env.SWARM_LAUNCHER === "1";
 }
-function drainDecision(s) {
+function drainDecision(s2) {
   const idle = (state) => ({ state, drainingSince: null, send: false, timedOut: false });
-  if (s.sent) return { state: "updating", drainingSince: s.drainingSince, send: false, timedOut: false };
-  if (s.behind <= 0) return idle("none");
-  if (!s.launcher) return idle(s.failed ? "failed" : "available");
-  const postponed = s.postponedUntil !== null && s.now < s.postponedUntil && s.behind <= s.postponedBehind;
-  const failedHold = s.failed !== null && s.behind <= (s.failedBehind ?? Infinity);
-  const due = s.requested || s.autoUpdate && !postponed && !failedHold;
-  if (!due) return idle(s.failed ? "failed" : s.autoUpdate && postponed ? "waiting" : "available");
-  const since = s.drainingSince ?? s.now;
-  const timedOut = s.running > 0 && s.now - since >= DRAIN_TIMEOUT_MS;
-  return { state: "draining", drainingSince: since, send: s.running === 0 || timedOut, timedOut };
+  if (s2.sent) return { state: "updating", drainingSince: s2.drainingSince, send: false, timedOut: false };
+  if (s2.behind <= 0) return idle("none");
+  if (!s2.launcher) return idle(s2.failed ? "failed" : "available");
+  const postponed = s2.postponedUntil !== null && s2.now < s2.postponedUntil && s2.behind <= s2.postponedBehind;
+  const failedHold = s2.failed !== null && s2.behind <= (s2.failedBehind ?? Infinity);
+  const due = s2.requested || s2.autoUpdate && !postponed && !failedHold;
+  if (!due) return idle(s2.failed ? "failed" : s2.autoUpdate && postponed ? "waiting" : "available");
+  const since = s2.drainingSince ?? s2.now;
+  const timedOut = s2.running > 0 && s2.now - since >= DRAIN_TIMEOUT_MS;
+  return { state: "draining", drainingSince: since, send: s2.running === 0 || timedOut, timedOut };
 }
 function parseLastUpdate(raw) {
   try {
@@ -2390,10 +2525,10 @@ function parseLastUpdate(raw) {
   }
 }
 async function takeLastUpdate(home) {
-  const file = path10.join(home, "last-update.json");
-  const raw = await fs9.readFile(file, "utf8").catch(() => null);
+  const file = path11.join(home, "last-update.json");
+  const raw = await fs10.readFile(file, "utf8").catch(() => null);
   if (raw === null) return null;
-  await fs9.rm(file, { force: true, maxRetries: 3 }).catch(() => void 0);
+  await fs10.rm(file, { force: true, maxRetries: 3 }).catch(() => void 0);
   return parseLastUpdate(raw);
 }
 function lastUpdateMessage(u, commits) {
@@ -2401,8 +2536,8 @@ function lastUpdateMessage(u, commits) {
   const n = commits === null ? "" : ` (${commits} commit${commits === 1 ? "" : "s"})`;
   return `\u2B06\uFE0F Updated the office from ${u.from.slice(0, 7)} to ${u.to.slice(0, 7)}${n}`;
 }
-var OFFICE_DIR = path10.resolve(import.meta.dirname, "..");
-var isSamePath = (a, b) => process.platform === "win32" ? path10.resolve(a).toLowerCase() === path10.resolve(b).toLowerCase() : path10.resolve(a) === path10.resolve(b);
+var OFFICE_DIR = path11.resolve(import.meta.dirname, "..");
+var isSamePath = (a, b) => process.platform === "win32" ? path11.resolve(a).toLowerCase() === path11.resolve(b).toLowerCase() : path11.resolve(a) === path11.resolve(b);
 var realOffice = {
   launcher: underLauncher(),
   head: () => git(["rev-parse", "HEAD"], { cwd: OFFICE_DIR }).catch(() => null),
@@ -2416,6 +2551,340 @@ var realOffice = {
   }
 };
 
+// server/voice.ts
+import crypto5 from "node:crypto";
+import fs11 from "node:fs/promises";
+import path12 from "node:path";
+
+// shared/speech.ts
+var SPEECH_MAX_CHARS = 1500;
+var SAMPLE_LINE = "Hi! This is how I'll sound when I message you from the office.";
+var EMOJI = /[\p{Extended_Pictographic}\p{Regional_Indicator}\u{1F3FB}-\u{1F3FF}‍︎️⃣]/gu;
+var URL2 = /\b(?:https?:\/\/|www\.)[^\s<>()]+[^\s<>().,;:!?'"]/gi;
+function speechText(text, max = SPEECH_MAX_CHARS) {
+  let s2 = text.replace(/\r\n?/g, "\n");
+  s2 = s2.replace(/```[\s\S]*?(```|$)/g, "\n");
+  s2 = s2.replace(/`([^`\n]*)`/g, "$1");
+  s2 = s2.replace(/!\[([^\]]*)\]\([^)]*\)/g, "$1");
+  s2 = s2.replace(/\[([^\]]+)\]\([^)]*\)/g, "$1");
+  s2 = s2.replace(/<(https?:[^>\s]+)>/g, "$1");
+  s2 = s2.replace(/<\/?[a-z][^>]*>/gi, "");
+  s2 = s2.replace(URL2, "a link");
+  s2 = s2.replace(EMOJI, "");
+  s2 = s2.replace(/(\*\*|__)(.+?)\1/g, "$2");
+  s2 = s2.replace(/(^|[^\w*])\*(?!\s)([^*\n]+?)\*(?!\w)/g, "$1$2");
+  s2 = s2.replace(/(^|[^\w])_(?!\s)([^_\n]+?)_(?!\w)/g, "$1$2");
+  s2 = s2.replace(/~~(.+?)~~/g, "$1");
+  s2 = s2.replace(/#(\d+)\b/g, "number $1");
+  const lines = [];
+  for (let line of s2.split("\n")) {
+    line = line.replace(/^\s*#{1,6}\s+/, "").replace(/^\s*>+\s?/, "").replace(/^\s*[-*+•]\s+/, "").replace(/^\s*\|?\s*:?-{3,}:?\s*(\|\s*:?-{3,}:?\s*)*\|?\s*$/, "").replace(/^\s*([-*_]\s*){3,}$/, "").replace(/\s*\|\s*/g, ", ").replace(/^[,\s]+|[,\s]+$/g, "").replace(/\s+/g, " ").trim();
+    if (!line) continue;
+    lines.push(/[.!?:;,…]$/.test(line) ? line : `${line}.`);
+  }
+  return cut(lines.join(" ").replace(/\s+([.,!?;:])/g, "$1"), max);
+}
+function cut(s2, max) {
+  if (s2.length <= max) return s2;
+  const head = s2.slice(0, max + 1);
+  const ends = [...head.matchAll(/[.!?…](?=\s|$)/g)];
+  const end = ends.length ? ends[ends.length - 1].index + 1 : -1;
+  if (end >= max / 2) return s2.slice(0, end);
+  const space = s2.lastIndexOf(" ", max);
+  return `${s2.slice(0, space > 0 ? space : max).replace(/[,;:\s]+$/, "")}\u2026`;
+}
+
+// server/httpError.ts
+var HttpError = class extends Error {
+  constructor(status, message) {
+    super(message);
+    this.status = status;
+  }
+  status;
+};
+
+// server/voice.ts
+var DEFAULT_VOICE_MODEL = "eleven_flash_v2_5";
+var VOICES_TTL_MS = 10 * 6e4;
+var SYNTH_TIMEOUT_MS = 2e4;
+var CACHE_MAX_FILES = 200;
+var CACHE_MAX_AGE_MS = 7 * 24 * 60 * 6e4;
+var KEY_REJECTED_NOTE = "\u{1F507} ElevenLabs rejected the key, so messages aren't read aloud until you set a new one in the voice settings.";
+var voice = (id, name, description, accent = "") => ({
+  id,
+  name,
+  category: "library",
+  labels: { accent, gender: "", age: "", description, use_case: "conversational" },
+  previewUrl: null,
+  recommended: true
+});
+var RECOMMENDED_VOICES = [
+  voice("OZ0L6eISlOejga3XjDFt", "Talia", "warm soft guide"),
+  voice("l7kNoIfnJKPg7779LI2t", "Eddie", "helpful and comforting"),
+  voice("AaOhDHYJ1XLZk74lXhdE", "Caleb", "trusted guide"),
+  voice("gOupLcAkjEnguROwi4oS", "Darian", "warm grounded storyteller"),
+  voice("BFd5oBc2DDna33pSi4Gf", "Alicia", "polished global anchor"),
+  voice("QtY3JBOUKEB5xzrRfOKc", "Maisie", "friendly casual neighbor"),
+  voice("FrS6cKLB1wg4WYgPa9GW", "Wyatt", "seasoned mentor"),
+  voice("6WwXjDDEMyNmFG95zycZ", "Eldrin", "crisp baritone", "british")
+];
+var DEFAULT_VOICE = {
+  provider: "off",
+  voiceId: RECOMMENDED_VOICES[0].id,
+  voiceName: RECOMMENDED_VOICES[0].name,
+  model: DEFAULT_VOICE_MODEL,
+  speakOffice: false
+};
+var VOICE_ID = /^[A-Za-z0-9_-]{1,64}$/;
+var MODEL_ID = /^[a-z0-9_.-]{1,64}$/;
+function voiceSettings(base, patch) {
+  const p = patch && typeof patch === "object" ? patch : {};
+  const out = { ...base };
+  if (p.provider === "off" || p.provider === "browser" || p.provider === "elevenlabs") out.provider = p.provider;
+  if (typeof p.voiceId === "string" && p.voiceId.trim() && p.voiceId.length <= 200) out.voiceId = p.voiceId.trim();
+  if (typeof p.voiceName === "string") out.voiceName = p.voiceName.trim().slice(0, 80);
+  if (typeof p.model === "string" && MODEL_ID.test(p.model.trim())) out.model = p.model.trim();
+  if (typeof p.speakOffice === "boolean") out.speakOffice = p.speakOffice;
+  return out;
+}
+function cacheToPrune(files, now2, max = CACHE_MAX_FILES, maxAgeMs = CACHE_MAX_AGE_MS) {
+  const fresh = files.filter((f) => now2 - f.mtimeMs <= maxAgeMs).sort((a, b) => b.mtimeMs - a.mtimeMs);
+  const keep = new Set(fresh.slice(0, max).map((f) => f.name));
+  return files.filter((f) => !keep.has(f.name)).map((f) => f.name);
+}
+function speaks(m, s2) {
+  return m.from === "ceo" || m.from === "office" && s2.speakOffice;
+}
+var VoiceApiError = class extends Error {
+  constructor(status, message) {
+    super(message);
+    this.status = status;
+  }
+  status;
+};
+var Voice = class {
+  // secrets-file writes, one after another
+  constructor(deps) {
+    this.deps = deps;
+  }
+  deps;
+  key = "";
+  rejected = false;
+  // ElevenLabs said 401: no more calls until the key changes
+  voicesCache = null;
+  making = /* @__PURE__ */ new Map();
+  queue = Promise.resolve();
+  writing = Promise.resolve();
+  async init() {
+    const s2 = await this.readSecrets();
+    this.key = typeof s2.elevenlabsKey === "string" ? s2.elevenlabsKey : "";
+    this.rejected = !!this.key && s2.elevenlabsKeyRejected === true;
+    await this.prune().catch(() => void 0);
+  }
+  keyView() {
+    return { voiceKeySet: !!this.key, voiceKeyHint: this.key.slice(-4) };
+  }
+  /** PUT /api/voice/key: '' removes the key; anything else must pass one cheap ElevenLabs call first. */
+  async setKey(raw) {
+    const key = raw.trim();
+    if (key) {
+      if (key.length > 200 || /\s/.test(key)) throw new HttpError(400, "That doesn't look like an ElevenLabs API key.");
+      try {
+        await this.deps.api.checkKey(key);
+      } catch (err) {
+        if (err instanceof VoiceApiError && err.status === 401) throw new HttpError(400, "ElevenLabs rejected that key. Copy it again from elevenlabs.io \u2192 Developers \u2192 API Keys.");
+        if (err instanceof VoiceApiError && err.status === 403) throw new HttpError(400, "That key may not read voices. Give it the Voices (read) and Text to Speech permissions on elevenlabs.io.");
+        throw new HttpError(502, `Couldn't check the key with ElevenLabs: ${err.message}`);
+      }
+    }
+    this.key = key;
+    this.rejected = false;
+    this.voicesCache = null;
+    await this.writeSecrets({ elevenlabsKey: key || void 0, elevenlabsKeyRejected: void 0 });
+    const view2 = this.keyView();
+    this.deps.keyChanged(view2);
+    return view2;
+  }
+  /** GET /api/voice/voices: the account's voices plus the shortlist, shortlist first. Cached for 10 minutes. */
+  async voices() {
+    this.requireKey();
+    const now2 = this.now();
+    if (this.voicesCache && now2 - this.voicesCache.at < VOICES_TTL_MS) return this.voicesCache.list;
+    const key = this.key;
+    const mine = await this.deps.api.listVoices(key).catch((err) => this.failed(err, key, "list the voices"));
+    const recommended = new Map(RECOMMENDED_VOICES.map((v) => [v.id, v]));
+    const list = [
+      ...RECOMMENDED_VOICES.map((r) => {
+        const own = mine.find((v) => v.id === r.id);
+        return own ? { ...own, labels: fill(own.labels, r.labels), recommended: true } : r;
+      }),
+      ...mine.filter((v) => !recommended.has(v.id)).map((v) => ({ ...v, recommended: false })).sort((a, b) => a.name.localeCompare(b.name))
+    ];
+    if (this.key === key) this.voicesCache = { at: now2, list };
+    return list;
+  }
+  /** GET /api/voice/messages/:id: a phone message as mp3, made once and cached. */
+  async messageAudio(id) {
+    const s2 = this.deps.settings();
+    if (s2.provider !== "elevenlabs") throw new HttpError(404, "Messages aren't read by ElevenLabs right now.");
+    const m = this.deps.message(id);
+    if (!m || !speaks(m, s2)) throw new HttpError(404, `No spoken message ${id}`);
+    const text = speechText(m.text);
+    if (!text) throw new HttpError(404, `Message ${id} has nothing to say aloud`);
+    return this.audio(String(m.id), s2.voiceId, s2.model, text);
+  }
+  /** GET /api/voice/sample: the settings' Test button, in `voiceId` (default: the chosen voice). */
+  async sampleAudio(voiceId) {
+    const s2 = this.deps.settings();
+    return this.audio("sample", voiceId || s2.voiceId, s2.model, SAMPLE_LINE);
+  }
+  async audio(name, voiceId, model, text) {
+    if (!VOICE_ID.test(voiceId)) throw new HttpError(400, "Pick an ElevenLabs voice first.");
+    const hash = crypto5.createHash("sha256").update(`${voiceId}
+${model}
+${text}`).digest("hex").slice(0, 12);
+    const file = path12.join(this.deps.cacheDir, `${name}-${hash}.mp3`);
+    const cached = await fs11.readFile(file).catch(() => null);
+    if (cached) return cached;
+    this.requireKey();
+    const busy = this.making.get(file);
+    if (busy) return busy;
+    const made = this.oneAtATime(() => this.synthesize(file, { voiceId, model, text })).finally(() => this.making.delete(file));
+    this.making.set(file, made);
+    return made;
+  }
+  oneAtATime(fn) {
+    const run2 = this.queue.then(fn, fn);
+    this.queue = run2.catch(() => void 0);
+    return run2;
+  }
+  async synthesize(file, req) {
+    this.requireKey();
+    const key = this.key;
+    const audio = await this.deps.api.synthesize(key, req, AbortSignal.timeout(SYNTH_TIMEOUT_MS)).catch((err) => this.failed(err, key, "speak the message"));
+    await fs11.mkdir(this.deps.cacheDir, { recursive: true });
+    const tmp = `${file}.${process.pid}.tmp`;
+    await fs11.writeFile(tmp, audio);
+    await fs11.rename(tmp, file);
+    await this.prune().catch(() => void 0);
+    return audio;
+  }
+  /** An ElevenLabs failure as a short 502. A 401 also stops every call until the key changes, and says so once. */
+  async failed(err, key, what) {
+    if (err instanceof VoiceApiError && err.status === 401 && key === this.key && !this.rejected) {
+      this.rejected = true;
+      this.deps.officeNote(KEY_REJECTED_NOTE);
+      await this.writeSecrets({ elevenlabsKeyRejected: true }).catch(() => void 0);
+    }
+    if (err instanceof VoiceApiError && err.status === 401) throw new HttpError(502, "ElevenLabs rejected the key.");
+    throw new HttpError(502, `ElevenLabs couldn't ${what}: ${err.message}`.slice(0, 240));
+  }
+  requireKey() {
+    if (!this.key) throw new HttpError(409, "Add an ElevenLabs API key first.");
+    if (this.rejected) throw new HttpError(502, "ElevenLabs rejected the key. Set a new one in the voice settings.");
+  }
+  async prune() {
+    const names = (await fs11.readdir(this.deps.cacheDir).catch(() => [])).filter((n) => n.endsWith(".mp3"));
+    const files = await Promise.all(names.map(async (name) => ({ name, mtimeMs: (await fs11.stat(path12.join(this.deps.cacheDir, name)).catch(() => null))?.mtimeMs ?? 0 })));
+    for (const name of cacheToPrune(files, this.now())) await fs11.rm(path12.join(this.deps.cacheDir, name), { force: true, maxRetries: 3 });
+  }
+  now() {
+    return this.deps.now?.() ?? Date.now();
+  }
+  async readSecrets() {
+    try {
+      const s2 = JSON.parse(await fs11.readFile(this.deps.secretsFile, "utf8"));
+      return s2 && typeof s2 === "object" ? s2 : {};
+    } catch {
+      return {};
+    }
+  }
+  /** Merge into the secrets file (other secrets stay), owner-only where the OS has file modes. */
+  writeSecrets(patch) {
+    const write = this.writing.then(() => this.mergeSecrets(patch));
+    this.writing = write.catch(() => void 0);
+    return write;
+  }
+  async mergeSecrets(patch) {
+    const next = { ...await this.readSecrets(), ...patch };
+    for (const k of Object.keys(next)) if (next[k] === void 0) delete next[k];
+    await fs11.mkdir(path12.dirname(this.deps.secretsFile), { recursive: true });
+    const tmp = `${this.deps.secretsFile}.tmp`;
+    await fs11.writeFile(tmp, JSON.stringify(next, null, 2), { mode: 384 });
+    await fs11.rename(tmp, this.deps.secretsFile);
+    await fs11.chmod(this.deps.secretsFile, 384).catch(() => void 0);
+  }
+};
+function fill(own, ours) {
+  return { ...own, description: own.description || ours.description };
+}
+
+// server/elevenlabs.ts
+var API = "https://api.elevenlabs.io";
+var CHECK_TIMEOUT_MS = 1e4;
+var MAX_VOICE_PAGES = 5;
+async function call(key, pathname, init, signal) {
+  let res;
+  try {
+    res = await fetch(`${API}${pathname}`, { ...init, signal, headers: { ...init.headers, "xi-api-key": key } });
+  } catch (err) {
+    throw new VoiceApiError(0, signal.aborted ? "it took too long to answer" : `it couldn't be reached (${err.message})`);
+  }
+  if (!res.ok) throw new VoiceApiError(res.status, await reason(res));
+  return res;
+}
+async function reason(res) {
+  const body2 = await res.text().catch(() => "");
+  let text = "";
+  try {
+    const d = JSON.parse(body2).detail;
+    if (typeof d === "string") text = d;
+    else if (Array.isArray(d)) text = d.map((x) => x?.msg).filter(Boolean).join("; ");
+    else if (d && typeof d === "object") text = String(d.message ?? d.status ?? "");
+  } catch {
+  }
+  return `${res.status}${text ? `: ${text}` : ""}`.slice(0, 200);
+}
+var s = (v) => typeof v === "string" ? v : "";
+function voiceOption(v) {
+  const l = v.labels ?? {};
+  return {
+    id: s(v.voice_id),
+    name: s(v.name),
+    category: s(v.category),
+    labels: { accent: s(l.accent), gender: s(l.gender), age: s(l.age), description: s(l.description) || s(l.descriptive), use_case: s(l.use_case) || s(l["use case"]) },
+    previewUrl: s(v.preview_url) || null
+  };
+}
+var elevenLabs = {
+  // The cheapest call a voices-reading key can make: one voice.
+  async checkKey(key) {
+    await call(key, "/v2/voices?page_size=1&include_total_count=false", {}, AbortSignal.timeout(CHECK_TIMEOUT_MS));
+  },
+  async listVoices(key) {
+    const out = [];
+    let token = "";
+    for (let page = 0; page < MAX_VOICE_PAGES; page++) {
+      const q = new URLSearchParams({ page_size: "100", include_total_count: "false", ...token ? { next_page_token: token } : {} });
+      const res = await call(key, `/v2/voices?${q}`, {}, AbortSignal.timeout(CHECK_TIMEOUT_MS));
+      const body2 = await res.json();
+      for (const v of body2.voices ?? []) if (s(v.voice_id)) out.push(voiceOption(v));
+      token = s(body2.next_page_token);
+      if (!body2.has_more || !token) break;
+    }
+    return out;
+  },
+  async synthesize(key, { voiceId, model, text }, signal) {
+    const res = await call(
+      key,
+      `/v1/text-to-speech/${encodeURIComponent(voiceId)}?output_format=mp3_44100_128`,
+      { method: "POST", headers: { "Content-Type": "application/json", Accept: "audio/mpeg" }, body: JSON.stringify({ text, model_id: model }) },
+      signal
+    );
+    return Buffer.from(await res.arrayBuffer());
+  }
+};
+
 // server/backend.ts
 var realBackend = {
   demo: false,
@@ -2446,6 +2915,7 @@ var realBackend = {
   mainDir,
   deskDir,
   prepareDesk,
+  installDeps: (dir, cb) => installDesk(dir, cb),
   removeDesk,
   sweepDesks,
   releaseDesk: (fullName, agentSlug, port) => releaseDesk(fullName, agentSlug, port, officeProcesses()),
@@ -2456,22 +2926,23 @@ var realBackend = {
   releaseClis,
   detectClis,
   previews: realPreviews,
-  office: realOffice
+  office: realOffice,
+  voice: elevenLabs
 };
 
 // server/demo.ts
-import crypto5 from "node:crypto";
+import crypto6 from "node:crypto";
 import http from "node:http";
-import path11 from "node:path";
+import path13 from "node:path";
 var now = () => (/* @__PURE__ */ new Date()).toISOString();
-function issue(n, title, body, fullName, labels = []) {
-  return { number: n, title, body, url: `https://github.com/${fullName}/issues/${n}`, labels, createdAt: now() };
+function issue(n, title, body2, fullName, labels = []) {
+  return { number: n, title, body: body2, url: `https://github.com/${fullName}/issues/${n}`, labels, createdAt: now() };
 }
 var repos = /* @__PURE__ */ new Map();
 var bareRepos = /* @__PURE__ */ new Set();
 var mergedSinceSync = /* @__PURE__ */ new Map();
 var closedIssues = /* @__PURE__ */ new Set();
-var fakeSha = () => crypto5.randomBytes(20).toString("hex");
+var fakeSha = () => crypto6.randomBytes(20).toString("hex");
 function runChecks(pr, fail = Math.random() < 0.2) {
   Object.assign(pr, { checks: "pending", pendingChecks: ["CI / build", "Vercel"], failedChecks: [] });
   setTimeout(() => {
@@ -2484,7 +2955,7 @@ function runChecks(pr, fail = Math.random() < 0.2) {
 }
 function seed(fullName, description, titles) {
   const r = { fullName, description, issues: [], pulls: [], nextNumber: 1 };
-  for (const [title, body] of titles) r.issues.push(issue(r.nextNumber++, title, body, fullName));
+  for (const [title, body2] of titles) r.issues.push(issue(r.nextNumber++, title, body2, fullName));
   repos.set(fullName, r);
 }
 seed("demo-co/pixel-todo", "A cheerful todo app", [
@@ -2501,7 +2972,7 @@ seed("demo-co/weather-api", "Tiny weather REST API", [
   ["OpenAPI spec", "Publish an OpenAPI 3.1 document at /openapi.json."]
 ]);
 function screenshotSvg(title, url, hue) {
-  const safe = (s) => s.replace(/[<>&"]/g, "");
+  const safe = (s2) => s2.replace(/[<>&"]/g, "");
   return `<svg xmlns="http://www.w3.org/2000/svg" width="640" height="400" viewBox="0 0 640 400">
   <rect width="640" height="400" fill="hsl(${hue},60%,97%)"/>
   <rect width="640" height="56" fill="hsl(${hue},70%,55%)"/>
@@ -2515,7 +2986,7 @@ function screenshotSvg(title, url, hue) {
 </svg>`;
 }
 function devScript(opts, cb, issueNumber, issueTitle) {
-  const branch = path11.basename(opts.cwd);
+  const branch = path13.basename(opts.cwd);
   const hue = issueNumber * 67 % 360;
   const file = ["src/App.tsx", "src/components/TodoList.tsx", "src/api/routes.ts", "src/styles.css"][issueNumber % 4];
   const port = 5200 + issueNumber % 50;
@@ -2551,18 +3022,25 @@ function devScript(opts, cb, issueNumber, issueTitle) {
     [{ kind: "tool", tool: "Bash", text: `\u23FA $ gh pr create --title "${issueTitle}" --body "Closes #${issueNumber}"` }]
   ];
 }
-function qaScript(cb, pr, title, round) {
+function qaScript(cb, pr, title, round, checks) {
   const port = 5600 + pr % 50;
   const hue = pr * 41 % 360;
-  return [
-    [{ kind: "text", text: `\u25CF Testing PR #${pr} "${title}" (round ${round}). First, the acceptance criteria from the issue.` }],
-    [{ kind: "tool", tool: "Bash", text: "\u23FA $ git diff origin/main...HEAD --stat" }, { kind: "result", text: "  \u23BF  3 files changed, 82 insertions(+), 9 deletions(-)" }],
+  const verify = checks.endsWith(": none") ? [
     [{ kind: "tool", tool: "Bash", text: "\u23FA $ npm ci && npm test -- --run" }],
     [
       { kind: "result", text: "  \u23BF Test Files  8 passed (8)" },
       { kind: "result", text: "    Tests  41 passed (41)" }
     ],
-    [{ kind: "tool", tool: "Bash", text: "\u23FA $ npm run lint && npm run build" }, { kind: "result", text: "  \u23BF \u2713 built in 1.84s" }],
+    [{ kind: "tool", tool: "Bash", text: "\u23FA $ npm run lint && npm run build" }, { kind: "result", text: "  \u23BF \u2713 built in 1.84s" }]
+  ] : [
+    [{ kind: "tool", tool: "Read", text: "\u23FA Read .github/workflows/ci.yml" }, { kind: "result", text: "  \u23BF Read 41 lines" }],
+    [{ kind: "text", text: "\u25CF CI already runs the tests, lint and build, so I only need a build to start the app." }],
+    [{ kind: "tool", tool: "Bash", text: "\u23FA $ npm ci && npm run build" }, { kind: "result", text: "  \u23BF \u2713 built in 1.84s" }]
+  ];
+  return [
+    [{ kind: "text", text: `\u25CF Testing PR #${pr} "${title}" (round ${round}). ${checks}. First, the acceptance criteria from the issue.` }],
+    [{ kind: "tool", tool: "Bash", text: "\u23FA $ git diff origin/main...HEAD --stat" }, { kind: "result", text: "  \u23BF  3 files changed, 82 insertions(+), 9 deletions(-)" }],
+    ...verify,
     [{ kind: "tool", tool: "Bash", text: `\u23FA $ npm run preview -- --port ${port} &` }, { kind: "result", text: `  \u23BF Local: http://localhost:${port}/` }],
     () => cb.browserUrl(`http://localhost:${port}/`),
     [{ kind: "tool", tool: "mcp__playwright__browser_navigate", text: `\u23FA \u{1F310} navigate http://localhost:${port}/` }, { kind: "result", text: `  \u23BF Page URL: http://localhost:${port}/` }],
@@ -2598,8 +3076,9 @@ function fakeSession(opts, cb, fullName) {
     { kind: "system", text: `\u273B Claude Code (demo) \xB7 ${opts.model} \xB7 ${opts.effort} effort` },
     { kind: "system", text: `  cwd ${opts.cwd}` }
   ];
-  const body = kind === "qa" ? qaScript(cb, number, title, round) : kind === "fix" ? fixScript(number, pushes) : devScript(opts, cb, number, title);
-  const script = [header, ...body];
+  const checks = opts.prompt.match(/^GitHub checks right now: .*$/m)?.[0] ?? "GitHub checks right now: none";
+  const body2 = kind === "qa" ? qaScript(cb, number, title, round, checks) : kind === "fix" ? fixScript(number, pushes) : devScript(opts, cb, number, title);
+  const script = [header, ...body2];
   const finish = () => {
     const costUsd = 0.3 + Math.random();
     const turns = 15 + Math.floor(Math.random() * 20);
@@ -2654,7 +3133,7 @@ function fakeSession(opts, cb, fullName) {
         number: n,
         title,
         url,
-        headRefName: `swarm/issue-${number}-${path11.basename(opts.cwd).replace(/-[0-9a-f]{4}$/, "")}`,
+        headRefName: `swarm/issue-${number}-${path13.basename(opts.cwd).replace(/-[0-9a-f]{4}$/, "")}`,
         state: "OPEN",
         isDraft: false,
         mergeable: "MERGEABLE",
@@ -2680,12 +3159,12 @@ function fakeSession(opts, cb, fullName) {
   const step = () => {
     if (stopped) return;
     if (i >= script.length) return finish();
-    const s = script[i++];
-    if (typeof s === "function") s();
+    const s2 = script[i++];
+    if (typeof s2 === "function") s2();
     else {
-      const tool2 = s.find((e) => e.kind === "tool");
+      const tool2 = s2.find((e) => e.kind === "tool");
       cb.tool(tool2?.tool ?? null);
-      cb.log(s);
+      cb.log(s2);
     }
     timers.push(setTimeout(step, 1600 + Math.random() * 3800));
   };
@@ -2783,6 +3262,7 @@ function fakeUsageWarning(cb) {
 }
 function createDemoBackend() {
   const deskRepo = /* @__PURE__ */ new Map();
+  const installedDesks = /* @__PURE__ */ new Set();
   const folders = /* @__PURE__ */ new Map();
   const addFolder = (name, github, git2 = true) => folders.set(name, { name, path: `/demo/projects/${name}`, git: git2, github, modified: Date.now() - folders.size * 36e5 });
   for (const r of repos.values()) addFolder(r.fullName.split("/")[1], r.fullName);
@@ -2824,11 +3304,11 @@ function createDemoBackend() {
     },
     listIssues: async (fullName) => [...repos.get(fullName)?.issues ?? []],
     listPulls: async (fullName) => [...repos.get(fullName)?.pulls ?? []],
-    createIssue: async (fullName, title, body, labels = []) => {
+    createIssue: async (fullName, title, body2, labels = []) => {
       const r = repos.get(fullName);
       if (!r) throw new Error("Unknown repo");
       const n = r.nextNumber++;
-      r.issues.push(issue(n, title, body, fullName, labels));
+      r.issues.push(issue(n, title, body2, fullName, labels));
       return n;
     },
     issueState: async (fullName, number) => {
@@ -2887,7 +3367,11 @@ Closes #${pr.closesIssues[0] ?? "?"}`,
         closesIssues: pr.closesIssues,
         state: pr.state,
         mergeable: pr.mergeable,
-        mergeState: pr.mergeState
+        mergeState: pr.mergeState,
+        checks: pr.checks,
+        checkNames: pr.checks === "none" ? [] : ["CI / build", "Vercel"],
+        failedChecks: pr.failedChecks.map((c) => c.name),
+        pendingChecks: pr.pendingChecks
       };
     },
     issueDetails: async (fullName, number) => {
@@ -2912,6 +3396,18 @@ Closes #${pr.closesIssues[0] ?? "?"}`,
       deskRepo.set(dir, fullName);
       return dir;
     },
+    installDeps: async (dir, cb) => {
+      if (installedDesks.has(dir)) {
+        cb.log(["Dependencies unchanged since the last install; skipping it."]);
+        return "skipped";
+      }
+      cb.log(["Installing dependencies\u2026", "$ npm ci"]);
+      cb.installing();
+      await new Promise((r) => setTimeout(r, 1500));
+      cb.log(["Dependencies installed."]);
+      installedDesks.add(dir);
+      return "installed";
+    },
     removeDesk: async () => void 0,
     sweepDesks: async () => ({ desks: 0, folders: 0, branches: 0, patches: [], skipped: [] }),
     releaseDesk: async () => void 0,
@@ -2926,7 +3422,8 @@ Closes #${pr.closesIssues[0] ?? "?"}`,
     releaseClis: async () => void 0,
     detectClis: async () => CLIS.map((c) => ({ id: c.id, label: c.label, installed: true, version: "demo", integrated: c.integrated })),
     previews: demoPreviews,
-    office: demoOffice
+    office: demoOffice,
+    voice: demoVoice
   };
 }
 var OFFICE_REPO = "demo-co/pixel-todo";
@@ -3031,11 +3528,11 @@ var demoPreviews = {
       async stop() {
         stopped = true;
         timers.forEach(clearTimeout);
-        const s = server2;
+        const s2 = server2;
         server2 = null;
-        if (!s?.listening) return;
-        s.closeAllConnections();
-        await new Promise((resolve) => s.close(() => resolve()));
+        if (!s2?.listening) return;
+        s2.closeAllConnections();
+        await new Promise((resolve) => s2.close(() => resolve()));
       }
     };
   }
@@ -3107,12 +3604,12 @@ function ceoSession(opts, cb) {
   };
   const status = async () => {
     await step([{ kind: "tool", tool: "mcp__office__company_status", text: `\u23FA ${describeOfficeTool("company_status", {})}` }]);
-    const s = JSON.parse(await office.call("company_status", {}));
-    const people = s.floors.reduce((n, f) => n + f.team.length, 0);
-    const issues = s.floors.reduce((n, f) => n + f.backlog.length, 0);
-    const free = s.floors.reduce((n, f) => n + f.seats.dev.free + f.seats.qa.free, 0);
-    cb.log([{ kind: "result", text: `  \u23BF ${s.floors.length} floors \xB7 ${people} people \xB7 ${free} free seats \xB7 ${issues} open issues \xB7 ${s.pendingProposals.length} proposals pending` }]);
-    return s;
+    const s2 = JSON.parse(await office.call("company_status", {}));
+    const people = s2.floors.reduce((n, f) => n + f.team.length, 0);
+    const issues = s2.floors.reduce((n, f) => n + f.backlog.length, 0);
+    const free = s2.floors.reduce((n, f) => n + f.seats.dev.free + f.seats.qa.free, 0);
+    cb.log([{ kind: "result", text: `  \u23BF ${s2.floors.length} floors \xB7 ${people} people \xB7 ${free} free seats \xB7 ${issues} open issues \xB7 ${s2.pendingProposals.length} proposals pending` }]);
+    return s2;
   };
   const use = async (name, args) => {
     await step([{ kind: "tool", tool: `mcp__office__${name}`, text: `\u23FA ${describeOfficeTool(name, args)}` }]);
@@ -3122,7 +3619,7 @@ function ceoSession(opts, cb) {
   };
   const read = (file, lines) => step([{ kind: "tool", tool: "Read", text: `\u23FA Read ${file}` }, { kind: "result", text: `  \u23BF Read ${lines} lines` }]);
   const think = (text) => step([{ kind: "thinking", text: "\u273B Thinking\u2026" }, { kind: "text", text: `\u25CF ${text}` }], 1800);
-  const short = (s, n = 48) => s.length > n ? `${s.slice(0, n - 1).trim()}\u2026` : s;
+  const short = (s2, n = 48) => s2.length > n ? `${s2.slice(0, n - 1).trim()}\u2026` : s2;
   const planIssues = async (floor, mission, team) => {
     const first = await use("file_issue", {
       floor,
@@ -3165,8 +3662,8 @@ Acceptance criteria:
   };
   const scripts = {
     async onboard(floor, fullName) {
-      const s = await status();
-      const f = s.floors.find((x) => x.floor === floor);
+      const s2 = await status();
+      const f = s2.floors.find((x) => x.floor === floor);
       if (!f) return "That floor has gone, so there was nothing to onboard.";
       const p = PROFILES[fullName.split("/")[1] ?? ""] ?? GENERIC;
       await read(`${f.repo}/README.md`, 48);
@@ -3198,8 +3695,8 @@ Acceptance criteria:
       ].filter(Boolean).join(" ");
     },
     async plan(floor, mission) {
-      const s = await status();
-      const f = s.floors.find((x) => x.floor === floor);
+      const s2 = await status();
+      const f = s2.floors.find((x) => x.floor === floor);
       if (!f) return "That floor has gone, so there was nothing to plan.";
       await read(`${f.repo}/README.md`, 12);
       await think("Foundation first, so the parallel work doesn't collide.");
@@ -3207,9 +3704,9 @@ Acceptance criteria:
       return `I turned the brief into three issues on floor ${floor}. #${n} sets up the skeleton; the other two say "Depends on #${n}", so nobody starts them early.`;
     },
     async review() {
-      const s = await status();
+      const s2 = await status();
       await think("Checking each floor for idle people and stuck work.");
-      for (const f of s.floors) {
+      for (const f of s2.floors) {
         const idle = f.team.filter((a) => a.role === "dev" && !a.specialty && (a.status === "idle" || a.status === "done"));
         const devs = f.team.filter((a) => a.role === "dev").length;
         if (devs >= 6 && idle.length >= 2 && f.backlog.length < devs) {
@@ -3217,26 +3714,26 @@ Acceptance criteria:
           return `Floor ${f.floor} is overstaffed: ${devs} developers for ${f.backlog.length} open issues. I suggest letting ${idle[idle.length - 1].name} go; it's on your phone.`;
         }
       }
-      for (const f of s.floors) {
+      for (const f of s2.floors) {
         const specialist = f.team.find((a) => a.role === "dev" && a.specialty);
         const unrouted = f.backlog.find((i) => !i.specialty && !i.inProgress);
         if (!specialist || !unrouted) continue;
         const out = await use("route_issue", { floor: f.floor, number: unrouted.number, specialty: specialist.specialty });
         if (!out.startsWith("Refused")) return `Floor ${f.floor}: #${unrouted.number} had no specialty, so I routed it to ${specialist.specialty}, ${specialist.name}'s lane.`;
       }
-      const issues = s.floors.reduce((n, f) => n + f.backlog.length, 0);
-      const prs = s.floors.reduce((n, f) => n + f.pullRequests.length, 0);
-      return `All ${s.floors.length} floors look healthy: ${issues} open issues and ${prs} pull requests in flight. No changes needed.`;
+      const issues = s2.floors.reduce((n, f) => n + f.backlog.length, 0);
+      const prs = s2.floors.reduce((n, f) => n + f.pullRequests.length, 0);
+      return `All ${s2.floors.length} floors look healthy: ${issues} open issues and ${prs} pull requests in flight. No changes needed.`;
     },
     async chat(text) {
-      const s = await status();
+      const s2 = await status();
       await think("Reading your message.");
-      const people = s.floors.reduce((n, f) => n + f.team.length, 0);
-      const issues = s.floors.reduce((n, f) => n + f.backlog.length, 0);
-      const pending2 = s.pendingProposals.length;
-      const rows = s.floors.map((f) => `| ${f.floor} | \`${f.repo.split("/").pop()}\` | ${f.team.length} | ${f.backlog.length} | ${f.pullRequests.length} |`);
+      const people = s2.floors.reduce((n, f) => n + f.team.length, 0);
+      const issues = s2.floors.reduce((n, f) => n + f.backlog.length, 0);
+      const pending2 = s2.pendingProposals.length;
+      const rows = s2.floors.map((f) => `| ${f.floor} | \`${f.repo.split("/").pop()}\` | ${f.team.length} | ${f.backlog.length} | ${f.pullRequests.length} |`);
       return [
-        `**Quick status:** ${s.floors.length} floor${s.floors.length === 1 ? "" : "s"}, ${people} people and ${issues} open issues.`,
+        `**Quick status:** ${s2.floors.length} floor${s2.floors.length === 1 ? "" : "s"}, ${people} people and ${issues} open issues.`,
         "",
         "- The team is *heads down* on the backlog",
         `- ${pending2 ? `**${pending2}** proposal${pending2 === 1 ? " is" : "s are"} waiting for you in Hires` : "No hiring decisions waiting on you"}`,
@@ -3300,34 +3797,154 @@ Acceptance criteria:
     }
   };
 }
+function demoChime(chars) {
+  const rate = 8e3;
+  const seconds = Math.min(0.4 + chars / 400, 2);
+  const n = Math.round(rate * seconds);
+  const wav = Buffer.alloc(44 + n);
+  wav.write("RIFF", 0);
+  wav.writeUInt32LE(36 + n, 4);
+  wav.write("WAVEfmt ", 8);
+  wav.writeUInt32LE(16, 16);
+  wav.writeUInt16LE(1, 20);
+  wav.writeUInt16LE(1, 22);
+  wav.writeUInt32LE(rate, 24);
+  wav.writeUInt32LE(rate, 28);
+  wav.writeUInt16LE(1, 32);
+  wav.writeUInt16LE(8, 34);
+  wav.write("data", 36);
+  wav.writeUInt32LE(n, 40);
+  for (let i = 0; i < n; i++) {
+    const t = i / rate;
+    const f = t < seconds / 2 ? 660 : 880;
+    const fade = Math.min(1, (seconds - t) * 8, t * 40);
+    wav[44 + i] = Math.round(128 + 40 * fade * Math.sin(2 * Math.PI * f * t));
+  }
+  return wav;
+}
+var demoVoices = [
+  { id: "demoVoiceAvery00001", name: "Avery", category: "premade", labels: { accent: "american", gender: "female", age: "middle aged", description: "calm", use_case: "conversational" }, previewUrl: null },
+  { id: "demoVoiceBasil00002", name: "Basil", category: "premade", labels: { accent: "british", gender: "male", age: "middle aged", description: "warm", use_case: "narration" }, previewUrl: null },
+  { id: "demoVoiceCleo000003", name: "Cleo", category: "premade", labels: { accent: "australian", gender: "female", age: "young", description: "friendly", use_case: "conversational" }, previewUrl: null }
+];
+var demoVoice = {
+  checkKey: async (key) => {
+    if (/bad/i.test(key)) throw new VoiceApiError(401, "401: invalid_api_key (demo)");
+  },
+  listVoices: async () => demoVoices,
+  synthesize: async (_key, { text }) => {
+    await new Promise((r) => setTimeout(r, 300));
+    return demoChime(text.length);
+  }
+};
+
+// server/screenReply.ts
+function screenStatus(shot) {
+  if (shot === void 0) return 404;
+  return shot ? 200 : 204;
+}
+
+// server/sendBack.ts
+import { z } from "zod";
+
+// server/mergeGate.ts
+var MAX_MERGE_FIXES = 3;
+var CHECKS_ALERT_MS = 30 * 6e4;
+var MERGE_RETRY_MS = 10 * 6e4;
+function mergeStep(pr, rec, now2, opts) {
+  if (pr.isDraft) return { do: "wait", note: "a draft: waiting", set: {} };
+  if (!opts.detailed && (pr.mergeable === "UNKNOWN" || pr.mergeState === "UNKNOWN")) return { do: "details", set: {} };
+  const set = {};
+  if (rec.passedSha == null) set.passedSha = pr.headSha;
+  if (pr.headSha !== (set.passedSha ?? rec.passedSha)) return { do: "requeue", set };
+  const needsHuman = rec.mergeFixes >= MAX_MERGE_FIXES;
+  if (pr.mergeable === "CONFLICTING" || pr.mergeState === "DIRTY") {
+    return { do: "send-back", reason: "conflict", instructions: `It conflicts with ${opts.base}.`, needsHuman, set };
+  }
+  if (pr.checks === "failing") {
+    const instructions = pr.failedChecks.map((c) => `- ${c.name}${c.url ? `: ${c.url}` : ""}`).join("\n");
+    return { do: "send-back", reason: "checks", instructions, needsHuman, set };
+  }
+  if (pr.checks === "pending") {
+    const since = rec.pendingSince ?? now2;
+    if (rec.pendingSince == null) set.pendingSince = since;
+    const alert = now2 - since > CHECKS_ALERT_MS && !rec.alerted;
+    if (alert) set.alerted = true;
+    return { do: "wait", note: `waiting for checks: ${pr.pendingChecks.join(", ") || "running"}`, alert, set };
+  }
+  set.pendingSince = null;
+  if (pr.mergeable === "UNKNOWN") return { do: "wait", note: "GitHub is checking it can merge", set };
+  if (pr.mergeState === "BEHIND") return { do: "update-branch", set };
+  if (rec.mergeRetryAt && now2 < rec.mergeRetryAt) return { do: "wait", set };
+  return { do: "merge", set };
+}
+
+// server/qaOutcome.ts
+var MAX_QA_ROUNDS = 3;
+function lastQaRound(rec) {
+  return rec.round - rec.retests >= MAX_QA_ROUNDS;
+}
+function qaOutcome(pass, rec, pr) {
+  if (pass) return "passed";
+  if (!lastQaRound(rec)) return "failed";
+  const conflicting = pr != null && (pr.mergeable === "CONFLICTING" || pr.mergeState === "DIRTY");
+  return conflicting && rec.mergeFixes < MAX_MERGE_FIXES ? "conflict" : "needs-human";
+}
+function conflictFixInstructions(qaInstructions2, base) {
+  const merge = `It also conflicts with ${base}: bring it up to date (git fetch origin && git merge origin/${base}) and resolve the conflicts so both this change and the newly merged work keep working.`;
+  return qaInstructions2.trim() ? `${qaInstructions2.trim()}
+
+${merge}` : merge;
+}
+
+// server/sendBack.ts
+var MAX_SEND_BACK_NOTE = 1e3;
+var body = z.object({ note: z.string().max(MAX_SEND_BACK_NOTE).optional() });
+function parseSendBackNote(input) {
+  const parsed = body.safeParse(input ?? {});
+  if (!parsed.success) throw new HttpError(400, `note must be text of at most ${MAX_SEND_BACK_NOTE} characters`);
+  return parsed.data.note?.trim() || void 0;
+}
+function sendBackPatch(prNumber, pr, rec, base, note) {
+  if (!pr || pr.state !== "OPEN") throw new HttpError(404, `PR #${prNumber} is not open`);
+  if (rec?.status === "testing" || rec?.status === "fixing") throw new HttpError(409, `PR #${prNumber} is already ${rec.status}`);
+  if (!rec || rec.status !== "needs-human" && rec.status !== "failed") {
+    throw new HttpError(409, `PR #${prNumber} isn't waiting on you: only a PR that failed QA or needs a human can go back to a developer`);
+  }
+  const conflict = pr.mergeable === "CONFLICTING" || pr.mergeState === "DIRTY";
+  const findings = [rec.fixInstructions?.trim(), note?.trim() && `From the manager: ${note.trim()}`].filter(Boolean).join("\n\n");
+  const addMerge = conflict && !rec.passedSha && !findings.includes(`conflicts with ${base}`);
+  const fixInstructions = (addMerge ? conflictFixInstructions(findings, base) : findings) || null;
+  return { status: "failed", fixReason: conflict ? "conflict" : "qa", fixInstructions, sessionFailures: 0, retests: rec.retests + 1, mergeNote: null };
+}
 
 // server/swarm.ts
-import fs11 from "node:fs/promises";
-import path13 from "node:path";
-import crypto6 from "node:crypto";
+import fs13 from "node:fs/promises";
+import path15 from "node:path";
+import crypto7 from "node:crypto";
 
 // server/ceo.ts
 import { createSdkMcpServer, tool } from "@anthropic-ai/claude-agent-sdk";
-import { z } from "zod";
+import { z as z2 } from "zod";
 
 // shared/issues.ts
 function issueSpecialty(labels) {
   const l = labels.find((x) => /^swarm:/i.test(x) && !/^swarm:skip$/i.test(x));
   return l ? l.slice(6).toLowerCase() : "";
 }
-function blockers(body, open) {
+function blockers(body2, open) {
   const out = /* @__PURE__ */ new Set();
-  for (const m of (body ?? "").matchAll(/\b(?:depends\s+on|blocked\s+by)\s*:?\s*((?:#\d+(?:\s*(?:,|and|&)\s*)?)+)/gi)) {
+  for (const m of (body2 ?? "").matchAll(/\b(?:depends\s+on|blocked\s+by)\s*:?\s*((?:#\d+(?:\s*(?:,|and|&)\s*)?)+)/gi)) {
     for (const n of m[1].matchAll(/#(\d+)/g)) if (open.has(Number(n[1]))) out.add(Number(n[1]));
   }
   return [...out];
 }
 var DEPENDENCY = /\b(?:depends\s+on|blocked\s+by)\s*:?\s*(?:#\d+(?:\s*(?:,|and|&)\s*)?)+/gi;
 var STATEMENT = new RegExp(`\\s*${DEPENDENCY.source}[.;,]?`, "gi");
-function setDependsOn(body, deps) {
+function setDependsOn(body2, deps) {
   const lines = [];
   let dropped = false;
-  for (const line of (body ?? "").split(/\r?\n/)) {
+  for (const line of (body2 ?? "").split(/\r?\n/)) {
     const rest2 = line.match(DEPENDENCY) ? line.replace(STATEMENT, "").trimEnd() : line;
     if (rest2 !== line && !/[\p{L}\p{N}]/u.test(rest2)) {
       dropped = true;
@@ -3376,7 +3993,7 @@ function holdUps(issues) {
 }
 
 // server/ceo.ts
-var EFFORT = z.enum(["low", "medium", "high", "xhigh", "max"]);
+var EFFORT = z2.enum(["low", "medium", "high", "xhigh", "max"]);
 function createOfficeTools(h) {
   const run2 = async (fn) => {
     try {
@@ -3395,21 +4012,21 @@ function createOfficeTools(h) {
     tool(
       "agent_detail",
       "One agent in full: title, specialty, role, status, current task, model and effort, and their complete job description (company_status shortens long ones). Read it before rewriting someone's job description.",
-      { agent_id: z.string().describe("An id (or name) from company_status") },
+      { agent_id: z2.string().describe("An id (or name) from company_status") },
       (a) => run2(() => h.agentDetail(a))
     ),
     tool(
       "set_floor_profile",
       "Record your read of a floor's project: a one-line summary (kind of project and stack), the QA brief that tells QA testers what to check for this kind of project, and how to run the app for the floor's preview monitor.",
       {
-        floor: z.number().int().describe("Floor number"),
-        summary: z.string().max(140).optional().describe('e.g. "3D browser game \xB7 Three.js + Vite + TypeScript"'),
-        qa_brief: z.string().max(2500).optional().describe("What QA must check on every PR for this project, as short bullet points"),
-        preview_command: z.string().max(2e3).optional().describe(
+        floor: z2.number().int().describe("Floor number"),
+        summary: z2.string().max(140).optional().describe('e.g. "3D browser game \xB7 Three.js + Vite + TypeScript"'),
+        qa_brief: z2.string().max(2500).optional().describe("What QA must check on every PR for this project, as short bullet points"),
+        preview_command: z2.string().max(2e3).optional().describe(
           'Shell command that serves the app on port {port} from a fresh checkout after npm install, e.g. "npm run dev -- --port {port} --strictPort". PORT={port} is always set. {tmp} is a scratch folder. Empty string: back to the default (npm run dev, else start, else preview). Only set it when the default would not serve the app on PORT.'
         ),
         // Not z.record(): the SDK can't turn it into JSON Schema, and one bad tool empties the whole tools/list.
-        preview_env: z.object({}).catchall(z.string()).optional().describe("Extra environment variables for the preview; {port} and {tmp} are replaced in the values. Replaces the whole set.")
+        preview_env: z2.object({}).catchall(z2.string()).optional().describe("Extra environment variables for the preview; {port} and {tmp} are replaced in the values. Replaces the whole set.")
       },
       (a) => run2(() => h.setFloorProfile(a))
     ),
@@ -3417,10 +4034,10 @@ function createOfficeTools(h) {
       "update_job",
       "Change an existing agent's job title, specialty or job description so it fits the project. Takes effect from their next task.",
       {
-        agent_id: z.string(),
-        title: z.string().max(60).optional(),
-        specialty: z.string().max(24).optional().describe('Short lowercase slug, e.g. "graphics"; "" for a generalist'),
-        job_description: z.string().max(2500).optional()
+        agent_id: z2.string(),
+        title: z2.string().max(60).optional(),
+        specialty: z2.string().max(24).optional().describe('Short lowercase slug, e.g. "graphics"; "" for a generalist'),
+        job_description: z2.string().max(2500).optional()
       },
       (a) => run2(() => h.updateJob(a))
     ),
@@ -3428,13 +4045,13 @@ function createOfficeTools(h) {
       "propose_hire",
       "Propose hiring a developer or QA tester for a floor. The manager approves or declines (or it is auto-approved if hiring is set to auto and the floor is under its team cap).",
       {
-        floor: z.number().int(),
-        role: z.enum(["dev", "qa"]).describe("dev = builds issues into pull requests; qa = tests pull requests"),
-        title: z.string().max(60).describe('Specific job title, e.g. "Three.js graphics engineer"'),
-        specialty: z.string().max(24).describe('Short lowercase slug used to label issues swarm:<specialty>, e.g. "graphics"'),
-        job_description: z.string().max(2500).describe("What this person owns on this project and how they should work. Written to them, second person."),
-        reason: z.string().max(600).describe("Why the floor needs them now. The manager reads this."),
-        model: z.string().optional().describe("Leave out to use the default model"),
+        floor: z2.number().int(),
+        role: z2.enum(["dev", "qa"]).describe("dev = builds issues into pull requests; qa = tests pull requests"),
+        title: z2.string().max(60).describe('Specific job title, e.g. "Three.js graphics engineer"'),
+        specialty: z2.string().max(24).describe('Short lowercase slug used to label issues swarm:<specialty>, e.g. "graphics"'),
+        job_description: z2.string().max(2500).describe("What this person owns on this project and how they should work. Written to them, second person."),
+        reason: z2.string().max(600).describe("Why the floor needs them now. The manager reads this."),
+        model: z2.string().optional().describe("Leave out to use the default model"),
         effort: EFFORT.optional().describe("Leave out to use the default effort")
       },
       (a) => run2(() => h.proposeHire(a))
@@ -3442,17 +4059,17 @@ function createOfficeTools(h) {
     tool(
       "propose_let_go",
       "Propose letting an agent go (overstaffed floor, specialty no longer needed). The manager decides.",
-      { agent_id: z.string(), reason: z.string().max(600) },
+      { agent_id: z2.string(), reason: z2.string().max(600) },
       (a) => run2(() => h.proposeLetGo(a))
     ),
     tool(
       "file_issue",
       'File a GitHub issue on a floor. A specialty routes it to that specialist first; when none is free, any free developer takes it. Write "Depends on #N" in the body only when it cannot start until #N is merged: the office will not start it until #N is closed.',
       {
-        floor: z.number().int(),
-        title: z.string().max(120),
-        body: z.string().max(6e3).describe("Context, what to build, acceptance criteria"),
-        specialty: z.string().max(24).optional()
+        floor: z2.number().int(),
+        title: z2.string().max(120),
+        body: z2.string().max(6e3).describe("Context, what to build, acceptance criteria"),
+        specialty: z2.string().max(24).optional()
       },
       (a) => run2(() => h.fileIssue(a))
     ),
@@ -3460,10 +4077,10 @@ function createOfficeTools(h) {
       "route_issue",
       'Fix the routing of an open issue instead of filing a duplicate: change its specialty, rewrite its "Depends on #N" line, or both. The rest of the body stays as it is.',
       {
-        floor: z.number().int(),
-        number: z.number().int().positive().describe("The issue number"),
-        specialty: z.string().max(24).optional().describe('Sets swarm:<specialty> and removes any other; "" for none. Someone on the floor, or a pending proposal, must have it.'),
-        depends_on: z.array(z.number().int().positive()).max(10).optional().describe("Issues it waits for; [] for none. Not for an issue in progress.")
+        floor: z2.number().int(),
+        number: z2.number().int().positive().describe("The issue number"),
+        specialty: z2.string().max(24).optional().describe('Sets swarm:<specialty> and removes any other; "" for none. Someone on the floor, or a pending proposal, must have it.'),
+        depends_on: z2.array(z2.number().int().positive()).max(10).optional().describe("Issues it waits for; [] for none. Not for an issue in progress.")
       },
       (a) => run2(() => h.routeIssue(a))
     )
@@ -3624,14 +4241,14 @@ function planRoute(r) {
       if (d === r.number) throw new Error(`#${r.number} can't depend on itself.`);
       if (!open.has(d)) throw new Error(r.closed(d) ? `#${d} is closed, so there's nothing to wait for.` : `There is no open issue #${d} on floor ${r.floor}.`);
     }
-    const body = setDependsOn(issue2.body, deps);
-    const after = r.issues.map((i) => i.number === r.number ? { ...i, body } : i);
+    const body2 = setDependsOn(issue2.body, deps);
+    const after = r.issues.map((i) => i.number === r.number ? { ...i, body: body2 } : i);
     const waits = new Map(after.map((i) => [i.number, blockers(i.body, open)]));
     const loop = deps.find((d) => reaches(d, r.number, waits));
     if (loop !== void 0) throw new Error(`#${loop} already waits for #${r.number}, directly or through other issues, so that would be a cycle.`);
     const depth = waitsDepth(r.number, waits) + (holdUps(after).get(r.number)?.chain ?? 0);
     if (depth > 2) throw new Error(`That makes a dependency chain ${depth} steps deep through #${r.number}. Keep chains to 2 steps at most: split the work so more of it can start side by side.`);
-    if (body !== issue2.body) plan.body = body;
+    if (body2 !== issue2.body) plan.body = body2;
     done.push(deps.length ? `depends on ${deps.map((d) => `#${d}`).join(", ")}` : "no dependencies");
   }
   plan.summary = `#${r.number} on floor ${r.floor}: ${done.join(", ")}.`;
@@ -3643,12 +4260,19 @@ function reaches(from, to, waits, seen = /* @__PURE__ */ new Set()) {
   seen.add(from);
   return (waits.get(from) ?? []).some((n) => reaches(n, to, waits, seen));
 }
-function specialtySlug(s) {
-  const slug = String(s ?? "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 24);
+function specialtySlug(s2) {
+  const slug = String(s2 ?? "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 24);
   return slug === "skip" ? "" : slug;
 }
 var specialtyLabel = (slug) => `swarm:${slug}`;
 
+// server/deskSetup.ts
+async function setUpDesk(term, steps) {
+  await term?.releaseIdle?.();
+  await steps.release();
+  return steps.prepare();
+}
+
 // server/fixOutcome.ts
 var MAX_FIX_FAILURES = 2;
 function fixOutcome(rec, head, minutes, counts = true) {
@@ -3663,21 +4287,12 @@ function fixOutcome(rec, head, minutes, counts = true) {
       pushed: false
     };
   }
-  if (rec.fixReason === "checks" || rec.fixReason === "conflict") {
+  if (rec.fixReason === "checks" || rec.fixReason === "conflict" && rec.passedSha) {
     return { set: { status: "passed", sessionFailures: 0, mergeNote: "waiting for fresh checks" }, log: { kind: "done", text: `\u2714 PR #${pr} fixed in ${minutes}m. Back in line to merge.` }, pushed: true };
   }
   return { set: { status: "queued", round: rec.round + 1, sessionFailures: 0 }, log: { kind: "done", text: `\u2714 Fix pushed for PR #${pr} in ${minutes}m. Back to QA.` }, pushed: true };
 }
 
-// server/httpError.ts
-var HttpError = class extends Error {
-  constructor(status, message) {
-    super(message);
-    this.status = status;
-  }
-  status;
-};
-
 // server/issueClaims.ts
 var RECENT_MERGE_MS = 6 * 60 * 6e4;
 function branchIssue(headRefName) {
@@ -3697,38 +4312,6 @@ function issueTaken(n, agents, pulls, now2) {
   });
 }
 
-// server/mergeGate.ts
-var MAX_MERGE_FIXES = 3;
-var CHECKS_ALERT_MS = 30 * 6e4;
-var MERGE_RETRY_MS = 10 * 6e4;
-function mergeStep(pr, rec, now2, opts) {
-  if (pr.isDraft) return { do: "wait", note: "a draft: waiting", set: {} };
-  if (!opts.detailed && (pr.mergeable === "UNKNOWN" || pr.mergeState === "UNKNOWN")) return { do: "details", set: {} };
-  const set = {};
-  if (rec.passedSha == null) set.passedSha = pr.headSha;
-  if (pr.headSha !== (set.passedSha ?? rec.passedSha)) return { do: "requeue", set };
-  const needsHuman = rec.mergeFixes >= MAX_MERGE_FIXES;
-  if (pr.mergeable === "CONFLICTING" || pr.mergeState === "DIRTY") {
-    return { do: "send-back", reason: "conflict", instructions: `It conflicts with ${opts.base}.`, needsHuman, set };
-  }
-  if (pr.checks === "failing") {
-    const instructions = pr.failedChecks.map((c) => `- ${c.name}${c.url ? `: ${c.url}` : ""}`).join("\n");
-    return { do: "send-back", reason: "checks", instructions, needsHuman, set };
-  }
-  if (pr.checks === "pending") {
-    const since = rec.pendingSince ?? now2;
-    if (rec.pendingSince == null) set.pendingSince = since;
-    const alert = now2 - since > CHECKS_ALERT_MS && !rec.alerted;
-    if (alert) set.alerted = true;
-    return { do: "wait", note: `waiting for checks: ${pr.pendingChecks.join(", ") || "running"}`, alert, set };
-  }
-  set.pendingSince = null;
-  if (pr.mergeable === "UNKNOWN") return { do: "wait", note: "GitHub is checking it can merge", set };
-  if (pr.mergeState === "BEHIND") return { do: "update-branch", set };
-  if (rec.mergeRetryAt && now2 < rec.mergeRetryAt) return { do: "wait", set };
-  return { do: "merge", set };
-}
-
 // server/qaOrphans.ts
 function orphanedQa(qa, agents, busy) {
   return qa.filter(
@@ -3736,6 +4319,39 @@ function orphanedQa(qa, agents, busy) {
   );
 }
 
+// server/qaPrompt.ts
+function qaInstructions(i) {
+  return { checks: checksLine(i), testStep: testStep(i.checks !== "none"), retest: retest(i) };
+}
+function checksLine(i) {
+  const names = (list) => list.join(", ") || "unnamed";
+  const state = i.checks === "passing" ? `passing (${names(i.checkNames)})` : i.checks === "failing" ? `failing: ${names(i.failedChecks)}${i.pendingChecks.length ? `; still running: ${i.pendingChecks.join(", ")}` : ""}` : i.checks === "pending" ? `pending: ${names(i.pendingChecks)}` : "none";
+  return `GitHub checks right now: ${state}`;
+}
+function testStep(hasChecks) {
+  return hasChecks ? "3. GitHub's checks run on this PR, and it merges only once they're green. Read .github/workflows to see what they cover and don't re-run that locally. Run only what you need to exercise the change (for example a build to start the app), anything the checks don't cover, or a failing check to reproduce it. A failing check is a finding: name it." : "3. Install dependencies if needed, then run the project's test suite, linters, type checks and build (whichever exist).";
+}
+function retest(i) {
+  const since = i.lastTestedSha && i.lastTestedSha !== i.headSha ? i.lastTestedSha : null;
+  const diff = since ? `(git diff ${since}..HEAD), plus a quick smoke test of the main flow. Don't repeat the full test plan for parts the change didn't touch.` : null;
+  if (i.fixReason === "conflict") {
+    return `
+QA passed it before, but since then the branch was updated with ${i.defaultBranch} to resolve merge conflicts. Re-check everything, especially where this change meets the newly merged work.`;
+  }
+  if (i.fixReason === "checks") {
+    return `
+QA passed it before, but since then the developer changed the code to fix failing GitHub checks. ${diff ? `Test what changed since QA passed it ${diff}` : "Re-check everything."}`;
+  }
+  if (i.round > 1 && i.summary) {
+    return `
+This is a re-test after fixes. Last round's findings:
+${i.summary}
+${i.fixInstructions ?? ""}
+Check those first, then ${diff ? `test what changed since the last round ${diff}` : "re-check everything else."}`;
+  }
+  return "";
+}
+
 // server/restartRecovery.ts
 function followKeptCli(a, cli) {
   if (!cli?.busy || a.status === "preparing") return false;
@@ -3865,9 +4481,9 @@ var Previews = class {
     r.handle = this.backend.previews.start(
       { fullName: f.fullName, defaultBranch: f.defaultBranch, pr: pr ?? null, port, command: f.preview.command, env: { ...f.preview.env }, title: `${title} \xB7 ${ref}` },
       {
-        status: (s) => {
+        status: (s2) => {
           if (!live()) return;
-          r.status = s;
+          r.status = s2;
           this.hooks.emit(f.id);
         },
         commit: (sha) => {
@@ -3969,7 +4585,7 @@ var PLACEHOLDERS = {
 };
 var devBranch = (issue2, slug) => `swarm/issue-${issue2}-${slug}`;
 var qaBranch = (pr, slug) => `qa/pr-${pr}-${slug}`;
-function devSystemPrompt({ agent: a, repo, port, cwd, branch, linked, fixing }) {
+function devSystemPrompt({ agent: a, repo, port, cwd, branch, linked, fixing, depsLine }) {
   const push = fixing ? `git push origin HEAD:${fixing.headRef}` : `git push -u origin ${branch}`;
   const links = linked.map((r) => `- ${r.fullName}: read-only reference clone at ${r.dir}`);
   return [
@@ -3983,6 +4599,7 @@ ${a.brief}` : "",
     repo.summary ? `Project: ${repo.summary}` : "",
     repo.mission ? `What the team is building (the manager's brief): ${repo.mission}` : "",
     `Your worktree: ${cwd}`,
+    depsLine ?? "",
     fixing ? `You are fixing pull request #${fixing.pr}. Its code is checked out on local branch ${branch}; push fixes with: ${push}. Do not open a new pull request.` : `Your branch: ${branch} (already checked out, created from origin/${repo.defaultBranch})`,
     links.length ? `Related repositories you may read for context (do not modify them):
 ${links.join("\n")}` : "",
@@ -3999,7 +4616,7 @@ ${links.join("\n")}` : "",
     "Rules: never push to the default branch, never force-push, never merge pull requests yourself (the office merges them once QA and the checks pass), and never edit files outside your worktree. If you cannot finish, open a draft PR (gh pr create --draft) explaining what is left and why."
   ].filter((l) => l !== "").join("\n");
 }
-function qaSystemPrompt({ agent: a, repo, port, cwd, branch, pr }) {
+function qaSystemPrompt({ agent: a, repo, port, cwd, branch, pr, depsLine, testStep: testStep2 }) {
   return [
     `You are ${a.name}, ${a.title ? `the team's ${a.title},` : "a QA engineer"} on an autonomous agent team ("cubefarm"). Developers open pull requests; you review and independently verify each one before it is merged. Your sign-off is the review: ${repo.autoMerge ? "on this floor a PR you pass merges by itself as soon as GitHub's checks are green, so nobody else reads the code after you. " : ""}Be thorough and skeptical, but fair: fail a PR only for real problems (broken behaviour, failing tests or build, the issue's requirements not met, obvious regressions), not for style preferences.`,
     ...a.brief ? ["", `Your job description:
@@ -4013,13 +4630,15 @@ ${a.brief}`] : [],
 ${repo.qaBrief}`] : [],
     `Pull request #${pr.number} "${pr.title}" from branch ${pr.headRefName}: ${pr.url}`,
     `Your worktree: ${cwd}. It has the pull request's code checked out on local branch ${branch}.`,
+    ...depsLine ? [depsLine] : [],
     "",
     "How to test:",
     "1. Read the PR description and the linked issue, and work out the acceptance criteria.",
     `2. Review the code as a careful reviewer would: git diff origin/${repo.defaultBranch}...HEAD. Look for bugs, unhandled errors and edge cases, security problems, leftover debug code, and new logic without tests.`,
-    "3. Install dependencies if needed, then run the project's test suite, linters, type checks and build (whichever exist).",
+    testStep2 ?? "3. Install dependencies if needed, then run the project's test suite, linters, type checks and build (whichever exist).",
     repo.browserTesting ? `4. If the project has a UI, start it in the background on port ${port} (reserved for you) and exercise the change in a real browser with the Playwright tools: navigate, click, type, resize to a phone size, try edge cases, and check the console for errors. Take a screenshot with browser_take_screenshot (no filename) of every important state: the screenshots are attached to the PR as evidence. Stop the server afterwards.` : "4. Exercise the changed behaviour directly (run the program, call the API, write a quick script).",
     "5. You may write throwaway scripts to probe behaviour, but do not commit them.",
+    "A merge conflict with the default branch is not a fail: judge the change itself (on a throwaway merge if you need newer work) and pass it if it's good. The office sends conflicting PRs back for a merge fix, then you re-test.",
     "",
     "Rules: do not modify the code under test, do not commit, push, comment on, review or merge anything on GitHub. The office posts your report on the pull request. Finish with the structured QA report: verdict, summary, the checks you performed, the commands you ran and one caption per screenshot."
   ].join("\n");
@@ -4085,8 +4704,8 @@ function pacingMessage(w, until, sessions, now2) {
 }
 
 // server/terminal.ts
-import fs10 from "node:fs/promises";
-import path12 from "node:path";
+import fs12 from "node:fs/promises";
+import path14 from "node:path";
 import xtermHeadless from "@xterm/headless";
 import xtermSerialize from "@xterm/addon-serialize";
 var { Terminal } = xtermHeadless;
@@ -4105,7 +4724,10 @@ var AgentTerminal = class {
   rows = TERM_ROWS;
   /** Output arrived since the last save. */
   dirty = false;
-  /** Closes a CLI left waiting at its prompt after its task (set by the runtime that left it there). */
+  /**
+   * Closes a CLI left waiting at its prompt after its task, settling once it has exited (set by the runtime that left
+   * it there; null while a CLI drives a session).
+   */
   releaseIdle = null;
   /** Something the manager typed at that waiting prompt: the office takes it on as a follow-up (true) or refuses. */
   onIdlePrompt = null;
@@ -4180,12 +4802,12 @@ var AgentTerminal = class {
   async save(file) {
     this.dirty = false;
     await this.flush();
-    await fs10.mkdir(path12.dirname(file), { recursive: true });
-    await fs10.writeFile(`${file}.tmp`, this.snapshot());
-    await fs10.rename(`${file}.tmp`, file);
+    await fs12.mkdir(path14.dirname(file), { recursive: true });
+    await fs12.writeFile(`${file}.tmp`, this.snapshot());
+    await fs12.rename(`${file}.tmp`, file);
   }
   async load(file) {
-    const data = await fs10.readFile(file, "utf8").catch(() => "");
+    const data = await fs12.readFile(file, "utf8").catch(() => "");
     if (!data) return;
     this.term.write(data);
     this.note("(the office restarted)");
@@ -4277,6 +4899,7 @@ function effectiveModel(own, cli, office, claudeDefault) {
 
 // shared/types.ts
 var CEO_ID = "ceo";
+var INSTALL_STEP = "Installing dependencies";
 
 // server/swarm.ts
 var FLOOR_COLORS = ["#ff8a5b", "#4fb3e8", "#8fd14f", "#c77dff", "#ffc93c", "#ff6fb5", "#2ec4b6", "#f25f5c"];
@@ -4316,33 +4939,32 @@ var FEMININE_NAMES = new Set(
 var lookFor = (name) => FEMININE_NAMES.has(name.trim().split(/\s+/)[0].toLowerCase()) ? "feminine" : "masculine";
 var LOOKS = ["feminine", "masculine"];
 var MAX_DESKS = { ...FLOOR_DESKS, ceo: 1 };
-var MAX_QA_ROUNDS = 3;
 var DEFAULT_MODEL = "claude-opus-5-5";
 var EFFORTS = ["low", "medium", "high", "xhigh", "max"];
 var CEO_MODEL = "claude-opus-5-5";
 var CEO_EFFORT = "xhigh";
 var CEO_NAME = "Morgan";
-var CEO_DIR = path13.join(HOME_DIR, "ceo");
-var DEFAULT_PROJECTS_DIR = defaultProjectsDir(path13.resolve(import.meta.dirname, ".."));
+var CEO_DIR = path15.join(HOME_DIR, "ceo");
+var DEFAULT_PROJECTS_DIR = defaultProjectsDir(path15.resolve(import.meta.dirname, ".."));
 var MAX_ISSUES_PER_JOB = 12;
 var KEEP_MESSAGES = 200;
 var KEEP_DECIDED_REQUESTS = 40;
 var pick = (arr) => arr[Math.floor(Math.random() * arr.length)];
-var slugify = (s) => s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 40) || "agent";
+var slugify = (s2) => s2.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 40) || "agent";
 var BUSY = ["preparing", "working"];
 var FREE = ["idle", "done"];
 var ERROR_COOLDOWN_MS = 2 * 6e4;
 var MAX_ISSUE_FAILURES = 2;
 var LIMIT_PAUSE_MS = 15 * 6e4;
 var oneLine = (err) => (err instanceof Error ? err.message : String(err)).split(/\r?\n/)[0].slice(0, 200);
-var SCREENS_DIR = path13.join(HOME_DIR, "screens");
+var SCREENS_DIR = path15.join(HOME_DIR, "screens");
 var MIME_EXT = { "image/png": "png", "image/jpeg": "jpg", "image/webp": "webp", "image/svg+xml": "svg" };
-var screenFile = (agentId, mime) => path13.join(SCREENS_DIR, `${agentId}.${MIME_EXT[mime] ?? "img"}`);
+var screenFile = (agentId, mime) => path15.join(SCREENS_DIR, `${agentId}.${MIME_EXT[mime] ?? "img"}`);
 async function loadScreen(agentId) {
   for (const [mime, ext] of Object.entries(MIME_EXT)) {
-    const file = path13.join(SCREENS_DIR, `${agentId}.${ext}`);
+    const file = path15.join(SCREENS_DIR, `${agentId}.${ext}`);
     try {
-      const [data, stat] = await Promise.all([fs11.readFile(file), fs11.stat(file)]);
+      const [data, stat] = await Promise.all([fs13.readFile(file), fs13.stat(file)]);
       return { data, mime, at: stat.mtimeMs };
     } catch {
     }
@@ -4350,10 +4972,10 @@ async function loadScreen(agentId) {
   return null;
 }
 async function removeScreens(agentId) {
-  await Promise.all(Object.values(MIME_EXT).map((ext) => fs11.rm(path13.join(SCREENS_DIR, `${agentId}.${ext}`), { force: true })));
+  await Promise.all(Object.values(MIME_EXT).map((ext) => fs13.rm(path15.join(SCREENS_DIR, `${agentId}.${ext}`), { force: true })));
 }
-var TERMINALS_DIR = path13.join(HOME_DIR, "terminals");
-var terminalFile = (agentId) => path13.join(TERMINALS_DIR, `${agentId}.ansi`);
+var TERMINALS_DIR = path15.join(HOME_DIR, "terminals");
+var terminalFile = (agentId) => path15.join(TERMINALS_DIR, `${agentId}.ansi`);
 var TERMINAL_SAVE_MS = 2e4;
 var QA_SCHEMA = {
   type: "object",
@@ -4419,12 +5041,20 @@ function parseReport(result) {
     fixInstructions: r.fixInstructions ? String(r.fixInstructions) : void 0
   };
 }
-var cell = (s) => s.replace(/\|/g, "\\|").replace(/\r?\n/g, "<br>");
+var cell = (s2) => s2.replace(/\|/g, "\\|").replace(/\r?\n/g, "<br>");
 var ICON = { pass: "\u2705", fail: "\u274C", skip: "\u23ED\uFE0F" };
 var Swarm = class {
-  // coding-agent CLIs found on this machine (detected at startup)
   constructor(backend) {
     this.backend = backend;
+    this.voice = new Voice({
+      api: backend.voice,
+      secretsFile: path15.join(HOME_DIR, backend.demo ? "demo-secrets.json" : "secrets.json"),
+      cacheDir: path15.join(HOME_DIR, backend.demo ? "demo-voice" : "voice"),
+      settings: () => this.state.settings.voice,
+      message: (id) => this.state.messages.find((m) => m.id === id),
+      officeNote: (text) => this.postMessage("office", text),
+      keyChanged: (view2) => this.broadcast({ type: "voiceKey", ...view2 })
+    });
     this.previews = new Previews(backend, {
       emit: (id) => {
         const r = this.state.repos.find((x) => x.id === id);
@@ -4450,7 +5080,8 @@ var Swarm = class {
       setupDone: false,
       tutorialStep: 0,
       autoUpdate: true,
-      pacingSessions: DEFAULT_PACING_SESSIONS
+      pacingSessions: DEFAULT_PACING_SESSIONS,
+      voice: { ...DEFAULT_VOICE }
     },
     repos: [],
     agents: [],
@@ -4481,6 +5112,8 @@ var Swarm = class {
   messageSeq = 1;
   agentRt = /* @__PURE__ */ new Map();
   repoRt = /* @__PURE__ */ new Map();
+  deskAlerts = /* @__PURE__ */ new Map();
+  // agent id -> the desk setup error the manager was last told about
   clients = /* @__PURE__ */ new Set();
   user = null;
   ghError;
@@ -4504,10 +5137,13 @@ var Swarm = class {
   };
   lastOfficeView = "";
   clis = [];
+  // coding-agent CLIs found on this machine (detected at startup)
+  /** Phone messages read aloud. The demo keeps its own key and clips, so it never touches the real ones. */
+  voice;
   // ---------- lifecycle ----------
   async init() {
     try {
-      const raw = await fs11.readFile(STATE_FILE, "utf8");
+      const raw = await fs13.readFile(STATE_FILE, "utf8");
       const loaded = JSON.parse(raw);
       this.state = {
         settings: { ...this.state.settings, ...loaded.settings },
@@ -4562,11 +5198,13 @@ var Swarm = class {
         delete old.maxConcurrent;
       }
       delete old.permissionMode;
+      this.state.settings.voice = voiceSettings(DEFAULT_VOICE, loaded.settings?.voice);
       if (loaded.settings && loaded.settings.setupDone === void 0 && this.state.repos.length > 0) {
         Object.assign(this.state.settings, { setupDone: true, tutorialStep: -1 });
       }
     } catch {
     }
+    await this.voice.init();
     for (const r of this.state.repos) if (r.localPath) this.backend.setLocalPath(r.fullName, r.localPath);
     const interrupted = [];
     for (const a of this.state.agents) {
@@ -4762,12 +5400,15 @@ var Swarm = class {
       phoneReadAt: this.state.phoneReadAt,
       usage: this.usageNow(),
       clis: this.clis,
+      ...this.voice.keyView(),
       officeCommit: this.officeHead?.slice(0, 7) ?? null,
       officeUpdate: this.officeHead ? this.officeUpdateView() : void 0
     };
   }
+  /** The agent's latest screenshot: null when it has none right now, undefined for an unknown agent. */
   screenshot(agentId) {
-    return this.agentRt.get(agentId)?.screenshot ?? null;
+    const rt = this.agentRt.get(agentId);
+    return rt ? rt.screenshot : void 0;
   }
   // ---------- clients ----------
   addClient(ws) {
@@ -4829,10 +5470,10 @@ var Swarm = class {
     if (this.saveTimer) clearTimeout(this.saveTimer);
     this.saveTimer = null;
     for (const a of this.state.agents) a.logTail = (this.agentRt.get(a.id)?.log ?? []).slice(-200);
-    await fs11.mkdir(path13.dirname(STATE_FILE), { recursive: true });
+    await fs13.mkdir(path15.dirname(STATE_FILE), { recursive: true });
     const tmp = `${STATE_FILE}.tmp`;
-    await fs11.writeFile(tmp, JSON.stringify(this.state, null, 2));
-    await fs11.rename(tmp, STATE_FILE);
+    await fs13.writeFile(tmp, JSON.stringify(this.state, null, 2));
+    await fs13.rename(tmp, STATE_FILE);
   }
   // ---------- lookups ----------
   repo(id) {
@@ -4914,7 +5555,7 @@ var Swarm = class {
     const name = fullName.split("/")[1];
     const taken = folders.find((f) => f.name.toLowerCase() === name.toLowerCase());
     if (taken) throw new HttpError(409, `${taken.path} already exists and isn't a clone of ${fullName}. Connect that folder instead, or rename it first.`);
-    return path13.join(root, name);
+    return path15.join(root, name);
   }
   /** A brand-new project: a folder in your projects folder, pushed to a new GitHub repo. */
   async createRepo(name, opts) {
@@ -4926,11 +5567,11 @@ var Swarm = class {
   }
   /** The folders in your projects folder (or another folder you point at), and which are floors already. */
   async listProjectFolders(dir) {
-    const root = dir?.trim() ? path13.resolve(dir.trim()) : this.state.settings.projectsDir;
+    const root = dir?.trim() ? path15.resolve(dir.trim()) : this.state.settings.projectsDir;
     const folders = await this.backend.scanProjects(root).catch((err) => {
       throw new HttpError(400, err.message);
     });
-    const same = (a, b) => path13.resolve(a).toLowerCase() === path13.resolve(b).toLowerCase();
+    const same = (a, b) => path15.resolve(a).toLowerCase() === path15.resolve(b).toLowerCase();
     const floorOf = (f) => this.state.repos.find((r) => r.localPath && same(r.localPath, f.path) || f.github && r.id.toLowerCase() === f.github.toLowerCase())?.floor ?? null;
     return { root, folders: folders.map((f) => ({ name: f.name, path: f.path, git: f.git, github: f.github, floor: floorOf(f) })) };
   }
@@ -5108,13 +5749,13 @@ var Swarm = class {
     return false;
   }
   /** QA passed, but the PR can't merge as it is: a developer fixes it, and QA re-tests if the code changed. */
-  sendBack(repo, rec, reason, fixInstructions, needsHuman) {
+  sendBack(repo, rec, reason2, fixInstructions, needsHuman) {
     if (needsHuman) {
       this.setQa(rec, { status: "needs-human", mergeNote: null });
-      this.postMessage("office", `\u26A0\uFE0F PR #${rec.prNumber} on ${repo.fullName} still ${reason === "conflict" ? `conflicts with ${repo.defaultBranch}` : "fails its checks"} after ${MAX_MERGE_FIXES} fixes, so it needs you.`);
+      this.postMessage("office", `\u26A0\uFE0F PR #${rec.prNumber} on ${repo.fullName} still ${reason2 === "conflict" ? `conflicts with ${repo.defaultBranch}` : "fails its checks"} after ${MAX_MERGE_FIXES} fixes, so it needs you.`);
       return false;
     }
-    this.setQa(rec, { status: "failed", fixReason: reason, fixInstructions, mergeFixes: rec.mergeFixes + 1, mergeNote: null, pendingSince: null });
+    this.setQa(rec, { status: "failed", fixReason: reason2, fixInstructions, mergeFixes: rec.mergeFixes + 1, mergeNote: null, pendingSince: null });
     setTimeout(() => this.schedule(), 200);
     return false;
   }
@@ -5131,7 +5772,7 @@ var Swarm = class {
     rt.folderSync = status;
     this.emitRepo(repo);
     if (status && status !== before) {
-      const name = repo.localPath ? path13.basename(repo.localPath) : repo.fullName;
+      const name = repo.localPath ? path15.basename(repo.localPath) : repo.fullName;
       if (status.startsWith("updated")) this.toast("success", `\u{1F4C1} ${name}: ${status}`);
       else if (/behind|diverged|failed/.test(status)) this.toast("info", `\u{1F4C1} ${name} wasn't updated: ${status}`);
     }
@@ -5155,7 +5796,7 @@ var Swarm = class {
       };
       const r = await this.backend.sweepDesks(repo.fullName, keep);
       const desks = r.desks + r.folders;
-      const saved = r.patches.length ? ` (${r.patches.length} patch${r.patches.length === 1 ? "" : "es"} saved to ${path13.dirname(r.patches[0])})` : "";
+      const saved = r.patches.length ? ` (${r.patches.length} patch${r.patches.length === 1 ? "" : "es"} saved to ${path15.dirname(r.patches[0])})` : "";
       console.log(`desk sweep ${repo.fullName}: ${desks} desks, ${r.branches} branches removed${saved}${r.skipped.length ? `, ${r.skipped.length} still in use` : ""}`);
       if (!desks && !r.branches) return;
       const removed = [desks && `${desks} old desk${desks === 1 ? "" : "s"}`, r.branches && `${r.branches} finished branch${r.branches === 1 ? "" : "es"}`].filter(Boolean).join(" and ");
@@ -5259,11 +5900,11 @@ var Swarm = class {
     }
     this.save();
   }
-  async createIssue(repoId2, title, body, assignTo, specialty) {
+  async createIssue(repoId2, title, body2, assignTo, specialty) {
     const repo = this.repo(repoId2);
     if (!title.trim()) throw new HttpError(400, "An issue needs a title");
     const slug = specialtySlug(specialty);
-    const number = await this.backend.createIssue(repo.fullName, title.trim(), body, slug ? [specialtyLabel(slug)] : []);
+    const number = await this.backend.createIssue(repo.fullName, title.trim(), body2, slug ? [specialtyLabel(slug)] : []);
     await this.syncRepo(repo.id);
     this.toast("success", `Issue #${number} filed on ${repo.fullName}`);
     if (assignTo) await this.assign(assignTo, number);
@@ -5296,7 +5937,7 @@ var Swarm = class {
     }
     const name = opts.name?.trim() || this.freeName(role);
     const agent = {
-      id: crypto6.randomUUID(),
+      id: crypto7.randomUUID(),
       name,
       repoId: repo.id,
       role,
@@ -5383,7 +6024,7 @@ var Swarm = class {
     this.agentRt.get(id)?.terminal?.releaseIdle?.();
     this.agentRt.get(id)?.terminal?.dispose();
     void removeScreens(id);
-    void fs11.rm(terminalFile(id), { force: true }).catch(() => void 0);
+    void fs13.rm(terminalFile(id), { force: true }).catch(() => void 0);
     for (const q of this.state.qa) {
       if (q.qaAgentId === id && q.status === "testing") this.setQa(q, { status: "queued", qaAgentId: null });
       if (q.devAgentId === id) q.devAgentId = null;
@@ -5490,7 +6131,7 @@ var Swarm = class {
   }
   // ---------- terminals ----------
   async loadTerminal(agentId) {
-    if (!await fs11.stat(terminalFile(agentId)).catch(() => null)) return null;
+    if (!await fs13.stat(terminalFile(agentId)).catch(() => null)) return null;
     const t = this.newTerminal(agentId);
     await t.load(terminalFile(agentId));
     return t;
@@ -5520,8 +6161,8 @@ var Swarm = class {
     if (!t) return ws.close(4404, "That agent has no terminal");
     t.attach(ws);
   }
-  buildSystemAppend(a, repo, cwd, branch, fixing) {
-    return devSystemPrompt({ agent: a, repo, port: this.port(a), cwd, branch, linked: this.linkedDirs(repo), fixing });
+  buildSystemAppend(a, repo, cwd, branch, fixing, deps) {
+    return devSystemPrompt({ agent: a, repo, port: this.port(a), cwd, branch, linked: this.linkedDirs(repo), fixing, depsLine: depsPromptLine(deps) });
   }
   linkedDirs(repo) {
     return this.linkedRepos(repo).map((r) => ({ fullName: r.fullName, dir: this.backend.mainDir(r.fullName) }));
@@ -5560,20 +6201,50 @@ var Swarm = class {
   async prepare(a, repo, base, branch) {
     try {
       if (this.repoRt.get(repo.id)?.cloneStatus !== "ready") await this.cloneRepo(repo.id);
-      await this.backend.releaseDesk(repo.fullName, this.agentSlug(a), this.port(a));
-      const cwd = await this.backend.prepareDesk(repo.fullName, { defaultBranch: repo.defaultBranch, pr: base.pr }, this.agentSlug(a), branch);
-      return a.status === "preparing" ? cwd : null;
+      const slug = this.agentSlug(a);
+      const note = (text) => this.appendLog(a, [{ kind: "system", text }]);
+      const cwd = await setUpDesk(this.agentRt.get(a.id)?.terminal, {
+        release: () => this.backend.releaseDesk(repo.fullName, slug, this.port(a)),
+        prepare: () => this.backend.prepareDesk(repo.fullName, { defaultBranch: repo.defaultBranch, pr: base.pr }, slug, branch, note)
+      });
+      this.deskAlerts.delete(a.id);
+      if (a.status !== "preparing") return null;
+      const deps = await this.installDeps(a, cwd);
+      return a.status === "preparing" ? { cwd, deps } : null;
     } catch (err) {
       if (a.status !== "preparing") return null;
       a.status = "error";
       a.endedAt = Date.now();
       a.lastError = err.message;
       this.appendLog(a, [{ kind: "error", text: `\u2717 ${a.lastError}` }]);
+      if (this.deskAlerts.get(a.id) !== a.lastError) {
+        this.deskAlerts.set(a.id, a.lastError);
+        this.postMessage("office", `\u26A0\uFE0F ${a.name}'s desk couldn't be set up: ${a.lastError.slice(0, 240)}`);
+      }
       this.emitAgent(a);
       this.save();
       return null;
     }
   }
+  /** The desk's dependencies, shown on the agent's card ("Installing dependencies") while npm runs. */
+  async installDeps(a, cwd) {
+    const rt = this.agentRt.get(a.id);
+    try {
+      return await this.backend.installDeps(cwd, {
+        log: (lines) => this.appendLog(a, lines.map((text) => ({ kind: text.startsWith("\u26A0") ? "error" : "system", text }))),
+        installing: () => {
+          if (!rt) return;
+          rt.currentTool = INSTALL_STEP;
+          this.emitAgent(a);
+        }
+      });
+    } finally {
+      if (rt?.currentTool === INSTALL_STEP) {
+        rt.currentTool = null;
+        this.emitAgent(a);
+      }
+    }
+  }
   async runTask(a, repo, issue2, note) {
     const branch = devBranch(issue2.number, slugify(a.name));
     this.beginTask(
@@ -5582,8 +6253,9 @@ var Swarm = class {
       `Issue #${issue2.number}: ${issue2.title}`,
       `Preparing worktree on ${branch}\u2026`
     );
-    const cwd = await this.prepare(a, repo, {}, branch);
-    if (!cwd) return;
+    const desk = await this.prepare(a, repo, {}, branch);
+    if (!desk) return;
+    const { cwd } = desk;
     const prompt = [
       `Please resolve GitHub issue #${issue2.number}: ${issue2.title}`,
       `URL: ${issue2.url}`,
@@ -5593,7 +6265,7 @@ var Swarm = class {
       note ? `
 Note from the manager: ${note}` : ""
     ].filter(Boolean).join("\n");
-    this.startAgentSession(a, repo, cwd, prompt, this.buildSystemAppend(a, repo, cwd, branch));
+    this.startAgentSession(a, repo, cwd, prompt, this.buildSystemAppend(a, repo, cwd, branch, void 0, desk.deps));
   }
   startAgentSession(a, repo, cwd, prompt, systemAppend, resumeSessionId, outputSchema, mode = null) {
     const rt = this.agentRt.get(a.id);
@@ -5640,7 +6312,7 @@ Note from the manager: ${note}` : ""
           rt.shots.push({ data, mime, url: rt.browserUrl, at });
           if (rt.shots.length > 12) rt.shots.shift();
           this.broadcast({ type: "screen", agentId: a.id, url: rt.browserUrl, at });
-          void removeScreens(a.id).then(() => fs11.mkdir(SCREENS_DIR, { recursive: true })).then(() => fs11.writeFile(screenFile(a.id, mime), data)).catch((err) => console.warn("could not save screenshot", err));
+          void removeScreens(a.id).then(() => fs13.mkdir(SCREENS_DIR, { recursive: true })).then(() => fs13.writeFile(screenFile(a.id, mime), data)).catch((err) => console.warn("could not save screenshot", err));
         },
         limited: (at) => this.pauseForLimit(at),
         usageWarning: (info) => this.paceForWarning(info),
@@ -5776,8 +6448,22 @@ Note from the manager: ${note}` : ""
     this.queueQa(repo, prNumber, dev ?? null, pr.closesIssues[0] ?? null);
     this.toast("info", `PR #${prNumber} is queued for QA`);
   }
-  buildQaSystemAppend(a, repo, cwd, branch, pr) {
-    return qaSystemPrompt({ agent: a, repo, port: this.port(a), cwd, branch, pr });
+  /** Manager's "send back to dev" for a PR that needs a human or failed QA: a developer fixes it, with the note. */
+  async sendBackToDev(repoId2, prNumber, note) {
+    const repo = this.repo(repoId2);
+    const find = () => this.state.qa.find((q) => q.repoId === repo.id && q.prNumber === prNumber);
+    const listed = this.repoRt.get(repo.id)?.pulls.find((p) => p.number === prNumber);
+    sendBackPatch(prNumber, listed, find(), repo.defaultBranch, note);
+    const details = await this.backend.prDetails(repo.fullName, prNumber).catch(() => null);
+    const pr = details && listed ? { ...listed, state: details.state, mergeable: details.mergeable, mergeState: details.mergeState } : listed;
+    const rec = find();
+    const patch = sendBackPatch(prNumber, pr, rec, repo.defaultBranch, note);
+    this.setQa(rec, patch);
+    setTimeout(() => this.schedule(), 200);
+    this.toast("info", `PR #${prNumber} goes back to a developer${patch.fixReason === "conflict" ? " to resolve its conflicts" : ""}`);
+  }
+  buildQaSystemAppend(a, repo, cwd, branch, pr, testStep2, deps) {
+    return qaSystemPrompt({ agent: a, repo, port: this.port(a), cwd, branch, pr, testStep: testStep2, depsLine: depsPromptLine(deps) });
   }
   async runQa(a, repo, rec) {
     const branch = qaBranch(rec.prNumber, slugify(a.name));
@@ -5790,6 +6476,7 @@ Note from the manager: ${note}` : ""
     );
     let pr;
     let issue2 = null;
+    const lastTestedSha = rec.testedSha;
     try {
       pr = await this.backend.prDetails(repo.fullName, rec.prNumber);
       const issueNumber = rec.issueNumber ?? pr.closesIssues[0] ?? null;
@@ -5813,22 +6500,29 @@ Note from the manager: ${note}` : ""
       this.clearTask(a);
       return;
     }
-    const cwd = await this.prepare(a, repo, { pr: rec.prNumber }, branch);
-    if (!cwd) {
+    const desk = await this.prepare(a, repo, { pr: rec.prNumber }, branch);
+    if (!desk) {
       if (this.state.qa.includes(rec) && rec.status === "testing") this.setQa(rec, { status: "queued", qaAgentId: null });
       return;
     }
+    const { cwd } = desk;
     const dev = rec.devAgentId ? this.state.agents.find((x) => x.id === rec.devAgentId) : null;
+    const failedConflict = rec.fixReason === "conflict" && !rec.passedSha;
+    const qa = qaInstructions({
+      ...pr,
+      round: rec.round,
+      fixReason: failedConflict ? "qa" : rec.fixReason,
+      lastTestedSha: failedConflict ? null : lastTestedSha,
+      summary: rec.summary,
+      fixInstructions: rec.fixInstructions,
+      defaultBranch: repo.defaultBranch
+    });
     const prompt = [
       `Please QA pull request #${pr.number}: ${pr.title}`,
       `URL: ${pr.url}`,
       `Author: ${dev ? `${dev.name} (developer agent)` : "a teammate"} \xB7 QA round ${rec.round}`,
-      rec.fixReason === "conflict" ? `
-QA passed it before, but since then the branch was updated with ${repo.defaultBranch} to resolve merge conflicts. Re-check everything, especially where this change meets the newly merged work.` : rec.fixReason === "checks" ? "\nQA passed it before, but since then the developer changed the code to fix failing GitHub checks. Re-check everything." : rec.round > 1 && rec.summary ? `
-This is a re-test after fixes. Last round's findings:
-${rec.summary}
-${rec.fixInstructions ?? ""}
-Check those first, then re-check everything else.` : "",
+      qa.checks,
+      qa.retest,
       "",
       "PR description:",
       pr.body.trim() || "(empty)",
@@ -5836,7 +6530,7 @@ Check those first, then re-check everything else.` : "",
 Linked issue: ${issue2.title}
 ${issue2.body.trim() || "(no description)"}` : ""
     ].filter((l) => l !== "").join("\n");
-    this.startAgentSession(a, repo, cwd, prompt, this.buildQaSystemAppend(a, repo, cwd, branch, pr), void 0, QA_SCHEMA);
+    this.startAgentSession(a, repo, cwd, prompt, this.buildQaSystemAppend(a, repo, cwd, branch, pr, qa.testStep, desk.deps), void 0, QA_SCHEMA);
   }
   async onQaFinished(a, repo, result) {
     const rec = this.state.qa.find((q) => q.repoId === repo.id && q.prNumber === a.prNumber);
@@ -5860,22 +6554,25 @@ ${issue2.body.trim() || "(no description)"}` : ""
     this.appendLog(a, [{ kind: pass ? "done" : "error", text: `${pass ? "\u2705 QA passed" : "\u274C QA failed"} PR #${a.prNumber} \xB7 ${report.checks.length} checks \xB7 ${rt.shots.length} screenshots` }]);
     let commentUrl = null;
     if (rec) {
+      const pull = !pass && lastQaRound(rec) ? await this.backend.prDetails(repo.fullName, rec.prNumber).catch(() => null) : null;
+      const next = qaOutcome(pass, rec, pull);
       try {
         this.appendLog(a, [{ kind: "system", text: "\u{1F4CE} Uploading evidence and posting the QA report on the PR\u2026" }]);
-        const body = await this.renderQaComment(a, repo, rec, report, rt.shots);
-        commentUrl = await this.backend.commentPull(repo.fullName, rec.prNumber, body) || null;
+        const body2 = await this.renderQaComment(a, repo, rec, report, rt.shots, next);
+        commentUrl = await this.backend.commentPull(repo.fullName, rec.prNumber, body2) || null;
         this.appendLog(a, [{ kind: "system", text: `  \u23BF ${commentUrl ?? "comment posted"}` }]);
       } catch (err) {
         this.appendLog(a, [{ kind: "error", text: `  \u23BF Could not post the QA report: ${err.message}` }]);
       }
       const qaRounds = rec.round - rec.retests;
-      const nextStatus = pass ? "passed" : qaRounds >= MAX_QA_ROUNDS ? "needs-human" : "failed";
+      const nextStatus = next === "conflict" ? "failed" : next;
+      const fixInstructions = report.fixInstructions ?? report.checks.filter((c) => c.result === "fail").map((c) => `${c.name}: ${c.details}`).join("\n");
       this.setQa(rec, {
         status: nextStatus,
         summary: report.summary,
         checks: report.checks,
         commentUrl: commentUrl ?? rec.commentUrl,
-        fixInstructions: report.fixInstructions ?? report.checks.filter((c) => c.result === "fail").map((c) => `${c.name}: ${c.details}`).join("\n"),
+        fixInstructions,
         sessionFailures: 0,
         fixReason: pass ? null : "qa",
         passedSha: pass ? rec.testedSha : null,
@@ -5884,13 +6581,14 @@ ${issue2.body.trim() || "(no description)"}` : ""
         mergeRetryAt: null,
         alerted: false
       });
+      if (next === "conflict") this.sendBack(repo, rec, "conflict", conflictFixInstructions(fixInstructions, repo.defaultBranch), false);
       this.toast(
         pass ? "success" : "error",
-        pass ? `\u2705 ${a.name} passed PR #${rec.prNumber}${repo.autoMerge ? "; it merges once GitHub's checks are green" : ": ready to merge"}` : nextStatus === "needs-human" ? `\u274C PR #${rec.prNumber} failed QA ${qaRounds} times and needs a human` : `\u274C ${a.name} failed PR #${rec.prNumber}; sending it back to the developer`
+        pass ? `\u2705 ${a.name} passed PR #${rec.prNumber}${repo.autoMerge ? "; it merges once GitHub's checks are green" : ": ready to merge"}` : nextStatus === "needs-human" ? `\u274C PR #${rec.prNumber} failed QA ${qaRounds} times and needs a human` : next === "conflict" ? `\u274C ${a.name} failed PR #${rec.prNumber}, and it conflicts with ${repo.defaultBranch}; sending it back to merge and fix` : `\u274C ${a.name} failed PR #${rec.prNumber}; sending it back to the developer`
       );
     }
   }
-  async renderQaComment(a, repo, rec, report, shots) {
+  async renderQaComment(a, repo, rec, report, shots, next) {
     const pass = report.verdict === "pass";
     const images = [];
     const evidence = shots.slice(-8);
@@ -5928,7 +6626,7 @@ ${issue2.body.trim() || "(no description)"}` : ""
     if (images.length) lines.push("", "### \u{1F4F8} Evidence", "", ...images.flatMap((img) => [img, ""]));
     else lines.push("", "_No browser screenshots were taken in this round._");
     const merge = repo.autoMerge ? "merges automatically once GitHub's checks pass" : "ready for the manager to merge";
-    lines.push("", `<sub>Posted by cubefarm \xB7 ${pass ? merge : rec.round - rec.retests >= MAX_QA_ROUNDS ? "needs a human decision" : "sent back to the developer for fixes"}</sub>`);
+    lines.push("", `<sub>Posted by cubefarm \xB7 ${pass ? merge : next === "needs-human" ? "needs a human decision" : next === "conflict" ? `sent back to the developer to merge ${repo.defaultBranch} and fix` : "sent back to the developer for fixes"}</sub>`);
     return lines.join("\n");
   }
   /** Send a failed PR back to the developer who wrote it (or any free developer on the floor). */
@@ -5945,16 +6643,20 @@ ${issue2.body.trim() || "(no description)"}` : ""
       rec.fixReason === "conflict" ? `Resolving conflicts on PR #${rec.prNumber}` : rec.fixReason === "checks" ? `Fixing checks on PR #${rec.prNumber}` : `Fixing PR #${rec.prNumber} after QA round ${rec.round}`,
       `Checking out PR #${rec.prNumber}\u2026`
     );
-    const cwd = await this.prepare(dev, repo, { pr: rec.prNumber }, headRef);
-    if (!cwd) {
+    const desk = await this.prepare(dev, repo, { pr: rec.prNumber }, headRef);
+    if (!desk) {
       if (rec.status === "fixing") this.setQa(rec, { status: "failed" });
       return;
     }
+    const { cwd } = desk;
     const failed2 = rec.checks.filter((c) => c.result === "fail");
     const takeover = original ? "" : " A teammate wrote it, so read the PR and the linked issue first.";
     const push = `push to the same branch: git push origin HEAD:${headRef}`;
-    const mergeFix = rec.fixReason === "conflict" ? [
+    const mergeFix = rec.fixReason === "conflict" && rec.passedSha ? [
       `QA passed pull request #${rec.prNumber} (${pull?.url ?? ""}), but it now conflicts with ${repo.defaultBranch} because other work was merged first.${takeover}`,
+      rec.fixInstructions ? `
+What needs fixing:
+${rec.fixInstructions}` : "",
       "",
       `Bring it up to date: git fetch origin && git merge origin/${repo.defaultBranch}. Resolve the conflicts so both this change and the newly merged work keep working, run the project's checks, and ${push}`
     ] : rec.fixReason === "checks" ? [
@@ -5984,7 +6686,7 @@ Full report with screenshots: ${rec.commentUrl}` : "",
     const mergeEnd = "Then reply with a short summary of what you did. Do not open a new pull request; the office merges it once the checks pass, after another QA round if the code changed.";
     const prompt = (mergeFix ? [...mergeFix, "", mergeEnd] : qaFix).filter((l) => l !== "").join("\n");
     const resume = original && rec.devSessionId ? rec.devSessionId : void 0;
-    this.startAgentSession(dev, repo, cwd, prompt, this.buildSystemAppend(dev, repo, cwd, headRef, { pr: rec.prNumber, headRef }), resume);
+    this.startAgentSession(dev, repo, cwd, prompt, this.buildSystemAppend(dev, repo, cwd, headRef, { pr: rec.prNumber, headRef }, desk.deps), resume);
   }
   async onFixFinished(a, repo, result) {
     const rec = this.state.qa.find((q) => q.repoId === repo.id && q.prNumber === a.prNumber);
@@ -6060,30 +6762,31 @@ Full report with screenshots: ${rec.commentUrl}` : "",
     this.startAgentSession(a, repo, cwd, text, this.buildSystemAppend(a, repo, cwd, a.branch, fixing), a.sessionId, void 0, typed ? "typed" : null);
   }
   updateSettings(patch) {
-    const s = this.state.settings;
-    if (patch.sessionLimit !== void 0) s.sessionLimit = Math.max(0, Math.round(Number(patch.sessionLimit)) || 0);
-    if (isCli(patch.defaultCli) && patch.defaultCli !== s.defaultCli) {
-      s.defaultCli = patch.defaultCli;
-      if (patch.defaultModel === void 0) s.defaultModel = s.defaultCli === "claude" ? DEFAULT_MODEL : "";
-    }
-    if (patch.defaultModel !== void 0) s.defaultModel = String(patch.defaultModel).trim() || (s.defaultCli === "claude" ? DEFAULT_MODEL : "");
-    if (patch.defaultEffort !== void 0 && EFFORTS.includes(patch.defaultEffort)) s.defaultEffort = patch.defaultEffort;
-    if (patch.runtime === "terminal" || patch.runtime === "sdk") s.runtime = patch.runtime;
-    if (patch.hiring === "approve" || patch.hiring === "auto") s.hiring = patch.hiring;
-    if (patch.teamCap !== void 0) s.teamCap = Math.max(1, Math.min(15, Math.round(Number(patch.teamCap)) || 1));
-    if (patch.ceoHeartbeatMin !== void 0) s.ceoHeartbeatMin = Math.max(0, Math.min(1440, Math.round(Number(patch.ceoHeartbeatMin)) || 0));
-    if (typeof patch.managerName === "string") s.managerName = patch.managerName.trim().slice(0, 40);
-    if (typeof patch.companyName === "string") s.companyName = patch.companyName.trim().slice(0, 60);
-    if (typeof patch.projectsDir === "string" && patch.projectsDir.trim()) s.projectsDir = path13.resolve(patch.projectsDir.trim());
-    if (typeof patch.setupDone === "boolean") s.setupDone = patch.setupDone;
-    if (patch.tutorialStep !== void 0) s.tutorialStep = Math.max(-1, Math.round(Number(patch.tutorialStep)) || 0);
-    if (typeof patch.autoUpdate === "boolean") s.autoUpdate = patch.autoUpdate;
-    if (patch.pacingSessions !== void 0) s.pacingSessions = clampPacingSessions(patch.pacingSessions);
+    const s2 = this.state.settings;
+    if (patch.sessionLimit !== void 0) s2.sessionLimit = Math.max(0, Math.round(Number(patch.sessionLimit)) || 0);
+    if (isCli(patch.defaultCli) && patch.defaultCli !== s2.defaultCli) {
+      s2.defaultCli = patch.defaultCli;
+      if (patch.defaultModel === void 0) s2.defaultModel = s2.defaultCli === "claude" ? DEFAULT_MODEL : "";
+    }
+    if (patch.defaultModel !== void 0) s2.defaultModel = String(patch.defaultModel).trim() || (s2.defaultCli === "claude" ? DEFAULT_MODEL : "");
+    if (patch.defaultEffort !== void 0 && EFFORTS.includes(patch.defaultEffort)) s2.defaultEffort = patch.defaultEffort;
+    if (patch.runtime === "terminal" || patch.runtime === "sdk") s2.runtime = patch.runtime;
+    if (patch.hiring === "approve" || patch.hiring === "auto") s2.hiring = patch.hiring;
+    if (patch.teamCap !== void 0) s2.teamCap = Math.max(1, Math.min(15, Math.round(Number(patch.teamCap)) || 1));
+    if (patch.ceoHeartbeatMin !== void 0) s2.ceoHeartbeatMin = Math.max(0, Math.min(1440, Math.round(Number(patch.ceoHeartbeatMin)) || 0));
+    if (typeof patch.managerName === "string") s2.managerName = patch.managerName.trim().slice(0, 40);
+    if (typeof patch.companyName === "string") s2.companyName = patch.companyName.trim().slice(0, 60);
+    if (typeof patch.projectsDir === "string" && patch.projectsDir.trim()) s2.projectsDir = path15.resolve(patch.projectsDir.trim());
+    if (typeof patch.setupDone === "boolean") s2.setupDone = patch.setupDone;
+    if (patch.tutorialStep !== void 0) s2.tutorialStep = Math.max(-1, Math.round(Number(patch.tutorialStep)) || 0);
+    if (typeof patch.autoUpdate === "boolean") s2.autoUpdate = patch.autoUpdate;
+    if (patch.pacingSessions !== void 0) s2.pacingSessions = clampPacingSessions(patch.pacingSessions);
+    if (patch.voice !== void 0) s2.voice = voiceSettings(s2.voice, patch.voice);
     this.save();
-    this.broadcast({ type: "settings", settings: s });
+    this.broadcast({ type: "settings", settings: s2 });
     this.emitCeo();
     setTimeout(() => this.schedule(), 200);
-    return s;
+    return s2;
   }
   /** The setup wizard: who you are, the company, and your CEO. */
   setup(x) {
@@ -6134,8 +6837,8 @@ Full report with screenshots: ${rec.commentUrl}` : "",
     const ready = this.readyIssues(repo).map((r) => r.want);
     const open = this.repoRt.get(repo.id).issues.map((i) => issueSpecialty(i.labels));
     const rank = (a) => {
-      const s = a.specialty.toLowerCase();
-      return [suits(a) ? 0 : 1, ready.filter((w) => w === s).length, open.filter((w) => w === s).length, a.desk];
+      const s2 = a.specialty.toLowerCase();
+      return [suits(a) ? 0 : 1, ready.filter((w) => w === s2).length, open.filter((w) => w === s2).length, a.desk];
     };
     return devs.map((a) => ({ a, r: rank(a) })).sort((x, y) => x.r[0] - y.r[0] || x.r[1] - y.r[1] || x.r[2] - y.r[2] || x.r[3] - y.r[3])[0].a;
   }
@@ -6503,8 +7206,8 @@ ${job.text}` } : job;
     void this.runCeoJob(a, job);
   }
   ceoPromptInput(a) {
-    const s = this.state.settings;
-    return { name: a.name, company: s.companyName, manager: s.managerName, notesFile: path13.join(CEO_DIR, "NOTES.md"), sessionLimit: s.sessionLimit, teamCap: s.teamCap, hiring: s.hiring };
+    const s2 = this.state.settings;
+    return { name: a.name, company: s2.companyName, manager: s2.managerName, notesFile: path15.join(CEO_DIR, "NOTES.md"), sessionLimit: s2.sessionLimit, teamCap: s2.teamCap, hiring: s2.hiring };
   }
   async runCeoJob(a, job) {
     const rt = this.agentRt.get(a.id);
@@ -6525,7 +7228,7 @@ ${job.text}` } : job;
     this.emitAgent(a);
     this.emitCeo();
     this.save();
-    await fs11.mkdir(CEO_DIR, { recursive: true }).catch(() => void 0);
+    await fs13.mkdir(CEO_DIR, { recursive: true }).catch(() => void 0);
     if (a.status !== "working") {
       this.state.ceo.job = null;
       this.emitCeo();
@@ -6639,7 +7342,7 @@ ${t}`);
       qa: this.state.qa.map((q) => [q.repoId, q.prNumber, q.status]),
       requests: this.state.requests.filter((r) => r.status === "pending").map((r) => r.id)
     };
-    return crypto6.createHash("sha1").update(JSON.stringify(data)).digest("hex");
+    return crypto7.createHash("sha1").update(JSON.stringify(data)).digest("hex");
   }
   maybeHeartbeat() {
     const min = this.state.settings.ceoHeartbeatMin;
@@ -6752,7 +7455,7 @@ ${t}`);
     return !BUSY.includes(a.status) ? null : a.task === "qa" ? `testing PR #${a.prNumber}` : a.task === "fix" ? `fixing PR #${a.prNumber}` : `issue #${a.issueNumber}`;
   }
   companyStatus() {
-    const s = this.state.settings;
+    const s2 = this.state.settings;
     const doing = (a) => this.agentDoing(a);
     const jobDescription = (brief) => {
       if (brief.length <= 400) return brief;
@@ -6829,9 +7532,9 @@ ${t}`);
       {
         company: {
           ceo: this.ceo().name,
-          hiring: s.hiring === "auto" ? `auto-approved while a floor has fewer than ${s.teamCap} people` : "the manager approves every proposal",
-          teamCap: s.teamCap,
-          sessionLimit: s.sessionLimit || "none",
+          hiring: s2.hiring === "auto" ? `auto-approved while a floor has fewer than ${s2.teamCap} people` : "the manager approves every proposal",
+          teamCap: s2.teamCap,
+          sessionLimit: s2.sessionLimit || "none",
           sessionsRunning: this.running(),
           usage: usageLabel(this.usageNow(), Date.now()),
           deskLimits: { dev: MAX_DESKS.dev, qa: MAX_DESKS.qa },
@@ -6905,7 +7608,7 @@ ${t}`);
     if (seated + waiting >= MAX_DESKS[role]) throw new Error(role === "qa" ? `The QA lab on floor ${repo.floor} is full.` : `Floor ${repo.floor} has no free desks.`);
     const name = this.freeName(role);
     const req = {
-      id: crypto6.randomUUID(),
+      id: crypto7.randomUUID(),
       kind: "hire",
       repoId: repo.id,
       role,
@@ -6928,8 +7631,8 @@ ${t}`);
       decidedBy: null
     };
     this.addRequest(req);
-    const s = this.state.settings;
-    if (s.hiring === "auto" && this.state.agents.filter((a) => a.repoId === repo.id).length < s.teamCap) {
+    const s2 = this.state.settings;
+    if (s2.hiring === "auto" && this.state.agents.filter((a) => a.repoId === repo.id).length < s2.teamCap) {
       this.approveRequest(req.id, {}, "auto");
       return `Hired ${req.name} as ${title} on floor ${repo.floor} (auto-approved; agent id ${req.agentId}).`;
     }
@@ -6947,7 +7650,7 @@ ${t}`);
     if (pending2.some((r) => r.kind === "let-go" && r.agentId === a.id)) throw new Error(`Letting ${a.name} go is already proposed.`);
     checkPendingLimit(pending2.length);
     const req = {
-      id: crypto6.randomUUID(),
+      id: crypto7.randomUUID(),
       kind: "let-go",
       repoId: repo.id,
       role: a.role,
@@ -6983,11 +7686,11 @@ ${t}`);
     const title = String(x.title ?? "").trim().slice(0, 120);
     if (!title) throw new Error("An issue needs a title.");
     const slug = specialtySlug(x.specialty);
-    const body = `${String(x.body ?? "").trim()}
+    const body2 = `${String(x.body ?? "").trim()}
 
 ---
 _Filed by ${this.ceo().name}, the cubefarm CEO._`;
-    const n = await this.backend.createIssue(repo.fullName, title, body, slug ? [specialtyLabel(slug)] : []);
+    const n = await this.backend.createIssue(repo.fullName, title, body2, slug ? [specialtyLabel(slug)] : []);
     this.ceoIssues.record(repo.id);
     return `Filed #${n} on floor ${repo.floor}: ${title}${slug ? ` (routed to ${slug})` : ""}.`;
   }
@@ -7108,6 +7811,7 @@ app.delete("/api/repos/:repo/preview", route((req) => swarm.stopPreview(repoId(r
 app.post("/api/repos/:repo/pulls/:n/merge", route((req) => swarm.mergePull(repoId(req), num(req.params.n), req.body?.method ?? "squash")));
 app.post("/api/repos/:repo/pulls/:n/close", route((req) => swarm.closePull(repoId(req), num(req.params.n))));
 app.post("/api/repos/:repo/pulls/:n/qa", route((req) => swarm.sendToQa(repoId(req), num(req.params.n))));
+app.post("/api/repos/:repo/pulls/:n/fix", route((req) => swarm.sendBackToDev(repoId(req), num(req.params.n), parseSendBackNote(req.body))));
 app.post(
   "/api/repos/:repo/agents",
   route(
@@ -7132,12 +7836,32 @@ app.post("/api/agents/:id/message", route((req) => swarm.message(String(req.para
 app.get("/api/agents/:id/prompt", route((req) => swarm.agentPrompt(String(req.params.id))));
 app.get("/api/agents/:id/screen", (req, res) => {
   const shot = swarm.screenshot(String(req.params.id));
-  if (!shot) return void res.status(404).end();
-  res.setHeader("Content-Type", shot.mime);
   res.setHeader("Cache-Control", "no-store");
+  if (!shot) return void res.status(screenStatus(shot)).end();
+  res.setHeader("Content-Type", shot.mime);
   res.end(shot.data);
 });
 app.patch("/api/settings", route((req) => swarm.updateSettings(req.body ?? {})));
+var parse = (schema, value) => {
+  const r = schema.safeParse(value);
+  if (!r.success) throw new HttpError(400, r.error.issues.map((i) => `${i.path.join(".") || "request"}: ${i.message}`).join("; "));
+  return r.data;
+};
+var sendAudio = (res, audio) => {
+  res.setHeader("Content-Type", audio.subarray(0, 4).toString("latin1") === "RIFF" ? "audio/wav" : "audio/mpeg");
+  res.setHeader("Cache-Control", "private, max-age=3600");
+  res.end(audio);
+};
+app.put("/api/voice/key", route((req) => swarm.voice.setKey(parse(z3.object({ key: z3.string().max(400) }), req.body).key)));
+app.get("/api/voice/voices", route(() => swarm.voice.voices()));
+app.get(
+  "/api/voice/messages/:id",
+  route(async (req, res) => sendAudio(res, await swarm.voice.messageAudio(parse(z3.object({ id: z3.coerce.number().int().positive() }), req.params).id)))
+);
+app.get(
+  "/api/voice/sample",
+  route(async (req, res) => sendAudio(res, await swarm.voice.sampleAudio(parse(z3.object({ voiceId: z3.string().regex(/^[A-Za-z0-9_-]{1,64}$/, "not a voice id").optional() }), req.query).voiceId)))
+);
 app.post("/api/office/update", route((req) => swarm.updateOffice(req.body?.action)));
 app.post("/api/ceo/message", route((req) => swarm.messageCeo(str(req.body.text))));
 app.post("/api/ceo/review", route(() => swarm.requestReview()));
@@ -7147,10 +7871,10 @@ app.post(
   route((req) => swarm.approveRequest(String(req.params.id), { name: str(req.body?.name) || void 0, model: typeof req.body?.model === "string" ? req.body.model : void 0, effort: typeof req.body?.effort === "string" ? req.body.effort : void 0 }))
 );
 app.post("/api/requests/:id/reject", route((req) => swarm.rejectRequest(String(req.params.id), str(req.body?.note))));
-var dist = path14.resolve(import.meta.dirname, "../dist");
-if (fs12.existsSync(dist)) {
+var dist = path16.resolve(import.meta.dirname, "../dist");
+if (fs14.existsSync(dist)) {
   app.use(express.static(dist));
-  app.get(/^(?!\/api).*/, (_req, res) => res.sendFile(path14.join(dist, "index.html")));
+  app.get(/^(?!\/api).*/, (_req, res) => res.sendFile(path16.join(dist, "index.html")));
 }
 app.use((err, _req, res, _next) => {
   const parserStatus = err?.status;