squadrant 0.13.0 → 0.13.2

package/dist/index.js

@@ -622,8 +622,41 @@ function resolveWorktreeBase(repoRoot, fallback = "develop") {
   return fallback;
 }
 function addWorktree(spec) {
-  const wt = worktreePath(spec.repoRoot, spec.worktreeDir, spec.project, spec.name);
-  execFileSync2("git", ["-C", spec.repoRoot, "worktree", "add", wt, "-b", crewBranch(spec.name), spec.base], { stdio: "pipe" });
+  const originalBranch = crewBranch(spec.name);
+  let targetName = spec.name;
+  let targetBranch = originalBranch;
+  let branchExists = false;
+  try {
+    execFileSync2("git", ["-C", spec.repoRoot, "show-ref", "--verify", "--quiet", `refs/heads/${originalBranch}`], { stdio: "pipe" });
+    branchExists = true;
+  } catch {
+  }
+  if (branchExists) {
+    const log = execFileSync2("git", ["-C", spec.repoRoot, "log", "--oneline", `${spec.base}..${originalBranch}`], { stdio: ["ignore", "pipe", "ignore"] }).toString().trim();
+    if (!log) {
+      execFileSync2("git", ["-C", spec.repoRoot, "branch", "-D", originalBranch], { stdio: "pipe" });
+    } else {
+      let suffix = 2;
+      while (true) {
+        const candidate = `${spec.name}-${suffix}`;
+        const candidateBranch = crewBranch(candidate);
+        let candidateExists = false;
+        try {
+          execFileSync2("git", ["-C", spec.repoRoot, "show-ref", "--verify", "--quiet", `refs/heads/${candidateBranch}`], { stdio: "pipe" });
+          candidateExists = true;
+        } catch {
+        }
+        if (!candidateExists) {
+          targetName = candidate;
+          targetBranch = candidateBranch;
+          break;
+        }
+        suffix++;
+      }
+    }
+  }
+  const wt = worktreePath(spec.repoRoot, spec.worktreeDir, spec.project, targetName);
+  execFileSync2("git", ["-C", spec.repoRoot, "worktree", "add", wt, "-b", targetBranch, spec.base], { stdio: "pipe" });
   return wt;
 }
 function removeWorktree(repoRoot, wtPath) {
@@ -2454,8 +2487,9 @@ async function runCodexInteractiveSpawn(o) {
     title
   });
   await o.runtime.sendToPane(pane, `squadrant crew attach ${rec.id}`);
