baro-ai 0.51.4 → 0.51.5

package/dist/cli.mjs

@@ -40350,6 +40350,150 @@ function buildDag(stories, options = {}) {
   return levels;
 }
 
+// ../baro-orchestrator/src/routing.ts
+var BACKENDS = ["claude", "openai", "codex", "opencode", "pi"];
+function isBackend(s2) {
+  return BACKENDS.includes(s2);
+}
+var CLAUDE_TIER_RE = /^(opus|sonnet|haiku)\b/i;
+function isClaudeTierName(s2) {
+  return CLAUDE_TIER_RE.test(s2.trim());
+}
+function splitBackendModel(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed) return {};
+  const idx = trimmed.indexOf(":");
+  if (idx > 0) {
+    const prefix = trimmed.slice(0, idx).toLowerCase();
+    if (isBackend(prefix)) {
+      const model = trimmed.slice(idx + 1).trim();
+      return { backend: prefix, model: model.length ? model : void 0 };
+    }
+  }
+  if (isBackend(trimmed.toLowerCase())) {
+    return { backend: trimmed.toLowerCase() };
+  }
+  return { model: trimmed };
+}
+function looksLikeUrl(s2) {
+  return /^https?:\/\//i.test(s2.trim());
+}
+function splitModelEndpoint(model) {
+  const at = model.indexOf("@");
+  if (at < 0) return { model };
+  const ref = model.slice(at + 1).trim();
+  return { model: model.slice(0, at).trim(), endpointRef: ref || void 0 };
+}
+function resolveEndpoint(ref, opts) {
+  if (looksLikeUrl(ref)) {
+    return { baseUrl: ref, apiKey: opts.defaultApiKey };
+  }
+  const ep = opts.endpoints?.[ref.toLowerCase()] ?? opts.endpoints?.[ref];
+  if (!ep) {
+    throw new Error(
+      `unknown OpenAI endpoint "${ref}" \u2014 define it with --openai-endpoint ${ref}=<url> or use an inline https:// URL`
+    );
+  }
+  return { baseUrl: ep.baseUrl, apiKey: ep.apiKey ?? opts.defaultApiKey };
+}
+function resolveStoryRoute(rawModel, opts) {
+  const raw = (opts.override ?? rawModel ?? "").trim();
+  if (!raw) return defaultRoute(opts.fallbackBackend, opts.openaiDefaultModel);
+  const direct = splitBackendModel(raw);
+  if (direct.backend === void 0 && opts.tierMap) {
+    const mapped = opts.tierMap[raw.toLowerCase()] ?? opts.tierMap[raw];
+    if (mapped) {
+      return resolveStoryRoute(mapped, {
+        ...opts,
+        override: void 0,
+        tierMap: void 0
+      });
+    }
+  }
+  if (direct.backend) {
+    if (direct.model) return buildRoute(direct.backend, direct.model, opts);
+    return defaultRoute(direct.backend, opts.openaiDefaultModel);
+  }
+  const backend = opts.fallbackBackend;
+  if (backend === "claude") {
+    return { backend, model: direct.model };
+  }
+  if (direct.model && !isClaudeTierName(direct.model)) {
+    return buildRoute(backend, direct.model, opts);
+  }
+  return defaultRoute(backend, opts.openaiDefaultModel);
+}
+function buildRoute(backend, model, opts) {
+  if (backend !== "openai") return { backend, model };
+  const { model: bareModel, endpointRef } = splitModelEndpoint(model);
+  if (!endpointRef) return { backend, model: bareModel };
+  const ep = resolveEndpoint(endpointRef, opts);
+  return { backend, model: bareModel, baseUrl: ep.baseUrl, apiKey: ep.apiKey };
+}
+function defaultRoute(backend, openaiDefaultModel) {
+  if (backend === "openai") return { backend, model: openaiDefaultModel };
+  return { backend };
+}
+function parseTierMap(spec) {
+  const map = {};
+  for (const part of spec.split(",")) {
+    const seg = part.trim();
+    if (!seg) continue;
+    const eq = seg.indexOf("=");
+    if (eq <= 0) {
+      throw new Error(
+        `bad --tier-map entry "${seg}" (expected tier=backend:model)`
+      );
+    }
+    const tier = seg.slice(0, eq).trim().toLowerCase();
+    const route = seg.slice(eq + 1).trim();
+    if (!tier || !route) {
+      throw new Error(
+        `bad --tier-map entry "${seg}" (expected tier=backend:model)`
+      );
+    }
+    const { backend } = splitBackendModel(route);
+    if (!backend) {
+      throw new Error(
+        `--tier-map route "${route}" for tier "${tier}" must name a backend (claude: | openai: | codex: | opencode: | pi:)`
+      );
+    }
+    map[tier] = route;
+  }
+  return map;
+}
+function parseEndpoints(specs, keyFor) {
+  const map = {};
+  for (const raw of specs) {
+    const spec = raw.trim();
+    if (!spec) continue;
+    const eq = spec.indexOf("=");
+    if (eq <= 0) {
+      throw new Error(
+        `bad --openai-endpoint "${spec}" (expected name=url)`
+      );
+    }
+    const name = spec.slice(0, eq).trim().toLowerCase();
+    const url = spec.slice(eq + 1).trim();
+    if (!name || !url) {
+      throw new Error(
+        `bad --openai-endpoint "${spec}" (expected name=url)`
+      );
+    }
+    if (!looksLikeUrl(url)) {
+      throw new Error(
+        `--openai-endpoint "${name}" url "${url}" must start with http:// or https://`
+      );
+    }
+    map[name] = { baseUrl: url, apiKey: keyFor?.(name) };
+  }
+  return map;
+}
+function formatRoute(route) {
+  const base = route.model ? `${route.backend}:${route.model}` : route.backend;
+  return route.baseUrl ? `${base}@${route.baseUrl}` : base;
+}
+
 // ../baro-orchestrator/src/participants/auditor.ts
 import { appendFileSync, mkdirSync } from "fs";
 import { dirname } from "path";
