llmist 0.8.0 → 1.1.0

package/dist/cli.cjs

@@ -32,12 +32,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;
@@ -370,17 +371,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
     };
   }
@@ -397,6 +393,7 @@ var init_messages = __esm({
       messages = [];
       startPrefix = GADGET_START_PREFIX;
       endPrefix = GADGET_END_PREFIX;
+      argPrefix = GADGET_ARG_PREFIX;
       promptConfig;
       constructor(promptConfig) {
         this.promptConfig = promptConfig ?? {};
@@ -405,26 +402,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)
         };
@@ -435,26 +438,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() : "";
@@ -465,35 +461,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(
@@ -511,124 +492,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) {
@@ -649,8 +596,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}
@@ -663,26 +610,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];
@@ -854,134 +807,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 = `__GADGET_PARAM_${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 = [
-      "__GADGET_PARAM_EOF__",
-      "__GADGET_PARAM_END__",
-      "__GADGET_PARAM_DOC__",
-      "__GADGET_PARAM_CONTENT__",
-      "__GADGET_PARAM_TEXT__",
-      "__GADGET_PARAM_HEREDOC__",
-      "__GADGET_PARAM_DATA__",
-      "__GADGET_PARAM_BLOCK__"
-    ];
     BaseGadget = class {
       /**
        * The name of the gadget. Used for identification when LLM calls it.
@@ -1012,19 +903,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) {
@@ -1033,20 +924,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("");
@@ -1055,13 +938,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);
@@ -1338,14 +1215,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) {
@@ -1355,7 +1230,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()];
@@ -1378,7 +1253,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;
@@ -1572,6 +1447,89 @@ var init_hook_validators = __esm({
   }
 });
 
+// src/gadgets/error-formatter.ts
+var GadgetErrorFormatter;
+var init_error_formatter = __esm({
+  "src/gadgets/error-formatter.ts"() {
+    "use strict";
+    init_constants();
+    GadgetErrorFormatter = class {
+      argPrefix;
+      startPrefix;
+      endPrefix;
+      constructor(options = {}) {
+        this.argPrefix = options.argPrefix ?? GADGET_ARG_PREFIX;
+        this.startPrefix = options.startPrefix ?? GADGET_START_PREFIX;
+        this.endPrefix = options.endPrefix ?? GADGET_END_PREFIX;
+      }
+      /**
+       * Format a Zod validation error with full gadget instructions.
+       *
+       * @param gadgetName - Name of the gadget that was called
+       * @param zodError - The Zod validation error
+       * @param gadget - The gadget instance (for generating instructions)
+       * @returns Formatted error message with usage instructions
+       */
+      formatValidationError(gadgetName, zodError, gadget) {
+        const parts = [];
+        parts.push(`Error: Invalid parameters for '${gadgetName}':`);
+        for (const issue of zodError.issues) {
+          const path2 = issue.path.join(".") || "root";
+          parts.push(`  - ${path2}: ${issue.message}`);
+        }
+        parts.push("");
+        parts.push("Gadget Usage:");
+        parts.push(gadget.getInstruction(this.argPrefix));
+        return parts.join("\n");
+      }
+      /**
+       * Format a parse error with block format reference.
+       *
+       * @param gadgetName - Name of the gadget that was called
+       * @param parseError - The parse error message
+       * @param gadget - The gadget instance if found (for generating instructions)
+       * @returns Formatted error message with format reference
+       */
+      formatParseError(gadgetName, parseError, gadget) {
+        const parts = [];
+        parts.push(`Error: Failed to parse parameters for '${gadgetName}':`);
+        parts.push(`  ${parseError}`);
+        if (gadget) {
+          parts.push("");
+          parts.push("Gadget Usage:");
+          parts.push(gadget.getInstruction(this.argPrefix));
+        }
+        parts.push("");
+        parts.push("Block Format Reference:");
+        parts.push(`  ${this.startPrefix}${gadgetName}`);
+        parts.push(`  ${this.argPrefix}parameterName`);
+        parts.push("  parameter value here");
+        parts.push(`  ${this.endPrefix}`);
+        return parts.join("\n");
+      }
+      /**
+       * Format a registry error (gadget not found) with available gadgets list.
+       *
+       * @param gadgetName - Name of the gadget that was not found
+       * @param availableGadgets - List of available gadget names
+       * @returns Formatted error message with available gadgets
+       */
+      formatRegistryError(gadgetName, availableGadgets) {
+        const parts = [];
+        parts.push(`Error: Gadget '${gadgetName}' not found.`);
+        if (availableGadgets.length > 0) {
+          parts.push("");
+          parts.push(`Available gadgets: ${availableGadgets.join(", ")}`);
+        } else {
+          parts.push("");
+          parts.push("No gadgets are currently registered.");
+        }
+        return parts.join("\n");
+      }
+    };
+  }
+});
+
 // src/gadgets/exceptions.ts
 var BreakLoopException, HumanInputException, TimeoutException;
 var init_exceptions = __esm({
@@ -1610,15 +1568,18 @@ var init_executor = __esm({
   "src/gadgets/executor.ts"() {
     "use strict";
     init_logger();
+    init_error_formatter();
     init_exceptions();
     GadgetExecutor = class {
-      constructor(registry, onHumanInputRequired, logger, defaultGadgetTimeoutMs) {
+      constructor(registry, onHumanInputRequired, logger, defaultGadgetTimeoutMs, errorFormatterOptions) {
         this.registry = registry;
         this.onHumanInputRequired = onHumanInputRequired;
         this.defaultGadgetTimeoutMs = defaultGadgetTimeoutMs;
         this.logger = logger ?? createLogger({ name: "llmist:executor" });
+        this.errorFormatter = new GadgetErrorFormatter(errorFormatterOptions);
       }
       logger;
+      errorFormatter;
       /**
        * Creates a promise that rejects with a TimeoutException after the specified timeout.
        */
@@ -1643,11 +1604,12 @@ var init_executor = __esm({
           const gadget = this.registry.get(call.gadgetName);
           if (!gadget) {
             this.logger.error("Gadget not found", { gadgetName: call.gadgetName });
+            const availableGadgets = this.registry.getNames();
             return {
               gadgetName: call.gadgetName,
               invocationId: call.invocationId,
               parameters: call.parameters ?? {},
-              error: `Gadget '${call.gadgetName}' not found in registry`,
+              error: this.errorFormatter.formatRegistryError(call.gadgetName, availableGadgets),
               executionTimeMs: Date.now() - startTime
             };
           }
@@ -1655,27 +1617,28 @@ var init_executor = __esm({
             this.logger.error("Gadget parameter parse error", {
               gadgetName: call.gadgetName,
               parseError: call.parseError,
-              rawParameters: call.parametersYaml
+              rawParameters: call.parametersRaw
             });
+            const parseErrorMessage = call.parseError ?? "Failed to parse parameters";
             return {
               gadgetName: call.gadgetName,
               invocationId: call.invocationId,
               parameters: {},
-              error: call.parseError ?? "Failed to parse parameters",
+              error: this.errorFormatter.formatParseError(call.gadgetName, parseErrorMessage, gadget),
               executionTimeMs: Date.now() - startTime
             };
           }
           if (gadget.parameterSchema) {
             const validationResult = gadget.parameterSchema.safeParse(rawParameters);
             if (!validationResult.success) {
-              const formattedIssues = validationResult.error.issues.map((issue) => {
-                const path2 = issue.path.join(".") || "root";
-                return `${path2}: ${issue.message}`;
-              }).join("; ");
-              const validationError = `Invalid parameters: ${formattedIssues}`;
+              const validationError = this.errorFormatter.formatValidationError(
+                call.gadgetName,
+                validationResult.error,
+                gadget
+              );
               this.logger.error("Gadget parameter validation failed", {
                 gadgetName: call.gadgetName,
-                error: validationError
+                issueCount: validationResult.error.issues.length
               });
               return {
                 gadgetName: call.gadgetName,
@@ -1817,168 +1780,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);
     }
-    result.push(line);
-    i++;
-  }
-  return result.join("\n");
-}
-function unescapeHeredocContent(content) {
-  return content.replace(/\\`/g, "`").replace(/\\\$/g, "$").replace(/\\{/g, "{").replace(/\\}/g, "}");
-}
-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) {
-      }
+    if (!pointer) {
       continue;
     }
