@bike4mind/cli 0.2.11-cli-cancel-pending-message.17326 → 0.2.11-cli-cancel-pending-message.17327

package/dist/index.js

@@ -3093,6 +3093,21 @@ ${options.context}` : this.getSystemPrompt()
       let finalAnswer = "";
       let reachedMaxIterations = false;
       while (iterations < maxIterations) {
+        if (options.signal?.aborted) {
+          this.context.logger.info("[ReActAgent] Operation aborted by user");
+          const result2 = {
+            finalAnswer: "Interrupted",
+            steps: this.steps,
+            completionInfo: {
+              totalTokens: this.totalTokens,
+              iterations,
+              toolCalls: this.toolCallCount,
+              reachedMaxIterations: false
+            }
+          };
+          this.emit("complete", result2);
+          return result2;
+        }
         iterations++;
         this.context.logger.debug(`[ReActAgent] Starting iteration ${iterations}/${maxIterations}`);
         let iterationComplete = false;
@@ -3106,7 +3121,8 @@ ${options.context}` : this.getSystemPrompt()
             stream: false,
             tools: this.context.tools,
             maxTokens,
-            temperature
+            temperature,
+            abortSignal: options.signal
           },
           async (texts, completionInfo) => {
             for (const text of texts) {
@@ -3249,6 +3265,9 @@ ${options.context}` : this.getSystemPrompt()
           this.emit("final_answer", finalStep);
         }
       }
+      if (options.signal?.aborted && !finalAnswer) {
+        finalAnswer = "Interrupted";
+      }
       const result = {
         finalAnswer,
         steps: this.steps,
@@ -11301,6 +11320,10 @@ var ServerLlmBackend = class {
    */
   async complete(model, messages, options, callback) {
     logger.debug(`[ServerLlmBackend] Starting complete() with model: ${model}`);
+    if (options.abortSignal?.aborted) {
+      logger.debug("[ServerLlmBackend] Request aborted before start");
+      return;
+    }
     return new Promise(async (resolve3, reject) => {
       try {
         logger.debug("[ServerLlmBackend] Making streaming request...");
@@ -11401,7 +11424,25 @@ var ServerLlmBackend = class {
             }
           }
         });
+        if (options.abortSignal) {
+          const abortHandler = () => {
+            logger.debug("[ServerLlmBackend] Abort signal received, destroying stream");
+            response.data.destroy();
+            resolve3();
+          };
+          if (options.abortSignal.aborted) {
+            abortHandler();
+            return;
+          }
+          options.abortSignal.addEventListener("abort", abortHandler, { once: true });
+          response.data.on("close", () => {
+            options.abortSignal?.removeEventListener("abort", abortHandler);
+          });
+        }
         response.data.on("data", (chunk) => {
+          if (options.abortSignal?.aborted) {
+            return;
+          }
           parser.feed(chunk.toString());
         });
         response.data.on("end", () => {
@@ -11413,9 +11454,23 @@ var ServerLlmBackend = class {
           }
         });
         response.data.on("error", (error) => {
+          if (options.abortSignal?.aborted) {
+            resolve3();
+            return;
+          }
           reject(error);
         });
       } catch (error) {
+        if (options.abortSignal?.aborted) {
+          logger.debug("[ServerLlmBackend] Request was aborted, resolving gracefully");
+          resolve3();
+          return;
+        }
+        if (isAxiosError(error) && error.code === "ERR_CANCELED") {
+          logger.debug("[ServerLlmBackend] Request was canceled, resolving gracefully");
+          resolve3();
+          return;
+        }
         logger.error("LLM completion failed", error);
         if (isAxiosError(error)) {
           logger.debug(
@@ -11566,8 +11621,10 @@ var ServerLlmBackend = class {
     logger.debug(`  Body: ${logger.formatBytes(bodySize)}`);
     logger.debug(`  Preview: ${bodyStr.substring(0, 200)}`);
     const response = await axiosInstance.post(this.completionsEndpoint, requestBody, {
-      responseType: "stream"
+      responseType: "stream",
       // Auth header is automatically injected by ApiClient interceptor
+      // Pass abort signal to cancel request if user presses ESC
+      signal: options.abortSignal
     });
     logger.debug(`\u2190 ${response.status} ${response.statusText}`);
     return response;
@@ -11711,7 +11768,7 @@ import { isAxiosError as isAxiosError2 } from "axios";
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.11-cli-cancel-pending-message.17326+24dfb0510",
+  version: "0.2.11-cli-cancel-pending-message.17327+02457534d",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -11815,10 +11872,10 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.40.1-cli-cancel-pending-message.17326+24dfb0510",
-    "@bike4mind/mcp": "1.20.5-cli-cancel-pending-message.17326+24dfb0510",
-    "@bike4mind/services": "2.35.1-cli-cancel-pending-message.17326+24dfb0510",
-    "@bike4mind/utils": "2.1.5-cli-cancel-pending-message.17326+24dfb0510",
+    "@bike4mind/common": "2.40.1-cli-cancel-pending-message.17327+02457534d",
+    "@bike4mind/mcp": "1.20.5-cli-cancel-pending-message.17327+02457534d",
+    "@bike4mind/services": "2.35.1-cli-cancel-pending-message.17327+02457534d",
+    "@bike4mind/utils": "2.1.5-cli-cancel-pending-message.17327+02457534d",
     "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
@@ -11831,7 +11888,7 @@ var package_default = {
     typescript: "^5.9.3",
     vitest: "^3.2.4"
   },
-  gitHead: "24dfb0510b2c3e1385417da0a3fe6c3604cdf8f8"
+  gitHead: "02457534dd28d3297ce20026e3a9735d658e67f1"
 };
 
 // src/config/constants.ts
@@ -12270,7 +12327,7 @@ function CliApp() {
         logger.debug("[ABORT] ESC pressed - aborting current operation...");
         state.abortController.abort();
         setState((prev) => ({ ...prev, abortController: null }));
-        console.log("\n\u26A0\uFE0F  Operation cancelled by user (ESC)\n");
+        useCliStore.getState().setIsThinking(false);
       }
       return;
     }
@@ -12536,13 +12593,16 @@ ${contextResult.mergedContent}` : "";
         }
       };
       agent.on("thought", stepHandler);
