llmist 0.7.0 → 1.0.0

package/dist/index.cjs

@@ -31,12 +31,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/core/constants.ts
-var GADGET_START_PREFIX, GADGET_END_PREFIX, DEFAULT_GADGET_OUTPUT_LIMIT, DEFAULT_GADGET_OUTPUT_LIMIT_PERCENT, CHARS_PER_TOKEN, FALLBACK_CONTEXT_WINDOW;
+var GADGET_START_PREFIX, GADGET_END_PREFIX, GADGET_ARG_PREFIX, DEFAULT_GADGET_OUTPUT_LIMIT, DEFAULT_GADGET_OUTPUT_LIMIT_PERCENT, CHARS_PER_TOKEN, FALLBACK_CONTEXT_WINDOW;
 var init_constants = __esm({
   "src/core/constants.ts"() {
     "use strict";
     GADGET_START_PREFIX = "!!!GADGET_START:";
     GADGET_END_PREFIX = "!!!GADGET_END";
+    GADGET_ARG_PREFIX = "!!!ARG:";
     DEFAULT_GADGET_OUTPUT_LIMIT = true;
     DEFAULT_GADGET_OUTPUT_LIMIT_PERCENT = 15;
     CHARS_PER_TOKEN = 4;
@@ -386,17 +387,12 @@ var init_prompt_config = __esm({
         "EACH MARKER MUST START WITH A NEWLINE."
       ].join("\n"),
       criticalUsage: "INVOKE gadgets using the markers - do not describe what you want to do.",
-      formatDescriptionYaml: "Parameters in YAML format (one per line)",
-      formatDescriptionJson: "Parameters in JSON format (valid JSON object)",
-      formatDescriptionToml: "Parameters in TOML format (key = value pairs, use heredoc for multiline: key = <<<EOF ... EOF)",
+      formatDescription: (ctx) => `Parameters using ${ctx.argPrefix}name markers (value on next line(s), no escaping needed)`,
       rules: () => [
         "Output ONLY plain text with the exact markers - never use function/tool calling",
         "You can invoke multiple gadgets in a single response",
         "For dependent gadgets, invoke the first one and wait for the result"
       ],
-      schemaLabelJson: "\n\nInput Schema (JSON):",
-      schemaLabelYaml: "\n\nInput Schema (YAML):",
-      schemaLabelToml: "\n\nInput Schema (TOML):",
       customExamples: null
     };
   }
@@ -413,6 +409,7 @@ var init_messages = __esm({
       messages = [];
       startPrefix = GADGET_START_PREFIX;
       endPrefix = GADGET_END_PREFIX;
+      argPrefix = GADGET_ARG_PREFIX;
       promptConfig;
       constructor(promptConfig) {
         this.promptConfig = promptConfig ?? {};
@@ -421,26 +418,32 @@ var init_messages = __esm({
        * Set custom prefixes for gadget markers.
        * Used to configure history builder to match system prompt markers.
        */
-      withPrefixes(startPrefix, endPrefix) {
+      withPrefixes(startPrefix, endPrefix, argPrefix) {
         this.startPrefix = startPrefix;
         this.endPrefix = endPrefix;
+        if (argPrefix) {
+          this.argPrefix = argPrefix;
+        }
         return this;
       }
       addSystem(content, metadata) {
         this.messages.push({ role: "system", content, metadata });
         return this;
       }
-      addGadgets(gadgets, parameterFormat = "json", options) {
+      addGadgets(gadgets, options) {
         if (options?.startPrefix) {
           this.startPrefix = options.startPrefix;
         }
         if (options?.endPrefix) {
           this.endPrefix = options.endPrefix;
         }
+        if (options?.argPrefix) {
+          this.argPrefix = options.argPrefix;
+        }
         const context = {
-          parameterFormat,
           startPrefix: this.startPrefix,
           endPrefix: this.endPrefix,
+          argPrefix: this.argPrefix,
           gadgetCount: gadgets.length,
           gadgetNames: gadgets.map((g) => g.name ?? g.constructor.name)
         };
@@ -451,26 +454,19 @@ var init_messages = __esm({
           context
         );
         parts.push(mainInstruction);
-        parts.push(this.buildGadgetsSection(gadgets, parameterFormat));
-        parts.push(this.buildUsageSection(parameterFormat, context));
+        parts.push(this.buildGadgetsSection(gadgets));
+        parts.push(this.buildUsageSection(context));
         this.messages.push({ role: "system", content: parts.join("") });
         return this;
       }
-      buildGadgetsSection(gadgets, parameterFormat) {
+      buildGadgetsSection(gadgets) {
         const parts = [];
         parts.push("\n\nAVAILABLE GADGETS");
         parts.push("\n=================\n");
         for (const gadget of gadgets) {
           const gadgetName = gadget.name ?? gadget.constructor.name;
-          const instruction = gadget.getInstruction(parameterFormat);
-          const schemaMarkers = {
-            yaml: "\n\nInput Schema (YAML):",
-            json: "\n\nInput Schema (JSON):",
-            toml: "\n\nInput Schema (TOML):",
-            auto: "\n\nInput Schema (JSON):"
-            // auto defaults to JSON schema display
-          };
-          const schemaMarker = schemaMarkers[parameterFormat];
+          const instruction = gadget.getInstruction(this.argPrefix);
+          const schemaMarker = "\n\nInput Schema (BLOCK):";
           const schemaIndex = instruction.indexOf(schemaMarker);
           const description = (schemaIndex !== -1 ? instruction.substring(0, schemaIndex) : instruction).trim();
           const schema = schemaIndex !== -1 ? instruction.substring(schemaIndex + schemaMarker.length).trim() : "";
@@ -481,35 +477,20 @@ ${description}`);
           if (schema) {
             parts.push(`
 
-PARAMETERS (${parameterFormat.toUpperCase()}):
+PARAMETERS (BLOCK):
 ${schema}`);
           }
           parts.push("\n\n---");
         }
         return parts.join("");
       }
-      buildUsageSection(parameterFormat, context) {
+      buildUsageSection(context) {
         const parts = [];
-        const formatDescriptionMap = {
-          yaml: {
-            config: this.promptConfig.formatDescriptionYaml,
-            defaultValue: DEFAULT_PROMPTS.formatDescriptionYaml
-          },
-          json: {
-            config: this.promptConfig.formatDescriptionJson,
-            defaultValue: DEFAULT_PROMPTS.formatDescriptionJson
-          },
-          toml: {
-            config: this.promptConfig.formatDescriptionToml,
-            defaultValue: DEFAULT_PROMPTS.formatDescriptionToml
-          },
-          auto: {
-            config: this.promptConfig.formatDescriptionJson,
-            defaultValue: DEFAULT_PROMPTS.formatDescriptionJson
-          }
-        };
-        const { config, defaultValue } = formatDescriptionMap[parameterFormat];
-        const formatDescription = resolvePromptTemplate(config, defaultValue, context);
+        const formatDescription = resolvePromptTemplate(
+          this.promptConfig.formatDescription,
+          DEFAULT_PROMPTS.formatDescription,
+          context
+        );
         parts.push("\n\nHOW TO INVOKE GADGETS");
         parts.push("\n=====================\n");
         const criticalUsage = resolvePromptTemplate(
@@ -527,124 +508,90 @@ CRITICAL: ${criticalUsage}
   2. ${formatDescription}`);
         parts.push(`
   3. End marker: ${this.endPrefix}`);
-        parts.push(this.buildExamplesSection(parameterFormat, context));
+        parts.push(this.buildExamplesSection(context));
         parts.push(this.buildRulesSection(context));
         parts.push("\n");
         return parts.join("");
       }
-      buildExamplesSection(parameterFormat, context) {
+      buildExamplesSection(context) {
         if (this.promptConfig.customExamples) {
           return this.promptConfig.customExamples(context);
         }
         const parts = [];
-        const singleExamples = {
-          yaml: `${this.startPrefix}translate
-from: English
-to: Polish
-content: "Paris is the capital of France: a beautiful city."
-${this.endPrefix}`,
-          json: `${this.startPrefix}translate
-{"from": "English", "to": "Polish", "content": "Paris is the capital of France: a beautiful city."}
-${this.endPrefix}`,
-          toml: `${this.startPrefix}translate
-from = "English"
-to = "Polish"
-content = "Paris is the capital of France: a beautiful city."
-${this.endPrefix}`,
-          auto: `${this.startPrefix}translate
-{"from": "English", "to": "Polish", "content": "Paris is the capital of France: a beautiful city."}
-${this.endPrefix}`
-        };
+        const singleExample = `${this.startPrefix}translate
+${this.argPrefix}from
+English
+${this.argPrefix}to
+Polish
+${this.argPrefix}content
+Paris is the capital of France: a beautiful city.
+${this.endPrefix}`;
         parts.push(`
 
 EXAMPLE (Single Gadget):
 
-${singleExamples[parameterFormat]}`);
-        const multipleExamples = {
-          yaml: `${this.startPrefix}translate
-from: English
-to: Polish
-content: "Paris is the capital of France: a beautiful city."
+${singleExample}`);
+        const multipleExample = `${this.startPrefix}translate
+${this.argPrefix}from
+English
+${this.argPrefix}to
+Polish
+${this.argPrefix}content
+Paris is the capital of France: a beautiful city.
 ${this.endPrefix}
 ${this.startPrefix}analyze
-type: economic_analysis
-matter: "Polish Economy"
-question: <<<EOF
+${this.argPrefix}type
+economic_analysis
+${this.argPrefix}matter
+Polish Economy
+${this.argPrefix}question
 Analyze the following:
 - Polish arms exports 2025
 - Economic implications
-EOF
-${this.endPrefix}`,
-          json: `${this.startPrefix}translate
-{"from": "English", "to": "Polish", "content": "Paris is the capital of France: a beautiful city."}
-${this.endPrefix}
-${this.startPrefix}analyze
-{"type": "economic_analysis", "matter": "Polish Economy", "question": "Analyze the following: Polish arms exports 2025, economic implications"}
-${this.endPrefix}`,
-          toml: `${this.startPrefix}translate
-from = "English"
-to = "Polish"
-content = "Paris is the capital of France: a beautiful city."
-${this.endPrefix}
-${this.startPrefix}analyze
-type = "economic_analysis"
-matter = "Polish Economy"
-question = <<<EOF
-Analyze the following:
-- Polish arms exports 2025
-- Economic implications
-EOF
-${this.endPrefix}`,
-          auto: `${this.startPrefix}translate
-{"from": "English", "to": "Polish", "content": "Paris is the capital of France: a beautiful city."}
-${this.endPrefix}
-${this.startPrefix}analyze
-{"type": "economic_analysis", "matter": "Polish Economy", "question": "Analyze the following: Polish arms exports 2025, economic implications"}
-${this.endPrefix}`
-        };
+${this.endPrefix}`;
         parts.push(`
 
 EXAMPLE (Multiple Gadgets):
 
-${multipleExamples[parameterFormat]}`);
-        if (parameterFormat === "yaml") {
-          parts.push(`
-
-YAML HEREDOC SYNTAX:
-For string values with multiple lines, use heredoc syntax (<<<DELIMITER...DELIMITER):
-
-filePath: "README.md"
-content: <<<EOF
-# Project Title
+${multipleExample}`);
+        parts.push(`
 
-This content can contain:
-- Markdown lists
-- Special characters: # : -
-- Multiple paragraphs
-EOF
+BLOCK FORMAT SYNTAX:
+Block format uses ${this.argPrefix}name markers. Values are captured verbatim until the next marker.
 
-The delimiter (EOF) can be any identifier. The closing delimiter must be on its own line.
-No indentation is required for the content.`);
-        } else if (parameterFormat === "toml") {
-          parts.push(`
+${this.argPrefix}filename
+calculator.ts
+${this.argPrefix}code
+class Calculator {
+  private history: string[] = [];
 
-TOML HEREDOC SYNTAX:
-For string values with multiple lines, use heredoc syntax (<<<DELIMITER...DELIMITER):
+  add(a: number, b: number): number {
+    const result = a + b;
+    this.history.push(\`\${a} + \${b} = \${result}\`);
+    return result;
+  }
+}
 
-filePath = "README.md"
-content = <<<EOF
-# Project Title
+BLOCK FORMAT RULES:
+- Each parameter starts with ${this.argPrefix}parameterName on its own line
+- The value starts on the NEXT line after the marker
+- Value ends when the next ${this.argPrefix} or ${this.endPrefix} appears
+- NO escaping needed - write values exactly as they should appear
+- Perfect for code, JSON, markdown, or any content with special characters
 
-This content can contain:
-- Markdown lists
-- Special characters: # : -
-- Multiple paragraphs
-EOF
+NESTED OBJECTS (use / separator):
+${this.argPrefix}config/timeout
+30
+${this.argPrefix}config/retries
+3
+Produces: { "config": { "timeout": "30", "retries": "3" } }
 
-The delimiter (EOF) can be any identifier. The closing delimiter must be on its own line.
-IMPORTANT: Content inside heredoc is LITERAL - do NOT escape backticks, dollar signs, or any characters.
-NEVER use TOML triple-quote strings ("""). ALWAYS use heredoc syntax (<<<EOF...EOF) for multiline content.`);
-        }
+ARRAYS (use numeric indices):
+${this.argPrefix}items/0
+first
+${this.argPrefix}items/1
+second
+Produces: { "items": ["first", "second"] }`);
         return parts.join("");
       }
       buildRulesSection(context) {
@@ -665,8 +612,8 @@ NEVER use TOML triple-quote strings ("""). ALWAYS use heredoc syntax (<<<EOF...E
         this.messages.push({ role: "assistant", content, metadata });
         return this;
       }
-      addGadgetCall(gadget, parameters, result, parameterFormat = "json") {
-        const paramStr = this.formatParameters(parameters, parameterFormat);
+      addGadgetCall(gadget, parameters, result) {
+        const paramStr = this.formatBlockParameters(parameters, "");
         this.messages.push({
           role: "assistant",
           content: `${this.startPrefix}${gadget}
@@ -679,26 +626,32 @@ ${this.endPrefix}`
         });
         return this;
       }
-      formatParameters(parameters, format) {
-        if (format === "yaml") {
-          return Object.entries(parameters).map(([key, value]) => {
-            if (typeof value === "string") {
-              return `${key}: ${value}`;
-            }
-            return `${key}: ${JSON.stringify(value)}`;
-          }).join("\n");
-        }
-        if (format === "toml") {
-          return Object.entries(parameters).map(([key, value]) => {
-            if (typeof value === "string" && value.includes("\n")) {
-              return `${key} = <<<EOF
-${value}
-EOF`;
-            }
-            return `${key} = ${JSON.stringify(value)}`;
-          }).join("\n");
+      /**
+       * Format parameters as Block format with JSON Pointer paths.
+       * Uses the configured argPrefix for consistency with system prompt.
+       */
+      formatBlockParameters(params, prefix) {
+        const lines = [];
+        for (const [key, value] of Object.entries(params)) {
+          const fullPath = prefix ? `${prefix}/${key}` : key;
+          if (Array.isArray(value)) {
+            value.forEach((item, index) => {
+              const itemPath = `${fullPath}/${index}`;
+              if (typeof item === "object" && item !== null) {
+                lines.push(this.formatBlockParameters(item, itemPath));
+              } else {
+                lines.push(`${this.argPrefix}${itemPath}`);
+                lines.push(String(item));
+              }
+            });
+          } else if (typeof value === "object" && value !== null) {
+            lines.push(this.formatBlockParameters(value, fullPath));
+          } else {
+            lines.push(`${this.argPrefix}${fullPath}`);
+            lines.push(String(value));
+          }
         }
-        return JSON.stringify(parameters);
+        return lines.join("\n");
       }
       build() {
         return [...this.messages];
@@ -870,125 +823,72 @@ var init_schema_to_json = __esm({
 });
 
 // src/gadgets/gadget.ts
-function findSafeDelimiter(content) {
-  const lines = content.split("\n");
-  for (const delimiter of HEREDOC_DELIMITERS) {
-    const regex = new RegExp(`^${delimiter}\\s*$`);
-    const isUsed = lines.some((line) => regex.test(line));
-    if (!isUsed) {
-      return delimiter;
-    }
-  }
-  let counter = 1;
-  while (counter < 1e3) {
-    const delimiter = `HEREDOC_${counter}`;
-    const regex = new RegExp(`^${delimiter}\\s*$`);
-    const isUsed = lines.some((line) => regex.test(line));
-    if (!isUsed) {
-      return delimiter;
-    }
-    counter++;
-  }
-  return "HEREDOC_FALLBACK";
-}
-function formatYamlValue(value, indent = "") {
-  if (typeof value === "string") {
-    const lines = value.split("\n");
-    if (lines.length === 1 && !value.includes(":") && !value.startsWith("-")) {
-      return value;
-    }
-    const delimiter = findSafeDelimiter(value);
-    return `<<<${delimiter}
-${value}
-${delimiter}`;
-  }
-  if (typeof value === "number" || typeof value === "boolean") {
-    return String(value);
-  }
-  if (value === null || value === void 0) {
-    return "null";
-  }
-  if (Array.isArray(value)) {
-    if (value.length === 0) return "[]";
-    const items = value.map((item) => `${indent}- ${formatYamlValue(item, indent + "  ")}`);
-    return "\n" + items.join("\n");
-  }
-  if (typeof value === "object") {
-    const entries = Object.entries(value);
-    if (entries.length === 0) return "{}";
-    const lines = entries.map(([k, v]) => {
-      const formattedValue = formatYamlValue(v, indent + "  ");
-      if (formattedValue.startsWith("\n") || formattedValue.startsWith("|")) {
-        return `${indent}${k}: ${formattedValue}`;
-      }
-      return `${indent}${k}: ${formattedValue}`;
-    });
-    return "\n" + lines.join("\n");
-  }
-  return yaml.dump(value).trimEnd();
-}
-function formatParamsAsYaml(params) {
+function formatParamsAsBlock(params, prefix = "", argPrefix = GADGET_ARG_PREFIX) {
   const lines = [];
   for (const [key, value] of Object.entries(params)) {
-    const formattedValue = formatYamlValue(value, "");
-    if (formattedValue.startsWith("\n")) {
-      lines.push(`${key}:${formattedValue}`);
+    const fullPath = prefix ? `${prefix}/${key}` : key;
+    if (Array.isArray(value)) {
+      value.forEach((item, index) => {
+        const itemPath = `${fullPath}/${index}`;
+        if (typeof item === "object" && item !== null) {
+          lines.push(formatParamsAsBlock(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));
     } else {
-      lines.push(`${key}: ${formattedValue}`);
+      lines.push(`${argPrefix}${fullPath}`);
+      lines.push(String(value));
     }
   }
   return lines.join("\n");
 }
-function formatTomlInlineTable(obj) {
-  const entries = Object.entries(obj).map(([k, v]) => `${k} = ${formatTomlValue(v)}`);
-  return `{ ${entries.join(", ")} }`;
-}
-function formatTomlValue(value) {
-  if (typeof value === "string") {
-    if (value.includes("\n")) {
-      const delimiter = findSafeDelimiter(value);
-      return `<<<${delimiter}
-${value}
-${delimiter}`;
-    }
-    return JSON.stringify(value);
-  }
-  if (typeof value === "number" || typeof value === "boolean") {
-    return String(value);
-  }
-  if (value === null || value === void 0) {
-    return '""';
-  }
-  if (Array.isArray(value)) {
-    if (value.length === 0) return "[]";
-    const items = value.map((item) => {
-      if (typeof item === "object" && item !== null && !Array.isArray(item)) {
-        return formatTomlInlineTable(item);
-      }
-      return formatTomlValue(item);
-    });
-    return `[${items.join(", ")}]`;
-  }
-  if (typeof value === "object") {
-    return formatTomlInlineTable(value);
-  }
-  return JSON.stringify(value);
-}
-function formatParamsAsToml(params) {
+function formatSchemaAsPlainText(schema, indent = "") {
   const lines = [];
-  for (const [key, value] of Object.entries(params)) {
-    lines.push(`${key} = ${formatTomlValue(value)}`);
+  const properties = schema.properties || {};
+  const required = schema.required || [];
+  for (const [key, prop] of Object.entries(properties)) {
+    const propObj = prop;
+    const type = propObj.type;
+    const description = propObj.description;
+    const isRequired = required.includes(key);
+    const enumValues = propObj.enum;
+    let line = `${indent}- ${key}`;
+    if (type === "array") {
+      const items = propObj.items;
+      const itemType = items?.type || "any";
+      line += ` (array of ${itemType})`;
+    } else if (type === "object" && propObj.properties) {
+      line += " (object)";
+    } else {
+      line += ` (${type})`;
+    }
+    if (isRequired) {
+      line += " [required]";
+    }
+    if (description) {
+      line += `: ${description}`;
+    }
+    if (enumValues) {
+      line += ` - one of: ${enumValues.map((v) => `"${v}"`).join(", ")}`;
+    }
+    lines.push(line);
+    if (type === "object" && propObj.properties) {
+      lines.push(formatSchemaAsPlainText(propObj, indent + "  "));
+    }
   }
   return lines.join("\n");
 }
-var yaml, HEREDOC_DELIMITERS, BaseGadget;
+var BaseGadget;
 var init_gadget = __esm({
   "src/gadgets/gadget.ts"() {
     "use strict";
-    yaml = __toESM(require("js-yaml"), 1);
+    init_constants();
     init_schema_to_json();
     init_schema_validator();
-    HEREDOC_DELIMITERS = ["EOF", "END", "DOC", "CONTENT", "TEXT", "HEREDOC", "DATA", "BLOCK"];
     BaseGadget = class {
       /**
        * The name of the gadget. Used for identification when LLM calls it.
@@ -1019,19 +919,19 @@ var init_gadget = __esm({
       /**
        * Auto-generated instruction text for the LLM.
        * Combines name, description, and parameter schema into a formatted instruction.
-       * @deprecated Use getInstruction(format) instead for format-specific schemas
+       * @deprecated Use getInstruction() instead
        */
       get instruction() {
-        return this.getInstruction("yaml");
+        return this.getInstruction();
       }
       /**
-       * Generate instruction text for the LLM with format-specific schema.
+       * Generate instruction text for the LLM.
        * Combines name, description, and parameter schema into a formatted instruction.
        *
-       * @param format - Format for the schema representation ('json' | 'yaml' | 'toml' | 'auto')
+       * @param argPrefix - Optional custom argument prefix for block format examples
        * @returns Formatted instruction string
        */
-      getInstruction(format = "json") {
+      getInstruction(argPrefix) {
         const parts = [];
         parts.push(this.description);
         if (this.parameterSchema) {
@@ -1040,20 +940,12 @@ var init_gadget = __esm({
           const jsonSchema = schemaToJSONSchema(this.parameterSchema, {
             target: "draft-7"
           });
-          if (format === "json" || format === "auto") {
-            parts.push("\n\nInput Schema (JSON):");
-            parts.push(JSON.stringify(jsonSchema, null, 2));
-          } else if (format === "toml") {
-            parts.push("\n\nInput Schema (TOML):");
-            parts.push(JSON.stringify(jsonSchema, null, 2));
-          } else {
-            const yamlSchema = yaml.dump(jsonSchema).trimEnd();
-            parts.push("\n\nInput Schema (YAML):");
-            parts.push(yamlSchema);
-          }
+          parts.push("\n\nParameters:");
+          parts.push(formatSchemaAsPlainText(jsonSchema));
         }
         if (this.examples && this.examples.length > 0) {
           parts.push("\n\nExamples:");
+          const effectiveArgPrefix = argPrefix ?? GADGET_ARG_PREFIX;
           this.examples.forEach((example, index) => {
             if (index > 0) {
               parts.push("");
@@ -1062,13 +954,7 @@ var init_gadget = __esm({
               parts.push(`# ${example.comment}`);
             }
             parts.push("Input:");
-            if (format === "json" || format === "auto") {
-              parts.push(JSON.stringify(example.params, null, 2));
-            } else if (format === "toml") {
-              parts.push(formatParamsAsToml(example.params));
-            } else {
-              parts.push(formatParamsAsYaml(example.params));
-            }
+            parts.push(formatParamsAsBlock(example.params, "", effectiveArgPrefix));
             if (example.output !== void 0) {
               parts.push("Output:");
               parts.push(example.output);
@@ -1345,14 +1231,12 @@ var init_conversation_manager = __esm({
       baseMessages;
       initialMessages;
       historyBuilder;
-      parameterFormat;
       constructor(baseMessages, initialMessages, options = {}) {
         this.baseMessages = baseMessages;
         this.initialMessages = initialMessages;
-        this.parameterFormat = options.parameterFormat ?? "json";
         this.historyBuilder = new LLMMessageBuilder();
         if (options.startPrefix && options.endPrefix) {
-          this.historyBuilder.withPrefixes(options.startPrefix, options.endPrefix);
+          this.historyBuilder.withPrefixes(options.startPrefix, options.endPrefix, options.argPrefix);
         }
       }
       addUserMessage(content) {
@@ -1362,7 +1246,7 @@ var init_conversation_manager = __esm({
         this.historyBuilder.addAssistant(content);
       }
       addGadgetCall(gadgetName, parameters, result) {
-        this.historyBuilder.addGadgetCall(gadgetName, parameters, result, this.parameterFormat);
+        this.historyBuilder.addGadgetCall(gadgetName, parameters, result);
       }
       getMessages() {
         return [...this.baseMessages, ...this.initialMessages, ...this.historyBuilder.build()];
@@ -1385,7 +1269,7 @@ async function runWithHandlers(agentGenerator, handlers) {
           await handlers.onGadgetCall({
             gadgetName: event.call.gadgetName,
             parameters: event.call.parameters,
-            parametersYaml: event.call.parametersYaml
+            parametersRaw: event.call.parametersRaw
           });
         }
         break;
@@ -1692,7 +1576,7 @@ var init_executor = __esm({
             this.logger.error("Gadget parameter parse error", {
               gadgetName: call.gadgetName,
               parseError: call.parseError,
-              rawParameters: call.parametersYaml
+              rawParameters: call.parametersRaw
             });
             return {
               gadgetName: call.gadgetName,
@@ -1854,168 +1738,107 @@ var init_executor = __esm({
   }
 });
 
-// src/gadgets/parser.ts
-function preprocessYaml(yamlStr) {
-  const lines = yamlStr.split("\n");
-  const result = [];
-  let i = 0;
-  while (i < lines.length) {
-    const line = lines[i];
-    const heredocMatch = line.match(/^(\s*)([\w-]+):\s*<<<([A-Za-z_][A-Za-z0-9_]*)\s*$/);
-    if (heredocMatch) {
-      const [, indent, key, delimiter] = heredocMatch;
-      const bodyLines = [];
-      i++;
-      const closingRegex = new RegExp(`^${delimiter}\\s*$`);
-      while (i < lines.length && !closingRegex.test(lines[i])) {
-        bodyLines.push(lines[i]);
-        i++;
-      }
-      if (i < lines.length) {
-        i++;
-      }
-      result.push(`${indent}${key}: |`);
-      for (const bodyLine of bodyLines) {
-        result.push(`${indent}  ${bodyLine}`);
+// src/gadgets/block-params.ts
+function parseBlockParams(content, options) {
+  const argPrefix = options?.argPrefix ?? GADGET_ARG_PREFIX;
+  const result = {};
+  const seenPointers = /* @__PURE__ */ new Set();
+  const parts = content.split(argPrefix);
+  for (let i = 1; i < parts.length; i++) {
+    const part = parts[i];
+    const newlineIndex = part.indexOf("\n");
+    if (newlineIndex === -1) {
+      const pointer2 = part.trim();
+      if (pointer2) {
+        if (seenPointers.has(pointer2)) {
+          throw new Error(`Duplicate pointer: ${pointer2}`);
+        }
+        seenPointers.add(pointer2);
+        setByPointer(result, pointer2, "");
       }
       continue;
     }
-    const match = line.match(/^(\s*)([\w-]+):\s+(.+)$/);
-    if (match) {
-      const [, indent, key, value] = match;
-      if (value === "|" || value === ">" || value === "|-" || value === ">-") {
-        result.push(line);
-        i++;
-        const keyIndentLen2 = indent.length;
-        const blockLines = [];
-        let minContentIndent = Infinity;
-        while (i < lines.length) {
-          const blockLine = lines[i];
-          const blockIndentMatch = blockLine.match(/^(\s*)/);
-          const blockIndentLen = blockIndentMatch ? blockIndentMatch[1].length : 0;
-          if (blockLine.trim() === "") {
-            blockLines.push({ content: "", originalIndent: 0 });
-            i++;
-            continue;
-          }
-          if (blockIndentLen > keyIndentLen2) {
-            const content = blockLine.substring(blockIndentLen);
-            blockLines.push({ content, originalIndent: blockIndentLen });
-            if (content.trim().length > 0) {
-              minContentIndent = Math.min(minContentIndent, blockIndentLen);
-            }
-            i++;
-          } else {
-            break;
-          }
-        }
-        const targetIndent = keyIndentLen2 + 2;
-        for (const blockLine of blockLines) {
-          if (blockLine.content === "") {
-            result.push("");
-          } else {
-            result.push(" ".repeat(targetIndent) + blockLine.content);
-          }
-        }
-        continue;
-      }
-      if (value.startsWith('"') || value.startsWith("'") || value === "true" || value === "false" || /^-?\d+(\.\d+)?$/.test(value)) {
-        result.push(line);
-        i++;
-        continue;
-      }
-      const keyIndentLen = indent.length;
-      const continuationLines = [];
-      let j = i + 1;
-      while (j < lines.length) {
-        const nextLine = lines[j];
-        if (nextLine.trim() === "") {
-          continuationLines.push(nextLine);
-          j++;
-          continue;
-        }
-        const nextIndentMatch = nextLine.match(/^(\s*)/);
-        const nextIndentLen = nextIndentMatch ? nextIndentMatch[1].length : 0;
-        if (nextIndentLen > keyIndentLen) {
-          continuationLines.push(nextLine);
-          j++;
-        } else {
-          break;
-        }
-      }
-      if (continuationLines.length > 0 && continuationLines.some((l) => l.trim().length > 0)) {
-        result.push(`${indent}${key}: |`);
-        result.push(`${indent}  ${value}`);
-        for (const contLine of continuationLines) {
-          if (contLine.trim() === "") {
-            result.push("");
-          } else {
-            const contIndentMatch = contLine.match(/^(\s*)/);
-            const contIndent = contIndentMatch ? contIndentMatch[1] : "";
-            const contContent = contLine.substring(contIndent.length);
-            result.push(`${indent}  ${contContent}`);
-          }
-        }
-        i = j;
-        continue;
-      }
-      if (value.includes(": ") || value.endsWith(":")) {
-        const escaped = value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-        result.push(`${indent}${key}: "${escaped}"`);
-        i++;
-        continue;
-      }
+    const pointer = part.substring(0, newlineIndex).trim();
+    let value = part.substring(newlineIndex + 1);
+    if (value.endsWith("\n")) {
+      value = value.slice(0, -1);
+    }
+    if (!pointer) {
+      continue;
+    }
+    if (seenPointers.has(pointer)) {
+      throw new Error(`Duplicate pointer: ${pointer}`);
     }
-    result.push(line);
-    i++;
+    seenPointers.add(pointer);
+    setByPointer(result, pointer, value);
   }
-  return result.join("\n");
+  return result;
 }
-function unescapeHeredocContent(content) {
-  return content.replace(/\\`/g, "`").replace(/\\\$/g, "$").replace(/\\{/g, "{").replace(/\\}/g, "}");
+function coerceValue(value) {
+  if (value.includes("\n")) {
+    return value;
+  }
+  const trimmed = value.trim();
+  if (trimmed === "true") return true;
+  if (trimmed === "false") return false;
+  if (trimmed !== "" && /^-?\d+(\.\d+)?$/.test(trimmed)) {
+    const num = Number(trimmed);
+    if (!isNaN(num) && isFinite(num)) {
+      return num;
+    }
+  }
+  return value;
 }
-function preprocessTomlHeredoc(tomlStr) {
-  const lines = tomlStr.split("\n");
-  const result = [];
-  let i = 0;
-  const heredocStartRegex = /^(\s*)([\w-]+)\s*=\s*<<<([A-Za-z_][A-Za-z0-9_]*)\s*$/;
-  while (i < lines.length) {
-    const line = lines[i];
-    const match = line.match(heredocStartRegex);
-    if (match) {
-      const [, indent, key, delimiter] = match;
-      const bodyLines = [];
-      i++;
-      const closingRegex = new RegExp(`^${delimiter}\\s*$`);
-      let foundClosing = false;
-      while (i < lines.length) {
-        const bodyLine = lines[i];
-        if (closingRegex.test(bodyLine)) {
-          foundClosing = true;
-          i++;
-          break;
-        }
-        bodyLines.push(bodyLine);
-        i++;
-      }
-      if (bodyLines.length === 0) {
-        result.push(`${indent}${key} = ''''''`);
-      } else {
-        result.push(`${indent}${key} = '''`);
-        for (let j = 0; j < bodyLines.length - 1; j++) {
-          result.push(unescapeHeredocContent(bodyLines[j]));
-        }
-        result.push(`${unescapeHeredocContent(bodyLines[bodyLines.length - 1])}'''`);
-      }
-      if (!foundClosing) {
+function setByPointer(obj, pointer, value) {
+  const segments = pointer.split("/");
+  let current = obj;
+  for (let i = 0; i < segments.length - 1; i++) {
+    const segment = segments[i];
+    const nextSegment = segments[i + 1];
+    const nextIsArrayIndex = /^\d+$/.test(nextSegment);
+    if (Array.isArray(current)) {
+      const index = parseInt(segment, 10);
+      if (isNaN(index) || index < 0) {
+        throw new Error(`Invalid array index: ${segment}`);
+      }
+      if (index > current.length) {
+        throw new Error(`Array index gap: expected ${current.length}, got ${index}`);
+      }
+      if (current[index] === void 0) {
+        current[index] = nextIsArrayIndex ? [] : {};
+      }
+      current = current[index];
+    } else {
+      const rec = current;
+      if (rec[segment] === void 0) {
+        rec[segment] = nextIsArrayIndex ? [] : {};
       }
-      continue;
+      current = rec[segment];
+    }
+  }
+  const lastSegment = segments[segments.length - 1];
+  const coercedValue = coerceValue(value);
+  if (Array.isArray(current)) {
+    const index = parseInt(lastSegment, 10);
+    if (isNaN(index) || index < 0) {
+      throw new Error(`Invalid array index: ${lastSegment}`);
     }
-    result.push(line);
-    i++;
+    if (index > current.length) {
+      throw new Error(`Array index gap: expected ${current.length}, got ${index}`);
+    }
+    current[index] = coercedValue;
+  } else {
+    current[lastSegment] = coercedValue;
   }
-  return result.join("\n");
 }
+var init_block_params = __esm({
+  "src/gadgets/block-params.ts"() {
+    "use strict";
+    init_constants();
+  }
+});
+
+// src/gadgets/parser.ts
 function stripMarkdownFences(content) {
   let cleaned = content.trim();
   const openingFence = /^```(?:toml|yaml|json)?\s*\n/i;
@@ -2024,24 +1847,23 @@ function stripMarkdownFences(content) {
   cleaned = cleaned.replace(closingFence, "");
   return cleaned.trim();
 }
-var yaml2, import_js_toml, globalInvocationCounter, StreamParser;
+var globalInvocationCounter, StreamParser;
 var init_parser = __esm({
   "src/gadgets/parser.ts"() {
     "use strict";
-    yaml2 = __toESM(require("js-yaml"), 1);
-    import_js_toml = require("js-toml");
     init_constants();
+    init_block_params();
     globalInvocationCounter = 0;
     StreamParser = class {
       buffer = "";
       lastReportedTextLength = 0;
       startPrefix;
       endPrefix;
-      parameterFormat;
+      argPrefix;
       constructor(options = {}) {
         this.startPrefix = options.startPrefix ?? GADGET_START_PREFIX;
         this.endPrefix = options.endPrefix ?? GADGET_END_PREFIX;
-        this.parameterFormat = options.parameterFormat ?? "json";
+        this.argPrefix = options.argPrefix ?? GADGET_ARG_PREFIX;
       }
       takeTextUntil(index) {
         if (index <= this.lastReportedTextLength) {
@@ -2076,43 +1898,14 @@ var init_parser = __esm({
         return `${firstLine.slice(0, maxLen)}... (${message.length} chars total)`;
       }
       /**
-       * Parse parameter string according to configured format
+       * Parse parameter string using block format
        */
       parseParameters(raw) {
         const cleaned = stripMarkdownFences(raw);
-        if (this.parameterFormat === "json") {
-          try {
-            return { parameters: JSON.parse(cleaned) };
-          } catch (error) {
-            return { parseError: this.truncateParseError(error, "JSON") };
-          }
-        }
-        if (this.parameterFormat === "yaml") {
-          try {
-            return { parameters: yaml2.load(preprocessYaml(cleaned)) };
-          } catch (error) {
-            return { parseError: this.truncateParseError(error, "YAML") };
-          }
-        }
-        if (this.parameterFormat === "toml") {
-          try {
-            return { parameters: (0, import_js_toml.load)(preprocessTomlHeredoc(cleaned)) };
-          } catch (error) {
-            return { parseError: this.truncateParseError(error, "TOML") };
-          }
-        }
         try {
-          return { parameters: JSON.parse(cleaned) };
-        } catch {
-          try {
-            return { parameters: (0, import_js_toml.load)(preprocessTomlHeredoc(cleaned)) };
-          } catch {
-            try {
-              return { parameters: yaml2.load(preprocessYaml(cleaned)) };
-            } catch (error) {
-              return { parseError: this.truncateParseError(error, "auto") };
-            }
-          }
+          return { parameters: parseBlockParams(cleaned, { argPrefix: this.argPrefix }) };
+        } catch (error) {
+          return { parseError: this.truncateParseError(error, "block") };
         }
       }
       // Feed a chunk of text and get parsed events
@@ -2171,8 +1964,7 @@ var init_parser = __esm({
             call: {
               gadgetName: actualGadgetName,
               invocationId,
-              parametersYaml: parametersRaw,
-              // Keep property name for backward compatibility
+              parametersRaw,
               parameters,
               parseError
             }
@@ -2206,7 +1998,7 @@ var init_parser = __esm({
               call: {
                 gadgetName: actualGadgetName,
                 invocationId,
-                parametersYaml: parametersRaw,
+                parametersRaw,
                 parameters,
                 parseError
               }
@@ -2257,9 +2049,9 @@ var init_stream_processor = __esm({
         this.stopOnGadgetError = options.stopOnGadgetError ?? true;
         this.shouldContinueAfterError = options.shouldContinueAfterError;
         this.parser = new StreamParser({
-          parameterFormat: options.parameterFormat,
           startPrefix: options.gadgetStartPrefix,
-          endPrefix: options.gadgetEndPrefix
+          endPrefix: options.gadgetEndPrefix,
+          argPrefix: options.gadgetArgPrefix
         });
         this.executor = new GadgetExecutor(
           options.registry,
@@ -2413,7 +2205,7 @@ var init_stream_processor = __esm({
           this.logger.warn("Gadget has parse error", {
             gadgetName: call.gadgetName,
             error: call.parseError,
-            rawParameters: call.parametersYaml
+            rawParameters: call.parametersRaw
           });
           const shouldContinue = await this.checkContinueAfterError(
             call.parseError,
@@ -2649,9 +2441,9 @@ var init_agent = __esm({
       hooks;
       conversation;
       registry;
-      parameterFormat;
       gadgetStartPrefix;
       gadgetEndPrefix;
+      gadgetArgPrefix;
       onHumanInputRequired;
       textOnlyHandler;
       textWithGadgetsHandler;
@@ -2680,9 +2472,9 @@ var init_agent = __esm({
         this.temperature = options.temperature;
         this.logger = options.logger ?? createLogger({ name: "llmist:agent" });
         this.registry = options.registry;
-        this.parameterFormat = options.parameterFormat ?? "json";
         this.gadgetStartPrefix = options.gadgetStartPrefix;
         this.gadgetEndPrefix = options.gadgetEndPrefix;
+        this.gadgetArgPrefix = options.gadgetArgPrefix;
         this.onHumanInputRequired = options.onHumanInputRequired;
         this.textOnlyHandler = options.textOnlyHandler ?? "terminate";
         this.textWithGadgetsHandler = options.textWithGadgetsHandler;
@@ -2704,9 +2496,10 @@ var init_agent = __esm({
         if (options.systemPrompt) {
           baseBuilder.addSystem(options.systemPrompt);
         }
-        baseBuilder.addGadgets(this.registry.getAll(), this.parameterFormat, {
+        baseBuilder.addGadgets(this.registry.getAll(), {
           startPrefix: options.gadgetStartPrefix,
-          endPrefix: options.gadgetEndPrefix
+          endPrefix: options.gadgetEndPrefix,
+          argPrefix: options.gadgetArgPrefix
         });
         const baseMessages = baseBuilder.build();
         const initialMessages = (options.initialMessages ?? []).map((message) => ({
@@ -2714,9 +2507,9 @@ var init_agent = __esm({
           content: message.content
         }));
         this.conversation = new ConversationManager(baseMessages, initialMessages, {
-          parameterFormat: this.parameterFormat,
           startPrefix: options.gadgetStartPrefix,
-          endPrefix: options.gadgetEndPrefix
+          endPrefix: options.gadgetEndPrefix,
+          argPrefix: options.gadgetArgPrefix
         });
         this.userPromptProvided = !!options.userPrompt;
         if (options.userPrompt) {
@@ -2809,9 +2602,9 @@ var init_agent = __esm({
             const processor = new StreamProcessor({
               iteration: currentIteration,
               registry: this.registry,
-              parameterFormat: this.parameterFormat,
               gadgetStartPrefix: this.gadgetStartPrefix,
               gadgetEndPrefix: this.gadgetEndPrefix,
+              gadgetArgPrefix: this.gadgetArgPrefix,
               hooks: this.hooks,
               logger: this.logger.getSubLogger({ name: "stream-processor" }),
               onHumanInputRequired: this.onHumanInputRequired,
@@ -3096,7 +2889,8 @@ var init_anthropic_models = __esm({
         pricing: {
           input: 3,
           output: 15,
-          cachedInput: 0.3
+          cachedInput: 0.3,
+          cacheWriteInput: 3.75
         },
         knowledgeCutoff: "2025-01",
         features: {
@@ -3120,7 +2914,8 @@ var init_anthropic_models = __esm({
         pricing: {
           input: 1,
           output: 5,
-          cachedInput: 0.1
+          cachedInput: 0.1,
+          cacheWriteInput: 1.25
         },
         knowledgeCutoff: "2025-02",
         features: {
@@ -3144,7 +2939,8 @@ var init_anthropic_models = __esm({
         pricing: {
           input: 3,
           output: 15,
-          cachedInput: 0.3
+          cachedInput: 0.3,
+          cacheWriteInput: 3.75
         },
         knowledgeCutoff: "2025-03",
         features: {
@@ -3168,7 +2964,8 @@ var init_anthropic_models = __esm({
         pricing: {
           input: 3,
           output: 15,
-          cachedInput: 0.3
+          cachedInput: 0.3,
+          cacheWriteInput: 3.75
         },
         knowledgeCutoff: "2024-11",
         features: {
@@ -3192,7 +2989,8 @@ var init_anthropic_models = __esm({
         pricing: {
           input: 15,
           output: 75,
-          cachedInput: 1.5
+          cachedInput: 1.5,
+          cacheWriteInput: 18.75
         },
         knowledgeCutoff: "2025-01",
         features: {
@@ -3216,7 +3014,8 @@ var init_anthropic_models = __esm({
         pricing: {
           input: 15,
           output: 75,
-          cachedInput: 1.5
+          cachedInput: 1.5,
+          cacheWriteInput: 18.75
         },
         knowledgeCutoff: "2025-03",
         features: {
@@ -3239,7 +3038,8 @@ var init_anthropic_models = __esm({
         pricing: {
           input: 0.8,
           output: 4,
-          cachedInput: 0.08
+          cachedInput: 0.08,
+          cacheWriteInput: 1
         },
         knowledgeCutoff: "2024-07",
         features: {
@@ -3262,7 +3062,8 @@ var init_anthropic_models = __esm({
         pricing: {
           input: 0.25,
           output: 1.25,
-          cachedInput: 0.025
+          cachedInput: 0.025,
+          cacheWriteInput: 0.3125
         },
         knowledgeCutoff: "2023-08",
         features: {
@@ -3286,7 +3087,8 @@ var init_anthropic_models = __esm({
         pricing: {
           input: 1,
           output: 5,
-          cachedInput: 0.1
+          cachedInput: 0.1,
+          cacheWriteInput: 1.25
         },
         knowledgeCutoff: "2025-02",
         features: {
@@ -3310,7 +3112,8 @@ var init_anthropic_models = __esm({
         pricing: {
           input: 3,
           output: 15,
-          cachedInput: 0.3
+          cachedInput: 0.3,
+          cacheWriteInput: 3.75
         },
         knowledgeCutoff: "2025-01",
         features: {
@@ -3334,7 +3137,8 @@ var init_anthropic_models = __esm({
         pricing: {
           input: 5,
           output: 25,
-          cachedInput: 0.5
+          cachedInput: 0.5,
+          cacheWriteInput: 6.25
         },
         knowledgeCutoff: "2025-03",
         features: {
@@ -3449,15 +3253,27 @@ var init_anthropic = __esm({
       }
       buildRequestPayload(options, descriptor, spec, messages) {
         const systemMessages = messages.filter((message) => message.role === "system");
-        const system = systemMessages.length > 0 ? systemMessages.map((m) => m.content).join("\n\n") : void 0;
-        const conversation = messages.filter(
+        const system = systemMessages.length > 0 ? systemMessages.map((m, index) => ({
+          type: "text",
+          text: m.content,
+          // Add cache_control to the LAST system message block
+          ...index === systemMessages.length - 1 ? { cache_control: { type: "ephemeral" } } : {}
+        })) : void 0;
+        const nonSystemMessages = messages.filter(
           (message) => message.role !== "system"
-        ).map((message) => ({
+        );
+        const lastUserIndex = nonSystemMessages.reduce(
+          (lastIdx, msg, idx) => msg.role === "user" ? idx : lastIdx,
+          -1
+        );
+        const conversation = nonSystemMessages.map((message, index) => ({
           role: message.role,
           content: [
             {
               type: "text",
-              text: message.content
+              text: message.content,
+              // Add cache_control to the LAST user message
+              ...message.role === "user" && index === lastUserIndex ? { cache_control: { type: "ephemeral" } } : {}
             }
           ]
         }));
@@ -3483,15 +3299,22 @@ var init_anthropic = __esm({
       async *wrapStream(iterable) {
         const stream2 = iterable;
         let inputTokens = 0;
+        let cachedInputTokens = 0;
+        let cacheCreationInputTokens = 0;
         for await (const event of stream2) {
           if (event.type === "message_start") {
-            inputTokens = event.message.usage.input_tokens;
+            const usage = event.message.usage;
+            cachedInputTokens = usage.cache_read_input_tokens ?? 0;
+            cacheCreationInputTokens = usage.cache_creation_input_tokens ?? 0;
+            inputTokens = usage.input_tokens + cachedInputTokens + cacheCreationInputTokens;
             yield {
               text: "",
               usage: {
                 inputTokens,
                 outputTokens: 0,
-                totalTokens: inputTokens
+                totalTokens: inputTokens,
+                cachedInputTokens,
+                cacheCreationInputTokens
               },
               rawEvent: event
             };
@@ -3505,7 +3328,9 @@ var init_anthropic = __esm({
             const usage = event.usage ? {
               inputTokens,
               outputTokens: event.usage.output_tokens,
-              totalTokens: inputTokens + event.usage.output_tokens
+              totalTokens: inputTokens + event.usage.output_tokens,
+              cachedInputTokens,
+              cacheCreationInputTokens
             } : void 0;
             if (event.delta.stop_reason || usage) {
               yield {
@@ -3586,6 +3411,7 @@ var init_gemini_models = __esm({
   "src/providers/gemini-models.ts"() {
     "use strict";
     GEMINI_MODELS = [
+      // Gemini 3 Pro (Preview)
       {
         provider: "gemini",
         modelId: "gemini-3-pro-preview",
@@ -3594,8 +3420,11 @@ var init_gemini_models = __esm({
         maxOutputTokens: 65536,
         pricing: {
           input: 2,
+          // $2.00 for prompts <= 200k, $4.00 for > 200k (using lower tier)
           output: 12,
+          // $12.00 for prompts <= 200k, $18.00 for > 200k
           cachedInput: 0.2
+          // $0.20 for prompts <= 200k
         },
         knowledgeCutoff: "2025-01",
         features: {
@@ -3608,9 +3437,10 @@ var init_gemini_models = __esm({
         metadata: {
           family: "Gemini 3",
           releaseDate: "2025-11-18",
-          notes: "Most advanced model. 1501 Elo LMArena, 91.9% GPQA Diamond, 76.2% SWE-bench. Deep Think mode available."
+          notes: "Best model for multimodal understanding, agentic and vibe-coding. Deep Think mode available."
         }
       },
+      // Gemini 2.5 Pro
       {
         provider: "gemini",
         modelId: "gemini-2.5-pro",
@@ -3619,8 +3449,11 @@ var init_gemini_models = __esm({
         maxOutputTokens: 65536,
         pricing: {
           input: 1.25,
+          // $1.25 for prompts <= 200k, $2.50 for > 200k
           output: 10,
+          // $10.00 for prompts <= 200k, $15.00 for > 200k
           cachedInput: 0.125
+          // $0.125 for prompts <= 200k
         },
         knowledgeCutoff: "2025-01",
         features: {
@@ -3633,9 +3466,10 @@ var init_gemini_models = __esm({
         metadata: {
           family: "Gemini 2.5",
           releaseDate: "2025-06",
-          notes: "Balanced multimodal model with 1M context. Best for complex agents and reasoning."
+          notes: "State-of-the-art multipurpose model. Excels at coding and complex reasoning."
         }
       },
+      // Gemini 2.5 Flash
       {
         provider: "gemini",
         modelId: "gemini-2.5-flash",
@@ -3644,8 +3478,10 @@ var init_gemini_models = __esm({
         maxOutputTokens: 65536,
         pricing: {
           input: 0.3,
+          // $0.30 for text/image/video, $1.00 for audio
           output: 2.5,
           cachedInput: 0.03
+          // $0.03 for text/image/video
         },
         knowledgeCutoff: "2025-01",
         features: {
@@ -3658,9 +3494,10 @@ var init_gemini_models = __esm({
         metadata: {
           family: "Gemini 2.5",
           releaseDate: "2025-06",
-          notes: "Best price-performance ratio with thinking enabled by default"
+          notes: "First hybrid reasoning model with 1M context and thinking budgets."
         }
       },
+      // Gemini 2.5 Flash-Lite
       {
         provider: "gemini",
         modelId: "gemini-2.5-flash-lite",
@@ -3669,8 +3506,10 @@ var init_gemini_models = __esm({
         maxOutputTokens: 65536,
         pricing: {
           input: 0.1,
+          // $0.10 for text/image/video, $0.30 for audio
           output: 0.4,
           cachedInput: 0.01
+          // $0.01 for text/image/video
         },
         knowledgeCutoff: "2025-01",
         features: {
@@ -3682,9 +3521,10 @@ var init_gemini_models = __esm({
         metadata: {
           family: "Gemini 2.5",
           releaseDate: "2025-06",
-          notes: "Fastest and most cost-efficient model for high-volume, low-latency tasks"
+          notes: "Smallest and most cost effective model, built for at scale usage."
         }
       },
+      // Gemini 2.0 Flash
       {
         provider: "gemini",
         modelId: "gemini-2.0-flash",
@@ -3693,8 +3533,10 @@ var init_gemini_models = __esm({
         maxOutputTokens: 8192,
         pricing: {
           input: 0.1,
+          // $0.10 for text/image/video, $0.70 for audio
           output: 0.4,
-          cachedInput: 0.01
+          cachedInput: 0.025
+          // $0.025 for text/image/video
         },
         knowledgeCutoff: "2024-08",
         features: {
@@ -3705,9 +3547,10 @@ var init_gemini_models = __esm({
         },
         metadata: {
           family: "Gemini 2.0",
-          notes: "Previous generation with 1M context and multimodal capabilities"
+          notes: "Balanced multimodal model with 1M context, built for the era of Agents."
         }
       },
+      // Gemini 2.0 Flash-Lite
       {
         provider: "gemini",
         modelId: "gemini-2.0-flash-lite",
@@ -3716,8 +3559,8 @@ var init_gemini_models = __esm({
         maxOutputTokens: 8192,
         pricing: {
           input: 0.075,
-          output: 0.3,
-          cachedInput: 75e-4
+          output: 0.3
+          // No context caching available for 2.0-flash-lite
         },
         knowledgeCutoff: "2024-08",
         features: {
@@ -3728,7 +3571,7 @@ var init_gemini_models = __esm({
         },
         metadata: {
           family: "Gemini 2.0",
-          notes: "Lightweight previous generation model for cost-sensitive applications"
+          notes: "Smallest and most cost effective 2.0 model for at scale usage."
         }
       }
     ];
@@ -3898,7 +3741,9 @@ var init_gemini = __esm({
         return {
           inputTokens: usageMetadata.promptTokenCount ?? 0,
           outputTokens: usageMetadata.candidatesTokenCount ?? 0,
-          totalTokens: usageMetadata.totalTokenCount ?? 0
+          totalTokens: usageMetadata.totalTokenCount ?? 0,
+          // Gemini returns cached token count in cachedContentTokenCount
+          cachedInputTokens: usageMetadata.cachedContentTokenCount ?? 0
         };
       }
       /**
@@ -3954,10 +3799,11 @@ var init_openai_models = __esm({
   "src/providers/openai-models.ts"() {
     "use strict";
     OPENAI_MODELS = [
+      // GPT-5 Family
       {
         provider: "openai",
         modelId: "gpt-5.1",
-        displayName: "GPT-5.1 Instant",
+        displayName: "GPT-5.1",
         contextWindow: 128e3,
         maxOutputTokens: 32768,
         pricing: {
@@ -3977,34 +3823,7 @@ var init_openai_models = __esm({
         metadata: {
           family: "GPT-5",
           releaseDate: "2025-11-12",
-          notes: "Warmer, more intelligent, better instruction following. 2-3x faster than GPT-5.",
-          supportsTemperature: false
-        }
-      },
-      {
-        provider: "openai",
-        modelId: "gpt-5.1-thinking",
-        displayName: "GPT-5.1 Thinking",
-        contextWindow: 196e3,
-        maxOutputTokens: 32768,
-        pricing: {
-          input: 1.25,
-          output: 10,
-          cachedInput: 0.125
-        },
-        knowledgeCutoff: "2024-09-30",
-        features: {
-          streaming: true,
-          functionCalling: true,
-          vision: true,
-          reasoning: true,
-          structuredOutputs: true,
-          fineTuning: true
-        },
-        metadata: {
-          family: "GPT-5",
-          releaseDate: "2025-11-12",
-          notes: "Advanced reasoning with thinking levels: Light, Standard, Extended, Heavy. Best for complex tasks.",
+          notes: "Latest GPT-5 with improved instruction following. 2-3x faster than GPT-5.",
           supportsTemperature: false
         }
       },
@@ -4084,6 +3903,255 @@ var init_openai_models = __esm({
           notes: "Fastest, most cost-efficient version for well-defined tasks",
           supportsTemperature: false
         }
+      },
+      {
+        provider: "openai",
+        modelId: "gpt-5-pro",
+        displayName: "GPT-5 Pro",
+        contextWindow: 272e3,
+        maxOutputTokens: 128e3,
+        pricing: {
+          input: 15,
+          output: 120
+          // No cached input pricing for gpt-5-pro
+        },
+        knowledgeCutoff: "2024-09-30",
+        features: {
+          streaming: true,
+          functionCalling: true,
+          vision: true,
+          reasoning: true,
+          structuredOutputs: true
+        },
+        metadata: {
+          family: "GPT-5",
+          notes: "Premium tier with enhanced capabilities. Does not support prompt caching.",
+          supportsTemperature: false
+        }
+      },
+      // GPT-4.1 Family
+      {
+        provider: "openai",
+        modelId: "gpt-4.1",
+        displayName: "GPT-4.1",
+        contextWindow: 128e3,
+        maxOutputTokens: 32768,
+        pricing: {
+          input: 2,
+          output: 8,
+          cachedInput: 0.5
+        },
+        knowledgeCutoff: "2024-04-01",
+        features: {
+          streaming: true,
+          functionCalling: true,
+          vision: true,
+          structuredOutputs: true,
+          fineTuning: true
+        },
+        metadata: {
+          family: "GPT-4.1",
+          notes: "Improved GPT-4 with better instruction following"
+        }
+      },
+      {
+        provider: "openai",
+        modelId: "gpt-4.1-mini",
+        displayName: "GPT-4.1 Mini",
+        contextWindow: 128e3,
+        maxOutputTokens: 32768,
+        pricing: {
+          input: 0.4,
+          output: 1.6,
+          cachedInput: 0.1
+        },
+        knowledgeCutoff: "2024-04-01",
+        features: {
+          streaming: true,
+          functionCalling: true,
+          vision: true,
+          structuredOutputs: true,
+          fineTuning: true
+        },
+        metadata: {
+          family: "GPT-4.1",
+          notes: "Cost-efficient GPT-4.1 variant"
+        }
+      },
+      {
+        provider: "openai",
+        modelId: "gpt-4.1-nano",
+        displayName: "GPT-4.1 Nano",
+        contextWindow: 128e3,
+        maxOutputTokens: 32768,
+        pricing: {
+          input: 0.1,
+          output: 0.4,
+          cachedInput: 0.025
+        },
+        knowledgeCutoff: "2024-04-01",
+        features: {
+          streaming: true,
+          functionCalling: true,
+          vision: true,
+          structuredOutputs: true,
+          fineTuning: true
+        },
+        metadata: {
+          family: "GPT-4.1",
+          notes: "Fastest GPT-4.1 variant for simple tasks"
+        }
+      },
+      // GPT-4o Family
+      {
+        provider: "openai",
+        modelId: "gpt-4o",
+        displayName: "GPT-4o",
+        contextWindow: 128e3,
+        maxOutputTokens: 16384,
+        pricing: {
+          input: 2.5,
+          output: 10,
+          cachedInput: 1.25
+        },
+        knowledgeCutoff: "2024-04-01",
+        features: {
+          streaming: true,
+          functionCalling: true,
+          vision: true,
+          structuredOutputs: true,
+          fineTuning: true
+        },
+        metadata: {
+          family: "GPT-4o",
+          notes: "Multimodal model optimized for speed"
+        }
+      },
+      {
+        provider: "openai",
+        modelId: "gpt-4o-mini",
+        displayName: "GPT-4o Mini",
+        contextWindow: 128e3,
+        maxOutputTokens: 16384,
+        pricing: {
+          input: 0.15,
+          output: 0.6,
+          cachedInput: 0.075
+        },
+        knowledgeCutoff: "2024-04-01",
+        features: {
+          streaming: true,
+          functionCalling: true,
+          vision: true,
+          structuredOutputs: true,
+          fineTuning: true
+        },
+        metadata: {
+          family: "GPT-4o",
+          notes: "Fast and affordable multimodal model"
+        }
+      },
+      // o-series (Reasoning models)
+      {
+        provider: "openai",
+        modelId: "o1",
+        displayName: "o1",
+        contextWindow: 2e5,
+        maxOutputTokens: 1e5,
+        pricing: {
+          input: 15,
+          output: 60,
+          cachedInput: 7.5
+        },
+        knowledgeCutoff: "2024-12-01",
+        features: {
+          streaming: true,
+          functionCalling: true,
+          vision: true,
+          reasoning: true,
+          structuredOutputs: true
+        },
+        metadata: {
+          family: "o-series",
+          notes: "Advanced reasoning model with chain-of-thought",
+          supportsTemperature: false
+        }
+      },
+      {
+        provider: "openai",
+        modelId: "o3",
+        displayName: "o3",
+        contextWindow: 2e5,
+        maxOutputTokens: 1e5,
+        pricing: {
+          input: 2,
+          output: 8,
+          cachedInput: 0.5
+        },
+        knowledgeCutoff: "2025-01-01",
+        features: {
+          streaming: true,
+          functionCalling: true,
+          vision: true,
+          reasoning: true,
+          structuredOutputs: true
+        },
+        metadata: {
+          family: "o-series",
+          notes: "Next-gen reasoning model, more efficient than o1",
+          supportsTemperature: false
+        }
+      },
+      {
+        provider: "openai",
+        modelId: "o4-mini",
+        displayName: "o4 Mini",
+        contextWindow: 2e5,
+        maxOutputTokens: 1e5,
+        pricing: {
+          input: 1.1,
+          output: 4.4,
+          cachedInput: 0.275
+        },
+        knowledgeCutoff: "2025-04-01",
+        features: {
+          streaming: true,
+          functionCalling: true,
+          vision: true,
+          reasoning: true,
+          structuredOutputs: true,
+          fineTuning: true
+        },
+        metadata: {
+          family: "o-series",
+          notes: "Cost-efficient reasoning model",
+          supportsTemperature: false
+        }
+      },
+      {
+        provider: "openai",
+        modelId: "o3-mini",
+        displayName: "o3 Mini",
+        contextWindow: 2e5,
+        maxOutputTokens: 1e5,
+        pricing: {
+          input: 1.1,
+          output: 4.4,
+          cachedInput: 0.55
+        },
+        knowledgeCutoff: "2025-01-01",
+        features: {
+          streaming: true,
+          functionCalling: true,
+          vision: true,
+          reasoning: true,
+          structuredOutputs: true
+        },
+        metadata: {
+          family: "o-series",
+          notes: "Compact reasoning model for cost-sensitive applications",
+          supportsTemperature: false
+        }
       }
     ];
   }
@@ -4164,7 +4232,8 @@ var init_openai = __esm({
           const usage = chunk.usage ? {
             inputTokens: chunk.usage.prompt_tokens,
             outputTokens: chunk.usage.completion_tokens,
-            totalTokens: chunk.usage.total_tokens
+            totalTokens: chunk.usage.total_tokens,
+            cachedInputTokens: chunk.usage.prompt_tokens_details?.cached_tokens ?? 0
           } : void 0;
           if (finishReason || usage) {
             yield { text: "", finishReason, usage, rawEvent: chunk };
@@ -4381,20 +4450,28 @@ var init_model_registry = __esm({
       /**
        * Estimate API cost for a given model and token usage
        * @param modelId - Full model identifier
-       * @param inputTokens - Number of input tokens
+       * @param inputTokens - Number of input tokens (total, including cached and cache creation)
        * @param outputTokens - Number of output tokens
-       * @param useCachedInput - Whether to use cached input pricing (if supported by provider)
+       * @param cachedInputTokens - Number of cached input tokens (subset of inputTokens)
+       * @param cacheCreationInputTokens - Number of cache creation tokens (subset of inputTokens, Anthropic only)
        * @returns CostEstimate if model found, undefined otherwise
        */
-      estimateCost(modelId, inputTokens, outputTokens, useCachedInput = false) {
+      estimateCost(modelId, inputTokens, outputTokens, cachedInputTokens = 0, cacheCreationInputTokens = 0) {
         const spec = this.getModelSpec(modelId);
         if (!spec) return void 0;
-        const inputRate = useCachedInput && spec.pricing.cachedInput !== void 0 ? spec.pricing.cachedInput : spec.pricing.input;
-        const inputCost = inputTokens / 1e6 * inputRate;
+        const cachedRate = spec.pricing.cachedInput ?? spec.pricing.input;
+        const cacheWriteRate = spec.pricing.cacheWriteInput ?? spec.pricing.input;
+        const uncachedInputTokens = inputTokens - cachedInputTokens - cacheCreationInputTokens;
+        const uncachedInputCost = uncachedInputTokens / 1e6 * spec.pricing.input;
+        const cachedInputCost = cachedInputTokens / 1e6 * cachedRate;
+        const cacheCreationCost = cacheCreationInputTokens / 1e6 * cacheWriteRate;
+        const inputCost = uncachedInputCost + cachedInputCost + cacheCreationCost;
         const outputCost = outputTokens / 1e6 * spec.pricing.output;
         const totalCost = inputCost + outputCost;
         return {
           inputCost,
+          cachedInputCost,
+          cacheCreationCost,
           outputCost,
           totalCost,
           currency: "USD"
@@ -4793,9 +4870,9 @@ var init_builder = __esm({
       gadgets = [];
       initialMessages = [];
       onHumanInputRequired;
-      parameterFormat;
       gadgetStartPrefix;
       gadgetEndPrefix;
+      gadgetArgPrefix;
       textOnlyHandler;
       textWithGadgetsHandler;
       stopOnGadgetError;
@@ -4982,21 +5059,6 @@ var init_builder = __esm({
         this.onHumanInputRequired = handler;
         return this;
       }
-      /**
-       * Set the parameter format for gadget calls.
-       *
-       * @param format - Parameter format ("json" or "xml")
-       * @returns This builder for chaining
-       *
-       * @example
-       * ```typescript
-       * .withParameterFormat("xml")
-       * ```
-       */
-      withParameterFormat(format) {
-        this.parameterFormat = format;
-        return this;
-      }
       /**
        * Set custom gadget marker prefix.
        *
@@ -5027,6 +5089,21 @@ var init_builder = __esm({
         this.gadgetEndPrefix = suffix;
         return this;
       }
+      /**
+       * Set custom argument prefix for block format parameters.
+       *
+       * @param prefix - Custom prefix for argument markers (default: "!!!ARG:")
+       * @returns This builder for chaining
+       *
+       * @example
+       * ```typescript
+       * .withGadgetArgPrefix("<<ARG>>")
+       * ```
+       */
+      withGadgetArgPrefix(prefix) {
+        this.gadgetArgPrefix = prefix;
+        return this;
+      }
       /**
        * Set the text-only handler strategy.
        *
@@ -5226,8 +5303,7 @@ var init_builder = __esm({
       withSyntheticGadgetCall(gadgetName, parameters, result) {
         const startPrefix = this.gadgetStartPrefix ?? GADGET_START_PREFIX;
         const endPrefix = this.gadgetEndPrefix ?? GADGET_END_PREFIX;
-        const format = this.parameterFormat ?? "yaml";
-        const paramStr = this.formatSyntheticParameters(parameters, format);
+        const paramStr = this.formatBlockParameters(parameters, "");
         this.initialMessages.push({
           role: "assistant",
           content: `${startPrefix}${gadgetName}
@@ -5241,25 +5317,31 @@ ${endPrefix}`
         return this;
       }
       /**
-       * Format parameters for synthetic gadget calls.
-       * Uses heredoc for multiline string values.
+       * Format parameters as block format with JSON Pointer paths.
        */
-      formatSyntheticParameters(parameters, format) {
-        if (format === "json" || format === "auto") {
-          return JSON.stringify(parameters);
-        }
-        return Object.entries(parameters).map(([key, value]) => {
-          if (typeof value === "string" && value.includes("\n")) {
-            const separator = format === "yaml" ? ":" : " =";
-            return `${key}${separator} <<<EOF
-${value}
-EOF`;
-          }
-          if (format === "yaml") {
-            return typeof value === "string" ? `${key}: ${value}` : `${key}: ${JSON.stringify(value)}`;
+      formatBlockParameters(params, prefix) {
+        const lines = [];
+        const argPrefix = this.gadgetArgPrefix ?? GADGET_ARG_PREFIX;
+        for (const [key, value] of Object.entries(params)) {
+          const fullPath = prefix ? `${prefix}/${key}` : key;
+          if (Array.isArray(value)) {
+            value.forEach((item, index) => {
+              const itemPath = `${fullPath}/${index}`;
+              if (typeof item === "object" && item !== null) {
+                lines.push(this.formatBlockParameters(item, itemPath));
+              } else {
+                lines.push(`${argPrefix}${itemPath}`);
+                lines.push(String(item));
+              }
+            });
+          } else if (typeof value === "object" && value !== null) {
+            lines.push(this.formatBlockParameters(value, fullPath));
+          } else {
+            lines.push(`${argPrefix}${fullPath}`);
+            lines.push(String(value));
           }
-          return `${key} = ${JSON.stringify(value)}`;
-        }).join("\n");
+        }
+        return lines.join("\n");
       }
       /**
        * Build and create the agent with the given user prompt.
@@ -5299,9 +5381,9 @@ EOF`;
           promptConfig: this.promptConfig,
           initialMessages: this.initialMessages,
           onHumanInputRequired: this.onHumanInputRequired,
-          parameterFormat: this.parameterFormat,
           gadgetStartPrefix: this.gadgetStartPrefix,
           gadgetEndPrefix: this.gadgetEndPrefix,
+          gadgetArgPrefix: this.gadgetArgPrefix,
           textOnlyHandler: this.textOnlyHandler,
           textWithGadgetsHandler: this.textWithGadgetsHandler,
           stopOnGadgetError: this.stopOnGadgetError,
@@ -5401,9 +5483,9 @@ EOF`;
           promptConfig: this.promptConfig,
           initialMessages: this.initialMessages,
           onHumanInputRequired: this.onHumanInputRequired,
-          parameterFormat: this.parameterFormat,
           gadgetStartPrefix: this.gadgetStartPrefix,
           gadgetEndPrefix: this.gadgetEndPrefix,
+          gadgetArgPrefix: this.gadgetArgPrefix,
           textOnlyHandler: this.textOnlyHandler,
           textWithGadgetsHandler: this.textWithGadgetsHandler,
           stopOnGadgetError: this.stopOnGadgetError,
@@ -6483,17 +6565,51 @@ function splitIntoChunks(text, minChunkSize = 5, maxChunkSize = 30) {
   }
   return chunks;
 }
+function serializeToBlockFormat(obj, prefix = "") {
+  let result = "";
+  for (const [key, value] of Object.entries(obj)) {
+    const pointer = prefix ? `${prefix}/${key}` : key;
+    if (value === null || value === void 0) {
+      continue;
+    }
+    if (Array.isArray(value)) {
+      for (let i = 0; i < value.length; i++) {
+        const item = value[i];
+        const itemPointer = `${pointer}/${i}`;
+        if (typeof item === "object" && item !== null && !Array.isArray(item)) {
+          result += serializeToBlockFormat(item, itemPointer);
+        } else if (Array.isArray(item)) {
+          for (let j = 0; j < item.length; j++) {
+            result += `${GADGET_ARG_PREFIX}${itemPointer}/${j}
+${String(item[j])}
+`;
+          }
+        } else {
+          result += `${GADGET_ARG_PREFIX}${itemPointer}
+${String(item)}
+`;
+        }
+      }
+    } else if (typeof value === "object") {
+      result += serializeToBlockFormat(value, pointer);
+    } else {
+      result += `${GADGET_ARG_PREFIX}${pointer}
+${String(value)}
+`;
+    }
+  }
+  return result;
+}
 function formatGadgetCalls(gadgetCalls) {
   let text = "";
   const calls = [];
   for (const call of gadgetCalls) {
     const invocationId = call.invocationId ?? generateInvocationId();
     calls.push({ name: call.gadgetName, invocationId });
-    const paramsJson = JSON.stringify(call.parameters);
+    const blockParams = serializeToBlockFormat(call.parameters);
     text += `
 ${GADGET_START_PREFIX}${call.gadgetName}
-${paramsJson}
-${GADGET_END_PREFIX}`;
+${blockParams}${GADGET_END_PREFIX}`;
   }
   return { text, calls };
 }