-    result.push(line);
-    i++;
+    if (seenPointers.has(pointer)) {
+      throw new Error(`Duplicate pointer: ${pointer}`);
+    }
+    seenPointers.add(pointer);
+    setByPointer(result, pointer, value);
+  }
+  return result;
+}
+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 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 ? [] : {};
+      }
+      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}`);
+    }
+    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;
@@ -1987,24 +1889,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) {
@@ -2026,56 +1927,22 @@ var init_parser = __esm({
         return { actualName: gadgetName, invocationId: `gadget_${++globalInvocationCounter}` };
       }
       /**
-       * Truncate verbose parse errors to avoid context overflow.
-       * Keeps first meaningful line and limits total length.
+       * Extract the error message from a parse error.
+       * Preserves full message since the error formatter adds contextual help
+       * that benefits from precise, detailed error information.
        */
-      truncateParseError(error, format) {
-        const message = error instanceof Error ? error.message : String(error);
-        const firstLine = message.split("\n")[0];
-        const maxLen = 200;
-        if (firstLine.length <= maxLen) {
-          return firstLine;
-        }
-        return `${firstLine.slice(0, maxLen)}... (${message.length} chars total)`;
+      extractParseError(error) {
+        return error instanceof Error ? error.message : String(error);
       }
       /**
-       * 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.extractParseError(error) };
         }
       }
       // Feed a chunk of text and get parsed events
@@ -2134,8 +2001,7 @@ var init_parser = __esm({
             call: {
               gadgetName: actualGadgetName,
               invocationId,
-              parametersYaml: parametersRaw,
-              // Keep property name for backward compatibility
+              parametersRaw,
               parameters,
               parseError
             }
@@ -2169,7 +2035,7 @@ var init_parser = __esm({
               call: {
                 gadgetName: actualGadgetName,
                 invocationId,
-                parametersYaml: parametersRaw,
+                parametersRaw,
                 parameters,
                 parseError
               }
@@ -2220,9 +2086,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,
@@ -2376,7 +2242,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,
@@ -2612,9 +2478,9 @@ var init_agent = __esm({
       hooks;
       conversation;
       registry;
-      parameterFormat;
       gadgetStartPrefix;
       gadgetEndPrefix;
+      gadgetArgPrefix;
       onHumanInputRequired;
       textOnlyHandler;
       textWithGadgetsHandler;
@@ -2643,9 +2509,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;
@@ -2667,9 +2533,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) => ({
@@ -2677,9 +2544,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) {
@@ -2772,9 +2639,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,
@@ -5040,9 +4907,9 @@ var init_builder = __esm({
       gadgets = [];
       initialMessages = [];
       onHumanInputRequired;
-      parameterFormat;
       gadgetStartPrefix;
       gadgetEndPrefix;
+      gadgetArgPrefix;
       textOnlyHandler;
       textWithGadgetsHandler;
       stopOnGadgetError;
@@ -5229,21 +5096,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.
        *
@@ -5274,6 +5126,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.
        *
@@ -5473,8 +5340,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}
@@ -5488,25 +5354,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.
@@ -5546,9 +5418,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,
@@ -5648,9 +5520,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,
@@ -5671,11 +5543,11 @@ var CLI_DESCRIPTION = "Command line utilities for llmist agents and direct LLM a
 var COMMANDS = {
   complete: "complete",
   agent: "agent",
-  models: "models"
+  models: "models",
+  gadget: "gadget"
 };
 var LOG_LEVELS = ["silly", "trace", "debug", "info", "warn", "error", "fatal"];
 var DEFAULT_MODEL = "openai:gpt-5-nano";
-var DEFAULT_PARAMETER_FORMAT = "toml";
 var OPTION_FLAGS = {
   model: "-m, --model <identifier>",
   systemPrompt: "-s, --system <prompt>",
@@ -5683,10 +5555,11 @@ var OPTION_FLAGS = {
   maxTokens: "--max-tokens <count>",
   maxIterations: "-i, --max-iterations <count>",
   gadgetModule: "-g, --gadget <module>",
-  parameterFormat: "--parameter-format <format>",
   logLevel: "--log-level <level>",
   logFile: "--log-file <path>",
   logReset: "--log-reset",
+  logLlmRequests: "--log-llm-requests [dir]",
+  logLlmResponses: "--log-llm-responses [dir]",
   noBuiltins: "--no-builtins",
   noBuiltinInteraction: "--no-builtin-interaction",
   quiet: "-q, --quiet"
@@ -5698,10 +5571,11 @@ var OPTION_DESCRIPTIONS = {
   maxTokens: "Maximum number of output tokens requested from the model.",
   maxIterations: "Maximum number of agent loop iterations before exiting.",
   gadgetModule: "Path or module specifier for a gadget export. Repeat to register multiple gadgets.",
-  parameterFormat: "Format for gadget parameter schemas: 'json', 'yaml', 'toml', or 'auto'.",
   logLevel: "Log level: silly, trace, debug, info, warn, error, fatal.",
   logFile: "Path to log file. When set, logs are written to file instead of stderr.",
   logReset: "Reset (truncate) the log file at session start instead of appending.",
+  logLlmRequests: "Save raw LLM requests as plain text. Optional dir, defaults to ~/.llmist/logs/requests/",
+  logLlmResponses: "Save raw LLM responses as plain text. Optional dir, defaults to ~/.llmist/logs/responses/",
   noBuiltins: "Disable built-in gadgets (AskUser, TellUser).",
   noBuiltinInteraction: "Disable interactive gadgets (AskUser) while keeping TellUser.",
   quiet: "Suppress all output except content (text and TellUser messages)."
@@ -5709,12 +5583,12 @@ var OPTION_DESCRIPTIONS = {
 var SUMMARY_PREFIX = "[llmist]";
 
 // src/cli/program.ts
-var import_commander3 = require("commander");
+var import_commander2 = require("commander");
 
 // package.json
 var package_default = {
   name: "llmist",
-  version: "0.7.0",
+  version: "1.0.0",
   description: "Universal TypeScript LLM client with streaming-first agent framework. Works with any model - no structured outputs or native tool calling required. Implements its own flexible grammar for function calling.",
   type: "module",
   main: "dist/index.cjs",
@@ -5827,7 +5701,7 @@ var package_default = {
 };
 
 // src/cli/agent-command.ts
-var import_promises = require("readline/promises");
+var import_promises2 = require("readline/promises");
 var import_chalk3 = __toESM(require("chalk"), 1);
 init_builder();
 init_registry();
@@ -6016,8 +5890,33 @@ async function loadGadgets(specifiers, cwd, importer = (specifier) => import(spe
   return gadgets;
 }
 
-// src/cli/option-helpers.ts
-var import_commander2 = require("commander");
+// src/cli/llm-logging.ts
+var import_promises = require("fs/promises");
+var import_node_os = require("os");
+var import_node_path3 = require("path");
+var DEFAULT_LLM_LOG_DIR = (0, import_node_path3.join)((0, import_node_os.homedir)(), ".llmist", "logs");
+function resolveLogDir(option, subdir) {
+  if (option === true) {
+    return (0, import_node_path3.join)(DEFAULT_LLM_LOG_DIR, subdir);
+  }
+  if (typeof option === "string") {
+    return option;
+  }
+  return void 0;
+}
+function formatLlmRequest(messages) {
+  const lines = [];
+  for (const msg of messages) {
+    lines.push(`=== ${msg.role.toUpperCase()} ===`);
+    lines.push(msg.content ?? "");
+    lines.push("");
+  }
+  return lines.join("\n");
+}
+async function writeLogFile(dir, filename, content) {
+  await (0, import_promises.mkdir)(dir, { recursive: true });
+  await (0, import_promises.writeFile)((0, import_node_path3.join)(dir, filename), content, "utf-8");
+}
 
 // src/cli/utils.ts
 var import_chalk2 = __toESM(require("chalk"), 1);
@@ -6061,9 +5960,29 @@ function ensureMarkedConfigured() {
 }
 function renderMarkdown(text) {
   ensureMarkedConfigured();
-  const rendered = import_marked.marked.parse(text);
+  let rendered = import_marked.marked.parse(text);
+  rendered = rendered.replace(/\*\*(.+?)\*\*/g, (_, content) => import_chalk.default.bold(content)).replace(/(?<!\*)\*(\S[^*]*)\*(?!\*)/g, (_, content) => import_chalk.default.italic(content));
   return rendered.trimEnd();
 }
+function createRainbowSeparator() {
+  const colors = [import_chalk.default.red, import_chalk.default.yellow, import_chalk.default.green, import_chalk.default.cyan, import_chalk.default.blue, import_chalk.default.magenta];
+  const char = "\u2500";
+  const width = process.stdout.columns || 80;
+  let result = "";
+  for (let i = 0; i < width; i++) {
+    result += colors[i % colors.length](char);
+  }
+  return result;
+}
+function renderMarkdownWithSeparators(text) {
+  const rendered = renderMarkdown(text);
+  const separator = createRainbowSeparator();
+  return `
+${separator}
+${rendered}
+${separator}
+`;
+}
 function formatTokens(tokens) {
   return tokens >= 1e3 ? `${(tokens / 1e3).toFixed(1)}k` : `${tokens}`;
 }
@@ -6183,7 +6102,7 @@ function formatGadgetSummary(result) {
   const summaryLine = `${icon} ${gadgetLabel}${paramsLabel} ${import_chalk.default.dim("\u2192")} ${outputLabel} ${timeLabel}`;
   if (result.gadgetName === "TellUser" && result.parameters?.message) {
     const message = String(result.parameters.message);
-    const rendered = renderMarkdown(message);
+    const rendered = renderMarkdownWithSeparators(message);
     return `${summaryLine}
 ${rendered}`;
   }
@@ -6490,7 +6409,7 @@ var StreamProgress = class {
     }
     this.isRunning = false;
     if (this.hasRendered) {
-      this.target.write("\r\x1B[K");
+      this.target.write("\r\x1B[K\x1B[0G");
       this.hasRendered = false;
     }
   }
@@ -6583,16 +6502,6 @@ async function executeAction(action, env) {
 }
 
 // src/cli/option-helpers.ts
-var PARAMETER_FORMAT_VALUES = ["json", "yaml", "toml", "auto"];
-function parseParameterFormat(value) {
-  const normalized = value.toLowerCase();
-  if (!PARAMETER_FORMAT_VALUES.includes(normalized)) {
-    throw new import_commander2.InvalidArgumentError(
-      `Parameter format must be one of: ${PARAMETER_FORMAT_VALUES.join(", ")}`
-    );
-  }
-  return normalized;
-}
 function addCompleteOptions(cmd, defaults) {
   return cmd.option(OPTION_FLAGS.model, OPTION_DESCRIPTIONS.model, defaults?.model ?? DEFAULT_MODEL).option(OPTION_FLAGS.systemPrompt, OPTION_DESCRIPTIONS.systemPrompt, defaults?.system).option(
     OPTION_FLAGS.temperature,
@@ -6604,7 +6513,7 @@ function addCompleteOptions(cmd, defaults) {
     OPTION_DESCRIPTIONS.maxTokens,
     createNumericParser({ label: "Max tokens", integer: true, min: 1 }),
     defaults?.["max-tokens"]
-  ).option(OPTION_FLAGS.quiet, OPTION_DESCRIPTIONS.quiet, defaults?.quiet);
+  ).option(OPTION_FLAGS.quiet, OPTION_DESCRIPTIONS.quiet, defaults?.quiet).option(OPTION_FLAGS.logLlmRequests, OPTION_DESCRIPTIONS.logLlmRequests, defaults?.["log-llm-requests"]).option(OPTION_FLAGS.logLlmResponses, OPTION_DESCRIPTIONS.logLlmResponses, defaults?.["log-llm-responses"]);
 }
 function addAgentOptions(cmd, defaults) {
   const gadgetAccumulator = (value, previous = []) => [
@@ -6624,16 +6533,11 @@ function addAgentOptions(cmd, defaults) {
     defaults?.["max-iterations"]
   ).option(OPTION_FLAGS.gadgetModule, OPTION_DESCRIPTIONS.gadgetModule, gadgetAccumulator, [
     ...defaultGadgets
-  ]).option(
-    OPTION_FLAGS.parameterFormat,
-    OPTION_DESCRIPTIONS.parameterFormat,
-    parseParameterFormat,
-    defaults?.["parameter-format"] ?? DEFAULT_PARAMETER_FORMAT
-  ).option(OPTION_FLAGS.noBuiltins, OPTION_DESCRIPTIONS.noBuiltins, defaults?.builtins !== false).option(
+  ]).option(OPTION_FLAGS.noBuiltins, OPTION_DESCRIPTIONS.noBuiltins, defaults?.builtins !== false).option(
     OPTION_FLAGS.noBuiltinInteraction,
     OPTION_DESCRIPTIONS.noBuiltinInteraction,
     defaults?.["builtin-interaction"] !== false
-  ).option(OPTION_FLAGS.quiet, OPTION_DESCRIPTIONS.quiet, defaults?.quiet);
+  ).option(OPTION_FLAGS.quiet, OPTION_DESCRIPTIONS.quiet, defaults?.quiet).option(OPTION_FLAGS.logLlmRequests, OPTION_DESCRIPTIONS.logLlmRequests, defaults?.["log-llm-requests"]).option(OPTION_FLAGS.logLlmResponses, OPTION_DESCRIPTIONS.logLlmResponses, defaults?.["log-llm-responses"]);
 }
 function configToCompleteOptions(config) {
   const result = {};
@@ -6642,6 +6546,8 @@ function configToCompleteOptions(config) {
   if (config.temperature !== void 0) result.temperature = config.temperature;
   if (config["max-tokens"] !== void 0) result.maxTokens = config["max-tokens"];
   if (config.quiet !== void 0) result.quiet = config.quiet;
+  if (config["log-llm-requests"] !== void 0) result.logLlmRequests = config["log-llm-requests"];
+  if (config["log-llm-responses"] !== void 0) result.logLlmResponses = config["log-llm-responses"];
   return result;
 }
 function configToAgentOptions(config) {
@@ -6651,7 +6557,6 @@ function configToAgentOptions(config) {
   if (config.temperature !== void 0) result.temperature = config.temperature;
   if (config["max-iterations"] !== void 0) result.maxIterations = config["max-iterations"];
   if (config.gadget !== void 0) result.gadget = config.gadget;
-  if (config["parameter-format"] !== void 0) result.parameterFormat = config["parameter-format"];
   if (config.builtins !== void 0) result.builtins = config.builtins;
   if (config["builtin-interaction"] !== void 0)
     result.builtinInteraction = config["builtin-interaction"];
@@ -6659,13 +6564,17 @@ function configToAgentOptions(config) {
     result.gadgetStartPrefix = config["gadget-start-prefix"];
   if (config["gadget-end-prefix"] !== void 0)
     result.gadgetEndPrefix = config["gadget-end-prefix"];
+  if (config["gadget-arg-prefix"] !== void 0)
+    result.gadgetArgPrefix = config["gadget-arg-prefix"];
   if (config.quiet !== void 0) result.quiet = config.quiet;
+  if (config["log-llm-requests"] !== void 0) result.logLlmRequests = config["log-llm-requests"];
+  if (config["log-llm-responses"] !== void 0) result.logLlmResponses = config["log-llm-responses"];
   return result;
 }
 
 // src/cli/agent-command.ts
 async function promptApproval(env, prompt) {
-  const rl = (0, import_promises.createInterface)({ input: env.stdin, output: env.stderr });
+  const rl = (0, import_promises2.createInterface)({ input: env.stdin, output: env.stderr });
   try {
     const answer = await rl.question(prompt);
     return answer.trim();
@@ -6680,10 +6589,10 @@ function createHumanInputHandler(env, progress) {
   }
   return async (question) => {
     progress.pause();
-    const rl = (0, import_promises.createInterface)({ input: env.stdin, output: env.stdout });
+    const rl = (0, import_promises2.createInterface)({ input: env.stdin, output: env.stdout });
     try {
       const questionLine = question.trim() ? `
