xab 11.0.0 → 12.0.0

package/dist/index.js

@@ -476,7 +476,7 @@ async function runStreamedWithProgress(thread, prompt, onProgress, turnOpts) {
               const lines = output.split(`
 `).filter(Boolean);
               for (const line of lines.slice(-3)) {
-                onProgress("exec", `  ${line.slice(0, 120)}`);
+                onProgress("output", `  ${line.slice(0, 120)}`);
               }
             }
           }
@@ -511,8 +511,10 @@ async function runStreamedWithProgress(thread, prompt, onProgress, turnOpts) {
           if (text) {
             const lines = text.split(`
 `).filter(Boolean);
-            for (const line of lines.slice(0, 3)) {
-              onProgress("think", line.slice(0, 150));
+            if (lines[0])
+              onProgress("think", lines[0].slice(0, 150));
+            for (const line of lines.slice(1, 3)) {
+              onProgress("output", `  ${line.slice(0, 150)}`);
             }
           }
           break;
@@ -1547,28 +1549,8 @@ async function runEngine(opts, cb) {
   await createDetachedWorktree(git, wtPath, wbHead);
   cb.onLog(`Eval worktree (detached): ${wtPath}`, "green");
   const wtGit = createGit(wtPath);
-  const runId = `run-${ts}`;
-  const audit = new AuditLog(repoPath, runId);
-  const runMeta = {
-    runId,
-    startedAt: new Date().toISOString(),
-    sourceRef,
-    targetRef,
-    workBranch: wbName,
-    mergeBase,
-    worktreePath: wtPath,
-    totalCandidates: commitsToProcess.length,
-    cherrySkipped: cherrySkipped.size,
-    dryRun,
-    repoPath
-  };
-  audit.runStart(runMeta);
-  for (const [hash, reason] of cherrySkipped) {
-    const c = allSourceCommits.find((x) => x.hash === hash);
-    if (c)
-      audit.cherrySkip(hash, c.message, reason);
-  }
   let resumeFromIndex = 0;
+  let resumedRunId;
   if (opts.resume && effectiveWorkBranch) {
     const resumeInfo = findResumableRun(repoPath, effectiveWorkBranch);
     if (resumeInfo && resumeInfo.lastCommitIndex >= 0) {
@@ -1580,7 +1562,31 @@ async function runEngine(opts, cb) {
       resumeFromIndex = commitsToProcess.findIndex((c) => !prevHashes.has(c.hash));
       if (resumeFromIndex < 0)
         resumeFromIndex = commitsToProcess.length;
-      cb.onLog(`Resuming from commit ${resumeFromIndex + 1}/${commitsToProcess.length} (${resumeInfo.decisions.length} already decided)`, "green");
+      resumedRunId = resumeInfo.runId;
+      cb.onLog(`Resuming run ${resumeInfo.runId} from commit ${resumeFromIndex + 1}/${commitsToProcess.length} (${resumeInfo.decisions.length} already decided)`, "green");
+    }
+  }
+  const runId = resumedRunId ?? `run-${ts}`;
+  const audit = new AuditLog(repoPath, runId);
+  if (!resumedRunId) {
+    const runMeta = {
+      runId,
+      startedAt: new Date().toISOString(),
+      sourceRef,
+      targetRef,
+      workBranch: wbName,
+      mergeBase,
+      worktreePath: wtPath,
+      totalCandidates: commitsToProcess.length,
+      cherrySkipped: cherrySkipped.size,
+      dryRun,
+      repoPath
+    };
+    audit.runStart(runMeta);
+    for (const [hash, reason] of cherrySkipped) {
+      const c = allSourceCommits.find((x) => x.hash === hash);
+      if (c)
+        audit.cherrySkip(hash, c.message, reason);
     }
   }
   const sourceLatestDiff = await getLatestCommitDiff(git, resolvedSource);
@@ -2059,43 +2065,20 @@ async function runBatch(opts) {
       const subMatch = msg.match(/^\[(\w+)\]\s*(.*)/);
       const sub = subMatch ? subMatch[1] : phase;
       const text = subMatch ? subMatch[2] : msg;
-      let icon;
       switch (sub) {
-        case "read":
-          icon = chalk.cyan("\uD83D\uDCD6");
-          break;
-        case "grep":
-          icon = chalk.cyan("\uD83D\uDD0D");
-          break;
-        case "glob":
-          icon = chalk.cyan("\uD83D\uDCC2");
-          break;
-        case "exec":
-          icon = chalk.yellow("\u26A1");
-          break;
         case "file":
-          icon = chalk.green("\u270F\uFE0F");
+          log(`  ${ts()} \u270F\uFE0F  ${chalk.green(text)}`);
           break;
         case "think":
-          icon = chalk.blue("\uD83D\uDCAD");
-          break;
-        case "tool":
-          icon = chalk.dim("\uD83D\uDD27");
+          log(`  ${ts()} \uD83D\uDCAD ${chalk.blue(text)}`);
           break;
-        case "analyze":
-          icon = chalk.blue("\u25C6");
-          break;
-        case "apply":
-          icon = chalk.green("\u25B8");
-          break;
-        case "review":
-          icon = chalk.magenta("\u25CF");
+        case "read":
+          log(`  ${ts()} \uD83D\uDCD6 ${chalk.dim(text)}`);
           break;
         default:
-          icon = chalk.dim("\xB7");
+          log(`  ${ts()}    ${chalk.dim(text)}`);
           break;
       }
-      log(`  ${ts()} ${icon} ${chalk.dim(text)}`);
     },
     onLog(msg, color) {
       if (jsonl)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xab",
-  "version": "11.0.0",
+  "version": "12.0.0",
   "description": "AI-powered curated branch reconciliation engine",
   "type": "module",
   "bin": {