cubefarm 0.3.3 → 0.3.4

package/dist-server/index.js

@@ -1588,6 +1588,12 @@ function idleHook(live, b) {
   }
   return {};
 }
+function resumableSession(b, exists2) {
+  const id = typeof b.session_id === "string" ? b.session_id : "";
+  const file = typeof b.transcript_path === "string" ? b.transcript_path : "";
+  return id && file && exists2(file) ? id : null;
+}
+var lostConversation = (screen) => /No conversation found with session ID/i.test(screen);
 function startCliSession(opts, callbacks) {
   const term = opts.terminal;
   const prev = lives.get(term);
@@ -1606,6 +1612,7 @@ function startCliSession(opts, callbacks) {
   const officePrompts = [];
   const launched = [];
   let mainThread = opts.resumeSessionId ?? null;
+  let kept = opts.resumeSessionId ?? null;
   const usageResets = /* @__PURE__ */ new Map();
   const warned = /* @__PURE__ */ new Set();
   let done = false;
@@ -1699,6 +1706,13 @@ function startCliSession(opts, callbacks) {
   const hook = (b) => {
     const event = String(b.hook_event_name ?? "");
     const sub = typeof b.agent_id === "string" && b.agent_id !== "";
+    if (cli === "claude" && !sub && b.session_id !== kept) {
+      const id = resumableSession(b, fs6.existsSync);
+      if (id) {
+        kept = id;
+        cb.sessionId(id);
+      }
+    }
     switch (event) {
       case "PreToolUse": {
         const name = String(b.tool_name ?? "");
@@ -1797,6 +1811,11 @@ function startCliSession(opts, callbacks) {
     return {};
   };
   const exited = (exitCode) => {
+    if (cli === "claude" && opts.resumeSessionId && !begun && lostConversation(term.screen())) {
+      cb.sessionId(null);
+      finish({ ok: false, text: "", errors: [`${label} couldn't find the conversation it was resuming, so the next session starts a new one.`] });
+      return;
+    }
     const ok = exitCode === 0 && (lastText !== "" || cli !== "claude" && Date.now() - started > 2e4);
     finish({ ok, text: lastText, errors: ok ? [] : [`${label} exited${exitCode ? ` with code ${exitCode}` : ""} before finishing.`] });
   };
@@ -1898,7 +1917,7 @@ ${JSON.stringify(opts.outputSchema)}`;
     env[k] = v;
   }
   Object.assign(env, { TERM: "xterm-256color", COLORTERM: "truecolor" }, launch2.env);
-  if (cli === "claude") cb.sessionId(sessionId);
+  if (cli === "claude" && opts.resumeSessionId) cb.sessionId(sessionId);
   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 } };
@@ -5205,7 +5224,7 @@ Note from the manager: ${note}` : ""
         },
         sessionId: (id) => {
           a.sessionId = id;
-          a.sessionCli = how.cli ?? "claude";
+          a.sessionCli = id ? how.cli ?? "claude" : null;
         },
         browserUrl: (url) => {
           rt.browserUrl = url;
@@ -6131,7 +6150,7 @@ ${job.text}` } : job;
         },
         sessionId: (id) => {
           a.sessionId = id;
-          a.sessionCli = "claude";
+          a.sessionCli = id ? "claude" : null;
         },
         browserUrl: () => void 0,
         screenshot: () => void 0,