llmist 2.5.0 → 3.0.0

package/dist/index.cjs

@@ -192,7 +192,9 @@ var init_input_content = __esm({
       // WAV (RIFF)
       { bytes: [82, 73, 70, 70], mimeType: "audio/wav" },
       // WebM
-      { bytes: [26, 69, 223, 163], mimeType: "audio/webm" }
+      { bytes: [26, 69, 223, 163], mimeType: "audio/webm" },
+      // FLAC (fLaC)
+      { bytes: [102, 76, 97, 67], mimeType: "audio/flac" }
     ];
   }
 });
@@ -564,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;
   }
@@ -930,7 +932,17 @@ Produces: { "items": ["first", "second"] }`);
         this.messages.push({ role: "user", content: parts });
         return this;
       }
-      addGadgetCall(gadget, parameters, result) {
+      /**
+       * 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",
@@ -938,10 +950,25 @@ Produces: { "items": ["first", "second"] }`);
 ${paramStr}
 ${this.endPrefix}`
         });
-        this.messages.push({
-          role: "user",
-          content: `Result: ${result}`
-        });
+        if (media && media.length > 0 && mediaIds && mediaIds.length > 0) {
+          const idRefs = media.map((m, i) => `[Media: ${mediaIds[i]} (${m.kind})]`).join("\n");
+          const textWithIds = `Result: ${result}
+${idRefs}`;
+          const parts = [text(textWithIds)];
+          for (const item of media) {
+            if (item.kind === "image") {
+              parts.push(imageFromBase64(item.data, item.mimeType));
+            } else if (item.kind === "audio") {
+              parts.push(audioFromBase64(item.data, item.mimeType));
+            }
+          }
+          this.messages.push({ role: "user", content: parts });
+        } else {
+          this.messages.push({
+            role: "user",
+            content: `Result: ${result}`
+          });
+        }
         return this;
       }
       /**
@@ -978,22 +1005,226 @@ ${this.endPrefix}`
   }
 });
 
+// src/gadgets/media-store.ts
+function getLlmistTmpDir() {
+  return (0, import_node_path.join)((0, import_node_os.homedir)(), ".llmist", "tmp");
+}
+var import_node_crypto, import_promises, import_node_os, import_node_path, MIME_TO_EXTENSION, MediaStore;
+var init_media_store = __esm({
+  "src/gadgets/media-store.ts"() {
+    "use strict";
+    import_node_crypto = require("crypto");
+    import_promises = require("fs/promises");
+    import_node_os = require("os");
+    import_node_path = require("path");
+    MIME_TO_EXTENSION = {
+      // Images
+      "image/png": ".png",
+      "image/jpeg": ".jpg",
+      "image/gif": ".gif",
+      "image/webp": ".webp",
+      "image/svg+xml": ".svg",
+      "image/bmp": ".bmp",
+      "image/tiff": ".tiff",
+      // Audio
+      "audio/mp3": ".mp3",
+      "audio/mpeg": ".mp3",
+      "audio/wav": ".wav",
+      "audio/webm": ".webm",
+      "audio/ogg": ".ogg",
+      "audio/flac": ".flac",
+      "audio/aac": ".aac",
+      // Video
+      "video/mp4": ".mp4",
+      "video/webm": ".webm",
+      "video/ogg": ".ogv",
+      "video/quicktime": ".mov",
+      "video/x-msvideo": ".avi",
+      // Documents
+      "application/pdf": ".pdf",
+      "application/json": ".json",
+      "text/plain": ".txt",
+      "text/html": ".html",
+      "text/css": ".css",
+      "text/javascript": ".js"
+    };
+    MediaStore = class {
+      items = /* @__PURE__ */ new Map();
+      outputDir;
+      counter = 0;
+      initialized = false;
+      /**
+       * Create a new MediaStore.
+       *
+       * @param sessionId - Optional session ID for the output directory.
+       *                    If not provided, a random ID is generated.
+       */
+      constructor(sessionId) {
+        const id = sessionId ?? (0, import_node_crypto.randomBytes)(8).toString("hex");
+        this.outputDir = (0, import_node_path.join)(getLlmistTmpDir(), `media-${id}`);
+      }
+      /**
+       * Get the output directory path.
+       */
+      getOutputDir() {
+        return this.outputDir;
+      }
+      /**
+       * Ensure the output directory exists.
+       * @throws Error if directory creation fails
+       */
+      async ensureDir() {
+        if (this.initialized) return;
+        try {
+          await (0, import_promises.mkdir)(this.outputDir, { recursive: true });
+          this.initialized = true;
+        } catch (error) {
+          throw new Error(
+            `MediaStore: Failed to create directory ${this.outputDir}: ${error instanceof Error ? error.message : String(error)}`
+          );
+        }
+      }
+      /**
+       * Generate a unique media ID.
+       * Format: "media_" + 6 random alphanumeric characters
+       */
+      generateId() {
+        const chars = "abcdefghijklmnopqrstuvwxyz0123456789";
+        let id = "media_";
+        const bytes = (0, import_node_crypto.randomBytes)(6);
+        for (let i = 0; i < 6; i++) {
+          id += chars[bytes[i] % chars.length];
+        }
+        return id;
+      }
+      /**
+       * Get file extension from MIME type.
+       */
+      getExtension(mimeType) {
+        return MIME_TO_EXTENSION[mimeType] ?? ".bin";
+      }
+      /**
+       * Store media and return stored metadata with ID.
+       *
+       * @param media - The media output from a gadget
+       * @param gadgetName - Name of the gadget that created this media
+       * @returns Stored media information including generated ID
+       * @throws Error if file write fails
+       */
+      async store(media, gadgetName) {
+        await this.ensureDir();
+        const id = this.generateId();
+        const ext = this.getExtension(media.mimeType);
+        const filename = media.fileName ?? `${gadgetName}_${String(++this.counter).padStart(3, "0")}${ext}`;
+        const filePath = (0, import_node_path.join)(this.outputDir, filename);
+        const buffer = Buffer.from(media.data, "base64");
+        try {
+          await (0, import_promises.writeFile)(filePath, buffer);
+        } catch (error) {
+          throw new Error(
+            `MediaStore: Failed to write media file ${filePath}: ${error instanceof Error ? error.message : String(error)}`
+          );
+        }
+        const stored = {
+          id,
+          kind: media.kind,
+          path: filePath,
+          mimeType: media.mimeType,
+          sizeBytes: buffer.length,
+          description: media.description,
+          metadata: media.metadata,
+          gadgetName,
+          createdAt: /* @__PURE__ */ new Date()
+        };
+        this.items.set(id, stored);
+        return stored;
+      }
+      /**
+       * Get stored media by ID.
+       *
+       * @param id - The media ID (e.g., "media_a1b2c3")
+       * @returns The stored media or undefined if not found
+       */
+      get(id) {
+        return this.items.get(id);
+      }
+      /**
+       * Get the actual file path for a media ID.
+       * Convenience method for gadgets that need the raw path.
+       *
+       * @param id - The media ID
+       * @returns The file path or undefined if not found
+       */
+      getPath(id) {
+        return this.items.get(id)?.path;
+      }
+      /**
+       * List all stored media, optionally filtered by kind.
+       *
+       * @param kind - Optional media kind to filter by
+       * @returns Array of stored media items
+       */
+      list(kind) {
+        const all = Array.from(this.items.values());
+        if (kind) {
+          return all.filter((item) => item.kind === kind);
+        }
+        return all;
+      }
+      /**
+       * Get the count of stored media items.
+       */
+      get size() {
+        return this.items.size;
+      }
+      /**
+       * Check if a media ID exists.
+       */
+      has(id) {
+        return this.items.has(id);
+      }
+      /**
+       * Clear in-memory store without deleting files.
+       * Resets the counter but leaves files on disk.
+       */
+      clear() {
+        this.items.clear();
+        this.counter = 0;
+      }
+      /**
+       * Delete all stored files and clear memory.
+       * Removes the entire session directory.
+       */
+      async cleanup() {
+        if (this.initialized) {
+          try {
+            await (0, import_promises.rm)(this.outputDir, { recursive: true, force: true });
+          } catch {
+          }
+          this.initialized = false;
+        }
+        this.clear();
+      }
+    };
+  }
+});
+
 // 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;
       }
     };
