jinzd-ai-cli 0.4.212 → 0.4.214

package/dist/{chunk-N5LB3PPL.js → chunk-R5CJD2AB.js}

@@ -5,10 +5,10 @@ import {
 } from "./chunk-T2NL5ZIA.js";
 import {
   runTestsTool
-} from "./chunk-HX6N6QEY.js";
+} from "./chunk-TR6MSPSS.js";
 import {
   runTool
-} from "./chunk-IFZX26K7.js";
+} from "./chunk-YMFGGCUP.js";
 import {
   getDangerLevel,
   isFileWriteTool,
@@ -26,7 +26,7 @@ import {
   SUBAGENT_ALLOWED_TOOLS,
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT
-} from "./chunk-GBBVCZ4W.js";
+} from "./chunk-DBYMX2ZC.js";
 import {
   fileCheckpoints
 } from "./chunk-4BKXL7SM.js";
@@ -1055,7 +1055,7 @@ import { dirname as dirname2 } from "path";
 
 // src/tools/executor.ts
 import chalk3 from "chalk";
-import { existsSync as existsSync5, readFileSync as readFileSync4 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
 import { tmpdir } from "os";
 
 // src/core/readline-internal.ts
@@ -1860,6 +1860,157 @@ var theme = new Proxy(DARK_THEME, {
   }
 });
 
