squadrant 0.13.0 → 0.13.1

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) {
@@ -3911,13 +3944,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,17 +3993,26 @@ 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 === "")
+    if (draft !== "" && draft !== null)
+      sawDraft = true;
+    if (draft === "" && sawDraft)
       return;
     if (draft === null && afterScreen !== preSendScreen)
       return;
-    await settleInputBox(runtime, pane);
+    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");
   }
 }
@@ -3999,18 +4046,27 @@ async function sendFirstTurnWhenReady(runtime, pane, task, preLaunchScreen, acce
     return;
   }
   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 === "")
+    if (draft !== "" && draft !== null)
+      sawDraft = true;
+    if (draft === "" && sawDraft)
       return;
     if (draft === null && afterScreen !== preSendScreen)
       return;
-    await settleInputBox(runtime, pane);
+    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");
   }
 }
@@ -5806,8 +5862,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 +5885,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 +5898,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─━│┃╭╮╰╯┌┐└┘├┤┬┴┼═║╔╗╚╝╠╣╦╩╬▁▂▃▄▅▆▇█▔▏▕]+$/;