squadrant 0.26.2 → 0.26.3

package/dist/squadrantd.js

@@ -4662,9 +4662,13 @@ async function runCrewSpawn(input, config, deps) {
     await deps.runtime.sendToPane(pane2, `cd ${shellQuote(spawnCwd)} && ${envPrefix}${routerPrefix} ${niceCrewCommand(cliCommand2)}`);
     const preLaunchScreen = await deps.runtime.readPaneScreen(pane2) ?? "";
     const claudeFirstTurn = spillOversizedFirstTurn(firstTurnTask, rec.id);
-    const sendPromise = deps.sendFirstTurn(pane2, `${claudeFirstTurn}
+    const peerBrief = `${firstTurnTask}
 
-${buildCompletionProtocol(rec.id, input.project)}`, preLaunchScreen);
+${buildCompletionProtocol(rec.id, input.project)}`;
+    const peerResult = deps.sendFirstTurnPeer ? await deps.sendFirstTurnPeer({ pane: pane2, taskId: rec.id, project: input.project, messagingSocketPath, message: peerBrief }).catch(() => ({ kind: "fallback" })) : { kind: "fallback" };
+    const sendPromise = peerResult.kind === "fallback" ? deps.sendFirstTurn(pane2, `${claudeFirstTurn}
+
+${buildCompletionProtocol(rec.id, input.project)}`, preLaunchScreen) : Promise.resolve({ delivered: peerResult.kind === "delivered" });
     let agentNotStarted = false;
     const scrapeDelivered = sendPromise.then((r) => {
       agentNotStarted = !!r.agentNotStarted;
@@ -8889,6 +8893,30 @@ async function runCrewAnswer(project, name, option, runtime, workspaceId, deps,
   if (!crew) {
     throw new Error(`Crew '${name}' not found for ${project}. Run 'squadrant crew list ${project}'.`);
   }
+  const match = runtime.findDialog && runtime.answerDialog ? await deps.dialogMatch?.() : void 0;
+  if (match) {
+    const dialog = await runtime.findDialog(match).catch(() => void 0);
+    if (dialog) {
+      const log2 = deps.log ?? (() => {
+      });
+      const options2 = dialog.options.map((o) => ({ ...o, highlighted: false }));
+      let target2;
+      try {
+        target2 = resolveOption(options2, option);
+        if (opts?.expect && !target2.label.toLowerCase().includes(opts.expect.toLowerCase()))
+          target2 = void 0;
+      } catch {
+        target2 = void 0;
+      }
+      if (target2) {
+        log2(`\u2192 answering ${target2.index}. "${target2.label}" via the runtime (no keystrokes)`);
+        const ok2 = await runtime.answerDialog(dialog, opts?.text ? { text: opts.text } : { label: target2.label }).catch(() => false);
+        if (ok2)
+          return { selected: target2, closed: true };
+      }
+      log2("runtime answer not applied \u2014 falling back to keystrokes");
+    }
+  }
   const modal = await deps.readModalOptions(crew);
   if (!modal || modal.options.length === 0) {
     throw new Error(`Crew '${name}' has no interactive option prompt visible right now \u2014 nothing to answer. Read its screen with 'squadrant crew read ${project} ${name}' to check its state.`);
@@ -9268,6 +9296,58 @@ var init_source = __esm({
   }
 });
 
+// packages/core/dist/peer-first-turn.js
+function screenShowsTrustPanel(screen) {
+  return /do you trust the files in this folder|is this a project you created or one you trust|is this a project you trust/i.test(screen);
+}
+function trustPanelAcceptKeys(screen) {
+  return /❯\s*(\d\.\s*)?No\b/.test(screen) ? ["Down", "Enter"] : ["Enter"];
+}
+async function deliverFirstTurnViaPeer(message, deps) {
+  const pollMs = deps.pollMs ?? DEFAULT_POLL_MS2;
+  const deadline = deps.now() + (deps.readyTimeoutMs ?? DEFAULT_READY_TIMEOUT_MS);
+  let lastTrustAnswer = -Infinity;
+  for (; ; ) {
+    if (deps.statusOf()?.status === "idle")
+      break;
+    if (deps.now() >= deadline)
+      return { kind: "fallback" };
+    if (!deps.statusOf() && deps.now() - lastTrustAnswer >= TRUST_ANSWER_COOLDOWN_MS) {
+      const screen = await deps.readScreen().catch(() => "");
+      if (screenShowsTrustPanel(screen)) {
+        lastTrustAnswer = deps.now();
+        for (const key of trustPanelAcceptKeys(screen))
+          await deps.pressKey(key).catch(() => {
+          });
+      }
+    }
+    await deps.sleep(pollMs);
+  }
+  const outcome = await deps.send(message);
+  if (fallsBackToPane(outcome))
+    return { kind: "fallback" };
+  if (outcome.status === "accepted" && outcome.confirmed)
+    return { kind: "delivered" };
+  const confirmDeadline = deps.now() + (deps.confirmGraceMs ?? DEFAULT_CONFIRM_GRACE_MS);
+  for (; ; ) {
+    if (await deps.isConfirmed().catch(() => false))
+      return { kind: "delivered" };
+    if (deps.now() >= confirmDeadline)
+      return { kind: "unconfirmed" };
+    await deps.sleep(pollMs);
+  }
+}
+var DEFAULT_READY_TIMEOUT_MS, DEFAULT_POLL_MS2, DEFAULT_CONFIRM_GRACE_MS, TRUST_ANSWER_COOLDOWN_MS;
+var init_peer_first_turn = __esm({
+  "packages/core/dist/peer-first-turn.js"() {
+    init_control_channel();
+    DEFAULT_READY_TIMEOUT_MS = 9e4;
+    DEFAULT_POLL_MS2 = 250;
+    DEFAULT_CONFIRM_GRACE_MS = 1e4;
+    TRUST_ANSWER_COOLDOWN_MS = 5e3;
+  }
+});
+
 // packages/core/dist/knowledge/paths.js
 import path14 from "path";
 function kbDir(hubVault, kb) {
@@ -12987,6 +13067,7 @@ __export(dist_exports, {
   defaultIsPidAlive: () => defaultIsPidAlive,
   defaultListenError: () => defaultListenError,
   defaultWorkRoot: () => defaultWorkRoot,
+  deliverFirstTurnViaPeer: () => deliverFirstTurnViaPeer,
   deliverStartupPrompt: () => deliverStartupPrompt,
   deliverToCaptain: () => deliverToCaptain,
   deliverable: () => deliverable,
@@ -13168,6 +13249,7 @@ __export(dist_exports, {
   saveState: () => saveState,
   screenHasSplashMarker: () => screenHasSplashMarker,
   screenHash: () => screenHash,
+  screenShowsTrustPanel: () => screenShowsTrustPanel,
   searchRules: () => searchRules,
   selectPromptHits: () => selectPromptHits,
   sendRequest: () => sendRequest,
@@ -13193,6 +13275,7 @@ __export(dist_exports, {
   toControlEvent: () => toControlEvent,
   topicKey: () => topicKey,
   topicName: () => topicName,
+  trustPanelAcceptKeys: () => trustPanelAcceptKeys,
   tryAcquireDaemonLock: () => tryAcquireDaemonLock,
   usageFromJson: () => usageFromJson,
   validateKb: () => validateKb,
@@ -13255,6 +13338,7 @@ var init_dist2 = __esm({
     init_conformance();
     init_source();
     init_control_channel();
+    init_peer_first_turn();
     init_captain_channel();
     init_captain_record();
     init_opencode_session();
@@ -15069,6 +15153,15 @@ async function cmuxHasInputGuards() {
   inputGuardsCache = major > 0 || minor >= 65;
   return inputGuardsCache;
 }
+function feedSessionOf(item) {
+  const parts = item.workstream_id?.split(":");
+  if (parts?.[0] !== "cmux-feed-v1" || !parts[2])
+    return void 0;
+  return Buffer.from(parts[2], "base64").toString("utf-8");
+}
+async function feedRpc(method, params) {
+  return JSON.parse(await cmux(["rpc", method, JSON.stringify(params)]));
+}
 function parseList(output) {
   let parsed;
   try {
@@ -15433,6 +15526,26 @@ function createCmuxDriver() {
       await cmux(["send-key", "--workspace", wsId, "--surface", surfaceId, "Enter"]);
       return { workspaceId: wsId, surfaceId, title: opts.title };
     },
+    // #916: cmux >= 0.65 `surface.input_state` reads the render grid (incl. faint
+    // spans) without touching the pane. The RPC needs a surface UUID, and an
+    // unknown ref would silently fall back to the focused surface, so resolve the
+    // ref through the tree first. Anything unexpected → undefined (old path).
+    async inputState(pane) {
+      try {
+        if (!await cmuxHasInputGuards())
+          return void 0;
+        const tree = JSON.parse(await cmux(["tree", "--workspace", pane.workspaceId, "--json", "--id-format", "both"]));
+        const id = tree.windows?.flatMap((w) => w.workspaces ?? []).flatMap((w) => w.panes ?? []).flatMap((p) => p.surfaces ?? []).find((s) => s.ref === pane.surfaceId)?.id;
+        if (!id)
+          return void 0;
+        const r = JSON.parse(await cmux(["rpc", "surface.input_state", JSON.stringify({ surface_id: id })]));
+        if (r.agent !== true)
+          return "unknown";
+        return r.state === "empty" || r.state === "draft" || r.state === "dialog" ? r.state : "unknown";
+      } catch {
+        return void 0;
+      }
+    },
     async sendToSurface(surface, text, opts) {
       const ws = surface.workspaceId;
       const sf = surface.surfaceId;
@@ -15459,6 +15572,17 @@ function createCmuxDriver() {
 `);
         }
       };
+      if (opts?.agent !== "opencode") {
+        const state = await this.inputState?.(surface);
+        if (state === "draft")
+          throw new DeferDelivery(null, "draft");
+        if (state === "dialog")
+          throw new DeferDelivery(null, "modal");
+        if (state === "empty") {
+          await deliver();
+          return;
+        }
+      }
       let screen = "";
       try {
         screen = await cmux(["read-screen", "--workspace", ws, "--surface", sf]);
@@ -15537,6 +15661,39 @@ function createCmuxDriver() {
         args.push("--focus", "true");
       await cmux(args);
     },
+    // Feed-backed structured answer (#918). cmux >= 0.65 only; any miss
+    // (old cmux, no matching item, unsupported shape) is undefined so the
+    // caller keeps the keystroke path.
+    async findDialog(match) {
+      if (!await cmuxHasInputGuards())
+        return void 0;
+      let items;
+      try {
+        items = (await feedRpc("feed.list", { pending_only: true })).items ?? [];
+      } catch {
+        return void 0;
+      }
+      const mine = items.filter((i) => match.agentSessionId ? feedSessionOf(i) === match.agentSessionId : !!match.cwd && i.cwd === match.cwd);
+      if (mine.length !== 1 || !mine[0].request_id)
+        return void 0;
+      const item = mine[0];
+      if (item.kind !== "question" || item.questions?.length !== 1)
+        return void 0;
+      const labels = (item.questions[0].options ?? []).map((o) => o.label ?? "");
+      if (labels.length === 0)
+        return void 0;
+      return {
+        id: item.request_id,
+        options: labels.map((label, i) => ({ index: i + 1, label }))
+      };
+    },
+    async answerDialog(dialog, answer) {
+      const reply = answer.text ?? answer.label;
+      if (!reply)
+        return false;
+      const res = await feedRpc("feed.question.reply", { request_id: dialog.id, selections: [reply] });
+      return res.delivered === true;
+    },
     async showPatch(opts) {
       const args = ["diff", "-", "--workspace", opts.workspaceId, "--layout", opts.layout ?? "split"];
       if (opts.title)
@@ -16637,6 +16794,11 @@ async function settleInputBox(runtime, pane) {
   return sawContent;
 }
 async function confirmedSendToPane(runtime, pane, message) {
+  const native = await runtime.inputState?.(pane).catch(() => void 0);
+  if (native === "dialog")
+    return { delivered: false, blockedByModal: true };
+  if (native === "draft")
+    return { delivered: false };
   const preSendScreen = await runtime.readPaneScreen(pane) ?? "";
   if (hasModalOptionList2(preSendScreen)) {
     return { delivered: false, blockedByModal: true };