cubefarm 0.3.5 → 0.3.6

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-CeoPkKws.js"></script>
+    <script type="module" crossorigin src="/assets/index-CvwxmawV.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-BU33ZUhQ.css">
   </head>
   <body>

package/dist-server/index.js

@@ -2386,13 +2386,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 +2404,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 +2446,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;
     }
@@ -3443,6 +3444,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 +3512,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;
@@ -4227,12 +4269,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 +4312,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 +4327,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 ----------
@@ -5264,7 +5309,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 +5419,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 +5611,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 +5657,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 +5670,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. */
@@ -5953,13 +6024,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;