llmist 4.0.0 → 5.1.0

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import "./chunk-Q6NQRMYD.js";
+import "./chunk-F5QK5YVI.js";
 import {
   AbstractGadget,
   AgentBuilder,
@@ -34,7 +34,7 @@ import {
   schemaToJSONSchema,
   text,
   validateGadgetSchema
-} from "./chunk-RHR2M6T6.js";
+} from "./chunk-YJKUWFIC.js";
 
 // src/cli/constants.ts
 var CLI_NAME = "llmist";
@@ -68,7 +68,6 @@ var OPTION_FLAGS = {
   docker: "--docker",
   dockerRo: "--docker-ro",
   noDocker: "--no-docker",
-  dockerDev: "--docker-dev",
   // Multimodal input options
   inputImage: "--image <path>",
   inputAudio: "--audio <path>",
@@ -103,7 +102,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'.",
@@ -123,7 +121,7 @@ import { Command, InvalidArgumentError as InvalidArgumentError2 } from "commande
 // package.json
 var package_default = {
   name: "llmist",
-  version: "3.1.0",
+  version: "5.1.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",
@@ -166,7 +164,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"
@@ -1525,20 +1524,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"]);
@@ -1650,12 +1646,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);
   }
@@ -1665,7 +1655,6 @@ function validateDockerConfig(raw, section) {
 // src/cli/docker/docker-wrapper.ts
 import { existsSync as existsSync4, readFileSync as readFileSync4 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { dirname, join as join3 } from "node:path";
 
 // src/cli/docker/dockerfile.ts
 var DEFAULT_DOCKERFILE = `# llmist sandbox image
@@ -1685,6 +1674,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
@@ -1702,37 +1695,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();
@@ -1794,10 +1758,13 @@ async function buildImage(imageName, dockerfile) {
   ensureCacheDir();
   const dockerfilePath = join2(CACHE_DIR, "Dockerfile");
   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();
@@ -1859,46 +1826,13 @@ function isInsideContainer() {
   }
   return false;
 }
-function autoDetectDevSource() {
-  const scriptPath = process.argv[1];
-  if (!scriptPath || !scriptPath.endsWith("src/cli.ts")) {
-    return void 0;
-  }
-  const srcDir = dirname(scriptPath);
-  const projectDir = dirname(srcDir);
-  const packageJsonPath = join3(projectDir, "package.json");
-  if (!existsSync4(packageJsonPath)) {
-    return void 0;
-  }
-  try {
-    const pkg = JSON.parse(readFileSync4(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(/^~/, homedir3());
   }
   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);
@@ -1912,11 +1846,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 (existsSync4(cliTomlPath)) {
+    args.push("-v", `${cliTomlPath}:/root/.llmist/cli.toml:${configPermission}`);
   }
+  const gadgetsDir = `${llmistDir}/gadgets`;
+  if (existsSync4(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);
@@ -1943,7 +1881,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) {
@@ -1958,22 +1896,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) {
@@ -1984,7 +1916,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",
@@ -2592,7 +2524,7 @@ async function installNpmPackage(spec, cacheDir) {
   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`, {
+    execSync(`bun add "${packageSpec}"`, {
       stdio: "pipe",
       cwd: cacheDir
     });
@@ -2623,7 +2555,7 @@ async function installGitPackage(spec, cacheDir) {
     }
     if (fs5.existsSync(path4.join(cacheDir, "package.json"))) {
       try {
-        execSync("npm install", { cwd: cacheDir, stdio: "pipe" });
+        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}`);
@@ -2631,7 +2563,7 @@ async function installGitPackage(spec, cacheDir) {
       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" });
+          execSync("bun run build", { cwd: cacheDir, stdio: "inherit" });
         }
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -2878,11 +2810,11 @@ async function loadGadgets(specifiers, cwd, importer = (specifier) => import(spe
 init_messages();
 import { mkdir, writeFile as writeFile2 } from "node:fs/promises";
 import { homedir as homedir4 } from "node:os";
-import { join as join4 } from "node:path";
-var DEFAULT_LLM_LOG_DIR = join4(homedir4(), ".llmist", "logs");
+import { join as join3 } from "node:path";
+var DEFAULT_LLM_LOG_DIR = join3(homedir4(), ".llmist", "logs");
 function resolveLogDir(option, subdir) {
   if (option === true) {
-    return join4(DEFAULT_LLM_LOG_DIR, subdir);
+    return join3(DEFAULT_LLM_LOG_DIR, subdir);
   }
   if (typeof option === "string") {
     return option;
@@ -2900,7 +2832,7 @@ function formatLlmRequest(messages) {
 }
 async function writeLogFile(dir, filename, content) {
   await mkdir(dir, { recursive: true });
-  await writeFile2(join4(dir, filename), content, "utf-8");
+  await writeFile2(join3(dir, filename), content, "utf-8");
 }
 function formatSessionTimestamp(date = /* @__PURE__ */ new Date()) {
   const pad = (n) => n.toString().padStart(2, "0");
@@ -2914,7 +2846,7 @@ function formatSessionTimestamp(date = /* @__PURE__ */ new Date()) {
 }
 async function createSessionDir(baseDir) {
   const timestamp = formatSessionTimestamp();
-  const sessionDir = join4(baseDir, timestamp);
+  const sessionDir = join3(baseDir, timestamp);
   try {
     await mkdir(sessionDir, { recursive: true });
     return sessionDir;
@@ -3007,6 +2939,45 @@ function formatCost(cost) {
   }
   return cost.toFixed(2);
 }
+function formatLLMCallLine(info) {
+  const parts = [];
+  parts.push(`${chalk3.cyan(`#${info.iteration}`)} ${chalk3.magenta(info.model)}`);
+  if (info.contextPercent !== void 0 && info.contextPercent !== null) {
+    const formatted = `${Math.round(info.contextPercent)}%`;
+    if (info.contextPercent >= 80) {
+      parts.push(chalk3.red(formatted));
+    } else if (info.contextPercent >= 50) {
+      parts.push(chalk3.yellow(formatted));
+    } else {
+      parts.push(chalk3.green(formatted));
+    }
+  }
+  if (info.inputTokens && info.inputTokens > 0) {
+    const prefix = info.estimated?.input ? "~" : "";
+    parts.push(chalk3.dim("\u2191") + chalk3.yellow(` ${prefix}${formatTokens(info.inputTokens)}`));
+  }
+  if (info.cachedInputTokens && info.cachedInputTokens > 0) {
+    parts.push(chalk3.dim("\u27F3") + chalk3.blue(` ${formatTokens(info.cachedInputTokens)}`));
+  }
+  if (info.outputTokens !== void 0 && info.outputTokens > 0 || info.isStreaming) {
+    const prefix = info.estimated?.output ? "~" : "";
+    parts.push(chalk3.dim("\u2193") + chalk3.green(` ${prefix}${formatTokens(info.outputTokens ?? 0)}`));
+  }
+  parts.push(chalk3.dim(`${info.elapsedSeconds.toFixed(1)}s`));
+  if (info.cost !== void 0 && info.cost > 0) {
+    parts.push(chalk3.cyan(`$${formatCost(info.cost)}`));
+  }
+  if (info.isStreaming && info.spinner) {
+    parts.push(chalk3.cyan(info.spinner));
+  } else if (info.finishReason !== void 0) {
+    if (!info.finishReason || info.finishReason === "stop" || info.finishReason === "end_turn") {
+      parts.push(chalk3.green("\u2713"));
+    } else {
+      parts.push(chalk3.yellow(info.finishReason));
+    }
+  }
+  return parts.join(chalk3.dim(" | "));
+}
 function renderSummary(metadata) {
   const parts = [];
   if (metadata.iterations !== void 0) {
@@ -3075,7 +3046,7 @@ function getRawValue(value) {
 function truncateValue(str, maxLen) {
   if (maxLen <= 0) return "";
   if (str.length <= maxLen) return str;
-  return `${str.slice(0, maxLen)}\u2026`;
+  return `${str.slice(0, maxLen - 1)}\u2026`;
 }
 function formatParametersInline(params, maxWidth) {
   if (!params || Object.keys(params).length === 0) {
@@ -3103,6 +3074,11 @@ function formatParametersInline(params, maxWidth) {
           const proportion = v.length / totalRawLength;
           return Math.max(minPerValue, Math.floor(proportion * availableForValues));
         });
+        const totalLimits = limits.reduce((sum, l) => sum + l, 0);
+        if (totalLimits > availableForValues) {
+          const scale = availableForValues / totalLimits;
+          limits = limits.map((l) => Math.max(1, Math.floor(l * scale)));
+        }
       }
     }
   } else {
@@ -3113,6 +3089,38 @@ function formatParametersInline(params, maxWidth) {
     return `${chalk3.dim(key)}${chalk3.dim("=")}${chalk3.cyan(formatted)}`;
   }).join(chalk3.dim(", "));
 }
+function formatGadgetLine(info, maxWidth) {
+  const terminalWidth = maxWidth ?? process.stdout.columns ?? 80;
+  const gadgetLabel = chalk3.magenta.bold(info.name);
+  const timeStr = `${info.elapsedSeconds.toFixed(1)}s`;
+  const timeLabel = chalk3.dim(timeStr);
+  const fixedLength = 3 + info.name.length + 2 + 1 + timeStr.length;
+  const availableForParams = Math.max(40, terminalWidth - fixedLength - 3);
+  const paramsStr = formatParametersInline(info.parameters, availableForParams);
+  const paramsLabel = paramsStr ? `${chalk3.dim("(")}${paramsStr}${chalk3.dim(")")}` : "";
+  if (info.error) {
+    const errorMsg = info.error.length > 50 ? `${info.error.slice(0, 50)}\u2026` : info.error;
+    return `${chalk3.red("\u2717")} ${gadgetLabel}${paramsLabel} ${chalk3.red("error:")} ${errorMsg} ${timeLabel}`;
+  }
+  if (!info.isComplete) {
+    return `${chalk3.blue("\u23F5")} ${gadgetLabel}${paramsLabel} ${timeLabel}`;
+  }
+  let outputLabel;
+  if (info.tokenCount !== void 0 && info.tokenCount > 0) {
+    outputLabel = chalk3.dim("\u2193") + chalk3.green(` ${formatTokens(info.tokenCount)} `);
+  } else if (info.outputBytes !== void 0 && info.outputBytes > 0) {
+    outputLabel = chalk3.green(formatBytes(info.outputBytes)) + " ";
+  } else {
+    outputLabel = "";
+  }
+  const icon = info.breaksLoop ? chalk3.yellow("\u23F9") : chalk3.green("\u2713");
+  const nameRef = chalk3.magenta(info.name);
+  const line1 = `${icon} ${gadgetLabel}${paramsLabel}`;
+  const line2Prefix = `  ${chalk3.dim("\u2192")} ${nameRef} ${outputLabel}`;
+  const line2 = `${line2Prefix}${timeLabel}`;
+  return `${line1}
+${line2}`;
+}
 function formatBytes(bytes) {
   if (bytes < 1024) {
     return `${bytes} bytes`;
@@ -3122,6 +3130,11 @@ function formatBytes(bytes) {
   }
   return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
 }
+function truncateOutputPreview(output, maxWidth) {
+  const normalized = output.replace(/\s+/g, " ").trim();
+  if (normalized.length <= maxWidth) return normalized;
+  return normalized.slice(0, maxWidth - 1) + "\u2026";
+}
 function getMediaIcon(kind) {
   switch (kind) {
     case "image":
@@ -3149,37 +3162,99 @@ function formatGadgetSummary2(result) {
   const gadgetLabel = chalk3.magenta.bold(result.gadgetName);
   const timeStr = result.executionTimeMs >= 1e3 ? `${(result.executionTimeMs / 1e3).toFixed(1)}s` : `${Math.round(result.executionTimeMs)}ms`;
   const timeLabel = chalk3.dim(timeStr);
-  let outputStr;
-  if (result.tokenCount !== void 0 && result.tokenCount > 0) {
-    outputStr = `${formatTokens(result.tokenCount)} tokens`;
-  } else if (result.result) {
+  const fixedLength = 3 + result.gadgetName.length + 2;
+  const availableForParams = Math.max(40, terminalWidth - fixedLength - 3);
+  const paramsStr = formatParametersInline(result.parameters, availableForParams);
+  const paramsLabel = paramsStr ? `${chalk3.dim("(")}${paramsStr}${chalk3.dim(")")}` : "";
+  const icon = result.breaksLoop ? chalk3.yellow("\u23F9") : result.error ? chalk3.red("\u2717") : chalk3.green("\u2713");
+  const line1 = `${icon} ${gadgetLabel}${paramsLabel}`;
+  const nameRef = chalk3.magenta(result.gadgetName);
+  const hasSubagentMetrics = result.subagentMetrics && result.subagentMetrics.callCount > 0;
+  let outputLabel;
+  let outputStrRaw;
+  if (!hasSubagentMetrics && result.tokenCount !== void 0 && result.tokenCount > 0) {
+    const tokenStr = formatTokens(result.tokenCount);
+    outputLabel = chalk3.dim("\u2193") + chalk3.green(` ${tokenStr} `);
+    outputStrRaw = `\u2193 ${tokenStr} `;
+  } else if (!hasSubagentMetrics && result.result) {
     const outputBytes = Buffer.byteLength(result.result, "utf-8");
-    outputStr = outputBytes > 0 ? formatBytes(outputBytes) : "no output";
+    if (outputBytes > 0) {
+      const bytesStr = formatBytes(outputBytes);
+      outputLabel = chalk3.green(bytesStr) + " ";
+      outputStrRaw = bytesStr + " ";
+    } else {
+      outputLabel = "";
+      outputStrRaw = "";
+    }
   } else {
-    outputStr = "no output";
+    outputLabel = "";
+    outputStrRaw = "";
   }
-  const fixedLength = 2 + result.gadgetName.length + 2 + 3 + outputStr.length + 1 + timeStr.length;
-  const availableForParams = Math.max(40, terminalWidth - fixedLength - 2);
-  const paramsStr = formatParametersInline(result.parameters, availableForParams);
-  const paramsLabel = paramsStr ? `${chalk3.dim("(")}${paramsStr}${chalk3.dim(")")}` : "";
   if (result.error) {
     const errorMsg = result.error.length > 50 ? `${result.error.slice(0, 50)}\u2026` : result.error;
-    return `${chalk3.red("\u2717")} ${gadgetLabel}${paramsLabel} ${chalk3.red("error:")} ${errorMsg} ${timeLabel}`;
+    const line22 = `  ${chalk3.dim("\u2192")} ${nameRef} ${chalk3.red("error:")} ${errorMsg} ${timeLabel}`;
+    return `${line1}
+${line22}`;
+  }
+  const previewWidth = Math.floor(terminalWidth * 0.6);
+  const prefixLength = 4 + result.gadgetName.length + 1 + outputStrRaw.length + 1 + timeStr.length + 2;
+  const availablePreview = Math.max(20, previewWidth - prefixLength);
+  let customPreview;
+  if (result.gadgetName === "TodoUpsert" && result.parameters?.content) {
+    const statusEmoji = result.parameters.status === "done" ? "\u2705" : result.parameters.status === "in_progress" ? "\u{1F504}" : "\u2B1C";
+    const content = String(result.parameters.content);
+    customPreview = `${statusEmoji} ${truncateOutputPreview(content, availablePreview - 3)}`;
+  }
+  if (result.gadgetName === "GoogleSearch" && result.parameters?.query) {
+    const query = String(result.parameters.query);
+    const countMatch = result.result?.match(/\((\d+)\s+of\s+[\d,]+\s+results?\)/i) || // "(10 of 36400000 results)"
+    result.result?.match(/(\d+)\s+results?\s+found/i) || // "10 results found"
+    result.result?.match(/found\s+(\d+)\s+results?/i);
+    const count = countMatch?.[1] ?? (result.parameters.maxResults ? String(result.parameters.maxResults) : null);
+    const countStr = count ? ` \u2192 ${count} results` : "";
+    const queryPreview = truncateOutputPreview(query, availablePreview - 5 - countStr.length);
+    customPreview = `\u{1F50D} "${queryPreview}"${countStr}`;
+  }
+  let subagentMetricsStr = "";
+  if (result.subagentMetrics && result.subagentMetrics.callCount > 0) {
+    const parts = [];
+    const m = result.subagentMetrics;
+    if (m.inputTokens > 0) {
+      parts.push(chalk3.dim("\u2191") + chalk3.yellow(` ${formatTokens(m.inputTokens)}`));
+    }
+    if (m.cachedInputTokens > 0) {
+      parts.push(chalk3.dim("\u27F3") + chalk3.blue(` ${formatTokens(m.cachedInputTokens)}`));
+    }
+    if (m.outputTokens > 0) {
+      parts.push(chalk3.dim("\u2193") + chalk3.green(` ${formatTokens(m.outputTokens)}`));
+    }
+    if (m.cost > 0) {
+      parts.push(chalk3.cyan(`$${formatCost(m.cost)}`));
+    }
+    if (parts.length > 0) {
+      subagentMetricsStr = parts.join(chalk3.dim(" | ")) + chalk3.dim(" | ");
+    }
+  }
+  let line2;
+  const previewContent = customPreview ?? (result.result?.trim() ? truncateOutputPreview(result.result, availablePreview) : null);
+  if (previewContent) {
+    line2 = `  ${chalk3.dim("\u2192")} ${nameRef} ${outputLabel}${subagentMetricsStr}${timeLabel}${chalk3.dim(":")} ${chalk3.dim(previewContent)}`;
+  } else {
+    line2 = `  ${chalk3.dim("\u2192")} ${nameRef} ${outputLabel}${subagentMetricsStr}${timeLabel}`;
   }
-  const outputLabel = outputStr === "no output" ? chalk3.dim(outputStr) : chalk3.green(outputStr);
-  const icon = result.breaksLoop ? chalk3.yellow("\u23F9") : chalk3.green("\u2713");
-  let summaryLine = `${icon} ${gadgetLabel}${paramsLabel} ${chalk3.dim("\u2192")} ${outputLabel} ${timeLabel}`;
+  let output = `${line1}
+${line2}`;
   if (result.media && result.media.length > 0) {
     const mediaLines = result.media.map(formatMediaLine);
-    summaryLine += "\n" + mediaLines.join("\n");
+    output += "\n" + mediaLines.join("\n");
   }
   if (result.gadgetName === "TellUser" && result.parameters?.message) {
     const message = String(result.parameters.message);
     const rendered = renderMarkdownWithSeparators(message);
-    return `${summaryLine}
+    return `${output}
 ${rendered}`;
   }
-  return summaryLine;
+  return output;
 }
 
 // src/cli/utils.ts
@@ -3376,14 +3451,15 @@ var StreamProgress = class {
    * 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) {
+  addNestedAgent(id, parentInvocationId, depth, model, iteration, info) {
     this.nestedAgents.set(id, {
       parentInvocationId,
       depth,
       model,
       iteration,
       startTime: Date.now(),
-      inputTokens
+      inputTokens: info?.inputTokens,
+      cachedInputTokens: info?.cachedInputTokens
     });
     if (this.isRunning && this.isTTY) {
       this.render();
@@ -3391,11 +3467,36 @@ 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;
+      if (info.inputTokens !== void 0) agent.inputTokens = info.inputTokens;
+      if (info.outputTokens !== void 0) agent.outputTokens = info.outputTokens;
+      if (info.cachedInputTokens !== void 0) agent.cachedInputTokens = info.cachedInputTokens;
+      if (info.cacheCreationInputTokens !== void 0)
+        agent.cacheCreationInputTokens = info.cacheCreationInputTokens;
+      if (info.finishReason !== void 0) agent.finishReason = info.finishReason;
+      if (info.cost !== void 0) {
+        agent.cost = info.cost;
+      } else if (this.modelRegistry && agent.model && agent.outputTokens) {
+        try {
+          const modelName = agent.model.includes(":") ? agent.model.split(":")[1] : agent.model;
+          const costResult = this.modelRegistry.estimateCost(
+            modelName,
+            agent.inputTokens ?? 0,
+            agent.outputTokens,
+            agent.cachedInputTokens,
+            agent.cacheCreationInputTokens
+          );
+          agent.cost = costResult?.totalCost;
+        } catch {
+        }
+      }
+      agent.completed = true;
+      agent.completedTime = Date.now();
       if (this.isRunning && this.isTTY) {
         this.render();
       }
@@ -3410,14 +3511,36 @@ var StreamProgress = class {
       this.render();
     }
   }
+  /**
+   * Get aggregated metrics from all nested agents for a parent gadget.
+   * Used to show total token counts and cost for subagent gadgets like BrowseWeb.
+   */
+  getAggregatedSubagentMetrics(parentInvocationId) {
+    let inputTokens = 0;
+    let outputTokens = 0;
+    let cachedInputTokens = 0;
+    let cost = 0;
+    let callCount = 0;
+    for (const [, nested] of this.nestedAgents) {
+      if (nested.parentInvocationId === parentInvocationId) {
+        inputTokens += nested.inputTokens ?? 0;
+        outputTokens += nested.outputTokens ?? 0;
+        cachedInputTokens += nested.cachedInputTokens ?? 0;
+        cost += nested.cost ?? 0;
+        callCount++;
+      }
+    }
+    return { inputTokens, outputTokens, cachedInputTokens, cost, callCount };
+  }
   /**
    * 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) {
@@ -3435,11 +3558,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();
       }
@@ -3574,38 +3699,130 @@ var StreamProgress = class {
     this.clearRenderedLines();
     const spinner = SPINNER_FRAMES[this.frameIndex++ % SPINNER_FRAMES.length];
     const lines = [];
-    if (this.mode === "streaming") {
-      lines.push(this.formatStreamingLine(spinner));
-    } else {
-      lines.push(this.formatCumulativeLine(spinner));
-    }
+    const activeNestedStreams = [];
     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")}`;
+        const elapsedSeconds = (Date.now() - gadget.startTime) / 1e3;
+        const termWidth = process.stdout.columns ?? 80;
+        const gadgetIndent = "  ";
+        const line = formatGadgetLine(
+          {
+            name: gadget.name,
+            parameters: gadget.params,
+            elapsedSeconds,
+            isComplete: false
+          },
+          termWidth - gadgetIndent.length
+        );
+        const gadgetLine = line.split("\n").map((l) => gadgetIndent + l).join("\n");
         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 ? ` ${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);
+          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
+            });
+            if (!nested.completed) {
+              activeNestedStreams.push({
+                depth: nested.depth,
+                iteration: nested.iteration,
+                model: nested.model,
+                inputTokens: nested.inputTokens,
+                cachedInputTokens: nested.cachedInputTokens,
+                outputTokens: nested.outputTokens,
+                cost: nested.cost,
+                startTime: nested.startTime
+              });
+            }
+          }
         }
-        for (const [nestedId, nestedGadget] of this.nestedGadgets) {
+        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 ? chalk4.green("\u2713") : chalk4.blue("\u23F5");
-            const nestedGadgetLine = `${indent}${icon} ${chalk4.dim(nestedGadget.name + "(...)")} ${chalk4.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) {
+          if (op.type === "agent" && !op.completed) {
+            continue;
+          }
+          const indent = "  ".repeat(op.depth + 2);
+          const endTime = op.completedTime ?? Date.now();
+          const elapsedSeconds2 = (endTime - op.startTime) / 1e3;
+          if (op.type === "agent") {
+            const line2 = 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}${line2}`);
+          } else {
+            const termWidth2 = process.stdout.columns ?? 80;
+            const line2 = formatGadgetLine(
+              {
+                name: op.name ?? "",
+                parameters: op.parameters,
+                elapsedSeconds: elapsedSeconds2,
+                isComplete: op.completed ?? false
+              },
+              termWidth2 - indent.length
+            );
+            const indentedLine = line2.split("\n").map((l) => indent + l).join("\n");
+            lines.push(indentedLine);
           }
         }
       }
     }
-    this.lastRenderLineCount = lines.length;
-    this.target.write("\r" + lines.join("\n"));
+    for (const stream of activeNestedStreams) {
+      const indent = "  ".repeat(stream.depth + 2);
+      const elapsedSeconds = (Date.now() - stream.startTime) / 1e3;
+      const line = formatLLMCallLine({
+        iteration: stream.iteration,
+        model: stream.model,
+        inputTokens: stream.inputTokens,
+        cachedInputTokens: stream.cachedInputTokens,
+        outputTokens: stream.outputTokens,
+        elapsedSeconds,
+        cost: stream.cost,
+        isStreaming: true,
+        spinner
+      });
+      lines.push(`${indent}${line}`);
+    }
+    if (this.mode === "streaming") {
+      lines.push(this.formatStreamingLine(spinner));
+    } else {
+      lines.push(this.formatCumulativeLine(spinner));
+    }
+    const output = lines.join("\n");
+    this.lastRenderLineCount = (output.match(/\n/g) || []).length + 1;
+    this.target.write("\r" + output);
     this.hasRendered = true;
   }
   /**
@@ -3621,42 +3838,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 = chalk4.cyan(`#${this.currentIteration}`);
-    if (this.model) {
-      parts.push(`${iterPart} ${chalk4.magenta(this.model)}`);
-    } else {
-      parts.push(iterPart);
-    }
-    const usagePercent = this.getContextUsagePercent();
-    if (usagePercent !== null) {
-      const formatted = `${Math.round(usagePercent)}%`;
-      if (usagePercent >= 80) {
-        parts.push(chalk4.red(formatted));
-      } else if (usagePercent >= 50) {
-        parts.push(chalk4.yellow(formatted));
-      } else {
-        parts.push(chalk4.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(chalk4.dim("\u2191") + chalk4.yellow(` ${prefix}${formatTokens(this.callInputTokens)}`));
-    }
-    if (this.isStreaming || outTokens > 0) {
-      const prefix = this.callOutputTokensEstimated ? "~" : "";
-      parts.push(chalk4.dim("\u2193") + chalk4.green(` ${prefix}${formatTokens(outTokens)}`));
-    }
-    parts.push(chalk4.dim(`${elapsed}s`));
-    const callCost = this.calculateCurrentCallCost(outTokens);
-    if (callCost > 0) {
-      parts.push(chalk4.cyan(`$${formatCost(callCost)}`));
-    }
-    return `${parts.join(chalk4.dim(" | "))} ${chalk4.cyan(spinner)}`;
+    });
   }
   /**
    * Calculates live cost estimate for the current streaming call.
@@ -3884,7 +4086,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 = {};
@@ -3961,8 +4163,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,
@@ -3971,7 +4172,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,
@@ -3982,7 +4182,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 {
@@ -4009,9 +4209,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(chalk5.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;
@@ -4021,9 +4230,11 @@ async function executeAgent(promptArg, options, env) {
       wasCancelled = true;
       abortController.abort();
       progress.pause();
-      env.stderr.write(chalk5.yellow(`
+      env.stderr.write(
+        chalk5.yellow(`
 [Cancelled] ${progress.formatStats()}
-`));
+`)
+      );
     } else {
       handleQuit();
     }
@@ -4033,7 +4244,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
+        );
       }
     }
   };
@@ -4058,7 +4273,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,
@@ -4084,7 +4303,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");
@@ -4094,7 +4318,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);
     }
   };
@@ -4116,7 +4343,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(
@@ -4142,7 +4371,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) {
@@ -4159,7 +4390,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);
@@ -4188,7 +4421,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,
@@ -4201,6 +4434,7 @@ async function executeAgent(promptArg, options, env) {
             env.stderr.write(`${summary}
 `);
           }
+          env.stderr.write("\n");
         }
         if (llmSessionDir) {
           const filename = `${formatCallNumber(llmCallCounter)}.response`;
@@ -4246,7 +4480,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",
@@ -4289,11 +4526,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({
@@ -4304,8 +4541,7 @@ Denied: ${result.reason ?? "by user"}`
   builder.withTrailingMessage(
     (ctx) => [
       `[Iteration ${ctx.iteration + 1}/${ctx.maxIterations}]`,
-      "Think carefully: what gadget invocations can you make in parallel right now?",
-      "Maximize efficiency by batching independent operations in a single response."
+      "Think carefully in two steps: 1. what gadget invocations we should be making next? 2. how do they depend on one another so we can run all of them in the right order? Then respond with all the gadget invocations you are able to do now."
     ].join(" ")
   );
   if (!options.quiet) {
@@ -4318,21 +4554,32 @@ Denied: ${result.reason ?? "by user"}`
           subagentEvent.gadgetInvocationId,
           subagentEvent.depth,
           info.model,
-          info.iteration,
-          info.inputTokens
+          info.iteration + 1,
+          // Make 1-indexed like main agent
+          {
+            inputTokens: info.usage?.inputTokens ?? info.inputTokens,
+            cachedInputTokens: info.usage?.cachedInputTokens
+          }
         );
       } 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;
@@ -4389,10 +4636,23 @@ Denied: ${result.reason ?? "by user"}`
           }
         } else {
           const tokenCount = await countGadgetOutputTokens(event.result.result);
-          env.stderr.write(
-            `${formatGadgetSummary2({ ...event.result, tokenCount, media: event.result.storedMedia })}
-`
+          const subagentMetrics = progress.getAggregatedSubagentMetrics(
+            event.result.invocationId
           );
+          const summary = formatGadgetSummary2({
+            ...event.result,
+            tokenCount,
+            media: event.result.storedMedia,
+            subagentMetrics: subagentMetrics.callCount > 0 ? subagentMetrics : void 0
+          });
+          if (event.result.gadgetName === "TellUser") {
+            env.stderr.write(`${summary}
+`);
+          } else {
+            const indentedSummary = summary.split("\n").map((line) => "  " + line).join("\n");
+            env.stderr.write(`${indentedSummary}
+`);
+          }
         }
         if (progress.hasInFlightGadgets()) {
           progress.start();
@@ -4431,7 +4691,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(() => {
@@ -4541,7 +4804,7 @@ 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";
+import { dirname } from "node:path";
 var STARTER_CONFIG = `# ~/.llmist/cli.toml
 # llmist CLI configuration file
 #
@@ -4597,7 +4860,7 @@ var STARTER_CONFIG = `# ~/.llmist/cli.toml
 `;
 async function executeInit(_options, env) {
   const configPath = getConfigPath();
-  const configDir = dirname2(configPath);
+  const configDir = dirname(configPath);
   if (existsSync5(configPath)) {
     env.stderr.write(`Configuration already exists at ${configPath}
 `);