@@ -42914,9 +43058,16 @@ var ProgressForwarder = class extends BaseObserver {
 };
 
 // ../baro-orchestrator/src/participants/forwarders/story-lifecycle.ts
+var CREATE_TOOLS = /* @__PURE__ */ new Set(["Write", "write_file"]);
+var EDIT_TOOLS = /* @__PURE__ */ new Set(["Edit", "MultiEdit", "NotebookEdit", "edit_file"]);
 var StoryLifecycleForwarder = class extends BaseObserver {
   startedStories = /* @__PURE__ */ new Set();
   retryCounts = /* @__PURE__ */ new Map();
+  // storyId → (path → first-touch kind). Distinct paths per story, so a
+  // file touched many times counts once, classified by its first write.
+  // Reset on each retry so story_complete reflects only the winning
+  // attempt's touches, not files a failed attempt wrote and abandoned.
+  filesByStory = /* @__PURE__ */ new Map();
   async onExternalEvent(_source, event) {
     if (AgentState.is(event)) {
       this.handleAgentState(event.data);
@@ -42927,6 +43078,27 @@ var StoryLifecycleForwarder = class extends BaseObserver {
       return;
     }
   }
+  // Same signal the Sentry uses: a write/edit tool call from a story
+  // agent. We attribute the touched path to that agent's story and
+  // remember its first-touch kind so story_complete can report real
+  // per-story file counts instead of a hardcoded 0.
+  async onExternalFunctionCall(source, item) {
+    const isCreate = CREATE_TOOLS.has(item.name);
+    const isEdit = EDIT_TOOLS.has(item.name);
+    if (!isCreate && !isEdit) return;
+    const agentId = source.agentId;
+    if (typeof agentId !== "string") return;
+    const path6 = extractPath(item);
+    if (!path6) return;
+    let paths = this.filesByStory.get(agentId);
+    if (!paths) {
+      paths = /* @__PURE__ */ new Map();
+      this.filesByStory.set(agentId, paths);
+    }
+    if (!paths.has(path6)) {
+      paths.set(path6, isCreate ? "created" : "modified");
+    }
+  }
   handleAgentState(item) {
     if (item.phase === "running" && !this.startedStories.has(item.agentId)) {
       this.startedStories.add(item.agentId);
@@ -42935,19 +43107,31 @@ var StoryLifecycleForwarder = class extends BaseObserver {
     if (item.phase === "waiting" && item.detail?.includes("retrying")) {
       const count = (this.retryCounts.get(item.agentId) ?? 0) + 1;
       this.retryCounts.set(item.agentId, count);
+      this.filesByStory.delete(item.agentId);
       emit({ type: "story_retry", id: item.agentId, attempt: count });
     }
   }
   handleStoryResult(item) {
     if (item.success) {
+      const paths = this.filesByStory.get(item.storyId);
+      let created = 0;
+      let modified = 0;
+      if (paths) {
+        for (const kind of paths.values()) {
+          if (kind === "created") created++;
+          else modified++;
+        }
+      }
+      this.filesByStory.delete(item.storyId);
       emit({
         type: "story_complete",
         id: item.storyId,
         duration_secs: item.durationSecs,
-        files_created: 0,
-        files_modified: 0
+        files_created: created,
+        files_modified: modified
       });
     } else {
+      this.filesByStory.delete(item.storyId);
       emit({
         type: "story_error",
         id: item.storyId,
@@ -42958,6 +43142,19 @@ var StoryLifecycleForwarder = class extends BaseObserver {
     }
   }
 };
+function extractPath(item) {
+  let args;
+  try {
+    args = JSON.parse(item.args);
+  } catch {
+    return null;
+  }
+  for (const key of ["file_path", "path", "notebook_path"]) {
+    const v = args[key];
+    if (typeof v === "string") return v;
+  }
+  return null;
+}
 
 // ../baro-orchestrator/src/participants/forwarders/token-usage.ts
 var TokenUsageForwarder = class extends BaseObserver {
@@ -43594,7 +43791,7 @@ var Sentry = class extends BaseObserver {
     if (!WRITE_TOOLS.has(item.name)) return;
     const agentId = source.agentId;
     if (typeof agentId !== "string") return;
-    const path6 = extractPath(item);
+    const path6 = extractPath2(item);
     if (!path6) return;
     const touch = {
       agentId,
@@ -43629,7 +43826,7 @@ var Sentry = class extends BaseObserver {
     }
   }
 };
-function extractPath(item) {
+function extractPath2(item) {
   let args;
   try {
     args = JSON.parse(item.args);
@@ -47014,150 +47211,6 @@ function raceWithTimeout4(p, ms, label) {
   ]);
 }
 
-// ../baro-orchestrator/src/routing.ts
-var BACKENDS = ["claude", "openai", "codex", "opencode", "pi"];
-function isBackend(s2) {
-  return BACKENDS.includes(s2);
-}
-var CLAUDE_TIER_RE = /^(opus|sonnet|haiku)\b/i;
-function isClaudeTierName(s2) {
-  return CLAUDE_TIER_RE.test(s2.trim());
-}
-function splitBackendModel(raw) {
-  const trimmed = raw.trim();
-  if (!trimmed) return {};
-  const idx = trimmed.indexOf(":");
-  if (idx > 0) {
-    const prefix = trimmed.slice(0, idx).toLowerCase();
-    if (isBackend(prefix)) {
-      const model = trimmed.slice(idx + 1).trim();
-      return { backend: prefix, model: model.length ? model : void 0 };
-    }
-  }
-  if (isBackend(trimmed.toLowerCase())) {
-    return { backend: trimmed.toLowerCase() };
-  }
-  return { model: trimmed };
-}
-function looksLikeUrl(s2) {
-  return /^https?:\/\//i.test(s2.trim());
-}
-function splitModelEndpoint(model) {
-  const at = model.indexOf("@");
-  if (at < 0) return { model };
-  const ref = model.slice(at + 1).trim();
-  return { model: model.slice(0, at).trim(), endpointRef: ref || void 0 };
-}
-function resolveEndpoint(ref, opts) {
-  if (looksLikeUrl(ref)) {
-    return { baseUrl: ref, apiKey: opts.defaultApiKey };
-  }
-  const ep = opts.endpoints?.[ref.toLowerCase()] ?? opts.endpoints?.[ref];
-  if (!ep) {
-    throw new Error(
-      `unknown OpenAI endpoint "${ref}" \u2014 define it with --openai-endpoint ${ref}=<url> or use an inline https:// URL`
-    );
-  }
-  return { baseUrl: ep.baseUrl, apiKey: ep.apiKey ?? opts.defaultApiKey };
-}
-function resolveStoryRoute(rawModel, opts) {
-  const raw = (opts.override ?? rawModel ?? "").trim();
-  if (!raw) return defaultRoute(opts.fallbackBackend, opts.openaiDefaultModel);
-  const direct = splitBackendModel(raw);
-  if (direct.backend === void 0 && opts.tierMap) {
-    const mapped = opts.tierMap[raw.toLowerCase()] ?? opts.tierMap[raw];
-    if (mapped) {
-      return resolveStoryRoute(mapped, {
-        ...opts,
-        override: void 0,
-        tierMap: void 0
-      });
-    }
-  }
-  if (direct.backend) {
-    if (direct.model) return buildRoute(direct.backend, direct.model, opts);
-    return defaultRoute(direct.backend, opts.openaiDefaultModel);
-  }
-  const backend = opts.fallbackBackend;
-  if (backend === "claude") {
-    return { backend, model: direct.model };
-  }
-  if (direct.model && !isClaudeTierName(direct.model)) {
-    return buildRoute(backend, direct.model, opts);
-  }
-  return defaultRoute(backend, opts.openaiDefaultModel);
-}
-function buildRoute(backend, model, opts) {
-  if (backend !== "openai") return { backend, model };
-  const { model: bareModel, endpointRef } = splitModelEndpoint(model);
-  if (!endpointRef) return { backend, model: bareModel };
-  const ep = resolveEndpoint(endpointRef, opts);
-  return { backend, model: bareModel, baseUrl: ep.baseUrl, apiKey: ep.apiKey };
-}
-function defaultRoute(backend, openaiDefaultModel) {
-  if (backend === "openai") return { backend, model: openaiDefaultModel };
-  return { backend };
-}
-function parseTierMap(spec) {
-  const map = {};
-  for (const part of spec.split(",")) {
-    const seg = part.trim();
-    if (!seg) continue;
-    const eq = seg.indexOf("=");
-    if (eq <= 0) {
-      throw new Error(
-        `bad --tier-map entry "${seg}" (expected tier=backend:model)`
-      );
-    }
-    const tier = seg.slice(0, eq).trim().toLowerCase();
-    const route = seg.slice(eq + 1).trim();
-    if (!tier || !route) {
-      throw new Error(
-        `bad --tier-map entry "${seg}" (expected tier=backend:model)`
-      );
-    }
-    const { backend } = splitBackendModel(route);
-    if (!backend) {
-      throw new Error(
-        `--tier-map route "${route}" for tier "${tier}" must name a backend (claude: | openai: | codex: | opencode: | pi:)`
-      );
-    }
-    map[tier] = route;
-  }
-  return map;
-}
-function parseEndpoints(specs, keyFor) {
-  const map = {};
-  for (const raw of specs) {
-    const spec = raw.trim();
-    if (!spec) continue;
-    const eq = spec.indexOf("=");
-    if (eq <= 0) {
-      throw new Error(
-        `bad --openai-endpoint "${spec}" (expected name=url)`
-      );
-    }
-    const name = spec.slice(0, eq).trim().toLowerCase();
-    const url = spec.slice(eq + 1).trim();
-    if (!name || !url) {
-      throw new Error(
-        `bad --openai-endpoint "${spec}" (expected name=url)`
-      );
-    }
-    if (!looksLikeUrl(url)) {
-      throw new Error(
-        `--openai-endpoint "${name}" url "${url}" must start with http:// or https://`
-      );
-    }
-    map[name] = { baseUrl: url, apiKey: keyFor?.(name) };
-  }
-  return map;
-}
-function formatRoute(route) {
-  const base = route.model ? `${route.backend}:${route.model}` : route.backend;
-  return route.baseUrl ? `${base}@${route.baseUrl}` : base;
-}
-
 // ../baro-orchestrator/src/participants/story-factory.ts
 var StoryFactory = class extends BaseObserver {
   constructor(opts) {
@@ -47347,7 +47400,8 @@ var Surgeon = class extends BaseObserver {
       maxReplans: opts.maxReplans ?? 10,
       claudeBin: opts.claudeBin ?? "claude",
       timeoutMs: opts.timeoutMs ?? 9e4,
-      snapshot: opts.snapshot
+      snapshot: opts.snapshot,
+      resolveRoute: opts.resolveRoute
     };
   }
   /** Resolves once every in-flight LLM evaluation has completed. */
@@ -47386,7 +47440,7 @@ var Surgeon = class extends BaseObserver {
    */
   async evaluateWithLlm(failure) {
     const snap = this.opts.snapshot();
-    const prompt = buildSurgeonPrompt(snap, failure);
+    const prompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute);
     try {
       const { stdout } = await execFileAsync3(
         this.opts.claudeBin,
@@ -47436,11 +47490,12 @@ var Surgeon = class extends BaseObserver {
     }
   }
 };
-function buildSurgeonPrompt(snap, failure) {
+function buildSurgeonPrompt(snap, failure, resolveRoute) {
   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");
   const failureStory = snap.stories.find((s2) => s2.id === failure.storyId);
+  const ranOn = resolveRoute ? resolveRoute(failureStory?.model) : null;
   return [
     `# Project: ${snap.project}`,
     `Description: ${snap.description}`,
@@ -47453,6 +47508,9 @@ function buildSurgeonPrompt(snap, failure) {
     `Title: ${failureStory?.title ?? "(unknown)"}`,
     `Description: ${failureStory?.description ?? "(unknown)"}`,
     `Tier that just failed: ${failureStory?.model ?? "(default)"}`,
+    ...ranOn ? [
+      `Model that actually ran: ${ranOn}  (an override replaced the planner tier above; refer to THIS model in your reason, not the tier)`
+    ] : [],
     `Attempts: ${failure.attempts}`,
     `Error: ${failure.error ?? "(no reason captured)"}`,
     "",
@@ -47503,7 +47561,8 @@ var SurgeonCodex = class extends BaseObserver {
       maxReplans: opts.maxReplans ?? 10,
       codexBin: opts.codexBin ?? "codex",
       timeoutMs: opts.timeoutMs ?? 3e5,
-      snapshot: opts.snapshot
+      snapshot: opts.snapshot,
+      resolveRoute: opts.resolveRoute
     };
   }
   async idle() {
@@ -47527,7 +47586,7 @@ var SurgeonCodex = class extends BaseObserver {
   }
   async evaluateWithLlm(failure) {
     const snap = this.opts.snapshot();
-    const userPrompt = buildSurgeonPrompt(snap, failure);
+    const userPrompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute);
     const prompt = `${SURGEON_SYSTEM_PROMPT}
 
 ${userPrompt}`;
@@ -47599,7 +47658,8 @@ var SurgeonOpenAI = class extends BaseObserver {
     this.opts = {
       maxReplans: opts.maxReplans ?? 10,
       model: opts.model ?? "gpt-5.5",
-      snapshot: opts.snapshot
+      snapshot: opts.snapshot,
+      resolveRoute: opts.resolveRoute
     };
     this.model = pickModel3(this.opts.model);
   }
@@ -47631,7 +47691,7 @@ var SurgeonOpenAI = class extends BaseObserver {
    */
   async evaluate(failure) {
     const snap = this.opts.snapshot();
-    const userPrompt = buildSurgeonPrompt(snap, failure);
+    const userPrompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute);
     const context = ModelContext.create("surgeon").addContextItem(SystemMessageItem.create(SURGEON_SYSTEM_PROMPT)).addContextItem(UserMessageItem.create(userPrompt));
     try {
       const round = await runInferenceRound(context, this.model);
@@ -47688,7 +47748,8 @@ var SurgeonOpenCode = class extends BaseObserver {
       maxReplans: opts.maxReplans ?? 10,
       opencodeBin: opts.opencodeBin ?? "opencode",
       timeoutMs: opts.timeoutMs ?? 3e5,
-      snapshot: opts.snapshot
+      snapshot: opts.snapshot,
+      resolveRoute: opts.resolveRoute
     };
   }
   async idle() {
@@ -47712,7 +47773,7 @@ var SurgeonOpenCode = class extends BaseObserver {
   }
   async evaluateWithLlm(failure) {
     const snap = this.opts.snapshot();
-    const userPrompt = buildSurgeonPrompt(snap, failure);
+    const userPrompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute);
     const prompt = `${SURGEON_SYSTEM_PROMPT}
 
 ${userPrompt}`;
@@ -47767,7 +47828,8 @@ var SurgeonPi = class extends BaseObserver {
       maxReplans: opts.maxReplans ?? 10,
       piBin: opts.piBin ?? "pi",
       timeoutMs: opts.timeoutMs ?? 3e5,
-      snapshot: opts.snapshot
+      snapshot: opts.snapshot,
+      resolveRoute: opts.resolveRoute
     };
   }
   async idle() {
@@ -47791,7 +47853,7 @@ var SurgeonPi = class extends BaseObserver {
   }
   async evaluateWithLlm(failure) {
     const snap = this.opts.snapshot();
-    const userPrompt = buildSurgeonPrompt(snap, failure);
+    const userPrompt = buildSurgeonPrompt(snap, failure, this.opts.resolveRoute);
     const prompt = `${SURGEON_SYSTEM_PROMPT}
 
 ${userPrompt}`;
@@ -47968,32 +48030,53 @@ async function orchestrate(config) {
         }))
       };
     };
+    const storyRouting = {
+      fallbackBackend: storyLlm,
+      openaiDefaultModel: config.storyModel ?? "gpt-5.5",
+      override: config.storyModel,
+      tierMap: config.tierMap,
+      endpoints: config.openaiEndpoints,
+      defaultApiKey: process.env.OPENAI_API_KEY
+    };
+    const routingOverridden = storyLlm !== "claude" || !!config.storyModel || !!config.tierMap;
+    const resolveRoute = routingOverridden ? (model) => {
+      try {
+        return formatRoute(resolveStoryRoute(model, storyRouting));
+      } catch {
+        return null;
+      }
+    } : void 0;
     if (surgeonLlm === "openai") {
       surgeon = new SurgeonOpenAI({
         snapshot,
+        resolveRoute,
         model: config.surgeonModel ?? "gpt-5.5"
       });
     } else if (surgeonLlm === "codex") {
       surgeon = new SurgeonCodex({
         snapshot,
+        resolveRoute,
         useLlm: config.surgeonUseLlm ?? true,
         model: config.surgeonModel
       });
     } else if (surgeonLlm === "opencode") {
       surgeon = new SurgeonOpenCode({
         snapshot,
+        resolveRoute,
         useLlm: config.surgeonUseLlm ?? true,
         model: config.surgeonModel
       });
     } else if (surgeonLlm === "pi") {
       surgeon = new SurgeonPi({
         snapshot,
+        resolveRoute,
         useLlm: config.surgeonUseLlm ?? true,
         model: config.surgeonModel
       });
     } else {
       surgeon = new Surgeon({
         snapshot,
+        resolveRoute,
         useLlm: config.surgeonUseLlm ?? false,
         model: config.surgeonModel ?? "opus"
       });