llmist 0.6.2 → 0.8.0

package/dist/cli.js

@@ -22,7 +22,7 @@ import {
   init_model_shortcuts,
   init_registry,
   resolveModel
-} from "./chunk-DVK6ZQOV.js";
+} from "./chunk-62M4TDAK.js";
 
 // src/cli/constants.ts
 var CLI_NAME = "llmist";
@@ -47,7 +47,8 @@ var OPTION_FLAGS = {
   logFile: "--log-file <path>",
   logReset: "--log-reset",
   noBuiltins: "--no-builtins",
-  noBuiltinInteraction: "--no-builtin-interaction"
+  noBuiltinInteraction: "--no-builtin-interaction",
+  quiet: "-q, --quiet"
 };
 var OPTION_DESCRIPTIONS = {
   model: "Model identifier, e.g. openai:gpt-5-nano or anthropic:claude-sonnet-4-5.",
@@ -61,7 +62,8 @@ var OPTION_DESCRIPTIONS = {
   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.",
   noBuiltins: "Disable built-in gadgets (AskUser, TellUser).",
-  noBuiltinInteraction: "Disable interactive gadgets (AskUser) while keeping TellUser."
+  noBuiltinInteraction: "Disable interactive gadgets (AskUser) while keeping TellUser.",
+  quiet: "Suppress all output except content (text and TellUser messages)."
 };
 var SUMMARY_PREFIX = "[llmist]";
 
@@ -71,7 +73,7 @@ import { Command, InvalidArgumentError as InvalidArgumentError3 } from "commande
 // package.json
 var package_default = {
   name: "llmist",
-  version: "0.6.1",
+  version: "0.7.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",
@@ -155,6 +157,7 @@ var package_default = {
     "@google/genai": "^1.27.0",
     chalk: "^5.6.2",
     commander: "^12.1.0",
+    eta: "^4.4.1",
     "js-toml": "^1.0.2",
     "js-yaml": "^4.1.0",
     marked: "^15.0.12",
@@ -219,7 +222,7 @@ var tellUser = createGadget({
   name: "TellUser",
   description: "Tell the user something important. Set done=true when your work is complete and you want to end the conversation.",
   schema: z.object({
-    message: z.string().describe("The message to display to the user in Markdown"),
+    message: z.string().optional().describe("The message to display to the user in Markdown"),
     done: z.boolean().default(false).describe("Set to true to end the conversation, false to continue"),
     type: z.enum(["info", "success", "warning", "error"]).default("info").describe("Message type: info, success, warning, or error")
   }),
@@ -239,9 +242,20 @@ var tellUser = createGadget({
         done: false,
         type: "warning"
       }
+    },
+    {
+      comment: "Share detailed analysis with bullet points (use heredoc for multiline)",
+      params: {
+        message: "Here's what I found in the codebase:\n\n1. **Main entry point**: `src/index.ts` exports all public APIs\n2. **Core logic**: Located in `src/core/` with 5 modules\n3. **Tests**: Good coverage in `src/__tests__/`\n\nI'll continue exploring the core modules.",
+        done: false,
+        type: "info"
+      }
     }
   ],
   execute: ({ message, done, type }) => {
+    if (!message || message.trim() === "") {
+      return "\u26A0\uFE0F  TellUser was called without a message. Please provide content in the 'message' field.";
+    }
     const prefixes = {
       info: "\u2139\uFE0F  ",
       success: "\u2705 ",
@@ -263,12 +277,19 @@ import fs from "node:fs";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 var PATH_PREFIXES = [".", "/", "~"];
+function isGadgetLike(value) {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  const obj = value;
+  return typeof obj.execute === "function" && typeof obj.description === "string" && ("parameterSchema" in obj || "schema" in obj);
+}
 function isGadgetConstructor(value) {
   if (typeof value !== "function") {
     return false;
   }
   const prototype = value.prototype;
-  return Boolean(prototype) && prototype instanceof BaseGadget;
+  return Boolean(prototype) && (prototype instanceof BaseGadget || isGadgetLike(prototype));
 }
 function expandHomePath(input) {
   if (!input.startsWith("~")) {
@@ -305,7 +326,7 @@ function extractGadgetsFromModule(moduleExports) {
       return;
     }
     visited.add(value);
-    if (value instanceof BaseGadget) {
+    if (value instanceof BaseGadget || isGadgetLike(value)) {
       results.push(value);
       return;
     }
@@ -430,8 +451,14 @@ function renderSummary(metadata) {
     parts.push(chalk.magenta(metadata.model));
   }
   if (metadata.usage) {
-    const { inputTokens, outputTokens } = metadata.usage;
+    const { inputTokens, outputTokens, cachedInputTokens, cacheCreationInputTokens } = metadata.usage;
     parts.push(chalk.dim("\u2191") + chalk.yellow(` ${formatTokens(inputTokens)}`));
+    if (cachedInputTokens && cachedInputTokens > 0) {
+      parts.push(chalk.dim("\u27F3") + chalk.blue(` ${formatTokens(cachedInputTokens)}`));
+    }
+    if (cacheCreationInputTokens && cacheCreationInputTokens > 0) {
+      parts.push(chalk.dim("\u270E") + chalk.magenta(` ${formatTokens(cacheCreationInputTokens)}`));
+    }
     parts.push(chalk.dim("\u2193") + chalk.green(` ${formatTokens(outputTokens)}`));
   }
   if (metadata.elapsedSeconds !== void 0 && metadata.elapsedSeconds > 0) {
@@ -523,53 +550,6 @@ ${rendered}`;
 }
 
 // src/cli/utils.ts
-var RARE_EMOJI = [
-  "\u{1F531}",
-  "\u2697\uFE0F",
-  "\u{1F9FF}",
-  "\u{1F530}",
-  "\u269B\uFE0F",
-  "\u{1F3FA}",
-  "\u{1F9EB}",
-  "\u{1F52C}",
-  "\u2695\uFE0F",
-  "\u{1F5DD}\uFE0F",
-  "\u2696\uFE0F",
-  "\u{1F52E}",
-  "\u{1FAAC}",
-  "\u{1F9EC}",
-  "\u2699\uFE0F",
-  "\u{1F529}",
-  "\u{1FA9B}",
-  "\u26CF\uFE0F",
-  "\u{1FA83}",
-  "\u{1F3F9}",
-  "\u{1F6E1}\uFE0F",
-  "\u2694\uFE0F",
-  "\u{1F5E1}\uFE0F",
-  "\u{1FA93}",
-  "\u{1F5C3}\uFE0F",
-  "\u{1F4DC}",
-  "\u{1F4EF}",
-  "\u{1F3B4}",
-  "\u{1F004}",
-  "\u{1F3B2}"
-];
-function generateMarkers() {
-  const pick = (count) => {
-    const result = [];
-    const pool = [...RARE_EMOJI];
-    for (let i = 0; i < count && pool.length > 0; i++) {
-      const idx = Math.floor(Math.random() * pool.length);
-      result.push(pool.splice(idx, 1)[0]);
-    }
-    return result.join("");
-  };
-  return {
-    startPrefix: pick(5),
-    endPrefix: pick(5)
-  };
-}
 function createNumericParser({
   label,
   integer = false,
@@ -647,6 +627,9 @@ var StreamProgress = class {
   callOutputTokensEstimated = true;
   callOutputChars = 0;
   isStreaming = false;
+  // Cache token tracking for live cost estimation during streaming
+  callCachedInputTokens = 0;
+  callCacheCreationInputTokens = 0;
   // Cumulative stats (cumulative mode)
   totalStartTime = Date.now();
   totalTokens = 0;
@@ -672,11 +655,13 @@ var StreamProgress = class {
     this.callOutputTokensEstimated = true;
     this.callOutputChars = 0;
     this.isStreaming = false;
+    this.callCachedInputTokens = 0;
+    this.callCacheCreationInputTokens = 0;
     this.start();
   }
   /**
    * Ends the current LLM call. Updates cumulative stats and switches to cumulative mode.
-   * @param usage - Final token usage from the call
+   * @param usage - Final token usage from the call (including cached tokens if available)
    */
   endCall(usage) {
     this.iterations++;
@@ -688,7 +673,9 @@ var StreamProgress = class {
           const cost = this.modelRegistry.estimateCost(
             modelName,
             usage.inputTokens,
-            usage.outputTokens
+            usage.outputTokens,
+            usage.cachedInputTokens ?? 0,
+            usage.cacheCreationInputTokens ?? 0
           );
           if (cost) {
             this.totalCost += cost.totalCost;
@@ -728,6 +715,16 @@ var StreamProgress = class {
     this.callOutputTokens = tokens;
     this.callOutputTokensEstimated = estimated;
   }
+  /**
+   * Sets cached token counts for the current call (from stream metadata).
+   * Used for live cost estimation during streaming.
+   * @param cachedInputTokens - Number of tokens read from cache (cheaper)
+   * @param cacheCreationInputTokens - Number of tokens written to cache (more expensive)
+   */
+  setCachedTokens(cachedInputTokens, cacheCreationInputTokens) {
+    this.callCachedInputTokens = cachedInputTokens;
+    this.callCacheCreationInputTokens = cacheCreationInputTokens;
+  }
   /**
    * Get total elapsed time in seconds since the first call started.
    * @returns Elapsed time in seconds with 1 decimal place
@@ -792,11 +789,32 @@ var StreamProgress = class {
       parts.push(chalk2.dim("\u2193") + chalk2.green(` ${prefix}${formatTokens(outTokens)}`));
     }
     parts.push(chalk2.dim(`${elapsed}s`));
-    if (this.totalCost > 0) {
-      parts.push(chalk2.cyan(`$${formatCost(this.totalCost)}`));
+    const callCost = this.calculateCurrentCallCost(outTokens);
+    if (callCost > 0) {
+      parts.push(chalk2.cyan(`$${formatCost(callCost)}`));
     }
     this.target.write(`\r${parts.join(chalk2.dim(" | "))} ${chalk2.cyan(spinner)}`);
   }
+  /**
+   * Calculates live cost estimate for the current streaming call.
+   * Uses current input/output tokens and cached token counts.
+   */
+  calculateCurrentCallCost(outputTokens) {
+    if (!this.modelRegistry || !this.model) return 0;
+    try {
+      const modelName = this.model.includes(":") ? this.model.split(":")[1] : this.model;
+      const cost = this.modelRegistry.estimateCost(
+        modelName,
+        this.callInputTokens,
+        outputTokens,
+        this.callCachedInputTokens,
+        this.callCacheCreationInputTokens
+      );
+      return cost?.totalCost ?? 0;
+    } catch {
+      return 0;
+    }
+  }
   renderCumulativeMode(spinner) {
     const elapsed = ((Date.now() - this.totalStartTime) / 1e3).toFixed(1);
     const parts = [];
@@ -945,7 +963,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);
 }
 function addAgentOptions(cmd, defaults) {
   const gadgetAccumulator = (value, previous = []) => [
@@ -974,7 +992,7 @@ function addAgentOptions(cmd, defaults) {
     OPTION_FLAGS.noBuiltinInteraction,
     OPTION_DESCRIPTIONS.noBuiltinInteraction,
     defaults?.["builtin-interaction"] !== false
-  );
+  ).option(OPTION_FLAGS.quiet, OPTION_DESCRIPTIONS.quiet, defaults?.quiet);
 }
 function configToCompleteOptions(config) {
   const result = {};
@@ -982,6 +1000,7 @@ function configToCompleteOptions(config) {
   if (config.system !== void 0) result.system = config.system;
   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;
   return result;
 }
 function configToAgentOptions(config) {
@@ -995,6 +1014,11 @@ function configToAgentOptions(config) {
   if (config.builtins !== void 0) result.builtins = config.builtins;
   if (config["builtin-interaction"] !== void 0)
     result.builtinInteraction = config["builtin-interaction"];
+  if (config["gadget-start-prefix"] !== void 0)
+    result.gadgetStartPrefix = config["gadget-start-prefix"];
+  if (config["gadget-end-prefix"] !== void 0)
+    result.gadgetEndPrefix = config["gadget-end-prefix"];
+  if (config.quiet !== void 0) result.quiet = config.quiet;
   return result;
 }
 
@@ -1040,9 +1064,10 @@ async function executeAgent(promptArg, options, env) {
   const prompt = await resolvePrompt(promptArg, env);
   const client = env.createClient();
   const registry = new GadgetRegistry();
+  const stdinIsInteractive = isInteractive(env.stdin);
   if (options.builtins !== false) {
     for (const gadget of builtinGadgets) {
-      if (options.builtinInteraction === false && gadget.name === "AskUser") {
+      if (gadget.name === "AskUser" && (options.builtinInteraction === false || !stdinIsInteractive)) {
         continue;
       }
       registry.registerByClass(gadget);
@@ -1100,6 +1125,10 @@ async function executeAgent(promptArg, options, env) {
           if (context.usage.outputTokens) {
             progress.setOutputTokens(context.usage.outputTokens, false);
           }
+          progress.setCachedTokens(
+            context.usage.cachedInputTokens ?? 0,
+            context.usage.cacheCreationInputTokens ?? 0
+          );
         }
       },
       // onLLMCallComplete: Finalize metrics after each LLM call
@@ -1118,11 +1147,13 @@ async function executeAgent(promptArg, options, env) {
         let callCost;
         if (context.usage && client.modelRegistry) {
           try {
-            const modelName = options.model.includes(":") ? options.model.split(":")[1] : options.model;
+            const modelName = context.options.model.includes(":") ? context.options.model.split(":")[1] : context.options.model;
             const costResult = client.modelRegistry.estimateCost(
               modelName,
               context.usage.inputTokens,
-              context.usage.outputTokens
+              context.usage.outputTokens,
+              context.usage.cachedInputTokens ?? 0,
+              context.usage.cacheCreationInputTokens ?? 0
             );
             if (costResult) callCost = costResult.totalCost;
           } catch {
@@ -1130,7 +1161,7 @@ async function executeAgent(promptArg, options, env) {
         }
         const callElapsed = progress.getCallElapsedSeconds();
         progress.endCall(context.usage);
-        if (stderrTTY) {
+        if (!options.quiet) {
           const summary = renderSummary({
             iterations: context.iteration + 1,
             model: options.model,
@@ -1209,9 +1240,27 @@ Command rejected by user with message: "${response}"`
     builder.withGadgets(...gadgets);
   }
   builder.withParameterFormat(options.parameterFormat);
-  const markers = generateMarkers();
-  builder.withGadgetStartPrefix(markers.startPrefix);
-  builder.withGadgetEndPrefix(markers.endPrefix);
+  if (options.gadgetStartPrefix) {
+    builder.withGadgetStartPrefix(options.gadgetStartPrefix);
+  }
+  if (options.gadgetEndPrefix) {
+    builder.withGadgetEndPrefix(options.gadgetEndPrefix);
+  }
+  builder.withSyntheticGadgetCall(
+    "TellUser",
+    {
+      message: "\u{1F44B} Hello! I'm ready to help.\n\nHere's what I can do:\n- Analyze your codebase\n- Execute commands\n- Answer questions\n\nWhat would you like me to work on?",
+      done: false,
+      type: "info"
+    },
+    "\u2139\uFE0F  \u{1F44B} Hello! I'm ready to help.\n\nHere's what I can do:\n- Analyze your codebase\n- Execute commands\n- Answer questions\n\nWhat would you like me to work on?"
+  );
+  builder.withTextOnlyHandler("acknowledge");
+  builder.withTextWithGadgetsHandler({
+    gadgetName: "TellUser",
+    parameterMapping: (text) => ({ message: text, done: false, type: "info" }),
+    resultMapping: (text) => `\u2139\uFE0F  ${text}`
+  });
   const agent = builder.ask(prompt);
   for await (const event of agent.run()) {
     if (event.type === "text") {
@@ -1219,7 +1268,14 @@ Command rejected by user with message: "${response}"`
       printer.write(event.content);
     } else if (event.type === "gadget_result") {
       progress.pause();
-      if (stderrTTY) {
+      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}
+`);
+        }
+      } else {
         const tokenCount = await countGadgetOutputTokens(event.result.result);
         env.stderr.write(`${formatGadgetSummary({ ...event.result, tokenCount })}
 `);
@@ -1228,7 +1284,7 @@ Command rejected by user with message: "${response}"`
   }
   progress.complete();
   printer.ensureNewline();
-  if (stderrTTY && iterations > 1) {
+  if (!options.quiet && iterations > 1) {
     env.stderr.write(`${chalk3.dim("\u2500".repeat(40))}
 `);
     const summary = renderOverallSummary({
@@ -1301,7 +1357,7 @@ async function executeComplete(promptArg, options, env) {
   progress.endCall(usage);
   progress.complete();
   printer.ensureNewline();
-  if (stderrTTY) {
+  if (stderrTTY && !options.quiet) {
     const summary = renderSummary({ finishReason, usage, cost: progress.getTotalCost() });
     if (summary) {
       env.stderr.write(`${summary}
@@ -1322,9 +1378,102 @@ import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { load as parseToml } from "js-toml";
+
+// src/cli/templates.ts
+import { Eta } from "eta";
+var TemplateError = class extends Error {
+  constructor(message, promptName, configPath) {
+    super(promptName ? `[prompts.${promptName}]: ${message}` : message);
+    this.promptName = promptName;
+    this.configPath = configPath;
+    this.name = "TemplateError";
+  }
+};
+function createTemplateEngine(prompts, configPath) {
+  const eta = new Eta({
+    views: "/",
+    // Required but we use named templates
+    autoEscape: false,
+    // Don't escape - these are prompts, not HTML
+    autoTrim: false
+    // Preserve whitespace in prompts
+  });
+  for (const [name, template] of Object.entries(prompts)) {
+    try {
+      eta.loadTemplate(`@${name}`, template);
+    } catch (error) {
+      throw new TemplateError(
+        error instanceof Error ? error.message : String(error),
+        name,
+        configPath
+      );
+    }
+  }
+  return eta;
+}
+function resolveTemplate(eta, template, context = {}, configPath) {
+  try {
+    const fullContext = {
+      ...context,
+      env: process.env
+    };
+    return eta.renderString(template, fullContext);
+  } catch (error) {
+    throw new TemplateError(
+      error instanceof Error ? error.message : String(error),
+      void 0,
+      configPath
+    );
+  }
+}
+function validatePrompts(prompts, configPath) {
+  const eta = createTemplateEngine(prompts, configPath);
+  for (const [name, template] of Object.entries(prompts)) {
+    try {
+      eta.renderString(template, { env: {} });
+    } catch (error) {
+      throw new TemplateError(
+        error instanceof Error ? error.message : String(error),
+        name,
+        configPath
+      );
+    }
+  }
+}
+function validateEnvVars(template, promptName, configPath) {
+  const envVarPattern = /<%=\s*it\.env\.(\w+)\s*%>/g;
+  const matches = template.matchAll(envVarPattern);
+  for (const match of matches) {
+    const varName = match[1];
+    if (process.env[varName] === void 0) {
+      throw new TemplateError(
+        `Environment variable '${varName}' is not set`,
+        promptName,
+        configPath
+      );
+    }
+  }
+}
+function hasTemplateSyntax(str) {
+  return str.includes("<%");
+}
+
+// src/cli/config.ts
 var GLOBAL_CONFIG_KEYS = /* @__PURE__ */ new Set(["log-level", "log-file", "log-reset"]);
 var VALID_LOG_LEVELS = ["silly", "trace", "debug", "info", "warn", "error", "fatal"];
-var COMPLETE_CONFIG_KEYS = /* @__PURE__ */ new Set(["model", "system", "temperature", "max-tokens"]);
+var COMPLETE_CONFIG_KEYS = /* @__PURE__ */ new Set([
+  "model",
+  "system",
+  "temperature",
+  "max-tokens",
+  "quiet",
+  "inherits",
+  "log-level",
+  "log-file",
+  "log-reset",
+  "type"
+  // Allowed for inheritance compatibility, ignored for built-in commands
+]);
 var AGENT_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "model",
   "system",
@@ -1333,16 +1482,22 @@ var AGENT_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "gadget",
   "parameter-format",
   "builtins",
-  "builtin-interaction"
+  "builtin-interaction",
+  "gadget-start-prefix",
+  "gadget-end-prefix",
+  "quiet",
+  "inherits",
+  "log-level",
+  "log-file",
+  "log-reset",
+  "type"
+  // Allowed for inheritance compatibility, ignored for built-in commands
 ]);
 var CUSTOM_CONFIG_KEYS = /* @__PURE__ */ new Set([
   ...COMPLETE_CONFIG_KEYS,
   ...AGENT_CONFIG_KEYS,
   "type",
-  "description",
-  "log-level",
-  "log-file",
-  "log-reset"
+  "description"
 ]);
 var VALID_PARAMETER_FORMATS = ["json", "yaml", "toml", "auto"];
 function getConfigPath() {
@@ -1393,6 +1548,39 @@ function validateStringArray(value, key, section) {
   }
   return value;
 }
+function validateInherits(value, section) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    for (let i = 0; i < value.length; i++) {
+      if (typeof value[i] !== "string") {
+        throw new ConfigError(`[${section}].inherits[${i}] must be a string`);
+      }
+    }
+    return value;
+  }
+  throw new ConfigError(`[${section}].inherits must be a string or array of strings`);
+}
+function validateLoggingConfig(raw, section) {
+  const result = {};
+  if ("log-level" in raw) {
+    const level = validateString(raw["log-level"], "log-level", section);
+    if (!VALID_LOG_LEVELS.includes(level)) {
+      throw new ConfigError(
+        `[${section}].log-level must be one of: ${VALID_LOG_LEVELS.join(", ")}`
+      );
+    }
+    result["log-level"] = level;
+  }
+  if ("log-file" in raw) {
+    result["log-file"] = validateString(raw["log-file"], "log-file", section);
+  }
+  if ("log-reset" in raw) {
+    result["log-reset"] = validateBoolean(raw["log-reset"], "log-reset", section);
+  }
+  return result;
+}
 function validateBaseConfig(raw, section) {
   const result = {};
   if ("model" in raw) {
@@ -1407,6 +1595,9 @@ function validateBaseConfig(raw, section) {
       max: 2
     });
   }
+  if ("inherits" in raw) {
+    result.inherits = validateInherits(raw.inherits, section);
+  }
   return result;
 }
 function validateGlobalConfig(raw, section) {
@@ -1419,23 +1610,7 @@ function validateGlobalConfig(raw, section) {
       throw new ConfigError(`[${section}].${key} is not a valid option`);
     }
   }
-  const result = {};
-  if ("log-level" in rawObj) {
-    const level = validateString(rawObj["log-level"], "log-level", section);
-    if (!VALID_LOG_LEVELS.includes(level)) {
-      throw new ConfigError(
-        `[${section}].log-level must be one of: ${VALID_LOG_LEVELS.join(", ")}`
-      );
-    }
-    result["log-level"] = level;
-  }
-  if ("log-file" in rawObj) {
-    result["log-file"] = validateString(rawObj["log-file"], "log-file", section);
-  }
-  if ("log-reset" in rawObj) {
-    result["log-reset"] = validateBoolean(rawObj["log-reset"], "log-reset", section);
-  }
-  return result;
+  return validateLoggingConfig(rawObj, section);
 }
 function validateCompleteConfig(raw, section) {
   if (typeof raw !== "object" || raw === null) {
@@ -1447,13 +1622,19 @@ function validateCompleteConfig(raw, section) {
       throw new ConfigError(`[${section}].${key} is not a valid option`);
     }
   }
-  const result = { ...validateBaseConfig(rawObj, section) };
+  const result = {
+    ...validateBaseConfig(rawObj, section),
+    ...validateLoggingConfig(rawObj, section)
+  };
   if ("max-tokens" in rawObj) {
     result["max-tokens"] = validateNumber(rawObj["max-tokens"], "max-tokens", section, {
       integer: true,
       min: 1
     });
   }
+  if ("quiet" in rawObj) {
+    result.quiet = validateBoolean(rawObj.quiet, "quiet", section);
+  }
   return result;
 }
 function validateAgentConfig(raw, section) {
@@ -1466,7 +1647,10 @@ function validateAgentConfig(raw, section) {
       throw new ConfigError(`[${section}].${key} is not a valid option`);
     }
   }
-  const result = { ...validateBaseConfig(rawObj, section) };
+  const result = {
+    ...validateBaseConfig(rawObj, section),
+    ...validateLoggingConfig(rawObj, section)
+  };
   if ("max-iterations" in rawObj) {
     result["max-iterations"] = validateNumber(rawObj["max-iterations"], "max-iterations", section, {
       integer: true,
@@ -1495,6 +1679,23 @@ function validateAgentConfig(raw, section) {
       section
     );
   }
+  if ("gadget-start-prefix" in rawObj) {
+    result["gadget-start-prefix"] = validateString(
+      rawObj["gadget-start-prefix"],
+      "gadget-start-prefix",
+      section
+    );
+  }
+  if ("gadget-end-prefix" in rawObj) {
+    result["gadget-end-prefix"] = validateString(
+      rawObj["gadget-end-prefix"],
+      "gadget-end-prefix",
+      section
+    );
+  }
+  if ("quiet" in rawObj) {
+    result.quiet = validateBoolean(rawObj.quiet, "quiet", section);
+  }
   return result;
 }
 function validateCustomConfig(raw, section) {
@@ -1550,26 +1751,42 @@ function validateCustomConfig(raw, section) {
       section
     );
   }
+  if ("gadget-start-prefix" in rawObj) {
+    result["gadget-start-prefix"] = validateString(
+      rawObj["gadget-start-prefix"],
+      "gadget-start-prefix",
+      section
+    );
+  }
+  if ("gadget-end-prefix" in rawObj) {
+    result["gadget-end-prefix"] = validateString(
+      rawObj["gadget-end-prefix"],
+      "gadget-end-prefix",
+      section
+    );
+  }
   if ("max-tokens" in rawObj) {
     result["max-tokens"] = validateNumber(rawObj["max-tokens"], "max-tokens", section, {
       integer: true,
       min: 1
     });
   }
-  if ("log-level" in rawObj) {
-    const level = validateString(rawObj["log-level"], "log-level", section);
-    if (!VALID_LOG_LEVELS.includes(level)) {
-      throw new ConfigError(
-        `[${section}].log-level must be one of: ${VALID_LOG_LEVELS.join(", ")}`
-      );
-    }
-    result["log-level"] = level;
+  if ("quiet" in rawObj) {
+    result.quiet = validateBoolean(rawObj.quiet, "quiet", section);
   }
-  if ("log-file" in rawObj) {
-    result["log-file"] = validateString(rawObj["log-file"], "log-file", section);
+  Object.assign(result, validateLoggingConfig(rawObj, section));
+  return result;
+}
+function validatePromptsConfig(raw, section) {
+  if (typeof raw !== "object" || raw === null) {
+    throw new ConfigError(`[${section}] must be a table`);
   }
-  if ("log-reset" in rawObj) {
-    result["log-reset"] = validateBoolean(rawObj["log-reset"], "log-reset", section);
+  const result = {};
+  for (const [key, value] of Object.entries(raw)) {
+    if (typeof value !== "string") {
+      throw new ConfigError(`[${section}].${key} must be a string`);
+    }
+    result[key] = value;
   }
   return result;
 }
@@ -1587,6 +1804,8 @@ function validateConfig(raw, configPath) {
         result.complete = validateCompleteConfig(value, key);
       } else if (key === "agent") {
         result.agent = validateAgentConfig(value, key);
+      } else if (key === "prompts") {
+        result.prompts = validatePromptsConfig(value, key);
       } else {
         result[key] = validateCustomConfig(value, key);
       }
@@ -1622,12 +1841,119 @@ function loadConfig() {
       configPath
     );
   }
-  return validateConfig(raw, configPath);
+  const validated = validateConfig(raw, configPath);
+  const inherited = resolveInheritance(validated, configPath);
+  return resolveTemplatesInConfig(inherited, configPath);
 }
 function getCustomCommandNames(config) {
-  const reserved = /* @__PURE__ */ new Set(["global", "complete", "agent"]);
+  const reserved = /* @__PURE__ */ new Set(["global", "complete", "agent", "prompts"]);
   return Object.keys(config).filter((key) => !reserved.has(key));
 }
+function resolveTemplatesInConfig(config, configPath) {
+  const prompts = config.prompts ?? {};
+  const hasPrompts = Object.keys(prompts).length > 0;
+  let hasTemplates = false;
+  for (const [sectionName, section] of Object.entries(config)) {
+    if (sectionName === "global" || sectionName === "prompts") continue;
+    if (!section || typeof section !== "object") continue;
+    const sectionObj = section;
+    if (typeof sectionObj.system === "string" && hasTemplateSyntax(sectionObj.system)) {
+      hasTemplates = true;
+      break;
+    }
+  }
+  for (const template of Object.values(prompts)) {
+    if (hasTemplateSyntax(template)) {
+      hasTemplates = true;
+      break;
+    }
+  }
+  if (!hasPrompts && !hasTemplates) {
+    return config;
+  }
+  try {
+    validatePrompts(prompts, configPath);
+  } catch (error) {
+    if (error instanceof TemplateError) {
+      throw new ConfigError(error.message, configPath);
+    }
+    throw error;
+  }
+  for (const [name, template] of Object.entries(prompts)) {
+    try {
+      validateEnvVars(template, name, configPath);
+    } catch (error) {
+      if (error instanceof TemplateError) {
+        throw new ConfigError(error.message, configPath);
+      }
+      throw error;
+    }
+  }
+  const eta = createTemplateEngine(prompts, configPath);
+  const result = { ...config };
+  for (const [sectionName, section] of Object.entries(config)) {
+    if (sectionName === "global" || sectionName === "prompts") continue;
+    if (!section || typeof section !== "object") continue;
+    const sectionObj = section;
+    if (typeof sectionObj.system === "string" && hasTemplateSyntax(sectionObj.system)) {
+      try {
+        validateEnvVars(sectionObj.system, void 0, configPath);
+      } catch (error) {
+        if (error instanceof TemplateError) {
+          throw new ConfigError(`[${sectionName}].system: ${error.message}`, configPath);
+        }
+        throw error;
+      }
+      try {
+        const resolved = resolveTemplate(eta, sectionObj.system, {}, configPath);
+        result[sectionName] = {
+          ...sectionObj,
+          system: resolved
+        };
+      } catch (error) {
+        if (error instanceof TemplateError) {
+          throw new ConfigError(`[${sectionName}].system: ${error.message}`, configPath);
+        }
+        throw error;
+      }
+    }
+  }
+  return result;
+}
+function resolveInheritance(config, configPath) {
+  const resolved = {};
+  const resolving = /* @__PURE__ */ new Set();
+  function resolveSection(name) {
+    if (name in resolved) {
+      return resolved[name];
+    }
+    if (resolving.has(name)) {
+      throw new ConfigError(`Circular inheritance detected: ${name}`, configPath);
+    }
+    const section = config[name];
+    if (section === void 0 || typeof section !== "object") {
+      throw new ConfigError(`Cannot inherit from unknown section: ${name}`, configPath);
+    }
+    resolving.add(name);
+    const sectionObj = section;
+    const inheritsRaw = sectionObj.inherits;
+    const inheritsList = inheritsRaw ? Array.isArray(inheritsRaw) ? inheritsRaw : [inheritsRaw] : [];
+    let merged = {};
+    for (const parent of inheritsList) {
+      const parentResolved = resolveSection(parent);
+      merged = { ...merged, ...parentResolved };
+    }
+    const { inherits: _inherits, ...ownValues } = sectionObj;
+    merged = { ...merged, ...ownValues };
+    resolving.delete(name);
+    resolved[name] = merged;
+    return merged;
+  }
+  for (const name of Object.keys(config)) {
+    resolveSection(name);
+  }
+  return resolved;
+}
 
 // src/cli/models-command.ts
 import chalk4 from "chalk";