llmist 2.6.0 → 3.0.0

package/dist/index.cjs

@@ -566,13 +566,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;
   }
@@ -932,7 +932,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",
@@ -1200,21 +1210,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;
       }
     };
@@ -1228,10 +1238,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";
       }
     };
   }
@@ -1400,7 +1410,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;
@@ -1408,14 +1418,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));
@@ -1504,7 +1514,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";
@@ -1512,7 +1522,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.
@@ -1540,14 +1550,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
@@ -1572,7 +1582,7 @@ var init_gadget = __esm({
        */
       throwIfAborted(ctx) {
         if (ctx?.signal?.aborted) {
-          throw new AbortError();
+          throw new AbortException();
         }
       }
       /**
@@ -1714,7 +1724,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) {
@@ -1732,7 +1742,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;
@@ -2370,8 +2380,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()];
@@ -2391,7 +2401,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));
           }
         }
       }
@@ -3271,12 +3281,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;
@@ -3362,16 +3372,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;
@@ -3380,16 +3390,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
@@ -3398,24 +3412,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
           };
@@ -3447,19 +3461,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;
@@ -3479,7 +3489,7 @@ var init_parser = __esm({
           yield {
             type: "gadget_call",
             call: {
-              gadgetName: actualGadgetName,
+              gadgetName,
               invocationId,
               parametersRaw,
               parameters,
@@ -3488,37 +3498,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,
@@ -3529,7 +3535,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 };
         }
@@ -3537,7 +3543,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;
       }
     };
   }
@@ -3556,14 +3562,16 @@ 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) {
         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.logger = logger ?? createLogger({ name: "llmist:executor" });
-        this.errorFormatter = new GadgetErrorFormatter(errorFormatterOptions);
+        this.errorFormatter = new GadgetExecutionErrorFormatter(errorFormatterOptions);
         this.argPrefix = errorFormatterOptions?.argPrefix ?? GADGET_ARG_PREFIX;
       }
       logger;
@@ -3583,11 +3591,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 };
         }
@@ -3705,7 +3713,9 @@ 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
           };
           let rawResult;
           if (timeoutMs && timeoutMs > 0) {
@@ -3720,7 +3730,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;
@@ -3766,7 +3776,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
@@ -3794,7 +3804,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
@@ -3807,14 +3817,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
@@ -3912,13 +3922,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) */
@@ -3929,20 +3939,22 @@ 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
         );
       }
       /**
@@ -3963,7 +3975,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);
@@ -3974,7 +3986,7 @@ var init_stream_processor = __esm({
               }
             }
             if (processedChunk) {
-              this.accumulatedText += processedChunk;
+              this.responseText += processedChunk;
             }
           }
           if (this.hooks.observers?.onStreamChunk && (processedChunk || chunk.usage)) {
@@ -3983,7 +3995,7 @@ var init_stream_processor = __esm({
               const context = {
                 iteration: this.iteration,
                 rawChunk: processedChunk,
-                accumulatedText: this.accumulatedText,
+                accumulatedText: this.responseText,
                 usage,
                 logger: this.logger
               };
@@ -4006,12 +4018,12 @@ var init_stream_processor = __esm({
               }
             }
           }
-          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);
@@ -4035,11 +4047,11 @@ var init_stream_processor = __esm({
             }
           }
         }
-        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);
@@ -4050,7 +4062,7 @@ var init_stream_processor = __esm({
           didExecuteGadgets,
           finishReason,
           usage,
-          rawResponse: this.accumulatedText,
+          rawResponse: this.responseText,
           finalMessage
         };
       }
@@ -4073,7 +4085,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);
@@ -4092,7 +4104,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
           });
@@ -4131,7 +4143,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;
           }
         }
@@ -4153,14 +4165,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 ?? {};
@@ -4284,14 +4296,14 @@ 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;
@@ -4378,11 +4390,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 });
@@ -4394,7 +4406,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;
@@ -4405,7 +4417,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);
@@ -4415,9 +4427,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));
@@ -4448,7 +4460,7 @@ var init_stream_processor = __esm({
             };
             events.push(skipEvent);
           }
-          this.pendingGadgets.clear();
+          this.gadgetsAwaitingDependencies.clear();
         }
         return events;
       }
@@ -4478,19 +4490,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,
@@ -4553,14 +4565,14 @@ var init_agent = __esm({
       gadgetStartPrefix;
       gadgetEndPrefix;
       gadgetArgPrefix;
-      onHumanInputRequired;
+      requestHumanInput;
       textOnlyHandler;
       textWithGadgetsHandler;
       stopOnGadgetError;
-      shouldContinueAfterError;
+      canRecoverFromGadgetError;
       defaultGadgetTimeoutMs;
       defaultMaxTokens;
-      userPromptProvided;
+      hasUserPrompt;
       // Gadget output limiting
       outputStore;
       outputLimitEnabled;
@@ -4571,6 +4583,9 @@ var init_agent = __esm({
       mediaStore;
       // Cancellation
       signal;
+      // Subagent configuration
+      agentContextConfig;
+      subagentConfig;
       /**
        * Creates a new Agent instance.
        * @internal This constructor is private. Use LLMist.createAgent() or AgentBuilder instead.
@@ -4590,11 +4605,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;
@@ -4610,7 +4625,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);
@@ -4630,7 +4645,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);
         }
@@ -4643,6 +4658,11 @@ var init_agent = __esm({
           );
         }
         this.signal = options.signal;
+        this.agentContextConfig = {
+          model: this.model,
+          temperature: this.temperature
+        };
+        this.subagentConfig = options.subagentConfig;
       }
       /**
        * Get the gadget registry for this agent.
@@ -4749,7 +4769,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."
           );
@@ -4866,12 +4886,14 @@ 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
             });
             const result = await processor.process(stream2);
             for (const output of result.outputs) {
@@ -4924,9 +4946,9 @@ 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)}`);
                   }
                 }
               }
@@ -4938,7 +4960,7 @@ var init_agent = __esm({
                 ).map((output) => output.content).join("");
                 if (textContent.trim()) {
                   const { gadgetName, parameterMapping, resultMapping } = this.textWithGadgetsHandler;
-                  this.conversation.addGadgetCall(
+                  this.conversation.addGadgetCallResult(
                     gadgetName,
                     parameterMapping(textContent),
                     resultMapping ? resultMapping(textContent) : textContent
@@ -4948,7 +4970,7 @@ var init_agent = __esm({
               for (const output of result.outputs) {
                 if (output.type === "gadget_result") {
                   const gadgetResult = output.result;
-                  this.conversation.addGadgetCall(
+                  this.conversation.addGadgetCallResult(
                     gadgetResult.gadgetName,
                     gadgetResult.parameters,
                     gadgetResult.error ?? gadgetResult.result ?? "",
@@ -4959,7 +4981,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}`
@@ -5085,10 +5107,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 ?? {};
         }
@@ -5442,9 +5464,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.
@@ -5544,11 +5566,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;
@@ -5585,7 +5607,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" } } : {};
@@ -5631,7 +5653,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;
@@ -5708,7 +5730,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) => ({
@@ -5730,7 +5752,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;
@@ -6421,7 +6443,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 = {
@@ -6473,7 +6495,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",
@@ -6523,7 +6545,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 };
@@ -6568,10 +6590,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 };
           }
@@ -6582,7 +6604,7 @@ var init_gemini = __esm({
           }
         }
       }
-      extractText(chunk) {
+      extractMessageText(chunk) {
         if (!chunk?.candidates) {
           return "";
         }
@@ -6647,7 +6669,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;
@@ -7393,7 +7415,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;
@@ -7428,7 +7450,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",
@@ -7488,7 +7510,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("");
@@ -7546,9 +7568,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++;
@@ -7573,7 +7595,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;
@@ -8438,20 +8460,21 @@ var init_builder = __esm({
       promptConfig;
       gadgets = [];
       initialMessages = [];
-      onHumanInputRequired;
+      requestHumanInput;
       gadgetStartPrefix;
       gadgetEndPrefix;
       gadgetArgPrefix;
       textOnlyHandler;
       textWithGadgetsHandler;
       stopOnGadgetError;
-      shouldContinueAfterError;
+      canRecoverFromGadgetError;
       defaultGadgetTimeoutMs;
       gadgetOutputLimit;
       gadgetOutputLimitPercent;
       compactionConfig;
       signal;
       trailingMessage;
+      subagentConfig;
       constructor(client) {
         this.client = client;
       }
@@ -8542,13 +8565,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;
       }
@@ -8628,7 +8651,7 @@ var init_builder = __esm({
        * ```
        */
       onHumanInput(handler) {
-        this.onHumanInputRequired = handler;
+        this.requestHumanInput = handler;
         return this;
       }
       /**
@@ -8763,9 +8786,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.
@@ -8786,7 +8809,7 @@ var init_builder = __esm({
        * ```
        */
       withErrorHandler(handler) {
-        this.shouldContinueAfterError = handler;
+        this.canRecoverFromGadgetError = handler;
         return this;
       }
       /**
@@ -8927,6 +8950,27 @@ 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;
+      }
       /**
        * Add an ephemeral trailing message that appears at the end of each LLM request.
        *
@@ -9091,19 +9135,20 @@ ${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
         };
       }
       ask(userPrompt) {
@@ -9272,19 +9317,20 @@ ${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
         };
         return new Agent(AGENT_INTERNAL_KEY, options);
       }
@@ -9295,11 +9341,10 @@ ${endPrefix}`
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  AbortError: () => AbortError,
+  AbortException: () => AbortException,
+  AbstractGadget: () => AbstractGadget,
   AgentBuilder: () => AgentBuilder,
   AnthropicMessagesProvider: () => AnthropicMessagesProvider,
-  BaseGadget: () => BaseGadget,
-  BreakLoopException: () => BreakLoopException,
   CompactionManager: () => CompactionManager,
   ConversationManager: () => ConversationManager,
   DEFAULT_COMPACTION_CONFIG: () => DEFAULT_COMPACTION_CONFIG,
@@ -9307,12 +9352,13 @@ __export(index_exports, {
   DEFAULT_PROMPTS: () => DEFAULT_PROMPTS,
   DEFAULT_SUMMARIZATION_PROMPT: () => DEFAULT_SUMMARIZATION_PROMPT,
   Gadget: () => Gadget,
+  GadgetCallParser: () => GadgetCallParser,
   GadgetExecutor: () => GadgetExecutor,
   GadgetOutputStore: () => GadgetOutputStore,
   GadgetRegistry: () => GadgetRegistry,
   GeminiGenerativeProvider: () => GeminiGenerativeProvider,
   HookPresets: () => HookPresets,
-  HumanInputException: () => HumanInputException,
+  HumanInputRequiredException: () => HumanInputRequiredException,
   HybridStrategy: () => HybridStrategy,
   LLMMessageBuilder: () => LLMMessageBuilder,
   LLMist: () => LLMist,
@@ -9325,9 +9371,10 @@ __export(index_exports, {
   ModelRegistry: () => ModelRegistry,
   OpenAIChatProvider: () => OpenAIChatProvider,
   SlidingWindowStrategy: () => SlidingWindowStrategy,
-  StreamParser: () => StreamParser,
   StreamProcessor: () => StreamProcessor,
   SummarizationStrategy: () => SummarizationStrategy,
+  TaskCompletionSignal: () => TaskCompletionSignal,
+  TimeoutException: () => TimeoutException,
   audioFromBase64: () => audioFromBase64,
   audioFromBuffer: () => audioFromBuffer,
   collectEvents: () => collectEvents,
@@ -9339,7 +9386,7 @@ __export(index_exports, {
   createGeminiProviderFromEnv: () => createGeminiProviderFromEnv,
   createHints: () => createHints,
   createLogger: () => createLogger,
-  createMedia: () => createMedia,
+  createMediaOutput: () => createMediaOutput,
   createMockAdapter: () => createMockAdapter,
   createMockClient: () => createMockClient,
   createMockStream: () => createMockStream,
@@ -9349,7 +9396,7 @@ __export(index_exports, {
   detectAudioMimeType: () => detectAudioMimeType,
   detectImageMimeType: () => detectImageMimeType,
   discoverProviderAdapters: () => discoverProviderAdapters,
-  extractText: () => extractText,
+  extractMessageText: () => extractMessageText,
   getMockManager: () => getMockManager,
   getModelId: () => getModelId,
   getProvider: () => getProvider,
@@ -9363,7 +9410,7 @@ __export(index_exports, {
   isTextPart: () => isTextPart,
   iterationProgressHint: () => iterationProgressHint,
   mockLLM: () => mockLLM,
-  normalizeContent: () => normalizeContent,
+  normalizeMessageContent: () => normalizeMessageContent,
   parallelGadgetHint: () => parallelGadgetHint,
   parseDataUrl: () => parseDataUrl,
   resolveHintTemplate: () => resolveHintTemplate,
@@ -10293,7 +10340,7 @@ init_registry();
 // src/gadgets/typed-gadget.ts
 init_gadget();
 function Gadget(config) {
-  class GadgetBase extends BaseGadget {
+  class GadgetBase extends AbstractGadget {
     description = config.description;
     parameterSchema = config.schema;
     name = config.name;
@@ -10313,7 +10360,7 @@ function Gadget(config) {
 
 // src/gadgets/helpers.ts
 init_input_content();
-function createMedia(kind, data, mimeType, options) {
+function createMediaOutput(kind, data, mimeType, options) {
   const buffer = data instanceof Buffer ? data : Buffer.from(data);
   return {
     kind,
@@ -11017,7 +11064,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;
@@ -11032,7 +11079,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;
   }
@@ -11043,7 +11090,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;
   }
   /**
@@ -11055,7 +11102,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;
@@ -11460,11 +11507,10 @@ function createMockClient(options) {
 init_gadget();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  AbortError,
+  AbortException,
+  AbstractGadget,
   AgentBuilder,
   AnthropicMessagesProvider,
-  BaseGadget,
-  BreakLoopException,
   CompactionManager,
   ConversationManager,
   DEFAULT_COMPACTION_CONFIG,
@@ -11472,12 +11518,13 @@ init_gadget();
   DEFAULT_PROMPTS,
   DEFAULT_SUMMARIZATION_PROMPT,
   Gadget,
+  GadgetCallParser,
   GadgetExecutor,
   GadgetOutputStore,
   GadgetRegistry,
   GeminiGenerativeProvider,
   HookPresets,
-  HumanInputException,
+  HumanInputRequiredException,
   HybridStrategy,
   LLMMessageBuilder,
   LLMist,
@@ -11490,9 +11537,10 @@ init_gadget();
   ModelRegistry,
   OpenAIChatProvider,
   SlidingWindowStrategy,
-  StreamParser,
   StreamProcessor,
   SummarizationStrategy,
+  TaskCompletionSignal,
+  TimeoutException,
   audioFromBase64,
   audioFromBuffer,
   collectEvents,
@@ -11504,7 +11552,7 @@ init_gadget();
   createGeminiProviderFromEnv,
   createHints,
   createLogger,
-  createMedia,
+  createMediaOutput,
   createMockAdapter,
   createMockClient,
   createMockStream,
@@ -11514,7 +11562,7 @@ init_gadget();
   detectAudioMimeType,
   detectImageMimeType,
   discoverProviderAdapters,
-  extractText,
+  extractMessageText,
   getMockManager,
   getModelId,
   getProvider,
@@ -11528,7 +11576,7 @@ init_gadget();
   isTextPart,
   iterationProgressHint,
   mockLLM,
-  normalizeContent,
+  normalizeMessageContent,
   parallelGadgetHint,
   parseDataUrl,
   resolveHintTemplate,