baro-ai 0.27.0 → 0.29.0

package/dist/cli.mjs

@@ -7188,29 +7188,6 @@ var InputText = class _InputText extends ItemContent {
     ];
   }
 };
-var UserMessageItem = class _UserMessageItem extends ContextItem {
-  constructor(content) {
-    super();
-    this.type = "message";
-    this.role = "user";
-    this.content = content;
-  }
-  static create(text) {
-    const content = InputText.create(text);
-    return new _UserMessageItem(content);
-  }
-  static rehydrate(data) {
-    const content = InputText.rehydrate(data);
-    return new _UserMessageItem(content);
-  }
-  toJSON() {
-    return {
-      type: this.type,
-      role: this.role,
-      content: this.content.toJSON()
-    };
-  }
-};
 var OutputText = class _OutputText extends ItemContent {
   constructor(text) {
     super();
@@ -7322,13 +7299,64 @@ var AgenticEnvironment = class {
   }
   subscribe(subscriber) {
     this.subscribers.push(subscriber);
+    for (const subscriber2 of this.subscribers) {
+      if (subscriber2 === subscriber2) {
+        subscriber2.onJoined();
+      } else {
+        subscriber2.onParticipantJoined(subscriber2);
+      }
+    }
+  }
+  unsubscribe(subscriber) {
+    this.subscribers = this.subscribers.filter((p) => p !== subscriber);
+    for (const subscriber2 of this.subscribers) {
+      if (subscriber2 === subscriber2) {
+        subscriber2.onLeft();
+      } else {
+        subscriber2.onParticipantLeft(subscriber2);
+      }
+    }
+  }
+  deliverFunctionCall(source, item) {
+    for (const subscriber of this.subscribers) {
+      if (subscriber === source) {
+        subscriber.onFunctionCall(item);
+      } else {
+        subscriber.onExternalFunctionCall(source, item);
+      }
+    }
+  }
+  deliverModelMessage(source, item) {
+    for (const subscriber of this.subscribers) {
+      if (subscriber === source) {
+        subscriber.onModelMessage(item);
+      } else {
+        subscriber.onExternalModelMessage(source, item);
+      }
+    }
   }
-  unsubscribe(user) {
-    this.subscribers = this.subscribers.filter((p) => p !== user);
+  deliverReasoning(source, item) {
+    for (const subscriber of this.subscribers) {
+      if (subscriber === source) {
+        subscriber.onReasoning(item);
+      } else {
+        subscriber.onExternalReasoning(source, item);
+      }
+    }
   }
-  deliverContextItem(source, item) {
+  deliverFunctionCallOutput(source, item) {
     for (const subscriber of this.subscribers) {
-      subscriber.onContextItem(source, item);
+      if (subscriber === source) {
+        subscriber.onFunctionCallOutput(item);
+      } else {
+        subscriber.onExternalFunctionCallOutput(source, item);
+      }
+    }
+  }
+  deliverMessage(source, message) {
+    for (const subscriber of this.subscribers) {
+      if (subscriber === source) continue;
+      subscriber.onMessage(message);
     }
   }
   async start() {
@@ -7342,6 +7370,67 @@ var AgenticEnvironment = class {
   }
 };
 
+// ../baro-orchestrator/src/bus.ts
+var BusEvent = class {
+  toJSON() {
+    const out = { type: this.type };
+    for (const [key, value] of Object.entries(this)) {
+      if (key !== "type") out[key] = value;
+    }
+    return out;
+  }
+};
+var BaroEnvironment = class extends AgenticEnvironment {
+  /**
+   * Self-emitted: the `source` participant receives `onBusEvent`.
+   * Every other subscriber receives `onExternalBusEvent`. Mirrors
+   * Mozaik's symmetry for built-in delivery methods. Subscribers
+   * that aren't `BaroParticipant` instances are silently skipped.
+   */
+  deliverBusEvent(source, event) {
+    for (const subscriber of this.subscribers) {
+      const sub = subscriber;
+      if (subscriber === source) {
+        void sub.onBusEvent?.(event);
+      } else {
+        void sub.onExternalBusEvent?.(source, event);
+      }
+    }
+  }
+};
+var BaroParticipant = class extends Participant {
+  onJoined() {
+  }
+  onLeft() {
+  }
+  onParticipantJoined(_p) {
+  }
+  onParticipantLeft(_p) {
+  }
+  onFunctionCall(_item) {
+  }
+  onExternalFunctionCall(_s, _item) {
+  }
+  onFunctionCallOutput(_item) {
+  }
+  onExternalFunctionCallOutput(_s, _item) {
+  }
+  onReasoning(_item) {
+  }
+  onExternalReasoning(_s, _item) {
+  }
+  onModelMessage(_item) {
+  }
+  onExternalModelMessage(_s, _item) {
+  }
+  onMessage(_message) {
+  }
+  onBusEvent(_event) {
+  }
+  onExternalBusEvent(_source, _event) {
+  }
+};
+
 // ../baro-orchestrator/src/git.ts
 import { execFile } from "child_process";
 import { promisify } from "util";
@@ -7608,7 +7697,7 @@ import { appendFileSync, mkdirSync } from "fs";
 import { dirname } from "path";
 
 // ../baro-orchestrator/src/types.ts
-var KnowledgeItem = class extends ContextItem {
+var KnowledgeItem = class extends BusEvent {
   constructor(sourceAgentId, tags, summary, content, tool) {
     super();
     this.sourceAgentId = sourceAgentId;
@@ -7629,7 +7718,7 @@ var KnowledgeItem = class extends ContextItem {
     };
   }
 };
-var ReplanItem = class extends ContextItem {
+var ReplanItem = class extends BusEvent {
   constructor(source, reason, addedStories = [], removedStoryIds = [], modifiedDeps = /* @__PURE__ */ new Map()) {
     super();
     this.source = source;
@@ -7650,7 +7739,7 @@ var ReplanItem = class extends ContextItem {
     };
   }
 };
-var CoordinationItem = class extends ContextItem {
+var CoordinationItem = class extends BusEvent {
   constructor(fromAgentId, recipientId, kind, reason, payload = {}) {
     super();
     this.fromAgentId = fromAgentId;
@@ -7671,7 +7760,7 @@ var CoordinationItem = class extends ContextItem {
     };
   }
 };
-var AgentTargetedMessageItem = class extends ContextItem {
+var AgentTargetedMessageItem = class extends BusEvent {
   constructor(recipientId, text, metadata = {}) {
     super();
     this.recipientId = recipientId;
@@ -7688,7 +7777,7 @@ var AgentTargetedMessageItem = class extends ContextItem {
     };
   }
 };
-var AgentStateItem = class extends ContextItem {
+var AgentStateItem = class extends BusEvent {
   constructor(agentId, phase, detail) {
     super();
     this.agentId = agentId;
@@ -7705,7 +7794,22 @@ var AgentStateItem = class extends ContextItem {
     };
   }
 };
-var ClaudeSystemItem = class extends ContextItem {
+var AgentUserMessageItem = class extends BusEvent {
+  constructor(agentId, text) {
+    super();
+    this.agentId = agentId;
+    this.text = text;
+  }
+  type = "agent_user_message";
+  toJSON() {
+    return {
+      type: this.type,
+      agentId: this.agentId,
+      text: this.text
+    };
+  }
+};
+var ClaudeSystemItem = class extends BusEvent {
   constructor(agentId, subtype, raw) {
     super();
     this.agentId = agentId;
@@ -7722,7 +7826,7 @@ var ClaudeSystemItem = class extends ContextItem {
     };
   }
 };
-var ClaudeResultItem = class extends ContextItem {
+var ClaudeResultItem = class extends BusEvent {
   constructor(agentId, subtype, sessionId, isError, resultText, usage, totalCostUsd, numTurns, durationMs, raw) {
     super();
     this.agentId = agentId;
@@ -7752,7 +7856,7 @@ var ClaudeResultItem = class extends ContextItem {
     };
   }
 };
-var ClaudeStreamChunkItem = class extends ContextItem {
+var ClaudeStreamChunkItem = class extends BusEvent {
   constructor(agentId, raw) {
     super();
     this.agentId = agentId;
@@ -7767,7 +7871,7 @@ var ClaudeStreamChunkItem = class extends ContextItem {
     };
   }
 };
-var ClaudeRateLimitItem = class extends ContextItem {
+var ClaudeRateLimitItem = class extends BusEvent {
   constructor(agentId, raw) {
     super();
     this.agentId = agentId;
@@ -7782,7 +7886,7 @@ var ClaudeRateLimitItem = class extends ContextItem {
     };
   }
 };
-var CritiqueItem = class extends ContextItem {
+var CritiqueItem = class extends BusEvent {
   constructor(agentId, verdict, reasoning, violatedCriteria, turn, modelUsed) {
     super();
     this.agentId = agentId;
@@ -7805,7 +7909,7 @@ var CritiqueItem = class extends ContextItem {
     };
   }
 };
-var ClaudeUnknownEventItem = class extends ContextItem {
+var ClaudeUnknownEventItem = class extends BusEvent {
   constructor(agentId, claudeType, raw) {
     super();
     this.agentId = agentId;
@@ -7822,7 +7926,7 @@ var ClaudeUnknownEventItem = class extends ContextItem {
     };
   }
 };
-var RunStartRequestItem = class extends ContextItem {
+var RunStartRequestItem = class extends BusEvent {
   constructor(reason = "user request") {
     super();
     this.reason = reason;
@@ -7832,7 +7936,7 @@ var RunStartRequestItem = class extends ContextItem {
     return { type: this.type, reason: this.reason };
   }
 };
-var RunStartedItem = class extends ContextItem {
+var RunStartedItem = class extends BusEvent {
   constructor(project, storyCount) {
     super();
     this.project = project;
@@ -7843,7 +7947,7 @@ var RunStartedItem = class extends ContextItem {
     return { type: this.type, project: this.project, storyCount: this.storyCount };
   }
 };
-var LevelComputeRequestItem = class extends ContextItem {
+var LevelComputeRequestItem = class extends BusEvent {
   constructor(reason) {
     super();
     this.reason = reason;
@@ -7853,7 +7957,7 @@ var LevelComputeRequestItem = class extends ContextItem {
     return { type: this.type, reason: this.reason };
   }
 };
-var LevelStartedItem = class extends ContextItem {
+var LevelStartedItem = class extends BusEvent {
   constructor(ordinal, totalLevelsHint, storyIds) {
     super();
     this.ordinal = ordinal;
@@ -7870,7 +7974,7 @@ var LevelStartedItem = class extends ContextItem {
     };
   }
 };
-var LevelCompletedItem = class extends ContextItem {
+var LevelCompletedItem = class extends BusEvent {
   constructor(ordinal, passed, failed) {
     super();
     this.ordinal = ordinal;
@@ -7887,7 +7991,7 @@ var LevelCompletedItem = class extends ContextItem {
     };
   }
 };
-var StorySpawnRequestItem = class extends ContextItem {
+var StorySpawnRequestItem = class extends BusEvent {
   constructor(storyId, prompt, model, retries, timeoutSecs) {
     super();
     this.storyId = storyId;
@@ -7908,7 +8012,7 @@ var StorySpawnRequestItem = class extends ContextItem {
     };
   }
 };
-var StorySpawnedItem = class extends ContextItem {
+var StorySpawnedItem = class extends BusEvent {
   constructor(storyId) {
     super();
     this.storyId = storyId;
@@ -7918,7 +8022,7 @@ var StorySpawnedItem = class extends ContextItem {
     return { type: this.type, storyId: this.storyId };
   }
 };
-var FinalizeStartedItem = class extends ContextItem {
+var FinalizeStartedItem = class extends BusEvent {
   constructor(branch) {
     super();
     this.branch = branch;
@@ -7928,7 +8032,7 @@ var FinalizeStartedItem = class extends ContextItem {
     return { type: this.type, branch: this.branch };
   }
 };
-var PrCreatedItem = class extends ContextItem {
+var PrCreatedItem = class extends BusEvent {
   constructor(url, branch, baseBranch) {
     super();
     this.url = url;
@@ -7945,7 +8049,7 @@ var PrCreatedItem = class extends ContextItem {
     };
   }
 };
-var RunCompletedItem = class extends ContextItem {
+var RunCompletedItem = class extends BusEvent {
   constructor(success, completedStories, failedStories, totalDurationSecs, totalAttempts, abortReason = null) {
     super();
     this.success = success;
@@ -7970,14 +8074,14 @@ var RunCompletedItem = class extends ContextItem {
 };
 
 // ../baro-orchestrator/src/participants/auditor.ts
-var Auditor = class extends Participant {
+var Auditor = class extends BaroParticipant {
   path;
   skipStreamChunks;
   filter;
   /**
    * Flips to true the first time a write fails (e.g. EACCES because
    * `~/.baro/runs/` is root-owned from a sudo install). Once disabled,
-   * subsequent items are dropped silently — losing the audit log is
+   * subsequent events are dropped silently — losing the audit log is
    * better than crashing the orchestrator on every bus event.
    */
   disabled = false;
@@ -7992,14 +8096,25 @@ var Auditor = class extends Participant {
       this.disable(`mkdir failed: ${e?.message ?? String(e)}`);
     }
   }
-  async onContextItem(source, item) {
+  async onExternalBusEvent(source, event) {
+    this.write(source, event);
+  }
+  async onExternalModelMessage(source, item) {
+    this.write(source, item);
+  }
+  async onExternalFunctionCall(source, item) {
+    this.write(source, item);
+  }
+  async onExternalFunctionCallOutput(source, item) {
+    this.write(source, item);
+  }
+  async onExternalReasoning(source, item) {
+    this.write(source, item);
+  }
+  write(source, item) {
     if (this.disabled) return;
-    if (this.skipStreamChunks && item instanceof ClaudeStreamChunkItem) {
-      return;
-    }
-    if (this.filter && !this.filter(source, item)) {
-      return;
-    }
+    if (this.skipStreamChunks && item instanceof ClaudeStreamChunkItem) return;
+    if (this.filter && !this.filter(source, item)) return;
     const entry = {
       ts: (/* @__PURE__ */ new Date()).toISOString(),
       source: this.sourceLabel(source),
@@ -8171,7 +8286,7 @@ function mapClaudeEvent(agentId, event) {
     case "user": {
       const content = event?.message?.content;
       if (typeof content === "string") {
-        items.push(UserMessageItem.create(content));
+        items.push(new AgentUserMessageItem(agentId, content));
       } else if (Array.isArray(content)) {
         for (const block of content) {
           if (block && typeof block === "object" && block.type === "tool_result") {
@@ -8244,7 +8359,7 @@ function stringifyToolResultContent(content) {
 }
 
 // ../baro-orchestrator/src/participants/claude-cli-participant.ts
-var ClaudeCliParticipant = class _ClaudeCliParticipant extends Participant {
+var ClaudeCliParticipant = class _ClaudeCliParticipant extends BaroParticipant {
   constructor(agentId, opts) {
     super();
     this.agentId = agentId;
@@ -8376,11 +8491,10 @@ var ClaudeCliParticipant = class _ClaudeCliParticipant extends Participant {
     this.transition("aborted");
     this.proc?.kill(signal);
   }
-  async onContextItem(source, item) {
-    if (source === this) return;
-    if (item instanceof AgentTargetedMessageItem && item.recipientId === this.agentId) {
+  async onExternalBusEvent(_source, event) {
+    if (event instanceof AgentTargetedMessageItem && event.recipientId === this.agentId) {
       if (!this.proc?.stdin) return;
-      this.sendUserMessage(item.text);
+      this.sendUserMessage(event.text);
     }
   }
   buildArgs() {
@@ -8451,23 +8565,44 @@ var ClaudeCliParticipant = class _ClaudeCliParticipant extends Participant {
         this.lastResult = item;
         this.transition(item.isError ? "failed" : "done", `result:${item.subtype}`);
       }
-      this.envRef?.deliverContextItem(this, item);
+      this.dispatch(item);
+    }
+  }
+  /**
+   * Route a mapped stream-json item to the right Mozaik 3.9 delivery
+   * channel. Assistant-side LLM items get their dedicated typed
+   * channels so future Mozaik-native participants can listen
+   * idiomatically; everything else (user-side messages, system frames,
+   * result frames, custom Claude wrappers) rides our `BusEvent` bus.
+   */
+  dispatch(item) {
+    if (!this.envRef) return;
+    if (item instanceof ModelMessageItem) {
+      this.envRef.deliverModelMessage(this, item);
+      return;
+    }
+    if (item instanceof FunctionCallItem) {
+      this.envRef.deliverFunctionCall(this, item);
+      return;
     }
+    if (item instanceof FunctionCallOutputItem) {
+      this.envRef.deliverFunctionCallOutput(this, item);
+      return;
+    }
+    this.envRef.deliverBusEvent(this, item);
   }
   transition(next, detail) {
     if (next === this.currentPhase) return;
     this.currentPhase = next;
-    if (this.envRef) {
-      this.envRef.deliverContextItem(
-        this,
-        new AgentStateItem(this.agentId, next, detail)
-      );
-    }
+    this.envRef?.deliverBusEvent(
+      this,
+      new AgentStateItem(this.agentId, next, detail)
+    );
   }
 };
 
 // ../baro-orchestrator/src/participants/story-agent.ts
-var StoryResultItem = class extends ContextItem {
+var StoryResultItem = class extends BusEvent {
   constructor(storyId, success, attempts, durationSecs, error) {
     super();
     this.storyId = storyId;
@@ -8488,7 +8623,7 @@ var StoryResultItem = class extends ContextItem {
     };
   }
 };
-var StoryAgent = class extends Participant {
+var StoryAgent = class extends BaroParticipant {
   spec;
   envRef = null;
   currentClaude = null;
@@ -8556,12 +8691,11 @@ var StoryAgent = class extends Participant {
    * StoryAgent is the sole owner of AgentTargetedMessageItem → stdin
    * forwarding. ClaudeCliParticipant.onContextItem does NOT do this.
    */
-  async onContextItem(source, item) {
-    if (source === this) return;
-    if (item instanceof AgentTargetedMessageItem && item.recipientId === this.spec.id) {
+  async onExternalBusEvent(_source, event) {
+    if (event instanceof AgentTargetedMessageItem && event.recipientId === this.spec.id) {
       this.notifyStoryMessage?.();
     }
-    if (item instanceof ClaudeResultItem && item.agentId === this.spec.id) {
+    if (event instanceof ClaudeResultItem && event.agentId === this.spec.id) {
       this.notifyStoryResult?.();
     }
   }
@@ -8736,7 +8870,7 @@ var StoryAgent = class extends Participant {
   }
   emitStoryResult(success, attempts, durationSecs, error) {
     if (!this.envRef) return;
-    this.envRef.deliverContextItem(
+    this.envRef.deliverBusEvent(
       this,
       new StoryResultItem(this.spec.id, success, attempts, durationSecs, error)
     );
@@ -8745,7 +8879,7 @@ var StoryAgent = class extends Participant {
     if (next === this.currentPhase) return;
     this.currentPhase = next;
     if (this.envRef) {
-      this.envRef.deliverContextItem(
+      this.envRef.deliverBusEvent(
         this,
         new AgentStateItem(this.spec.id, next, detail)
       );
@@ -8760,7 +8894,7 @@ function raceWithTimeout(p, ms, label) {
 }
 
 // ../baro-orchestrator/src/participants/conductor.ts
-var ConductorStateItem = class extends ContextItem {
+var ConductorStateItem = class extends BusEvent {
   constructor(phase, detail, currentLevel, totalLevels, storyIds) {
     super();
     this.phase = phase;
@@ -8781,7 +8915,7 @@ var ConductorStateItem = class extends ContextItem {
     };
   }
 };
-var Conductor = class extends Participant {
+var Conductor = class extends BaroParticipant {
   opts;
   envRef = null;
   phase = "idle";
@@ -8839,14 +8973,21 @@ var Conductor = class extends Participant {
   /**
    * Single entry point. All state transitions happen here.
    *
-   * Note: the Mozaik bus delivers items to every subscriber, INCLUDING
-   * the source. We rely on this — the Conductor self-ticks via
-   * LevelComputeRequestItem, so blocking self-delivery would break the
-   * state machine. Per-item type guards distinguish "from outside"
-   * (RunStartRequestItem from Operator, ReplanItem from Surgeon,
-   * StoryResultItem from StoryAgent) from "from self" (LevelCompute).
-   */
-  async onContextItem(_source, item) {
+   * Note: the Conductor self-ticks via LevelComputeRequestItem, so it
+   * MUST receive its own emissions. Mozaik 3.9 splits self vs external
+   * delivery — we route both through the same handler so the state
+   * machine sees every event regardless of source. Per-event type
+   * guards distinguish "from outside" (RunStartRequestItem from
+   * Operator, ReplanItem from Surgeon, StoryResultItem from StoryAgent)
+   * from "from self" (LevelCompute).
+   */
+  async onBusEvent(event) {
+    await this.handle(event);
+  }
+  async onExternalBusEvent(_source, event) {
+    await this.handle(event);
+  }
+  async handle(item) {
     if (item instanceof RunStartRequestItem) {
       await this.handleRunStart();
       return;
@@ -9151,8 +9292,8 @@ ${prompt}`;
     }
     return prompt;
   }
-  emit(item) {
-    this.envRef?.deliverContextItem(this, item);
+  emit(event) {
+    this.envRef?.deliverBusEvent(this, event);
   }
 };
 function applyReplan(prd, replan) {
@@ -9222,7 +9363,7 @@ Rules:
 - "violated_criteria" must list the exact criterion strings that are NOT satisfied.
 - If ALL criteria pass, "violated_criteria" must be an empty array.
 - Do NOT include any text outside the JSON object.`;
-var Critic = class extends Participant {
+var Critic = class extends BaroParticipant {
   opts;
   /** agentId → number of AgentTargetedMessageItem-s emitted so far. */
   emissions = /* @__PURE__ */ new Map();
@@ -9249,20 +9390,20 @@ var Critic = class extends Participant {
   async idle() {
     await Promise.allSettled([...this.pending]);
   }
-  async onContextItem(_source, item) {
-    if (!(item instanceof ClaudeResultItem)) return;
-    if (item.isError || !item.resultText) return;
-    const criteria = this.opts.targets.get(item.agentId);
+  async onExternalBusEvent(_source, event) {
+    if (!(event instanceof ClaudeResultItem)) return;
+    if (event.isError || !event.resultText) return;
+    const criteria = this.opts.targets.get(event.agentId);
     if (!criteria || criteria.length === 0) return;
-    const turn = (this.turnCount.get(item.agentId) ?? 0) + 1;
-    this.turnCount.set(item.agentId, turn);
+    const turn = (this.turnCount.get(event.agentId) ?? 0) + 1;
+    this.turnCount.set(event.agentId, turn);
     const work = (async () => {
       const { verdict, reasoning, violatedCriteria } = await this.evaluate(
-        item.resultText,
+        event.resultText,
         criteria
       );
       const critiqueItem = new CritiqueItem(
-        item.agentId,
+        event.agentId,
         verdict,
         reasoning,
         violatedCriteria,
@@ -9270,20 +9411,22 @@ var Critic = class extends Participant {
         this.opts.model
       );
       for (const env of this.getEnvironments()) {
-        env.deliverContextItem(this, critiqueItem);
+        ;
+        env.deliverBusEvent(this, critiqueItem);
       }
       if (verdict === "fail") {
-        const emitted = this.emissions.get(item.agentId) ?? 0;
+        const emitted = this.emissions.get(event.agentId) ?? 0;
         if (emitted < this.opts.maxEmissionsPerAgent) {
-          this.emissions.set(item.agentId, emitted + 1);
+          this.emissions.set(event.agentId, emitted + 1);
           const text = buildCorrectiveMessage(reasoning, violatedCriteria);
           const msg = new AgentTargetedMessageItem(
-            item.agentId,
+            event.agentId,
             text,
             { criticTurn: turn, emissionIndex: emitted + 1 }
           );
           for (const env of this.getEnvironments()) {
-            env.deliverContextItem(this, msg);
+            ;
+            env.deliverBusEvent(this, msg);
           }
         }
       }
@@ -9394,7 +9537,7 @@ function extractVerdictJson(text) {
 import { execFile as execFile3 } from "child_process";
 import { promisify as promisify3 } from "util";
 var execFileAsync2 = promisify3(execFile3);
-var Finalizer = class extends Participant {
+var Finalizer = class extends BaroParticipant {
   opts;
   envRef = null;
   startedAtMs = null;
@@ -9428,7 +9571,7 @@ var Finalizer = class extends Participant {
   setEnvironment(env) {
     this.envRef = env;
   }
-  async onContextItem(_source, item) {
+  async onExternalBusEvent(_source, item) {
     if (item instanceof RunStartedItem) {
       this.startedAtMs = Date.now();
       if (this.baseSha == null) {
@@ -9561,8 +9704,8 @@ var Finalizer = class extends Participant {
     this.emit(new PrCreatedItem(url, branch, baseBranch));
   }
   // ─── Bus & env helpers ──────────────────────────────────────────
-  emit(item) {
-    this.envRef?.deliverContextItem(this, item);
+  emit(event) {
+    this.envRef?.deliverBusEvent(this, event);
   }
   log(line) {
     this.opts.onLog?.(line);
@@ -9844,7 +9987,7 @@ var EXPLORATION_TOOLS = /* @__PURE__ */ new Set([
   "WebSearch"
 ]);
 var BROADCAST_TOOLS = /* @__PURE__ */ new Set(["Read", "Grep", "Glob", "LSP"]);
-var Librarian = class extends Participant {
+var Librarian = class extends BaroParticipant {
   opts;
   pending = /* @__PURE__ */ new Map();
   knowledge = [];
@@ -9907,26 +10050,23 @@ var Librarian = class extends Participant {
       ...lines
     ].join("\n");
   }
-  async onContextItem(source, item) {
-    if (item instanceof FunctionCallItem) {
-      this.recordPending(source, item);
-      return;
-    }
-    if (item instanceof FunctionCallOutputItem) {
-      this.completeWithOutput(source, item);
-      return;
-    }
-    if (item instanceof StorySpawnRequestItem) {
-      this.storyHints.set(item.storyId, tokenizeHints(item.prompt));
+  async onExternalFunctionCall(source, item) {
+    this.recordPending(source, item);
+  }
+  async onExternalFunctionCallOutput(source, item) {
+    this.completeWithOutput(source, item);
+  }
+  async onExternalBusEvent(_source, event) {
+    if (event instanceof StorySpawnRequestItem) {
+      this.storyHints.set(event.storyId, tokenizeHints(event.prompt));
       return;
     }
-    if (item instanceof StorySpawnedItem) {
-      this.inFlight.add(item.storyId);
+    if (event instanceof StorySpawnedItem) {
+      this.inFlight.add(event.storyId);
       return;
     }
-    if (item instanceof StoryResultItem) {
-      this.inFlight.delete(item.storyId);
-      return;
+    if (event instanceof StoryResultItem) {
+      this.inFlight.delete(event.storyId);
     }
   }
   recordPending(source, item) {
@@ -9963,7 +10103,7 @@ var Librarian = class extends Participant {
     };
     this.knowledge.push(entry);
     for (const env of this.getEnvironments()) {
-      env.deliverContextItem(
+      env.deliverBusEvent(
         this,
         new KnowledgeItem(
           entry.sourceAgentId,
@@ -10009,7 +10149,7 @@ var Librarian = class extends Participant {
       if (already + bytes > this.opts.maxBroadcastBytesPerStory) continue;
       this.broadcastBytes.set(recipientId, already + bytes);
       for (const env of envs) {
-        env.deliverContextItem(
+        env.deliverBusEvent(
           this,
           new AgentTargetedMessageItem(recipientId, text, {
             source: "librarian",
@@ -10076,7 +10216,7 @@ function tokenizeHints(prompt) {
 }
 
 // ../baro-orchestrator/src/participants/operator.ts
-var Operator = class extends Participant {
+var Operator = class extends BaroParticipant {
   constructor(hooks = {}) {
     super();
     this.hooks = hooks;
@@ -10085,8 +10225,9 @@ var Operator = class extends Participant {
   setEnvironment(env) {
     this.envRef = env;
   }
-  async onContextItem() {
-  }
+  // Operator is push-only: it emits in response to external commands,
+  // never reacts to bus events. Default BaroParticipant no-op handlers
+  // cover everything.
   /** Translate an external command into bus action / hook callback. */
   dispatch(cmd) {
     switch (cmd.kind) {
@@ -10112,14 +10253,14 @@ var Operator = class extends Participant {
       }
     }
   }
-  emit(item) {
-    this.envRef?.deliverContextItem(this, item);
+  emit(event) {
+    this.envRef?.deliverBusEvent(this, event);
   }
 };
 
 // ../baro-orchestrator/src/participants/sentry.ts
 var WRITE_TOOLS = /* @__PURE__ */ new Set(["Edit", "Write", "MultiEdit", "NotebookEdit"]);
-var Sentry = class extends Participant {
+var Sentry = class extends BaroParticipant {
   opts;
   /** path → set of agentIds that have touched it. */
   touchedBy = /* @__PURE__ */ new Map();
@@ -10139,53 +10280,50 @@ var Sentry = class extends Participant {
   getTouches() {
     return this.touches;
   }
-  async onContextItem(source, item) {
-    if (item instanceof AgentStateItem) {
-      if (item.phase === "done" || item.phase === "failed" || item.phase === "aborted") {
-        this.terminalPhase.set(item.agentId, item.phase);
+  async onExternalBusEvent(_source, event) {
+    if (event instanceof AgentStateItem) {
+      if (event.phase === "done" || event.phase === "failed" || event.phase === "aborted") {
+        this.terminalPhase.set(event.agentId, event.phase);
       }
-      return;
     }
-    if (item instanceof FunctionCallItem) {
-      if (!WRITE_TOOLS.has(item.name)) return;
-      const agentId = source.agentId;
-      if (typeof agentId !== "string") return;
-      const path2 = extractPath(item);
-      if (!path2) return;
-      const touch = {
-        agentId,
-        path: path2,
-        tool: item.name,
-        at: Date.now()
-      };
-      this.touches.push(touch);
-      const set = this.touchedBy.get(path2) ?? /* @__PURE__ */ new Set();
-      set.add(agentId);
-      this.touchedBy.set(path2, set);
-      const otherAgents = [...set].filter((a) => a !== agentId);
-      if (otherAgents.length === 0) return;
-      this.opts.onOverlap?.({
-        path: path2,
-        agents: [agentId, ...otherAgents]
-      });
-      if (!this.opts.emitNotice || this.noticedPaths.has(path2)) {
-        return;
-      }
-      this.noticedPaths.add(path2);
-      const reason = `agents [${[agentId, ...otherAgents].join(", ")}] both touched ${path2}`;
-      for (const env of this.getEnvironments()) {
-        env.deliverContextItem(
-          this,
-          new CoordinationItem(
-            agentId,
-            otherAgents[0],
-            "notice",
-            reason,
-            { path: path2, agents: [agentId, ...otherAgents] }
-          )
-        );
-      }
-      return;
+  }
+  async onExternalFunctionCall(source, item) {
+    if (!WRITE_TOOLS.has(item.name)) return;
+    const agentId = source.agentId;
+    if (typeof agentId !== "string") return;
+    const path2 = extractPath(item);
+    if (!path2) return;
+    const touch = {
+      agentId,
+      path: path2,
+      tool: item.name,
+      at: Date.now()
+    };
+    this.touches.push(touch);
+    const set = this.touchedBy.get(path2) ?? /* @__PURE__ */ new Set();
+    set.add(agentId);
+    this.touchedBy.set(path2, set);
+    const otherAgents = [...set].filter((a) => a !== agentId);
+    if (otherAgents.length === 0) return;
+    this.opts.onOverlap?.({
+      path: path2,
+      agents: [agentId, ...otherAgents]
+    });
+    if (!this.opts.emitNotice || this.noticedPaths.has(path2)) return;
+    this.noticedPaths.add(path2);
+    const reason = `agents [${[agentId, ...otherAgents].join(", ")}] both touched ${path2}`;
+    for (const env of this.getEnvironments()) {
+      ;
+      env.deliverBusEvent(
+        this,
+        new CoordinationItem(
+          agentId,
+          otherAgents[0],
+          "notice",
+          reason,
+          { path: path2, agents: [agentId, ...otherAgents] }
+        )
+      );
     }
   }
 };
@@ -10204,7 +10342,7 @@ function extractPath(item) {
 }
 
 // ../baro-orchestrator/src/participants/story-factory.ts
-var StoryFactory = class extends Participant {
+var StoryFactory = class extends BaroParticipant {
   constructor(opts) {
     super();
     this.opts = opts;
@@ -10214,17 +10352,16 @@ var StoryFactory = class extends Participant {
   setEnvironment(env) {
     this.envRef = env;
   }
-  async onContextItem(source, item) {
-    if (source === this) return;
-    if (item instanceof StorySpawnRequestItem) {
-      await this.spawn(item);
+  async onExternalBusEvent(_source, event) {
+    if (event instanceof StorySpawnRequestItem) {
+      await this.spawn(event);
       return;
     }
-    if (item instanceof StoryResultItem) {
-      const agent = this.active.get(item.storyId);
+    if (event instanceof StoryResultItem) {
+      const agent = this.active.get(event.storyId);
       if (agent && this.envRef) {
         agent.leave(this.envRef);
-        this.active.delete(item.storyId);
+        this.active.delete(event.storyId);
       }
     }
   }
@@ -10242,7 +10379,7 @@ var StoryFactory = class extends Participant {
     agent.join(this.envRef);
     this.active.set(req.storyId, agent);
     void agent.run(this.envRef);
-    this.envRef.deliverContextItem(this, new StorySpawnedItem(req.storyId));
+    this.envRef.deliverBusEvent(this, new StorySpawnedItem(req.storyId));
   }
 };
 
@@ -10302,7 +10439,7 @@ Rules:
   of a removed story to a replacement.
 - "abort" \u2192 empty added/removed/modifiedDeps arrays.
 - Output ONLY the JSON object, nothing else.`;
-var Surgeon = class extends Participant {
+var Surgeon = class extends BaroParticipant {
   opts;
   replansEmitted = 0;
   pending = /* @__PURE__ */ new Set();
@@ -10321,16 +10458,17 @@ var Surgeon = class extends Participant {
   async idle() {
     await Promise.allSettled([...this.pending]);
   }
-  async onContextItem(_source, item) {
-    if (!(item instanceof StoryResultItem)) return;
-    if (item.success) return;
+  async onExternalBusEvent(_source, event) {
+    if (!(event instanceof StoryResultItem)) return;
+    if (event.success) return;
     if (this.replansEmitted >= this.opts.maxReplans) return;
     const work = (async () => {
-      const replan = this.opts.useLlm ? await this.evaluateWithLlm(item) : this.evaluateDeterministic(item);
+      const replan = this.opts.useLlm ? await this.evaluateWithLlm(event) : this.evaluateDeterministic(event);
       if (!replan) return;
       this.replansEmitted += 1;
       for (const env of this.getEnvironments()) {
-        env.deliverContextItem(this, replan);
+        ;
+        env.deliverBusEvent(this, replan);
       }
     })();
     this.pending.add(work);
@@ -10464,8 +10602,14 @@ function emit(event) {
 
 // ../baro-orchestrator/src/orchestrate.ts
 async function orchestrate(config) {
-  const env = new AgenticEnvironment();
+  const env = new BaroEnvironment();
   const emitTui = config.emitTuiEvents ?? true;
+  const llm = config.llm ?? "claude";
+  if (llm === "openai") {
+    process.stderr.write(
+      "[orchestrate] llm=openai requested \u2014 no native OpenAI siblings wired yet, falling through to Claude CLI flow. Coming in 0.29+.\n"
+    );
+  }
   if (config.auditLogPath) {
     mkdirSync2(dirname2(config.auditLogPath), { recursive: true });
     new Auditor({ path: config.auditLogPath }).join(env);
@@ -10608,7 +10752,7 @@ async function orchestrate(config) {
     );
     emit({ type: "dag", levels: dagLevels });
   }
-  env.deliverContextItem(operator, new RunStartRequestItem("orchestrate"));
+  env.deliverBusEvent(operator, new RunStartRequestItem("orchestrate"));
   const summary = await conductor.done;
   if (critic) await critic.idle();
   if (surgeon) await surgeon.idle();
@@ -10641,59 +10785,56 @@ async function orchestrate(config) {
     storyAgents: /* @__PURE__ */ new Map()
   };
 }
-var BaroEventForwarder = class extends Participant {
+var BaroEventForwarder = class extends BaroParticipant {
   /** Story IDs that have already received a `story_start`. */
   startedStories = /* @__PURE__ */ new Set();
   /** Number of in-flight retry attempts per story (for `story_retry`). */
   retryCounts = /* @__PURE__ */ new Map();
   /** Token-usage tally per story (incrementally updated from results). */
   tokensByStory = /* @__PURE__ */ new Map();
-  async onContextItem(source, item) {
-    if (item instanceof ConductorStateItem) {
-      this.handleConductorState(item);
-      return;
-    }
-    if (item instanceof StoryResultItem) {
-      this.handleStoryResult(item);
+  async onExternalModelMessage(source, item) {
+    this.handleModelMessage(source, item);
+  }
+  async onExternalFunctionCall(source, item) {
+    this.handleToolCall(source, item);
+  }
+  async onExternalFunctionCallOutput(source, item) {
+    this.handleToolResult(source, item);
+  }
+  async onExternalBusEvent(_source, event) {
+    if (event instanceof ConductorStateItem) {
+      this.handleConductorState(event);
       return;
     }
-    if (item instanceof ClaudeResultItem) {
-      this.handleClaudeResult(item);
+    if (event instanceof StoryResultItem) {
+      this.handleStoryResult(event);
       return;
     }
-    if (item instanceof AgentStateItem) {
-      this.handleAgentState(item);
+    if (event instanceof ClaudeResultItem) {
+      this.handleClaudeResult(event);
       return;
     }
-    if (item instanceof ClaudeSystemItem) {
+    if (event instanceof AgentStateItem) {
+      this.handleAgentState(event);
       return;
     }
-    if (item instanceof ModelMessageItem) {
-      this.handleModelMessage(source, item);
+    if (event instanceof ClaudeSystemItem) {
       return;
     }
-    if (item instanceof FunctionCallItem) {
-      this.handleToolCall(source, item);
+    if (event instanceof CoordinationItem) {
+      this.handleCoordination(event);
       return;
     }
-    if (item instanceof FunctionCallOutputItem) {
-      this.handleToolResult(source, item);
+    if (event instanceof CritiqueItem) {
+      this.handleCritique(event);
       return;
     }
-    if (item instanceof CoordinationItem) {
-      this.handleCoordination(item);
-      return;
-    }
-    if (item instanceof CritiqueItem) {
-      this.handleCritique(item);
-      return;
-    }
-    if (item instanceof FinalizeStartedItem) {
+    if (event instanceof FinalizeStartedItem) {
       emit({ type: "finalize_start" });
       return;
     }
-    if (item instanceof PrCreatedItem) {
-      emit({ type: "finalize_complete", pr_url: item.url });
+    if (event instanceof PrCreatedItem) {
+      emit({ type: "finalize_complete", pr_url: event.url });
       return;
     }
   }
@@ -10823,6 +10964,7 @@ function parseArgs(argv) {
     noSentry: false,
     withSurgeon: false,
     surgeonUseLlm: false,
+    llm: "claude",
     help: false
   };
   for (let i = 0; i < argv.length; i++) {
@@ -10883,6 +11025,16 @@ function parseArgs(argv) {
           10
         );
         break;
+      case "--llm": {
+        const v = required(argv, ++i, "--llm");
+        if (v !== "claude" && v !== "openai") {
+          process.stderr.write(`[cli] --llm must be 'claude' or 'openai', got '${v}'
+`);
+          process.exit(2);
+        }
+        args.llm = v;
+        break;
+      }
       default:
         process.stderr.write(`[cli] unknown flag: ${a}
 `);
@@ -10960,10 +11112,16 @@ async function main() {
     withSurgeon: args.withSurgeon,
     surgeonUseLlm: args.surgeonUseLlm,
     surgeonModel: args.surgeonModel,
-    intraLevelDelaySecs: args.intraLevelDelaySecs
+    intraLevelDelaySecs: args.intraLevelDelaySecs,
+    llm: args.llm
   };
+  if (args.llm === "openai" && !process.env.OPENAI_API_KEY) {
+    process.stderr.write(
+      "[cli] WARNING: --llm openai requested but OPENAI_API_KEY is not set.\n[cli]          The current build falls through to Claude behaviour;\n[cli]          set OPENAI_API_KEY before phase 3+ OpenAI siblings ship.\n"
+    );
+  }
   process.stderr.write(
-    `[cli] starting orchestrator: prd=${prdPath} cwd=${cwd} parallel=${args.parallel} timeout=${args.timeout}s
+    `[cli] starting orchestrator: prd=${prdPath} cwd=${cwd} parallel=${args.parallel} timeout=${args.timeout}s llm=${args.llm}
 `
   );
   const startedAt = Date.now();