@kimbho/kimbho-cli 0.1.14 → 0.1.18

package/dist/index.cjs

@@ -1147,7 +1147,7 @@ var require_command = __commonJS({
   "../../node_modules/commander/lib/command.js"(exports2) {
     var EventEmitter = require("node:events").EventEmitter;
     var childProcess = require("node:child_process");
-    var path21 = require("node:path");
+    var path22 = require("node:path");
     var fs = require("node:fs");
     var process20 = require("node:process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
@@ -2147,9 +2147,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
         let launchWithNode = false;
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
-          const localBin = path21.resolve(baseDir, baseName);
+          const localBin = path22.resolve(baseDir, baseName);
           if (fs.existsSync(localBin)) return localBin;
-          if (sourceExt.includes(path21.extname(baseName))) return void 0;
+          if (sourceExt.includes(path22.extname(baseName))) return void 0;
           const foundExt = sourceExt.find(
             (ext) => fs.existsSync(`${localBin}${ext}`)
           );
@@ -2167,17 +2167,17 @@ Expecting one of '${allowedValues.join("', '")}'`);
           } catch {
             resolvedScriptPath = this._scriptPath;
           }
-          executableDir = path21.resolve(
-            path21.dirname(resolvedScriptPath),
+          executableDir = path22.resolve(
+            path22.dirname(resolvedScriptPath),
             executableDir
           );
         }
         if (executableDir) {
           let localFile = findFile(executableDir, executableFile);
           if (!localFile && !subcommand._executableFile && this._scriptPath) {
-            const legacyName = path21.basename(
+            const legacyName = path22.basename(
               this._scriptPath,
-              path21.extname(this._scriptPath)
+              path22.extname(this._scriptPath)
             );
             if (legacyName !== this._name) {
               localFile = findFile(
@@ -2188,7 +2188,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           }
           executableFile = localFile || executableFile;
         }
-        launchWithNode = sourceExt.includes(path21.extname(executableFile));
+        launchWithNode = sourceExt.includes(path22.extname(executableFile));
         let proc;
         if (process20.platform !== "win32") {
           if (launchWithNode) {
@@ -3035,7 +3035,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @return {Command}
        */
       nameFromFilename(filename) {
-        this._name = path21.basename(filename, path21.extname(filename));
+        this._name = path22.basename(filename, path22.extname(filename));
         return this;
       }
       /**
@@ -3049,9 +3049,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} [path]
        * @return {(string|null|Command)}
        */
-      executableDir(path22) {
-        if (path22 === void 0) return this._executableDir;
-        this._executableDir = path22;
+      executableDir(path23) {
+        if (path23 === void 0) return this._executableDir;
+        this._executableDir = path23;
         return this;
       }
       /**
@@ -6516,8 +6516,8 @@ var require_utils = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path21) {
-      let input = path21;
+    function removeDotSegments(path22) {
+      let input = path22;
       const output = [];
       let nextSlash = -1;
       let len = 0;
@@ -6716,8 +6716,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path21, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path21 && path21 !== "/" ? path21 : void 0;
+        const [path22, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path22 && path22 !== "/" ? path22 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -10098,7 +10098,7 @@ var require_windows = __commonJS({
     module2.exports = isexe;
     isexe.sync = sync;
     var fs = require("fs");
-    function checkPathExt(path21, options) {
+    function checkPathExt(path22, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
         return true;
@@ -10109,25 +10109,25 @@ var require_windows = __commonJS({
       }
       for (var i = 0; i < pathext.length; i++) {
         var p = pathext[i].toLowerCase();
-        if (p && path21.substr(-p.length).toLowerCase() === p) {
+        if (p && path22.substr(-p.length).toLowerCase() === p) {
           return true;
         }
       }
       return false;
     }
-    function checkStat(stat2, path21, options) {
+    function checkStat(stat2, path22, options) {
       if (!stat2.isSymbolicLink() && !stat2.isFile()) {
         return false;
       }
-      return checkPathExt(path21, options);
+      return checkPathExt(path22, options);
     }
-    function isexe(path21, options, cb) {
-      fs.stat(path21, function(er, stat2) {
-        cb(er, er ? false : checkStat(stat2, path21, options));
+    function isexe(path22, options, cb) {
+      fs.stat(path22, function(er, stat2) {
+        cb(er, er ? false : checkStat(stat2, path22, options));
       });
     }
-    function sync(path21, options) {
-      return checkStat(fs.statSync(path21), path21, options);
+    function sync(path22, options) {
+      return checkStat(fs.statSync(path22), path22, options);
     }
   }
 });
@@ -10138,13 +10138,13 @@ var require_mode = __commonJS({
     module2.exports = isexe;
     isexe.sync = sync;
     var fs = require("fs");
-    function isexe(path21, options, cb) {
-      fs.stat(path21, function(er, stat2) {
+    function isexe(path22, options, cb) {
+      fs.stat(path22, function(er, stat2) {
         cb(er, er ? false : checkStat(stat2, options));
       });
     }
-    function sync(path21, options) {
-      return checkStat(fs.statSync(path21), options);
+    function sync(path22, options) {
+      return checkStat(fs.statSync(path22), options);
     }
     function checkStat(stat2, options) {
       return stat2.isFile() && checkMode(stat2, options);
@@ -10177,7 +10177,7 @@ var require_isexe = __commonJS({
     }
     module2.exports = isexe;
     isexe.sync = sync;
-    function isexe(path21, options, cb) {
+    function isexe(path22, options, cb) {
       if (typeof options === "function") {
         cb = options;
         options = {};
@@ -10187,7 +10187,7 @@ var require_isexe = __commonJS({
           throw new TypeError("callback not provided");
         }
         return new Promise(function(resolve, reject) {
-          isexe(path21, options || {}, function(er, is) {
+          isexe(path22, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
@@ -10196,7 +10196,7 @@ var require_isexe = __commonJS({
           });
         });
       }
-      core(path21, options || {}, function(er, is) {
+      core(path22, options || {}, function(er, is) {
         if (er) {
           if (er.code === "EACCES" || options && options.ignoreErrors) {
             er = null;
@@ -10206,9 +10206,9 @@ var require_isexe = __commonJS({
         cb(er, is);
       });
     }
-    function sync(path21, options) {
+    function sync(path22, options) {
       try {
-        return core.sync(path21, options || {});
+        return core.sync(path22, options || {});
       } catch (er) {
         if (options && options.ignoreErrors || er.code === "EACCES") {
           return false;
@@ -10224,7 +10224,7 @@ var require_isexe = __commonJS({
 var require_which = __commonJS({
   "../../node_modules/which/which.js"(exports2, module2) {
     var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-    var path21 = require("path");
+    var path22 = require("path");
     var COLON = isWindows ? ";" : ":";
     var isexe = require_isexe();
     var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -10262,7 +10262,7 @@ var require_which = __commonJS({
           return opt.all && found.length ? resolve(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path21.join(pathPart, cmd);
+        const pCmd = path22.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         resolve(subStep(p, i, 0));
       });
@@ -10289,7 +10289,7 @@ var require_which = __commonJS({
       for (let i = 0; i < pathEnv.length; i++) {
         const ppRaw = pathEnv[i];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path21.join(pathPart, cmd);
+        const pCmd = path22.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         for (let j = 0; j < pathExt.length; j++) {
           const cur = p + pathExt[j];
@@ -10337,7 +10337,7 @@ var require_path_key = __commonJS({
 var require_resolveCommand = __commonJS({
   "../../node_modules/cross-spawn/lib/util/resolveCommand.js"(exports2, module2) {
     "use strict";
-    var path21 = require("path");
+    var path22 = require("path");
     var which = require_which();
     var getPathKey = require_path_key();
     function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -10355,7 +10355,7 @@ var require_resolveCommand = __commonJS({
       try {
         resolved = which.sync(parsed.command, {
           path: env[getPathKey({ env })],
-          pathExt: withoutPathExt ? path21.delimiter : void 0
+          pathExt: withoutPathExt ? path22.delimiter : void 0
         });
       } catch (e) {
       } finally {
@@ -10364,7 +10364,7 @@ var require_resolveCommand = __commonJS({
         }
       }
       if (resolved) {
-        resolved = path21.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+        resolved = path22.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
       }
       return resolved;
     }
@@ -10418,8 +10418,8 @@ var require_shebang_command = __commonJS({
       if (!match) {
         return null;
       }
-      const [path21, argument] = match[0].replace(/#! ?/, "").split(" ");
-      const binary = path21.split("/").pop();
+      const [path22, argument] = match[0].replace(/#! ?/, "").split(" ");
+      const binary = path22.split("/").pop();
       if (binary === "env") {
         return argument;
       }
@@ -10454,7 +10454,7 @@ var require_readShebang = __commonJS({
 var require_parse = __commonJS({
   "../../node_modules/cross-spawn/lib/parse.js"(exports2, module2) {
     "use strict";
-    var path21 = require("path");
+    var path22 = require("path");
     var resolveCommand = require_resolveCommand();
     var escape2 = require_escape();
     var readShebang = require_readShebang();
@@ -10479,7 +10479,7 @@ var require_parse = __commonJS({
       const needsShell = !isExecutableRegExp.test(commandFile);
       if (parsed.options.forceShell || needsShell) {
         const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-        parsed.command = path21.normalize(parsed.command);
+        parsed.command = path22.normalize(parsed.command);
         parsed.command = escape2.command(parsed.command);
         parsed.args = parsed.args.map((arg) => escape2.argument(arg, needsDoubleEscapeMetaChars));
         const shellCommand = [parsed.command].concat(parsed.args).join(" ");
@@ -10612,7 +10612,7 @@ var {
 // package.json
 var package_default = {
   name: "@kimbho/kimbho-cli",
-  version: "0.1.14",
+  version: "0.1.18",
   description: "Kimbho CLI is a terminal-native coding agent for planning, execution, and verification.",
   type: "module",
   engines: {
@@ -11406,8 +11406,8 @@ function getErrorMap() {
 
 // ../../node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path21, errorMaps, issueData } = params;
-  const fullPath = [...path21, ...issueData.path || []];
+  const { data, path: path22, errorMaps, issueData } = params;
+  const fullPath = [...path22, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -11523,11 +11523,11 @@ var errorUtil;
 
 // ../../node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path21, key) {
+  constructor(parent, value, path22, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path21;
+    this._path = path22;
     this._key = key;
   }
   get path() {
@@ -15026,7 +15026,12 @@ var PlanTaskSchema = external_exports.object({
   filesLikelyTouched: external_exports.array(external_exports.string()).default([]),
   riskLevel: RiskLevelSchema.default("medium"),
   originTaskId: external_exports.string().min(1).optional(),
-  swarmDepth: external_exports.number().int().nonnegative().optional()
+  swarmDepth: external_exports.number().int().nonnegative().optional(),
+  customAgentId: external_exports.string().min(1).optional(),
+  teamId: external_exports.string().min(1).optional(),
+  teamMemberIds: external_exports.array(external_exports.string()).optional(),
+  subagentLabel: external_exports.string().min(1).optional(),
+  subagentInstructions: external_exports.string().min(1).optional()
 });
 var PlanMilestoneSchema = external_exports.object({
   id: external_exports.string().min(1),
@@ -15437,6 +15442,7 @@ function summarizeStructuredOutputError(context, error2) {
 
 // ../core/dist/config/config.js
 var import_promises = require("node:fs/promises");
+var import_node_os = __toESM(require("node:os"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 var KIMBHO_DIR_NAME = ".kimbho";
 function resolveKimbhoDir(cwd = process.cwd()) {
@@ -15445,6 +15451,9 @@ function resolveKimbhoDir(cwd = process.cwd()) {
 function resolveConfigPath(cwd = process.cwd()) {
   return import_node_path.default.join(resolveKimbhoDir(cwd), "config.json");
 }
+function resolveGlobalConfigPath() {
+  return import_node_path.default.join(import_node_os.default.homedir(), ".kimbho", "config.json");
+}
 var LegacyProviderNameSchema = external_exports.enum([
   "openai",
   "anthropic",
@@ -15599,8 +15608,7 @@ async function ensureKimbhoDir(cwd = process.cwd()) {
   await (0, import_promises.mkdir)(import_node_path.default.join(root, "teams"), { recursive: true });
   return root;
 }
-async function loadConfig(cwd = process.cwd()) {
-  const configPath = resolveConfigPath(cwd);
+async function loadConfigFile(configPath) {
   try {
     const raw = await (0, import_promises.readFile)(configPath, "utf8");
     return KimbhoConfigSchema.parse(normalizeConfigInput(JSON.parse(raw)));
@@ -15612,6 +15620,77 @@ async function loadConfig(cwd = process.cwd()) {
     throw error2;
   }
 }
+async function loadProjectConfig(cwd = process.cwd()) {
+  return loadConfigFile(resolveConfigPath(cwd));
+}
+async function loadUserConfig() {
+  return loadConfigFile(resolveGlobalConfigPath());
+}
+function mergeConfigCatalog(lower, upper) {
+  const merged = /* @__PURE__ */ new Map();
+  for (const provider of lower) {
+    merged.set(provider.id, provider);
+  }
+  for (const provider of upper) {
+    merged.set(provider.id, provider);
+  }
+  return Array.from(merged.values());
+}
+function mergeConfigLayers(base, override) {
+  return KimbhoConfigSchema.parse({
+    providers: mergeConfigCatalog(base.providers, override.providers),
+    brains: {
+      planner: {
+        ...base.brains.planner,
+        ...override.brains.planner
+      },
+      coder: {
+        ...base.brains.coder,
+        ...override.brains.coder
+      },
+      reviewer: {
+        ...base.brains.reviewer,
+        ...override.brains.reviewer
+      },
+      fast: {
+        ...base.brains.fast,
+        ...override.brains.fast
+      }
+    },
+    approvalMode: override.approvalMode ?? base.approvalMode,
+    sandboxMode: override.sandboxMode ?? base.sandboxMode,
+    stackPresets: Array.from(/* @__PURE__ */ new Set([
+      ...base.stackPresets,
+      ...override.stackPresets
+    ])),
+    trustedDirectories: Array.from(/* @__PURE__ */ new Set([
+      ...base.trustedDirectories,
+      ...override.trustedDirectories
+    ]))
+  });
+}
+async function loadConfigLayers(cwd = process.cwd()) {
+  const [user, project] = await Promise.all([
+    loadUserConfig(),
+    loadProjectConfig(cwd)
+  ]);
+  if (!user && !project) {
+    return {
+      user: null,
+      project: null,
+      resolved: null
+    };
+  }
+  return {
+    user,
+    project,
+    resolved: user && project ? mergeConfigLayers(user, project) : project ?? user
+  };
+}
+async function loadConfig(cwd = process.cwd()) {
+  const layers = await loadConfigLayers(cwd);
+  return layers.resolved;
+}
 async function saveConfig(config2, cwd = process.cwd()) {
   await ensureKimbhoDir(cwd);
   const configPath = resolveConfigPath(cwd);
@@ -15622,6 +15701,16 @@ async function saveConfig(config2, cwd = process.cwd()) {
   await (0, import_promises.rename)(tempPath, configPath);
   return configPath;
 }
+async function saveUserConfig(config2) {
+  const configPath = resolveGlobalConfigPath();
+  await (0, import_promises.mkdir)(import_node_path.default.dirname(configPath), { recursive: true });
+  const normalized = KimbhoConfigSchema.parse(config2);
+  const tempPath = `${configPath}.tmp-${process.pid}-${Date.now()}`;
+  await (0, import_promises.writeFile)(tempPath, `${JSON.stringify(normalized, null, 2)}
+`, "utf8");
+  await (0, import_promises.rename)(tempPath, configPath);
+  return configPath;
+}
 function findProviderById(config2, providerId) {
   return config2.providers.find((provider) => provider.id === providerId);
 }
@@ -15740,10 +15829,10 @@ async function loadLatestSession(cwd = process.cwd()) {
 
 // ../core/dist/memory.js
 var import_promises3 = require("node:fs/promises");
-var import_node_os = __toESM(require("node:os"), 1);
+var import_node_os2 = __toESM(require("node:os"), 1);
 var import_node_path3 = __toESM(require("node:path"), 1);
 function resolveGlobalKimbhoHome() {
-  return import_node_path3.default.join(import_node_os.default.homedir(), ".kimbho");
+  return import_node_path3.default.join(import_node_os2.default.homedir(), ".kimbho");
 }
 function resolveUserMemoryPath() {
   return import_node_path3.default.join(resolveGlobalKimbhoHome(), "memory.md");
@@ -15807,6 +15896,54 @@ ${block}` : `# ${import_node_path3.default.basename(filePath, import_node_path3.
 
 ${block}`);
 }
+function uniqueOrdered(values) {
+  return Array.from(new Set(values));
+}
+function candidateMemoryFilesForDirectory(directory) {
+  return [
+    import_node_path3.default.join(directory, "KIMBHO.md"),
+    import_node_path3.default.join(directory, "KIMBHO.local.md"),
+    import_node_path3.default.join(directory, "CLAUDE.md"),
+    import_node_path3.default.join(directory, "CLAUDE.local.md")
+  ];
+}
+function discoverMarkdownMemoryPaths(cwd = process.cwd()) {
+  const discovered = [];
+  let current = import_node_path3.default.resolve(cwd);
+  const root = import_node_path3.default.parse(current).root;
+  while (true) {
+    discovered.push(...candidateMemoryFilesForDirectory(current));
+    if (current === root) {
+      break;
+    }
+    current = import_node_path3.default.dirname(current);
+  }
+  discovered.push(import_node_path3.default.join(cwd, "kimbho_init.md"));
+  discovered.push(resolveProjectMemoryPath(cwd));
+  discovered.push(resolveUserMemoryPath());
+  return uniqueOrdered(discovered);
+}
+async function loadMarkdownMemoryContext(cwd = process.cwd(), options = {}) {
+  const candidates = discoverMarkdownMemoryPaths(cwd);
+  const records = [];
+  const maxFiles = options.maxFiles ?? 12;
+  const maxCharsPerFile = options.maxCharsPerFile ?? 6e3;
+  for (const filePath of candidates) {
+    if (records.length >= maxFiles) {
+      break;
+    }
+    const content = await readMarkdownIfExists(filePath);
+    if (!content || content.trim().length === 0) {
+      continue;
+    }
+    records.push({
+      filePath,
+      content: content.length > maxCharsPerFile ? `${content.slice(0, maxCharsPerFile)}
+... [truncated]` : content
+    });
+  }
+  return records;
+}
 
 // ../core/dist/mcp.js
 var import_promises4 = require("node:fs/promises");
@@ -15996,6 +16133,8 @@ async function loadAgentTeams(cwd) {
       id,
       label: typeof attributes.label === "string" ? attributes.label : id,
       agents: asStringArray(attributes.agents),
+      match: asStringArray(attributes.match),
+      strategy: typeof attributes.strategy === "string" && attributes.strategy === "parallel" ? "parallel" : "sequential",
       filePath,
       ...body.trim() ? {
         description: body.trim()
@@ -16044,8 +16183,11 @@ async function createAgentTeamFile(cwd, id, agentIds, label) {
     "---",
     `id: ${id}`,
     `label: ${label ?? id}`,
+    "match:",
+    "  - feature",
     "agents:",
     ...agentIds.map((agentId) => `  - ${agentId}`),
+    "strategy: sequential",
     "---",
     "",
     `# ${label ?? id}`,
@@ -16072,11 +16214,46 @@ function scoreCustomAgentMatch(definition, task, request) {
   }
   return definition.match.reduce((score, keyword) => haystack.includes(keyword.toLowerCase()) ? score + 1 : score, 0);
 }
+function scoreAgentTeamMatch(definition, task, request) {
+  const haystack = [
+    request.goal,
+    task.title,
+    task.description,
+    ...task.acceptanceCriteria
+  ].join(" ").toLowerCase();
+  if (definition.match.length === 0) {
+    return definition.agents.length > 0 ? 1 : -1;
+  }
+  return definition.match.reduce((score, keyword) => haystack.includes(keyword.toLowerCase()) ? score + 1 : score, 0);
+}
+async function selectAgentTeam(cwd, task, request) {
+  const [teams, agents] = await Promise.all([
+    loadAgentTeams(cwd),
+    loadCustomAgents(cwd)
+  ]);
+  const selected = teams.map((team) => ({
+    team,
+    score: scoreAgentTeamMatch(team, task, request)
+  })).filter((candidate) => candidate.score > 0).sort((left, right) => right.score - left.score || left.team.id.localeCompare(right.team.id))[0]?.team;
+  if (!selected) {
+    return null;
+  }
+  const members = selected.agents.map((agentId) => agents.find((candidate) => candidate.id === agentId)).filter((candidate) => Boolean(candidate));
+  return {
+    team: selected,
+    members
+  };
+}
 async function selectCustomAgentOverlay(cwd, task, request, builtInTools) {
-  const definitions = await loadCustomAgents(cwd);
+  const selectedTeam = task.teamId ? await selectAgentTeam(cwd, task, request) : await selectAgentTeam(cwd, task, request);
+  const allDefinitions = await loadCustomAgents(cwd);
+  const preferredDefinition = task.customAgentId ? allDefinitions.find((definition) => definition.id === task.customAgentId) : null;
+  const definitions = preferredDefinition ? [
+    preferredDefinition
+  ] : selectedTeam?.members.length ? selectedTeam.members : allDefinitions;
   const ranked = definitions.map((definition) => ({
     definition,
-    score: scoreCustomAgentMatch(definition, task, request)
+    score: preferredDefinition && definition.id === preferredDefinition.id ? Number.MAX_SAFE_INTEGER : scoreCustomAgentMatch(definition, task, request)
   })).filter((candidate) => candidate.score > 0).sort((left, right) => right.score - left.score || left.definition.id.localeCompare(right.definition.id));
   const selected = ranked[0]?.definition;
   if (!selected) {
@@ -16090,6 +16267,12 @@ async function selectCustomAgentOverlay(cwd, task, request, builtInTools) {
     purpose: selected.purpose ?? baseProfile.purpose,
     brainRole: selected.brainRole ?? baseProfile.brainRole,
     promptPreamble: [
+      ...selectedTeam ? [
+        `Agent team active: ${selectedTeam.team.label} (${selectedTeam.team.id}).`,
+        `Team strategy: ${selectedTeam.team.strategy}.`,
+        `Team roster: ${selectedTeam.members.map((member) => member.id).join(", ") || "(none)"}.`,
+        selectedTeam.team.description?.trim() ?? ""
+      ].filter((line) => line.length > 0) : [],
       `Custom agent overlay: ${selected.label} (${selected.id}).`,
       `Base role: ${selected.baseRole}.`,
       selected.instructions.trim()
@@ -17311,7 +17494,7 @@ var import_promises11 = require("node:fs/promises");
 var import_node_path11 = __toESM(require("node:path"), 1);
 var import_node_process2 = __toESM(require("node:process"), 1);
 var import_node_child_process2 = require("node:child_process");
-var import_node_os2 = require("node:os");
+var import_node_os3 = require("node:os");
 
 // ../tools/dist/browser-manager.js
 var import_node_crypto2 = require("node:crypto");
@@ -18109,6 +18292,47 @@ var KNOWN_SCAFFOLD_PRESETS = [
 ];
 function looksLikeStaticLandingGoal(value) {
   const normalized = value.toLowerCase();
+  const backendSignals = [
+    "api",
+    "database",
+    "backend",
+    "server",
+    "migration",
+    "schema",
+    "prisma",
+    "postgres",
+    "sqlite",
+    "auth",
+    "billing",
+    "webhook"
+  ];
+  const pageSignals = [
+    "page",
+    "landing",
+    "lnding",
+    "homepage",
+    "home page",
+    "site",
+    "website",
+    "ui",
+    "hero",
+    "layout",
+    "screen"
+  ];
+  const polishSignals = [
+    "animate",
+    "animated",
+    "animation",
+    "motion",
+    "rich",
+    "richer",
+    "polish",
+    "styled",
+    "styling",
+    "visual",
+    "redesign",
+    "revamp"
+  ];
   if (normalized.includes("landing page") || normalized.includes("landing") || normalized.includes("lnding") || normalized.includes("homepage") || normalized.includes("home page") || normalized.includes("marketing page") || normalized.includes("storefront") || normalized.includes("static")) {
     return true;
   }
@@ -18118,6 +18342,12 @@ function looksLikeStaticLandingGoal(value) {
   if (normalized.includes("restaurant") && (normalized.includes("page") || normalized.includes("site") || normalized.includes("website") || normalized.includes("landing") || normalized.includes("lnding"))) {
     return true;
   }
+  if (pageSignals.some((signal) => normalized.includes(signal)) && polishSignals.some((signal) => normalized.includes(signal)) && !backendSignals.some((signal) => normalized.includes(signal))) {
+    return true;
+  }
+  if (normalized.includes("blog") && (normalized.includes("make") || normalized.includes("improve") || normalized.includes("enhance") || normalized.includes("redesign")) && !backendSignals.some((signal) => normalized.includes(signal))) {
+    return true;
+  }
   return false;
 }
 function sanitizeName(value) {
@@ -19019,7 +19249,7 @@ async function createUnifiedDiffPreview(cwd, targetPath, beforeContent, afterCon
   if (beforeContent === afterContent) {
     return void 0;
   }
-  const tempDir = await (0, import_promises11.mkdtemp)(import_node_path11.default.join((0, import_node_os2.tmpdir)(), "kimbho-diff-"));
+  const tempDir = await (0, import_promises11.mkdtemp)(import_node_path11.default.join((0, import_node_os3.tmpdir)(), "kimbho-diff-"));
   const beforePath = import_node_path11.default.join(tempDir, "before");
   const afterPath = import_node_path11.default.join(tempDir, "after");
   const relativeTarget = import_node_path11.default.relative(cwd, targetPath) || import_node_path11.default.basename(targetPath);
@@ -19051,10 +19281,17 @@ async function createUnifiedDiffPreview(cwd, targetPath, beforeContent, afterCon
     await (0, import_promises11.rm)(tempDir, { recursive: true, force: true });
   }
 }
-function resolveWorkspacePath(cwd, filePath) {
+function isTrustedWorkspacePath(resolved, trustedDirectories = []) {
+  return trustedDirectories.some((trustedDirectory) => {
+    const trustedRoot = import_node_path11.default.resolve(trustedDirectory);
+    const relative = import_node_path11.default.relative(trustedRoot, resolved);
+    return relative === "" || !relative.startsWith("..") && !import_node_path11.default.isAbsolute(relative);
+  });
+}
+function resolveWorkspacePath(cwd, filePath, trustedDirectories = []) {
   const resolved = import_node_path11.default.resolve(cwd, filePath);
   const relative = import_node_path11.default.relative(cwd, resolved);
-  if (relative.startsWith("..") || import_node_path11.default.isAbsolute(relative)) {
+  if ((relative.startsWith("..") || import_node_path11.default.isAbsolute(relative)) && !isTrustedWorkspacePath(resolved, trustedDirectories)) {
     throw new Error(`Path "${filePath}" escapes the workspace.`);
   }
   return resolved;
@@ -19137,10 +19374,10 @@ function normalizeArtifactRelativePath(cwd, absolutePath) {
 function isProtectedWritePath(relativePath) {
   return PROTECTED_WRITE_PREFIXES.some((prefix) => relativePath === prefix || relativePath.startsWith(`${prefix}/`));
 }
-function extractProspectiveWriteTargets(toolId, input, cwd) {
+function extractProspectiveWriteTargets(toolId, input, cwd, trustedDirectories = []) {
   if (toolId === "file.write" && typeof input.path === "string") {
     return [
-      normalizeArtifactRelativePath(cwd, resolveWorkspacePath(cwd, input.path))
+      normalizeArtifactRelativePath(cwd, resolveWorkspacePath(cwd, input.path, trustedDirectories))
     ];
   }
   if (toolId === "file.patch" && typeof input.patch === "string") {
@@ -19212,7 +19449,7 @@ function enforceToolPolicy(toolId, input, descriptor, context) {
     return null;
   }
   if ((toolId === "file.write" || toolId === "file.patch") && sandboxMode === "workspace-write") {
-    const targets = extractProspectiveWriteTargets(toolId, input, context.cwd);
+    const targets = extractProspectiveWriteTargets(toolId, input, context.cwd, context.trustedDirectories);
     const protectedTargets = targets.filter((target) => isProtectedWritePath(target));
     if (protectedTargets.length > 0) {
       return createPolicyFailure(toolId, `Blocked write to protected workspace paths: ${protectedTargets.join(", ")}`);
@@ -19319,7 +19556,7 @@ async function executeFileRead(input, context) {
   if (!rawPath) {
     throw new Error("file.read requires a string path.");
   }
-  const targetPath = resolveWorkspacePath(context.cwd, rawPath);
+  const targetPath = resolveWorkspacePath(context.cwd, rawPath, context.trustedDirectories);
   const contents = await (0, import_promises11.readFile)(targetPath, "utf8");
   return ToolResultSchema.parse({
     toolId: "file.read",
@@ -19340,7 +19577,7 @@ async function executeFileList(input, context, timeoutMs) {
   const root = typeof input.path === "string" && input.path.trim().length > 0 ? input.path : ".";
   const pattern = typeof input.pattern === "string" && input.pattern.trim().length > 0 ? input.pattern : null;
   const limit = parseLimitValue(input.limit, 200);
-  const searchRoot = resolveWorkspacePath(context.cwd, root);
+  const searchRoot = resolveWorkspacePath(context.cwd, root, context.trustedDirectories);
   const relativeRoot = import_node_path11.default.relative(context.cwd, searchRoot) || ".";
   const rootArg = relativeRoot === "." ? "." : relativeRoot;
   let result;
@@ -19388,7 +19625,7 @@ async function executeFileSearch(input, context, timeoutMs) {
   if (!pattern) {
     throw new Error("file.search requires a non-empty pattern.");
   }
-  const searchRoot = resolveWorkspacePath(context.cwd, root);
+  const searchRoot = resolveWorkspacePath(context.cwd, root, context.trustedDirectories);
   const relativeRoot = import_node_path11.default.relative(context.cwd, searchRoot) || ".";
   const rootArg = relativeRoot === "." ? "." : relativeRoot;
   let result;
@@ -19444,7 +19681,7 @@ async function executeFileWrite(input, context) {
   if (content === null) {
     throw new Error("file.write requires a string content field.");
   }
-  const targetPath = resolveWorkspacePath(context.cwd, rawPath);
+  const targetPath = resolveWorkspacePath(context.cwd, rawPath, context.trustedDirectories);
   let existed = true;
   let previousContent = "";
   try {
@@ -19522,7 +19759,7 @@ async function executeGitDiff(input, context, timeoutMs) {
     "--unified=3"
   ];
   if (rawPath) {
-    const targetPath = resolveWorkspacePath(context.cwd, rawPath);
+    const targetPath = resolveWorkspacePath(context.cwd, rawPath, context.trustedDirectories);
     const relativeTarget = import_node_path11.default.relative(context.cwd, targetPath) || ".";
     args.push("--", relativeTarget);
   }
@@ -19859,7 +20096,7 @@ async function executeProcessStart(input, context) {
   if (!command) {
     throw new Error("process.start requires a command string.");
   }
-  const processCwd = rawPath ? resolveWorkspacePath(context.cwd, rawPath) : context.cwd;
+  const processCwd = rawPath ? resolveWorkspacePath(context.cwd, rawPath, context.trustedDirectories) : context.cwd;
   const record2 = await startManagedProcess(processCwd, command, name, context.signal);
   return ToolResultSchema.parse({
     toolId: "process.start",
@@ -19957,7 +20194,7 @@ async function executeFilePatch(input, context, timeoutMs) {
   if (!patch) {
     throw new Error("file.patch requires a unified diff in the patch field.");
   }
-  const tempDir = await (0, import_promises11.mkdtemp)(import_node_path11.default.join((0, import_node_os2.tmpdir)(), "kimbho-patch-"));
+  const tempDir = await (0, import_promises11.mkdtemp)(import_node_path11.default.join((0, import_node_os3.tmpdir)(), "kimbho-patch-"));
   const patchPath = import_node_path11.default.join(tempDir, "change.patch");
   try {
     await (0, import_promises11.writeFile)(patchPath, patch, "utf8");
@@ -20310,10 +20547,10 @@ function assignProp(target, prop, value) {
     configurable: true
   });
 }
-function getElementAtPath(obj, path21) {
-  if (!path21)
+function getElementAtPath(obj, path22) {
+  if (!path22)
     return obj;
-  return path21.reduce((acc, key) => acc?.[key], obj);
+  return path22.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -20633,11 +20870,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path21, issues) {
+function prefixIssues(path22, issues) {
   return issues.map((iss) => {
     var _a;
     (_a = iss).path ?? (_a.path = []);
-    iss.path.unshift(path21);
+    iss.path.unshift(path22);
     return iss;
   });
 }
@@ -27385,6 +27622,7 @@ var MCP_ALLOWED_ROLES = [
   "reviewer",
   "integrator"
 ];
+var MCP_INVENTORY_TIMEOUT_MS = 8e3;
 function toMcpToolId(serverName, toolName) {
   return `mcp.${serverName}.${toolName}`;
 }
@@ -27427,7 +27665,7 @@ function renderMcpContent(result) {
   }
   return sections.length > 0 ? sections.join("\n\n") : void 0;
 }
-async function withMcpClient(cwd, name, server, handler) {
+async function withMcpClient(cwd, name, server, handler, options = {}) {
   const transport = new StdioClientTransport({
     command: server.command,
     args: server.args,
@@ -27446,10 +27684,31 @@ async function withMcpClient(cwd, name, server, handler) {
     name: "kimbho",
     version: "0.1.13"
   });
-  await client.connect(transport);
+  const run = async () => {
+    await client.connect(transport);
+    return handler(client);
+  };
   try {
-    return await handler(client);
+    if (typeof options.timeoutMs === "number" && options.timeoutMs > 0) {
+      let timer;
+      try {
+        return await Promise.race([
+          run(),
+          new Promise((_, reject) => {
+            timer = setTimeout(() => {
+              reject(new Error(`${options.timeoutLabel ?? `MCP call for ${name}`} timed out after ${options.timeoutMs}ms.`));
+            }, options.timeoutMs);
+          })
+        ]);
+      } finally {
+        if (timer) {
+          clearTimeout(timer);
+        }
+      }
+    }
+    return await run();
   } finally {
+    await client.close().catch(() => void 0);
     await transport.close().catch(() => void 0);
   }
 }
@@ -27458,31 +27717,65 @@ async function loadMcpServerInventory(cwd) {
   const servers = Object.entries(config2.mcpServers).filter(([, server]) => server.enabled !== false).sort(([left], [right]) => left.localeCompare(right));
   const inventory = [];
   for (const [name, server] of servers) {
-    const record2 = await withMcpClient(cwd, name, server, async (client) => {
-      const [toolsResponse, promptsResponse, resourcesResponse] = await Promise.all([
-        client.listTools().catch(() => ({ tools: [] })),
-        client.listPrompts().catch(() => ({ prompts: [] })),
-        client.listResources().catch(() => ({ resources: [] }))
-      ]);
-      const instructions = client.getInstructions();
-      return {
+    try {
+      const record2 = await withMcpClient(cwd, name, server, async (client) => {
+        const [toolsResponse, promptsResponse, resourcesResponse, resourceTemplatesResponse] = await Promise.all([
+          client.listTools().catch(() => ({ tools: [] })),
+          client.listPrompts().catch(() => ({ prompts: [] })),
+          client.listResources().catch(() => ({ resources: [] })),
+          client.listResourceTemplates().catch(() => ({ resourceTemplates: [] }))
+        ]);
+        const instructions = client.getInstructions();
+        return {
+          name,
+          config: server,
+          tools: (toolsResponse.tools ?? []).map((tool) => ({
+            serverName: name,
+            toolName: tool.name,
+            toolId: toMcpToolId(name, tool.name),
+            description: tool.description ?? `MCP tool ${tool.name} from ${name}.`,
+            permission: permissionFromAnnotations(tool.annotations)
+          })),
+          prompts: (promptsResponse.prompts ?? []).map((prompt) => ({
+            serverName: name,
+            name: prompt.name,
+            description: prompt.description ?? `MCP prompt ${prompt.name} from ${name}.`,
+            arguments: prompt.arguments ?? []
+          })),
+          resources: (resourcesResponse.resources ?? []).map((resource) => ({
+            serverName: name,
+            uri: resource.uri,
+            name: resource.name,
+            description: resource.description,
+            mimeType: resource.mimeType
+          })),
+          resourceTemplates: (resourceTemplatesResponse.resourceTemplates ?? []).map((resourceTemplate) => ({
+            serverName: name,
+            uriTemplate: resourceTemplate.uriTemplate,
+            name: resourceTemplate.name,
+            description: resourceTemplate.description,
+            mimeType: resourceTemplate.mimeType
+          })),
+          ...instructions ? {
+            instructions
+          } : {}
+        };
+      }, {
+        timeoutMs: MCP_INVENTORY_TIMEOUT_MS,
+        timeoutLabel: `MCP inventory for ${name}`
+      });
+      inventory.push(record2);
+    } catch (error2) {
+      inventory.push({
         name,
         config: server,
-        tools: (toolsResponse.tools ?? []).map((tool) => ({
-          serverName: name,
-          toolName: tool.name,
-          toolId: toMcpToolId(name, tool.name),
-          description: tool.description ?? `MCP tool ${tool.name} from ${name}.`,
-          permission: permissionFromAnnotations(tool.annotations)
-        })),
-        prompts: (promptsResponse.prompts ?? []).map((prompt) => prompt.name),
-        resources: (resourcesResponse.resources ?? []).map((resource) => resource.name ?? resource.uri),
-        ...instructions ? {
-          instructions
-        } : {}
-      };
-    });
-    inventory.push(record2);
+        tools: [],
+        prompts: [],
+        resources: [],
+        resourceTemplates: [],
+        warning: error2 instanceof Error ? error2.message : String(error2)
+      });
+    }
   }
   return inventory;
 }
@@ -27513,6 +27806,59 @@ async function callMcpTool(cwd, serverName, toolName, input) {
     artifacts: []
   };
 }
+function renderPromptContent(result) {
+  return result.messages.map((message) => {
+    if (message.content.type === "text") {
+      return `[${message.role}] ${message.content.text}`;
+    }
+    if (message.content.type === "resource") {
+      const resource = message.content.resource;
+      return `[${message.role}] resource ${resource.uri}
+${"text" in resource ? resource.text : `[binary ${resource.mimeType ?? "resource"}]`}`;
+    }
+    if (message.content.type === "resource_link") {
+      return `[${message.role}] resource-link ${message.content.uri}`;
+    }
+    return `[${message.role}] ${JSON.stringify(message.content, null, 2)}`;
+  }).join("\n\n");
+}
+async function invokeMcpPrompt(cwd, serverName, promptName, args) {
+  const config2 = await loadMcpConfig(cwd);
+  const server = config2.mcpServers[serverName];
+  if (!server || server.enabled === false) {
+    throw new Error(`MCP server ${serverName} is not configured or is disabled.`);
+  }
+  const result = await withMcpClient(cwd, serverName, server, async (client) => client.getPrompt({
+    name: promptName,
+    arguments: args
+  }));
+  return {
+    serverName,
+    promptName,
+    ...result.description ? {
+      description: result.description
+    } : {},
+    content: renderPromptContent(result)
+  };
+}
+async function readMcpResource(cwd, serverName, uri) {
+  const config2 = await loadMcpConfig(cwd);
+  const server = config2.mcpServers[serverName];
+  if (!server || server.enabled === false) {
+    throw new Error(`MCP server ${serverName} is not configured or is disabled.`);
+  }
+  const result = await withMcpClient(cwd, serverName, server, async (client) => client.readResource({
+    uri
+  }));
+  const content = result.contents.map((item) => "text" in item ? `resource: ${item.uri}
+${item.text}` : `resource: ${item.uri}
+[binary ${item.mimeType ?? "resource"}]`).join("\n\n");
+  return {
+    serverName,
+    uri,
+    content
+  };
+}
 async function registerMcpToolsForWorkspace(cwd, registry2, runtime) {
   const tools = await discoverMcpTools(cwd);
   for (const tool of tools) {
@@ -27536,7 +27882,7 @@ async function registerMcpToolsForWorkspace(cwd, registry2, runtime) {
 
 // ../agent-runtime/dist/autonomous.js
 var MAX_TOOL_OUTPUT_CHARS = 4e3;
-var MAX_PARSE_RETRIES = 2;
+var MAX_PARSE_RETRIES = 1;
 var DEFAULT_MAX_REPAIR_ATTEMPTS = 2;
 var CONTEXT_FILE_READ_LIMIT = 3;
 var SESSION_NOTE_LIMIT = 4;
@@ -27552,6 +27898,14 @@ var BOOTSTRAP_CONTEXT_FILES = [
   "README.md",
   "package.json"
 ];
+async function fileExists(cwd, filePath) {
+  try {
+    await (0, import_promises12.access)(import_node_path12.default.join(cwd, filePath));
+    return true;
+  } catch {
+    return false;
+  }
+}
 function createAgentActionSchema(allowedTools) {
   return external_exports.discriminatedUnion("type", [
     external_exports.object({
@@ -27718,6 +28072,9 @@ function buildSystemPrompt(agent, task, request, allowedTools, plan, extraInstru
   return [
     `You are Kimbho's ${agent.role}.`,
     `Purpose: ${agent.purpose}`,
+    ...task.subagentLabel ? [
+      `Delegated worker: ${task.subagentLabel}`
+    ] : [],
     `Goal: ${request.goal}`,
     `Current task: ${task.id} - ${task.title}`,
     `Task description: ${task.description}`,
@@ -27751,6 +28108,10 @@ function buildSystemPrompt(agent, task, request, allowedTools, plan, extraInstru
     `- After changing code, run verification with tests.run or shell.exec when appropriate.`,
     `- Do not claim success unless the task acceptance criteria are satisfied.`,
     `- If the task is underspecified, make a pragmatic implementation choice and continue.`,
+    ...task.subagentInstructions ? [
+      `Delegation instructions:`,
+      task.subagentInstructions
+    ] : [],
     ...extraInstructions ? [
       `Custom instructions:`,
       extraInstructions
@@ -28165,6 +28526,7 @@ var AutonomousTaskExecutor = class {
             signal: options.signal,
             approvalMode: this.config.approvalMode,
             sandboxMode: this.config.sandboxMode,
+            trustedDirectories: this.config.trustedDirectories,
             agentRole: task.agentRole,
             sessionId,
             taskId: task.id,
@@ -28174,6 +28536,7 @@ var AutonomousTaskExecutor = class {
             cwd: request.cwd,
             approvalMode: this.config.approvalMode,
             sandboxMode: this.config.sandboxMode,
+            trustedDirectories: this.config.trustedDirectories,
             agentRole: task.agentRole,
             sessionId,
             taskId: task.id,
@@ -28244,7 +28607,13 @@ var AutonomousTaskExecutor = class {
           ...BOOTSTRAP_CONTEXT_FILES,
           ...filesToRead
         ] : BOOTSTRAP_CONTEXT_FILES)).slice(0, CONTEXT_FILE_READ_LIMIT + 4);
+        const existingContextFiles = [];
         for (const filePath of fallbackFiles) {
+          if (await fileExists(request.cwd, filePath)) {
+            existingContextFiles.push(filePath);
+          }
+        }
+        for (const filePath of existingContextFiles) {
           const readResult = await runPreflightTool("file.read", {
             path: filePath
           }, "Load an existing repo-defining file before the first model action.");
@@ -28256,12 +28625,23 @@ var AutonomousTaskExecutor = class {
       const contextRootCwd = options.contextRootCwd ?? request.cwd;
       const savedSession = await loadLatestSession(contextRootCwd).catch(() => null);
       const savedSessionSummary = summarizeSavedSessionContext(sessionId, savedSession);
+      const recursiveMemory = await loadMarkdownMemoryContext(request.cwd, {
+        maxFiles: 10,
+        maxCharsPerFile: 4e3
+      });
       const userMemory = await readMarkdownIfExists(resolveUserMemoryPath());
       const projectMemory = await readMarkdownIfExists(resolveProjectMemoryPath(request.cwd));
       const customAgentMemory = customOverlay ? await readMarkdownIfExists(import_node_path12.default.join(resolveAgentMemoryDir(request.cwd), `${customOverlay.definition.id}.md`)) : null;
       if (savedSessionSummary.length > 0) {
         contextMessages.unshift(savedSessionSummary.join("\n"));
       }
+      if (recursiveMemory.length > 0) {
+        contextMessages.unshift([
+          "Recursive markdown memory context:",
+          ...recursiveMemory.map((record2) => `File: ${record2.filePath}
+${truncateForModel(record2.content)}`)
+        ].join("\n\n"));
+      }
       if (userMemory) {
         contextMessages.unshift(`Global user memory:
 ${truncateForModel(userMemory)}`);
@@ -28306,6 +28686,7 @@ ${truncateForModel(customAgentMemory)}`);
           signal: options.signal,
           approvalMode: this.config.approvalMode,
           sandboxMode: this.config.sandboxMode,
+          trustedDirectories: this.config.trustedDirectories,
           agentRole: task.agentRole,
           operatorApproved,
           sessionId,
@@ -28318,6 +28699,7 @@ ${truncateForModel(customAgentMemory)}`);
           cwd: request.cwd,
           approvalMode: this.config.approvalMode,
           sandboxMode: this.config.sandboxMode,
+          trustedDirectories: this.config.trustedDirectories,
           agentRole: task.agentRole,
           operatorApproved,
           sessionId,
@@ -28516,14 +28898,16 @@ ${truncateForModel(customAgentMemory)}`);
       let responseText = "";
       let parsedAction = null;
       for (let attempt = 0; attempt <= MAX_PARSE_RETRIES; attempt += 1) {
-        await emitProgress({
-          type: "task-note",
-          sessionId,
-          taskId: task.id,
-          agentRole: task.agentRole,
-          step,
-          message: attempt === 0 ? "Thinking through the next safe action." : `Re-asking the model for a stricter machine-readable action (${attempt + 1}/${MAX_PARSE_RETRIES + 1}).`
-        });
+        if (attempt === 0) {
+          await emitProgress({
+            type: "task-note",
+            sessionId,
+            taskId: task.id,
+            agentRole: task.agentRole,
+            step,
+            message: "Thinking through the next safe action."
+          });
+        }
         let response;
         try {
           response = await brain.client.generateText({
@@ -28591,20 +28975,20 @@ ${truncateForModel(customAgentMemory)}`);
             response: response.text,
             runtimeNote: `${parseSummary} ${error2 instanceof Error ? error2.message : String(error2)}`
           });
+          const inferredFallbackAction = inferFallbackActionFromResponse(response.text, task, request, allowedTools);
+          if (inferredFallbackAction) {
+            parsedAction = inferredFallbackAction;
+            await emitProgress({
+              type: "task-note",
+              sessionId,
+              taskId: task.id,
+              agentRole: task.agentRole,
+              step,
+              message: `Interpreted the model draft as ${inferredFallbackAction.tool}.`
+            });
+            break;
+          }
           if (attempt === MAX_PARSE_RETRIES) {
-            const inferredFallbackAction = inferFallbackActionFromResponse(response.text, task, request, allowedTools);
-            if (inferredFallbackAction) {
-              parsedAction = inferredFallbackAction;
-              await emitProgress({
-                type: "task-note",
-                sessionId,
-                taskId: task.id,
-                agentRole: task.agentRole,
-                step,
-                message: `Model stayed out of structured mode; inferred ${inferredFallbackAction.tool} from the response.`
-              });
-              break;
-            }
             const transcriptPath2 = await writeTranscriptArtifact(request.cwd, sessionId, task.id, transcript);
             artifacts.add(transcriptPath2);
             await emitProgress({
@@ -28629,7 +29013,7 @@ ${truncateForModel(customAgentMemory)}`);
             taskId: task.id,
             agentRole: task.agentRole,
             step,
-            message: `Reformatting model output to match Kimbho's action schema (${attempt + 1}/${MAX_PARSE_RETRIES + 1}).`
+            message: "Normalizing the model draft into one safe machine-readable action."
           });
           messages.push({
             role: "assistant",
@@ -28795,6 +29179,47 @@ function normalizeGoal(goal) {
 }
 function looksLikeStaticSiteGoal(goal) {
   const lower = goal.toLowerCase();
+  const backendSignals = [
+    "api",
+    "database",
+    "backend",
+    "server",
+    "migration",
+    "schema",
+    "prisma",
+    "postgres",
+    "sqlite",
+    "auth",
+    "billing",
+    "webhook"
+  ];
+  const pageSignals = [
+    "page",
+    "landing",
+    "lnding",
+    "homepage",
+    "home page",
+    "site",
+    "website",
+    "ui",
+    "hero",
+    "layout",
+    "screen"
+  ];
+  const polishSignals = [
+    "animate",
+    "animated",
+    "animation",
+    "motion",
+    "rich",
+    "richer",
+    "polish",
+    "styled",
+    "styling",
+    "visual",
+    "redesign",
+    "revamp"
+  ];
   if (lower.includes("landing page") || lower.includes("landing") || lower.includes("lnding") || lower.includes("homepage") || lower.includes("home page") || lower.includes("marketing page") || lower.includes("storefront") || lower.includes("restaurant website") || lower.includes("restaurant site") || lower.includes("static site")) {
     return true;
   }
@@ -28804,6 +29229,12 @@ function looksLikeStaticSiteGoal(goal) {
   if (lower.includes("restaurant") && (lower.includes("page") || lower.includes("site") || lower.includes("website") || lower.includes("landing") || lower.includes("lnding"))) {
     return true;
   }
+  if (pageSignals.some((signal) => lower.includes(signal)) && polishSignals.some((signal) => lower.includes(signal)) && !backendSignals.some((signal) => lower.includes(signal))) {
+    return true;
+  }
+  if (lower.includes("blog") && (lower.includes("make") || lower.includes("improve") || lower.includes("enhance") || lower.includes("redesign")) && !backendSignals.some((signal) => lower.includes(signal))) {
+    return true;
+  }
   return false;
 }
 function inferProjectShape(goal) {
@@ -29577,7 +30008,7 @@ function terminalTaskIds(tasks) {
   const terminalIds = tasks.filter((task) => !referencedIds.has(task.id)).map((task) => task.id);
   return terminalIds.length > 0 ? terminalIds : tasks.map((task) => task.id);
 }
-function integrateExpandedTasks(plan, taskId, expandedTasks, note) {
+function integratePlanTaskExpansion(plan, taskId, expandedTasks, note) {
   const terminalIds = terminalTaskIds(expandedTasks);
   const milestones = plan.milestones.map((milestone) => ({
     ...milestone,
@@ -29687,7 +30118,7 @@ async function generateExpandedTasks(request, plan, task, invocation, repoSummar
     const normalizedTasks = normalizeExpandedTasks(plan, task, payload, "model");
     const note = `Planner expanded ${task.id} into ${normalizedTasks.length} subtasks via ${invocation.modelLabel ?? "planner model"}: ${normalizedTasks.map((candidate) => candidate.id).join(", ")}.`;
     return {
-      plan: integrateExpandedTasks(plan, task.id, normalizedTasks, note),
+      plan: integratePlanTaskExpansion(plan, task.id, normalizedTasks, note),
       source: "model",
       expandedTaskId: task.id,
       createdTaskIds: normalizedTasks.map((candidate) => candidate.id),
@@ -29716,7 +30147,7 @@ async function generateExpandedTasks(request, plan, task, invocation, repoSummar
     }
     const note = `Planner fell back to deterministic subtask expansion for ${task.id}: ${fallbackTasks.map((candidate) => candidate.id).join(", ")}.`;
     return {
-      plan: integrateExpandedTasks(plan, task.id, fallbackTasks, note),
+      plan: integratePlanTaskExpansion(plan, task.id, fallbackTasks, note),
       source: "fallback",
       expandedTaskId: task.id,
       createdTaskIds: fallbackTasks.map((candidate) => candidate.id),
@@ -29761,7 +30192,7 @@ function expandPlanTaskFallback(plan, taskId) {
   }
   const note = `Planner deterministically expanded ${task.id} into ${fallbackTasks.length} subtasks: ${fallbackTasks.map((candidate) => candidate.id).join(", ")}.`;
   return {
-    plan: integrateExpandedTasks(plan, task.id, fallbackTasks, note),
+    plan: integratePlanTaskExpansion(plan, task.id, fallbackTasks, note),
     source: "fallback",
     expandedTaskId: task.id,
     createdTaskIds: fallbackTasks.map((candidate) => candidate.id),
@@ -30695,6 +31126,19 @@ function maybeAppendNote(notes, note) {
     note
   ];
 }
+function slugify2(value) {
+  return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").replace(/-{2,}/g, "-");
+}
+function createUniqueTaskId2(baseId, existingIds) {
+  let candidate = baseId;
+  let index = 2;
+  while (existingIds.has(candidate)) {
+    candidate = `${baseId}-${index}`;
+    index += 1;
+  }
+  existingIds.add(candidate);
+  return candidate;
+}
 function mergeUnique(items) {
   return Array.from(new Set(items.filter((item) => item.trim().length > 0)));
 }
@@ -30707,6 +31151,280 @@ function isStaticSiteTask(task, request) {
   }
   return task.filesLikelyTouched.some((filePath) => filePath === "src/app/page.tsx" || filePath === "src/app/layout.tsx" || filePath === "src/pages/index.tsx" || filePath === "index.html" || filePath === "styles.css");
 }
+function shouldDelegateTask(task) {
+  return (task.swarmDepth ?? 0) === 0 && task.type === "implementation" && ![
+    "repo-analyst",
+    "planner",
+    "reviewer",
+    "integrator",
+    "test-debugger",
+    "session-orchestrator",
+    "execution-manager"
+  ].includes(task.agentRole);
+}
+function terminalExpansionTaskIds(tasks) {
+  const referencedIds = new Set(tasks.flatMap((task) => task.dependsOn));
+  const terminalIds = tasks.filter((task) => !referencedIds.has(task.id)).map((task) => task.id);
+  return terminalIds.length > 0 ? terminalIds : tasks.map((task) => task.id);
+}
+function createDefaultDelegationPlan(task, request) {
+  if (!shouldDelegateTask(task)) {
+    return null;
+  }
+  if (task.agentRole === "frontend-specialist" || isStaticSiteTask(task, request)) {
+    return {
+      label: "auto-frontend-swarm",
+      strategy: "parallel",
+      members: [
+        {
+          id: "content-architect",
+          label: "content-architect",
+          agentRole: "frontend-specialist",
+          description: "Own information architecture, page composition, navigation, copy structure, and section flow.",
+          instructions: "Prioritize semantic layout, page structure, routes, content hierarchy, and component composition. Leave purely visual polish to the visual worker unless structure blocks it.",
+          acceptanceCriteria: [
+            "The page structure, sections, and navigation flow are clear and coherent.",
+            "Content hierarchy reflects the requested product, brand, or venue."
+          ],
+          outputs: [
+            "Structured page/content update"
+          ]
+        },
+        {
+          id: "visual-polisher",
+          label: "visual-polisher",
+          agentRole: "frontend-specialist",
+          description: "Own styling, gradients, motion, responsiveness, spacing, and visual finishing.",
+          instructions: "Focus on visual quality, gradients, motion, responsiveness, spacing, and interaction polish after inspecting the current structure. Keep edits aligned with the existing design language when present.",
+          acceptanceCriteria: [
+            "Visual styling and responsiveness are meaningfully improved.",
+            "Motion and polish remain consistent with the requested UI direction."
+          ],
+          outputs: [
+            "Visual polish update"
+          ]
+        }
+      ]
+    };
+  }
+  if (task.agentRole === "backend-specialist") {
+    return {
+      label: "auto-backend-swarm",
+      strategy: "sequential",
+      members: [
+        {
+          id: "contract-architect",
+          label: "contract-architect",
+          agentRole: "backend-specialist",
+          description: "Define the API/service surface, request-response shapes, and failure behavior.",
+          instructions: "Focus on service and API contracts, input/output shapes, handlers, and edge cases before broad implementation changes.",
+          acceptanceCriteria: [
+            "Contracts and failure cases are explicit.",
+            "The implementation path is narrowed to concrete handlers or services."
+          ],
+          outputs: [
+            "Backend contract design"
+          ]
+        },
+        {
+          id: "service-implementer",
+          label: "service-implementer",
+          agentRole: "backend-specialist",
+          description: "Implement handlers, services, and domain logic against the agreed contract.",
+          instructions: "Implement the core backend behavior against the established contract. Prefer targeted file edits and verification over broad rewrites.",
+          acceptanceCriteria: [
+            "Business logic is implemented against the contract.",
+            "The backend behavior satisfies the task acceptance criteria."
+          ],
+          outputs: [
+            "Backend implementation"
+          ]
+        }
+      ]
+    };
+  }
+  if (task.agentRole === "database-specialist") {
+    return {
+      label: "auto-database-swarm",
+      strategy: "sequential",
+      members: [
+        {
+          id: "schema-designer",
+          label: "schema-designer",
+          agentRole: "database-specialist",
+          description: "Design models, fields, relations, constraints, and persistence boundaries.",
+          instructions: "Focus on schema structure, data modeling, constraints, and identifiers. Keep the migration path safe and explicit.",
+          acceptanceCriteria: [
+            "Schema design reflects the requested domain.",
+            "Constraints and data relationships are explicit."
+          ],
+          outputs: [
+            "Schema design"
+          ]
+        },
+        {
+          id: "migration-planner",
+          label: "migration-planner",
+          agentRole: "database-specialist",
+          description: "Apply or prepare migrations and persistence wiring around the approved schema.",
+          instructions: "Translate the schema design into migrations or persistence updates. Keep destructive changes obvious and verification-friendly.",
+          acceptanceCriteria: [
+            "Persistence updates align with the intended schema.",
+            "Migration risk and verification needs are explicit."
+          ],
+          outputs: [
+            "Migration/persistence update"
+          ]
+        }
+      ]
+    };
+  }
+  if (task.agentRole === "infra-specialist") {
+    return {
+      label: "auto-infra-swarm",
+      strategy: "sequential",
+      members: [
+        {
+          id: "workspace-scaffolder",
+          label: "workspace-scaffolder",
+          agentRole: "infra-specialist",
+          description: "Set up required files, scripts, package wiring, and environment plumbing.",
+          instructions: "Focus on scaffolding, package manifests, scripts, environment wiring, and local runtime setup. Keep the workspace runnable.",
+          acceptanceCriteria: [
+            "Required scaffolding and environment wiring are in place.",
+            "The workspace can proceed into implementation or verification."
+          ],
+          outputs: [
+            "Workspace scaffolding"
+          ]
+        },
+        {
+          id: "runtime-verifier",
+          label: "runtime-verifier",
+          agentRole: "infra-specialist",
+          description: "Verify build/runtime setup and tighten any configuration or tooling gaps.",
+          instructions: "Focus on runtime, toolchain, script, and build verification after the initial setup work has landed.",
+          acceptanceCriteria: [
+            "The environment or app can be verified locally.",
+            "Tooling and configuration gaps are closed."
+          ],
+          outputs: [
+            "Runtime/config verification"
+          ]
+        }
+      ]
+    };
+  }
+  return null;
+}
+function materializeDelegatedTasks(plan, task, label, strategy, members) {
+  const existingIds = new Set(flattenPlanTasks(plan).filter((candidate) => candidate.id !== task.id).map((candidate) => candidate.id));
+  const teamMemberIds = members.map((member) => member.id);
+  const generatedTaskIds = members.map((member, index) => createUniqueTaskId2(`${task.id}-${slugify2(member.id) || `worker-${index + 1}`}`, existingIds));
+  return members.map((member, index) => {
+    const taskId = generatedTaskIds[index];
+    const dependsOn = strategy === "parallel" ? [
+      ...task.dependsOn
+    ] : index === 0 ? [
+      ...task.dependsOn
+    ] : [
+      generatedTaskIds[index - 1]
+    ];
+    return {
+      ...task,
+      id: taskId,
+      title: `${task.title} (${member.label})`,
+      description: [
+        task.description,
+        `Delegated worker: ${member.label}.`,
+        member.description
+      ].join("\n\n"),
+      agentRole: member.agentRole,
+      dependsOn,
+      acceptanceCriteria: member.acceptanceCriteria?.length ? member.acceptanceCriteria : index === members.length - 1 ? task.acceptanceCriteria : [
+        `Advance ${task.title.toLowerCase()} from the ${member.label} perspective.`,
+        "Leave concrete implementation evidence for the next worker."
+      ],
+      outputs: member.outputs?.length ? member.outputs : index === members.length - 1 ? task.outputs : [
+        `Delegated handoff from ${member.id}`
+      ],
+      filesLikelyTouched: member.filesLikelyTouched?.length ? member.filesLikelyTouched : task.filesLikelyTouched,
+      originTaskId: task.id,
+      swarmDepth: (task.swarmDepth ?? 0) + 1,
+      teamId: label,
+      teamMemberIds,
+      subagentLabel: member.label,
+      subagentInstructions: member.instructions
+    };
+  });
+}
+function appendReviewAndIntegrationTasks(plan, originalTask, expandedTasks, delegationLabel) {
+  const existingIds = new Set(flattenPlanTasks(plan).filter((candidate) => candidate.id !== originalTask.id).map((candidate) => candidate.id));
+  for (const task of expandedTasks) {
+    existingIds.add(task.id);
+  }
+  const terminalIds = terminalExpansionTaskIds(expandedTasks);
+  const reviewerId = createUniqueTaskId2(`${originalTask.id}-review`, existingIds);
+  const integratorId = createUniqueTaskId2(`${originalTask.id}-integrate`, existingIds);
+  const reviewerTask = {
+    ...originalTask,
+    id: reviewerId,
+    title: `Review ${originalTask.title.toLowerCase()}`,
+    description: `Inspect delegated worker output from ${delegationLabel} before integration and call out correctness or verification risk.`,
+    type: "verification",
+    agentRole: "reviewer",
+    dependsOn: terminalIds,
+    acceptanceCriteria: [
+      "Inspect the delegated changes for regressions or missing coverage.",
+      "Confirm whether the worker output is ready for integration."
+    ],
+    outputs: [
+      "Review summary"
+    ],
+    originTaskId: originalTask.id,
+    swarmDepth: (originalTask.swarmDepth ?? 0) + 1,
+    teamId: delegationLabel,
+    teamMemberIds: [
+      ...originalTask.teamMemberIds ?? [],
+      "reviewer"
+    ],
+    subagentLabel: "reviewer",
+    subagentInstructions: "Inspect the delegated changes, diff, and verification evidence. Surface concrete risks before integration."
+  };
+  const integratorTask = {
+    ...originalTask,
+    id: integratorId,
+    title: `Integrate ${originalTask.title.toLowerCase()}`,
+    description: `Finalize and integrate delegated worker output after reviewer sign-off for ${delegationLabel}.`,
+    type: "integration",
+    agentRole: "integrator",
+    dependsOn: [
+      reviewerId
+    ],
+    acceptanceCriteria: originalTask.acceptanceCriteria,
+    outputs: mergeUnique([
+      ...originalTask.outputs,
+      "Integrated change set"
+    ]),
+    originTaskId: originalTask.id,
+    swarmDepth: (originalTask.swarmDepth ?? 0) + 1,
+    teamId: delegationLabel,
+    teamMemberIds: [
+      ...originalTask.teamMemberIds ?? [],
+      "integrator"
+    ],
+    subagentLabel: "integrator",
+    subagentInstructions: "Finalize the accepted worker output, preserve repository consistency, and leave the workspace ready for downstream verification."
+  };
+  return {
+    tasks: [
+      ...expandedTasks,
+      reviewerTask,
+      integratorTask
+    ],
+    noteSuffix: `review tail ${reviewerId} -> integration tail ${integratorId}`
+  };
+}
 function renderToolResultSection(results) {
   return results.map((result) => {
     const lines = [
@@ -31764,20 +32482,49 @@ var ExecutionOrchestrator = class {
   }
   async maybeExpandReadyTaskGraph(sessionId, request, plan, events, emitProgress) {
     const envelope = this.buildEnvelope(request, plan, sessionId);
-    const candidate = envelope.readyTasks.find((task) => (task.swarmDepth ?? 0) === 0 && task.type === "implementation" && ![
-      "repo-analyst",
-      "planner",
-      "reviewer",
-      "integrator",
-      "test-debugger",
-      "session-orchestrator",
-      "execution-manager"
-    ].includes(task.agentRole));
+    const candidate = envelope.readyTasks.find((task) => shouldDelegateTask(task));
     if (!candidate) {
       return {
         plan
       };
     }
+    const matchedTeam = await selectAgentTeam(request.cwd, candidate, request);
+    if (matchedTeam && matchedTeam.members.length > 1) {
+      const teamTasks = materializeDelegatedTasks(plan, candidate, matchedTeam.team.id, matchedTeam.team.strategy, matchedTeam.members.map((member) => ({
+        id: member.id,
+        label: member.label,
+        agentRole: member.baseRole,
+        description: [
+          `Assigned team member: ${member.label} (${member.id}).`,
+          member.purpose ? `Purpose: ${member.purpose}` : "",
+          matchedTeam.team.description ? `Team context: ${matchedTeam.team.description}` : ""
+        ].filter((part) => part.length > 0).join("\n\n"),
+        instructions: member.instructions
+      }))).map((task) => ({
+        ...task,
+        customAgentId: task.customAgentId ?? task.subagentLabel ? matchedTeam.members.find((member) => member.label === task.subagentLabel)?.id : void 0,
+        teamId: matchedTeam.team.id,
+        teamMemberIds: matchedTeam.members.map((member) => member.id)
+      }));
+      const augmented = appendReviewAndIntegrationTasks(plan, candidate, teamTasks, matchedTeam.team.label);
+      const note = `Agent team ${matchedTeam.team.label} expanded ${candidate.id} into ${teamTasks.length} worker subtasks with reviewer/integrator follow-through: ${augmented.tasks.map((task) => task.id).join(", ")}.`;
+      return {
+        plan: integratePlanTaskExpansion(plan, candidate.id, augmented.tasks, note),
+        note,
+        expandedTaskId: candidate.id
+      };
+    }
+    const defaultDelegation = createDefaultDelegationPlan(candidate, request);
+    if (defaultDelegation && defaultDelegation.members.length > 1) {
+      const delegatedTasks = materializeDelegatedTasks(plan, candidate, defaultDelegation.label, defaultDelegation.strategy, defaultDelegation.members);
+      const augmented = appendReviewAndIntegrationTasks(plan, candidate, delegatedTasks, defaultDelegation.label);
+      const note = `Execution manager delegated ${candidate.id} into ${delegatedTasks.length} subagents plus reviewer/integrator: ${augmented.tasks.map((task) => task.id).join(", ")}.`;
+      return {
+        plan: integratePlanTaskExpansion(plan, candidate.id, augmented.tasks, note),
+        note,
+        expandedTaskId: candidate.id
+      };
+    }
     const repoContext = latestRepoAnalysisContext(events);
     const config2 = await loadConfig(request.cwd);
     if (!config2) {
@@ -31835,12 +32582,14 @@ var ExecutionOrchestrator = class {
           plan
         };
       }
+      const expandedTasks = flattenPlanTasks(result.plan).filter((task) => result.createdTaskIds.includes(task.id));
+      const augmented = appendReviewAndIntegrationTasks(plan, candidate, expandedTasks, "planner-swarm");
       const noteParts = [
-        result.note,
+        result.note ? `${result.note} | Added reviewer/integrator pass: ${augmented.noteSuffix}.` : `Added reviewer/integrator pass: ${augmented.noteSuffix}.`,
         result.warning && result.source !== "model" ? `expander note: ${result.warning}` : ""
       ].filter(Boolean);
       return {
-        plan: result.plan,
+        plan: integratePlanTaskExpansion(plan, candidate.id, augmented.tasks, noteParts.join(" | ")),
         ...noteParts.length > 0 ? {
           note: noteParts.join(" | ")
         } : {},
@@ -32395,7 +33144,15 @@ async function generateProjectInitFile(cwd, outputFileName = "kimbho_init.md") {
   return {
     outputPath,
     indexArtifactPath: artifactPath,
-    summary: `Generated ${outputFileName} with indexed project context for ${import_node_path15.default.basename(cwd)}.`
+    summary: `Generated ${outputFileName} with indexed project context for ${import_node_path15.default.basename(cwd)}.`,
+    purpose,
+    frameworks,
+    entrypoints,
+    verificationCommands,
+    indexedFiles: index.summary.totalFiles,
+    sourceFiles: index.summary.sourceFiles,
+    routes: index.summary.routes,
+    schemas: index.summary.schemas
   };
 }
 
@@ -32452,7 +33209,15 @@ async function refreshMemoryFiles(cwd) {
     initFilePath: init.outputPath,
     projectMemoryPath,
     userMemoryPath,
-    summary: `Refreshed project bootstrap and memory files for ${import_node_path16.default.basename(cwd)}.`
+    summary: `Refreshed project bootstrap and memory files for ${import_node_path16.default.basename(cwd)}.`,
+    purpose: init.purpose,
+    frameworks: init.frameworks,
+    entrypoints: init.entrypoints,
+    verificationCommands: init.verificationCommands,
+    indexedFiles: init.indexedFiles,
+    sourceFiles: init.sourceFiles,
+    routes: init.routes,
+    schemas: init.schemas
   };
 }
 async function appendMemoryNote(cwd, scope, text, agentId) {
@@ -32486,21 +33251,24 @@ async function listMemoryPaths(cwd) {
 function createConfigCommand() {
   return new Command("config").description("Show the current config, memory, and MCP file locations.").action(async () => {
     const cwd = import_node_process5.default.cwd();
-    const config2 = await loadConfig(cwd);
+    const layers = await loadConfigLayers(cwd);
     const memory = await listMemoryPaths(cwd);
-    console.log(`config: ${resolveConfigPath(cwd)}`);
+    console.log(`config.user: ${resolveGlobalConfigPath()}`);
+    console.log(`config.project: ${resolveConfigPath(cwd)}`);
     console.log(`mcp: ${resolveMcpConfigPath(cwd)}`);
     console.log(`memory.project: ${memory.projectMemoryPath}`);
     console.log(`memory.user: ${memory.userMemoryPath}`);
     console.log(`memory.agents: ${memory.agentMemoryDir}`);
-    if (!config2) {
+    if (!layers.resolved) {
       console.log("No config found.");
       return;
     }
-    console.log(`providers: ${config2.providers.length}`);
-    console.log(`approval: ${config2.approvalMode}`);
-    console.log(`sandbox: ${config2.sandboxMode}`);
-    console.log(`trusted directories: ${config2.trustedDirectories.length}`);
+    console.log(`layers.user: ${layers.user ? "present" : "missing"}`);
+    console.log(`layers.project: ${layers.project ? "present" : "missing"}`);
+    console.log(`providers: ${layers.resolved.providers.length}`);
+    console.log(`approval: ${layers.resolved.approvalMode}`);
+    console.log(`sandbox: ${layers.resolved.sandboxMode}`);
+    console.log(`trusted directories: ${layers.resolved.trustedDirectories.length}`);
   });
 }
 
@@ -32591,6 +33359,22 @@ function createDoctorCommand() {
 
 // src/commands/init.ts
 var import_node_process7 = __toESM(require("node:process"), 1);
+function printProjectUnderstanding(result) {
+  console.log(result.summary);
+  console.log("Now I have a durable understanding of the current project structure.");
+  console.log(`Purpose: ${result.purpose}`);
+  console.log(`Indexed: ${result.indexedFiles} files (${result.sourceFiles} source files), ${result.routes} routes, ${result.schemas} schemas`);
+  console.log(`Frameworks: ${result.frameworks.length > 0 ? result.frameworks.join(", ") : "unknown"}`);
+  if (result.entrypoints.length > 0) {
+    console.log(`Entrypoints: ${result.entrypoints.slice(0, 5).join(", ")}`);
+  }
+  if (result.verificationCommands.length > 0) {
+    console.log(`Verification: ${result.verificationCommands.join(" -> ")}`);
+  }
+  console.log(`Wrote ${result.initFilePath}`);
+  console.log(`Wrote ${result.projectMemoryPath}`);
+  console.log(`Wrote ${result.userMemoryPath}`);
+}
 function createInitCommand() {
   return new Command("init").description("Create or refresh local Kimbho config and project bootstrap memory.").option("--template <template>", "Provider template to use for the initial provider").option("--provider-id <id>", "Identifier for the initial provider").option("--driver <driver>", "Provider driver to use when no template is supplied").option("--label <label>", "Human-readable provider label").option("--model <model>", "Default model to use for planner/coder/reviewer brains").option("--fast-model <model>", "Model to use for the fast utility brain").option("--api-key-env <env>", "Environment variable that stores the provider API key").option("--base-url <url>", "Base URL or endpoint for the provider driver").option("--module-path <path>", "Module path for a custom provider driver").option("--config-only", "Only write .kimbho/config.json and skip project memory generation", false).option("--memory-only", "Only generate kimbho_init.md and keep the existing config untouched", false).option("--memory-file <file>", "Project memory file to write", "kimbho_init.md").option("--force", "Overwrite an existing config file", false).action(async (options) => {
     const existing = await loadConfig(import_node_process7.default.cwd());
@@ -32656,10 +33440,7 @@ function createInitCommand() {
     }
     if (!options.configOnly) {
       const result = await refreshMemoryFiles(import_node_process7.default.cwd());
-      console.log(result.summary);
-      console.log(`Wrote ${result.initFilePath}`);
-      console.log(`Wrote ${result.projectMemoryPath}`);
-      console.log(`Wrote ${result.userMemoryPath}`);
+      printProjectUnderstanding(result);
     }
   });
 }
@@ -32734,14 +33515,90 @@ async function renderMcpInventory(cwd, name) {
   }
   return filtered.flatMap((server) => [
     `${server.name}`,
+    ...server.warning ? [
+      `  warning: ${server.warning}`
+    ] : [],
     `  tools: ${server.tools.length}`,
     ...server.tools.slice(0, 20).map((tool) => `    - ${tool.toolName} (${tool.permission})`),
     `  prompts: ${server.prompts.length}`,
-    ...server.prompts.slice(0, 10).map((prompt) => `    - ${prompt}`),
+    ...server.prompts.slice(0, 10).flatMap((prompt) => [
+      `    - ${prompt.name}${prompt.arguments.length > 0 ? ` (${prompt.arguments.map((argument) => `${argument.name}${argument.required ? "*" : ""}`).join(", ")})` : ""}`,
+      `      command: /mcp__${server.name}__${prompt.name}`
+    ]),
     `  resources: ${server.resources.length}`,
-    ...server.resources.slice(0, 10).map((resource) => `    - ${resource}`)
+    ...server.resources.slice(0, 10).flatMap((resource) => [
+      `    - ${resource.name} -> ${resource.uri}`,
+      `      attach: @${server.name}:${resource.uri}`
+    ]),
+    `  resource templates: ${server.resourceTemplates.length}`,
+    ...server.resourceTemplates.slice(0, 10).map((resourceTemplate) => `    - ${resourceTemplate.name} -> ${resourceTemplate.uriTemplate}`)
+  ]);
+}
+async function renderMcpPromptList(cwd, name) {
+  const inventory = await loadMcpServerInventory(cwd);
+  const filtered = name ? inventory.filter((server) => server.name === name) : inventory;
+  if (filtered.length === 0) {
+    return [
+      name ? `No MCP prompt inventory found for ${name}.` : "No MCP prompt inventory available."
+    ];
+  }
+  return filtered.flatMap((server) => [
+    `${server.name}`,
+    ...server.warning ? [
+      `  warning: ${server.warning}`
+    ] : [],
+    ...server.prompts.length > 0 ? server.prompts.flatMap((prompt) => [
+      `  - ${prompt.name}${prompt.arguments.length > 0 ? ` (${prompt.arguments.map((argument) => `${argument.name}${argument.required ? "*" : ""}`).join(", ")})` : ""}`,
+      `    command: /mcp__${server.name}__${prompt.name}`
+    ]) : [
+      "  - no prompts"
+    ]
   ]);
 }
+async function renderMcpResourceList(cwd, name) {
+  const inventory = await loadMcpServerInventory(cwd);
+  const filtered = name ? inventory.filter((server) => server.name === name) : inventory;
+  if (filtered.length === 0) {
+    return [
+      name ? `No MCP resource inventory found for ${name}.` : "No MCP resource inventory available."
+    ];
+  }
+  return filtered.flatMap((server) => [
+    `${server.name}`,
+    ...server.warning ? [
+      `  warning: ${server.warning}`
+    ] : [],
+    ...server.resources.length > 0 ? server.resources.flatMap((resource) => [
+      `  - ${resource.name} -> ${resource.uri}`,
+      `    attach: @${server.name}:${resource.uri}`
+    ]) : [
+      "  - no resources"
+    ],
+    ...server.resourceTemplates.length > 0 ? [
+      "  templates:",
+      ...server.resourceTemplates.map((resourceTemplate) => `    - ${resourceTemplate.name} -> ${resourceTemplate.uriTemplate}`)
+    ] : []
+  ]);
+}
+async function renderMcpPromptInvocation(cwd, serverName, promptName, args) {
+  const result = await invokeMcpPrompt(cwd, serverName, promptName, args);
+  return [
+    `${result.serverName}/${result.promptName}`,
+    ...result.description ? [
+      `description: ${result.description}`
+    ] : [],
+    "",
+    result.content
+  ];
+}
+async function renderMcpResourceRead(cwd, serverName, uri) {
+  const result = await readMcpResource(cwd, serverName, uri);
+  return [
+    `${result.serverName} ${result.uri}`,
+    "",
+    result.content
+  ];
+}
 
 // src/commands/mcp.ts
 function collectValues(value, previous = []) {
@@ -32791,6 +33648,34 @@ function createMcpCommand() {
       console.log(line);
     }
   });
+  command.command("discover").description("Show MCP tools, prompts-as-commands, and resource attachment syntax.").argument("[name]", "Optional server name").action(async (name) => {
+    for (const line of await renderMcpInventory(import_node_process8.default.cwd(), name)) {
+      console.log(line);
+    }
+  });
+  command.command("prompts").description("List MCP prompts.").argument("[name]", "Optional server name").action(async (name) => {
+    for (const line of await renderMcpPromptList(import_node_process8.default.cwd(), name)) {
+      console.log(line);
+    }
+  });
+  command.command("resources").description("List MCP resources and resource templates.").argument("[name]", "Optional server name").action(async (name) => {
+    for (const line of await renderMcpResourceList(import_node_process8.default.cwd(), name)) {
+      console.log(line);
+    }
+  });
+  command.command("prompt").description("Invoke an MCP prompt and print the rendered content.").argument("<server>", "Server name").argument("<prompt>", "Prompt name").argument("[args...]", "Prompt args in key=value form").action(async (server, prompt, rawArgs = []) => {
+    const args = Object.fromEntries(
+      rawArgs.map((entry) => entry.split("=", 2)).filter((parts) => parts.length === 2 && parts[0].length > 0)
+    );
+    for (const line of await renderMcpPromptInvocation(import_node_process8.default.cwd(), server, prompt, args)) {
+      console.log(line);
+    }
+  });
+  command.command("read").description("Read one MCP resource by URI.").argument("<server>", "Server name").argument("<uri>", "Resource URI").action(async (server, uri) => {
+    for (const line of await renderMcpResourceRead(import_node_process8.default.cwd(), server, uri)) {
+      console.log(line);
+    }
+  });
   return command;
 }
 
@@ -33252,7 +34137,7 @@ function createModelsCommand() {
         const exists = models.some((item) => item.id === model) || provider.models.includes(model);
         if (!exists) {
           throw new Error(
-            `Model "${model}" was not found for provider "${provider.id}". Run \`kimbho /models ${provider.id} --search ${model}\` or re-run with --force.`
+            `Model "${model}" was not found for provider "${provider.id}". Run \`kimbho model find ${model}\` or re-run with --force.`
           );
         }
       } catch (error2) {
@@ -33595,27 +34480,49 @@ function createPlanCommand() {
 
 // src/commands/permissions.ts
 var import_node_process13 = __toESM(require("node:process"), 1);
+var import_node_path19 = __toESM(require("node:path"), 1);
+function getScope(options) {
+  return options.scope === "user" ? "user" : "project";
+}
+async function loadScopedConfig(scope, cwd) {
+  const direct = scope === "user" ? await loadUserConfig() : await loadProjectConfig(cwd);
+  const resolved = await loadConfig(cwd);
+  return {
+    direct,
+    resolved
+  };
+}
+async function saveScopedConfig(scope, cwd, config2) {
+  return scope === "user" ? saveUserConfig(config2) : saveConfig(config2, cwd);
+}
 function createPermissionsCommand() {
   const command = new Command("permissions").description("Manage approval mode, sandbox mode, and trusted directories.");
-  command.command("status").description("Show permission settings.").action(async () => {
-    const config2 = await loadConfig(import_node_process13.default.cwd());
-    if (!config2) {
+  command.command("status").description("Show permission settings.").option("--scope <scope>", "project or user", "project").action(async (options) => {
+    const scope = getScope(options);
+    const { direct, resolved } = await loadScopedConfig(scope, import_node_process13.default.cwd());
+    console.log(`scope: ${scope}`);
+    console.log(`direct config: ${direct ? "present" : "missing"}`);
+    if (!resolved) {
       throw new Error("No config found. Run `kimbho init` first.");
     }
-    console.log(`approval: ${config2.approvalMode}`);
-    console.log(`sandbox: ${config2.sandboxMode}`);
-    console.log(`trusted directories: ${config2.trustedDirectories.length}`);
-    for (const directory of config2.trustedDirectories) {
+    const display = direct ?? resolved;
+    console.log(`approval: ${display.approvalMode}`);
+    console.log(`sandbox: ${display.sandboxMode}`);
+    console.log(`trusted directories: ${display.trustedDirectories.length}`);
+    for (const directory of display.trustedDirectories) {
       console.log(`  - ${directory}`);
     }
   });
-  command.command("set").description("Set approval mode or sandbox mode.").option("--approval <mode>", "manual or auto").option("--sandbox <mode>", "read-only, workspace-write, or full").action(async (options) => {
-    const config2 = await loadConfig(import_node_process13.default.cwd());
-    if (!config2) {
+  command.command("set").description("Set approval mode or sandbox mode.").option("--scope <scope>", "project or user", "project").option("--approval <mode>", "manual or auto").option("--sandbox <mode>", "read-only, workspace-write, or full").action(async (options) => {
+    const scope = getScope(options);
+    const cwd = import_node_process13.default.cwd();
+    const { direct, resolved } = await loadScopedConfig(scope, cwd);
+    if (!resolved && !direct) {
       throw new Error("No config found. Run `kimbho init` first.");
     }
+    const base = direct ?? resolved ?? createDefaultConfig();
     const next = {
-      ...config2,
+      ...base,
       ...options.approval ? {
         approvalMode: options.approval
       } : {},
@@ -33623,32 +34530,40 @@ function createPermissionsCommand() {
         sandboxMode: options.sandbox
       } : {}
     };
-    const outputPath = await saveConfig(next, import_node_process13.default.cwd());
+    const outputPath = await saveScopedConfig(scope, cwd, next);
     console.log(`Updated ${outputPath}`);
   });
-  command.command("trust").description("Add a trusted directory.").argument("<path>", "Directory to trust").action(async (trustedPath) => {
-    const config2 = await loadConfig(import_node_process13.default.cwd());
-    if (!config2) {
+  command.command("trust").description("Add a trusted directory.").argument("<path>", "Directory to trust").option("--scope <scope>", "project or user", "project").action(async (trustedPath, options) => {
+    const scope = getScope(options);
+    const cwd = import_node_process13.default.cwd();
+    const { direct, resolved } = await loadScopedConfig(scope, cwd);
+    if (!resolved && !direct) {
       throw new Error("No config found. Run `kimbho init` first.");
     }
-    const outputPath = await saveConfig({
-      ...config2,
+    const base = direct ?? resolved ?? createDefaultConfig();
+    const normalizedPath = import_node_path19.default.resolve(cwd, trustedPath);
+    const outputPath = await saveScopedConfig(scope, cwd, {
+      ...base,
       trustedDirectories: Array.from(/* @__PURE__ */ new Set([
-        ...config2.trustedDirectories,
-        trustedPath
+        ...base.trustedDirectories,
+        normalizedPath
       ]))
-    }, import_node_process13.default.cwd());
+    });
     console.log(`Updated ${outputPath}`);
   });
-  command.command("untrust").description("Remove a trusted directory.").argument("<path>", "Directory to remove").action(async (trustedPath) => {
-    const config2 = await loadConfig(import_node_process13.default.cwd());
-    if (!config2) {
+  command.command("untrust").description("Remove a trusted directory.").argument("<path>", "Directory to remove").option("--scope <scope>", "project or user", "project").action(async (trustedPath, options) => {
+    const scope = getScope(options);
+    const cwd = import_node_process13.default.cwd();
+    const { direct, resolved } = await loadScopedConfig(scope, cwd);
+    if (!resolved && !direct) {
       throw new Error("No config found. Run `kimbho init` first.");
     }
-    const outputPath = await saveConfig({
-      ...config2,
-      trustedDirectories: config2.trustedDirectories.filter((directory) => directory !== trustedPath)
-    }, import_node_process13.default.cwd());
+    const base = direct ?? resolved ?? createDefaultConfig();
+    const normalizedPath = import_node_path19.default.resolve(cwd, trustedPath);
+    const outputPath = await saveScopedConfig(scope, cwd, {
+      ...base,
+      trustedDirectories: base.trustedDirectories.filter((directory) => directory !== trustedPath && directory !== normalizedPath)
+    });
     console.log(`Updated ${outputPath}`);
   });
   return command;
@@ -33762,7 +34677,7 @@ function createProvidersCommand() {
 
 // src/commands/review.ts
 var import_promises17 = require("node:fs/promises");
-var import_node_path19 = __toESM(require("node:path"), 1);
+var import_node_path20 = __toESM(require("node:path"), 1);
 var import_node_process15 = __toESM(require("node:process"), 1);
 function summarizeChangedFiles2(diff) {
   const files = /* @__PURE__ */ new Set();
@@ -33846,7 +34761,7 @@ ${diff.stdout}`
       }
     }
     await ensureKimbhoDir(cwd);
-    const artifactPath = import_node_path19.default.join(resolveKimbhoDir(cwd), "logs", `review-${Date.now()}.md`);
+    const artifactPath = import_node_path20.default.join(resolveKimbhoDir(cwd), "logs", `review-${Date.now()}.md`);
     await (0, import_promises17.writeFile)(artifactPath, [
       `# Review`,
       ``,
@@ -34080,6 +34995,12 @@ function normalizeCliTokens(tokens) {
 }
 function createProgram(onOpenShell) {
   const program2 = new Command();
+  const legacyProviders = createProvidersCommand();
+  const legacyModels = createModelsCommand();
+  const legacyBrains = createBrainsCommand();
+  legacyProviders._hidden = true;
+  legacyModels._hidden = true;
+  legacyBrains._hidden = true;
   program2.name("kimbho").description(KIMBHO_DESCRIPTION).version(KIMBHO_VERSION);
   program2.addCommand(createInitCommand());
   program2.addCommand(createPlanCommand());
@@ -34090,9 +35011,9 @@ function createProgram(onOpenShell) {
   program2.addCommand(createMcpCommand());
   program2.addCommand(createModelCommand());
   program2.addCommand(createAgentsCommand());
-  program2.addCommand(createProvidersCommand());
-  program2.addCommand(createModelsCommand());
-  program2.addCommand(createBrainsCommand());
+  program2.addCommand(legacyProviders);
+  program2.addCommand(legacyModels);
+  program2.addCommand(legacyBrains);
   program2.addCommand(createRunCommand());
   program2.addCommand(createResumeCommand());
   program2.addCommand(createFixCommand());
@@ -34108,7 +35029,7 @@ function createProgram(onOpenShell) {
 // src/shell.ts
 var import_node_readline = require("node:readline");
 var import_promises18 = require("node:readline/promises");
-var import_node_path20 = __toESM(require("node:path"), 1);
+var import_node_path21 = __toESM(require("node:path"), 1);
 var import_node_process18 = __toESM(require("node:process"), 1);
 
 // src/agent-management.ts
@@ -34162,6 +35083,7 @@ var TOP_LEVEL_COMMANDS = /* @__PURE__ */ new Set([
   "help",
   "init",
   "mcp",
+  "mcp__",
   "memory",
   "model",
   "models",
@@ -34263,9 +35185,67 @@ var PLAN_PREFIXES = [
   "outline ",
   "propose "
 ];
+function looksLikeExecutionRequest(input) {
+  return /\b(build|create|make|scaffold|implement|fix|refactor|setup|set up|generate|add|change|update|edit|rewrite|restyle|redesign|improve|enhance)\b/.test(input);
+}
 function color(code, value) {
   return `${code}${value}${RESET}`;
 }
+function extractMcpResourceReferences(prompt) {
+  const matches = prompt.match(/@[A-Za-z0-9_-]+:[^\s]+/g) ?? [];
+  return matches.flatMap((token) => {
+    const withoutAt = token.slice(1);
+    const separatorIndex = withoutAt.indexOf(":");
+    if (separatorIndex === -1) {
+      return [];
+    }
+    return [
+      {
+        token,
+        serverName: withoutAt.slice(0, separatorIndex),
+        uri: withoutAt.slice(separatorIndex + 1)
+      }
+    ];
+  });
+}
+async function hydratePromptWithMcpResources(cwd, prompt) {
+  const references = extractMcpResourceReferences(prompt);
+  if (references.length === 0) {
+    return {
+      prompt,
+      notes: []
+    };
+  }
+  const blocks = [];
+  const notes = [];
+  for (const reference of references) {
+    try {
+      const rendered = await renderMcpResourceRead(cwd, reference.serverName, reference.uri);
+      notes.push(`attached MCP resource ${reference.token}`);
+      blocks.push([
+        `Attached MCP resource ${reference.token}:`,
+        ...rendered
+      ].join("\n"));
+    } catch (error2) {
+      const message = error2 instanceof Error ? error2.message : String(error2);
+      notes.push(`failed to attach ${reference.token}: ${message}`);
+    }
+  }
+  if (blocks.length === 0) {
+    return {
+      prompt,
+      notes
+    };
+  }
+  return {
+    prompt: [
+      prompt,
+      "",
+      ...blocks
+    ].join("\n"),
+    notes
+  };
+}
 function createExecutionTelemetry() {
   return {
     toolCalls: 0,
@@ -34535,6 +35515,11 @@ function renderHelp() {
     "/mcp add <name> --command <cmd> [--arg <value>] [--env KEY=VALUE]",
     "                         Add an MCP stdio server to .mcp.json.",
     "/mcp tools [server]      Discover tools/prompts/resources from MCP servers.",
+    "/mcp prompts [server]    List MCP prompts.",
+    "/mcp resources [server]  List MCP resources and templates.",
+    "/mcp prompt <server> <prompt> [key=value ...]",
+    "                         Render an MCP prompt.",
+    "/mcp read <server> <uri> Read one MCP resource.",
     "/agents                  List custom agents and teams.",
     "/agents create <id> --base <role>  Create a markdown custom agent.",
     "/agents team create <id> <agent...>  Create a markdown team file.",
@@ -34571,7 +35556,7 @@ function renderStartupCard(cwd, state) {
     renderCardLine("shortcuts", "/ask  /run  /model  /permissions  /memory  /mcp  /quit")
   ];
   if (!state.configured) {
-    cardLines.push("setup: run /init or /providers add <template> to create .kimbho/config.json");
+    cardLines.push("setup: run /init or /model add <template> to create .kimbho/config.json");
   }
   return renderBox(cardLines);
 }
@@ -34596,20 +35581,20 @@ function inferPromptIntent(input) {
   if (/^(hi|hello|hey|yo|sup)\b/.test(normalized)) {
     return "chat";
   }
-  if (normalized.endsWith("?")) {
-    return "chat";
-  }
   if (PLAN_PREFIXES.some((prefix) => normalized.startsWith(prefix))) {
     return "plan";
   }
   if (EXECUTION_PREFIXES.some((prefix) => normalized.startsWith(prefix))) {
     return "run";
   }
-  if (CHAT_PREFIXES.some((prefix) => normalized.startsWith(prefix))) {
+  if (looksLikeExecutionRequest(normalized)) {
+    return "run";
+  }
+  if (normalized.endsWith("?")) {
     return "chat";
   }
-  if (/\b(build|create|make|scaffold|implement|fix|refactor|setup|set up|generate)\b/.test(normalized)) {
-    return "run";
+  if (CHAT_PREFIXES.some((prefix) => normalized.startsWith(prefix))) {
+    return "chat";
   }
   return normalized.split(/\s+/).length >= 4 ? "plan" : "chat";
 }
@@ -34863,6 +35848,12 @@ function hasRenderableDiff(toolId, output) {
   }
   return false;
 }
+function isMutationTool(toolId) {
+  return toolId === "file.write" || toolId === "file.patch" || toolId === "scaffold.generate";
+}
+function renderMutationArtifacts(artifacts, label = "changed", maxItems = 4) {
+  return artifacts.slice(0, maxItems).map((artifact) => `    ${color(DIM, `${label}: ${shortenMiddle(artifact, 120)}`)}`);
+}
 function colorDiffLine(line) {
   if (line.startsWith("diff --git ")) {
     const match = line.match(/^diff --git a\/(.+?) b\/(.+)$/);
@@ -34921,14 +35912,26 @@ function renderShellSessionSummary(snapshot, planPath, sessionPath) {
     lines.push(color(BOLD, "Activity"));
     for (const event of snapshot.events.slice(-8)) {
       lines.push(`- ${renderEventType(event.type)} | ${event.agentRole ?? "session"} | ${event.message}`);
+      let landedMutation = false;
       for (const toolResult of event.toolResults.slice(-4)) {
         lines.push(`  ${toolResult.success ? "ok" : "fail"} ${toolResult.toolId}: ${toolResult.summary}`);
         if (toolResult.stdout && hasRenderableDiff(toolResult.toolId, toolResult.stdout)) {
+          landedMutation = landedMutation || isMutationTool(toolResult.toolId);
           lines.push(...renderDiffPreview(toolResult.stdout, 6));
         }
         if ((toolResult.toolId.startsWith("process.") || toolResult.toolId === "http.fetch" || toolResult.toolId.startsWith("browser.") || toolResult.toolId.startsWith("repo.")) && toolResult.stdout) {
           lines.push(...renderTextPreview(toolResult.stdout, 6));
         }
+        if (toolResult.success && isMutationTool(toolResult.toolId) && toolResult.artifacts.length > 0) {
+          landedMutation = true;
+          lines.push(...renderMutationArtifacts(
+            toolResult.artifacts,
+            toolResult.toolId === "scaffold.generate" ? "created" : "changed"
+          ));
+        }
+      }
+      if (event.type === "task-blocked" && !landedMutation) {
+        lines.push(`  ${color(DIM, "no safe edit landed before this task blocked.")}`);
       }
       for (const artifact of event.artifacts.slice(-3)) {
         lines.push(`  artifact: ${artifact}`);
@@ -35041,7 +36044,11 @@ function renderLiveExecutionEvent(event) {
     case "tool-finished":
       return [
         `  ${event.toolResult.success ? color(CYAN, "ok") : color(AMBER, "fail")} ${event.toolResult.toolId} ${event.toolResult.summary}`,
-        ...event.toolResult.stdout && hasRenderableDiff(event.toolResult.toolId, event.toolResult.stdout) ? renderDiffPreview(event.toolResult.stdout, 8) : (event.toolResult.toolId.startsWith("process.") || event.toolResult.toolId === "http.fetch" || event.toolResult.toolId.startsWith("browser.") || event.toolResult.toolId.startsWith("repo.")) && event.toolResult.stdout ? renderTextPreview(event.toolResult.stdout, 8) : []
+        ...event.toolResult.stdout && hasRenderableDiff(event.toolResult.toolId, event.toolResult.stdout) ? renderDiffPreview(event.toolResult.stdout, 8) : (event.toolResult.toolId.startsWith("process.") || event.toolResult.toolId === "http.fetch" || event.toolResult.toolId.startsWith("browser.") || event.toolResult.toolId.startsWith("repo.")) && event.toolResult.stdout ? renderTextPreview(event.toolResult.stdout, 8) : [],
+        ...event.toolResult.success && isMutationTool(event.toolResult.toolId) && event.toolResult.artifacts.length > 0 ? renderMutationArtifacts(
+          event.toolResult.artifacts,
+          event.toolResult.toolId === "scaffold.generate" ? "created" : "changed"
+        ) : []
       ];
     default:
       return [];
@@ -35190,13 +36197,18 @@ function clearAllConversations(runtime) {
   }
 }
 async function handleChatPrompt(cwd, prompt, runtime) {
+  const hydrated = await hydratePromptWithMcpResources(cwd, prompt);
   const config2 = await loadConfig(cwd);
   if (!config2) {
-    throw new Error("No config found. Run /init or /providers add <template> first.");
+    throw new Error("No config found. Run /init or /model add <template> first.");
   }
   const registry2 = createDefaultBrainProviderRegistry(cwd);
   const resolver = new BrainResolver(config2, registry2);
   const brain = await resolver.resolve(runtime.focusRole);
+  const memoryContext = await loadMarkdownMemoryContext(cwd, {
+    maxFiles: 8,
+    maxCharsPerFile: 3e3
+  });
   const compactionPath = await compactConversationIfNeeded(cwd, runtime, runtime.focusRole);
   if (compactionPath) {
     console.log(color(DIM, `[compacting] condensed ${runtime.focusRole} chat context -> ${compactionPath}`));
@@ -35206,7 +36218,7 @@ async function handleChatPrompt(cwd, prompt, runtime) {
     ...history,
     {
       role: "user",
-      content: prompt
+      content: hydrated.prompt
     }
   ]);
   let result;
@@ -35219,6 +36231,11 @@ async function handleChatPrompt(cwd, prompt, runtime) {
       ...brain.settings.promptPreamble || runtime.conversationSummaries[runtime.focusRole] ? {
         systemPrompt: [
           brain.settings.promptPreamble,
+          memoryContext.length > 0 ? [
+            "Workspace memory:",
+            ...memoryContext.map((record2) => `File: ${record2.filePath}
+${record2.content}`)
+          ].join("\n\n") : null,
           runtime.conversationSummaries[runtime.focusRole] ? `Compacted conversation summary:
 ${runtime.conversationSummaries[runtime.focusRole]}` : null
         ].filter((value) => Boolean(value)).join("\n\n")
@@ -35245,16 +36262,20 @@ ${runtime.conversationSummaries[runtime.focusRole]}` : null
   ]);
   runtime.conversations[runtime.focusRole] = nextConversation;
   console.log(color(DIM, `[${brain.role}] ${brain.provider.id}/${brain.model}`));
+  for (const note of hydrated.notes) {
+    console.log(color(DIM, note));
+  }
   if (result.usage) {
     console.log(color(DIM, `tokens: ${result.usage.inputTokens} in / ${result.usage.outputTokens} out`));
   }
   console.log(renderTerminalMarkdown(result.text));
 }
 async function runGoalExecution(cwd, goal, runtime) {
+  const hydrated = await hydratePromptWithMcpResources(cwd, goal);
   const orchestrator = new ExecutionOrchestrator();
-  const workspace = await resolveExecutionWorkspace(cwd, goal);
+  const workspace = await resolveExecutionWorkspace(cwd, hydrated.prompt);
   const request = {
-    goal,
+    goal: hydrated.prompt,
     mode: "run",
     cwd: workspace.cwd,
     workspaceState: workspace.workspaceState,
@@ -35269,6 +36290,9 @@ async function runGoalExecution(cwd, goal, runtime) {
   };
   const planningSpinner = new ShellActivityIndicator("planning");
   console.log(color(DIM, `Working on: ${goal}`));
+  for (const note of hydrated.notes) {
+    console.log(color(DIM, note));
+  }
   for (const note of workspace.notes) {
     console.log(color(DIM, note));
   }
@@ -35529,7 +36553,7 @@ async function printLatestPlanSummary(cwd) {
 async function handleApprovalModeCommand(cwd, tokens) {
   const config2 = await loadConfig(cwd);
   if (!config2) {
-    throw new Error("No config found. Run /init or /providers add <template> first.");
+    throw new Error("No config found. Run /init or /model add <template> first.");
   }
   const subcommand = tokens[1]?.trim().toLowerCase();
   if (!subcommand || subcommand === "status") {
@@ -35549,44 +36573,55 @@ async function handleApprovalModeCommand(cwd, tokens) {
   console.log(`approval mode: ${subcommand}`);
 }
 async function printConfigSummary(cwd) {
-  const config2 = await loadConfig(cwd);
+  const layers = await loadConfigLayers(cwd);
   const paths = await listMemoryPaths(cwd);
-  console.log(`config: ${resolveConfigPath(cwd)}`);
+  console.log(`config.project: ${resolveConfigPath(cwd)}`);
+  console.log(`config.user: ${resolveGlobalConfigPath()}`);
   console.log(`mcp: ${resolveMcpConfigPath(cwd)}`);
   console.log(`memory.project: ${paths.projectMemoryPath}`);
   console.log(`memory.user: ${paths.userMemoryPath}`);
   console.log(`memory.agents: ${paths.agentMemoryDir}`);
-  if (!config2) {
+  if (!layers.resolved) {
     console.log("No config found. Run /init first.");
     return;
   }
+  console.log(`layers: user=${layers.user ? "yes" : "no"} project=${layers.project ? "yes" : "no"}`);
+  const config2 = layers.resolved;
   console.log(`providers: ${config2.providers.length}`);
   console.log(`approval: ${config2.approvalMode}`);
   console.log(`sandbox: ${config2.sandboxMode}`);
   console.log(`trusted directories: ${config2.trustedDirectories.length}`);
 }
 async function handlePermissionsCommand(cwd, tokens) {
-  const config2 = await loadConfig(cwd);
-  if (!config2) {
+  const subcommand = tokens[1]?.trim().toLowerCase();
+  const scopeToken = tokens.find((token, index) => index > 0 && (token === "user" || token === "project"));
+  const scope = scopeToken === "user" ? "user" : "project";
+  const direct = scope === "user" ? await loadUserConfig() : await loadProjectConfig(cwd);
+  const resolved = await loadConfig(cwd);
+  if (!resolved && !direct) {
     throw new Error("No config found. Run /init or /model add <template> first.");
   }
-  const subcommand = tokens[1]?.trim().toLowerCase();
+  const effective = direct ?? resolved ?? createDefaultConfig();
+  const saveScoped = async (next) => scope === "user" ? saveUserConfig(next) : saveConfig(next, cwd);
   if (!subcommand || subcommand === "show" || subcommand === "status") {
-    console.log(`approval: ${config2.approvalMode}`);
-    console.log(`sandbox: ${config2.sandboxMode}`);
-    console.log(`trusted directories: ${config2.trustedDirectories.length}`);
-    for (const directory of config2.trustedDirectories) {
+    console.log(`scope: ${scope}`);
+    console.log(`direct config: ${direct ? "present" : "missing"}`);
+    console.log(`approval: ${effective.approvalMode}`);
+    console.log(`sandbox: ${effective.sandboxMode}`);
+    console.log(`trusted directories: ${effective.trustedDirectories.length}`);
+    for (const directory of effective.trustedDirectories) {
       console.log(`  - ${directory}`);
     }
     return;
   }
   if (subcommand === "auto" || subcommand === "manual") {
-    const outputPath = await saveConfig({
-      ...config2,
+    const outputPath = await saveScoped({
+      ...effective,
       approvalMode: subcommand
-    }, cwd);
+    });
     console.log(`Updated ${outputPath}`);
     console.log(`approval mode: ${subcommand}`);
+    console.log(`scope: ${scope}`);
     return;
   }
   if (subcommand === "sandbox") {
@@ -35598,12 +36633,13 @@ async function handlePermissionsCommand(cwd, tokens) {
     ].includes(mode)) {
       throw new Error("Usage: /permissions sandbox <read-only|workspace-write|full>");
     }
-    const outputPath = await saveConfig({
-      ...config2,
+    const outputPath = await saveScoped({
+      ...effective,
       sandboxMode: mode
-    }, cwd);
+    });
     console.log(`Updated ${outputPath}`);
     console.log(`sandbox: ${mode}`);
+    console.log(`scope: ${scope}`);
     return;
   }
   if (subcommand === "trust" || subcommand === "untrust") {
@@ -35611,19 +36647,21 @@ async function handlePermissionsCommand(cwd, tokens) {
     if (!target) {
       throw new Error(`Usage: /permissions ${subcommand} <path>`);
     }
+    const normalizedTarget = import_node_path21.default.resolve(cwd, target);
     const trustedDirectories = subcommand === "trust" ? Array.from(/* @__PURE__ */ new Set([
-      ...config2.trustedDirectories,
-      target
-    ])) : config2.trustedDirectories.filter((directory) => directory !== target);
-    const outputPath = await saveConfig({
-      ...config2,
+      ...effective.trustedDirectories,
+      normalizedTarget
+    ])) : effective.trustedDirectories.filter((directory) => directory !== target && directory !== normalizedTarget);
+    const outputPath = await saveScoped({
+      ...effective,
       trustedDirectories
-    }, cwd);
+    });
     console.log(`Updated ${outputPath}`);
-    console.log(`${subcommand === "trust" ? "Trusted" : "Removed"} ${target}`);
+    console.log(`${subcommand === "trust" ? "Trusted" : "Removed"} ${normalizedTarget}`);
+    console.log(`scope: ${scope}`);
     return;
   }
-  throw new Error("Usage: /permissions [show|auto|manual|sandbox <mode>|trust <path>|untrust <path>]");
+  throw new Error("Usage: /permissions [show|auto|manual|sandbox <mode>|trust <path>|untrust <path>] [project|user]");
 }
 async function handleMemoryCommand(cwd, tokens) {
   const subcommand = tokens[1]?.trim().toLowerCase();
@@ -35638,6 +36676,16 @@ async function handleMemoryCommand(cwd, tokens) {
   if (subcommand === "refresh") {
     const result = await refreshMemoryFiles(cwd);
     console.log(result.summary);
+    console.log("Now I have a durable understanding of the current project structure.");
+    console.log(`Purpose: ${result.purpose}`);
+    console.log(`Indexed: ${result.indexedFiles} files (${result.sourceFiles} source files), ${result.routes} routes, ${result.schemas} schemas`);
+    console.log(`Frameworks: ${result.frameworks.length > 0 ? result.frameworks.join(", ") : "unknown"}`);
+    if (result.entrypoints.length > 0) {
+      console.log(`Entrypoints: ${result.entrypoints.slice(0, 5).join(", ")}`);
+    }
+    if (result.verificationCommands.length > 0) {
+      console.log(`Verification: ${result.verificationCommands.join(" -> ")}`);
+    }
     console.log(`Wrote ${result.initFilePath}`);
     console.log(`Wrote ${result.projectMemoryPath}`);
     console.log(`Wrote ${result.userMemoryPath}`);
@@ -35650,7 +36698,7 @@ async function handleMemoryCommand(cwd, tokens) {
     }
     let filePath;
     if (scope === "init") {
-      filePath = import_node_path20.default.join(cwd, "kimbho_init.md");
+      filePath = import_node_path21.default.join(cwd, "kimbho_init.md");
     } else if (scope === "project") {
       filePath = resolveProjectMemoryPath(cwd);
     } else if (scope === "user") {
@@ -35660,7 +36708,7 @@ async function handleMemoryCommand(cwd, tokens) {
       if (!agentId) {
         throw new Error("Usage: /memory show agent <agent-id>");
       }
-      filePath = import_node_path20.default.join(resolveAgentMemoryDir(cwd), `${agentId}.md`);
+      filePath = import_node_path21.default.join(resolveAgentMemoryDir(cwd), `${agentId}.md`);
     } else {
       throw new Error("Usage: /memory show <init|project|user|agent> [id]");
     }
@@ -35728,6 +36776,45 @@ async function handleMcpCommand(cwd, tokens) {
     }
     return;
   }
+  if (subcommand === "prompts") {
+    const name = tokens[2]?.trim();
+    for (const line of await renderMcpPromptList(cwd, name)) {
+      console.log(line);
+    }
+    return;
+  }
+  if (subcommand === "resources") {
+    const name = tokens[2]?.trim();
+    for (const line of await renderMcpResourceList(cwd, name)) {
+      console.log(line);
+    }
+    return;
+  }
+  if (subcommand === "prompt") {
+    const serverName = tokens[2]?.trim();
+    const promptName = tokens[3]?.trim();
+    if (!serverName || !promptName) {
+      throw new Error("Usage: /mcp prompt <server> <prompt> [key=value ...]");
+    }
+    const args = Object.fromEntries(
+      tokens.slice(4).map((entry) => entry.split("=", 2)).filter((parts) => parts.length === 2 && parts[0].length > 0)
+    );
+    for (const line of await renderMcpPromptInvocation(cwd, serverName, promptName, args)) {
+      console.log(line);
+    }
+    return;
+  }
+  if (subcommand === "read") {
+    const serverName = tokens[2]?.trim();
+    const uri = tokens.slice(3).join(" ").trim();
+    if (!serverName || !uri) {
+      throw new Error("Usage: /mcp read <server> <uri>");
+    }
+    for (const line of await renderMcpResourceRead(cwd, serverName, uri)) {
+      console.log(line);
+    }
+    return;
+  }
   if (subcommand === "remove") {
     const name = tokens[2]?.trim();
     if (!name) {
@@ -35791,7 +36878,7 @@ async function handleMcpCommand(cwd, tokens) {
     console.log(`Added MCP server ${name}`);
     return;
   }
-  throw new Error("Usage: /mcp [list|tools [server]|inspect <server>|add <name> --command <cmd>|remove <name>|enable <name>|disable <name>]");
+  throw new Error("Usage: /mcp [list|tools [server]|prompts [server]|resources [server]|prompt <server> <prompt>|read <server> <uri>|add <name> --command <cmd>|remove <name>|enable <name>|disable <name>]");
 }
 async function handleAgentsCommand(cwd, tokens) {
   const subcommand = tokens[1]?.trim().toLowerCase();
@@ -35922,11 +37009,12 @@ async function handleModelSurfaceCommand(cwd, tokens, runtime) {
   throw new Error("Usage: /model [show|providers|templates|add <tpl>|use <provider> [model]|find [search]|select <n>|focus <role>|check]");
 }
 async function createPlanOnly(cwd, goal) {
+  const hydrated = await hydratePromptWithMcpResources(cwd, goal);
   const request = {
-    goal,
+    goal: hydrated.prompt,
     mode: "plan",
     cwd,
-    workspaceState: await inferPlanningWorkspaceState(cwd, goal),
+    workspaceState: await inferPlanningWorkspaceState(cwd, hydrated.prompt),
     constraints: []
   };
   const activity = new ShellActivityIndicator("planning");
@@ -35939,6 +37027,9 @@ async function createPlanOnly(cwd, goal) {
   }
   const plan = planResult.plan;
   const planPath = await savePlan(plan, cwd);
+  for (const note of hydrated.notes) {
+    console.log(color(DIM, note));
+  }
   for (const line of renderPlanGenerationNotes(planResult)) {
     console.log(line);
   }
@@ -36111,7 +37202,7 @@ function renderModelLine2(model) {
 async function printProviderList(cwd, focusRole) {
   const config2 = await loadConfig(cwd);
   if (!config2) {
-    console.log("No config found. Run /init or /providers add <template> first.");
+    console.log("No config found. Run /init or /model add <template> first.");
     return;
   }
   const activeProviderId = config2.brains[focusRole].providerId;
@@ -36163,7 +37254,7 @@ async function addProviderFromTemplate(cwd, options) {
 async function printProviderHealth(cwd) {
   const config2 = await loadConfig(cwd);
   if (!config2) {
-    console.log("No config found. Run /init or /providers add <template> first.");
+    console.log("No config found. Run /init or /model add <template> first.");
     return;
   }
   const registry2 = createDefaultBrainProviderRegistry(cwd);
@@ -36180,7 +37271,7 @@ async function printProviderHealth(cwd) {
 async function printBrainAssignments(cwd) {
   const config2 = await loadConfig(cwd);
   if (!config2) {
-    console.log("No config found. Run /init or /providers add <template> first.");
+    console.log("No config found. Run /init or /model add <template> first.");
     return;
   }
   for (const role of BRAIN_ROLES) {
@@ -36218,7 +37309,7 @@ async function handleProvidersCommand(cwd, tokens, runtime) {
     if (options.baseUrl) {
       console.log(`Base URL ${options.baseUrl}`);
     }
-    console.log(`Next: /providers use ${resolvedProviderId}`);
+    console.log(`Next: /model use ${resolvedProviderId}`);
     return;
   }
   if (subcommand === "use") {
@@ -36258,7 +37349,7 @@ async function handleBrainCommand(cwd, tokens, runtime) {
 async function handleModelsCommand(cwd, tokens, runtime) {
   const config2 = await loadConfig(cwd);
   if (!config2) {
-    throw new Error("No config found. Run /init or /providers add <template> first.");
+    throw new Error("No config found. Run /init or /model add <template> first.");
   }
   const providerId = config2.brains[runtime.focusRole].providerId;
   const provider = findProviderById(config2, providerId);
@@ -36301,12 +37392,12 @@ async function handleModelsCommand(cwd, tokens, runtime) {
     console.log(`  ${index + 1}. ${renderModelLine2(model)}`);
   }
   console.log(``);
-  console.log("Use /select <number> or /use-model <model-id> to assign one to all roles.");
+  console.log("Use /model select <number> or /model use <provider-id> <model-id> to assign one to all roles.");
 }
 async function handleModelSelection(cwd, modelId, runtime) {
   const config2 = await loadConfig(cwd);
   if (!config2) {
-    throw new Error("No config found. Run /init or /providers add <template> first.");
+    throw new Error("No config found. Run /init or /model add <template> first.");
   }
   const providerId = config2.brains[runtime.focusRole].providerId;
   const provider = findProviderById(config2, providerId);
@@ -36415,6 +37506,23 @@ async function handleShellCommand(cwd, input, state, runtime, execute) {
   if (!head) {
     return cwd;
   }
+  if (head.startsWith("mcp__")) {
+    const parts = head.split("__").filter((part) => part.length > 0);
+    if (parts.length < 3) {
+      throw new Error("Usage: /mcp__<server>__<prompt> [key=value ...]");
+    }
+    const serverName = parts[1];
+    const promptName = parts[2];
+    if (!serverName || !promptName) {
+      throw new Error("Usage: /mcp__<server>__<prompt> [key=value ...]");
+    }
+    const args = Object.fromEntries(
+      tokens.slice(1).map((entry) => entry.split("=", 2)).filter((pair) => pair.length === 2 && pair[0].length > 0)
+    );
+    const rendered = await renderMcpPromptInvocation(cwd, serverName, promptName, args);
+    await handleChatPrompt(cwd, rendered.join("\n"), runtime);
+    return cwd;
+  }
   if (!firstToken?.startsWith("/") && !TOP_LEVEL_COMMANDS.has(head) && !head.startsWith("-")) {
     const intent = inferPromptIntent(trimmed);
     if (intent === "run") {