cubefarm 0.3.5 → 0.3.7

package/dist-server/index.js

@@ -1,7 +1,7 @@
 // server/index.ts
 import http2 from "node:http";
-import path13 from "node:path";
-import fs11 from "node:fs";
+import path14 from "node:path";
+import fs12 from "node:fs";
 import express from "express";
 import { WebSocketServer } from "ws";
 
@@ -537,9 +537,46 @@ Write-Output $kill.Count`;
 }
 
 // server/agentRunner.ts
+import fs4 from "node:fs";
+import path4 from "node:path";
+import { query } from "@anthropic-ai/claude-agent-sdk";
+
+// server/browser.ts
 import fs3 from "node:fs";
+import { createRequire } from "node:module";
+import os2 from "node:os";
 import path3 from "node:path";
-import { query } from "@anthropic-ai/claude-agent-sdk";
+function playwrightMcpCli() {
+  try {
+    const pkgFile = createRequire(import.meta.url).resolve("@playwright/mcp/package.json");
+    const bin = JSON.parse(fs3.readFileSync(pkgFile, "utf8")).bin?.["playwright-mcp"] ?? "cli.js";
+    return path3.join(path3.dirname(pkgFile), bin);
+  } catch {
+    return null;
+  }
+}
+function playwrightMcpCommand(cli, initScript, outputDir, node = process.execPath) {
+  return { command: node, args: [cli, "--headless", "--isolated", ...outputDir ? ["--output-dir", outputDir] : [], "--init-script", initScript] };
+}
+function playwrightMcp(outputDir) {
+  const cli = playwrightMcpCli();
+  return cli ? playwrightMcpCommand(cli, path3.join(import.meta.dirname, "browser-init.js"), outputDir) : null;
+}
+function chromePaths(platform = process.platform, env = process.env, home = os2.homedir()) {
+  if (platform === "win32") {
+    return [env.LOCALAPPDATA, env.PROGRAMFILES, env["PROGRAMFILES(X86)"]].filter((d) => !!d).map((d) => path3.win32.join(d, "Google", "Chrome", "Application", "chrome.exe"));
+  }
+  if (platform === "darwin") return ["/Applications/Google Chrome.app", path3.posix.join(home, "Applications", "Google Chrome.app")];
+  return ["/opt/google/chrome/chrome", "/usr/bin/google-chrome", "/usr/bin/google-chrome-stable"];
+}
+var hasChrome = () => chromePaths().some((p) => fs3.existsSync(p));
+function browserProblem(mcp, chrome = hasChrome()) {
+  if (!mcp) return "\u26A0 The browser tool (@playwright/mcp) is not installed with cubefarm: reinstall it, or run npx cubefarm doctor";
+  if (!chrome) return "\u26A0 Google Chrome not found, so this session cannot test in a browser: install it, or run npx cubefarm doctor";
+  return null;
+}
+
+// server/agentRunner.ts
 var InputQueue = class {
   items = [];
   waiters = [];
@@ -571,7 +608,7 @@ function screenshotFile(cwd, text) {
   const file = text.match(/\]\(([^)\s]+\.(png|jpe?g))\)/i);
   if (!file) return null;
   try {
-    return { data: fs3.readFileSync(path3.resolve(cwd, file[1])), mime: /png$/i.test(file[2]) ? "image/png" : "image/jpeg" };
+    return { data: fs4.readFileSync(path4.resolve(cwd, file[1])), mime: /png$/i.test(file[2]) ? "image/png" : "image/jpeg" };
   } catch {
     return null;
   }
@@ -580,17 +617,17 @@ var IMAGE_MIME = { ".png": "image/png", ".jpg": "image/jpeg", ".jpeg": "image/jp
 function newScreenshots(dir, seen, now2 = Date.now()) {
   let names;
   try {
-    names = fs3.readdirSync(dir);
+    names = fs4.readdirSync(dir);
   } catch {
     return [];
   }
   const found2 = [];
   for (const name of names.sort()) {
-    const mime = IMAGE_MIME[path3.extname(name).toLowerCase()];
-    const file = path3.join(dir, name);
+    const mime = IMAGE_MIME[path4.extname(name).toLowerCase()];
+    const file = path4.join(dir, name);
     if (!mime || seen.has(name)) continue;
     try {
-      if (now2 - fs3.statSync(file).mtimeMs < 1e3) continue;
+      if (now2 - fs4.statSync(file).mtimeMs < 1e3) continue;
     } catch {
       continue;
     }
@@ -602,7 +639,7 @@ var clip = (s, n) => s.length > n ? `${s.slice(0, n - 1)}\u2026` : s;
 function rel(cwd, p) {
   const s = String(p ?? "");
   if (!s) return "";
-  const r = path3.relative(cwd, path3.resolve(cwd, s));
+  const r = path4.relative(cwd, path4.resolve(cwd, s));
   return r && !r.startsWith("..") ? r.replaceAll("\\", "/") : s;
 }
 var escapeRe = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -729,8 +766,10 @@ function startSession(opts, callbacks) {
   env.CLAUDE_AGENT_SDK_CLIENT_APP = `cubefarm/${VERSION}`;
   const mcpServers = {};
   if (opts.browserTesting) {
-    const args = ["-y", "@playwright/mcp@latest", "--headless", "--isolated", "--init-script", path3.join(import.meta.dirname, "browser-init.js")];
-    mcpServers.playwright = process.platform === "win32" ? { command: "cmd", args: ["/c", "npx", ...args] } : { command: "npx", args };
+    const browser = playwrightMcp();
+    if (browser) mcpServers.playwright = browser;
+    const problem = browserProblem(browser);
+    if (problem) cb.log([{ kind: "error", text: problem }]);
   }
   if (opts.office) mcpServers.office = opts.office.server;
   const disallowedTools = ["AskUserQuestion", "EnterPlanMode", "ExitPlanMode"];
@@ -903,15 +942,15 @@ function startSession(opts, callbacks) {
 
 // server/cliRunner.ts
 import crypto3 from "node:crypto";
-import fs6 from "node:fs";
-import path7 from "node:path";
+import fs7 from "node:fs";
+import path8 from "node:path";
 import { pathToFileURL } from "node:url";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 
 // server/clis.ts
-import fs4 from "node:fs";
-import { createRequire } from "node:module";
-import path4 from "node:path";
+import fs5 from "node:fs";
+import { createRequire as createRequire2 } from "node:module";
+import path5 from "node:path";
 var CLIS = [
   { id: "claude", label: "Claude Code", command: "claude", integrated: true },
   { id: "codex", label: "Codex", command: "codex", integrated: false },
@@ -922,13 +961,13 @@ var cliLabel = (id) => CLIS.find((c) => c.id === id)?.label ?? id;
 var WIN = process.platform === "win32";
 function resolveCommand(name, env = process.env) {
   const key = Object.keys(env).find((k) => k.toUpperCase() === "PATH") ?? "PATH";
-  const dirs = (env[key] ?? "").split(path4.delimiter).filter(Boolean);
+  const dirs = (env[key] ?? "").split(path5.delimiter).filter(Boolean);
   const exts = WIN ? (env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter((e) => /^\.(exe|cmd|bat|com)$/i.test(e)) : [""];
   for (const dir of dirs) {
     for (const ext of exts) {
-      const file = path4.join(dir, name + ext.toLowerCase());
+      const file = path5.join(dir, name + ext.toLowerCase());
       try {
-        const st = fs4.statSync(file);
+        const st = fs5.statSync(file);
         if (st.isFile() && (WIN || (st.mode & 73) !== 0)) return file;
       } catch {
       }
@@ -939,16 +978,16 @@ function resolveCommand(name, env = process.env) {
 function unwrapCmdShim(shimPath, text) {
   const line = text.split(/\r?\n/).find((l) => /%\*\s*$/.test(l));
   if (!line) return null;
-  const dir = path4.dirname(shimPath);
-  const targets = [...line.matchAll(/"%dp0%\\([^"]+)"/g)].map((m) => path4.join(dir, m[1]));
+  const dir = path5.dirname(shimPath);
+  const targets = [...line.matchAll(/"%dp0%\\([^"]+)"/g)].map((m) => path5.join(dir, m[1]));
   const target = targets[targets.length - 1];
   if (!target) return null;
   if (/\.exe$/i.test(target)) return { file: target, args: [] };
   if (!/\.[cm]?js$/i.test(target)) return null;
   const between = line.slice(line.indexOf('"%_prog%"') + '"%_prog%"'.length, line.lastIndexOf(`"%dp0%\\`));
   const nodeFlags = line.includes('"%_prog%"') ? between.trim().split(/\s+/).filter((f) => f.startsWith("--")) : [];
