llmist 3.0.0 → 3.1.0

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import "./chunk-NBPKLSXJ.js";
+import "./chunk-LFI4WQVV.js";
 import {
   AbstractGadget,
   AgentBuilder,
@@ -34,7 +34,7 @@ import {
   schemaToJSONSchema,
   text,
   validateGadgetSchema
-} from "./chunk-67MMSOAT.js";
+} from "./chunk-JCFPJMRQ.js";
 
 // src/cli/constants.ts
 var CLI_NAME = "llmist";
@@ -3113,7 +3113,9 @@ function formatMediaLine(media) {
 }
 function formatGadgetSummary2(result) {
   const gadgetLabel = chalk3.magenta.bold(result.gadgetName);
-  const timeLabel = chalk3.dim(`${Math.round(result.executionTimeMs)}ms`);
+  const timeLabel = chalk3.dim(
+    result.executionTimeMs >= 1e3 ? `${(result.executionTimeMs / 1e3).toFixed(1)}s` : `${Math.round(result.executionTimeMs)}ms`
+  );
   const paramsStr = formatParametersInline(result.parameters);
   const paramsLabel = paramsStr ? `${chalk3.dim("(")}${paramsStr}${chalk3.dim(")")}` : "";
   if (result.error) {
@@ -3281,6 +3283,8 @@ var StreamProgress = class {
   delayTimeout = null;
   isRunning = false;
   hasRendered = false;
+  lastRenderLineCount = 0;
+  // Track lines rendered for multi-line clearing
   // Current call stats (streaming mode)
   mode = "cumulative";
   model = "";
@@ -3300,6 +3304,99 @@ var StreamProgress = class {
   totalCost = 0;
   iterations = 0;
   currentIteration = 0;
+  // In-flight gadget tracking for concurrent status display
+  inFlightGadgets = /* @__PURE__ */ new Map();
+  // Nested agent tracking for hierarchical subagent display
+  nestedAgents = /* @__PURE__ */ new Map();
+  // Nested gadget tracking for hierarchical subagent display
+  nestedGadgets = /* @__PURE__ */ new Map();
+  /**
+   * Add a gadget to the in-flight tracking (called when gadget_call event received).
+   * Triggers re-render to show the gadget in the status display.
+   */
+  addGadget(invocationId, name, params) {
+    this.inFlightGadgets.set(invocationId, { name, params, startTime: Date.now() });
+    if (this.isRunning && this.isTTY) {
+      this.render();
+    }
+  }
+  /**
+   * Remove a gadget from in-flight tracking (called when gadget_result event received).
+   * Triggers re-render to update the status display.
+   */
+  removeGadget(invocationId) {
+    this.inFlightGadgets.delete(invocationId);
+    if (this.isRunning && this.isTTY) {
+      this.render();
+    }
+  }
+  /**
+   * Check if there are any gadgets currently in flight.
+   */
+  hasInFlightGadgets() {
+    return this.inFlightGadgets.size > 0;
+  }
+  /**
+   * Add a nested agent LLM call (called when nested llm_call_start event received).
+   * Used to display hierarchical progress for subagent gadgets.
+   */
+  addNestedAgent(id, parentInvocationId, depth, model, iteration, inputTokens) {
+    this.nestedAgents.set(id, {
+      parentInvocationId,
+      depth,
+      model,
+      iteration,
+      startTime: Date.now(),
+      inputTokens
+    });
+    if (this.isRunning && this.isTTY) {
+      this.render();
+    }
+  }
+  /**
+   * Update a nested agent with completion info (called when nested llm_call_end event received).
+   */
+  updateNestedAgent(id, outputTokens) {
+    const agent = this.nestedAgents.get(id);
+    if (agent) {
+      agent.outputTokens = outputTokens;
+      if (this.isRunning && this.isTTY) {
+        this.render();
+      }
+    }
+  }
+  /**
+   * Remove a nested agent (called when the nested LLM call completes).
+   */
+  removeNestedAgent(id) {
+    this.nestedAgents.delete(id);
+    if (this.isRunning && this.isTTY) {
+      this.render();
+    }
+  }
+  /**
+   * Add a nested gadget call (called when nested gadget_call event received).
+   */
+  addNestedGadget(id, depth, parentInvocationId, name) {
+    this.nestedGadgets.set(id, {
+      depth,
+      parentInvocationId,
+      name,
+      startTime: Date.now()
+    });
+    if (this.isRunning && this.isTTY) {
+      this.render();
+    }
+  }
+  /**
+   * Remove a nested gadget (called when nested gadget_result event received).
+   */
+  removeNestedGadget(id) {
+    this.nestedGadgets.delete(id);
+    if (this.isRunning && this.isTTY) {
+      this.render();
+    }
+  }
   /**
    * Starts a new LLM call. Switches to streaming mode.
    * @param model - Model name being used
@@ -3426,15 +3523,57 @@ var StreamProgress = class {
     this.isStreaming = true;
   }
   render() {
+    this.clearRenderedLines();
     const spinner = SPINNER_FRAMES[this.frameIndex++ % SPINNER_FRAMES.length];
+    const lines = [];
     if (this.mode === "streaming") {
-      this.renderStreamingMode(spinner);
+      lines.push(this.formatStreamingLine(spinner));
     } else {
-      this.renderCumulativeMode(spinner);
+      lines.push(this.formatCumulativeLine(spinner));
+    }
+    if (this.isTTY) {
+      for (const [gadgetId, gadget] of this.inFlightGadgets) {
+        const elapsed = ((Date.now() - gadget.startTime) / 1e3).toFixed(1);
+        const gadgetLine = `  ${chalk4.blue("\u23F5")} ${chalk4.magenta.bold(gadget.name)}${chalk4.dim("(...)")} ${chalk4.dim(elapsed + "s")}`;
+        lines.push(gadgetLine);
+        for (const [_agentId, nested] of this.nestedAgents) {
+          if (nested.parentInvocationId !== gadgetId) continue;
+          const indent = "  ".repeat(nested.depth + 1);
+          const nestedElapsed = ((Date.now() - nested.startTime) / 1e3).toFixed(1);
+          const tokens = nested.inputTokens ? ` ${chalk4.dim("\u2191")}${chalk4.yellow(formatTokens(nested.inputTokens))}` : "";
+          const outTokens = nested.outputTokens ? ` ${chalk4.dim("\u2193")}${chalk4.green(formatTokens(nested.outputTokens))}` : "";
+          const nestedLine = `${indent}${chalk4.cyan(`#${nested.iteration}`)} ${chalk4.dim(nested.model)}${tokens}${outTokens} ${chalk4.dim(nestedElapsed + "s")} ${chalk4.cyan(spinner)}`;
+          lines.push(nestedLine);
+        }
+        for (const [_nestedId, nestedGadget] of this.nestedGadgets) {
+          if (nestedGadget.parentInvocationId === gadgetId) {
+            const indent = "  ".repeat(nestedGadget.depth + 1);
+            const nestedElapsed = ((Date.now() - nestedGadget.startTime) / 1e3).toFixed(1);
+            const nestedGadgetLine = `${indent}${chalk4.blue("\u23F5")} ${chalk4.dim(nestedGadget.name + "(...)")} ${chalk4.dim(nestedElapsed + "s")}`;
+            lines.push(nestedGadgetLine);
+          }
+        }
+      }
     }
+    this.lastRenderLineCount = lines.length;
+    this.target.write("\r" + lines.join("\n"));
     this.hasRendered = true;
   }
-  renderStreamingMode(spinner) {
+  /**
+   * Clears the previously rendered lines (for multi-line status display).
+   */
+  clearRenderedLines() {
+    if (!this.hasRendered || this.lastRenderLineCount === 0) return;
+    this.target.write("\r\x1B[K");
+    for (let i = 1; i < this.lastRenderLineCount; i++) {
+      this.target.write("\x1B[1A\x1B[K");
+    }
+    this.target.write("\r");
+  }
+  /**
+   * Format the streaming mode progress line (returns string, doesn't write).
+   */
+  formatStreamingLine(spinner) {
     const elapsed = ((Date.now() - this.callStartTime) / 1e3).toFixed(1);
     const outTokens = this.callOutputTokensEstimated ? Math.round(this.callOutputChars / FALLBACK_CHARS_PER_TOKEN) : this.callOutputTokens;
     const parts = [];
@@ -3468,7 +3607,7 @@ var StreamProgress = class {
     if (callCost > 0) {
       parts.push(chalk4.cyan(`$${formatCost(callCost)}`));
     }
-    this.target.write(`\r${parts.join(chalk4.dim(" | "))} ${chalk4.cyan(spinner)}`);
+    return `${parts.join(chalk4.dim(" | "))} ${chalk4.cyan(spinner)}`;
   }
   /**
    * Calculates live cost estimate for the current streaming call.
@@ -3505,7 +3644,10 @@ var StreamProgress = class {
     }
     return this.callInputTokens / limits.contextWindow * 100;
   }
-  renderCumulativeMode(spinner) {
+  /**
+   * Format the cumulative mode progress line (returns string, doesn't write).
+   */
+  formatCumulativeLine(spinner) {
     const elapsed = ((Date.now() - this.totalStartTime) / 1e3).toFixed(1);
     const parts = [];
     if (this.model) {
@@ -3521,10 +3663,10 @@ var StreamProgress = class {
       parts.push(chalk4.dim("cost:") + chalk4.cyan(` $${formatCost(this.totalCost)}`));
     }
     parts.push(chalk4.dim(`${elapsed}s`));
-    this.target.write(`\r${parts.join(chalk4.dim(" | "))} ${chalk4.cyan(spinner)}`);
+    return `${parts.join(chalk4.dim(" | "))} ${chalk4.cyan(spinner)}`;
   }
   /**
-   * Pauses the progress indicator and clears the line.
+   * Pauses the progress indicator and clears all rendered lines.
    * Can be resumed with start().
    */
   pause() {
@@ -3538,10 +3680,9 @@ var StreamProgress = class {
       this.interval = null;
     }
     this.isRunning = false;
-    if (this.hasRendered) {
-      this.target.write("\r\x1B[K\x1B[0G");
-      this.hasRendered = false;
-    }
+    this.clearRenderedLines();
+    this.hasRendered = false;
+    this.lastRenderLineCount = 0;
   }
   /**
    * Completes the progress indicator and clears the line.
@@ -4118,6 +4259,38 @@ Denied: ${result.reason ?? "by user"}`
       "Maximize efficiency by batching independent operations in a single response."
     ].join(" ")
   );
+  if (!options.quiet) {
+    builder.withNestedEventCallback((event) => {
+      if (event.type === "llm_call_start") {
+        const info = event.event;
+        const nestedId = `${event.gadgetInvocationId}:${info.iteration}`;
+        progress.addNestedAgent(
+          nestedId,
+          event.gadgetInvocationId,
+          event.depth,
+          info.model,
+          info.iteration,
+          info.inputTokens
+        );
+      } else if (event.type === "llm_call_end") {
+        const info = event.event;
+        const nestedId = `${event.gadgetInvocationId}:${info.iteration}`;
+        progress.updateNestedAgent(nestedId, info.outputTokens);
+        setTimeout(() => progress.removeNestedAgent(nestedId), 100);
+      } else if (event.type === "gadget_call") {
+        const gadgetEvent = event.event;
+        progress.addNestedGadget(
+          gadgetEvent.call.invocationId,
+          event.depth,
+          event.gadgetInvocationId,
+          gadgetEvent.call.gadgetName
+        );
+      } else if (event.type === "gadget_result") {
+        const resultEvent = event.event;
+        progress.removeNestedGadget(resultEvent.result.invocationId);
+      }
+    });
+  }
   let agent;
   if (options.image || options.audio) {
     const parts = [text(prompt)];
@@ -4142,10 +4315,22 @@ Denied: ${result.reason ?? "by user"}`
   try {
     for await (const event of agent.run()) {
       if (event.type === "text") {
-        progress.pause();
         textBuffer += event.content;
+      } else if (event.type === "gadget_call") {
+        flushTextBuffer();
+        if (!options.quiet) {
+          progress.addGadget(
+            event.call.invocationId,
+            event.call.gadgetName,
+            event.call.parameters
+          );
+          progress.start();
+        }
       } else if (event.type === "gadget_result") {
         flushTextBuffer();
+        if (!options.quiet) {
+          progress.removeGadget(event.result.invocationId);
+        }
         progress.pause();
         if (options.quiet) {
           if (event.result.gadgetName === "TellUser" && event.result.parameters?.message) {
@@ -4160,6 +4345,9 @@ Denied: ${result.reason ?? "by user"}`
 `
           );
         }
+        if (progress.hasInFlightGadgets()) {
+          progress.start();
+        }
       }
     }
   } catch (error) {