squadrant 0.16.4 → 0.16.5

package/dist/squadrantd.js

@@ -490,6 +490,9 @@ function stampAttempt(rec, patch, now) {
     attempts.push(last);
   return { ...rec, attempts };
 }
+function isStickyAttention(state) {
+  return state === "blocked" || state === "review";
+}
 function nextPendingTool(current, ev, now) {
   if (ev.note === "agent.hook.PreToolUse")
     return { name: ev.tool ?? "tool", since: now };
@@ -518,7 +521,7 @@ function reduce(rec, ev, now) {
       };
     case "task.progress": {
       const pendingTool = nextPendingTool(rec.pendingTool, ev, now);
-      if (rec.state === "blocked")
+      if (isStickyAttention(rec.state))
         return { ...rec, lastHeartbeat: now, lastEvent: ev.type, pendingTool };
       const b = { ...base, pendingTool };
       if (rec.state === "awaiting-input" || rec.state === "stalled")
@@ -526,7 +529,7 @@ function reduce(rec, ev, now) {
       return stampAttempt(b, {}, now);
     }
     case "heartbeat":
-      if (rec.state === "blocked")
+      if (isStickyAttention(rec.state))
         return { ...rec, lastHeartbeat: now, lastEvent: ev.type };
       if (rec.state === "awaiting-input")
         return { ...base, state: "working" };
@@ -535,7 +538,12 @@ function reduce(rec, ev, now) {
       if (rec.state === "blocked")
         return { ...rec, lastHeartbeat: now, lastEvent: ev.type };
       return { ...base, state: "blocked", question: ev.question, pendingTool: void 0 };
+    case "task.review":
+      return { ...base, state: "review", reviewNote: ev.message, pendingTool: void 0 };
     case "task.done":
+      if (rec.state === "review" && ev.source !== "approve") {
+        return { ...rec, lastHeartbeat: now, lastEvent: ev.type };
+      }
       return { ...base, state: "done", resultRef: ev.resultRef, parseWarning: ev.parseWarning };
     case "task.failed":
       return { ...base, state: "failed", error: ev.error, exitCode: ev.exitCode };
@@ -548,7 +556,7 @@ function reduce(rec, ev, now) {
     case "task.turn.started":
       return { ...stampAttempt(base, {}, now), state: "working", pendingTool: void 0 };
     case "task.turn.completed":
-      if (rec.state === "blocked")
+      if (isStickyAttention(rec.state))
         return { ...rec, lastHeartbeat: now, lastEvent: ev.type };
       if (rec.pendingTool)
         return stampAttempt(base, {}, now);
@@ -606,8 +614,8 @@ var DEFAULT_FIRST_TURN_RESEND_COOLDOWN_MS = 6e4;
 var DEFAULT_TASK_TIMEOUT_MS = 8 * 60 * 60 * 1e3;
 var TERMINAL_RECORD_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
 var TERMINAL_RECORD_KEEP_PER_PROJECT = 20;
-var ATTENTION_STATES = /* @__PURE__ */ new Set(["done", "blocked", "failed", "stalled", "awaiting-input"]);
-var REAPABLE_SURFACE_STATES = /* @__PURE__ */ new Set(["working", "stalled", "awaiting-input", "blocked"]);
+var ATTENTION_STATES = /* @__PURE__ */ new Set(["done", "blocked", "review", "failed", "stalled", "awaiting-input"]);
+var REAPABLE_SURFACE_STATES = /* @__PURE__ */ new Set(["working", "stalled", "awaiting-input", "blocked", "review"]);
 var IDLE_DEBOUNCE_MS = 12e3;
 function shortId(id) {
   return id.slice(0, 8);
@@ -629,6 +637,10 @@ function formatMessage(rec, event) {
     }
     case "blocked":
       return `CREW BLOCKED ${tag}: ${(rec.question ?? "(no question)").trim()}`;
+    case "review": {
+      const note = (rec.reviewNote ?? "").trim();
+      return `CREW REVIEW ${tag}: ${note || "ready for review"} \u2014 run 'squadrant diff ${rec.project} ${rec.name ?? rec.id}' then 'squadrant crew approve' or send feedback.`;
+    }
     case "failed":
       return `CREW FAILED ${tag}: ${(rec.error ?? "(no error)").trim()}`;
     case "stalled": {
@@ -699,6 +711,7 @@ var KNOWN_EVENT_TYPES = /* @__PURE__ */ new Set([
   "task.progress",
   "heartbeat",
   "task.blocked",
+  "task.review",
   "task.done",
   "task.failed",
   "task.session",
@@ -2841,8 +2854,12 @@ var REGISTRY = {
     build: (a) => a[0] ? ok("crews", ["crew", "list", a[0]]) : usage("crews", "usage: /crews <project>")
   },
   launch: {
+    // --headless (#586, same reason as #520 on the boot-if-down path): runCommand
+    // execs this argv from the daemon, which has no CMUX_WORKSPACE_ID and no
+    // terminal — a plain `launch` would open the cmux GUI app and exit 0 before
+    // the workspace is ever launched.
     usage: "/launch <project>",
-    build: (a) => a[0] ? ok("launch", ["launch", a[0]]) : usage("launch", "usage: /launch <project>")
+    build: (a) => a[0] ? ok("launch", ["launch", a[0], "--headless"]) : usage("launch", "usage: /launch <project>")
   },
   effort: {
     usage: "/effort [max|balance|low]",
@@ -3027,6 +3044,9 @@ ${ev.message}` : "");
     case "task.blocked":
       return `\u{1F6A7} [${project}] CREW BLOCKED \xB7 ${ev.id}
 ${ev.question}`;
+    case "task.review":
+      return `\u{1F440} [${project}] CREW REVIEW \xB7 ${ev.id}` + (ev.message ? `
+${ev.message}` : "");
     case "task.idle":
       return `\u{1F4A4} [${project}] CREW IDLE \xB7 ${ev.id}`;
     case "task.failed":
@@ -3223,6 +3243,7 @@ var DONE_ONLY = /* @__PURE__ */ new Set(["task.done", "task.failed"]);
 var ALERTS = /* @__PURE__ */ new Set([
   ...DONE_ONLY,
   "task.blocked",
+  "task.review",
   "task.approval.requested",
   "task.input.requested",
   "task.timeout"
@@ -4658,6 +4679,18 @@ function cmux(args) {
     );
   });
 }
+function cmuxStdin(args, input) {
+  return new Promise((resolve2, reject) => {
+    const child = execFile2(resolveCmuxBin(), args, { encoding: "utf-8", timeout: CMUX_TIMEOUT, env: { ...process.env, CMUX_QUIET: "1" } }, (err, stdout) => {
+      if (err) {
+        reject(err.code === "ETIMEDOUT" ? new CmuxTimeoutError(args.join(" ")) : err);
+        return;
+      }
+      resolve2(stdout.trim());
+    });
+    child.stdin.end(input);
+  });
+}
 function parseList(output) {
   let parsed;
   try {
@@ -5059,6 +5092,37 @@ function createCmuxDriver() {
       }
       throw new DeferDelivery(draft);
     },
+    async showDiff(opts) {
+      const source = opts.source ?? "branch";
+      const args = ["diff"];
+      if (source === "staged") {
+        args.push("--staged");
+      } else if (source === "unstaged") {
+        args.push("--unstaged");
+      } else {
+        args.push("--branch", "--base", opts.base);
+        if (opts.lastTurn)
+          args.push("--last-turn");
+      }
+      args.push("--cwd", opts.cwd, "--workspace", opts.workspaceId, "--layout", opts.layout ?? "split");
+      if (opts.title)
+        args.push("--title", opts.title);
+      if (opts.focus === false)
+        args.push("--no-focus");
+      else
+        args.push("--focus", "true");
+      await cmux(args);
+    },
+    async showPatch(opts) {
+      const args = ["diff", "-", "--workspace", opts.workspaceId, "--layout", opts.layout ?? "split"];
+      if (opts.title)
+        args.push("--title", opts.title);
+      if (opts.focus === false)
+        args.push("--no-focus");
+      else
+        args.push("--focus", "true");
+      await cmuxStdin(args, opts.patch);
+    },
     async listSurfaces(workspaceId) {
       let output;
       try {