-  const localNode = path4.join(dir, "node.exe");
-  return { file: fs4.existsSync(localNode) ? localNode : process.execPath, args: [...nodeFlags, target] };
+  const localNode = path5.join(dir, "node.exe");
+  return { file: fs5.existsSync(localNode) ? localNode : process.execPath, args: [...nodeFlags, target] };
 }
 var bundled;
 function bundledClaude() {
@@ -956,7 +995,7 @@ function bundledClaude() {
   bundled = null;
   let sdk;
   try {
-    sdk = createRequire(import.meta.url).resolve("@anthropic-ai/claude-agent-sdk");
+    sdk = createRequire2(import.meta.url).resolve("@anthropic-ai/claude-agent-sdk");
   } catch {
     return null;
   }
@@ -966,7 +1005,7 @@ function bundledClaude() {
   const targets = platform === "linux" ? musl ? [`linux-${arch}-musl`, `linux-${arch}`] : [`linux-${arch}`, `linux-${arch}-musl`] : [`${platform}-${arch}`];
   for (const target of targets) {
     try {
-      bundled = createRequire(sdk).resolve(`@anthropic-ai/claude-agent-sdk-${target}/claude${WIN ? ".exe" : ""}`);
+      bundled = createRequire2(sdk).resolve(`@anthropic-ai/claude-agent-sdk-${target}/claude${WIN ? ".exe" : ""}`);
       return bundled;
     } catch {
     }
@@ -981,7 +1020,7 @@ function commandFor(id) {
   if (!found2) return null;
   if (WIN && /\.(cmd|bat)$/i.test(found2)) {
     try {
-      return unwrapCmdShim(found2, fs4.readFileSync(found2, "utf8")) ?? { file: found2, args: [] };
+      return unwrapCmdShim(found2, fs5.readFileSync(found2, "utf8")) ?? { file: found2, args: [] };
     } catch {
       return { file: found2, args: [] };
     }
@@ -1183,18 +1222,18 @@ export default async function CubefarmPlugin({ client } = {}) {
 
 // server/ptyClient.ts
 import crypto2 from "node:crypto";
-import fs5 from "node:fs";
+import fs6 from "node:fs";
 import net from "node:net";
-import path6 from "node:path";
+import path7 from "node:path";
 import { spawn } from "node:child_process";
 
 // server/ptyProtocol.ts
 import crypto from "node:crypto";
-import path5 from "node:path";
+import path6 from "node:path";
 var PTY_PROTOCOL = 1;
 function hostSocket(home, platform = process.platform) {
-  if (platform !== "win32") return path5.join(home, "pty.sock");
-  const tag = crypto.createHash("sha1").update(path5.resolve(home).toLowerCase()).digest("hex").slice(0, 12);
+  if (platform !== "win32") return path6.join(home, "pty.sock");
+  const tag = crypto.createHash("sha1").update(path6.resolve(home).toLowerCase()).digest("hex").slice(0, 12);
   return `\\\\.\\pipe\\cubefarm-pty-${tag}`;
 }
 var encode = (m) => `${JSON.stringify(m)}
@@ -1325,7 +1364,7 @@ function connect(socket, secret) {
 }
 var runtimeFlags = () => process.execArgv.filter((a, i, all) => !/^--(inspect|watch|debug)/.test(a) && !/^--(inspect|watch|debug)/.test(all[i - 1] ?? ""));
 function launch(socket, secretFile) {
-  const entry = path6.join(import.meta.dirname, `ptyHost${path6.extname(import.meta.filename)}`);
+  const entry = path7.join(import.meta.dirname, `ptyHost${path7.extname(import.meta.filename)}`);
   spawn(process.execPath, [...runtimeFlags(), entry, "launch", socket, secretFile], { detached: true, stdio: "ignore", windowsHide: true }).once("error", () => void 0).unref();
 }
 var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
@@ -1333,17 +1372,17 @@ async function startKeeper(home, onHook) {
   hookHandler = onHook;
   if (!nodePty) return [];
   const socket = hostSocket(home);
-  const secretFile = path6.join(home, "pty.secret");
+  const secretFile = path7.join(home, "pty.secret");
   try {
-    if (!fs5.existsSync(secretFile)) {
-      fs5.mkdirSync(home, { recursive: true });
-      fs5.writeFileSync(secretFile, crypto2.randomBytes(24).toString("hex"), { mode: 384 });
+    if (!fs6.existsSync(secretFile)) {
+      fs6.mkdirSync(home, { recursive: true });
+      fs6.writeFileSync(secretFile, crypto2.randomBytes(24).toString("hex"), { mode: 384 });
     }
   } catch (err) {
     console.warn(`  terminal keeper unavailable: ${err.message}`);
     return [];
   }
-  const secret = fs5.readFileSync(secretFile, "utf8").trim();
+  const secret = fs6.readFileSync(secretFile, "utf8").trim();
   let hello = await connect(socket, secret);
   if (hello && hello.ready.version !== PTY_PROTOCOL) {
     console.log(`  replacing the terminal keeper (v${hello.ready.version}); the ${hello.ready.ptys.length} terminal(s) it held are stopped`);
@@ -1423,8 +1462,8 @@ function killTree(proc) {
 }
 
 // server/cliRunner.ts
-var SESSIONS_DIR = path7.join(HOME_DIR, "sessions");
-var BIN_DIR = path7.join(HOME_DIR, "bin");
+var SESSIONS_DIR = path8.join(HOME_DIR, "sessions");
+var BIN_DIR = path8.join(HOME_DIR, "bin");
 var FINISH_GRACE_MS = 3e3;
 var BOOT_MS = 6e4;
 var USAGE_WARN_PCT = 90;
@@ -1462,19 +1501,15 @@ async function handleMcp(token, req, res) {
 var helpersWritten = false;
 function writeHelpers() {
   if (helpersWritten) return;
-  fs6.mkdirSync(BIN_DIR, { recursive: true });
-  fs6.writeFileSync(path7.join(BIN_DIR, "statusline.cjs"), STATUSLINE_SOURCE);
-  fs6.writeFileSync(path7.join(BIN_DIR, "notify.cjs"), NOTIFY_SOURCE);
-  fs6.writeFileSync(path7.join(BIN_DIR, "codex-hook.cjs"), CODEX_HOOK_SOURCE);
-  fs6.writeFileSync(path7.join(BIN_DIR, "opencode-plugin.mjs"), OPENCODE_PLUGIN_SOURCE);
+  fs7.mkdirSync(BIN_DIR, { recursive: true });
+  fs7.writeFileSync(path8.join(BIN_DIR, "statusline.cjs"), STATUSLINE_SOURCE);
+  fs7.writeFileSync(path8.join(BIN_DIR, "notify.cjs"), NOTIFY_SOURCE);
+  fs7.writeFileSync(path8.join(BIN_DIR, "codex-hook.cjs"), CODEX_HOOK_SOURCE);
+  fs7.writeFileSync(path8.join(BIN_DIR, "opencode-plugin.mjs"), OPENCODE_PLUGIN_SOURCE);
   helpersWritten = true;
 }
 var shellArg = (p) => `"${p.replaceAll("\\", "/")}"`;
 var HOOK_EVENTS = ["UserPromptSubmit", "PreToolUse", "PostToolUse", "PostToolUseFailure", "Stop", "StopFailure", "Notification"];
-function playwrightServer(outputDir) {
-  const args = ["-y", "@playwright/mcp@latest", "--headless", "--isolated", "--output-dir", outputDir, "--init-script", path7.join(import.meta.dirname, "browser-init.js")];
-  return process.platform === "win32" ? { command: "cmd", args: ["/c", "npx", ...args] } : { command: "npx", args };
-}
 function toolOutput(response) {
   const images = [];
   const blocks = Array.isArray(response) ? response : Array.isArray(response?.content) ? response.content : null;
@@ -1521,7 +1556,7 @@ function endLive(live) {
   live.proc?.kill();
   live.proc = null;
   live.term.note(`\u2500\u2500 ${cliLabel(live.cli)} session ended \u2500\u2500`);
-  fs6.rm(live.dir, { recursive: true, force: true, maxRetries: 5 }, () => void 0);
+  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();
 }
 var metaOf = (l) => ({ agentId: l.agentId, cli: l.cli, token: l.token, dir: l.dir, resumeId: l.resumeId, busy: !!l.session });
@@ -1605,7 +1640,7 @@ function startCliSession(opts, callbacks) {
   const label = cliLabel(cli);
   const token = crypto3.randomUUID();
   const sessionId = opts.resumeSessionId ?? crypto3.randomUUID();
-  const dir = path7.join(SESSIONS_DIR, token);
+  const dir = path8.join(SESSIONS_DIR, token);
   const started = Date.now();
   const statusLine = `\u{1F3E2} cubefarm${opts.label ? ` \xB7 ${opts.label}` : ""}`;
   const toolNames = /* @__PURE__ */ new Map();
@@ -1633,10 +1668,10 @@ function startCliSession(opts, callbacks) {
   const collectShots = (all = false) => {
     const l2 = live;
     if (!l2 || cli === "claude" || !opts.browserTesting) return;
-    for (const shot of newScreenshots(path7.join(l2.dir, "browser"), l2.shots, all ? Infinity : Date.now())) {
+    for (const shot of newScreenshots(path8.join(l2.dir, "browser"), l2.shots, all ? Infinity : Date.now())) {
       l2.shots.add(shot.name);
       try {
-        cb.screenshot(fs6.readFileSync(shot.file), shot.mime);
+        cb.screenshot(fs7.readFileSync(shot.file), shot.mime);
       } catch {
       }
     }
@@ -1707,7 +1742,7 @@ function startCliSession(opts, callbacks) {
     const event = String(b.hook_event_name ?? "");
     const sub = typeof b.agent_id === "string" && b.agent_id !== "";
     if (cli === "claude" && !sub && b.session_id !== kept) {
-      const id = resumableSession(b, fs6.existsSync);
+      const id = resumableSession(b, fs7.existsSync);
       if (id) {
         kept = id;
         cb.sessionId(id);
@@ -1859,7 +1894,9 @@ function startCliSession(opts, callbacks) {
   }
   const keeper = keeperHookUrl();
   const hookUrl = `${keeper ?? officeUrl}/api/hooks/${token}`;
-  const browser = opts.browserTesting ? playwrightServer(path7.join(dir, "browser")) : null;
+  const browser = opts.browserTesting ? playwrightMcp(path8.join(dir, "browser")) : null;
+  const browserIssue = opts.browserTesting ? browserProblem(browser) : null;
+  if (browserIssue) log([{ kind: "error", text: browserIssue }]);
   let prompt = opts.prompt;
   if (opts.outputSchema) {
     prompt += `
@@ -1870,21 +1907,21 @@ ${JSON.stringify(opts.outputSchema)}`;
   let files;
   try {
     writeHelpers();
-    fs6.mkdirSync(dir, { recursive: true });
+    fs7.mkdirSync(dir, { recursive: true });
     const settings = {
       hooks: Object.fromEntries(HOOK_EVENTS.map((e) => [e, [{ hooks: [{ type: "http", url: hookUrl, timeout: keeper ? 120 : 30 }] }]])),
-      statusLine: { type: "command", command: `${shellArg(process.execPath)} ${shellArg(path7.join(BIN_DIR, "statusline.cjs"))} ${shellArg(hookUrl)}`, padding: 0 }
+      statusLine: { type: "command", command: `${shellArg(process.execPath)} ${shellArg(path8.join(BIN_DIR, "statusline.cjs"))} ${shellArg(hookUrl)}`, padding: 0 }
     };
     const servers = {};
     if (browser) servers.playwright = browser;
     if (opts.office) servers.office = { type: "http", url: `${officeUrl}/api/mcp/${token}` };
-    files = { settings: path7.join(dir, "settings.json"), mcp: Object.keys(servers).length ? path7.join(dir, "mcp.json") : null, system: path7.join(dir, "instructions.md") };
-    fs6.writeFileSync(files.settings, JSON.stringify(settings, null, 2));
-    if (files.mcp) fs6.writeFileSync(files.mcp, JSON.stringify({ mcpServers: servers }, null, 2));
-    fs6.writeFileSync(files.system, opts.systemAppend);
+    files = { settings: path8.join(dir, "settings.json"), mcp: Object.keys(servers).length ? path8.join(dir, "mcp.json") : null, system: path8.join(dir, "instructions.md") };
+    fs7.writeFileSync(files.settings, JSON.stringify(settings, null, 2));
+    if (files.mcp) fs7.writeFileSync(files.mcp, JSON.stringify({ mcpServers: servers }, null, 2));
+    fs7.writeFileSync(files.system, opts.systemAppend);
     if (prompt.length > INLINE_PROMPT_MAX) {
-      const file = path7.join(dir, "task.md");
-      fs6.writeFileSync(file, prompt);
+      const file = path8.join(dir, "task.md");
+      fs7.writeFileSync(file, prompt);
       prompt = `Your task is in ${file}. Read all of it first, then do what it says.`;
     }
   } catch (err) {
@@ -1904,9 +1941,9 @@ ${JSON.stringify(opts.outputSchema)}`;
     role: opts.role,
     additionalDirectories: opts.additionalDirectories,
     files,
-    notify: { script: path7.join(BIN_DIR, "notify.cjs"), url: hookUrl },
-    codexHook: path7.join(BIN_DIR, "codex-hook.cjs"),
-    plugin: pathToFileURL(path7.join(BIN_DIR, "opencode-plugin.mjs")).href,
+    notify: { script: path8.join(BIN_DIR, "notify.cjs"), url: hookUrl },
+    codexHook: path8.join(BIN_DIR, "codex-hook.cjs"),
+    plugin: pathToFileURL(path8.join(BIN_DIR, "opencode-plugin.mjs")).href,
     browser
   });
   const env = {};
@@ -1972,9 +2009,9 @@ ${JSON.stringify(opts.outputSchema)}`;
 // server/previewRunner.ts
 import { spawn as spawn2 } from "node:child_process";
 import crypto4 from "node:crypto";
-import fs7 from "node:fs/promises";
+import fs8 from "node:fs/promises";
 import net2 from "node:net";
-import path8 from "node:path";
+import path9 from "node:path";
 var PREVIEW_SLUG = "preview";
 var PREVIEW_BRANCH = "swarm-preview";
 var PREVIEW_TMP = ".preview-tmp";
@@ -2010,7 +2047,7 @@ async function portOpen(port) {
 var sleep2 = (ms) => new Promise((r) => setTimeout(r, ms));
 async function readJson(file) {
   try {
-    return JSON.parse(await fs7.readFile(file, "utf8"));
+    return JSON.parse(await fs8.readFile(file, "utf8"));
   } catch {
     return null;
   }
@@ -2071,9 +2108,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 = path8.join(wt, PREVIEW_TMP);
-    await fs7.mkdir(tmp, { recursive: true });
-    const pkg = await readJson(path8.join(wt, "package.json"));
+    const tmp = path9.join(wt, PREVIEW_TMP);
+    await fs8.mkdir(tmp, { recursive: true });
+    const pkg = await readJson(path9.join(wt, "package.json"));
     const command = job.command ?? defaultCommand(pkg);
     if (!command) {
       this.stopped = true;
@@ -2112,11 +2149,11 @@ 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 = path8.join(wt, "package-lock.json");
-    const lock = await fs7.readFile(lockFile, "utf8").catch(() => null);
-    const hash = crypto4.createHash("sha256").update(await fs7.readFile(path8.join(wt, "package.json"), "utf8")).update("\0").update(lock ?? "").digest("hex");
-    const marker = path8.join(wt, "node_modules", INSTALL_MARKER);
-    if (await fs7.readFile(marker, "utf8").catch(() => "") === hash) {
+    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) {
       this.cb.log(["Dependencies unchanged since the last install; skipping it."]);
       return;
     }
@@ -2130,7 +2167,7 @@ var RealPreview = class {
     }
     if (code !== 0) throw new Error(`${cmd} failed (code ${code}).`);
     this.child = null;
-    await fs7.writeFile(marker, hash).catch(() => void 0);
+    await fs8.writeFile(marker, hash).catch(() => void 0);
   }
   /** Run a command line through the platform shell; resolves with its exit code. */
   spawn(cmd, cwd, env) {
@@ -2161,12 +2198,12 @@ var RealPreview = class {
 };
 var realPreviews = {
   start: (job, cb) => new RealPreview(job, cb),
-  hasDefault: async (fullName) => fs7.access(path8.join(mainDir(fullName), "package.json")).then(() => true).catch(() => false)
+  hasDefault: async (fullName) => fs8.access(path9.join(mainDir(fullName), "package.json")).then(() => true).catch(() => false)
 };
 
 // server/officeUpdate.ts
-import fs8 from "node:fs/promises";
-import path9 from "node:path";
+import fs9 from "node:fs/promises";
+import path10 from "node:path";
 var DRAIN_TIMEOUT_MS = 20 * 6e4;
 var POSTPONE_MS = 2 * 60 * 6e4;
 function underLauncher(proc = process) {
@@ -2203,10 +2240,10 @@ function parseLastUpdate(raw) {
   }
 }
 async function takeLastUpdate(home) {
-  const file = path9.join(home, "last-update.json");
-  const raw = await fs8.readFile(file, "utf8").catch(() => null);
+  const file = path10.join(home, "last-update.json");
+  const raw = await fs9.readFile(file, "utf8").catch(() => null);
   if (raw === null) return null;
-  await fs8.rm(file, { force: true, maxRetries: 3 }).catch(() => void 0);
+  await fs9.rm(file, { force: true, maxRetries: 3 }).catch(() => void 0);
   return parseLastUpdate(raw);
 }
 function lastUpdateMessage(u, commits) {
@@ -2214,8 +2251,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 = path9.resolve(import.meta.dirname, "..");
-var isSamePath = (a, b) => process.platform === "win32" ? path9.resolve(a).toLowerCase() === path9.resolve(b).toLowerCase() : path9.resolve(a) === path9.resolve(b);
+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 realOffice = {
   launcher: underLauncher(),
   head: () => git(["rev-parse", "HEAD"], { cwd: OFFICE_DIR }).catch(() => null),
@@ -2273,7 +2310,7 @@ var realBackend = {
 // server/demo.ts
 import crypto5 from "node:crypto";
 import http from "node:http";
-import path10 from "node:path";
+import path11 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() };
@@ -2326,7 +2363,7 @@ function screenshotSvg(title, url, hue) {
 </svg>`;
 }
 function devScript(opts, cb, issueNumber, issueTitle) {
-  const branch = path10.basename(opts.cwd);
+  const branch = path11.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;
@@ -2386,13 +2423,13 @@ function qaScript(cb, pr, title, round) {
     [{ kind: "tool", tool: "mcp__playwright__browser_console_messages", text: "\u23FA \u{1F310} console_messages" }, { kind: "result", text: "  \u23BF No errors" }]
   ];
 }
-function fixScript(pr) {
+function fixScript(pr, pushes) {
   return [
     [{ kind: "text", text: `\u25CF Reading the QA report for PR #${pr}. The toolbar overflows on phones; I'll let it wrap.` }],
     [{ kind: "tool", tool: "Read", text: "\u23FA Read src/styles.css" }, { kind: "result", text: "  \u23BF Read 212 lines" }],
     [{ kind: "tool", tool: "Edit", text: "\u23FA Edit src/styles.css" }, { kind: "result", text: "  \u23BF Updated" }],
     [{ kind: "tool", tool: "Bash", text: "\u23FA $ npm test -- --run" }, { kind: "result", text: "  \u23BF Test Files  8 passed (8)" }],
-    [{ kind: "tool", tool: "Bash", text: '\u23FA $ git commit -am "fix: wrap toolbar on narrow screens" && git push origin HEAD' }, { kind: "result", text: "  \u23BF pushed" }]
+    pushes ? [{ kind: "tool", tool: "Bash", text: '\u23FA $ git commit -am "fix: wrap toolbar on narrow screens" && git push origin HEAD' }, { kind: "result", text: "  \u23BF pushed" }] : [{ kind: "tool", tool: "Bash", text: "\u23FA $ git status --short" }, { kind: "result", text: "  \u23BF  M src/styles.css" }]
   ];
 }
 function fakeSession(opts, cb, fullName) {
@@ -2404,11 +2441,12 @@ function fakeSession(opts, cb, fullName) {
   const number = Number((kind === "issue" ? issueMatch?.[1] : prMatch?.[1]) ?? 0);
   const title = (kind === "issue" ? issueMatch?.[2] : prMatch?.[2])?.trim() ?? "follow-up";
   const round = Number(opts.prompt.match(/QA round (\d+)/)?.[1] ?? 1);
+  const pushes = kind !== "fix" || !/FAILED|taking over pull request/.test(opts.prompt) || Math.random() > 0.25;
   const header = [
     { 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) : devScript(opts, cb, number, title);
+  const body = kind === "qa" ? qaScript(cb, number, title, round) : kind === "fix" ? fixScript(number, pushes) : devScript(opts, cb, number, title);
   const script = [header, ...body];
   const finish = () => {
     const costUsd = 0.3 + Math.random();
@@ -2445,13 +2483,13 @@ function fakeSession(opts, cb, fullName) {
     }
     if (kind === "fix") {
       const pr = repos.get(fullName)?.pulls.find((p) => p.number === number);
-      if (pr) {
+      if (pr && pushes) {
         pr.headSha = fakeSha();
         pr.mergeState = "CLEAN";
         pr.mergeable = "MERGEABLE";
         runChecks(pr, false);
       }
-      cb.log([{ kind: "text", text: `\u25CF Fixed PR #${number} and pushed. Ready for another QA round.` }]);
+      cb.log([{ kind: "text", text: pushes ? `\u25CF Fixed PR #${number} and pushed. Ready for another QA round.` : `\u25CF The toolbar wraps on narrow screens now. Ready for another QA round.` }]);
       cb.finished({ ok: true, text: "", costUsd, turns, errors: [] });
       return;
     }
@@ -2464,7 +2502,7 @@ function fakeSession(opts, cb, fullName) {
         number: n,
         title,
         url,
-        headRefName: `swarm/issue-${number}-${path10.basename(opts.cwd).replace(/-[0-9a-f]{4}$/, "")}`,
+        headRefName: `swarm/issue-${number}-${path11.basename(opts.cwd).replace(/-[0-9a-f]{4}$/, "")}`,
         state: "OPEN",
         isDraft: false,
         mergeable: "MERGEABLE",
@@ -2911,7 +2949,8 @@ function ceoSession(opts, cb) {
     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);
-    cb.log([{ kind: "result", text: `  \u23BF ${s.floors.length} floors \xB7 ${people} people \xB7 ${issues} open issues \xB7 ${s.pendingProposals.length} proposals pending` }]);
+    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 use = async (name, args) => {
@@ -3102,8 +3141,8 @@ Acceptance criteria:
 }
 
 // server/swarm.ts
-import fs10 from "node:fs/promises";
-import path12 from "node:path";
+import fs11 from "node:fs/promises";
+import path13 from "node:path";
 import crypto6 from "node:crypto";
 
 // server/ceo.ts
@@ -3188,7 +3227,7 @@ function createOfficeTools(h) {
   const defs = [
     tool(
       "company_status",
-      "Everything about the company right now: settings, every floor (repo, clone path, brief, profile, QA brief), its team, backlog, pull requests and QA, pending proposals and recent decisions by the manager. Call this first.",
+      "Everything about the company right now: settings, every floor (repo, clone path, brief, profile, QA brief), its free seats, team, backlog, pull requests and QA, pending proposals and recent decisions by the manager. Call this first.",
       {},
       () => run2(() => h.companyStatus())
     ),
@@ -3280,6 +3319,12 @@ function createOfficeTools(h) {
     }
   };
 }
+var FLOOR_DESKS = { dev: 12, qa: 3 };
+var MAX_PENDING_PROPOSALS = FLOOR_DESKS.dev + FLOOR_DESKS.qa;
+var seatCount = (total, taken, proposed) => ({ total, taken, proposed, free: Math.max(0, total - taken - proposed) });
+function checkPendingLimit(pending2, max = MAX_PENDING_PROPOSALS) {
+  if (pending2 >= max) throw new Error(`${pending2} proposals are already waiting for the manager; propose the rest after they decide.`);
+}
 function ceoSystemPrompt(o) {
   const manager = o.manager ? `the manager, ${o.manager}` : "the human manager";
   return [
@@ -3288,7 +3333,7 @@ function ceoSystemPrompt(o) {
     "",
     "Your job is to run the company, not to write code:",
     "- Understand each project: what it is, its stack, how far along it is, and what kind of people it needs. Projects differ a lot. A static marketing site, a 3D browser game and a REST API need different specialists and different QA.",
-    `- Shape each floor's team. Propose specialists with a specific title and a job description written for this project. Keep teams lean: agents on the same coding agent share one subscription's usage limits${o.sessionLimit ? ` and at most ${o.sessionLimit} sessions run at once` : ""}, so a floor rarely needs more than ${o.teamCap} people. Propose letting people go when a floor is clearly overstaffed or a specialty is no longer needed.`,
+    `- Shape each floor's team. Propose specialists with a specific title and a job description written for this project. Keep teams lean: agents on the same coding agent share one subscription's usage limits${o.sessionLimit ? ` and at most ${o.sessionLimit} sessions run at once` : ""}, so a floor rarely needs more than ${o.teamCap} people. When the manager asks for a bigger team, follow that, up to the floor's free seats (seats in company_status). Propose letting people go when a floor is clearly overstaffed or a specialty is no longer needed.`,
     "- Plan the work: turn a floor's brief into small, well-specified GitHub issues, one agent-session each, with acceptance criteria. Route each to a specialty. The office hands issues out itself: a free specialist gets first pick of their specialty, and otherwise any free developer takes the next issue that can start, so a specialty is a preference, not a lock.",
     "- Write each floor's QA brief: what QA testers must check for this kind of project (for a 3D game: the canvas renders, controls respond, frame rate is smooth; for a website: links, phone layout, accessibility; for an API: status codes, validation, error cases).",
     "",
@@ -3443,6 +3488,26 @@ function specialtySlug(s) {
 }
 var specialtyLabel = (slug) => `swarm:${slug}`;
 
+// server/fixOutcome.ts
+var MAX_FIX_FAILURES = 2;
+function fixOutcome(rec, head, minutes, counts = true) {
+  const pr = rec.prNumber;
+  const before = rec.fixReason === "conflict" ? rec.passedSha ?? rec.testedSha : rec.testedSha;
+  if (rec.fixReason !== "checks" && head && before && head === before) {
+    const sessionFailures = rec.sessionFailures + (counts ? 1 : 0);
+    const needsHuman = sessionFailures >= MAX_FIX_FAILURES;
+    return {
+      set: needsHuman ? { status: "needs-human", sessionFailures, mergeNote: rec.fixReason === "conflict" ? "the conflict was never resolved" : "the fix was never pushed" } : { status: "failed", sessionFailures },
+      log: { kind: "error", text: `\u2717 No new commits were pushed for PR #${pr}` },
+      pushed: false
+    };
+  }
+  if (rec.fixReason === "checks" || rec.fixReason === "conflict") {
+    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) {
@@ -3491,6 +3556,27 @@ function orphanedQa(qa, agents, busy) {
   );
 }
 
+// server/restartRecovery.ts
+function followKeptCli(a, cli) {
+  if (!cli?.busy || a.status === "preparing") return false;
+  return !(a.sessionId && cli.resumeId && cli.resumeId !== a.sessionId);
+}
+function resumesAfterRestart(a, preparing, demo) {
+  return !demo && !preparing && a.task !== "qa" && !!a.sessionId && !!a.branch;
+}
+function resumeNote(a, fix) {
+  const yours = "Uncommitted changes in your worktree are yours to finish.";
+  if (a.task === "fix" && a.prNumber && a.branch) {
+    const job = fix?.fixReason === "conflict" ? `resolving the merge conflicts on PR #${a.prNumber}` : fix?.fixReason === "checks" ? `fixing the failing checks on PR #${a.prNumber}` : `fixing PR #${a.prNumber}${fix ? ` after QA round ${fix.round}` : ""}`;
+    return `The office server restarted while you were ${job}. Finish the fix, commit, and push with: git push origin HEAD:${a.branch}. ${yours}`;
+  }
+  if (a.task === "issue" && a.issueNumber && a.branch) {
+    const pr = a.prNumber ? `push with: git push origin ${a.branch} to update PR #${a.prNumber}` : `push with: git push -u origin ${a.branch}, and open the pull request with "Closes #${a.issueNumber}" (or push to it if it's already open)`;
+    return `The office server restarted while you were working on issue #${a.issueNumber}${a.issueTitle ? ` (${a.issueTitle})` : ""} on branch ${a.branch}. Finish it, commit, ${pr}. ${yours}`;
+  }
+  return "The office server restarted while you were working. Check the state of your worktree and continue where you left off.";
+}
+
 // server/previews.ts
 var PREVIEW_BASE_PORT = 6300;
 var LOG_KEEP = 200;
@@ -3729,8 +3815,8 @@ function pacingMessage(w, until, sessions, now2) {
 }
 
 // server/terminal.ts
-import fs9 from "node:fs/promises";
-import path11 from "node:path";
+import fs10 from "node:fs/promises";
+import path12 from "node:path";
 import xtermHeadless from "@xterm/headless";
 import xtermSerialize from "@xterm/addon-serialize";
 var { Terminal } = xtermHeadless;
@@ -3824,12 +3910,12 @@ var AgentTerminal = class {
   async save(file) {
     this.dirty = false;
     await this.flush();
-    await fs9.mkdir(path11.dirname(file), { recursive: true });
-    await fs9.writeFile(`${file}.tmp`, this.snapshot());
-    await fs9.rename(`${file}.tmp`, file);
+    await fs10.mkdir(path12.dirname(file), { recursive: true });
+    await fs10.writeFile(`${file}.tmp`, this.snapshot());
+    await fs10.rename(`${file}.tmp`, file);
   }
   async load(file) {
-    const data = await fs9.readFile(file, "utf8").catch(() => "");
+    const data = await fs10.readFile(file, "utf8").catch(() => "");
     if (!data) return;
     this.term.write(data);
     this.note("(the office restarted)");
@@ -3959,16 +4045,15 @@ 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 = { dev: 12, qa: 3, ceo: 1 };
+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 = path12.join(HOME_DIR, "ceo");
-var DEFAULT_PROJECTS_DIR = defaultProjectsDir(path12.resolve(import.meta.dirname, ".."));
-var MAX_PENDING_REQUESTS = 8;
+var CEO_DIR = path13.join(HOME_DIR, "ceo");
+var DEFAULT_PROJECTS_DIR = defaultProjectsDir(path13.resolve(import.meta.dirname, ".."));
 var MAX_ISSUES_PER_JOB = 12;
 var KEEP_MESSAGES = 200;
 var KEEP_DECIDED_REQUESTS = 40;
@@ -3980,14 +4065,14 @@ 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 = path12.join(HOME_DIR, "screens");
+var SCREENS_DIR = path13.join(HOME_DIR, "screens");
 var MIME_EXT = { "image/png": "png", "image/jpeg": "jpg", "image/webp": "webp", "image/svg+xml": "svg" };
-var screenFile = (agentId, mime) => path12.join(SCREENS_DIR, `${agentId}.${MIME_EXT[mime] ?? "img"}`);
+var screenFile = (agentId, mime) => path13.join(SCREENS_DIR, `${agentId}.${MIME_EXT[mime] ?? "img"}`);
 async function loadScreen(agentId) {
   for (const [mime, ext] of Object.entries(MIME_EXT)) {
-    const file = path12.join(SCREENS_DIR, `${agentId}.${ext}`);
+    const file = path13.join(SCREENS_DIR, `${agentId}.${ext}`);
     try {
-      const [data, stat] = await Promise.all([fs10.readFile(file), fs10.stat(file)]);
+      const [data, stat] = await Promise.all([fs11.readFile(file), fs11.stat(file)]);
       return { data, mime, at: stat.mtimeMs };
     } catch {
     }
@@ -3995,10 +4080,10 @@ async function loadScreen(agentId) {
   return null;
 }
 async function removeScreens(agentId) {
-  await Promise.all(Object.values(MIME_EXT).map((ext) => fs10.rm(path12.join(SCREENS_DIR, `${agentId}.${ext}`), { force: true })));
+  await Promise.all(Object.values(MIME_EXT).map((ext) => fs11.rm(path13.join(SCREENS_DIR, `${agentId}.${ext}`), { force: true })));
 }
-var TERMINALS_DIR = path12.join(HOME_DIR, "terminals");
-var terminalFile = (agentId) => path12.join(TERMINALS_DIR, `${agentId}.ansi`);
+var TERMINALS_DIR = path13.join(HOME_DIR, "terminals");
+var terminalFile = (agentId) => path13.join(TERMINALS_DIR, `${agentId}.ansi`);
 var TERMINAL_SAVE_MS = 2e4;
 var QA_SCHEMA = {
   type: "object",
@@ -4152,7 +4237,7 @@ var Swarm = class {
   // ---------- lifecycle ----------
   async init() {
     try {
-      const raw = await fs10.readFile(STATE_FILE, "utf8");
+      const raw = await fs11.readFile(STATE_FILE, "utf8");
       const loaded = JSON.parse(raw);
       this.state = {
         settings: { ...this.state.settings, ...loaded.settings },
@@ -4227,12 +4312,14 @@ var Swarm = class {
       return [];
     });
     const carryOn = [];
+    const preparing = /* @__PURE__ */ new Set();
     for (const a of this.state.agents) {
       if (!BUSY.includes(a.status)) continue;
-      if (back.some((c) => c.agentId === a.id && c.busy)) {
+      if (followKeptCli(a, back.find((c) => c.agentId === a.id))) {
         carryOn.push(a);
         continue;
       }
+      if (a.status === "preparing") preparing.add(a);
       a.status = "stopped";
       a.lastError = "The swarm server restarted while this agent was working.";
       interrupted.push(a);
@@ -4268,7 +4355,7 @@ var Swarm = class {
       this.previews.clearOrphans(this.state.repos)
     ]);
     for (const r of this.state.repos) void this.previews.refreshDefault(r);
-    this.recover(interrupted);
+    this.recover(interrupted, preparing);
     for (const rec of orphanedQa(this.state.qa, this.state.agents, BUSY)) this.setQa(rec, { status: "queued", qaAgentId: null });
     this.officeHead = await this.backend.office.head();
     const updated = await this.backend.office.takeLastUpdate().catch(() => null);
@@ -4283,22 +4370,23 @@ var Swarm = class {
     this.save();
     setTimeout(() => this.schedule(), 1e3);
   }
-  /** Agents cut off by a server restart pick their Claude Code session back up (QA and demo agents start over). */
-  recover(agents) {
+  /**
+   * Agents cut off by a server restart pick their session back up, told what they were doing. QA, demo agents and
+   * tasks still being prepared start over from the queue.
+   */
+  recover(agents, preparing) {
     for (const a of agents) {
-      if (a.task === "qa" || this.backend.demo || !a.sessionId || !a.branch) {
+      const fix = a.task === "fix" ? this.state.qa.find((q) => q.devAgentId === a.id && q.status === "fixing") : void 0;
+      if (!resumesAfterRestart(a, preparing.has(a), this.backend.demo)) {
         this.appendLog(a, [{ kind: "system", text: "\u21BA The office server restarted. Starting over from the queue." }]);
         const rec = a.task === "qa" ? this.state.qa.find((q) => q.qaAgentId === a.id && q.status === "testing") : void 0;
         if (rec) this.setQa(rec, { status: "queued" });
-        const fix = a.task === "fix" ? this.state.qa.find((q) => q.devAgentId === a.id && q.status === "fixing") : void 0;
         if (fix) this.setQa(fix, { status: "failed" });
         this.clearTask(a);
         continue;
       }
       if (this.slotsFull()) continue;
-      void this.message(a.id, "The office server restarted while you were working. Check the state of your worktree and continue where you left off.").catch(
-        (err) => console.warn(`could not resume ${a.name}`, err)
-      );
+      void this.message(a.id, resumeNote(a, fix)).catch((err) => console.warn(`could not resume ${a.name}`, err));
     }
   }
   // ---------- views ----------
@@ -4470,10 +4558,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 fs10.mkdir(path12.dirname(STATE_FILE), { recursive: true });
+    await fs11.mkdir(path13.dirname(STATE_FILE), { recursive: true });
     const tmp = `${STATE_FILE}.tmp`;
-    await fs10.writeFile(tmp, JSON.stringify(this.state, null, 2));
-    await fs10.rename(tmp, STATE_FILE);
+    await fs11.writeFile(tmp, JSON.stringify(this.state, null, 2));
+    await fs11.rename(tmp, STATE_FILE);
   }
   // ---------- lookups ----------
   repo(id) {
@@ -4555,7 +4643,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 path12.join(root, name);
+    return path13.join(root, name);
   }
   /** A brand-new project: a folder in your projects folder, pushed to a new GitHub repo. */
   async createRepo(name, opts) {
@@ -4567,11 +4655,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() ? path12.resolve(dir.trim()) : this.state.settings.projectsDir;
+    const root = dir?.trim() ? path13.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) => path12.resolve(a).toLowerCase() === path12.resolve(b).toLowerCase();
+    const same = (a, b) => path13.resolve(a).toLowerCase() === path13.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) })) };
   }
@@ -4751,7 +4839,7 @@ var Swarm = class {
     rt.folderSync = status;
     this.emitRepo(repo);
     if (status && status !== before) {
-      const name = repo.localPath ? path12.basename(repo.localPath) : repo.fullName;
+      const name = repo.localPath ? path13.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}`);
     }
@@ -4975,7 +5063,7 @@ var Swarm = class {
     this.agentRt.get(id)?.terminal?.releaseIdle?.();
     this.agentRt.get(id)?.terminal?.dispose();
     void removeScreens(id);
-    void fs10.rm(terminalFile(id), { force: true }).catch(() => void 0);
+    void fs11.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;
@@ -5078,7 +5166,7 @@ var Swarm = class {
   }
   // ---------- terminals ----------
   async loadTerminal(agentId) {
-    if (!await fs10.stat(terminalFile(agentId)).catch(() => null)) return null;
+    if (!await fs11.stat(terminalFile(agentId)).catch(() => null)) return null;
     const t = this.newTerminal(agentId);
     await t.load(terminalFile(agentId));
     return t;
@@ -5244,7 +5332,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(() => fs10.mkdir(SCREENS_DIR, { recursive: true })).then(() => fs10.writeFile(screenFile(a.id, mime), data)).catch((err) => console.warn("could not save screenshot", err));
+          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));
         },
         limited: (at) => this.pauseForLimit(at),
         usageWarning: (info) => this.paceForWarning(info),
@@ -5264,7 +5352,7 @@ Note from the manager: ${note}` : ""
     void this.backend.releaseDesk(repo.fullName, this.agentSlug(a), this.port(a)).catch(() => void 0);
     if (result.interrupted) this.interrupted(a);
     if (a.task === "qa") await this.onQaFinished(a, repo, result);
-    else if (a.task === "fix") this.onFixFinished(a, repo, result);
+    else if (a.task === "fix") await this.onFixFinished(a, repo, result);
     else await this.onIssueFinished(a, repo, result);
     this.emitAgent(a);
     this.save();
@@ -5374,6 +5462,7 @@ Note from the manager: ${note}` : ""
     if (rec && (rec.status === "needs-human" || rec.status === "passed" || rec.status === "failed")) {
       rec.round += 1;
       rec.sessionFailures = 0;
+      rec.mergeNote = null;
     }
     const dev = this.state.agents.find((a) => a.repoId === repo.id && a.role === "dev" && a.task !== "qa" && (a.prNumber === prNumber || a.branch === pr.headRefName));
     this.queueQa(repo, prNumber, dev ?? null, pr.closesIssues[0] ?? null);
@@ -5565,7 +5654,8 @@ ${issue2.body.trim() || "(no description)"}` : ""
     this.setQa(rec, { status: "fixing", devAgentId: dev.id });
     this.beginTask(
       dev,
-      { task: "fix", issueNumber: rec.issueNumber, issueTitle: pull?.title ?? `PR #${rec.prNumber}`, branch: headRef, prNumber: rec.prNumber, prUrl: pull?.url ?? null },
+      // The session they held was another task's (QA, say); the author's own is resumed below, from rec.devSessionId.
+      { task: "fix", issueNumber: rec.issueNumber, issueTitle: pull?.title ?? `PR #${rec.prNumber}`, branch: headRef, prNumber: rec.prNumber, prUrl: pull?.url ?? null, sessionId: null },
       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`
     );
@@ -5610,8 +5700,9 @@ Full report with screenshots: ${rec.commentUrl}` : "",
     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);
   }
-  onFixFinished(a, repo, result) {
+  async onFixFinished(a, repo, result) {
     const rec = this.state.qa.find((q) => q.repoId === repo.id && q.prNumber === a.prNumber);
+    const head = rec && result.ok && a.status !== "stopped" && rec.fixReason !== "checks" ? await this.prHead(a, repo, rec.prNumber) : null;
     if (a.status === "stopped") {
       if (rec?.status === "fixing") this.setQa(rec, { status: "failed" });
       return;
@@ -5622,17 +5713,40 @@ Full report with screenshots: ${rec.commentUrl}` : "",
       if (rec) this.setQa(rec, { status: failures >= 2 ? "needs-human" : "failed", sessionFailures: failures });
       return;
     }
-    a.status = "done";
-    if (rec && (rec.fixReason === "checks" || rec.fixReason === "conflict")) {
-      this.appendLog(a, [{ kind: "done", text: `\u2714 PR #${a.prNumber} fixed in ${this.minutes(a)}m. Back in line to merge.` }]);
-      this.setQa(rec, { status: "passed", devSessionId: a.sessionId ?? rec.devSessionId, mergeNote: "waiting for fresh checks" });
-      this.toast("info", `${a.name} fixed PR #${rec.prNumber}; it merges once it passes again`);
+    if (!rec || !this.state.qa.includes(rec)) {
+      a.status = "done";
+      this.appendLog(a, [{ kind: "done", text: `\u2714 Fix pushed for PR #${a.prNumber} in ${this.minutes(a)}m. Back to QA.` }]);
       return;
     }
-    this.appendLog(a, [{ kind: "done", text: `\u2714 Fix pushed for PR #${a.prNumber} in ${this.minutes(a)}m. Back to QA.` }]);
-    if (rec) {
-      this.setQa(rec, { status: "queued", round: rec.round + 1, devSessionId: a.sessionId ?? rec.devSessionId });
-      this.toast("info", `${a.name} pushed fixes for PR #${rec.prNumber}; QA round ${rec.round} is queued`);
+    const step = fixOutcome(rec, head, this.minutes(a), !this.limited());
+    if (!step.pushed) {
+      const needsHuman = step.set.status === "needs-human";
+      a.status = "error";
+      a.lastError = `No new commits were pushed for PR #${rec.prNumber}`;
+      this.appendLog(a, [step.log]);
+      this.setQa(rec, step.set);
+      this.toast("error", `${a.name} ended the fix for PR #${rec.prNumber} without pushing a commit${needsHuman ? "; it needs you" : "; it goes back for another try"}`);
+      if (needsHuman) {
+        this.postMessage("office", `\u26A0\uFE0F PR #${rec.prNumber} on ${repo.fullName} went back for fixes, but ${step.set.sessionFailures} fix sessions in a row ended without pushing a commit, so it needs you.`);
+      }
+      return;
+    }
+    a.status = "done";
+    this.appendLog(a, [step.log]);
+    this.setQa(rec, { ...step.set, devSessionId: a.sessionId ?? rec.devSessionId });
+    this.toast(
+      "info",
+      step.set.status === "passed" ? `${a.name} fixed PR #${rec.prNumber}; it merges once it passes again` : `${a.name} pushed fixes for PR #${rec.prNumber}; QA round ${rec.round} is queued`
+    );
+  }
+  /** The PR's head commit now; null (with a warning in the agent's log) when GitHub can't be asked. */
+  async prHead(a, repo, prNumber) {
+    try {
+      return (await this.backend.prDetails(repo.fullName, prNumber)).headSha;
+    } catch (err) {
+      console.warn(`could not read the head of ${repo.fullName}#${prNumber}`, err);
+      this.appendLog(a, [{ kind: "system", text: `\u26A0 Could not check PR #${prNumber} for new commits (${oneLine(err)}); taking the fix at its word.` }]);
+      return null;
     }
   }
   /** A message for an agent: sent into their running session, or a follow-up that resumes it. typed: the manager typed it at their CLI's prompt, where it's already running. */
@@ -5674,7 +5788,7 @@ Full report with screenshots: ${rec.commentUrl}` : "",
     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 = path12.resolve(patch.projectsDir.trim());
+    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;
@@ -5953,13 +6067,14 @@ Full report with screenshots: ${rec.commentUrl}` : "",
     const u = this.officeUpdate;
     Object.assign(u, { sent: false, handedOver: false, requested: false, drainingSince: null });
     const interrupted = this.state.agents.filter((a) => BUSY.includes(a.status));
+    const preparing = new Set(interrupted.filter((a) => a.status === "preparing"));
     for (const a of interrupted) {
       Object.assign(a, { status: "stopped", lastError: "The office updated itself while this agent was working." });
       const rt = this.agentRt.get(a.id);
       if (rt) Object.assign(rt, { session: null, currentTool: null });
     }
     this.ensureCeo(interrupted);
-    this.recover(interrupted);
+    this.recover(interrupted, preparing);
     interrupted.forEach((a) => this.emitAgent(a));
     await this.reportUpdate(result);
     if (!result.ok) u.failedBehind = u.behind;
@@ -6120,7 +6235,7 @@ ${job.text}` } : job;
     this.emitAgent(a);
     this.emitCeo();
     this.save();
-    await fs10.mkdir(CEO_DIR, { recursive: true }).catch(() => void 0);
+    await fs11.mkdir(CEO_DIR, { recursive: true }).catch(() => void 0);
     if (a.status !== "working") {
       this.state.ceo.job = null;
       this.emitCeo();
@@ -6136,7 +6251,7 @@ ${job.text}` } : job;
           name: a.name,
           company: s.companyName,
           manager: s.managerName,
-          notesFile: path12.join(CEO_DIR, "NOTES.md"),
+          notesFile: path13.join(CEO_DIR, "NOTES.md"),
           sessionLimit: s.sessionLimit,
           teamCap: s.teamCap,
           hiring: s.hiring
@@ -6363,6 +6478,12 @@ ${t}`);
       const mark = `\u2026 (truncated, ${brief.length} chars; see agent_detail)`;
       return brief.slice(0, 400 - mark.length).trimEnd() + mark;
     };
+    const pending2 = this.state.requests.filter((r) => r.status === "pending");
+    const seats = (r, role) => seatCount(
+      MAX_DESKS[role],
+      this.state.agents.filter((a) => a.repoId === r.id && a.role === role).length,
+      pending2.filter((p) => p.kind === "hire" && p.repoId === r.id && p.role === role).length
+    );
     const floors = [...this.state.repos].sort((x, y) => x.floor - y.floor).map((r) => {
       const rt = this.repoRt.get(r.id);
       const open = new Set(rt.issues.map((i) => i.number));
@@ -6378,6 +6499,7 @@ ${t}`);
         autoAssign: r.autoAssign,
         autoMerge: r.autoMerge,
         folderSync: rt.folderSync,
+        seats: { dev: seats(r, "dev"), qa: seats(r, "qa") },
         capacity: {
           developers: this.state.agents.filter((a) => a.repoId === r.id && a.role === "dev").length,
           developersFree: this.available(r, "dev").length,
@@ -6431,10 +6553,11 @@ ${t}`);
           sessionLimit: s.sessionLimit || "none",
           sessionsRunning: this.running(),
           usage: usageLabel(this.usageNow(), Date.now()),
-          deskLimits: { dev: MAX_DESKS.dev, qa: MAX_DESKS.qa }
+          deskLimits: { dev: MAX_DESKS.dev, qa: MAX_DESKS.qa },
+          proposalLimit: { pending: pending2.length, max: MAX_PENDING_PROPOSALS }
         },
         floors,
-        pendingProposals: this.state.requests.filter((r) => r.status === "pending").map(req),
+        pendingProposals: pending2.map(req),
         recentDecisions: this.state.requests.filter((r) => r.status !== "pending").slice(-10).map(req)
       },
       null,
@@ -6493,7 +6616,7 @@ ${t}`);
     if (!title) throw new Error("A hire needs a job title.");
     const specialty = specialtySlug(x.specialty);
     const pending2 = this.state.requests.filter((r) => r.status === "pending");
-    if (pending2.length >= MAX_PENDING_REQUESTS) throw new Error(`${pending2.length} proposals are already waiting for the manager. Wait for their decisions first.`);
+    checkPendingLimit(pending2.length);
     const dup = pending2.find((r) => r.kind === "hire" && r.repoId === repo.id && r.role === role && r.specialty === specialty);
     if (dup) throw new Error(`${dup.name} (${dup.title}) is already proposed for floor ${repo.floor} with that specialty.`);
     const seated = this.state.agents.filter((a) => a.repoId === repo.id && a.role === role).length;
@@ -6541,7 +6664,7 @@ ${t}`);
     }
     const pending2 = this.state.requests.filter((r) => r.status === "pending");
     if (pending2.some((r) => r.kind === "let-go" && r.agentId === a.id)) throw new Error(`Letting ${a.name} go is already proposed.`);
-    if (pending2.length >= MAX_PENDING_REQUESTS) throw new Error(`${pending2.length} proposals are already waiting for the manager. Wait for their decisions first.`);
+    checkPendingLimit(pending2.length);
     const req = {
       id: crypto6.randomUUID(),
       kind: "let-go",
@@ -6742,10 +6865,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 = path13.resolve(import.meta.dirname, "../dist");
-if (fs11.existsSync(dist)) {
+var dist = path14.resolve(import.meta.dirname, "../dist");
+if (fs12.existsSync(dist)) {
   app.use(express.static(dist));
-  app.get(/^(?!\/api).*/, (_req, res) => res.sendFile(path13.join(dist, "index.html")));
+  app.get(/^(?!\/api).*/, (_req, res) => res.sendFile(path14.join(dist, "index.html")));
 }
 app.use((err, _req, res, _next) => {
   const parserStatus = err?.status;