jonah-fleet 1.5.0 → 1.6.0

package/dist/index.js

@@ -92,7 +92,7 @@ var ROUTINE_TO_WORKFLOW_MAP = {
   "product-planning": [],
   "analytics-review": []
 };
-var FLEET_VERSION = "1.5.0";
+var FLEET_VERSION = "1.6.0";
 var SCHEMA_URL = "https://raw.githubusercontent.com/juliendurandeu/jonah-fleet/main/schema.json";
 
 // src/lib/manifest.ts
@@ -1759,6 +1759,8 @@ function parseLogToTelemetry(content, options = {}) {
       failureCategory = "infeasible";
     } else if (lower.includes("conflict")) {
       failureCategory = "merge_conflict";
+    } else if (lower.includes("ambiguous") || lower.includes("needs-info") || lower.includes("clarification") || lower.includes("acceptance criteria")) {
+      failureCategory = "ambiguous_spec";
     }
   }
   const inputTokens = parseInt((metadata["input tokens"] || "0").replace(/[^\d]/g, ""), 10) || 0;
@@ -1783,6 +1785,16 @@ function parseLogToTelemetry(content, options = {}) {
     }
   }
   const promptSha = metadata["prompt sha"];
+  const lowerContent = content.toLowerCase();
+  const ambiguityGateTriggered = lowerContent.includes("ambiguity & missing acceptance criteria gate") || lowerContent.includes("ambiguity gate") || lowerContent.includes("clarifications needed before implementation") || lowerContent.includes("needs-info") && (lowerContent.includes("clarification") || lowerContent.includes("questions"));
+  const needsInfoApplied = lowerContent.includes("needs-info");
+  let questionsAskedCount;
+  if (ambiguityGateTriggered) {
+    const questionLines = content.split("\n").filter(
+      (line) => (line.trim().startsWith("1.") || line.trim().startsWith("2.") || line.trim().startsWith("3.") || line.trim().startsWith("-")) && line.includes("?")
+    );
+    questionsAskedCount = questionLines.length > 0 ? questionLines.length : 2;
+  }
   return {
     schemaVersion: "1.0.0",
     routine,
@@ -1800,7 +1812,10 @@ function parseLogToTelemetry(content, options = {}) {
     durationSeconds,
     iterationsUsed,
     maxIterations,
-    promptSha
+    promptSha,
+    ambiguityGateTriggered: ambiguityGateTriggered || void 0,
+    questionsAskedCount,
+    needsInfoApplied: needsInfoApplied || void 0
   };
 }
 function checkWeeklyBudgetLimit(usedTokens, ceilingTokens = GLOBAL_WEEKLY_TOKEN_BUDGET) {
@@ -1859,7 +1874,10 @@ function aggregateFleetTelemetry(summaries, options = {}) {
         failureCount: 0,
         bouncedCount: 0,
         avgDurationSeconds: 0,
-        avgIterationsUsed: 0
+        avgIterationsUsed: 0,
+        ambiguityGatesTriggered: 0,
+        questionsAskedCount: 0,
+        needsInfoAppliedCount: 0
       };
     }
     const r = byRoutine[s.routine];
