llmist 2.6.0 → 3.1.0

package/dist/cli.js

@@ -1,21 +1,21 @@
 #!/usr/bin/env node
-import "./chunk-4IHLIYW5.js";
+import "./chunk-LFI4WQVV.js";
 import {
+  AbstractGadget,
   AgentBuilder,
-  BaseGadget,
-  BreakLoopException,
   FALLBACK_CHARS_PER_TOKEN,
   GadgetRegistry,
-  HumanInputException,
+  HumanInputRequiredException,
   LLMMessageBuilder,
   LLMist,
   MODEL_ALIASES,
+  TaskCompletionSignal,
   audioFromBuffer,
   createGadget,
   createLogger,
   detectAudioMimeType,
   detectImageMimeType,
-  extractText,
+  extractMessageText,
   imageFromBuffer,
   init_builder,
   init_client,
@@ -34,7 +34,7 @@ import {
   schemaToJSONSchema,
   text,
   validateGadgetSchema
-} from "./chunk-364PEMVT.js";
+} from "./chunk-JCFPJMRQ.js";
 
 // src/cli/constants.ts
 var CLI_NAME = "llmist";
@@ -46,7 +46,8 @@ var COMMANDS = {
   gadget: "gadget",
   image: "image",
   speech: "speech",
-  vision: "vision"
+  vision: "vision",
+  init: "init"
 };
 var LOG_LEVELS = ["silly", "trace", "debug", "info", "warn", "error", "fatal"];
 var DEFAULT_MODEL = "openai:gpt-5-nano";
@@ -122,7 +123,7 @@ import { Command, InvalidArgumentError as InvalidArgumentError2 } from "commande
 // package.json
 var package_default = {
   name: "llmist",
-  version: "2.6.0",
+  version: "3.0.0",
   description: "TypeScript LLM client with streaming tool execution. Tools fire mid-stream. Built-in function calling works with any model\u2014no structured outputs or native tool support required.",
   type: "module",
   main: "dist/index.cjs",
@@ -530,7 +531,7 @@ var askUser = createGadget({
     }
   ],
   execute: ({ question }) => {
-    throw new HumanInputException(question);
+    throw new HumanInputRequiredException(question);
   }
 });
 var tellUser = createGadget({
@@ -580,11 +581,59 @@ var finish = createGadget({
     }
   ],
   execute: () => {
-    throw new BreakLoopException("Task completed");
+    throw new TaskCompletionSignal("Task completed");
   }
 });
 var builtinGadgets = [askUser, tellUser, finish];
 
+// src/cli/subagent-config.ts
+var INHERIT_MODEL = "inherit";
+function resolveSubagentConfig(subagentName, parentModel, profileConfig, globalConfig) {
+  const resolved = {};
+  const globalDefaultModel = globalConfig?.["default-model"];
+  const globalSubagent = extractSubagentConfig(globalConfig, subagentName);
+  const profileSubagent = profileConfig?.[subagentName] ?? {};
+  const merged = { ...globalSubagent, ...profileSubagent };
+  const configModel = merged.model ?? globalDefaultModel ?? INHERIT_MODEL;
+  resolved.model = configModel === INHERIT_MODEL ? parentModel : configModel;
+  for (const [key, value] of Object.entries(merged)) {
+    if (key !== "model") {
+      resolved[key] = value;
+    }
+  }
+  return resolved;
+}
+function buildSubagentConfigMap(parentModel, profileConfig, globalConfig) {
+  const subagentNames = /* @__PURE__ */ new Set();
+  if (globalConfig) {
+    for (const key of Object.keys(globalConfig)) {
+      if (key !== "default-model" && typeof globalConfig[key] === "object") {
+        subagentNames.add(key);
+      }
+    }
+  }
+  if (profileConfig) {
+    for (const key of Object.keys(profileConfig)) {
+      subagentNames.add(key);
+    }
+  }
+  const result = {};
+  for (const name of subagentNames) {
+    result[name] = resolveSubagentConfig(name, parentModel, profileConfig, globalConfig);
+  }
+  return result;
+}
+function extractSubagentConfig(globalConfig, subagentName) {
+  if (!globalConfig) {
+    return {};
+  }
+  const value = globalConfig[subagentName];
+  if (typeof value === "object" && value !== null) {
+    return value;
+  }
+  return {};
+}
+
 // src/cli/config.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
 import { homedir } from "node:os";
@@ -673,7 +722,7 @@ function hasTemplateSyntax(str) {
 }
 
 // src/cli/config.ts