@@ -1007,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";
       }
     };
   }
@@ -1050,7 +1281,7 @@ function createLogger(options = {}) {
   let finalType = defaultType;
   if (envLogFile) {
     try {
-      (0, import_node_fs.mkdirSync)((0, import_node_path.dirname)(envLogFile), { recursive: true });
+      (0, import_node_fs.mkdirSync)((0, import_node_path2.dirname)(envLogFile), { recursive: true });
       const flags = logReset ? "w" : "a";
       logFileStream = (0, import_node_fs.createWriteStream)(envLogFile, { flags });
       finalType = "hidden";
@@ -1075,12 +1306,12 @@ function createLogger(options = {}) {
   }
   return logger;
 }
-var import_node_fs, import_node_path, import_tslog, LEVEL_NAME_TO_ID, defaultLogger;
+var import_node_fs, import_node_path2, import_tslog, LEVEL_NAME_TO_ID, defaultLogger;
 var init_logger = __esm({
   "src/logging/logger.ts"() {
     "use strict";
     import_node_fs = require("fs");
-    import_node_path = require("path");
+    import_node_path2 = require("path");
     import_tslog = require("tslog");
     LEVEL_NAME_TO_ID = {
       silly: 0,
@@ -1179,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;
@@ -1187,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));
@@ -1283,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";
@@ -1291,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.
@@ -1319,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
@@ -1351,7 +1582,7 @@ var init_gadget = __esm({
        */
       throwIfAborted(ctx) {
         if (ctx?.signal?.aborted) {
-          throw new AbortError();
+          throw new AbortException();
         }
       }
       /**
@@ -1492,7 +1723,9 @@ var init_gadget = __esm({
               parts.push(`# ${example.comment}`);
             }
             parts.push(`${effectiveStartPrefix}${gadgetName}`);
-            parts.push(formatParamsAsBlock(example.params, "", effectiveArgPrefix));
+            parts.push(
+              formatParamsForBlockExample(example.params, "", effectiveArgPrefix)
+            );
             parts.push(effectiveEndPrefix);
             if (example.output !== void 0) {
               parts.push("");
@@ -1509,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;
@@ -1694,6 +1927,18 @@ var init_output_viewer = __esm({
   }
 });
 
+// src/agent/agent-internal-key.ts
+function isValidAgentKey(key) {
+  return key === AGENT_INTERNAL_KEY;
+}
+var AGENT_INTERNAL_KEY;
+var init_agent_internal_key = __esm({
+  "src/agent/agent-internal-key.ts"() {
+    "use strict";
+    AGENT_INTERNAL_KEY = Symbol("AGENT_INTERNAL_KEY");
+  }
+});
+
 // src/agent/compaction/config.ts
 function resolveCompactionConfig(config = {}) {
   const trigger = config.triggerThresholdPercent ?? DEFAULT_COMPACTION_CONFIG.triggerThresholdPercent;
@@ -1941,9 +2186,9 @@ var init_hybrid = __esm({
 var init_strategies = __esm({
   "src/agent/compaction/strategies/index.ts"() {
     "use strict";
+    init_hybrid();
     init_sliding_window();
     init_summarization();
-    init_hybrid();
   }
 });
 
@@ -2105,98 +2350,6 @@ var init_manager = __esm({
   }
 });
 
-// src/agent/gadget-output-store.ts
-var import_node_crypto, GadgetOutputStore;
-var init_gadget_output_store = __esm({
-  "src/agent/gadget-output-store.ts"() {
-    "use strict";
-    import_node_crypto = require("crypto");
-    GadgetOutputStore = class {
-      outputs = /* @__PURE__ */ new Map();
-      /**
-       * Store a gadget output and return its ID.
-       *
-       * @param gadgetName - Name of the gadget that produced the output
-       * @param content - Full output content to store
-       * @returns Generated ID for retrieving the output later
-       */
-      store(gadgetName, content) {
-        const id = this.generateId(gadgetName);
-        const encoder = new TextEncoder();
-        const stored = {
-          id,
-          gadgetName,
-          content,
-          byteSize: encoder.encode(content).length,
-          lineCount: content.split("\n").length,
-          timestamp: /* @__PURE__ */ new Date()
-        };
-        this.outputs.set(id, stored);
-        return id;
-      }
-      /**
-       * Retrieve a stored output by ID.
-       *
-       * @param id - The output ID (e.g., "Search_d34db33f")
-       * @returns The stored output or undefined if not found
-       */
-      get(id) {
-        return this.outputs.get(id);
-      }
-      /**
-       * Check if an output exists.
-       *
-       * @param id - The output ID to check
-       * @returns True if the output exists
-       */
-      has(id) {
-        return this.outputs.has(id);
-      }
-      /**
-       * Get all stored output IDs.
-       *
-       * @returns Array of output IDs
-       */
-      getIds() {
-        return Array.from(this.outputs.keys());
-      }
-      /**
-       * Get the number of stored outputs.
-       */
-      get size() {
-        return this.outputs.size;
-      }
-      /**
-       * Clear all stored outputs.
-       * Called when the agent run completes.
-       */
-      clear() {
-        this.outputs.clear();
-      }
-      /**
-       * Generate a unique ID for a stored output.
-       * Format: {GadgetName}_{8 hex chars}
-       */
-      generateId(gadgetName) {
-        const hex = (0, import_node_crypto.randomBytes)(4).toString("hex");
-        return `${gadgetName}_${hex}`;
-      }
-    };
-  }
-});
-
-// src/agent/agent-internal-key.ts
-function isValidAgentKey(key) {
-  return key === AGENT_INTERNAL_KEY;
-}
-var AGENT_INTERNAL_KEY;
-var init_agent_internal_key = __esm({
-  "src/agent/agent-internal-key.ts"() {
-    "use strict";
-    AGENT_INTERNAL_KEY = Symbol("AGENT_INTERNAL_KEY");
-  }
-});
-
 // src/agent/conversation-manager.ts
 var ConversationManager;
 var init_conversation_manager = __esm({
@@ -2227,8 +2380,8 @@ var init_conversation_manager = __esm({
       addAssistantMessage(content) {
         this.historyBuilder.addAssistant(content);
       }
-      addGadgetCall(gadgetName, parameters, result) {
-        this.historyBuilder.addGadgetCall(gadgetName, parameters, result);
+      addGadgetCallResult(gadgetName, parameters, result, media, mediaIds) {
+        this.historyBuilder.addGadgetCallResult(gadgetName, parameters, result, media, mediaIds);
       }
       getMessages() {
         return [...this.baseMessages, ...this.initialMessages, ...this.historyBuilder.build()];
@@ -2248,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));
           }
         }
       }
@@ -2342,6 +2495,86 @@ var init_event_handlers = __esm({
   }
 });
 
+// src/agent/gadget-output-store.ts
+var import_node_crypto2, GadgetOutputStore;
+var init_gadget_output_store = __esm({
+  "src/agent/gadget-output-store.ts"() {
+    "use strict";
+    import_node_crypto2 = require("crypto");
+    GadgetOutputStore = class {
+      outputs = /* @__PURE__ */ new Map();
+      /**
+       * Store a gadget output and return its ID.
+       *
+       * @param gadgetName - Name of the gadget that produced the output
+       * @param content - Full output content to store
+       * @returns Generated ID for retrieving the output later
+       */
+      store(gadgetName, content) {
+        const id = this.generateId(gadgetName);
+        const encoder = new TextEncoder();
+        const stored = {
+          id,
+          gadgetName,
+          content,
+          byteSize: encoder.encode(content).length,
+          lineCount: content.split("\n").length,
+          timestamp: /* @__PURE__ */ new Date()
+        };
+        this.outputs.set(id, stored);
+        return id;
+      }
+      /**
+       * Retrieve a stored output by ID.
+       *
+       * @param id - The output ID (e.g., "Search_d34db33f")
+       * @returns The stored output or undefined if not found
+       */
+      get(id) {
+        return this.outputs.get(id);
+      }
+      /**
+       * Check if an output exists.
+       *
+       * @param id - The output ID to check
+       * @returns True if the output exists
+       */
+      has(id) {
+        return this.outputs.has(id);
+      }
+      /**
+       * Get all stored output IDs.
+       *
+       * @returns Array of output IDs
+       */
+      getIds() {
+        return Array.from(this.outputs.keys());
+      }
+      /**
+       * Get the number of stored outputs.
+       */
+      get size() {
+        return this.outputs.size;
+      }
+      /**
+       * Clear all stored outputs.
+       * Called when the agent run completes.
+       */
+      clear() {
+        this.outputs.clear();
+      }
+      /**
+       * Generate a unique ID for a stored output.
+       * Format: {GadgetName}_{8 hex chars}
+       */
+      generateId(gadgetName) {
+        const hex = (0, import_node_crypto2.randomBytes)(4).toString("hex");
+        return `${gadgetName}_${hex}`;
+      }
+    };
+  }
+});
+
 // src/agent/hook-validators.ts
 function validateBeforeLLMCallAction(action) {
   if (!action || typeof action !== "object" || !("action" in action)) {
@@ -2652,8 +2885,7 @@ var init_schema_introspector = __esm({
             const values = def?.values;
             const value = values?.[0] ?? def?.value;
             if (typeof value === "string") return "string";
-            if (typeof value === "number" || typeof value === "bigint")
-              return "number";
+            if (typeof value === "number" || typeof value === "bigint") return "number";
             if (typeof value === "boolean") return "boolean";
             return "unknown";
           }
@@ -2925,7 +3157,13 @@ var init_cost_reporting_client = __esm({
             cacheCreationInputTokens = chunk.usage.cacheCreationInputTokens ?? 0;
           }
         }
-        this.reportCostFromUsage(model, inputTokens, outputTokens, cachedInputTokens, cacheCreationInputTokens);
+        this.reportCostFromUsage(
+          model,
+          inputTokens,
+          outputTokens,
+          cachedInputTokens,
+          cacheCreationInputTokens
+        );
         return result;
       }
       /**
@@ -2965,7 +3203,13 @@ var init_cost_reporting_client = __esm({
             }
           }
         } finally {
-          this.reportCostFromUsage(model, inputTokens, outputTokens, cachedInputTokens, cacheCreationInputTokens);
+          this.reportCostFromUsage(
+            model,
+            inputTokens,
+            outputTokens,
+            cachedInputTokens,
+            cacheCreationInputTokens
+          );
         }
       }
       /**
@@ -3003,7 +3247,13 @@ var init_cost_reporting_client = __esm({
             }
           } finally {
             if (inputTokens > 0 || outputTokens > 0) {
-              reportCostFromUsage(model, inputTokens, outputTokens, cachedInputTokens, cacheCreationInputTokens);
+              reportCostFromUsage(
+                model,
+                inputTokens,
+                outputTokens,
+                cachedInputTokens,
+                cacheCreationInputTokens
+              );
             }
           }
         }
@@ -3031,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;
@@ -3122,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;
@@ -3140,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
@@ -3158,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
           };
@@ -3207,15 +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;
@@ -3235,7 +3489,7 @@ var init_parser = __esm({
           yield {
             type: "gadget_call",
             call: {
-              gadgetName: actualGadgetName,
+              gadgetName,
               invocationId,
               parametersRaw,
               parameters,
@@ -3244,33 +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,
@@ -3281,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 };
         }
@@ -3289,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;
       }
     };
   }
@@ -3308,13 +3562,16 @@ var init_executor = __esm({
     init_exceptions();
     init_parser();
     GadgetExecutor = class {
-      constructor(registry, onHumanInputRequired, logger, defaultGadgetTimeoutMs, errorFormatterOptions, client) {
+      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;
@@ -3334,13 +3591,17 @@ var init_executor = __esm({
         });
       }
       /**
-       * Normalizes gadget execute result to consistent format.
-       * Handles both string returns (backwards compat) and object returns with cost.
+       * 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 };
         }
+        if ("media" in raw && raw.media) {
+          return { result: raw.result, media: raw.media, cost: raw.cost ?? 0 };
+        }
         return { result: raw.result, cost: raw.cost ?? 0 };
       }
       // Execute a gadget call asynchronously
@@ -3452,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) {
@@ -3467,8 +3730,21 @@ var init_executor = __esm({
           } else {
             rawResult = await Promise.resolve(gadget.execute(validatedParameters, ctx));
           }
-          const { result, cost: returnCost } = this.normalizeExecuteResult(rawResult);
+          const { result, media, cost: returnCost } = this.unifyExecuteResult(rawResult);
           const totalCost = callbackCost + returnCost;
+          let mediaIds;
+          let storedMedia;
+          if (media && media.length > 0 && this.mediaStore) {
+            storedMedia = await Promise.all(
+              media.map((item) => this.mediaStore.store(item, call.gadgetName))
+            );
+            mediaIds = storedMedia.map((m) => m.id);
+            this.logger.debug("Stored media outputs", {
+              gadgetName: call.gadgetName,
+              mediaIds,
+              count: media.length
+            });
+          }
           const executionTimeMs = Date.now() - startTime;
           this.logger.info("Gadget executed successfully", {
             gadgetName: call.gadgetName,
@@ -3476,7 +3752,8 @@ var init_executor = __esm({
             executionTimeMs,
             cost: totalCost > 0 ? totalCost : void 0,
             callbackCost: callbackCost > 0 ? callbackCost : void 0,
-            returnCost: returnCost > 0 ? returnCost : void 0
+            returnCost: returnCost > 0 ? returnCost : void 0,
+            mediaCount: media?.length
           });
           this.logger.debug("Gadget result", {
             gadgetName: call.gadgetName,
@@ -3484,7 +3761,8 @@ var init_executor = __esm({
             parameters: validatedParameters,
             result,
             cost: totalCost,
-            executionTimeMs
+            executionTimeMs,
+            mediaIds
           });
           return {
             gadgetName: call.gadgetName,
@@ -3492,10 +3770,13 @@ var init_executor = __esm({
             parameters: validatedParameters,
             result,
             executionTimeMs,
-            cost: totalCost
+            cost: totalCost,
+            media,
+            mediaIds,
+            storedMedia
           };
         } catch (error) {
-          if (error instanceof BreakLoopException) {
+          if (error instanceof TaskCompletionSignal) {
             this.logger.info("Gadget requested loop termination", {
               gadgetName: call.gadgetName,
               message: error.message
@@ -3523,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
@@ -3536,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
@@ -3641,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) */
@@ -3658,19 +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.client,
+          options.mediaStore,
+          options.agentConfig,
+          options.subagentConfig
         );
       }
       /**
@@ -3691,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);
@@ -3702,7 +3986,7 @@ var init_stream_processor = __esm({
               }
             }
             if (processedChunk) {
-              this.accumulatedText += processedChunk;
+              this.responseText += processedChunk;
             }
           }
           if (this.hooks.observers?.onStreamChunk && (processedChunk || chunk.usage)) {
@@ -3711,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
               };
@@ -3734,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);
@@ -3763,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);
@@ -3778,7 +4062,7 @@ var init_stream_processor = __esm({
           didExecuteGadgets,
           finishReason,
           usage,
-          rawResponse: this.accumulatedText,
+          rawResponse: this.responseText,
           finalMessage
         };
       }
@@ -3801,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);
@@ -3820,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
           });
@@ -3859,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;
           }
         }
@@ -3881,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 ?? {};
@@ -4012,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;
@@ -4106,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 });
@@ -4122,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;
@@ -4133,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);
@@ -4143,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));
@@ -4176,7 +4460,7 @@ var init_stream_processor = __esm({
             };
             events.push(skipEvent);
           }
-          this.pendingGadgets.clear();
+          this.gadgetsAwaitingDependencies.clear();
         }
         return events;
       }
@@ -4206,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,
@@ -4259,13 +4543,14 @@ var init_agent = __esm({
     init_constants();
     init_messages();
     init_model_shortcuts();
+    init_media_store();
     init_output_viewer();
     init_logger();
-    init_manager();
-    init_gadget_output_store();
     init_agent_internal_key();
+    init_manager();
     init_conversation_manager();
     init_event_handlers();
+    init_gadget_output_store();
     init_hook_validators();
     init_stream_processor();
     Agent = class {
@@ -4280,22 +4565,27 @@ var init_agent = __esm({
       gadgetStartPrefix;
       gadgetEndPrefix;
       gadgetArgPrefix;
-      onHumanInputRequired;
+      requestHumanInput;
       textOnlyHandler;
       textWithGadgetsHandler;
       stopOnGadgetError;
-      shouldContinueAfterError;
+      canRecoverFromGadgetError;
       defaultGadgetTimeoutMs;
       defaultMaxTokens;
-      userPromptProvided;
+      hasUserPrompt;
       // Gadget output limiting
       outputStore;
       outputLimitEnabled;
       outputLimitCharLimit;
       // Context compaction
       compactionManager;
+      // Media storage (for gadgets returning images, audio, etc.)
+      mediaStore;
       // Cancellation
       signal;
+      // Subagent configuration
+      agentContextConfig;
+      subagentConfig;
       /**
        * Creates a new Agent instance.
        * @internal This constructor is private. Use LLMist.createAgent() or AgentBuilder instead.
@@ -4315,15 +4605,16 @@ 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;
         this.outputStore = new GadgetOutputStore();
+        this.mediaStore = new MediaStore();
         const limitPercent = options.gadgetOutputLimitPercent ?? DEFAULT_GADGET_OUTPUT_LIMIT_PERCENT;
         const limits = this.client.modelRegistry.getModelLimits(this.model);
         const contextWindow = limits?.contextWindow ?? FALLBACK_CONTEXT_WINDOW;
@@ -4334,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);
@@ -4354,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);
         }
@@ -4367,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.
@@ -4389,6 +4685,36 @@ var init_agent = __esm({
       getRegistry() {
         return this.registry;
       }
+      /**
+       * Get the media store for this agent session.
+       *
+       * The media store holds all media outputs (images, audio, etc.) produced by gadgets
+       * during this agent's execution. Use this to:
+       * - Access stored media files by ID
+       * - List all stored media
+       * - Clean up temporary files after execution
+       *
+       * @returns The MediaStore instance for this agent
+       *
+       * @example
+       * ```typescript
+       * const agent = new AgentBuilder()
+       *   .withModel("sonnet")
+       *   .build();
+       *
+       * // After execution, access stored media
+       * const store = agent.getMediaStore();
+       * for (const media of store.list()) {
+       *   console.log(`${media.id}: ${media.path}`);
+       * }
+       *
+       * // Clean up when done
+       * await store.cleanup();
+       * ```
+       */
+      getMediaStore() {
+        return this.mediaStore;
+      }
       /**
        * Manually trigger context compaction.
        *
@@ -4443,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."
           );
@@ -4560,11 +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
+              client: this.client,
+              mediaStore: this.mediaStore,
+              agentConfig: this.agentContextConfig,
+              subagentConfig: this.subagentConfig
             });
             const result = await processor.process(stream2);
             for (const output of result.outputs) {
@@ -4617,19 +4946,21 @@ 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 = result.outputs.filter(
+                  (output) => output.type === "text"
+                ).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
@@ -4639,16 +4970,18 @@ 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 ?? ""
+                    gadgetResult.error ?? gadgetResult.result ?? "",
+                    gadgetResult.media,
+                    gadgetResult.mediaIds
                   );
                 }
               }
             } else {
               if (finalMessage.trim()) {
-                this.conversation.addGadgetCall(
+                this.conversation.addGadgetCallResult(
                   "TellUser",
                   { message: finalMessage, done: false, type: "info" },
                   `\u2139\uFE0F  ${finalMessage}`
@@ -4774,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 ?? {};
         }
@@ -5131,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.
@@ -5233,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;
@@ -5274,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" } } : {};
@@ -5320,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;
@@ -5397,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) => ({
@@ -5419,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;
@@ -6110,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 = {
@@ -6162,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",
@@ -6212,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 };
@@ -6257,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 };
           }
@@ -6271,7 +6604,7 @@ var init_gemini = __esm({
           }
         }
       }
-      extractText(chunk) {
+      extractMessageText(chunk) {
         if (!chunk?.candidates) {
           return "";
         }
@@ -6336,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;
@@ -6857,14 +7190,7 @@ var OPENAI_TTS_VOICES, OPENAI_TTS_EXTENDED_VOICES, OPENAI_TTS_FORMATS, openaiSpe
 var init_openai_speech_models = __esm({
   "src/providers/openai-speech-models.ts"() {
     "use strict";
-    OPENAI_TTS_VOICES = [
-      "alloy",
-      "echo",
-      "fable",
-      "onyx",
-      "nova",
-      "shimmer"
-    ];
+    OPENAI_TTS_VOICES = ["alloy", "echo", "fable", "onyx", "nova", "shimmer"];
     OPENAI_TTS_EXTENDED_VOICES = [
       ...OPENAI_TTS_VOICES,
       "ash",
@@ -7089,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;
@@ -7124,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",
@@ -7184,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("");
@@ -7242,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++;
@@ -7269,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;
@@ -7562,9 +7888,7 @@ var init_image = __esm({
         return this.findImageAdapter(modelId) !== void 0;
       }
       findImageAdapter(modelId) {
-        return this.adapters.find(
-          (adapter) => adapter.supportsImageGeneration?.(modelId) ?? false
-        );
+        return this.adapters.find((adapter) => adapter.supportsImageGeneration?.(modelId) ?? false);
       }
     };
   }
@@ -7616,9 +7940,7 @@ var init_speech = __esm({
         return this.findSpeechAdapter(modelId) !== void 0;
       }
       findSpeechAdapter(modelId) {
-        return this.adapters.find(
-          (adapter) => adapter.supportsSpeechGeneration?.(modelId) ?? false
-        );
+        return this.adapters.find((adapter) => adapter.supportsSpeechGeneration?.(modelId) ?? false);
       }
     };
   }
@@ -7729,11 +8051,7 @@ var init_vision = __esm({
             if (!parsed) {
               throw new Error("Invalid data URL format");
             }
-            builder.addUserWithImage(
-              options.prompt,
-              parsed.data,
-              parsed.mimeType
-            );
+            builder.addUserWithImage(options.prompt, parsed.data, parsed.mimeType);
           } else {
             const buffer = Buffer.from(options.image, "base64");
             builder.addUserWithImage(options.prompt, buffer, options.mimeType);
@@ -8142,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;
       }
@@ -8246,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;
       }
@@ -8332,7 +8651,7 @@ var init_builder = __esm({
        * ```
        */
       onHumanInput(handler) {
-        this.onHumanInputRequired = handler;
+        this.requestHumanInput = handler;
         return this;
       }
       /**
@@ -8467,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.
@@ -8490,7 +8809,7 @@ var init_builder = __esm({
        * ```
        */
       withErrorHandler(handler) {
-        this.shouldContinueAfterError = handler;
+        this.canRecoverFromGadgetError = handler;
         return this;
       }
       /**
@@ -8631,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.
        *
@@ -8795,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) {
@@ -8976,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);
       }
@@ -8999,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,
@@ -9011,16 +9352,18 @@ __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,
   MODEL_ALIASES: () => MODEL_ALIASES,
+  MediaStore: () => MediaStore,
   MockBuilder: () => MockBuilder,
   MockManager: () => MockManager,
   MockProviderAdapter: () => MockProviderAdapter,
@@ -9028,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,
@@ -9042,6 +9386,7 @@ __export(index_exports, {
   createGeminiProviderFromEnv: () => createGeminiProviderFromEnv,
   createHints: () => createHints,
   createLogger: () => createLogger,
+  createMediaOutput: () => createMediaOutput,
   createMockAdapter: () => createMockAdapter,
   createMockClient: () => createMockClient,
   createMockStream: () => createMockStream,
@@ -9051,7 +9396,7 @@ __export(index_exports, {
   detectAudioMimeType: () => detectAudioMimeType,
   detectImageMimeType: () => detectImageMimeType,
   discoverProviderAdapters: () => discoverProviderAdapters,
-  extractText: () => extractText,
+  extractMessageText: () => extractMessageText,
   getMockManager: () => getMockManager,
   getModelId: () => getModelId,
   getProvider: () => getProvider,
@@ -9065,13 +9410,18 @@ __export(index_exports, {
   isTextPart: () => isTextPart,
   iterationProgressHint: () => iterationProgressHint,
   mockLLM: () => mockLLM,
-  normalizeContent: () => normalizeContent,
+  normalizeMessageContent: () => normalizeMessageContent,
   parallelGadgetHint: () => parallelGadgetHint,
   parseDataUrl: () => parseDataUrl,
   resolveHintTemplate: () => resolveHintTemplate,
   resolveModel: () => resolveModel,
   resolvePromptTemplate: () => resolvePromptTemplate,
   resolveRulesTemplate: () => resolveRulesTemplate,
+  resultWithAudio: () => resultWithAudio,
+  resultWithFile: () => resultWithFile,
+  resultWithImage: () => resultWithImage,
+  resultWithImages: () => resultWithImages,
+  resultWithMedia: () => resultWithMedia,
   runWithHandlers: () => runWithHandlers,
   stream: () => stream,
   text: () => text,
@@ -9625,9 +9975,7 @@ var HookPresets = class _HookPresets {
           console.log(
             `\u{1F5DC}\uFE0F  Compaction (${ctx.event.strategy}): ${ctx.event.tokensBefore} \u2192 ${ctx.event.tokensAfter} tokens (saved ${saved}, ${percent}%)`
           );
-          console.log(
-            `   Messages: ${ctx.event.messagesBefore} \u2192 ${ctx.event.messagesAfter}`
-          );
+          console.log(`   Messages: ${ctx.event.messagesBefore} \u2192 ${ctx.event.messagesAfter}`);
           if (ctx.stats.totalCompactions > 1) {
             console.log(
               `   Cumulative: ${ctx.stats.totalCompactions} compactions, ${ctx.stats.totalTokensSaved} tokens saved`
@@ -9862,16 +10210,15 @@ var HookPresets = class _HookPresets {
   }
 };
 
-// src/agent/index.ts
-init_conversation_manager();
-init_stream_processor();
-init_gadget_output_store();
-
 // src/agent/compaction/index.ts
 init_config();
-init_strategy();
-init_strategies();
 init_manager();
+init_strategies();
+init_strategy();
+
+// src/agent/index.ts
+init_conversation_manager();
+init_gadget_output_store();
 
 // src/agent/hints.ts
 init_prompt_config();
@@ -9895,11 +10242,7 @@ function iterationProgressHint(options) {
           maxIterations,
           remaining
         };
-        let hint = resolveHintTemplate(
-          template,
-          DEFAULT_HINTS.iterationProgressHint,
-          hintContext
-        );
+        let hint = resolveHintTemplate(template, DEFAULT_HINTS.iterationProgressHint, hintContext);
         if (showUrgency && progress >= 0.8) {
           hint += " \u26A0\uFE0F Running low on iterations - focus on completing the task.";
         }
@@ -9974,6 +10317,9 @@ function createHints(config) {
   return HookPresets.merge(...hooksToMerge);
 }
 
+// src/agent/index.ts
+init_stream_processor();
+
 // src/index.ts
 init_client();
 init_input_content();
@@ -9984,17 +10330,17 @@ init_options();
 init_prompt_config();
 init_quick_methods();
 init_create_gadget();
-init_output_viewer();
 init_exceptions();
 init_executor();
 init_gadget();
+init_output_viewer();
 init_parser();
 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;
@@ -10012,6 +10358,119 @@ function Gadget(config) {
   return GadgetBase;
 }
 
+// src/gadgets/helpers.ts
+init_input_content();
+function createMediaOutput(kind, data, mimeType, options) {
+  const buffer = data instanceof Buffer ? data : Buffer.from(data);
+  return {
+    kind,
+    data: buffer.toString("base64"),
+    mimeType,
+    description: options?.description,
+    metadata: options?.metadata,
+    fileName: options?.fileName
+  };
+}
+function resultWithMedia(result, media, cost) {
+  if (media.length === 0) {
+    throw new Error("resultWithMedia: media array cannot be empty");
+  }
+  return {
+    result,
+    media,
+    cost
+  };
+}
+function resultWithImage(result, imageData, options) {
+  const buffer = imageData instanceof Buffer ? imageData : Buffer.from(imageData);
+  const mimeType = options?.mimeType ?? detectImageMimeType(buffer);
+  if (!mimeType) {
+    throw new Error(
+      "Could not detect image MIME type. Please provide mimeType explicitly in options."
+    );
+  }
+  return {
+    result,
+    media: [
+      {
+        kind: "image",
+        data: buffer.toString("base64"),
+        mimeType,
+        description: options?.description,
+        metadata: options?.metadata,
+        fileName: options?.fileName
+      }
+    ],
+    cost: options?.cost
+  };
+}
+function resultWithImages(result, images, cost) {
+  if (images.length === 0) {
+    throw new Error("resultWithImages: images array cannot be empty");
+  }
+  const media = images.map((img, index) => {
+    const buffer = img.data instanceof Buffer ? img.data : Buffer.from(img.data);
+    const mimeType = img.mimeType ?? detectImageMimeType(buffer);
+    if (!mimeType) {
+      throw new Error(
+        `Could not detect MIME type for image at index ${index}. Please provide mimeType explicitly.`
+      );
+    }
+    return {
+      kind: "image",
+      data: buffer.toString("base64"),
+      mimeType,
+      description: img.description,
+      metadata: img.metadata,
+      fileName: img.fileName
+    };
+  });
+  return { result, media, cost };
+}
+function resultWithAudio(result, audioData, options) {
+  const buffer = audioData instanceof Buffer ? audioData : Buffer.from(audioData);
+  const mimeType = options?.mimeType ?? detectAudioMimeType(buffer);
+  if (!mimeType) {
+    throw new Error(
+      "Could not detect audio MIME type. Please provide mimeType explicitly in options."
+    );
+  }
+  const metadata = options?.durationMs ? { durationMs: options.durationMs } : void 0;
+  return {
+    result,
+    media: [
+      {
+        kind: "audio",
+        data: buffer.toString("base64"),
+        mimeType,
+        description: options?.description,
+        metadata,
+        fileName: options?.fileName
+      }
+    ],
+    cost: options?.cost
+  };
+}
+function resultWithFile(result, fileData, mimeType, options) {
+  const buffer = fileData instanceof Buffer ? fileData : Buffer.from(fileData);
+  return {
+    result,
+    media: [
+      {
+        kind: "file",
+        data: buffer.toString("base64"),
+        mimeType,
+        description: options?.description,
+        fileName: options?.fileName
+      }
+    ],
+    cost: options?.cost
+  };
+}
+
+// src/index.ts
+init_media_store();
+
 // src/gadgets/validation.ts
 function validateAndApplyDefaults(schema, params) {
   const result = schema.safeParse(params);
@@ -10049,6 +10508,9 @@ init_discovery();
 init_gemini();
 init_openai();
 
+// src/testing/cli-helpers.ts
+var import_node_stream = require("stream");
+
 // src/testing/mock-manager.ts
 init_logger();
 var MockManager = class _MockManager {
@@ -10601,7 +11063,9 @@ var MockBuilder = class {
    */
   whenMessageContains(text3) {
     this.matchers.push(
-      (ctx) => ctx.messages.some((msg) => extractText(msg.content).toLowerCase().includes(text3.toLowerCase()))
+      (ctx) => ctx.messages.some(
+        (msg) => extractMessageText(msg.content).toLowerCase().includes(text3.toLowerCase())
+      )
     );
     return this;
   }
@@ -10615,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;
   }
@@ -10626,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;
   }
   /**
@@ -10638,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;
@@ -11041,16 +11505,12 @@ function createMockClient(options) {
 
 // src/testing/mock-gadget.ts
 init_gadget();
-
-// src/testing/cli-helpers.ts
-var import_node_stream = require("stream");
 // 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,
@@ -11058,16 +11518,18 @@ var import_node_stream = require("stream");
   DEFAULT_PROMPTS,
   DEFAULT_SUMMARIZATION_PROMPT,
   Gadget,
+  GadgetCallParser,
   GadgetExecutor,
   GadgetOutputStore,
   GadgetRegistry,
   GeminiGenerativeProvider,
   HookPresets,
-  HumanInputException,
+  HumanInputRequiredException,
   HybridStrategy,
   LLMMessageBuilder,
   LLMist,
   MODEL_ALIASES,
+  MediaStore,
   MockBuilder,
   MockManager,
   MockProviderAdapter,
@@ -11075,9 +11537,10 @@ var import_node_stream = require("stream");
   ModelRegistry,
   OpenAIChatProvider,
   SlidingWindowStrategy,
-  StreamParser,
   StreamProcessor,
   SummarizationStrategy,
+  TaskCompletionSignal,
+  TimeoutException,
   audioFromBase64,
   audioFromBuffer,
   collectEvents,
@@ -11089,6 +11552,7 @@ var import_node_stream = require("stream");
   createGeminiProviderFromEnv,
   createHints,
   createLogger,
+  createMediaOutput,
   createMockAdapter,
   createMockClient,
   createMockStream,
@@ -11098,7 +11562,7 @@ var import_node_stream = require("stream");
   detectAudioMimeType,
   detectImageMimeType,
   discoverProviderAdapters,
-  extractText,
+  extractMessageText,
   getMockManager,
   getModelId,
   getProvider,
@@ -11112,13 +11576,18 @@ var import_node_stream = require("stream");
   isTextPart,
   iterationProgressHint,
   mockLLM,
-  normalizeContent,
+  normalizeMessageContent,
   parallelGadgetHint,
   parseDataUrl,
   resolveHintTemplate,
   resolveModel,
   resolvePromptTemplate,
   resolveRulesTemplate,
+  resultWithAudio,
+  resultWithFile,
+  resultWithImage,
+  resultWithImages,
+  resultWithMedia,
   runWithHandlers,
   stream,
   text,