@bunny-agent/runner-cli 0.10.2 → 0.10.3-beta1

package/dist/bundle.mjs

@@ -39690,6 +39690,89 @@ function createOpenCodeRunner(options = {}) {
 // ../../packages/runner-pi/dist/live-control.js
 import { AsyncLocalStorage } from "node:async_hooks";
 import { randomBytes as randomBytes2 } from "node:crypto";
+import { createAssistantMessageEventStream as createAssistantMessageEventStream2 } from "@earendil-works/pi-ai";
+
+// ../../packages/runner-pi/dist/generation-stream.js
+import { createAssistantMessageEventStream } from "@earendil-works/pi-ai";
+function fenceGenerationStream(source, model, signal, onSettled) {
+  const target = createAssistantMessageEventStream();
+  let partial3;
+  let closed = false;
+  const close = () => {
+    closed = true;
+    signal.removeEventListener("abort", abort);
+    onSettled();
+  };
+  const finishFailure = (error109) => {
+    if (closed)
+      return;
+    const message = partial3 ? structuredClone(partial3) : {
+      role: "assistant",
+      content: [],
+      api: model.api,
+      provider: model.provider,
+      model: model.id,
+      timestamp: Date.now(),
+      stopReason: "aborted",
+      usage: {
+        input: 0,
+        output: 0,
+        cacheRead: 0,
+        cacheWrite: 0,
+        totalTokens: 0,
+        cost: {
+          input: 0,
+          output: 0,
+          cacheRead: 0,
+          cacheWrite: 0,
+          total: 0
+        }
+      }
+    };
+    message.stopReason = error109 === void 0 ? "aborted" : "error";
+    if (error109 === void 0)
+      delete message.errorMessage;
+    else
+      message.errorMessage = error109 instanceof Error ? error109.message : String(error109);
+    close();
+    target.push({ type: "error", reason: message.stopReason, error: message });
+    target.end();
+    source.end(message);
+  };
+  const abort = () => finishFailure();
+  signal.addEventListener("abort", abort, { once: true });
+  if (signal.aborted)
+    abort();
+  void (async () => {
+    try {
+      for await (const event of source) {
+        if (closed)
+          break;
+        if ("partial" in event)
+          partial3 = event.partial;
+        if (event.type === "done" || event.type === "error") {
+          close();
+          target.push(event);
+          target.end();
+          return;
+        }
+        target.push(event);
+      }
+      if (!closed) {
+        const message = await source.result();
+        if (closed)
+          return;
+        close();
+        target.end(message);
+      }
+    } catch (error109) {
+      finishFailure(error109);
+    }
+  })();
+  return target;
+}
+
+// ../../packages/runner-pi/dist/live-control.js
 function createPiLiveController(session, onFirstStreamInvocation) {
   const originalSteeringMode = session.agent.steeringMode;
   session.agent.steeringMode = "one-at-a-time";
@@ -39699,6 +39782,7 @@ function createPiLiveController(session, onFirstStreamInvocation) {
   let consumedCallback;
   let disposed = false;
   let firstStreamInvocationReported = false;
+  let activeGeneration;
   const reportIfConfirmed = (dispatch) => {
     if (!disposed && dispatch.outcome === "queued" && dispatch.captured.length === 1 && dispatch.observed && !dispatch.reported) {
       dispatch.reported = true;
@@ -39720,40 +39804,93 @@ function createPiLiveController(session, onFirstStreamInvocation) {
   session.agent.steer = installedAgentSteer;
   const originalStreamFunction = session.agent.streamFunction;
   const wrappedStreamFunction = (model, context, streamOptions) => {
+    const generation = new AbortController();
+    activeGeneration = generation;
+    const parentSignal = streamOptions?.signal;
+    const abortFromParent = () => generation.abort(parentSignal?.reason);
+    parentSignal?.addEventListener("abort", abortFromParent, { once: true });
+    if (parentSignal?.aborted)
+      abortFromParent();
+    const settle2 = () => {
+      parentSignal?.removeEventListener("abort", abortFromParent);
+      if (activeGeneration === generation)
+        activeGeneration = void 0;
+    };
     const observed = /* @__PURE__ */ new Set();
-    const sanitizedMessages = context.messages.map((candidate) => {
+    const sanitizedMessages = context.messages.flatMap((candidate) => {
+      if (candidate.role === "assistant" && candidate.stopReason === "aborted") {
+        const text = candidate.content.filter((part) => part.type === "text" && part.text.trim().length > 0);
+        return text.length ? [{ ...candidate, content: text, stopReason: "stop" }] : [];
+      }
       if (!Object.getOwnPropertyDescriptor(candidate, "__bunnyLiveControl"))
-        return candidate;
+        return [candidate];
       const { __bunnyLiveControl: marker, ...rest } = candidate;
       if (marker && marker.controllerNonce === controllerNonce && candidate.role === "user") {
         const dispatch = dispatches.get(marker.stableId);
         if (dispatch)
           observed.add(dispatch);
       }
-      return rest;
+      return [rest];
     });
     const providerContext = {
       ...context,
       messages: sanitizedMessages
     };
-    const result = originalStreamFunction.call(session.agent, model, providerContext, streamOptions);
-    return Promise.resolve(result).then((stream) => {
+    let result;
+    try {
+      result = originalStreamFunction.call(session.agent, model, providerContext, { ...streamOptions, signal: generation.signal });
+    } catch (error109) {
+      settle2();
+      throw error109;
+    }
+    let abortStartup;
+    const startupAborted = new Promise((resolve6) => {
+      abortStartup = () => resolve6(fenceGenerationStream(createAssistantMessageEventStream2(), model, generation.signal, settle2));
+      generation.signal.addEventListener("abort", abortStartup, {
+        once: true
+      });
+      if (generation.signal.aborted)
+        abortStartup();
+    });
+    const started = Promise.resolve(result).then((stream) => {
+      generation.signal.removeEventListener("abort", abortStartup);
+      if (generation.signal.aborted)
+        return fenceGenerationStream(stream, model, generation.signal, settle2);
       if (!disposed && !firstStreamInvocationReported) {
         firstStreamInvocationReported = true;
         onFirstStreamInvocation?.();
       }
-      for (const dispatch of observed) {
-        dispatch.observed = true;
-        reportIfConfirmed(dispatch);
+      if (!generation.signal.aborted) {
+        for (const dispatch of observed) {
+          dispatch.observed = true;
+          reportIfConfirmed(dispatch);
+        }
+        const waiting = [...dispatches.values()].filter((dispatch) => dispatch.outcome === "queued" && dispatch.captured.length === 1 && !dispatch.observed && !dispatch.preemptionRequested);
+        if (waiting.length) {
+          for (const dispatch of waiting)
+            dispatch.preemptionRequested = true;
+          generation.abort();
+        }
       }
-      return stream;
+      return fenceGenerationStream(stream, model, generation.signal, settle2);
+    }, (error109) => {
+      generation.signal.removeEventListener("abort", abortStartup);
+      settle2();
+      throw error109;
     });
+    return Promise.race([started, startupAborted]);
   };
   session.agent.streamFunction = wrappedStreamFunction;
   return {
+    supportedPiSteerPreempt: true,
     async steer(message) {
       if (disposed)
         return { disposition: "rejected", reason: "controller disposed" };
+      if (session.isStreaming === false)
+        return {
+          disposition: "rejected",
+          reason: "session is no longer running"
+        };
       if (dispatches.has(message.id)) {
         return {
           disposition: "rejected",
@@ -39764,7 +39901,8 @@ function createPiLiveController(session, onFirstStreamInvocation) {
         id: message.id,
         captured: [],
         observed: false,
-        reported: false
+        reported: false,
+        preemptionRequested: false
       };
       dispatches.set(message.id, dispatch);
       const images = message.images?.map((image) => ({
@@ -39785,6 +39923,10 @@ function createPiLiveController(session, onFirstStreamInvocation) {
       if (dispatch.outcome === "handled")
         return { disposition: "handled" };
       reportIfConfirmed(dispatch);
+      if (dispatch.captured.length === 1 && !dispatch.observed && activeGeneration) {
+        dispatch.preemptionRequested = true;
+        activeGeneration.abort();
+      }
       return { disposition: "queued" };
     },
     onConsumed(callback) {
@@ -41735,12 +41877,34 @@ function accumulateToolUsage(tally, raw) {
   }
 }
 function getUsageFromAgentEndMessages(messages) {
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const m = messages[i];
-    if (m.role === "assistant" && m.usage != null)
-      return m.usage;
+  let total;
+  for (const message of messages) {
+    if (message.role !== "assistant" || !message.usage)
+      continue;
+    const usage = message.usage;
+    if (!total) {
+      total = { ...usage, cost: { ...usage.cost } };
+      continue;
+    }
+    total.input += usage.input;
+    total.output += usage.output;
+    total.cacheRead += usage.cacheRead;
+    total.cacheWrite += usage.cacheWrite;
+    total.totalTokens += usage.totalTokens;
+    if (usage.reasoning !== void 0)
+      total.reasoning = (total.reasoning ?? 0) + usage.reasoning;
+    if (usage.cacheWrite1h !== void 0)
+      total.cacheWrite1h = (total.cacheWrite1h ?? 0) + usage.cacheWrite1h;
+    for (const key of [
+      "input",
+      "output",
+      "cacheRead",
+      "cacheWrite",
+      "total"
+    ])
+      total.cost[key] += usage.cost[key];
   }
-  return void 0;
+  return total;
 }
 
 // ../../packages/runner-pi/dist/stream-converter.js
@@ -45838,8 +46002,10 @@ function applyModelOverrides(model, provider, optionsEnv) {
 function getErrorFromAgentEndMessages(messages) {
   for (let i = messages.length - 1; i >= 0; i--) {
     const m = messages[i];
-    if (m.role === "assistant" && m.errorMessage) {
-      return m.errorMessage;
+    if (m.role === "assistant") {
+      if (m.stopReason === "aborted")
+        return m.errorMessage ?? "Generation interrupted before pending input could be consumed.";
+      return m.stopReason === "error" ? m.errorMessage : void 0;
     }
   }
   return void 0;
@@ -46063,6 +46229,7 @@ function createPiRunner(options = {}) {
         let promptSettled = false;
         let promptError;
         let finalAgentEnd;
+        const assistantCompletions = [];
         let aborted3 = false;
         let wakeConsumer = null;
         const notify = () => {
@@ -46129,6 +46296,8 @@ function createPiRunner(options = {}) {
                 finalAgentEnd = event;
                 continue;
               }
+              if (event.type === "message_end" && event.message.role === "assistant")
+                assistantCompletions.push(event.message);
               const chunks = streamConverter.handleEvent(event, aborted3);
               for (const chunk of chunks) {
                 yield chunk;
@@ -46157,7 +46326,10 @@ function createPiRunner(options = {}) {
             return;
           }
           if (finalAgentEnd) {
-            const chunks = streamConverter.handleEvent(finalAgentEnd, false);
+            const chunks = streamConverter.handleEvent({
+              ...finalAgentEnd,
+              messages: assistantCompletions.length ? assistantCompletions : finalAgentEnd.messages
+            }, false);
             for (const chunk of chunks) {
               yield chunk;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunny-agent/runner-cli",
-  "version": "0.10.2",
+  "version": "0.10.3-beta1",
   "description": "BunnyAgent Runner CLI - Like gemini-cli or claude-code, runs in your local terminal with AI SDK UI streaming",
   "type": "module",
   "bin": {
@@ -60,6 +60,7 @@
     "typescript": "^5.3.0",
     "vitest": "^1.6.1",
     "@bunny-agent/apply-patch": "0.1.0",
+    "@bunny-agent/manager": "0.10.3-beta1",
     "@bunny-agent/runner-claude": "0.6.2",
     "@bunny-agent/runner-codex": "0.6.2",
     "@bunny-agent/runner-copilot": "0.1.0",
@@ -67,7 +68,6 @@
     "@bunny-agent/runner-harness": "0.1.1-beta.0",
     "@bunny-agent/runner-opencode": "0.6.2",
     "@bunny-agent/runner-pi": "0.6.4-beta.0",
-    "@bunny-agent/manager": "0.10.2",
     "@bunny-agent/server-acp": "0.1.0"
   },
   "scripts": {