cubefarm 0.3.8 → 0.3.9

package/dist/index.html

@@ -8,7 +8,7 @@
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link href="https://fonts.googleapis.com/css2?family=Fredoka:wght@400;500;600;700&family=JetBrains+Mono:wght@400;600&display=swap" rel="stylesheet" />
-    <script type="module" crossorigin src="/assets/index-B7sInPPW.js"></script>
+    <script type="module" crossorigin src="/assets/index-g6QWWXij.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-CIr98Zaa.css">
   </head>
   <body>

package/dist-server/index.js

@@ -194,8 +194,10 @@ async function prForBranch(fullName, branch) {
   const list = await ghJson(["pr", "list", "-R", fullName, "--head", branch, "--state", "all", "--json", "number,url", "--limit", "1"]);
   return list[0] ?? null;
 }
+var uniqueNames = (checks) => [...new Set(checks.map(checkName))];
 async function prDetails(fullName, number) {
-  const raw = await ghJson(["pr", "view", String(number), "-R", fullName, "--json", "number,title,body,url,headRefName,headRefOid,isCrossRepository,closingIssuesReferences,state,mergeable,mergeStateStatus"]);
+  const raw = await ghJson(["pr", "view", String(number), "-R", fullName, "--json", "number,title,body,url,headRefName,headRefOid,isCrossRepository,closingIssuesReferences,state,mergeable,mergeStateStatus,statusCheckRollup"]);
+  const rollup = raw.statusCheckRollup ?? [];
   return {
     number: raw.number,
     title: raw.title,
@@ -207,7 +209,11 @@ async function prDetails(fullName, number) {
     closesIssues: (raw.closingIssuesReferences ?? []).map((r) => r.number),
     state: raw.state,
     mergeable: raw.mergeable,
-    mergeState: raw.mergeStateStatus || "UNKNOWN"
+    mergeState: raw.mergeStateStatus || "UNKNOWN",
+    checks: checksOf(rollup),
+    checkNames: uniqueNames(rollup),
+    failedChecks: uniqueNames(rollup.filter(failed)),
+    pendingChecks: uniqueNames(rollup.filter(pending))
   };
 }
 async function issueDetails(fullName, number) {
@@ -457,7 +463,32 @@ async function createProject(root, name, opts) {
 async function removeDir(dir) {
   await fs2.rm(dir, { recursive: true, force: true, maxRetries: 8, retryDelay: 250 });
 }
-function prepareDesk(fullName, base, agentSlug, branch) {
+var STALE_LOCK_MS = 10 * 6e4;
+async function staleIndexLock(wt) {
+  const ref = (await fs2.readFile(path2.join(wt, ".git"), "utf8").catch(() => "")).match(/gitdir:\s*(.+)/)?.[1]?.trim();
+  if (!ref) return null;
+  const lock = path2.join(path2.resolve(wt, ref), "index.lock");
+  const stat = await fs2.stat(lock).catch(() => null);
+  return stat && Date.now() - stat.mtimeMs > STALE_LOCK_MS ? lock : null;
+}
+async function reuseDesk(wt, branch, ref) {
+  await git(["checkout", "--force", "-B", branch, ref], { cwd: wt });
+  await git(["reset", "--hard", ref], { cwd: wt });
+  await git(["clean", "-fd"], { cwd: wt }).catch(() => void 0);
+}
+async function clearDeskFolder(wt) {
+  try {
+    await removeDir(wt);
+  } catch (err) {
+    const left = await fs2.readdir(wt).catch(() => null);
+    if (left?.length !== 0) {
+      throw new Error(
+        `Could not clear the desk folder ${wt}: ${err.message}. A program started by the previous task is probably still running there. Close it and try again.`
+      );
+    }
+  }
+}
+function prepareDesk(fullName, base, agentSlug, branch, note) {
   return withRepoLock(fullName, async () => {
     const main = mainDir(fullName);
     await git(["fetch", "origin", "--prune"], { cwd: main, timeoutMs: 18e4 });
@@ -476,22 +507,25 @@ function prepareDesk(fullName, base, agentSlug, branch) {
     const wt = deskDir(fullName, agentSlug);
     if (await exists(path2.join(wt, ".git"))) {
       try {
-        await git(["checkout", "--force", "-B", branch, ref], { cwd: wt });
-        await git(["reset", "--hard", ref], { cwd: wt });
-        await git(["clean", "-fd"], { cwd: wt }).catch(() => void 0);
+        try {
+          await reuseDesk(wt, branch, ref);
+        } catch (err) {
+          const lock = /index\.lock/.test(err.message) ? await staleIndexLock(wt) : null;
+          if (!lock) throw err;
+          await fs2.rm(lock, { force: true, maxRetries: 3 });
+          note?.(`Removed a stale git lock (${lock}) left in the desk.`);
+          await reuseDesk(wt, branch, ref);
+        }
         return wt;
-      } catch {
+      } catch (err) {
+        const why = `Couldn't reuse the desk in place, so it's rebuilt: ${err.message}`;
+        console.warn(`${wt}: ${why}`);
+        note?.(why);
       }
     }
     if (await exists(wt)) {
       await git(["worktree", "remove", "--force", wt], { cwd: main }).catch(() => void 0);
-      try {
-        await removeDir(wt);
-      } catch (err) {
-        throw new Error(
-          `Could not clear the desk folder ${wt}: ${err.message}. A program started by the previous task is probably still running there. Close it and try again.`
-        );
-      }
+      await clearDeskFolder(wt);
     }
     await git(["worktree", "prune"], { cwd: main });
     await fs2.mkdir(path2.dirname(wt), { recursive: true });
@@ -1702,12 +1736,13 @@ function endLive(live) {
   routes.delete(live.token);
   live.term.releaseIdle = null;
   live.term.bind(null);
-  const gone = live.proc ? exitOf(live.proc) : void 0;
+  const gone = live.proc ? exitOf(live.proc) : Promise.resolve();
   live.proc?.kill();
   live.proc = null;
   live.term.note(`\u2500\u2500 ${cliLabel(live.cli)} session ended \u2500\u2500`);
   fs7.rm(live.dir, { recursive: true, force: true, maxRetries: 5 }, () => void 0);
-  return live.cli === "codex" && live.resumeId ? codexThread("archive", live.resumeId, gone) : Promise.resolve();
+  if (live.cli === "codex" && live.resumeId) void codexThread("archive", live.resumeId, gone);
+  return gone;
 }
 var metaOf = (l) => ({ agentId: l.agentId, cli: l.cli, token: l.token, dir: l.dir, resumeId: l.resumeId, busy: !!l.session });
 var remember = (l) => l.proc?.setMeta(metaOf(l));
@@ -2551,18 +2586,25 @@ function devScript(opts, cb, issueNumber, issueTitle) {
     [{ kind: "tool", tool: "Bash", text: `\u23FA $ gh pr create --title "${issueTitle}" --body "Closes #${issueNumber}"` }]
   ];
 }
-function qaScript(cb, pr, title, round) {
+function qaScript(cb, pr, title, round, checks) {
   const port = 5600 + pr % 50;
   const hue = pr * 41 % 360;
-  return [
-    [{ kind: "text", text: `\u25CF Testing PR #${pr} "${title}" (round ${round}). First, the acceptance criteria from the issue.` }],
-    [{ kind: "tool", tool: "Bash", text: "\u23FA $ git diff origin/main...HEAD --stat" }, { kind: "result", text: "  \u23BF  3 files changed, 82 insertions(+), 9 deletions(-)" }],
+  const verify = checks.endsWith(": none") ? [
     [{ kind: "tool", tool: "Bash", text: "\u23FA $ npm ci && npm test -- --run" }],
     [
       { kind: "result", text: "  \u23BF Test Files  8 passed (8)" },
       { kind: "result", text: "    Tests  41 passed (41)" }
     ],
-    [{ kind: "tool", tool: "Bash", text: "\u23FA $ npm run lint && npm run build" }, { kind: "result", text: "  \u23BF \u2713 built in 1.84s" }],
+    [{ kind: "tool", tool: "Bash", text: "\u23FA $ npm run lint && npm run build" }, { kind: "result", text: "  \u23BF \u2713 built in 1.84s" }]
+  ] : [
+    [{ kind: "tool", tool: "Read", text: "\u23FA Read .github/workflows/ci.yml" }, { kind: "result", text: "  \u23BF Read 41 lines" }],
+    [{ kind: "text", text: "\u25CF CI already runs the tests, lint and build, so I only need a build to start the app." }],
+    [{ kind: "tool", tool: "Bash", text: "\u23FA $ npm ci && npm run build" }, { kind: "result", text: "  \u23BF \u2713 built in 1.84s" }]
+  ];
+  return [
+    [{ kind: "text", text: `\u25CF Testing PR #${pr} "${title}" (round ${round}). ${checks}. First, the acceptance criteria from the issue.` }],
+    [{ kind: "tool", tool: "Bash", text: "\u23FA $ git diff origin/main...HEAD --stat" }, { kind: "result", text: "  \u23BF  3 files changed, 82 insertions(+), 9 deletions(-)" }],
+    ...verify,
     [{ kind: "tool", tool: "Bash", text: `\u23FA $ npm run preview -- --port ${port} &` }, { kind: "result", text: `  \u23BF Local: http://localhost:${port}/` }],
     () => cb.browserUrl(`http://localhost:${port}/`),
     [{ kind: "tool", tool: "mcp__playwright__browser_navigate", text: `\u23FA \u{1F310} navigate http://localhost:${port}/` }, { kind: "result", text: `  \u23BF Page URL: http://localhost:${port}/` }],
@@ -2598,7 +2640,8 @@ function fakeSession(opts, cb, fullName) {
     { kind: "system", text: `\u273B Claude Code (demo) \xB7 ${opts.model} \xB7 ${opts.effort} effort` },
     { kind: "system", text: `  cwd ${opts.cwd}` }
   ];
-  const body = kind === "qa" ? qaScript(cb, number, title, round) : kind === "fix" ? fixScript(number, pushes) : devScript(opts, cb, number, title);
+  const checks = opts.prompt.match(/^GitHub checks right now: .*$/m)?.[0] ?? "GitHub checks right now: none";
+  const body = kind === "qa" ? qaScript(cb, number, title, round, checks) : kind === "fix" ? fixScript(number, pushes) : devScript(opts, cb, number, title);
   const script = [header, ...body];
   const finish = () => {
     const costUsd = 0.3 + Math.random();
@@ -2887,7 +2930,11 @@ Closes #${pr.closesIssues[0] ?? "?"}`,
         closesIssues: pr.closesIssues,
         state: pr.state,
         mergeable: pr.mergeable,
-        mergeState: pr.mergeState
+        mergeState: pr.mergeState,
+        checks: pr.checks,
+        checkNames: pr.checks === "none" ? [] : ["CI / build", "Vercel"],
+        failedChecks: pr.failedChecks.map((c) => c.name),
+        pendingChecks: pr.pendingChecks
       };
     },
     issueDetails: async (fullName, number) => {
@@ -3649,6 +3696,13 @@ function specialtySlug(s) {
 }
 var specialtyLabel = (slug) => `swarm:${slug}`;
 
+// server/deskSetup.ts
+async function setUpDesk(term, steps) {
+  await term?.releaseIdle?.();
+  await steps.release();
+  return steps.prepare();
+}
+
 // server/fixOutcome.ts
 var MAX_FIX_FAILURES = 2;
 function fixOutcome(rec, head, minutes, counts = true) {
@@ -3663,7 +3717,7 @@ function fixOutcome(rec, head, minutes, counts = true) {
       pushed: false
     };
   }
-  if (rec.fixReason === "checks" || rec.fixReason === "conflict") {
+  if (rec.fixReason === "checks" || rec.fixReason === "conflict" && rec.passedSha) {
     return { set: { status: "passed", sessionFailures: 0, mergeNote: "waiting for fresh checks" }, log: { kind: "done", text: `\u2714 PR #${pr} fixed in ${minutes}m. Back in line to merge.` }, pushed: true };
   }
   return { set: { status: "queued", round: rec.round + 1, sessionFailures: 0 }, log: { kind: "done", text: `\u2714 Fix pushed for PR #${pr} in ${minutes}m. Back to QA.` }, pushed: true };
@@ -3736,6 +3790,57 @@ function orphanedQa(qa, agents, busy) {
   );
 }
 
+// server/qaOutcome.ts
+var MAX_QA_ROUNDS = 3;
+function lastQaRound(rec) {
+  return rec.round - rec.retests >= MAX_QA_ROUNDS;
+}
+function qaOutcome(pass, rec, pr) {
+  if (pass) return "passed";
+  if (!lastQaRound(rec)) return "failed";
+  const conflicting = pr != null && (pr.mergeable === "CONFLICTING" || pr.mergeState === "DIRTY");
+  return conflicting && rec.mergeFixes < MAX_MERGE_FIXES ? "conflict" : "needs-human";
+}
+function conflictFixInstructions(qaInstructions2, base) {
+  const merge = `It also conflicts with ${base}: bring it up to date (git fetch origin && git merge origin/${base}) and resolve the conflicts so both this change and the newly merged work keep working.`;
+  return qaInstructions2.trim() ? `${qaInstructions2.trim()}
+
+${merge}` : merge;
+}
+
+// server/qaPrompt.ts
+function qaInstructions(i) {
+  return { checks: checksLine(i), testStep: testStep(i.checks !== "none"), retest: retest(i) };
+}
+function checksLine(i) {
+  const names = (list) => list.join(", ") || "unnamed";
+  const state = i.checks === "passing" ? `passing (${names(i.checkNames)})` : i.checks === "failing" ? `failing: ${names(i.failedChecks)}${i.pendingChecks.length ? `; still running: ${i.pendingChecks.join(", ")}` : ""}` : i.checks === "pending" ? `pending: ${names(i.pendingChecks)}` : "none";
+  return `GitHub checks right now: ${state}`;
+}
+function testStep(hasChecks) {
+  return hasChecks ? "3. GitHub's checks run on this PR, and it merges only once they're green. Read .github/workflows to see what they cover and don't re-run that locally. Run only what you need to exercise the change (for example a build to start the app), anything the checks don't cover, or a failing check to reproduce it. A failing check is a finding: name it." : "3. Install dependencies if needed, then run the project's test suite, linters, type checks and build (whichever exist).";
+}
+function retest(i) {
+  const since = i.lastTestedSha && i.lastTestedSha !== i.headSha ? i.lastTestedSha : null;
+  const diff = since ? `(git diff ${since}..HEAD), plus a quick smoke test of the main flow. Don't repeat the full test plan for parts the change didn't touch.` : null;
+  if (i.fixReason === "conflict") {
+    return `
+QA passed it before, but since then the branch was updated with ${i.defaultBranch} to resolve merge conflicts. Re-check everything, especially where this change meets the newly merged work.`;
+  }
+  if (i.fixReason === "checks") {
+    return `
+QA passed it before, but since then the developer changed the code to fix failing GitHub checks. ${diff ? `Test what changed since QA passed it ${diff}` : "Re-check everything."}`;
+  }
+  if (i.round > 1 && i.summary) {
+    return `
+This is a re-test after fixes. Last round's findings:
+${i.summary}
+${i.fixInstructions ?? ""}
+Check those first, then ${diff ? `test what changed since the last round ${diff}` : "re-check everything else."}`;
+  }
+  return "";
+}
+
 // server/restartRecovery.ts
 function followKeptCli(a, cli) {
   if (!cli?.busy || a.status === "preparing") return false;
@@ -3999,7 +4104,7 @@ ${links.join("\n")}` : "",
     "Rules: never push to the default branch, never force-push, never merge pull requests yourself (the office merges them once QA and the checks pass), and never edit files outside your worktree. If you cannot finish, open a draft PR (gh pr create --draft) explaining what is left and why."
   ].filter((l) => l !== "").join("\n");
 }
-function qaSystemPrompt({ agent: a, repo, port, cwd, branch, pr }) {
+function qaSystemPrompt({ agent: a, repo, port, cwd, branch, pr, testStep: testStep2 }) {
   return [
     `You are ${a.name}, ${a.title ? `the team's ${a.title},` : "a QA engineer"} on an autonomous agent team ("cubefarm"). Developers open pull requests; you review and independently verify each one before it is merged. Your sign-off is the review: ${repo.autoMerge ? "on this floor a PR you pass merges by itself as soon as GitHub's checks are green, so nobody else reads the code after you. " : ""}Be thorough and skeptical, but fair: fail a PR only for real problems (broken behaviour, failing tests or build, the issue's requirements not met, obvious regressions), not for style preferences.`,
     ...a.brief ? ["", `Your job description:
@@ -4017,9 +4122,10 @@ ${repo.qaBrief}`] : [],
     "How to test:",
     "1. Read the PR description and the linked issue, and work out the acceptance criteria.",
     `2. Review the code as a careful reviewer would: git diff origin/${repo.defaultBranch}...HEAD. Look for bugs, unhandled errors and edge cases, security problems, leftover debug code, and new logic without tests.`,
-    "3. Install dependencies if needed, then run the project's test suite, linters, type checks and build (whichever exist).",
+    testStep2 ?? "3. Install dependencies if needed, then run the project's test suite, linters, type checks and build (whichever exist).",
     repo.browserTesting ? `4. If the project has a UI, start it in the background on port ${port} (reserved for you) and exercise the change in a real browser with the Playwright tools: navigate, click, type, resize to a phone size, try edge cases, and check the console for errors. Take a screenshot with browser_take_screenshot (no filename) of every important state: the screenshots are attached to the PR as evidence. Stop the server afterwards.` : "4. Exercise the changed behaviour directly (run the program, call the API, write a quick script).",
     "5. You may write throwaway scripts to probe behaviour, but do not commit them.",
+    "A merge conflict with the default branch is not a fail: judge the change itself (on a throwaway merge if you need newer work) and pass it if it's good. The office sends conflicting PRs back for a merge fix, then you re-test.",
     "",
     "Rules: do not modify the code under test, do not commit, push, comment on, review or merge anything on GitHub. The office posts your report on the pull request. Finish with the structured QA report: verdict, summary, the checks you performed, the commands you ran and one caption per screenshot."
   ].join("\n");
@@ -4105,7 +4211,10 @@ var AgentTerminal = class {
   rows = TERM_ROWS;
   /** Output arrived since the last save. */
   dirty = false;
-  /** Closes a CLI left waiting at its prompt after its task (set by the runtime that left it there). */
+  /**
+   * Closes a CLI left waiting at its prompt after its task, settling once it has exited (set by the runtime that left
+   * it there; null while a CLI drives a session).
+   */
   releaseIdle = null;
   /** Something the manager typed at that waiting prompt: the office takes it on as a follow-up (true) or refuses. */
   onIdlePrompt = null;
@@ -4316,7 +4425,6 @@ var FEMININE_NAMES = new Set(
 var lookFor = (name) => FEMININE_NAMES.has(name.trim().split(/\s+/)[0].toLowerCase()) ? "feminine" : "masculine";
 var LOOKS = ["feminine", "masculine"];
 var MAX_DESKS = { ...FLOOR_DESKS, ceo: 1 };
-var MAX_QA_ROUNDS = 3;
 var DEFAULT_MODEL = "claude-opus-5-5";
 var EFFORTS = ["low", "medium", "high", "xhigh", "max"];
 var CEO_MODEL = "claude-opus-5-5";
@@ -4481,6 +4589,8 @@ var Swarm = class {
   messageSeq = 1;
   agentRt = /* @__PURE__ */ new Map();
   repoRt = /* @__PURE__ */ new Map();
+  deskAlerts = /* @__PURE__ */ new Map();
+  // agent id -> the desk setup error the manager was last told about
   clients = /* @__PURE__ */ new Set();
   user = null;
   ghError;
@@ -5560,8 +5670,13 @@ var Swarm = class {
   async prepare(a, repo, base, branch) {
     try {
       if (this.repoRt.get(repo.id)?.cloneStatus !== "ready") await this.cloneRepo(repo.id);
-      await this.backend.releaseDesk(repo.fullName, this.agentSlug(a), this.port(a));
-      const cwd = await this.backend.prepareDesk(repo.fullName, { defaultBranch: repo.defaultBranch, pr: base.pr }, this.agentSlug(a), branch);
+      const slug = this.agentSlug(a);
+      const note = (text) => this.appendLog(a, [{ kind: "system", text }]);
+      const cwd = await setUpDesk(this.agentRt.get(a.id)?.terminal, {
+        release: () => this.backend.releaseDesk(repo.fullName, slug, this.port(a)),
+        prepare: () => this.backend.prepareDesk(repo.fullName, { defaultBranch: repo.defaultBranch, pr: base.pr }, slug, branch, note)
+      });
+      this.deskAlerts.delete(a.id);
       return a.status === "preparing" ? cwd : null;
     } catch (err) {
       if (a.status !== "preparing") return null;
@@ -5569,6 +5684,10 @@ var Swarm = class {
       a.endedAt = Date.now();
       a.lastError = err.message;
       this.appendLog(a, [{ kind: "error", text: `\u2717 ${a.lastError}` }]);
+      if (this.deskAlerts.get(a.id) !== a.lastError) {
+        this.deskAlerts.set(a.id, a.lastError);
+        this.postMessage("office", `\u26A0\uFE0F ${a.name}'s desk couldn't be set up: ${a.lastError.slice(0, 240)}`);
+      }
       this.emitAgent(a);
       this.save();
       return null;
@@ -5776,8 +5895,8 @@ Note from the manager: ${note}` : ""
     this.queueQa(repo, prNumber, dev ?? null, pr.closesIssues[0] ?? null);
     this.toast("info", `PR #${prNumber} is queued for QA`);
   }
-  buildQaSystemAppend(a, repo, cwd, branch, pr) {
-    return qaSystemPrompt({ agent: a, repo, port: this.port(a), cwd, branch, pr });
+  buildQaSystemAppend(a, repo, cwd, branch, pr, testStep2) {
+    return qaSystemPrompt({ agent: a, repo, port: this.port(a), cwd, branch, pr, testStep: testStep2 });
   }
   async runQa(a, repo, rec) {
     const branch = qaBranch(rec.prNumber, slugify(a.name));
@@ -5790,6 +5909,7 @@ Note from the manager: ${note}` : ""
     );
     let pr;
     let issue2 = null;
+    const lastTestedSha = rec.testedSha;
     try {
       pr = await this.backend.prDetails(repo.fullName, rec.prNumber);
       const issueNumber = rec.issueNumber ?? pr.closesIssues[0] ?? null;
@@ -5819,16 +5939,22 @@ Note from the manager: ${note}` : ""
       return;
     }
     const dev = rec.devAgentId ? this.state.agents.find((x) => x.id === rec.devAgentId) : null;
+    const failedConflict = rec.fixReason === "conflict" && !rec.passedSha;
+    const qa = qaInstructions({
+      ...pr,
+      round: rec.round,
+      fixReason: failedConflict ? "qa" : rec.fixReason,
+      lastTestedSha: failedConflict ? null : lastTestedSha,
+      summary: rec.summary,
+      fixInstructions: rec.fixInstructions,
+      defaultBranch: repo.defaultBranch
+    });
     const prompt = [
       `Please QA pull request #${pr.number}: ${pr.title}`,
       `URL: ${pr.url}`,
       `Author: ${dev ? `${dev.name} (developer agent)` : "a teammate"} \xB7 QA round ${rec.round}`,
-      rec.fixReason === "conflict" ? `
-QA passed it before, but since then the branch was updated with ${repo.defaultBranch} to resolve merge conflicts. Re-check everything, especially where this change meets the newly merged work.` : rec.fixReason === "checks" ? "\nQA passed it before, but since then the developer changed the code to fix failing GitHub checks. Re-check everything." : rec.round > 1 && rec.summary ? `
-This is a re-test after fixes. Last round's findings:
-${rec.summary}
-${rec.fixInstructions ?? ""}
-Check those first, then re-check everything else.` : "",
+      qa.checks,
+      qa.retest,
       "",
       "PR description:",
       pr.body.trim() || "(empty)",
@@ -5836,7 +5962,7 @@ Check those first, then re-check everything else.` : "",
 Linked issue: ${issue2.title}
 ${issue2.body.trim() || "(no description)"}` : ""
     ].filter((l) => l !== "").join("\n");
-    this.startAgentSession(a, repo, cwd, prompt, this.buildQaSystemAppend(a, repo, cwd, branch, pr), void 0, QA_SCHEMA);
+    this.startAgentSession(a, repo, cwd, prompt, this.buildQaSystemAppend(a, repo, cwd, branch, pr, qa.testStep), void 0, QA_SCHEMA);
   }
   async onQaFinished(a, repo, result) {
     const rec = this.state.qa.find((q) => q.repoId === repo.id && q.prNumber === a.prNumber);
@@ -5860,22 +5986,25 @@ ${issue2.body.trim() || "(no description)"}` : ""
     this.appendLog(a, [{ kind: pass ? "done" : "error", text: `${pass ? "\u2705 QA passed" : "\u274C QA failed"} PR #${a.prNumber} \xB7 ${report.checks.length} checks \xB7 ${rt.shots.length} screenshots` }]);
     let commentUrl = null;
     if (rec) {
+      const pull = !pass && lastQaRound(rec) ? await this.backend.prDetails(repo.fullName, rec.prNumber).catch(() => null) : null;
+      const next = qaOutcome(pass, rec, pull);
       try {
         this.appendLog(a, [{ kind: "system", text: "\u{1F4CE} Uploading evidence and posting the QA report on the PR\u2026" }]);
-        const body = await this.renderQaComment(a, repo, rec, report, rt.shots);
+        const body = await this.renderQaComment(a, repo, rec, report, rt.shots, next);
         commentUrl = await this.backend.commentPull(repo.fullName, rec.prNumber, body) || null;
         this.appendLog(a, [{ kind: "system", text: `  \u23BF ${commentUrl ?? "comment posted"}` }]);
       } catch (err) {
         this.appendLog(a, [{ kind: "error", text: `  \u23BF Could not post the QA report: ${err.message}` }]);
       }
       const qaRounds = rec.round - rec.retests;
-      const nextStatus = pass ? "passed" : qaRounds >= MAX_QA_ROUNDS ? "needs-human" : "failed";
+      const nextStatus = next === "conflict" ? "failed" : next;
+      const fixInstructions = report.fixInstructions ?? report.checks.filter((c) => c.result === "fail").map((c) => `${c.name}: ${c.details}`).join("\n");
       this.setQa(rec, {
         status: nextStatus,
         summary: report.summary,
         checks: report.checks,
         commentUrl: commentUrl ?? rec.commentUrl,
-        fixInstructions: report.fixInstructions ?? report.checks.filter((c) => c.result === "fail").map((c) => `${c.name}: ${c.details}`).join("\n"),
+        fixInstructions,
         sessionFailures: 0,
         fixReason: pass ? null : "qa",
         passedSha: pass ? rec.testedSha : null,
@@ -5884,13 +6013,14 @@ ${issue2.body.trim() || "(no description)"}` : ""
         mergeRetryAt: null,
         alerted: false
       });
+      if (next === "conflict") this.sendBack(repo, rec, "conflict", conflictFixInstructions(fixInstructions, repo.defaultBranch), false);
       this.toast(
         pass ? "success" : "error",
-        pass ? `\u2705 ${a.name} passed PR #${rec.prNumber}${repo.autoMerge ? "; it merges once GitHub's checks are green" : ": ready to merge"}` : nextStatus === "needs-human" ? `\u274C PR #${rec.prNumber} failed QA ${qaRounds} times and needs a human` : `\u274C ${a.name} failed PR #${rec.prNumber}; sending it back to the developer`
+        pass ? `\u2705 ${a.name} passed PR #${rec.prNumber}${repo.autoMerge ? "; it merges once GitHub's checks are green" : ": ready to merge"}` : nextStatus === "needs-human" ? `\u274C PR #${rec.prNumber} failed QA ${qaRounds} times and needs a human` : next === "conflict" ? `\u274C ${a.name} failed PR #${rec.prNumber}, and it conflicts with ${repo.defaultBranch}; sending it back to merge and fix` : `\u274C ${a.name} failed PR #${rec.prNumber}; sending it back to the developer`
       );
     }
   }
-  async renderQaComment(a, repo, rec, report, shots) {
+  async renderQaComment(a, repo, rec, report, shots, next) {
     const pass = report.verdict === "pass";
     const images = [];
     const evidence = shots.slice(-8);
@@ -5928,7 +6058,7 @@ ${issue2.body.trim() || "(no description)"}` : ""
     if (images.length) lines.push("", "### \u{1F4F8} Evidence", "", ...images.flatMap((img) => [img, ""]));
     else lines.push("", "_No browser screenshots were taken in this round._");
     const merge = repo.autoMerge ? "merges automatically once GitHub's checks pass" : "ready for the manager to merge";
-    lines.push("", `<sub>Posted by cubefarm \xB7 ${pass ? merge : rec.round - rec.retests >= MAX_QA_ROUNDS ? "needs a human decision" : "sent back to the developer for fixes"}</sub>`);
+    lines.push("", `<sub>Posted by cubefarm \xB7 ${pass ? merge : next === "needs-human" ? "needs a human decision" : next === "conflict" ? `sent back to the developer to merge ${repo.defaultBranch} and fix` : "sent back to the developer for fixes"}</sub>`);
     return lines.join("\n");
   }
   /** Send a failed PR back to the developer who wrote it (or any free developer on the floor). */
@@ -5953,7 +6083,7 @@ ${issue2.body.trim() || "(no description)"}` : ""
     const failed2 = rec.checks.filter((c) => c.result === "fail");
     const takeover = original ? "" : " A teammate wrote it, so read the PR and the linked issue first.";
     const push = `push to the same branch: git push origin HEAD:${headRef}`;
-    const mergeFix = rec.fixReason === "conflict" ? [
+    const mergeFix = rec.fixReason === "conflict" && rec.passedSha ? [
       `QA passed pull request #${rec.prNumber} (${pull?.url ?? ""}), but it now conflicts with ${repo.defaultBranch} because other work was merged first.${takeover}`,
       "",
       `Bring it up to date: git fetch origin && git merge origin/${repo.defaultBranch}. Resolve the conflicts so both this change and the newly merged work keep working, run the project's checks, and ${push}`