squadrant 0.16.0 → 0.16.2

package/dist/squadrantd.js

@@ -430,13 +430,14 @@ var FAILURE_RETRY_MS = 60 * 60 * 1e3;
 
 // packages/shared/dist/lib/git-worktree.js
 import { execFileSync as execFileSync2 } from "child_process";
+import fs4 from "fs";
 import path4 from "path";
 
 // packages/shared/dist/lib/resolve-text-input.js
-import fs4 from "fs";
+import fs5 from "fs";
 
 // packages/shared/dist/lib/runtime-sync.js
-import fs5 from "fs";
+import fs6 from "fs";
 import path5 from "path";
 
 // packages/shared/dist/lib/tool-compat.js
@@ -471,12 +472,12 @@ function checkToolCompat(name, rawVersion, entry) {
 }
 
 // packages/shared/dist/lib/canonical-source.js
-import fs6 from "fs";
+import fs7 from "fs";
 import path6 from "path";
 
 // packages/shared/dist/lib/daily-logs.js
 import { execSync } from "child_process";
-import fs7 from "fs";
+import fs8 from "fs";
 import path7 from "path";
 import matter from "gray-matter";
 
@@ -1019,7 +1020,7 @@ function createDaemon(deps) {
 }
 
 // packages/core/dist/mailbox.js