+      agent.on("observation", stepHandler);
       agent.on("action", stepHandler);
       orchestrator.setBeforeRunCallback((subagent, _subagentType) => {
         subagent.on("thought", stepHandler);
+        subagent.on("observation", stepHandler);
         subagent.on("action", stepHandler);
       });
       orchestrator.setAfterRunCallback((subagent, _subagentType) => {
         subagent.off("thought", stepHandler);
+        subagent.off("observation", stepHandler);
         subagent.off("action", stepHandler);
       });
       setState((prev) => ({
@@ -12653,10 +12713,6 @@ ${contextResult.mergedContent}` : "";
         previousMessages: previousMessages.length > 0 ? previousMessages : void 0,
         signal: abortController.signal
       });
-      if (abortController.signal.aborted) {
-        logger.debug("[ABORT] Custom command was cancelled, discarding result");
-        return;
-      }
       const permissionDenied = result.finalAnswer.startsWith("Permission denied for tool");
       if (permissionDenied) {
         console.log("\n\u26A0\uFE0F  Action denied by user\n");
@@ -12829,10 +12885,6 @@ ${contextResult.mergedContent}` : "";
         previousMessages: previousMessages.length > 0 ? previousMessages : void 0,
         signal: abortController.signal
       });
-      if (abortController.signal.aborted) {
-        logger.debug("[ABORT] Operation was cancelled, discarding result");
-        return;
-      }
       const permissionDenied = result.finalAnswer.startsWith("Permission denied for tool");
       if (permissionDenied) {
         console.log("\n\u26A0\uFE0F  Action denied by user\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bike4mind/cli",
-  "version": "0.2.11-cli-cancel-pending-message.17326+24dfb0510",
+  "version": "0.2.11-cli-cancel-pending-message.17327+02457534d",
   "type": "module",
   "description": "Interactive CLI tool for Bike4Mind with ReAct agents",
   "license": "UNLICENSED",
@@ -104,10 +104,10 @@
   },
   "devDependencies": {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.40.1-cli-cancel-pending-message.17326+24dfb0510",
-    "@bike4mind/mcp": "1.20.5-cli-cancel-pending-message.17326+24dfb0510",
-    "@bike4mind/services": "2.35.1-cli-cancel-pending-message.17326+24dfb0510",
-    "@bike4mind/utils": "2.1.5-cli-cancel-pending-message.17326+24dfb0510",
+    "@bike4mind/common": "2.40.1-cli-cancel-pending-message.17327+02457534d",
+    "@bike4mind/mcp": "1.20.5-cli-cancel-pending-message.17327+02457534d",
+    "@bike4mind/services": "2.35.1-cli-cancel-pending-message.17327+02457534d",
+    "@bike4mind/utils": "2.1.5-cli-cancel-pending-message.17327+02457534d",
     "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
@@ -120,5 +120,5 @@
     "typescript": "^5.9.3",
     "vitest": "^3.2.4"
   },
-  "gitHead": "24dfb0510b2c3e1385417da0a3fe6c3604cdf8f8"
+  "gitHead": "02457534dd28d3297ce20026e3a9735d658e67f1"
 }