cliskill 1.0.6 → 1.0.7

package/dist/bootstrap/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runCli
-} from "../chunk-S4ZZPUPF.js";
+} from "../chunk-SE4GOVKS.js";
 import "../chunk-AJENHWD3.js";
 export {
   runCli

package/dist/{chunk-S4ZZPUPF.js → chunk-SE4GOVKS.js}

@@ -2802,6 +2802,7 @@ import { z as z15 } from "zod";
 import { randomUUID as randomUUID3 } from "crypto";
 
 // src/services/streaming-tool-executor.ts
+var HEARTBEAT_INTERVAL_MS = 2e3;
 var StreamingToolExecutor = class {
   tools = [];
   hasBashError = false;
@@ -2897,11 +2898,11 @@ var StreamingToolExecutor = class {
         const progressPromise = new Promise((resolve10) => {
           this.progressAvailableResolve = resolve10;
         });
-        if (executingPromises.length > 0) {
-          await Promise.race([...executingPromises, progressPromise]);
-        } else {
-          await progressPromise;
-        }
+        const heartbeatPromise = new Promise((resolve10) => {
+          setTimeout(resolve10, HEARTBEAT_INTERVAL_MS);
+        });
+        const waitTargets = executingPromises.length > 0 ? [...executingPromises, progressPromise, heartbeatPromise] : [progressPromise, heartbeatPromise];
+        await Promise.race(waitTargets);
         for (const progress of this.drainProgress()) {
           yield { type: "progress", progress };
         }
@@ -2982,7 +2983,9 @@ var StreamingToolExecutor = class {
     for (const tool of this.tools) {
       if (tool.status !== "queued") continue;
       if (this.canExecuteTool(tool.isConcurrencySafe)) {
-        void this.executeTool(tool, ctx);
+        tool.promise = this.executeTool(tool, ctx);
+      } else if (this.discarded || this.siblingAbortController.signal.aborted) {
+        tool.promise = this.executeTool(tool, ctx);
       } else if (!tool.isConcurrencySafe) {
         break;
       }
@@ -3054,17 +3057,6 @@ var StreamingToolExecutor = class {
           }
         };
       }
-      if (tool.result.toolResult.isError) {
-        if (tool.name === "bash") {
-          this.hasBashError = true;
-          const cmd = typeof tool.input.command === "string" ? tool.input.command : "";
-          this.bashErrorDescription = cmd.length > 40 ? cmd.slice(0, 40) + "\u2026" : cmd;
-          this.siblingAbortController.abort("sibling_error");
-        }
-        if (this.executorConfig.abortOnError && !this.autoMode) {
-          this.siblingAbortController.abort("sibling_error");
-        }
-      }
     } catch (err) {
       const errorMsg = err && typeof err === "object" && "issues" in err ? `Validation error: ${err.issues.map((i) => `${i.path.join(".")}: ${i.message}`).join("; ")}` : err.message;
       tool.result = {
@@ -3088,6 +3080,17 @@ var StreamingToolExecutor = class {
         externalSignal.removeEventListener("abort", onDiscard);
       }
     }
+    if (tool.result?.toolResult.isError) {
+      if (tool.name === "bash") {
+        this.hasBashError = true;
+        const cmd = typeof tool.input.command === "string" ? tool.input.command : "";
+        this.bashErrorDescription = cmd.length > 40 ? cmd.slice(0, 40) + "\u2026" : cmd;
+        this.siblingAbortController.abort("sibling_error");
+      }
+      if (this.executorConfig.abortOnError && !this.autoMode) {
+        this.siblingAbortController.abort("sibling_error");
+      }
+    }
     tool.status = "completed";
     void this.processQueue(context);
   }
@@ -3963,6 +3966,8 @@ var AgentTool = class extends BaseTool {
     );
     let finalText = "";
     let turnsUsed = 0;
+    let lastProgressLen = 0;
+    const PROGRESS_REPORT_INTERVAL = 200;
     try {
       const eventStream = runWithAgentContext(
         { agentId: randomUUID3(), agentType: "subagent", agentName: "agent" },
@@ -3973,9 +3978,35 @@ var AgentTool = class extends BaseTool {
         switch (event.type) {
           case "text_delta":
             finalText += event.text;
+            if (finalText.length - lastProgressLen >= PROGRESS_REPORT_INTERVAL) {
+              lastProgressLen = finalText.length;
+              const preview = finalText.slice(-80).replace(/\n/g, " ");
+              context.onProgress?.(`Generating: ...${preview}`);
+            }
+            break;
+          case "turn_start":
+            context.onProgress?.(`Turn ${event.turn}/${input.max_turns}`);
             break;
           case "turn_end":
             turnsUsed = event.turn;
+            context.onProgress?.(`Turn ${event.turn} completed`);
+            break;
+          case "tool_use":
+            context.onProgress?.(`Calling: ${event.name}`);
+            break;
+          case "tool_result": {
+            const status = event.isError ? "error" : "ok";
+            const outputPreview = event.output.length > 60 ? event.output.slice(0, 60) + "..." : event.output;
+            context.onProgress?.(`${event.name} (${status}): ${outputPreview.replace(/\n/g, " ")}`);
+            break;
+          }
+          case "cost_update":
+            break;
+          case "compaction":
+            context.onProgress?.(`Context compacted (${event.removedCount} messages)`);
+            break;
+          case "complete":
+            context.onProgress?.(`Completed in ${event.result.turns} turns`);
             break;
           case "error":
             if (isAbortError(event.error)) {
@@ -11476,4 +11507,4 @@ export {
   MCPConnectionManager,
   runCli
 };
-//# sourceMappingURL=chunk-S4ZZPUPF.js.map
+//# sourceMappingURL=chunk-SE4GOVKS.js.map