@akanjs/cli 3.0.0-beta.16 → 3.0.0-beta.17

package/{index-5405kc0x.js → index-2sq06vv0.js}

@@ -1,7 +1,9 @@
 // @bun
 import {
-  SubagentPool2
-} from "./index-jgrnpt6y.js";
+  SubagentPool2,
+  akanCodePaths2,
+  McpServerConfig
+} from "./index-qt8dqgnf.js";
 import {
   stripAnsi
 } from "./index-7md2g9vw.js";
@@ -9,7 +11,7 @@ import {
   akanCodeModel2,
   akanCodeModelSupportsImages2,
   akanCodeModelWarnings2
-} from "./index-wfwknnje.js";
+} from "./index-jwrpsrg3.js";
 
 // pkgs/@akanjs/devkit/codeAgent/agent/CodeAgent.ts
 import {
@@ -639,31 +641,12 @@ class MailToolPack2 {
 }
 
 // pkgs/@akanjs/devkit/codeAgent/tools/McpToolPack.ts
-import { existsSync as existsSync5, readFileSync } from "fs";
-import { codeAgentClip, codeAgentOutputChars } from "akanjs/common";
+import {
+  codeAgentClip,
+  codeAgentOutputChars
+} from "akanjs/common";
 import { Type as Type3 } from "typebox";
 
-// pkgs/@akanjs/devkit/codeAgent/agent/akanCodePaths.ts
-import { existsSync as existsSync4 } from "fs";
-import { homedir as homedir2 } from "os";
-import path4 from "path";
-var builtinSkillsDir = () => {
-  const candidates = [path4.join(import.meta.dir, "skills"), path4.join(import.meta.dir, "..", "skills")];
-  return candidates.find((candidate) => existsSync4(candidate));
-};
-var akanCodePaths2 = {
-  workspaceDir: (workspaceRoot) => path4.join(workspaceRoot, ".akan", "code"),
-  sessionsDir: (workspaceRoot) => path4.join(workspaceRoot, ".akan", "code", "sessions"),
-  extensionsDir: (workspaceRoot) => path4.join(workspaceRoot, ".akan", "code", "extensions"),
-  skillsDir: (workspaceRoot) => path4.join(workspaceRoot, ".akan", "code", "skills"),
-  mailDir: (workspaceRoot) => path4.join(workspaceRoot, ".akan", "code", "mail"),
-  builtinSkillsDir,
-  mcpFile: (workspaceRoot) => path4.join(workspaceRoot, ".akan", "code", "mcp.json"),
-  globalDir: () => path4.join(homedir2(), ".akan", "code"),
-  authFile: () => path4.join(homedir2(), ".akan", "code", "auth.json"),
-  modelsFile: () => path4.join(homedir2(), ".akan", "code", "models.json")
-};
-
 // pkgs/@akanjs/devkit/codeAgent/tools/McpClient.ts
 var protocolVersion = "2025-06-18";
 
@@ -804,29 +787,34 @@ class McpClient2 {
 
 // pkgs/@akanjs/devkit/codeAgent/tools/McpToolPack.ts
 class McpToolPack2 {
-  #options;
   #clients = [];
-  constructor(options) {
-    this.#options = options;
-  }
+  #status = [];
+  constructor() {}
   static async connect(options) {
     const refs = McpToolPack2.#refs(options);
     if (!refs.length)
       return;
-    const pack = new McpToolPack2(options);
+    const pack = new McpToolPack2;
     for (const ref of refs) {
+      const base = { name: ref.name, transport: ref.transport, target: McpServerConfig.targetOf(ref) };
       try {
         const client = await new McpClient2(ref).connect();
-        pack.#clients.push({ client, tools: await client.listTools() });
+        const tools = await client.listTools();
+        pack.#clients.push({ client, tools });
+        pack.#status.push({ ...base, tools: tools.map((tool) => McpToolPack2.#nameOf(ref.name, tool.name)) });
       } catch (error) {
         options.onNotice?.(`MCP server "${ref.name}" is unavailable: ${String(error)}`);
+        pack.#status.push({ ...base, tools: [], error: String(error) });
       }
     }
-    return pack.#clients.length ? pack : undefined;
+    return pack;
   }
   get toolNames() {
     return this.#clients.flatMap(({ client, tools }) => tools.map((tool) => McpToolPack2.#nameOf(client.ref.name, tool.name)));
   }
+  get status() {
+    return this.#status;
+  }
   extension() {
     return { name: "akan-mcp", factory: (pi) => this.#register(pi) };
   }
@@ -863,29 +851,7 @@ class McpToolPack2 {
     if (options.profile.tools.mcp === "off")
       return [];
     const declared = Array.isArray(options.profile.tools.mcp) ? options.profile.tools.mcp : [];
-    return [...McpToolPack2.#fromFile(options.workspaceRoot), ...declared];
-  }
-  static #fromFile(workspaceRoot) {
-    const file = akanCodePaths2.mcpFile(workspaceRoot);
-    if (!existsSync5(file))
-      return [];
-    try {
-      const parsed = JSON.parse(readFileSync(file, "utf8"));
-      const entries = Object.entries(parsed.mcpServers ?? parsed.servers ?? {});
-      return entries.filter(([, entry]) => !entry.disabled).map(([name, entry]) => {
-        const transport = entry.url ? "http" : "stdio";
-        return {
-          name,
-          transport,
-          ...entry.command ? { command: entry.command } : {},
-          ...entry.args ? { args: entry.args } : {},
-          ...entry.url ? { url: entry.url } : {},
-          ...entry.env ? { env: entry.env } : {}
-        };
-      });
-    } catch {
-      return [];
-    }
+    return [...McpServerConfig.read(options.workspaceRoot), ...declared];
   }
 }
 
@@ -1098,6 +1064,7 @@ class AkanCodePlugins2 {
       ...options.onNotice ? { onNotice: options.onNotice } : {}
     });
     const dispose = () => mcp?.close();
+    const mcpStatus = mcp?.status ?? [];
     const web = new WebToolPack2({ profile: options.profile });
     const webExtension = web.extension();
     const sessions = new SessionToolPack2({
@@ -1113,6 +1080,7 @@ class AkanCodePlugins2 {
       return {
         extensions: [mcp?.extension(), webExtension, sessionExtension, mailExtension].filter((entry) => !!entry),
         toolNames: [...mcp?.toolNames ?? [], ...web.names(), ...sessions.names(), ...mail.names()],
+        mcp: mcpStatus,
         dispose
       };
     const readOnly = !options.profile.tools.builtin.includes("write");
@@ -1127,7 +1095,8 @@ class AkanCodePlugins2 {
       cwd: options.cwd,
       parent: options.profile,
       depth: options.depth,
-      ...options.onNotice ? { onNotice: options.onNotice } : {}
+      ...options.onNotice ? { onNotice: options.onNotice } : {},
+      ...options.onAgents ? { onAgents: options.onAgents } : {}
     });
     if (subagent)
       extensions.push(subagent);
@@ -1155,6 +1124,7 @@ class AkanCodePlugins2 {
         ...sessions.names(),
         ...mail.names()
       ],
+      mcp: mcpStatus,
       dispose
     };
   }
@@ -1184,36 +1154,31 @@ class AkanCodePlugins2 {
 }
 
 // pkgs/@akanjs/devkit/codeAgent/agent/AkanCodeServices.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync2 } from "fs";
-import {
-  AuthStorage,
-  ModelRegistry,
-  SessionManager as SessionManager2,
-  SettingsManager
-} from "@earendil-works/pi-coding-agent";
+import { existsSync as existsSync7, mkdirSync } from "fs";
+import { ModelRuntime, SessionManager as SessionManager2, SettingsManager } from "@earendil-works/pi-coding-agent";
 
 // pkgs/@akanjs/devkit/codeAgent/tools/AkanEnvKeys.ts
-import { existsSync as existsSync6, readFileSync as readFileSync2 } from "fs";
-import path5 from "path";
+import { existsSync as existsSync4, readFileSync } from "fs";
+import path4 from "path";
 
 class AkanEnvKeys2 {
-  static apply(authStorage, workspaceRoot) {
+  static async apply(runtime, workspaceRoot) {
     const applied = [];
     for (const [name, value] of AkanEnvKeys2.#entries(workspaceRoot)) {
       const provider = AkanEnvKeys2.#providerOf(name);
       if (!provider || !value)
         continue;
-      authStorage.setRuntimeApiKey(provider, value);
+      await runtime.setRuntimeApiKey(provider, value);
       applied.push(provider);
     }
     return applied;
   }
   static #entries(workspaceRoot) {
     const fromProcess = Object.entries(process.env).filter(([, value]) => typeof value === "string");
-    const file = path5.join(workspaceRoot, ".env");
-    if (!existsSync6(file))
+    const file = path4.join(workspaceRoot, ".env");
+    if (!existsSync4(file))
       return fromProcess;
-    const fromFile = readFileSync2(file, "utf8").split(`
+    const fromFile = readFileSync(file, "utf8").split(`
 `).map((line) => line.trim()).filter((line) => line && !line.startsWith("#") && line.includes("=")).map((line) => {
       const index = line.indexOf("=");
       return [
@@ -1229,89 +1194,82 @@ class AkanEnvKeys2 {
   }
 }
 
-// pkgs/@akanjs/devkit/codeAgent/agent/AkanAuthStorageBackend.ts
-import {
-  closeSync,
-  existsSync as existsSync7,
-  mkdirSync,
-  openSync,
-  readFileSync as readFileSync3,
-  renameSync,
-  unlinkSync,
-  writeFileSync
-} from "fs";
-import path6 from "path";
+// pkgs/@akanjs/devkit/codeAgent/agent/AkanContextFiles.ts
+import { existsSync as existsSync5, readdirSync, readFileSync as readFileSync2, statSync as statSync2 } from "fs";
+import path5 from "path";
 
-class AkanAuthStorageBackend2 {
-  #authPath;
-  #lockPath;
-  constructor(authPath) {
-    this.#authPath = authPath;
-    this.#lockPath = `${authPath}.lock`;
-  }
-  withLock(fn) {
-    this.#acquire();
-    try {
-      const { result, next } = fn(this.#read());
-      if (next !== undefined)
-        this.#write(next);
-      return result;
-    } finally {
-      this.#release();
+class AkanContextFiles {
+  static #frontmatter = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?/;
+  static extend(base, options) {
+    const seen = new Set(base.map((file) => file.path));
+    const contents = new Set(base.map((file) => file.content.trim()));
+    const added = [];
+    for (const file of [...AkanContextFiles.#claude(base), ...AkanContextFiles.#cursor(options)]) {
+      if (seen.has(file.path) || contents.has(file.content.trim()) || !file.content.trim())
+        continue;
+      seen.add(file.path);
+      contents.add(file.content.trim());
+      added.push(file);
     }
+    return [...base, ...added];
   }
-  async withLockAsync(fn) {
-    this.#acquire();
-    try {
-      const { result, next } = await fn(this.#read());
-      if (next !== undefined)
-        this.#write(next);
-      return result;
-    } finally {
-      this.#release();
+  static #claude(base) {
+    const files = [];
+    for (const file of base) {
+      if (!/^AGENTS\.(md|MD)$/.test(path5.basename(file.path)))
+        continue;
+      for (const name of ["CLAUDE.md", "CLAUDE.MD"]) {
+        const candidate = path5.join(path5.dirname(file.path), name);
+        const content = AkanContextFiles.#read(candidate);
+        if (content !== undefined)
+          files.push({ path: candidate, content });
+      }
     }
-  }
-  #read() {
-    if (!existsSync7(this.#authPath))
-      return;
-    const text = readFileSync3(this.#authPath, "utf8");
-    return text.trim() ? text : undefined;
-  }
-  #write(next) {
-    mkdirSync(path6.dirname(this.#authPath), { recursive: true, mode: 448 });
-    const temp = `${this.#authPath}.${process.pid}.tmp`;
-    writeFileSync(temp, next, { mode: 384 });
-    renameSync(temp, this.#authPath);
-  }
-  #acquire() {
-    mkdirSync(path6.dirname(this.#lockPath), { recursive: true, mode: 448 });
-    const deadline = Date.now() + 5000;
-    for (;; ) {
-      try {
-        closeSync(openSync(this.#lockPath, "wx"));
-        return;
-      } catch {
-        if (this.#lockIsStale() || Date.now() > deadline) {
-          try {
-            unlinkSync(this.#lockPath);
-          } catch {}
+    return files;
+  }
+  static #cursor(options) {
+    const files = [];
+    const roots = [...new Set([options.workspaceRoot, options.cwd])];
+    for (const root of roots) {
+      const legacy = AkanContextFiles.#read(path5.join(root, ".cursorrules"));
+      if (legacy !== undefined)
+        files.push({ path: path5.join(root, ".cursorrules"), content: legacy });
+      for (const file of AkanContextFiles.#mdcFiles(path5.join(root, ".cursor", "rules"))) {
+        const raw = AkanContextFiles.#read(file);
+        if (raw === undefined)
           continue;
-        }
-        Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 20);
+        const body = AkanContextFiles.#applied(raw);
+        if (body !== undefined)
+          files.push({ path: file, content: body });
       }
     }
+    return files;
+  }
+  static #applied(raw) {
+    const match = AkanContextFiles.#frontmatter.exec(raw);
+    if (!match)
+      return raw;
+    if (!/^\s*alwaysApply\s*:\s*true\s*$/m.test(match[1] ?? ""))
+      return;
+    return raw.slice(match[0].length);
   }
-  #lockIsStale() {
+  static #mdcFiles(dir) {
+    if (!existsSync5(dir))
+      return [];
     try {
-      return Date.now() - Bun.file(this.#lockPath).lastModified > 30000;
+      return readdirSync(dir, { recursive: true, withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".mdc")).map((entry) => path5.join(entry.parentPath ?? dir, entry.name)).sort();
     } catch {
-      return true;
+      return [];
     }
   }
-  #release() {
+  static #read(file) {
     try {
-      unlinkSync(this.#lockPath);
-    } catch {}
+      if (!existsSync5(file) || !statSync2(file).isFile())
+        return;
+      return readFileSync2(file, "utf8").replace(/^\uFEFF/, "");
+    } catch {
+      return;
+    }
   }
 }
 
@@ -1339,26 +1297,26 @@ var akanSystemPrompt2 = (profile) => {
 };
 
 // pkgs/@akanjs/devkit/codeAgent/agent/CodeSessionIndex.ts
-import { existsSync as existsSync8, readdirSync, readFileSync as readFileSync4, statSync as statSync2 } from "fs";
-import path7 from "path";
+import { existsSync as existsSync6, readdirSync as readdirSync2, readFileSync as readFileSync3, statSync as statSync3 } from "fs";
+import path6 from "path";
 
 class CodeSessionIndex2 {
   static readLimit = 512 * 1024;
   static list(dir, limit = 30) {
-    if (!existsSync8(dir))
+    if (!existsSync6(dir))
       return [];
-    const files = readdirSync(dir).filter((entry) => entry.endsWith(".jsonl")).map((entry) => path7.join(dir, entry)).map((file) => ({ file, updatedAt: CodeSessionIndex2.#mtime(file) })).sort((left, right) => right.updatedAt - left.updatedAt).slice(0, limit);
+    const files = readdirSync2(dir).filter((entry) => entry.endsWith(".jsonl")).map((entry) => path6.join(dir, entry)).map((file) => ({ file, updatedAt: CodeSessionIndex2.#mtime(file) })).sort((left, right) => right.updatedAt - left.updatedAt).slice(0, limit);
     return files.map((entry) => CodeSessionIndex2.#read(entry.file, entry.updatedAt)).filter((entry) => !!entry);
   }
   static fileOf(dir, id) {
-    if (!existsSync8(dir))
+    if (!existsSync6(dir))
       return;
-    const match = readdirSync(dir).find((entry) => entry.endsWith(`${id}.jsonl`) || entry === `${id}.jsonl`);
-    return match ? path7.join(dir, match) : undefined;
+    const match = readdirSync2(dir).find((entry) => entry.endsWith(`${id}.jsonl`) || entry === `${id}.jsonl`);
+    return match ? path6.join(dir, match) : undefined;
   }
   static #mtime(file) {
     try {
-      return statSync2(file).mtimeMs;
+      return statSync3(file).mtimeMs;
     } catch {
       return 0;
     }
@@ -1389,9 +1347,9 @@ class CodeSessionIndex2 {
   }
   static #lines(file) {
     try {
-      if (statSync2(file).size > CodeSessionIndex2.readLimit)
+      if (statSync3(file).size > CodeSessionIndex2.readLimit)
         return [];
-      return readFileSync4(file, "utf8").split(`
+      return readFileSync3(file, "utf8").split(`
 `).filter((line) => !!line.trim());
     } catch {
       return [];
@@ -1419,20 +1377,20 @@ class AkanCodeServices2 {
       quietStartup: true
     });
   }
-  static auth(workspaceRoot) {
-    mkdirSync2(akanCodePaths2.globalDir(), { recursive: true, mode: 448 });
-    const authStorage = AuthStorage.fromStorage(new AkanAuthStorageBackend2(akanCodePaths2.authFile()));
-    AkanEnvKeys2.apply(authStorage, workspaceRoot);
-    return authStorage;
-  }
-  static models(authStorage) {
-    return ModelRegistry.create(authStorage, akanCodePaths2.modelsFile());
+  static async runtime(workspaceRoot) {
+    mkdirSync(akanCodePaths2.globalDir(), { recursive: true, mode: 448 });
+    const runtime = await ModelRuntime.create({
+      authPath: akanCodePaths2.authFile(),
+      modelsPath: akanCodePaths2.modelsFile()
+    });
+    await AkanEnvKeys2.apply(runtime, workspaceRoot);
+    return runtime;
   }
   static sessions(workspaceRoot, cwd, profile, resume) {
     if (profile.session.store !== "file")
       return SessionManager2.inMemory(cwd);
     const dir = akanCodePaths2.sessionsDir(workspaceRoot);
-    mkdirSync2(dir, { recursive: true });
+    mkdirSync(dir, { recursive: true });
     const manager = SessionManager2.create(cwd, dir);
     if (!resume)
       return manager;
@@ -1446,16 +1404,19 @@ class AkanCodeServices2 {
     if (!profile.context.skills)
       return [];
     const workspace = akanCodePaths2.skillsDir(workspaceRoot);
-    return [akanCodePaths2.builtinSkillsDir(), existsSync9(workspace) ? workspace : undefined].filter((dir) => !!dir);
+    return [akanCodePaths2.builtinSkillsDir(), existsSync7(workspace) ? workspace : undefined].filter((dir) => !!dir);
   }
   static resourceOptions(options) {
-    const present = (dir) => existsSync9(dir) ? [dir] : [];
+    const present = (dir) => existsSync7(dir) ? [dir] : [];
     return {
       noExtensions: true,
       noSkills: true,
       noPromptTemplates: true,
       noThemes: true,
       noContextFiles: !options.profile.context.projectFiles,
+      agentsFilesOverride: ({ agentsFiles }) => ({
+        agentsFiles: options.profile.context.projectFiles ? AkanContextFiles.extend(agentsFiles, { workspaceRoot: options.workspaceRoot, cwd: options.cwd }) : agentsFiles
+      }),
       appendSystemPrompt: [akanSystemPrompt2(options.profile)],
       additionalExtensionPaths: present(akanCodePaths2.extensionsDir(options.workspaceRoot)),
       additionalSkillPaths: AkanCodeServices2.#skillPaths(options.profile, options.workspaceRoot),
@@ -1733,7 +1694,7 @@ class CodeAgentEventMapper2 {
 }
 
 // pkgs/@akanjs/devkit/codeAgent/agent/CodeAgentGate.ts
-import path8 from "path";
+import path7 from "path";
 var writeTools = new Set(["write", "edit"]);
 var commandTools = new Set(["bash"]);
 
@@ -1772,9 +1733,9 @@ class CodeAgentGate2 {
     return `The command names "${hit}", which the profile's deny list covers. Ask the user for the value instead of reading the file.`;
   }
   #deniedReason(target) {
-    const absolute = path8.isAbsolute(target) ? target : path8.resolve(this.#profile.paths.root, target);
-    const relative = path8.relative(this.#profile.paths.root, absolute);
-    if (relative.startsWith("..") || path8.isAbsolute(relative))
+    const absolute = path7.isAbsolute(target) ? target : path7.resolve(this.#profile.paths.root, target);
+    const relative = path7.relative(this.#profile.paths.root, absolute);
+    if (relative.startsWith("..") || path7.isAbsolute(relative))
       return `Path is outside the agent root (${this.#profile.paths.root}).`;
     if (this.#deny.some((glob) => glob.match(absolute) || glob.match(relative)))
       return "Path is on the profile's deny list (secrets and environment files are never readable).";
@@ -1864,15 +1825,15 @@ class CodeAgentUi2 {
 // pkgs/@akanjs/devkit/codeAgent/agent/CodeMailbox.ts
 import {
   appendFileSync,
-  existsSync as existsSync10,
-  mkdirSync as mkdirSync3,
-  readdirSync as readdirSync2,
-  readFileSync as readFileSync5,
+  existsSync as existsSync8,
+  mkdirSync as mkdirSync2,
+  readdirSync as readdirSync3,
+  readFileSync as readFileSync4,
   rmSync,
-  statSync as statSync3,
-  writeFileSync as writeFileSync2
+  statSync as statSync4,
+  writeFileSync
 } from "fs";
-import path9 from "path";
+import path8 from "path";
 
 class CodeMailbox2 {
   static staleMs = 20000;
@@ -1892,11 +1853,11 @@ class CodeMailbox2 {
     this.#name = name;
   }
   get inbox() {
-    return path9.join(this.#dir, "inbox", `${this.#id}.jsonl`);
+    return path8.join(this.#dir, "inbox", `${this.#id}.jsonl`);
   }
   open(cwd, onMail) {
-    mkdirSync3(path9.join(this.#dir, "live"), { recursive: true });
-    mkdirSync3(path9.join(this.#dir, "inbox"), { recursive: true });
+    mkdirSync2(path8.join(this.#dir, "live"), { recursive: true });
+    mkdirSync2(path8.join(this.#dir, "inbox"), { recursive: true });
     this.#read = CodeMailbox2.#lines(this.inbox).length;
     this.beat(cwd);
     this.#beat = setInterval(() => this.beat(cwd), CodeMailbox2.beatMs);
@@ -1913,7 +1874,7 @@ class CodeMailbox2 {
     this.#beat = null;
     this.#poll = null;
     try {
-      rmSync(path9.join(this.#dir, "live", `${this.#id}.json`), { force: true });
+      rmSync(path8.join(this.#dir, "live", `${this.#id}.json`), { force: true });
     } catch {}
   }
   rename(name, cwd) {
@@ -1923,15 +1884,15 @@ class CodeMailbox2 {
   beat(cwd) {
     const peer = { id: this.#id, name: this.#name, cwd, pid: process.pid, at: Date.now() };
     try {
-      writeFileSync2(path9.join(this.#dir, "live", `${this.#id}.json`), JSON.stringify(peer));
+      writeFileSync(path8.join(this.#dir, "live", `${this.#id}.json`), JSON.stringify(peer));
     } catch {}
   }
   peers() {
-    const dir = path9.join(this.#dir, "live");
-    if (!existsSync10(dir))
+    const dir = path8.join(this.#dir, "live");
+    if (!existsSync8(dir))
       return [];
     const now = Date.now();
-    return readdirSync2(dir).filter((entry) => entry.endsWith(".json")).map((entry) => CodeMailbox2.#peer(path9.join(dir, entry))).filter((peer) => !!peer && peer.id !== this.#id && now - peer.at < CodeMailbox2.staleMs).sort((left, right) => right.at - left.at);
+    return readdirSync3(dir).filter((entry) => entry.endsWith(".json")).map((entry) => CodeMailbox2.#peer(path8.join(dir, entry))).filter((peer) => !!peer && peer.id !== this.#id && now - peer.at < CodeMailbox2.staleMs).sort((left, right) => right.at - left.at);
   }
   find(target) {
     const needle = target.trim().toLowerCase();
@@ -1949,8 +1910,8 @@ class CodeMailbox2 {
       throw new Error(`Too many messages: ${CodeMailbox2.sendsPerMinute} a minute is the ceiling.`);
     this.#sent.push(now);
     const mail = { at: now, from: this.#id, fromName: this.#name, text };
-    mkdirSync3(path9.join(this.#dir, "inbox"), { recursive: true });
-    appendFileSync(path9.join(this.#dir, "inbox", `${to}.jsonl`), `${JSON.stringify(mail)}
+    mkdirSync2(path8.join(this.#dir, "inbox"), { recursive: true });
+    appendFileSync(path8.join(this.#dir, "inbox", `${to}.jsonl`), `${JSON.stringify(mail)}
 `);
   }
   #drain() {
@@ -1963,15 +1924,15 @@ class CodeMailbox2 {
   }
   static #peer(file) {
     try {
-      const peer = JSON.parse(readFileSync5(file, "utf8"));
-      return typeof peer.id === "string" ? { ...peer, at: peer.at || statSync3(file).mtimeMs } : undefined;
+      const peer = JSON.parse(readFileSync4(file, "utf8"));
+      return typeof peer.id === "string" ? { ...peer, at: peer.at || statSync4(file).mtimeMs } : undefined;
     } catch {
       return;
     }
   }
   static #lines(file) {
     try {
-      return readFileSync5(file, "utf8").split(`
+      return readFileSync4(file, "utf8").split(`
 `).filter((line) => !!line.trim());
     } catch {
       return [];
@@ -1988,15 +1949,15 @@ class CodeMailbox2 {
 
 // pkgs/@akanjs/devkit/codeAgent/agent/CodeSessionFork.ts
 import { randomBytes } from "crypto";
-import { readFileSync as readFileSync6, writeFileSync as writeFileSync3 } from "fs";
-import path10 from "path";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync2 } from "fs";
+import path9 from "path";
 import { codeAgentSessionName } from "akanjs/common";
 class CodeSessionFork2 {
   static fork(dir, id, name) {
     const source = CodeSessionIndex2.fileOf(dir, id);
     if (!source)
       throw new Error(`No stored session ${id} in ${dir}`);
-    const lines = readFileSync6(source, "utf8").split(`
+    const lines = readFileSync5(source, "utf8").split(`
 `).filter((line) => !!line.trim());
     if (!lines.length)
       throw new Error(`Session ${id} has nothing in it to fork`);
@@ -2009,8 +1970,8 @@ class CodeSessionFork2 {
     first.id = forked;
     first.timestamp = at.toISOString();
     records.push(CodeSessionFork2.#named(records, name ?? CodeSessionFork2.#nameOf(records), at));
-    const file = path10.join(dir, `${at.toISOString().replace(/[:.]/g, "-")}_${forked}.jsonl`);
-    writeFileSync3(file, `${records.map((record) => JSON.stringify(record)).join(`
+    const file = path9.join(dir, `${at.toISOString().replace(/[:.]/g, "-")}_${forked}.jsonl`);
+    writeFileSync2(file, `${records.map((record) => JSON.stringify(record)).join(`
 `)}
 `);
     return { id: forked, file };
@@ -2052,6 +2013,8 @@ class CodeAgent2 {
   #disposed = false;
   #sessionDir;
   #mailbox;
+  #mcp = [];
+  #workspaceRoot = "";
   #replay = [];
   #replayFrom = 0;
   #lastContextTokens;
@@ -2064,9 +2027,8 @@ class CodeAgent2 {
     const cwd = options.cwd ?? workspaceRoot;
     const agent = new CodeAgent2(options.profile);
     const settingsManager = AkanCodeServices2.settings();
-    const authStorage = AkanCodeServices2.auth(workspaceRoot);
-    const modelRegistry = AkanCodeServices2.models(authStorage);
-    const model = await akanCodeModel2(modelRegistry, options.model);
+    const modelRuntime = await AkanCodeServices2.runtime(workspaceRoot);
+    const model = await akanCodeModel2(modelRuntime, options.model);
     const compaction = DEFAULT_COMPACTION_SETTINGS;
     const modelWarnings = akanCodeModelWarnings2(model, compaction.reserveTokens + compaction.keepRecentTokens);
     const akan = await AkanCodePlugins2.build({
@@ -2078,7 +2040,8 @@ class CodeAgent2 {
       depth: options.depth ?? 0,
       currentSessionId: () => agent.sessionId,
       mailbox: () => agent.#mailbox,
-      onNotice: (message) => agent.#emit({ type: "notice", level: "warning", message })
+      onNotice: (message) => agent.#emit({ type: "notice", level: "warning", message }),
+      onAgents: (agents) => agent.#emit({ type: "subagent", agents })
     });
     const resourceLoader = new DefaultResourceLoader({
       cwd,
@@ -2095,8 +2058,7 @@ class CodeAgent2 {
     const { session } = await createAgentSession({
       cwd,
       agentDir: akanCodePaths2.globalDir(),
-      authStorage,
-      modelRegistry,
+      modelRuntime,
       settingsManager,
       resourceLoader,
       model,
@@ -2106,6 +2068,8 @@ class CodeAgent2 {
       customTools: options.customTools
     });
     agent.#disposePlugins = akan.dispose;
+    agent.#mcp = akan.mcp;
+    agent.#workspaceRoot = workspaceRoot;
     if (options.profile.session.store === "file")
       agent.#sessionDir = akanCodePaths2.sessionsDir(workspaceRoot);
     await agent.#attach(session, options.mode ?? "print");
@@ -2125,6 +2089,12 @@ class CodeAgent2 {
   sessions() {
     return this.#sessionDir ? CodeSessionIndex2.list(this.#sessionDir) : [];
   }
+  get workspaceRoot() {
+    return this.#workspaceRoot;
+  }
+  mcpServers() {
+    return this.#mcp;
+  }
   peers() {
     return this.#mailbox?.peers() ?? [];
   }
@@ -2281,7 +2251,7 @@ Continue the task.`);
   }
   async setModel(ref) {
     const session = this.#require();
-    const model = await akanCodeModel2(session.modelRegistry, ref);
+    const model = await akanCodeModel2(session.modelRuntime, ref);
     if (!model)
       throw new Error(`Unknown model: ${ref.provider}/${ref.id}`);
     await session.setModel(model);
@@ -2431,4 +2401,4 @@ Continue the task.`);
   }
 }
 
-export { AkanEditScope2, DevLogFeedback2, PreviewChrome2, PreviewView2, PreviewFeedback2, TurnFeedback2, AkanCli2, AkanVerifier2, VerifyFeedback2, AkanToolPack2, MailToolPack2, akanCodePaths2, McpClient2, McpToolPack2, SessionToolPack2, WebToolPack2, AkanCodePlugins2, AkanEnvKeys2, AkanAuthStorageBackend2, akanSystemPrompt2, CodeSessionIndex2, AkanCodeServices2, CodeAgentAsks2, CodeAgentEventMapper2, CodeAgentGate2, CodeAgentUi2, CodeMailbox2, CodeSessionFork2, CodeAgent2 };
+export { AkanEditScope2, DevLogFeedback2, PreviewChrome2, PreviewView2, PreviewFeedback2, TurnFeedback2, AkanCli2, AkanVerifier2, VerifyFeedback2, AkanToolPack2, MailToolPack2, McpClient2, McpToolPack2, SessionToolPack2, WebToolPack2, AkanCodePlugins2, AkanEnvKeys2, akanSystemPrompt2, CodeSessionIndex2, AkanCodeServices2, CodeAgentAsks2, CodeAgentEventMapper2, CodeAgentGate2, CodeAgentUi2, CodeMailbox2, CodeSessionFork2, CodeAgent2 };