llmist 3.1.0 → 5.0.0

package/dist/index.cjs

@@ -3562,7 +3562,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;
@@ -3570,7 +3570,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;
@@ -3718,7 +3718,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) {
@@ -3958,7 +3958,7 @@ var init_stream_processor = __esm({
           options.mediaStore,
           options.agentConfig,
           options.subagentConfig,
-          options.onNestedEvent
+          options.onSubagentEvent
         );
       }
       /**
@@ -4917,8 +4917,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.
@@ -4996,7 +5000,72 @@ 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;
+            const usage = info.usage ?? (info.outputTokens ? {
+              inputTokens: info.inputTokens ?? 0,
+              outputTokens: info.outputTokens,
+              totalTokens: (info.inputTokens ?? 0) + info.outputTokens
+            } : void 0);
+            void this.hooks?.observers?.onLLMCallComplete?.({
+              iteration: info.iteration,
+              options: { model: info.model, messages: [] },
+              finishReason: info.finishReason ?? null,
+              usage,
+              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.
@@ -5228,7 +5297,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;
@@ -5246,6 +5315,7 @@ var init_agent = __esm({
                 gadgetResults.push(event);
               }
               yield event;
+              yield* this.flushPendingSubagentEvents();
             }
             if (!streamMetadata) {
               throw new Error("Stream processing completed without metadata event");
@@ -7000,6 +7070,9 @@ var init_gemini = __esm({
       async countTokens(messages, descriptor, _spec) {
         const client = this.client;
         const contents = this.convertMessagesToContents(messages);
+        if (!contents || contents.length === 0) {
+          return 0;
+        }
         try {
           const response = await client.models.countTokens({
             model: descriptor.name,
@@ -8822,7 +8895,7 @@ var init_builder = __esm({
       signal;
       trailingMessage;
       subagentConfig;
-      nestedEventCallback;
+      subagentEventCallback;
       parentContext;
       constructor(client) {
         this.client = client;
@@ -9321,38 +9394,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
@@ -9379,10 +9452,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
           };
         }
@@ -9457,20 +9530,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,
@@ -9484,20 +9559,57 @@ ${endPrefix}`
                 }
               },
               onLLMCallComplete: async (context) => {
-                onNestedEvent({
+                onSubagentEvent({
                   type: "llm_call_end",
                   gadgetInvocationId: invocationId,
                   depth,
                   event: {
                     iteration: context.iteration,
                     model: context.options.model,
+                    // Backward compat fields
+                    inputTokens: context.usage?.inputTokens,
                     outputTokens: context.usage?.outputTokens,
-                    finishReason: context.finishReason
+                    finishReason: context.finishReason ?? void 0,
+                    // Full usage object with cache details (for first-class display)
+                    usage: context.usage
+                    // Cost will be calculated by parent if it has model registry
                   }
                 });
                 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);
+                }
               }
             }
           };
@@ -9584,11 +9696,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,
@@ -9623,7 +9735,7 @@ ${endPrefix}`
           compactionConfig: this.compactionConfig,
           signal: this.signal,
           subagentConfig: this.subagentConfig,
-          onNestedEvent
+          onSubagentEvent
         };
       }
       ask(userPrompt) {
@@ -9780,11 +9892,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,
@@ -9819,7 +9931,7 @@ ${endPrefix}`
           compactionConfig: this.compactionConfig,
           signal: this.signal,
           subagentConfig: this.subagentConfig,
-          onNestedEvent
+          onSubagentEvent
         };
         return new Agent(AGENT_INTERNAL_KEY, options);
       }