llmist 2.6.0 → 3.1.0

package/dist/{chunk-364PEMVT.js → chunk-JCFPJMRQ.js}

@@ -320,13 +320,13 @@ var init_prompt_config = __esm({
 });
 
 // src/core/messages.ts
-function normalizeContent(content) {
+function normalizeMessageContent(content) {
   if (typeof content === "string") {
     return [{ type: "text", text: content }];
   }
   return content;
 }
-function extractText(content) {
+function extractMessageText(content) {
   if (typeof content === "string") {
     return content;
   }
@@ -686,7 +686,17 @@ Produces: { "items": ["first", "second"] }`);
         this.messages.push({ role: "user", content: parts });
         return this;
       }
-      addGadgetCall(gadget, parameters, result, media, mediaIds) {
+      /**
+       * Record a gadget execution result in the message history.
+       * Creates an assistant message with the gadget invocation and a user message with the result.
+       *
+       * @param gadget - Name of the gadget that was executed
+       * @param parameters - Parameters that were passed to the gadget
+       * @param result - Text result from the gadget execution
+       * @param media - Optional media outputs from the gadget
+       * @param mediaIds - Optional IDs for the media outputs
+       */
+      addGadgetCallResult(gadget, parameters, result, media, mediaIds) {
         const paramStr = this.formatBlockParameters(parameters, "");
         this.messages.push({
           role: "assistant",
@@ -1267,21 +1277,21 @@ var init_media_store = __esm({
 });
 
 // src/gadgets/exceptions.ts
-var BreakLoopException, HumanInputException, TimeoutException, AbortError;
+var TaskCompletionSignal, HumanInputRequiredException, TimeoutException, AbortException;
 var init_exceptions = __esm({
   "src/gadgets/exceptions.ts"() {
     "use strict";
-    BreakLoopException = class extends Error {
+    TaskCompletionSignal = class extends Error {
       constructor(message) {
         super(message ?? "Agent loop terminated by gadget");
-        this.name = "BreakLoopException";
+        this.name = "TaskCompletionSignal";
       }
     };
-    HumanInputException = class extends Error {
+    HumanInputRequiredException = class extends Error {
       question;
       constructor(question) {
         super(`Human input required: ${question}`);
-        this.name = "HumanInputException";
+        this.name = "HumanInputRequiredException";
         this.question = question;
       }
     };
@@ -1295,10 +1305,10 @@ var init_exceptions = __esm({
         this.timeoutMs = timeoutMs;
       }
     };
-    AbortError = class extends Error {
+    AbortException = class extends Error {
       constructor(message) {
         super(message || "Gadget execution was aborted");
-        this.name = "AbortError";
+        this.name = "AbortException";
       }
     };
   }
@@ -1387,7 +1397,7 @@ var init_schema_to_json = __esm({
 });
 
 // src/gadgets/gadget.ts
-function formatParamsAsBlock(params, prefix = "", argPrefix = GADGET_ARG_PREFIX) {
+function formatParamsForBlockExample(params, prefix = "", argPrefix = GADGET_ARG_PREFIX) {
   const lines = [];
   for (const [key, value] of Object.entries(params)) {
     const fullPath = prefix ? `${prefix}/${key}` : key;
@@ -1395,14 +1405,14 @@ function formatParamsAsBlock(params, prefix = "", argPrefix = GADGET_ARG_PREFIX)
       value.forEach((item, index) => {
         const itemPath = `${fullPath}/${index}`;
         if (typeof item === "object" && item !== null) {
-          lines.push(formatParamsAsBlock(item, itemPath, argPrefix));
+          lines.push(formatParamsForBlockExample(item, itemPath, argPrefix));
         } else {
           lines.push(`${argPrefix}${itemPath}`);
           lines.push(String(item));
         }
       });
     } else if (typeof value === "object" && value !== null) {
-      lines.push(formatParamsAsBlock(value, fullPath, argPrefix));
+      lines.push(formatParamsForBlockExample(value, fullPath, argPrefix));
     } else {
       lines.push(`${argPrefix}${fullPath}`);
       lines.push(String(value));
@@ -1491,7 +1501,7 @@ function formatSchemaAsPlainText(schema, indent = "", atRoot = true) {
   }
   return lines.join("\n");
 }
-var BaseGadget;
+var AbstractGadget;
 var init_gadget = __esm({
   "src/gadgets/gadget.ts"() {
     "use strict";
@@ -1499,7 +1509,7 @@ var init_gadget = __esm({
     init_exceptions();
     init_schema_to_json();
     init_schema_validator();
-    BaseGadget = class {
+    AbstractGadget = class {
       /**
        * The name of the gadget. Used for identification when LLM calls it.
        * If not provided, defaults to the class name.
@@ -1527,14 +1537,14 @@ var init_gadget = __esm({
        */
       examples;
       /**
-       * Throws an AbortError if the execution has been aborted.
+       * Throws an AbortException if the execution has been aborted.
        *
        * Call this at key checkpoints in long-running gadgets to allow early exit
        * when the gadget has been cancelled (e.g., due to timeout). This enables
        * resource cleanup and prevents unnecessary work after cancellation.
        *
        * @param ctx - The execution context containing the abort signal
-       * @throws AbortError if ctx.signal.aborted is true
+       * @throws AbortException if ctx.signal.aborted is true
        *
        * @example
        * ```typescript
@@ -1559,7 +1569,7 @@ var init_gadget = __esm({
        */
       throwIfAborted(ctx) {
         if (ctx?.signal?.aborted) {
-          throw new AbortError();
+          throw new AbortException();
         }
       }
       /**
@@ -1701,7 +1711,7 @@ var init_gadget = __esm({
             }
             parts.push(`${effectiveStartPrefix}${gadgetName}`);
             parts.push(
-              formatParamsAsBlock(example.params, "", effectiveArgPrefix)
+              formatParamsForBlockExample(example.params, "", effectiveArgPrefix)
             );
             parts.push(effectiveEndPrefix);
             if (example.output !== void 0) {
@@ -1719,7 +1729,7 @@ var init_gadget = __esm({
 
 // src/gadgets/create-gadget.ts
 function createGadget(config) {
-  class DynamicGadget extends BaseGadget {
+  class DynamicGadget extends AbstractGadget {
     name = config.name;
     description = config.description;
     parameterSchema = config.schema;
@@ -2357,8 +2367,8 @@ var init_conversation_manager = __esm({
       addAssistantMessage(content) {
         this.historyBuilder.addAssistant(content);
       }
-      addGadgetCall(gadgetName, parameters, result, media, mediaIds) {
-        this.historyBuilder.addGadgetCall(gadgetName, parameters, result, media, mediaIds);
+      addGadgetCallResult(gadgetName, parameters, result, media, mediaIds) {
+        this.historyBuilder.addGadgetCallResult(gadgetName, parameters, result, media, mediaIds);
       }
       getMessages() {
         return [...this.baseMessages, ...this.initialMessages, ...this.historyBuilder.build()];
@@ -2378,7 +2388,7 @@ var init_conversation_manager = __esm({
           if (msg.role === "user") {
             this.historyBuilder.addUser(msg.content);
           } else if (msg.role === "assistant") {
-            this.historyBuilder.addAssistant(extractText(msg.content));
+            this.historyBuilder.addAssistant(extractMessageText(msg.content));
           }
         }
       }
@@ -3258,12 +3268,12 @@ var init_cost_reporting_client = __esm({
 });
 
 // src/gadgets/error-formatter.ts
-var GadgetErrorFormatter;
+var GadgetExecutionErrorFormatter;
 var init_error_formatter = __esm({
   "src/gadgets/error-formatter.ts"() {
     "use strict";
     init_constants();
-    GadgetErrorFormatter = class {
+    GadgetExecutionErrorFormatter = class {
       argPrefix;
       startPrefix;
       endPrefix;
@@ -3349,16 +3359,16 @@ function stripMarkdownFences(content) {
   cleaned = cleaned.replace(closingFence, "");
   return cleaned.trim();
 }
-var globalInvocationCounter, StreamParser;
+var globalInvocationCounter, GadgetCallParser;
 var init_parser = __esm({
   "src/gadgets/parser.ts"() {
     "use strict";
     init_constants();
     init_block_params();
     globalInvocationCounter = 0;
-    StreamParser = class {
+    GadgetCallParser = class {
       buffer = "";
-      lastReportedTextLength = 0;
+      lastEmittedTextOffset = 0;
       startPrefix;
       endPrefix;
       argPrefix;
@@ -3367,16 +3377,20 @@ var init_parser = __esm({
         this.endPrefix = options.endPrefix ?? GADGET_END_PREFIX;
         this.argPrefix = options.argPrefix ?? GADGET_ARG_PREFIX;
       }
-      takeTextUntil(index) {
-        if (index <= this.lastReportedTextLength) {
+      /**
+       * Extract and consume text up to the given index.
+       * Returns undefined if no meaningful text to emit.
+       */
+      extractTextSegment(index) {
+        if (index <= this.lastEmittedTextOffset) {
           return void 0;
         }
-        const segment = this.buffer.slice(this.lastReportedTextLength, index);
-        this.lastReportedTextLength = index;
+        const segment = this.buffer.slice(this.lastEmittedTextOffset, index);
+        this.lastEmittedTextOffset = index;
         return segment.trim().length > 0 ? segment : void 0;
       }
       /**
-       * Parse gadget name with optional invocation ID and dependencies.
+       * Parse gadget invocation metadata from the header line.
        *
        * Supported formats:
        * - `GadgetName` - Auto-generate ID, no dependencies
@@ -3385,24 +3399,24 @@ var init_parser = __esm({
        *
        * Dependencies must be comma-separated invocation IDs.
        */
-      parseGadgetName(gadgetName) {
-        const parts = gadgetName.split(":");
+      parseInvocationMetadata(headerLine) {
+        const parts = headerLine.split(":");
         if (parts.length === 1) {
           return {
-            actualName: parts[0],
+            gadgetName: parts[0],
             invocationId: `gadget_${++globalInvocationCounter}`,
             dependencies: []
           };
         } else if (parts.length === 2) {
           return {
-            actualName: parts[0],
+            gadgetName: parts[0],
             invocationId: parts[1].trim(),
             dependencies: []
           };
         } else {
           const deps = parts[2].split(",").map((d) => d.trim()).filter((d) => d.length > 0);
           return {
-            actualName: parts[0],
+            gadgetName: parts[0],
             invocationId: parts[1].trim(),
             dependencies: deps
           };
@@ -3434,19 +3448,15 @@ var init_parser = __esm({
         while (true) {
           const partStartIndex = this.buffer.indexOf(this.startPrefix, startIndex);
           if (partStartIndex === -1) break;
-          const textBefore = this.takeTextUntil(partStartIndex);
+          const textBefore = this.extractTextSegment(partStartIndex);
           if (textBefore !== void 0) {
             yield { type: "text", content: textBefore };
           }
           const metadataStartIndex = partStartIndex + this.startPrefix.length;
           const metadataEndIndex = this.buffer.indexOf("\n", metadataStartIndex);
           if (metadataEndIndex === -1) break;
-          const gadgetName = this.buffer.substring(metadataStartIndex, metadataEndIndex).trim();
-          const {
-            actualName: actualGadgetName,
-            invocationId,
-            dependencies
-          } = this.parseGadgetName(gadgetName);
+          const headerLine = this.buffer.substring(metadataStartIndex, metadataEndIndex).trim();
+          const { gadgetName, invocationId, dependencies } = this.parseInvocationMetadata(headerLine);
           const contentStartIndex = metadataEndIndex + 1;
           let partEndIndex;
           let endMarkerLength = 0;
@@ -3466,7 +3476,7 @@ var init_parser = __esm({
           yield {
             type: "gadget_call",
             call: {
-              gadgetName: actualGadgetName,
+              gadgetName,
               invocationId,
               parametersRaw,
               parameters,
@@ -3475,37 +3485,33 @@ var init_parser = __esm({
             }
           };
           startIndex = partEndIndex + endMarkerLength;
-          this.lastReportedTextLength = startIndex;
+          this.lastEmittedTextOffset = startIndex;
         }
         if (startIndex > 0) {
           this.buffer = this.buffer.substring(startIndex);
-          this.lastReportedTextLength = 0;
+          this.lastEmittedTextOffset = 0;
         }
       }
       // Finalize parsing and return remaining text or incomplete gadgets
       *finalize() {
-        const startIndex = this.buffer.indexOf(this.startPrefix, this.lastReportedTextLength);
+        const startIndex = this.buffer.indexOf(this.startPrefix, this.lastEmittedTextOffset);
         if (startIndex !== -1) {
-          const textBefore = this.takeTextUntil(startIndex);
+          const textBefore = this.extractTextSegment(startIndex);
           if (textBefore !== void 0) {
             yield { type: "text", content: textBefore };
           }
           const metadataStartIndex = startIndex + this.startPrefix.length;
           const metadataEndIndex = this.buffer.indexOf("\n", metadataStartIndex);
           if (metadataEndIndex !== -1) {
-            const gadgetName = this.buffer.substring(metadataStartIndex, metadataEndIndex).trim();
-            const {
-              actualName: actualGadgetName,
-              invocationId,
-              dependencies
-            } = this.parseGadgetName(gadgetName);
+            const headerLine = this.buffer.substring(metadataStartIndex, metadataEndIndex).trim();
+            const { gadgetName, invocationId, dependencies } = this.parseInvocationMetadata(headerLine);
             const contentStartIndex = metadataEndIndex + 1;
             const parametersRaw = this.buffer.substring(contentStartIndex).trim();
             const { parameters, parseError } = this.parseParameters(parametersRaw);
             yield {
               type: "gadget_call",
               call: {
-                gadgetName: actualGadgetName,
+                gadgetName,
                 invocationId,
                 parametersRaw,
                 parameters,
@@ -3516,7 +3522,7 @@ var init_parser = __esm({
             return;
           }
         }
-        const remainingText = this.takeTextUntil(this.buffer.length);
+        const remainingText = this.extractTextSegment(this.buffer.length);
         if (remainingText !== void 0) {
           yield { type: "text", content: remainingText };
         }
@@ -3524,7 +3530,7 @@ var init_parser = __esm({
       // Reset parser state (note: global invocation counter is NOT reset to ensure unique IDs)
       reset() {
         this.buffer = "";
-        this.lastReportedTextLength = 0;
+        this.lastEmittedTextOffset = 0;
       }
     };
   }
@@ -3543,14 +3549,17 @@ var init_executor = __esm({
     init_exceptions();
     init_parser();
     GadgetExecutor = class {
-      constructor(registry, onHumanInputRequired, logger, defaultGadgetTimeoutMs, errorFormatterOptions, client, mediaStore) {
+      constructor(registry, requestHumanInput, logger, defaultGadgetTimeoutMs, errorFormatterOptions, client, mediaStore, agentConfig, subagentConfig, onNestedEvent) {
         this.registry = registry;
-        this.onHumanInputRequired = onHumanInputRequired;
+        this.requestHumanInput = requestHumanInput;
         this.defaultGadgetTimeoutMs = defaultGadgetTimeoutMs;
         this.client = client;
         this.mediaStore = mediaStore;
+        this.agentConfig = agentConfig;
+        this.subagentConfig = subagentConfig;
+        this.onNestedEvent = onNestedEvent;
         this.logger = logger ?? createLogger({ name: "llmist:executor" });
-        this.errorFormatter = new GadgetErrorFormatter(errorFormatterOptions);
+        this.errorFormatter = new GadgetExecutionErrorFormatter(errorFormatterOptions);
         this.argPrefix = errorFormatterOptions?.argPrefix ?? GADGET_ARG_PREFIX;
       }
       logger;
@@ -3570,11 +3579,11 @@ var init_executor = __esm({
         });
       }
       /**
-       * Normalizes gadget execute result to consistent format.
+       * Unify gadget execute result to consistent internal format.
        * Handles string returns (backwards compat), object returns with cost,
        * and object returns with media.
        */
-      normalizeExecuteResult(raw) {
+      unifyExecuteResult(raw) {
         if (typeof raw === "string") {
           return { result: raw, cost: 0 };
         }
@@ -3692,7 +3701,11 @@ var init_executor = __esm({
           const ctx = {
             reportCost,
             llmist: this.client ? new CostReportingLLMistWrapper(this.client, reportCost) : void 0,
-            signal: abortController.signal
+            signal: abortController.signal,
+            agentConfig: this.agentConfig,
+            subagentConfig: this.subagentConfig,
+            invocationId: call.invocationId,
+            onNestedEvent: this.onNestedEvent
           };
           let rawResult;
           if (timeoutMs && timeoutMs > 0) {
@@ -3707,7 +3720,7 @@ var init_executor = __esm({
           } else {
             rawResult = await Promise.resolve(gadget.execute(validatedParameters, ctx));
           }
-          const { result, media, cost: returnCost } = this.normalizeExecuteResult(rawResult);
+          const { result, media, cost: returnCost } = this.unifyExecuteResult(rawResult);
           const totalCost = callbackCost + returnCost;
           let mediaIds;
           let storedMedia;
@@ -3753,7 +3766,7 @@ var init_executor = __esm({
             storedMedia
           };
         } catch (error) {
-          if (error instanceof BreakLoopException) {
+          if (error instanceof TaskCompletionSignal) {
             this.logger.info("Gadget requested loop termination", {
               gadgetName: call.gadgetName,
               message: error.message
@@ -3781,7 +3794,7 @@ var init_executor = __esm({
               executionTimeMs: Date.now() - startTime
             };
           }
-          if (error instanceof AbortError) {
+          if (error instanceof AbortException) {
             this.logger.info("Gadget execution was aborted", {
               gadgetName: call.gadgetName,
               executionTimeMs: Date.now() - startTime
@@ -3794,14 +3807,14 @@ var init_executor = __esm({
               executionTimeMs: Date.now() - startTime
             };
           }
-          if (error instanceof HumanInputException) {
+          if (error instanceof HumanInputRequiredException) {
             this.logger.info("Gadget requested human input", {
               gadgetName: call.gadgetName,
               question: error.question
             });
-            if (this.onHumanInputRequired) {
+            if (this.requestHumanInput) {
               try {
-                const answer = await this.onHumanInputRequired(error.question);
+                const answer = await this.requestHumanInput(error.question);
                 this.logger.debug("Human input received", {
                   gadgetName: call.gadgetName,
                   answerLength: answer.length
@@ -3899,13 +3912,13 @@ var init_stream_processor = __esm({
       parser;
       executor;
       stopOnGadgetError;
-      shouldContinueAfterError;
-      accumulatedText = "";
-      shouldStopExecution = false;
+      canRecoverFromGadgetError;
+      responseText = "";
+      executionHalted = false;
       observerFailureCount = 0;
       // Dependency tracking for gadget execution DAG
       /** Gadgets waiting for their dependencies to complete */
-      pendingGadgets = /* @__PURE__ */ new Map();
+      gadgetsAwaitingDependencies = /* @__PURE__ */ new Map();
       /** Completed gadget results, keyed by invocation ID */
       completedResults = /* @__PURE__ */ new Map();
       /** Invocation IDs of gadgets that have failed (error or skipped due to dependency) */
@@ -3916,27 +3929,36 @@ var init_stream_processor = __esm({
         this.hooks = options.hooks ?? {};
         this.logger = options.logger ?? createLogger({ name: "llmist:stream-processor" });
         this.stopOnGadgetError = options.stopOnGadgetError ?? true;
-        this.shouldContinueAfterError = options.shouldContinueAfterError;
-        this.parser = new StreamParser({
+        this.canRecoverFromGadgetError = options.canRecoverFromGadgetError;
+        this.parser = new GadgetCallParser({
           startPrefix: options.gadgetStartPrefix,
           endPrefix: options.gadgetEndPrefix,
           argPrefix: options.gadgetArgPrefix
         });
         this.executor = new GadgetExecutor(
           options.registry,
-          options.onHumanInputRequired,
+          options.requestHumanInput,
           this.logger.getSubLogger({ name: "executor" }),
           options.defaultGadgetTimeoutMs,
           { argPrefix: options.gadgetArgPrefix },
           options.client,
-          options.mediaStore
+          options.mediaStore,
+          options.agentConfig,
+          options.subagentConfig,
+          options.onNestedEvent
         );
       }
       /**
-       * Process an LLM stream and return structured results.
+       * Process an LLM stream and yield events in real-time.
+       *
+       * This is an async generator that yields events immediately as they occur:
+       * - Text events are yielded as text is streamed from the LLM
+       * - gadget_call events are yielded immediately when a gadget call is parsed
+       * - gadget_result events are yielded when gadget execution completes
+       *
+       * The final event is always a StreamCompletionEvent containing metadata.
        */
-      async process(stream2) {
-        const outputs = [];
+      async *process(stream2) {
         let finishReason = null;
         let usage;
         let didExecuteGadgets = false;
@@ -3950,7 +3972,7 @@ var init_stream_processor = __esm({
             if (this.hooks.interceptors?.interceptRawChunk) {
               const context = {
                 iteration: this.iteration,
-                accumulatedText: this.accumulatedText,
+                accumulatedText: this.responseText,
                 logger: this.logger
               };
               const intercepted = this.hooks.interceptors.interceptRawChunk(processedChunk, context);
@@ -3961,7 +3983,7 @@ var init_stream_processor = __esm({
               }
             }
             if (processedChunk) {
-              this.accumulatedText += processedChunk;
+              this.responseText += processedChunk;
             }
           }
           if (this.hooks.observers?.onStreamChunk && (processedChunk || chunk.usage)) {
@@ -3970,7 +3992,7 @@ var init_stream_processor = __esm({
               const context = {
                 iteration: this.iteration,
                 rawChunk: processedChunk,
-                accumulatedText: this.accumulatedText,
+                accumulatedText: this.responseText,
                 usage,
                 logger: this.logger
               };
@@ -3982,67 +4004,66 @@ var init_stream_processor = __esm({
             continue;
           }
           for (const event of this.parser.feed(processedChunk)) {
-            const processedEvents = await this.processEvent(event);
-            outputs.push(...processedEvents);
-            if (processedEvents.some((e) => e.type === "gadget_result")) {
-              didExecuteGadgets = true;
-            }
-            for (const evt of processedEvents) {
-              if (evt.type === "gadget_result" && evt.result.breaksLoop) {
-                shouldBreakLoop = true;
+            for await (const processedEvent of this.processEventGenerator(event)) {
+              yield processedEvent;
+              if (processedEvent.type === "gadget_result") {
+                didExecuteGadgets = true;
+                if (processedEvent.result.breaksLoop) {
+                  shouldBreakLoop = true;
+                }
               }
             }
           }
-          if (this.shouldStopExecution) {
+          if (this.executionHalted) {
             this.logger.info("Breaking from LLM stream due to gadget error");
             break;
           }
         }
-        if (!this.shouldStopExecution) {
+        if (!this.executionHalted) {
           for (const event of this.parser.finalize()) {
-            const processedEvents = await this.processEvent(event);
-            outputs.push(...processedEvents);
-            if (processedEvents.some((e) => e.type === "gadget_result")) {
-              didExecuteGadgets = true;
-            }
-            for (const evt of processedEvents) {
-              if (evt.type === "gadget_result" && evt.result.breaksLoop) {
-                shouldBreakLoop = true;
+            for await (const processedEvent of this.processEventGenerator(event)) {
+              yield processedEvent;
+              if (processedEvent.type === "gadget_result") {
+                didExecuteGadgets = true;
+                if (processedEvent.result.breaksLoop) {
+                  shouldBreakLoop = true;
+                }
               }
             }
           }
-          const finalPendingEvents = await this.processPendingGadgets();
-          outputs.push(...finalPendingEvents);
-          if (finalPendingEvents.some((e) => e.type === "gadget_result")) {
-            didExecuteGadgets = true;
-          }
-          for (const evt of finalPendingEvents) {
-            if (evt.type === "gadget_result" && evt.result.breaksLoop) {
-              shouldBreakLoop = true;
+          for await (const evt of this.processPendingGadgetsGenerator()) {
+            yield evt;
+            if (evt.type === "gadget_result") {
+              didExecuteGadgets = true;
+              if (evt.result.breaksLoop) {
+                shouldBreakLoop = true;
+              }
             }
           }
         }
-        let finalMessage = this.accumulatedText;
+        let finalMessage = this.responseText;
         if (this.hooks.interceptors?.interceptAssistantMessage) {
           const context = {
             iteration: this.iteration,
-            rawResponse: this.accumulatedText,
+            rawResponse: this.responseText,
             logger: this.logger
           };
           finalMessage = this.hooks.interceptors.interceptAssistantMessage(finalMessage, context);
         }
-        return {
-          outputs,
+        const completionEvent = {
+          type: "stream_complete",
           shouldBreakLoop,
           didExecuteGadgets,
           finishReason,
           usage,
-          rawResponse: this.accumulatedText,
+          rawResponse: this.responseText,
           finalMessage
         };
+        yield completionEvent;
       }
       /**
        * Process a single parsed event (text or gadget call).
+       * @deprecated Use processEventGenerator for real-time streaming
        */
       async processEvent(event) {
         if (event.type === "text") {
@@ -4052,6 +4073,23 @@ var init_stream_processor = __esm({
         }
         return [event];
       }
+      /**
+       * Process a single parsed event, yielding events in real-time.
+       * Generator version of processEvent for streaming support.
+       */
+      async *processEventGenerator(event) {
+        if (event.type === "text") {
+          for (const e of await this.processTextEvent(event)) {
+            yield e;
+          }
+        } else if (event.type === "gadget_call") {
+          for await (const e of this.processGadgetCallGenerator(event.call)) {
+            yield e;
+          }
+        } else {
+          yield event;
+        }
+      }
       /**
        * Process a text event through interceptors.
        */
@@ -4060,7 +4098,7 @@ var init_stream_processor = __esm({
         if (this.hooks.interceptors?.interceptTextChunk) {
           const context = {
             iteration: this.iteration,
-            accumulatedText: this.accumulatedText,
+            accumulatedText: this.responseText,
             logger: this.logger
           };
           const intercepted = this.hooks.interceptors.interceptTextChunk(content, context);
@@ -4079,7 +4117,7 @@ var init_stream_processor = __esm({
        * After each execution, pending gadgets are checked to see if they can now run.
        */
       async processGadgetCall(call) {
-        if (this.shouldStopExecution) {
+        if (this.executionHalted) {
           this.logger.debug("Skipping gadget execution due to previous error", {
             gadgetName: call.gadgetName
           });
@@ -4118,7 +4156,7 @@ var init_stream_processor = __esm({
               invocationId: call.invocationId,
               waitingOn: unsatisfied
             });
-            this.pendingGadgets.set(call.invocationId, call);
+            this.gadgetsAwaitingDependencies.set(call.invocationId, call);
             return events;
           }
         }
@@ -4128,9 +4166,68 @@ var init_stream_processor = __esm({
         events.push(...triggeredEvents);
         return events;
       }
+      /**
+       * Process a gadget call, yielding events in real-time.
+       *
+       * Key difference from processGadgetCall: yields gadget_call event IMMEDIATELY
+       * when parsed (before execution), enabling real-time UI feedback.
+       */
+      async *processGadgetCallGenerator(call) {
+        if (this.executionHalted) {
+          this.logger.debug("Skipping gadget execution due to previous error", {
+            gadgetName: call.gadgetName
+          });
+          return;
+        }
+        yield { type: "gadget_call", call };
+        if (call.dependencies.length > 0) {
+          if (call.dependencies.includes(call.invocationId)) {
+            this.logger.warn("Gadget has self-referential dependency (depends on itself)", {
+              gadgetName: call.gadgetName,
+              invocationId: call.invocationId
+            });
+            this.failedInvocations.add(call.invocationId);
+            const skipEvent = {
+              type: "gadget_skipped",
+              gadgetName: call.gadgetName,
+              invocationId: call.invocationId,
+              parameters: call.parameters ?? {},
+              failedDependency: call.invocationId,
+              failedDependencyError: `Gadget "${call.invocationId}" cannot depend on itself (self-referential dependency)`
+            };
+            yield skipEvent;
+            return;
+          }
+          const failedDep = call.dependencies.find((dep) => this.failedInvocations.has(dep));
+          if (failedDep) {
+            const skipEvents = await this.handleFailedDependency(call, failedDep);
+            for (const evt of skipEvents) {
+              yield evt;
+            }
+            return;
+          }
+          const unsatisfied = call.dependencies.filter((dep) => !this.completedResults.has(dep));
+          if (unsatisfied.length > 0) {
+            this.logger.debug("Queueing gadget for later - waiting on dependencies", {
+              gadgetName: call.gadgetName,
+              invocationId: call.invocationId,
+              waitingOn: unsatisfied
+            });
+            this.gadgetsAwaitingDependencies.set(call.invocationId, call);
+            return;
+          }
+        }
+        for await (const evt of this.executeGadgetGenerator(call)) {
+          yield evt;
+        }
+        for await (const evt of this.processPendingGadgetsGenerator()) {
+          yield evt;
+        }
+      }
       /**
        * Execute a gadget through the full hook lifecycle.
        * This is the core execution logic, extracted from processGadgetCall.
+       * @deprecated Use executeGadgetGenerator for real-time streaming
        */
       async executeGadgetWithHooks(call) {
         const events = [];
@@ -4140,14 +4237,14 @@ var init_stream_processor = __esm({
             error: call.parseError,
             rawParameters: call.parametersRaw
           });
-          const shouldContinue = await this.checkContinueAfterError(
+          const shouldContinue = await this.checkCanRecoverFromError(
             call.parseError,
             call.gadgetName,
             "parse",
             call.parameters
           );
           if (!shouldContinue) {
-            this.shouldStopExecution = true;
+            this.executionHalted = true;
           }
         }
         let parameters = call.parameters ?? {};
@@ -4271,18 +4368,171 @@ var init_stream_processor = __esm({
         events.push({ type: "gadget_result", result });
         if (result.error) {
           const errorType = this.determineErrorType(call, result);
-          const shouldContinue = await this.checkContinueAfterError(
+          const shouldContinue = await this.checkCanRecoverFromError(
             result.error,
             result.gadgetName,
             errorType,
             result.parameters
           );
           if (!shouldContinue) {
-            this.shouldStopExecution = true;
+            this.executionHalted = true;
           }
         }
         return events;
       }
+      /**
+       * Execute a gadget and yield the result event.
+       * Generator version that yields gadget_result immediately when execution completes.
+       */
+      async *executeGadgetGenerator(call) {
+        if (call.parseError) {
+          this.logger.warn("Gadget has parse error", {
+            gadgetName: call.gadgetName,
+            error: call.parseError,
+            rawParameters: call.parametersRaw
+          });
+          const shouldContinue = await this.checkCanRecoverFromError(
+            call.parseError,
+            call.gadgetName,
+            "parse",
+            call.parameters
+          );
+          if (!shouldContinue) {
+            this.executionHalted = true;
+          }
+        }
+        let parameters = call.parameters ?? {};
+        if (this.hooks.interceptors?.interceptGadgetParameters) {
+          const context = {
+            iteration: this.iteration,
+            gadgetName: call.gadgetName,
+            invocationId: call.invocationId,
+            logger: this.logger
+          };
+          parameters = this.hooks.interceptors.interceptGadgetParameters(parameters, context);
+        }
+        call.parameters = parameters;
+        let shouldSkip = false;
+        let syntheticResult;
+        if (this.hooks.controllers?.beforeGadgetExecution) {
+          const context = {
+            iteration: this.iteration,
+            gadgetName: call.gadgetName,
+            invocationId: call.invocationId,
+            parameters,
+            logger: this.logger
+          };
+          const action = await this.hooks.controllers.beforeGadgetExecution(context);
+          validateBeforeGadgetExecutionAction(action);
+          if (action.action === "skip") {
+            shouldSkip = true;
+            syntheticResult = action.syntheticResult;
+            this.logger.info("Controller skipped gadget execution", {
+              gadgetName: call.gadgetName
+            });
+          }
+        }
+        const startObservers = [];
+        if (this.hooks.observers?.onGadgetExecutionStart) {
+          startObservers.push(async () => {
+            const context = {
+              iteration: this.iteration,
+              gadgetName: call.gadgetName,
+              invocationId: call.invocationId,
+              parameters,
+              logger: this.logger
+            };
+            await this.hooks.observers.onGadgetExecutionStart(context);
+          });
+        }
+        await this.runObserversInParallel(startObservers);
+        let result;
+        if (shouldSkip) {
+          result = {
+            gadgetName: call.gadgetName,
+            invocationId: call.invocationId,
+            parameters,
+            result: syntheticResult ?? "Execution skipped",
+            executionTimeMs: 0
+          };
+        } else {
+          result = await this.executor.execute(call);
+        }
+        const originalResult = result.result;
+        if (result.result && this.hooks.interceptors?.interceptGadgetResult) {
+          const context = {
+            iteration: this.iteration,
+            gadgetName: result.gadgetName,
+            invocationId: result.invocationId,
+            parameters,
+            executionTimeMs: result.executionTimeMs,
+            logger: this.logger
+          };
+          result.result = this.hooks.interceptors.interceptGadgetResult(result.result, context);
+        }
+        if (this.hooks.controllers?.afterGadgetExecution) {
+          const context = {
+            iteration: this.iteration,
+            gadgetName: result.gadgetName,
+            invocationId: result.invocationId,
+            parameters,
+            result: result.result,
+            error: result.error,
+            executionTimeMs: result.executionTimeMs,
+            logger: this.logger
+          };
+          const action = await this.hooks.controllers.afterGadgetExecution(context);
+          validateAfterGadgetExecutionAction(action);
+          if (action.action === "recover" && result.error) {
+            this.logger.info("Controller recovered from gadget error", {
+              gadgetName: result.gadgetName,
+              originalError: result.error
+            });
+            result = {
+              ...result,
+              error: void 0,
+              result: action.fallbackResult
+            };
+          }
+        }
+        const completeObservers = [];
+        if (this.hooks.observers?.onGadgetExecutionComplete) {
+          completeObservers.push(async () => {
+            const context = {
+              iteration: this.iteration,
+              gadgetName: result.gadgetName,
+              invocationId: result.invocationId,
+              parameters,
+              originalResult,
+              finalResult: result.result,
+              error: result.error,
+              executionTimeMs: result.executionTimeMs,
+              breaksLoop: result.breaksLoop,
+              cost: result.cost,
+              logger: this.logger
+            };
+            await this.hooks.observers.onGadgetExecutionComplete(context);
+          });
+        }
+        await this.runObserversInParallel(completeObservers);
+        this.completedResults.set(result.invocationId, result);
+        if (result.error) {
+          this.failedInvocations.add(result.invocationId);
+        }
+        yield { type: "gadget_result", result };
+        if (result.error) {
+          const errorType = this.determineErrorType(call, result);
+          const shouldContinue = await this.checkCanRecoverFromError(
+            result.error,
+            result.gadgetName,
+            errorType,
+            result.parameters
+          );
+          if (!shouldContinue) {
+            this.executionHalted = true;
+          }
+        }
+      }
       /**
        * Handle a gadget that cannot execute because a dependency failed.
        * Calls the onDependencySkipped controller to allow customization.
@@ -4365,11 +4615,11 @@ var init_stream_processor = __esm({
       async processPendingGadgets() {
         const events = [];
         let progress = true;
-        while (progress && this.pendingGadgets.size > 0) {
+        while (progress && this.gadgetsAwaitingDependencies.size > 0) {
           progress = false;
           const readyToExecute = [];
           const readyToSkip = [];
-          for (const [invocationId, call] of this.pendingGadgets) {
+          for (const [invocationId, call] of this.gadgetsAwaitingDependencies) {
             const failedDep = call.dependencies.find((dep) => this.failedInvocations.has(dep));
             if (failedDep) {
               readyToSkip.push({ call, failedDep });
@@ -4381,7 +4631,7 @@ var init_stream_processor = __esm({
             }
           }
           for (const { call, failedDep } of readyToSkip) {
-            this.pendingGadgets.delete(call.invocationId);
+            this.gadgetsAwaitingDependencies.delete(call.invocationId);
             const skipEvents = await this.handleFailedDependency(call, failedDep);
             events.push(...skipEvents);
             progress = true;
@@ -4392,7 +4642,7 @@ var init_stream_processor = __esm({
               invocationIds: readyToExecute.map((c) => c.invocationId)
             });
             for (const call of readyToExecute) {
-              this.pendingGadgets.delete(call.invocationId);
+              this.gadgetsAwaitingDependencies.delete(call.invocationId);
             }
             const executePromises = readyToExecute.map((call) => this.executeGadgetWithHooks(call));
             const results = await Promise.all(executePromises);
@@ -4402,9 +4652,9 @@ var init_stream_processor = __esm({
             progress = true;
           }
         }
-        if (this.pendingGadgets.size > 0) {
-          const pendingIds = new Set(this.pendingGadgets.keys());
-          for (const [invocationId, call] of this.pendingGadgets) {
+        if (this.gadgetsAwaitingDependencies.size > 0) {
+          const pendingIds = new Set(this.gadgetsAwaitingDependencies.keys());
+          for (const [invocationId, call] of this.gadgetsAwaitingDependencies) {
             const missingDeps = call.dependencies.filter((dep) => !this.completedResults.has(dep));
             const circularDeps = missingDeps.filter((dep) => pendingIds.has(dep));
             const trulyMissingDeps = missingDeps.filter((dep) => !pendingIds.has(dep));
@@ -4435,10 +4685,103 @@ var init_stream_processor = __esm({
             };
             events.push(skipEvent);
           }
-          this.pendingGadgets.clear();
+          this.gadgetsAwaitingDependencies.clear();
         }
         return events;
       }
+      /**
+       * Process pending gadgets, yielding events in real-time.
+       * Generator version that yields events as gadgets complete.
+       *
+       * Note: Gadgets are still executed in parallel for efficiency,
+       * but results are yielded as they become available.
+       */
+      async *processPendingGadgetsGenerator() {
+        let progress = true;
+        while (progress && this.gadgetsAwaitingDependencies.size > 0) {
+          progress = false;
+          const readyToExecute = [];
+          const readyToSkip = [];
+          for (const [_invocationId, call] of this.gadgetsAwaitingDependencies) {
+            const failedDep = call.dependencies.find((dep) => this.failedInvocations.has(dep));
+            if (failedDep) {
+              readyToSkip.push({ call, failedDep });
+              continue;
+            }
+            const allSatisfied = call.dependencies.every((dep) => this.completedResults.has(dep));
+            if (allSatisfied) {
+              readyToExecute.push(call);
+            }
+          }
+          for (const { call, failedDep } of readyToSkip) {
+            this.gadgetsAwaitingDependencies.delete(call.invocationId);
+            const skipEvents = await this.handleFailedDependency(call, failedDep);
+            for (const evt of skipEvents) {
+              yield evt;
+            }
+            progress = true;
+          }
+          if (readyToExecute.length > 0) {
+            this.logger.debug("Executing ready gadgets in parallel", {
+              count: readyToExecute.length,
+              invocationIds: readyToExecute.map((c) => c.invocationId)
+            });
+            for (const call of readyToExecute) {
+              this.gadgetsAwaitingDependencies.delete(call.invocationId);
+            }
+            const eventSets = await Promise.all(
+              readyToExecute.map(async (call) => {
+                const events = [];
+                for await (const evt of this.executeGadgetGenerator(call)) {
+                  events.push(evt);
+                }
+                return events;
+              })
+            );
+            for (const events of eventSets) {
+              for (const evt of events) {
+                yield evt;
+              }
+            }
+            progress = true;
+          }
+        }
+        if (this.gadgetsAwaitingDependencies.size > 0) {
+          const pendingIds = new Set(this.gadgetsAwaitingDependencies.keys());
+          for (const [invocationId, call] of this.gadgetsAwaitingDependencies) {
+            const missingDeps = call.dependencies.filter((dep) => !this.completedResults.has(dep));
+            const circularDeps = missingDeps.filter((dep) => pendingIds.has(dep));
+            const trulyMissingDeps = missingDeps.filter((dep) => !pendingIds.has(dep));
+            let errorMessage;
+            let logLevel = "warn";
+            if (circularDeps.length > 0 && trulyMissingDeps.length > 0) {
+              errorMessage = `Dependencies unresolvable: circular=[${circularDeps.join(", ")}], missing=[${trulyMissingDeps.join(", ")}]`;
+              logLevel = "error";
+            } else if (circularDeps.length > 0) {
+              errorMessage = `Circular dependency detected: "${invocationId}" depends on "${circularDeps[0]}" which also depends on "${invocationId}" (directly or indirectly)`;
+            } else {
+              errorMessage = `Dependency "${missingDeps[0]}" was never executed - check that the invocation ID exists and is spelled correctly`;
+            }
+            this.logger[logLevel]("Gadget has unresolvable dependencies", {
+              gadgetName: call.gadgetName,
+              invocationId,
+              circularDependencies: circularDeps,
+              missingDependencies: trulyMissingDeps
+            });
+            this.failedInvocations.add(invocationId);
+            const skipEvent = {
+              type: "gadget_skipped",
+              gadgetName: call.gadgetName,
+              invocationId,
+              parameters: call.parameters ?? {},
+              failedDependency: missingDeps[0],
+              failedDependencyError: errorMessage
+            };
+            yield skipEvent;
+          }
+          this.gadgetsAwaitingDependencies.clear();
+        }
+      }
       /**
        * Safely execute an observer, catching and logging any errors.
        * Observers are non-critical, so errors are logged but don't crash the system.
@@ -4465,19 +4808,19 @@ var init_stream_processor = __esm({
         );
       }
       /**
-       * Check if execution should continue after an error.
+       * Check if execution can recover from an error.
        *
        * Returns true if we should continue processing subsequent gadgets, false if we should stop.
        *
        * Logic:
-       * - If custom shouldContinueAfterError is provided, use it
+       * - If custom canRecoverFromGadgetError is provided, use it
        * - Otherwise, use stopOnGadgetError config:
        *   - stopOnGadgetError=true → return false (stop execution)
        *   - stopOnGadgetError=false → return true (continue execution)
        */
-      async checkContinueAfterError(error, gadgetName, errorType, parameters) {
-        if (this.shouldContinueAfterError) {
-          return await this.shouldContinueAfterError({
+      async checkCanRecoverFromError(error, gadgetName, errorType, parameters) {
+        if (this.canRecoverFromGadgetError) {
+          return await this.canRecoverFromGadgetError({
             error,
             gadgetName,
             errorType,
@@ -4540,14 +4883,14 @@ var init_agent = __esm({
       gadgetStartPrefix;
       gadgetEndPrefix;
       gadgetArgPrefix;
-      onHumanInputRequired;
+      requestHumanInput;
       textOnlyHandler;
       textWithGadgetsHandler;
       stopOnGadgetError;
-      shouldContinueAfterError;
+      canRecoverFromGadgetError;
       defaultGadgetTimeoutMs;
       defaultMaxTokens;
-      userPromptProvided;
+      hasUserPrompt;
       // Gadget output limiting
       outputStore;
       outputLimitEnabled;
@@ -4558,6 +4901,11 @@ var init_agent = __esm({
       mediaStore;
       // Cancellation
       signal;
+      // Subagent configuration
+      agentContextConfig;
+      subagentConfig;
+      // Nested event callback for subagent gadgets
+      onNestedEvent;
       /**
        * Creates a new Agent instance.
        * @internal This constructor is private. Use LLMist.createAgent() or AgentBuilder instead.
@@ -4577,11 +4925,11 @@ var init_agent = __esm({
         this.gadgetStartPrefix = options.gadgetStartPrefix;
         this.gadgetEndPrefix = options.gadgetEndPrefix;
         this.gadgetArgPrefix = options.gadgetArgPrefix;
-        this.onHumanInputRequired = options.onHumanInputRequired;
+        this.requestHumanInput = options.requestHumanInput;
         this.textOnlyHandler = options.textOnlyHandler ?? "terminate";
         this.textWithGadgetsHandler = options.textWithGadgetsHandler;
         this.stopOnGadgetError = options.stopOnGadgetError ?? true;
-        this.shouldContinueAfterError = options.shouldContinueAfterError;
+        this.canRecoverFromGadgetError = options.canRecoverFromGadgetError;
         this.defaultGadgetTimeoutMs = options.defaultGadgetTimeoutMs;
         this.defaultMaxTokens = this.resolveMaxTokensFromCatalog(options.model);
         this.outputLimitEnabled = options.gadgetOutputLimit ?? DEFAULT_GADGET_OUTPUT_LIMIT;
@@ -4597,7 +4945,7 @@ var init_agent = __esm({
             createGadgetOutputViewer(this.outputStore, this.outputLimitCharLimit)
           );
         }
-        this.hooks = this.mergeOutputLimiterHook(options.hooks);
+        this.hooks = this.chainOutputLimiterWithUserHooks(options.hooks);
         const baseBuilder = new LLMMessageBuilder(options.promptConfig);
         if (options.systemPrompt) {
           baseBuilder.addSystem(options.systemPrompt);
@@ -4617,7 +4965,7 @@ var init_agent = __esm({
           endPrefix: options.gadgetEndPrefix,
           argPrefix: options.gadgetArgPrefix
         });
-        this.userPromptProvided = !!options.userPrompt;
+        this.hasUserPrompt = !!options.userPrompt;
         if (options.userPrompt) {
           this.conversation.addUserMessage(options.userPrompt);
         }
@@ -4630,6 +4978,12 @@ var init_agent = __esm({
           );
         }
         this.signal = options.signal;
+        this.agentContextConfig = {
+          model: this.model,
+          temperature: this.temperature
+        };
+        this.subagentConfig = options.subagentConfig;
+        this.onNestedEvent = options.onNestedEvent;
       }
       /**
        * Get the gadget registry for this agent.
@@ -4736,7 +5090,7 @@ var init_agent = __esm({
        * @throws {Error} If no user prompt was provided (when using build() without ask())
        */
       async *run() {
-        if (!this.userPromptProvided) {
+        if (!this.hasUserPrompt) {
           throw new Error(
             "No user prompt provided. Use .ask(prompt) instead of .build(), or call agent.run() after providing a prompt."
           );
@@ -4853,17 +5207,37 @@ var init_agent = __esm({
               gadgetArgPrefix: this.gadgetArgPrefix,
               hooks: this.hooks,
               logger: this.logger.getSubLogger({ name: "stream-processor" }),
-              onHumanInputRequired: this.onHumanInputRequired,
+              requestHumanInput: this.requestHumanInput,
               stopOnGadgetError: this.stopOnGadgetError,
-              shouldContinueAfterError: this.shouldContinueAfterError,
+              canRecoverFromGadgetError: this.canRecoverFromGadgetError,
               defaultGadgetTimeoutMs: this.defaultGadgetTimeoutMs,
               client: this.client,
-              mediaStore: this.mediaStore
+              mediaStore: this.mediaStore,
+              agentConfig: this.agentContextConfig,
+              subagentConfig: this.subagentConfig,
+              onNestedEvent: this.onNestedEvent
             });
-            const result = await processor.process(stream2);
-            for (const output of result.outputs) {
-              yield output;
+            let streamMetadata = null;
+            let gadgetCallCount = 0;
+            const textOutputs = [];
+            const gadgetResults = [];
+            for await (const event of processor.process(stream2)) {
+              if (event.type === "stream_complete") {
+                streamMetadata = event;
+                continue;
+              }
+              if (event.type === "text") {
+                textOutputs.push(event.content);
+              } else if (event.type === "gadget_result") {
+                gadgetCallCount++;
+                gadgetResults.push(event);
+              }
+              yield event;
             }
+            if (!streamMetadata) {
+              throw new Error("Stream processing completed without metadata event");
+            }
+            const result = streamMetadata;
             this.logger.info("LLM response completed", {
               finishReason: result.finishReason,
               usage: result.usage,
@@ -4888,9 +5262,6 @@ var init_agent = __esm({
             });
             let finalMessage = result.finalMessage;
             if (this.hooks.controllers?.afterLLMCall) {
-              const gadgetCallCount = result.outputs.filter(
-                (output) => output.type === "gadget_result"
-              ).length;
               const context = {
                 iteration: currentIteration,
                 maxIterations: this.maxIterations,
@@ -4911,31 +5282,29 @@ var init_agent = __esm({
                   if (msg.role === "user") {
                     this.conversation.addUserMessage(msg.content);
                   } else if (msg.role === "assistant") {
-                    this.conversation.addAssistantMessage(extractText(msg.content));
+                    this.conversation.addAssistantMessage(extractMessageText(msg.content));
                   } else if (msg.role === "system") {
-                    this.conversation.addUserMessage(`[System] ${extractText(msg.content)}`);
+                    this.conversation.addUserMessage(`[System] ${extractMessageText(msg.content)}`);
                   }
                 }
               }
             }
             if (result.didExecuteGadgets) {
               if (this.textWithGadgetsHandler) {
-                const textContent = result.outputs.filter(
-                  (output) => output.type === "text"
-                ).map((output) => output.content).join("");
+                const textContent = textOutputs.join("");
                 if (textContent.trim()) {
                   const { gadgetName, parameterMapping, resultMapping } = this.textWithGadgetsHandler;
-                  this.conversation.addGadgetCall(
+                  this.conversation.addGadgetCallResult(
                     gadgetName,
                     parameterMapping(textContent),
                     resultMapping ? resultMapping(textContent) : textContent
                   );
                 }
               }
-              for (const output of result.outputs) {
+              for (const output of gadgetResults) {
                 if (output.type === "gadget_result") {
                   const gadgetResult = output.result;
-                  this.conversation.addGadgetCall(
+                  this.conversation.addGadgetCallResult(
                     gadgetResult.gadgetName,
                     gadgetResult.parameters,
                     gadgetResult.error ?? gadgetResult.result ?? "",
@@ -4946,7 +5315,7 @@ var init_agent = __esm({
               }
             } else {
               if (finalMessage.trim()) {
-                this.conversation.addGadgetCall(
+                this.conversation.addGadgetCallResult(
                   "TellUser",
                   { message: finalMessage, done: false, type: "info" },
                   `\u2139\uFE0F  ${finalMessage}`
@@ -5072,10 +5441,10 @@ var init_agent = __esm({
         return this.client.modelRegistry.getModelLimits(unprefixedModelId)?.maxOutputTokens;
       }
       /**
-       * Merge the output limiter interceptor into user-provided hooks.
+       * Chain the output limiter interceptor with user-provided hooks.
        * The limiter runs first, then chains to any user interceptor.
        */
-      mergeOutputLimiterHook(userHooks) {
+      chainOutputLimiterWithUserHooks(userHooks) {
         if (!this.outputLimitEnabled) {
           return userHooks ?? {};
         }
@@ -5154,20 +5523,23 @@ var init_builder = __esm({
       promptConfig;
       gadgets = [];
       initialMessages = [];
-      onHumanInputRequired;
+      requestHumanInput;
       gadgetStartPrefix;
       gadgetEndPrefix;
       gadgetArgPrefix;
       textOnlyHandler;
       textWithGadgetsHandler;
       stopOnGadgetError;
-      shouldContinueAfterError;
+      canRecoverFromGadgetError;
       defaultGadgetTimeoutMs;
       gadgetOutputLimit;
       gadgetOutputLimitPercent;
       compactionConfig;
       signal;
       trailingMessage;
+      subagentConfig;
+      nestedEventCallback;
+      parentContext;
       constructor(client) {
         this.client = client;
       }
@@ -5258,13 +5630,13 @@ var init_builder = __esm({
        *
        * @example
        * ```typescript
-       * .withPromptConfig({
+       * .withPromptTemplateConfig({
        *   mainInstruction: "Use the gadget markers below:",
        *   rules: ["Always use markers", "Never use function calling"]
        * })
        * ```
        */
-      withPromptConfig(config) {
+      withPromptTemplateConfig(config) {
         this.promptConfig = config;
         return this;
       }
@@ -5344,7 +5716,7 @@ var init_builder = __esm({
        * ```
        */
       onHumanInput(handler) {
-        this.onHumanInputRequired = handler;
+        this.requestHumanInput = handler;
         return this;
       }
       /**
@@ -5479,9 +5851,9 @@ var init_builder = __esm({
        * Provides fine-grained control over whether to continue after different types of errors.
        * Overrides `stopOnGadgetError` when provided.
        *
-       * **Note:** This builder method configures the underlying `shouldContinueAfterError` option
+       * **Note:** This builder method configures the underlying `canRecoverFromGadgetError` option
        * in `AgentOptions`. The method is named `withErrorHandler` for better developer experience,
-       * but maps to the `shouldContinueAfterError` property internally.
+       * but maps to the `canRecoverFromGadgetError` property internally.
        *
        * @param handler - Function that decides whether to continue after an error.
        *                  Return `true` to continue execution, `false` to stop.
@@ -5502,7 +5874,7 @@ var init_builder = __esm({
        * ```
        */
       withErrorHandler(handler) {
-        this.shouldContinueAfterError = handler;
+        this.canRecoverFromGadgetError = handler;
         return this;
       }
       /**
@@ -5643,6 +6015,95 @@ var init_builder = __esm({
         this.signal = signal;
         return this;
       }
+      /**
+       * Set subagent configuration overrides.
+       *
+       * Subagent gadgets (like BrowseWeb) can read these settings from ExecutionContext
+       * to inherit model and other options from the CLI configuration.
+       *
+       * @param config - Subagent configuration map keyed by gadget name
+       * @returns This builder for chaining
+       *
+       * @example
+       * ```typescript
+       * .withSubagentConfig({
+       *   BrowseWeb: { model: "inherit", maxIterations: 20, headless: true },
+       *   CodeAnalyzer: { model: "sonnet", maxIterations: 10 }
+       * })
+       * ```
+       */
+      withSubagentConfig(config) {
+        this.subagentConfig = config;
+        return this;
+      }
+      /**
+       * Set the callback for nested subagent events.
+       *
+       * Subagent gadgets (like BrowseWeb) can use ExecutionContext.onNestedEvent
+       * 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
+       * @returns This builder for chaining
+       *
+       * @example
+       * ```typescript
+       * .withNestedEventCallback((event) => {
+       *   if (event.type === "llm_call_start") {
+       *     console.log(`  Nested LLM #${event.event.iteration} starting...`);
+       *   } else if (event.type === "gadget_call") {
+       *     console.log(`    ⏵ ${event.event.call.gadgetName}...`);
+       *   }
+       * })
+       * ```
+       */
+      withNestedEventCallback(callback) {
+        this.nestedEventCallback = callback;
+        return this;
+      }
+      /**
+       * Enable automatic nested 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
+       * context and sets up automatic forwarding via hooks and event wrapping.
+       *
+       * @param ctx - ExecutionContext passed to the gadget's execute() method
+       * @param depth - Nesting depth (default: 1 for direct child)
+       * @returns This builder for chaining
+       *
+       * @example
+       * ```typescript
+       * // In a subagent gadget like BrowseWeb - ONE LINE enables auto-forwarding:
+       * execute: async (params, ctx) => {
+       *   const agent = new AgentBuilder(client)
+       *     .withModel(model)
+       *     .withGadgets(Navigate, Click, Screenshot)
+       *     .withParentContext(ctx)  // <-- This is all you need!
+       *     .ask(params.task);
+       *
+       *   for await (const event of agent.run()) {
+       *     // Events automatically forwarded - just process normally
+       *     if (event.type === "text") {
+       *       result = event.content;
+       *     }
+       *   }
+       * }
+       * ```
+       */
+      withParentContext(ctx, depth = 1) {
+        if (ctx.onNestedEvent && ctx.invocationId) {
+          this.parentContext = {
+            invocationId: ctx.invocationId,
+            onNestedEvent: ctx.onNestedEvent,
+            depth
+          };
+        }
+        return this;
+      }
       /**
        * Add an ephemeral trailing message that appears at the end of each LLM request.
        *
@@ -5710,14 +6171,58 @@ ${endPrefix}`
         return this;
       }
       /**
-       * Compose the final hooks, including trailing message if configured.
+       * Compose the final hooks, including:
+       * - Trailing message injection (if configured)
+       * - Nested event forwarding for LLM calls (if parentContext is set)
        */
       composeHooks() {
+        let hooks = this.hooks;
+        if (this.parentContext) {
+          const { invocationId, onNestedEvent, depth } = this.parentContext;
+          const existingOnLLMCallStart = hooks?.observers?.onLLMCallStart;
+          const existingOnLLMCallComplete = hooks?.observers?.onLLMCallComplete;
+          hooks = {
+            ...hooks,
+            observers: {
+              ...hooks?.observers,
+              onLLMCallStart: async (context) => {
+                onNestedEvent({
+                  type: "llm_call_start",
+                  gadgetInvocationId: invocationId,
+                  depth,
+                  event: {
+                    iteration: context.iteration,
+                    model: context.options.model
+                  }
+                });
+                if (existingOnLLMCallStart) {
+                  await existingOnLLMCallStart(context);
+                }
+              },
+              onLLMCallComplete: async (context) => {
+                onNestedEvent({
+                  type: "llm_call_end",
+                  gadgetInvocationId: invocationId,
+                  depth,
+                  event: {
+                    iteration: context.iteration,
+                    model: context.options.model,
+                    outputTokens: context.usage?.outputTokens,
+                    finishReason: context.finishReason
+                  }
+                });
+                if (existingOnLLMCallComplete) {
+                  await existingOnLLMCallComplete(context);
+                }
+              }
+            }
+          };
+        }
         if (!this.trailingMessage) {
-          return this.hooks;
+          return hooks;
         }
         const trailingMsg = this.trailingMessage;
-        const existingBeforeLLMCall = this.hooks?.controllers?.beforeLLMCall;
+        const existingBeforeLLMCall = hooks?.controllers?.beforeLLMCall;
         const trailingMessageController = async (ctx) => {
           const result = existingBeforeLLMCall ? await existingBeforeLLMCall(ctx) : { action: "proceed" };
           if (result.action === "skip") {
@@ -5732,9 +6237,9 @@ ${endPrefix}`
           };
         };
         return {
-          ...this.hooks,
+          ...hooks,
           controllers: {
-            ...this.hooks?.controllers,
+            ...hooks?.controllers,
             beforeLLMCall: trailingMessageController
           }
         };
@@ -5795,6 +6300,19 @@ ${endPrefix}`
           this.client = new LLMistClass();
         }
         const registry = GadgetRegistry.from(this.gadgets);
+        let onNestedEvent = this.nestedEventCallback;
+        if (this.parentContext) {
+          const { invocationId, onNestedEvent: parentCallback, depth } = this.parentContext;
+          const existingCallback = this.nestedEventCallback;
+          onNestedEvent = (event) => {
+            parentCallback({
+              ...event,
+              gadgetInvocationId: invocationId,
+              depth: event.depth + depth
+            });
+            existingCallback?.(event);
+          };
+        }
         return {
           client: this.client,
           model: this.model ?? "openai:gpt-5-nano",
@@ -5807,19 +6325,21 @@ ${endPrefix}`
           hooks: this.composeHooks(),
           promptConfig: this.promptConfig,
           initialMessages: this.initialMessages,
-          onHumanInputRequired: this.onHumanInputRequired,
+          requestHumanInput: this.requestHumanInput,
           gadgetStartPrefix: this.gadgetStartPrefix,
           gadgetEndPrefix: this.gadgetEndPrefix,
           gadgetArgPrefix: this.gadgetArgPrefix,
           textOnlyHandler: this.textOnlyHandler,
           textWithGadgetsHandler: this.textWithGadgetsHandler,
           stopOnGadgetError: this.stopOnGadgetError,
-          shouldContinueAfterError: this.shouldContinueAfterError,
+          canRecoverFromGadgetError: this.canRecoverFromGadgetError,
           defaultGadgetTimeoutMs: this.defaultGadgetTimeoutMs,
           gadgetOutputLimit: this.gadgetOutputLimit,
           gadgetOutputLimitPercent: this.gadgetOutputLimitPercent,
           compactionConfig: this.compactionConfig,
-          signal: this.signal
+          signal: this.signal,
+          subagentConfig: this.subagentConfig,
+          onNestedEvent
         };
       }
       ask(userPrompt) {
@@ -5976,6 +6496,19 @@ ${endPrefix}`
           this.client = new LLMistClass();
         }
         const registry = GadgetRegistry.from(this.gadgets);
+        let onNestedEvent = this.nestedEventCallback;
+        if (this.parentContext) {
+          const { invocationId, onNestedEvent: parentCallback, depth } = this.parentContext;
+          const existingCallback = this.nestedEventCallback;
+          onNestedEvent = (event) => {
+            parentCallback({
+              ...event,
+              gadgetInvocationId: invocationId,
+              depth: event.depth + depth
+            });
+            existingCallback?.(event);
+          };
+        }
         const options = {
           client: this.client,
           model: this.model ?? "openai:gpt-5-nano",
@@ -5988,19 +6521,21 @@ ${endPrefix}`
           hooks: this.composeHooks(),
           promptConfig: this.promptConfig,
           initialMessages: this.initialMessages,
-          onHumanInputRequired: this.onHumanInputRequired,
+          requestHumanInput: this.requestHumanInput,
           gadgetStartPrefix: this.gadgetStartPrefix,
           gadgetEndPrefix: this.gadgetEndPrefix,
           gadgetArgPrefix: this.gadgetArgPrefix,
           textOnlyHandler: this.textOnlyHandler,
           textWithGadgetsHandler: this.textWithGadgetsHandler,
           stopOnGadgetError: this.stopOnGadgetError,
-          shouldContinueAfterError: this.shouldContinueAfterError,
+          canRecoverFromGadgetError: this.canRecoverFromGadgetError,
           defaultGadgetTimeoutMs: this.defaultGadgetTimeoutMs,
           gadgetOutputLimit: this.gadgetOutputLimit,
           gadgetOutputLimitPercent: this.gadgetOutputLimitPercent,
           compactionConfig: this.compactionConfig,
-          signal: this.signal
+          signal: this.signal,
+          subagentConfig: this.subagentConfig,
+          onNestedEvent
         };
         return new Agent(AGENT_INTERNAL_KEY, options);
       }
@@ -6306,9 +6841,9 @@ var init_base_provider = __esm({
        */
       async *stream(options, descriptor, spec) {
         const preparedMessages = this.prepareMessages(options.messages);
-        const payload = this.buildRequestPayload(options, descriptor, spec, preparedMessages);
+        const payload = this.buildApiRequest(options, descriptor, spec, preparedMessages);
         const rawStream = await this.executeStreamRequest(payload, options.signal);
-        yield* this.wrapStream(rawStream);
+        yield* this.normalizeProviderStream(rawStream);
       }
       /**
        * Prepare messages for the request.
@@ -6408,11 +6943,11 @@ var init_anthropic = __esm({
           "Anthropic does not support speech generation. Use OpenAI (TTS) or Google Gemini (TTS) instead."
         );
       }
-      buildRequestPayload(options, descriptor, spec, messages) {
+      buildApiRequest(options, descriptor, spec, messages) {
         const systemMessages = messages.filter((message) => message.role === "system");
         const system = systemMessages.length > 0 ? systemMessages.map((m, index) => ({
           type: "text",
-          text: extractText(m.content),
+          text: extractMessageText(m.content),
           // Add cache_control to the LAST system message block
           ...index === systemMessages.length - 1 ? { cache_control: { type: "ephemeral" } } : {}
         })) : void 0;
@@ -6449,7 +6984,7 @@ var init_anthropic = __esm({
        * Handles text, images (base64 only), and applies cache_control.
        */
       convertToAnthropicContent(content, addCacheControl) {
-        const parts = normalizeContent(content);
+        const parts = normalizeMessageContent(content);
         return parts.map((part, index) => {
           const isLastPart = index === parts.length - 1;
           const cacheControl = addCacheControl && isLastPart ? { cache_control: { type: "ephemeral" } } : {};
@@ -6495,7 +7030,7 @@ var init_anthropic = __esm({
         const stream2 = await client.messages.create(payload, signal ? { signal } : void 0);
         return stream2;
       }
-      async *wrapStream(iterable) {
+      async *normalizeProviderStream(iterable) {
         const stream2 = iterable;
         let inputTokens = 0;
         let cachedInputTokens = 0;
@@ -6572,7 +7107,7 @@ var init_anthropic = __esm({
       async countTokens(messages, descriptor, _spec) {
         const client = this.client;
         const systemMessages = messages.filter((message) => message.role === "system");
-        const system = systemMessages.length > 0 ? systemMessages.map((m) => extractText(m.content)).join("\n\n") : void 0;
+        const system = systemMessages.length > 0 ? systemMessages.map((m) => extractMessageText(m.content)).join("\n\n") : void 0;
         const conversation = messages.filter(
           (message) => message.role !== "system"
         ).map((message) => ({
@@ -6594,7 +7129,7 @@ var init_anthropic = __esm({
           let totalChars = 0;
           let imageCount = 0;
           for (const msg of messages) {
-            const parts = normalizeContent(msg.content);
+            const parts = normalizeMessageContent(msg.content);
             for (const part of parts) {
               if (part.type === "text") {
                 totalChars += part.text.length;
@@ -7285,7 +7820,7 @@ var init_gemini = __esm({
           format: spec?.defaultFormat ?? "wav"
         };
       }
-      buildRequestPayload(options, descriptor, _spec, messages) {
+      buildApiRequest(options, descriptor, _spec, messages) {
         const contents = this.convertMessagesToContents(messages);
         const generationConfig = this.buildGenerationConfig(options);
         const config = {
@@ -7337,7 +7872,7 @@ var init_gemini = __esm({
           if (message.role === "system") {
             expandedMessages.push({
               role: "user",
-              content: extractText(message.content)
+              content: extractMessageText(message.content)
             });
             expandedMessages.push({
               role: "assistant",
@@ -7387,7 +7922,7 @@ var init_gemini = __esm({
        * Handles text, images, and audio (Gemini supports all three).
        */
       convertToGeminiParts(content) {
-        const parts = normalizeContent(content);
+        const parts = normalizeMessageContent(content);
         return parts.map((part) => {
           if (part.type === "text") {
             return { text: part.text };
@@ -7432,10 +7967,10 @@ var init_gemini = __esm({
         }
         return Object.keys(config).length > 0 ? config : null;
       }
-      async *wrapStream(iterable) {
+      async *normalizeProviderStream(iterable) {
         const stream2 = iterable;
         for await (const chunk of stream2) {
-          const text3 = this.extractText(chunk);
+          const text3 = this.extractMessageText(chunk);
           if (text3) {
             yield { text: text3, rawEvent: chunk };
           }
@@ -7446,7 +7981,7 @@ var init_gemini = __esm({
           }
         }
       }
-      extractText(chunk) {
+      extractMessageText(chunk) {
         if (!chunk?.candidates) {
           return "";
         }
@@ -7511,7 +8046,7 @@ var init_gemini = __esm({
           let totalChars = 0;
           let mediaCount = 0;
           for (const msg of messages) {
-            const parts = normalizeContent(msg.content);
+            const parts = normalizeMessageContent(msg.content);
             for (const part of parts) {
               if (part.type === "text") {
                 totalChars += part.text.length;
@@ -8257,7 +8792,7 @@ var init_openai = __esm({
           format
         };
       }
-      buildRequestPayload(options, descriptor, spec, messages) {
+      buildApiRequest(options, descriptor, spec, messages) {
         const { maxTokens, temperature, topP, stopSequences, extra } = options;
         const supportsTemperature = spec?.metadata?.supportsTemperature !== false;
         const shouldIncludeTemperature = typeof temperature === "number" && supportsTemperature;
@@ -8292,7 +8827,7 @@ var init_openai = __esm({
             ...message.name ? { name: message.name } : {}
           };
         }
-        const textContent = typeof message.content === "string" ? message.content : extractText(message.content);
+        const textContent = typeof message.content === "string" ? message.content : extractMessageText(message.content);
         if (role === "system") {
           return {
             role: "system",
@@ -8352,7 +8887,7 @@ var init_openai = __esm({
         const stream2 = await client.chat.completions.create(payload, signal ? { signal } : void 0);
         return stream2;
       }
-      async *wrapStream(iterable) {
+      async *normalizeProviderStream(iterable) {
         const stream2 = iterable;
         for await (const chunk of stream2) {
           const text3 = chunk.choices.map((choice) => choice.delta?.content ?? "").join("");
@@ -8410,9 +8945,9 @@ var init_openai = __esm({
               tokenCount += OPENAI_MESSAGE_OVERHEAD_TOKENS;
               const roleText = ROLE_MAP[message.role];
               tokenCount += encoding.encode(roleText).length;
-              const textContent = extractText(message.content);
+              const textContent = extractMessageText(message.content);
               tokenCount += encoding.encode(textContent).length;
-              const parts = normalizeContent(message.content);
+              const parts = normalizeMessageContent(message.content);
               for (const part of parts) {
                 if (part.type === "image") {
                   imageCount++;
@@ -8437,7 +8972,7 @@ var init_openai = __esm({
           let totalChars = 0;
           let imageCount = 0;
           for (const msg of messages) {
-            const parts = normalizeContent(msg.content);
+            const parts = normalizeMessageContent(msg.content);
             for (const part of parts) {
               if (part.type === "text") {
                 totalChars += part.text.length;
@@ -10125,7 +10660,7 @@ var MockBuilder = class {
   whenMessageContains(text3) {
     this.matchers.push(
       (ctx) => ctx.messages.some(
-        (msg) => extractText(msg.content).toLowerCase().includes(text3.toLowerCase())
+        (msg) => extractMessageText(msg.content).toLowerCase().includes(text3.toLowerCase())
       )
     );
     return this;
@@ -10140,7 +10675,7 @@ var MockBuilder = class {
     this.matchers.push((ctx) => {
       const lastMsg = ctx.messages[ctx.messages.length - 1];
       if (!lastMsg) return false;
-      return extractText(lastMsg.content).toLowerCase().includes(text3.toLowerCase());
+      return extractMessageText(lastMsg.content).toLowerCase().includes(text3.toLowerCase());
     });
     return this;
   }
@@ -10151,7 +10686,7 @@ var MockBuilder = class {
    * mockLLM().whenMessageMatches(/calculate \d+/)
    */
   whenMessageMatches(regex) {
-    this.matchers.push((ctx) => ctx.messages.some((msg) => regex.test(extractText(msg.content))));
+    this.matchers.push((ctx) => ctx.messages.some((msg) => regex.test(extractMessageText(msg.content))));
     return this;
   }
   /**
@@ -10163,7 +10698,7 @@ var MockBuilder = class {
   whenRoleContains(role, text3) {
     this.matchers.push(
       (ctx) => ctx.messages.some(
-        (msg) => msg.role === role && extractText(msg.content).toLowerCase().includes(text3.toLowerCase())
+        (msg) => msg.role === role && extractMessageText(msg.content).toLowerCase().includes(text3.toLowerCase())
       )
     );
     return this;
@@ -10585,7 +11120,7 @@ var MockConversationManager = class {
     this.history.push(msg);
     this.addedMessages.push(msg);
   }
-  addGadgetCall(gadgetName, parameters, result) {
+  addGadgetCallResult(gadgetName, parameters, result) {
     const assistantMsg = {
       role: "assistant",
       content: `!!!GADGET_START:${gadgetName}
@@ -10695,7 +11230,7 @@ function createMockConversationManager(turnCount, baseMessages = []) {
 
 // src/testing/mock-gadget.ts
 init_gadget();
-var MockGadgetImpl = class extends BaseGadget {
+var MockGadgetImpl = class extends AbstractGadget {
   name;
   description;
   parameterSchema;
@@ -10948,22 +11483,23 @@ export {
   resolveRulesTemplate,
   resolveHintTemplate,
   init_prompt_config,
-  normalizeContent,
-  extractText,
+  normalizeMessageContent,
+  extractMessageText,
   LLMMessageBuilder,
   init_messages,
   MediaStore,
   init_media_store,
-  BreakLoopException,
-  HumanInputException,
-  AbortError,
+  TaskCompletionSignal,
+  HumanInputRequiredException,
+  TimeoutException,
+  AbortException,
   init_exceptions,
   createLogger,
   defaultLogger,
   init_logger,
   schemaToJSONSchema,
   init_schema_to_json,
-  BaseGadget,
+  AbstractGadget,
   init_gadget,
   createGadget,
   init_create_gadget,
@@ -10987,7 +11523,7 @@ export {
   init_event_handlers,
   GadgetOutputStore,
   init_gadget_output_store,
-  StreamParser,
+  GadgetCallParser,
   init_parser,
   GadgetExecutor,
   init_executor,
@@ -11059,4 +11595,4 @@ export {
   createEmptyStream,
   createErrorStream
 };
-//# sourceMappingURL=chunk-364PEMVT.js.map
+//# sourceMappingURL=chunk-JCFPJMRQ.js.map