llmist 10.2.1 → 10.3.1

package/dist/index.cjs

@@ -8356,12 +8356,10 @@ var init_stream_processor = __esm({
           endPrefix: options.gadgetEndPrefix,
           argPrefix: options.gadgetArgPrefix
         });
-        const wrappedOnSubagentEvent = options.onSubagentEvent ? (event) => {
-          this.completedResultsQueue.push({
-            type: "subagent_event",
-            subagentEvent: event
-          });
-          options.onSubagentEvent?.(event);
+        const onSubagentEvent = options.onSubagentEvent;
+        const wrappedOnSubagentEvent = onSubagentEvent ? (event) => {
+          onSubagentEvent(event);
+          this.completedResultsQueue.push({ type: "subagent_event", subagentEvent: event });
         } : void 0;
         this.executor = new GadgetExecutor(
           options.registry,
@@ -9191,11 +9189,16 @@ var init_agent = __esm({
       // Subagent configuration
       agentContextConfig;
       subagentConfig;
-      // Subagent event callback for subagent gadgets
+      /**
+       * User-provided callback for subagent events (from withSubagentEventHandler).
+       * Called synchronously before events are queued for streaming.
+       */
       userSubagentEventCallback;
-      // Internal queue for yielding subagent events in run()
-      pendingSubagentEvents = [];
-      // Combined callback that queues events AND calls user callback
+      /**
+       * Internal callback passed to StreamProcessor.
+       * StreamProcessor wraps this to: (1) call userSubagentEventCallback, then (2) queue for streaming.
+       * @see StreamProcessor.wrappedOnSubagentEvent for the unified event streaming architecture.
+       */
       onSubagentEvent;
       // Counter for generating synthetic invocation IDs for wrapped text content
       syntheticInvocationCounter = 0;
@@ -9289,73 +9292,9 @@ var init_agent = __esm({
         this.baseDepth = options.baseDepth ?? 0;
         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();
-          if (event) {
-            yield { type: "subagent_event", subagentEvent: event };
-          }
-        }
-      }
       /**
        * Get the gadget registry for this agent.
        *
@@ -9632,7 +9571,6 @@ var init_agent = __esm({
                 gadgetResults.push(event);
               }
               yield event;
-              yield* this.flushPendingSubagentEvents();
             }
             if (!streamMetadata) {
               throw new Error("Stream processing completed without metadata event");
@@ -10794,7 +10732,14 @@ var init_builder = __esm({
             observers: {
               ...existingHooks.observers,
               onLLMCallStart: async (info) => {
-                await existingHooks.observers?.onLLMCallStart?.(info);
+                const infoWithSubagent = {
+                  ...info,
+                  subagentContext: {
+                    parentGadgetInvocationId: invocationId,
+                    depth
+                  }
+                };
+                await existingHooks.observers?.onLLMCallStart?.(infoWithSubagent);
                 ctx.onSubagentEvent({
                   type: "llm_call_start",
                   event: {
@@ -10807,7 +10752,14 @@ var init_builder = __esm({
                 });
               },
               onGadgetExecutionStart: async (gadgetCtx) => {
-                await existingHooks.observers?.onGadgetExecutionStart?.(gadgetCtx);
+                const ctxWithSubagent = {
+                  ...gadgetCtx,
+                  subagentContext: {
+                    parentGadgetInvocationId: invocationId,
+                    depth
+                  }
+                };
+                await existingHooks.observers?.onGadgetExecutionStart?.(ctxWithSubagent);
                 ctx.onSubagentEvent({
                   type: "gadget_call",
                   event: {
@@ -10825,7 +10777,14 @@ var init_builder = __esm({
                 });
               },
               onLLMCallComplete: async (info) => {
-                await existingHooks.observers?.onLLMCallComplete?.(info);
+                const infoWithSubagent = {
+                  ...info,
+                  subagentContext: {
+                    parentGadgetInvocationId: invocationId,
+                    depth
+                  }
+                };
+                await existingHooks.observers?.onLLMCallComplete?.(infoWithSubagent);
                 ctx.onSubagentEvent({
                   type: "llm_call_end",
                   event: {