baro-ai 0.70.7 → 0.70.9

package/dist/cli.mjs

@@ -42791,19 +42791,6 @@ var Finalizer = class extends BaseObserver {
   }
   async finalize(run) {
     if (!this.opts.createPr) return;
-    if (!run.success) {
-      this.log(
-        `[finalizer] run did not complete successfully (${run.abortReason ?? "no reason"}); skipping PR`
-      );
-      this.emit(
-        PrCreated.create({
-          url: null,
-          branch: this.branchName ?? "",
-          baseBranch: ""
-        })
-      );
-      return;
-    }
     if (!await this.hasGhBinary()) {
       this.log("[finalizer] `gh` not found on PATH; skipping PR creation");
       this.emit(
@@ -42835,6 +42822,21 @@ var Finalizer = class extends BaseObserver {
       return;
     }
     this.emit(FinalizeStarted.create({ branch }));
+    const preAdrCommits = await this.collectCommitsSinceBase();
+    const preAdrStats = await this.collectFileStats();
+    const hasRunChanges = preAdrCommits.length > 0 || preAdrStats.created + preAdrStats.modified > 0;
+    if (!run.success && !hasRunChanges) {
+      this.log(
+        `[finalizer] run failed with no branch changes (${run.abortReason ?? "no reason"}); skipping PR`
+      );
+      this.emit(PrCreated.create({ url: null, branch, baseBranch }));
+      return;
+    }
+    if (!run.success) {
+      this.log(
+        `[finalizer] run failed after producing changes; opening checkpoint PR (${run.abortReason ?? "no reason"})`
+      );
+    }
     const prd = this.safeLoadPrd();
     if (prd) {
       for (const s2 of prd.userStories) {
@@ -42848,10 +42850,12 @@ var Finalizer = class extends BaseObserver {
     const { passed, failed } = this.partition(orderedStories);
     const filesStats = await this.collectFileStats();
     const totalSecs = run.totalDurationSecs;
-    const title = this.buildPrTitle(prd, passed.length, orderedStories.length);
+    const checkpoint = !run.success;
+    const title = this.buildPrTitle(prd, passed.length, orderedStories.length, checkpoint);
     const body = this.buildPrBody({
       prd,
       run,
+      checkpoint,
       orderedStories,
       passed,
       failed,
@@ -42861,7 +42865,7 @@ var Finalizer = class extends BaseObserver {
       sequentialSecs: this.sequentialSeconds()
     });
     await this.pushBranch(branch);
-    this.log(`[finalizer] opening PR on ${baseBranch} \u2190 ${branch}`);
+    this.log(`[finalizer] opening ${checkpoint ? "checkpoint " : ""}PR on ${baseBranch} \u2190 ${branch}`);
     const url = await this.openPr({ title, body, baseBranch, branch });
     if (url) {
       this.log(`[finalizer] PR opened: ${url}`);
@@ -43038,12 +43042,13 @@ ${BARO_COAUTHOR_TRAILER}`],
     return "main";
   }
   // ─── PR body composition ────────────────────────────────────────
-  buildPrTitle(prd, passed, total) {
+  buildPrTitle(prd, passed, total, checkpoint = false) {
     const project = prd?.project ?? "baro run";
+    const prefix = checkpoint ? "Checkpoint: " : "";
     if (passed === total) {
-      return `${project} (${total} ${total === 1 ? "story" : "stories"})`;
+      return `${prefix}${project} (${total} ${total === 1 ? "story" : "stories"})`;
     }
-    return `${project} (${passed}/${total} stories)`;
+    return `${prefix}${project} (${passed}/${total} stories)`;
   }
   buildPrBody(args) {
     const { prd, run, orderedStories, passed, failed, commits, filesStats } = args;
@@ -43052,6 +43057,10 @@ ${BARO_COAUTHOR_TRAILER}`],
       `> Opened by [baro](https://baro.rs) \u2014 Mozaik-orchestrated parallel coding agents.`
     );
     lines.push("");
+    if (args.checkpoint) {
+      lines.push("> **Checkpoint PR:** baro produced branch changes, but the run failed during verification/retry/replan. Review this as a candidate fix, not a fully verified completion.");
+      lines.push("");
+    }
     if (prd?.description) {
       lines.push("## Goal");
       lines.push("");
@@ -43368,8 +43377,20 @@ var FinalizationForwarder = class extends BaseObserver {
 // ../baro-orchestrator/src/participants/forwarders/progress.ts
 var ProgressForwarder = class extends BaseObserver {
   async onExternalEvent(_source, event) {
-    if (!ConductorState.is(event)) return;
-    const item = event.data;
+    if (ConductorState.is(event)) {
+      this.handleConductorState(event.data);
+      return;
+    }
+    if (Replan.is(event)) {
+      this.handleReplan(event.data);
+      return;
+    }
+    if (Critique.is(event)) {
+      this.handleCritique(event.data);
+      return;
+    }
+  }
+  handleConductorState(item) {
     if (item.phase === "running_level" && item.currentLevel != null && item.totalLevels != null) {
       emit({
         type: "progress",
@@ -43380,6 +43401,33 @@ var ProgressForwarder = class extends BaseObserver {
         )
       });
     }
+    if (item.detail) {
+      emit({
+        type: "activity",
+        id: "plan",
+        kind: item.phase === "failed" ? "error" : "warn",
+        text: item.detail
+      });
+    }
+  }
+  handleReplan(item) {
+    const added = item.addedStories.length;
+    const removed = item.removedStoryIds.length;
+    emit({
+      type: "activity",
+      id: "plan",
+      kind: "warn",
+      text: `Replanned (${item.source}): +${added}/-${removed} \u2014 ${item.reason}`
+    });
+  }
+  handleCritique(item) {
+    emit({
+      type: "activity",
+      id: item.agentId,
+      kind: "verdict",
+      ok: item.verdict === "pass",
+      text: item.verdict === "pass" ? `Critic accepted ${item.agentId}` : `Critic rejected ${item.agentId}: ${item.reasoning}`
+    });
   }
 };
 
@@ -47767,7 +47815,7 @@ exactly this shape:
 {"action":"split"|"prereq"|"rewire"|"skip"|"abort",
  "reason":"\u2026",
  "added":[ { "id":"S?","priority":N,"title":"\u2026","description":"\u2026",
-             "dependsOn":["\u2026"], "acceptance":["\u2026"], "model":"sonnet" } ],
+             "dependsOn":["\u2026"], "acceptance":["\u2026"] } ],
  "removed":["S?"],
  "modifiedDeps":[{"id":"S?","newDependsOn":["\u2026"]}]}
 
@@ -47777,18 +47825,22 @@ Rules:
 - "modifiedDeps" rewires a story's dependsOn \u2014 use to repoint dependents
   of a removed story to a replacement.
 - "abort" \u2192 empty added/removed/modifiedDeps arrays.
-- TIER every added story with "model" ("haiku" | "sonnet" | "opus"),
-  the same way the planner does \u2014 by blast radius, not raw difficulty:
-    * "haiku"  \u2192 mechanical, single-concern, nothing important breaks
-    * "sonnet" \u2192 one contained feature/module
-    * "opus"   \u2192 cross-cutting / schema / wiring / a DAG hub
-  ESCALATION: the failing story already burned its retries at the tier
-  shown ("Tier that just failed"). Its replacement(s) must NOT repeat
-  that tier unless you are splitting it into genuinely smaller pieces.
-  When you keep the same scope (rewire / prereq replacement), bump the
-  tier UP one step (haiku\u2192sonnet\u2192opus). When you split (action "split"),
-  each child gets the tier its own (smaller) blast radius warrants \u2014
-  often lower, but a still-complex child stays "opus".
+- MODEL: LEAVE "model" UNSET on the stories you add \u2014 they run on the
+  default (cheaper) model, which is exactly what split children want.
+  Do NOT use planner tier names ("haiku"/"sonnet"/"opus") \u2014 the story
+  model is not chosen by tier here; it is either the default or an
+  explicit escalation route (below).
+- ESCALATION vs SPLIT \u2014 the failing story already burned its retries on
+  the model shown ("Model that just failed"). Two ways to recover:
+    * SPLIT (preferred): if it was TOO BROAD \u2014 too many files/concerns
+      for one session \u2014 break it into smaller, focused stories and
+      leave their "model" unset (they stay on the cheaper model). A
+      smaller, sharper story is usually what a stuck run actually needs.
+    * ESCALATE (sparingly): if the story was already RIGHT-SIZED but
+      genuinely needs a more capable model, set that ONE story's "model"
+      to the exact ESCALATION ROUTE printed in the failure context
+      below. That runs it on the stronger model. Only escalate when the
+      scope is already tight \u2014 never as a reflex.
 - Output ONLY the JSON object, nothing else.`;
 var Surgeon = class extends BaseObserver {
   opts;
@@ -47803,7 +47855,8 @@ var Surgeon = class extends BaseObserver {
       claudeBin: opts.claudeBin ?? "claude",
       timeoutMs: opts.timeoutMs ?? 9e4,
       snapshot: opts.snapshot,
-      resolveRoute: opts.resolveRoute
+      resolveRoute: opts.resolveRoute,
+      escalationRoute: opts.escalationRoute
     };
   }
   /** Resolves once every in-flight LLM evaluation has completed. */
@@ -47842,7 +47895,7 @@ var Surgeon = class extends BaseObserver {
    */
   async evaluateWithLlm(failure) {
     const snap = this.opts.snapshot();
-    const prompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute);
+    const prompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute, this.opts.escalationRoute);
     try {
       const { stdout } = await execFileAsync3(
         this.opts.claudeBin,
@@ -47892,7 +47945,7 @@ var Surgeon = class extends BaseObserver {
     }
   }
 };
-function buildSurgeonPrompt(snap, failure, resolveRoute) {
+function buildSurgeonPrompt(snap, failure, resolveRoute, escalationRoute) {
   const storyLines = snap.stories.map(
     (s2) => `  - ${s2.id} ${s2.passes ? "[passed]" : "[pending]"} ${s2.model ? `<tier:${s2.model}> ` : ""}"${s2.title}" deps=${JSON.stringify(s2.dependsOn)}`
   ).join("\n");
@@ -47915,6 +47968,12 @@ function buildSurgeonPrompt(snap, failure, resolveRoute) {
     ] : [],
     `Attempts: ${failure.attempts}`,
     `Error: ${failure.error ?? "(no reason captured)"}`,
+    ...escalationRoute ? [
+      "",
+      `# Escalation route`,
+      `To ESCALATE a right-sized story onto the stronger model, set that story's "model" to EXACTLY: ${escalationRoute}`,
+      `Otherwise leave "model" unset \u2014 added stories run on the default (cheaper) model. Prefer splitting a too-broad story over escalating.`
+    ] : [],
     "",
     `# Decide`,
     `Output the replan JSON per the rules in your system prompt.`
@@ -47964,7 +48023,8 @@ var SurgeonCodex = class extends BaseObserver {
       codexBin: opts.codexBin ?? "codex",
       timeoutMs: opts.timeoutMs ?? 3e5,
       snapshot: opts.snapshot,
-      resolveRoute: opts.resolveRoute
+      resolveRoute: opts.resolveRoute,
+      escalationRoute: opts.escalationRoute
     };
   }
   async idle() {
@@ -47988,7 +48048,7 @@ var SurgeonCodex = class extends BaseObserver {
   }
   async evaluateWithLlm(failure) {
     const snap = this.opts.snapshot();
-    const userPrompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute);
+    const userPrompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute, this.opts.escalationRoute);
     const prompt = `${SURGEON_SYSTEM_PROMPT}
 
 ${userPrompt}`;
@@ -48061,7 +48121,8 @@ var SurgeonOpenAI = class extends BaseObserver {
       maxReplans: opts.maxReplans ?? Infinity,
       model: opts.model ?? "gpt-5.5",
       snapshot: opts.snapshot,
-      resolveRoute: opts.resolveRoute
+      resolveRoute: opts.resolveRoute,
+      escalationRoute: opts.escalationRoute
     };
     this.model = pickModel3(this.opts.model);
   }
@@ -48093,7 +48154,7 @@ var SurgeonOpenAI = class extends BaseObserver {
    */
   async evaluate(failure) {
     const snap = this.opts.snapshot();
-    const userPrompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute);
+    const userPrompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute, this.opts.escalationRoute);
     const context = ModelContext.create("surgeon").addContextItem(SystemMessageItem.create(SURGEON_SYSTEM_PROMPT)).addContextItem(UserMessageItem.create(userPrompt));
     try {
       const round = await runInferenceRound(context, this.model);
@@ -48151,7 +48212,8 @@ var SurgeonOpenCode = class extends BaseObserver {
       opencodeBin: opts.opencodeBin ?? "opencode",
       timeoutMs: opts.timeoutMs ?? 3e5,
       snapshot: opts.snapshot,
-      resolveRoute: opts.resolveRoute
+      resolveRoute: opts.resolveRoute,
+      escalationRoute: opts.escalationRoute
     };
   }
   async idle() {
@@ -48175,7 +48237,7 @@ var SurgeonOpenCode = class extends BaseObserver {
   }
   async evaluateWithLlm(failure) {
     const snap = this.opts.snapshot();
-    const userPrompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute);
+    const userPrompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute, this.opts.escalationRoute);
     const prompt = `${SURGEON_SYSTEM_PROMPT}
 
 ${userPrompt}`;
@@ -48231,7 +48293,8 @@ var SurgeonPi = class extends BaseObserver {
       piBin: opts.piBin ?? "pi",
       timeoutMs: opts.timeoutMs ?? 3e5,
       snapshot: opts.snapshot,
-      resolveRoute: opts.resolveRoute
+      resolveRoute: opts.resolveRoute,
+      escalationRoute: opts.escalationRoute
     };
   }
   async idle() {
@@ -48255,7 +48318,7 @@ var SurgeonPi = class extends BaseObserver {
   }
   async evaluateWithLlm(failure) {
     const snap = this.opts.snapshot();
-    const userPrompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute);
+    const userPrompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute, this.opts.escalationRoute);
     const prompt = `${SURGEON_SYSTEM_PROMPT}
 
 ${userPrompt}`;
@@ -48552,16 +48615,20 @@ async function orchestrate(config) {
         return null;
       }
     } : void 0;
+    const surgeonEscalationModel = config.surgeonModel ?? (surgeonLlm === "openai" ? "gpt-5.5" : surgeonLlm === "claude" ? "opus" : void 0);
+    const escalationRoute = surgeonEscalationModel && !config.storyModel ? `${surgeonLlm}:${surgeonEscalationModel}` : void 0;
     if (surgeonLlm === "openai") {
       surgeon = new SurgeonOpenAI({
         snapshot,
         resolveRoute,
+        escalationRoute,
         model: config.surgeonModel ?? "gpt-5.5"
       });
     } else if (surgeonLlm === "codex") {
       surgeon = new SurgeonCodex({
         snapshot,
         resolveRoute,
+        escalationRoute,
         useLlm: config.surgeonUseLlm ?? true,
         model: config.surgeonModel
       });
@@ -48569,6 +48636,7 @@ async function orchestrate(config) {
       surgeon = new SurgeonOpenCode({
         snapshot,
         resolveRoute,
+        escalationRoute,
         useLlm: config.surgeonUseLlm ?? true,
         model: config.surgeonModel
       });
@@ -48576,6 +48644,7 @@ async function orchestrate(config) {
       surgeon = new SurgeonPi({
         snapshot,
         resolveRoute,
+        escalationRoute,
         useLlm: config.surgeonUseLlm ?? true,
         model: config.surgeonModel
       });
@@ -48583,6 +48652,7 @@ async function orchestrate(config) {
       surgeon = new Surgeon({
         snapshot,
         resolveRoute,
+        escalationRoute,
         useLlm: config.surgeonUseLlm ?? false,
         model: config.surgeonModel ?? "opus"
       });
@@ -48732,6 +48802,12 @@ async function orchestrate(config) {
         const aborted = storyFactory.abort(storyId);
         if (aborted && emitTui) {
           emit({ type: "story_log", id: storyId, line: `\u26A0 ${reason} \u2014 aborting so it can be split/escalated` });
+          emit({
+            type: "activity",
+            id: storyId,
+            kind: "warn",
+            text: `Supervisor paused ${storyId}: ${reason}. It will be retried or replanned.`
+          });
         }
       }
     });