cubefarm 0.3.0 → 0.3.2

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

package/dist-server/index.js

@@ -602,7 +602,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, s);
+  const r = path3.relative(cwd, path3.resolve(cwd, s));
   return r && !r.startsWith("..") ? r.replaceAll("\\", "/") : s;
 }
 var escapeRe = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -1068,6 +1068,26 @@ function launchArgs(id, ctx) {
     }
   }
 }
+function oneAtATime() {
+  const tails = /* @__PURE__ */ new Map();
+  return (key, step) => {
+    const next = (tails.get(key) ?? Promise.resolve()).then(step).then(
+      () => void 0,
+      () => void 0
+    );
+    tails.set(key, next);
+    void next.then(() => tails.get(key) === next && tails.delete(key));
+    return next;
+  };
+}
+var threadSteps = oneAtATime();
+function codexThread(action, id, after) {
+  return threadSteps(id, async () => {
+    await after;
+    const cmd = commandFor("codex");
+    if (cmd) await run(cmd.file, [...cmd.args, action, id], { timeoutMs: 3e4 });
+  });
+}
 var TRUST_PROMPT = /Quick safety check|Do you trust the (files|contents) (in|of) this|trust this folder|allow Codex to work in this folder/i;
 function trustKey(screen) {
   if (!TRUST_PROMPT.test(screen)) return null;
@@ -1360,7 +1380,7 @@ function spawnPty(file, args, o, meta) {
     return p2;
   }
   if (!nodePty) throw new Error("the terminal module could not be loaded on this machine");
-  const p = nodePty.spawn(file, args, { name: "xterm-256color", cols: o.cols, rows: o.rows, cwd: o.cwd, env: o.env });
+  const p = nodePty.spawn(file, args, { name: "xterm-256color", cols: o.cols, rows: o.rows, cwd: o.cwd, env: o.env, useConptyDll: true });
   return {
     get pid() {
       return p.pid;
@@ -1486,17 +1506,23 @@ var hooksHinted = false;
 var IDLE_MS = 30 * 6e4;
 var ALLOW = { hookSpecificOutput: { hookEventName: "PreToolUse", permissionDecision: "allow", permissionDecisionReason: "Approved by cubefarm" } };
 var toolInput = (b) => b.tool_input && typeof b.tool_input === "object" ? b.tool_input : {};
+var exitOf = (p) => new Promise((resolve) => {
+  p.onExit(() => resolve());
+  setTimeout(resolve, 5e3);
+});
 function endLive(live) {
-  if (lives.get(live.term) !== live) return;
+  if (lives.get(live.term) !== live) return Promise.resolve();
   lives.delete(live.term);
   clearTimeout(live.idleTimer);
   routes.delete(live.token);
   live.term.releaseIdle = null;
   live.term.bind(null);
+  const gone = live.proc ? exitOf(live.proc) : void 0;
   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);
+  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 });
 var remember = (l) => l.proc?.setMeta(metaOf(l));
@@ -1529,6 +1555,7 @@ async function reconnectClis(terminalFor) {
     const term = meta.agentId ? terminalFor(meta.agentId) : null;
     if (h.exit !== null || !term || lives.has(term) || !isCli(meta.cli) || !meta.token || !meta.dir || !meta.agentId) {
       discardPty(h);
+      if (meta.cli === "codex" && meta.resumeId) void codexThread("archive", meta.resumeId, h.exit === null ? new Promise((r) => setTimeout(r, 5e3)) : void 0);
       continue;
     }
     const l = { agentId: meta.agentId, cli: meta.cli, term, proc: adoptPty(h), token: meta.token, dir: meta.dir, resumeId: meta.resumeId ?? null, statusLine: "\u{1F3E2} cubefarm", shots: /* @__PURE__ */ new Set(), session: null };
@@ -1543,8 +1570,8 @@ function officeProcesses() {
   const pids = [keeperPid(), ...[...lives.values()].map((l) => l.proc?.pid ?? 0)].filter((p) => p > 0);
   return { pids, markers: [SESSIONS_DIR, BIN_DIR] };
 }
-function releaseClis(restart) {
-  if (!restart) for (const l of [...lives.values()]) endLive(l);
+async function releaseClis(restart) {
+  if (!restart) await Promise.all([...lives.values()].map(endLive));
   leaveKeeper();
 }
 function idleHook(live, b) {
@@ -1707,7 +1734,7 @@ function startCliSession(opts, callbacks) {
         if (sub) return {};
         busy();
         const prompt2 = String(b.prompt ?? "").trim();
-        const i = officePrompts.findIndex((p2) => p2.slice(0, 60) === prompt2.slice(0, 60));
+        const i = officePrompts.findIndex((p) => p.slice(0, 60) === prompt2.slice(0, 60));
         if (i >= 0) officePrompts.splice(i, 1);
         else if (prompt2) log([{ kind: "manager", text: `\u25B6 Typed in the terminal: ${clip(prompt2.split("\n")[0], 200)}` }]);
         return {};
@@ -1743,7 +1770,7 @@ function startCliSession(opts, callbacks) {
         const thread = typeof b.session_id === "string" ? b.session_id : "";
         if (cli === "codex" && thread !== mainThread) {
           const input = String(b.input ?? "").trim();
-          if (mainThread || !launched.some((p2) => input.startsWith(p2.slice(0, 40)))) return {};
+          if (mainThread || !launched.some((p) => input.startsWith(p.slice(0, 40)))) return {};
           mainThread = thread;
         }
         if (thread) {
@@ -1875,46 +1902,51 @@ ${JSON.stringify(opts.outputSchema)}`;
   term.note(`\u2500\u2500 ${label}${opts.label ? ` \xB7 ${opts.label}` : ""} \u2500\u2500`);
   const resumeId = cli === "claude" ? sessionId : opts.resumeSessionId ?? null;
   const l = { agentId: opts.agentId ?? "", cli, term, proc: null, token, dir, resumeId, statusLine, shots: /* @__PURE__ */ new Set(), session: { hook, exited } };
-  let p;
-  try {
-    p = spawnPty(cmd.file, [...cmd.args, ...launch2.args], { cols: term.cols, rows: term.rows, cwd: opts.cwd, env }, metaOf(l));
-  } catch (err) {
-    setTimeout(() => finish({ ok: false, text: "", errors: [`Could not start ${label}: ${err.message}`] }), 0);
-    return handle;
-  }
-  l.proc = p;
-  live = l;
-  wire(l, opts.office);
-  shotTimer = setInterval(collectShots, 2e3);
-  screenTimer = setInterval(() => {
-    if (done || Date.now() - started > BOOT_MS * 2) return clearInterval(screenTimer);
-    const screen = term.screen();
-    const review = hookReviewKey(screen);
-    const key = trustKeys < 12 && Date.now() - trustedAt > 3e3 ? trustKey(screen) ?? review : null;
-    if (key === "down") {
-      trustKeys += 1;
-      quietly(() => p.write(term.appCursor ? "\x1BOB" : "\x1B[B"));
-    } else if (key === "enter") {
-      trustKeys += 1;
-      trustedAt = Date.now();
-      if (!review) log([{ kind: "system", text: `\u2713 Trusted the worktree for ${label}.` }]);
-      else if (!hooksHinted) {
-        hooksHinted = true;
-        log([{ kind: "system", text: `\u2139 To see ${label}'s steps here, trust the office's hooks once: in this terminal, type /hooks and press t. Until then the office shows its task.` }]);
+  const begin = () => {
+    if (done) return;
+    let p;
+    try {
+      p = spawnPty(cmd.file, [...cmd.args, ...launch2.args], { cols: term.cols, rows: term.rows, cwd: opts.cwd, env }, metaOf(l));
+    } catch (err) {
+      setTimeout(() => finish({ ok: false, text: "", errors: [`Could not start ${label}: ${err.message}`] }), 0);
+      return;
+    }
+    l.proc = p;
+    live = l;
+    wire(l, opts.office);
+    shotTimer = setInterval(collectShots, 2e3);
+    screenTimer = setInterval(() => {
+      if (done || Date.now() - started > BOOT_MS * 2) return clearInterval(screenTimer);
+      const screen = term.screen();
+      const review = hookReviewKey(screen);
+      const key = trustKeys < 12 && Date.now() - trustedAt > 3e3 ? trustKey(screen) ?? review : null;
+      if (key === "down") {
+        trustKeys += 1;
+        quietly(() => p.write(term.appCursor ? "\x1BOB" : "\x1B[B"));
+      } else if (key === "enter") {
+        trustKeys += 1;
+        trustedAt = Date.now();
+        if (!review) log([{ kind: "system", text: `\u2713 Trusted the worktree for ${label}.` }]);
+        else if (!hooksHinted) {
+          hooksHinted = true;
+          log([{ kind: "system", text: `\u2139 To see ${label}'s steps here, trust the office's hooks once: in this terminal, type /hooks and press t. Until then the office shows its task.` }]);
+        }
+        quietly(() => p.write("\r"));
+      }
+      if (!nudged.has("login") && /Not logged in|run \/login|Select login method|Sign in with ChatGPT|Please login|Invalid API key/i.test(screen)) {
+        nudged.add("login");
+        log([{ kind: "error", text: `\u26A0 ${label} needs you to sign in: open the terminal and sign in there, or run "${cli}" in a terminal of your own.` }]);
+      } else if (!nudged.has("setup") && !trustKey(screen) && Date.now() - trustedAt > 5e3 && /Choose the text style|Press Enter to continue|Bypass Permissions mode|Settings Error/i.test(screen)) {
+        nudged.add("setup");
+        log([{ kind: "error", text: `\u26A0 ${label} is waiting on a setup screen: open the terminal to answer it.` }]);
       }
-      quietly(() => p.write("\r"));
-    }
-    if (!nudged.has("login") && /Not logged in|run \/login|Select login method|Sign in with ChatGPT|Please login|Invalid API key/i.test(screen)) {
-      nudged.add("login");
-      log([{ kind: "error", text: `\u26A0 ${label} needs you to sign in: open the terminal and sign in there, or run "${cli}" in a terminal of your own.` }]);
-    } else if (!nudged.has("setup") && !trustKey(screen) && Date.now() - trustedAt > 5e3 && /Choose the text style|Press Enter to continue|Bypass Permissions mode|Settings Error/i.test(screen)) {
-      nudged.add("setup");
-      log([{ kind: "error", text: `\u26A0 ${label} is waiting on a setup screen: open the terminal to answer it.` }]);
-    }
-  }, 1e3);
-  bootTimer = setTimeout(() => {
-    if (!done && !begun && cli === "claude") log([{ kind: "error", text: `\u26A0 ${label} hasn't started on the task yet. Open the terminal to see what it's waiting for.` }]);
-  }, BOOT_MS);
+    }, 1e3);
+    bootTimer = setTimeout(() => {
+      if (!done && !begun && cli === "claude") log([{ kind: "error", text: `\u26A0 ${label} hasn't started on the task yet. Open the terminal to see what it's waiting for.` }]);
+    }, BOOT_MS);
+  };
+  if (cli === "codex" && opts.resumeSessionId) void codexThread("unarchive", opts.resumeSessionId).then(begin);
+  else begin();
   return handle;
 }
 
@@ -2673,7 +2705,7 @@ Closes #${pr.closesIssues[0] ?? "?"}`,
     reconnectClis: async () => [],
     // fake sessions end with the office
     hooksReady: () => void 0,
-    releaseClis: () => void 0,
+    releaseClis: async () => void 0,
     detectClis: async () => CLIS.map((c) => ({ id: c.id, label: c.label, installed: true, version: "demo", integrated: c.integrated })),
     previews: demoPreviews,
     office: demoOffice
@@ -4717,7 +4749,7 @@ var Swarm = class {
    */
   async shutdown(restart = false) {
     await this.writeState().catch((err) => console.warn("could not save the state", err));
-    this.backend.releaseClis(restart);
+    await this.backend.releaseClis(restart);
     await this.saveTerminals(true);
     await this.previews.stopAll(this.state.repos);
   }