cliskill 1.0.6 → 1.0.8

package/dist/bootstrap/cli.js

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

package/dist/{chunk-S4ZZPUPF.js → chunk-4XDWZXBP.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)) {
@@ -7228,9 +7259,11 @@ var StatusBar = memo(function StatusBar2({
     ] })
   ] });
 });
-var Spinner = memo(function Spinner2({ label }) {
+var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+var Spinner = memo(function Spinner2({ label, frame }) {
+  const ch = SPINNER_FRAMES[frame % SPINNER_FRAMES.length];
   return /* @__PURE__ */ jsxs(Box, { gap: 1, children: [
-    /* @__PURE__ */ jsx(Text, { color: C.primary, children: "\u25CF" }),
+    /* @__PURE__ */ jsx(Text, { color: C.primary, children: ch }),
     /* @__PURE__ */ jsx(Text, { color: C.dimText, children: label })
   ] });
 });
@@ -7240,6 +7273,7 @@ var ChatPanel = memo(function ChatPanel2({
   contentWidth,
   loading,
   spinnerLabel,
+  spinnerFrame,
   width,
   showScroll,
   thumbPos,
@@ -7290,7 +7324,7 @@ var ChatPanel = memo(function ChatPanel2({
     lines,
     loading && /* @__PURE__ */ jsxs(Box, { flexDirection: "row", children: [
       /* @__PURE__ */ jsx(Text, { color: C.border, children: "\u2502" }),
-      /* @__PURE__ */ jsx(Box, { width: contentWidth, children: /* @__PURE__ */ jsx(Spinner, { label: clampLine(spinnerLabel, contentWidth - 2) }) }),
+      /* @__PURE__ */ jsx(Box, { width: contentWidth, children: /* @__PURE__ */ jsx(Spinner, { label: clampLine(spinnerLabel, contentWidth - 2), frame: spinnerFrame }) }),
       /* @__PURE__ */ jsx(Text, { color: C.border, children: "\u2502" })
     ] }),
     /* @__PURE__ */ jsx(Text, { color: C.primary, children: panelBottom(width) })
@@ -7311,6 +7345,7 @@ function InkApp({ model, toolCount, onSubmit, onCancel }) {
   const [messages, setMessages] = useState([]);
   const [loading, setLoading] = useState(false);
   const [spinnerLabel, setSpinnerLabel] = useState("Thinking...");
+  const [spinnerFrame, setSpinnerFrame] = useState(0);
   const [inputTokens, setInputTokens] = useState(0);
   const [outputTokens, setOutputTokens] = useState(0);
   const [sessionStart] = useState(Date.now());
@@ -7321,6 +7356,11 @@ function InkApp({ model, toolCount, onSubmit, onCancel }) {
   const autoScrollRef = useRef(true);
   const assistantBufferRef = useRef("");
   const flushTimerRef = useRef(null);
+  useEffect(() => {
+    if (!loading) return;
+    const t = setInterval(() => setSpinnerFrame((f) => f + 1), 80);
+    return () => clearInterval(t);
+  }, [loading]);
   const inputRef = useRef("");
   const [input, setInput] = useState("");
   useEffect(() => {
@@ -7380,6 +7420,7 @@ function InkApp({ model, toolCount, onSubmit, onCancel }) {
     switch (event.type) {
       case "assistant_text": {
         assistantBufferRef.current += event.text;
+        setSpinnerLabel("Writing...");
         if (!flushTimerRef.current) {
           flushTimerRef.current = setTimeout(flushAssistantBuffer, 150);
         }
@@ -7389,6 +7430,9 @@ function InkApp({ model, toolCount, onSubmit, onCancel }) {
         setSpinnerLabel(`Running ${event.toolName}...`);
         setMessages((prev) => [...prev, { id: msgId(), role: "tool", content: "...", toolName: event.toolName }]);
         break;
+      case "tool_progress":
+        setSpinnerLabel(`${event.toolName}: ${event.message}`);
+        break;
       case "tool_result":
         setSpinnerLabel("Thinking...");
         setMessages((prev) => {
@@ -7407,6 +7451,7 @@ function InkApp({ model, toolCount, onSubmit, onCancel }) {
         });
         break;
       case "turn_complete":
+        setSpinnerLabel(`Turn ${event.turnNumber} done, thinking...`);
         if (flushTimerRef.current) {
           clearTimeout(flushTimerRef.current);
           flushAssistantBuffer();
@@ -7417,6 +7462,9 @@ function InkApp({ model, toolCount, onSubmit, onCancel }) {
         setInputTokens(event.inputTokens);
         setOutputTokens(event.outputTokens);
         break;
+      case "context_compacted":
+        setSpinnerLabel(`Compacting context (${event.removedCount} msgs)...`);
+        break;
       case "loop_complete":
         setInputTokens(event.usage.inputTokens);
         setOutputTokens(event.usage.outputTokens);
@@ -7552,6 +7600,7 @@ function InkApp({ model, toolCount, onSubmit, onCancel }) {
           contentWidth: chatContentWidth,
           loading,
           spinnerLabel,
+          spinnerFrame,
           width: chatWidth,
           showScroll,
           thumbPos,
@@ -8468,6 +8517,9 @@ async function runBasicRepl(config) {
               toolName: event.toolName
             });
             break;
+          case "tool_progress":
+            process.stdout.write(`\r  [${event.toolName}: ${event.message}]`);
+            break;
           case "tool_result":
             console.log(`  [Result: ${event.result.slice(0, 200)}${event.result.length > 200 ? "..." : ""}]`);
             await sessionSaver.append({
@@ -11476,4 +11528,4 @@ export {
   MCPConnectionManager,
   runCli
 };
-//# sourceMappingURL=chunk-S4ZZPUPF.js.map
+//# sourceMappingURL=chunk-4XDWZXBP.js.map