-${renderMarkdown(question.trim())}` : "";
+${renderMarkdownWithSeparators(question.trim())}` : "";
       let isFirst = true;
       while (true) {
         const statsPrompt = progress.formatPrompt();
@@ -6726,6 +6635,9 @@ async function executeAgent(promptArg, options, env) {
   const progress = new StreamProgress(env.stderr, stderrTTY, client.modelRegistry);
   let usage;
   let iterations = 0;
+  const llmRequestsDir = resolveLogDir(options.logLlmRequests, "requests");
+  const llmResponsesDir = resolveLogDir(options.logLlmResponses, "responses");
+  let llmCallCounter = 0;
   const countMessagesTokens = async (model, messages) => {
     try {
       return await client.countTokens(model, messages);
@@ -6748,12 +6660,18 @@ async function executeAgent(promptArg, options, env) {
       // onLLMCallStart: Start progress indicator for each LLM call
       // This showcases how to react to agent lifecycle events
       onLLMCallStart: async (context) => {
+        llmCallCounter++;
         const inputTokens = await countMessagesTokens(
           context.options.model,
           context.options.messages
         );
         progress.startCall(context.options.model, inputTokens);
         progress.setInputTokens(inputTokens, false);
+        if (llmRequestsDir) {
+          const filename = `${Date.now()}_call_${llmCallCounter}.request.txt`;
+          const content = formatLlmRequest(context.options.messages);
+          await writeLogFile(llmRequestsDir, filename, content);
+        }
       },
       // onStreamChunk: Real-time updates as LLM generates tokens
       // This enables responsive UIs that show progress during generation
@@ -6816,6 +6734,10 @@ async function executeAgent(promptArg, options, env) {
 `);
           }
         }
+        if (llmResponsesDir) {
+          const filename = `${Date.now()}_call_${llmCallCounter}.response.txt`;
+          await writeLogFile(llmResponsesDir, filename, context.rawResponse);
+        }
       }
     },
     // SHOWCASE: Controller-based approval gating for dangerous gadgets
@@ -6880,13 +6802,15 @@ Command rejected by user with message: "${response}"`
   if (gadgets.length > 0) {
     builder.withGadgets(...gadgets);
   }
-  builder.withParameterFormat(options.parameterFormat);
   if (options.gadgetStartPrefix) {
     builder.withGadgetStartPrefix(options.gadgetStartPrefix);
   }
   if (options.gadgetEndPrefix) {
     builder.withGadgetEndPrefix(options.gadgetEndPrefix);
   }
+  if (options.gadgetArgPrefix) {
+    builder.withGadgetArgPrefix(options.gadgetArgPrefix);
+  }
   builder.withSyntheticGadgetCall(
     "TellUser",
     {
@@ -6903,17 +6827,25 @@ Command rejected by user with message: "${response}"`
     resultMapping: (text) => `\u2139\uFE0F  ${text}`
   });
   const agent = builder.ask(prompt);
+  let textBuffer = "";
+  const flushTextBuffer = () => {
+    if (textBuffer) {
+      const output = options.quiet ? textBuffer : renderMarkdownWithSeparators(textBuffer);
+      printer.write(output);
+      textBuffer = "";
+    }
+  };
   for await (const event of agent.run()) {
     if (event.type === "text") {
       progress.pause();
-      printer.write(event.content);
+      textBuffer += event.content;
     } else if (event.type === "gadget_result") {
+      flushTextBuffer();
       progress.pause();
       if (options.quiet) {
         if (event.result.gadgetName === "TellUser" && event.result.parameters?.message) {
           const message = String(event.result.parameters.message);
-          const rendered = renderMarkdown(message);
-          env.stdout.write(`${rendered}
+          env.stdout.write(`${message}
 `);
         }
       } else {
@@ -6923,6 +6855,7 @@ Command rejected by user with message: "${response}"`
       }
     }
   }
+  flushTextBuffer();
   progress.complete();
   printer.ensureNewline();
   if (!options.quiet && iterations > 1) {
@@ -6961,9 +6894,18 @@ async function executeComplete(promptArg, options, env) {
     builder.addSystem(options.system);
   }
   builder.addUser(prompt);
+  const messages = builder.build();
+  const llmRequestsDir = resolveLogDir(options.logLlmRequests, "requests");
+  const llmResponsesDir = resolveLogDir(options.logLlmResponses, "responses");
+  const timestamp = Date.now();
+  if (llmRequestsDir) {
+    const filename = `${timestamp}_complete.request.txt`;
+    const content = formatLlmRequest(messages);
+    await writeLogFile(llmRequestsDir, filename, content);
+  }
   const stream2 = client.stream({
     model,
-    messages: builder.build(),
+    messages,
     temperature: options.temperature,
     maxTokens: options.maxTokens
   });
@@ -6974,7 +6916,7 @@ async function executeComplete(promptArg, options, env) {
   progress.startCall(model, estimatedInputTokens);
   let finishReason;
   let usage;
-  let totalChars = 0;
+  let accumulatedResponse = "";
   for await (const chunk of stream2) {
     if (chunk.usage) {
       usage = chunk.usage;
@@ -6987,8 +6929,8 @@ async function executeComplete(promptArg, options, env) {
     }
     if (chunk.text) {
       progress.pause();
-      totalChars += chunk.text.length;
-      progress.update(totalChars);
+      accumulatedResponse += chunk.text;
+      progress.update(accumulatedResponse.length);
       printer.write(chunk.text);
     }
     if (chunk.finishReason !== void 0) {
@@ -6998,6 +6940,10 @@ async function executeComplete(promptArg, options, env) {
   progress.endCall(usage);
   progress.complete();
   printer.ensureNewline();
+  if (llmResponsesDir) {
+    const filename = `${timestamp}_complete.response.txt`;
+    await writeLogFile(llmResponsesDir, filename, accumulatedResponse);
+  }
   if (stderrTTY && !options.quiet) {
     const summary = renderSummary({ finishReason, usage, cost: progress.getTotalCost() });
     if (summary) {
@@ -7016,9 +6962,9 @@ function registerCompleteCommand(program, env, config) {
 
 // src/cli/config.ts
 var import_node_fs3 = require("fs");
-var import_node_os = require("os");
-var import_node_path3 = require("path");
-var import_js_toml2 = require("js-toml");
+var import_node_os2 = require("os");
+var import_node_path4 = require("path");
+var import_js_toml = require("js-toml");
 
 // src/cli/templates.ts
 var import_eta = require("eta");
@@ -7112,6 +7058,8 @@ var COMPLETE_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "log-level",
   "log-file",
   "log-reset",
+  "log-llm-requests",
+  "log-llm-responses",
   "type"
   // Allowed for inheritance compatibility, ignored for built-in commands
 ]);
@@ -7121,16 +7069,18 @@ var AGENT_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "temperature",
   "max-iterations",
   "gadget",
-  "parameter-format",
   "builtins",
   "builtin-interaction",
   "gadget-start-prefix",
   "gadget-end-prefix",
+  "gadget-arg-prefix",
   "quiet",
   "inherits",
   "log-level",
   "log-file",
   "log-reset",
+  "log-llm-requests",
+  "log-llm-responses",
   "type"
   // Allowed for inheritance compatibility, ignored for built-in commands
 ]);
@@ -7140,9 +7090,8 @@ var CUSTOM_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "type",
   "description"
 ]);
-var VALID_PARAMETER_FORMATS = ["json", "yaml", "toml", "auto"];
 function getConfigPath() {
-  return (0, import_node_path3.join)((0, import_node_os.homedir)(), ".llmist", "cli.toml");
+  return (0, import_node_path4.join)((0, import_node_os2.homedir)(), ".llmist", "cli.toml");
 }
 var ConfigError = class extends Error {
   constructor(message, path2) {
@@ -7276,6 +7225,20 @@ function validateCompleteConfig(raw, section) {
   if ("quiet" in rawObj) {
     result.quiet = validateBoolean(rawObj.quiet, "quiet", section);
   }
+  if ("log-llm-requests" in rawObj) {
+    result["log-llm-requests"] = validateStringOrBoolean(
+      rawObj["log-llm-requests"],
+      "log-llm-requests",
+      section
+    );
+  }
+  if ("log-llm-responses" in rawObj) {
+    result["log-llm-responses"] = validateStringOrBoolean(
+      rawObj["log-llm-responses"],
+      "log-llm-responses",
+      section
+    );
+  }
   return result;
 }
 function validateAgentConfig(raw, section) {
@@ -7301,15 +7264,6 @@ function validateAgentConfig(raw, section) {
   if ("gadget" in rawObj) {
     result.gadget = validateStringArray(rawObj.gadget, "gadget", section);
   }
-  if ("parameter-format" in rawObj) {
-    const format = validateString(rawObj["parameter-format"], "parameter-format", section);
-    if (!VALID_PARAMETER_FORMATS.includes(format)) {
-      throw new ConfigError(
-        `[${section}].parameter-format must be one of: ${VALID_PARAMETER_FORMATS.join(", ")}`
-      );
-    }
-    result["parameter-format"] = format;
-  }
   if ("builtins" in rawObj) {
     result.builtins = validateBoolean(rawObj.builtins, "builtins", section);
   }
@@ -7334,11 +7288,38 @@ function validateAgentConfig(raw, section) {
       section
     );
   }
+  if ("gadget-arg-prefix" in rawObj) {
+    result["gadget-arg-prefix"] = validateString(
+      rawObj["gadget-arg-prefix"],
+      "gadget-arg-prefix",
+      section
+    );
+  }
   if ("quiet" in rawObj) {
     result.quiet = validateBoolean(rawObj.quiet, "quiet", section);
   }
+  if ("log-llm-requests" in rawObj) {
+    result["log-llm-requests"] = validateStringOrBoolean(
+      rawObj["log-llm-requests"],
+      "log-llm-requests",
+      section
+    );
+  }
+  if ("log-llm-responses" in rawObj) {
+    result["log-llm-responses"] = validateStringOrBoolean(
+      rawObj["log-llm-responses"],
+      "log-llm-responses",
+      section
+    );
+  }
   return result;
 }
+function validateStringOrBoolean(value, field, section) {
+  if (typeof value === "string" || typeof value === "boolean") {
+    return value;
+  }
+  throw new ConfigError(`[${section}].${field} must be a string or boolean`);
+}
 function validateCustomConfig(raw, section) {
   if (typeof raw !== "object" || raw === null) {
     throw new ConfigError(`[${section}] must be a table`);
@@ -7373,15 +7354,6 @@ function validateCustomConfig(raw, section) {
   if ("gadget" in rawObj) {
     result.gadget = validateStringArray(rawObj.gadget, "gadget", section);
   }
-  if ("parameter-format" in rawObj) {
-    const format = validateString(rawObj["parameter-format"], "parameter-format", section);
-    if (!VALID_PARAMETER_FORMATS.includes(format)) {
-      throw new ConfigError(
-        `[${section}].parameter-format must be one of: ${VALID_PARAMETER_FORMATS.join(", ")}`
-      );
-    }
-    result["parameter-format"] = format;
-  }
   if ("builtins" in rawObj) {
     result.builtins = validateBoolean(rawObj.builtins, "builtins", section);
   }
@@ -7406,6 +7378,13 @@ function validateCustomConfig(raw, section) {
       section
     );
   }
+  if ("gadget-arg-prefix" in rawObj) {
+    result["gadget-arg-prefix"] = validateString(
+      rawObj["gadget-arg-prefix"],
+      "gadget-arg-prefix",
+      section
+    );
+  }
   if ("max-tokens" in rawObj) {
     result["max-tokens"] = validateNumber(rawObj["max-tokens"], "max-tokens", section, {
       integer: true,
@@ -7475,7 +7454,7 @@ function loadConfig() {
   }
   let raw;
   try {
-    raw = (0, import_js_toml2.load)(content);
+    raw = (0, import_js_toml.load)(content);
   } catch (error) {
     throw new ConfigError(
       `Invalid TOML syntax: ${error instanceof Error ? error.message : "Unknown error"}`,
@@ -7596,8 +7575,439 @@ function resolveInheritance(config, configPath) {
   return resolved;
 }
 
-// src/cli/models-command.ts
+// src/cli/gadget-command.ts
+var import_chalk5 = __toESM(require("chalk"), 1);
+init_schema_to_json();
+init_schema_validator();
+
+// src/cli/gadget-prompts.ts
+var import_promises3 = require("readline/promises");
 var import_chalk4 = __toESM(require("chalk"), 1);
+init_schema_to_json();
+async function promptForParameters(schema, ctx) {
+  if (!schema) {
+    return {};
+  }
+  const jsonSchema = schemaToJSONSchema(schema, { target: "draft-7" });
+  if (!jsonSchema.properties || Object.keys(jsonSchema.properties).length === 0) {
+    return {};
+  }
+  const rl = (0, import_promises3.createInterface)({ input: ctx.stdin, output: ctx.stdout });
+  const params = {};
+  try {
+    for (const [key, prop] of Object.entries(jsonSchema.properties)) {
+      const value = await promptForField(rl, key, prop, jsonSchema.required ?? []);
+      if (value !== void 0) {
+        params[key] = value;
+      }
+    }
+  } finally {
+    rl.close();
+  }
+  const result = schema.safeParse(params);
+  if (!result.success) {
+    const issues = result.error.issues.map((i) => `  ${i.path.join(".")}: ${i.message}`).join("\n");
+    throw new Error(`Invalid parameters:
+${issues}`);
+  }
+  return result.data;
+}
+async function promptForField(rl, key, prop, required) {
+  const isRequired = required.includes(key);
+  const typeHint = formatTypeHint(prop);
+  const defaultHint = prop.default !== void 0 ? import_chalk4.default.dim(` [default: ${JSON.stringify(prop.default)}]`) : "";
+  const requiredMarker = isRequired ? import_chalk4.default.red("*") : "";
+  let prompt = `
+${import_chalk4.default.cyan.bold(key)}${requiredMarker}`;
+  if (prop.description) {
+    prompt += import_chalk4.default.dim(` - ${prop.description}`);
+  }
+  prompt += `
+  ${typeHint}${defaultHint}
+  ${import_chalk4.default.green(">")} `;
+  const answer = await rl.question(prompt);
+  const trimmed = answer.trim();
+  if (!trimmed) {
+    if (prop.default !== void 0) {
+      return void 0;
+    }
+    if (!isRequired) {
+      return void 0;
+    }
+    throw new Error(`Parameter '${key}' is required.`);
+  }
+  return parseValue(trimmed, prop, key);
+}
+function formatTypeHint(prop) {
+  if (prop.enum) {
+    return import_chalk4.default.yellow(`(${prop.enum.join(" | ")})`);
+  }
+  if (prop.type === "array") {
+    const items = prop.items;
+    if (items?.enum) {
+      return import_chalk4.default.yellow(`(${items.enum.join(" | ")})[] comma-separated`);
+    }
+    const itemType = items?.type ?? "any";
+    return import_chalk4.default.yellow(`(${itemType}[]) comma-separated`);
+  }
+  if (prop.type === "object" && prop.properties) {
+    return import_chalk4.default.yellow("(object) enter as JSON");
+  }
+  return import_chalk4.default.yellow(`(${prop.type ?? "any"})`);
+}
+function parseValue(input, prop, key) {
+  const type = prop.type;
+  if (type === "number" || type === "integer") {
+    const num = Number(input);
+    if (Number.isNaN(num)) {
+      throw new Error(`Invalid number for '${key}': ${input}`);
+    }
+    if (type === "integer" && !Number.isInteger(num)) {
+      throw new Error(`Expected integer for '${key}', got: ${input}`);
+    }
+    return num;
+  }
+  if (type === "boolean") {
+    const lower = input.toLowerCase();
+    if (["true", "yes", "1", "y"].includes(lower)) return true;
+    if (["false", "no", "0", "n"].includes(lower)) return false;
+    throw new Error(`Invalid boolean for '${key}': ${input} (use true/false, yes/no, 1/0)`);
+  }
+  if (type === "array") {
+    const items = input.split(",").map((s) => s.trim()).filter(Boolean);
+    const itemType = prop.items?.type;
+    if (itemType === "number" || itemType === "integer") {
+      return items.map((item) => {
+        const num = Number(item);
+        if (Number.isNaN(num)) throw new Error(`Invalid number in '${key}' array: ${item}`);
+        return num;
+      });
+    }
+    if (itemType === "boolean") {
+      return items.map((item) => {
+        const lower = item.toLowerCase();
+        if (["true", "yes", "1", "y"].includes(lower)) return true;
+        if (["false", "no", "0", "n"].includes(lower)) return false;
+        throw new Error(`Invalid boolean in '${key}' array: ${item}`);
+      });
+    }
+    return items;
+  }
+  if (type === "object") {
+    try {
+      return JSON.parse(input);
+    } catch {
+      throw new Error(`Invalid JSON for '${key}': ${input}`);
+    }
+  }
+  return input;
+}
+async function readStdinJson(stdin) {
+  const chunks = [];
+  for await (const chunk of stdin) {
+    if (typeof chunk === "string") {
+      chunks.push(chunk);
+    } else {
+      chunks.push(chunk.toString("utf8"));
+    }
+  }
+  const content = chunks.join("").trim();
+  if (!content) {
+    return {};
+  }
+  try {
+    const parsed = JSON.parse(content);
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+      throw new Error("Stdin must contain a JSON object, not an array or primitive.");
+    }
+    return parsed;
+  } catch (error) {
+    if (error instanceof SyntaxError) {
+      throw new Error(`Invalid JSON from stdin: ${error.message}`);
+    }
+    throw error;
+  }
+}
+
+// src/cli/gadget-command.ts
+async function selectGadget(file, nameOption, cwd) {
+  const gadgets = await loadGadgets([file], cwd);
+  if (gadgets.length === 0) {
+    throw new Error(
+      `No gadgets found in '${file}'.
+Ensure the file exports a Gadget class or instance.`
+    );
+  }
+  if (gadgets.length === 1) {
+    const gadget = gadgets[0];
+    const name = gadget.name ?? gadget.constructor.name;
+    return { gadget, name };
+  }
+  const names = gadgets.map((g) => g.name ?? g.constructor.name);
+  if (!nameOption) {
+    throw new Error(
+      `File '${file}' exports ${gadgets.length} gadgets.
+Use --name to select one:
+` + names.map((n) => `  - ${n}`).join("\n")
+    );
+  }
+  const found = gadgets.find((g) => (g.name ?? g.constructor.name) === nameOption);
+  if (!found) {
+    throw new Error(
+      `Gadget '${nameOption}' not found in '${file}'.
+Available gadgets:
+` + names.map((n) => `  - ${n}`).join("\n")
+    );
+  }
+  return { gadget: found, name: nameOption };
+}
+async function executeGadgetRun(file, options, env) {
+  const cwd = process.cwd();
+  const { gadget, name } = await selectGadget(file, options.name, cwd);
+  env.stderr.write(import_chalk5.default.cyan.bold(`
+\u{1F527} Running gadget: ${name}
+`));
+  let params;
+  if (env.isTTY) {
+    params = await promptForParameters(gadget.parameterSchema, {
+      stdin: env.stdin,
+      stdout: env.stderr
+      // Prompts go to stderr to keep stdout clean
+    });
+  } else {
+    env.stderr.write(import_chalk5.default.dim("Reading parameters from stdin...\n"));
+    const stdinParams = await readStdinJson(env.stdin);
+    if (gadget.parameterSchema) {
+      const result2 = gadget.parameterSchema.safeParse(stdinParams);
+      if (!result2.success) {
+        const issues = result2.error.issues.map((i) => `  ${i.path.join(".")}: ${i.message}`).join("\n");
+        throw new Error(`Invalid parameters:
+${issues}`);
+      }
+      params = result2.data;
+    } else {
+      params = stdinParams;
+    }
+  }
+  env.stderr.write(import_chalk5.default.dim("\nExecuting...\n"));
+  const startTime = Date.now();
+  let result;
+  try {
+    if (gadget.timeoutMs && gadget.timeoutMs > 0) {
+      result = await Promise.race([
+        Promise.resolve(gadget.execute(params)),
+        new Promise(
+          (_, reject) => setTimeout(
+            () => reject(new Error(`Gadget timed out after ${gadget.timeoutMs}ms`)),
+            gadget.timeoutMs
+          )
+        )
+      ]);
+    } else {
+      result = await Promise.resolve(gadget.execute(params));
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`Execution failed: ${message}`);
+  }
+  const elapsed = Date.now() - startTime;
+  env.stderr.write(import_chalk5.default.green(`
+\u2713 Completed in ${elapsed}ms
+
+`));
+  formatOutput(result, options, env.stdout);
+}
+function formatOutput(result, options, stdout) {
+  if (options.raw) {
+    stdout.write(result);
+    if (!result.endsWith("\n")) stdout.write("\n");
+    return;
+  }
+  if (options.json || looksLikeJson(result)) {
+    try {
+      const parsed = JSON.parse(result);
+      stdout.write(JSON.stringify(parsed, null, 2) + "\n");
+      return;
+    } catch {
+    }
+  }
+  stdout.write(result);
+  if (!result.endsWith("\n")) stdout.write("\n");
+}
+function looksLikeJson(str) {
+  const trimmed = str.trim();
+  return trimmed.startsWith("{") && trimmed.endsWith("}") || trimmed.startsWith("[") && trimmed.endsWith("]");
+}
+async function executeGadgetInfo(file, options, env) {
+  const cwd = process.cwd();
+  const { gadget, name } = await selectGadget(file, options.name, cwd);
+  if (options.json) {
+    const info = buildGadgetInfo(gadget, name);
+    env.stdout.write(JSON.stringify(info, null, 2) + "\n");
+    return;
+  }
+  env.stdout.write("\n");
+  env.stdout.write(import_chalk5.default.cyan.bold(`${name}
+`));
+  env.stdout.write(import_chalk5.default.cyan("\u2550".repeat(name.length)) + "\n\n");
+  env.stdout.write(import_chalk5.default.bold("Description:\n"));
+  env.stdout.write(`  ${gadget.description}
+
+`);
+  if (gadget.parameterSchema) {
+    env.stdout.write(import_chalk5.default.bold("Parameters:\n"));
+    const jsonSchema = schemaToJSONSchema(gadget.parameterSchema, { target: "draft-7" });
+    env.stdout.write(formatSchemaAsText(jsonSchema, "  ") + "\n\n");
+  } else {
+    env.stdout.write(import_chalk5.default.dim("No parameters required.\n\n"));
+  }
+  if (gadget.timeoutMs) {
+    env.stdout.write(import_chalk5.default.bold("Timeout:\n"));
+    env.stdout.write(`  ${gadget.timeoutMs}ms
+
+`);
+  }
+  if (gadget.examples && gadget.examples.length > 0) {
+    env.stdout.write(import_chalk5.default.bold("Examples:\n"));
+    for (const example of gadget.examples) {
+      if (example.comment) {
+        env.stdout.write(import_chalk5.default.dim(`  # ${example.comment}
+`));
+      }
+      env.stdout.write(`  Input: ${import_chalk5.default.cyan(JSON.stringify(example.params))}
+`);
+      if (example.output !== void 0) {
+        env.stdout.write(`  Output: ${import_chalk5.default.green(example.output)}
+`);
+      }
+      env.stdout.write("\n");
+    }
+  }
+}
+function buildGadgetInfo(gadget, name) {
+  const info = {
+    name,
+    description: gadget.description
+  };
+  if (gadget.parameterSchema) {
+    info.schema = schemaToJSONSchema(gadget.parameterSchema, { target: "draft-7" });
+  }
+  if (gadget.timeoutMs) {
+    info.timeoutMs = gadget.timeoutMs;
+  }
+  if (gadget.examples && gadget.examples.length > 0) {
+    info.examples = gadget.examples;
+  }
+  return info;
+}
+function formatSchemaAsText(schema, indent = "") {
+  const lines = [];
+  const properties = schema.properties || {};
+  const required = schema.required || [];
+  for (const [key, prop] of Object.entries(properties)) {
+    const type = prop.type;
+    const description = prop.description;
+    const isRequired = required.includes(key);
+    const enumValues = prop.enum;
+    const defaultValue = prop.default;
+    let line = `${indent}${import_chalk5.default.cyan(key)}`;
+    if (isRequired) {
+      line += import_chalk5.default.red("*");
+    }
+    if (type === "array") {
+      const items = prop.items;
+      const itemType = items?.type || "any";
+      line += import_chalk5.default.dim(` (${itemType}[])`);
+    } else if (type === "object" && prop.properties) {
+      line += import_chalk5.default.dim(" (object)");
+    } else {
+      line += import_chalk5.default.dim(` (${type})`);
+    }
+    if (defaultValue !== void 0) {
+      line += import_chalk5.default.dim(` [default: ${JSON.stringify(defaultValue)}]`);
+    }
+    if (description) {
+      line += `: ${description}`;
+    }
+    if (enumValues) {
+      line += import_chalk5.default.yellow(` - one of: ${enumValues.join(", ")}`);
+    }
+    lines.push(line);
+    if (type === "object" && prop.properties) {
+      lines.push(formatSchemaAsText(prop, indent + "  "));
+    }
+  }
+  return lines.join("\n");
+}
+async function executeGadgetValidate(file, env) {
+  const cwd = process.cwd();
+  try {
+    const gadgets = await loadGadgets([file], cwd);
+    if (gadgets.length === 0) {
+      throw new Error(
+        "No gadgets exported from file.\nA valid gadget must have:\n  - execute() method\n  - description property\n  - parameterSchema (optional)"
+      );
+    }
+    const issues = [];
+    for (const gadget of gadgets) {
+      const name = gadget.name ?? gadget.constructor.name;
+      if (!gadget.description) {
+        issues.push(`${name}: Missing 'description' property.`);
+      }
+      if (gadget.parameterSchema) {
+        try {
+          validateGadgetSchema(gadget.parameterSchema, name);
+        } catch (schemaError) {
+          const message = schemaError instanceof Error ? schemaError.message : String(schemaError);
+          issues.push(`${name}: ${message}`);
+        }
+      }
+      if (typeof gadget.execute !== "function") {
+        issues.push(`${name}: Missing 'execute()' method.`);
+      }
+    }
+    if (issues.length > 0) {
+      throw new Error(`Validation issues:
+${issues.map((i) => `  - ${i}`).join("\n")}`);
+    }
+    env.stdout.write(import_chalk5.default.green.bold("\n\u2713 Valid\n\n"));
+    env.stdout.write(import_chalk5.default.bold("Gadgets found:\n"));
+    for (const gadget of gadgets) {
+      const name = gadget.name ?? gadget.constructor.name;
+      const schemaInfo = gadget.parameterSchema ? import_chalk5.default.cyan("(with schema)") : import_chalk5.default.dim("(no schema)");
+      env.stdout.write(`  ${import_chalk5.default.bold(name)} ${schemaInfo}
+`);
+      env.stdout.write(import_chalk5.default.dim(`    ${gadget.description}
+`));
+    }
+    env.stdout.write("\n");
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    env.stdout.write(import_chalk5.default.red.bold(`
+\u2717 Invalid
+
+`));
+    env.stdout.write(`${message}
+
+`);
+    env.setExitCode(1);
+  }
+}
+function registerGadgetCommand(program, env) {
+  const gadgetCmd = program.command("gadget").description("Test and inspect gadgets outside the agent loop.");
+  gadgetCmd.command("run <file>").description("Execute a gadget with interactive prompts or stdin JSON.").option("--name <gadget>", "Select gadget by name (required if file exports multiple)").option("--json", "Format output as pretty-printed JSON").option("--raw", "Output result as raw string without formatting").action(
+    (file, options) => executeAction(() => executeGadgetRun(file, options, env), env)
+  );
+  gadgetCmd.command("info <file>").description("Display gadget description, schema, and examples.").option("--name <gadget>", "Select gadget by name (required if file exports multiple)").option("--json", "Output as JSON instead of formatted text").action(
+    (file, options) => executeAction(() => executeGadgetInfo(file, options, env), env)
+  );
+  gadgetCmd.command("validate <file>").description("Check if file exports valid gadget(s).").action(
+    (file) => executeAction(() => executeGadgetValidate(file, env), env)
+  );
+}
+
+// src/cli/models-command.ts
+var import_chalk6 = __toESM(require("chalk"), 1);
 init_model_shortcuts();
 async function handleModelsCommand(options, env) {
   const client = env.createClient();
@@ -7617,13 +8027,13 @@ function renderTable(models, verbose, stream2) {
     }
     grouped.get(provider).push(model);
   }
-  stream2.write(import_chalk4.default.bold.cyan("\nAvailable Models\n"));
-  stream2.write(import_chalk4.default.cyan("=".repeat(80)) + "\n\n");
+  stream2.write(import_chalk6.default.bold.cyan("\nAvailable Models\n"));
+  stream2.write(import_chalk6.default.cyan("=".repeat(80)) + "\n\n");
   const providers = Array.from(grouped.keys()).sort();
   for (const provider of providers) {
     const providerModels = grouped.get(provider);
     const providerName = provider.charAt(0).toUpperCase() + provider.slice(1);
-    stream2.write(import_chalk4.default.bold.yellow(`${providerName} Models
+    stream2.write(import_chalk6.default.bold.yellow(`${providerName} Models
 `));
     if (verbose) {
       renderVerboseTable(providerModels, stream2);
@@ -7632,11 +8042,11 @@ function renderTable(models, verbose, stream2) {
     }
     stream2.write("\n");
   }
-  stream2.write(import_chalk4.default.bold.magenta("Model Shortcuts\n"));
-  stream2.write(import_chalk4.default.dim("\u2500".repeat(80)) + "\n");
+  stream2.write(import_chalk6.default.bold.magenta("Model Shortcuts\n"));
+  stream2.write(import_chalk6.default.dim("\u2500".repeat(80)) + "\n");
   const shortcuts = Object.entries(MODEL_ALIASES).sort((a, b) => a[0].localeCompare(b[0]));
   for (const [shortcut, fullName] of shortcuts) {
-    stream2.write(import_chalk4.default.cyan(`  ${shortcut.padEnd(15)}`) + import_chalk4.default.dim(" \u2192 ") + import_chalk4.default.white(fullName) + "\n");
+    stream2.write(import_chalk6.default.cyan(`  ${shortcut.padEnd(15)}`) + import_chalk6.default.dim(" \u2192 ") + import_chalk6.default.white(fullName) + "\n");
   }
   stream2.write("\n");
 }
@@ -7646,45 +8056,45 @@ function renderCompactTable(models, stream2) {
   const contextWidth = 13;
   const inputWidth = 10;
   const outputWidth = 10;
-  stream2.write(import_chalk4.default.dim("\u2500".repeat(idWidth + nameWidth + contextWidth + inputWidth + outputWidth + 8)) + "\n");
+  stream2.write(import_chalk6.default.dim("\u2500".repeat(idWidth + nameWidth + contextWidth + inputWidth + outputWidth + 8)) + "\n");
   stream2.write(
-    import_chalk4.default.bold(
+    import_chalk6.default.bold(
       "Model ID".padEnd(idWidth) + "  " + "Display Name".padEnd(nameWidth) + "  " + "Context".padEnd(contextWidth) + "  " + "Input".padEnd(inputWidth) + "  " + "Output".padEnd(outputWidth)
     ) + "\n"
   );
-  stream2.write(import_chalk4.default.dim("\u2500".repeat(idWidth + nameWidth + contextWidth + inputWidth + outputWidth + 8)) + "\n");
+  stream2.write(import_chalk6.default.dim("\u2500".repeat(idWidth + nameWidth + contextWidth + inputWidth + outputWidth + 8)) + "\n");
   for (const model of models) {
     const contextFormatted = formatTokens2(model.contextWindow);
     const inputPrice = `$${model.pricing.input.toFixed(2)}`;
     const outputPrice = `$${model.pricing.output.toFixed(2)}`;
     stream2.write(
-      import_chalk4.default.green(model.modelId.padEnd(idWidth)) + "  " + import_chalk4.default.white(model.displayName.padEnd(nameWidth)) + "  " + import_chalk4.default.yellow(contextFormatted.padEnd(contextWidth)) + "  " + import_chalk4.default.cyan(inputPrice.padEnd(inputWidth)) + "  " + import_chalk4.default.cyan(outputPrice.padEnd(outputWidth)) + "\n"
+      import_chalk6.default.green(model.modelId.padEnd(idWidth)) + "  " + import_chalk6.default.white(model.displayName.padEnd(nameWidth)) + "  " + import_chalk6.default.yellow(contextFormatted.padEnd(contextWidth)) + "  " + import_chalk6.default.cyan(inputPrice.padEnd(inputWidth)) + "  " + import_chalk6.default.cyan(outputPrice.padEnd(outputWidth)) + "\n"
     );
   }
-  stream2.write(import_chalk4.default.dim("\u2500".repeat(idWidth + nameWidth + contextWidth + inputWidth + outputWidth + 8)) + "\n");
-  stream2.write(import_chalk4.default.dim(`  * Prices are per 1M tokens
+  stream2.write(import_chalk6.default.dim("\u2500".repeat(idWidth + nameWidth + contextWidth + inputWidth + outputWidth + 8)) + "\n");
+  stream2.write(import_chalk6.default.dim(`  * Prices are per 1M tokens
 `));
 }
 function renderVerboseTable(models, stream2) {
   for (const model of models) {
-    stream2.write(import_chalk4.default.bold.green(`
+    stream2.write(import_chalk6.default.bold.green(`
   ${model.modelId}
 `));
-    stream2.write(import_chalk4.default.dim("  " + "\u2500".repeat(60)) + "\n");
-    stream2.write(`  ${import_chalk4.default.dim("Name:")}         ${import_chalk4.default.white(model.displayName)}
+    stream2.write(import_chalk6.default.dim("  " + "\u2500".repeat(60)) + "\n");
+    stream2.write(`  ${import_chalk6.default.dim("Name:")}         ${import_chalk6.default.white(model.displayName)}
 `);
-    stream2.write(`  ${import_chalk4.default.dim("Context:")}      ${import_chalk4.default.yellow(formatTokens2(model.contextWindow))}
+    stream2.write(`  ${import_chalk6.default.dim("Context:")}      ${import_chalk6.default.yellow(formatTokens2(model.contextWindow))}
 `);
-    stream2.write(`  ${import_chalk4.default.dim("Max Output:")}   ${import_chalk4.default.yellow(formatTokens2(model.maxOutputTokens))}
+    stream2.write(`  ${import_chalk6.default.dim("Max Output:")}   ${import_chalk6.default.yellow(formatTokens2(model.maxOutputTokens))}
 `);
-    stream2.write(`  ${import_chalk4.default.dim("Pricing:")}      ${import_chalk4.default.cyan(`$${model.pricing.input.toFixed(2)} input`)} ${import_chalk4.default.dim("/")} ${import_chalk4.default.cyan(`$${model.pricing.output.toFixed(2)} output`)} ${import_chalk4.default.dim("(per 1M tokens)")}
+    stream2.write(`  ${import_chalk6.default.dim("Pricing:")}      ${import_chalk6.default.cyan(`$${model.pricing.input.toFixed(2)} input`)} ${import_chalk6.default.dim("/")} ${import_chalk6.default.cyan(`$${model.pricing.output.toFixed(2)} output`)} ${import_chalk6.default.dim("(per 1M tokens)")}
 `);
     if (model.pricing.cachedInput !== void 0) {
-      stream2.write(`  ${import_chalk4.default.dim("Cached Input:")} ${import_chalk4.default.cyan(`$${model.pricing.cachedInput.toFixed(2)} per 1M tokens`)}
+      stream2.write(`  ${import_chalk6.default.dim("Cached Input:")} ${import_chalk6.default.cyan(`$${model.pricing.cachedInput.toFixed(2)} per 1M tokens`)}
 `);
     }
     if (model.knowledgeCutoff) {
-      stream2.write(`  ${import_chalk4.default.dim("Knowledge:")}    ${model.knowledgeCutoff}
+      stream2.write(`  ${import_chalk6.default.dim("Knowledge:")}    ${model.knowledgeCutoff}
 `);
     }
     const features = [];
@@ -7695,20 +8105,20 @@ function renderVerboseTable(models, stream2) {
     if (model.features.structuredOutputs) features.push("structured-outputs");
     if (model.features.fineTuning) features.push("fine-tuning");
     if (features.length > 0) {
-      stream2.write(`  ${import_chalk4.default.dim("Features:")}     ${import_chalk4.default.blue(features.join(", "))}
+      stream2.write(`  ${import_chalk6.default.dim("Features:")}     ${import_chalk6.default.blue(features.join(", "))}
 `);
     }
     if (model.metadata) {
       if (model.metadata.family) {
-        stream2.write(`  ${import_chalk4.default.dim("Family:")}       ${model.metadata.family}
+        stream2.write(`  ${import_chalk6.default.dim("Family:")}       ${model.metadata.family}
 `);
       }
       if (model.metadata.releaseDate) {
-        stream2.write(`  ${import_chalk4.default.dim("Released:")}     ${model.metadata.releaseDate}
+        stream2.write(`  ${import_chalk6.default.dim("Released:")}     ${model.metadata.releaseDate}
 `);
       }
       if (model.metadata.notes) {
-        stream2.write(`  ${import_chalk4.default.dim("Notes:")}        ${import_chalk4.default.italic(model.metadata.notes)}
+        stream2.write(`  ${import_chalk6.default.dim("Notes:")}        ${import_chalk6.default.italic(model.metadata.notes)}
 `);
       }
     }
@@ -7758,7 +8168,7 @@ function registerModelsCommand(program, env) {
 
 // src/cli/environment.ts
 var import_node_readline = __toESM(require("readline"), 1);
-var import_chalk5 = __toESM(require("chalk"), 1);
+var import_chalk7 = __toESM(require("chalk"), 1);
 init_client();
 init_logger();
 var LOG_LEVEL_MAP = {
@@ -7807,14 +8217,14 @@ function createPromptFunction(stdin, stdout) {
         output: stdout
       });
       stdout.write("\n");
-      stdout.write(`${import_chalk5.default.cyan("\u2500".repeat(60))}
+      stdout.write(`${import_chalk7.default.cyan("\u2500".repeat(60))}
 `);
-      stdout.write(import_chalk5.default.cyan.bold("\u{1F916} Agent asks:\n"));
+      stdout.write(import_chalk7.default.cyan.bold("\u{1F916} Agent asks:\n"));
       stdout.write(`${question}
 `);
-      stdout.write(`${import_chalk5.default.cyan("\u2500".repeat(60))}
+      stdout.write(`${import_chalk7.default.cyan("\u2500".repeat(60))}
 `);
-      rl.question(import_chalk5.default.green.bold("You: "), (answer) => {
+      rl.question(import_chalk7.default.green.bold("You: "), (answer) => {
         rl.close();
         resolve(answer);
       });
@@ -7891,12 +8301,12 @@ function registerCustomCommand(program, name, config, env) {
 function parseLogLevel2(value) {
   const normalized = value.toLowerCase();
   if (!LOG_LEVELS.includes(normalized)) {
-    throw new import_commander3.InvalidArgumentError(`Log level must be one of: ${LOG_LEVELS.join(", ")}`);
+    throw new import_commander2.InvalidArgumentError(`Log level must be one of: ${LOG_LEVELS.join(", ")}`);
   }
   return normalized;
 }
 function createProgram(env, config) {
-  const program = new import_commander3.Command();
+  const program = new import_commander2.Command();
   program.name(CLI_NAME).description(CLI_DESCRIPTION).version(package_default.version).option(OPTION_FLAGS.logLevel, OPTION_DESCRIPTIONS.logLevel, parseLogLevel2).option(OPTION_FLAGS.logFile, OPTION_DESCRIPTIONS.logFile).option(OPTION_FLAGS.logReset, OPTION_DESCRIPTIONS.logReset).configureOutput({
     writeOut: (str) => env.stdout.write(str),
     writeErr: (str) => env.stderr.write(str)
@@ -7904,6 +8314,7 @@ function createProgram(env, config) {
   registerCompleteCommand(program, env, config?.complete);
   registerAgentCommand(program, env, config?.agent);
   registerModelsCommand(program, env);
+  registerGadgetCommand(program, env);
   if (config) {
     const customNames = getCustomCommandNames(config);
     for (const name of customNames) {
@@ -7917,7 +8328,7 @@ async function runCLI(overrides = {}) {
   const opts = "env" in overrides || "config" in overrides ? overrides : { env: overrides };
   const config = opts.config !== void 0 ? opts.config : loadConfig();
   const envOverrides = opts.env ?? {};
-  const preParser = new import_commander3.Command();
+  const preParser = new import_commander2.Command();
   preParser.option(OPTION_FLAGS.logLevel, OPTION_DESCRIPTIONS.logLevel, parseLogLevel2).option(OPTION_FLAGS.logFile, OPTION_DESCRIPTIONS.logFile).option(OPTION_FLAGS.logReset, OPTION_DESCRIPTIONS.logReset).allowUnknownOption().allowExcessArguments().helpOption(false);
   preParser.parse(process.argv);
   const globalOpts = preParser.opts();