@sandagent/runner-cli 0.2.12 → 0.2.13

package/dist/bundle.mjs

@@ -131,8 +131,23 @@ CMD `);
 }
 
 // ../../packages/runner-claude/dist/ai-sdk-stream.js
-import { writeFile } from "node:fs/promises";
+import { appendFileSync, existsSync as existsSync2, unlinkSync } from "node:fs";
 import { join as join2 } from "node:path";
+function trace(data, reset = false) {
+  if (process.env.DEBUG !== "true")
+    return;
+  try {
+    const file = join2(process.cwd(), "claude-message-stream-debug.json");
+    if (reset && existsSync2(file))
+      unlinkSync(file);
+    const entry = {
+      _t: (/* @__PURE__ */ new Date()).toISOString(),
+      ...typeof data === "object" && data !== null ? data : { value: data }
+    };
+    appendFileSync(file, JSON.stringify(entry, null, 2) + ",\n");
+  } catch {
+  }
+}
 var UNKNOWN_TOOL_NAME = "unknown-tool";
 function formatDataStream(data) {
   return `data: ${JSON.stringify(data)}
@@ -142,6 +157,16 @@ function formatDataStream(data) {
 function generateId() {
   return `${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
 }
+function isAbortError(err) {
+  if (err && typeof err === "object") {
+    const e = err;
+    if (typeof e.name === "string" && e.name === "AbortError")
+      return true;
+    if (typeof e.code === "string" && e.code.toUpperCase() === "ABORT_ERR")
+      return true;
+  }
+  return false;
+}
 function convertUsageToAISDK(usage) {
   const inputTokens = usage.input_tokens ?? 0;
   const outputTokens = usage.output_tokens ?? 0;
@@ -194,11 +219,6 @@ function extractToolUses(content) {
 var AISDKStreamConverter = class {
   systemMessage;
   hasEmittedStart = false;
-  accumulatedText = "";
-  textPartId;
-  streamedTextLength = 0;
-  // Track text already emitted via stream_events
-  hasReceivedStreamEvents = false;
   sessionId;
   partIdMap = /* @__PURE__ */ new Map();
   /**
@@ -277,15 +297,15 @@ var AISDKStreamConverter = class {
   /**
    * Stream SDK messages and convert to AI SDK UI Data Stream format
    */
-  async *stream(messageIterator, options) {
-    const debugMessages = [];
+  async *stream(messageIterator) {
     try {
       for await (const message of messageIterator) {
-        debugMessages.push(message);
         if (message.type === "system" && message.subtype === "init") {
+          trace(null, true);
           this.systemMessage = message;
           this.sessionId = this.systemMessage.session_id;
         }
+        trace(message);
         if (message.type === "stream_event") {
           const streamEvent = message;
           const event = streamEvent.event;
@@ -340,9 +360,14 @@ var AISDKStreamConverter = class {
         }
         if (message.type === "result") {
           const resultMsg = message;
-          const finishTime = (/* @__PURE__ */ new Date()).toISOString();
-          console.error(`[AISDKStream] Processing result message at ${finishTime}`);
-          const finishEvent = this.emit({
+          if (resultMsg.is_error) {
+            const errorText = resultMsg.result || "Unknown error";
+            yield this.emit({
+              type: "error",
+              errorText
+            });
+          }
+          yield this.emit({
             type: "finish",
             finishReason: mapFinishReason(resultMsg.subtype, resultMsg.is_error),
             messageMetadata: {
@@ -350,29 +375,34 @@ var AISDKStreamConverter = class {
               sessionId: this.sessionId
             }
           });
-          console.error(`[AISDKStream] Emitting finish event at ${(/* @__PURE__ */ new Date()).toISOString()}`);
-          yield finishEvent;
-          console.error(`[AISDKStream] Emitted [DONE] at ${(/* @__PURE__ */ new Date()).toISOString()}`);
         }
       }
     } catch (error) {
-      debugMessages.push(error);
-    } finally {
-      if (debugMessages.length > 0 && process.env.DEBUG === "true") {
-        const debugDir = options?.cwd ?? process.cwd();
-        const debugFile = join2(debugDir, `claude-message-stream-debug.json`);
-        writeFile(debugFile, JSON.stringify(debugMessages, null, 2), "utf-8").catch((writeError) => {
-          console.error(`[AISDKStream] Failed to write debug file:`, writeError);
+      trace({ error: String(error) });
+      if (isAbortError(error)) {
+        console.error("[AISDKStream] Operation aborted");
+      } else {
+        const errorMessage = error instanceof Error ? error.message : "Unknown error";
+        console.error("[AISDKStream] Error:", errorMessage);
+        yield this.emit({ type: "error", errorText: errorMessage });
+        yield this.emit({
+          type: "finish",
+          finishReason: mapFinishReason("error_during_execution", true),
+          messageMetadata: {
+            usage: convertUsageToAISDK({}),
+            sessionId: this.sessionId
+          }
         });
       }
+    } finally {
       yield `data: [DONE]
 
 `;
     }
   }
 };
-function streamSDKMessagesToAISDKUI(messageIterator, options) {
-  return new AISDKStreamConverter().stream(messageIterator, options);
+function streamSDKMessagesToAISDKUI(messageIterator) {
+  return new AISDKStreamConverter().stream(messageIterator);
 }
 
 // ../../packages/runner-claude/dist/claude-runner.js
@@ -538,7 +568,7 @@ function setupAbortHandler(queryIterator, signal) {
     }
   };
 }
-async function* runWithTextOutput(sdk, options, userInput, signal) {
+async function* runWithTextOutput(sdk, options, userInput) {
   const sdkOptions = createSDKOptions(options);
   const queryIterator = sdk.query({ prompt: userInput, options: sdkOptions });
   const cleanup = setupAbortHandler(queryIterator, options.abortController?.signal);
@@ -557,10 +587,10 @@ async function* runWithTextOutput(sdk, options, userInput, signal) {
     cleanup();
   }
 }
-async function* runWithJSONOutput(sdk, options, userInput, signal) {
+async function* runWithJSONOutput(sdk, options, userInput) {
   const sdkOptions = createSDKOptions(options);
   const queryIterator = sdk.query({ prompt: userInput, options: sdkOptions });
-  const cleanup = setupAbortHandler(queryIterator, signal);
+  const cleanup = setupAbortHandler(queryIterator, options.abortController?.signal);
   try {
     let resultMessage = null;
     for await (const message of queryIterator) {
@@ -575,10 +605,10 @@ async function* runWithJSONOutput(sdk, options, userInput, signal) {
     cleanup();
   }
 }
-async function* runWithStreamJSONOutput(sdk, options, userInput, signal) {
+async function* runWithStreamJSONOutput(sdk, options, userInput) {
   const sdkOptions = createSDKOptions(options);
   const queryIterator = sdk.query({ prompt: userInput, options: sdkOptions });
-  const cleanup = setupAbortHandler(queryIterator, signal);
+  const cleanup = setupAbortHandler(queryIterator, options.abortController?.signal);
   try {
     for await (const message of queryIterator) {
       yield JSON.stringify(message) + "\n";
@@ -595,7 +625,7 @@ async function* runWithAISDKUIOutput(sdk, options, userInput) {
   const queryIterator = sdk.query({ prompt: userInput, options: sdkOptions });
   const cleanup = setupAbortHandler(queryIterator, options.abortController?.signal);
   try {
-    yield* streamSDKMessagesToAISDKUI(queryIterator, { cwd: options.cwd });
+    yield* streamSDKMessagesToAISDKUI(queryIterator);
   } finally {
     cleanup();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sandagent/runner-cli",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "SandAgent Runner CLI - Like gemini-cli or claude-code, runs in your local terminal with AI SDK UI streaming",
   "type": "module",
   "bin": {