squadrant 0.13.3 → 0.13.5

package/dist/squadrantd.js

@@ -1974,6 +1974,7 @@ var CaptainDelivery = class {
 // packages/core/dist/daemon/delivery-loop.js
 var CURSOR_SUBSCRIBER = "captain";
 var CAPTAIN_GONE_STREAK_K = 3;
+var TERMINAL_KINDS = /* @__PURE__ */ new Set(["task.done", "task.failed", "task.cancelled", "task.blocked"]);
 function discoverCaptainSurface(surfaces, captainTitle) {
   return surfaces.find((s) => s.title === captainTitle) ?? null;
 }
@@ -2066,13 +2067,19 @@ function createDelivery(ctx, daemonCmux) {
       }
       for await (const entry of readFromCursor({ stateRoot, project, fromSeq: lastAcked + 1 })) {
         if (new Date(entry.ts).getTime() < sessionStartMs - STALE_THRESHOLD_MS) {
-          await writeCursor({ stateRoot, project, subscriber: CURSOR_SUBSCRIBER, lastAckedSeq: entry.seq });
-          continue;
+          if (!TERMINAL_KINDS.has(entry.kind)) {
+            log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=stale-skipped`);
+            await writeCursor({ stateRoot, project, subscriber: CURSOR_SUBSCRIBER, lastAckedSeq: entry.seq });
+            continue;
+          }
+          log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=stale-terminal-deliver`);
         }
         const result = await d.deliver(entry, (text, sendOpts) => cmux2.send(surface, text, sendOpts));
         if ("delivered" in result) {
+          log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=delivered`);
           await writeCursor({ stateRoot, project, subscriber: CURSOR_SUBSCRIBER, lastAckedSeq: entry.seq });
         } else {
+          log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=deferred`);
           break;
         }
       }
@@ -4388,7 +4395,28 @@ function parseDraftFromScreen(screen) {
   }
   return "";
 }
-function readInputBoxRaw(screen) {
+function hasModalOptionList(screen) {
+  if (!screen)
+    return false;
+  const lines = screen.split(/\r?\n/);
+  const HR_RE = /^\s*─{10,}\s*$/;
+  let bottomHR = -1;
+  let topHR = -1;
+  for (let i = lines.length - 1; i >= 0; i--) {
+    if (HR_RE.test(lines[i])) {
+      if (bottomHR === -1)
+        bottomHR = i;
+      else {
+        topHR = i;
+        break;
+      }
+    }
+  }
+  if (topHR === -1)
+    return false;
+  return lines.slice(topHR + 1, bottomHR).some((l) => /^\s*\d+\.\s/.test(l));
+}
+function readInputBoxRaw(screen, opts) {
   if (!screen)
     return null;
   const lines = screen.split(/\r?\n/);
@@ -4414,7 +4442,8 @@ function readInputBoxRaw(screen) {
     s = s.replace(/\s*[▌█▔▎▏]+\s*$/, "");
     parts.push(s);
   }
-  return parts.join("").replace(/\s+$/, "");
+  const joined = parts.join("");
+  return opts?.trim === false ? joined : joined.replace(/\s+$/, "");
 }
 function sendDebugEnabled() {
   return !!process.env.SQUADRANT_DEBUG_SEND;
@@ -4428,6 +4457,19 @@ function classifySendOutcome(payload, postBox) {
     return "stuck";
   return "unknown";
 }
+function classifyDraftLiveness(before, after) {
+  if (before === null || after === null)
+    return "inconclusive";
+  if (after === "")
+    return "no-draft";
+  if (before.length > 0) {
+    const segs = [...new Intl.Segmenter().segment(before)];
+    const expected = segs.slice(0, -1).map((s) => s.segment).join("").replace(/\s+$/, "");
+    if (after === expected)
+      return "real-draft";
+  }
+  return "inconclusive";
+}
 function createCmuxDriver() {
   return {
     name: "cmux",
@@ -4618,6 +4660,8 @@ function createCmuxDriver() {
       const draft = parseDraftFromScreen(screen);
       if (draft === null)
         throw new DeferDelivery(null);
+      if (hasModalOptionList(screen))
+        throw new DeferDelivery(null);
       if (draft === "") {
         await deliver();
         return;
@@ -4625,18 +4669,38 @@ function createCmuxDriver() {
       if (!opts?.probe)
         throw new DeferDelivery(draft);
       const before = readInputBoxRaw(screen);
+      const rawBefore = readInputBoxRaw(screen, { trim: false });
       await cmux(["send-key", "--workspace", ws, "--surface", sf, "backspace"]);
+      await new Promise((r) => setTimeout(r, 50));
       let afterScreen = "";
       try {
         afterScreen = await cmux(["read-screen", "--workspace", ws, "--surface", sf]);
       } catch {
       }
       const after = readInputBoxRaw(afterScreen);
-      if (before !== null && after !== null && after.length > 0 && after === before.slice(0, -1)) {
-        await cmux(["send", "--workspace", ws, "--surface", sf, before.slice(-1)]);
+      const rawAfter = readInputBoxRaw(afterScreen, { trim: false });
+      const liveness = classifyDraftLiveness(before, after);
+      if (liveness === "real-draft") {
+        const segs = before ? [...new Intl.Segmenter().segment(before)] : [];
+        const lastGrapheme = segs.length > 0 ? segs[segs.length - 1].segment : before.slice(-1);
+        await cmux(["send", "--workspace", ws, "--surface", sf, lastGrapheme]);
         throw new DeferDelivery(draft);
       }
-      await deliver();
+      if (liveness === "no-draft") {
+        await deliver();
+        return;
+      }
+      if (rawBefore !== null && rawAfter !== null) {
+        if (rawBefore !== rawAfter) {
+          const segs = [...new Intl.Segmenter().segment(rawBefore)];
+          const lastGrapheme = segs.length > 0 ? segs[segs.length - 1].segment : rawBefore.slice(-1);
+          await cmux(["send", "--workspace", ws, "--surface", sf, lastGrapheme]);
+          throw new DeferDelivery(draft);
+        }
+        await deliver();
+        return;
+      }
+      throw new DeferDelivery(draft);
     },
     async listSurfaces(workspaceId) {
       let output;