@akanjs/cli 3.0.0-beta.19 → 3.0.0-beta.20

package/{index-e4v6vhxq.js → index-xsjh6nzh.js}

@@ -4,7 +4,7 @@ import {
   akanCodePaths2,
   McpServerConfig,
   McpSignIn
-} from "./index-9d6nvkz2.js";
+} from "./index-ztp3e73t.js";
 import {
   stripAnsi
 } from "./index-7md2g9vw.js";
@@ -13,7 +13,7 @@ import {
   akanCodeModel2,
   akanCodeModelSupportsImages2,
   akanCodeModelWarnings2
-} from "./index-667w0yah.js";
+} from "./index-c6eggbee.js";
 
 // pkgs/@akanjs/devkit/codeAgent/agent/CodeAgent.ts
 import {
@@ -36,7 +36,7 @@ var empty = { paths: [], apps: [], libs: [], needsSync: false, touchesTsx: false
 
 class AkanEditScope2 {
   static async since(cwd, baseline) {
-    const current = await AkanEditScope2.#status(cwd);
+    const current = await AkanEditScope2.baseline(cwd);
     const changed = [...current].filter((line) => !baseline.has(line));
     if (!changed.length)
       return empty;
@@ -51,9 +51,6 @@ class AkanEditScope2 {
     };
   }
   static async baseline(cwd) {
-    return await AkanEditScope2.#status(cwd);
-  }
-  static async#status(cwd) {
     const proc = Bun.spawn(["git", "status", "--porcelain=v1", "--untracked-files=all"], {
       cwd,
       stdout: "pipe",
@@ -514,7 +511,7 @@ class AkanToolPack2 {
     return { name: "akan-tools", factory: async (pi) => await this.#register(pi) };
   }
   async names() {
-    const { ContextRunner } = await import("./context.runner-rs4rj15d.js");
+    const { ContextRunner } = await import("./context.runner-k99nb5pk.js");
     return [
       ...new ContextRunner().listMcpTools(this.#options.mode).map((tool) => tool.name),
       AkanToolPack2.verifyToolName
@@ -522,7 +519,7 @@ class AkanToolPack2 {
   }
   static verifyToolName = "akan_verify";
   async#register(pi) {
-    const { ContextRunner } = await import("./context.runner-rs4rj15d.js");
+    const { ContextRunner } = await import("./context.runner-k99nb5pk.js");
     const runner = new ContextRunner;
     const guidelineNames = await AkanToolPack2.#guidelineNames();
     for (const tool of runner.listMcpTools(this.#options.mode, { guidelineNames })) {
@@ -537,7 +534,8 @@ class AkanToolPack2 {
           const result = await runner.callMcpTool(this.#options.workspace, tool.name, params ?? {}, {
             mode: this.#options.mode
           });
-          return { content: [{ type: "text", text: AkanToolPack2.#render(result) }], details: undefined };
+          const text = typeof result === "string" ? result : JSON.stringify(result, null, 2);
+          return { content: [{ type: "text", text }], details: undefined };
         }
       });
     }
@@ -564,17 +562,12 @@ class AkanToolPack2 {
   }
   static async#guidelineNames() {
     try {
-      const { Prompter } = await import("./prompter-1f8d9pcc.js");
+      const { Prompter } = await import("./prompter-ptaa3nk0.js");
       return await Prompter.listGuidelines();
     } catch {
       return [];
     }
   }
-  static #render(result) {
-    if (typeof result === "string")
-      return result;
-    return JSON.stringify(result, null, 2);
-  }
 }
 
 // pkgs/@akanjs/devkit/codeAgent/tools/AskToolPack.ts
@@ -885,24 +878,27 @@ class McpClient2 {
 class McpToolPack2 {
   #clients = [];
   #status = [];
-  constructor() {}
+  #onNotice;
+  constructor(onNotice) {
+    this.#onNotice = onNotice;
+  }
   static async connect(options) {
     const refs = McpToolPack2.#refs(options);
     if (!refs.length)
       return;
-    const pack = new McpToolPack2;
+    const pack = new McpToolPack2(options.onNotice);
     for (const ref of refs) {
       const base = { name: ref.name, transport: ref.transport, target: McpServerConfig.targetOf(ref) };
       const token = ref.transport === "http" ? await McpSignIn.token(ref, options.onNotice) : undefined;
       try {
-        const client = await new McpClient2(ref, token).connect();
-        const tools = await client.listTools();
-        pack.#clients.push({ client, tools });
-        pack.#status.push({
+        const opened = await McpToolPack2.#openRefreshing(ref, token, options.onNotice);
+        const status = {
           ...base,
-          tools: tools.map((tool) => McpToolPack2.#nameOf(ref.name, tool.name)),
-          auth: token ? "authorized" : "none"
-        });
+          tools: opened.tools.map((tool) => McpToolPack2.#nameOf(ref.name, tool.name)),
+          auth: opened.token ? "authorized" : "none"
+        };
+        pack.#clients.push({ ...opened, status, renewing: undefined, refused: undefined });
+        pack.#status.push(status);
       } catch (error) {
         if (error instanceof McpUnauthorized2) {
           options.onNotice?.(`MCP server "${ref.name}" needs signing in \u2014 /mcp login ${ref.name}`);
@@ -915,6 +911,22 @@ class McpToolPack2 {
     }
     return pack;
   }
+  static async#openRefreshing(ref, token, onNotice) {
+    try {
+      return await McpToolPack2.#open(ref, token);
+    } catch (error) {
+      if (!(error instanceof McpUnauthorized2) || !token)
+        throw error;
+      const retry = await McpSignIn.retryToken(ref, token, onNotice);
+      if (!retry)
+        throw error;
+      return await McpToolPack2.#open(ref, retry);
+    }
+  }
+  static async#open(ref, token) {
+    const client = await new McpClient2(ref, token).connect();
+    return { client, tools: await client.listTools(), token };
+  }
   get toolNames() {
     return this.#clients.flatMap(({ client, tools }) => tools.map((tool) => McpToolPack2.#nameOf(client.ref.name, tool.name)));
   }
@@ -929,18 +941,18 @@ class McpToolPack2 {
       client.close();
   }
   #register(pi) {
-    for (const { client, tools } of this.#clients)
-      for (const tool of tools) {
-        const name = McpToolPack2.#nameOf(client.ref.name, tool.name);
+    for (const server of this.#clients)
+      for (const tool of server.tools) {
+        const name = McpToolPack2.#nameOf(server.client.ref.name, tool.name);
         const description = tool.description ?? tool.name;
         pi.registerTool({
           name,
-          label: `${client.ref.name}: ${tool.name}`,
+          label: `${server.client.ref.name}: ${tool.name}`,
           description,
           promptSnippet: `${name}: ${description.split(".")[0] ?? description}`,
           parameters: Type4.Unsafe(tool.inputSchema),
           execute: async (_id, params) => {
-            const result = await client.callTool(tool.name, params ?? {});
+            const result = await this.#call(server, tool.name, params ?? {});
             return {
               content: [{ type: "text", text: codeAgentClip(result.text, codeAgentOutputChars) }],
               details: undefined,
@@ -950,6 +962,59 @@ class McpToolPack2 {
         });
       }
   }
+  async#call(server, tool, args) {
+    const client = server.client;
+    try {
+      return await client.callTool(tool, args);
+    } catch (error) {
+      if (!(error instanceof McpUnauthorized2))
+        throw error;
+    }
+    const renewed = await this.#renewed(server, client);
+    try {
+      if (renewed)
+        return await renewed.callTool(tool, args);
+    } catch (error) {
+      if (!(error instanceof McpUnauthorized2))
+        throw error;
+      McpToolPack2.#refuse(server, renewed);
+    }
+    throw new Error(`MCP server "${client.ref.name}" needs signing in \u2014 /mcp login ${client.ref.name}`);
+  }
+  static #refuse(server, client) {
+    server.refused = client;
+    server.status.auth = "required";
+  }
+  async#renewed(server, refused) {
+    if (server.client === refused && server.refused !== refused)
+      server.renewing ??= this.#renew(server, refused).finally(() => {
+        server.renewing = undefined;
+      });
+    if (server.renewing)
+      return await server.renewing;
+    return server.client === server.refused ? undefined : server.client;
+  }
+  async#renew(server, refused) {
+    const token = server.token ? await McpSignIn.retryToken(refused.ref, server.token, this.#onNotice) : undefined;
+    const client = token ? await McpToolPack2.#reopen(refused.ref, token) : undefined;
+    if (!client) {
+      McpToolPack2.#refuse(server, refused);
+      return;
+    }
+    refused.close();
+    server.client = client;
+    server.token = token;
+    return client;
+  }
+  static async#reopen(ref, token) {
+    try {
+      return await new McpClient2(ref, token).connect();
+    } catch (error) {
+      if (error instanceof McpUnauthorized2)
+        return;
+      throw error;
+    }
+  }
   static #nameOf(server, tool) {
     return `mcp__${server.replace(/[^a-zA-Z0-9_]/g, "_")}__${tool}`;
   }
@@ -1172,32 +1237,27 @@ class AkanCodePlugins2 {
     const dispose = () => mcp?.close();
     const mcpStatus = mcp?.status ?? [];
     const web = new WebToolPack2({ profile: options.profile });
-    const webExtension = web.extension();
     const sessions = new SessionToolPack2({
       workspaceRoot: options.workspace.workspaceRoot,
       cwd: options.cwd,
       profile: options.profile,
       currentSessionId: options.currentSessionId
     });
-    const sessionExtension = sessions.extension();
     const mail = new MailToolPack2({ profile: options.profile, mailbox: options.mailbox });
-    const mailExtension = mail.extension();
     const onAsk = options.onAsk;
     const ask = onAsk ? new AskToolPack({ profile: options.profile, ask: onAsk }) : undefined;
-    const askExtension = ask?.extension();
+    const shared = {
+      extensions: [mcp?.extension(), web.extension(), sessions.extension(), mail.extension(), ask?.extension()].filter((entry) => !!entry),
+      toolNames: [
+        ...mcp?.toolNames ?? [],
+        ...web.names(),
+        ...sessions.names(),
+        ...mail.names(),
+        ...ask?.names() ?? []
+      ]
+    };
     if (!options.profile.tools.akan)
-      return {
-        extensions: [mcp?.extension(), webExtension, sessionExtension, mailExtension, askExtension].filter((entry) => !!entry),
-        toolNames: [
-          ...mcp?.toolNames ?? [],
-          ...web.names(),
-          ...sessions.names(),
-          ...mail.names(),
-          ...ask?.names() ?? []
-        ],
-        mcp: mcpStatus,
-        dispose
-      };
+      return { ...shared, mcp: mcpStatus, dispose };
     const readOnly = !options.profile.tools.builtin.includes("write");
     const pack = new AkanToolPack2({
       workspace: options.workspace,
@@ -1210,6 +1270,7 @@ class AkanCodePlugins2 {
       cwd: options.cwd,
       parent: options.profile,
       depth: options.depth,
+      ...options.subagentSpend ? { spend: options.subagentSpend } : {},
       ...options.onNotice ? { onNotice: options.onNotice } : {},
       ...options.onAgents ? { onAgents: options.onAgents } : {}
     });
@@ -1221,27 +1282,9 @@ class AkanCodePlugins2 {
         budget: options.profile.limits.feedback,
         ...options.onNotice ? { onNotice: options.onNotice } : {}
       }).extension());
-    if (mcp)
-      extensions.push(mcp.extension());
-    if (webExtension)
-      extensions.push(webExtension);
-    if (sessionExtension)
-      extensions.push(sessionExtension);
-    if (mailExtension)
-      extensions.push(mailExtension);
-    if (askExtension)
-      extensions.push(askExtension);
     return {
-      extensions,
-      toolNames: [
-        ...await pack.names(),
-        ...subagent ? [SubagentPool2.toolName] : [],
-        ...mcp?.toolNames ?? [],
-        ...web.names(),
-        ...sessions.names(),
-        ...mail.names(),
-        ...ask?.names() ?? []
-      ],
+      extensions: [...extensions, ...shared.extensions],
+      toolNames: [...await pack.names(), ...subagent ? [SubagentPool2.toolName] : [], ...shared.toolNames],
       mcp: mcpStatus,
       dispose
     };
@@ -1420,9 +1463,38 @@ var akanSystemPrompt2 = (profile) => {
 };
 
 // pkgs/@akanjs/devkit/codeAgent/agent/CodeSessionIndex.ts
-import { existsSync as existsSync6, readdirSync as readdirSync2, readFileSync as readFileSync3, statSync as statSync3 } from "fs";
+import { existsSync as existsSync6, readdirSync as readdirSync2, statSync as statSync4 } from "fs";
 import path6 from "path";
 
+// pkgs/@akanjs/devkit/codeAgent/agent/jsonLines.ts
+import { closeSync, openSync, readFileSync as readFileSync3, readSync, statSync as statSync3 } from "fs";
+var readHead = (file, maxBytes) => {
+  const fd = openSync(file, "r");
+  try {
+    const head = Buffer.alloc(maxBytes);
+    return head.subarray(0, readSync(fd, head, 0, maxBytes, 0)).toString("utf8");
+  } finally {
+    closeSync(fd);
+  }
+};
+var readJsonLines = (file, maxBytes) => {
+  try {
+    const text = maxBytes !== undefined && statSync3(file).size > maxBytes ? readHead(file, maxBytes) : readFileSync3(file, "utf8");
+    return text.split(`
+`).filter((line) => !!line.trim());
+  } catch {
+    return [];
+  }
+};
+var parseJsonLine = (line) => {
+  try {
+    return JSON.parse(line);
+  } catch {
+    return;
+  }
+};
+
+// pkgs/@akanjs/devkit/codeAgent/agent/CodeSessionIndex.ts
 class CodeSessionIndex2 {
   static readLimit = 512 * 1024;
   static list(dir, limit = 30) {
@@ -1439,18 +1511,18 @@ class CodeSessionIndex2 {
   }
   static #mtime(file) {
     try {
-      return statSync3(file).mtimeMs;
+      return statSync4(file).mtimeMs;
     } catch {
       return 0;
     }
   }
   static #read(file, updatedAt) {
-    const lines = CodeSessionIndex2.#lines(file);
+    const lines = readJsonLines(file, CodeSessionIndex2.readLimit);
     if (!lines.length)
       return;
     const entry = { id: "", file, name: undefined, opening: "", updatedAt, turns: 0 };
     for (const line of lines) {
-      const record = CodeSessionIndex2.#parse(line);
+      const record = parseJsonLine(line);
       if (!record)
         continue;
       if (record.type === "session" && typeof record.id === "string")
@@ -1468,23 +1540,6 @@ class CodeSessionIndex2 {
     }
     return entry.id ? entry : undefined;
   }
-  static #lines(file) {
-    try {
-      if (statSync3(file).size > CodeSessionIndex2.readLimit)
-        return [];
-      return readFileSync3(file, "utf8").split(`
-`).filter((line) => !!line.trim());
-    } catch {
-      return [];
-    }
-  }
-  static #parse(line) {
-    try {
-      return JSON.parse(line);
-    } catch {
-      return;
-    }
-  }
   static #text(content) {
     const text = typeof content === "string" ? content : Array.isArray(content) ? content.map((part) => typeof part === "object" && part && ("text" in part) ? String(part.text) : "").join(" ") : "";
     return text.replace(/\s+/g, " ").trim();
@@ -1503,19 +1558,14 @@ class AkanCodeServices2 {
   }
   static async runtime(workspaceRoot, proxy = null) {
     mkdirSync(akanCodePaths2.globalDir(), { recursive: true, mode: 448 });
-    if (proxy) {
-      const runtime = await ModelRuntime.create({
-        authPath: path7.join(mkdtempSync(path7.join(tmpdir(), "akan-code-proxy-")), "auth.json"),
-        modelsPath: akanCodePaths2.modelsFile()
-      });
-      await proxy.apply(runtime);
-      return runtime;
-    }
     const runtime = await ModelRuntime.create({
-      authPath: akanCodePaths2.authFile(),
+      authPath: proxy ? path7.join(mkdtempSync(path7.join(tmpdir(), "akan-code-proxy-")), "auth.json") : akanCodePaths2.authFile(),
       modelsPath: akanCodePaths2.modelsFile()
     });
-    await AkanEnvKeys2.apply(runtime, workspaceRoot);
+    if (proxy)
+      await proxy.apply(runtime);
+    else
+      await AkanEnvKeys2.apply(runtime, workspaceRoot);
     return runtime;
   }
   static sessions(workspaceRoot, cwd, profile, resume) {
@@ -1582,7 +1632,7 @@ class CodeAgentAsks2 {
   }
   openQuestion(question) {
     this.#question?.deferred.resolve("");
-    const deferred = CodeAgentAsks2.#defer();
+    const deferred = Promise.withResolvers();
     this.#question = { question, deferred };
     return deferred.promise;
   }
@@ -1595,7 +1645,7 @@ class CodeAgentAsks2 {
     return true;
   }
   openApproval(id) {
-    const deferred = CodeAgentAsks2.#defer();
+    const deferred = Promise.withResolvers();
     this.#approvals.set(id, deferred);
     return deferred.promise;
   }
@@ -1614,13 +1664,6 @@ class CodeAgentAsks2 {
       deferred.resolve(false);
     this.#approvals.clear();
   }
-  static #defer() {
-    let resolve = () => {};
-    const promise = new Promise((r) => {
-      resolve = r;
-    });
-    return { resolve, promise };
-  }
 }
 
 // pkgs/@akanjs/devkit/codeAgent/agent/CodeAgentEventMapper.ts
@@ -1629,6 +1672,16 @@ import {
   codeAgentLabelChars,
   codeAgentOutputChars as codeAgentOutputChars4
 } from "akanjs/common";
+
+// pkgs/@akanjs/devkit/codeAgent/agent/stringArg.ts
+var stringArg = (args, key) => {
+  if (!args || typeof args !== "object")
+    return;
+  const value = args[key];
+  return typeof value === "string" && value ? value : undefined;
+};
+
+// pkgs/@akanjs/devkit/codeAgent/agent/CodeAgentEventMapper.ts
 var toolOps = {
   read: "read",
   write: "write",
@@ -1772,7 +1825,7 @@ class CodeAgentEventMapper2 {
     return "done";
   }
   #summary(toolCallId, name, args) {
-    const path = CodeAgentEventMapper2.#pathOf(args);
+    const path = stringArg(args, "path");
     return {
       toolCallId,
       name,
@@ -1798,12 +1851,6 @@ class CodeAgentEventMapper2 {
       return [];
     return [{ type: "message", turnId: this.#turnId, role: message.role, text }];
   }
-  static #pathOf(args) {
-    if (!args || typeof args !== "object")
-      return;
-    const value = args.path;
-    return typeof value === "string" && value ? value : undefined;
-  }
   static #renderArgs(args) {
     if (!args || typeof args !== "object")
       return "";
@@ -1855,13 +1902,13 @@ class CodeAgentGate2 {
     this.#deniedFragments = [...new Set((profile.paths.deny ?? []).map(CodeAgentGate2.#fragmentOf).filter(Boolean))];
   }
   verdict(toolName, args) {
-    const target = CodeAgentGate2.#pathOf(args);
+    const target = stringArg(args, "path");
     if (target) {
       const denied = this.#deniedReason(target);
       if (denied)
         return { block: denied };
     }
-    const command = CodeAgentGate2.#commandOf(args);
+    const command = stringArg(args, "command");
     if (command) {
       const denied = this.#deniedCommandReason(command);
       if (denied)
@@ -1906,23 +1953,11 @@ class CodeAgentGate2 {
     const trimmed = pattern.replace(/^\*\*\//, "").replace(/\/\*\*$/, "/").replace(/^\*+/, "");
     return trimmed.includes("*") ? "" : trimmed;
   }
-  static #commandOf(args) {
-    if (!args || typeof args !== "object")
-      return;
-    const value = args.command;
-    return typeof value === "string" && value ? value : undefined;
-  }
-  static #pathOf(args) {
-    if (!args || typeof args !== "object")
-      return;
-    const value = args.path;
-    return typeof value === "string" && value ? value : undefined;
-  }
   static #summarize(toolName, args) {
     const record = args ?? {};
     if (toolName === "bash")
       return `run: ${String(record.command ?? "").slice(0, 200)}`;
-    const target = CodeAgentGate2.#pathOf(args);
+    const target = stringArg(args, "path");
     return target ? `${toolName} ${target}` : toolName;
   }
 }
@@ -2106,11 +2141,10 @@ import {
   readdirSync as readdirSync3,
   readFileSync as readFileSync5,
   rmSync as rmSync2,
-  statSync as statSync4,
+  statSync as statSync5,
   writeFileSync as writeFileSync2
 } from "fs";
 import path10 from "path";
-
 class CodeMailbox2 {
   static staleMs = 20000;
   static beatMs = 5000;
@@ -2134,7 +2168,7 @@ class CodeMailbox2 {
   open(cwd, onMail) {
     mkdirSync3(path10.join(this.#dir, "live"), { recursive: true });
     mkdirSync3(path10.join(this.#dir, "inbox"), { recursive: true });
-    this.#read = CodeMailbox2.#lines(this.inbox).length;
+    this.#read = readJsonLines(this.inbox).length;
     this.beat(cwd);
     this.#beat = setInterval(() => this.beat(cwd), CodeMailbox2.beatMs);
     this.#poll = setInterval(() => {
@@ -2191,32 +2225,17 @@ class CodeMailbox2 {
 `);
   }
   #drain() {
-    const lines = CodeMailbox2.#lines(this.inbox);
+    const lines = readJsonLines(this.inbox);
     if (lines.length <= this.#read)
       return [];
     const fresh = lines.slice(this.#read);
     this.#read = lines.length;
-    return fresh.map((line) => CodeMailbox2.#parse(line)).filter((mail) => !!mail?.text && typeof mail.from === "string");
+    return fresh.map((line) => parseJsonLine(line)).filter((mail) => !!mail?.text && typeof mail.from === "string");
   }
   static #peer(file) {
     try {
       const peer = JSON.parse(readFileSync5(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(`
-`).filter((line) => !!line.trim());
-    } catch {
-      return [];
-    }
-  }
-  static #parse(line) {
-    try {
-      return JSON.parse(line);
+      return typeof peer.id === "string" ? { ...peer, at: peer.at || statSync5(file).mtimeMs } : undefined;
     } catch {
       return;
     }
@@ -2239,7 +2258,7 @@ class CodeSessionFork2 {
       throw new Error(`Session ${id} has nothing in it to fork`);
     const at = new Date;
     const forked = Bun.randomUUIDv7();
-    const records = lines.map((line) => CodeSessionFork2.#parse(line)).filter((record) => !!record);
+    const records = lines.map((line) => parseJsonLine(line)).filter((record) => !!record);
     const first = records.find((record) => record.type === "session");
     if (!first)
       throw new Error(`Session ${id} carries no session record`);
@@ -2267,13 +2286,6 @@ class CodeSessionFork2 {
     const current = typeof named?.name === "string" ? named.name : "";
     return codeAgentSessionName(current ? `${current} fork` : "fork");
   }
-  static #parse(line) {
-    try {
-      return JSON.parse(line);
-    } catch {
-      return;
-    }
-  }
 }
 
 // pkgs/@akanjs/devkit/codeAgent/agent/CodeAgent.ts
@@ -2315,6 +2327,7 @@ class CodeAgent2 {
       apps: options.apps ?? [],
       canSeeImages: akanCodeModelSupportsImages2(model),
       depth: options.depth ?? 0,
+      ...options.subagentSpend ? { subagentSpend: options.subagentSpend } : {},
       currentSessionId: () => agent.sessionId,
       mailbox: () => agent.#mailbox,
       onNotice: (message) => agent.#emit({ type: "notice", level: "warning", message }),
@@ -2395,7 +2408,7 @@ class CodeAgent2 {
     this.#mailbox.open(cwd, (mail) => {
       const from = `${mail.fromName} (${mail.from.slice(0, 8)})`;
       this.#emit({ type: "notice", level: "info", message: `message from ${from}` });
-      this.prompt(`Message from another session \u2014 ${from}:
+      this.#prompt(`Message from another session \u2014 ${from}:
 ${mail.text}`).catch((error) => this.#emit({ type: "notice", level: "error", message: String(error) }));
     });
   }
@@ -2465,6 +2478,10 @@ ${mail.text}`).catch((error) => this.#emit({ type: "notice", level: "error", mes
     return { ...base, frames: this.#replay.filter((event) => event.seq > sinceSeq) };
   }
   async prompt(message, images) {
+    this.#suspended.clear();
+    await this.#prompt(message, images);
+  }
+  async#prompt(message, images) {
     const session = this.#require();
     if (!session.sessionName && message.trim())
       this.setName(codeAgentSessionName2(message));
@@ -2493,7 +2510,7 @@ ${mail.text}`).catch((error) => this.#emit({ type: "notice", level: "error", mes
       return false;
     const suspendedRendered = codeAgentRenderAnswer(suspended, answer);
     this.#emit({ type: "question_resolved", questionId, answer, rendered: suspendedRendered });
-    await this.prompt(`The user answered: ${suspendedRendered}
+    await this.#prompt(`The user answered: ${suspendedRendered}
 Continue the task.`);
     return true;
   }
@@ -2508,7 +2525,7 @@ Continue the task.`);
       return false;
     this.#emit({ type: "approval_resolved", approvalId, approved });
     if (approved)
-      await this.prompt("The user approved the pending action. Retry it and continue.");
+      await this.#prompt("The user approved the pending action. Retry it and continue.");
     return true;
   }
   async compact(instructions) {
@@ -2583,7 +2600,8 @@ Continue the task.`);
     session.subscribe((event) => {
       for (const body of this.#mapper.map(event))
         this.#emit(body);
-      this.#emitContextUsage(event.type);
+      if (event.type === "agent_end" || event.type === "compaction_end")
+        this.#emitContextNow();
     });
     await session.bindExtensions({
       mode,
@@ -2606,11 +2624,6 @@ Continue the task.`);
       };
     }));
   }
-  #emitContextUsage(eventType) {
-    if (eventType !== "agent_end" && eventType !== "compaction_end")
-      return;
-    this.#emitContextNow();
-  }
   #emitContextNow() {
     const usage = this.#session?.getContextUsage();
     if (usage?.tokens == null)