llmist 3.1.0 → 4.0.0

package/dist/cli.cjs

@@ -3496,7 +3496,7 @@ var init_executor = __esm({
     init_exceptions();
     init_parser();
     GadgetExecutor = class {
-      constructor(registry, requestHumanInput, logger, defaultGadgetTimeoutMs, errorFormatterOptions, client, mediaStore, agentConfig, subagentConfig, onNestedEvent) {
+      constructor(registry, requestHumanInput, logger, defaultGadgetTimeoutMs, errorFormatterOptions, client, mediaStore, agentConfig, subagentConfig, onSubagentEvent) {
         this.registry = registry;
         this.requestHumanInput = requestHumanInput;
         this.defaultGadgetTimeoutMs = defaultGadgetTimeoutMs;
@@ -3504,7 +3504,7 @@ var init_executor = __esm({
         this.mediaStore = mediaStore;
         this.agentConfig = agentConfig;
         this.subagentConfig = subagentConfig;
-        this.onNestedEvent = onNestedEvent;
+        this.onSubagentEvent = onSubagentEvent;
         this.logger = logger ?? createLogger({ name: "llmist:executor" });
         this.errorFormatter = new GadgetExecutionErrorFormatter(errorFormatterOptions);
         this.argPrefix = errorFormatterOptions?.argPrefix ?? GADGET_ARG_PREFIX;
@@ -3652,7 +3652,7 @@ var init_executor = __esm({
             agentConfig: this.agentConfig,
             subagentConfig: this.subagentConfig,
             invocationId: call.invocationId,
-            onNestedEvent: this.onNestedEvent
+            onSubagentEvent: this.onSubagentEvent
           };
           let rawResult;
           if (timeoutMs && timeoutMs > 0) {
@@ -3892,7 +3892,7 @@ var init_stream_processor = __esm({
           options.mediaStore,
           options.agentConfig,
           options.subagentConfig,
-          options.onNestedEvent
+          options.onSubagentEvent
         );
       }
       /**
@@ -4851,8 +4851,12 @@ var init_agent = __esm({
       // Subagent configuration
       agentContextConfig;
       subagentConfig;
-      // Nested event callback for subagent gadgets
-      onNestedEvent;
+      // Subagent event callback for subagent gadgets
+      userSubagentEventCallback;
+      // Internal queue for yielding subagent events in run()
+      pendingSubagentEvents = [];
+      // Combined callback that queues events AND calls user callback
+      onSubagentEvent;
       /**
        * Creates a new Agent instance.
        * @internal This constructor is private. Use LLMist.createAgent() or AgentBuilder instead.
@@ -4930,7 +4934,71 @@ var init_agent = __esm({
           temperature: this.temperature
         };
         this.subagentConfig = options.subagentConfig;
-        this.onNestedEvent = options.onNestedEvent;
+        this.userSubagentEventCallback = options.onSubagentEvent;
+        this.onSubagentEvent = (event) => {
+          this.pendingSubagentEvents.push(event);
+          this.userSubagentEventCallback?.(event);
+          const subagentContext = {
+            parentGadgetInvocationId: event.gadgetInvocationId,
+            depth: event.depth
+          };
+          if (event.type === "llm_call_start") {
+            const info = event.event;
+            void this.hooks?.observers?.onLLMCallStart?.({
+              iteration: info.iteration,
+              options: { model: info.model, messages: [] },
+              logger: this.logger,
+              subagentContext
+            });
+          } else if (event.type === "llm_call_end") {
+            const info = event.event;
+            void this.hooks?.observers?.onLLMCallComplete?.({
+              iteration: info.iteration,
+              options: { model: info.model, messages: [] },
+              finishReason: info.finishReason ?? null,
+              usage: info.outputTokens ? {
+                inputTokens: info.inputTokens ?? 0,
+                outputTokens: info.outputTokens,
+                totalTokens: (info.inputTokens ?? 0) + info.outputTokens
+              } : void 0,
+              rawResponse: "",
+              finalMessage: "",
+              logger: this.logger,
+              subagentContext
+            });
+          } else if (event.type === "gadget_call") {
+            const gadgetEvent = event.event;
+            void this.hooks?.observers?.onGadgetExecutionStart?.({
+              iteration: 0,
+              gadgetName: gadgetEvent.call.gadgetName,
+              invocationId: gadgetEvent.call.invocationId,
+              parameters: gadgetEvent.call.parameters ?? {},
+              logger: this.logger,
+              subagentContext
+            });
+          } else if (event.type === "gadget_result") {
+            const resultEvent = event.event;
+            void this.hooks?.observers?.onGadgetExecutionComplete?.({
+              iteration: 0,
+              gadgetName: resultEvent.result.gadgetName ?? "unknown",
+              invocationId: resultEvent.result.invocationId,
+              parameters: {},
+              executionTimeMs: resultEvent.result.executionTimeMs ?? 0,
+              logger: this.logger,
+              subagentContext
+            });
+          }
+        };
+      }
+      /**
+       * Flush pending subagent events as StreamEvents.
+       * Called from run() to yield queued subagent events from subagent gadgets.
+       */
+      *flushPendingSubagentEvents() {
+        while (this.pendingSubagentEvents.length > 0) {
+          const event = this.pendingSubagentEvents.shift();
+          yield { type: "subagent_event", subagentEvent: event };
+        }
       }
       /**
        * Get the gadget registry for this agent.
@@ -5162,7 +5230,7 @@ var init_agent = __esm({
               mediaStore: this.mediaStore,
               agentConfig: this.agentContextConfig,
               subagentConfig: this.subagentConfig,
-              onNestedEvent: this.onNestedEvent
+              onSubagentEvent: this.onSubagentEvent
             });
             let streamMetadata = null;
             let gadgetCallCount = 0;
@@ -5180,6 +5248,7 @@ var init_agent = __esm({
                 gadgetResults.push(event);
               }
               yield event;
+              yield* this.flushPendingSubagentEvents();
             }
             if (!streamMetadata) {
               throw new Error("Stream processing completed without metadata event");
@@ -8756,7 +8825,7 @@ var init_builder = __esm({
       signal;
       trailingMessage;
       subagentConfig;
-      nestedEventCallback;
+      subagentEventCallback;
       parentContext;
       constructor(client) {
         this.client = client;
@@ -9255,38 +9324,38 @@ var init_builder = __esm({
         return this;
       }
       /**
-       * Set the callback for nested subagent events.
+       * Set the callback for subagent events.
        *
-       * Subagent gadgets (like BrowseWeb) can use ExecutionContext.onNestedEvent
+       * Subagent gadgets (like BrowseWeb) can use ExecutionContext.onSubagentEvent
        * to report their internal LLM calls and gadget executions in real-time.
        * This callback receives those events, enabling hierarchical progress display.
        *
-       * @param callback - Function to handle nested agent events
+       * @param callback - Function to handle subagent events
        * @returns This builder for chaining
        *
        * @example
        * ```typescript
-       * .withNestedEventCallback((event) => {
+       * .withSubagentEventCallback((event) => {
        *   if (event.type === "llm_call_start") {
-       *     console.log(`  Nested LLM #${event.event.iteration} starting...`);
+       *     console.log(`  Subagent LLM #${event.event.iteration} starting...`);
        *   } else if (event.type === "gadget_call") {
        *     console.log(`    ⏵ ${event.event.call.gadgetName}...`);
        *   }
        * })
        * ```
        */
-      withNestedEventCallback(callback) {
-        this.nestedEventCallback = callback;
+      withSubagentEventCallback(callback) {
+        this.subagentEventCallback = callback;
         return this;
       }
       /**
-       * Enable automatic nested event forwarding to parent agent.
+       * Enable automatic subagent event forwarding to parent agent.
        *
        * When building a subagent inside a gadget, call this method to automatically
        * forward all LLM calls and gadget events to the parent agent. This enables
        * hierarchical progress display without any manual event handling.
        *
-       * The method extracts `invocationId` and `onNestedEvent` from the execution
+       * The method extracts `invocationId` and `onSubagentEvent` from the execution
        * context and sets up automatic forwarding via hooks and event wrapping.
        *
        * @param ctx - ExecutionContext passed to the gadget's execute() method
@@ -9313,10 +9382,10 @@ var init_builder = __esm({
        * ```
        */
       withParentContext(ctx, depth = 1) {
-        if (ctx.onNestedEvent && ctx.invocationId) {
+        if (ctx.onSubagentEvent && ctx.invocationId) {
           this.parentContext = {
             invocationId: ctx.invocationId,
-            onNestedEvent: ctx.onNestedEvent,
+            onSubagentEvent: ctx.onSubagentEvent,
             depth
           };
         }
@@ -9391,20 +9460,22 @@ ${endPrefix}`
       /**
        * Compose the final hooks, including:
        * - Trailing message injection (if configured)
-       * - Nested event forwarding for LLM calls (if parentContext is set)
+       * - Subagent event forwarding for LLM calls (if parentContext is set)
        */
       composeHooks() {
         let hooks = this.hooks;
         if (this.parentContext) {
-          const { invocationId, onNestedEvent, depth } = this.parentContext;
+          const { invocationId, onSubagentEvent, depth } = this.parentContext;
           const existingOnLLMCallStart = hooks?.observers?.onLLMCallStart;
           const existingOnLLMCallComplete = hooks?.observers?.onLLMCallComplete;
+          const existingOnGadgetExecutionStart = hooks?.observers?.onGadgetExecutionStart;
+          const existingOnGadgetExecutionComplete = hooks?.observers?.onGadgetExecutionComplete;
           hooks = {
             ...hooks,
             observers: {
               ...hooks?.observers,
               onLLMCallStart: async (context) => {
-                onNestedEvent({
+                onSubagentEvent({
                   type: "llm_call_start",
                   gadgetInvocationId: invocationId,
                   depth,
@@ -9418,7 +9489,7 @@ ${endPrefix}`
                 }
               },
               onLLMCallComplete: async (context) => {
-                onNestedEvent({
+                onSubagentEvent({
                   type: "llm_call_end",
                   gadgetInvocationId: invocationId,
                   depth,
@@ -9432,6 +9503,38 @@ ${endPrefix}`
                 if (existingOnLLMCallComplete) {
                   await existingOnLLMCallComplete(context);
                 }
+              },
+              onGadgetExecutionStart: async (context) => {
+                onSubagentEvent({
+                  type: "gadget_call",
+                  gadgetInvocationId: invocationId,
+                  depth,
+                  event: {
+                    call: {
+                      invocationId: context.invocationId,
+                      gadgetName: context.gadgetName,
+                      parameters: context.parameters
+                    }
+                  }
+                });
+                if (existingOnGadgetExecutionStart) {
+                  await existingOnGadgetExecutionStart(context);
+                }
+              },
+              onGadgetExecutionComplete: async (context) => {
+                onSubagentEvent({
+                  type: "gadget_result",
+                  gadgetInvocationId: invocationId,
+                  depth,
+                  event: {
+                    result: {
+                      invocationId: context.invocationId
+                    }
+                  }
+                });
+                if (existingOnGadgetExecutionComplete) {
+                  await existingOnGadgetExecutionComplete(context);
+                }
               }
             }
           };
@@ -9518,11 +9621,11 @@ ${endPrefix}`
           this.client = new LLMistClass();
         }
         const registry = GadgetRegistry.from(this.gadgets);
-        let onNestedEvent = this.nestedEventCallback;
+        let onSubagentEvent = this.subagentEventCallback;
         if (this.parentContext) {
-          const { invocationId, onNestedEvent: parentCallback, depth } = this.parentContext;
-          const existingCallback = this.nestedEventCallback;
-          onNestedEvent = (event) => {
+          const { invocationId, onSubagentEvent: parentCallback, depth } = this.parentContext;
+          const existingCallback = this.subagentEventCallback;
+          onSubagentEvent = (event) => {
             parentCallback({
               ...event,
               gadgetInvocationId: invocationId,
@@ -9557,7 +9660,7 @@ ${endPrefix}`
           compactionConfig: this.compactionConfig,
           signal: this.signal,
           subagentConfig: this.subagentConfig,
-          onNestedEvent
+          onSubagentEvent
         };
       }
       ask(userPrompt) {
@@ -9714,11 +9817,11 @@ ${endPrefix}`
           this.client = new LLMistClass();
         }
         const registry = GadgetRegistry.from(this.gadgets);
-        let onNestedEvent = this.nestedEventCallback;
+        let onSubagentEvent = this.subagentEventCallback;
         if (this.parentContext) {
-          const { invocationId, onNestedEvent: parentCallback, depth } = this.parentContext;
-          const existingCallback = this.nestedEventCallback;
-          onNestedEvent = (event) => {
+          const { invocationId, onSubagentEvent: parentCallback, depth } = this.parentContext;
+          const existingCallback = this.subagentEventCallback;
+          onSubagentEvent = (event) => {
             parentCallback({
               ...event,
               gadgetInvocationId: invocationId,
@@ -9753,7 +9856,7 @@ ${endPrefix}`
           compactionConfig: this.compactionConfig,
           signal: this.signal,
           subagentConfig: this.subagentConfig,
-          onNestedEvent
+          onSubagentEvent
         };
         return new Agent(AGENT_INTERNAL_KEY, options);
       }
@@ -9848,7 +9951,7 @@ var import_commander2 = require("commander");
 // package.json
 var package_default = {
   name: "llmist",
-  version: "3.0.0",
+  version: "3.1.0",
   description: "TypeScript LLM client with streaming tool execution. Tools fire mid-stream. Built-in function calling works with any model\u2014no structured outputs or native tool support required.",
   type: "module",
   main: "dist/index.cjs",
@@ -12859,20 +12962,53 @@ function renderOverallSummary(metadata) {
   }
   return parts.join(import_chalk3.default.dim(" | "));
 }
-function formatParametersInline(params) {
+function getRawValue(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "boolean" || typeof value === "number") {
+    return String(value);
+  }
+  return JSON.stringify(value);
+}
+function truncateValue(str, maxLen) {
+  if (maxLen <= 0) return "";
+  if (str.length <= maxLen) return str;
+  return `${str.slice(0, maxLen)}\u2026`;
+}
+function formatParametersInline(params, maxWidth) {
   if (!params || Object.keys(params).length === 0) {
     return "";
   }
-  return Object.entries(params).map(([key, value]) => {
-    let formatted;
-    if (typeof value === "string") {
-      formatted = value.length > 30 ? `${value.slice(0, 30)}\u2026` : value;
-    } else if (typeof value === "boolean" || typeof value === "number") {
-      formatted = String(value);
+  const entries = Object.entries(params);
+  const defaultLimit = 30;
+  const rawValues = entries.map(([, value]) => getRawValue(value));
+  const overhead = entries.reduce((sum, [key], i) => {
+    return sum + key.length + 1 + (i > 0 ? 2 : 0);
+  }, 0);
+  let limits;
+  if (maxWidth && maxWidth > overhead) {
+    const availableForValues = maxWidth - overhead;
+    const totalRawLength = rawValues.reduce((sum, v) => sum + v.length, 0);
+    if (totalRawLength <= availableForValues) {
+      limits = rawValues.map(() => Infinity);
     } else {
-      const json = JSON.stringify(value);
-      formatted = json.length > 30 ? `${json.slice(0, 30)}\u2026` : json;
+      const minPerValue = 10;
+      const minTotal = entries.length * minPerValue;
+      if (availableForValues <= minTotal) {
+        limits = rawValues.map(() => Math.max(1, Math.floor(availableForValues / entries.length)));
+      } else {
+        limits = rawValues.map((v) => {
+          const proportion = v.length / totalRawLength;
+          return Math.max(minPerValue, Math.floor(proportion * availableForValues));
+        });
+      }
     }
+  } else {
+    limits = rawValues.map(() => defaultLimit);
+  }
+  return entries.map(([key, _], i) => {
+    const formatted = truncateValue(rawValues[i], limits[i]);
     return `${import_chalk3.default.dim(key)}${import_chalk3.default.dim("=")}${import_chalk3.default.cyan(formatted)}`;
   }).join(import_chalk3.default.dim(", "));
 }
@@ -12908,25 +13044,28 @@ function formatMediaLine(media) {
   return `${import_chalk3.default.dim("[")}${icon} ${id} ${mimeType} ${size}${import_chalk3.default.dim("]")} ${import_chalk3.default.dim("\u2192")} ${path6}`;
 }
 function formatGadgetSummary2(result) {
+  const terminalWidth = process.stdout.columns || 80;
   const gadgetLabel = import_chalk3.default.magenta.bold(result.gadgetName);
-  const timeLabel = import_chalk3.default.dim(
-    result.executionTimeMs >= 1e3 ? `${(result.executionTimeMs / 1e3).toFixed(1)}s` : `${Math.round(result.executionTimeMs)}ms`
-  );
-  const paramsStr = formatParametersInline(result.parameters);
-  const paramsLabel = paramsStr ? `${import_chalk3.default.dim("(")}${paramsStr}${import_chalk3.default.dim(")")}` : "";
-  if (result.error) {
-    const errorMsg = result.error.length > 50 ? `${result.error.slice(0, 50)}\u2026` : result.error;
-    return `${import_chalk3.default.red("\u2717")} ${gadgetLabel}${paramsLabel} ${import_chalk3.default.red("error:")} ${errorMsg} ${timeLabel}`;
-  }
-  let outputLabel;
+  const timeStr = result.executionTimeMs >= 1e3 ? `${(result.executionTimeMs / 1e3).toFixed(1)}s` : `${Math.round(result.executionTimeMs)}ms`;
+  const timeLabel = import_chalk3.default.dim(timeStr);
+  let outputStr;
   if (result.tokenCount !== void 0 && result.tokenCount > 0) {
-    outputLabel = import_chalk3.default.green(`${formatTokens(result.tokenCount)} tokens`);
+    outputStr = `${formatTokens(result.tokenCount)} tokens`;
   } else if (result.result) {
     const outputBytes = Buffer.byteLength(result.result, "utf-8");
-    outputLabel = outputBytes > 0 ? import_chalk3.default.green(formatBytes(outputBytes)) : import_chalk3.default.dim("no output");
+    outputStr = outputBytes > 0 ? formatBytes(outputBytes) : "no output";
   } else {
-    outputLabel = import_chalk3.default.dim("no output");
+    outputStr = "no output";
   }
+  const fixedLength = 2 + result.gadgetName.length + 2 + 3 + outputStr.length + 1 + timeStr.length;
+  const availableForParams = Math.max(40, terminalWidth - fixedLength - 2);
+  const paramsStr = formatParametersInline(result.parameters, availableForParams);
+  const paramsLabel = paramsStr ? `${import_chalk3.default.dim("(")}${paramsStr}${import_chalk3.default.dim(")")}` : "";
+  if (result.error) {
+    const errorMsg = result.error.length > 50 ? `${result.error.slice(0, 50)}\u2026` : result.error;
+    return `${import_chalk3.default.red("\u2717")} ${gadgetLabel}${paramsLabel} ${import_chalk3.default.red("error:")} ${errorMsg} ${timeLabel}`;
+  }
+  const outputLabel = outputStr === "no output" ? import_chalk3.default.dim(outputStr) : import_chalk3.default.green(outputStr);
   const icon = result.breaksLoop ? import_chalk3.default.yellow("\u23F9") : import_chalk3.default.green("\u2713");
   let summaryLine = `${icon} ${gadgetLabel}${paramsLabel} ${import_chalk3.default.dim("\u2192")} ${outputLabel} ${timeLabel}`;
   if (result.media && result.media.length > 0) {
@@ -13193,6 +13332,18 @@ var StreamProgress = class {
       this.render();
     }
   }
+  /**
+   * Mark a nested gadget as completed (keeps it visible with ✓ indicator).
+   */
+  completeNestedGadget(id) {
+    const gadget = this.nestedGadgets.get(id);
+    if (gadget) {
+      gadget.completed = true;
+      if (this.isRunning && this.isTTY) {
+        this.render();
+      }
+    }
+  }
   /**
    * Starts a new LLM call. Switches to streaming mode.
    * @param model - Model name being used
@@ -13341,11 +13492,12 @@ var StreamProgress = class {
           const nestedLine = `${indent}${import_chalk4.default.cyan(`#${nested.iteration}`)} ${import_chalk4.default.dim(nested.model)}${tokens}${outTokens} ${import_chalk4.default.dim(nestedElapsed + "s")} ${import_chalk4.default.cyan(spinner)}`;
           lines.push(nestedLine);
         }
-        for (const [_nestedId, nestedGadget] of this.nestedGadgets) {
+        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}${import_chalk4.default.blue("\u23F5")} ${import_chalk4.default.dim(nestedGadget.name + "(...)")} ${import_chalk4.default.dim(nestedElapsed + "s")}`;
+            const icon = nestedGadget.completed ? import_chalk4.default.green("\u2713") : import_chalk4.default.blue("\u23F5");
+            const nestedGadgetLine = `${indent}${icon} ${import_chalk4.default.dim(nestedGadget.name + "(...)")} ${import_chalk4.default.dim(nestedElapsed + "s")}`;
             lines.push(nestedGadgetLine);
           }
         }
@@ -14056,34 +14208,34 @@ Denied: ${result.reason ?? "by user"}`
     ].join(" ")
   );
   if (!options.quiet) {
-    builder.withNestedEventCallback((event) => {
-      if (event.type === "llm_call_start") {
-        const info = event.event;
-        const nestedId = `${event.gadgetInvocationId}:${info.iteration}`;
+    builder.withSubagentEventCallback((subagentEvent) => {
+      if (subagentEvent.type === "llm_call_start") {
+        const info = subagentEvent.event;
+        const subagentId = `${subagentEvent.gadgetInvocationId}:${info.iteration}`;
         progress.addNestedAgent(
-          nestedId,
-          event.gadgetInvocationId,
-          event.depth,
+          subagentId,
+          subagentEvent.gadgetInvocationId,
+          subagentEvent.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;
+      } else if (subagentEvent.type === "llm_call_end") {
+        const info = subagentEvent.event;
+        const subagentId = `${subagentEvent.gadgetInvocationId}:${info.iteration}`;
+        progress.updateNestedAgent(subagentId, info.outputTokens);
+        setTimeout(() => progress.removeNestedAgent(subagentId), 100);
+      } else if (subagentEvent.type === "gadget_call") {
+        const gadgetEvent = subagentEvent.event;
         progress.addNestedGadget(
           gadgetEvent.call.invocationId,
-          event.depth,
-          event.gadgetInvocationId,
+          subagentEvent.depth,
+          subagentEvent.gadgetInvocationId,
           gadgetEvent.call.gadgetName
         );
-      } else if (event.type === "gadget_result") {
-        const resultEvent = event.event;
-        progress.removeNestedGadget(resultEvent.result.invocationId);
+      } else if (subagentEvent.type === "gadget_result") {
+        const resultEvent = subagentEvent.event;
+        progress.completeNestedGadget(resultEvent.result.invocationId);
       }
     });
   }
@@ -14144,6 +14296,7 @@ Denied: ${result.reason ?? "by user"}`
         if (progress.hasInFlightGadgets()) {
           progress.start();
         }
+      } else if (event.type === "subagent_event") {
       }
     }
   } catch (error) {