@bike4mind/cli 0.2.29-feat-cli-websocket-streaming.18841 → 0.2.29-feat-cli-websocket-streaming.18842

package/dist/index.js

@@ -13416,8 +13416,8 @@ var WebSocketLlmBackend = class {
   }
   /**
    * Make LLM completion request via WebSocket.
-   * Mirrors ServerLlmBackend accumulation logic — collects all chunks,
-   * calls callback once at completion with full accumulated content.
+   * Collects all streamed chunks, then calls callback once at completion
+   * with the full accumulated content.
    */
   async complete(model, messages, options, callback) {
     logger.debug(`[WebSocketLlmBackend] Starting complete() with model: ${model}`);
@@ -13444,32 +13444,33 @@ var WebSocketLlmBackend = class {
       let toolsUsed = [];
       let thinkingBlocks = [];
       let settled = false;
-      const cleanup = () => {
-        this.wsManager.offRequest(requestId);
-      };
-      const settleResolve = () => {
-        if (settled) return;
-        settled = true;
-        cleanup();
-        resolve3();
-      };
-      const settleReject = (err) => {
+      const settle = (action) => {
         if (settled) return;
         settled = true;
-        cleanup();
-        reject(err);
+        this.wsManager.offRequest(requestId);
+        action();
       };
+      const settleResolve = () => settle(() => resolve3());
+      const settleReject = (err) => settle(() => reject(err));
       if (options.abortSignal) {
-        const abortHandler = () => {
-          logger.debug("[WebSocketLlmBackend] Abort signal received");
-          settleResolve();
-        };
         if (options.abortSignal.aborted) {
           settleResolve();
           return;
         }
-        options.abortSignal.addEventListener("abort", abortHandler, { once: true });
+        options.abortSignal.addEventListener(
+          "abort",
+          () => {
+            logger.debug("[WebSocketLlmBackend] Abort signal received");
+            settleResolve();
+          },
+          { once: true }
+        );
       }
+      const updateUsage = (usage) => {
+        if (usage) {
+          lastUsageInfo = { inputTokens: usage.inputTokens, outputTokens: usage.outputTokens };
+        }
+      };
       this.wsManager.onRequest(requestId, (message) => {
         if (options.abortSignal?.aborted) return;
         const action = message.action;
@@ -13477,48 +13478,29 @@ var WebSocketLlmBackend = class {
           eventCount++;
           const chunk = message.chunk;
           streamLogger.onEvent(eventCount, JSON.stringify(chunk));
+          const textChunk = chunk.text || "";
+          if (textChunk) accumulatedText += textChunk;
+          updateUsage(chunk.usage);
           if (chunk.type === "content") {
-            const textChunk = chunk.text || "";
-            accumulatedText += textChunk;
             streamLogger.onContent(eventCount, textChunk, accumulatedText);
-            if (chunk.usage) {
-              lastUsageInfo = {
-                inputTokens: chunk.usage.inputTokens,
-                outputTokens: chunk.usage.outputTokens
-              };
-            }
           } else if (chunk.type === "tool_use") {
             streamLogger.onCriticalEvent(eventCount, "TOOL_USE", `tools: ${chunk.tools?.length}`);
-            const textChunk = chunk.text || "";
-            if (textChunk) accumulatedText += textChunk;
-            if (chunk.tools && chunk.tools.length > 0) {
-              toolsUsed = chunk.tools;
-            }
-            if (chunk.thinking && chunk.thinking.length > 0) {
-              thinkingBlocks = chunk.thinking;
-            }
-            if (chunk.usage) {
-              lastUsageInfo = {
-                inputTokens: chunk.usage.inputTokens,
-                outputTokens: chunk.usage.outputTokens
-              };
-            }
+            if (chunk.tools && chunk.tools.length > 0) toolsUsed = chunk.tools;
+            if (chunk.thinking && chunk.thinking.length > 0) thinkingBlocks = chunk.thinking;
           }
         } else if (action === "cli_completion_done") {
           streamLogger.streamComplete(accumulatedText);
           const cleanedText = stripThinkingBlocks2(accumulatedText);
-          if (toolsUsed.length > 0) {
-            const info = {
-              toolsUsed,
-              thinking: thinkingBlocks.length > 0 ? thinkingBlocks : void 0,
-              ...lastUsageInfo
-            };
-            callback([cleanedText], info).then(() => settleResolve()).catch((err) => settleReject(err));
-          } else if (cleanedText) {
-            callback([cleanedText], lastUsageInfo).then(() => settleResolve()).catch((err) => settleReject(err));
-          } else {
+          if (!cleanedText && toolsUsed.length === 0) {
             settleResolve();
+            return;
           }
+          const info = {
+            ...lastUsageInfo,
+            ...toolsUsed.length > 0 && { toolsUsed },
+            ...thinkingBlocks.length > 0 && { thinking: thinkingBlocks }
+          };
+          callback([cleanedText], info).then(() => settleResolve()).catch((err) => settleReject(err));
         } else if (action === "cli_completion_error") {
           const errorMsg = message.error || "Server error";
           streamLogger.onCriticalEvent(eventCount, "ERROR", errorMsg);
@@ -13546,7 +13528,7 @@ var WebSocketLlmBackend = class {
   }
   /**
    * Get available models from server (REST call, not streaming).
-   * Delegates to ApiClient — same as ServerLlmBackend.
+   * Delegates to ApiClient -- same as ServerLlmBackend.
    */
   async getModelInfo() {
     try {
@@ -13783,34 +13765,25 @@ var WebSocketToolExecutor = class {
     const requestId = uuidv412();
     return new Promise((resolve3, reject) => {
       let settled = false;
-      const cleanup = () => {
-        this.wsManager.offRequest(requestId);
-      };
-      const settleResolve = (result) => {
+      const settle = (action) => {
         if (settled) return;
         settled = true;
-        cleanup();
-        resolve3(result);
-      };
-      const settleReject = (err) => {
-        if (settled) return;
-        settled = true;
-        cleanup();
-        reject(err);
+        this.wsManager.offRequest(requestId);
+        action();
       };
+      const settleResolve = (result) => settle(() => resolve3(result));
+      const settleReject = (err) => settle(() => reject(err));
       if (abortSignal) {
-        const abortHandler = () => {
-          settleReject(new Error("Tool execution aborted"));
-        };
         if (abortSignal.aborted) {
           settleReject(new Error("Tool execution aborted"));
           return;
         }
-        abortSignal.addEventListener("abort", abortHandler, { once: true });
+        abortSignal.addEventListener("abort", () => settleReject(new Error("Tool execution aborted")), {
+          once: true
+        });
       }
       this.wsManager.onRequest(requestId, (message) => {
-        const action = message.action;
-        if (action === "cli_tool_response") {
+        if (message.action === "cli_tool_response") {
           settleResolve({
             success: message.success,
             content: message.content,
@@ -13970,7 +13943,7 @@ import { isAxiosError as isAxiosError2 } from "axios";
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.29-feat-cli-websocket-streaming.18841+5c940d031",
+  version: "0.2.29-feat-cli-websocket-streaming.18842+8ba59c222",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -14080,10 +14053,10 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.50.1-feat-cli-websocket-streaming.18841+5c940d031",
-    "@bike4mind/mcp": "1.29.1-feat-cli-websocket-streaming.18841+5c940d031",
-    "@bike4mind/services": "2.48.1-feat-cli-websocket-streaming.18841+5c940d031",
-    "@bike4mind/utils": "2.5.1-feat-cli-websocket-streaming.18841+5c940d031",
+    "@bike4mind/common": "2.50.1-feat-cli-websocket-streaming.18842+8ba59c222",
+    "@bike4mind/mcp": "1.29.1-feat-cli-websocket-streaming.18842+8ba59c222",
+    "@bike4mind/services": "2.48.1-feat-cli-websocket-streaming.18842+8ba59c222",
+    "@bike4mind/utils": "2.5.1-feat-cli-websocket-streaming.18842+8ba59c222",
     "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
@@ -14100,7 +14073,7 @@ var package_default = {
   optionalDependencies: {
     "@vscode/ripgrep": "^1.17.0"
   },
-  gitHead: "5c940d031610617c76d3c12cc611b71db8bb4caf"
+  gitHead: "8ba59c22293ec8857baaba3c7c6d96db1fbb4b15"
 };
 
 // src/config/constants.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bike4mind/cli",
-  "version": "0.2.29-feat-cli-websocket-streaming.18841+5c940d031",
+  "version": "0.2.29-feat-cli-websocket-streaming.18842+8ba59c222",
   "type": "module",
   "description": "Interactive CLI tool for Bike4Mind with ReAct agents",
   "license": "UNLICENSED",
@@ -110,10 +110,10 @@
   },
   "devDependencies": {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.50.1-feat-cli-websocket-streaming.18841+5c940d031",
-    "@bike4mind/mcp": "1.29.1-feat-cli-websocket-streaming.18841+5c940d031",
-    "@bike4mind/services": "2.48.1-feat-cli-websocket-streaming.18841+5c940d031",
-    "@bike4mind/utils": "2.5.1-feat-cli-websocket-streaming.18841+5c940d031",
+    "@bike4mind/common": "2.50.1-feat-cli-websocket-streaming.18842+8ba59c222",
+    "@bike4mind/mcp": "1.29.1-feat-cli-websocket-streaming.18842+8ba59c222",
+    "@bike4mind/services": "2.48.1-feat-cli-websocket-streaming.18842+8ba59c222",
+    "@bike4mind/utils": "2.5.1-feat-cli-websocket-streaming.18842+8ba59c222",
     "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
@@ -130,5 +130,5 @@
   "optionalDependencies": {
     "@vscode/ripgrep": "^1.17.0"
   },
-  "gitHead": "5c940d031610617c76d3c12cc611b71db8bb4caf"
+  "gitHead": "8ba59c22293ec8857baaba3c7c6d96db1fbb4b15"
 }