llmist 4.0.0 → 5.0.0

package/dist/cli.cjs

@@ -4952,15 +4952,16 @@ var init_agent = __esm({
             });
           } else if (event.type === "llm_call_end") {
             const info = event.event;
+            const usage = info.usage ?? (info.outputTokens ? {
+              inputTokens: info.inputTokens ?? 0,
+              outputTokens: info.outputTokens,
+              totalTokens: (info.inputTokens ?? 0) + info.outputTokens
+            } : void 0);
             void this.hooks?.observers?.onLLMCallComplete?.({
               iteration: info.iteration,
               options: { model: info.model, messages: [] },
               finishReason: info.finishReason ?? null,
-              usage: info.outputTokens ? {
-                inputTokens: info.inputTokens ?? 0,
-                outputTokens: info.outputTokens,
-                totalTokens: (info.inputTokens ?? 0) + info.outputTokens
-              } : void 0,
+              usage,
               rawResponse: "",
               finalMessage: "",
               logger: this.logger,
@@ -7003,6 +7004,9 @@ var init_gemini = __esm({
       async countTokens(messages, descriptor, _spec) {
         const client = this.client;
         const contents = this.convertMessagesToContents(messages);
+        if (!contents || contents.length === 0) {
+          return 0;
+        }
         try {
           const response = await client.models.countTokens({
             model: descriptor.name,
@@ -9496,8 +9500,13 @@ ${endPrefix}`
                   event: {
                     iteration: context.iteration,
                     model: context.options.model,
+                    // Backward compat fields
+                    inputTokens: context.usage?.inputTokens,
                     outputTokens: context.usage?.outputTokens,
-                    finishReason: context.finishReason
+                    finishReason: context.finishReason ?? void 0,
+                    // Full usage object with cache details (for first-class display)
+                    usage: context.usage
+                    // Cost will be calculated by parent if it has model registry
                   }
                 });
                 if (existingOnLLMCallComplete) {
@@ -9896,7 +9905,6 @@ var OPTION_FLAGS = {
   docker: "--docker",
   dockerRo: "--docker-ro",
   noDocker: "--no-docker",
-  dockerDev: "--docker-dev",
   // Multimodal input options
   inputImage: "--image <path>",
   inputAudio: "--audio <path>",
@@ -9931,7 +9939,6 @@ var OPTION_DESCRIPTIONS = {
   docker: "Run agent in a Docker sandbox container for security isolation.",
   dockerRo: "Run in Docker with current directory mounted read-only.",
   noDocker: "Disable Docker sandboxing (override config).",
-  dockerDev: "Run in Docker dev mode (mount local source instead of npm install).",
   // Image generation descriptions
   imageSize: "Image size/aspect ratio, e.g. '1024x1024', '1:1', '16:9'.",
   imageQuality: "Image quality: 'standard', 'hd', 'low', 'medium', 'high'.",
@@ -9951,7 +9958,7 @@ var import_commander2 = require("commander");
 // package.json
 var package_default = {
   name: "llmist",
-  version: "3.1.0",
+  version: "5.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",
@@ -9994,7 +10001,8 @@ var package_default = {
     "test:all": "bun run test && bun run test:e2e",
     clean: "rimraf dist",
     prepare: "node scripts/install-hooks.js || true",
-    "release:dry": "bunx semantic-release --dry-run"
+    "release:dry": "bunx semantic-release --dry-run",
+    "release:publish": 'test "$(git branch --show-current)" = "main" && git pull origin main && bun run build && npm publish'
   },
   bin: {
     llmist: "dist/cli.js"
@@ -11353,20 +11361,17 @@ var DOCKER_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "mounts",
   "env-vars",
   "image-name",
-  "dev-mode",
-  "dev-source",
   "docker-args"
 ]);
 var DEFAULT_IMAGE_NAME = "llmist-sandbox";
 var DEFAULT_CWD_PERMISSION = "rw";
 var DEFAULT_CONFIG_PERMISSION = "ro";
+var GADGET_CACHE_VOLUME = "llmist-gadget-cache";
 var FORWARDED_API_KEYS = [
   "ANTHROPIC_API_KEY",
   "OPENAI_API_KEY",
   "GEMINI_API_KEY"
 ];
-var DEV_IMAGE_NAME = "llmist-dev-sandbox";
-var DEV_SOURCE_MOUNT_TARGET = "/llmist-src";
 
 // src/cli/docker/docker-config.ts
 var MOUNT_CONFIG_KEYS = /* @__PURE__ */ new Set(["source", "target", "permission"]);
@@ -11478,12 +11483,6 @@ function validateDockerConfig(raw, section) {
   if ("image-name" in rawObj) {
     result["image-name"] = validateString2(rawObj["image-name"], "image-name", section);
   }
-  if ("dev-mode" in rawObj) {
-    result["dev-mode"] = validateBoolean2(rawObj["dev-mode"], "dev-mode", section);
-  }
-  if ("dev-source" in rawObj) {
-    result["dev-source"] = validateString2(rawObj["dev-source"], "dev-source", section);
-  }
   if ("docker-args" in rawObj) {
     result["docker-args"] = validateStringArray2(rawObj["docker-args"], "docker-args", section);
   }
@@ -11493,7 +11492,6 @@ function validateDockerConfig(raw, section) {
 // src/cli/docker/docker-wrapper.ts
 var import_node_fs5 = require("fs");
 var import_node_os4 = require("os");
-var import_node_path6 = require("path");
 
 // src/cli/docker/dockerfile.ts
 var DEFAULT_DOCKERFILE = `# llmist sandbox image
@@ -11513,6 +11511,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \\
     curl \\
     # ca-certificates for HTTPS
     ca-certificates \\
+    # python3 for native module compilation (node-gyp)
+    python3 \\
+    # build-essential for compiling native modules
+    build-essential \\
     && rm -rf /var/lib/apt/lists/*
 
 # Install ast-grep for code search/refactoring
@@ -11530,37 +11532,8 @@ WORKDIR /workspace
 # Entry point - llmist with all arguments forwarded
 ENTRYPOINT ["llmist"]
 `;
-var DEV_DOCKERFILE = `# llmist DEV sandbox image
-# For development/testing with local source code
-
-FROM oven/bun:1-debian
-
-# Install essential tools (same as production)
-RUN apt-get update && apt-get install -y --no-install-recommends \\
-    ed \\
-    ripgrep \\
-    git \\
-    curl \\
-    ca-certificates \\
-    && rm -rf /var/lib/apt/lists/*
-
-# Install ast-grep for code search/refactoring
-RUN curl -fsSL https://raw.githubusercontent.com/ast-grep/ast-grep/main/install.sh | bash \\
-    && mv /root/.local/bin/ast-grep /usr/local/bin/ 2>/dev/null || true \\
-    && mv /root/.local/bin/sg /usr/local/bin/ 2>/dev/null || true
-
-# Working directory (host CWD will be mounted here)
-WORKDIR /workspace
-
-# Entry point - run llmist from mounted source
-# Source is mounted at ${DEV_SOURCE_MOUNT_TARGET}
-ENTRYPOINT ["bun", "run", "${DEV_SOURCE_MOUNT_TARGET}/src/cli.ts"]
-`;
-function resolveDockerfile(config, devMode = false) {
-  if (config.dockerfile) {
-    return config.dockerfile;
-  }
-  return devMode ? DEV_DOCKERFILE : DEFAULT_DOCKERFILE;
+function resolveDockerfile(config) {
+  return config.dockerfile ?? DEFAULT_DOCKERFILE;
 }
 function computeDockerfileHash(dockerfile) {
   const encoder = new TextEncoder();
@@ -11622,10 +11595,13 @@ async function buildImage(imageName, dockerfile) {
   ensureCacheDir();
   const dockerfilePath = (0, import_node_path5.join)(CACHE_DIR, "Dockerfile");
   (0, import_node_fs4.writeFileSync)(dockerfilePath, dockerfile);
-  const proc = Bun.spawn(["docker", "build", "-t", imageName, "-f", dockerfilePath, CACHE_DIR], {
-    stdout: "pipe",
-    stderr: "pipe"
-  });
+  const proc = Bun.spawn(
+    ["docker", "build", "--no-cache", "-t", imageName, "-f", dockerfilePath, CACHE_DIR],
+    {
+      stdout: "pipe",
+      stderr: "pipe"
+    }
+  );
   const exitCode = await proc.exited;
   const stdout = await new Response(proc.stdout).text();
   const stderr = await new Response(proc.stderr).text();
@@ -11687,46 +11663,13 @@ function isInsideContainer() {
   }
   return false;
 }
-function autoDetectDevSource() {
-  const scriptPath = process.argv[1];
-  if (!scriptPath || !scriptPath.endsWith("src/cli.ts")) {
-    return void 0;
-  }
-  const srcDir = (0, import_node_path6.dirname)(scriptPath);
-  const projectDir = (0, import_node_path6.dirname)(srcDir);
-  const packageJsonPath = (0, import_node_path6.join)(projectDir, "package.json");
-  if (!(0, import_node_fs5.existsSync)(packageJsonPath)) {
-    return void 0;
-  }
-  try {
-    const pkg = JSON.parse((0, import_node_fs5.readFileSync)(packageJsonPath, "utf-8"));
-    if (pkg.name === "llmist") {
-      return projectDir;
-    }
-  } catch {
-  }
-  return void 0;
-}
-function resolveDevMode(config, cliDevMode) {
-  const enabled = cliDevMode || config?.["dev-mode"] || process.env.LLMIST_DEV_MODE === "1";
-  if (!enabled) {
-    return { enabled: false, sourcePath: void 0 };
-  }
-  const sourcePath = config?.["dev-source"] || process.env.LLMIST_DEV_SOURCE || autoDetectDevSource();
-  if (!sourcePath) {
-    throw new Error(
-      "Docker dev mode enabled but llmist source path not found. Set [docker].dev-source in config, LLMIST_DEV_SOURCE env var, or run from the llmist source directory (bun src/cli.ts)."
-    );
-  }
-  return { enabled: true, sourcePath };
-}
 function expandHome(path6) {
   if (path6.startsWith("~")) {
     return path6.replace(/^~/, (0, import_node_os4.homedir)());
   }
   return path6;
 }
-function buildDockerRunArgs(ctx, imageName, devMode) {
+function buildDockerRunArgs(ctx, imageName) {
   const args = ["run", "--rm"];
   const timestamp = Date.now();
   const random = Math.random().toString(36).slice(2, 8);
@@ -11740,11 +11683,15 @@ function buildDockerRunArgs(ctx, imageName, devMode) {
   args.push("-w", "/workspace");
   const configPermission = ctx.config["config-permission"] ?? DEFAULT_CONFIG_PERMISSION;
   const llmistDir = expandHome("~/.llmist");
-  args.push("-v", `${llmistDir}:/root/.llmist:${configPermission}`);
-  if (devMode.enabled && devMode.sourcePath) {
-    const expandedSource = expandHome(devMode.sourcePath);
-    args.push("-v", `${expandedSource}:${DEV_SOURCE_MOUNT_TARGET}:ro`);
+  const cliTomlPath = `${llmistDir}/cli.toml`;
+  if ((0, import_node_fs5.existsSync)(cliTomlPath)) {
+    args.push("-v", `${cliTomlPath}:/root/.llmist/cli.toml:${configPermission}`);
+  }
+  const gadgetsDir = `${llmistDir}/gadgets`;
+  if ((0, import_node_fs5.existsSync)(gadgetsDir)) {
+    args.push("-v", `${gadgetsDir}:/root/.llmist/gadgets:${configPermission}`);
   }
+  args.push("-v", `${GADGET_CACHE_VOLUME}:/root/.llmist/gadget-cache`);
   if (ctx.config.mounts) {
     for (const mount of ctx.config.mounts) {
       const source = expandHome(mount.source);
@@ -11771,7 +11718,7 @@ function buildDockerRunArgs(ctx, imageName, devMode) {
   return args;
 }
 function filterDockerArgs(argv) {
-  const dockerFlags = /* @__PURE__ */ new Set(["--docker", "--docker-ro", "--no-docker", "--docker-dev"]);
+  const dockerFlags = /* @__PURE__ */ new Set(["--docker", "--docker-ro", "--no-docker"]);
   return argv.filter((arg) => !dockerFlags.has(arg));
 }
 function resolveDockerEnabled(config, options, profileDocker) {
@@ -11786,22 +11733,16 @@ function resolveDockerEnabled(config, options, profileDocker) {
   }
   return config?.enabled ?? false;
 }
-async function executeInDocker(ctx, devMode) {
+async function executeInDocker(ctx) {
   if (isInsideContainer()) {
-    console.error(
-      "Warning: Docker mode requested but already inside a container. Proceeding without re-containerization."
-    );
     throw new DockerSkipError();
   }
   const available = await checkDockerAvailable();
   if (!available) {
     throw new DockerUnavailableError();
   }
-  const dockerfile = resolveDockerfile(ctx.config, devMode.enabled);
-  const imageName = devMode.enabled ? DEV_IMAGE_NAME : ctx.config["image-name"] ?? DEFAULT_IMAGE_NAME;
-  if (devMode.enabled) {
-    console.error(`[dev mode] Mounting source from ${devMode.sourcePath}`);
-  }
+  const dockerfile = resolveDockerfile(ctx.config);
+  const imageName = ctx.config["image-name"] ?? DEFAULT_IMAGE_NAME;
   try {
     await ensureImage(imageName, dockerfile);
   } catch (error) {
@@ -11812,7 +11753,7 @@ async function executeInDocker(ctx, devMode) {
     }
     throw error;
   }
-  const dockerArgs = buildDockerRunArgs(ctx, imageName, devMode);
+  const dockerArgs = buildDockerRunArgs(ctx, imageName);
   const proc = Bun.spawn(["docker", ...dockerArgs], {
     stdin: "inherit",
     stdout: "inherit",
@@ -11833,7 +11774,7 @@ function createDockerContext(config, options, argv, cwd, profileCwdPermission) {
 
 // src/cli/file-utils.ts
 var import_promises3 = require("fs/promises");
-var import_node_path7 = require("path");
+var import_node_path6 = require("path");
 init_input_content();
 var DEFAULT_MAX_FILE_SIZE = 50 * 1024 * 1024;
 function formatFileSize(bytes) {
@@ -11851,7 +11792,7 @@ async function checkFileSize(absolutePath, filePath, maxSize) {
   }
 }
 async function readImageFile(filePath, options = {}) {
-  const absolutePath = (0, import_node_path7.resolve)(filePath);
+  const absolutePath = (0, import_node_path6.resolve)(filePath);
   const maxFileSize = options.maxFileSize ?? DEFAULT_MAX_FILE_SIZE;
   let buffer;
   try {
@@ -11870,7 +11811,7 @@ async function readImageFile(filePath, options = {}) {
   return imageFromBuffer(buffer, mimeType);
 }
 async function readAudioFile(filePath, options = {}) {
-  const absolutePath = (0, import_node_path7.resolve)(filePath);
+  const absolutePath = (0, import_node_path6.resolve)(filePath);
   const maxFileSize = options.maxFileSize ?? DEFAULT_MAX_FILE_SIZE;
   let buffer;
   try {
@@ -11889,7 +11830,7 @@ async function readAudioFile(filePath, options = {}) {
   return audioFromBuffer(buffer, mimeType);
 }
 async function readFileBuffer(filePath, options = {}) {
-  const absolutePath = (0, import_node_path7.resolve)(filePath);
+  const absolutePath = (0, import_node_path6.resolve)(filePath);
   const maxFileSize = options.maxFileSize ?? DEFAULT_MAX_FILE_SIZE;
   try {
     await checkFileSize(absolutePath, filePath, maxFileSize);
@@ -11902,7 +11843,7 @@ async function readFileBuffer(filePath, options = {}) {
 
 // src/cli/gadgets.ts
 var import_node_fs11 = __toESM(require("fs"), 1);
-var import_node_path12 = __toESM(require("path"), 1);
+var import_node_path11 = __toESM(require("path"), 1);
 var import_node_url2 = require("url");
 init_gadget();
 
@@ -11982,7 +11923,7 @@ init_gadget();
 
 // src/cli/builtins/filesystem/utils.ts
 var import_node_fs6 = __toESM(require("fs"), 1);
-var import_node_path8 = __toESM(require("path"), 1);
+var import_node_path7 = __toESM(require("path"), 1);
 var PathSandboxException = class extends Error {
   constructor(inputPath, reason) {
     super(`Path access denied: ${inputPath}. ${reason}`);
@@ -11991,7 +11932,7 @@ var PathSandboxException = class extends Error {
 };
 function validatePathIsWithinCwd(inputPath) {
   const cwd = process.cwd();
-  const resolvedPath = import_node_path8.default.resolve(cwd, inputPath);
+  const resolvedPath = import_node_path7.default.resolve(cwd, inputPath);
   let finalPath;
   try {
     finalPath = import_node_fs6.default.realpathSync(resolvedPath);
@@ -12003,7 +11944,7 @@ function validatePathIsWithinCwd(inputPath) {
       throw error;
     }
   }
-  const cwdWithSep = cwd + import_node_path8.default.sep;
+  const cwdWithSep = cwd + import_node_path7.default.sep;
   if (!finalPath.startsWith(cwdWithSep) && finalPath !== cwd) {
     throw new PathSandboxException(inputPath, "Path is outside the current working directory");
   }
@@ -12106,15 +12047,15 @@ error: ${message}`;
 
 // src/cli/builtins/filesystem/list-directory.ts
 var import_node_fs7 = __toESM(require("fs"), 1);
-var import_node_path9 = __toESM(require("path"), 1);
+var import_node_path8 = __toESM(require("path"), 1);
 var import_zod5 = require("zod");
 function listFiles(dirPath, basePath = dirPath, maxDepth = 1, currentDepth = 1) {
   const entries = [];
   try {
     const items = import_node_fs7.default.readdirSync(dirPath);
     for (const item of items) {
-      const fullPath = import_node_path9.default.join(dirPath, item);
-      const relativePath = import_node_path9.default.relative(basePath, fullPath);
+      const fullPath = import_node_path8.default.join(dirPath, item);
+      const relativePath = import_node_path8.default.relative(basePath, fullPath);
       try {
         const stats = import_node_fs7.default.lstatSync(fullPath);
         let type;
@@ -12258,7 +12199,7 @@ ${content}`;
 
 // src/cli/builtins/filesystem/write-file.ts
 var import_node_fs9 = __toESM(require("fs"), 1);
-var import_node_path10 = __toESM(require("path"), 1);
+var import_node_path9 = __toESM(require("path"), 1);
 var import_zod7 = require("zod");
 var writeFile2 = createGadget({
   name: "WriteFile",
@@ -12293,7 +12234,7 @@ console.log(\`Server running on http://localhost:\${port}\`);`
   ],
   execute: ({ filePath, content }) => {
     const validatedPath = validatePathIsWithinCwd(filePath);
-    const parentDir = import_node_path10.default.dirname(validatedPath);
+    const parentDir = import_node_path9.default.dirname(validatedPath);
     let createdDir = false;
     if (!import_node_fs9.default.existsSync(parentDir)) {
       validatePathIsWithinCwd(parentDir);
@@ -12302,7 +12243,7 @@ console.log(\`Server running on http://localhost:\${port}\`);`
     }
     import_node_fs9.default.writeFileSync(validatedPath, content, "utf-8");
     const bytesWritten = Buffer.byteLength(content, "utf-8");
-    const dirNote = createdDir ? ` (created directory: ${import_node_path10.default.dirname(filePath)})` : "";
+    const dirNote = createdDir ? ` (created directory: ${import_node_path9.default.dirname(filePath)})` : "";
     return `path=${filePath}
 
 Wrote ${bytesWritten} bytes${dirNote}`;
@@ -12431,10 +12372,10 @@ function isBuiltinGadgetName(name) {
 // src/cli/external-gadgets.ts
 var import_node_child_process = require("child_process");
 var import_node_fs10 = __toESM(require("fs"), 1);
-var import_node_path11 = __toESM(require("path"), 1);
+var import_node_path10 = __toESM(require("path"), 1);
 var import_node_os5 = __toESM(require("os"), 1);
 var import_node_url = require("url");
-var CACHE_DIR2 = import_node_path11.default.join(import_node_os5.default.homedir(), ".llmist", "gadget-cache");
+var CACHE_DIR2 = import_node_path10.default.join(import_node_os5.default.homedir(), ".llmist", "gadget-cache");
 function isExternalPackageSpecifier(specifier) {
   if (/^@?[a-z0-9][\w.-]*(?:@[\w.-]+)?(?::[a-z]+)?(?:\/\w+)?$/i.test(specifier)) {
     return true;
@@ -12472,13 +12413,13 @@ function parseGadgetSpecifier(specifier) {
 function getCacheDir(spec) {
   const versionSuffix = spec.version ? `@${spec.version}` : "@latest";
   if (spec.type === "npm") {
-    return import_node_path11.default.join(CACHE_DIR2, "npm", `${spec.package}${versionSuffix}`);
+    return import_node_path10.default.join(CACHE_DIR2, "npm", `${spec.package}${versionSuffix}`);
   }
   const sanitizedUrl = spec.package.replace(/[/:]/g, "-").replace(/^-+|-+$/g, "");
-  return import_node_path11.default.join(CACHE_DIR2, "git", `${sanitizedUrl}${versionSuffix}`);
+  return import_node_path10.default.join(CACHE_DIR2, "git", `${sanitizedUrl}${versionSuffix}`);
 }
 function isCached(cacheDir) {
-  const packageJsonPath = import_node_path11.default.join(cacheDir, "package.json");
+  const packageJsonPath = import_node_path10.default.join(cacheDir, "package.json");
   return import_node_fs10.default.existsSync(packageJsonPath);
 }
 async function installNpmPackage(spec, cacheDir) {
@@ -12488,10 +12429,10 @@ async function installNpmPackage(spec, cacheDir) {
     private: true,
     type: "module"
   };
-  import_node_fs10.default.writeFileSync(import_node_path11.default.join(cacheDir, "package.json"), JSON.stringify(packageJson, null, 2));
+  import_node_fs10.default.writeFileSync(import_node_path10.default.join(cacheDir, "package.json"), JSON.stringify(packageJson, null, 2));
   const packageSpec = spec.version ? `${spec.package}@${spec.version}` : spec.package;
   try {
-    (0, import_node_child_process.execSync)(`npm install --prefix "${cacheDir}" "${packageSpec}" --save`, {
+    (0, import_node_child_process.execSync)(`bun add "${packageSpec}"`, {
       stdio: "pipe",
       cwd: cacheDir
     });
@@ -12501,7 +12442,7 @@ async function installNpmPackage(spec, cacheDir) {
   }
 }
 async function installGitPackage(spec, cacheDir) {
-  import_node_fs10.default.mkdirSync(import_node_path11.default.dirname(cacheDir), { recursive: true });
+  import_node_fs10.default.mkdirSync(import_node_path10.default.dirname(cacheDir), { recursive: true });
   if (import_node_fs10.default.existsSync(cacheDir)) {
     try {
       (0, import_node_child_process.execSync)("git fetch", { cwd: cacheDir, stdio: "pipe" });
@@ -12520,17 +12461,17 @@ async function installGitPackage(spec, cacheDir) {
       const message = error instanceof Error ? error.message : String(error);
       throw new Error(`Failed to clone git repository '${spec.package}': ${message}`);
     }
-    if (import_node_fs10.default.existsSync(import_node_path11.default.join(cacheDir, "package.json"))) {
+    if (import_node_fs10.default.existsSync(import_node_path10.default.join(cacheDir, "package.json"))) {
       try {
-        (0, import_node_child_process.execSync)("npm install", { cwd: cacheDir, stdio: "pipe" });
+        (0, import_node_child_process.execSync)("bun install", { cwd: cacheDir, stdio: "inherit" });
       } 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(import_node_fs10.default.readFileSync(import_node_path11.default.join(cacheDir, "package.json"), "utf-8"));
+        const packageJson = JSON.parse(import_node_fs10.default.readFileSync(import_node_path10.default.join(cacheDir, "package.json"), "utf-8"));
         if (packageJson.scripts?.build) {
-          (0, import_node_child_process.execSync)("npm run build", { cwd: cacheDir, stdio: "pipe" });
+          (0, import_node_child_process.execSync)("bun run build", { cwd: cacheDir, stdio: "inherit" });
         }
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -12540,7 +12481,7 @@ async function installGitPackage(spec, cacheDir) {
   }
 }
 function readManifest(packageDir) {
-  const packageJsonPath = import_node_path11.default.join(packageDir, "package.json");
+  const packageJsonPath = import_node_path10.default.join(packageDir, "package.json");
   if (!import_node_fs10.default.existsSync(packageJsonPath)) {
     return null;
   }
@@ -12552,7 +12493,7 @@ function readManifest(packageDir) {
   }
 }
 function getPackagePath(cacheDir, packageName) {
-  const nodeModulesPath = import_node_path11.default.join(cacheDir, "node_modules", packageName);
+  const nodeModulesPath = import_node_path10.default.join(cacheDir, "node_modules", packageName);
   if (import_node_fs10.default.existsSync(nodeModulesPath)) {
     return nodeModulesPath;
   }
@@ -12596,7 +12537,7 @@ async function loadExternalGadgets(specifier, forceInstall = false) {
   } else {
     entryPoint = manifest?.gadgets || "./dist/index.js";
   }
-  const resolvedEntryPoint = import_node_path11.default.resolve(packagePath, entryPoint);
+  const resolvedEntryPoint = import_node_path10.default.resolve(packagePath, entryPoint);
   if (!import_node_fs10.default.existsSync(resolvedEntryPoint)) {
     throw new Error(
       `Entry point not found: ${resolvedEntryPoint}. Make sure the package is built (run 'npm run build' in the package directory).`
@@ -12665,10 +12606,10 @@ function expandHomePath(input) {
   if (!home) {
     return input;
   }
-  return import_node_path12.default.join(home, input.slice(1));
+  return import_node_path11.default.join(home, input.slice(1));
 }
 function isFileLikeSpecifier(specifier) {
-  return PATH_PREFIXES.some((prefix) => specifier.startsWith(prefix)) || specifier.includes(import_node_path12.default.sep);
+  return PATH_PREFIXES.some((prefix) => specifier.startsWith(prefix)) || specifier.includes(import_node_path11.default.sep);
 }
 function tryResolveBuiltin(specifier) {
   if (specifier.startsWith(BUILTIN_PREFIX)) {
@@ -12691,7 +12632,7 @@ function resolveGadgetSpecifier(specifier, cwd) {
     return specifier;
   }
   const expanded = expandHomePath(specifier);
-  const resolvedPath = import_node_path12.default.resolve(cwd, expanded);
+  const resolvedPath = import_node_path11.default.resolve(cwd, expanded);
   if (!import_node_fs11.default.existsSync(resolvedPath)) {
     throw new Error(`Gadget module not found at ${resolvedPath}`);
   }
@@ -12776,12 +12717,12 @@ async function loadGadgets(specifiers, cwd, importer = (specifier) => import(spe
 // src/cli/llm-logging.ts
 var import_promises4 = require("fs/promises");
 var import_node_os6 = require("os");
-var import_node_path13 = require("path");
+var import_node_path12 = require("path");
 init_messages();
-var DEFAULT_LLM_LOG_DIR = (0, import_node_path13.join)((0, import_node_os6.homedir)(), ".llmist", "logs");
+var DEFAULT_LLM_LOG_DIR = (0, import_node_path12.join)((0, import_node_os6.homedir)(), ".llmist", "logs");
 function resolveLogDir(option, subdir) {
   if (option === true) {
-    return (0, import_node_path13.join)(DEFAULT_LLM_LOG_DIR, subdir);
+    return (0, import_node_path12.join)(DEFAULT_LLM_LOG_DIR, subdir);
   }
   if (typeof option === "string") {
     return option;
@@ -12799,7 +12740,7 @@ function formatLlmRequest(messages) {
 }
 async function writeLogFile(dir, filename, content) {
   await (0, import_promises4.mkdir)(dir, { recursive: true });
-  await (0, import_promises4.writeFile)((0, import_node_path13.join)(dir, filename), content, "utf-8");
+  await (0, import_promises4.writeFile)((0, import_node_path12.join)(dir, filename), content, "utf-8");
 }
 function formatSessionTimestamp(date = /* @__PURE__ */ new Date()) {
   const pad = (n) => n.toString().padStart(2, "0");
@@ -12813,7 +12754,7 @@ function formatSessionTimestamp(date = /* @__PURE__ */ new Date()) {
 }
 async function createSessionDir(baseDir) {
   const timestamp = formatSessionTimestamp();
-  const sessionDir = (0, import_node_path13.join)(baseDir, timestamp);
+  const sessionDir = (0, import_node_path12.join)(baseDir, timestamp);
   try {
     await (0, import_promises4.mkdir)(sessionDir, { recursive: true });
     return sessionDir;
@@ -12906,6 +12847,45 @@ function formatCost(cost) {
   }
   return cost.toFixed(2);
 }
+function formatLLMCallLine(info) {
+  const parts = [];
+  parts.push(`${import_chalk3.default.cyan(`#${info.iteration}`)} ${import_chalk3.default.magenta(info.model)}`);
+  if (info.contextPercent !== void 0 && info.contextPercent !== null) {
+    const formatted = `${Math.round(info.contextPercent)}%`;
+    if (info.contextPercent >= 80) {
+      parts.push(import_chalk3.default.red(formatted));
+    } else if (info.contextPercent >= 50) {
+      parts.push(import_chalk3.default.yellow(formatted));
+    } else {
+      parts.push(import_chalk3.default.green(formatted));
+    }
+  }
+  if (info.inputTokens && info.inputTokens > 0) {
+    const prefix = info.estimated?.input ? "~" : "";
+    parts.push(import_chalk3.default.dim("\u2191") + import_chalk3.default.yellow(` ${prefix}${formatTokens(info.inputTokens)}`));
+  }
+  if (info.cachedInputTokens && info.cachedInputTokens > 0) {
+    parts.push(import_chalk3.default.dim("\u27F3") + import_chalk3.default.blue(` ${formatTokens(info.cachedInputTokens)}`));
+  }
+  if (info.outputTokens !== void 0 && info.outputTokens > 0 || info.isStreaming) {
+    const prefix = info.estimated?.output ? "~" : "";
+    parts.push(import_chalk3.default.dim("\u2193") + import_chalk3.default.green(` ${prefix}${formatTokens(info.outputTokens ?? 0)}`));
+  }
+  parts.push(import_chalk3.default.dim(`${info.elapsedSeconds.toFixed(1)}s`));
+  if (info.cost !== void 0 && info.cost > 0) {
+    parts.push(import_chalk3.default.cyan(`$${formatCost(info.cost)}`));
+  }
+  if (info.isStreaming && info.spinner) {
+    parts.push(import_chalk3.default.cyan(info.spinner));
+  } else if (info.finishReason !== void 0) {
+    if (!info.finishReason || info.finishReason === "stop" || info.finishReason === "end_turn") {
+      parts.push(import_chalk3.default.green("\u2713"));
+    } else {
+      parts.push(import_chalk3.default.yellow(info.finishReason));
+    }
+  }
+  return parts.join(import_chalk3.default.dim(" | "));
+}
 function renderSummary(metadata) {
   const parts = [];
   if (metadata.iterations !== void 0) {
@@ -13012,6 +12992,34 @@ function formatParametersInline(params, maxWidth) {
     return `${import_chalk3.default.dim(key)}${import_chalk3.default.dim("=")}${import_chalk3.default.cyan(formatted)}`;
   }).join(import_chalk3.default.dim(", "));
 }
+function formatGadgetLine(info, maxWidth) {
+  const terminalWidth = maxWidth ?? process.stdout.columns ?? 80;
+  const gadgetLabel = import_chalk3.default.magenta.bold(info.name);
+  const timeStr = `${info.elapsedSeconds.toFixed(1)}s`;
+  const timeLabel = import_chalk3.default.dim(timeStr);
+  const fixedLength = 2 + info.name.length + 2 + 1 + timeStr.length;
+  const availableForParams = Math.max(40, terminalWidth - fixedLength - 2);
+  const paramsStr = formatParametersInline(info.parameters, availableForParams);
+  const paramsLabel = paramsStr ? `${import_chalk3.default.dim("(")}${paramsStr}${import_chalk3.default.dim(")")}` : "";
+  if (info.error) {
+    const errorMsg = info.error.length > 50 ? `${info.error.slice(0, 50)}\u2026` : info.error;
+    return `${import_chalk3.default.red("\u2717")} ${gadgetLabel}${paramsLabel} ${import_chalk3.default.red("error:")} ${errorMsg} ${timeLabel}`;
+  }
+  if (!info.isComplete) {
+    return `${import_chalk3.default.blue("\u23F5")} ${gadgetLabel}${paramsLabel} ${timeLabel}`;
+  }
+  let outputStr;
+  if (info.tokenCount !== void 0 && info.tokenCount > 0) {
+    outputStr = `${formatTokens(info.tokenCount)} tokens`;
+  } else if (info.outputBytes !== void 0 && info.outputBytes > 0) {
+    outputStr = formatBytes(info.outputBytes);
+  } else {
+    outputStr = "";
+  }
+  const icon = info.breaksLoop ? import_chalk3.default.yellow("\u23F9") : import_chalk3.default.green("\u2713");
+  const outputLabel = outputStr ? ` ${import_chalk3.default.dim("\u2192")} ${import_chalk3.default.green(outputStr)}` : "";
+  return `${icon} ${gadgetLabel}${paramsLabel}${outputLabel} ${timeLabel}`;
+}
 function formatBytes(bytes) {
   if (bytes < 1024) {
     return `${bytes} bytes`;
@@ -13290,11 +13298,35 @@ var StreamProgress = class {
   }
   /**
    * Update a nested agent with completion info (called when nested llm_call_end event received).
+   * Records completion time to freeze the elapsed timer.
+   * @param info - Full LLM call info including tokens, cache details, and cost
    */
-  updateNestedAgent(id, outputTokens) {
+  updateNestedAgent(id, info) {
     const agent = this.nestedAgents.get(id);
     if (agent) {
-      agent.outputTokens = outputTokens;
+      agent.inputTokens = info.inputTokens;
+      agent.outputTokens = info.outputTokens;
+      agent.cachedInputTokens = info.cachedInputTokens;
+      agent.cacheCreationInputTokens = info.cacheCreationInputTokens;
+      agent.finishReason = info.finishReason;
+      if (info.cost !== void 0) {
+        agent.cost = info.cost;
+      } else if (this.modelRegistry && agent.model && info.outputTokens) {
+        try {
+          const modelName = agent.model.includes(":") ? agent.model.split(":")[1] : agent.model;
+          const costResult = this.modelRegistry.estimateCost(
+            modelName,
+            info.inputTokens ?? 0,
+            info.outputTokens,
+            info.cachedInputTokens,
+            info.cacheCreationInputTokens
+          );
+          agent.cost = costResult?.totalCost;
+        } catch {
+        }
+      }
+      agent.completed = true;
+      agent.completedTime = Date.now();
       if (this.isRunning && this.isTTY) {
         this.render();
       }
@@ -13312,11 +13344,12 @@ var StreamProgress = class {
   /**
    * Add a nested gadget call (called when nested gadget_call event received).
    */
-  addNestedGadget(id, depth, parentInvocationId, name) {
+  addNestedGadget(id, depth, parentInvocationId, name, parameters) {
     this.nestedGadgets.set(id, {
       depth,
       parentInvocationId,
       name,
+      parameters,
       startTime: Date.now()
     });
     if (this.isRunning && this.isTTY) {
@@ -13334,11 +13367,13 @@ var StreamProgress = class {
   }
   /**
    * Mark a nested gadget as completed (keeps it visible with ✓ indicator).
+   * Records completion time to freeze the elapsed timer.
    */
   completeNestedGadget(id) {
     const gadget = this.nestedGadgets.get(id);
     if (gadget) {
       gadget.completed = true;
+      gadget.completedTime = Date.now();
       if (this.isRunning && this.isTTY) {
         this.render();
       }
@@ -13480,25 +13515,73 @@ var StreamProgress = class {
     }
     if (this.isTTY) {
       for (const [gadgetId, gadget] of this.inFlightGadgets) {
-        const elapsed = ((Date.now() - gadget.startTime) / 1e3).toFixed(1);
-        const gadgetLine = `  ${import_chalk4.default.blue("\u23F5")} ${import_chalk4.default.magenta.bold(gadget.name)}${import_chalk4.default.dim("(...)")} ${import_chalk4.default.dim(elapsed + "s")}`;
+        const elapsedSeconds = (Date.now() - gadget.startTime) / 1e3;
+        const gadgetLine = `  ${formatGadgetLine({
+          name: gadget.name,
+          parameters: gadget.params,
+          elapsedSeconds,
+          isComplete: false
+        })}`;
         lines.push(gadgetLine);
+        const nestedOps = [];
         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 ? ` ${import_chalk4.default.dim("\u2191")}${import_chalk4.default.yellow(formatTokens(nested.inputTokens))}` : "";
-          const outTokens = nested.outputTokens ? ` ${import_chalk4.default.dim("\u2193")}${import_chalk4.default.green(formatTokens(nested.outputTokens))}` : "";
-          const nestedLine = `${indent}${import_chalk4.default.cyan(`#${nested.iteration}`)} ${import_chalk4.default.dim(nested.model)}${tokens}${outTokens} ${import_chalk4.default.dim(nestedElapsed + "s")} ${import_chalk4.default.cyan(spinner)}`;
-          lines.push(nestedLine);
-        }
-        for (const [nestedId, nestedGadget] of this.nestedGadgets) {
+          if (nested.parentInvocationId === gadgetId) {
+            nestedOps.push({
+              type: "agent",
+              startTime: nested.startTime,
+              depth: nested.depth,
+              iteration: nested.iteration,
+              model: nested.model,
+              inputTokens: nested.inputTokens,
+              cachedInputTokens: nested.cachedInputTokens,
+              outputTokens: nested.outputTokens,
+              cost: nested.cost,
+              finishReason: nested.finishReason,
+              completed: nested.completed,
+              completedTime: nested.completedTime
+            });
+          }
+        }
+        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 icon = nestedGadget.completed ? import_chalk4.default.green("\u2713") : import_chalk4.default.blue("\u23F5");
-            const nestedGadgetLine = `${indent}${icon} ${import_chalk4.default.dim(nestedGadget.name + "(...)")} ${import_chalk4.default.dim(nestedElapsed + "s")}`;
-            lines.push(nestedGadgetLine);
+            nestedOps.push({
+              type: "gadget",
+              startTime: nestedGadget.startTime,
+              depth: nestedGadget.depth,
+              name: nestedGadget.name,
+              parameters: nestedGadget.parameters,
+              completed: nestedGadget.completed,
+              completedTime: nestedGadget.completedTime
+            });
+          }
+        }
+        nestedOps.sort((a, b) => a.startTime - b.startTime);
+        for (const op of nestedOps) {
+          const indent = "  ".repeat(op.depth + 1);
+          const endTime = op.completedTime ?? Date.now();
+          const elapsedSeconds2 = (endTime - op.startTime) / 1e3;
+          if (op.type === "agent") {
+            const line = formatLLMCallLine({
+              iteration: op.iteration ?? 0,
+              model: op.model ?? "",
+              inputTokens: op.inputTokens,
+              cachedInputTokens: op.cachedInputTokens,
+              outputTokens: op.outputTokens,
+              elapsedSeconds: elapsedSeconds2,
+              cost: op.cost,
+              finishReason: op.completed ? op.finishReason ?? "stop" : void 0,
+              isStreaming: !op.completed,
+              spinner
+            });
+            lines.push(`${indent}${line}`);
+          } else {
+            const line = formatGadgetLine({
+              name: op.name ?? "",
+              parameters: op.parameters,
+              elapsedSeconds: elapsedSeconds2,
+              isComplete: op.completed ?? false
+            });
+            lines.push(`${indent}${line}`);
           }
         }
       }
@@ -13520,42 +13603,27 @@ var StreamProgress = class {
   }
   /**
    * Format the streaming mode progress line (returns string, doesn't write).
+   * Uses the shared formatLLMCallLine() function for consistent formatting
+   * between main agent and nested subagent displays.
    */
   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 = [];
-    const iterPart = import_chalk4.default.cyan(`#${this.currentIteration}`);
-    if (this.model) {
-      parts.push(`${iterPart} ${import_chalk4.default.magenta(this.model)}`);
-    } else {
-      parts.push(iterPart);
-    }
-    const usagePercent = this.getContextUsagePercent();
-    if (usagePercent !== null) {
-      const formatted = `${Math.round(usagePercent)}%`;
-      if (usagePercent >= 80) {
-        parts.push(import_chalk4.default.red(formatted));
-      } else if (usagePercent >= 50) {
-        parts.push(import_chalk4.default.yellow(formatted));
-      } else {
-        parts.push(import_chalk4.default.green(formatted));
+    return formatLLMCallLine({
+      iteration: this.currentIteration,
+      model: this.model ?? "",
+      inputTokens: this.callInputTokens,
+      cachedInputTokens: this.callCachedInputTokens,
+      outputTokens: outTokens,
+      elapsedSeconds: (Date.now() - this.callStartTime) / 1e3,
+      cost: this.calculateCurrentCallCost(outTokens),
+      isStreaming: true,
+      spinner,
+      contextPercent: this.getContextUsagePercent(),
+      estimated: {
+        input: this.callInputTokensEstimated,
+        output: this.callOutputTokensEstimated
       }
-    }
-    if (this.callInputTokens > 0) {
-      const prefix = this.callInputTokensEstimated ? "~" : "";
-      parts.push(import_chalk4.default.dim("\u2191") + import_chalk4.default.yellow(` ${prefix}${formatTokens(this.callInputTokens)}`));
-    }
-    if (this.isStreaming || outTokens > 0) {
-      const prefix = this.callOutputTokensEstimated ? "~" : "";
-      parts.push(import_chalk4.default.dim("\u2193") + import_chalk4.default.green(` ${prefix}${formatTokens(outTokens)}`));
-    }
-    parts.push(import_chalk4.default.dim(`${elapsed}s`));
-    const callCost = this.calculateCurrentCallCost(outTokens);
-    if (callCost > 0) {
-      parts.push(import_chalk4.default.cyan(`$${formatCost(callCost)}`));
-    }
-    return `${parts.join(import_chalk4.default.dim(" | "))} ${import_chalk4.default.cyan(spinner)}`;
+    });
   }
   /**
    * Calculates live cost estimate for the current streaming call.
@@ -13783,7 +13851,7 @@ function addAgentOptions(cmd, defaults) {
     OPTION_FLAGS.logLlmRequests,
     OPTION_DESCRIPTIONS.logLlmRequests,
     defaults?.["log-llm-requests"]
-  ).option(OPTION_FLAGS.inputImage, OPTION_DESCRIPTIONS.inputImage).option(OPTION_FLAGS.inputAudio, OPTION_DESCRIPTIONS.inputAudio).option(OPTION_FLAGS.docker, OPTION_DESCRIPTIONS.docker).option(OPTION_FLAGS.dockerRo, OPTION_DESCRIPTIONS.dockerRo).option(OPTION_FLAGS.noDocker, OPTION_DESCRIPTIONS.noDocker).option(OPTION_FLAGS.dockerDev, OPTION_DESCRIPTIONS.dockerDev);
+  ).option(OPTION_FLAGS.inputImage, OPTION_DESCRIPTIONS.inputImage).option(OPTION_FLAGS.inputAudio, OPTION_DESCRIPTIONS.inputAudio).option(OPTION_FLAGS.docker, OPTION_DESCRIPTIONS.docker).option(OPTION_FLAGS.dockerRo, OPTION_DESCRIPTIONS.dockerRo).option(OPTION_FLAGS.noDocker, OPTION_DESCRIPTIONS.noDocker);
 }
 function configToCompleteOptions(config) {
   const result = {};
@@ -13860,8 +13928,7 @@ async function executeAgent(promptArg, options, env) {
   const dockerOptions = {
     docker: options.docker ?? false,
     dockerRo: options.dockerRo ?? false,
-    noDocker: options.noDocker ?? false,
-    dockerDev: options.dockerDev ?? false
+    noDocker: options.noDocker ?? false
   };
   const dockerEnabled = resolveDockerEnabled(
     env.dockerConfig,
@@ -13870,7 +13937,6 @@ async function executeAgent(promptArg, options, env) {
     // Profile-level docker: true/false
   );
   if (dockerEnabled) {
-    const devMode = resolveDevMode(env.dockerConfig, dockerOptions.dockerDev);
     const ctx = createDockerContext(
       env.dockerConfig,
       dockerOptions,
@@ -13881,7 +13947,7 @@ async function executeAgent(promptArg, options, env) {
       // Profile-level CWD permission override
     );
     try {
-      await executeInDocker(ctx, devMode);
+      await executeInDocker(ctx);
     } catch (error) {
       if (error instanceof DockerSkipError) {
       } else {
@@ -13908,9 +13974,18 @@ async function executeAgent(promptArg, options, env) {
       registry.registerByClass(gadget);
     }
   }
+  if (!options.quiet) {
+    const allNames = registry.getAll().map((g) => g.name).join(", ");
+    env.stderr.write(import_chalk5.default.dim(`Gadgets: ${allNames}
+`));
+  }
   const printer = new StreamPrinter(env.stdout);
   const stderrTTY = env.stderr.isTTY === true;
-  const progress = new StreamProgress(env.stderr, stderrTTY, client.modelRegistry);
+  const progress = new StreamProgress(
+    env.stderr,
+    stderrTTY,
+    client.modelRegistry
+  );
   const abortController = new AbortController();
   let wasCancelled = false;
   let isStreaming = false;
@@ -13920,9 +13995,11 @@ async function executeAgent(promptArg, options, env) {
       wasCancelled = true;
       abortController.abort();
       progress.pause();
-      env.stderr.write(import_chalk5.default.yellow(`
+      env.stderr.write(
+        import_chalk5.default.yellow(`
 [Cancelled] ${progress.formatStats()}
-`));
+`)
+      );
     } else {
       handleQuit();
     }
@@ -13932,7 +14009,11 @@ async function executeAgent(promptArg, options, env) {
     cleanupSigint: null,
     restore: () => {
       if (stdinIsInteractive && stdinStream.isTTY && !wasCancelled) {
-        keyboard.cleanupEsc = createEscKeyListener(stdinStream, handleCancel, handleCancel);
+        keyboard.cleanupEsc = createEscKeyListener(
+          stdinStream,
+          handleCancel,
+          handleCancel
+        );
       }
     }
   };
@@ -13957,7 +14038,11 @@ async function executeAgent(promptArg, options, env) {
     process.exit(130);
   };
   if (stdinIsInteractive && stdinStream.isTTY) {
-    keyboard.cleanupEsc = createEscKeyListener(stdinStream, handleCancel, handleCancel);
+    keyboard.cleanupEsc = createEscKeyListener(
+      stdinStream,
+      handleCancel,
+      handleCancel
+    );
   }
   keyboard.cleanupSigint = createSigintListener(
     handleCancel,
@@ -13983,7 +14068,12 @@ async function executeAgent(promptArg, options, env) {
     gadgetApprovals,
     defaultMode: "allowed"
   };
-  const approvalManager = new ApprovalManager(approvalConfig, env, progress, keyboard);
+  const approvalManager = new ApprovalManager(
+    approvalConfig,
+    env,
+    progress,
+    keyboard
+  );
   let usage;
   let iterations = 0;
   const llmLogsBaseDir = resolveLogDir(options.logLlmRequests, "requests");
@@ -13993,7 +14083,10 @@ async function executeAgent(promptArg, options, env) {
     try {
       return await client.countTokens(model, messages);
     } catch {
-      const totalChars = messages.reduce((sum, m) => sum + (m.content?.length ?? 0), 0);
+      const totalChars = messages.reduce(
+        (sum, m) => sum + (m.content?.length ?? 0),
+        0
+      );
       return Math.round(totalChars / FALLBACK_CHARS_PER_TOKEN);
     }
   };
@@ -14015,7 +14108,9 @@ async function executeAgent(promptArg, options, env) {
     observers: {
       // onLLMCallStart: Start progress indicator for each LLM call
       // This showcases how to react to agent lifecycle events
+      // Skip for subagent events (tracked separately via nested display)
       onLLMCallStart: async (context) => {
+        if (context.subagentContext) return;
         isStreaming = true;
         llmCallCounter++;
         const inputTokens = await countMessagesTokens(
@@ -14041,7 +14136,9 @@ async function executeAgent(promptArg, options, env) {
       },
       // onStreamChunk: Real-time updates as LLM generates tokens
       // This enables responsive UIs that show progress during generation
+      // Skip for subagent events (tracked separately via nested display)
       onStreamChunk: async (context) => {
+        if (context.subagentContext) return;
         progress.update(context.accumulatedText.length);
         if (context.usage) {
           if (context.usage.inputTokens) {
@@ -14058,7 +14155,9 @@ async function executeAgent(promptArg, options, env) {
       },
       // onLLMCallComplete: Finalize metrics after each LLM call
       // This is where you'd typically log metrics or update dashboards
+      // Skip progress updates for subagent events (tracked separately via nested display)
       onLLMCallComplete: async (context) => {
+        if (context.subagentContext) return;
         isStreaming = false;
         usage = context.usage;
         iterations = Math.max(iterations, context.iteration + 1);
@@ -14087,7 +14186,7 @@ async function executeAgent(promptArg, options, env) {
         }
         const callElapsed = progress.getCallElapsedSeconds();
         progress.endCall(context.usage);
-        if (!options.quiet) {
+        if (!options.quiet && !context.subagentContext) {
           const summary = renderSummary({
             iterations: context.iteration + 1,
             model: options.model,
@@ -14145,7 +14244,10 @@ ${ctx.gadgetName} is denied by configuration.`
           }
           return { action: "proceed" };
         }
-        const result = await approvalManager.requestApproval(ctx.gadgetName, ctx.parameters);
+        const result = await approvalManager.requestApproval(
+          ctx.gadgetName,
+          ctx.parameters
+        );
         if (!result.approved) {
           return {
             action: "skip",
@@ -14188,11 +14290,11 @@ Denied: ${result.reason ?? "by user"}`
   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?",
+      message: "\u{1F44B} Hello! I'm ready to help.\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?"
+    "\u2139\uFE0F  \u{1F44B} Hello! I'm ready to help.\n\nWhat would you like me to work on?"
   );
   builder.withTextOnlyHandler("acknowledge");
   builder.withTextWithGadgetsHandler({
@@ -14223,15 +14325,22 @@ Denied: ${result.reason ?? "by user"}`
       } else if (subagentEvent.type === "llm_call_end") {
         const info = subagentEvent.event;
         const subagentId = `${subagentEvent.gadgetInvocationId}:${info.iteration}`;
-        progress.updateNestedAgent(subagentId, info.outputTokens);
-        setTimeout(() => progress.removeNestedAgent(subagentId), 100);
+        progress.updateNestedAgent(subagentId, {
+          inputTokens: info.usage?.inputTokens ?? info.inputTokens,
+          outputTokens: info.usage?.outputTokens ?? info.outputTokens,
+          cachedInputTokens: info.usage?.cachedInputTokens,
+          cacheCreationInputTokens: info.usage?.cacheCreationInputTokens,
+          finishReason: info.finishReason,
+          cost: info.cost
+        });
       } else if (subagentEvent.type === "gadget_call") {
         const gadgetEvent = subagentEvent.event;
         progress.addNestedGadget(
           gadgetEvent.call.invocationId,
           subagentEvent.depth,
           subagentEvent.gadgetInvocationId,
-          gadgetEvent.call.gadgetName
+          gadgetEvent.call.gadgetName,
+          gadgetEvent.call.parameters
         );
       } else if (subagentEvent.type === "gadget_result") {
         const resultEvent = subagentEvent.event;
@@ -14330,7 +14439,10 @@ Denied: ${result.reason ?? "by user"}`
   }
 }
 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.");
+  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(() => {
@@ -14440,7 +14552,7 @@ function registerCompleteCommand(program, env, config) {
 
 // src/cli/init-command.ts
 var import_node_fs12 = require("fs");
-var import_node_path14 = require("path");
+var import_node_path13 = require("path");
 var STARTER_CONFIG = `# ~/.llmist/cli.toml
 # llmist CLI configuration file
 #
@@ -14496,7 +14608,7 @@ var STARTER_CONFIG = `# ~/.llmist/cli.toml
 `;
 async function executeInit(_options, env) {
   const configPath = getConfigPath();
-  const configDir = (0, import_node_path14.dirname)(configPath);
+  const configDir = (0, import_node_path13.dirname)(configPath);
   if ((0, import_node_fs12.existsSync)(configPath)) {
     env.stderr.write(`Configuration already exists at ${configPath}
 `);