cubefarm 0.3.7 → 0.3.8

package/dist-server/index.js

@@ -17,6 +17,7 @@ var DEMO = process.argv.includes("--demo") || process.env.SWARM_DEMO === "1" ||
 var STATE_FILE = path.join(HOME_DIR, DEMO ? "demo-state.json" : "state.json");
 var SYNC_INTERVAL_MS = 45e3;
 var SCHEDULER_INTERVAL_MS = 8e3;
+var DESK_SWEEP_INTERVAL_MS = 30 * 6e4;
 var LOG_BUFFER = 600;
 function defaultProjectsDir(appDir, home = os.homedir()) {
   if (!appDir.split(/[\\/]/).includes("node_modules")) return path.resolve(appDir, "..");
@@ -162,6 +163,9 @@ async function issueState(fullName, number) {
     return null;
   }
 }
+async function closeIssue(fullName, number, comment) {
+  await gh(["issue", "close", String(number), "-R", fullName, "--reason", "completed", "--comment", comment]);
+}
 async function editIssue(fullName, number, edit) {
   const args = ["issue", "edit", String(number), "-R", fullName];
   if (edit.body !== void 0) args.push("--body-file", "-");
@@ -296,6 +300,33 @@ function npmInstall(dir) {
   installs.set(dir, next);
   return next;
 }
+function porcelainPaths(porcelain) {
+  return porcelain.split(/\r?\n/).map((line) => /^([ MTADRCU?!]{1,2}) (.+)$/.exec(line)).filter((m) => m !== null).map(([, xy, file]) => /[RC]/.test(xy) ? /^(?:"(?:[^"\\]|\\.)*"|.*?) -> (.+)$/.exec(file)?.[1] ?? file : file);
+}
+function overwrittenPaths(stderr) {
+  const lines = stderr.split(/\r?\n/);
+  const start = lines.findIndex((l) => /would be overwritten by/.test(l));
+  if (start < 0) return [];
+  const files = [];
+  for (const line of lines.slice(start + 1)) {
+    if (!line.startsWith("	")) break;
+    files.push(line.trim());
+  }
+  return files.filter(Boolean);
+}
+function fileList(files, max = 3, maxChars = 120) {
+  const shown = [];
+  let length = 0;
+  for (const file of files.slice(0, max)) {
+    const name = file.length > maxChars ? `\u2026${file.slice(-(maxChars - 1))}` : file;
+    const add = name.length + (shown.length ? 2 : 0);
+    if (shown.length && length + add > maxChars) break;
+    shown.push(name);
+    length += add;
+  }
+  const more = files.length - shown.length;
+  return `${shown.join(", ")}${more ? ` +${more} more` : ""}`;
+}
 async function syncMain(fullName, defaultBranch, opts) {
   const dir = mainDir(fullName);
   const result = await withRepoLock(fullName, async () => {
@@ -313,12 +344,17 @@ async function syncMain(fullName, defaultBranch, opts) {
       if (behind === 0) return stays("in sync");
       if (Number(await g(["rev-list", "--count", `${target}..HEAD`])) > 0) return stays(`diverged: local commits, and ${commits} to pull`);
       if (!opts.touch) return { status: `update ready (${commits})`, behind, updatable: true };
-      if (await g(["status", "--porcelain", "--untracked-files=no"])) return { status: `${behind} behind: local changes`, behind, updatable: true };
+      const dirty = await g(["status", "--porcelain", "--untracked-files=no"]);
+      if (dirty) {
+        const files = porcelainPaths(dirty);
+        return { status: `${behind} behind: local changes${files.length ? ` in ${fileList(files)}` : ""}`, behind, updatable: true };
+      }
       const before = await g(["rev-parse", "HEAD"]);
       try {
         await g(["merge", "--ff-only", target], 12e4);
-      } catch {
-        return { status: `${behind} behind: local files are in the way`, behind, updatable: true };
+      } catch (err) {
+        const files = overwrittenPaths(err.stderr ?? "");
+        return { status: `${behind} behind: local files are in the way${files.length ? `: ${fileList(files)}` : ""}`, behind, updatable: true };
       }
       const changed = (await g(["diff", "--name-only", before, "HEAD"])).split(/\r?\n/);
       const install = changed.some((f) => f === "package.json" || f === "package-lock.json") && await exists(path2.join(dir, "package.json"));
@@ -463,9 +499,8 @@ function prepareDesk(fullName, base, agentSlug, branch) {
     return wt;
   });
 }
-function removeDesk(fullName, agentSlug) {
+function removeDesk(fullName, agentSlug, main = mainDir(fullName)) {
   return withRepoLock(fullName, async () => {
-    const main = mainDir(fullName);
     const wt = deskDir(fullName, agentSlug);
     if (!await exists(wt)) return;
     await git(["worktree", "remove", "--force", wt], { cwd: main }).catch(() => void 0);
@@ -473,6 +508,121 @@ function removeDesk(fullName, agentSlug) {
     await git(["worktree", "prune"], { cwd: main }).catch(() => void 0);
   });
 }
+var OLD_HOMES = [".office-swarm"];
+var OFFICE_BRANCH = /^(swarm\/issue-|qa\/pr-)/;
+function parseWorktrees(porcelain) {
+  const out = [];
+  for (const line of porcelain.split(/\r?\n/)) {
+    if (line.startsWith("worktree ")) out.push({ path: path2.resolve(line.slice(9)), branch: null, locked: false });
+    else if (!out.length) continue;
+    else if (line.startsWith("branch ")) out[out.length - 1].branch = line.slice(7).replace(/^refs\/heads\//, "");
+    else if (line === "locked" || line.startsWith("locked ")) out[out.length - 1].locked = true;
+  }
+  return out;
+}
+var samePath = (a, b) => process.platform === "win32" ? a.toLowerCase() === b.toLowerCase() : a === b;
+function isOfficeDesk(p, fullName, root) {
+  const desks = path2.dirname(p);
+  const repo = path2.dirname(desks);
+  const workspaces = path2.dirname(repo);
+  if (!samePath(path2.basename(desks), "desks") || !samePath(path2.basename(repo), fullName.replace("/", "__"))) return false;
+  if (samePath(workspaces, path2.resolve(root))) return true;
+  return path2.basename(workspaces) === "workspaces" && OLD_HOMES.some((h) => samePath(path2.basename(path2.dirname(workspaces)), h));
+}
+function planSweep(input, keep) {
+  const deskRoot = path2.join(path2.resolve(input.root), input.fullName.replace("/", "__"), "desks");
+  const kept = (p) => keep.desks.some((slug) => samePath(p, path2.join(deskRoot, slug)));
+  const worktrees = input.worktrees.slice(1).filter((w) => !w.locked && isOfficeDesk(w.path, input.fullName, input.root) && !kept(w.path));
+  const stays = input.worktrees.filter((w) => !worktrees.includes(w));
+  const folders = input.folders.filter((name) => {
+    const p = path2.join(deskRoot, name);
+    return !kept(p) && !input.worktrees.some((w) => samePath(w.path, p));
+  });
+  const branches = input.branches.filter((b) => OFFICE_BRANCH.test(b) && !keep.branches.includes(b) && !stays.some((w) => w.branch === b));
+  return { worktrees, folders, branches };
+}
+async function inUse(dir) {
+  const probe = `${dir}.sweep`;
+  try {
+    await fs2.rename(dir, probe);
+  } catch (err) {
+    return err.code !== "ENOENT";
+  }
+  await fs2.rename(probe, dir);
+  return false;
+}
+var stamp = (d) => `${d.getFullYear()}${String(d.getMonth() + 1).padStart(2, "0")}${String(d.getDate()).padStart(2, "0")}`;
+async function saveLeftovers(fullName, desk) {
+  const g = (args) => git(args, { cwd: desk, timeoutMs: 6e4 });
+  if (!await g(["rev-parse", "--verify", "-q", "HEAD"]).catch(() => "")) return null;
+  const dirty = await g(["status", "--porcelain", "--untracked-files=no"]);
+  const commits = Number(await g(["rev-list", "--count", "HEAD", "--not", "--remotes"]));
+  if (!dirty && !commits) return null;
+  const dir = path2.join(HOME_DIR, "leftovers", fullName.replace("/", "__"));
+  await fs2.mkdir(dir, { recursive: true });
+  const tmp = await fs2.mkdtemp(path2.join(dir, ".tmp-"));
+  try {
+    if (commits) await g(["format-patch", "-q", "-o", tmp, "HEAD", "--not", "--remotes"]);
+    if (dirty) await g(["diff", "HEAD", "--binary", `--output=${path2.join(tmp, "zz-uncommitted.patch")}`]);
+    const parts = (await fs2.readdir(tmp)).sort();
+    const base = `${path2.basename(desk)}-${stamp(/* @__PURE__ */ new Date())}`;
+    let file = path2.join(dir, `${base}.patch`);
+    for (let n = 2; await exists(file); n++) file = path2.join(dir, `${base}-${n}.patch`);
+    await fs2.writeFile(file, Buffer.concat(await Promise.all(parts.map((p) => fs2.readFile(path2.join(tmp, p))))));
+    return file;
+  } finally {
+    await removeDir(tmp).catch(() => void 0);
+  }
+}
+function sweepDesks(fullName, keep) {
+  return withRepoLock(fullName, async () => {
+    const result = { desks: 0, folders: 0, branches: 0, patches: [], skipped: [] };
+    const main = mainDir(fullName);
+    if (!await exists(path2.join(main, ".git"))) return result;
+    const g = (args) => git(args, { cwd: main, timeoutMs: 6e4 });
+    await g(["worktree", "prune"]);
+    const real = (p) => fs2.realpath(p).catch(() => p);
+    const worktrees = await Promise.all(parseWorktrees(await g(["worktree", "list", "--porcelain"])).map(async (w) => ({ ...w, path: await real(w.path) })));
+    const refs = await g(["for-each-ref", "--format=%(refname)", "refs/heads/swarm", "refs/heads/qa"]);
+    const branches = refs.split(/\r?\n/).filter(Boolean).map((r) => r.replace(/^refs\/heads\//, ""));
+    const root = await real(WORKSPACE_ROOT);
+    const deskRoot = path2.join(root, fullName.replace("/", "__"), "desks");
+    const folders = (await fs2.readdir(deskRoot, { withFileTypes: true }).catch(() => [])).filter((e) => e.isDirectory()).map((e) => e.name);
+    const plan = planSweep({ fullName, root, worktrees, branches, folders }, keep);
+    const held = /* @__PURE__ */ new Set();
+    for (const wt of plan.worktrees) {
+      try {
+        if (await inUse(wt.path)) throw new Error("in use");
+        const patch = await saveLeftovers(fullName, wt.path);
+        if (patch) result.patches.push(patch);
+        await g(["worktree", "remove", "--force", wt.path]).catch(() => void 0);
+        await removeDir(wt.path);
+        result.desks++;
+      } catch {
+        result.skipped.push(wt.path);
+        if (wt.branch) held.add(wt.branch);
+      }
+    }
+    await g(["worktree", "prune"]).catch(() => void 0);
+    for (const name of plan.folders) {
+      const dir = path2.join(deskRoot, name);
+      try {
+        if (await inUse(dir)) throw new Error("in use");
+        await removeDir(dir);
+        result.folders++;
+      } catch {
+        result.skipped.push(dir);
+      }
+    }
+    const doomed = plan.branches.filter((b) => !held.has(b));
+    for (let i = 0; i < doomed.length; i += 40) await g(["branch", "-D", ...doomed.slice(i, i + 40)]).catch(() => void 0);
+    if (doomed.length) {
+      const left = new Set((await g(["for-each-ref", "--format=%(refname)", "refs/heads/swarm", "refs/heads/qa"])).split(/\r?\n/));
+      result.branches = doomed.filter((b) => !left.has(`refs/heads/${b}`)).length;
+    }
+    return result;
+  });
+}
 var LAUNCHERS = ["node.exe", "cmd.exe", "bash.exe", "sh.exe", "conhost.exe", "python.exe", "npm.exe", "npx.exe", "bun.exe", "deno.exe"];
 var pathForms = (p) => [.../* @__PURE__ */ new Set([p, p.replaceAll("\\", "/"), p.replaceAll("\\", "\\\\")])];
 function leftoversInDesk(listing, desk, keep) {
@@ -2277,6 +2427,7 @@ var realBackend = {
   createIssue,
   issueState,
   editIssue,
+  closeIssue,
   mergePull,
   updateBranch,
   closePull,
@@ -2296,6 +2447,7 @@ var realBackend = {
   deskDir,
   prepareDesk,
   removeDesk,
+  sweepDesks,
   releaseDesk: (fullName, agentSlug, port) => releaseDesk(fullName, agentSlug, port, officeProcesses()),
   startSession: (opts, cb) => opts.terminal ? startCliSession(opts, cb) : startSession(opts, cb),
   terminals: terminalsAvailable,
@@ -2697,8 +2849,16 @@ function createDemoBackend() {
       mergedSinceSync.set(fullName, (mergedSinceSync.get(fullName) ?? 0) + 1);
       pr.state = "MERGED";
       pr.mergedAt = now();
-      for (const n of pr.closesIssues) closedIssues.add(`${fullName}#${n}`);
-      r.issues = r.issues.filter((i) => !pr.closesIssues.includes(i.number));
+      setTimeout(() => {
+        for (const n of pr.closesIssues) closedIssues.add(`${fullName}#${n}`);
+        r.issues = r.issues.filter((i) => !pr.closesIssues.includes(i.number));
+      }, 2e4).unref();
+    },
+    closeIssue: async (fullName, number) => {
+      const r = repos.get(fullName);
+      if (!r?.issues.some((i) => i.number === number)) throw new Error(`Issue #${number} is not open`);
+      closedIssues.add(`${fullName}#${number}`);
+      r.issues = r.issues.filter((i) => i.number !== number);
     },
     updateBranch: async (fullName, number) => {
       const pr = repos.get(fullName)?.pulls.find((p) => p.number === number);
@@ -2753,6 +2913,7 @@ Closes #${pr.closesIssues[0] ?? "?"}`,
       return dir;
     },
     removeDesk: async () => void 0,
+    sweepDesks: async () => ({ desks: 0, folders: 0, branches: 0, patches: [], skipped: [] }),
     releaseDesk: async () => void 0,
     startSession: (opts, cb) => {
       if (++sessionsStarted === USAGE_WARNING_AT) fakeUsageWarning(cb);
@@ -3517,6 +3678,25 @@ var HttpError = class extends Error {
   status;
 };
 
+// server/issueClaims.ts
+var RECENT_MERGE_MS = 6 * 60 * 6e4;
+function branchIssue(headRefName) {
+  const m = /^swarm\/issue-(\d+)-/.exec(headRefName);
+  return m ? Number(m[1]) : null;
+}
+function issuesResolvedBy(pr) {
+  const n = branchIssue(pr.headRefName);
+  return [...new Set(n == null ? pr.closesIssues : [...pr.closesIssues, n])];
+}
+function issueTaken(n, agents, pulls, now2) {
+  if (agents.some((a) => a.role === "dev" && a.task !== "qa" && a.issueNumber === n && a.status !== "idle" && a.status !== "error")) return true;
+  return pulls.some((p) => {
+    if (p.state === "CLOSED") return false;
+    if (p.state === "MERGED" && (!p.mergedAt || now2 - Date.parse(p.mergedAt) > RECENT_MERGE_MS)) return false;
+    return issuesResolvedBy(p).includes(n);
+  });
+}
+
 // server/mergeGate.ts
 var MAX_MERGE_FIXES = 3;
 var CHECKS_ALERT_MS = 30 * 6e4;
@@ -3724,6 +3904,7 @@ var Previews = class {
   }
   /** The floor is leaving the building: stop its preview and remove the preview worktree. */
   async remove(f) {
+    const main = this.backend.mainDir(f.fullName);
     const r = this.runs.get(f.id);
     if (r) {
       r.gen++;
@@ -3732,7 +3913,7 @@ var Previews = class {
     this.runs.delete(f.id);
     this.hasDefault.delete(f.id);
     clearTimeout(this.emitTimers.get(f.id));
-    await this.backend.removeDesk(f.fullName, PREVIEW_SLUG).catch(() => void 0);
+    await this.backend.removeDesk(f.fullName, PREVIEW_SLUG, main).catch(() => void 0);
   }
   /** Server shutdown: stop every running preview. */
   async stopAll(floors) {
@@ -3777,6 +3958,95 @@ var Previews = class {
   }
 };
 
+// server/prompts.ts
+var PLACEHOLDERS = {
+  worktree: "<your worktree>",
+  issue: "<issue>",
+  pr: "<PR>",
+  prTitle: "<PR title>",
+  prUrl: "<PR URL>",
+  branch: "<branch>"
+};
+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 }) {
+  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 [
+    `You are ${a.name}, ${a.title ? `the team's ${a.title},` : "a software engineer"} on an autonomous agent team ("cubefarm"). Several teammates work in parallel on other issues of the same repository, each in their own git worktree. Nobody is watching live to answer questions, so make sensible decisions yourself and record assumptions in the PR description. The manager may occasionally send you messages; follow their instructions.`,
+    `Every pull request is reviewed and tested by a QA teammate. ${repo.autoMerge ? "Once they sign off and GitHub's checks pass, the office merges it by itself" : "Once they sign off, the manager merges it"}. If they find problems, or checks fail, or it conflicts with the default branch, you will get the details; fix them on the same branch.`,
+    a.brief ? `
+Your job description:
+${a.brief}` : "",
+    "",
+    `Repository: ${repo.fullName} (default branch: ${repo.defaultBranch})`,
+    repo.summary ? `Project: ${repo.summary}` : "",
+    repo.mission ? `What the team is building (the manager's brief): ${repo.mission}` : "",
+    `Your worktree: ${cwd}`,
+    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")}` : "",
+    "",
+    "Workflow:",
+    "1. Read the issue and explore the relevant code before changing anything.",
+    "2. Implement the change with focused commits and clear messages.",
+    "3. Run the project's existing tests, linters and build (if any) and fix what you broke. Install dependencies first if needed.",
+    repo.browserTesting ? `4. If the project has a web UI, start its dev server in the background on port ${port} (reserved for you, so you don't collide with teammates), then check your change with the Playwright browser tools (mcp__playwright__browser_navigate, browser_snapshot, browser_click, browser_take_screenshot). Stop the dev server when you're done.` : "4. Verify the behaviour you changed as directly as you can.",
+    `5. Push: ${push}`,
+    fixing ? "6. Reply with a short summary of what you fixed." : `6. Open a pull request with the GitHub CLI: gh pr create --base ${repo.defaultBranch} --head ${branch} --title "<concise title>" --body "<what changed, how you verified it, assumptions>". The body must contain "Closes #<issue number>".`,
+    fixing ? "" : "7. End your final message with the pull request URL on its own line.",
+    "",
+    "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 }) {
+  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:
+${a.brief}`] : [],
+    ...a.role === "dev" ? ["", "You're a developer covering for the QA lab while its testers are busy. You didn't write this pull request: test it as an independent QA engineer would."] : [],
+    "",
+    `Repository: ${repo.fullName} (default branch: ${repo.defaultBranch})`,
+    ...repo.summary ? [`Project: ${repo.summary}`] : [],
+    ...repo.mission ? [`What the team is building (the manager's brief): ${repo.mission}`] : [],
+    ...repo.qaBrief ? [`What to check on this project (from the CEO):
+${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}.`,
+    "",
+    "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).",
+    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.",
+    "",
+    "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");
+}
+var OFFICE = "Office instructions";
+var MARK = "\0job description\0";
+function promptParts(build, brief) {
+  if (!brief) return [{ label: OFFICE, text: build(""), editable: false }];
+  const [before, after] = build(MARK).split(MARK);
+  return [
+    { label: OFFICE, text: before, editable: false },
+    { label: "Job description", text: brief, editable: true },
+    { label: OFFICE, text: after, editable: false }
+  ].filter((p) => p.text !== "");
+}
+var view = (kind, parts) => ({ kind, text: parts.map((p) => p.text).join(""), parts });
+function devPromptPreview({ slug, ...i }) {
+  const branch = devBranch(PLACEHOLDERS.issue, slug);
+  return view("dev", promptParts((brief) => devSystemPrompt({ ...i, agent: { ...i.agent, brief }, cwd: PLACEHOLDERS.worktree, branch }), i.agent.brief));
+}
+function qaPromptPreview({ slug, ...i }) {
+  const pr = { number: PLACEHOLDERS.pr, title: PLACEHOLDERS.prTitle, headRefName: PLACEHOLDERS.branch, url: PLACEHOLDERS.prUrl };
+  const branch = qaBranch(PLACEHOLDERS.pr, slug);
+  return view("qa", promptParts((brief) => qaSystemPrompt({ ...i, agent: { ...i.agent, brief }, cwd: PLACEHOLDERS.worktree, branch, pr }), i.agent.brief));
+}
+var ceoPromptPreview = (text) => view("ceo", [{ label: OFFICE, text, editable: false }]);
+
 // server/pacing.ts
 var PACING_MS = 60 * 6e4;
 var DEFAULT_PACING_SESSIONS = 3;
@@ -4363,6 +4633,7 @@ var Swarm = class {
     setInterval(() => this.state.repos.forEach((r, i) => setTimeout(() => void this.syncRepo(r.id), i * 1500)), SYNC_INTERVAL_MS);
     setInterval(() => this.schedule(), SCHEDULER_INTERVAL_MS);
     setInterval(() => void this.saveTerminals(), TERMINAL_SAVE_MS);
+    setInterval(() => this.state.repos.forEach((r, i) => setTimeout(() => void this.sweepFloor(r.id), i * 1500)), DESK_SWEEP_INTERVAL_MS);
     void this.backend.detectClis().then((clis) => {
       this.clis = clis;
       this.broadcast({ type: "clis", clis });
@@ -4805,8 +5076,29 @@ var Swarm = class {
       return this.mergeNote(rec, `merge blocked: ${error}`);
     }
     this.toast("success", `\u{1F500} Merged PR #${pr.number} into ${repo.defaultBranch}: ${pr.title}`);
+    await this.closeResolvedIssues(repo, pr.number, pr);
     return true;
   }
+  /**
+   * After the office merges a PR: close the issues it resolves now rather than waiting for GitHub's "Closes #N" (which
+   * lags, and never comes when the link wasn't recognised), so the scheduler doesn't hand them out again. Never throws.
+   */
+  async closeResolvedIssues(repo, prNumber, pr) {
+    const numbers = issuesResolvedBy(pr);
+    const rt = this.repoRt.get(repo.id);
+    if (rt && rt.issues.some((i) => numbers.includes(i.number))) {
+      rt.issues = rt.issues.filter((i) => !numbers.includes(i.number));
+      this.emitRepo(repo);
+    }
+    for (const n of numbers) {
+      try {
+        if (await this.backend.issueState(repo.fullName, n) !== "OPEN") continue;
+        await this.backend.closeIssue(repo.fullName, n, `Shipped in #${prNumber}`);
+      } catch (err) {
+        console.warn(`could not close ${repo.fullName}#${n} after merging #${prNumber}`, err);
+      }
+    }
+  }
   /** Show where auto-merge stands on a PR's card. Doesn't count as a change to the record. */
   mergeNote(rec, text) {
     if (rec.mergeNote !== text) {
@@ -4849,6 +5141,31 @@ var Swarm = class {
   async syncFolderNow(repoId2) {
     return { folderSync: await this.syncFolder(this.repo(repoId2)) };
   }
+  /** Remove the floor's desks, desk folders and swarm/qa branches nobody uses any more; say so when something went. */
+  async sweepFloor(repoId2) {
+    const repo = this.state.repos.find((r) => r.id === repoId2);
+    const rt = this.repoRt.get(repoId2);
+    if (!repo || !rt || rt.cloneStatus !== "ready") return;
+    try {
+      const pulls = rt.lastSync ? rt.pulls : await this.backend.listPulls(repo.fullName);
+      const agents = this.state.agents.filter((a) => a.repoId === repo.id);
+      const keep = {
+        desks: [...agents.map((a) => this.agentSlug(a)), PREVIEW_SLUG],
+        branches: [...agents.flatMap((a) => a.branch ? [a.branch] : []), ...pulls.filter((p) => p.state === "OPEN").map((p) => p.headRefName)]
+      };
+      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])})` : "";
+      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 ");
+      const text = `\u{1F9F9} ${repo.fullName.split("/")[1]}: removed ${removed}${saved}`;
+      this.toast("info", text);
+      this.postMessage("office", text);
+    } catch (err) {
+      console.warn(`desk sweep ${repo.fullName} failed: ${oneLine(err)}`);
+    }
+  }
   // ---------- the floor's app (preview monitor) ----------
   /** Run the floor's app from its preview worktree: the default branch, or an open PR. Replaces what it is running now. */
   async startPreview(id, pr) {
@@ -4879,6 +5196,7 @@ var Swarm = class {
       await this.backend.ensureClone(repo.fullName);
       rt.cloneStatus = "ready";
       void this.previews.refreshDefault(repo);
+      void this.sweepFloor(id);
     } catch (err) {
       rt.cloneStatus = "error";
       rt.cloneError = err.message;
@@ -4954,8 +5272,10 @@ var Swarm = class {
   }
   async mergePull(repoId2, number, method = "squash") {
     const repo = this.repo(repoId2);
+    const pr = this.repoRt.get(repo.id)?.pulls.find((p) => p.number === number) ?? await this.backend.prDetails(repo.fullName, number);
     await this.backend.mergePull(repo.fullName, number, method);
     this.toast("success", `Merged PR #${number} into ${repo.defaultBranch}`);
+    await this.closeResolvedIssues(repo, number, pr);
     await this.syncRepo(repo.id);
     setTimeout(() => this.schedule(), 200);
   }
@@ -5072,7 +5392,8 @@ var Swarm = class {
     const repo = this.state.repos.find((r) => r.id === a.repoId);
     if (repo) {
       const slug = this.agentSlug(a);
-      void this.backend.releaseDesk(repo.fullName, slug, this.port(a)).then(() => this.backend.removeDesk(repo.fullName, slug)).catch(() => void 0);
+      const main = this.backend.mainDir(repo.fullName);
+      void this.backend.releaseDesk(repo.fullName, slug, this.port(a)).then(() => this.backend.removeDesk(repo.fullName, slug, main)).catch(() => void 0).then(() => this.sweepFloor(repo.id));
     }
     this.state.agents = this.state.agents.filter((x) => x.id !== id);
     this.agentRt.delete(id);
@@ -5116,9 +5437,12 @@ var Swarm = class {
     this.save();
   }
   issueTaken(repo, n) {
-    if (this.state.agents.some((a) => a.repoId === repo.id && a.role === "dev" && a.task !== "qa" && a.issueNumber === n && a.status !== "idle" && a.status !== "error")) return true;
-    const pulls = this.repoRt.get(repo.id)?.pulls ?? [];
-    return pulls.some((p) => p.state === "OPEN" && (p.closesIssues.includes(n) || p.headRefName.startsWith(`swarm/issue-${n}-`)));
+    return issueTaken(
+      n,
+      this.state.agents.filter((a) => a.repoId === repo.id),
+      this.repoRt.get(repo.id)?.pulls ?? [],
+      Date.now()
+    );
   }
   ensureSlot() {
     if (this.slotsFull()) {
@@ -5197,34 +5521,18 @@ var Swarm = class {
     t.attach(ws);
   }
   buildSystemAppend(a, repo, cwd, branch, fixing) {
-    const linked = this.linkedRepos(repo).map((r) => `- ${r.fullName}: read-only reference clone at ${this.backend.mainDir(r.fullName)}`);
-    const push = fixing ? `git push origin HEAD:${fixing.headRef}` : `git push -u origin ${branch}`;
-    return [
-      `You are ${a.name}, ${a.title ? `the team's ${a.title},` : "a software engineer"} on an autonomous agent team ("cubefarm"). Several teammates work in parallel on other issues of the same repository, each in their own git worktree. Nobody is watching live to answer questions, so make sensible decisions yourself and record assumptions in the PR description. The manager may occasionally send you messages; follow their instructions.`,
-      `Every pull request is reviewed and tested by a QA teammate. ${repo.autoMerge ? "Once they sign off and GitHub's checks pass, the office merges it by itself" : "Once they sign off, the manager merges it"}. If they find problems, or checks fail, or it conflicts with the default branch, you will get the details; fix them on the same branch.`,
-      a.brief ? `
-Your job description:
-${a.brief}` : "",
-      "",
-      `Repository: ${repo.fullName} (default branch: ${repo.defaultBranch})`,
-      repo.summary ? `Project: ${repo.summary}` : "",
-      repo.mission ? `What the team is building (the manager's brief): ${repo.mission}` : "",
-      `Your worktree: ${cwd}`,
-      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})`,
-      linked.length ? `Related repositories you may read for context (do not modify them):
-${linked.join("\n")}` : "",
-      "",
-      "Workflow:",
-      "1. Read the issue and explore the relevant code before changing anything.",
-      "2. Implement the change with focused commits and clear messages.",
-      "3. Run the project's existing tests, linters and build (if any) and fix what you broke. Install dependencies first if needed.",
-      repo.browserTesting ? `4. If the project has a web UI, start its dev server in the background on port ${this.port(a)} (reserved for you, so you don't collide with teammates), then check your change with the Playwright browser tools (mcp__playwright__browser_navigate, browser_snapshot, browser_click, browser_take_screenshot). Stop the dev server when you're done.` : "4. Verify the behaviour you changed as directly as you can.",
-      `5. Push: ${push}`,
-      fixing ? "6. Reply with a short summary of what you fixed." : `6. Open a pull request with the GitHub CLI: gh pr create --base ${repo.defaultBranch} --head ${branch} --title "<concise title>" --body "<what changed, how you verified it, assumptions>". The body must contain "Closes #<issue number>".`,
-      fixing ? "" : "7. End your final message with the pull request URL on its own line.",
-      "",
-      "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");
+    return devSystemPrompt({ agent: a, repo, port: this.port(a), cwd, branch, linked: this.linkedDirs(repo), fixing });
+  }
+  linkedDirs(repo) {
+    return this.linkedRepos(repo).map((r) => ({ fullName: r.fullName, dir: this.backend.mainDir(r.fullName) }));
+  }
+  /** What an agent is told on a task, previewed with placeholders for the task's details. */
+  agentPrompt(id) {
+    const a = this.agent(id);
+    if (a.role === "ceo") return ceoPromptPreview(ceoSystemPrompt(this.ceoPromptInput(a)));
+    const repo = this.repo(a.repoId);
+    const base = { agent: a, repo, port: this.port(a), slug: slugify(a.name) };
+    return a.role === "qa" ? qaPromptPreview(base) : devPromptPreview({ ...base, linked: this.linkedDirs(repo) });
   }
   beginTask(a, patch, banner, preparing) {
     const rt = this.agentRt.get(a.id);
@@ -5267,7 +5575,7 @@ ${linked.join("\n")}` : "",
     }
   }
   async runTask(a, repo, issue2, note) {
-    const branch = `swarm/issue-${issue2.number}-${slugify(a.name)}`;
+    const branch = devBranch(issue2.number, slugify(a.name));
     this.beginTask(
       a,
       { task: "issue", issueNumber: issue2.number, issueTitle: issue2.title, branch, prNumber: null, prUrl: null, sessionId: null },
@@ -5469,32 +5777,10 @@ Note from the manager: ${note}` : ""
     this.toast("info", `PR #${prNumber} is queued for QA`);
   }
   buildQaSystemAppend(a, repo, cwd, branch, pr) {
-    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:
-${a.brief}`] : [],
-      ...a.role === "dev" ? ["", "You're a developer covering for the QA lab while its testers are busy. You didn't write this pull request: test it as an independent QA engineer would."] : [],
-      "",
-      `Repository: ${repo.fullName} (default branch: ${repo.defaultBranch})`,
-      ...repo.summary ? [`Project: ${repo.summary}`] : [],
-      ...repo.mission ? [`What the team is building (the manager's brief): ${repo.mission}`] : [],
-      ...repo.qaBrief ? [`What to check on this project (from the CEO):
-${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}.`,
-      "",
-      "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).",
-      repo.browserTesting ? `4. If the project has a UI, start it in the background on port ${this.port(a)} (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.",
-      "",
-      "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");
+    return qaSystemPrompt({ agent: a, repo, port: this.port(a), cwd, branch, pr });
   }
   async runQa(a, repo, rec) {
-    const branch = `qa/pr-${rec.prNumber}-${slugify(a.name)}`;
+    const branch = qaBranch(rec.prNumber, slugify(a.name));
     this.setQa(rec, { status: "testing", qaAgentId: a.id });
     this.beginTask(
       a,
@@ -6010,11 +6296,11 @@ Full report with screenshots: ${rec.commentUrl}` : "",
   }
   emitOfficeUpdate() {
     if (!this.officeHead) return;
-    const view = this.officeUpdateView();
-    const key = JSON.stringify(view);
+    const view2 = this.officeUpdateView();
+    const key = JSON.stringify(view2);
     if (key === this.lastOfficeView) return;
     this.lastOfficeView = key;
-    this.broadcast({ type: "officeUpdate", officeUpdate: view });
+    this.broadcast({ type: "officeUpdate", officeUpdate: view2 });
   }
   /** The own-folder check found the office this many commits behind GitHub. */
   setOfficeBehind(behind) {
@@ -6168,11 +6454,11 @@ Full report with screenshots: ${rec.commentUrl}` : "",
   }
   ceoInfo() {
     const c = this.state.ceo;
-    const view = (j) => ({ kind: j.kind, label: jobLabel(j, this.ceoFloor(j.repoId)) });
+    const view2 = (j) => ({ kind: j.kind, label: jobLabel(j, this.ceoFloor(j.repoId)) });
     const min = this.state.settings.ceoHeartbeatMin;
     return {
-      queue: c.queue.map(view),
-      job: c.job ? view(c.job) : null,
+      queue: c.queue.map(view2),
+      job: c.job ? view2(c.job) : null,
       lastReviewAt: c.lastReviewAt,
       nextReviewAt: min > 0 && c.lastReviewAt ? c.lastReviewAt + min * 6e4 : null
     };
@@ -6216,6 +6502,10 @@ ${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 };
+  }
   async runCeoJob(a, job) {
     const rt = this.agentRt.get(a.id);
     const floor = this.ceoFloor(job.repoId);
@@ -6241,21 +6531,12 @@ ${job.text}` } : job;
       this.emitCeo();
       return;
     }
-    const s = this.state.settings;
     const how = this.sessionRuntime(a, job.kind === "chat" ? a.sessionId ?? void 0 : void 0);
     rt.session = this.backend.startSession(
       {
         cwd: CEO_DIR,
         prompt: ceoJobPrompt(job, floor),
-        systemAppend: ceoSystemPrompt({
-          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
-        }),
+        systemAppend: ceoSystemPrompt(this.ceoPromptInput(a)),
         model: a.model || CEO_MODEL,
         effort: a.effort || CEO_EFFORT,
         browserTesting: false,
@@ -6848,6 +7129,7 @@ app.post("/api/agents/:id/assign", route((req) => swarm.assign(String(req.params
 app.post("/api/agents/:id/stop", route((req) => swarm.stopAgent(String(req.params.id))));
 app.post("/api/agents/:id/reset", route((req) => swarm.resetAgent(String(req.params.id))));
 app.post("/api/agents/:id/message", route((req) => swarm.message(String(req.params.id), str(req.body.text))));
+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();