-import { promises as fs8 } from "fs";
+import { promises as fs9 } from "fs";
 import { join as join5 } from "path";
 import { randomUUID } from "crypto";
 function inboxDir(stateRoot) {
@@ -1036,7 +1037,7 @@ async function listRotatedOldestFirst(stateRoot, project) {
   const dir = inboxDir(stateRoot);
   let entries;
   try {
-    entries = await fs8.readdir(dir);
+    entries = await fs9.readdir(dir);
   } catch {
     return [];
   }
@@ -1045,7 +1046,7 @@ async function listRotatedOldestFirst(stateRoot, project) {
 }
 async function readMaxSeqFromFile(file) {
   try {
-    const buf = await fs8.readFile(file, "utf-8");
+    const buf = await fs9.readFile(file, "utf-8");
     if (!buf.trim())
       return 0;
     const lines = buf.trim().split("\n");
@@ -1087,12 +1088,12 @@ function withProjectLock(project, fn) {
 function appendEntry(stateRoot, project, build) {
   return withProjectLock(project, async () => {
     const dir = inboxDir(stateRoot);
-    await fs8.mkdir(dir, { recursive: true });
+    await fs9.mkdir(dir, { recursive: true });
     const file = logPath(stateRoot, project);
     const lastSeq = await readMaxSeq(stateRoot, project);
     const seq = lastSeq + 1;
     const entry = build(seq);
-    await fs8.appendFile(file, JSON.stringify(entry) + "\n", { encoding: "utf-8" });
+    await fs9.appendFile(file, JSON.stringify(entry) + "\n", { encoding: "utf-8" });
     return seq;
   });
 }
@@ -1109,7 +1110,7 @@ async function appendToMailbox(opts) {
   }));
 }
 async function appendCaptainMessage(opts) {
-  await appendEntry(opts.stateRoot, opts.project, (seq) => ({
+  return appendEntry(opts.stateRoot, opts.project, (seq) => ({
     seq,
     ts: (/* @__PURE__ */ new Date()).toISOString(),
     kind: "captain.message",
@@ -1123,7 +1124,7 @@ function cursorPath(stateRoot, project, subscriber) {
 async function readCursor(opts) {
   let buf;
   try {
-    buf = await fs8.readFile(cursorPath(opts.stateRoot, opts.project, opts.subscriber), "utf-8");
+    buf = await fs9.readFile(cursorPath(opts.stateRoot, opts.project, opts.subscriber), "utf-8");
   } catch (e) {
     if (e.code === "ENOENT")
       return null;
@@ -1138,7 +1139,7 @@ async function readCursor(opts) {
   }
 }
 async function writeCursor(opts) {
-  await fs8.mkdir(inboxDir(opts.stateRoot), { recursive: true });
+  await fs9.mkdir(inboxDir(opts.stateRoot), { recursive: true });
   const dest = cursorPath(opts.stateRoot, opts.project, opts.subscriber);
   const tmp = `${dest}.${process.pid}.${randomUUID()}.tmp`;
   const data = {
@@ -1146,7 +1147,7 @@ async function writeCursor(opts) {
     subscriber: opts.subscriber,
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
-  const handle = await fs8.open(tmp, "w");
+  const handle = await fs9.open(tmp, "w");
   try {
     await handle.writeFile(JSON.stringify(data), { encoding: "utf-8" });
     await handle.sync();
@@ -1154,9 +1155,9 @@ async function writeCursor(opts) {
     await handle.close();
   }
   try {
-    await fs8.rename(tmp, dest);
+    await fs9.rename(tmp, dest);
   } catch (e) {
-    await fs8.unlink(tmp).catch(() => {
+    await fs9.unlink(tmp).catch(() => {
     });
     throw e;
   }
@@ -1167,7 +1168,7 @@ async function* readFromCursor(opts) {
   for (const file of files) {
     let buf;
     try {
-      buf = await fs8.readFile(file, "utf-8");
+      buf = await fs9.readFile(file, "utf-8");
     } catch (e) {
       if (e.code === "ENOENT")
         continue;
@@ -1193,7 +1194,7 @@ async function mailboxStats(stateRoot, project) {
   let sizeBytes = 0;
   for (const f of [file, ...rotated]) {
     try {
-      sizeBytes += (await fs8.stat(f)).size;
+      sizeBytes += (await fs9.stat(f)).size;
     } catch (e) {
       if (e.code !== "ENOENT")
         throw e;
@@ -1209,7 +1210,7 @@ async function mailboxStats(stateRoot, project) {
 }
 async function oldestEntryAgeMs(file) {
   try {
-    const buf = await fs8.readFile(file, "utf-8");
+    const buf = await fs9.readFile(file, "utf-8");
     const firstLine = buf.split("\n").find((l) => l.trim());
     if (!firstLine)
       return 0;
@@ -1224,7 +1225,7 @@ async function rotateIfNeeded(opts) {
     const file = logPath(opts.stateRoot, opts.project);
     let size = 0;
     try {
-      size = (await fs8.stat(file)).size;
+      size = (await fs9.stat(file)).size;
     } catch (e) {
       if (e.code === "ENOENT")
         return { rotated: false };
@@ -1240,22 +1241,22 @@ async function rotateIfNeeded(opts) {
       const dst = `${file}.${n + 1}`;
       if (n + 1 > opts.keepCount) {
         try {
-          await fs8.unlink(src);
+          await fs9.unlink(src);
         } catch (e) {
           if (e.code !== "ENOENT")
             throw e;
         }
       } else {
         try {
-          await fs8.rename(src, dst);
+          await fs9.rename(src, dst);
         } catch (e) {
           if (e.code !== "ENOENT")
             throw e;
         }
       }
     }
-    await fs8.rename(file, `${file}.1`);
-    await fs8.writeFile(file, "", { encoding: "utf-8" });
+    await fs9.rename(file, `${file}.1`);
+    await fs9.writeFile(file, "", { encoding: "utf-8" });
     return { rotated: true, from: file, to: `${file}.1` };
   });
 }
@@ -1511,6 +1512,9 @@ function reconcileLiveness(prev, next) {
   }
   if (next.startedAt >= prev.startedAt || next.lastState === "end")
     return next;
+  const prevAlive = prev.lastState === "start" && prev.pidAlive;
+  if (!prevAlive && next.lastState === "start" && next.pidAlive)
+    return next;
   return prev;
 }
 
@@ -2167,9 +2171,15 @@ async function runLivenessTick(deps) {
     return;
   }
   const seen = /* @__PURE__ */ new Set();
+  const knownCaptainSessions = /* @__PURE__ */ new Map();
+  for (const e of deps.registry.all()) {
+    if (e.role === "captain")
+      knownCaptainSessions.set(e.sessionId, e.project);
+  }
   const byProject = /* @__PURE__ */ new Map();
   for (const r of records) {
-    if (r.role !== "captain")
+    const role = r.role === "captain" || knownCaptainSessions.get(r.sessionId) === r.project ? "captain" : r.role;
+    if (role !== "captain")
       continue;
     let arr = byProject.get(r.project);
     if (!arr) {
@@ -2201,10 +2211,14 @@ async function runLivenessTick(deps) {
     logEntry(deps.log, project, deps.registry.get(project));
   }
   for (const e of deps.registry.all()) {
-    if (e.role === "captain" && e.lastState === "start" && !seen.has(e.project)) {
-      deps.registry.markEnded(e.project, now);
-      logEntry(deps.log, e.project, deps.registry.get(e.project));
+    if (e.role !== "captain" || e.lastState !== "start" || seen.has(e.project))
+      continue;
+    if (e.pid == null || deps.isPidAlive(e.pid)) {
+      deps.log?.(`[${e.role}/runtime] ${e.project} pid=${e.pid} missing from snapshot but not confirmed dead \u2014 leaving alive`);
+      continue;
     }
+    deps.registry.markEnded(e.project, now);
+    logEntry(deps.log, e.project, deps.registry.get(e.project));
   }
   if (deps.reap) {
     for (const e of deps.registry.all()) {
@@ -2756,7 +2770,7 @@ function startDaemon(ctx, opts, pkgVersion) {
 
 // packages/core/dist/session-freshness.js
 import crypto from "crypto";
-import fs9 from "fs";
+import fs10 from "fs";
 import path8 from "path";
 
 // packages/core/dist/crew-protocol.js
@@ -3012,7 +3026,7 @@ function formatInbound(text) {
 }
 
 // packages/core/dist/telegram/state.js
-import fs10 from "fs";
+import fs11 from "fs";
 import path9 from "path";
 function statePath(stateRoot) {
   return path9.join(stateRoot, "telegram-state.json");
@@ -3022,7 +3036,7 @@ function topicKey(project, scope = "project") {
 }
 function loadState(stateRoot) {
   try {
-    const raw = fs10.readFileSync(statePath(stateRoot), "utf-8");
+    const raw = fs11.readFileSync(statePath(stateRoot), "utf-8");
     const data = JSON.parse(raw);
     const result = {
       offset: typeof data.offset === "number" ? data.offset : 0,
@@ -3037,8 +3051,8 @@ function loadState(stateRoot) {
   }
 }
 function saveState(stateRoot, s) {
-  fs10.mkdirSync(stateRoot, { recursive: true });
-  fs10.writeFileSync(statePath(stateRoot), JSON.stringify(s, null, 2) + "\n");
+  fs11.mkdirSync(stateRoot, { recursive: true });
+  fs11.writeFileSync(statePath(stateRoot), JSON.stringify(s, null, 2) + "\n");
 }
 function setTopic(stateRoot, project, topicId, scope = "project") {
   const s = loadState(stateRoot);
@@ -3573,7 +3587,7 @@ function createTelegramBridge(opts) {
 }
 
 // packages/core/dist/telegram/setup.js
-import fs11 from "fs";
+import fs12 from "fs";
 
 // packages/core/dist/restart-daemon.js
 import { execFileSync as execFileSync4 } from "child_process";
@@ -3589,10 +3603,10 @@ import { join as join12 } from "path";
 var DEFAULT_SOCK_PATH2 = join12(homedir7(), ".config", "squadrant", "squadrant.sock");
 
 // packages/core/dist/side-session.js
-import fs12 from "fs";
+import fs13 from "fs";
 
 // packages/core/dist/crew-spawn.js
-import fs13 from "fs";
+import fs14 from "fs";
 import os5 from "os";
 import path11 from "path";
 var TEMPLATES_DIR = path11.join(os5.homedir(), ".config", "squadrant", "templates");
@@ -3628,7 +3642,7 @@ import { execSync as execSync4 } from "child_process";
 import { execSync as execSync5 } from "child_process";
 
 // packages/agents/dist/drivers/launch-cmd.js
-import fs14 from "fs";
+import fs15 from "fs";
 import path12 from "path";
 
 // packages/agents/dist/projection/cursor.js
@@ -5078,7 +5092,7 @@ var RuntimeRegistry = class {
 import { execFileSync as execFileSync6, execSync as execSync7 } from "child_process";
 
 // packages/workspaces/dist/workspaces/obsidian.js
-import fs15 from "fs/promises";
+import fs16 from "fs/promises";
 import { existsSync as existsSync9 } from "fs";
 import path17 from "path";
 
@@ -5764,7 +5778,7 @@ async function resendCrewFirstTurn(runtime, captainName, project, name, message)
 }
 
 // packages/cli/src/lib/daemon-restart-broadcast.ts
-import fs16 from "fs";
+import fs17 from "fs";
 import path18 from "path";
 function statePath2(stateRoot) {
   return path18.join(stateRoot, "daemon-restart-state.json");
@@ -5774,7 +5788,7 @@ function computeRestartSignature(version, buildMtimeMs) {
 }
 function readPersistedRestartSignature(stateRoot) {
   try {
-    const raw = fs16.readFileSync(statePath2(stateRoot), "utf-8");
+    const raw = fs17.readFileSync(statePath2(stateRoot), "utf-8");
     const data = JSON.parse(raw);
     return typeof data.signature === "string" ? data.signature : null;
   } catch {
@@ -5782,8 +5796,8 @@ function readPersistedRestartSignature(stateRoot) {
   }
 }
 function writePersistedRestartSignature(stateRoot, signature) {
-  fs16.mkdirSync(stateRoot, { recursive: true });
-  fs16.writeFileSync(statePath2(stateRoot), JSON.stringify({ signature }, null, 2) + "\n");
+  fs17.mkdirSync(stateRoot, { recursive: true });
+  fs17.writeFileSync(statePath2(stateRoot), JSON.stringify({ signature }, null, 2) + "\n");
 }
 function restartNotice(version, isDevRebuild) {
   const suffix = isDevRebuild ? " (dev build)" : "";