@bgicli/bgicli 2.3.8 → 2.4.0

package/dist/bgi.js

@@ -13956,7 +13956,7 @@ var TOOL_DEFINITIONS = [
     }
   }
 ];
-async function executeTool(name, args, onStream) {
+async function executeTool(name, args, onStream, signal) {
   try {
     switch (name) {
       case "bash": {
@@ -13964,9 +13964,9 @@ async function executeTool(name, args, onStream) {
         const requestedTimeout = args["timeout_ms"] ?? 3e5;
         const isDownload = /\b(wget|curl|aria2c|axel|rsync)\b/.test(cmd);
         if (isDownload) {
-          return await toolBash(cmd, args["workdir"], 0, onStream, 6e5);
+          return await toolBash(cmd, args["workdir"], 0, onStream, 6e5, signal);
         }
-        return await toolBash(cmd, args["workdir"], requestedTimeout, onStream);
+        return await toolBash(cmd, args["workdir"], requestedTimeout, onStream, void 0, signal);
       }
       case "read_file":
         return toolReadFile(
@@ -14017,7 +14017,7 @@ function injectProgressFlags(cmd) {
   }
   return cmd;
 }
-async function toolBash(command, workdir, timeoutMs = 3e5, onStream, inactivityMs) {
+async function toolBash(command, workdir, timeoutMs = 3e5, onStream, inactivityMs, signal) {
   const scan = scanCommand(command);
   const criticals = scan.matches.filter((m2) => m2.pattern.level === "CRITICAL");
   if (criticals.length > 0) {
@@ -14067,6 +14067,17 @@ async function toolBash(command, workdir, timeoutMs = 3e5, onStream, inactivityM
     });
     let timedOut = false;
     let timedOutSecs = 0;
+    let aborted = false;
+    if (signal) {
+      if (signal.aborted) {
+        child.kill();
+        return resolve4({ output: "", error: "\u4EFB\u52A1\u5DF2\u4E2D\u65AD" });
+      }
+      signal.addEventListener("abort", () => {
+        aborted = true;
+        child.kill();
+      }, { once: true });
+    }
     const effectiveMs = inactivityMs ?? timeoutMs;
     let timer = setTimeout(() => {
       timedOut = true;
@@ -14088,7 +14099,9 @@ async function toolBash(command, workdir, timeoutMs = 3e5, onStream, inactivityM
     child.on("close", (code) => {
       clearTimeout(timer);
       const out = (decodeBuffer(Buffer.concat(outChunks)) + "\n" + decodeBuffer(Buffer.concat(errChunks))).trim();
-      if (timedOut) {
+      if (aborted) {
+        resolve4({ output: out, error: "\u4EFB\u52A1\u5DF2\u4E2D\u65AD" });
+      } else if (timedOut) {
         const msg = inactivityMs ? `\u4E0B\u8F7D\u505C\u6EDE \u2014 \u8D85\u8FC7 ${timedOutSecs}s \u65E0\u4EFB\u4F55\u8F93\u51FA\uFF08\u8FDE\u63A5\u53EF\u80FD\u5DF2\u65AD\u5F00\uFF09` : `Command timed out after ${timedOutSecs}s`;
         resolve4({ output: out, error: msg });
       } else if (code !== 0) {
@@ -14316,6 +14329,7 @@ ${label} `);
         let lastLineWasEmpty = false;
         let spinnerCleared = false;
         let partialLine = "";
+        let outputStarted = false;
         const MAX_STREAM_LINES = 200;
         let frame = 0;
         const spin = setInterval(() => {
@@ -14333,9 +14347,17 @@ ${label} `);
         };
         let lastChunkTime = t0;
         let heartbeat = null;
+        const clearHeartbeat = () => {
+          if (heartbeat) {
+            clearInterval(heartbeat);
+            heartbeat = null;
+          }
+        };
+        signal?.addEventListener("abort", clearHeartbeat, { once: true });
         const onStream = isBash ? (chunk) => {
           lastChunkTime = Date.now();
-          if (streamedLines === 0 && partialLine.length === 0) {
+          if (!outputStarted) {
+            outputStarted = true;
             clearSpinner();
             process.stdout.write(`${label}
 `);
@@ -14380,11 +14402,9 @@ ${label} `);
             }
           }
         } : void 0;
-        const result = await executeTool(tc.name, args, onStream);
-        if (heartbeat) {
-          clearInterval(heartbeat);
-          heartbeat = null;
-        }
+        const result = await executeTool(tc.name, args, onStream, signal);
+        signal?.removeEventListener("abort", clearHeartbeat);
+        clearHeartbeat();
         if (partialLine) {
           if (streamedLines < MAX_STREAM_LINES) {
             process.stdout.write("\r" + source_default.dim("  \u2502 ") + partialLine + "\x1B[K\n");
@@ -15979,7 +15999,7 @@ function clearCheckpoints(sessionId) {
 
 // src/index.ts
 var import_fs7 = require("fs");
-var VERSION2 = "2.3.8";
+var VERSION2 = "2.4.0";
 var SKILLHUB_HUBS = {
   bgi: { label: "BGI\u5185\u7F51", apiBase: "https://clawhub.ai", backend: "clawhub" },
   clawhub: { label: "clawhub.ai", apiBase: "https://clawhub.ai", backend: "clawhub" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgicli/bgicli",
-  "version": "2.3.8",
+  "version": "2.4.0",
   "description": "BGI CLI — Bioinformatics AI terminal for Chinese researchers (百炼/DeepSeek/Kimi/Qwen)",
   "bin": {
     "bgi": "dist/bgi.js"