-var VALID_APPROVAL_MODES = ["allowed", "denied", "approval-required"];
+var VALID_PERMISSION_LEVELS = ["allowed", "denied", "approval-required"];
 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([
@@ -713,6 +762,8 @@ var AGENT_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "gadget-end-prefix",
   "gadget-arg-prefix",
   "gadget-approval",
+  "subagents",
+  // Per-subagent configuration overrides
   "quiet",
   "inherits",
   "log-level",
@@ -738,9 +789,9 @@ function getConfigPath() {
   return join(homedir(), ".llmist", "cli.toml");
 }
 var ConfigError = class extends Error {
-  constructor(message, path5) {
-    super(path5 ? `${path5}: ${message}` : message);
-    this.path = path5;
+  constructor(message, path6) {
+    super(path6 ? `${path6}: ${message}` : message);
+    this.path = path6;
     this.name = "ConfigError";
   }
 };
@@ -796,6 +847,63 @@ function validateInherits(value, section) {
   }
   throw new ConfigError(`[${section}].inherits must be a string or array of strings`);
 }
+function validateSingleSubagentConfig(value, subagentName, section) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    throw new ConfigError(
+      `[${section}].${subagentName} must be a table (e.g., { model = "inherit", maxIterations = 20 })`
+    );
+  }
+  const result = {};
+  const rawObj = value;
+  for (const [key, val] of Object.entries(rawObj)) {
+    if (key === "model") {
+      if (typeof val !== "string") {
+        throw new ConfigError(`[${section}].${subagentName}.model must be a string`);
+      }
+      result.model = val;
+    } else if (key === "maxIterations") {
+      if (typeof val !== "number" || !Number.isInteger(val) || val < 1) {
+        throw new ConfigError(
+          `[${section}].${subagentName}.maxIterations must be a positive integer`
+        );
+      }
+      result.maxIterations = val;
+    } else {
+      result[key] = val;
+    }
+  }
+  return result;
+}
+function validateSubagentConfigMap(value, section) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    throw new ConfigError(
+      `[${section}].subagents must be a table (e.g., { BrowseWeb = { model = "inherit" } })`
+    );
+  }
+  const result = {};
+  for (const [subagentName, config] of Object.entries(value)) {
+    result[subagentName] = validateSingleSubagentConfig(config, subagentName, `${section}.subagents`);
+  }
+  return result;
+}
+function validateGlobalSubagentConfig(value, section) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    throw new ConfigError(`[${section}] must be a table`);
+  }
+  const result = {};
+  const rawObj = value;
+  for (const [key, val] of Object.entries(rawObj)) {
+    if (key === "default-model") {
+      if (typeof val !== "string") {
+        throw new ConfigError(`[${section}].default-model must be a string`);
+      }
+      result["default-model"] = val;
+    } else {
+      result[key] = validateSingleSubagentConfig(val, key, section);
+    }
+  }
+  return result;
+}
 function validateGadgetApproval(value, section) {
   if (typeof value !== "object" || value === null || Array.isArray(value)) {
     throw new ConfigError(
@@ -807,9 +915,9 @@ function validateGadgetApproval(value, section) {
     if (typeof mode !== "string") {
       throw new ConfigError(`[${section}].gadget-approval.${gadgetName} must be a string`);
     }
-    if (!VALID_APPROVAL_MODES.includes(mode)) {
+    if (!VALID_PERMISSION_LEVELS.includes(mode)) {
       throw new ConfigError(
-        `[${section}].gadget-approval.${gadgetName} must be one of: ${VALID_APPROVAL_MODES.join(", ")}`
+        `[${section}].gadget-approval.${gadgetName} must be one of: ${VALID_PERMISSION_LEVELS.join(", ")}`
       );
     }
     result[gadgetName] = mode;
@@ -978,6 +1086,9 @@ function validateAgentConfig(raw, section) {
   if ("gadget-approval" in rawObj) {
     result["gadget-approval"] = validateGadgetApproval(rawObj["gadget-approval"], section);
   }
+  if ("subagents" in rawObj) {
+    result.subagents = validateSubagentConfigMap(rawObj.subagents, section);
+  }
   if ("quiet" in rawObj) {
     result.quiet = validateBoolean(rawObj.quiet, "quiet", section);
   }
@@ -1146,6 +1257,9 @@ function validateCustomConfig(raw, section) {
   if ("gadget-approval" in rawObj) {
     result["gadget-approval"] = validateGadgetApproval(rawObj["gadget-approval"], section);
   }
+  if ("subagents" in rawObj) {
+    result.subagents = validateSubagentConfigMap(rawObj.subagents, section);
+  }
   if ("max-tokens" in rawObj) {
     result["max-tokens"] = validateNumber(rawObj["max-tokens"], "max-tokens", section, {
       integer: true,
@@ -1193,6 +1307,8 @@ function validateConfig(raw, configPath) {
         result.prompts = validatePromptsConfig(value, key);
       } else if (key === "docker") {
         result.docker = validateDockerConfig(value, key);
+      } else if (key === "subagents") {
+        result.subagents = validateGlobalSubagentConfig(value, key);
       } else {
         result[key] = validateCustomConfig(value, key);
       }
@@ -1233,7 +1349,16 @@ function loadConfig() {
   return resolveTemplatesInConfig(inherited, configPath);
 }
 function getCustomCommandNames(config) {
-  const reserved = /* @__PURE__ */ new Set(["global", "complete", "agent", "image", "speech", "prompts", "docker"]);
+  const reserved = /* @__PURE__ */ new Set([
+    "global",
+    "complete",
+    "agent",
+    "image",
+    "speech",
+    "prompts",
+    "docker",
+    "subagents"
+  ]);
   return Object.keys(config).filter((key) => !reserved.has(key));
 }
 function resolveTemplatesInConfig(config, configPath) {
@@ -1767,11 +1892,11 @@ function resolveDevMode(config, cliDevMode) {
   }
   return { enabled: true, sourcePath };
 }
-function expandHome(path5) {
-  if (path5.startsWith("~")) {
-    return path5.replace(/^~/, homedir3());
+function expandHome(path6) {
+  if (path6.startsWith("~")) {
+    return path6.replace(/^~/, homedir3());
   }
-  return path5;
+  return path6;
 }
 function buildDockerRunArgs(ctx, imageName, devMode) {
   const args = ["run", "--rm"];
@@ -1949,9 +2074,9 @@ async function readFileBuffer(filePath, options = {}) {
 
 // src/cli/gadgets.ts
 init_gadget();
-import fs5 from "node:fs";
-import path4 from "node:path";
-import { pathToFileURL } from "node:url";
+import fs6 from "node:fs";
+import path5 from "node:path";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
 
 // src/cli/builtins/filesystem/edit-file.ts
 import { z as z2 } from "zod";
@@ -2404,6 +2529,208 @@ function isBuiltinGadgetName(name) {
   return name in builtinGadgetRegistry;
 }
 
+// src/cli/external-gadgets.ts
+import { execSync } from "node:child_process";
+import fs5 from "node:fs";
+import path4 from "node:path";
+import os from "node:os";
+import { pathToFileURL } from "node:url";
+var CACHE_DIR2 = path4.join(os.homedir(), ".llmist", "gadget-cache");
+function isExternalPackageSpecifier(specifier) {
+  if (/^@?[a-z0-9][\w.-]*(?:@[\w.-]+)?(?::[a-z]+)?(?:\/\w+)?$/i.test(specifier)) {
+    return true;
+  }
+  if (specifier.startsWith("git+")) {
+    return true;
+  }
+  return false;
+}
+function parseGadgetSpecifier(specifier) {
+  if (specifier.startsWith("git+")) {
+    const url = specifier.slice(4);
+    const [baseUrl, ref] = url.split("#");
+    return {
+      type: "git",
+      package: baseUrl,
+      version: ref
+    };
+  }
+  const npmMatch = specifier.match(
+    /^(@?[a-z0-9][\w.-]*)(?:@([\w.-]+))?(?::([a-z]+))?(?:\/(\w+))?$/i
+  );
+  if (npmMatch) {
+    const [, pkg, version, preset, gadgetName] = npmMatch;
+    return {
+      type: "npm",
+      package: pkg,
+      version,
+      preset,
+      gadgetName
+    };
+  }
+  return null;
+}
+function getCacheDir(spec) {
+  const versionSuffix = spec.version ? `@${spec.version}` : "@latest";
+  if (spec.type === "npm") {
+    return path4.join(CACHE_DIR2, "npm", `${spec.package}${versionSuffix}`);
+  }
+  const sanitizedUrl = spec.package.replace(/[/:]/g, "-").replace(/^-+|-+$/g, "");
+  return path4.join(CACHE_DIR2, "git", `${sanitizedUrl}${versionSuffix}`);
+}
+function isCached(cacheDir) {
+  const packageJsonPath = path4.join(cacheDir, "package.json");
+  return fs5.existsSync(packageJsonPath);
+}
+async function installNpmPackage(spec, cacheDir) {
+  fs5.mkdirSync(cacheDir, { recursive: true });
+  const packageJson = {
+    name: "llmist-gadget-cache",
+    private: true,
+    type: "module"
+  };
+  fs5.writeFileSync(path4.join(cacheDir, "package.json"), JSON.stringify(packageJson, null, 2));
+  const packageSpec = spec.version ? `${spec.package}@${spec.version}` : spec.package;
+  try {
+    execSync(`npm install --prefix "${cacheDir}" "${packageSpec}" --save`, {
+      stdio: "pipe",
+      cwd: cacheDir
+    });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`Failed to install npm package '${packageSpec}': ${message}`);
+  }
+}
+async function installGitPackage(spec, cacheDir) {
+  fs5.mkdirSync(path4.dirname(cacheDir), { recursive: true });
+  if (fs5.existsSync(cacheDir)) {
+    try {
+      execSync("git fetch", { cwd: cacheDir, stdio: "pipe" });
+      if (spec.version) {
+        execSync(`git checkout ${spec.version}`, { cwd: cacheDir, stdio: "pipe" });
+      }
+    } catch (error) {
+      fs5.rmSync(cacheDir, { recursive: true, force: true });
+    }
+  }
+  if (!fs5.existsSync(cacheDir)) {
+    try {
+      const cloneCmd = spec.version ? `git clone --branch ${spec.version} "${spec.package}" "${cacheDir}"` : `git clone "${spec.package}" "${cacheDir}"`;
+      execSync(cloneCmd, { stdio: "pipe" });
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(`Failed to clone git repository '${spec.package}': ${message}`);
+    }
+    if (fs5.existsSync(path4.join(cacheDir, "package.json"))) {
+      try {
+        execSync("npm install", { cwd: cacheDir, stdio: "pipe" });
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`Failed to install dependencies for '${spec.package}': ${message}`);
+      }
+      try {
+        const packageJson = JSON.parse(fs5.readFileSync(path4.join(cacheDir, "package.json"), "utf-8"));
+        if (packageJson.scripts?.build) {
+          execSync("npm run build", { cwd: cacheDir, stdio: "pipe" });
+        }
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`Failed to build package '${spec.package}': ${message}`);
+      }
+    }
+  }
+}
+function readManifest(packageDir) {
+  const packageJsonPath = path4.join(packageDir, "package.json");
+  if (!fs5.existsSync(packageJsonPath)) {
+    return null;
+  }
+  try {
+    const packageJson = JSON.parse(fs5.readFileSync(packageJsonPath, "utf-8"));
+    return packageJson.llmist || null;
+  } catch {
+    return null;
+  }
+}
+function getPackagePath(cacheDir, packageName) {
+  const nodeModulesPath = path4.join(cacheDir, "node_modules", packageName);
+  if (fs5.existsSync(nodeModulesPath)) {
+    return nodeModulesPath;
+  }
+  return cacheDir;
+}
+async function loadExternalGadgets(specifier, forceInstall = false) {
+  const spec = parseGadgetSpecifier(specifier);
+  if (!spec) {
+    throw new Error(`Invalid external package specifier: ${specifier}`);
+  }
+  const cacheDir = getCacheDir(spec);
+  if (!isCached(cacheDir) || forceInstall) {
+    if (spec.type === "npm") {
+      await installNpmPackage(spec, cacheDir);
+    } else {
+      await installGitPackage(spec, cacheDir);
+    }
+  }
+  const packagePath = getPackagePath(cacheDir, spec.package);
+  const manifest = readManifest(packagePath);
+  let entryPoint;
+  let gadgetNames = null;
+  if (spec.gadgetName) {
+    gadgetNames = [spec.gadgetName];
+    if (manifest?.subagents?.[spec.gadgetName]) {
+      entryPoint = manifest.subagents[spec.gadgetName].entryPoint;
+    } else {
+      entryPoint = manifest?.gadgets || "./dist/index.js";
+    }
+  } else if (spec.preset) {
+    if (!manifest?.presets?.[spec.preset]) {
+      throw new Error(`Unknown preset '${spec.preset}' in package '${spec.package}'`);
+    }
+    const preset = manifest.presets[spec.preset];
+    if (preset === "*") {
+      gadgetNames = null;
+    } else {
+      gadgetNames = preset;
+    }
+    entryPoint = manifest?.gadgets || "./dist/index.js";
+  } else {
+    entryPoint = manifest?.gadgets || "./dist/index.js";
+  }
+  const resolvedEntryPoint = path4.resolve(packagePath, entryPoint);
+  if (!fs5.existsSync(resolvedEntryPoint)) {
+    throw new Error(
+      `Entry point not found: ${resolvedEntryPoint}. Make sure the package is built (run 'npm run build' in the package directory).`
+    );
+  }
+  const moduleUrl = pathToFileURL(resolvedEntryPoint).href;
+  let exports;
+  try {
+    exports = await import(moduleUrl);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`Failed to import '${specifier}': ${message}`);
+  }
+  let gadgets = extractGadgetsFromModule(exports);
+  if (gadgetNames) {
+    const gadgetSet = new Set(gadgetNames.map((n) => n.toLowerCase()));
+    gadgets = gadgets.filter((g) => {
+      const name = g.name?.toLowerCase() || "";
+      return gadgetSet.has(name);
+    });
+    const foundNames = new Set(gadgets.map((g) => g.name?.toLowerCase() || ""));
+    for (const requested of gadgetNames) {
+      if (!foundNames.has(requested.toLowerCase())) {
+        throw new Error(`Gadget '${requested}' not found in package '${spec.package}'`);
+      }
+    }
+  }
+  if (gadgets.length === 0) {
+    throw new Error(`No gadgets found in package '${spec.package}'`);
+  }
+  return gadgets;
+}
+
 // src/cli/gadgets.ts
 var PATH_PREFIXES = [".", "/", "~"];
 var BUILTIN_PREFIX = "builtin:";
@@ -2419,7 +2746,17 @@ function isGadgetConstructor(value) {
     return false;
   }
   const prototype = value.prototype;
-  return Boolean(prototype) && (prototype instanceof BaseGadget || isGadgetLike(prototype));
+  if (!prototype) {
+    return false;
+  }
+  if (prototype instanceof AbstractGadget) {
+    return true;
+  }
+  const proto = prototype;
+  if (typeof proto.execute === "function") {
+    return true;
+  }
+  return isGadgetLike(prototype);
 }
 function expandHomePath(input) {
   if (!input.startsWith("~")) {
@@ -2429,10 +2766,10 @@ function expandHomePath(input) {
   if (!home) {
     return input;
   }
-  return path4.join(home, input.slice(1));
+  return path5.join(home, input.slice(1));
 }
 function isFileLikeSpecifier(specifier) {
-  return PATH_PREFIXES.some((prefix) => specifier.startsWith(prefix)) || specifier.includes(path4.sep);
+  return PATH_PREFIXES.some((prefix) => specifier.startsWith(prefix)) || specifier.includes(path5.sep);
 }
 function tryResolveBuiltin(specifier) {
   if (specifier.startsWith(BUILTIN_PREFIX)) {
@@ -2455,11 +2792,11 @@ function resolveGadgetSpecifier(specifier, cwd) {
     return specifier;
   }
   const expanded = expandHomePath(specifier);
-  const resolvedPath = path4.resolve(cwd, expanded);
-  if (!fs5.existsSync(resolvedPath)) {
+  const resolvedPath = path5.resolve(cwd, expanded);
+  if (!fs6.existsSync(resolvedPath)) {
     throw new Error(`Gadget module not found at ${resolvedPath}`);
   }
-  return pathToFileURL(resolvedPath).href;
+  return pathToFileURL2(resolvedPath).href;
 }
 function extractGadgetsFromModule(moduleExports) {
   const results = [];
@@ -2472,7 +2809,7 @@ function extractGadgetsFromModule(moduleExports) {
       return;
     }
     visited.add(value);
-    if (value instanceof BaseGadget || isGadgetLike(value)) {
+    if (value instanceof AbstractGadget || isGadgetLike(value)) {
       results.push(value);
       return;
     }
@@ -2497,12 +2834,23 @@ function extractGadgetsFromModule(moduleExports) {
 }
 async function loadGadgets(specifiers, cwd, importer = (specifier) => import(specifier)) {
   const gadgets = [];
+  const usingDefaultImporter = importer.toString().includes("import(specifier)");
   for (const specifier of specifiers) {
     const builtin = tryResolveBuiltin(specifier);
     if (builtin) {
       gadgets.push(builtin);
       continue;
     }
+    if (usingDefaultImporter && isExternalPackageSpecifier(specifier)) {
+      try {
+        const externalGadgets = await loadExternalGadgets(specifier);
+        gadgets.push(...externalGadgets);
+        continue;
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`Failed to load external package '${specifier}': ${message}`);
+      }
+    }
     const resolved = resolveGadgetSpecifier(specifier, cwd);
     let exports;
     try {
@@ -2545,7 +2893,7 @@ function formatLlmRequest(messages) {
   const lines = [];
   for (const msg of messages) {
     lines.push(`=== ${msg.role.toUpperCase()} ===`);
-    lines.push(msg.content ? extractText(msg.content) : "");
+    lines.push(msg.content ? extractMessageText(msg.content) : "");
     lines.push("");
   }
   return lines.join("\n");
@@ -2760,12 +3108,14 @@ function formatMediaLine(media) {
   const id = chalk3.cyan(media.id);
   const mimeType = chalk3.dim(media.mimeType);
   const size = chalk3.yellow(formatBytes(media.sizeBytes));
-  const path5 = chalk3.dim(media.path);
-  return `${chalk3.dim("[")}${icon} ${id} ${mimeType} ${size}${chalk3.dim("]")} ${chalk3.dim("\u2192")} ${path5}`;
+  const path6 = chalk3.dim(media.path);
+  return `${chalk3.dim("[")}${icon} ${id} ${mimeType} ${size}${chalk3.dim("]")} ${chalk3.dim("\u2192")} ${path6}`;
 }
 function formatGadgetSummary2(result) {
   const gadgetLabel = chalk3.magenta.bold(result.gadgetName);
-  const timeLabel = chalk3.dim(`${Math.round(result.executionTimeMs)}ms`);
+  const timeLabel = chalk3.dim(
+    result.executionTimeMs >= 1e3 ? `${(result.executionTimeMs / 1e3).toFixed(1)}s` : `${Math.round(result.executionTimeMs)}ms`
+  );
   const paramsStr = formatParametersInline(result.parameters);
   const paramsLabel = paramsStr ? `${chalk3.dim("(")}${paramsStr}${chalk3.dim(")")}` : "";
   if (result.error) {
@@ -2933,6 +3283,8 @@ var StreamProgress = class {
   delayTimeout = null;
   isRunning = false;
   hasRendered = false;
+  lastRenderLineCount = 0;
+  // Track lines rendered for multi-line clearing
   // Current call stats (streaming mode)
   mode = "cumulative";
   model = "";
@@ -2952,6 +3304,99 @@ var StreamProgress = class {
   totalCost = 0;
   iterations = 0;
   currentIteration = 0;
+  // In-flight gadget tracking for concurrent status display
+  inFlightGadgets = /* @__PURE__ */ new Map();
+  // Nested agent tracking for hierarchical subagent display
+  nestedAgents = /* @__PURE__ */ new Map();
+  // Nested gadget tracking for hierarchical subagent display
+  nestedGadgets = /* @__PURE__ */ new Map();
+  /**
+   * Add a gadget to the in-flight tracking (called when gadget_call event received).
+   * Triggers re-render to show the gadget in the status display.
+   */
+  addGadget(invocationId, name, params) {
+    this.inFlightGadgets.set(invocationId, { name, params, startTime: Date.now() });
+    if (this.isRunning && this.isTTY) {
+      this.render();
+    }
+  }
+  /**
+   * Remove a gadget from in-flight tracking (called when gadget_result event received).
+   * Triggers re-render to update the status display.
+   */
+  removeGadget(invocationId) {
+    this.inFlightGadgets.delete(invocationId);
+    if (this.isRunning && this.isTTY) {
+      this.render();
+    }
+  }
+  /**
+   * Check if there are any gadgets currently in flight.
+   */
+  hasInFlightGadgets() {
+    return this.inFlightGadgets.size > 0;
+  }
+  /**
+   * Add a nested agent LLM call (called when nested llm_call_start event received).
+   * Used to display hierarchical progress for subagent gadgets.
+   */
+  addNestedAgent(id, parentInvocationId, depth, model, iteration, inputTokens) {
+    this.nestedAgents.set(id, {
+      parentInvocationId,
+      depth,
+      model,
+      iteration,
+      startTime: Date.now(),
+      inputTokens
+    });
+    if (this.isRunning && this.isTTY) {
+      this.render();
+    }
+  }
+  /**
+   * Update a nested agent with completion info (called when nested llm_call_end event received).
+   */
+  updateNestedAgent(id, outputTokens) {
+    const agent = this.nestedAgents.get(id);
+    if (agent) {
+      agent.outputTokens = outputTokens;
+      if (this.isRunning && this.isTTY) {
+        this.render();
+      }
+    }
+  }
+  /**
+   * Remove a nested agent (called when the nested LLM call completes).
+   */
+  removeNestedAgent(id) {
+    this.nestedAgents.delete(id);
+    if (this.isRunning && this.isTTY) {
+      this.render();
+    }
+  }
+  /**
+   * Add a nested gadget call (called when nested gadget_call event received).
+   */
+  addNestedGadget(id, depth, parentInvocationId, name) {
+    this.nestedGadgets.set(id, {
+      depth,
+      parentInvocationId,
+      name,
+      startTime: Date.now()
+    });
+    if (this.isRunning && this.isTTY) {
+      this.render();
+    }
+  }
+  /**
+   * Remove a nested gadget (called when nested gadget_result event received).
+   */
+  removeNestedGadget(id) {
+    this.nestedGadgets.delete(id);
+    if (this.isRunning && this.isTTY) {
+      this.render();
+    }
+  }
   /**
    * Starts a new LLM call. Switches to streaming mode.
    * @param model - Model name being used
@@ -3078,15 +3523,57 @@ var StreamProgress = class {
     this.isStreaming = true;
   }
   render() {
+    this.clearRenderedLines();
     const spinner = SPINNER_FRAMES[this.frameIndex++ % SPINNER_FRAMES.length];
+    const lines = [];
     if (this.mode === "streaming") {
-      this.renderStreamingMode(spinner);
+      lines.push(this.formatStreamingLine(spinner));
     } else {
-      this.renderCumulativeMode(spinner);
+      lines.push(this.formatCumulativeLine(spinner));
+    }
+    if (this.isTTY) {
+      for (const [gadgetId, gadget] of this.inFlightGadgets) {
+        const elapsed = ((Date.now() - gadget.startTime) / 1e3).toFixed(1);
+        const gadgetLine = `  ${chalk4.blue("\u23F5")} ${chalk4.magenta.bold(gadget.name)}${chalk4.dim("(...)")} ${chalk4.dim(elapsed + "s")}`;
+        lines.push(gadgetLine);
+        for (const [_agentId, nested] of this.nestedAgents) {
+          if (nested.parentInvocationId !== gadgetId) continue;
+          const indent = "  ".repeat(nested.depth + 1);
+          const nestedElapsed = ((Date.now() - nested.startTime) / 1e3).toFixed(1);
+          const tokens = nested.inputTokens ? ` ${chalk4.dim("\u2191")}${chalk4.yellow(formatTokens(nested.inputTokens))}` : "";
+          const outTokens = nested.outputTokens ? ` ${chalk4.dim("\u2193")}${chalk4.green(formatTokens(nested.outputTokens))}` : "";
+          const nestedLine = `${indent}${chalk4.cyan(`#${nested.iteration}`)} ${chalk4.dim(nested.model)}${tokens}${outTokens} ${chalk4.dim(nestedElapsed + "s")} ${chalk4.cyan(spinner)}`;
+          lines.push(nestedLine);
+        }
+        for (const [_nestedId, nestedGadget] of this.nestedGadgets) {
+          if (nestedGadget.parentInvocationId === gadgetId) {
+            const indent = "  ".repeat(nestedGadget.depth + 1);
+            const nestedElapsed = ((Date.now() - nestedGadget.startTime) / 1e3).toFixed(1);
+            const nestedGadgetLine = `${indent}${chalk4.blue("\u23F5")} ${chalk4.dim(nestedGadget.name + "(...)")} ${chalk4.dim(nestedElapsed + "s")}`;
+            lines.push(nestedGadgetLine);
+          }
+        }
+      }
     }
+    this.lastRenderLineCount = lines.length;
+    this.target.write("\r" + lines.join("\n"));
     this.hasRendered = true;
   }
-  renderStreamingMode(spinner) {
+  /**
+   * Clears the previously rendered lines (for multi-line status display).
+   */
+  clearRenderedLines() {
+    if (!this.hasRendered || this.lastRenderLineCount === 0) return;
+    this.target.write("\r\x1B[K");
+    for (let i = 1; i < this.lastRenderLineCount; i++) {
+      this.target.write("\x1B[1A\x1B[K");
+    }
+    this.target.write("\r");
+  }
+  /**
+   * Format the streaming mode progress line (returns string, doesn't write).
+   */
+  formatStreamingLine(spinner) {
     const elapsed = ((Date.now() - this.callStartTime) / 1e3).toFixed(1);
     const outTokens = this.callOutputTokensEstimated ? Math.round(this.callOutputChars / FALLBACK_CHARS_PER_TOKEN) : this.callOutputTokens;
     const parts = [];
@@ -3120,7 +3607,7 @@ var StreamProgress = class {
     if (callCost > 0) {
       parts.push(chalk4.cyan(`$${formatCost(callCost)}`));
     }
-    this.target.write(`\r${parts.join(chalk4.dim(" | "))} ${chalk4.cyan(spinner)}`);
+    return `${parts.join(chalk4.dim(" | "))} ${chalk4.cyan(spinner)}`;
   }
   /**
    * Calculates live cost estimate for the current streaming call.
@@ -3157,7 +3644,10 @@ var StreamProgress = class {
     }
     return this.callInputTokens / limits.contextWindow * 100;
   }
-  renderCumulativeMode(spinner) {
+  /**
+   * Format the cumulative mode progress line (returns string, doesn't write).
+   */
+  formatCumulativeLine(spinner) {
     const elapsed = ((Date.now() - this.totalStartTime) / 1e3).toFixed(1);
     const parts = [];
     if (this.model) {
@@ -3173,10 +3663,10 @@ var StreamProgress = class {
       parts.push(chalk4.dim("cost:") + chalk4.cyan(` $${formatCost(this.totalCost)}`));
     }
     parts.push(chalk4.dim(`${elapsed}s`));
-    this.target.write(`\r${parts.join(chalk4.dim(" | "))} ${chalk4.cyan(spinner)}`);
+    return `${parts.join(chalk4.dim(" | "))} ${chalk4.cyan(spinner)}`;
   }
   /**
-   * Pauses the progress indicator and clears the line.
+   * Pauses the progress indicator and clears all rendered lines.
    * Can be resumed with start().
    */
   pause() {
@@ -3190,10 +3680,9 @@ var StreamProgress = class {
       this.interval = null;
     }
     this.isRunning = false;
-    if (this.hasRendered) {
-      this.target.write("\r\x1B[K\x1B[0G");
-      this.hasRendered = false;
-    }
+    this.clearRenderedLines();
+    this.hasRendered = false;
+    this.lastRenderLineCount = 0;
   }
   /**
    * Completes the progress indicator and clears the line.
@@ -3381,6 +3870,7 @@ function configToAgentOptions(config) {
   if (config.docker !== void 0) result.docker = config.docker;
   if (config["docker-cwd-permission"] !== void 0)
     result.dockerCwdPermission = config["docker-cwd-permission"];
+  if (config.subagents !== void 0) result.subagents = config.subagents;
   return result;
 }
 
@@ -3568,7 +4058,12 @@ async function executeAgent(promptArg, options, env) {
       return void 0;
     }
   };
-  const builder = new AgentBuilder(client).withModel(options.model).withLogger(env.createLogger("llmist:cli:agent")).withHooks({
+  const resolvedSubagentConfig = buildSubagentConfigMap(
+    options.model,
+    options.subagents,
+    options.globalSubagents
+  );
+  const builder = new AgentBuilder(client).withModel(options.model).withSubagentConfig(resolvedSubagentConfig).withLogger(env.createLogger("llmist:cli:agent")).withHooks({
     observers: {
       // onLLMCallStart: Start progress indicator for each LLM call
       // This showcases how to react to agent lifecycle events
@@ -3764,6 +4259,38 @@ Denied: ${result.reason ?? "by user"}`
       "Maximize efficiency by batching independent operations in a single response."
     ].join(" ")
   );
+  if (!options.quiet) {
+    builder.withNestedEventCallback((event) => {
+      if (event.type === "llm_call_start") {
+        const info = event.event;
+        const nestedId = `${event.gadgetInvocationId}:${info.iteration}`;
+        progress.addNestedAgent(
+          nestedId,
+          event.gadgetInvocationId,
+          event.depth,
+          info.model,
+          info.iteration,
+          info.inputTokens
+        );
+      } else if (event.type === "llm_call_end") {
+        const info = event.event;
+        const nestedId = `${event.gadgetInvocationId}:${info.iteration}`;
+        progress.updateNestedAgent(nestedId, info.outputTokens);
+        setTimeout(() => progress.removeNestedAgent(nestedId), 100);
+      } else if (event.type === "gadget_call") {
+        const gadgetEvent = event.event;
+        progress.addNestedGadget(
+          gadgetEvent.call.invocationId,
+          event.depth,
+          event.gadgetInvocationId,
+          gadgetEvent.call.gadgetName
+        );
+      } else if (event.type === "gadget_result") {
+        const resultEvent = event.event;
+        progress.removeNestedGadget(resultEvent.result.invocationId);
+      }
+    });
+  }
   let agent;
   if (options.image || options.audio) {
     const parts = [text(prompt)];
@@ -3788,10 +4315,22 @@ Denied: ${result.reason ?? "by user"}`
   try {
     for await (const event of agent.run()) {
       if (event.type === "text") {
-        progress.pause();
         textBuffer += event.content;
+      } else if (event.type === "gadget_call") {
+        flushTextBuffer();
+        if (!options.quiet) {
+          progress.addGadget(
+            event.call.invocationId,
+            event.call.gadgetName,
+            event.call.parameters
+          );
+          progress.start();
+        }
       } else if (event.type === "gadget_result") {
         flushTextBuffer();
+        if (!options.quiet) {
+          progress.removeGadget(event.result.invocationId);
+        }
         progress.pause();
         if (options.quiet) {
           if (event.result.gadgetName === "TellUser" && event.result.parameters?.message) {
@@ -3806,6 +4345,9 @@ Denied: ${result.reason ?? "by user"}`
 `
           );
         }
+        if (progress.hasInFlightGadgets()) {
+          progress.start();
+        }
       }
     }
   } catch (error) {
@@ -3838,14 +4380,16 @@ Denied: ${result.reason ?? "by user"}`
     }
   }
 }
-function registerAgentCommand(program, env, config) {
+function registerAgentCommand(program, env, config, globalSubagents) {
   const cmd = program.command(COMMANDS.agent).description("Run the llmist agent loop with optional gadgets.").argument("[prompt]", "Prompt for the agent loop. Falls back to stdin when available.");
   addAgentOptions(cmd, config);
   cmd.action(
     (prompt, options) => executeAction(() => {
       const mergedOptions = {
         ...options,
-        gadgetApproval: config?.["gadget-approval"]
+        gadgetApproval: config?.["gadget-approval"],
+        subagents: config?.subagents,
+        globalSubagents
       };
       return executeAgent(prompt, mergedOptions, env);
     }, env)
@@ -3945,6 +4489,104 @@ function registerCompleteCommand(program, env, config) {
   );
 }
 
+// src/cli/init-command.ts
+import { existsSync as existsSync5, mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { dirname as dirname2 } from "node:path";
+var STARTER_CONFIG = `# ~/.llmist/cli.toml
+# llmist CLI configuration file
+#
+# This is a minimal starter config. For a comprehensive example with all options:
+#   https://github.com/zbigniewsobiecki/llmist/blob/main/examples/cli.example.toml
+#
+# Key concepts:
+#   - Any section can inherit from others using: inherits = "section-name"
+#   - Prompts can use templates with Eta syntax: <%~ include("@prompt-name") %>
+#   - Custom sections become CLI commands: [my-command] -> llmist my-command
+
+#\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+# GLOBAL OPTIONS
+# These apply to all commands. CLI flags override these settings.
+#\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+[global]
+# log-level = "info"              # silly, trace, debug, info, warn, error, fatal
+# log-file = "/tmp/llmist.log"    # Enable file logging (JSON format)
+
+#\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+# COMPLETE COMMAND DEFAULTS
+# For single LLM responses: llmist complete "prompt"
+# Model format: provider:model (e.g., openai:gpt-4o, anthropic:claude-sonnet-4-5)
+#\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+[complete]
+# model = "openai:gpt-4o"
+# temperature = 0.7               # 0-2, higher = more creative
+# max-tokens = 4096               # Maximum response length
+
+#\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+# AGENT COMMAND DEFAULTS
+# For tool-using agents: llmist agent "prompt"
+#\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+[agent]
+# model = "anthropic:claude-sonnet-4-5"
+# max-iterations = 15             # Max tool-use loops before stopping
+# gadgets = [                     # Tools the agent can use
+#   "ListDirectory",
+#   "ReadFile",
+#   "WriteFile",
+# ]
+
+#\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+# CUSTOM COMMANDS
+# Any other section becomes a new CLI command!
+# Uncomment below to create: llmist summarize "your text"
+#\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+# [summarize]
+# type = "complete"               # "complete" or "agent"
+# description = "Summarize text concisely."
+# system = "Summarize the following text in 2-3 bullet points."
+# temperature = 0.3
+`;
+async function executeInit(_options, env) {
+  const configPath = getConfigPath();
+  const configDir = dirname2(configPath);
+  if (existsSync5(configPath)) {
+    env.stderr.write(`Configuration already exists at ${configPath}
+`);
+    env.stderr.write("\n");
+    env.stderr.write(`To view it:  cat ${configPath}
+`);
+    env.stderr.write(`To reset:    rm ${configPath} && llmist init
+`);
+    return;
+  }
+  if (!existsSync5(configDir)) {
+    mkdirSync2(configDir, { recursive: true });
+  }
+  writeFileSync2(configPath, STARTER_CONFIG, "utf-8");
+  env.stderr.write(`Created ${configPath}
+`);
+  env.stderr.write("\n");
+  env.stderr.write("Next steps:\n");
+  env.stderr.write("  1. Set your API key:\n");
+  env.stderr.write("       export OPENAI_API_KEY=sk-...\n");
+  env.stderr.write("       export ANTHROPIC_API_KEY=sk-...\n");
+  env.stderr.write("       export GEMINI_API_KEY=...\n");
+  env.stderr.write("\n");
+  env.stderr.write(`  2. Customize your config:
+`);
+  env.stderr.write(`       $EDITOR ${configPath}
+`);
+  env.stderr.write("\n");
+  env.stderr.write("  3. See all options:\n");
+  env.stderr.write(
+    "       https://github.com/zbigniewsobiecki/llmist/blob/main/examples/cli.example.toml\n"
+  );
+  env.stderr.write("\n");
+  env.stderr.write('Try it: llmist complete "Hello, world!"\n');
+}
+function registerInitCommand(program, env) {
+  program.command(COMMANDS.init).description("Initialize llmist configuration at ~/.llmist/cli.toml").action((options) => executeAction(() => executeInit(options, env), env));
+}
+
 // src/cli/environment.ts
 init_client();
 init_logger();
@@ -4047,7 +4689,7 @@ function createCommandEnvironment(baseEnv, config) {
     createLogger: createLoggerFactory(loggerConfig)
   };
 }
-function registerCustomCommand(program, name, config, env) {
+function registerCustomCommand(program, name, config, env, globalSubagents) {
   const type = config.type ?? "agent";
   const description = config.description ?? `Custom ${type} command`;
   const cmd = program.command(name).description(description).argument("[prompt]", "Prompt for the command. Falls back to stdin when available.");
@@ -4072,7 +4714,8 @@ function registerCustomCommand(program, name, config, env) {
         const configDefaults = configToAgentOptions(config);
         const options = {
           ...configDefaults,
-          ...cliOptions
+          ...cliOptions,
+          globalSubagents
         };
         await executeAgent(prompt, options, cmdEnv);
       }, cmdEnv);
@@ -4515,7 +5158,7 @@ function registerGadgetCommand(program, env) {
 }
 
 // src/cli/image-command.ts
-import { writeFileSync as writeFileSync2 } from "node:fs";
+import { writeFileSync as writeFileSync3 } from "node:fs";
 var DEFAULT_IMAGE_MODEL = "dall-e-3";
 async function executeImage(promptArg, options, env) {
   const prompt = await resolvePrompt(promptArg, env);
@@ -4539,7 +5182,7 @@ async function executeImage(promptArg, options, env) {
     const imageData = result.images[0];
     if (imageData.b64Json) {
       const buffer = Buffer.from(imageData.b64Json, "base64");
-      writeFileSync2(options.output, buffer);
+      writeFileSync3(options.output, buffer);
       if (!options.quiet) {
         env.stderr.write(`${SUMMARY_PREFIX} Image saved to ${options.output}
 `);
@@ -4980,7 +5623,7 @@ function registerModelsCommand(program, env) {
 }
 
 // src/cli/speech-command.ts
-import { writeFileSync as writeFileSync3 } from "node:fs";
+import { writeFileSync as writeFileSync4 } from "node:fs";
 var DEFAULT_SPEECH_MODEL = "tts-1";
 var DEFAULT_VOICE = "nova";
 async function executeSpeech(textArg, options, env) {
@@ -5003,7 +5646,7 @@ async function executeSpeech(textArg, options, env) {
   });
   const audioBuffer = Buffer.from(result.audio);
   if (options.output) {
-    writeFileSync3(options.output, audioBuffer);
+    writeFileSync4(options.output, audioBuffer);
     if (!options.quiet) {
       env.stderr.write(`${SUMMARY_PREFIX} Audio saved to ${options.output}
 `);
@@ -5077,17 +5720,18 @@ function createProgram(env, config) {
     writeErr: (str) => env.stderr.write(str)
   });
   registerCompleteCommand(program, env, config?.complete);
-  registerAgentCommand(program, env, config?.agent);
+  registerAgentCommand(program, env, config?.agent, config?.subagents);
   registerImageCommand(program, env, config?.image);
   registerSpeechCommand(program, env, config?.speech);
   registerVisionCommand(program, env);
   registerModelsCommand(program, env);
   registerGadgetCommand(program, env);
+  registerInitCommand(program, env);
   if (config) {
     const customNames = getCustomCommandNames(config);
     for (const name of customNames) {
       const cmdConfig = config[name];
-      registerCustomCommand(program, name, cmdConfig, env);
+      registerCustomCommand(program, name, cmdConfig, env, config.subagents);
     }
   }
   return program;