@@ -1877,6 +1895,9 @@ function aggregateFleetTelemetry(summaries, options = {}) {
     if (s.iterationsUsed) {
       r.avgIterationsUsed = (r.avgIterationsUsed * (r.runCount - 1) + s.iterationsUsed) / r.runCount;
     }
+    if (s.ambiguityGateTriggered) r.ambiguityGatesTriggered++;
+    if (s.questionsAskedCount) r.questionsAskedCount += s.questionsAskedCount;
+    if (s.needsInfoApplied) r.needsInfoAppliedCount++;
     if (!byRepository[s.repository]) {
       byRepository[s.repository] = {
         repository: s.repository,
@@ -1894,6 +1915,21 @@ function aggregateFleetTelemetry(summaries, options = {}) {
     if (s.result === "SUCCESS") repoObj.successCount++;
     else if (s.result === "FAILURE") repoObj.failureCount++;
   }
+  let totalAmbiguityGatesTriggered = 0;
+  let totalQuestionsAsked = 0;
+  let totalNeedsInfoApplied = 0;
+  for (const s of summaries) {
+    if (s.ambiguityGateTriggered) totalAmbiguityGatesTriggered++;
+    if (s.questionsAskedCount) totalQuestionsAsked += s.questionsAskedCount;
+    if (s.needsInfoApplied) totalNeedsInfoApplied++;
+  }
+  const estimatedTokensSaved = totalAmbiguityGatesTriggered * 5e4;
+  const ambiguity = {
+    totalAmbiguityGatesTriggered,
+    totalQuestionsAsked,
+    needsInfoAppliedCount: totalNeedsInfoApplied,
+    estimatedTokensSaved
+  };
   const totalTokens = totalInputTokens + totalOutputTokens;
   const budget = checkWeeklyBudgetLimit(totalTokens, budgetCeiling);
   return {
@@ -1910,6 +1946,7 @@ function aggregateFleetTelemetry(summaries, options = {}) {
     byRoutine,
     byRepository,
     failureCategories,
+    ambiguity,
     events: summaries
   };
 }
@@ -2046,6 +2083,20 @@ function renderTelemetryDashboard(telemetry, options = {}) {
       );
     }
   }
+  const amb = telemetry.ambiguity;
+  lines.push("\n" + pc7.bold("\u2753 Inquisitive Stance & Ambiguity Gate Signals:"));
+  lines.push(
+    `   \u2022 Ambiguity Gate Triggers:    ${pc7.bold(amb.totalAmbiguityGatesTriggered.toString())} runs stopped to request clarification`
+  );
+  lines.push(
+    `   \u2022 Clarifying Questions Posed: ${pc7.bold(amb.totalQuestionsAsked.toString())} targeted questions`
+  );
+  lines.push(
+    `   \u2022 Needs-Info Labels Applied:  ${pc7.bold(amb.needsInfoAppliedCount.toString())}`
+  );
+  lines.push(
+    `   \u2022 Est. Wasted Tokens Averted: ~${pc7.bold(pc7.green(formatTokens2(amb.estimatedTokensSaved)))} tokens (avoided speculative builds)`
+  );
   const failKeys = Object.keys(telemetry.failureCategories);
   if (failKeys.length > 0) {
     lines.push("\n" + pc7.bold(pc7.red("\u26A0\uFE0F  Failure Categories Breakdown:")));
@@ -2289,7 +2340,60 @@ async function cleanupStaleWorktrees(repoRoot) {
 // src/lib/terminal-card.ts
 import fs11 from "fs";
 import path11 from "path";
+import { execFileSync } from "child_process";
 import pc9 from "picocolors";
+function stripAnsi(text) {
+  return text.replace(/\x1b\[[0-9;]*m/g, "");
+}
+function wrapText(text, maxWidth) {
+  if (maxWidth <= 0) return [text];
+  const words = text.split(/\s+/).filter(Boolean);
+  if (words.length === 0) return [];
+  const lines = [];
+  let current = "";
+  for (const word of words) {
+    if (!current) {
+      current = word;
+    } else {
+      const proposed = current + " " + word;
+      if (stripAnsi(proposed).length <= maxWidth) {
+        current = proposed;
+      } else {
+        lines.push(current);
+        current = word;
+      }
+    }
+  }
+  if (current) lines.push(current);
+  return lines;
+}
+function fetchTargetTitle(repoRoot, target) {
+  try {
+    const prMatch = target.match(/PR\s*#?(\d+)/i);
+    if (prMatch) {
+      const stdout = execFileSync("gh", ["pr", "view", prMatch[1], "--json", "title", "-q", ".title"], {
+        cwd: repoRoot,
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+        timeout: 4e3
+      });
+      return stdout.trim() || null;
+    }
+    const issueMatch = target.match(/Issue\s*#?(\d+)/i);
+    if (issueMatch) {
+      const stdout = execFileSync("gh", ["issue", "view", issueMatch[1], "--json", "title", "-q", ".title"], {
+        cwd: repoRoot,
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+        timeout: 4e3
+      });
+      return stdout.trim() || null;
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
 function sanitizeWorktreePaths(text) {
   let cleaned = text.replace(/file:\/\/\/[^\s"'()]+?\/\.jonah-fleet\/worktrees\/[^/\s"'()]+\//g, "");
   cleaned = cleaned.replace(/(?:^|[\s"'(`[])(?:\/[^\s"'()]+?)?\.jonah-fleet\/worktrees\/[^/\s"'()]+\//g, (match) => {
@@ -2300,7 +2404,7 @@ function sanitizeWorktreePaths(text) {
   return cleaned;
 }
 function extractExecutionSummary(output) {
-  const summaryHeaderRegex = /#\s+([A-Za-z0-9\s_-]+?Execution\s+Summary[\s\S]*)/i;
+  const summaryHeaderRegex = /#{1,3}\s+([A-Za-z0-9\s_-]*?(?:Execution|Review|Autowork)\s+Summary[\s\S]*)/i;
   const match = output.match(summaryHeaderRegex);
   if (!match) return null;
   let summary = match[1].trim();
@@ -2308,8 +2412,8 @@ function extractExecutionSummary(output) {
     "\u2713 Local peer-review completed",
     "\u2713 Local autowork completed",
     "\u2713 Local agent session",
-    "[6:",
-    "Peer Review Watchdog:"
+    "Peer Review Watchdog:",
+    "Autowork Backlog Scan:"
   ];
   for (const sep of trailingSeparators) {
     const idx = summary.indexOf(sep);
@@ -2317,6 +2421,10 @@ function extractExecutionSummary(output) {
       summary = summary.slice(0, idx).trim();
     }
   }
+  const timestampMatch = summary.match(/\n\s*\[\d{1,2}:\d{2}:\d{2}\s*(?:AM|PM)?\][\s\S]*/);
+  if (timestampMatch && timestampMatch.index !== void 0) {
+    summary = summary.slice(0, timestampMatch.index).trim();
+  }
   return sanitizeWorktreePaths(summary);
 }
 function findLatestRunLog(repoRoot, routine) {
@@ -2337,57 +2445,73 @@ function parseRunLog(logContent) {
     actions: []
   };
   const lines = logContent.split("\n");
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (trimmed.startsWith("|") && trimmed.includes("|")) {
-      const parts = trimmed.split("|").map((p) => p.trim()).filter(Boolean);
-      if (parts.length >= 2) {
-        const key = parts[0].toLowerCase();
-        const value = parts[1].replace(/`/g, "");
-        if (key.includes("routine")) summary.routine = value;
-        if (key.includes("target pr") || key.includes("target issue")) summary.target = value;
-        if (key.includes("decision")) summary.decision = value;
-        if (key.includes("result")) summary.result = value;
-        if (key.includes("duration")) summary.duration = value;
-      }
-    }
-  }
+  let inMetadata = false;
   let inDoD = false;
   let inFindings = false;
   let inActions = false;
   for (const line of lines) {
     const trimmed = line.trim();
-    if (trimmed.startsWith("## Definition of Done")) {
+    if (trimmed.startsWith("## Metadata")) {
+      inMetadata = true;
+      inDoD = false;
+      inFindings = false;
+      inActions = false;
+      continue;
+    } else if (trimmed.startsWith("## Definition of Done")) {
+      inMetadata = false;
       inDoD = true;
       inFindings = false;
       inActions = false;
       continue;
     } else if (trimmed.startsWith("## Code Review Findings") || trimmed.startsWith("## Findings")) {
+      inMetadata = false;
       inDoD = false;
       inFindings = true;
       inActions = false;
       continue;
-    } else if (trimmed.startsWith("## Execution Trace") || trimmed.startsWith("### Actions Taken")) {
+    } else if (trimmed.startsWith("## Execution Trace") || trimmed.startsWith("### Actions Taken") || trimmed.startsWith("## Actions Taken") || trimmed.startsWith("## Artifacts")) {
+      inMetadata = false;
       inDoD = false;
       inFindings = false;
-      inActions = true;
+      inActions = trimmed.startsWith("### Actions Taken") || trimmed.startsWith("## Actions Taken");
       continue;
     } else if (trimmed.startsWith("## ")) {
+      inMetadata = false;
       inDoD = false;
       inFindings = false;
       inActions = false;
     }
+    if (inMetadata && trimmed.startsWith("|") && trimmed.includes("|")) {
+      const parts = trimmed.split("|").map((p) => p.trim()).filter(Boolean);
+      if (parts.length >= 2) {
+        const key = parts[0].toLowerCase();
+        const value = parts[1].replace(/[`*]/g, "").trim();
+        if (key === "routine") summary.routine = value;
+        if (key === "target pr" || key === "target issue" || key === "target") {
+          summary.target = value;
+        }
+        if (key === "decision") summary.decision = value;
+        if (key === "result") summary.result = value;
+        if (key === "duration") summary.duration = value;
+        if (key === "title" || key === "pr title" || key === "issue title") summary.title = value;
+      }
+    }
     if (inDoD && trimmed.startsWith("|") && !trimmed.includes("Criterion") && !trimmed.includes("---")) {
       const parts = trimmed.split("|").map((p) => p.trim()).filter(Boolean);
       if (parts.length >= 2) {
         const criterion = parts[0];
-        const met = parts[1].toUpperCase() === "YES" || parts[1].toUpperCase() === "PASS";
-        const evidence = parts[2] ? ` (${parts[2].slice(0, 60)}...)` : "";
-        summary.passes?.push({
-          name: criterion,
-          status: met ? "pass" : "fail",
-          detail: evidence
-        });
+        const metRaw = parts[1].toUpperCase();
+        const met = metRaw === "YES" || metRaw === "PASS";
+        const evidence = parts[2] ? parts[2].trim() : "";
+        const isConditionalScan = criterion.toLowerCase().startsWith("if in scan mode and no eligible");
+        const isNA = evidence.toLowerCase().includes("n/a") || metRaw === "N/A";
+        if (!isConditionalScan && !isNA) {
+          summary.passes?.push({
+            name: criterion,
+            status: met ? "pass" : "fail",
+            detail: evidence ? ` (${evidence})` : ""
+          });
+        }
       }
     }
     if (inActions && (trimmed.startsWith("- ") || trimmed.startsWith("* "))) {
@@ -2398,9 +2522,15 @@ function parseRunLog(logContent) {
 }
 function detectActivePhase(chunk, currentPhase = "Executing routine") {
   const lower = chunk.toLowerCase();
+  if (lower.includes("\u{1F512} addressing review findings") || lower.includes("addressing review findings by")) {
+    return "Claimed bounced PR, addressing review findings";
+  }
   if (lower.includes("\u{1F512} claimed") || lower.includes("claimed by local autowork") || lower.includes("claimed by autowork")) {
     return "Claimed target issue, starting implementation";
   }
+  if (lower.includes("addressing review findings") || lower.includes("fixing review findings")) {
+    return "Claimed bounced PR, addressing review findings";
+  }
   if (lower.includes("starting review (round")) {
     return "Claimed review window, starting review passes";
   }
@@ -2430,16 +2560,18 @@ function detectClaimedIssue(chunk) {
   return null;
 }
 function detectClaimedPR(chunk) {
+  const findingMatch = chunk.match(/(?:addressing\s+review\s+findings|fixing\s+review\s+findings)[^\n#]*?#(\d+)/i);
+  if (findingMatch) return `PR #${findingMatch[1]}`;
   const reviewMatch = chunk.match(/Starting\s+review[^\n#]*?#(\d+)/i);
   if (reviewMatch) return `PR #${reviewMatch[1]}`;
   const prMatch = chunk.match(/(?:selected|target|reviewing)\s+(?:target\s+)?PR:?\s*\[?PR\s*#?(\d+)/i);
   if (prMatch) return `PR #${prMatch[1]}`;
-  const ghPrMatch = chunk.match(/gh\s+pr\s+(?:view|diff|checkout|review)\s+(\d+)/i);
+  const ghPrMatch = chunk.match(/gh\s+pr\s+(?:view|diff|checkout|review|edit|ready)\s+(\d+)/i);
   if (ghPrMatch) return `PR #${ghPrMatch[1]}`;
   return null;
 }
 function renderSummaryCard(options) {
-  const width = Math.min(Math.max((process.stdout.columns || 80) - 4, 60), 86);
+  const width = Math.min(Math.max((process.stdout.columns || 80) - 4, 64), 90);
   const horizontal = "\u2500".repeat(width - 2);
   const rawSummary = options.output ? extractExecutionSummary(options.output) : null;
   let parsedFromLog = null;
@@ -2455,7 +2587,28 @@ function renderSummaryCard(options) {
     }
   }
   let target = options.pr ? `PR #${options.pr}` : options.issue ? `Issue #${options.issue}` : "";
-  if (!target && parsedFromLog?.target) target = parsedFromLog.target;
+  if (!target && parsedFromLog?.target && parsedFromLog.target.toUpperCase() !== "YES") {
+    const rawTarget = parsedFromLog.target;
+    target = rawTarget.startsWith("#") ? options.routine === "peer-review" ? `PR ${rawTarget}` : `Issue ${rawTarget}` : rawTarget;
+  }
+  if (!target && options.output) {
+    const targetMatch = options.output.match(/Selected\s+Target\s+PR:?\s*\[?PR\s*#?(\d+)\]?/i) || options.output.match(/Starting\s+review[^\n#]*?#(\d+)/i) || options.output.match(/Target(?:ing)?\s+(?:issue|PR)\s*#?(\d+)/i) || options.output.match(/Candidate\s+issue\s*#?(\d+)/i);
+    if (targetMatch) {
+      target = options.routine === "peer-review" ? `PR #${targetMatch[1]}` : `Issue #${targetMatch[1]}`;
+    }
+  }
+  let title = options.title || parsedFromLog?.title || "";
+  if (!title && rawSummary) {
+    const titleMatch = rawSummary.match(/\[PR\s*#?\d+\s*\((`?[^`)]+`?)\)\]/i) || rawSummary.match(/Selected\s+Target\s+PR:?\s*\[.*?\]\([^)]+\)\s*\(([^)]+)\)/i) || rawSummary.match(/PR\s*#?\d+[:\s]+`?([^`\n]+)`?/i);
+    if (titleMatch) title = titleMatch[1].replace(/[`*]/g, "").trim();
+  }
+  if (!title && options.output) {
+    const titleMatch = options.output.match(/Selected\s+Target\s+PR:?\s*\[PR\s*#?\d+\s*\((`?[^`)]+`?)\)\]/i) || options.output.match(/Selected\s+candidate\s+issue\s*#?\d+[:\s]+`?([^`\n]+)`?/i);
+    if (titleMatch) title = titleMatch[1].replace(/[`*]/g, "").trim();
+  }
+  if (!title && options.repoRoot && target) {
+    title = fetchTargetTitle(options.repoRoot, target) || "";
+  }
   let decision = parsedFromLog?.decision || "";
   if (!decision && rawSummary) {
     const decisionMatch = rawSummary.match(/\*\*Final Action\*\*:\s*([^\n]+)/i);
@@ -2464,15 +2617,26 @@ function renderSummaryCard(options) {
   const durationStr = options.durationMs ? `${Math.round(options.durationMs / 1e3)}s` : parsedFromLog?.duration || "";
   const lines = [];
   lines.push(pc9.cyan(`\u250C${horizontal}\u2510`));
-  const title = ` Jonah Fleet Routine: ${pc9.bold(options.routine.toUpperCase())} `;
+  const headerParts = [pc9.bold(pc9.white(options.routine.toUpperCase()))];
+  if (target) headerParts.push(pc9.yellow(target));
+  if (durationStr) headerParts.push(pc9.dim(`(${durationStr})`));
+  const headerContent = headerParts.join(" \xB7 ");
+  const headerPlain = stripAnsi(headerContent);
   lines.push(
-    pc9.cyan("\u2502") + ` ${pc9.bold(pc9.white(options.routine.toUpperCase()))}` + (target ? ` \xB7 ${pc9.yellow(target)}` : "") + (durationStr ? pc9.dim(` (${durationStr})`) : "") + " ".repeat(
-      Math.max(
-        1,
-        width - 4 - options.routine.length - target.length - (durationStr ? durationStr.length + 3 : 0)
-      )
-    ) + pc9.cyan("\u2502")
+    pc9.cyan("\u2502") + ` ${headerContent}` + " ".repeat(Math.max(1, width - 3 - headerPlain.length)) + pc9.cyan("\u2502")
   );
+  if (title) {
+    const titlePrefix = " Title: ";
+    const wrappedTitle = wrapText(title, width - 4 - titlePrefix.length);
+    for (let i = 0; i < wrappedTitle.length; i++) {
+      const prefix = i === 0 ? pc9.dim(titlePrefix) : " ".repeat(titlePrefix.length);
+      const text = wrappedTitle[i];
+      const plainLen = titlePrefix.length + stripAnsi(text).length;
+      lines.push(
+        pc9.cyan("\u2502") + ` ${prefix}${pc9.white(pc9.bold(text))}` + " ".repeat(Math.max(1, width - 3 - plainLen)) + pc9.cyan("\u2502")
+      );
+    }
+  }
   if (decision) {
     let decisionBadge = pc9.green(`\u2714 ${decision}`);
     if (/bounce|draft|reject|fail/i.test(decision)) {
@@ -2480,8 +2644,9 @@ function renderSummaryCard(options) {
     } else if (/escalat/i.test(decision)) {
       decisionBadge = pc9.red(`\u{1F6A8} ${decision}`);
     }
+    const decisionPlain = ` Action: ${decision}`;
     lines.push(
-      pc9.cyan("\u2502") + ` Action: ${decisionBadge}` + " ".repeat(Math.max(1, width - 11 - decision.length)) + pc9.cyan("\u2502")
+      pc9.cyan("\u2502") + ` Action: ${decisionBadge}` + " ".repeat(Math.max(1, width - 3 - decisionPlain.length)) + pc9.cyan("\u2502")
     );
   }
   lines.push(pc9.cyan(`\u251C${horizontal}\u2524`));
@@ -2503,22 +2668,36 @@ function renderSummaryCard(options) {
       } else if (line.startsWith("- ") || line.startsWith("* ")) {
         const item = sanitizeWorktreePaths(line.slice(2)).trim();
         const formatted = item.replace(/\[([^\]]+)\]\([^)]+\)/g, "$1").replace(/\*\*([^*]+)\*\*/g, (_, text) => pc9.bold(text)).replace(/`([^`]+)`/g, (_, code) => pc9.yellow(code));
-        const plainLen = item.replace(/\[([^\]]+)\]\([^)]+\)/g, "$1").replace(/\*\*([^*]+)\*\*/g, "$1").replace(/`([^`]+)`/g, "$1").length;
-        if (plainLen <= width - 6) {
-          lines.push(pc9.cyan("\u2502") + `  \u2022 ${formatted}` + " ".repeat(Math.max(1, width - 5 - plainLen)) + pc9.cyan("\u2502"));
-        } else {
-          const truncated = formatted.slice(0, width - 10) + "...";
-          lines.push(pc9.cyan("\u2502") + `  \u2022 ${truncated}` + " ".repeat(Math.max(1, width - 5 - (width - 7))) + pc9.cyan("\u2502"));
+        const wrapped = wrapText(formatted, width - 8);
+        for (let i = 0; i < wrapped.length; i++) {
+          const wLine = wrapped[i];
+          const wPlain = stripAnsi(wLine);
+          if (i === 0) {
+            lines.push(
+              pc9.cyan("\u2502") + `  \u2022 ${wLine}` + " ".repeat(Math.max(1, width - 5 - wPlain.length)) + pc9.cyan("\u2502")
+            );
+          } else {
+            lines.push(
+              pc9.cyan("\u2502") + `    ${wLine}` + " ".repeat(Math.max(1, width - 5 - wPlain.length)) + pc9.cyan("\u2502")
+            );
+          }
         }
       } else if (/^[0-9]+\.\s+/.test(line)) {
         const item = sanitizeWorktreePaths(line.replace(/^[0-9]+\.\s+/, "")).trim();
         const formatted = item.replace(/\[([^\]]+)\]\([^)]+\)/g, "$1").replace(/\*\*([^*]+)\*\*/g, (_, text) => pc9.bold(text)).replace(/`([^`]+)`/g, (_, code) => pc9.yellow(code));
-        const plainLen = item.replace(/\[([^\]]+)\]\([^)]+\)/g, "$1").replace(/\*\*([^*]+)\*\*/g, "$1").replace(/`([^`]+)`/g, "$1").length;
-        if (plainLen <= width - 6) {
-          lines.push(pc9.cyan("\u2502") + `  \u2714 ${formatted}` + " ".repeat(Math.max(1, width - 5 - plainLen)) + pc9.cyan("\u2502"));
-        } else {
-          const truncated = formatted.slice(0, width - 10) + "...";
-          lines.push(pc9.cyan("\u2502") + `  \u2714 ${truncated}` + " ".repeat(Math.max(1, width - 5 - (width - 7))) + pc9.cyan("\u2502"));
+        const wrapped = wrapText(formatted, width - 8);
+        for (let i = 0; i < wrapped.length; i++) {
+          const wLine = wrapped[i];
+          const wPlain = stripAnsi(wLine);
+          if (i === 0) {
+            lines.push(
+              pc9.cyan("\u2502") + `  \u2714 ${wLine}` + " ".repeat(Math.max(1, width - 5 - wPlain.length)) + pc9.cyan("\u2502")
+            );
+          } else {
+            lines.push(
+              pc9.cyan("\u2502") + `    ${wLine}` + " ".repeat(Math.max(1, width - 5 - wPlain.length)) + pc9.cyan("\u2502")
+            );
+          }
         }
       }
     }
@@ -2526,10 +2705,45 @@ function renderSummaryCard(options) {
     lines.push(pc9.cyan("\u2502") + ` ${pc9.bold("Verification Passes:")}` + " ".repeat(Math.max(1, width - 23)) + pc9.cyan("\u2502"));
     for (const pass of parsedFromLog.passes.slice(0, 6)) {
       const icon = pass.status === "pass" ? pc9.green("\u2714") : pc9.red("\u2716");
-      const text = `${pass.name}${pass.detail || ""}`;
-      const plainLen = text.length + 4;
-      const truncated = plainLen > width - 6 ? text.slice(0, width - 10) + "..." : text;
-      lines.push(pc9.cyan("\u2502") + `  ${icon} ${truncated}` + " ".repeat(Math.max(1, width - 5 - truncated.length)) + pc9.cyan("\u2502"));
+      let criterionName = pass.name;
+      const colonIdx = criterionName.indexOf(":");
+      if (colonIdx > 10 && colonIdx < 40) {
+        criterionName = criterionName.slice(0, colonIdx);
+      }
+      const passText = `${criterionName}${pass.detail || ""}`;
+      const wrapped = wrapText(passText, width - 8);
+      for (let i = 0; i < wrapped.length; i++) {
+        const wLine = wrapped[i];
+        const wPlain = stripAnsi(wLine);
+        if (i === 0) {
+          lines.push(
+            pc9.cyan("\u2502") + `  ${icon} ${wLine}` + " ".repeat(Math.max(1, width - 5 - wPlain.length)) + pc9.cyan("\u2502")
+          );
+        } else {
+          lines.push(
+            pc9.cyan("\u2502") + `    ${pc9.dim(wLine)}` + " ".repeat(Math.max(1, width - 5 - wPlain.length)) + pc9.cyan("\u2502")
+          );
+        }
+      }
+    }
+    if (parsedFromLog.actions && parsedFromLog.actions.length > 0) {
+      lines.push(pc9.cyan("\u2502") + ` ${pc9.bold("Actions Taken:")}` + " ".repeat(Math.max(1, width - 16)) + pc9.cyan("\u2502"));
+      for (const action of parsedFromLog.actions.slice(0, 4)) {
+        const wrapped = wrapText(action, width - 8);
+        for (let i = 0; i < wrapped.length; i++) {
+          const wLine = wrapped[i];
+          const wPlain = stripAnsi(wLine);
+          if (i === 0) {
+            lines.push(
+              pc9.cyan("\u2502") + `  \u2022 ${wLine}` + " ".repeat(Math.max(1, width - 5 - wPlain.length)) + pc9.cyan("\u2502")
+            );
+          } else {
+            lines.push(
+              pc9.cyan("\u2502") + `    ${wLine}` + " ".repeat(Math.max(1, width - 5 - wPlain.length)) + pc9.cyan("\u2502")
+            );
+          }
+        }
+      }
     }
   }
   if (parsedFromLog?.logPath) {
@@ -2972,18 +3186,28 @@ function isDaemonRunning(repoRoot) {
     return false;
   }
 }
-async function countOpenReadyPRs(repoRoot) {
+function filterReviewablePRs(prs) {
+  return (prs || []).filter(
+    (pr) => pr && typeof pr.number === "number" && !pr.headRefName?.startsWith("release-please--") && !pr.title?.startsWith("chore(main): release")
+  );
+}
+async function getOpenReviewablePRs(repoRoot) {
   try {
     const { stdout } = await execFileAsync3(
       "gh",
-      ["pr", "list", "--state", "open", "--draft=false", "--json", "number", "--jq", "length"],
+      ["pr", "list", "--state", "open", "--draft=false", "--json", "number,headRefName,title"],
       { cwd: repoRoot }
     );
-    return parseInt(stdout.trim(), 10) || 0;
+    const prs = JSON.parse(stdout);
+    return filterReviewablePRs(prs);
   } catch {
-    return 0;
+    return [];
   }
 }
+async function countOpenReadyPRs(repoRoot) {
+  const prs = await getOpenReviewablePRs(repoRoot);
+  return prs.length;
+}
 async function startBackgroundDaemon(repoRoot, options = {}) {
   if (isDaemonRunning(repoRoot)) {
     const existing = readDaemonState(repoRoot);
@@ -3043,6 +3267,103 @@ async function stopDaemon(repoRoot) {
     return false;
   }
 }
+async function drainReviewQueue(drainOptions) {
+  const {
+    repoRoot,
+    state,
+    options = {},
+    isStopping = () => false,
+    clearTicker,
+    getPRs = getOpenReviewablePRs,
+    runRoutine = runLocalRoutine,
+    onAttempted
+  } = drainOptions;
+  if (isStopping()) return;
+  if (state) {
+    state.lastReviewCheckAt = (/* @__PURE__ */ new Date()).toISOString();
+    writeDaemonState(repoRoot, state);
+  }
+  let reviewablePRs = await getPRs(repoRoot);
+  if (reviewablePRs.length === 0) {
+    if (options.verbose) {
+      console.log(pc11.dim(`[${(/* @__PURE__ */ new Date()).toLocaleTimeString()}] Peer Review Watchdog: 0 ready PRs found (0 tokens used).`));
+    }
+    return;
+  }
+  const attemptedPRNumbers = /* @__PURE__ */ new Set();
+  while (!isStopping() && reviewablePRs.length > 0) {
+    const candidatePRs = reviewablePRs.filter((pr) => !attemptedPRNumbers.has(pr.number));
+    if (candidatePRs.length === 0) {
+      if (options.verbose) {
+        console.log(
+          pc11.dim(
+            `[${(/* @__PURE__ */ new Date()).toLocaleTimeString()}] All ${reviewablePRs.length} remaining ready PR(s) were already evaluated in this drain pass.`
+          )
+        );
+      }
+      break;
+    }
+    const totalRemaining = candidatePRs.length;
+    let targetPRStr = void 0;
+    try {
+      if (clearTicker) clearTicker();
+      if (state) {
+        state.status = "working";
+        state.activeRoutine = "peer-review";
+        writeDaemonState(repoRoot, state);
+      }
+      console.log(
+        pc11.cyan(
+          `
+[${(/* @__PURE__ */ new Date()).toLocaleTimeString()}] \u{1F50D} Peer Review Watchdog: Draining PR backlog (${totalRemaining} PR(s) remaining). Starting review session...`
+        )
+      );
+      await cleanupStaleWorktrees(repoRoot);
+      const result = await runRoutine({
+        targetDir: repoRoot,
+        routine: "peer-review",
+        model: options.model,
+        verbose: options.verbose,
+        noWorktree: false,
+        onTargetDetected: (target) => {
+          targetPRStr = target;
+          if (state) {
+            state.activeTarget = target;
+            writeDaemonState(repoRoot, state);
+          }
+        }
+      });
+      const activeTargetStr = targetPRStr;
+      const match = activeTargetStr?.match(/PR\s*#?([0-9]+)/i);
+      const prNum = match ? parseInt(match[1], 10) : candidatePRs[0]?.number;
+      if (typeof prNum === "number") {
+        attemptedPRNumbers.add(prNum);
+        onAttempted?.(prNum);
+      }
+      if (result.success) {
+        console.log(pc11.green(`\u2713 Local peer-review completed successfully.
+`));
+      } else {
+        console.warn(pc11.yellow(`\u26A0\uFE0F  Local peer-review completed with code ${result.exitCode}.
+`));
+      }
+    } catch (err) {
+      console.error(pc11.red(`\u2717 Error in peer-review: ${err.message}`));
+      if (candidatePRs[0]) {
+        attemptedPRNumbers.add(candidatePRs[0].number);
+        onAttempted?.(candidatePRs[0].number);
+      }
+    } finally {
+      if (state) {
+        state.status = "idle";
+        state.activeRoutine = void 0;
+        state.activeTarget = void 0;
+        writeDaemonState(repoRoot, state);
+      }
+    }
+    reviewablePRs = await getPRs(repoRoot);
+  }
+}
 async function runDaemonLoop(repoRoot, options = {}) {
   const reviewInterval = options.reviewInterval || 3;
   const autoworkInterval = options.autoworkInterval || options.interval || 30;
@@ -3105,61 +3426,51 @@ Stopping local agent daemon...`));
   };
   process.once("SIGINT", handleStop);
   process.once("SIGTERM", handleStop);
-  const runReviewCheck = async () => {
+  const performReviewDrain = async () => {
     if (isStopping || isWorking) return;
-    state.lastReviewCheckAt = (/* @__PURE__ */ new Date()).toISOString();
-    writeDaemonState(repoRoot, state);
-    const openPRCount = await countOpenReadyPRs(repoRoot);
-    lastOpenPRCount = openPRCount;
-    if (openPRCount === 0) {
-      if (options.verbose) {
-        console.log(pc11.dim(`[${(/* @__PURE__ */ new Date()).toLocaleTimeString()}] Peer Review Watchdog: 0 ready PRs found (0 tokens used).`));
-      }
-      nextReviewCheckTime = Date.now() + reviewIntervalMs;
-      updateTicker();
-      return;
-    }
     try {
       isWorking = true;
-      clearTicker();
-      state.status = "working";
-      state.activeRoutine = "peer-review";
-      writeDaemonState(repoRoot, state);
-      console.log(pc11.cyan(`
-[${(/* @__PURE__ */ new Date()).toLocaleTimeString()}] \u{1F50D} Peer Review Watchdog: Found ${openPRCount} ready PR(s). Starting review session...`));
-      await cleanupStaleWorktrees(repoRoot);
-      const result = await runLocalRoutine({
-        targetDir: repoRoot,
-        routine: "peer-review",
-        model: options.model,
-        verbose: options.verbose,
-        noWorktree: false,
-        onTargetDetected: (target) => {
-          state.activeTarget = target;
-          writeDaemonState(repoRoot, state);
-        }
+      await drainReviewQueue({
+        repoRoot,
+        state,
+        options,
+        isStopping: () => isStopping,
+        clearTicker
       });
-      if (result.success) {
-        console.log(pc11.green(`\u2713 Local peer-review completed successfully.
-`));
-      } else {
-        console.warn(pc11.yellow(`\u26A0\uFE0F  Local peer-review completed with code ${result.exitCode}.
-`));
-      }
-    } catch (err) {
-      console.error(pc11.red(`\u2717 Error in peer-review: ${err.message}`));
+      const prs = await getOpenReviewablePRs(repoRoot);
+      lastOpenPRCount = prs.length;
     } finally {
       isWorking = false;
-      state.status = "idle";
-      state.activeRoutine = void 0;
-      state.activeTarget = void 0;
-      writeDaemonState(repoRoot, state);
       nextReviewCheckTime = Date.now() + reviewIntervalMs;
       updateTicker();
     }
   };
   const runAutoworkCheck = async () => {
     if (isStopping || isWorking || !routines.includes("autowork")) return;
+    if (routines.includes("peer-review")) {
+      const pendingPRs = await countOpenReadyPRs(repoRoot);
+      if (pendingPRs > 0) {
+        console.log(
+          pc11.cyan(
+            `
+[${(/* @__PURE__ */ new Date()).toLocaleTimeString()}] \u23F3 Autowork paused: draining ${pendingPRs} reviewable PR(s) first...`
+          )
+        );
+        await performReviewDrain();
+        const remainingPRs = await countOpenReadyPRs(repoRoot);
+        if (remainingPRs > 0) {
+          console.log(
+            pc11.yellow(
+              `
+[${(/* @__PURE__ */ new Date()).toLocaleTimeString()}] \u26A0\uFE0F  Review backlog still has ${remainingPRs} pending PR(s). Postponing autowork session.`
+            )
+          );
+          nextAutoworkCheckTime = Date.now() + autoworkIntervalMs;
+          updateTicker();
+          return;
+        }
+      }
+    }
     state.lastAutoworkCheckAt = (/* @__PURE__ */ new Date()).toISOString();
     writeDaemonState(repoRoot, state);
     try {
@@ -3199,15 +3510,27 @@ Stopping local agent daemon...`));
       writeDaemonState(repoRoot, state);
       nextAutoworkCheckTime = Date.now() + autoworkIntervalMs;
       updateTicker();
+      if (!isStopping && routines.includes("peer-review")) {
+        const newPRCount = await countOpenReadyPRs(repoRoot);
+        if (newPRCount > 0) {
+          console.log(
+            pc11.cyan(
+              `
+[${(/* @__PURE__ */ new Date()).toLocaleTimeString()}] \u{1F504} Post-autowork convergence: Found ${newPRCount} ready PR(s). Initiating review sweep...`
+            )
+          );
+          await performReviewDrain();
+        }
+      }
     }
   };
   if (routines.includes("peer-review")) {
-    await runReviewCheck();
+    await performReviewDrain();
   }
-  if (routines.includes("autowork")) {
+  if (!isStopping && routines.includes("autowork")) {
     await runAutoworkCheck();
   }
-  const reviewTimer = setInterval(runReviewCheck, reviewIntervalMs);
+  const reviewTimer = setInterval(performReviewDrain, reviewIntervalMs);
   const autoworkTimer = setInterval(runAutoworkCheck, autoworkIntervalMs);
   await new Promise(() => {
   });