@byfriends/agent-core 0.1.0 → 0.2.1

package/dist/index.mjs

@@ -1,10 +1,10 @@
-import { a as fromByfErrorPayload, c as toByfErrorPayload, d as ErrorCodes, l as ByfError, o as isByfError, r as normalizeWorkDir, s as makeErrorPayload, t as SessionStore, u as BYF_ERROR_INFO } from "./store-DhTph1cB.mjs";
+import { a as fromByfErrorPayload, c as toByfErrorPayload, d as ErrorCodes, l as ByfError, o as isByfError, r as normalizeWorkDir, s as makeErrorPayload, t as SessionStore, u as BYF_ERROR_INFO } from "./store-7tEWsiOk.mjs";
 import { a as resolveWireMigrations, n as isNewerWireVersion, r as migrateWireRecord, t as AGENT_WIRE_PROTOCOL_VERSION } from "./migration-Bg8uYnT_.mjs";
 import { createRequire } from "node:module";
-import { createHash, randomBytes, randomInt, randomUUID } from "node:crypto";
+import { createHash, randomBytes, randomUUID } from "node:crypto";
 import * as nativePath from "node:path";
 import path, { basename, dirname, join, posix, relative, resolve } from "node:path";
-import { APIConnectionError, APIContextOverflowError, APIEmptyResponseError, APIStatusError, APITimeoutError, UNKNOWN_CAPABILITY, addUsage, createProvider, createToolMessage, emptyUsage, generate, inputTotal } from "@byfriends/kosong";
+import { APIConnectionError, APIContextOverflowError, APIEmptyResponseError, APIStatusError, APITimeoutError, UNKNOWN_CAPABILITY, addUsage, cacheHitRate, createProvider, createToolMessage, emptyUsage, generate, inputTotal } from "@byfriends/kosong";
 import { access, appendFile, chmod, mkdir, mkdtemp, open, readFile, readdir, rename, rm, stat, unlink } from "node:fs/promises";
 import * as nodeFs from "node:fs";
 import { appendFileSync, chmodSync, closeSync, constants, createReadStream, createWriteStream, existsSync, fsyncSync, mkdirSync, openSync, promises, readFileSync, renameSync, statSync, unlinkSync, writeSync } from "node:fs";
@@ -21,7 +21,7 @@ import { pipeline } from "node:stream/promises";
 import { extract } from "tar";
 import { fromBuffer } from "yauzl";
 import { StringDecoder } from "node:string_decoder";
-import { createControlledPromise, objectMap, sleep, uniq } from "@antfu/utils";
+import { createControlledPromise, objectMap, sleep } from "@antfu/utils";
 import * as retry from "retry";
 import { spawn } from "node:child_process";
 import Ajv from "ajv";
@@ -118,7 +118,7 @@ function redactCtx(ctx) {
 	};
 	return walk(ctx, 0);
 }