-  if (o.task && o.task !== "(interactive)") {
-    void o.sendCodexFirstTurn(rec.id, o.task).catch((e) => {
+  const firstTurnText = o.firstTurn ?? o.task;
+  if (firstTurnText && firstTurnText !== "(interactive)") {
+    void o.sendCodexFirstTurn(rec.id, firstTurnText).catch((e) => {
       process.stderr.write(`(first-turn delivery failed: ${e.message})
 `);
     });
@@ -2487,6 +2521,13 @@ async function runCrewSpawn(input, config, deps) {
     name,
     base: resolveWorktreeBase(proj.path)
   }) : proj.path;
+  let firstTurnTask = input.task;
+  if (input.taskFile && input.taskFile !== "-" && !input.shared) {
+    const absTaskFile = path10.resolve(input.taskFile);
+    const basename = path10.basename(absTaskFile);
+    fs12.copyFileSync(absTaskFile, path10.join(spawnCwd, basename));
+    firstTurnTask = `Read ./${basename} to get your task brief, then execute it.`;
+  }
   const route = !input.agentExplicit && !input.model ? resolveCrewRoute(input.task, config) : null;
   if (route) {
     deps.onRouted?.(route);
@@ -2502,6 +2543,7 @@ async function runCrewSpawn(input, config, deps) {
     return runCodexInteractiveSpawn({
       project: input.project,
       task: input.task,
+      firstTurn: firstTurnTask !== input.task ? firstTurnTask : void 0,
       cwd: spawnCwd,
       runtime: deps.runtime,
       workspaceId: captain.id,
@@ -2545,9 +2587,15 @@ async function runCrewSpawn(input, config, deps) {
     const envPrefix = `SQUADRANT_CREW_TASK_ID=${rec.id} SQUADRANT_CREW_PROJECT=${input.project}`;
     await deps.runtime.sendToPane(pane2, `cd ${shellQuote(spawnCwd)} && ${envPrefix} ${cliCommand2}`);
     const preLaunchScreen = await deps.runtime.readPaneScreen(pane2) ?? "";
-    await deps.sendFirstTurn(pane2, `${input.task}
+    const claudeResult = await deps.sendFirstTurn(pane2, `${firstTurnTask}
 
 ${buildCompletionProtocol(rec.id, input.project)}`, preLaunchScreen);
+    if (!claudeResult.delivered) {
+      process.stderr.write(`\u26A0\uFE0F  First turn not delivered for crew '${name}' \u2014 use 'squadrant crew send ${input.project} ${name}' to re-send the task.
+`);
+    } else {
+      await deps.emitEvent?.(input.project, { type: "task.first-turn.confirmed", id: rec.id });
+    }
     return { ...pane2, title: title2 };
   }
   if (agentName === "opencode") {
@@ -2587,7 +2635,7 @@ ${buildCompletionProtocol(rec.id, input.project)}`, preLaunchScreen);
     const envPrefix = `SQUADRANT_CREW_TASK_ID=${rec.id} SQUADRANT_CREW_PROJECT=${input.project}`;
     await deps.runtime.sendToPane(pane2, `cd ${shellQuote(spawnCwd)} && ${envPrefix} OPENCODE_CONFIG=${opencodeConfigPath} ${cliCommand2}`);
     const preLaunchScreen = await deps.runtime.readPaneScreen(pane2) ?? "";
-    await deps.sendFirstTurn(pane2, `${input.task}
+    const opencodeResult = await deps.sendFirstTurn(pane2, `${firstTurnTask}
 
 ${buildCompletionProtocol(rec.id, input.project)}`, preLaunchScreen, {
       // #235: confirm-on-delivery — sendFirstTurnWhenReady polls until "Ask
@@ -2595,6 +2643,12 @@ ${buildCompletionProtocol(rec.id, input.project)}`, preLaunchScreen, {
       // without duplicating the task. See crew-pane.ts SPLASH_MAX_CHECKS/EVERY_N.
       splashMarker: "Ask anything\u2026"
     });
+    if (!opencodeResult.delivered) {
+      process.stderr.write(`\u26A0\uFE0F  First turn not delivered for crew '${name}' \u2014 use 'squadrant crew send ${input.project} ${name}' to re-send the task.
+`);
+    } else {
+      await deps.emitEvent?.(input.project, { type: "task.first-turn.confirmed", id: rec.id });
+    }
     return { ...pane2, title: title2 };
   }
   const cliCommand = agent.buildCommand({
@@ -2611,7 +2665,11 @@ ${buildCompletionProtocol(rec.id, input.project)}`, preLaunchScreen, {
   await deps.runtime.sendToPane(pane, cliCommand);
   if (interactive) {
     const preLaunchScreen = await deps.runtime.readPaneScreen(pane) ?? "";
-    await deps.sendFirstTurn(pane, input.task, preLaunchScreen);
+    const genericResult = await deps.sendFirstTurn(pane, firstTurnTask, preLaunchScreen);
+    if (!genericResult.delivered) {
+      process.stderr.write(`\u26A0\uFE0F  First turn not delivered for crew '${name}' \u2014 use 'squadrant crew send ${input.project} ${name}' to re-send the task.
+`);
+    }
   }
   return { ...pane, title };
 }
@@ -2632,8 +2690,12 @@ async function runCrewSend(project, name, message, runtime, workspaceId, deps) {
     }
   } catch {
   }
-  const deliver = deps.sendToPane ?? ((pane, msg) => runtime.sendToPane(pane, msg));
-  await deliver(crew, message);
+  const deliver = deps.sendToPane ?? ((pane, msg) => runtime.sendToPane(pane, msg).then(() => ({ delivered: true })));
+  const { delivered } = await deliver(crew, message);
+  if (!delivered) {
+    process.stderr.write(`\u26A0\uFE0F  Message not delivered to crew '${name}' \u2014 use 'squadrant crew send ${project} ${name}' to re-send.
+`);
+  }
 }
 async function runCrewRead(project, name, runtime, workspaceId) {
   const crew = await findCrewPane(runtime, workspaceId, project, name);
@@ -3911,13 +3973,18 @@ var init_native_hook_source = __esm({
 import net from "net";
 async function settleInputBox(runtime, pane) {
   let prev = await runtime.readPaneScreen(pane) ?? "";
+  let sawContent = parseDraftFromScreen(prev) !== "" && parseDraftFromScreen(prev) !== null;
   for (let i = 0; i < SETTLE_MAX_POLLS; i++) {
     await new Promise((r) => setTimeout(r, SETTLE_POLL_MS));
     const cur = await runtime.readPaneScreen(pane) ?? "";
+    const draft = parseDraftFromScreen(cur);
+    if (draft !== "" && draft !== null)
+      sawContent = true;
     if (cur === prev)
-      return;
+      return sawContent;
     prev = cur;
   }
+  return sawContent;
 }
 function getFreePort() {
   return new Promise((resolve3, reject) => {
@@ -3955,19 +4022,29 @@ async function resolveCaptainWorkspace(project) {
 async function confirmedSendToPane(runtime, pane, message) {
   const preSendScreen = await runtime.readPaneScreen(pane) ?? "";
   await runtime.pasteToPane(pane, message);
-  await settleInputBox(runtime, pane);
+  let sawDraft = await settleInputBox(runtime, pane);
   await runtime.sendKeyToPane(pane, "Enter");
+  let repasted = false;
   for (let attempt = 0; attempt < SUBMIT_RETRY_LIMIT; attempt++) {
     await new Promise((r) => setTimeout(r, POST_SEND_CHECK_MS));
     const afterScreen = await runtime.readPaneScreen(pane) ?? "";
     const draft = parseDraftFromScreen(afterScreen);
-    if (draft === "")
-      return;
+    if (draft !== "" && draft !== null)
+      sawDraft = true;
+    if (draft === "" && sawDraft)
+      return { delivered: true };
     if (draft === null && afterScreen !== preSendScreen)
-      return;
-    await settleInputBox(runtime, pane);
+      return { delivered: true };
+    const settled = await settleInputBox(runtime, pane);
+    if (settled)
+      sawDraft = true;
+    if (!sawDraft && !repasted) {
+      repasted = true;
+      await runtime.pasteToPane(pane, message);
+    }
     await runtime.sendKeyToPane(pane, "Enter");
   }
+  return { delivered: false };
 }
 async function sendFirstTurnWhenReady(runtime, pane, task, preLaunchScreen, acceptanceConfig) {
   await new Promise((r) => setTimeout(r, SEND_FIRST_TURN_FLOOR_MS));
@@ -3976,7 +4053,8 @@ async function sendFirstTurnWhenReady(runtime, pane, task, preLaunchScreen, acce
   let stable = false;
   for (let i = 0; i < maxPolls && !stable; i++) {
     const screen = await runtime.readPaneScreen(pane) ?? "";
-    if (screen.length > 0 && screen === previousScreen && screen !== preLaunchScreen) {
+    const hasInputBox = !!acceptanceConfig?.splashMarker || parseDraftFromScreen(screen) !== null;
+    if (screen.length > 0 && screen === previousScreen && screen !== preLaunchScreen && hasInputBox) {
       stable = true;
     } else {
       previousScreen = screen;
@@ -3990,29 +4068,45 @@ async function sendFirstTurnWhenReady(runtime, pane, task, preLaunchScreen, acce
       await new Promise((r) => setTimeout(r, POST_SEND_CHECK_MS));
       const afterScreen = await runtime.readPaneScreen(pane) ?? "";
       if (isTurnAccepted(preSendScreen, afterScreen, acceptanceConfig)) {
-        return;
+        return { delivered: true };
       }
       if ((check2 + 1) % SPLASH_RESEND_EVERY_N === 0 && check2 < SPLASH_MAX_CHECKS - 1) {
         await runtime.sendToPane(pane, task);
       }
     }
-    return;
+    return { delivered: false };
+  }
+  if (!stable) {
+    return confirmedSendToPane(runtime, pane, task);
   }
   await runtime.pasteToPane(pane, task);
-  await settleInputBox(runtime, pane);
+  let sawDraft = await settleInputBox(runtime, pane);
   await runtime.sendKeyToPane(pane, "Enter");
   const retryLimit = acceptanceConfig?.retryLimit ?? SUBMIT_RETRY_LIMIT;
+  let repasted = false;
   for (let attempt = 0; attempt < retryLimit; attempt++) {
     await new Promise((r) => setTimeout(r, POST_SEND_CHECK_MS));
     const afterScreen = await runtime.readPaneScreen(pane) ?? "";
     const draft = parseDraftFromScreen(afterScreen);
-    if (draft === "")
-      return;
+    if (draft !== "" && draft !== null)
+      sawDraft = true;
+    if (draft === "" && sawDraft)
+      return { delivered: true };
     if (draft === null && afterScreen !== preSendScreen)
-      return;
-    await settleInputBox(runtime, pane);
+      return { delivered: true };
+    const settled = await settleInputBox(runtime, pane);
+    if (settled)
+      sawDraft = true;
+    if (!sawDraft && !repasted) {
+      repasted = true;
+      await runtime.pasteToPane(pane, task);
+    }
     await runtime.sendKeyToPane(pane, "Enter");
   }
+  if (!sawDraft) {
+    return confirmedSendToPane(runtime, pane, task);
+  }
+  return { delivered: false };
 }
 var SEND_FIRST_TURN_FLOOR_MS, POLL_INTERVAL_MS, SEND_FIRST_TURN_TIMEOUT_MS, POST_SEND_CHECK_MS, SPLASH_MAX_CHECKS, SPLASH_RESEND_EVERY_N, SETTLE_POLL_MS, SETTLE_MAX_POLLS, SUBMIT_RETRY_LIMIT;
 var init_crew_pane = __esm({
@@ -5806,8 +5900,13 @@ function classifyPaneTail(tail) {
     if (c != null && ERROR_BANNER_RE.some((re) => re.test(c)))
       errLine = c;
   }
-  if (errLine)
+  if (errLine) {
+    const isRetrying = cleaned.some((c) => c != null && RETRYING_RE.test(c));
+    const isExhausted = cleaned.some((c) => c != null && EXHAUSTED_RE.test(c));
+    if (isRetrying && !isExhausted)
+      return null;
     return { kind: "error", text: errLine.slice(0, 200) };
+  }
   return null;
 }
 function stripChrome(raw) {
@@ -5824,7 +5923,7 @@ function stripChrome(raw) {
     return null;
   return trimmed;
 }
-var ERROR_BANNER_RE, OPTION_RE, PICKER_FOOTER_RE, PURE_CHROME_RE, STATUS_LINE_RE;
+var ERROR_BANNER_RE, RETRYING_RE, EXHAUSTED_RE, OPTION_RE, PICKER_FOOTER_RE, PURE_CHROME_RE, STATUS_LINE_RE;
 var init_pane_classifier = __esm({
   "packages/agents/dist/interactive/pane-classifier.js"() {
     init_claude2();
@@ -5837,6 +5936,8 @@ var init_pane_classifier = __esm({
       /\bretr(?:y|ies)\s+(?:exhausted|limit\s+(?:reached|exceeded))\b/i,
       /\bmaximum\s+retries\b/i
     ];
+    RETRYING_RE = /\bRetrying\b|\battempt\s+\d+\s*\/\s*\d+/i;
+    EXHAUSTED_RE = /\bretr(?:y|ies)\s+(?:exhausted|limit\s+(?:reached|exceeded))\b|\bmaximum\s+retries\b/i;
     OPTION_RE = /^[❯>›]?\s*(\d+)\.\s+(.*\S)\s*$/;
     PICKER_FOOTER_RE = /↑↓\s*select|enter\s+submit|esc\s+dismiss/i;
     PURE_CHROME_RE = /^[\s─━│┃╭╮╰╯┌┐└┘├┤┬┴┼═║╔╗╚╝╠╣╦╩╬▁▂▃▄▅▆▇█▔▏▕]+$/;
@@ -6979,6 +7080,7 @@ import chalk9 from "chalk";
 // packages/cli/src/commands/crew-control.ts
 init_dist2();
 init_dist2();
+init_dist();
 init_dist4();
 import { Command as Command8 } from "commander";
 import { createConnection as createConnection3 } from "net";
@@ -7404,7 +7506,16 @@ function addControlPlaneCrewCommands(crew) {
     const r = await squadrantdCall(buildStatusRequest(project, id));
     process.stdout.write(JSON.stringify(r) + "\n");
   });
-  crew.command("tasks <project>").description("List control-plane tasks for a project (control-plane analogue of legacy `list`), or purge a task with --purge").option("--json", "Full JSON output (one or more records)").option("--id <taskId>", "Show only tasks matching this id prefix").option("--state <state>", "Filter by task state").option("--state-only <taskId>", "Print just the state string for a single task").option("--purge <taskId>", "Purge a task record from the store (default: only terminal records)").option("--force", "Force-purge a non-terminal record (use with --purge)").action(async (project, opts) => {
+  crew.command("tasks <project>").description("List control-plane tasks for a project (control-plane analogue of legacy `list`), or purge a task with --purge").option("--json", "Full JSON output (one or more records)").option("--id <taskId>", "Show only tasks matching this id prefix").option("--state <state>", "Filter by task state").option("--state-only <taskId>", "Print just the state string for a single task").option("--purge <taskId>", "Purge a task record from the store (default: only terminal records)").option("--force", "Force-purge a non-terminal record (use with --purge)").option("--all-terminal", "Purge all terminal (done/cancelled/failed) records for the project").action(async (project, opts) => {
+    if (opts.allTerminal) {
+      const tasks = await squadrantdCall({ kind: "list", project });
+      const terminal = tasks.filter((t) => TERMINAL_STATES.has(t.state));
+      for (const t of terminal) {
+        await squadrantdCall({ kind: "purge", project, id: t.id, force: false });
+      }
+      console.log(`purged ${terminal.length} terminal record(s)`);
+      return;
+    }
     if (opts.purge) {
       const r = await squadrantdCall({ kind: "purge", project, id: opts.purge, force: opts.force ?? false });
       console.log(`purged ${r.provider}/${r.id} (was ${r.state})`);
@@ -7642,6 +7753,10 @@ async function runCrewSpawn2(input) {
     sendFirstTurn: (pane, firstTurn, preLaunchScreen, opts) => sendFirstTurnWhenReady(runtime, pane, firstTurn, preLaunchScreen, opts),
     getFreePort,
     sendCodexFirstTurn,
+    // #466: wire delivery confirmation so the daemon stamps firstTurnConfirmedAt.
+    emitEvent: async (p, event) => {
+      await squadrantdCall({ kind: "event", project: p, event });
+    },
     onRouted: (route) => console.log(
       chalk9.dim(
         `routed: tier=${route.tier} \u2192 ${route.agent}${route.model ? `/${route.model}` : ""} (rule: "${route.matchedRule}")`
@@ -7702,7 +7817,10 @@ crewCommand.command("spawn").description(
         // opencode consumes the `approval` flag (→ bash:"ask" per-crew config).
         ...opts.approval ? { approvalPolicy: "untrusted", approval: true } : {},
         ...opts.shared ? { shared: true } : {},
-        ...opts.model ? { model: opts.model } : {}
+        ...opts.model ? { model: opts.model } : {},
+        // #458: pass the raw file path (not stdin) so runCrewSpawn can copy it
+        // into the isolated worktree root for relative-path access.
+        ...opts.taskFile && opts.taskFile !== "-" ? { taskFile: opts.taskFile } : {}
       });
       console.log(chalk9.green(`\u2714 Crew '${pane.title}' spawned (${pane.surfaceId})`));
     } catch (err) {