+// src/tools/action-classifier.ts
+import { existsSync as existsSync5, readFileSync as readFileSync4 } from "fs";
+import { isAbsolute as isAbsolute2, join as join2, resolve as resolve4 } from "path";
+var RECENT_DENIED_LIMIT = 50;
+var recentlyDenied = [];
+function recordRecentlyDeniedAutoAction(call, classification) {
+  recentlyDenied.unshift({
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    tool: call.name,
+    reason: classification.reason,
+    ruleId: classification.ruleId,
+    argsPreview: JSON.stringify(call.arguments).slice(0, 240)
+  });
+  recentlyDenied.splice(RECENT_DENIED_LIMIT);
+}
+function getRecentlyDeniedAutoActions() {
+  return [...recentlyDenied];
+}
+function clearRecentlyDeniedAutoActions() {
+  recentlyDenied.splice(0, recentlyDenied.length);
+}
+function normalizePath(value) {
+  return value.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
+}
+function isInside(root, target) {
+  const absoluteRoot = resolve4(root);
+  const absoluteTarget = isAbsolute2(target) ? target : resolve4(root, target);
+  const base = normalizePath(absoluteRoot);
+  const t = normalizePath(absoluteTarget);
+  return t === base || t.startsWith(base + "/");
+}
+function getPathArg(call) {
+  const raw = call.arguments.path ?? call.arguments.filePath ?? call.arguments.outputPath ?? call.arguments.file;
+  return typeof raw === "string" && raw.trim() ? raw.trim() : null;
+}
+function splitShellWords(command) {
+  const out = [];
+  const re = /"([^"]*)"|'([^']*)'|([^\s]+)/g;
+  let m;
+  while (m = re.exec(command)) out.push(m[1] ?? m[2] ?? m[3] ?? "");
+  return out.filter(Boolean);
+}
+function readPackageManifest(root) {
+  const p = join2(root, "package.json");
+  if (!existsSync5(p)) return null;
+  try {
+    return JSON.parse(readFileSync4(p, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function manifestHasDependency(root, name) {
+  const manifest = readPackageManifest(root);
+  if (!manifest) return false;
+  for (const key of ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"]) {
+    const deps = manifest[key];
+    if (deps && typeof deps === "object" && Object.prototype.hasOwnProperty.call(deps, name)) return true;
+  }
+  return false;
+}
+function lockfileMentions(root, name) {
+  for (const file of ["package-lock.json", "pnpm-lock.yaml", "yarn.lock"]) {
+    const p = join2(root, file);
+    if (!existsSync5(p)) continue;
+    try {
+      if (readFileSync4(p, "utf-8").includes(name)) return true;
+    } catch {
+    }
+  }
+  return false;
+}
+function getInstallPackages(command) {
+  const words = splitShellWords(command);
+  const cmd = words[0]?.toLowerCase();
+  const sub = words[1]?.toLowerCase();
+  if (!cmd || !sub) return [];
+  const isInstall = cmd === "npm" && (sub === "install" || sub === "i" || sub === "add") || (cmd === "pnpm" || cmd === "yarn") && (sub === "add" || sub === "install");
+  if (!isInstall) return [];
+  return words.slice(2).filter((w) => !w.startsWith("-")).filter((w) => w !== "." && w !== "./").map((w) => w.replace(/^@([^/]+)\/([^@]+)(?:@.+)?$/, "@$1/$2").replace(/^([^@]+)@.+$/, "$1"));
+}
+function isPlainGitPush(command) {
+  if (!/^\s*git\s+push\b/i.test(command)) return false;
+  if (/--force|-f\b|\+[^\s]+/i.test(command)) return false;
+  return !/[;&|`$<>\n\r]/.test(command);
+}
+function hasSecretExfiltrationShape(command) {
+  return /(?:\.env|config\.json|id_rsa|id_ed25519|AWS_SECRET|AICLI_API_KEY|OPENAI_API_KEY|ANTHROPIC_API_KEY)/i.test(command) && /\b(curl|wget|scp|rsync|nc|netcat|Invoke-WebRequest|Invoke-RestMethod)\b/i.test(command);
+}
+var RuleBasedActionClassifier = class {
+  classify(call, dangerLevel, ctx) {
+    if (call.name === "bash") return this.classifyShell(call, dangerLevel, ctx);
+    if (call.name === "web_fetch" || call.name === "web_search" || call.name === "google_search") {
+      return { decision: "auto-approve", reason: "read-only HTTP tool", ruleId: "auto.readonly-http", confidence: "high" };
+    }
+    if (dangerLevel === "safe") {
+      return { decision: "auto-approve", reason: "safe read-only tool", ruleId: "auto.safe-tool", confidence: "high" };
+    }
+    if (dangerLevel === "write") {
+      const p = getPathArg(call);
+      if (p && (isInside(ctx.workspaceRoot, p) || (ctx.tempDirs ?? []).some((root) => isInside(root, p)))) {
+        return { decision: "auto-approve", reason: "explicit write inside workspace/temp roots", ruleId: "auto.workspace-write", confidence: "high" };
+      }
+      return { decision: "confirm", reason: "write action is not proven low-risk", ruleId: "auto.write-confirm", confidence: "medium" };
+    }
+    return { decision: "confirm", reason: "destructive actions require confirmation", ruleId: "auto.destructive-confirm", confidence: "high" };
+  }
+  classifyShell(call, dangerLevel, ctx) {
+    const command = String(call.arguments.command ?? "");
+    if (/\bcurl\b[^\n|;&]*\|\s*(?:sudo\s+)?(?:bash|sh|zsh)\b/i.test(command)) {
+      return { decision: "deny", reason: "curl pipe shell execution is blocked in auto mode", ruleId: "deny.curl-pipe-shell", confidence: "high" };
+    }
+    if (/\bgit\s+push\b/i.test(command) && /--force|-f\b|\+[^\s]+/i.test(command)) {
+      return { decision: "deny", reason: "force push is blocked in auto mode", ruleId: "deny.force-push", confidence: "high" };
+    }
+    if (hasSecretExfiltrationShape(command)) {
+      return { decision: "deny", reason: "possible secret exfiltration is blocked in auto mode", ruleId: "deny.secret-exfiltration", confidence: "high" };
+    }
+    if (/\b(terraform|tofu)\s+destroy\b|\bkubectl\s+delete\b|\bcdk\s+destroy\b/i.test(command)) {
+      return { decision: "confirm", reason: "infrastructure destroy requires confirmation", ruleId: "confirm.iac-destroy", confidence: "high" };
+    }
+    if (/\b(prisma|sequelize|knex|typeorm)\b[^\n]*\b(migrate|migration)\b|\bdb:migrate\b/i.test(command)) {
+      return { decision: "confirm", reason: "database migration requires confirmation", ruleId: "confirm.database-migration", confidence: "high" };
+    }
+    if (/\b(vercel|netlify|flyctl|railway|wrangler|serverless|firebase)\b[^\n]*\bdeploy\b|\bdeploy\b[^\n]*\b(prod|production)\b/i.test(command)) {
+      return { decision: "confirm", reason: "production deployment requires confirmation", ruleId: "confirm.production-deploy", confidence: "high" };
+    }
+    if (/\b(iam|policy|token|secret|api[-_]?key|credential|permission|role)\b/i.test(command)) {
+      return { decision: "confirm", reason: "credential or permission change requires confirmation", ruleId: "confirm.credentials-permissions", confidence: "medium" };
+    }
+    if (/\b(npx|pnpm\s+dlx|yarn\s+dlx)\s+(claude|codex|aider|cursor-agent|gemini)\b/i.test(command)) {
+      return { decision: "confirm", reason: "third-party agent loop requires confirmation", ruleId: "confirm.third-party-agent", confidence: "high" };
+    }
+    if (isPlainGitPush(command)) {
+      return { decision: "auto-approve", reason: "plain git push without force", ruleId: "auto.git-push", confidence: "high" };
+    }
+    const pkgs = getInstallPackages(command);
+    if (pkgs.length > 0) {
+      const allDeclared = pkgs.every((p) => manifestHasDependency(ctx.workspaceRoot, p) || lockfileMentions(ctx.workspaceRoot, p));
+      return allDeclared ? { decision: "auto-approve", reason: "installing dependencies already declared in manifest/lockfile", ruleId: "auto.declared-dependency-install", confidence: "medium" } : { decision: "confirm", reason: "dependency install includes undeclared packages", ruleId: "confirm.undeclared-dependency-install", confidence: "medium" };
+    }
+    if (/\b(curl|wget|Invoke-WebRequest|Invoke-RestMethod)\b/i.test(command) && !/[>|;&`$]/.test(command)) {
+      return { decision: "auto-approve", reason: "read-only HTTP shell command", ruleId: "auto.readonly-http-shell", confidence: "medium" };
+    }
+    if (dangerLevel === "safe") {
+      return { decision: "auto-approve", reason: "safe shell action", ruleId: "auto.safe-shell", confidence: "medium" };
+    }
+    return { decision: "confirm", reason: "shell action is not proven low-risk", ruleId: "confirm.shell-default", confidence: "medium" };
+  }
+};
+var defaultActionClassifier = new RuleBasedActionClassifier();
+
 // src/tools/executor.ts
 function buildErrorPreview(content) {
   const meaningful = content.split("\n").filter(
@@ -1899,6 +2050,8 @@ var ToolExecutor = class {
    * destructive 操作仍然必须逐次确认。
    */
   sessionAutoApprove = false;
+  /** Session-level Auto Mode: rule-based low-risk auto approval. */
+  sessionAutoMode = false;
   /**
    * Logical session key used to scope per-session state in stateful tools
    * (currently only `bash`'s persistent cwd). Web mode sets this per-tab so
@@ -2058,6 +2211,40 @@ var ToolExecutor = class {
         };
       }
     }
+    if (this.sessionAutoMode && networkPermission?.action !== "confirm") {
+      const classification = defaultActionClassifier.classify(call, dangerLevel, {
+        workspaceRoot: this.workspaceRoot,
+        tempDirs: [tmpdir()]
+      });
+      if (classification.decision === "deny") {
+        recordRecentlyDeniedAutoAction(call, classification);
+        return {
+          callId: call.id,
+          content: `[Auto denied] ${classification.reason}. Do not retry without asking.`,
+          isError: true
+        };
+      }
+      if (classification.decision === "auto-approve") {
+        this.printToolCall(call);
+        if (dangerLevel === "write") this.printDiffPreview(call);
+        console.log(theme.warning(`  \u26A1 Auto-approved (/auto: ${classification.ruleId})`));
+        try {
+          const rawContent = await runTool(tool, call.arguments, call.name);
+          const content = truncateOutput(rawContent, call.name);
+          const wasTruncated = content !== rawContent;
+          this.printToolResult(call.name, rawContent, false, wasTruncated);
+          runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "ok" });
+          runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "ok" }, { configDir: this.hookConfigDir });
+          return { callId: call.id, content, isError: false };
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          this.printToolResult(call.name, message, true, false);
+          runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
+          runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "error", error: message }, { configDir: this.hookConfigDir });
+          return { callId: call.id, content: message, isError: true };
+        }
+      }
+    }
     if (this.sessionAutoApprove && dangerLevel === "write") {
       this.printToolCall(call);
       if (dangerLevel === "write") this.printDiffPreview(call);
@@ -2225,7 +2412,7 @@ var ToolExecutor = class {
     rl.resume();
     process.stdout.write(prompt);
     this.confirming = true;
-    return new Promise((resolve6) => {
+    return new Promise((resolve7) => {
       let completed = false;
       const cleanup = (result) => {
         if (completed) return;
@@ -2235,7 +2422,7 @@ var ToolExecutor = class {
         rl.pause();
         rlAny.output = savedOutput;
         this.confirming = false;
-        resolve6(result);
+        resolve7(result);
       };
       const onLine = (line) => {
         const trimmed = line.trim();
@@ -2302,10 +2489,10 @@ var ToolExecutor = class {
       const filePath = String(call.arguments["path"] ?? "");
       const newContent = String(call.arguments["content"] ?? "");
       if (!filePath) return;
-      if (existsSync5(filePath)) {
+      if (existsSync6(filePath)) {
         let oldContent;
         try {
-          oldContent = readFileSync4(filePath, "utf-8");
+          oldContent = readFileSync5(filePath, "utf-8");
         } catch {
           return;
         }
@@ -2328,7 +2515,7 @@ var ToolExecutor = class {
       }
     } else if (call.name === "edit_file") {
       const filePath = String(call.arguments["path"] ?? "");
-      if (!filePath || !existsSync5(filePath)) return;
+      if (!filePath || !existsSync6(filePath)) return;
       const oldStr = call.arguments["old_str"];
       const newStr = call.arguments["new_str"];
       if (oldStr !== void 0) {
@@ -2355,7 +2542,7 @@ var ToolExecutor = class {
         const to = Number(call.arguments["delete_to_line"] ?? from);
         let fileContent;
         try {
-          fileContent = readFileSync4(filePath, "utf-8");
+          fileContent = readFileSync5(filePath, "utf-8");
         } catch {
           return;
         }
@@ -2409,7 +2596,7 @@ var ToolExecutor = class {
     rl.resume();
     process.stdout.write(color("Proceed? [y/N] (type y + Enter to confirm) "));
     this.confirming = true;
-    return new Promise((resolve6) => {
+    return new Promise((resolve7) => {
       let completed = false;
       const cleanup = (answer) => {
         if (completed) return;
@@ -2419,7 +2606,7 @@ var ToolExecutor = class {
         rl.pause();
         rlAny.output = savedOutput;
         this.confirming = false;
-        resolve6(answer === "y");
+        resolve7(answer === "y");
       };
       const onLine = (line) => {
         const trimmed = line.trim();
@@ -2447,11 +2634,11 @@ var ToolExecutor = class {
 };
 
 // src/tools/sensitive-paths.ts
-import { resolve as resolve4, sep as sep2, basename as basename2 } from "path";
+import { resolve as resolve5, sep as sep2, basename as basename2 } from "path";
 import { homedir as homedir2 } from "os";
 var home = homedir2();
 function norm(p) {
-  const abs = resolve4(p);
+  const abs = resolve5(p);
   return process.platform === "win32" ? abs.toLowerCase() : abs;
 }
 function homeRel(p) {
@@ -2610,7 +2797,7 @@ Do NOT split a long document into many write_file(append=true) calls. That patte
 };
 
 // src/tools/builtin/edit-file.ts
-import { readFileSync as readFileSync5, existsSync as existsSync6 } from "fs";
+import { readFileSync as readFileSync6, existsSync as existsSync7 } from "fs";
 
 // src/tools/builtin/patch-apply.ts
 function parseUnifiedDiff(patch) {
@@ -2971,7 +3158,7 @@ Note: Path can be absolute or relative to cwd.`,
     const filePath = String(args["path"] ?? "");
     const encoding = args["encoding"] ?? "utf-8";
     if (!filePath) throw new ToolError("edit_file", "path is required");
-    if (!existsSync6(filePath)) throw new ToolError("edit_file", `File not found: ${filePath}`);
+    if (!existsSync7(filePath)) throw new ToolError("edit_file", `File not found: ${filePath}`);
     const verdict = classifyWritePath(filePath);
     if (verdict.sensitive && subAgentGuard.active) {
       throw new ToolError(
@@ -2979,7 +3166,7 @@ Note: Path can be absolute or relative to cwd.`,
         `Refused: sub-agents cannot edit sensitive paths \u2014 ${verdict.reason}. If this is genuinely needed, ask the parent agent to perform the edit so the user can approve it.`
       );
     }
-    const original = readFileSync5(filePath, encoding);
+    const original = readFileSync6(filePath, encoding);
     if (args["patch"] !== void 0) {
       const patchText = String(args["patch"] ?? "");
       const stopOnError = args["stop_on_error"] !== false;
@@ -3137,8 +3324,8 @@ function truncatePreview(str, maxLen = 80) {
 }
 
 // src/tools/builtin/list-dir.ts
-import { readdirSync as readdirSync3, statSync as statSync3, existsSync as existsSync7 } from "fs";
-import { join as join2, basename as basename3 } from "path";
+import { readdirSync as readdirSync3, statSync as statSync3, existsSync as existsSync8 } from "fs";
+import { join as join3, basename as basename3 } from "path";
 var listDirTool = {
   definition: {
     name: "list_dir",
@@ -3160,7 +3347,7 @@ var listDirTool = {
   async execute(args) {
     const dirPath = String(args["path"] ?? process.cwd());
     const recursive = Boolean(args["recursive"] ?? false);
-    if (!existsSync7(dirPath)) {
+    if (!existsSync8(dirPath)) {
       const targetName = basename3(dirPath).toLowerCase();
       const cwd = process.cwd();
       const suggestions = [];
@@ -3218,11 +3405,11 @@ function listRecursive(basePath, indent, recursive, lines) {
     if (entry.isDirectory()) {
       lines.push(`${indent}\u{1F4C1} ${entry.name}/`);
       if (recursive) {
-        listRecursive(join2(basePath, entry.name), indent + "  ", true, lines);
+        listRecursive(join3(basePath, entry.name), indent + "  ", true, lines);
       }
     } else {
       try {
-        const stat = statSync3(join2(basePath, entry.name));
+        const stat = statSync3(join3(basePath, entry.name));
         const size = formatSize(stat.size);
         lines.push(`${indent}\u{1F4C4} ${entry.name}  (${size})`);
       } catch {
@@ -3238,9 +3425,9 @@ function formatSize(bytes) {
 }
 
 // src/tools/builtin/grep-files.ts
-import { readdirSync as readdirSync4, readFileSync as readFileSync6, statSync as statSync4, existsSync as existsSync8 } from "fs";
+import { readdirSync as readdirSync4, readFileSync as readFileSync7, statSync as statSync4, existsSync as existsSync9 } from "fs";
 import { readFile } from "fs/promises";
-import { join as join3, relative } from "path";
+import { join as join4, relative } from "path";
 var grepFilesTool = {
   definition: {
     name: "grep_files",
@@ -3291,7 +3478,7 @@ Supports regex. Automatically skips node_modules, dist, .git directories.`,
     const contextLines = Math.max(0, Number(args["context_lines"] ?? 0));
     const maxResults = Math.max(1, Number(args["max_results"] ?? 50));
     if (!pattern) throw new ToolError("grep_files", "pattern is required");
-    if (!existsSync8(rootPath)) throw new ToolError("grep_files", `Path not found: ${rootPath}`);
+    if (!existsSync9(rootPath)) throw new ToolError("grep_files", `Path not found: ${rootPath}`);
     const MAX_PATTERN_LENGTH = 1e3;
     if (pattern.length > MAX_PATTERN_LENGTH) {
       throw new ToolError("grep_files", `Pattern too long (${pattern.length} chars, max ${MAX_PATTERN_LENGTH}). Use a shorter pattern.`);
@@ -3385,11 +3572,11 @@ function collectFilePaths(rootPath, filePattern, maxFiles) {
       if (paths.length >= maxFiles) return;
       if (entry.isDirectory()) {
         if (SKIP_DIRS.has(entry.name) || entry.name.startsWith(".")) continue;
-        walk(join3(dirPath, entry.name));
+        walk(join4(dirPath, entry.name));
       } else if (entry.isFile()) {
         if (isBinary(entry.name)) continue;
         if (filePattern && !matchesFilePattern(entry.name, filePattern)) continue;
-        const fullPath = join3(dirPath, entry.name);
+        const fullPath = join4(dirPath, entry.name);
         try {
           if (statSync4(fullPath).size > 1e6) continue;
         } catch {
@@ -3444,7 +3631,7 @@ function searchInFile(fullPath, displayPath, regex, contextLines, maxResults, re
   }
   let content;
   try {
-    content = readFileSync6(fullPath, "utf-8");
+    content = readFileSync7(fullPath, "utf-8");
   } catch {
     return;
   }
@@ -3475,8 +3662,8 @@ function searchInFile(fullPath, displayPath, regex, contextLines, maxResults, re
 }
 
 // src/tools/builtin/glob-files.ts
-import { readdirSync as readdirSync5, statSync as statSync5, existsSync as existsSync9 } from "fs";
-import { join as join4, relative as relative2, basename as basename4 } from "path";
+import { readdirSync as readdirSync5, statSync as statSync5, existsSync as existsSync10 } from "fs";
+import { join as join5, relative as relative2, basename as basename4 } from "path";
 var globFilesTool = {
   definition: {
     name: "glob_files",
@@ -3509,7 +3696,7 @@ Results sorted by most recent modification time. Automatically skips node_module
     const rootPath = String(args["path"] ?? process.cwd());
     const maxResults = Math.max(1, Number(args["max_results"] ?? 100));
     if (!pattern) throw new ToolError("glob_files", "pattern is required");
-    if (!existsSync9(rootPath)) throw new ToolError("glob_files", `Path not found: ${rootPath}`);
+    if (!existsSync10(rootPath)) throw new ToolError("glob_files", `Path not found: ${rootPath}`);
     const regex = globToRegex(pattern);
     const matches = [];
     collectMatchingFiles(rootPath, rootPath, regex, matches, maxResults);
@@ -3586,7 +3773,7 @@ function collectMatchingFiles(dirPath, rootPath, regex, results, maxResults) {
   }
   for (const entry of entries) {
     if (results.length >= maxResults) break;
-    const fullPath = join4(dirPath, entry.name);
+    const fullPath = join5(dirPath, entry.name);
     if (entry.isDirectory()) {
       if (SKIP_DIRS2.has(entry.name) || entry.name.startsWith(".")) continue;
       collectMatchingFiles(fullPath, rootPath, regex, results, maxResults);
@@ -3668,7 +3855,7 @@ var runInteractiveTool = {
       PYTHONDONTWRITEBYTECODE: "1"
     };
     const prefixWarnings = [argsTypeWarning, stdinTypeWarning].filter(Boolean).join("");
-    return new Promise((resolve6) => {
+    return new Promise((resolve7) => {
       const child = spawn2(executable, cmdArgs.map(String), {
         cwd: process.cwd(),
         env,
@@ -3701,22 +3888,22 @@ var runInteractiveTool = {
       setTimeout(writeNextLine, 400);
       const timer = setTimeout(() => {
         child.kill();
-        resolve6(`${prefixWarnings}[Timeout after ${timeout}ms]
+        resolve7(`${prefixWarnings}[Timeout after ${timeout}ms]
 ${buildOutput(stdout, stderr)}`);
       }, timeout);
       child.on("close", (code) => {
         clearTimeout(timer);
         const output = buildOutput(stdout, stderr);
         if (code !== 0 && code !== null) {
-          resolve6(`${prefixWarnings}Exit code ${code}:
+          resolve7(`${prefixWarnings}Exit code ${code}:
 ${output}`);
         } else {
-          resolve6(`${prefixWarnings}${output || "(no output)"}`);
+          resolve7(`${prefixWarnings}${output || "(no output)"}`);
         }
       });
       child.on("error", (err) => {
         clearTimeout(timer);
-        resolve6(
+        resolve7(
           `${prefixWarnings}Failed to start process "${executable}": ${err.message}
 Hint: On Windows, use the full path to the executable, e.g.:
   C:\\Users\\Jinzd\\anaconda3\\envs\\python312\\python.exe`
@@ -4384,11 +4571,11 @@ Any of these triggers means use save_last_response, NOT write_file:
 };
 
 // src/tools/builtin/save-memory.ts
-import { existsSync as existsSync10, readFileSync as readFileSync7, statSync as statSync6, mkdirSync as mkdirSync4 } from "fs";
-import { join as join5 } from "path";
+import { existsSync as existsSync11, readFileSync as readFileSync8, statSync as statSync6, mkdirSync as mkdirSync4 } from "fs";
+import { join as join6 } from "path";
 import { homedir as homedir3 } from "os";
 function getMemoryFilePath() {
-  return join5(homedir3(), CONFIG_DIR_NAME, MEMORY_FILE_NAME);
+  return join6(homedir3(), CONFIG_DIR_NAME, MEMORY_FILE_NAME);
 }
 function formatTimestamp() {
   const now = /* @__PURE__ */ new Date();
@@ -4412,8 +4599,8 @@ var saveMemoryTool = {
     const content = String(args["content"] ?? "").trim();
     if (!content) throw new ToolError("save_memory", "content is required");
     const memoryPath = getMemoryFilePath();
-    const configDir = join5(homedir3(), CONFIG_DIR_NAME);
-    if (!existsSync10(configDir)) {
+    const configDir = join6(homedir3(), CONFIG_DIR_NAME);
+    if (!existsSync11(configDir)) {
       mkdirSync4(configDir, { recursive: true });
     }
     const timestamp = formatTimestamp();
@@ -4421,7 +4608,7 @@ var saveMemoryTool = {
 ## ${timestamp}
 ${content}
 `;
-    const previous = existsSync10(memoryPath) ? readFileSync7(memoryPath, "utf-8") : "";
+    const previous = existsSync11(memoryPath) ? readFileSync8(memoryPath, "utf-8") : "";
     atomicWriteFileSync(memoryPath, previous + entry);
     const byteSize = statSync6(memoryPath).size;
     return `Memory saved successfully. File size: ${byteSize} bytes in ${MEMORY_FILE_NAME}`;
@@ -4468,7 +4655,7 @@ function promptUser(rl, question) {
   console.log();
   console.log(chalk4.cyan("\u2753 ") + chalk4.bold(question));
   process.stdout.write(chalk4.cyan("> "));
-  return new Promise((resolve6) => {
+  return new Promise((resolve7) => {
     let completed = false;
     const cleanup = (answer) => {
       if (completed) return;
@@ -4478,7 +4665,7 @@ function promptUser(rl, question) {
       rl.pause();
       rlAny.output = savedOutput;
       askUserContext.prompting = false;
-      resolve6(answer);
+      resolve7(answer);
     };
     const onLine = (line) => {
       cleanup(line);
@@ -4709,6 +4896,218 @@ function formatResults2(query, data, _requested) {
   return header + "\n" + results.join("\n\n");
 }
 
+// src/agents/agent-config.ts
+import { existsSync as existsSync12, readdirSync as readdirSync6, readFileSync as readFileSync9 } from "fs";
+import { join as join7 } from "path";
+import { homedir as homedir4 } from "os";
+var READ_ONLY_TOOLS2 = /* @__PURE__ */ new Set([
+  "read_file",
+  "list_dir",
+  "grep_files",
+  "glob_files",
+  "web_fetch",
+  "google_search",
+  "write_todos",
+  "find_symbol",
+  "get_outline",
+  "find_references",
+  "search_code"
+]);
+var BUILTIN_AGENTS = [
+  {
+    name: "explorer",
+    description: "Read-only code exploration and evidence gathering.",
+    permissionProfile: "read-only",
+    allowedTools: [...READ_ONLY_TOOLS2],
+    maxToolRounds: 10,
+    contextPolicy: "task-only",
+    system: "Act as a read-only explorer. Inspect code, collect evidence, and do not modify files.",
+    source: "builtin"
+  },
+  {
+    name: "worker",
+    description: "Implementation and focused fixes within sub-agent safety limits.",
+    permissionProfile: "workspace-write",
+    maxToolRounds: 15,
+    contextPolicy: "task-only",
+    system: "Act as a focused implementation worker. Keep edits scoped and report changed files.",
+    source: "builtin"
+  },
+  {
+    name: "reviewer",
+    description: "Code review focused on bugs, regressions, and missing tests.",
+    permissionProfile: "read-only",
+    allowedTools: [...READ_ONLY_TOOLS2],
+    maxToolRounds: 12,
+    contextPolicy: "task-only",
+    system: "Act as a code reviewer. Lead with concrete findings, file evidence, and residual risks.",
+    source: "builtin"
+  },
+  {
+    name: "security",
+    description: "Security audit with read-only evidence collection.",
+    permissionProfile: "read-only",
+    allowedTools: [...READ_ONLY_TOOLS2],
+    maxToolRounds: 12,
+    contextPolicy: "task-only",
+    system: "Act as a security reviewer. Look for trust-boundary, injection, filesystem, network, and secret-handling issues.",
+    source: "builtin"
+  },
+  {
+    name: "tester",
+    description: "Test planning and regression analysis without direct shell execution.",
+    permissionProfile: "read-only",
+    allowedTools: [...READ_ONLY_TOOLS2],
+    maxToolRounds: 12,
+    contextPolicy: "task-only",
+    system: "Act as a tester. Inspect tests, identify coverage gaps, and propose precise regression checks.",
+    source: "builtin"
+  }
+];
+function normalizeName(name) {
+  return name.trim().toLowerCase();
+}
+function isStringArray(value) {
+  return Array.isArray(value) && value.every((item) => typeof item === "string");
+}
+function parseAgentConfig(raw, source, path3) {
+  if (!raw || typeof raw !== "object") return null;
+  const obj = raw;
+  if (typeof obj.name !== "string" || obj.name.trim() === "") return null;
+  const cfg = {
+    name: obj.name.trim(),
+    source,
+    path: path3
+  };
+  if (typeof obj.description === "string") cfg.description = obj.description;
+  if (typeof obj.provider === "string") cfg.provider = obj.provider;
+  if (typeof obj.model === "string") cfg.model = obj.model;
+  if (typeof obj.system === "string") cfg.system = obj.system;
+  if (typeof obj.instructions === "string") cfg.instructions = obj.instructions;
+  if (typeof obj.systemInstructions === "string") cfg.systemInstructions = obj.systemInstructions;
+  if (isStringArray(obj.allowedTools)) cfg.allowedTools = obj.allowedTools;
+  if (isStringArray(obj.blockedTools)) cfg.blockedTools = obj.blockedTools;
+  if (typeof obj.permissionProfile === "string") cfg.permissionProfile = obj.permissionProfile;
+  if (typeof obj.maxToolRounds === "number" && Number.isFinite(obj.maxToolRounds)) cfg.maxToolRounds = obj.maxToolRounds;
+  if (typeof obj.contextPolicy === "string") cfg.contextPolicy = obj.contextPolicy;
+  return cfg;
+}
+function loadAgentDir(dir, source) {
+  if (!existsSync12(dir)) return [];
+  const out = [];
+  for (const file of readdirSync6(dir)) {
+    if (!file.endsWith(".json")) continue;
+    const path3 = join7(dir, file);
+    try {
+      const parsed = JSON.parse(readFileSync9(path3, "utf-8"));
+      const cfg = parseAgentConfig(parsed, source, path3);
+      if (cfg) out.push(cfg);
+    } catch {
+    }
+  }
+  return out;
+}
+function getAgentDirs(configDir, cwd = process.cwd()) {
+  return {
+    user: join7(configDir ?? join7(homedir4(), CONFIG_DIR_NAME), "agents"),
+    project: join7(cwd, CONFIG_DIR_NAME, "agents")
+  };
+}
+function listAgentConfigs(configDir, cwd = process.cwd()) {
+  const dirs = getAgentDirs(configDir, cwd);
+  const byName = /* @__PURE__ */ new Map();
+  for (const cfg of BUILTIN_AGENTS) byName.set(normalizeName(cfg.name), { ...cfg });
+  for (const cfg of loadAgentDir(dirs.user, "user")) byName.set(normalizeName(cfg.name), cfg);
+  for (const cfg of loadAgentDir(dirs.project, "project")) byName.set(normalizeName(cfg.name), cfg);
+  return [...byName.values()].sort((a, b) => a.name.localeCompare(b.name));
+}
+function resolveAgentConfig(name, configDir, cwd = process.cwd()) {
+  const target = normalizeName(name);
+  return listAgentConfigs(configDir, cwd).find((cfg) => normalizeName(cfg.name) === target);
+}
+function getAgentInstructions(agent) {
+  return agent.system ?? agent.systemInstructions ?? agent.instructions;
+}
+function getEffectiveAgentTools(agent) {
+  let allowed = new Set(SUBAGENT_ALLOWED_TOOLS);
+  if (agent.permissionProfile === "read-only") {
+    allowed = new Set([...allowed].filter((name) => READ_ONLY_TOOLS2.has(name)));
+  }
+  if (agent.allowedTools && agent.allowedTools.length > 0) {
+    const requested = new Set(agent.allowedTools);
+    allowed = new Set([...allowed].filter((name) => requested.has(name)));
+  }
+  if (agent.blockedTools && agent.blockedTools.length > 0) {
+    for (const name of agent.blockedTools) allowed.delete(name);
+  }
+  return allowed;
+}
+function getEffectiveMaxRounds(requestedMaxRounds, agent) {
+  const agentMax = agent.maxToolRounds && agent.maxToolRounds > 0 ? Math.round(agent.maxToolRounds) : SUBAGENT_MAX_ROUNDS_LIMIT;
+  return Math.min(requestedMaxRounds, agentMax, SUBAGENT_MAX_ROUNDS_LIMIT);
+}
+
+// src/agents/agent-runtime.ts
+var nextId = 1;
+var preferredAgentName = "worker";
+var runs = [];
+var MAX_RUNS = 50;
+function nowIso() {
+  return (/* @__PURE__ */ new Date()).toISOString();
+}
+function startAgentRun(input) {
+  const run = {
+    id: `agent-${nextId++}`,
+    agentName: input.agentName,
+    task: input.task,
+    status: "running",
+    startedAt: nowIso(),
+    toolNames: [],
+    agentIndex: input.agentIndex,
+    stopRequested: false
+  };
+  runs.unshift(run);
+  if (runs.length > MAX_RUNS) runs.splice(MAX_RUNS);
+  return run;
+}
+function recordAgentTool(runId, toolName) {
+  const run = runs.find((r) => r.id === runId);
+  if (!run) return;
+  if (!run.toolNames.includes(toolName)) run.toolNames.push(toolName);
+}
+function finishAgentRun(runId, status, summary, error) {
+  const run = runs.find((r) => r.id === runId);
+  if (!run) return;
+  run.status = status;
+  run.finishedAt = nowIso();
+  if (summary) run.summary = summary;
+  if (error) run.error = error;
+}
+function listAgentRuns() {
+  return runs.map((run) => ({ ...run, toolNames: [...run.toolNames] }));
+}
+function requestAgentStop(idOrAll) {
+  const target = idOrAll.trim().toLowerCase();
+  let count = 0;
+  for (const run of runs) {
+    if (run.status !== "running") continue;
+    if (target === "all" || run.id.toLowerCase() === target) {
+      run.stopRequested = true;
+      count++;
+    }
+  }
+  return count;
+}
+function isAgentStopRequested(runId) {
+  return runs.find((r) => r.id === runId)?.stopRequested ?? false;
+}
+function setPreferredAgentName(name) {
+  preferredAgentName = name.trim() || "worker";
+}
+function getPreferredAgentName() {
+  return preferredAgentName;
+}
+
 // src/tools/builtin/spawn-agent.ts
 var spawnAgentContext = {
   provider: null,
@@ -4723,18 +5122,27 @@ function agentPrefix(agentIndex) {
   return theme.dim(`  \u2503${agentIndex} `);
 }
 var SubAgentExecutor = class {
-  constructor(registry, agentIndex = null) {
+  constructor(registry, agentIndex = null, runId) {
     this.registry = registry;
+    this.runId = runId;
     this.prefix = agentPrefix(agentIndex);
   }
   round = 0;
   totalRounds = 0;
   prefix = PREFIX;
+  toolNames = [];
   setRoundInfo(current, total) {
     this.round = current;
     this.totalRounds = total;
   }
   async execute(call) {
+    if (this.runId && isAgentStopRequested(this.runId)) {
+      return {
+        callId: call.id,
+        content: "Sub-agent stop requested.",
+        isError: true
+      };
+    }
     const tool = this.registry.get(call.name);
     if (!tool) {
       return {
@@ -4755,6 +5163,8 @@ var SubAgentExecutor = class {
       };
     }
     this.printToolCall(call, dangerLevel);
+    if (!this.toolNames.includes(call.name)) this.toolNames.push(call.name);
+    if (this.runId) recordAgentTool(this.runId, call.name);
     try {
       const rawContent = await runTool(tool, call.arguments, call.name);
       const content = truncateOutput(rawContent, call.name);
@@ -4774,7 +5184,6 @@ var SubAgentExecutor = class {
     }
     return results;
   }
-  // ── 带前缀的终端输出 ──
   printPrefixed(text) {
     for (const line of text.split("\n")) {
       console.log(this.prefix + line);
@@ -4815,7 +5224,7 @@ var SubAgentExecutor = class {
     }
   }
 };
-function buildSubAgentSystemPrompt(task, parentSystemPrompt) {
+function buildSubAgentSystemPrompt(task, agent, parentSystemPrompt) {
   const parts = [];
   if (parentSystemPrompt) {
     parts.push(parentSystemPrompt);
@@ -4823,6 +5232,8 @@ function buildSubAgentSystemPrompt(task, parentSystemPrompt) {
   parts.push(
     `# Sub-Agent Mode
 
+**Agent Role**: ${agent.name}${agent.description ? ` \u2014 ${agent.description}` : ""}
+
 You are a focused sub-agent delegated by the main agent to complete a specific task.
 
 **Your Task**:
@@ -4836,13 +5247,19 @@ ${task}
 5. Destructive operations (rm -rf etc.) will be automatically blocked
 6. Be efficient, minimize unnecessary tool call rounds`
   );
+  const agentInstructions = getAgentInstructions(agent);
+  if (agentInstructions) {
+    parts.push(`# Agent Instructions
+
+${agentInstructions}`);
+  }
   return parts.join("\n\n---\n\n");
 }
-function printSubAgentHeader(task, maxRounds, agentIndex = null) {
+function printSubAgentHeader(task, maxRounds, agentName, agentIndex = null) {
   const prefix = agentPrefix(agentIndex);
   console.log();
   console.log(theme.dim("  \u250F\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501"));
-  const label = agentIndex !== null ? `\u{1F916} Sub-Agent #${agentIndex} Spawned` : "\u{1F916} Sub-Agent Spawned";
+  const label = agentIndex !== null ? `\u{1F916} Sub-Agent #${agentIndex} Spawned (${agentName})` : `\u{1F916} Sub-Agent Spawned (${agentName})`;
   console.log(prefix + theme.toolCall(label));
   console.log(
     prefix + theme.dim("Task: ") + (task.slice(0, 120) + (task.length > 120 ? "..." : ""))
@@ -4865,58 +5282,110 @@ function printSubAgentFooter(usage, agentIndex = null) {
   console.log(theme.dim("  \u2517\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501"));
   console.log();
 }
-async function runSubAgent(task, maxRounds, agentIndex, ctx) {
+function summarizeContent(content) {
+  const flat = content.replace(/\s+/g, " ").trim();
+  return flat.length > 500 ? flat.slice(0, 497) + "..." : flat;
+}
+function extractEvidence(content, toolNames) {
+  const evidence = /* @__PURE__ */ new Set();
+  if (toolNames.length > 0) evidence.add(`Tools: ${toolNames.join(", ")}`);
+  const matches = content.match(/(?:[\w.-]+[\\/])+[\w.-]+\.(?:ts|tsx|js|jsx|json|md|css|html|py|go|rs|yml|yaml)/g) ?? [];
+  for (const match of matches.slice(0, 8)) evidence.add(match);
+  return [...evidence].slice(0, 10);
+}
+function formatAgentResult(input) {
+  const lines = [input.title, "", `**Agent**: ${input.agentName}`];
+  if (input.task) lines.push(`**Task**: ${input.task}`);
+  lines.push("", "### Summary", input.summary || "(no summary)", "", "### Key Evidence");
+  if (input.evidence.length > 0) {
+    for (const item of input.evidence) lines.push(`- ${item}`);
+  } else {
+    lines.push("- No structured evidence extracted.");
+  }
+  lines.push("", "### Tools Used");
+  lines.push(input.toolNames.length > 0 ? input.toolNames.join(", ") : "No tools used.");
+  lines.push("", "### Full Result", input.content, "");
+  lines.push(`*Tokens: ${input.usage.inputTokens} in / ${input.usage.outputTokens} out*`);
+  return lines;
+}
+async function runSubAgent(task, maxRounds, agentIndex, ctx, agent) {
   if (!ctx.provider) {
     throw new ToolError("spawn_agent", "provider not initialized (context not injected)");
   }
+  const providerFromConfig = agent.provider && ctx.providers?.has(agent.provider) ? ctx.providers.get(agent.provider) : void 0;
+  const provider = providerFromConfig ?? ctx.provider;
+  const model = agent.model ?? (providerFromConfig?.info?.defaultModel ?? ctx.model);
+  const run = startAgentRun({
+    agentName: agent.name,
+    task,
+    agentIndex: agentIndex ?? void 0
+  });
+  const effectiveTools = getEffectiveAgentTools(agent);
   const subRegistry = new ToolRegistry();
   for (const tool of subRegistry.listAll()) {
-    if (!SUBAGENT_ALLOWED_TOOLS.has(tool.definition.name)) {
+    if (!SUBAGENT_ALLOWED_TOOLS.has(tool.definition.name) || !effectiveTools.has(tool.definition.name)) {
       subRegistry.unregister(tool.definition.name);
     }
   }
-  const subExecutor = new SubAgentExecutor(subRegistry, agentIndex);
+  const subExecutor = new SubAgentExecutor(subRegistry, agentIndex, run.id);
   const subMessages = [
     { role: "user", content: task, timestamp: /* @__PURE__ */ new Date() }
   ];
-  const subSystemPrompt = buildSubAgentSystemPrompt(task, ctx.systemPrompt);
+  const subSystemPrompt = buildSubAgentSystemPrompt(task, agent, ctx.systemPrompt);
   const toolDefs = subRegistry.getDefinitions();
-  printSubAgentHeader(task, maxRounds, agentIndex);
-  const loop = await runLeanAgentLoop({
-    provider: ctx.provider,
-    messages: subMessages,
-    model: ctx.model,
-    maxRounds,
-    chatParams: {
-      temperature: ctx.modelParams.temperature,
-      maxTokens: ctx.modelParams.maxTokens,
-      timeout: ctx.modelParams.timeout,
-      thinking: ctx.modelParams.thinking
-    },
-    executeTools: (calls) => subExecutor.executeAll(calls),
-    systemPromptForRound: () => subSystemPrompt,
-    toolDefsForRound: () => toolDefs,
-    onRoundStart: (round) => {
-      subExecutor.setRoundInfo(round + 1, maxRounds);
-      if (ctx.configManager) {
-        googleSearchContext.configManager = ctx.configManager;
-      }
-    },
-    onRoundsExhausted: () => `(Sub-agent reached maximum rounds (${maxRounds}) without producing a final response)`,
-    onError: (errMsg) => {
-      process.stderr.write(`
+  printSubAgentHeader(task, maxRounds, agent.name, agentIndex);
+  try {
+    const loop = await runLeanAgentLoop({
+      provider,
+      messages: subMessages,
+      model,
+      maxRounds,
+      chatParams: {
+        temperature: ctx.modelParams.temperature,
+        maxTokens: ctx.modelParams.maxTokens,
+        timeout: ctx.modelParams.timeout,
+        thinking: ctx.modelParams.thinking
+      },
+      executeTools: (calls) => subExecutor.executeAll(calls),
+      systemPromptForRound: () => subSystemPrompt,
+      toolDefsForRound: () => toolDefs,
+      onRoundStart: (round) => {
+        subExecutor.setRoundInfo(round + 1, maxRounds);
+        if (ctx.configManager) {
+          googleSearchContext.configManager = ctx.configManager;
+        }
+      },
+      onRoundsExhausted: () => `(Sub-agent reached maximum rounds (${maxRounds}) without producing a final response)`,
+      onError: (errMsg) => {
+        process.stderr.write(`
 [spawn_agent] Error in sub-agent loop: ${errMsg}
 `);
-      return `(Sub-agent error: ${errMsg})`;
-    }
-  });
-  printSubAgentFooter(loop.usage, agentIndex);
-  return { content: loop.content, usage: loop.usage };
+        return `(Sub-agent error: ${errMsg})`;
+      }
+    });
+    printSubAgentFooter(loop.usage, agentIndex);
+    const summary = summarizeContent(loop.content);
+    const evidence = extractEvidence(loop.content, subExecutor.toolNames);
+    const stopped = isAgentStopRequested(run.id);
+    finishAgentRun(run.id, stopped ? "stopped" : "ok", summary);
+    return {
+      content: loop.content,
+      usage: loop.usage,
+      toolNames: subExecutor.toolNames,
+      summary,
+      evidence,
+      agentName: agent.name
+    };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    finishAgentRun(run.id, "error", void 0, message);
+    throw err;
+  }
 }
 var spawnAgentTool = {
   definition: {
     name: "spawn_agent",
-    description: "Delegate subtask(s) to independent sub-agent(s). Each sub-agent has its own conversation context and agentic tool-call loop, with access to bash, file read/write, edit, search, etc., but cannot interact with the user or spawn more sub-agents. Suitable for independently completable subtasks like: refactoring a module, writing tests, researching a technical approach, or implementing a specific feature. Pass `task` for a single sub-agent, or `tasks` (array) to run multiple sub-agents IN PARALLEL. Parallel mode is ideal for independent research/analysis tasks \u2014 network-bound API calls overlap while the main thread stays responsive. Returns a summary of each sub-agent result.",
+    description: "Delegate subtask(s) to independent named agents. Each sub-agent has its own conversation context and agentic tool-call loop, inherits the parent safety boundary, and can only narrow the sub-agent tool whitelist. Pass `agent` to select a built-in or configured role. Built-ins: explorer, worker, reviewer, security, tester. Pass `task` for a single sub-agent, or `tasks` (array) to run multiple sub-agents IN PARALLEL. Returns summary, key evidence, and tools used for each sub-agent result.",
     parameters: {
       task: {
         type: "string",
@@ -4934,7 +5403,12 @@ var spawnAgentTool = {
       },
       max_rounds: {
         type: "number",
-        description: "Max tool-call rounds per sub-agent (1-15, default 10). Applied to each sub-agent in parallel mode.",
+        description: "Max tool-call rounds per sub-agent (1-30, default 15). Agent config can only reduce this value.",
+        required: false
+      },
+      agent: {
+        type: "string",
+        description: "Agent role name from built-ins or ~/.aicli/agents / .aicli/agents JSON configs. Built-ins: explorer, worker, reviewer, security, tester.",
         required: false
       }
     },
@@ -4954,10 +5428,17 @@ var spawnAgentTool = {
       Math.max(Math.round(rawMaxRounds), 1),
       SUBAGENT_MAX_ROUNDS_LIMIT
     );
+    const requestedAgentName = typeof args["agent"] === "string" && args["agent"].trim() ? args["agent"].trim() : getPreferredAgentName();
     const ctx = spawnAgentContext;
     if (!ctx.provider) {
       throw new ToolError("spawn_agent", "provider not initialized (context not injected)");
     }
+    const agent = resolveAgentConfig(requestedAgentName, ctx.configManager?.getConfigDir());
+    if (!agent) {
+      const available = listAgentConfigs(ctx.configManager?.getConfigDir()).map((cfg) => cfg.name).join(", ");
+      throw new ToolError("spawn_agent", `unknown agent "${requestedAgentName}". Available agents: ${available}`);
+    }
+    const effectiveMaxRounds = getEffectiveMaxRounds(maxRounds, agent);
     const hookConfig = ctx.configManager?.get("hooks") ?? void 0;
     const hookConfigDir = ctx.configManager?.getConfigDir() ?? process.cwd();
     const taskCount = singleTask ? 1 : tasksArr.length;
@@ -4965,7 +5446,8 @@ var spawnAgentTool = {
       task: singleTask || void 0,
       tasks: tasksArr.length > 0 ? tasksArr : void 0,
       taskCount,
-      maxRounds
+      maxRounds: effectiveMaxRounds,
+      agent: agent.name
     };
     const startDecisions = runLifecycleHooks(hookConfig, "SubagentStart", hookPayload, hookConfigDir);
     const startDeny = startDecisions.find((d) => d.action === "deny");
@@ -4977,32 +5459,37 @@ var spawnAgentTool = {
     subAgentGuard.active = true;
     try {
       if (singleTask) {
-        const { content, usage } = await runSubAgent(singleTask, maxRounds, null, ctx);
+        const result = await runSubAgent(singleTask, effectiveMaxRounds, null, ctx, agent);
         subagentStatus = "ok";
-        return [
-          "## Sub-Agent Result",
-          "",
-          content,
-          "",
-          "---",
-          `Token usage: ${usage.inputTokens} input, ${usage.outputTokens} output`
-        ].join("\n");
+        return formatAgentResult({
+          title: "## Sub-Agent Result",
+          content: result.content,
+          usage: result.usage,
+          toolNames: result.toolNames,
+          summary: result.summary,
+          evidence: result.evidence,
+          agentName: result.agentName
+        }).join("\n");
       }
       console.log();
-      console.log(theme.toolCall(`\u{1F916} Spawning ${tasksArr.length} sub-agents in parallel...`));
+      console.log(theme.toolCall(`\u{1F916} Spawning ${tasksArr.length} sub-agents in parallel as ${agent.name}...`));
       const results = await Promise.all(
-        tasksArr.map((t, i) => runSubAgent(t, maxRounds, i + 1, ctx))
+        tasksArr.map((t, i) => runSubAgent(t, effectiveMaxRounds, i + 1, ctx, agent))
       );
       const totalIn = results.reduce((s, r) => s + r.usage.inputTokens, 0);
       const totalOut = results.reduce((s, r) => s + r.usage.outputTokens, 0);
       const lines = [`## Parallel Sub-Agent Results (${results.length} agents)`, ""];
       results.forEach((r, i) => {
-        lines.push(`### Sub-Agent #${i + 1}`);
-        lines.push(`**Task**: ${tasksArr[i].slice(0, 200)}${tasksArr[i].length > 200 ? "..." : ""}`);
-        lines.push("");
-        lines.push(r.content);
-        lines.push("");
-        lines.push(`*Tokens: ${r.usage.inputTokens} in / ${r.usage.outputTokens} out*`);
+        lines.push(...formatAgentResult({
+          title: `### Sub-Agent #${i + 1}`,
+          task: `${tasksArr[i].slice(0, 200)}${tasksArr[i].length > 200 ? "..." : ""}`,
+          content: r.content,
+          usage: r.usage,
+          toolNames: r.toolNames,
+          summary: r.summary,
+          evidence: r.evidence,
+          agentName: r.agentName
+        }));
         lines.push("");
       });
       lines.push("---");
@@ -5233,14 +5720,14 @@ var taskStopTool = {
 
 // src/tools/builtin/git-tools.ts
 import { execFileSync as execFileSync2 } from "child_process";
-import { existsSync as existsSync11 } from "fs";
-import { join as join6 } from "path";
+import { existsSync as existsSync13 } from "fs";
+import { join as join8 } from "path";
 function assertGitRepo(cwd) {
   let dir = cwd;
   const root = dir.split(/[\\/]/)[0] + (dir.includes("\\") ? "\\" : "/");
   while (dir && dir !== root) {
-    if (existsSync11(join6(dir, ".git"))) return;
-    const parent = join6(dir, "..");
+    if (existsSync13(join8(dir, ".git"))) return;
+    const parent = join8(dir, "..");
     if (parent === dir) break;
     dir = parent;
   }
@@ -5505,9 +5992,9 @@ ${commitOutput.trim()}`;
 };
 
 // src/tools/builtin/notebook-edit.ts
-import { readFileSync as readFileSync8, existsSync as existsSync12 } from "fs";
+import { readFileSync as readFileSync10, existsSync as existsSync14 } from "fs";
 import { writeFile } from "fs/promises";
-import { resolve as resolve5, extname as extname2 } from "path";
+import { resolve as resolve6, extname as extname2 } from "path";
 var notebookEditTool = {
   definition: {
     name: "notebook_edit",
@@ -5556,14 +6043,14 @@ var notebookEditTool = {
     if (!Number.isInteger(cellIndexRaw) || cellIndexRaw < 1) {
       throw new ToolError("notebook_edit", "cell_index must be a positive integer (1-based)");
     }
-    const absPath = resolve5(filePath);
+    const absPath = resolve6(filePath);
     if (extname2(absPath).toLowerCase() !== ".ipynb") {
       throw new ToolError("notebook_edit", "path must point to a .ipynb file");
     }
-    if (!existsSync12(absPath)) {
+    if (!existsSync14(absPath)) {
       throw new ToolError("notebook_edit", `Notebook not found: ${filePath}`);
     }
-    const raw = readFileSync8(absPath, "utf-8");
+    const raw = readFileSync10(absPath, "utf-8");
     const nb = parseNotebook(raw);
     const cellIdx0 = cellIndexRaw - 1;
     undoStack.push(absPath, `notebook_edit (${action}): ${filePath}`);
@@ -5980,8 +6467,8 @@ function estimateToolDefinitionTokens(def) {
 
 // src/tools/registry.ts
 import { pathToFileURL } from "url";
-import { existsSync as existsSync13, mkdirSync as mkdirSync5, readdirSync as readdirSync6 } from "fs";
-import { join as join7 } from "path";
+import { existsSync as existsSync15, mkdirSync as mkdirSync5, readdirSync as readdirSync7 } from "fs";
+import { join as join9 } from "path";
 var ToolRegistry = class {
   tools = /* @__PURE__ */ new Map();
   pluginToolNames = /* @__PURE__ */ new Set();
@@ -6142,7 +6629,7 @@ var ToolRegistry = class {
    * Returns the number of successfully loaded plugins.
    */
   async loadPlugins(pluginsDir, allowPlugins = false) {
-    if (!existsSync13(pluginsDir)) {
+    if (!existsSync15(pluginsDir)) {
       try {
         mkdirSync5(pluginsDir, { recursive: true });
       } catch {
@@ -6151,7 +6638,7 @@ var ToolRegistry = class {
     }
     let files;
     try {
-      files = readdirSync6(pluginsDir).filter((f) => f.endsWith(".js"));
+      files = readdirSync7(pluginsDir).filter((f) => f.endsWith(".js"));
     } catch {
       return 0;
     }
@@ -6168,12 +6655,12 @@ var ToolRegistry = class {
     process.stderr.write(
       `
 [plugins] \u26A0 Loading ${files.length} plugin(s) with FULL system privileges:
-` + files.map((f) => `  + ${join7(pluginsDir, f)}`).join("\n") + "\n\n"
+` + files.map((f) => `  + ${join9(pluginsDir, f)}`).join("\n") + "\n\n"
     );
     let loaded = 0;
     for (const file of files) {
       try {
-        const fileUrl = pathToFileURL(join7(pluginsDir, file)).href;
+        const fileUrl = pathToFileURL(join9(pluginsDir, file)).href;
         const mod = await import(fileUrl);
         const tool = mod.tool ?? mod.default?.tool ?? mod.default;
         if (!tool || typeof tool.execute !== "function" || !tool.definition?.name) {
@@ -6211,6 +6698,10 @@ export {
   getPendingHookTrust,
   runLifecycleHooks,
   runHook,
+  recordRecentlyDeniedAutoAction,
+  getRecentlyDeniedAutoActions,
+  clearRecentlyDeniedAutoActions,
+  defaultActionClassifier,
   isInterrupted,
   requestInterrupt,
   resetInterrupt,
@@ -6230,6 +6721,12 @@ export {
   cleanupRejectedTeeFile,
   askUserContext,
   googleSearchContext,
+  listAgentConfigs,
+  resolveAgentConfig,
+  listAgentRuns,
+  requestAgentStop,
+  setPreferredAgentName,
+  getPreferredAgentName,
   spawnAgentContext,
   estimateTokens,
   ToolRegistry