-function truncate$1(value, max) {
+function truncate(value, max) {
 	return value.length <= max ? value : value.slice(0, max - 1) + ELLIPSIS;
 }
 function serializeValue(raw) {
@@ -142,7 +142,7 @@ function quote(value) {
 	return `"${value.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"").replaceAll("\n", "\\n")}"`;
 }
 function formatPair(key, raw) {
-	const limited = truncate$1(serializeValue(raw), CTX_VALUE_MAX_CHARS);
+	const limited = truncate(serializeValue(raw), CTX_VALUE_MAX_CHARS);
 	return `${SAFE_KEY_RE.test(key) ? key : quote(key)}=${/[\s="\\]/.test(limited) || limited.length === 0 ? quote(limited) : limited}`;
 }
 function clipBytes(text, maxBytes) {
@@ -166,7 +166,7 @@ function indentStack(stack) {
 function formatEntry(entry, options = {}) {
 	const ctx = entry.ctx ? redactCtx(entry.ctx) : void 0;
 	const omitContextKeys = new Set(options.omitContextKeys ?? []);
-	const msg = truncate$1(entry.msg, 200);
+	const msg = truncate(entry.msg, 200);
 	const pairs = [];
 	if (ctx) for (const [k, v] of Object.entries(ctx)) {
 		if (omitContextKeys.has(k)) continue;
@@ -813,85 +813,6 @@ const RawAgentProfileSchema = z.object({
 	whenToUse: z.string().optional(),
 	subagents: z.record(z.string(), RawSubagentProfileSchema).optional()
 });
-async function collectEntries(kaos, dirPath, maxWidth, pathClass) {
-	const all = [];
-	try {
-		for await (const fullPath of kaos.iterdir(dirPath)) {
-			const name = basename$1(fullPath, pathClass);
-			let isDir = false;
-			try {
-				isDir = ((await kaos.stat(fullPath)).stMode & 61440) === 16384;
-			} catch {}
-			all.push({
-				name,
-				isDir
-			});
-		}
-	} catch {
-		return {
-			entries: [],
-			total: 0,
-			readable: false
-		};
-	}
-	all.sort((a, b) => {
-		if (a.isDir !== b.isDir) return a.isDir ? -1 : 1;
-		return a.name.localeCompare(b.name);
-	});
-	return {
-		entries: all.slice(0, maxWidth),
-		total: all.length,
-		readable: true
-	};
-}
-function pathMod$5(pathClass) {
-	return pathClass === "win32" ? win32Path : posixPath;
-}
-function basename$1(p, pathClass) {
-	return pathMod$5(pathClass).basename(p);
-}
-/**
-* Return a 2-level tree listing of `workDir` suitable for inclusion in a
-* tool error message. Returns `"(empty directory)"` if the directory is
-* empty, or an error marker line if the directory itself is unreadable.
-*/
-async function listDirectory(kaos, workDir) {
-	const lines = [];
-	const pathClass = kaos.pathClass();
-	const { entries, total, readable } = await collectEntries(kaos, workDir, 30, pathClass);
-	if (!readable) return "[not readable]";
-	const remaining = total - entries.length;
-	for (let i = 0; i < entries.length; i++) {
-		const entry = entries[i];
-		if (entry === void 0) continue;
-		const { name, isDir } = entry;
-		const isLast = i === entries.length - 1 && remaining === 0;
-		const connector = isLast ? "└── " : "├── ";
-		if (isDir) {
-			lines.push(`${connector}${name}/`);
-			const childPrefix = isLast ? "    " : "│   ";
-			const child = await collectEntries(kaos, joinPath$1(workDir, name, pathClass), 10, pathClass);
-			if (!child.readable) {
-				lines.push(`${childPrefix}└── [not readable]`);
-				continue;
-			}
-			const childRemaining = child.total - child.entries.length;
-			for (let j = 0; j < child.entries.length; j++) {
-				const ce = child.entries[j];
-				if (ce === void 0) continue;
-				const cConnector = j === child.entries.length - 1 && childRemaining === 0 ? "└── " : "├── ";
-				const suffix = ce.isDir ? "/" : "";
-				lines.push(`${childPrefix}${cConnector}${ce.name}${suffix}`);
-			}
-			if (childRemaining > 0) lines.push(`${childPrefix}└── ... and ${String(childRemaining)} more`);
-		} else lines.push(`${connector}${name}`);
-	}
-	if (remaining > 0) lines.push(`└── ... and ${String(remaining)} more entries`);
-	return lines.length > 0 ? lines.join("\n") : "(empty directory)";
-}
-function joinPath$1(parent, child, pathClass) {
-	return pathMod$5(pathClass).join(parent, child);
-}
 //#endregion
 //#region src/profile/context.ts
 const AGENTS_MD_MAX_BYTES = 32 * 1024;
@@ -902,11 +823,9 @@ function resolveSystemPromptCwd(kaos, cwd) {
 }
 async function prepareSystemPromptContext(kaos, cwd) {
 	const resolvedCwd = resolveSystemPromptCwd(kaos, cwd);
-	const [cwdListing, agentsMd] = await Promise.all([listDirectory(kaos, resolvedCwd), loadAgentsMd(kaos, resolvedCwd)]);
 	return {
 		cwd: resolvedCwd,
-		cwdListing,
-		agentsMd
+		agentsMd: await loadAgentsMd(kaos, resolvedCwd)
 	};
 }
 async function loadAgentsMd(kaos, workDir) {
@@ -923,17 +842,17 @@ async function loadAgentsMd(kaos, workDir) {
 		return true;
 	};
 	const home = kaos.gethome();
-	await collect(joinPath(kaos, home, ".byf", "AGENTS.md"));
-	const genericFiles = [joinPath(kaos, home, ".agents")].flatMap((dir) => ["AGENTS.md", "agents.md"].map((name) => joinPath(kaos, dir, name)));
+	await collect(joinPath$2(kaos, home, ".byf", "AGENTS.md"));
+	const genericFiles = [joinPath$2(kaos, home, ".agents")].flatMap((dir) => ["AGENTS.md", "agents.md"].map((name) => joinPath$2(kaos, dir, name)));
 	for (const file of genericFiles) if (await collect(file)) break;
 	for (const dir of dirs) {
-		await collect(joinPath(kaos, dir, ".byf", "AGENTS.md"));
-		for (const fileName of ["AGENTS.md", "agents.md"]) if (await collect(joinPath(kaos, dir, fileName))) break;
+		await collect(joinPath$2(kaos, dir, ".byf", "AGENTS.md"));
+		for (const fileName of ["AGENTS.md", "agents.md"]) if (await collect(joinPath$2(kaos, dir, fileName))) break;
 	}
 	return renderAgentFiles(discovered);
 }
 async function findProjectRoot$1(kaos, workDir) {
-	const path = pathMod$4(kaos);
+	const path = pathMod$6(kaos);
 	const initial = kaos.normpath(workDir);
 	let current = initial;
 	while (true) {
@@ -944,7 +863,7 @@ async function findProjectRoot$1(kaos, workDir) {
 	}
 }
 function dirsRootToLeaf(kaos, workDir, projectRoot) {
-	const path = pathMod$4(kaos);
+	const path = pathMod$6(kaos);
 	const dirs = [];
 	let current = kaos.normpath(workDir);
 	while (true) {
@@ -1019,10 +938,10 @@ function byteLength(text) {
 function annotationFor(path) {
 	return `<!-- From: ${path} -->\n`;
 }
-function joinPath(kaos, ...parts) {
-	return pathMod$4(kaos).join(...parts);
+function joinPath$2(kaos, ...parts) {
+	return pathMod$6(kaos).join(...parts);
 }
-function pathMod$4(kaos) {
+function pathMod$6(kaos) {
 	return kaos.pathClass() === "win32" ? win32Path : posixPath;
 }
 //#endregion
@@ -1047,6 +966,51 @@ function renderPrompt(template, vars) {
 	return env.renderString(template, vars);
 }
 //#endregion
+//#region src/utils/tokens.ts
+/**
+* Estimate token count from text using a character-based heuristic.
+*   - ASCII (~4 chars per token)
+*   - CJK and other non-ASCII (~1 char per token)
+* The estimate is transient — the next LLM call returns the real count
+* and supersedes this value. Used to keep `tokenCountWithPending`
+* monotonic between LLM round-trips without paying for a tokenizer.
+*/
+function estimateTokens(text) {
+	let asciiCount = 0;
+	let nonAsciiCount = 0;
+	for (const char of text) if (char.codePointAt(0) <= 127) asciiCount++;
+	else nonAsciiCount++;
+	return Math.ceil(asciiCount / 4) + nonAsciiCount;
+}
+function estimateTokensForMessages(messages) {
+	let total = 0;
+	for (const message of messages) total += estimateTokensForMessage(message);
+	return total;
+}
+function estimateTokensForTools(tools) {
+	let total = 0;
+	for (const tool of tools) {
+		total += estimateTokens(tool.name);
+		total += estimateTokens(tool.description);
+		total += estimateTokens(JSON.stringify(tool.parameters));
+	}
+	return total;
+}
+function estimateTokensForMessage(message) {
+	let total = estimateTokens(message.role);
+	for (const part of message.content) total += estimateTokensForContentPart(part);
+	if (message.toolCalls !== void 0) for (const call of message.toolCalls) {
+		total += estimateTokens(call.name);
+		total += estimateTokens(JSON.stringify(call.arguments));
+	}
+	return total;
+}
+function estimateTokensForContentPart(part) {
+	if (part.type === "text") return estimateTokens(part.text);
+	else if (part.type === "think") return estimateTokens(part.think);
+	return 0;
+}
+//#endregion
 //#region src/profile/resolve.ts
 /**
 * Resolve agent profiles with extends inheritance.
@@ -1132,15 +1096,14 @@ function createSystemPromptRenderer(merged) {
 }
 function buildTemplateVars(context, promptVars) {
 	const skills = typeof context.skills === "string" ? context.skills : context.skills?.getModelSkillListing() ?? "";
-	const now = context.now instanceof Date ? context.now.toISOString() : context.now ?? (/* @__PURE__ */ new Date()).toISOString();
+	const agentsMd = context.agentsMd ?? "";
 	return {
 		...promptVars,
 		BYF_OS: context.osEnv.osKind,
 		BYF_SHELL: `${context.osEnv.shellName} (\`${context.osEnv.shellPath}\`)`,
-		BYF_NOW: now,
 		BYF_WORK_DIR: context.cwd,
-		BYF_WORK_DIR_LS: context.cwdListing ?? "",
-		BYF_AGENTS_MD: context.agentsMd ?? "",
+		BYF_AGENTS_MD: agentsMd,
+		BYF_AGENTS_MD_TOO_LONG: estimateTokens(agentsMd) > 4e3 ? "true" : "",
 		BYF_SKILLS: skills,
 		BYF_ADDITIONAL_DIRS_INFO: context.additionalDirsInfo ?? "",
 		ROLE_ADDITIONAL: context.roleAdditional ?? promptVars["ROLE_ADDITIONAL"] ?? promptVars["roleAdditional"] ?? ""
@@ -1215,13 +1178,13 @@ function normalizeSourcePath(path) {
 }
 //#endregion
 //#region src/profile/default/agent.yaml
-var agent_default$1 = "name: agent\ndescription: Default BYF agent\n\nsystemPromptPath: ./system.md\npromptVars:\n  roleAdditional: ''\n\ntools:\n  - Read\n  - Write\n  - Edit\n  - Grep\n  - Glob\n  - Bash\n  - TaskList\n  - TaskOutput\n  - TaskStop\n  - ReadMediaFile\n  - TodoList\n  - Skill\n  - WebSearch\n  - Agent\n  - FetchURL\n  - AskUserQuestion\n  - EnterPlanMode\n  - ExitPlanMode\n  - mcp__*\n\nsubagents:\n  coder:\n    description: Good at general software engineering tasks.\n  explore:\n    description: Fast codebase exploration with prompt-enforced read-only behavior.\n  plan:\n    description: Read-only implementation planning and architecture design.\n";
+var agent_default$1 = "name: agent\ndescription: Default BYF agent\n\nsystemPromptPath: ./system.md\npromptVars:\n  roleAdditional: ''\n\ntools:\n  - Read\n  - Write\n  - Edit\n  - Grep\n  - Glob\n  - Bash\n  - TaskList\n  - TaskOutput\n  - TaskStop\n  - ReadMediaFile\n  - TodoList\n  - Skill\n  - WebSearch\n  - Agent\n  - FetchURL\n  - AskUserQuestion\n  - mcp__*\n\nsubagents:\n  coder:\n    description: Good at general software engineering tasks.\n  explore:\n    description: Fast codebase exploration with prompt-enforced read-only behavior.\n";
 //#endregion
 //#region src/profile/default/coder.yaml
-var coder_default = "extends: agent\nname: coder\npromptVars:\n  roleAdditional: |\n    You are now running as a subagent. All the `user` messages are sent by the main agent. The main agent cannot see your context, it can only see your last message when you finish the task. You must treat the parent agent as your caller. Do not directly ask the end user questions. If something is unclear, explain the ambiguity in your final summary to the parent agent.\nwhenToUse: |\n  Use this agent for non-trivial software engineering work that may require reading files, editing code, running commands, and returning a compact but technically complete summary to the parent agent.\ntools:\n  - Bash\n  - Read\n  - ReadMediaFile\n  - Glob\n  - Grep\n  - Write\n  - Edit\n  - WebSearch\n  - FetchURL\n  - mcp__*\n";
+var coder_default = "extends: agent\nname: coder\npromptVars:\n  roleAdditional: |\n    You are operating as a subagent instance. The main BYF agent spawned you to handle a specific task. All user messages come from the main agent — it cannot see your context and will only see your final result when you finish. Do not address the end user directly. If something is unclear, explain the ambiguity in your summary to the parent agent.\nwhenToUse: |\n  Use this agent for non-trivial software engineering work that may require reading files, editing code, running commands, and returning a compact but technically complete summary to the parent agent.\ntools:\n  - Bash\n  - Read\n  - ReadMediaFile\n  - Glob\n  - Grep\n  - Write\n  - Edit\n  - WebSearch\n  - FetchURL\n  - mcp__*\n";
 //#endregion
 //#region src/profile/default/explore.yaml
-var explore_default = "extends: agent\nname: explore\npromptVars:\n  roleAdditional: |\n    You are now running as a subagent. All the `user` messages are sent by the main agent. The main agent cannot see your context, it can only see your last message when you finish the task. You must treat the parent agent as your caller. Do not directly ask the end user questions. If something is unclear, explain the ambiguity in your final summary to the parent agent.\n\n    You are a codebase exploration specialist. Your role is EXCLUSIVELY to search, read, and analyze existing code and resources. You do NOT have access to file editing tools.\n\n    Your strengths:\n    - Rapidly finding files using glob patterns\n    - Searching code and text with powerful regex patterns\n    - Reading and analyzing file contents\n    - Running read-only shell commands (git log, git diff, ls, find, etc.)\n\n    Guidelines:\n    - Use Glob for broad file pattern matching. Patterns MUST contain a literal anchor (extension or subdirectory); pure wildcards like `*` or `**/*` are rejected by the tool.\n    - Use Grep for searching file contents with regex\n    - Use Read when you know the specific file path\n    - Use Bash ONLY for read-only operations (ls, git status, git log, git diff, find)\n    - NEVER use Bash for any file creation or modification commands\n    - Adapt your search depth based on the thoroughness level specified by the caller\n    - Wherever possible, spawn multiple parallel tool calls for grepping and reading files to maximize speed\n\n    If the prompt includes a <git-context> block, use it to orient yourself about the repository state before starting your investigation.\n\n    You are meant to be a fast agent. Complete the search request efficiently and report your findings clearly in a structured format.\nwhenToUse: |\n  Fast agent specialized for exploring codebases. Use this when you need to quickly find files by patterns (e.g. \"src/**/*.yaml\"), search code for keywords (e.g. \"database connection\"), or answer questions about the codebase (e.g. \"how does the auth module work?\"). When calling this agent, specify the desired thoroughness level: \"quick\" for basic searches, \"medium\" for moderate exploration, or \"thorough\" for comprehensive analysis across multiple locations and naming conventions. Use this agent for any read-only exploration that will clearly require more than 3 search queries. Prefer launching multiple explore agents concurrently when investigating independent questions.\ntools:\n  - Bash\n  - Read\n  - ReadMediaFile\n  - Glob\n  - Grep\n  - WebSearch\n  - FetchURL\n";
+var explore_default = "extends: agent\nname: explore\npromptVars:\n  roleAdditional: |\n    You are operating as a subagent instance. The main BYF agent spawned you to handle a specific task. All user messages come from the main agent — it cannot see your context and will only see your final result when you finish. Do not address the end user directly. If something is unclear, explain the ambiguity in your summary to the parent agent.\n\n    You are a codebase exploration specialist. Your role is EXCLUSIVELY to search, read, and analyze existing code and resources. You do NOT have access to file editing tools.\n\n    Your strengths:\n    - Rapidly finding files using glob patterns\n    - Searching code and text with powerful regex patterns\n    - Reading and analyzing file contents\n    - Running read-only shell commands (git log, git diff, ls, find, etc.)\n\n    Guidelines:\n    - Use Glob for broad file pattern matching. Patterns MUST contain a literal anchor (extension or subdirectory); pure wildcards like `*` or `**/*` are rejected by the tool.\n    - Use Grep for searching file contents with regex\n    - Use Read when you know the specific file path\n    - Use Bash ONLY for read-only operations (ls, git status, git log, git diff, find)\n    - NEVER use Bash for any file creation or modification commands\n    - Adapt your search depth based on the thoroughness level specified by the caller\n    - Wherever possible, spawn multiple parallel tool calls for grepping and reading files to maximize speed\n\n    If the prompt includes a <git-context> block, use it to orient yourself about the repository state before starting your investigation.\n\n    You are meant to be a fast agent. Complete the search request efficiently and report your findings clearly in a structured format.\nwhenToUse: |\n  Fast agent specialized for exploring codebases. Use this when you need to quickly find files by patterns (e.g. \"src/**/*.yaml\"), search code for keywords (e.g. \"database connection\"), or answer questions about the codebase (e.g. \"how does the auth module work?\"). When calling this agent, specify the desired thoroughness level: \"quick\" for basic searches, \"medium\" for moderate exploration, or \"thorough\" for comprehensive analysis across multiple locations and naming conventions. Use this agent for any read-only exploration that will clearly require more than 3 search queries. Prefer launching multiple explore agents concurrently when investigating independent questions.\ntools:\n  - Bash\n  - Read\n  - ReadMediaFile\n  - Glob\n  - Grep\n  - WebSearch\n  - FetchURL\n";
 //#endregion
 //#region src/profile/default/init.md
 var init_default = "You are a software engineering expert with many years of programming experience. Please explore the current project directory to understand the project's architecture and main details.\n\nTask requirements:\n1. Analyze the project structure and identify key configuration files (such as pyproject.toml, package.json, Cargo.toml, etc.).\n2. Understand the project's technology stack, build process and runtime architecture.\n3. Identify how the code is organized and main module divisions.\n4. Discover project-specific development conventions, testing strategies, and deployment processes.\n\nAfter the exploration, you should do a thorough summary of your findings and overwrite it into `AGENTS.md` file in the project root. You need to refer to what is already in the file when you do so.\n\nFor your information, `AGENTS.md` is a file intended to be read by AI coding agents. Expect the reader of this file know nothing about the project.\n\nYou should compose this file according to the actual project content. Do not make any assumptions or generalizations. Ensure the information is accurate and useful. You must use the natural language that is mainly used in the project's comments and documentation.\n\nPopular sections that people usually write in `AGENTS.md` are:\n\n- Project overview\n- Build and test commands\n- Code style guidelines\n- Testing instructions\n- Security considerations\n";
@@ -1231,15 +1194,13 @@ const PROFILE_SOURCES = {
 	"profile/default/agent.yaml": agent_default$1,
 	"profile/default/coder.yaml": coder_default,
 	"profile/default/explore.yaml": explore_default,
-	"profile/default/plan.yaml": "extends: agent\nname: plan\npromptVars:\n  roleAdditional: |\n    You are now running as a subagent. All the `user` messages are sent by the main agent. The main agent cannot see your context, it can only see your last message when you finish the task. You must treat the parent agent as your caller. Do not directly ask the end user questions. If something is unclear, explain the ambiguity in your final summary to the parent agent.\n\n    Before designing your implementation plan, consider whether you fully understand the codebase areas relevant to the task. If not, recommend the parent agent to use the explore agent (subagent_type=\"explore\") to investigate key questions first. In your response, clearly state:\n    1. What you already know from the information provided\n    2. What questions remain unanswered that would benefit from explore agent investigation\n    3. Your implementation plan (either preliminary if questions remain, or final if sufficient context exists)\nwhenToUse: |\n  Use this agent when the parent agent needs a step-by-step implementation plan, key file identification, and architectural trade-off analysis before code changes are made.\ntools:\n  - Read\n  - ReadMediaFile\n  - Glob\n  - Grep\n  - WebSearch\n  - FetchURL\n",
-	"profile/default/system.md": "You are BYF, an interactive general AI agent running on a user's computer.\n\nYour primary goal is to help users with software engineering tasks by taking action — use the tools available to you to make real changes on the user's system. You should also answer questions when asked. Always adhere strictly to the following system instructions and the user's requirements.\n\n{{ ROLE_ADDITIONAL }}\n\n# Prompt and Tool Use\n\nThe user's messages may contain questions and/or task descriptions in natural language, code snippets, logs, file paths, or other forms of information. Read them, understand them and do what the user requested. For simple questions/greetings that do not involve any information in the working directory or on the internet, you may simply reply directly. For anything else, default to taking action with tools. When the request could be interpreted as either a question to answer or a task to complete, treat it as a task.\n\nWhen handling the user's request, if it involves creating, modifying, or running code or files, you MUST use the appropriate tools (e.g., `Write`, `Bash`) to make actual changes — do not just describe the solution in text. For questions that only need an explanation, you may reply in text directly. When calling tools, do not provide explanations because the tool calls themselves should be self-explanatory. You MUST follow the description of each tool and its parameters when calling tools.\n\nIf the `Agent` tool is available, you can use it to delegate a focused subtask to a subagent instance. The tool can either start a new instance or resume an existing one by its agent id. Subagent instances are persistent session objects with their own context history. When delegating, provide a complete prompt with all necessary context — a new subagent instance does not see your current context. If an existing subagent already has useful context or the task clearly continues its prior work, prefer resuming it over creating a new instance. Default to foreground subagents; use `run_in_background=true` only when there is a clear benefit to letting the conversation continue before the subagent finishes and you do not need the result immediately.\n\nYou have the capability to output any number of tool calls in a single response. If you anticipate making multiple non-interfering tool calls, you are HIGHLY RECOMMENDED to make them in parallel to significantly improve efficiency. This is very important to your performance.\n\nThe results of the tool calls will be returned to you in a tool message. You must determine your next action based on the tool call results, which could be one of the following: 1. Continue working on the task, 2. Inform the user that the task is completed or has failed, or 3. Ask the user for more information.\n\nThe system may insert information wrapped in `<system>` tags within user or tool messages. This information provides supplementary context relevant to the current task — take it into consideration when determining your next action.\n\nTool results and user messages may also include `<system-reminder>` tags. Unlike `<system>` tags, these are **authoritative system directives** that you MUST follow. They bear no direct relation to the specific tool results or user messages in which they appear. Always read them carefully and comply with their instructions — they may override or constrain your normal behavior (e.g., restricting you to read-only actions during plan mode).\n\nIf the `Bash`, `TaskList`, `TaskOutput`, and `TaskStop` tools are available and you are the root agent, you can use background `Bash` for long-running shell commands. Launch it via `Bash` with `run_in_background=true` and a short `description`. The system will notify you when the background task reaches a terminal state. Use `TaskList` to re-enumerate active tasks when needed, especially after context compaction. Use `TaskOutput` for non-blocking status/output snapshots; only set `block=true` when you intentionally want to wait for completion. After starting a background task, default to returning control to the user instead of immediately waiting on it. Use `TaskStop` only when you need to cancel the task. For human users in the interactive shell, the only task-management slash command is `/tasks`. Do not tell users to run `/task`, `/tasks list`, `/tasks output`, `/tasks stop`, or any other invented slash subcommands. If you are a subagent or these tools are not available, do not assume you can create or control background tasks.\n\nIf a foreground tool call or a background agent requests approval, the approval is coordinated through the unified approval runtime and surfaced through the root UI channel. Do not assume approvals are local to a single subagent turn.\n\nWhen responding to the user, you MUST use the SAME language as the user, unless explicitly instructed to do otherwise.\n\n# General Guidelines for Coding\n\nWhen building something from scratch, you should:\n\n- Understand the user's requirements.\n- Ask the user for clarification if there is anything unclear.\n- Design the architecture and make a plan for the implementation.\n- Write the code in a modular and maintainable way.\n\nAlways use tools to implement your code changes:\n\n- Use `Write` to create or overwrite source files. Code that only appears in your text response is NOT saved to the file system and will not take effect.\n- Use `Bash` to run and test your code after writing it.\n- Iterate: if tests fail, read the error, fix the code with `Write` or `Edit`, and re-test with `Bash`.\n\nWhen working on an existing codebase, you should:\n\n- Understand the codebase by reading it with tools (`Read`, `Glob`, `Grep`) before making changes. Identify the ultimate goal and the most important criteria to achieve the goal.\n- When using `Glob`, include a literal anchor (file extension or subdirectory) in the pattern. Pure wildcards like `*` or `**/*` are rejected by the tool.\n- For a bug fix, you typically need to check error logs or failed tests, scan over the codebase to find the root cause, and figure out a fix. If user mentioned any failed tests, you should make sure they pass after the changes.\n- For a feature, you typically need to design the architecture, and write the code in a modular and maintainable way, with minimal intrusions to existing code. Add new tests if the project already has tests.\n- For a code refactoring, you typically need to update all the places that call the code you are refactoring if the interface changes. DO NOT change any existing logic especially in tests, focus only on fixing any errors caused by the interface changes.\n- Make MINIMAL changes to achieve the goal. This is very important to your performance.\n- Follow the coding style of existing code in the project.\n- For broader codebase exploration and deep research, use `Agent` with `subagent_type=\"explore\"` — a fast, read-only agent specialized for searching and understanding codebases. Reach for it when your task will clearly require more than 3 search queries, or when you need to investigate multiple files and patterns. Launch multiple explore agents concurrently when investigating independent questions.\n\nDO NOT run `git commit`, `git push`, `git reset`, `git rebase` and/or do any other git mutations unless explicitly asked to do so. Ask for confirmation each time when you need to do git mutations, even if the user has confirmed in earlier conversations.\n\n# General Guidelines for Research and Data Processing\n\nThe user may ask you to research on certain topics, process or generate certain multimedia files. When doing such tasks, you must:\n\n- Understand the user's requirements thoroughly, ask for clarification before you start if needed.\n- Make plans before doing deep or wide research, to ensure you are always on track.\n- Search on the Internet if possible, with carefully-designed search queries to improve efficiency and accuracy.\n- Use proper tools or shell commands or Python packages to process or generate images, videos, PDFs, docs, spreadsheets, presentations, or other multimedia files. Detect if there are already such tools in the environment. If you have to install third-party tools/packages, you MUST ensure that they are installed in a virtual/isolated environment.\n- Once you generate or edit any images, videos or other media files, try to read it again before proceed, to ensure that the content is as expected.\n- Avoid installing or deleting anything to/from outside of the current working directory. If you have to do so, ask the user for confirmation.\n\n# Working Environment\n\n## Operating System\n\nYou are running on **{{ BYF_OS }}**. The Bash tool executes commands using **{{ BYF_SHELL }}**.\n{% if BYF_OS == \"Windows\" %}\n\nIMPORTANT: You are on Windows. The Bash tool runs through Git Bash, so use Unix shell syntax inside Bash commands — `/dev/null` not `NUL`, and forward slashes in paths. For file operations, always prefer the built-in tools (Read, Write, Edit, Glob, Grep) over Bash commands — they work reliably across all platforms.\n{% endif %}\n\nThe operating environment is not in a sandbox. Any actions you do will immediately affect the user's system. So you MUST be extremely cautious. Unless being explicitly instructed to do so, you should never access (read/write/execute) files outside of the working directory.\n\n## Date and Time\n\nThe current date and time in ISO format is `{{ BYF_NOW }}`. This is only a reference for you when searching the web, or checking file modification time, etc. If you need the exact time, use Bash tool with proper command.\n\n## Working Directory\n\nThe current working directory is `{{ BYF_WORK_DIR }}`. This should be considered as the project root if you are instructed to perform tasks on the project. Every file system operation will be relative to the working directory if you do not explicitly specify the absolute path. Tools may require absolute paths for some parameters, IF SO, YOU MUST use absolute paths for these parameters.\n\nThe directory listing of current working directory is:\n\n```\n{{ BYF_WORK_DIR_LS }}\n```\n\nUse this as your basic understanding of the project structure. The tree only shows the first two levels; entries marked \"... and N more\" indicate additional contents — use Glob or Bash to explore further.\n{% if BYF_ADDITIONAL_DIRS_INFO %}\n\n## Additional Directories\n\nThe following directories have been added to the workspace. You can read, write, search, and glob files in these directories as part of your workspace scope.\n\n{{ BYF_ADDITIONAL_DIRS_INFO }}\n{% endif %}\n\n# Project Information\n\nMarkdown files named `AGENTS.md` usually contain the background, structure, coding styles, user preferences and other relevant information about the project. You should use this information to understand the project and the user's preferences. `AGENTS.md` files may exist at different locations in the project, but typically there is one in the project root.\n\n> Why `AGENTS.md`?\n>\n> `README.md` files are for humans: quick starts, project descriptions, and contribution guidelines. `AGENTS.md` complements this by containing the extra, sometimes detailed context coding agents need: build steps, tests, and conventions that might clutter a README or aren’t relevant to human contributors.\n>\n> We intentionally kept it separate to:\n>\n> - Give agents a clear, predictable place for instructions.\n> - Keep `README`s concise and focused on human contributors.\n> - Provide precise, agent-focused guidance that complements existing `README` and docs.\n\nThe `AGENTS.md` instructions (merged from all applicable directories):\n\n`````````\n{{ BYF_AGENTS_MD }}\n`````````\n\n`AGENTS.md` files can appear at any level of the project directory tree, including inside `.byf/` directories. Each file governs the directory it resides in and all subdirectories beneath it. When multiple `AGENTS.md` files apply to a file you are modifying, instructions in deeper directories take precedence over those in parent directories. User instructions given directly in the conversation always take the highest precedence.\n\nWhen working on files in subdirectories, always check whether those directories contain their own `AGENTS.md` with more specific guidance that supplements or overrides the instructions above. You may also check `README`/`README.md` files for more information about the project.\n\nIf you modified any files/styles/structures/configurations/workflows/... mentioned in `AGENTS.md` files, you MUST update the corresponding `AGENTS.md` files to keep them up-to-date.\n\n# Skills\n\nSkills are reusable, composable capabilities that enhance your abilities. Each skill is either a self-contained directory with a `SKILL.md` file or a standalone `.md` file that contains instructions, examples, and/or reference material.\n\n## What are skills?\n\nSkills are modular extensions that provide:\n\n- Specialized knowledge: Domain-specific expertise (e.g., PDF processing, data analysis)\n- Workflow patterns: Best practices for common tasks\n- Tool integrations: Pre-configured tool chains for specific operations\n- Reference material: Documentation, templates, and examples\n\n## Available skills\n\nSkills are grouped by scope (`Project`, `User`, `Extra`, `Built-in`) so you can tell where each came from. When the user refers to \"the skill in this project\" or \"the user-scope skill\", use the scope heading to disambiguate. When multiple scopes define a skill with the same name, the more specific scope takes precedence: **Project overrides User overrides Extra overrides Built-in**.\n\n{{ BYF_SKILLS }}\n\n## How to use skills\n\nIdentify the skills that are likely to be useful for the tasks you are currently working on, read the skill file for detailed instructions, guidelines, scripts and more.\n\nOnly read skill details when needed to conserve the context window.\n\n# Ultimate Reminders\n\nAt any time, you should be HELPFUL, CONCISE, and ACCURATE. Be thorough in your actions — test what you build, verify what you change — not in your explanations.\n\n- Never diverge from the requirements and the goals of the task you work on. Stay on track.\n- Never give the user more than what they want.\n- Try your best to avoid any hallucination. Do fact checking before providing any factual information.\n- Think about the best approach, then take action decisively.\n- Do not give up too early.\n- ALWAYS, keep it stupidly simple. Do not overcomplicate things.\n- When the task requires creating or modifying files, always use tools to do so. Never treat displaying code in your response as a substitute for actually writing it to the file system.\n"
+	"profile/default/system.md": "You are BYF, an AI agent running on the user's computer. Your job is to help\nusers accomplish tasks by taking action — read, write, search, and execute to\nmake real changes on the user's system. Answer questions when asked; otherwise,\nact.\n\nWhen responding, use the same language as the user unless explicitly instructed\notherwise.\n\n{{ ROLE_ADDITIONAL }}\n\n# First Principles\n\nThink from first principles. Strip away assumptions and conventions; every\naction must be traceable to a verifiable fact — the actual file contents,\ncommand output, data, or the user's explicit words. When in doubt, read\nbefore guessing, ask before assuming, verify before claiming.\n\n# Tool Use\n\nUse tools only when the task requires them. If the request can be answered\nwithout reading files, running commands, or searching the web, reply in text\ndirectly. When a request is ambiguous, prefer action — the user can see your\noutput and correct course.\n\nCode that only appears in your text response is NOT saved to the file system\nand will not take effect. To create or modify files, use `Write` or `Edit`.\nTo run commands, use `Bash`.\n\n# Protocol\n\n<system> tags in user or tool messages provide supplementary context. Treat\nthem as background information.\n\n<system-reminder> tags are authoritative directives that override default\nbehavior. They are unrelated to the messages they appear in. Always comply.\n\n# Safety\n\nThe environment is not a sandbox — your actions immediately affect the user's\nsystem.\n\n- Stay within the working directory unless explicitly instructed otherwise.\n- Git operations are destructive and may affect remote repositories. Never\n  execute git mutations unless explicitly asked; confirm each time.\n- Avoid installing or deleting anything outside the working directory. If\n  necessary, ask for confirmation first.\n\n# Working Environment\n\n## Operating System\n\nYou are running on **{{ BYF_OS }}**. The Bash tool executes commands using **{{ BYF_SHELL }}**.\n{% if BYF_OS == \"Windows\" %}\n\nIMPORTANT: You are on Windows. The Bash tool runs through Git Bash, so use Unix shell syntax inside Bash commands — `/dev/null` not `NUL`, and forward slashes in paths. For file operations, always prefer the built-in tools (Read, Write, Edit, Glob, Grep) over Bash commands — they work reliably across all platforms.\n{% endif %}\n\n## Working Directory\n\nThe current working directory is `{{ BYF_WORK_DIR }}`. This should be considered as the project root if you are instructed to perform tasks on the project. Every file system operation will be relative to the working directory if you do not explicitly specify the absolute path. Tools may require absolute paths for some parameters, IF SO, YOU MUST use absolute paths for these parameters.\n{% if BYF_ADDITIONAL_DIRS_INFO %}\n\n## Additional Directories\n\nThe following directories have been added to the workspace. You can read, write, search, and glob files in these directories as part of your workspace scope.\n\n{{ BYF_ADDITIONAL_DIRS_INFO }}\n{% endif %}\n\n# Project Information\n\n`AGENTS.md` files contain project-specific context, styles, and conventions for agents. They may exist at different locations in the project — each file governs its directory and all subdirectories beneath it. Deeper files take precedence over parent files.\n\nIf instructions conflict:\n- `<system-reminder>` directives override all other instructions, including user messages.\n- Safety rules are hard constraints and must never be violated, even if a user message or AGENTS.md says otherwise.\n- Beyond those two, user messages > AGENTS.md > default system instructions.\n\n{% if BYF_AGENTS_MD_TOO_LONG %}\n> ⚠️ The merged AGENTS.md content exceeds 4,000 tokens. Consider compressing project instructions to reduce context usage.\n{% endif %}\n\nThe `AGENTS.md` instructions (merged from all applicable directories):\n\n`````````\n{{ BYF_AGENTS_MD }}\n`````````\n\nIf you modified anything mentioned in `AGENTS.md` files, update the corresponding files to keep them up-to-date.\n\n# Skills\n\nSkills are reusable capabilities. When a skill from the listing matches the user's request, you MUST call the `Skill` tool (not free-form text).\n\n{{ BYF_SKILLS }}\n"
 };
 const DEFAULT_INIT_PROMPT = init_default;
 const DEFAULT_AGENT_PROFILES = loadAgentProfilesFromSources([
 	"agent.yaml",
 	"coder.yaml",
-	"explore.yaml",
-	"plan.yaml"
+	"explore.yaml"
 ].map((file) => `profile/default/${file}`), PROFILE_SOURCES);
 //#endregion
 //#region src/providers/request-auth.ts
@@ -1269,54 +1230,6 @@ const noopTelemetryClient = {
 	withContext: () => noopTelemetryClient,
 	setContext: () => {}
 };
-function withTelemetryContext(telemetry, patch) {
-	return telemetry.withContext?.(patch) ?? telemetry;
-}
-//#endregion
-//#region src/utils/tokens.ts
-/**
-* Estimate token count from text using a character-based heuristic.
-*   - ASCII (~4 chars per token)
-*   - CJK and other non-ASCII (~1 char per token)
-* The estimate is transient — the next LLM call returns the real count
-* and supersedes this value. Used to keep `tokenCountWithPending`
-* monotonic between LLM round-trips without paying for a tokenizer.
-*/
-function estimateTokens(text) {
-	let asciiCount = 0;
-	let nonAsciiCount = 0;
-	for (const char of text) if (char.codePointAt(0) <= 127) asciiCount++;
-	else nonAsciiCount++;
-	return Math.ceil(asciiCount / 4) + nonAsciiCount;
-}
-function estimateTokensForMessages(messages) {
-	let total = 0;
-	for (const message of messages) total += estimateTokensForMessage(message);
-	return total;
-}
-function estimateTokensForTools(tools) {
-	let total = 0;
-	for (const tool of tools) {
-		total += estimateTokens(tool.name);
-		total += estimateTokens(tool.description);
-		total += estimateTokens(JSON.stringify(tool.parameters));
-	}
-	return total;
-}
-function estimateTokensForMessage(message) {
-	let total = estimateTokens(message.role);
-	for (const part of message.content) total += estimateTokensForContentPart(part);
-	if (message.toolCalls !== void 0) for (const call of message.toolCalls) {
-		total += estimateTokens(call.name);
-		total += estimateTokens(JSON.stringify(call.arguments));
-	}
-	return total;
-}
-function estimateTokensForContentPart(part) {
-	if (part.type === "text") return estimateTokens(part.text);
-	else if (part.type === "think") return estimateTokens(part.think);
-	return 0;
-}
 //#endregion
 //#region src/loop/errors.ts
 /**
@@ -2357,7 +2270,7 @@ function closeObjectNodes(value) {
 }
 //#endregion
 //#region src/tools/background/task-list.md
-var task_list_default = "List background tasks and their current status.\n\nUse this tool to discover which background tasks exist and where each one\nstands. It is the entry point for inspecting background work: it returns a\ntask ID, status, command, description, and PID for every task it reports,\nplus the exit code and stop reason for tasks that have already finished.\n\nGuidelines:\n\n- After a context compaction, or whenever you are unsure which background\n  tasks are running or what their task IDs are, call this tool to\n  re-enumerate them instead of guessing a task ID.\n- Prefer the default `active_only=true`, which lists only non-terminal tasks.\n  Pass `active_only=false` only when you specifically need to see tasks that\n  have already finished. With `active_only=false` the result may also include\n  `lost` tasks — tasks left over from a previous process that can no longer be\n  inspected or controlled; treat them as already terminated.\n- `limit` caps how many tasks are returned. It accepts a value between 1 and\n  100 and defaults to 20 when omitted.\n- This tool only lists tasks; it does not return their output. Use it first\n  to locate the task ID you need, then call `TaskOutput` with that ID to read\n  the task's output and details.\n- This tool is read-only and does not change any state, so it is always safe\n  to call, including in plan mode.\n";
+var task_list_default = "List background tasks and their current status.\n\nUse this tool to discover which background tasks exist and where each one stands. It returns a task ID, status, command, description, and PID for each task, plus exit code and stop reason for finished tasks.\n\nGuidelines:\n- After a context compaction, or whenever you are unsure which background tasks are running, call this tool to re-enumerate them instead of guessing a task ID.\n- Prefer the default `active_only=true`, which lists only non-terminal tasks. Pass `active_only=false` only when you need to see finished tasks; the result may include `lost` tasks from a previous process.\n- `limit` caps how many tasks are returned (1-100, defaults to 20).\n- This tool only lists tasks; it does not return their output. Use it first to locate a task ID, then call `TaskOutput` with that ID.\n- This tool is read-only and safe to call at any time.\n";
 //#endregion
 //#region src/tools/background/task-list.ts
 /**
@@ -2410,7 +2323,7 @@ var TaskListTool = class {
 };
 //#endregion
 //#region src/tools/background/task-output.md
-var task_output_default = "Retrieve output from a running or completed background task.\n\nUse this after `Bash(run_in_background=true)` when you need to inspect progress or explicitly wait for completion.\n\nGuidelines:\n- Prefer relying on automatic completion notifications. Use this tool only when you need task output before the automatic notification arrives.\n- By default this tool is non-blocking and returns a current status/output snapshot.\n- Use block=true only when you intentionally want to wait for completion or timeout.\n- This tool returns structured task metadata, a fixed-size output preview, and an output_path for the full log.\n- For a terminal task, the metadata also explains why it ended: `timed_out` when an agent task was aborted by its deadline, and `stop_reason` when the task was explicitly stopped. `terminal_reason` is a categorical label for the same event — its value is `timed_out` or `stopped` — and is emitted alongside the matching `timed_out` / `stop_reason` field. A task that ended on its own emits none of these three fields.\n- The full, never-truncated log is always available at output_path; use the `Read` tool with that path to page through it, whether or not the preview was truncated.\n- This tool works with the generic background task system and should remain the primary read path for future task types, not just bash.\n";
+var task_output_default = "Retrieve output from a running or completed background task.\n\nUse this after `Bash(run_in_background=true)` when you need to inspect progress or wait for completion.\n\nGuidelines:\n- Prefer automatic completion notifications. Use this tool only when you need output before it arrives.\n- Non-blocking by default; returns a current status/output snapshot.\n- Use block=true only when you want to wait for completion or timeout.\n- Returns structured task metadata, a fixed-size output preview, and an output_path for the full log.\n- For terminal tasks, metadata includes why it ended: `timed_out` (agent deadline abort) or `stop_reason` (explicit stop), plus a categorical `terminal_reason`.\n- The full log is always available at output_path; use `Read` with that path to page through it.\n- Output preview may be truncated; use `Read` with output_path to view the full log.\n";
 //#endregion
 //#region src/tools/background/task-output.ts
 /**
@@ -2499,7 +2412,7 @@ var TaskOutputTool = class {
 };
 //#endregion
 //#region src/tools/background/task-stop.md
-var task_stop_default = "Stop a running background task.\n\nOnly use this when a task must genuinely be cancelled — for a task that is\nfinishing normally, wait for its completion notification or inspect it with\n`TaskOutput` instead of stopping it.\n\nGuidelines:\n- This is a general-purpose stop capability for any background task. It is not\n  a bash-specific kill.\n- Stopping a task is destructive: it may leave partial side effects behind.\n  Use it with care.\n- If the task has already finished, this tool simply returns its current\n  status.\n";
+var task_stop_default = "Stop a running background task.\n\nOnly use this when a task must genuinely be cancelled — for a task that is finishing normally, wait for its completion notification or inspect it with `TaskOutput` instead.\n\nGuidelines:\n- General-purpose stop for any background task, not a bash-specific kill.\n- Stopping a task is destructive and may leave partial side effects behind. Use it with care.\n- If the task has already finished, this tool returns its current status.\n";
 //#endregion
 //#region src/tools/background/task-stop.ts
 /**
@@ -2693,7 +2606,7 @@ var agent_background_disabled_default = "Background agent execution is disabled
 var agent_background_enabled_default = "When `run_in_background=true`, the subagent runs detached from this turn. The completion arrives in a later turn as a synthetic user-role message containing its result — you do not need to poll, sleep, or check on its progress. Continue with other work or respond to the user. Never fabricate or predict what the result will say.\n\nFor a background task, when `timeout` is omitted it falls back to the operator-configured background timeout, if one is set. If the operator has not configured a background timeout, an omitted `timeout` means the task runs with no time limit.\n";
 //#endregion
 //#region src/tools/builtin/collaboration/agent.md
-var agent_default = "Launch a subagent to handle a task. The subagent runs as a same-process loop instance with its own context and wire file.\n\nWriting the prompt:\n- The subagent starts with zero context — it has not seen this conversation. Brief it like a colleague who just walked into the room: state the goal, list what you already know, hand over the specifics.\n- Lookups (read this file, run that test): put the exact path or command in the prompt. The subagent should not have to search for things you already know.\n- Investigations (figure out X, find why Y): give the question, not prescribed steps — fixed steps become dead weight when the premise is wrong.\n- Do not delegate understanding. If the task hinges on a file path or line number, find it yourself first and write it into the prompt.\n\nUsage notes:\n- When the task continues earlier work a subagent already did, prefer resuming that agent (pass its `resume` id) over spawning a fresh instance — the resumed agent keeps its prior context.\n- A subagent's result is only visible to you, not to the user. When the user needs to see what a subagent produced, summarize the relevant parts yourself in your own reply.\n\nWhen NOT to use Agent: skip delegation for trivial work you can do directly — reading a file whose path you already know, searching a small known set of files, or any task that takes only a step or two. Delegation has a context-handoff cost; it pays off only when the task is substantial enough to outweigh it.\n\nOnce a subagent is running, leave that scope to it: do not redo its searches or reads in parallel, and do not abandon it midway and finish the job manually. Both undo the context savings the delegation was meant to buy.";
+var agent_default = "Launch a subagent to handle a task. The subagent starts with zero context — it has not seen this conversation. Brief it with the goal, what you already know, and exact paths or commands.\n\n- When the task continues earlier work a subagent already did, prefer resuming that agent (pass its `resume` id) over spawning a fresh instance.\n- A subagent's result is only visible to you, not to the user. Summarize the relevant parts yourself when the user needs to see them.\n- Skip delegation for trivial work you can do directly — reading a known file, searching a small set of files, or any one-step task.\n- Once a subagent is running, do not redo its searches or reads in parallel, and do not abandon it midway and finish the job manually.\n";
 //#endregion
 //#region src/tools/builtin/collaboration/agent.ts
 /**
@@ -2910,14 +2823,12 @@ function buildSubagentDescriptions(subagents) {
 	if (subagents === void 0) return "";
 	return Object.entries(subagents).map(([name, subagent]) => {
 		const details = [subagent.description, subagent.whenToUse].filter((part) => part !== void 0 && part.length > 0);
-		const header = details.length === 0 ? `- ${name}` : `- ${name}: ${details.join(" ")}`;
-		if (subagent.tools.length === 0) return header;
-		return `${header}\n  Tools: ${subagent.tools.join(", ")}`;
+		return details.length === 0 ? `- ${name}` : `- ${name}: ${details.join(" ")}`;
 	}).join("\n");
 }
 //#endregion
 //#region src/tools/builtin/collaboration/ask-user.md
-var ask_user_default = "Use this tool when you need to ask the user questions with structured options during execution. This allows you to:\n1. Collect user preferences or requirements before proceeding\n2. Resolve ambiguous or underspecified instructions\n3. Let the user decide between implementation approaches as you work\n4. Present concrete options when multiple valid directions exist\n\n**When NOT to use:**\n- When you can infer the answer from context — be decisive and proceed\n- Trivial decisions that don't materially affect the outcome\n\nOverusing this tool interrupts the user's flow. Only use it when the user's input genuinely changes your next action.\n\n**Usage notes:**\n- Users always have an \"Other\" option for custom input — don't create one yourself\n- Use multi_select to allow multiple answers to be selected for a question\n- Keep option labels concise (1-5 words), use descriptions for trade-offs and details\n- Each question should have 2-4 meaningful, distinct options\n- You can ask 1-4 questions at a time; group related questions to minimize interruptions\n- If you recommend a specific option, list it first and append \"(Recommended)\" to its label";
+var ask_user_default = "Use this tool ONLY to present structured multiple-choice questions to the user. Use it to collect preferences, resolve ambiguity, or present options when multiple valid directions exist.\n\n**When NOT to use:**\n- For simple greetings, direct questions, or casual conversation — reply in text instead\n- When you can infer the answer from context — be decisive and proceed\n- Trivial decisions that don't materially affect the outcome\n\nOnly use this tool when the user's input genuinely changes your next action.\n\n**Usage notes:**\n- Users always have an \"Other\" option — don't create one yourself\n- Use multi_select to allow multiple answers per question\n- Keep option labels concise (1-5 words), use descriptions for trade-offs\n- Each question needs 2-4 meaningful, distinct options\n- Ask 1-4 questions at a time; group related questions to minimize interruptions\n- If you recommend an option, list it first and append \"(Recommended)\" to its label\n";
 //#endregion
 //#region src/tools/builtin/collaboration/ask-user.ts
 /**
@@ -3458,7 +3369,6 @@ function isWithin(child, parent) {
 }
 //#endregion
 //#region src/skill/registry.ts
-const LISTING_DESC_MAX = 250;
 var SkillRegistry = class {
 	byName = /* @__PURE__ */ new Map();
 	roots = [];
@@ -3560,13 +3470,7 @@ function formatFullSkill(skill) {
 	];
 }
 function formatModelSkill(skill) {
-	const lines = [`- ${skill.name}: ${truncate(skill.description, LISTING_DESC_MAX)}`];
-	if (typeof skill.metadata.whenToUse === "string" && skill.metadata.whenToUse.length > 0) lines.push(`  When to use: ${skill.metadata.whenToUse}`);
-	lines.push(`  Path: ${skill.path}`);
-	return lines;
-}
-function truncate(value, max) {
-	return value.length > max ? value.slice(0, max) : value;
+	return [`- ${skill.name}: ${skill.description}`];
 }
 //#endregion
 //#region src/tools/builtin/collaboration/skill-tool.md
@@ -3695,14 +3599,14 @@ const SENSITIVE_DOT_VARIANT_SUFFIXES = [
 ];
 const SENSITIVE_DOT_VARIANT_SUFFIX_SET = new Set(SENSITIVE_DOT_VARIANT_SUFFIXES);
 const DEFAULT_PATH_CLASS$1 = nativePath.sep === "\\" ? "win32" : "posix";
-function pathMod$3(pathClass) {
+function pathMod$5(pathClass) {
 	return pathClass === "win32" ? win32Path : posixPath;
 }
 function comparable(path, pathClass) {
 	return pathClass === "win32" ? path.toLowerCase() : path;
 }
 function isSensitiveFile(path, pathClass = DEFAULT_PATH_CLASS$1) {
-	const mod = pathMod$3(pathClass);
+	const mod = pathMod$5(pathClass);
 	const comparableName = comparable(mod.basename(path), pathClass);
 	const comparablePath = comparable(path, pathClass);
 	if (ENV_EXEMPTIONS.has(comparableName)) return false;
@@ -3756,7 +3660,7 @@ var PathSecurityError = class extends Error {
 	}
 };
 const DEFAULT_PATH_CLASS = nativePath.sep === "\\" ? "win32" : "posix";
-function pathMod$2(pathClass) {
+function pathMod$4(pathClass) {
 	return pathClass === "win32" ? win32Path : posixPath;
 }
 function comparablePath(path, pathClass) {
@@ -3786,7 +3690,7 @@ function normalizeUserPath(path, pathClass = DEFAULT_PATH_CLASS) {
 function expandUserPath$1(path, homeDir, pathClass) {
 	if (homeDir === void 0) return path;
 	if (path === "~") return homeDir;
-	if (path.startsWith("~/") || pathClass === "win32" && path.startsWith("~\\")) return pathMod$2(pathClass).join(homeDir, path.slice(2));
+	if (path.startsWith("~/") || pathClass === "win32" && path.startsWith("~\\")) return pathMod$4(pathClass).join(homeDir, path.slice(2));
 	return path;
 }
 /**
@@ -3795,7 +3699,7 @@ function expandUserPath$1(path, homeDir, pathClass) {
 */
 function canonicalizePath(path, cwd, pathClass = DEFAULT_PATH_CLASS) {
 	if (path === "") throw new PathSecurityError("PATH_INVALID", path, path, "Path cannot be empty");
-	const mod = pathMod$2(pathClass);
+	const mod = pathMod$4(pathClass);
 	const normalizedPath = normalizeUserPath(path, pathClass);
 	if (pathClass === "win32" && isWin32DriveRelative(normalizedPath)) throw new PathSecurityError("PATH_INVALID", path, normalizedPath, `"${path}" is a drive-relative Windows path. Use an absolute path like C:\\path or a path relative to the working directory.`);
 	if (!mod.isAbsolute(normalizedPath) && !mod.isAbsolute(cwd)) throw new PathSecurityError("PATH_INVALID", path, normalizedPath, `Cannot resolve "${path}" against non-absolute cwd "${cwd}".`);
@@ -3807,7 +3711,7 @@ function canonicalizePath(path, cwd, pathClass = DEFAULT_PATH_CLASS) {
 * on path-component boundaries. Both arguments must already be canonical.
 */
 function isWithinDirectory(candidate, base, pathClass = DEFAULT_PATH_CLASS) {
-	const mod = pathMod$2(pathClass);
+	const mod = pathMod$4(pathClass);
 	const comparableCandidate = comparablePath(candidate, pathClass);
 	const comparableBase = comparablePath(base, pathClass);
 	if (comparableCandidate === comparableBase) return true;
@@ -3833,7 +3737,7 @@ function relativeOutsideMessage(path, operation) {
 }
 function resolvePathAccess(path, cwd, config, options) {
 	const pathClass = options.pathClass ?? DEFAULT_PATH_CLASS;
-	const mod = pathMod$2(pathClass);
+	const mod = pathMod$4(pathClass);
 	const expandedPath = expandUserPath$1(normalizeUserPath(path, pathClass), options.homeDir, pathClass);
 	const rawIsAbsolute = mod.isAbsolute(expandedPath);
 	const canonical = canonicalizePath(expandedPath, cwd, pathClass);
@@ -3900,7 +3804,7 @@ function makeCarriageReturnsVisible(text) {
 }
 //#endregion
 //#region src/tools/builtin/file/edit.md
-var edit_default = "Perform exact string replacements against the text view returned by Read.\n\n- When copying from Read output, omit the line-number prefix and tab; match only the file content.\n- By default, old_string must occur exactly once. If it matches multiple locations, add surrounding context or set replace_all when every occurrence should change.\n- Prefer Edit for targeted changes to existing files; use Write only for new files or complete overwrites.\n- To modify a file, always use Edit; do not run a Shell `sed` command for edits.\n- When making several independent changes, issue multiple Edit calls in parallel within a single response; edits to the same file are serialized automatically by a write lock.\n- When several parallel Edit calls target the same file, a write lock serializes them; they apply in the order the calls appear in your response. An edit fails with `old_string not found` if its old_string was taken from text an earlier edit already replaced — base every old_string on the latest Read view and order dependent edits accordingly.\n- For pure CRLF files, Read shows LF and Edit.old_string/new_string should use LF; Edit writes the file back with CRLF preserved.\n- For mixed line endings or lone carriage returns, Read displays carriage returns as \\r; include actual \\r escapes in old_string/new_string for those positions.";
+var edit_default = "Perform exact string replacements against the text view returned by Read.\n\n- When copying from Read output, omit the line-number prefix and tab; match only the file content.\n- By default, old_string must occur exactly once. If it matches multiple locations, add surrounding context or set replace_all when every occurrence should change.\n- When making several independent changes, issue multiple Edit calls in parallel within a single response; edits to the same file are serialized automatically by a write lock.\n- When several parallel Edit calls target the same file, a write lock serializes them; they apply in the order the calls appear in your response. An edit fails with `old_string not found` if its old_string was taken from text an earlier edit already replaced — base every old_string on the latest Read view and order dependent edits accordingly.\n- For pure CRLF files, Read shows LF and Edit.old_string/new_string should use LF; Edit writes the file back with CRLF preserved.\n- For mixed line endings or lone carriage returns, Read displays carriage returns as \\r; include actual \\r escapes in old_string/new_string for those positions.\n";
 //#endregion
 //#region src/tools/builtin/file/edit.ts
 const EditInputSchema = z.object({
@@ -3988,9 +3892,88 @@ var EditTool = class {
 		}
 	}
 };
+async function collectEntries$1(kaos, dirPath, maxWidth, pathClass) {
+	const all = [];
+	try {
+		for await (const fullPath of kaos.iterdir(dirPath)) {
+			const name = basename$2(fullPath, pathClass);
+			let isDir = false;
+			try {
+				isDir = ((await kaos.stat(fullPath)).stMode & 61440) === 16384;
+			} catch {}
+			all.push({
+				name,
+				isDir
+			});
+		}
+	} catch {
+		return {
+			entries: [],
+			total: 0,
+			readable: false
+		};
+	}
+	all.sort((a, b) => {
+		if (a.isDir !== b.isDir) return a.isDir ? -1 : 1;
+		return a.name.localeCompare(b.name);
+	});
+	return {
+		entries: all.slice(0, maxWidth),
+		total: all.length,
+		readable: true
+	};
+}
+function pathMod$3(pathClass) {
+	return pathClass === "win32" ? win32Path : posixPath;
+}
+function basename$2(p, pathClass) {
+	return pathMod$3(pathClass).basename(p);
+}
+/**
+* Return a 2-level tree listing of `workDir` suitable for inclusion in a
+* tool error message. Returns `"(empty directory)"` if the directory is
+* empty, or an error marker line if the directory itself is unreadable.
+*/
+async function listDirectory(kaos, workDir) {
+	const lines = [];
+	const pathClass = kaos.pathClass();
+	const { entries, total, readable } = await collectEntries$1(kaos, workDir, 30, pathClass);
+	if (!readable) return "[not readable]";
+	const remaining = total - entries.length;
+	for (let i = 0; i < entries.length; i++) {
+		const entry = entries[i];
+		if (entry === void 0) continue;
+		const { name, isDir } = entry;
+		const isLast = i === entries.length - 1 && remaining === 0;
+		const connector = isLast ? "└── " : "├── ";
+		if (isDir) {
+			lines.push(`${connector}${name}/`);
+			const childPrefix = isLast ? "    " : "│   ";
+			const child = await collectEntries$1(kaos, joinPath$1(workDir, name, pathClass), 10, pathClass);
+			if (!child.readable) {
+				lines.push(`${childPrefix}└── [not readable]`);
+				continue;
+			}
+			const childRemaining = child.total - child.entries.length;
+			for (let j = 0; j < child.entries.length; j++) {
+				const ce = child.entries[j];
+				if (ce === void 0) continue;
+				const cConnector = j === child.entries.length - 1 && childRemaining === 0 ? "└── " : "├── ";
+				const suffix = ce.isDir ? "/" : "";
+				lines.push(`${childPrefix}${cConnector}${ce.name}${suffix}`);
+			}
+			if (childRemaining > 0) lines.push(`${childPrefix}└── ... and ${String(childRemaining)} more`);
+		} else lines.push(`${connector}${name}`);
+	}
+	if (remaining > 0) lines.push(`└── ... and ${String(remaining)} more entries`);
+	return lines.length > 0 ? lines.join("\n") : "(empty directory)";
+}
+function joinPath$1(parent, child, pathClass) {
+	return pathMod$3(pathClass).join(parent, child);
+}
 //#endregion
 //#region src/tools/builtin/file/glob.md
-var glob_default = "Find files (and optionally directories) by glob pattern, sorted by modification time (most recent first).\n\nGood patterns:\n- `*.ts` — files in the current directory matching an extension\n- `src/**/*.ts` — recursive with a subdirectory anchor and extension\n- `test_*.py` — files whose name starts with a literal prefix\n\nRejected patterns (no literal anchor — nothing bounds the result set):\n- `**`, `**/*`, `*/*` — pure wildcards. Add an extension or subdirectory to give the walk a concrete target.\n- Anything that starts with `**/` (e.g. `**/*.md`, `**/main/*.py`). The leading `**/` has no literal anchor in front of it. Anchor it with a top-level subdirectory like `src/**/*.md`.\n- `*.{ts,tsx}` — brace expansion is not supported. Issue two calls: `*.ts` and `*.tsx`.\n\nLarge-directory warning — avoid recursing into dependency/build output even with an anchor:\n- `node_modules/**/*.js`, `.venv/**/*.py`, `__pycache__/**`, `target/**` all match technically but\n  typically produce thousands of results that truncate at the match cap and waste the caller context.\n  Prefer specific subpaths like `node_modules/react/src/**/*.js`.";
+var glob_default = "Find files (and optionally directories) by glob pattern, sorted by modification time (most recent first).\n\nGood patterns:\n- `*.ts` — files in the current directory matching an extension\n- `src/**/*.ts` — recursive with a subdirectory anchor and extension\n- `test_*.py` — files whose name starts with a literal prefix\n\nRejected patterns (no literal anchor):\n- `**`, `**/*`, `*/*` — pure wildcards. Add an extension or subdirectory to give the walk a concrete target.\n- Anything starting with `**/` (e.g. `**/*.md`, `**/main/*.py`). Anchor it with a top-level subdirectory like `src/**/*.md`.\n- `*.{ts,tsx}` — brace expansion is not supported. Issue two calls: `*.ts` and `*.tsx`.\n\nLarge-directory warning — avoid recursing into dependency/build output even with an anchor:\n- `node_modules/**/*.js`, `.venv/**/*.py`, `__pycache__/**`, `target/**` match technically but typically produce thousands of results that truncate at the match cap. Prefer specific subpaths like `node_modules/react/src/**/*.js`.\n";
 //#endregion
 //#region src/tools/builtin/file/glob.ts
 const GlobInputSchema = z.object({
@@ -4536,7 +4519,7 @@ var ToolResultBuilder = class {
 };
 //#endregion
 //#region src/tools/builtin/file/grep.md
-var grep_default = "Search file contents using regular expressions (powered by ripgrep).\n\nUse Grep when the task is to find unknown content or unknown file locations. Do not use shell `grep` or `rg` directly; this tool applies workspace path policy, output limits, and sensitive-file filtering.\nALWAYS use Grep tool instead of running `grep` or `rg` from a shell — direct shell calls bypass workspace policy, output limits, and sensitive-file filtering.\nIf you already know a concrete file path and need to inspect its contents, use Read directly instead.\n\nWrite patterns in ripgrep regex syntax, which differs from POSIX `grep` syntax. For example, braces are special, so escape them as `\\{` to match a literal `{`.\n\nHidden files (dotfiles such as `.gitlab-ci.yml` or `.eslintrc.json`) are searched by default. To also search files excluded by `.gitignore` (such as `node_modules` or build outputs), set `include_ignored` to `true`. Sensitive files (such as `.env`) are always skipped for safety, even when `include_ignored` is `true`.\n";
+var grep_default = "Search file contents using regular expressions (powered by ripgrep).\n\nUse Grep when the task is to find unknown content or unknown file locations. If you already know a concrete file path and need to inspect its contents, use Read directly instead.\n\nWrite patterns in ripgrep regex syntax, which differs from POSIX `grep` syntax. For example, braces are special, so escape them as `\\{` to match a literal `{`.\n\nHidden files (dotfiles such as `.gitlab-ci.yml` or `.eslintrc.json`) are searched by default. To also search files excluded by `.gitignore` (such as `node_modules` or build outputs), set `include_ignored` to `true`. Sensitive files (such as `.env`) are always skipped for safety, even when `include_ignored` is `true`.\n";
 //#endregion
 //#region src/tools/builtin/file/grep.ts
 const GrepInputSchema = z.object({
@@ -5516,7 +5499,7 @@ function detectFileType(path, header) {
 }
 //#endregion
 //#region src/tools/builtin/file/read.md
-var read_default = "Read a text file from the local filesystem.\n\nIf the user provides a concrete file path to a text file, call Read directly. Do not `Glob`, `ls`, or otherwise pre-check known text file paths; missing or invalid file paths return errors you can handle. Do not use Read for directories; use `ls` via Bash for a known directory, or Glob when you need files/directories matching a pattern. Use `Grep` only when the task is to search for unknown content or locations.\n\nWhen you need several files, prefer to read them in parallel: emit multiple `Read` calls in a single response instead of reading one file per turn.\n\n- Relative paths resolve against the working directory; a path outside the working directory must be absolute.\n- Returns up to {{ MAX_LINES }} lines or {{ MAX_BYTES_KB }} KB per call, whichever comes first; lines longer than {{ MAX_LINE_LENGTH }} chars are truncated mid-line.\n- Page larger files with `line_offset` (1-based start line) and `n_lines`. Omit `n_lines` to read up to the {{ MAX_LINES }}-line cap.\n- Sensitive files (`.env` files, credential stores, SSH keys, and similar secrets) are refused to protect secrets; do not attempt to read them.\n- Only UTF-8 text files can be read. Non-UTF-8 encodings, binary files, and files containing NUL bytes are refused; use `ReadMediaFile` for images or video, and Bash or an MCP tool for other binary formats.\n- Negative line_offset reads from the end of the file (for example, -100 reads the last 100 lines); the absolute value cannot exceed {{ MAX_LINES }}.\n- Output format: `<line-number>\\t<content>` per line.\n- A `<system>...</system>` status block is appended after the file content; it summarizes how much was read (line and byte counts, truncation, line-ending notes) and is not part of the file itself.\n- Pure CRLF files are displayed with LF line endings; `Edit` matches this output and preserves CRLF when writing back.\n- Mixed or lone carriage-return line endings are shown as `\\r` and require exact `Edit.old_string` escapes.\n- After a successful `Edit`/`Write`, do not re-read solely to prove the write landed. When the task depends on an exact file, API, or output shape, inspect the final external contract before finishing.\n";
+var read_default = "Read a text file from the local filesystem.\n\nIf the user provides a concrete file path to a text file, call Read directly. Prefer to read several files in parallel: emit multiple `Read` calls in a single response.\n\n- Returns up to {{ MAX_LINES }} lines or {{ MAX_BYTES_KB }} KB per call, whichever comes first; lines longer than {{ MAX_LINE_LENGTH }} chars are truncated mid-line.\n- Page larger files with `line_offset` (1-based start line) and `n_lines`. Omit `n_lines` to read up to the {{ MAX_LINES }}-line cap.\n- Negative line_offset reads from the end of the file (for example, -100 reads the last 100 lines); the absolute value cannot exceed {{ MAX_LINES }}.\n- Sensitive files (`.env`, credential stores, SSH keys, and similar secrets) are refused; do not attempt to read them.\n- Only UTF-8 text files can be read. Non-UTF-8 encodings, binary files, and files containing NUL bytes are refused; use `ReadMediaFile` for images or video, and Bash or an MCP tool for other binary formats.\n- Output format: `<line-number>\\t<content>` per line.\n- A `<system>...</system>` status block is appended after the file content; it summarizes how much was read and is not part of the file itself.\n- Pure CRLF files are displayed with LF line endings; `Edit` matches this output and preserves CRLF when writing back.\n- Mixed or lone carriage-return line endings are shown as `\\r` and require exact `Edit.old_string` escapes.\n- After a successful `Edit`/`Write`, do not re-read solely to prove the write landed. When the task depends on an exact file, API, or output shape, inspect the final external contract before finishing.\n";
 //#endregion
 //#region src/tools/builtin/file/read.ts
 const MAX_LINES = 1e3;
@@ -5808,7 +5791,7 @@ var ReadTool = class {
 };
 //#endregion
 //#region src/tools/builtin/file/read-media.md
-var read_media_default = "Read media content from a file.\n\n**Tips:**\n- Make sure you follow the description of each tool parameter.\n- A `<system>` tag is given before the file content; it summarizes the mime type, byte size and, for images, the original pixel dimensions. When outputting coordinates, give relative coordinates first and compute absolute coordinates from the original image size. After generating or editing media via commands or scripts, read the result back before continuing.\n- The system will notify you when there is anything wrong when reading the file.\n- This tool is a tool that you typically want to use in parallel. Always read multiple files in one response when possible.\n- This tool can only read image or video files. To read text files, use the Read tool. To list directories, use `ls` via Bash for a known directory, or Glob for pattern search.\n- If the file doesn't exist or path is invalid, an error will be returned.\n- The maximum size that can be read is {{ MAX_MEDIA_MEGABYTES }}MB. An error will be returned if the file is larger than this limit.\n- The media content will be returned in a form that you can directly view and understand.\n\n**Capabilities**";
+var read_media_default = "Read media content from a file.\n\n- A `<system>` tag precedes the file content; it summarizes mime type, byte size and, for images, original pixel dimensions. When outputting coordinates, give relative coordinates first and compute absolute coordinates from the original image size. After generating or editing media via commands or scripts, read the result back before continuing.\n- Use this tool in parallel when possible — always read multiple files in one response.\n- This tool can only read image or video files. To read text files, use the Read tool. To list directories, use `ls` via Bash for a known directory, or Glob for pattern search.\n- The maximum size is {{ MAX_MEDIA_MEGABYTES }}MB.\n- The media content is returned in a form you can directly view and understand.\n";
 //#endregion
 //#region src/tools/builtin/file/read-media.ts
 const MAX_MEDIA_MEGABYTES = 100;
@@ -5959,14 +5942,14 @@ var ReadMediaFileTool = class {
 };
 //#endregion
 //#region src/tools/builtin/file/write.md
-var write_default = "Overwrite or append to a file with content exactly as provided, creating the file if needed; the parent directory must already exist. Defaults to overwrite; append adds content to the end without adding a newline. Write does not use the Read/Edit model text view and does not preserve or infer the previous line-ending style: \\n stays LF, \\r\\n stays CRLF. Use Edit for targeted changes to existing files. When the content is very large, you can split it across multiple calls: write the first chunk with overwrite, then add the remaining chunks with append.\n";
+var write_default = "Overwrite or append to a file with content exactly as provided, creating the file if needed; the parent directory must already exist. Defaults to overwrite; append adds content to the end without adding a newline. Write does not use the Read/Edit model text view and does not preserve or infer the previous line-ending style: \\n stays LF, \\r\\n stays CRLF. When the content is very large, split it across multiple calls: write the first chunk with overwrite, then add the remaining chunks with append.\n";
 //#endregion
 //#region src/tools/builtin/file/write.ts
 /** Mask isolating the file-type bits of a stat mode. */
 const S_IFMT$2 = 61440;
 /** File-type bits of a directory. */
 const S_IFDIR$1 = 16384;
-function pathMod$1(pathClass) {
+function pathMod$2(pathClass) {
 	return pathClass === "win32" ? win32Path : posixPath;
 }
 const WriteInputSchema = z.object({
@@ -6033,7 +6016,7 @@ var WriteTool = class {
 	* skipped and the write proceeds, surfacing the real I/O error if any.
 	*/
 	async checkParentDirectory(safePath) {
-		const parent = pathMod$1(this.kaos.pathClass()).dirname(safePath);
+		const parent = pathMod$2(this.kaos.pathClass()).dirname(safePath);
 		let stat;
 		try {
 			stat = await this.kaos.stat(parent);
@@ -6045,196 +6028,8 @@ var WriteTool = class {
 	}
 };
 //#endregion
-//#region src/tools/builtin/planning/enter-plan-mode.md
-var enter_plan_mode_default = "Use this tool proactively when you're about to start a non-trivial implementation task.\nGetting user sign-off on your approach via ExitPlanMode before writing code prevents wasted effort.\n\nUse it when ANY of these conditions apply:\n\n1. New Feature Implementation - e.g. \"Add a caching layer to the API\"\n2. Multiple Valid Approaches - e.g. \"Optimize database queries\" (indexing vs rewrite vs caching)\n3. Code Modifications - e.g. \"Refactor auth module to support OAuth\"\n4. Architectural Decisions - e.g. \"Add WebSocket support\"\n5. Multi-File Changes - involves more than 2-3 files\n6. Unclear Requirements - need exploration to understand scope\n7. User Preferences Matter - if user input would materially change the implementation approach, use EnterPlanMode to structure the decision\n\nPermission mode notes:\n- EnterPlanMode enters plan mode automatically without an approval prompt in all permission modes.\n- In yolo and manual modes, ExitPlanMode still presents the plan to the user for approval.\n- In auto permission mode, do not use AskUserQuestion; make the best decision from available context.\n- In auto permission mode, ExitPlanMode exits plan mode without asking the user.\n- Use EnterPlanMode only when planning itself adds value.\n\nWhen NOT to use:\n- Single-line or few-line fixes (typos, obvious bugs, small tweaks)\n- User gave very specific, detailed instructions\n- Pure research/exploration tasks\n\n## What Happens in Plan Mode\nIn plan mode, you will:\n1. Identify 2-3 key questions about the codebase that are critical to your plan. If you are not confident about the codebase structure or relevant code paths, use `Agent(subagent_type=\"explore\")` to investigate these questions first - this is strongly recommended for non-trivial tasks.\n2. Explore the codebase using Glob, Grep, Read, and other read-only tools for any remaining quick lookups. Use Bash only when needed; Bash follows the normal permission mode and rules.\n3. Design an implementation approach based on your findings\n4. Write your plan to the current plan file with Write or Edit\n5. Present your plan to the user via ExitPlanMode for approval\n";
-//#endregion
-//#region src/tools/builtin/planning/enter-plan-mode.ts
-const EnterPlanModeInputSchema = z.object({}).strict();
-var EnterPlanModeTool = class {
-	agent;
-	name = "EnterPlanMode";
-	description = enter_plan_mode_default;
-	parameters = toInputJsonSchema(EnterPlanModeInputSchema);
-	constructor(agent) {
-		this.agent = agent;
-	}
-	resolveExecution(_args) {
-		return {
-			description: "Requesting to enter plan mode",
-			execute: async () => {
-				if (this.agent.planMode.isActive) return {
-					isError: true,
-					output: "Plan mode is already active. Use ExitPlanMode when the plan is ready."
-				};
-				try {
-					await this.agent.planMode.enter();
-				} catch (error) {
-					return {
-						isError: true,
-						output: `Failed to enter plan mode: ${error instanceof Error ? error.message : "Failed to enter plan mode."}`
-					};
-				}
-				this.agent.telemetry.track("plan_enter_resolved", { outcome: "auto_approved" });
-				return { output: enteredPlanModeMessage(this.agent.planMode.planFilePath) };
-			}
-		};
-	}
-};
-function enteredPlanModeMessage(planPath) {
-	if (planPath === null) return [
-		"Plan mode is now active. Your workflow:",
-		"",
-		"1. Use read-only tools (Read, Grep, Glob) to investigate the codebase. Use Bash only when needed.",
-		"2. Design a concrete, step-by-step plan.",
-		"3. Wait for the host to provide a plan file path before calling ExitPlanMode.",
-		"",
-		"Do NOT use Write or Edit while plan mode is active in this host; no plan file path is available.",
-		"Use Bash only when needed; Bash follows the normal permission mode and rules."
-	].join("\n");
-	return [
-		"Plan mode is now active. Your workflow:",
-		"",
-		`Plan file: ${planPath}`,
-		"",
-		"1. Use read-only tools (Read, Grep, Glob) to investigate the codebase. Use Bash only when needed.",
-		"2. Design a concrete, step-by-step plan.",
-		"3. Write the plan to the plan file with Write or Edit.",
-		"4. When the plan is ready, call ExitPlanMode for user approval.",
-		"",
-		"Do NOT edit files other than the plan file while plan mode is active.",
-		"Use Bash only when needed; Bash follows the normal permission mode and rules."
-	].join("\n");
-}
-//#endregion
-//#region src/tools/builtin/planning/exit-plan-mode.md
-var exit_plan_mode_default = "Use this tool when you are in plan mode and have finished writing your plan to the plan file and are ready for user approval.\n\n## How This Tool Works\n- You should have already written your plan to the plan file specified in the plan mode reminder.\n- This tool does NOT take the plan content as a parameter - it reads the plan from the file you wrote.\n- The user will see the contents of your plan file when they review it. In auto permission mode, the tool reads the file and exits plan mode without asking the user.\n\n## When to Use\nOnly use this tool for tasks that require planning implementation steps. For research tasks (searching files, reading code, understanding the codebase), do NOT use this tool.\n\n## Multiple Approaches\nIf your plan contains multiple alternative approaches:\n- Pass them via the `options` parameter so the user can choose which approach to execute.\n- Each option should have a concise label and a brief description of trade-offs.\n- If you recommend one option, append \"(Recommended)\" to its label.\n- In yolo and manual modes, the user will see all options alongside Reject and Revise choices.\n- Provide up to 3 options; the host adds the standard rejection and revision controls. When the plan offers a real choice, 2-3 distinct approaches work best.\n- Passing a single option is allowed and is equivalent to a plain plan approval (no approach choice is surfaced to the user).\n- Do NOT use \"Reject\", \"Reject and Exit\", \"Revise\", or \"Approve\" as option labels - these are reserved by the system.\n\n## Before Using\n- In auto permission mode, do NOT use AskUserQuestion; make the best decision from available context.\n- In auto permission mode, this tool exits plan mode without asking the user.\n- In yolo and manual modes, this tool still presents the plan to the user for approval.\n- If auto permission mode is not active and you have unresolved questions, use AskUserQuestion first.\n- If auto permission mode is not active and you have multiple approaches and haven't narrowed down yet, consider using AskUserQuestion first to let the user choose, then write a plan for the chosen approach only.\n- Once your plan is finalized, use THIS tool to request approval.\n- Do NOT use AskUserQuestion to ask \"Is this plan OK?\" or \"Should I proceed?\" - that is exactly what ExitPlanMode does.\n- If rejected, revise based on feedback and call ExitPlanMode again.\n";
-//#endregion
-//#region src/tools/builtin/planning/exit-plan-mode.ts
-const RESERVED_OPTION_LABELS = new Set([
-	"Approve",
-	"Reject",
-	"Reject and Exit",
-	"Revise"
-].map(normalizeOptionLabel$1));
-const ExitPlanModeOptionSchema = z.object({
-	label: z.string().min(1).max(80).describe("Short name for this option (1-8 words). Append \"(Recommended)\" if you recommend this option."),
-	description: z.string().default("").describe("Brief summary of this approach and its trade-offs.")
-}).strict();
-const ExitPlanModeInputSchema = z.object({ options: z.array(ExitPlanModeOptionSchema).min(1).max(3).refine(hasUniqueOptionLabels, "Option labels must be unique.").refine(hasNoReservedOptionLabels, "Option labels must not use reserved approval labels.").optional().describe("When the plan contains multiple alternative approaches, list them here so the user can choose which one to execute. Provide up to 3 options; 2-3 distinct approaches work best when the plan offers a real choice. Passing a single option is allowed and is equivalent to a plain plan approval. Each option represents a distinct approach from the plan. Do not use \"Reject\", \"Revise\", \"Approve\", or \"Reject and Exit\" as labels.") }).strict();
-var ExitPlanModeTool = class {
-	agent;
-	name = "ExitPlanMode";
-	description = exit_plan_mode_default;
-	parameters = toInputJsonSchema(ExitPlanModeInputSchema);
-	constructor(agent) {
-		this.agent = agent;
-	}
-	resolveExecution(args) {
-		return {
-			description: "Presenting plan and exiting plan mode",
-			execute: (ctx) => this.execution(args, ctx)
-		};
-	}
-	async execution(args, { metadata }) {
-		if (!this.agent.planMode.isActive) return {
-			isError: true,
-			output: "ExitPlanMode can only be called while plan mode is active. Use EnterPlanMode (or /plan) first."
-		};
-		const resolvedPlan = await this.resolvePlan();
-		if (!resolvedPlan.ok) return resolvedPlan.error;
-		if (!planTelemetryWasSubmitted(metadata)) this.agent.telemetry.track("plan_submitted", { has_options: args.options !== void 0 && args.options.length >= 2 });
-		return this.exitWithPlan(resolvedPlan.plan, resolvedPlan.path, selectedOptionFromMetadata(metadata), planTelemetryWasResolved(metadata));
-	}
-	async exitWithPlan(plan, path, option = void 0, telemetryResolved = false) {
-		const failed = this.exitPlanMode();
-		if (failed !== void 0) return failed;
-		if (!telemetryResolved) this.agent.telemetry.track("plan_resolved", { outcome: "auto_approved" });
-		return {
-			isError: false,
-			output: `Exited plan mode. ${option === void 0 ? "" : `Selected approach: ${option.label}\nExecute ONLY the selected approach. Do not execute any unselected alternatives.\n\n`}${formatPlanForOutput(plan, path)}`
-		};
-	}
-	exitPlanMode() {
-		try {
-			this.agent.planMode.exit();
-		} catch (error) {
-			return {
-				isError: true,
-				output: `Failed to exit plan mode: ${error instanceof Error ? error.message : "Failed to exit plan mode."}`
-			};
-		}
-	}
-	async resolvePlan() {
-		let source;
-		try {
-			const data = await this.agent.planMode.data();
-			source = data === null ? null : {
-				plan: data.content,
-				path: data.path
-			};
-		} catch (error) {
-			return {
-				ok: false,
-				error: {
-					isError: true,
-					output: `Failed to read plan file: ${error instanceof Error ? error.message : "Failed to read plan file."}`
-				}
-			};
-		}
-		if (source !== null && source.plan.trim().length > 0) return {
-			ok: true,
-			plan: source.plan,
-			path: source.path
-		};
-		const path = source?.path ?? this.agent.planMode.planFilePath;
-		return {
-			ok: false,
-			error: {
-				isError: true,
-				output: path === null ? "No plan file found. Write the plan to the current plan file first, then call ExitPlanMode." : `No plan file found. Write your plan to ${path} first, then call ExitPlanMode.`
-			}
-		};
-	}
-};
-function hasUniqueOptionLabels(options) {
-	const labels = /* @__PURE__ */ new Set();
-	for (const option of options) {
-		const label = normalizeOptionLabel$1(option.label);
-		if (labels.has(label)) return false;
-		labels.add(label);
-	}
-	return true;
-}
-function hasNoReservedOptionLabels(options) {
-	return options.every((option) => !RESERVED_OPTION_LABELS.has(normalizeOptionLabel$1(option.label)));
-}
-function normalizeOptionLabel$1(label) {
-	return label.trim().toLowerCase();
-}
-function selectedOptionFromMetadata(metadata) {
-	if (metadata === null || typeof metadata !== "object") return void 0;
-	const selectedOption = metadata.selectedOption;
-	if (selectedOption === null || typeof selectedOption !== "object") return void 0;
-	const label = selectedOption.label;
-	const description = selectedOption.description;
-	if (typeof label !== "string" || typeof description !== "string") return void 0;
-	return {
-		label,
-		description
-	};
-}
-function planTelemetryWasSubmitted(metadata) {
-	return metadata !== null && typeof metadata === "object" && metadata.planTelemetrySubmitted === true;
-}
-function planTelemetryWasResolved(metadata) {
-	return metadata !== null && typeof metadata === "object" && metadata.planTelemetryResolved === true;
-}
-function formatPlanForOutput(plan, path) {
-	return `Plan mode deactivated. All tools are now available.\n${path !== void 0 ? `Plan saved to: ${path}\n\n` : ""}## Approved Plan:\n${plan}`;
-}
-//#endregion
-//#region src/tools/builtin/shell/bash.md
-var bash_default = "Execute a `{{ SHELL_NAME }}` command. Use this for shell semantics — pipes, env, processes, git, package managers, build/test runners, anything genuinely interactive or multi-step.\n\n**Translate these to a dedicated tool instead:**\n- `cat` / `head` / `tail` (known path) → `Read`\n- `sed` / `awk` (in-place edit) → `Edit`\n- `echo > file` / `cat <<EOF` → `Write`\n- `find` / recursive `ls` to locate files by name pattern → `Glob` (plain `ls <known-directory>` is fine for listing a directory)\n- `grep` / `rg` (search file contents) → `Grep`\n- `echo` / `printf` (talk to the user) → just output text directly\n\nThe dedicated tools render in the per-tool permission UI and keep raw stdout out of the conversation; that is why they are worth reaching for whenever one fits.\n\n**Output:**\nThe stdout and stderr will be combined and returned as a string. The output may be truncated if it is too long. If the command failed, the output will end with a `Command failed with exit code: N` line stating the non-zero exit code.\n\nIf `run_in_background=true`, the command will be started as a background task and this tool will return a task ID instead of waiting for command completion. When doing that, you must provide a short `description`. Background commands default to a {{ DEFAULT_BACKGROUND_TIMEOUT_S }}s timeout and `timeout` is capped at {{ MAX_BACKGROUND_TIMEOUT_S }}s; set `disable_timeout=true` only when the task should run without a timeout. You will be automatically notified when the task completes. Use `TaskOutput` for a non-blocking status/output snapshot, and only set `block=true` when you explicitly want to wait for completion. Use `TaskStop` only if the task must be cancelled. If a human user wants to inspect background tasks themselves, point them to the `/tasks` command, which opens an interactive panel; it has no subcommands.\n\n**Guidelines for safety and security:**\n- Each shell tool call will be executed in a fresh shell environment. The shell variables, current working directory changes, and the shell history is not preserved between calls.\n- The tool call will return after the command is finished. You shall not use this tool to execute an interactive command or a command that may run forever. For possibly long-running foreground commands, set the `timeout` argument in seconds. Foreground commands default to {{ DEFAULT_TIMEOUT_S }}s and allow up to {{ MAX_TIMEOUT_S }}s.\n- Avoid using `..` to access files or directories outside of the working directory.\n- Avoid modifying files outside of the working directory unless explicitly instructed to do so.\n- Never run commands that require superuser privileges unless explicitly instructed to do so.\n\n**Guidelines for efficiency:**\n- For multiple related commands, use `&&` to chain them in a single call, e.g. `cd /path && ls -la`\n- Use `;` to run commands sequentially regardless of success/failure\n- Use `||` for conditional execution (run second command only if first fails)\n- Use pipe operations (`|`) and redirections (`>`, `>>`) to chain input and output between commands\n- Always quote file paths containing spaces with double quotes (e.g., cd \"/path with spaces/\")\n- Compose multi-step logic in a single call with `if` / `case` / `for` / `while` control flows.\n- Prefer `run_in_background=true` for long-running builds, tests, watchers, or servers when you need the conversation to continue before the command finishes.\n\n**Commands available:**\nThe following common command categories are usually available. Availability still depends on the host, so when in doubt run `which <command>` first to confirm a command exists before relying on it.\n- Navigation and inspection: `ls`, `pwd`, `cd`, `stat`, `file`, `du`, `df`, `tree`\n- File and directory management: `cp`, `mv`, `rm`, `mkdir`, `touch`, `ln`, `chmod`, `chown`\n- Text and data processing: `wc`, `sort`, `uniq`, `cut`, `tr`, `diff`, `xargs`\n- Archives and compression: `tar`, `gzip`, `gunzip`, `zip`, `unzip`\n- Networking and transfer: `curl`, `wget`, `ping`, `ssh`, `scp`\n- Version control: `git`\n- Process and system: `ps`, `kill`, `top`, `env`, `date`, `uname`, `whoami`\n- Language and package toolchains: `node`, `npm`, `pnpm`, `yarn`, `python`, `pip` (use whichever the project actually relies on)\n";
+//#region src/tools/builtin/shell/bash.md
+var bash_default = "Execute a `{{ SHELL_NAME }}` command. Use this for shell semantics — pipes, env, processes, git, package managers, build/test runners, anything genuinely interactive or multi-step.\n\n**Translate these to a dedicated tool instead:**\n- `cat` / `head` / `tail` (known path) → `Read`\n- `sed` / `awk` (in-place edit) → `Edit`\n- `echo > file` / `cat <<EOF` → `Write`\n- `find` / recursive `ls` to locate files by name pattern → `Glob` (plain `ls <known-directory>` is fine for listing a directory)\n- `grep` / `rg` (search file contents) → `Grep`\n- `echo` / `printf` (talk to the user) → just output text directly\n\n**Output:**\nThe stdout and stderr will be combined and returned as a string. The output may be truncated if it is too long. If the command failed, the output will end with a `Command failed with exit code: N` line stating the non-zero exit code.\n\nEach shell call runs in a fresh shell environment. The shell variables, current working directory changes, and the shell history is not preserved between calls.\n\nNever run commands that require superuser privileges unless explicitly instructed to do so.\n\nIf `run_in_background=true`, the command will be started as a background task and this tool will return a task ID instead of waiting for command completion. When doing that, you must provide a short `description`. Background commands default to a {{ DEFAULT_BACKGROUND_TIMEOUT_S }}s timeout and `timeout` is capped at {{ MAX_BACKGROUND_TIMEOUT_S }}s; set `disable_timeout=true` only when the task should run without a timeout. You will be automatically notified when the task completes. Use `TaskOutput` for a non-blocking status/output snapshot, and only set `block=true` when you explicitly want to wait for completion. Use `TaskStop` only if the task must be cancelled. If a human user wants to inspect background tasks themselves, point them to the `/tasks` command, which opens an interactive panel; it has no subcommands.\n";
 //#endregion
 //#region src/tools/builtin/shell/bash.ts
 const MS_PER_SECOND = 1e3;
@@ -6524,14 +6319,14 @@ function rewriteWindowsNullRedirect$1(command) {
 }
 //#endregion
 //#region src/tools/builtin/state/todo-list.md
-var todo_list_default = "Use this tool to maintain a structured TODO list as you work through a multi-step task. This is especially useful in plan mode and for long-running investigations.\n\n**When to use:**\n- Multi-step tasks that span several tool calls\n- Tracking investigation progress across a large codebase search\n- Planning a sequence of edits before making them\n\n**When NOT to use:**\n- Single-shot answers that complete in one or two tool calls\n- Trivial requests where tracking adds no clarity\n\n**Avoid churn:**\n- Do not re-call this tool when nothing meaningful has changed since the last call — update the list only after real progress.\n- When unsure of the current state, call query mode first (omit `todos`) to check the list before deciding what to update.\n- If no available tool can move any task forward, tell the user where you are stuck instead of repeatedly re-ordering the same todos.\n\n**How to use:**\n- Call with `todos: [...]` to replace the full list. Statuses: pending / in_progress / done.\n- Call with no arguments to retrieve the current list without changing it.\n- Call with `todos: []` to clear the list.\n- Keep titles short and actionable (e.g. \"Read session-control.ts\", \"Add planMode flag to TurnManager\").\n- Update statuses as you make progress — mark one item in_progress at a time.";
+var todo_list_default = "Use this tool to maintain a structured TODO list as you work through a multi-step task.\n\nUse for multi-step tasks, tracking investigation progress, or planning a sequence of edits. Do not use for single-shot answers or trivial requests.\n\n**Avoid churn:**\n- Do not re-call this tool when nothing meaningful has changed since the last call — update the list only after real progress.\n- When unsure of the current state, call query mode first (omit `todos`) to check the list before deciding what to update.\n- If no available tool can move any task forward, tell the user where you are stuck instead of repeatedly re-ordering the same todos.\n\n**How to use:**\n- Call with `todos: [...]` to replace the full list. Statuses: pending / in_progress / done.\n- Call with no arguments to query the current list.\n- Call with `todos: []` to clear the list.\n- Keep titles short and actionable.\n- Update statuses as you make progress — mark one item in_progress at a time.\n";
 //#endregion
 //#region src/tools/builtin/state/todo-list.ts
 /**
 * TodoListTool — structured TODO list management tool.
 *
 * The LLM uses this tool to maintain a visible plan of sub-tasks during
-* plan-mode workflows and multi-step operations. A single tool serves
+* multi-step workflows and operations. A single tool serves
 * both reads and writes:
 *
 *   - `resolveExecution({ todos: [...] })` — replace the full list
@@ -7232,6 +7027,124 @@ function cloneMessage(message) {
 //#region src/agent/compaction/compaction-instruction.md
 var compaction_instruction_default = "\n--- This message is a direct task, not part of the above conversation ---\n\nYou are now given a task to compact this conversation context according to specific priorities and output requirements.\n\nOutput text only. DO NOT CALL ANY TOOLS. Calling tools will be rejected and fails the task. You already have all the information you need in the conversation history. You have only one chance.\n\nThe goal of compaction is to keep essential code patterns, technical details, and architectural decisions for continuing development without losing context after the above messages are cleared work.\n\n{{ customInstruction }}\n\n<!-- Compression Priorities (in order) -->\n\n1. **Current Task State**: What is being worked on RIGHT NOW\n2. **Errors & Solutions**: All encountered errors and their resolutions\n3. **Code Evolution**: Final working versions only (remove intermediate attempts)\n4. **System Context**: Project structure, dependencies, environment setup\n5. **Design Decisions**: Architectural choices and their rationale\n6. **TODO Items**: Unfinished tasks and known issues\n\n<!-- Required Output Structure -->\n\n## Current Focus\n\n[What we're working on now]\n\n## Environment\n\n- [Key setup/config points]\n- ...\n\n## Completed Tasks\n\n- [Task]: [Brief outcome]\n- ...\n\n## Active Issues\n\n- [Issue]: [Status/Next steps]\n- ...\n\n## Code State\n\n### [Critical file name]\n\n[Brief description of the file's purpose and current state]\n\n```\n[The latest version of critical code snippets in this file, <20 lines]\n```\n\n### [Critical file name]\n\n- [Useful classes/methods/functions]: [Brief description/usage]\n- ...\n\n<!-- Omit non-critical code, intermediate attempts, and resolved errors -->\n\n## Important Context\n\n- [Any crucial information not covered above]\n- ...\n\n## All User Messages\n\n- [Detailed non tool use user message]\n- ...\n";
 //#endregion
+//#region src/agent/context/observation-masking.ts
+const DEFAULT_MASKING_CONFIG = {
+	effectiveCapacityRatio: .6,
+	lowPriorityThreshold: .6,
+	mediumPriorityThreshold: .8,
+	highPriorityThreshold: .85
+};
+function getToolPriority(toolName) {
+	switch (toolName) {
+		case "Write":
+		case "Edit":
+		case "Agent": return "high";
+		case "Bash": return "medium";
+		case "Read":
+		case "Glob":
+		case "Grep": return "low";
+		default: return "low";
+	}
+}
+function extractTextFromContent(content) {
+	if (typeof content === "string") return content;
+	return content.filter((part) => part.type === "text").map((part) => part.text).join("");
+}
+function countLines(text) {
+	if (text.length === 0) return 0;
+	let count = 1;
+	for (const char of text) if (char === "\n") count++;
+	return count;
+}
+function headTailLines(text, headCount, tailCount) {
+	const lines = text.split("\n");
+	if (lines.length <= headCount + tailCount) return text;
+	return `${lines.slice(0, headCount).join("\n")}\n...\n${lines.slice(-tailCount).join("\n")}`;
+}
+function formatSummary(toolName, _args, lineCount, isError) {
+	return `[${toolName}: ${String(lineCount)} lines${isError ? ", error" : ""}]`;
+}
+function isAlreadyMasked(text, toolName) {
+	return text.startsWith(`[${toolName}:`);
+}
+function maskToolResult(message, toolName, toolArgs) {
+	const text = extractTextFromContent(message.content);
+	if (isAlreadyMasked(text, toolName)) return message;
+	const lineCount = countLines(text);
+	const summary = formatSummary(toolName, toolArgs, lineCount, message.isError === true);
+	const priority = getToolPriority(toolName);
+	let maskedContent;
+	if (priority === "high") maskedContent = summary;
+	else {
+		const headCount = priority === "medium" ? 3 : 3;
+		const tailCount = priority === "medium" ? 5 : toolName === "Read" ? 3 : 2;
+		if (lineCount <= headCount + tailCount) if (lineCount === 0) maskedContent = summary;
+		else maskedContent = `${summary}\n---\n${text}`;
+		else maskedContent = `${summary}\n---\n${headTailLines(text, headCount, tailCount)}`;
+	}
+	return {
+		...message,
+		content: [{
+			type: "text",
+			text: maskedContent
+		}]
+	};
+}
+/**
+* Apply observation masking to tool result messages in history.
+* Returns a new history array (does not mutate the original) and masking result.
+*/
+function applyObservationMasking(history, maxContextSize, toolCallIdToInfo, config = DEFAULT_MASKING_CONFIG) {
+	const effectiveCapacity = maxContextSize * config.effectiveCapacityRatio;
+	const tokensBefore = estimateTokensForMessages(history);
+	const pressure = effectiveCapacity > 0 ? tokensBefore / effectiveCapacity : 0;
+	let maskPriorities;
+	if (pressure < config.lowPriorityThreshold) maskPriorities = /* @__PURE__ */ new Set();
+	else if (pressure < config.mediumPriorityThreshold) maskPriorities = new Set(["low"]);
+	else if (pressure < config.highPriorityThreshold) maskPriorities = new Set(["low", "medium"]);
+	else maskPriorities = new Set(["low", "medium"]);
+	if (maskPriorities.size === 0) return {
+		history: [...history],
+		result: {
+			masked: false,
+			maskedCount: 0,
+			tokensBefore,
+			tokensAfter: tokensBefore
+		}
+	};
+	let maskedCount = 0;
+	const newHistory = [];
+	for (const message of history) {
+		if (message.role !== "tool" || message.toolCallId === void 0) {
+			newHistory.push(message);
+			continue;
+		}
+		const info = toolCallIdToInfo.get(message.toolCallId);
+		if (info === void 0) {
+			newHistory.push(message);
+			continue;
+		}
+		const priority = getToolPriority(info.name);
+		if (!maskPriorities.has(priority)) {
+			newHistory.push(message);
+			continue;
+		}
+		const masked = maskToolResult(message, info.name, info.args);
+		newHistory.push(masked);
+		if (masked !== message) maskedCount++;
+	}
+	const tokensAfter = estimateTokensForMessages(newHistory);
+	return {
+		history: newHistory,
+		result: {
+			masked: maskedCount > 0,
+			maskedCount,
+			tokensBefore,
+			tokensAfter
+		}
+	};
+}
+//#endregion
 //#region src/agent/compaction/config.ts
 const DEFAULT_COMPACTION_CONFIG = {
 	triggerRatio: .85,
@@ -7240,7 +7153,8 @@ const DEFAULT_COMPACTION_CONFIG = {
 	maxCompactionPerTurn: 3,
 	maxRecentSteps: 3,
 	maxRecentUserMessages: Infinity,
-	maxRecentSizeRatio: .2
+	maxRecentSizeRatio: .2,
+	masking: DEFAULT_MASKING_CONFIG
 };
 //#endregion
 //#region src/agent/compaction/render-messages.ts
@@ -7320,6 +7234,9 @@ var DefaultCompactionStrategy = class {
 	constructor(config = DEFAULT_COMPACTION_CONFIG) {
 		this.config = config;
 	}
+	get maskingConfig() {
+		return this.config.masking;
+	}
 	shouldCompact(usedSize, maxSize) {
 		if (maxSize <= 0) return false;
 		return usedSize >= maxSize * this.config.triggerRatio || this.shouldUseReservedContext(maxSize, usedSize);
@@ -7471,6 +7388,18 @@ var FullCompaction = class {
 		await this.block(signal);
 	}
 	async beforeStep(signal) {
+		const maskingResult = this.agent.context.applyObservationMasking(this.strategy.maskingConfig);
+		if (maskingResult.masked) this.agent.emitEvent({
+			type: "observation_masking.applied",
+			maskedCount: maskingResult.maskedCount,
+			tokensBefore: maskingResult.tokensBefore,
+			tokensAfter: maskingResult.tokensAfter
+		});
+		const pruningResult = this.agent.context.applyPruning();
+		if (pruningResult.pruned) this.agent.emitEvent({
+			type: "pruning.applied",
+			prunedCount: pruningResult.prunedCount
+		});
 		this.checkAutoCompaction();
 		if (this.shouldBlock) await this.block(signal);
 	}
@@ -7634,6 +7563,19 @@ var FullCompaction = class {
 	computeCompactableCount(history) {
 		return sliceCompleteMessages(history, this.strategy.computeCompactCount(history, this.maxContextSize));
 	}
+	restoreRecord(record) {
+		switch (record.type) {
+			case "full_compaction.begin":
+				this.begin(record);
+				break;
+			case "full_compaction.cancel":
+				this.cancel();
+				break;
+			case "full_compaction.complete":
+				this.complete(record);
+				break;
+		}
+	}
 };
 function extractCompactionSummary(response) {
 	const summary = typeof response.message.content === "string" ? response.message.content : response.message.content.map((part) => part.type === "text" ? part.text : "").join("");
@@ -7775,6 +7717,92 @@ var ConfigState = class {
 			return;
 		}
 	}
+	restoreRecord(record) {
+		switch (record.type) {
+			case "config.update":
+				this.update(record);
+				break;
+		}
+	}
+};
+//#endregion
+//#region src/agent/context/output-offloading.ts
+const DEFAULT_OFFLOADING_CONFIG = {
+	threshold: 8e3,
+	previewChars: 1e3
+};
+function shouldOffload(output, config = DEFAULT_OFFLOADING_CONFIG) {
+	return estimateTokens(output) > config.threshold;
+}
+async function offloadOutput(toolCallId, toolName, result, scratchManager, config = DEFAULT_OFFLOADING_CONFIG) {
+	const output = result.output;
+	if (typeof output !== "string") return { offloaded: false };
+	if (!shouldOffload(output, config)) return { offloaded: false };
+	const filePath = await scratchManager.writeOutput(toolCallId, output);
+	return {
+		offloaded: true,
+		output: buildPreview(output, toolName, filePath, config.previewChars),
+		filePath
+	};
+}
+function buildPreview(output, toolName, filePath, previewChars) {
+	const preview = output.slice(0, previewChars);
+	return `[Tool output offloaded to scratch file: ${filePath}]
+Preview (first ${String(previewChars)} chars):
+${preview}
+Use Read(path="${filePath}") to retrieve the full output.`;
+}
+//#endregion
+//#region src/agent/context/scratch-manager.ts
+var ScratchManager = class {
+	kaos;
+	config;
+	currentSize = 0;
+	files = [];
+	constructor(kaos, config) {
+		this.kaos = kaos;
+		this.config = config;
+	}
+	async writeOutput(toolCallId, output) {
+		await this.kaos.mkdir(this.config.scratchDir, {
+			parents: true,
+			existOk: true
+		});
+		const filePath = join(this.config.scratchDir, `${toolCallId}.txt`);
+		const size = Buffer.byteLength(output, "utf-8");
+		await this.evictIfNeeded(size);
+		await this.kaos.writeText(filePath, output);
+		this.files.push({
+			path: filePath,
+			size,
+			createdAt: Date.now()
+		});
+		this.currentSize += size;
+		return filePath;
+	}
+	async readOutput(filePath) {
+		return this.kaos.readText(filePath);
+	}
+	async evictIfNeeded(neededBytes) {
+		this.files.sort((a, b) => a.createdAt - b.createdAt);
+		while (this.files.length > 0 && (this.files.length >= this.config.maxFileCount || this.currentSize + neededBytes > this.config.maxSessionSize)) {
+			const oldest = this.files.shift();
+			try {
+				await this.kaos.exec("rm", oldest.path);
+			} catch {}
+			this.currentSize -= oldest.size;
+		}
+	}
+	async cleanup() {
+		for (const file of this.files) try {
+			await this.kaos.exec("rm", file.path);
+		} catch {}
+		this.files = [];
+		this.currentSize = 0;
+		try {
+			await this.kaos.exec("rm", "-rf", this.config.scratchDir);
+		} catch {}
+	}
 };
 //#endregion
 //#region src/agent/context/types.ts
@@ -7793,8 +7821,15 @@ var ContextMemory = class {
 	openSteps = /* @__PURE__ */ new Map();
 	pendingToolResultIds = /* @__PURE__ */ new Set();
 	deferredMessages = [];
-	constructor(agent) {
+	toolCallInfo = /* @__PURE__ */ new Map();
+	scratchManager;
+	constructor(agent, sessionId) {
 		this.agent = agent;
+		if (agent.homedir !== void 0 && sessionId !== void 0) this.scratchManager = new ScratchManager(agent.runtime.kaos, {
+			scratchDir: join(agent.homedir, "sessions", sessionId, "scratch"),
+			maxSessionSize: 5e7,
+			maxFileCount: 100
+		});
 	}
 	appendUserMessage(content, origin = USER_PROMPT_ORIGIN) {
 		this.appendMessage({
@@ -7842,6 +7877,8 @@ var ContextMemory = class {
 		this.openSteps.clear();
 		this.pendingToolResultIds.clear();
 		this.deferredMessages = [];
+		this.toolCallInfo.clear();
+		this.scratchManager?.cleanup();
 		this.agent.injection.onContextClear();
 		this.agent.emitStatusUpdated();
 	}
@@ -7885,7 +7922,73 @@ var ContextMemory = class {
 	get messages() {
 		return project(this.history);
 	}
-	appendLoopEvent(event) {
+	applyObservationMasking(config) {
+		const effectiveConfig = config ?? DEFAULT_MASKING_CONFIG;
+		const maxContextSize = this.agent.config.modelCapabilities.max_context_tokens;
+		const { history, result } = applyObservationMasking(this._history, maxContextSize, this.toolCallInfo, effectiveConfig);
+		if (result.masked) {
+			this.agent.records.logRecord({
+				type: "context.observation_masking",
+				maskedCount: result.maskedCount,
+				tokensBefore: result.tokensBefore,
+				tokensAfter: result.tokensAfter
+			});
+			this._history = history;
+			this.agent.emitStatusUpdated();
+		}
+		return result;
+	}
+	applyPruning(config) {
+		const maxContextSize = this.agent.config.modelCapabilities.max_context_tokens;
+		if (maxContextSize <= 0) return {
+			pruned: false,
+			prunedCount: 0
+		};
+		const effectiveCapacity = maxContextSize * (config?.effectiveCapacityRatio ?? .6);
+		const currentTokens = this.tokenCountWithPending;
+		const threshold = effectiveCapacity * (config?.pruningThreshold ?? .85);
+		if (currentTokens < threshold) return {
+			pruned: false,
+			prunedCount: 0
+		};
+		const maskedIndices = [];
+		for (let i = 0; i < this._history.length; i++) {
+			const message = this._history[i];
+			if (message?.role !== "tool" || message.toolCallId === void 0) continue;
+			const info = this.toolCallInfo.get(message.toolCallId);
+			if (info === void 0) continue;
+			if ((typeof message.content === "string" ? message.content : message.content.filter((part) => part.type === "text").map((part) => part.text).join("")).startsWith(`[${info.name}:`)) maskedIndices.push(i);
+		}
+		let prunedCount = 0;
+		let tokensAfter = currentTokens;
+		for (const index of maskedIndices) {
+			if (tokensAfter < threshold) break;
+			const message = this._history[index];
+			if (message === void 0) continue;
+			const tokensBeforeMessage = estimateTokensForMessages([message]);
+			this._history[index] = {
+				...message,
+				content: [{
+					type: "text",
+					text: "[pruned]"
+				}]
+			};
+			tokensAfter -= tokensBeforeMessage;
+			prunedCount++;
+		}
+		if (prunedCount > 0) {
+			this.agent.records.logRecord({
+				type: "context.pruning",
+				prunedCount
+			});
+			this.agent.emitStatusUpdated();
+		}
+		return {
+			pruned: prunedCount > 0,
+			prunedCount
+		};
+	}
+	async appendLoopEvent(event) {
 		this.agent.records.logRecord({
 			type: "context.append_loop_event",
 			event
@@ -7928,14 +8031,33 @@ var ContextMemory = class {
 					arguments: event.args === void 0 ? null : JSON.stringify(event.args)
 				});
 				this.pendingToolResultIds.add(event.toolCallId);
+				this.toolCallInfo.set(event.toolCallId, {
+					name: event.name,
+					args: event.args
+				});
 				return;
 			}
 			case "tool.result": {
-				const message = createToolMessage(event.toolCallId, toolResultOutputForModel(event.result));
+				let result = event.result;
+				if (!this.agent.records.restoring && this.scratchManager !== void 0 && typeof result.output === "string" && (this.toolCallInfo.get(event.toolCallId)?.name ?? "unknown") !== "Agent") {
+					const offloadResult = await offloadOutput(event.toolCallId, this.toolCallInfo.get(event.toolCallId)?.name ?? "unknown", result, this.scratchManager, DEFAULT_OFFLOADING_CONFIG);
+					if (offloadResult.offloaded) {
+						result = {
+							...result,
+							output: offloadResult.output
+						};
+						this.agent.records.logRecord({
+							type: "context.output_offloaded",
+							toolCallId: event.toolCallId,
+							filePath: offloadResult.filePath
+						});
+					}
+				}
+				const message = createToolMessage(event.toolCallId, toolResultOutputForModel(result));
 				this.pushHistory({
 					...message,
 					role: "tool",
-					isError: event.result.isError
+					isError: result.isError
 				});
 				this.pendingToolResultIds.delete(event.toolCallId);
 				this.flushDeferredMessagesIfToolExchangeClosed();
@@ -7972,6 +8094,83 @@ var ContextMemory = class {
 			});
 		}
 	}
+	restoreRecord(record) {
+		switch (record.type) {
+			case "context.append_message":
+				this.appendMessage(record.message);
+				break;
+			case "context.clear":
+				this.restoreClear();
+				break;
+			case "context.apply_compaction":
+				this.restoreApplyCompaction(record);
+				break;
+			case "context.mark_last_user_prompt_blocked":
+				this.restoreMarkLastUserPromptBlocked(record);
+				break;
+			case "context.append_loop_event":
+				this.restoreAppendLoopEvent(record);
+				break;
+			case "context.observation_masking":
+				this.restoreObservationMasking();
+				break;
+		}
+	}
+	restoreClear() {
+		this._history = [];
+		this._tokenCount = 0;
+		this.tokenCountCoveredMessageCount = 0;
+		this.openSteps.clear();
+		this.pendingToolResultIds.clear();
+		this.deferredMessages = [];
+		this.toolCallInfo.clear();
+		this.agent.injection.onContextClear();
+		this.agent.emitStatusUpdated();
+	}
+	restoreApplyCompaction(record) {
+		const compactedCount = record.compactedCount;
+		const summary = record.summary;
+		const tokensAfter = record.tokensAfter;
+		this._history = [{
+			role: "assistant",
+			content: [{
+				type: "text",
+				text: summary
+			}],
+			toolCalls: [],
+			origin: { kind: "compaction_summary" }
+		}, ...this._history.slice(compactedCount)];
+		this.openSteps.clear();
+		this.flushDeferredMessagesIfToolExchangeClosed();
+		this._tokenCount = tokensAfter;
+		this.tokenCountCoveredMessageCount = this._history.length;
+		this.agent.injection.onContextCompacted(compactedCount);
+		this.agent.emitStatusUpdated();
+	}
+	restoreMarkLastUserPromptBlocked(record) {
+		const hookEvent = record.hookEvent;
+		for (let i = this._history.length - 1; i >= 0; i--) {
+			const message = this._history[i];
+			if (message?.role !== "user" || message.origin?.kind !== "user") continue;
+			this._history[i] = {
+				...message,
+				origin: {
+					...message.origin,
+					blockedByHook: hookEvent
+				}
+			};
+			return;
+		}
+	}
+	async restoreAppendLoopEvent(record) {
+		await this.appendLoopEvent(record.event);
+	}
+	restoreObservationMasking() {
+		const maxContextSize = this.agent.config.modelCapabilities.max_context_tokens;
+		const { history } = applyObservationMasking(this._history, maxContextSize, this.toolCallInfo);
+		this._history = history;
+		this.agent.emitStatusUpdated();
+	}
 };
 function toolResultOutputForModel(result) {
 	const output = result.output;
@@ -8382,6 +8581,129 @@ var DynamicInjector = class {
 	}
 };
 //#endregion
+//#region src/agent/injection/directory-tree.ts
+const EXCLUDED_DIRS = new Set([
+	"node_modules",
+	".git",
+	"dist",
+	"build",
+	".next",
+	".nuxt",
+	".vite",
+	"target",
+	".turbo",
+	"coverage",
+	".cache",
+	".DS_Store",
+	".idea",
+	".vscode",
+	"venv",
+	".venv"
+]);
+const HIDDEN_DIR_WHITELIST = new Set([
+	".github",
+	".byf",
+	".agents",
+	".changeset",
+	".husky"
+]);
+var DirectoryTreeInjector = class extends DynamicInjector {
+	injectionVariant = "directory_tree";
+	lastTree;
+	hasInjected = false;
+	capturedTimestamp;
+	async getInjection() {
+		const kaos = this.agent.runtime.kaos;
+		const workDir = this.agent.config.cwd || kaos.getcwd();
+		const tree = await buildTree(kaos, workDir);
+		if (this.hasInjected && tree === this.lastTree) return;
+		this.lastTree = tree;
+		this.hasInjected = true;
+		if (this.capturedTimestamp === void 0) this.capturedTimestamp = (/* @__PURE__ */ new Date()).toISOString();
+		return `Current working directory structure (${workDir}):\n${tree}\n\nThe current date and time in ISO format is \`${this.capturedTimestamp}\`. This is only a reference for you when searching the web or checking file modification time, etc. If you need the exact time, use Bash tool with proper command.`;
+	}
+};
+async function buildTree(kaos, workDir) {
+	const lines = [];
+	const pathClass = kaos.pathClass();
+	const { entries, total, readable } = await collectEntries(kaos, workDir, 30, pathClass);
+	if (!readable) return "[not readable]";
+	const remaining = total - entries.length;
+	for (let i = 0; i < entries.length; i++) {
+		const entry = entries[i];
+		if (entry === void 0) continue;
+		const { name, isDir } = entry;
+		const isLast = i === entries.length - 1 && remaining === 0;
+		const connector = isLast ? "└── " : "├── ";
+		if (isDir) {
+			lines.push(`${connector}${name}/`);
+			const childPrefix = isLast ? "    " : "│   ";
+			const child = await collectEntries(kaos, joinPath(workDir, name, pathClass), 10, pathClass);
+			if (!child.readable) {
+				lines.push(`${childPrefix}└── [not readable]`);
+				continue;
+			}
+			const childRemaining = child.total - child.entries.length;
+			for (let j = 0; j < child.entries.length; j++) {
+				const ce = child.entries[j];
+				if (ce === void 0) continue;
+				const cConnector = j === child.entries.length - 1 && childRemaining === 0 ? "└── " : "├── ";
+				const suffix = ce.isDir ? "/" : "";
+				lines.push(`${childPrefix}${cConnector}${ce.name}${suffix}`);
+			}
+			if (childRemaining > 0) lines.push(`${childPrefix}└── ... and ${String(childRemaining)} more`);
+		} else lines.push(`${connector}${name}`);
+	}
+	if (remaining > 0) lines.push(`└── ... and ${String(remaining)} more entries`);
+	return lines.length > 0 ? lines.join("\n") : "(empty directory)";
+}
+async function collectEntries(kaos, dirPath, maxWidth, pathClass) {
+	const all = [];
+	try {
+		for await (const fullPath of kaos.iterdir(dirPath)) {
+			const name = basename$1(fullPath, pathClass);
+			if (shouldExclude(name)) continue;
+			let isDir = false;
+			try {
+				isDir = ((await kaos.stat(fullPath)).stMode & 61440) === 16384;
+			} catch {}
+			all.push({
+				name,
+				isDir
+			});
+		}
+	} catch {
+		return {
+			entries: [],
+			total: 0,
+			readable: false
+		};
+	}
+	all.sort((a, b) => {
+		if (a.isDir !== b.isDir) return a.isDir ? -1 : 1;
+		return a.name.localeCompare(b.name);
+	});
+	return {
+		entries: all.slice(0, maxWidth),
+		total: all.length,
+		readable: true
+	};
+}
+function shouldExclude(name) {
+	if (EXCLUDED_DIRS.has(name)) return true;
+	if (name.startsWith(".") && !HIDDEN_DIR_WHITELIST.has(name)) return true;
+	return false;
+}
+function pathMod$1(pathClass) {
+	return pathClass === "win32" ? win32Path : posixPath;
+}
+function basename$1(p, pathClass) {
+	return pathMod$1(pathClass).basename(p);
+}
+function joinPath(parent, child, pathClass) {
+	return pathMod$1(pathClass).join(parent, child);
+}
+//#endregion
 //#region src/agent/injection/permission-mode.ts
 const AUTO_MODE_ENTER_REMINDER = [
 	"Auto permission mode is active. Tool approvals will be handled automatically while this mode remains enabled.",
@@ -8402,149 +8724,13 @@ var PermissionModeInjector = class extends DynamicInjector {
 	}
 };
 //#endregion
-//#region src/agent/injection/plan-mode.ts
-const PLAN_MODE_DEDUP_MIN_TURNS = 2;
-const PLAN_MODE_FULL_REFRESH_TURNS = 5;
-var PlanModeInjector = class extends DynamicInjector {
-	injectionVariant = "plan_mode";
-	wasActive = false;
-	onContextClear() {
-		super.onContextClear();
-		this.wasActive = this.agent.planMode.isActive;
-	}
-	async getInjection() {
-		const { isActive, planFilePath } = this.agent.planMode;
-		if (!isActive) {
-			if (!this.wasActive) return;
-			this.wasActive = false;
-			this.injectedAt = null;
-			return exitReminder();
-		}
-		if (!this.wasActive) {
-			this.injectedAt = null;
-			this.wasActive = true;
-			if (await this.hasCurrentPlanContent()) return reentryReminder(planFilePath);
-		}
-		const variant = this.getVariant();
-		if (variant === null) return void 0;
-		return variant === "full" ? fullReminder(planFilePath) : variant === "sparse" ? sparseReminder(planFilePath) : reentryReminder(planFilePath);
-	}
-	getVariant() {
-		if (this.injectedAt === null) return "full";
-		const history = this.agent.context.history;
-		let assistantTurnsSince = 0;
-		for (let i = this.injectedAt + 1; i < history.length; i++) {
-			const msg = history[i];
-			if (msg === void 0) continue;
-			if (msg.role === "assistant") {
-				assistantTurnsSince += 1;
-				continue;
-			}
-			if (msg.role === "user") return "full";
-		}
-		if (assistantTurnsSince >= PLAN_MODE_FULL_REFRESH_TURNS) return "full";
-		if (assistantTurnsSince >= PLAN_MODE_DEDUP_MIN_TURNS) return "sparse";
-		return null;
-	}
-	async hasCurrentPlanContent() {
-		try {
-			const data = await this.agent.planMode.data();
-			return data !== null && data.content.trim().length > 0;
-		} catch {
-			return false;
-		}
-	}
-};
-function withPlanFileFooter(body, planFilePath) {
-	if (planFilePath === null || planFilePath.length === 0) return body;
-	return `${body}\n\nPlan file: ${planFilePath}`;
-}
-function fullReminder(planFilePath) {
-	if (planFilePath === null || planFilePath.length === 0) return inlineFullReminder();
-	return withPlanFileFooter(`Plan mode is active. You MUST NOT make any edits (with the exception of the current plan file) or otherwise make changes to the system unless a tool request is explicitly approved. Prefer read-only tools. Use Bash only when needed; Bash follows the normal permission mode and rules. This supersedes any other instructions you have received.
-
-Workflow:
-  1. Understand — explore the codebase with Glob, Grep, Read.
-  2. Design — converge on the best approach; consider trade-offs but aim for a single recommendation.
-  3. Review — re-read key files to verify understanding.
-  4. Write Plan — modify the plan file with Write or Edit. Use Write if the plan file does not exist yet.
-  5. Exit — call ExitPlanMode for user approval.
-
-## Handling multiple approaches
-Keep it focused: at most 2-3 meaningfully different approaches. Do NOT pad with minor variations — if one approach is clearly superior, just propose that one.
-When the best approach depends on user preferences, constraints, or context you don't have, use AskUserQuestion to clarify first. This helps you write a better, more targeted plan rather than dumping multiple options for the user to sort through.
-When you do include multiple approaches in the plan, you MUST pass them as the \`options\` parameter when calling ExitPlanMode, so the user can select which approach to execute at approval time.
-NEVER write multiple approaches in the plan and call ExitPlanMode without the \`options\` parameter — the user will only see the default approval controls with no way to choose a specific approach.
-
-AskUserQuestion is for clarifying missing requirements or user preferences that affect the plan.
-Never ask about plan approval via text or AskUserQuestion.
-Your turn must end with either AskUserQuestion (to clarify requirements or preferences) or ExitPlanMode (to request plan approval). Do NOT end your turn any other way.
-Do NOT use AskUserQuestion to ask about plan approval or reference "the plan" — the user cannot see the plan until you call ExitPlanMode.`, planFilePath);
-}
-function sparseReminder(planFilePath) {
-	if (planFilePath === null || planFilePath.length === 0) return inlineSparseReminder();
-	return withPlanFileFooter(`Plan mode still active (see full instructions earlier). Prefer read-only tools except the current plan file. Use Write or Edit to modify the plan file. If it does not exist yet, create it with Write first. Use Bash only when needed; Bash follows the normal permission mode and rules. Use AskUserQuestion to clarify user preferences when it helps you write a better plan. If the plan has multiple approaches, pass options to ExitPlanMode so the user can choose. End turns with AskUserQuestion (for clarifications) or ExitPlanMode (for approval). Never ask about plan approval via text or AskUserQuestion.`, planFilePath);
-}
-function reentryReminder(planFilePath) {
-	if (planFilePath === null || planFilePath.length === 0) return inlineReentryReminder();
-	return withPlanFileFooter(`Plan mode is active. You MUST NOT make any edits (with the exception of the current plan file) or otherwise make changes to the system unless a tool request is explicitly approved. Prefer read-only tools. Use Bash only when needed; Bash follows the normal permission mode and rules. This supersedes any other instructions you have received.
-
-## Re-entering Plan Mode
-A plan file from a previous planning session already exists.
-Before proceeding:
-  1. Read the existing plan file to understand what was previously planned.
-  2. Evaluate the user's current request against that plan.
-  3. If different task: replace the old plan with a fresh one. If same task: update the existing plan.
-  4. You may use Write or Edit to modify the plan file. If the file does not exist yet, create it with Write first.
-  5. Use AskUserQuestion to clarify missing requirements or user preferences that affect the plan.
-  6. Always edit the plan file before calling ExitPlanMode.
-
-Your turn must end with either AskUserQuestion (to clarify requirements) or ExitPlanMode (to request plan approval).`, planFilePath);
-}
-function inlineFullReminder() {
-	return `Plan mode is active. You MUST NOT make any edits or otherwise make changes to the system unless a tool request is explicitly approved. Prefer read-only tools. Use Bash only when needed; Bash follows the normal permission mode and rules. This supersedes any other instructions you have received.
-
-Workflow:
-  1. Understand — explore the codebase with Glob, Grep, Read.
-  2. Design — converge on the best approach; consider trade-offs but aim for a single recommendation.
-  3. Review — re-read key files to verify understanding.
-  4. Wait for the host to provide a plan file path, write the plan there, then call ExitPlanMode.
-
-## Handling multiple approaches
-Keep it focused: at most 2-3 meaningfully different approaches. Do NOT pad with minor variations — if one approach is clearly superior, just propose that one.
-When the best approach depends on user preferences, constraints, or context you don't have, use AskUserQuestion to clarify first.
-When you do include multiple approaches in the plan, you MUST pass them as the \`options\` parameter when calling ExitPlanMode, so the user can select which approach to execute at approval time.
-
-AskUserQuestion is for clarifying missing requirements or user preferences that affect the plan.
-Never ask about plan approval via text or AskUserQuestion.
-Your turn must end with either AskUserQuestion (to clarify requirements or preferences) or ExitPlanMode (to request plan approval). Do NOT end your turn any other way.`;
-}
-function inlineSparseReminder() {
-	return `Plan mode still active (see full instructions earlier). Read-only; no plan file path is available in this host. Wait for the host to provide a plan file path before calling ExitPlanMode. Use AskUserQuestion to clarify user preferences when it helps you write a better plan. If the plan has multiple approaches, pass options to ExitPlanMode so the user can choose. End turns with AskUserQuestion (for clarifications) or ExitPlanMode (for approval).`;
-}
-function inlineReentryReminder() {
-	return `Plan mode is active. You MUST NOT make any edits or otherwise make changes to the system unless a tool request is explicitly approved. Prefer read-only tools. Use Bash only when needed; Bash follows the normal permission mode and rules. This supersedes any other instructions you have received.
-
-## Re-entering Plan Mode
-No plan file path is available in this host.
-Before proceeding:
-  1. Re-evaluate the user request and any existing conversation context.
-  2. Use AskUserQuestion to clarify missing requirements or user preferences that affect the plan.
-  3. Wait for the host to provide a plan file path, write the revised plan there, then call ExitPlanMode.
-
-Your turn must end with either AskUserQuestion (to clarify requirements) or ExitPlanMode (to request plan approval).`;
-}
-function exitReminder() {
-	return `Plan mode is no longer active. The read-only and plan-file-only restrictions from plan mode no longer apply. Continue with the approved plan using the normal tool and permission rules.`;
-}
-//#endregion
 //#region src/agent/injection/manager.ts
 var InjectionManager = class {
 	agent;
 	injectors;
 	constructor(agent) {
 		this.agent = agent;
-		this.injectors = [new PlanModeInjector(agent), new PermissionModeInjector(agent)];
+		this.injectors = [new PermissionModeInjector(agent), new DirectoryTreeInjector(agent)];
 	}
 	async inject() {
 		for (const injector of this.injectors) await injector.inject();
@@ -8573,8 +8759,6 @@ const BUILTIN_TOOL_DEFAULT_PERMISSIONS = {
 	FetchURL: "auto_allow",
 	Agent: "auto_allow",
 	AskUserQuestion: "auto_allow",
-	EnterPlanMode: "auto_allow",
-	ExitPlanMode: "auto_allow",
 	Skill: "auto_allow",
 	Bash: "ask",
 	Write: "ask",
@@ -8607,7 +8791,6 @@ const TOOL_NAME_TO_ACTION = {
 /** Inverse table — action label → the representative tool-name pattern. */
 const ACTION_TO_PATTERN = {
 	"run command": "Bash",
-	"run command in plan mode": null,
 	"run background command": "BackgroundRun",
 	"stop background task": "BackgroundStop",
 	"edit file": "Write",
@@ -10852,7 +11035,7 @@ function createDefaultGitCwdWritePolicy() {
 			if (pathClass !== "posix") return void 0;
 			const cwd = agent.config.cwd;
 			if (cwd.length === 0) return void 0;
-			const path = readStringField$2(toolCallContext.args, "path");
+			const path = readStringField$1(toolCallContext.args, "path");
 			if (path === void 0) return void 0;
 			let access;
 			try {
@@ -10884,7 +11067,7 @@ function createDefaultGitCwdWritePolicy() {
 		}
 	};
 }
-function readStringField$2(args, key) {
+function readStringField$1(args, key) {
 	if (args === null || typeof args !== "object") return void 0;
 	const value = args[key];
 	return typeof value === "string" ? value : void 0;
@@ -10910,236 +11093,12 @@ async function hasSymlinkInPath(kaos, cwd, targetPath) {
 	return false;
 }
 function isFileNotFoundError(error) {
-	if (error === null || typeof error !== "object") return false;
-	if (error.name === "KaosFileNotFoundError") return true;
-	const code = error.code;
-	if (code === "ENOENT" || code === "ENOTDIR" || code === 2) return true;
-	const message = error instanceof Error ? error.message : "";
-	return message.includes("ENOENT") || message.includes("ENOTDIR");
-}
-//#endregion
-//#region src/agent/permission/policies/plan.ts
-const EnterPlanModePermissionPolicy = {
-	name: "plan.enter-plan-mode",
-	evaluate({ toolCallContext }) {
-		if (toolCallContext.toolCall.name !== "EnterPlanMode") return void 0;
-		return { kind: "allow" };
-	}
-};
-const ExitPlanModePermissionPolicy = {
-	name: "plan.exit-plan-mode",
-	async evaluate(context) {
-		if (context.toolCallContext.toolCall.name !== "ExitPlanMode") return void 0;
-		if (context.mode === "auto") return { kind: "allow" };
-		const review = await resolveExitPlanModeReview(context);
-		if (review === null) return { kind: "allow" };
-		const action = exitPlanModeAction(review.options);
-		context.agent.telemetry.track("plan_submitted", { has_options: review.options !== void 0 });
-		let result;
-		try {
-			result = await context.agent.rpc.requestApproval({
-				turnId: Number(context.toolCallContext.turnId),
-				toolCallId: context.toolCallContext.toolCall.id,
-				toolName: "ExitPlanMode",
-				action,
-				display: {
-					kind: "plan_review",
-					plan: review.plan,
-					path: review.path,
-					options: review.options
-				}
-			}, { signal: context.toolCallContext.signal });
-		} catch (error) {
-			return {
-				kind: "result",
-				result: { syntheticResult: {
-					isError: true,
-					output: `Plan approval failed: ${error instanceof Error ? error.message : "Plan approval failed."}`
-				} }
-			};
-		}
-		context.recordApprovalResult({
-			turnId: Number(context.toolCallContext.turnId),
-			toolCallId: context.toolCallContext.toolCall.id,
-			toolName: "ExitPlanMode",
-			action,
-			result
-		});
-		trackExitPlanModeResolution(context, result);
-		return exitPlanModeApprovalResult(context, result, review.options);
-	}
-};
-const PlanModeGuardPermissionPolicy = {
-	name: "plan.mode-guard",
-	async evaluate({ agent, toolCallContext }) {
-		if (!agent.planMode.isActive) return void 0;
-		const name = toolCallContext.toolCall.name;
-		const args = toolCallContext.args;
-		if (name === "Write" || name === "Edit") {
-			const path = readStringField$1(args, "path");
-			if (path === void 0) return void 0;
-			const planFilePath = agent.planMode.planFilePath;
-			if (planFilePath !== null && path === planFilePath) {
-				await agent.planMode.materializeCurrentPlanFile();
-				return { kind: "allow" };
-			}
-			return {
-				kind: "result",
-				result: {
-					block: true,
-					reason: `Plan mode is active. You may only write to the current plan file: ${planFilePath ?? "(no plan file selected yet)"}. Call ExitPlanMode to exit plan mode before editing other files.`
-				}
-			};
-		}
-		if (name === "TaskStop") return {
-			kind: "result",
-			result: {
-				block: true,
-				reason: "TaskStop is not available in plan mode. Call ExitPlanMode to exit plan mode before stopping a background task."
-			}
-		};
-	}
-};
-function createPlanPermissionPolicies() {
-	return [
-		EnterPlanModePermissionPolicy,
-		ExitPlanModePermissionPolicy,
-		PlanModeGuardPermissionPolicy
-	];
-}
-async function resolveExitPlanModeReview(context) {
-	if (!context.agent.planMode.isActive) return null;
-	let data;
-	try {
-		data = await context.agent.planMode.data();
-	} catch {
-		return null;
-	}
-	if (data === null || data.content.trim().length === 0) return null;
-	return {
-		plan: data.content,
-		path: data.path,
-		options: exitPlanModeOptions(context.toolCallContext.args)
-	};
-}
-function exitPlanModeApprovalResult(context, result, options) {
-	if (result.decision === "approved") return {
-		kind: "allow",
-		executionMetadata: exitPlanModeExecutionMetadata(selectedExitPlanModeOption(options, result.selectedLabel))
-	};
-	if (result.decision === "cancelled") return {
-		kind: "result",
-		result: { syntheticResult: {
-			isError: false,
-			output: "Plan approval dismissed. Plan mode remains active."
-		} }
-	};
-	if (result.selectedLabel === "Reject and Exit") return {
-		kind: "result",
-		result: { syntheticResult: exitPlanModeForRejectedPlan(context) ?? {
-			isError: true,
-			stopTurn: true,
-			output: "Plan rejected by user. Plan mode deactivated."
-		} }
-	};
-	const feedback = result.feedback ?? "";
-	if (result.selectedLabel === "Revise" || feedback.length > 0) return {
-		kind: "result",
-		result: { syntheticResult: {
-			isError: false,
-			output: feedback.length > 0 ? `User rejected the plan. Feedback:\n\n${feedback}` : "User requested revisions. Plan mode remains active."
-		} }
-	};
-	return {
-		kind: "result",
-		result: { syntheticResult: {
-			isError: true,
-			stopTurn: true,
-			output: "Plan rejected by user. Plan mode remains active."
-		} }
-	};
-}
-function exitPlanModeExecutionMetadata(selectedOption) {
-	return {
-		selectedOption,
-		planTelemetrySubmitted: true,
-		planTelemetryResolved: true
-	};
-}
-function trackExitPlanModeResolution(context, result) {
-	const selectedLabel = result.selectedLabel ?? "";
-	const normalizedSelectedLabel = normalizeOptionLabel(selectedLabel);
-	const hasFeedback = (result.feedback ?? "").length > 0;
-	if (result.decision === "cancelled") {
-		context.agent.telemetry.track("plan_resolved", { outcome: "dismissed" });
-		return;
-	}
-	if (result.decision === "approved") {
-		if (selectedLabel.length > 0) {
-			context.agent.telemetry.track("plan_resolved", {
-				outcome: "approved",
-				chosen_option: selectedLabel
-			});
-			return;
-		}
-		context.agent.telemetry.track("plan_resolved", { outcome: "approved" });
-		return;
-	}
-	if (normalizedSelectedLabel === "reject and exit") {
-		context.agent.telemetry.track("plan_resolved", { outcome: "rejected_and_exited" });
-		return;
-	}
-	if (normalizedSelectedLabel === "revise" || hasFeedback) {
-		context.agent.telemetry.track("plan_resolved", {
-			outcome: "revise",
-			has_feedback: hasFeedback
-		});
-		return;
-	}
-	context.agent.telemetry.track("plan_resolved", { outcome: "rejected" });
-}
-function exitPlanModeForRejectedPlan(context) {
-	try {
-		context.agent.planMode.exit();
-	} catch (error) {
-		return {
-			isError: true,
-			output: `Failed to exit plan mode: ${error instanceof Error ? error.message : "Failed to exit plan mode."}`
-		};
-	}
-}
-function exitPlanModeOptions(args) {
-	if (args === null || typeof args !== "object") return void 0;
-	const options = args.options;
-	if (!Array.isArray(options) || options.length < 2) return void 0;
-	const parsed = [];
-	for (const option of options) {
-		if (option === null || typeof option !== "object") return void 0;
-		const label = option.label;
-		if (typeof label !== "string") return void 0;
-		const description = option.description;
-		if (description !== void 0 && typeof description !== "string") return void 0;
-		parsed.push({
-			label,
-			description: description ?? ""
-		});
-	}
-	return parsed;
-}
-function selectedExitPlanModeOption(options, label) {
-	if (options === void 0 || label === void 0) return void 0;
-	return options.find((option) => option.label === label);
-}
-function exitPlanModeAction(options) {
-	return options !== void 0 && options.length >= 2 ? "Review plan and choose an option" : "Review plan";
-}
-function normalizeOptionLabel(label) {
-	return label.trim().toLowerCase();
-}
-function readStringField$1(args, key) {
-	if (args === null || typeof args !== "object") return void 0;
-	const value = args[key];
-	return typeof value === "string" ? value : void 0;
+	if (error === null || typeof error !== "object") return false;
+	if (error.name === "KaosFileNotFoundError") return true;
+	const code = error.code;
+	if (code === "ENOENT" || code === "ENOTDIR" || code === 2) return true;
+	const message = error instanceof Error ? error.message : "";
+	return message.includes("ENOENT") || message.includes("ENOTDIR");
 }
 //#endregion
 //#region src/agent/permission/policies/yolo-workspace-access.ts
@@ -11198,7 +11157,6 @@ function readStringField(args, key) {
 //#region src/agent/permission/policies/index.ts
 function createBuiltinPermissionPolicies() {
 	return [
-		...createPlanPermissionPolicies(),
 		YoloOutsideWorkspacePermissionPolicy,
 		createDefaultGitCwdWritePolicy(),
 		AskUserQuestionAutoPermissionPolicy
@@ -11274,16 +11232,20 @@ var PermissionManager = class {
 			block: true,
 			reason: this.formatMessage(name, matchedRule?.reason)
 		};
-		const policyResult = await this.evaluatePolicies(context, matchedRule);
-		if (policyResult !== void 0) return this.permissionPolicyResultToPrepare(policyResult, context);
 		if (mode === "auto") {
+			const policyResult = await this.evaluatePolicies(context, matchedRule);
+			if (policyResult !== void 0) return this.permissionPolicyResultToPrepare(policyResult, context);
 			if (this.wouldAskInManualMode(name, args)) this.trackToolApproved(name, "afk");
 			return;
 		}
 		if (mode === "yolo") {
+			const policyResult = await this.evaluatePolicies(context, matchedRule);
+			if (policyResult !== void 0) return this.permissionPolicyResultToPrepare(policyResult, context);
 			if (this.wouldAskInManualMode(name, args)) this.trackToolApproved(name, "yolo");
 			return;
 		}
+		const policyResult = await this.evaluatePolicies(context, matchedRule);
+		if (policyResult !== void 0) return this.permissionPolicyResultToPrepare(policyResult, context);
 		if (decision === "allow") {
 			if (matchedRule?.scope === "session-runtime") this.trackToolApproved(name, "auto_session", "session");
 			return;
@@ -11402,409 +11364,19 @@ var PermissionManager = class {
 		if (scope !== void 0) properties["scope"] = scope;
 		this.agent.telemetry.track("tool_approved", properties);
 	}
-};
-function approvalTelemetryMode(mode) {
-	return mode === "auto" ? "afk" : mode;
-}
-//#endregion
-//#region src/utils/hero-slug.ts
-/** Hero-name slug generator: produces "hero-hero-hero" with collision fallback. */
-const HERO_NAMES = [
-	"iron-man",
-	"spider-man",
-	"captain-america",
-	"thor",
-	"hulk",
-	"black-widow",
-	"hawkeye",
-	"black-panther",
-	"doctor-strange",
-	"scarlet-witch",
-	"vision",
-	"falcon",
-	"war-machine",
-	"ant-man",
-	"wasp",
-	"captain-marvel",
-	"gamora",
-	"star-lord",
-	"groot",
-	"rocket",
-	"drax",
-	"mantis",
-	"nebula",
-	"shang-chi",
-	"moon-knight",
-	"ms-marvel",
-	"she-hulk",
-	"echo",
-	"wolverine",
-	"cyclops",
-	"storm",
-	"jean-grey",
-	"rogue",
-	"beast",
-	"nightcrawler",
-	"colossus",
-	"shadowcat",
-	"jubilee",
-	"cable",
-	"deadpool",
-	"bishop",
-	"magik",
-	"iceman",
-	"archangel",
-	"psylocke",
-	"dazzler",
-	"forge",
-	"havok",
-	"polaris",
-	"emma-frost",
-	"namor",
-	"silver-surfer",
-	"adam-warlock",
-	"nova",
-	"quasar",
-	"sentry",
-	"blue-marvel",
-	"spectrum",
-	"squirrel-girl",
-	"cloak",
-	"dagger",
-	"punisher",
-	"elektra",
-	"luke-cage",
-	"iron-fist",
-	"jessica-jones",
-	"daredevil",
-	"blade",
-	"ghost-rider",
-	"morbius",
-	"venom",
-	"carnage",
-	"silk",
-	"spider-gwen",
-	"miles-morales",
-	"america-chavez",
-	"kate-bishop",
-	"yelena-belova",
-	"white-tiger",
-	"moon-girl",
-	"devil-dinosaur",
-	"amadeus-cho",
-	"riri-williams",
-	"kamala-khan",
-	"sam-alexander",
-	"nova-prime",
-	"medusa",
-	"black-bolt",
-	"crystal",
-	"karnak",
-	"gorgon",
-	"lockjaw",
-	"quake",
-	"mockingbird",
-	"bobbi-morse",
-	"maria-hill",
-	"nick-fury",
-	"phil-coulson",
-	"winter-soldier",
-	"us-agent",
-	"patriot",
-	"speed",
-	"wiccan",
-	"hulkling",
-	"stature",
-	"yellowjacket",
-	"tigra",
-	"hellcat",
-	"valkyrie",
-	"sif",
-	"beta-ray-bill",
-	"hercules",
-	"wonder-man",
-	"taskmaster",
-	"domino",
-	"cannonball",
-	"sunspot",
-	"wolfsbane",
-	"warpath",
-	"multiple-man",
-	"banshee",
-	"siryn",
-	"monet",
-	"rictor",
-	"shatterstar",
-	"longshot",
-	"daken",
-	"x-23",
-	"fantomex",
-	"batman",
-	"superman",
-	"wonder-woman",
-	"flash",
-	"aquaman",
-	"green-lantern",
-	"martian-manhunter",
-	"cyborg",
-	"hawkgirl",
-	"green-arrow",
-	"black-canary",
-	"zatanna",
-	"constantine",
-	"shazam",
-	"blue-beetle",
-	"booster-gold",
-	"firestorm",
-	"atom",
-	"hawkman",
-	"plastic-man",
-	"red-tornado",
-	"starfire",
-	"raven",
-	"beast-boy",
-	"robin",
-	"nightwing",
-	"batgirl",
-	"batwoman",
-	"red-hood",
-	"signal",
-	"orphan",
-	"spoiler",
-	"catwoman",
-	"huntress",
-	"supergirl",
-	"superboy",
-	"power-girl",
-	"steel",
-	"stargirl",
-	"wildcat",
-	"doctor-fate",
-	"mister-terrific",
-	"hourman",
-	"sandman",
-	"spectre",
-	"phantom-stranger",
-	"swamp-thing",
-	"animal-man",
-	"deadman",
-	"vixen",
-	"black-lightning",
-	"static",
-	"icon",
-	"rocket-dc",
-	"captain-atom",
-	"fire",
-	"ice",
-	"elongated-man",
-	"metamorpho",
-	"black-hawk",
-	"crimson-avenger",
-	"doctor-mid-nite",
-	"jakeem-thunder",
-	"mister-miracle",
-	"big-barda",
-	"orion",
-	"lightray",
-	"forager",
-	"killer-frost",
-	"jessica-cruz",
-	"simon-baz",
-	"john-stewart",
-	"guy-gardner",
-	"kyle-rayner",
-	"hal-jordan",
-	"wally-west",
-	"barry-allen",
-	"jay-garrick",
-	"impulse",
-	"kid-flash",
-	"donna-troy",
-	"tempest",
-	"aqualad",
-	"miss-martian",
-	"terra",
-	"jericho",
-	"ravager",
-	"red-star",
-	"pantha",
-	"argent",
-	"damage",
-	"jade",
-	"obsidian",
-	"cyclone",
-	"atom-smasher",
-	"maxima",
-	"starman",
-	"liberty-belle",
-	"dove",
-	"hawk",
-	"blue-devil",
-	"creeper",
-	"ragman",
-	"thunder"
-];
-const MAX_ATTEMPTS = 20;
-function pickHero() {
-	return HERO_NAMES[randomInt(HERO_NAMES.length)];
-}
-function assembleSlug() {
-	return `${pickHero()}-${pickHero()}-${pickHero()}`;
-}
-function generateHeroSlug(id, existing) {
-	let slug = "";
-	let collided = true;
-	for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
-		slug = assembleSlug();
-		if (!existing.has(slug)) {
-			collided = false;
-			break;
-		}
-	}
-	if (collided) slug = `${slug}-${id.slice(0, 8)}`;
-	return slug;
-}
-//#endregion
-//#region src/agent/plan/index.ts
-var PlanMode = class {
-	agent;
-	_isActive = false;
-	_planId = null;
-	_planFilePath = null;
-	constructor(agent) {
-		this.agent = agent;
-	}
-	createPlanId() {
-		return generateHeroSlug(randomUUID(), /* @__PURE__ */ new Set());
-	}
-	async enter(id = this.createPlanId(), createFile = false, emitStatus = true) {
-		if (this._isActive) throw new Error("Already in plan mode");
-		this._isActive = true;
-		this._planId = id;
-		this._planFilePath = null;
-		let enterRecorded = false;
-		try {
-			const planFilePath = this.planFilePathFor(id);
-			this._planFilePath = planFilePath;
-			this.agent.records.logRecord({
-				type: "plan_mode.enter",
-				id
-			});
-			enterRecorded = true;
-			if (createFile) await this.materializePlanFile(planFilePath);
-		} catch (error) {
-			if (enterRecorded) this.cancel(id);
-			else {
-				this._isActive = false;
-				this._planId = null;
-				this._planFilePath = null;
-			}
-			throw error;
-		}
-		this.trackPlanLifecycle("entered");
-		if (emitStatus) this.agent.emitStatusUpdated();
-	}
-	restoreEnter({ id }) {
-		this.agent.replayBuilder.push({
-			type: "plan_updated",
-			enabled: true
-		});
-		this._isActive = true;
-		this._planId = id;
-		this._planFilePath = this.planFilePathFor(id);
-	}
-	cancel(id) {
-		this.agent.records.logRecord({
-			type: "plan_mode.cancel",
-			id
-		});
-		this.agent.replayBuilder.push({
-			type: "plan_updated",
-			enabled: false
-		});
-		this._isActive = false;
-		this._planId = null;
-		this._planFilePath = null;
-		this.agent.emitStatusUpdated();
-	}
-	async clear() {
-		if (!this._planFilePath) return;
-		if (!await this.planFileExists(this._planFilePath)) return;
-		await this.agent.runtime.kaos.writeText(this._planFilePath, "");
-	}
-	exit(id) {
-		this.agent.records.logRecord({
-			type: "plan_mode.exit",
-			id
-		});
-		this.agent.replayBuilder.push({
-			type: "plan_updated",
-			enabled: false
-		});
-		this._isActive = false;
-		this._planId = null;
-		this._planFilePath = null;
-		this.trackPlanLifecycle("exited");
-		this.agent.emitStatusUpdated();
-	}
-	get isActive() {
-		return this._isActive;
-	}
-	get planFilePath() {
-		return this._planFilePath;
-	}
-	async data() {
-		if (!this._planId || !this._planFilePath) return null;
-		let content = "";
-		let exists = true;
-		try {
-			content = await this.agent.runtime.kaos.readText(this._planFilePath);
-		} catch (error) {
-			if (!isMissingFileError(error)) throw error;
-			exists = false;
-		}
-		return {
-			id: this._planId,
-			exists,
-			content,
-			path: this._planFilePath
-		};
-	}
-	async materializeCurrentPlanFile() {
-		if (this._planFilePath === null) return;
-		await this.materializePlanFile(this._planFilePath);
-	}
-	async materializePlanFile(path) {
-		if (await this.planFileExists(path)) return;
-		await this.ensurePlanDirectory(path);
-		await this.agent.runtime.kaos.writeText(path, "");
-		this.trackPlanLifecycle("materialized");
-	}
-	async ensurePlanDirectory(path) {
-		await this.agent.runtime.kaos.mkdir(dirname(path), {
-			parents: true,
-			existOk: true
-		});
-	}
-	planFilePathFor(id) {
-		return join(this.agent.homedir === void 0 ? join(this.agent.config.cwd || this.agent.runtime.kaos.getcwd(), "plan") : join(this.agent.homedir, "plans"), `${id}.md`);
-	}
-	async planFileExists(path) {
-		try {
-			await this.agent.runtime.kaos.readText(path);
-			return true;
-		} catch (error) {
-			if (isMissingFileError(error)) return false;
-			throw error;
+	restoreRecord(record) {
+		switch (record.type) {
+			case "permission.set_mode":
+				this.setMode(record.mode);
+				break;
+			case "permission.record_approval_result":
+				this.recordApprovalResult(record);
+				break;
 		}
 	}
-	trackPlanLifecycle(stage) {
-		this.agent.telemetry?.track?.("plan_file_lifecycle", { stage });
-	}
 };
-function isMissingFileError(error) {
-	if (error === null || typeof error !== "object") return false;
-	return error.code === "ENOENT";
+function approvalTelemetryMode(mode) {
+	return mode === "auto" ? "afk" : mode;
 }
 //#endregion
 //#region src/agent/records/persistence.ts
@@ -11923,83 +11495,12 @@ function parseRecordLine(line, lineNumber, filePath, allowTruncated) {
 }
 //#endregion
 //#region src/agent/records/index.ts
-function restoreAgentRecord(agent, input) {
-	switch (input.type) {
-		case "metadata": return;
-		case "turn.prompt":
-			agent.turn.restorePrompt();
-			return;
-		case "turn.steer":
-			agent.turn.restoreSteer(input.input, input.origin);
-			return;
-		case "turn.cancel":
-			agent.turn.cancel(input.turnId);
-			return;
-		case "background.stop": return;
-		case "config.update":
-			agent.config.update(input);
-			return;
-		case "permission.set_mode":
-			agent.permission.setMode(input.mode);
-			return;
-		case "permission.record_approval_result":
-			agent.permission.recordApprovalResult(input);
-			return;
-		case "usage.record":
-			agent.usage.record(input.model, input.usage, "session");
-			return;
-		case "full_compaction.begin":
-			agent.fullCompaction.begin(input);
-			return;
-		case "full_compaction.cancel":
-			agent.fullCompaction.cancel();
-			return;
-		case "full_compaction.complete":
-			agent.fullCompaction.complete(input);
-			return;
-		case "plan_mode.enter":
-			agent.planMode.restoreEnter(input);
-			return;
-		case "plan_mode.cancel":
-			agent.planMode.cancel(input.id);
-			return;
-		case "plan_mode.exit":
-			agent.planMode.exit(input.id);
-			return;
-		case "context.append_message":
-			agent.context.appendMessage(input.message);
-			return;
-		case "context.mark_last_user_prompt_blocked":
-			agent.context.markLastUserPromptBlocked(input.hookEvent);
-			return;
-		case "context.append_loop_event":
-			agent.context.appendLoopEvent(input.event);
-			return;
-		case "context.clear":
-			agent.context.clear();
-			return;
-		case "context.apply_compaction":
-			agent.context.applyCompaction(input);
-			return;
-		case "tools.register_user_tool":
-			agent.tools.registerUserTool(input);
-			return;
-		case "tools.unregister_user_tool":
-			agent.tools.unregisterUserTool(input.name);
-			return;
-		case "tools.set_active_tools":
-			agent.tools.setActiveTools(input.names);
-			return;
-		case "tools.update_store":
-			agent.tools.updateStore(input.key, input.value);
-			return;
-	}
-}
 var AgentRecords = class {
 	agent;
 	persistence;
 	_restoring = false;
 	metadataInitialized = false;
+	handlers = {};
 	constructor(agent, persistence) {
 		this.agent = agent;
 		this.persistence = persistence;
@@ -12007,6 +11508,9 @@ var AgentRecords = class {
 	get restoring() {
 		return this._restoring;
 	}
+	registerHandlers(handlers) {
+		this.handlers = { ...handlers };
+	}
 	logRecord(record) {
 		if (this._restoring) return;
 		const stamped = record.time !== void 0 ? record : {
@@ -12027,11 +11531,30 @@ var AgentRecords = class {
 	restore(record) {
 		this._restoring = true;
 		try {
-			restoreAgentRecord(this.agent, record);
+			this.routeToHandler(record);
 		} finally {
 			this._restoring = false;
 		}
 	}
+	routeToHandler(record) {
+		const handlerKey = this.getHandlerKey(record.type);
+		if (handlerKey === null || this.handlers[handlerKey] === void 0) return;
+		this.handlers[handlerKey].restoreRecord(record);
+	}
+	getHandlerKey(recordType) {
+		if (recordType === "metadata") return null;
+		return {
+			context: "context",
+			config: "config",
+			turn: "turn",
+			permission: "permission",
+			tools: "tools",
+			usage: "usage",
+			background: "background",
+			full_compaction: "fullCompaction",
+			plan_mode: "planMode"
+		}[recordType.split(".")[0]] ?? null;
+	}
 	async replay() {
 		if (!this.persistence) throw new Error("No persistence provided for AgentRecords");
 		let migrations = [];
@@ -12397,7 +11920,7 @@ async function prepareToolCall(step, call) {
 	const decision = await runPrepareToolExecutionHook(step, call);
 	if (decision.kind === "blocked") {
 		await dispatchToolCall(step, call, decision.args);
-		return { task: makeResolvedToolCallTask(makeErrorToolResult(call, decision.args, decision.output)) };
+		return { task: makeResolvedToolCallTask(makeErrorToolResult(call, decision.args, decision.output, decision.blockedReason)) };
 	}
 	if (decision.kind === "hookFailed") {
 		await dispatchToolCall(step, call, decision.args);
@@ -12433,10 +11956,13 @@ async function prepareToolCall(step, call) {
 	}
 	await dispatchToolCall(step, call, effectiveArgs, toolCallDisplayFieldsFromExecution(execution));
 	if (step.signal.aborted) return { task: makeResolvedToolCallTask(makeErrorToolResult(call, effectiveArgs, `Tool "${call.toolName}" was aborted`)) };
-	if (execution.isError === true) return {
-		task: makeResolvedToolCallTask(makeToolResult(call, effectiveArgs, execution)),
-		stopBatchAfterThis: execution.stopTurn
-	};
+	if (execution.isError === true) {
+		const coerced = coerceToolResult(execution, call.toolName);
+		return {
+			task: makeResolvedToolCallTask(makeToolResult(call, effectiveArgs, coerced)),
+			stopBatchAfterThis: toolResultStopsTurn(coerced)
+		};
+	}
 	return { task: {
 		accesses: execution.accesses ?? ToolAccesses.all(),
 		start: async () => ({ result: runRunnableToolCall(step, call, effectiveArgs, decision.metadata, execution) })
@@ -12491,7 +12017,8 @@ async function runPrepareToolExecutionHook(step, call) {
 	if (hookResult?.block === true) return {
 		kind: "blocked",
 		args: effectiveArgs,
-		output: hookResult.reason ?? `Tool call "${call.toolName}" was blocked`
+		output: hookResult.reason ?? `Tool call "${call.toolName}" was blocked`,
+		blockedReason: hookResult.blockedReason
 	};
 	if (hookResult?.syntheticResult !== void 0) return {
 		kind: "synthetic",
@@ -12653,10 +12180,15 @@ function normalizeToolResult(r) {
 		const textJoined = r.output.filter((c) => c.type === "text").map((c) => c.text).join("");
 		output = textJoined.length > 0 ? textJoined : TOOL_OUTPUT_EMPTY;
 	}
-	return r.isError === true ? {
+	if (r.isError === true) return r.blockedReason !== void 0 ? {
+		output,
+		isError: true,
+		blockedReason: r.blockedReason
+	} : {
 		output,
 		isError: true
-	} : { output };
+	};
+	return { output };
 }
 function makeToolResult(call, args, result) {
 	return {
@@ -12670,10 +12202,11 @@ function makeToolResult(call, args, result) {
 function toolResultStopsTurn(result) {
 	return result.isError === true && result.stopTurn === true;
 }
-function makeErrorToolResult(call, args, output) {
+function makeErrorToolResult(call, args, output, blockedReason) {
 	return makeToolResult(call, args, {
 		output,
-		isError: true
+		isError: true,
+		blockedReason
 	});
 }
 /**
@@ -12772,7 +12305,9 @@ async function executeLoopStep(deps) {
 		step: currentStep,
 		usage,
 		finishReason: effectiveStopReason,
-		...stepEndProviderDiagnostics(response, effectiveStopReason)
+		...stepEndProviderDiagnostics(response, effectiveStopReason),
+		...response.llmFirstTokenLatencyMs !== void 0 ? { llmFirstTokenLatencyMs: response.llmFirstTokenLatencyMs } : {},
+		...response.llmStreamDurationMs !== void 0 ? { llmStreamDurationMs: response.llmStreamDurationMs } : {}
 	});
 	if (hooks?.afterStep !== void 0) try {
 		await hooks.afterStep({
@@ -14038,8 +13573,6 @@ var ToolManager = class {
 			new GlobTool(kaos, workspace),
 			new BashTool(kaos, cwd, osEnv, background, { allowBackground }),
 			(modelCapabilities.image_in || modelCapabilities.video_in) && new ReadMediaFileTool(kaos, workspace, modelCapabilities, videoUploader),
-			new EnterPlanModeTool(this.agent),
-			new ExitPlanModeTool(this.agent),
 			new AskUserQuestionTool(this.agent),
 			new TodoListTool(this.toolStore),
 			new TaskListTool(background),
@@ -14062,11 +13595,87 @@ var ToolManager = class {
 		return (input) => withProviderRequestAuth(resolveAuth, (auth) => uploadVideo(input, { auth }));
 	}
 	get loopTools() {
+		const builtinNames = [...this.builtinTools.keys()].filter((name) => this.enabledTools.has(name)).sort();
+		const userNames = [...this.userTools.keys()].filter((name) => this.enabledTools.has(name)).sort();
 		const mcpNames = [...this.mcpTools.keys()].filter((name) => this.isMcpToolEnabled(name));
-		return uniq([...this.enabledTools, ...mcpNames]).toSorted((a, b) => a.localeCompare(b)).map((name) => this.userTools.get(name) ?? this.mcpTools.get(name)?.tool ?? this.builtinTools.get(name)).filter((tool) => !!tool);
+		return [
+			...builtinNames.map((name) => this.builtinTools.get(name)),
+			...userNames.map((name) => this.userTools.get(name)),
+			...mcpNames.map((name) => this.mcpTools.get(name)?.tool)
+		].filter((tool) => !!tool);
+	}
+	restoreRecord(record) {
+		switch (record.type) {
+			case "tools.register_user_tool":
+				this.registerUserTool(record);
+				break;
+			case "tools.unregister_user_tool":
+				this.unregisterUserTool(record.name);
+				break;
+			case "tools.set_active_tools":
+				this.setActiveTools(record.names);
+				break;
+			case "tools.update_store":
+				this.updateStore(record.key, record.value);
+				break;
+		}
 	}
 };
 //#endregion
+//#region src/agent/cache-staking/index.ts
+const DEFAULT_SIZE_THRESHOLD = 2e3;
+/**
+* Apply cache staking hints to a message array based on turn boundaries.
+*
+* - **Stake 3**: Tags the last assistant message of the previous turn with
+*   `cacheHint.isLastTurnEnd = true`.
+* - **Stake 4** (conditional): Tags the largest content block in the current
+*   turn that exceeds `sizeThreshold` with `cacheHint.isSuddenLargeContext = true`.
+*
+* Returns a new array with shallow-copied messages (original messages are
+* not mutated).
+*/
+function applyCacheStaking(messages, context) {
+	const { previousTurnMessageCount, sizeThreshold = DEFAULT_SIZE_THRESHOLD } = context;
+	if (previousTurnMessageCount <= 0 || messages.length === 0) return messages;
+	const result = messages.map((msg) => ({ ...msg }));
+	const lastTurnIndex = previousTurnMessageCount - 1;
+	if (lastTurnIndex < result.length) {
+		const lastTurnMsg = result[lastTurnIndex];
+		if (lastTurnMsg.role === "assistant") {
+			const existingHint = lastTurnMsg.cacheHint ?? {};
+			result[lastTurnIndex] = {
+				...lastTurnMsg,
+				cacheHint: {
+					...existingHint,
+					isLastTurnEnd: true
+				}
+			};
+		}
+	}
+	let largestIndex = -1;
+	let largestSize = 0;
+	for (let i = previousTurnMessageCount; i < result.length; i++) {
+		const contentLength = result[i].content.filter((p) => p.type === "text").reduce((sum, p) => sum + p.text.length, 0);
+		if (contentLength >= sizeThreshold && contentLength > largestSize) {
+			largestSize = contentLength;
+			largestIndex = i;
+		}
+	}
+	if (largestIndex >= 0) {
+		const target = result[largestIndex];
+		const existingHint = target.cacheHint ?? {};
+		result[largestIndex] = {
+			...target,
+			cacheHint: {
+				...existingHint,
+				isSuddenLargeContext: true
+			}
+		};
+	}
+	return result;
+}
+//#endregion
 //#region src/agent/turn/canonical-args.ts
 /**
 * JSON canonicalization used by tool-call telemetry and dedup.
@@ -14088,6 +13697,231 @@ function isPlainRecord(value) {
 	return proto === Object.prototype || proto === null;
 }
 //#endregion
+//#region src/prompt-plan/builder.ts
+/**
+* Cache boundary marker used to split the system prompt into cacheable blocks.
+*
+* @deprecated This marker is deprecated in favor of implicit boundaries based on section headers.
+* It is still supported for backward compatibility.
+*/
+const CACHE_BOUNDARY_MARKER = "__CACHE_BOUNDARY__";
+/**
+* Section headers that define implicit cache boundaries.
+*
+* These headers mark natural breaks in the system prompt where cache boundaries should be placed:
+* - "# Project Information" marks the start of project-specific content
+* - "# Skills" marks the start of session-specific skills listing
+*/
+const IMPLICIT_BOUNDARY_HEADERS = ["# Project Information", "# Skills"];
+/**
+* Block names by position.
+*
+* - First block (before first marker): 'base'
+* - Last block (after last marker): 'sessionContext'
+* - Intermediate blocks: Sequential names from 'projectInstructions', 'skillsListing', etc.
+*/
+const BLOCK_NAMES = [
+	"base",
+	"projectInstructions",
+	"skillsListing",
+	"sessionContext"
+];
+/**
+* Get the cache scope for a block by its position.
+*
+* @param position - The block position (0-indexed)
+* @param totalBlocks - Total number of blocks
+* @returns The default cache scope for this position
+*/
+function getDefaultScopeForPosition(position, totalBlocks) {
+	if (position === 0) return "global";
+	if (position === totalBlocks - 1) return "session";
+	if (position === 1) return "project";
+	return "session";
+}
+/**
+* Filter cache scope based on provider's supported scopes.
+*
+* @param scope - The desired cache scope
+* @param capability - The provider's cache capability
+* @returns The filtered scope (or 'none' if not supported)
+*/
+function filterScopeByCapability(scope, capability) {
+	if (capability.strategy === "none") return "none";
+	if (capability.supportedScopes === void 0) return scope;
+	if (capability.supportedScopes.includes(scope)) return scope;
+	return "none";
+}
+/**
+* Find implicit boundary positions in the system prompt.
+*
+* Searches for section headers that mark natural cache boundaries.
+* Returns sorted indices of where each boundary header starts.
+*
+* @param prompt - The system prompt to search
+* @returns Array of character positions where implicit boundaries occur
+*/
+function findImplicitBoundaries(prompt) {
+	const boundaries = [];
+	for (const header of IMPLICIT_BOUNDARY_HEADERS) {
+		const index = prompt.indexOf(header);
+		if (index !== -1) boundaries.push(index);
+	}
+	return boundaries.sort((a, b) => a - b);
+}
+/**
+* Split prompt by implicit boundaries into blocks.
+*
+* Creates blocks based on the position of section headers that mark natural boundaries.
+* The block before the first header is the base block.
+* Blocks between headers are intermediate blocks.
+* The block after the last header is the session context block.
+*
+* @param prompt - The system prompt to split
+* @param boundaryPositions - Sorted array of boundary positions
+* @returns Array of text blocks
+*/
+function splitByImplicitBoundaries(prompt, boundaryPositions) {
+	if (boundaryPositions.length === 0) return [prompt];
+	const blocks = [];
+	let previousPosition = 0;
+	for (const position of boundaryPositions) {
+		blocks.push(prompt.slice(previousPosition, position));
+		previousPosition = position;
+	}
+	blocks.push(prompt.slice(previousPosition));
+	return blocks;
+}
+/**
+* Detect if a prompt contains implicit cache boundaries.
+*
+* A prompt has implicit boundaries if it contains any of the known boundary headers.
+*
+* @param prompt - The system prompt to check
+* @returns true if implicit boundaries are detected
+*/
+function hasImplicitBoundaries(prompt) {
+	return IMPLICIT_BOUNDARY_HEADERS.some((header) => prompt.includes(header));
+}
+/**
+* Build a prompt plan from a rendered system prompt and provider cache capability.
+*
+* This function parses cache boundary markers from the system prompt and creates
+* a structured plan with named blocks, each with an appropriate cache scope.
+*
+* @param renderedSystemPrompt - The fully rendered system prompt (may contain `__CACHE_BOUNDARY__` markers)
+* @param providerCacheCapability - The provider's cache capability (for scope filtering)
+* @returns A prompt plan with cacheable blocks
+*
+* @example
+* ```ts
+* const prompt = `Base instructions
+* __CACHE_BOUNDARY__
+* Session context`;
+*
+* const capability = {
+*   strategy: 'explicit-block',
+*   supportedScopes: ['global', 'session'],
+* };
+*
+* const plan = buildPromptPlan(prompt, capability);
+* // {
+* //   blocks: [
+* //     { name: 'base', text: 'Base instructions\n', cacheScope: 'global' },
+* //     { name: 'sessionContext', text: 'Session context', cacheScope: 'session' },
+* //   ],
+* // }
+* ```
+*/
+/**
+* Normalize block text by handling newlines around cache boundaries.
+*
+* After splitting by `__CACHE_BOUNDARY__`, the pattern is typically:
+* - `[text]\n__CACHE_BOUNDARY__\n[next text]`
+*
+* Rules:
+* - First block: Keep as-is (preserves any trailing newline before marker)
+* - Middle blocks: Keep the newline that was between markers
+* - Last block: Trim leading newline (the one immediately after the last marker)
+*
+* @param text - The raw block text after splitting
+* @param index - The block index
+* @param totalBlocks - Total number of blocks
+* @returns Normalized block text
+*/
+function normalizeBlockText(text, index, totalBlocks) {
+	if (index === 0) return text;
+	if (index === totalBlocks - 1) {
+		if (text.startsWith("\n")) return text.slice(1);
+		return text;
+	}
+	return text;
+}
+function buildPromptPlan(renderedSystemPrompt, providerCacheCapability) {
+	const parts = renderedSystemPrompt.split(CACHE_BOUNDARY_MARKER);
+	if (parts.length > 1) return createPlanFromParts(parts, providerCacheCapability);
+	if (hasImplicitBoundaries(renderedSystemPrompt)) return createPlanFromParts(splitByImplicitBoundaries(renderedSystemPrompt, findImplicitBoundaries(renderedSystemPrompt)), providerCacheCapability);
+	return { blocks: [{
+		name: "base",
+		text: renderedSystemPrompt,
+		cacheScope: "none"
+	}] };
+}
+/**
+* Create a prompt plan from pre-split parts.
+*
+* This is shared logic for both explicit and implicit boundaries.
+*
+* @param parts - The pre-split text parts
+* @param providerCacheCapability - The provider's cache capability
+* @returns A prompt plan with cacheable blocks
+*/
+function createPlanFromParts(parts, providerCacheCapability) {
+	const blocks = parts.map((part, index) => {
+		const totalBlocks = parts.length;
+		const filteredScope = filterScopeByCapability(getDefaultScopeForPosition(index, totalBlocks), providerCacheCapability);
+		return {
+			name: getBlockNameForPart(part, index, totalBlocks),
+			text: normalizeBlockText(part, index, totalBlocks),
+			cacheScope: filteredScope
+		};
+	});
+	const maxCacheable = providerCacheCapability.maxCacheableBlocks;
+	if (maxCacheable !== void 0 && maxCacheable > 0) {
+		let cacheableCount = 0;
+		for (const block of blocks) if (block.cacheScope !== "none") {
+			cacheableCount++;
+			if (cacheableCount > maxCacheable) block.cacheScope = "none";
+		}
+	}
+	return { blocks };
+}
+/**
+* Get the block name for a given part, considering its content.
+*
+* This is a smarter version of getBlockName that looks at the content
+* to determine the appropriate name for the last block.
+*
+* @param part - The text content of this block
+* @param position - The block position (0-indexed)
+* @param totalBlocks - Total number of blocks
+* @returns The block name
+*/
+function getBlockNameForPart(part, position, totalBlocks) {
+	if (position === 0) return "base";
+	if (position === totalBlocks - 1) {
+		if (part.includes("# Skills")) return "sessionContext";
+		if (part.includes("# Project Information")) return "projectInstructions";
+		return "sessionContext";
+	}
+	const nameIndex = position - 1 + 1;
+	if (nameIndex < BLOCK_NAMES.length && nameIndex < BLOCK_NAMES.length - 1) {
+		const name = BLOCK_NAMES[nameIndex];
+		if (name !== void 0) return name;
+	}
+	return "sessionContext";
+}
+//#endregion
 //#region src/agent/turn/kosong-llm.ts
 /**
 * Kosong-backed implementation of the loop `LLM` interface.
@@ -14134,7 +13968,7 @@ var KosongLLM = class {
 			systemPrompt: this.systemPrompt,
 			tools: params.tools
 		});
-		const result = await this.generate(effectiveProvider, this.systemPrompt, [...params.tools], [...params.messages], callbacks, generateOptions(params));
+		const result = await this.generate(effectiveProvider, this.systemPrompt, [...params.tools], [...params.messages], callbacks, generateOptions(params, this.systemPrompt, effectiveProvider));
 		if (params.onTextPart !== void 0 || params.onThinkPart !== void 0) {
 			for (const part of result.message.content) if (part.type === "text" && params.onTextPart !== void 0) await params.onTextPart(part);
 			else if (part.type === "think" && params.onThinkPart !== void 0) await params.onThinkPart(part);
@@ -14143,7 +13977,9 @@ var KosongLLM = class {
 			toolCalls: [...result.message.toolCalls],
 			...result.finishReason !== null ? { providerFinishReason: result.finishReason } : {},
 			...result.rawFinishReason !== null ? { rawFinishReason: result.rawFinishReason } : {},
-			usage: result.usage ?? emptyUsage()
+			usage: result.usage ?? emptyUsage(),
+			...result.llmFirstTokenLatencyMs !== void 0 ? { llmFirstTokenLatencyMs: result.llmFirstTokenLatencyMs } : {},
+			...result.llmStreamDurationMs !== void 0 ? { llmStreamDurationMs: result.llmStreamDurationMs } : {}
 		};
 	}
 	isRetryableError(error) {
@@ -14158,14 +13994,30 @@ var KosongLLM = class {
 		].includes(error.statusCode);
 	}
 };
-function generateOptions(params) {
-	const options = { signal: params.signal };
+function generateOptions(params, systemPrompt, provider) {
+	const promptPlan = buildPromptPlan(systemPrompt, getProviderCacheCapability(provider));
+	const options = {
+		signal: params.signal,
+		promptPlan
+	};
 	if (params.requestLogContext !== void 0) return {
 		...options,
 		[GENERATE_REQUEST_LOG_CONTEXT]: params.requestLogContext
 	};
 	return options;
 }
+/**
+* Get the cache capability from a provider.
+*
+* Safely handles providers that don't implement getCapability or don't have cache.
+* Returns a default capability with 'none' strategy for non-caching providers.
+*/
+function getProviderCacheCapability(provider) {
+	if (typeof provider.getCapability !== "function") return { strategy: "none" };
+	const capability = provider.getCapability();
+	if (capability?.cache !== void 0) return capability.cache;
+	return { strategy: "none" };
+}
 function buildKosongCallbacks(params) {
 	const toolCallIdentities = /* @__PURE__ */ new Map();
 	const pendingIndexedToolCallDeltas = /* @__PURE__ */ new Map();
@@ -14412,6 +14264,7 @@ var TurnFlow = class {
 	agent;
 	steerBuffer = [];
 	turnId = -1;
+	_previousTurnMessageCount = 0;
 	activeTurn = null;
 	toolCallStartedAt = /* @__PURE__ */ new Map();
 	toolCallDupType = /* @__PURE__ */ new Map();
@@ -14456,6 +14309,7 @@ var TurnFlow = class {
 			return null;
 		}
 		this.turnId += 1;
+		this._previousTurnMessageCount = this.agent.context.messages.length;
 		this.currentStep = 0;
 		this.stepToolCallKeys.clear();
 		this.toolCallDupType.clear();
@@ -14692,7 +14546,10 @@ var TurnFlow = class {
 						generate: this.agent.generate,
 						completionBudgetConfig
 					}),
-					buildMessages: () => this.agent.context.messages,
+					buildMessages: () => {
+						const messages = this.agent.context.messages;
+						return applyCacheStaking(messages, { previousTurnMessageCount: this._previousTurnMessageCount });
+					},
 					dispatchEvent: this.buildDispatchEvent(turnId),
 					tools: this.agent.tools.loopTools,
 					log: this.agent.log,
@@ -14798,7 +14655,7 @@ var TurnFlow = class {
 	buildDispatchEvent(turnId) {
 		return createLoopEventDispatcher({
 			appendTranscriptRecord: async (event) => {
-				this.agent.context.appendLoopEvent(event);
+				await this.agent.context.appendLoopEvent(event);
 			},
 			emitLiveEvent: (event) => {
 				this.trackLoopTelemetry(event, turnId);
@@ -14884,12 +14741,25 @@ var TurnFlow = class {
 		});
 	}
 	telemetryMode() {
-		return this.agent.planMode.isActive ? "plan" : "agent";
+		return "agent";
 	}
 	shouldTrackApiError(turnId) {
 		const failure = this.stepFailureByTurn.get(turnId);
 		return failure?.reason === "error" && failure.activeStep !== void 0;
 	}
+	restoreRecord(record) {
+		switch (record.type) {
+			case "turn.prompt":
+				if (this.activeTurn === "resuming") this.activeTurn = null;
+				this.restorePrompt();
+				break;
+			case "turn.steer":
+				if (this.activeTurn === "resuming") this.activeTurn = null;
+				this.restoreSteer(record.input, record.origin);
+				break;
+			case "turn.cancel": break;
+		}
+	}
 };
 function mapLoopEvent(event, turnId) {
 	switch (event.type) {
@@ -14907,7 +14777,9 @@ function mapLoopEvent(event, turnId) {
 			usage: event.usage,
 			finishReason: event.finishReason,
 			providerFinishReason: event.providerFinishReason,
-			rawFinishReason: event.rawFinishReason
+			rawFinishReason: event.rawFinishReason,
+			...event.llmFirstTokenLatencyMs !== void 0 ? { llmFirstTokenLatencyMs: event.llmFirstTokenLatencyMs } : {},
+			...event.llmStreamDurationMs !== void 0 ? { llmStreamDurationMs: event.llmStreamDurationMs } : {}
 		};
 		case "step.retrying": return {
 			type: "turn.step.retrying",
@@ -14932,13 +14804,17 @@ function mapLoopEvent(event, turnId) {
 			description: event.description,
 			display: event.display
 		};
-		case "tool.result": return {
-			type: "tool.result",
-			turnId,
-			toolCallId: event.toolCallId,
-			output: event.result.output,
-			isError: event.result.isError
-		};
+		case "tool.result": {
+			const blockedReason = event.result.isError === true ? event.result.blockedReason : void 0;
+			return {
+				type: "tool.result",
+				turnId,
+				toolCallId: event.toolCallId,
+				output: event.result.output,
+				isError: event.result.isError,
+				blockedReason
+			};
+		}
 		case "turn.interrupted":
 			if (event.activeStep === void 0) return void 0;
 			return {
@@ -15120,10 +14996,12 @@ var UsageRecorder = class {
 		const byModel = this.byModelSnapshot();
 		const hasByModel = Object.keys(byModel).length > 0;
 		const currentTurn = this.currentTurn;
+		const total = hasByModel ? totalUsage(byModel) : void 0;
 		return {
 			byModel: hasByModel ? byModel : void 0,
-			total: hasByModel ? totalUsage(byModel) : void 0,
-			currentTurn: currentTurn === void 0 ? void 0 : copyUsage(currentTurn)
+			total,
+			currentTurn: currentTurn === void 0 ? void 0 : copyUsage(currentTurn),
+			cacheHitRate: total !== void 0 ? cacheHitRate(total) : void 0
 		};
 	}
 	status() {
@@ -15134,6 +15012,13 @@ var UsageRecorder = class {
 	byModelSnapshot() {
 		return Object.fromEntries(Object.entries(this.byModel).map(([model, usage]) => [model, copyUsage(usage)]));
 	}
+	restoreRecord(record) {
+		switch (record.type) {
+			case "usage.record":
+				this.record(record.model, record.usage, "session");
+				break;
+		}
+	}
 };
 function totalUsage(byModel) {
 	let total;
@@ -15161,7 +15046,6 @@ var Agent = class {
 	turn;
 	injection;
 	permission;
-	planMode;
 	usage;
 	tools;
 	background;
@@ -15185,12 +15069,11 @@ var Agent = class {
 			this.emitRecordsWriteError(error);
 		} }) : void 0));
 		this.fullCompaction = new FullCompaction(this, config.compactionStrategy);
-		this.context = new ContextMemory(this);
+		this.context = new ContextMemory(this, config.sessionId);
 		this.config = new ConfigState(this);
 		this.turn = new TurnFlow(this);
 		this.injection = new InjectionManager(this);
 		this.permission = new PermissionManager(this, config.permission);
-		this.planMode = new PlanMode(this);
 		this.usage = new UsageRecorder(this);
 		this.tools = new ToolManager(this);
 		this.background = new BackgroundManager(this, {
@@ -15198,6 +15081,15 @@ var Agent = class {
 			sessionDir: config.backgroundSessionDir
 		});
 		this.replayBuilder = new ReplayBuilder(this);
+		this.records.registerHandlers({
+			context: this.context,
+			config: this.config,
+			usage: this.usage,
+			turn: this.turn,
+			permission: this.permission,
+			tools: this.tools,
+			fullCompaction: this.fullCompaction
+		});
 	}
 	get generate() {
 		return async (provider, systemPrompt, tools, history, callbacks, options) => {
@@ -15218,7 +15110,7 @@ var Agent = class {
 	}
 	logLlmRequest(provider, systemPrompt, tools, history, options) {
 		const context = buildLlmRequestContext(options);
-		const configMetadata = buildLlmConfigMetadata(provider, this.config.modelAlias, systemPrompt, tools);
+		const configMetadata = buildLlmConfigMetadata(provider, this.config.modelAlias, systemPrompt, tools, options);
 		this.logLlmConfigIfChanged(context, configMetadata, buildLlmConfigSignature(configMetadata, systemPrompt, tools));
 		this.log.info("llm request", {
 			...context,
@@ -15239,7 +15131,6 @@ var Agent = class {
 			osEnv: this.runtime.osEnv,
 			cwd,
 			skills: this.skills?.registry,
-			cwdListing: context?.cwdListing,
 			agentsMd: context?.agentsMd
 		});
 		this.config.update({
@@ -15249,11 +15140,15 @@ var Agent = class {
 		this.tools.setActiveTools(profile.tools);
 	}
 	async resume() {
-		const result = await this.records.replay();
-		await this.background.loadFromDisk();
-		await this.background.reconcile();
-		this.turn.finishResume();
-		return result;
+		try {
+			const result = await this.records.replay();
+			await this.background.loadFromDisk();
+			await this.background.reconcile();
+			this.turn.finishResume();
+			return result;
+		} catch (error) {
+			return { error: error instanceof Error ? error : new Error(String(error)) };
+		}
 	}
 	get rpcMethods() {
 		return {
@@ -15298,12 +15193,14 @@ var Agent = class {
 				return this.config.modelAlias ?? "";
 			},
 			enterPlan: async () => {
-				await this.planMode.enter();
+				throw new ByfError(ErrorCodes.NOT_IMPLEMENTED, "Plan mode has been removed");
 			},
-			cancelPlan: (payload) => {
-				this.planMode.cancel(payload.id);
+			cancelPlan: async () => {
+				throw new ByfError(ErrorCodes.NOT_IMPLEMENTED, "Plan mode has been removed");
+			},
+			clearPlan: async () => {
+				throw new ByfError(ErrorCodes.NOT_IMPLEMENTED, "Plan mode has been removed");
 			},
-			clearPlan: () => this.planMode.clear(),
 			beginCompaction: (payload) => {
 				this.fullCompaction.begin({
 					source: "manual",
@@ -15338,7 +15235,7 @@ var Agent = class {
 			getContext: () => this.context.data(),
 			getConfig: () => this.config.data(),
 			getPermission: () => this.permission.data(),
-			getPlan: () => this.planMode.data(),
+			getPlan: async () => null,
 			getUsage: () => this.usage.data(),
 			getTools: () => this.tools.data(),
 			getBackground: (payload) => this.background.list(payload.activeOnly ?? false, payload.limit)
@@ -15362,7 +15259,6 @@ var Agent = class {
 			contextTokens,
 			maxContextTokens,
 			contextUsage,
-			planMode: this.planMode.isActive,
 			permission: this.permission.mode,
 			usage
 		});
@@ -15408,8 +15304,8 @@ function buildLlmRequestMetadata(systemPrompt, tools, history) {
 	if (partialMessageCount > 0) metadata.partialMessageCount = partialMessageCount;
 	return metadata;
 }
-function buildLlmConfigMetadata(provider, modelAlias, systemPrompt, tools) {
-	return {
+function buildLlmConfigMetadata(provider, modelAlias, systemPrompt, tools, options) {
+	const metadata = {
 		provider: provider.name,
 		model: provider.modelName,
 		modelAlias,
@@ -15417,6 +15313,30 @@ function buildLlmConfigMetadata(provider, modelAlias, systemPrompt, tools) {
 		systemPromptChars: systemPrompt.length,
 		toolCount: tools.length
 	};
+	const providerCacheStrategy = getProviderCacheStrategy(provider);
+	if (providerCacheStrategy !== void 0) metadata.providerCacheStrategy = providerCacheStrategy;
+	const promptPlan = options?.promptPlan;
+	if (promptPlan !== void 0 && promptPlan.blocks.length > 0) metadata.cacheBlockHashes = extractCacheBlockHashes(promptPlan);
+	return metadata;
+}
+/**
+* Get the cache strategy from a provider's capability.
+*
+* Safely handles providers that don't implement getCapability or don't have cache.
+*/
+function getProviderCacheStrategy(provider) {
+	if (typeof provider.getCapability !== "function") return;
+	return provider.getCapability()?.cache?.strategy;
+}
+/**
+* Extract cache block hashes from a PromptPlan.
+*
+* Returns a Record mapping block names to their SHA256 hashes.
+*/
+function extractCacheBlockHashes(promptPlan) {
+	const hashes = {};
+	for (const block of promptPlan.blocks) hashes[block.name] = fingerprint(block.text);
+	return hashes;
 }
 function buildLlmConfigSignature(metadata, systemPrompt, tools) {
 	const toolsForSignature = tools.map(({ name, description, parameters }) => ({
@@ -15452,8 +15372,7 @@ function proxyWithExtraPayload(methods, extraPayload) {
 //#region src/config/schema.ts
 const ProviderTypeSchema = z.enum([
 	"anthropic",
-	"openai",
-	"openai-compat",
+	"openai-completions",
 	"google-genai",
 	"openai_responses",
 	"vertexai"
@@ -15463,6 +15382,7 @@ const OAuthRefSchema = z.object({
 	key: z.string().min(1)
 });
 const StringRecordSchema = z.record(z.string(), z.string());
+const ExtraBodySchema = z.record(z.string(), z.unknown());
 const ProviderConfigSchema = z.object({
 	type: ProviderTypeSchema,
 	apiKey: z.string().optional(),
@@ -15471,7 +15391,8 @@ const ProviderConfigSchema = z.object({
 	thinkingEffortKey: z.string().optional(),
 	oauth: OAuthRefSchema.optional(),
 	env: StringRecordSchema.optional(),
-	customHeaders: StringRecordSchema.optional()
+	customHeaders: StringRecordSchema.optional(),
+	extraBody: ExtraBodySchema.optional()
 });
 const ModelAliasSchema = z.object({
 	provider: z.string(),
@@ -15488,7 +15409,13 @@ const ThinkingConfigSchema = z.object({
 		"on",
 		"off"
 	]).optional(),
-	effort: z.string().optional()
+	effort: z.enum([
+		"low",
+		"medium",
+		"high",
+		"xhigh",
+		"max"
+	]).optional()
 });
 const PermissionModeSchema = z.enum([
 	"yolo",
@@ -15587,11 +15514,9 @@ const ByfConfigSchema = z.object({
 	defaultModel: z.string().optional(),
 	models: z.record(z.string(), ModelAliasSchema).optional(),
 	thinking: ThinkingConfigSchema.optional(),
-	planMode: z.boolean().optional(),
 	yolo: z.boolean().optional(),
 	defaultThinking: z.boolean().optional(),
 	defaultPermissionMode: PermissionModeSchema.optional(),
-	defaultPlanMode: z.boolean().optional(),
 	permission: PermissionConfigSchema.optional(),
 	hooks: z.array(HookDefSchema).optional(),
 	services: ServicesConfigSchema.optional(),
@@ -15599,7 +15524,6 @@ const ByfConfigSchema = z.object({
 	extraSkillDirs: z.array(z.string()).optional(),
 	loopControl: LoopControlSchema.optional(),
 	background: BackgroundConfigSchema.optional(),
-	telemetry: z.boolean().optional(),
 	raw: z.record(z.string(), z.unknown()).optional()
 });
 const ProviderConfigPatchSchema = ProviderConfigSchema.partial();
@@ -15619,19 +15543,16 @@ const ByfConfigPatchSchema = z.object({
 	defaultModel: z.string().optional(),
 	models: z.record(z.string(), ModelAliasPatchSchema).optional(),
 	thinking: ThinkingConfigPatchSchema.optional(),
-	planMode: z.boolean().optional(),
 	yolo: z.boolean().optional(),
 	defaultThinking: z.boolean().optional(),
 	defaultPermissionMode: PermissionModeSchema.optional(),
-	defaultPlanMode: z.boolean().optional(),
 	permission: PermissionConfigPatchSchema.optional(),
 	hooks: z.array(HookDefSchema).optional(),
 	services: ServicesConfigPatchSchema.optional(),
 	mergeAllAvailableSkills: z.boolean().optional(),
 	extraSkillDirs: z.array(z.string()).optional(),
 	loopControl: LoopControlPatchSchema.optional(),
-	background: BackgroundConfigPatchSchema.optional(),
-	telemetry: z.boolean().optional()
+	background: BackgroundConfigPatchSchema.optional()
 }).strict();
 function getDefaultConfig() {
 	return { providers: {} };
@@ -15888,14 +15809,11 @@ function configToTomlData(config) {
 	for (const key of [
 		"defaultProvider",
 		"defaultModel",
-		"planMode",
 		"yolo",
 		"defaultThinking",
 		"defaultPermissionMode",
-		"defaultPlanMode",
 		"mergeAllAvailableSkills",
-		"extraSkillDirs",
-		"telemetry"
+		"extraSkillDirs"
 	]) setDefined(out, camelToSnake(key), config[key]);
 	setRecordSection(out, "providers", config.providers, providerToToml);
 	setRecordSection(out, "models", config.models, modelToToml);
@@ -16905,6 +16823,11 @@ var summary_continuation_default = "Your previous response was too brief. Please
 * agent receives a technically complete handoff.
 */
 const SUMMARY_MIN_LENGTH = 200;
+/**
+* Soft upper bound (characters) communicated to the subagent via prompt so
+* it self-regulates summary length. Not enforced at runtime.
+*/
+const SUMMARY_MAX_LENGTH = 8e3;
 const SUMMARY_CONTINUATION_ATTEMPTS = 1;
 const HOOK_TEXT_PREVIEW_LENGTH = 500;
 const SUBAGENT_MAX_TOKENS_ERROR = "Subagent turn failed before completing its final summary: reason=max_tokens";
@@ -17017,7 +16940,7 @@ var SessionSubagentHost = class {
 			options.signal.throwIfAborted();
 			await this.triggerSubagentStart(parent, profileName, options.prompt, options.signal);
 			options.signal.throwIfAborted();
-			let childPrompt = options.prompt;
+			let childPrompt = `${`Summary length constraint: minimum ${SUMMARY_MIN_LENGTH} characters, maximum ${SUMMARY_MAX_LENGTH} characters.`}\n\n${options.prompt}`;
 			if (profileName === "explore") {
 				const gitContext = await collectGitContext(child.runtime.kaos, child.config.cwd);
 				if (gitContext) childPrompt = `${gitContext}\n\n${childPrompt}`;
@@ -17177,11 +17100,19 @@ var Session = class {
 		const { agents } = await this.readMetadata();
 		this.agents.clear();
 		let warning;
+		const failedAgents = [];
 		const resumeTasks = Object.keys(agents).map(async (id) => {
 			const result = await this.ensureResumeAgentInstantiated(id, agents).resume();
 			if (result.warning !== void 0 && warning === void 0) warning = result.warning;
+			if (result.error !== void 0) failedAgents.push({
+				id,
+				error: result.error
+			});
 		});
 		await Promise.all(resumeTasks);
+		const mainAgentFailure = failedAgents.find(({ id }) => id === "main");
+		if (mainAgentFailure !== void 0) throw mainAgentFailure.error;
+		for (const { id, error } of failedAgents) this.log.warn(`Sub agent "${id}" failed to resume: ${error.message}`);
 		const resumeWarning = warning;
 		const main = this.agents.get("main");
 		const profile = DEFAULT_AGENT_PROFILES["agent"];
@@ -19304,6 +19235,9 @@ function resolveModelCapabilities(alias, provider) {
 		audio_in: has("audio_in") || providerCapability.audio_in,
 		thinking: has("thinking") || has("always_thinking") || providerCapability.thinking,
 		tool_use: has("tool_use") || providerCapability.tool_use,
+		thinking_effort: has("thinking_effort") || providerCapability.thinking_effort,
+		thinking_xhigh: has("thinking_xhigh") || providerCapability.thinking_xhigh,
+		thinking_max: has("thinking_max") || providerCapability.thinking_max,
 		max_context_tokens: alias.maxContextSize
 	};
 }
@@ -19317,33 +19251,31 @@ function toKosongProviderConfig(provider, model, byfRequestHeaders, maxOutputSiz
 			...maxOutputSize !== void 0 ? { defaultMaxTokens: maxOutputSize } : {},
 			...defaultHeadersField(provider.customHeaders)
 		};
-		case "openai": return {
-			type: "openai",
-			model,
-			baseUrl: providerValue(provider.baseUrl, provider.env, "OPENAI_BASE_URL"),
-			apiKey: providerApiKey(provider),
-			reasoningKey,
-			...defaultHeadersField(provider.customHeaders)
-		};
-		case "openai-compat": {
+		case "openai-completions": {
 			const defaultHeaders = {
 				...byfRequestHeaders,
 				...provider.customHeaders
 			};
+			const generationKwargs = {
+				prompt_cache_key: promptCacheKey,
+				extra_body: provider.extraBody
+			};
 			if (Object.keys(defaultHeaders).length === 0) return {
-				type: "openai-compat",
+				type: "openai-completions",
 				model,
 				baseUrl: providerValue(provider.baseUrl, provider.env, "BYF_BASE_URL"),
+				reasoningKey,
 				thinkingEffortKey: provider.thinkingEffortKey,
-				generationKwargs: { prompt_cache_key: promptCacheKey },
+				generationKwargs,
 				apiKey: providerApiKey(provider)
 			};
 			return {
-				type: "openai-compat",
+				type: "openai-completions",
 				model,
 				baseUrl: providerValue(provider.baseUrl, provider.env, "BYF_BASE_URL"),
+				reasoningKey,
 				thinkingEffortKey: provider.thinkingEffortKey,
-				generationKwargs: { prompt_cache_key: promptCacheKey },
+				generationKwargs,
 				defaultHeaders,
 				apiKey: providerApiKey(provider)
 			};
@@ -19395,9 +19327,8 @@ function providerForCapabilityProbe(provider) {
 function providerApiKey(provider) {
 	switch (provider.type) {
 		case "anthropic": return providerValue(provider.apiKey, provider.env, "ANTHROPIC_API_KEY");
-		case "openai":
 		case "openai_responses": return providerValue(provider.apiKey, provider.env, "OPENAI_API_KEY");
-		case "openai-compat": return providerValue(provider.apiKey, provider.env, "BYF_API_KEY");
+		case "openai-completions": return providerValue(provider.apiKey, provider.env, "BYF_API_KEY");
 		case "google-genai": return providerValue(provider.apiKey, provider.env, "GOOGLE_API_KEY");
 		case "vertexai": return nonEmptyString$1(provider.apiKey) ?? envValue(provider.env, "VERTEXAI_API_KEY") ?? envValue(provider.env, "GOOGLE_API_KEY");
 		default: {
@@ -19527,7 +19458,7 @@ function resolveRuntimeThinkingRequest(requestedThinking, defaultThinking) {
 }
 //#endregion
 //#region src/rpc/core-impl.ts
-const BYF_CODE_PROVIDER_NAME = "managed:byf";
+const BYF_CODE_PROVIDER_NAME = "byf";
 var ByfCore = class {
 	rpcClient;
 	sdk;
@@ -19554,7 +19485,7 @@ var ByfCore = class {
 		this.byfRequestHeaders = options.byfRequestHeaders;
 		this.resolveOAuthTokenProvider = options.resolveOAuthTokenProvider;
 		this.skillDirs = options.skillDirs ?? [];
-		this.telemetry = options.telemetry ?? noopTelemetryClient;
+		this.telemetry = noopTelemetryClient;
 		ensureByfHome(this.homeDir);
 		this.providerManager = new ProviderManager({
 			config: readConfigFile(this.configPath),
@@ -19597,7 +19528,7 @@ var ByfCore = class {
 			permissionRules: config.permission?.rules,
 			skills: this.resolveSessionSkillConfig(config),
 			mcpConfig,
-			telemetry: withTelemetryContext(this.telemetry, { sessionId: summary.id })
+			telemetry: this.telemetry
 		});
 		try {
 			session.metadata = {
@@ -19617,7 +19548,6 @@ var ByfCore = class {
 				thinkingLevel
 			});
 			if (permissionMode !== void 0) mainAgent.permission.setMode(permissionMode);
-			if (config.defaultPlanMode === true) await mainAgent.planMode.enter();
 			await session.writeMetadata();
 			await session.flushMetadata();
 		} catch (error) {
@@ -19659,7 +19589,7 @@ var ByfCore = class {
 			permissionRules: config.permission?.rules,
 			skills: this.resolveSessionSkillConfig(config),
 			mcpConfig,
-			telemetry: withTelemetryContext(this.telemetry, { sessionId: summary.id }),
+			telemetry: this.telemetry,
 			initializeMainAgent: false
 		});
 		let warning;
@@ -19668,7 +19598,6 @@ var ByfCore = class {
 			await this.refreshSessionRuntimeConfig(session, config);
 		} catch (error) {
 			await session.close().catch(() => {});
-			withTelemetryContext(this.telemetry, { sessionId: summary.id }).track("session_load_failed", { reason: telemetryErrorReason(error) });
 			throw error;
 		}
 		this.sessions.set(summary.id, session);
@@ -19939,11 +19868,6 @@ function requiredWorkDir(operation, value) {
 function createSessionId() {
 	return `session_${randomUUID()}`;
 }
-function telemetryErrorReason(error) {
-	if (error instanceof ByfError) return error.code;
-	if (error instanceof Error && error.name.length > 0) return error.name;
-	return typeof error;
-}
 async function resumeSessionResult(summary, session, warning) {
 	const api = new SessionAPIImpl(session);
 	const agents = {};
@@ -19951,7 +19875,6 @@ async function resumeSessionResult(summary, session, warning) {
 		const config = await api.getConfig({ agentId });
 		const context = await api.getContext({ agentId });
 		const permission = await api.getPermission({ agentId });
-		const plan = await api.getPlan({ agentId });
 		const usage = await api.getUsage({ agentId });
 		agents[agentId] = {
 			type: agent.type,
@@ -19959,7 +19882,7 @@ async function resumeSessionResult(summary, session, warning) {
 			context,
 			replay: agent.replayBuilder.buildResult(),
 			permission,
-			plan,
+			plan: null,
 			usage,
 			tools: await api.getTools({ agentId }),
 			toolStore: agent.tools.storeData(),
@@ -20018,4 +19941,4 @@ function parsePositiveInt(value) {
 	return n;
 }
 //#endregion
-export { AGENT_WIRE_PROTOCOL_VERSION, Agent, BYF_ERROR_INFO, BackgroundConfigSchema, ByfConfigPatchSchema, ByfConfigSchema, ByfCore, ByfError, ByfServiceConfigSchema, ErrorCodes, HookDefSchema, LoopControlSchema, MCP_OAUTH_AUTHORIZATION_URL_TOOL_UPDATE, McpServerConfigSchema, McpServerHttpConfigSchema, McpServerStdioConfigSchema, ModelAliasSchema, OAuthRefSchema, PermissionConfigSchema, PermissionModeSchema, PermissionRuleDecisionSchema, PermissionRuleSchema, PermissionRuleScopeSchema, ProviderConfigSchema, ProviderTypeSchema, ServicesConfigSchema, Session, SessionSubagentHost, ThinkingConfigSchema, USER_PROMPT_ORIGIN, WIRE_PROTOCOL_VERSION, buildExportManifest, collectFilesRecursive, configToTomlData, createRPC, ensureByfHome, ensureConfigFile, exportSessionDirectory, flushDiagnosticLogs, formatConfigValidationError, fromByfErrorPayload, getDefaultConfig, getRootLogger, isByfError, log, makeErrorPayload, mergeConfigPatch, noopTelemetryClient, normalizeTimestampMs, parseBooleanEnv, parseConfigString, proxyWithExtraPayload, readConfigFile, redact, resolveByfHome, resolveConfigPath, resolveConfigValue, resolveGlobalLogPath, resolveLoggingConfig, scanSessionWire, toByfErrorPayload, transformTomlData, validateConfig, withTelemetryContext, writeConfigFile, writeExportZip };
+export { AGENT_WIRE_PROTOCOL_VERSION, Agent, BYF_ERROR_INFO, BackgroundConfigSchema, ByfConfigPatchSchema, ByfConfigSchema, ByfCore, ByfError, ByfServiceConfigSchema, ErrorCodes, HookDefSchema, LoopControlSchema, MCP_OAUTH_AUTHORIZATION_URL_TOOL_UPDATE, McpServerConfigSchema, McpServerHttpConfigSchema, McpServerStdioConfigSchema, ModelAliasSchema, OAuthRefSchema, PermissionConfigSchema, PermissionModeSchema, PermissionRuleDecisionSchema, PermissionRuleSchema, PermissionRuleScopeSchema, ProviderConfigSchema, ProviderTypeSchema, ServicesConfigSchema, Session, SessionSubagentHost, ThinkingConfigSchema, USER_PROMPT_ORIGIN, WIRE_PROTOCOL_VERSION, buildExportManifest, buildPromptPlan, collectFilesRecursive, configToTomlData, createRPC, ensureByfHome, ensureConfigFile, exportSessionDirectory, flushDiagnosticLogs, formatConfigValidationError, fromByfErrorPayload, getDefaultConfig, getRootLogger, isByfError, log, makeErrorPayload, mergeConfigPatch, normalizeTimestampMs, parseBooleanEnv, parseConfigString, proxyWithExtraPayload, readConfigFile, redact, resolveByfHome, resolveConfigPath, resolveConfigValue, resolveGlobalLogPath, resolveLoggingConfig, scanSessionWire, toByfErrorPayload, transformTomlData, validateConfig, writeConfigFile, writeExportZip };