baro-ai 0.33.0 → 0.35.0

package/dist/cli.mjs

@@ -7672,17 +7672,6 @@ var AgenticEnvironment = class {
     this.isActive = false;
   }
 };
-var OpenAIInferenceRunner = class {
-  constructor() {
-    this.runtime = new OpenAIResponses();
-  }
-  async *run(context, model, signal) {
-    const response = await this.runtime.infer(new InferenceRequest(model, context));
-    for (const item of response.contextItems) {
-      yield item;
-    }
-  }
-};
 var Gpt55 = class {
   constructor() {
     this.specification = {
@@ -8169,7 +8158,7 @@ var ClaudeSystemItem = class extends BusEvent {
     };
   }
 };
-var ClaudeResultItem = class extends BusEvent {
+var AgentResultItem = class extends BusEvent {
   constructor(agentId, subtype, sessionId, isError, resultText, usage, totalCostUsd, numTurns, durationMs, raw) {
     super();
     this.agentId = agentId;
@@ -8662,7 +8651,7 @@ function mapClaudeEvent(agentId, event) {
     }
     case "result": {
       items.push(
-        new ClaudeResultItem(
+        new AgentResultItem(
           agentId,
           typeof event.subtype === "string" ? event.subtype : "unknown",
           sessionId,
@@ -8904,7 +8893,7 @@ var ClaudeCliParticipant = class _ClaudeCliParticipant extends BaroParticipant {
         this.transition("running", "claude init received");
         this.resolveReady();
       }
-      if (item instanceof ClaudeResultItem) {
+      if (item instanceof AgentResultItem) {
         this.lastResult = item;
         this.transition(item.isError ? "failed" : "done", `result:${item.subtype}`);
       }
@@ -9038,7 +9027,7 @@ var StoryAgent = class extends BaroParticipant {
     if (event instanceof AgentTargetedMessageItem && event.recipientId === this.spec.id) {
       this.notifyStoryMessage?.();
     }
-    if (event instanceof ClaudeResultItem && event.agentId === this.spec.id) {
+    if (event instanceof AgentResultItem && event.agentId === this.spec.id) {
       this.notifyStoryResult?.();
     }
   }
@@ -9734,7 +9723,7 @@ var Critic = class extends BaroParticipant {
     await Promise.allSettled([...this.pending]);
   }
   async onExternalBusEvent(_source, event) {
-    if (!(event instanceof ClaudeResultItem)) return;
+    if (!(event instanceof AgentResultItem)) return;
     if (event.isError || !event.resultText) return;
     const criteria = this.opts.targets.get(event.agentId);
     if (!criteria || criteria.length === 0) return;
@@ -9876,6 +9865,58 @@ function extractVerdictJson(text) {
   throw new Error(`unbalanced JSON object in critic response: ${trimmed.slice(0, 200)}`);
 }
 
+// ../baro-orchestrator/src/planning/openai-runtime.ts
+var runtime = new OpenAIResponses();
+async function runInferenceRound(context, model) {
+  const response = await runtime.infer(new InferenceRequest(model, context));
+  return {
+    items: response.contextItems,
+    usage: response.tokenUsage
+  };
+}
+var UsageAccumulator = class {
+  input = 0;
+  output = 0;
+  total = 0;
+  cached = 0;
+  reasoning = 0;
+  rounds = 0;
+  add(usage) {
+    if (!usage) return;
+    this.rounds += 1;
+    this.input += usage.inputTokens ?? 0;
+    this.output += usage.outputTokens ?? 0;
+    this.total += usage.totalTokens ?? 0;
+    this.cached += usage.inputTokenDetails?.cached_tokens ?? 0;
+    this.reasoning += usage.outputTokenDetails?.reasoning_tokens ?? 0;
+  }
+  get isEmpty() {
+    return this.rounds === 0;
+  }
+  /**
+   * Plain-object snapshot suitable for embedding in
+   * `AgentResultItem.usage` (which is typed `any` to allow per-
+   * provider shapes). Keys are snake_case to line up with what the
+   * Claude side's stream-json mapper produces from Anthropic
+   * usage frames.
+   */
+  toJSON() {
+    return {
+      input_tokens: this.input,
+      output_tokens: this.output,
+      total_tokens: this.total,
+      cached_input_tokens: this.cached,
+      reasoning_tokens: this.reasoning,
+      rounds: this.rounds
+    };
+  }
+  /** One-line summary for the stderr / log path. */
+  summary() {
+    if (this.isEmpty) return "(no token usage reported)";
+    return `${this.total} total tokens (${this.input} in, ${this.output} out${this.cached ? `, ${this.cached} cached` : ""}${this.reasoning ? `, ${this.reasoning} reasoning` : ""}) across ${this.rounds} round(s)`;
+  }
+};
+
 // ../baro-orchestrator/src/participants/critic-openai.ts
 function pickModel(name) {
   switch (name) {
@@ -9896,7 +9937,6 @@ function pickModel(name) {
 var CriticOpenAI = class extends BaroParticipant {
   opts;
   model;
-  runner = new OpenAIInferenceRunner();
   emissions = /* @__PURE__ */ new Map();
   turnCount = /* @__PURE__ */ new Map();
   pending = /* @__PURE__ */ new Set();
@@ -9914,7 +9954,7 @@ var CriticOpenAI = class extends BaroParticipant {
     await Promise.allSettled([...this.pending]);
   }
   async onExternalBusEvent(_source, event) {
-    if (!(event instanceof ClaudeResultItem)) return;
+    if (!(event instanceof AgentResultItem)) return;
     if (event.isError || !event.resultText) return;
     const criteria = this.opts.targets.get(event.agentId);
     if (!criteria || criteria.length === 0) return;
@@ -9967,9 +10007,12 @@ var CriticOpenAI = class extends BaroParticipant {
     const userPrompt = buildEvalPrompt(criteria, resultText);
     const context = ModelContext.create("critic").addContextItem(SystemMessageItem.create(VERDICT_SYSTEM_PROMPT)).addContextItem(UserMessageItem.create(userPrompt));
     try {
+      const round = await runInferenceRound(context, this.model);
+      const usage = new UsageAccumulator();
+      usage.add(round.usage);
       let assistantText = "";
-      for await (const item of this.runner.run(context, this.model)) {
-        if (item.type === "message" && item.role === "assistant") {
+      for (const item of round.items) {
+        if (item.type === "message") {
           const json = item.toJSON();
           assistantText += json.content?.[0]?.text ?? "";
         }
@@ -9977,6 +10020,8 @@ var CriticOpenAI = class extends BaroParticipant {
       if (!assistantText.trim()) {
         throw new Error("OpenAI returned empty assistant text");
       }
+      process.stderr.write(`[critic-openai] ${usage.summary()}
+`);
       const verdictJson = extractVerdictJson(assistantText);
       const parsed = JSON.parse(verdictJson);
       return {
@@ -11266,7 +11311,6 @@ var OpenAIStoryAgent = class extends BaroParticipant {
   spec;
   opts;
   model;
-  runner = new OpenAIInferenceRunner();
   tools;
   envRef = null;
   currentPhase = "idle";
@@ -11381,23 +11425,27 @@ var OpenAIStoryAgent = class extends BaroParticipant {
     for (let turn = 1; turn <= this.spec.maxTurns; turn++) {
       const turnResult = await this.runOneTurn(context);
       context = turnResult.context;
+      const usageJson = turnResult.usage.isEmpty ? null : turnResult.usage.toJSON();
       this.envRef?.deliverBusEvent(
         this,
-        new ClaudeResultItem(
+        new AgentResultItem(
           this.spec.id,
           turnResult.success ? "success" : "error",
           null,
           // session id — not applicable for OpenAI
           !turnResult.success,
           turnResult.assistantText,
-          null,
-          // usage info — not surfaced this phase
+          usageJson,
           null,
           null,
           null,
           {}
         )
       );
+      process.stderr.write(
+        `[story-openai/${this.spec.id}] turn ${turn}: ${turnResult.usage.summary()}
+`
+      );
       if (!turnResult.success) {
         this.transition("failed", turnResult.error ?? "turn failed");
         return;
@@ -11428,19 +11476,27 @@ var OpenAIStoryAgent = class extends BaroParticipant {
     let context = initialContext;
     let assistantText = null;
     const perRoundMs = this.opts.perRoundTimeoutSecs * 1e3;
+    const usage = new UsageAccumulator();
     for (let round = 1; round <= this.opts.maxRoundsPerTurn; round++) {
-      const ac = new AbortController();
-      const timer = setTimeout(() => ac.abort(), perRoundMs);
       const calls = [];
       let sawMessage = false;
       let lastMessageText = null;
       try {
-        for await (const item of this.runner.run(context, this.model, ac.signal)) {
+        const roundPromise = runInferenceRound(context, this.model);
+        const timeoutPromise = new Promise(
+          (_, rej) => setTimeout(
+            () => rej(new Error(`round ${round} timed out after ${perRoundMs}ms`)),
+            perRoundMs
+          )
+        );
+        const result = await Promise.race([roundPromise, timeoutPromise]);
+        usage.add(result.usage);
+        for (const item of result.items) {
           if (item.type === "function_call") {
             await this.envRef?.deliverFunctionCall(this, item);
             context = context.addContextItem(item);
             calls.push(item);
-          } else if (item.type === "message" && item.role === "assistant") {
+          } else if (item.type === "message") {
             await this.envRef?.deliverModelMessage(this, item);
             context = context.addContextItem(item);
             const json = item.toJSON();
@@ -11452,15 +11508,13 @@ var OpenAIStoryAgent = class extends BaroParticipant {
           }
         }
       } catch (e) {
-        clearTimeout(timer);
         return {
           context,
           success: false,
           assistantText,
+          usage,
           error: `inference round ${round} failed: ${e?.message ?? String(e)}`
         };
-      } finally {
-        clearTimeout(timer);
       }
       for (const call of calls) {
         const tool = this.tools.find((t) => t.name === call.name);
@@ -11473,7 +11527,8 @@ var OpenAIStoryAgent = class extends BaroParticipant {
         return {
           context,
           success: true,
-          assistantText: lastMessageText
+          assistantText: lastMessageText,
+          usage
         };
       }
       if (!sawMessage && calls.length === 0) {
@@ -11481,6 +11536,7 @@ var OpenAIStoryAgent = class extends BaroParticipant {
           context,
           success: false,
           assistantText,
+          usage,
           error: `round ${round} returned no items`
         };
       }
@@ -11490,6 +11546,7 @@ var OpenAIStoryAgent = class extends BaroParticipant {
       context,
       success: false,
       assistantText,
+      usage,
       error: `exceeded maxRoundsPerTurn=${this.opts.maxRoundsPerTurn}`
     };
   }
@@ -11591,6 +11648,8 @@ var StoryFactory = class extends BaroParticipant {
     if (!this.envRef) return;
     if (this.active.has(req.storyId)) return;
     const llm = this.opts.llm ?? "claude";
+    const claudeModel = this.opts.storyModelOverride ?? req.model;
+    const openaiModel = this.opts.storyModelOverride ?? this.opts.openaiModel ?? "gpt-5.5";
     const agent = llm === "openai" ? new OpenAIStoryAgent(
       {
         id: req.storyId,
@@ -11600,12 +11659,12 @@ var StoryFactory = class extends BaroParticipant {
         retries: req.retries,
         timeoutSecs: req.timeoutSecs
       },
-      { model: this.opts.openaiModel ?? "gpt-5.5" }
+      { model: openaiModel }
     ) : new StoryAgent({
       id: req.storyId,
       prompt: req.prompt,
       cwd: this.opts.cwd,
-      model: req.model,
+      model: claudeModel,
       retries: req.retries,
       timeoutSecs: req.timeoutSecs
     });
@@ -11850,7 +11909,6 @@ function pickModel3(name) {
 var SurgeonOpenAI = class extends BaroParticipant {
   opts;
   model;
-  runner = new OpenAIInferenceRunner();
   replansEmitted = 0;
   pending = /* @__PURE__ */ new Set();
   constructor(opts) {
@@ -11894,9 +11952,12 @@ var SurgeonOpenAI = class extends BaroParticipant {
     const userPrompt = buildSurgeonPrompt(snap, failure);
     const context = ModelContext.create("surgeon").addContextItem(SystemMessageItem.create(SURGEON_SYSTEM_PROMPT)).addContextItem(UserMessageItem.create(userPrompt));
     try {
+      const round = await runInferenceRound(context, this.model);
+      const usage = new UsageAccumulator();
+      usage.add(round.usage);
       let assistantText = "";
-      for await (const item of this.runner.run(context, this.model)) {
-        if (item.type === "message" && item.role === "assistant") {
+      for (const item of round.items) {
+        if (item.type === "message") {
           const json = item.toJSON();
           assistantText += json.content?.[0]?.text ?? "";
         }
@@ -11904,6 +11965,8 @@ var SurgeonOpenAI = class extends BaroParticipant {
       if (!assistantText.trim()) {
         throw new Error("OpenAI returned empty assistant text");
       }
+      process.stderr.write(`[surgeon-openai] ${usage.summary()}
+`);
       const verdictJson = extractJsonObject(assistantText);
       const parsed = JSON.parse(verdictJson);
       if (parsed.action === "abort") return null;
@@ -12082,7 +12145,8 @@ async function orchestrate(config) {
   const storyFactory = new StoryFactory({
     cwd: config.cwd,
     llm,
-    openaiModel: "gpt-5.5"
+    openaiModel: config.storyModel ?? "gpt-5.5",
+    storyModelOverride: config.storyModel
   });
   storyFactory.setEnvironment(env);
   storyFactory.join(env);
@@ -12160,7 +12224,7 @@ var BaroEventForwarder = class extends BaroParticipant {
       this.handleStoryResult(event);
       return;
     }
-    if (event instanceof ClaudeResultItem) {
+    if (event instanceof AgentResultItem) {
       this.handleClaudeResult(event);
       return;
     }
@@ -12375,6 +12439,9 @@ function parseArgs(argv) {
           10
         );
         break;
+      case "--story-model":
+        args.storyModel = required(argv, ++i, "--story-model");
+        break;
       case "--llm": {
         const v = required(argv, ++i, "--llm");
         if (v !== "claude" && v !== "openai") {
@@ -12463,7 +12530,8 @@ async function main() {
     surgeonUseLlm: args.surgeonUseLlm,
     surgeonModel: args.surgeonModel,
     intraLevelDelaySecs: args.intraLevelDelaySecs,
-    llm: args.llm
+    llm: args.llm,
+    storyModel: args.storyModel
   };
   if (args.llm === "openai" && !process.env.OPENAI_API_KEY) {
     process.stderr.write(