squadrant 0.16.1 → 0.16.2

package/dist/index.js

@@ -1950,7 +1950,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",
@@ -1978,6 +1978,18 @@ async function readCursor(opts) {
     return null;
   }
 }
+async function waitForCaptainDelivery(opts) {
+  const subscriber = opts.subscriber ?? "captain";
+  const deadline = Date.now() + opts.timeoutMs;
+  for (; ; ) {
+    const cursor = await readCursor({ stateRoot: opts.stateRoot, project: opts.project, subscriber });
+    if (cursor && cursor.lastAckedSeq >= opts.seq)
+      return true;
+    if (Date.now() >= deadline)
+      return false;
+    await new Promise((r) => setTimeout(r, opts.pollMs));
+  }
+}
 async function writeCursor(opts) {
   await fs9.mkdir(inboxDir(opts.stateRoot), { recursive: true });
   const dest = cursorPath(opts.stateRoot, opts.project, opts.subscriber);
@@ -2389,6 +2401,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;
 }
 var CREW_STALE_MS, CREW_GONE_MS, TERMINAL;
@@ -3394,9 +3409,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) {
@@ -3428,10 +3449,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()) {
@@ -5882,8 +5907,7 @@ async function runCrewSend(project, name, message, runtime, workspaceId, deps) {
     throw new Error(blockedByModalMessage());
   }
   if (!delivered) {
-    process.stderr.write(`\u26A0\uFE0F  Message not delivered to crew '${name}' \u2014 use 'squadrant crew send ${project} ${name}' to re-send.
-`);
+    throw new Error(`Message not delivered to crew '${name}' \u2014 the paste/submit could not be confirmed. Re-send with 'squadrant crew send ${project} ${name}'.`);
   }
 }
 async function runCrewRead(project, name, runtime, workspaceId) {
@@ -6144,6 +6168,7 @@ __export(dist_exports2, {
   topicKey: () => topicKey,
   topicName: () => topicName,
   tryAcquireDaemonLock: () => tryAcquireDaemonLock,
+  waitForCaptainDelivery: () => waitForCaptainDelivery,
   waitForWarmup: () => waitForWarmup,
   writeCursor: () => writeCursor,
   writeTelegramConfig: () => writeTelegramConfig
@@ -13767,7 +13792,9 @@ runtimeCommand.command("status").description("Print 'running' or 'stopped' for a
     process.exit(2);
   }
 });
-async function runRuntimeSend(arg1, arg2, opts) {
+var SEND_CONFIRM_TIMEOUT_MS = 15e3;
+var SEND_CONFIRM_POLL_MS = 500;
+async function runRuntimeSend(arg1, arg2, opts, confirmOpts) {
   const config = loadConfig();
   const registry = buildRegistry();
   if (opts.command && arg2 !== void 0) {
@@ -13777,7 +13804,7 @@ async function runRuntimeSend(arg1, arg2, opts) {
   const message = opts.command ? arg1 : arg2;
   if (!message) throw new Error("Message is required");
   const { requireDaemon: requireDaemon2 } = await Promise.resolve().then(() => (init_require_daemon(), require_daemon_exports));
-  const { appendCaptainMessage: appendCaptainMessage2 } = await Promise.resolve().then(() => (init_dist2(), dist_exports2));
+  const { appendCaptainMessage: appendCaptainMessage2, waitForCaptainDelivery: waitForCaptainDelivery2 } = await Promise.resolve().then(() => (init_dist2(), dist_exports2));
   await requireDaemon2();
   const resolved = resolveTarget(registry, config, target, !!opts.command);
   await needRef(resolved);
@@ -13785,16 +13812,30 @@ async function runRuntimeSend(arg1, arg2, opts) {
   const { join: join30, dirname: dirname10 } = await import("path");
   const { DEFAULT_CONFIG_PATH: DEFAULT_CONFIG_PATH2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
   const stateRoot = join30(dirname10(DEFAULT_CONFIG_PATH2), "state");
-  await appendCaptainMessage2({
+  const seq = await appendCaptainMessage2({
     stateRoot,
     project: finalProject,
     text: message,
     source: "cli"
   });
+  const timeoutMs = confirmOpts?.timeoutMs ?? SEND_CONFIRM_TIMEOUT_MS;
+  const delivered = await waitForCaptainDelivery2({
+    stateRoot,
+    project: finalProject,
+    seq,
+    timeoutMs,
+    pollMs: confirmOpts?.pollMs ?? SEND_CONFIRM_POLL_MS
+  });
+  if (!delivered) {
+    throw new Error(
+      `Message queued for '${finalProject}' (seq=${seq}) but delivery was not confirmed within ${Math.round(timeoutMs / 1e3)}s. It may still be pending \u2014 check with 'squadrant runtime read-screen ${finalProject}${opts.command ? " --command" : ""}'.`
+    );
+  }
 }
 runtimeCommand.command("send").description("Send a message to a target workspace AND commit with Enter. With --command, the first positional is the message.").argument("<arg1>", "Project name, or the message when --command is used").argument("[arg2]", "Message (when target is a project). Omit when using --command.").option("--command", "Target the command workspace").action(async (arg1, arg2, opts) => {
   try {
     await runRuntimeSend(arg1, arg2, opts);
+    console.log(chalk18.green("\u2714 Delivered (confirmed)"));
   } catch (err) {
     console.error(chalk18.red(err.message));
     process.exit(1);