baro-ai 0.52.0 → 0.54.0

package/dist/cli.mjs

@@ -47302,19 +47302,74 @@ function raceWithTimeout4(p, ms, label) {
   ]);
 }
 
+// ../baro-orchestrator/src/participants/story-executor.ts
+var LocalStoryExecutor = class {
+  start(req, route, cwd, env, opts) {
+    const agent = route.backend === "pi" ? new PiStoryAgent({
+      id: req.storyId,
+      prompt: req.prompt,
+      cwd,
+      model: route.model,
+      retries: req.retries,
+      timeoutSecs: req.timeoutSecs
+    }) : route.backend === "opencode" ? new OpenCodeStoryAgent({
+      id: req.storyId,
+      prompt: req.prompt,
+      cwd,
+      model: route.model,
+      retries: req.retries,
+      timeoutSecs: req.timeoutSecs
+    }) : route.backend === "codex" ? new CodexStoryAgent({
+      id: req.storyId,
+      prompt: req.prompt,
+      cwd,
+      // undefined → let Codex pick its account default.
+      model: route.model,
+      retries: req.retries,
+      timeoutSecs: req.timeoutSecs
+    }) : route.backend === "openai" ? new OpenAIStoryAgent(
+      {
+        id: req.storyId,
+        prompt: req.prompt,
+        cwd,
+        model: route.model,
+        retries: req.retries,
+        timeoutSecs: req.timeoutSecs
+      },
+      {
+        model: route.model ?? opts.openaiModel,
+        baseUrl: route.baseUrl,
+        apiKey: route.apiKey
+      }
+    ) : new StoryAgent({
+      id: req.storyId,
+      prompt: req.prompt,
+      cwd,
+      // undefined → StoryAgent applies its own default.
+      model: route.model,
+      effort: opts.effort,
+      retries: req.retries,
+      timeoutSecs: req.timeoutSecs
+    });
+    agent.join(env);
+    void agent.run(env);
+    return { dispose: (e2) => agent.leave(e2) };
+  }
+};
+
 // ../baro-orchestrator/src/participants/story-factory.ts
 var StoryFactory = class extends BaseObserver {
   constructor(opts) {
     super();
     this.opts = opts;
+    this.executor = opts.executor ?? new LocalStoryExecutor();
   }
-  // Typed as BaroEnvironment because StoryAgent.run() / join() still
-  // expect the old environment type. Once StoryAgent migrates, this
-  // narrows to vanilla AgenticEnvironment.
+  /** The bus environment, wired in before any spawn; passed to the executor. */
   envRef = null;
   active = /* @__PURE__ */ new Map();
   /** Story ids whose spawn is in progress (closes the await-create window). */
   spawning = /* @__PURE__ */ new Set();
+  executor;
   setEnvironment(env) {
     this.envRef = env;
   }
@@ -47324,9 +47379,9 @@ var StoryFactory = class extends BaseObserver {
       return;
     }
     if (StoryResult.is(event)) {
-      const agent = this.active.get(event.data.storyId);
-      if (agent && this.envRef) {
-        agent.leave(this.envRef);
+      const exec3 = this.active.get(event.data.storyId);
+      if (exec3 && this.envRef) {
+        exec3.dispose(this.envRef);
         this.active.delete(event.data.storyId);
       }
     }
@@ -47355,55 +47410,11 @@ var StoryFactory = class extends BaseObserver {
       `[story-factory] ${req.storyId} \u2192 ${formatRoute(route)}` + (req.model ? ` (model="${req.model}")` : "") + "\n"
     );
     const storyCwd = this.opts.worktrees ? await this.opts.worktrees.create(req.storyId) ?? this.opts.cwd : this.opts.cwd;
-    const agent = route.backend === "pi" ? new PiStoryAgent({
-      id: req.storyId,
-      prompt: req.prompt,
-      cwd: storyCwd,
-      model: route.model,
-      retries: req.retries,
-      timeoutSecs: req.timeoutSecs
-    }) : route.backend === "opencode" ? new OpenCodeStoryAgent({
-      id: req.storyId,
-      prompt: req.prompt,
-      cwd: storyCwd,
-      model: route.model,
-      retries: req.retries,
-      timeoutSecs: req.timeoutSecs
-    }) : route.backend === "codex" ? new CodexStoryAgent({
-      id: req.storyId,
-      prompt: req.prompt,
-      cwd: storyCwd,
-      // undefined → let Codex pick its account default.
-      model: route.model,
-      retries: req.retries,
-      timeoutSecs: req.timeoutSecs
-    }) : route.backend === "openai" ? new OpenAIStoryAgent(
-      {
-        id: req.storyId,
-        prompt: req.prompt,
-        cwd: storyCwd,
-        model: route.model,
-        retries: req.retries,
-        timeoutSecs: req.timeoutSecs
-      },
-      {
-        model: route.model ?? this.opts.openaiModel,
-        baseUrl: route.baseUrl,
-        apiKey: route.apiKey
-      }
-    ) : new StoryAgent({
-      id: req.storyId,
-      prompt: req.prompt,
-      cwd: storyCwd,
-      // undefined → StoryAgent applies its own default.
-      model: route.model,
-      effort: this.opts.effort,
-      retries: req.retries,
-      timeoutSecs: req.timeoutSecs
+    const exec3 = this.executor.start(req, route, storyCwd, this.envRef, {
+      openaiModel: this.opts.openaiModel,
+      effort: this.opts.effort
     });
-    agent.join(this.envRef);
-    this.active.set(req.storyId, agent);
-    void agent.run(this.envRef);
+    this.active.set(req.storyId, exec3);
     this.envRef.deliverSemanticEvent(
       this,
       StorySpawned.create({ storyId: req.storyId })
@@ -48294,7 +48305,8 @@ async function orchestrate(config) {
     effort: config.effort,
     tierMap: config.tierMap,
     endpoints: config.openaiEndpoints,
-    defaultApiKey: process.env.OPENAI_API_KEY
+    defaultApiKey: process.env.OPENAI_API_KEY,
+    executor: config.executor
   });
   storyFactory.setEnvironment(env);
   storyFactory.join(env);