@xiaoso/dsh-tool-plus 0.1.0-beta.3 → 0.1.0-beta.4

package/lib/index.mjs

@@ -1,10 +1,11 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { n as fs_promises_shim_exports, t as exists } from "./fs-promises-shim-B-9cMxz5.mjs";
-import { A as truncateToWidth$1, C as capParseErrors, D as LRUCache, E as shortenPath, M as isSettingsInitialized, N as settings, O as padding, P as OMP_DEFAULTS, S as convertFileWithMarkit, T as formatParseErrors, _ as extractWithParallel, a as fetchBinary, b as ensureTool, g as looksLikeHtml, h as loadPage, i as convertWithMarkit, j as Settings, k as replaceTabs, o as MAX_BYTES, s as MAX_OUTPUT_CHARS, u as finalizeOutput, v as findParallelApiKey, w as formatCodeFrameLine, x as CONVERTIBLE_EXTENSIONS, y as getParallelExtractContent } from "./utils-W8WdSBpX.mjs";
-import { $ as untilAborted, A as formatAge, C as error, F as $envpos, I as $flag, M as formatCount, P as $env, S as debug, T as warn, U as getAutoQaDbPath, V as VERSION, Y as getRemoteDir, Z as isProbablyBinary, b as isEnotdir, c as combineSignals, d as $which, j as formatBytes$2, k as installBunShim, l as exec, p as readImageMetadata, q as getInstallId, u as render, v as hasFsCode, y as isEnoent } from "./src-DTid0g4K.mjs";
+import { n as fs_promises_shim_exports, t as exists } from "./fs-promises-shim-Bx0fpxuk.mjs";
+import { A as formatAge, C as error, F as $envpos, I as $flag, M as formatCount, P as $env, Q as peekFile, S as debug, T as warn, U as getAutoQaDbPath, V as VERSION, Y as getRemoteDir, Z as isProbablyBinary, b as isEnotdir, c as combineSignals, d as $which, et as untilAborted, j as formatBytes$1, k as installBunShim, l as exec, p as readImageMetadata, q as getInstallId, u as render, v as hasFsCode, y as isEnoent } from "./src-BgpusnsB.mjs";
+import { A as shortenPath, C as Settings, D as capParseErrors, E as OMP_DEFAULTS, M as padding, N as replaceTabs, O as formatCodeFrameLine, P as truncateToWidth$1, S as convertFileWithMarkit, T as settings, _ as extractWithParallel, a as fetchBinary, b as ensureTool, g as looksLikeHtml, h as loadPage, i as convertWithMarkit, j as LRUCache, k as formatParseErrors, o as MAX_BYTES, s as MAX_OUTPUT_CHARS, u as finalizeOutput, v as findParallelApiKey, w as isSettingsInitialized, x as CONVERTIBLE_EXTENSIONS, y as getParallelExtractContent } from "./utils-CZw4tVZQ.mjs";
+import { t as sanitizeText } from "./sanitize-text-CfcXzw5X.mjs";
 import { n as isRecord$2 } from "./type-guards-B9VVjRDK.mjs";
-import { a as openArchive, c as sniffArchiveFormat, d as writeArchive, f as ToolAbortError, i as listArchiveRoot, m as throwIfAborted, o as parseArchivePathCandidates, p as ToolError$1, r as formatArchiveEntryLines, s as readArchiveEntries, t as archiveFormatFromPath } from "./zip-D6QXpvaJ.mjs";
+import { a as openArchive, c as sniffArchiveFormat, d as writeArchive, f as ToolAbortError, i as listArchiveRoot, m as throwIfAborted, o as parseArchivePathCandidates, p as ToolError, r as formatArchiveEntryLines, s as readArchiveEntries, t as archiveFormatFromPath } from "./zip-Cg9ANN_U.mjs";
 import * as path from "node:path";
 import { TOOL_ABORTED, defineTool } from "@deepseek-ai/dsh-tools";
 import { HarnessError } from "@deepseek-ai/dsh-llm";
@@ -24,7 +25,207 @@ import z from "@deepseek-ai/schemastery";
 import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
 import { type } from "@oh-my-pi/omptype";
 import { DatabaseSync } from "node:sqlite";
+//#region src/tools/bash/shell-tokenize.ts
+/**
+* Returns the flat shell command segments with the original text of each. Unlike
+* `tokenizeShellSegments`, this preserves quoting and escaping so the results
+* are safe to match against user-configured regular expressions, and flags
+* segments that receive piped stdin.
+*
+* The extractor deliberately declines to split syntax whose execution context
+* cannot be determined with this small scanner (heredocs, command substitution,
+* backticks, grouping, and malformed quoting). Callers must still check the
+* complete input in that case.
+*/
+function extractFlatShellCommandSegments(command) {
+	const segments = [];
+	let segmentStart = 0;
+	let inSingle = false;
+	let inDouble = false;
+	let atWordStart = true;
+	let currentPiped = false;
+	const pushSegment = (end) => {
+		const segment = command.slice(segmentStart, end).trim();
+		if (segment.length === 0) return false;
+		segments.push({
+			text: segment,
+			pipedStdin: currentPiped
+		});
+		return true;
+	};
+	for (let i = 0; i < command.length; i++) {
+		const ch = command[i];
+		if (inSingle) {
+			if (ch === "'") inSingle = false;
+			continue;
+		}
+		if (inDouble) {
+			if (ch === "\\") {
+				if (i + 1 >= command.length) return [];
+				i++;
+				continue;
+			}
+			if (ch === "\"") {
+				inDouble = false;
+				continue;
+			}
+			if (ch === "`" || ch === "$" && command[i + 1] === "(") return [];
+			continue;
+		}
+		if (ch === "'") {
+			inSingle = true;
+			atWordStart = false;
+			continue;
+		}
+		if (ch === "\"") {
+			inDouble = true;
+			atWordStart = false;
+			continue;
+		}
+		if (ch === "\\") {
+			if (i + 1 >= command.length) return [];
+			i++;
+			atWordStart = false;
+			continue;
+		}
+		if (ch === "`" || ch === "(" || ch === ")" || ch === "$" && command[i + 1] === "(" || ch === "$" && command[i + 1] === "{" || ch === "<" && command[i + 1] === "<" || (ch === "{" || ch === "}") && atWordStart && (command[i + 1] === void 0 || /[ \t\n;]/.test(command[i + 1]))) return [];
+		if (ch === "#" && atWordStart) {
+			const pushed = pushSegment(i);
+			const newline = command.indexOf("\n", i + 1);
+			if (newline === -1) return segments;
+			i = newline;
+			segmentStart = newline + 1;
+			atWordStart = true;
+			if (pushed) currentPiped = false;
+			continue;
+		}
+		const isRedirectionOperatorCharacter = ch === "|" ? command[i - 1] === ">" : ch === "&" ? command[i - 1] === ">" || command[i - 1] === "<" || command[i + 1] === ">" : false;
+		if ((ch === "\n" || ch === ";" || ch === "|" || ch === "&") && !isRedirectionOperatorCharacter) {
+			const pushed = pushSegment(i);
+			const doubled = (ch === "|" || ch === "&") && command[i + 1] === ch;
+			const pipeStderr = ch === "|" && command[i + 1] === "&";
+			if (doubled || pipeStderr) i++;
+			if (pushed || ch !== "\n") currentPiped = ch === "|" && !doubled;
+			segmentStart = i + 1;
+			atWordStart = true;
+			continue;
+		}
+		atWordStart = ch === " " || ch === "	";
+	}
+	if (inSingle || inDouble) return [];
+	pushSegment(command.length);
+	return segments;
+}
+/**
+* Shell metacharacters that end an unquoted `cd` target token. A redirect,
+* extra argument, or any operator in this set means the leading construct is
+* more than a bare `cd <path>`, so extraction must bail.
+*/
+const CD_TARGET_TERMINATORS = {
+	" ": true,
+	"	": true,
+	"\n": true,
+	"\r": true,
+	"&": true,
+	"|": true,
+	";": true,
+	"<": true,
+	">": true,
+	"(": true,
+	")": true
+};
+/**
+* Parses a leading `cd <path> && ...` prefix so the bash tool can route the
+* target through its structured `cwd` parameter when the model omits it.
+*
+* Returns the single path token (quotes and backslash escapes resolved to their
+* literal value) and the command remainder after the top-level `&&`, or `null`
+* when the command does not begin with exactly `cd`, one path token, and a
+* top-level `&&`. The scanner deliberately bails on anything else in the prefix
+* — redirects (`cd /tmp 2>/dev/null && ...`), extra arguments, or paths needing
+* shell expansion (`$`, backticks, `(`) — leaving the whole command for the
+* shell instead of absorbing shell syntax into `cwd`.
+*/
+function extractLeadingCdTarget(command) {
+	const prefix = /^cd[ \t]+/.exec(command);
+	if (!prefix) return null;
+	let i = prefix[0].length;
+	let path = "";
+	let inSingle = false;
+	let inDouble = false;
+	for (; i < command.length; i++) {
+		const ch = command[i];
+		if (inSingle) {
+			if (ch === "'") {
+				inSingle = false;
+				continue;
+			}
+			path += ch;
+			continue;
+		}
+		if (inDouble) {
+			if (ch === "\\" && i + 1 < command.length) {
+				const next = command[i + 1];
+				if (next === "\n" || next === "\r") return null;
+				if (next === "\"" || next === "\\" || next === "$" || next === "`") {
+					path += next;
+					i++;
+					continue;
+				}
+			}
+			if (ch === "\"") {
+				inDouble = false;
+				continue;
+			}
+			path += ch;
+			continue;
+		}
+		if (ch === "'") {
+			inSingle = true;
+			continue;
+		}
+		if (ch === "\"") {
+			inDouble = true;
+			continue;
+		}
+		if (ch === "\\" && i + 1 < command.length) {
+			if (command[i + 1] === "\n" || command[i + 1] === "\r") return null;
+			path += command[i + 1];
+			i++;
+			continue;
+		}
+		if (CD_TARGET_TERMINATORS[ch]) break;
+		path += ch;
+	}
+	if (inSingle || inDouble || path.length === 0) return null;
+	if (/[$`(]/.test(path)) return null;
+	while (command[i] === " " || command[i] === "	") i++;
+	if (command[i] !== "&" || command[i + 1] !== "&") return null;
+	i += 2;
+	while (command[i] === " " || command[i] === "	") i++;
+	return {
+		path,
+		rest: command.slice(i)
+	};
+}
+//#endregion
 //#region src/tools/bash/bash-interceptor.ts
+/**
+* Bash intent interceptor - redirects common shell patterns to proper tools.
+*
+* When an LLM calls bash with patterns like `grep`, `cat`, `find`, etc.,
+* this interceptor provides helpful error messages directing them to use
+* the specialized tools instead.
+*/
+/**
+* 规则表对齐上游 refs/oh-my-pi/packages/coding-agent/src/config/settings-schema.ts:325-387（10 条）。
+* 既有 6 条（read/grep/glob/edit×3）语义与消息文案保持不变；新增 echo/printf 重定向 → write（上游 :356-367）。
+* hub 类 3 条（nohup/后台语法、dev/start 服务、--watch，上游 :368-386）按映射决策加入：
+* pattern 逐字照抄；tool hub → bash（DSH 等价受管机制 = bash 工具 run_in_background:true，
+* startBashJob → jobs 注册表 → job_output 读输出 / job_kill 停止）；文案改写为 run_in_background 引导。
+* DSH 无 hub 的 stdin-send/restart/跨实例观察能力，属有意不移植。
+* `bashInterceptor.patterns` 配置键不在本次范围，未引入。
+*/
 const DEFAULT_BASH_INTERCEPTOR_RULES = [
 	{
 		pattern: "^\\s*(cat|head|tail|less|more)\\s+",
@@ -55,6 +256,26 @@ const DEFAULT_BASH_INTERCEPTOR_RULES = [
 		pattern: "^\\s*awk\\s+.*-i\\s+inplace",
 		tool: "edit",
 		message: "Use the `edit` tool instead of awk -i inplace. It provides diff preview and fuzzy matching."
+	},
+	{
+		pattern: "^\\s*(echo|printf|cat\\s*<<)\\s+(?:(?:[^\"'>]|\"[^\"]*\"|'[^']*')|(?<!\\|)>{1,2}\\|?\\s*(?:\"/dev/(?:null|tty|stdout|stderr)\"|'/dev/(?:null|tty|stdout|stderr)'|/dev/(?:null|tty|stdout|stderr))(?:[\\s;&|]|$))*(?<!\\|)>{1,2}\\|?\\s*(?!(?:\"/dev/(?:null|tty|stdout|stderr)\"|'/dev/(?:null|tty|stdout|stderr)'|/dev/(?:null|tty|stdout|stderr))(?:[\\s;&|]|$))[$\\w./~\"'-]",
+		tool: "write",
+		message: "Use the `write` tool instead of echo/cat redirection. It handles encoding and provides confirmation."
+	},
+	{
+		pattern: "^\\s*nohup\\s+|(?<!&)\\&\\s*$",
+		tool: "bash",
+		message: "Use the bash tool with `run_in_background: true` instead of nohup/background shell syntax, so the process runs as a managed background job (job id returned immediately; result delivered on completion; stop with job_kill) instead of an untracked detached process."
+	},
+	{
+		pattern: "^\\s*(?:(?:bun|npm|pnpm|yarn)\\s+(?:run\\s+)?(?:dev|start)(?:\\s|$)|(?:vite|next\\s+dev|nuxt\\s+dev|nodemon|lldb|gdb|tail\\s+-f)(?:\\s|$)|docker\\s+compose\\s+up(?!.*(?:\\s-d(?:\\s|$)|--detach))(?:\\s|$))",
+		tool: "bash",
+		message: "Run services, watchers, and debuggers via the bash tool with `run_in_background: true` so their output, lifecycle, and exit stay observable as a background job (job_output / job_kill) instead of hanging the foreground call."
+	},
+	{
+		pattern: "^\\s*(?:(?:bun|npm|pnpm|yarn)\\s+(?:run\\s+)?\\S+|cargo\\s+watch|watchexec|pytest|vitest|jest|tsc)(?:.|\\n)*(?:--watch|-w)(?:\\s|$)",
+		tool: "bash",
+		message: "Run watch mode via the bash tool with `run_in_background: true` so its output, input, and lifecycle stay managed as a background job (job_output / job_kill)."
 	}
 ];
 /**
@@ -73,6 +294,73 @@ function compileRules(rules) {
 	}
 	return compiled;
 }
+/** Finds the end of a shell word, respecting quotes and escapes; returns null for incomplete syntax. */
+function skipShellWord(command, start) {
+	let inSingle = false;
+	let inDouble = false;
+	for (let i = start; i < command.length; i++) {
+		const ch = command[i];
+		if (inSingle) {
+			if (ch === "'") inSingle = false;
+			continue;
+		}
+		if (inDouble) {
+			if (ch === "\\") {
+				if (i + 1 >= command.length) return null;
+				i++;
+				continue;
+			}
+			if (ch === "\"") inDouble = false;
+			continue;
+		}
+		if (ch === "'") {
+			inSingle = true;
+			continue;
+		}
+		if (ch === "\"") {
+			inDouble = true;
+			continue;
+		}
+		if (ch === "\\") {
+			if (i + 1 >= command.length) return null;
+			i++;
+			continue;
+		}
+		if (ch === " " || ch === "	") return i;
+	}
+	return inSingle || inDouble ? null : command.length;
+}
+/** Removes leading `NAME=value` assignments without interpreting shell syntax. */
+function withoutLeadingEnvironmentAssignments(command) {
+	let index = 0;
+	let foundAssignment = false;
+	while (index < command.length) {
+		while (command[index] === " " || command[index] === "	") index++;
+		const assignmentStart = index;
+		if (!/[A-Za-z_]/.test(command[index] ?? "")) break;
+		let nameEnd = index + 1;
+		while (/[A-Za-z0-9_]/.test(command[nameEnd] ?? "")) nameEnd++;
+		if (command[nameEnd] !== "=") return foundAssignment ? command.slice(assignmentStart).trimStart() : null;
+		const wordEnd = skipShellWord(command, nameEnd + 1);
+		if (wordEnd === null) return null;
+		foundAssignment = true;
+		index = wordEnd;
+		if (index === command.length) return null;
+	}
+	if (!foundAssignment) return null;
+	const commandWithoutAssignments = command.slice(index).trimStart();
+	return commandWithoutAssignments.length > 0 ? commandWithoutAssignments : null;
+}
+function interceptionCandidates(command) {
+	const candidates = [command.trim()];
+	for (const segment of extractFlatShellCommandSegments(command)) {
+		if (segment.pipedStdin) continue;
+		candidates.push(segment.text);
+		const withoutAssignments = withoutLeadingEnvironmentAssignments(segment.text);
+		if (withoutAssignments) candidates.push(withoutAssignments);
+	}
+	return candidates;
+}
 /**
 * Check if a bash command should be intercepted.
 *
@@ -80,16 +368,19 @@ function compileRules(rules) {
 * @param availableTools Set of tool names that are available
 * @returns InterceptionResult indicating if the command should be blocked
 */
-function checkBashInterception(command, availableTools, rules = DEFAULT_BASH_INTERCEPTOR_RULES) {
-	const normalizedCommand = command.trim();
+function checkBashInterception(command, availableTools, rules = DEFAULT_BASH_INTERCEPTOR_RULES, originalCommand = command) {
 	const compiled = compileRules(rules);
+	const candidates = interceptionCandidates(command);
 	for (const { rule, regex } of compiled) {
 		if (!availableTools.includes(rule.tool)) continue;
-		if (regex.test(normalizedCommand)) return {
-			block: true,
-			message: `Blocked: ${rule.message}\n\nOriginal command: ${command}`,
-			suggestedTool: rule.tool
-		};
+		for (const candidate of candidates) {
+			regex.lastIndex = 0;
+			if (regex.test(candidate)) return {
+				block: true,
+				message: `Blocked: ${rule.message}\n\nOriginal command: ${originalCommand}`,
+				suggestedTool: rule.tool
+			};
+		}
 	}
 	return { block: false };
 }
@@ -110,7 +401,49 @@ function runtimeLogger() {
 	return current;
 }
 //#endregion
-//#region src/tools/bash/non-interactive-env.ts
+//#region src/tools/bash/which.ts
+/**
+* Minimal PATH (+ PATHEXT on Windows) executable lookup, standing in for
+* `Bun.which` / pi-utils `$which` on the Node runtime.
+*
+* Why this exists: pi-utils' `$which` calls `Bun.which` at module top level
+* (node_modules @oh-my-pi/pi-utils src/which.ts:196), which the bun-shim does
+* not provide — so DSH code that must resolve executables the way OMP does
+* (procmgr `resolveWindowsShell` for shell discovery, `REJECT_PROMPT_COMMAND`
+* in non-interactive-env) uses this scanner instead. Single implementation —
+* any new caller resolves executables through here, never hand-rolls a PATH
+* walk.
+* @module @xiaoso/dsh-tool-plus/bash/which
+*/
+/** Windows default extension order when PATHEXT is unset. */
+const WIN32_DEFAULT_PATHEXT = ".COM;.EXE;.BAT;.CMD";
+/** True when `command` carries its own directory component. */
+function hasPathSeparator(command) {
+	return command.includes("/") || command.includes("\\");
+}
+/**
+* Resolve `command` against PATH the way `Bun.which` would: absolute/relative
+* candidates are returned as-is when they name an existing file; bare names
+* are looked up in each PATH dir (appending PATHEXT extensions on win32, in
+* order). Returns the first existing regular file, or `undefined`.
+*/
+function findOnPath(command, env = process.env) {
+	if (command.length === 0) return void 0;
+	if (hasPathSeparator(command)) try {
+		return fs.statSync(command).isFile() ? path.resolve(command) : void 0;
+	} catch {
+		return;
+	}
+	const dirs = (env.PATH ?? "").split(path.delimiter).filter(Boolean);
+	const extensions = process.platform === "win32" ? (env.PATHEXT && env.PATHEXT.length > 0 ? env.PATHEXT : WIN32_DEFAULT_PATHEXT).split(";").filter(Boolean) : [];
+	const candidates = process.platform === "win32" ? [command, ...extensions.map((ext) => command + ext)] : [command];
+	for (const dir of dirs) for (const candidate of candidates) {
+		const full = path.join(dir, candidate);
+		try {
+			if (fs.statSync(full).isFile()) return full;
+		} catch {}
+	}
+}
 const NON_INTERACTIVE_ENV = {
 	PAGER: "cat",
 	GIT_PAGER: "cat",
@@ -132,8 +465,9 @@ const NON_INTERACTIVE_ENV = {
 	VISUAL: "true",
 	EDITOR: "true",
 	GIT_TERMINAL_PROMPT: "0",
-	SSH_ASKPASS: "/usr/bin/false",
-	CI: "1",
+	SSH_ASKPASS: findOnPath("false") ?? "false",
+	CI: "true",
+	AGENT: "1",
 	npm_config_yes: "true",
 	npm_config_update_notifier: "false",
 	npm_config_fund: "false",
@@ -174,13 +508,19 @@ function hasEnvGroupValue(env, group, platform) {
 	for (const [key] of group) if (hasEnvValue(env, key, platform)) return true;
 	return false;
 }
+/** Copy of the base env with `CI` removed, for the `PI_BASH_NO_CI` opt-out. */
+function withoutCI(env) {
+	const { CI: _ci, ...rest } = env;
+	return rest;
+}
 /** Builds the per-command environment for non-interactive child processes. */
 function buildNonInteractiveEnv(overrides, baseEnv = process.env, platform = process.platform) {
+	const base = baseEnv.PI_BASH_NO_CI || baseEnv.CLAUDE_BASH_NO_CI ? withoutCI(NON_INTERACTIVE_ENV) : NON_INTERACTIVE_ENV;
 	if (platform !== "win32") return overrides ? {
-		...NON_INTERACTIVE_ENV,
+		...base,
 		...overrides
-	} : NON_INTERACTIVE_ENV;
-	const env = { ...NON_INTERACTIVE_ENV };
+	} : base;
+	const env = { ...base };
 	for (const group of WINDOWS_UTF8_ENV_DEFAULT_GROUPS) {
 		if (hasEnvGroupValue(baseEnv, group, platform) || hasEnvGroupValue(overrides, group, platform)) continue;
 		for (const [key, value] of group) env[key] = value;
@@ -383,25 +723,37 @@ fi
 /**
 * Create a shell snapshot, caching the result.
 * Returns the path to the snapshot file, or null if creation failed.
+*
+* `timeoutMs` is configurable so callers exercising failure handling do not
+* have to wait out the production startup budget.
 */
-async function getOrCreateSnapshot(shell, env) {
+async function getOrCreateSnapshot(shell, env, timeoutMs = SNAPSHOT_TIMEOUT_MS) {
 	const cacheKey = shell;
 	const cached = cachedSnapshotPaths.get(cacheKey);
 	if (cached && fs.existsSync(cached)) return cached;
 	if (cached) cachedSnapshotPaths.delete(cacheKey);
 	if (process.platform === "win32") return null;
 	const rcFile = getShellConfigFile(shell, env);
-	const snapshotDir = path.join(os.tmpdir(), "omp-shell-snapshots");
-	fs.mkdirSync(snapshotDir, {
-		recursive: true,
-		mode: 448
-	});
-	try {
-		fs.chmodSync(snapshotDir, 448);
-	} catch {}
+	const uid = process.getuid?.();
+	const snapshotDir = path.join(os.tmpdir(), uid === void 0 ? "omp-shell-snapshots" : `omp-shell-snapshots-${uid}`);
 	const shellName = shell.includes("zsh") ? "zsh" : shell.includes("bash") ? "bash" : "sh";
 	const snapshotPath = path.join(snapshotDir, `snapshot-${shellName}-${crypto.randomUUID()}.sh`);
-	fs.writeFileSync(snapshotPath, "", { mode: 384 });
+	try {
+		fs.mkdirSync(snapshotDir, {
+			recursive: true,
+			mode: 448
+		});
+		try {
+			fs.chmodSync(snapshotDir, 448);
+		} catch {}
+		fs.writeFileSync(snapshotPath, "", { mode: 384 });
+	} catch (err) {
+		runtimeLogger().debug("shell-snapshot: snapshot dir unusable", {
+			dir: snapshotDir,
+			err: String(err)
+		});
+		return null;
+	}
 	const script = generateSnapshotScript(shell, snapshotPath, rcFile);
 	let succeeded = false;
 	try {
@@ -410,7 +762,7 @@ async function getOrCreateSnapshot(shell, env) {
 		for (const [key, value] of Object.entries(snapshotEnv)) if (value !== void 0) spawnEnv[key] = value;
 		const child = spawn(shell, ["-c", script], {
 			env: spawnEnv,
-			timeout: SNAPSHOT_TIMEOUT_MS,
+			timeout: timeoutMs,
 			stdio: "ignore",
 			killSignal: "SIGKILL"
 		});
@@ -449,85 +801,222 @@ function cleanupSnapshots() {
 	cachedSnapshotPaths.clear();
 }
 //#endregion
-//#region src/tools/bash/sanitize-text.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-utils@17.3.5/node_modules/@oh-my-pi/pi-utils/src/path.ts
+const WINDOWS_DRIVE_EXTENDED_PREFIX = /^\\\\[?]\\([A-Za-z]:[\\/].*)$/;
+const WINDOWS_UNC_EXTENDED_PREFIX = /^\\\\[?]\\UNC[\\/]([^\\/]+)[\\/](.+)$/i;
+const WINDOWS_DRIVE_EXTENDED_FORWARD_PREFIX = /^\/\/[?]\/([A-Za-z]:\/.*)$/;
+const WINDOWS_UNC_EXTENDED_FORWARD_PREFIX = /^\/\/[?]\/UNC\/([^/]+)\/(.+)$/i;
+const WINDOWS_DRIVE_NT_PREFIX = /^\\\\[?][?]\\([A-Za-z]:[\\/].*)$/;
+const WINDOWS_UNC_NT_PREFIX = /^\\\\[?][?]\\UNC[\\/]([^\\/]+)[\\/](.+)$/i;
+/** Removes Win32 extended-length prefixes before passing paths to Bun APIs. */
+function stripWindowsExtendedLengthPathPrefix(filePath, platform = process.platform) {
+	if (platform !== "win32") return filePath;
+	const uncMatch = WINDOWS_UNC_EXTENDED_PREFIX.exec(filePath) ?? WINDOWS_UNC_NT_PREFIX.exec(filePath);
+	if (uncMatch) return `\\\\${uncMatch[1]}\\${uncMatch[2]}`;
+	const driveMatch = WINDOWS_DRIVE_EXTENDED_PREFIX.exec(filePath) ?? WINDOWS_DRIVE_NT_PREFIX.exec(filePath);
+	if (driveMatch) return driveMatch[1];
+	const forwardUncMatch = WINDOWS_UNC_EXTENDED_FORWARD_PREFIX.exec(filePath);
+	if (forwardUncMatch) return `//${forwardUncMatch[1]}/${forwardUncMatch[2]}`;
+	const forwardDriveMatch = WINDOWS_DRIVE_EXTENDED_FORWARD_PREFIX.exec(filePath);
+	if (forwardDriveMatch) return forwardDriveMatch[1];
+	return filePath;
+}
+//#endregion
+//#region node_modules/.pnpm/@oh-my-pi+pi-utils@17.3.5/node_modules/@oh-my-pi/pi-utils/src/path-tree.ts
+/**
+* Multi-level path tree shared by grouped file listings (find / grep / ast tools)
+* and compaction file-operation lists.
+*
+* Flat path lists used to group by the *immediate* parent directory and print the
+* full directory path in every header. For results spread across a deep tree — or
+* rooted outside cwd, where paths stay absolute — that repeated the shared prefix
+* on every line. The tree below folds single-child directory chains (so the common
+* prefix collapses into one header) and nests the rest, charging the model one
+* token per path segment instead of one per file.
+*/
+const URL_LIKE_PATH_RE = /^[a-z][a-z0-9+.-]*:\/\//i;
+/** True for `scheme://…` entries that have no meaningful directory structure. */
+function isUrlLikePath(filePath) {
+	return URL_LIKE_PATH_RE.test(filePath);
+}
+function createNode() {
+	return {
+		files: [],
+		fileNames: /* @__PURE__ */ new Set(),
+		subdirs: [],
+		dirIndex: /* @__PURE__ */ new Map()
+	};
+}
+function addFile(node, name, key) {
+	if (node.fileNames.has(name)) return;
+	node.fileNames.add(name);
+	node.files.push({
+		name,
+		key
+	});
+}
+/**
+* Build a directory tree from a flat list of paths. URL-like entries are kept
+* whole as root-level file leaves (they have no meaningful directory structure).
+* Absolute paths carry a leading empty segment so they share a common `/` root
+* and fold like any other prefix.
+*/
+function buildPathTree(entries) {
+	const root = createNode();
+	for (const { path: rawPath, isDir, key } of entries) {
+		const normalized = rawPath.replace(/\\/g, "/");
+		const fileKey = key ?? rawPath;
+		if (isUrlLikePath(normalized)) {
+			addFile(root, normalized, fileKey);
+			continue;
+		}
+		const trimmed = normalized.endsWith("/") ? normalized.slice(0, -1) : normalized;
+		if (trimmed.length === 0) continue;
+		const segments = trimmed.split("/");
+		const dirCount = isDir ? segments.length : segments.length - 1;
+		let node = root;
+		for (let i = 0; i < dirCount; i++) {
+			const segment = segments[i];
+			let child = node.dirIndex.get(segment);
+			if (!child) {
+				child = createNode();
+				node.dirIndex.set(segment, child);
+				node.subdirs.push({
+					name: segment,
+					node: child
+				});
+			}
+			node = child;
+		}
+		if (!isDir) addFile(node, segments[segments.length - 1], fileKey);
+	}
+	return root;
+}
 /**
-* Strip ANSI escape sequences, remove control characters / lone surrogates,
-* and normalize line endings.
+* Depth-first walk yielding directory and file events. Directories collapse their
+* single-child chains (`a` → `a/b` → `a/b/c`) so a shared prefix becomes one
+* header. Each node's direct files are emitted before its subdirectories, keeping
+* a file unambiguously attached to the header above it.
+*/
+function* walkPathTree(node, depth = 0) {
+	for (const file of node.files) yield {
+		kind: "file",
+		depth,
+		name: file.name,
+		key: file.key
+	};
+	for (const subdir of node.subdirs) {
+		let dirNode = subdir.node;
+		const parts = [subdir.name];
+		while (dirNode.files.length === 0 && dirNode.subdirs.length === 1) {
+			const only = dirNode.subdirs[0];
+			parts.push(only.name);
+			dirNode = only.node;
+		}
+		yield {
+			kind: "dir",
+			depth,
+			name: parts.join("/"),
+			key: ""
+		};
+		yield* walkPathTree(dirNode, depth + 1);
+	}
+}
+/**
+* Render a flat path list as a grouped, prefix-folded directory tree without
+* per-file bodies (find-tool output shape, also used by compaction `<files>`
+* lists). Single-child directory chains fold into one header (`# a/b/c/`),
+* each level adds one `#`, and files are listed bare under the deepest
+* directory header that owns them. Trailing-slash entries are directory
+* leaves and keep their slash in the header.
 *
-* Bun-native implementation of the former native `sanitizeText` (see
-* `crates/pi-natives/src/text.rs::sanitize_text`). JavaScript strings are
-* already UTF-16 code-unit arrays. `toWellFormed()` handles the uncommon
-* malformed path; when it changes the input, replacement characters are
-* dropped and the normalized result goes through the well-formed sanitizer.
+* `annotate` receives each file's full original path and its return value is
+* appended verbatim to the file line (e.g. ` (RW)`).
 *
-* Fast path: well-formed input with no controls or ANSI returns the original
-* string after the control probe.
-*/
-const ESC_CHAR = "\x1B";
-const CONTROL_RE = /[\x00-\x08\x0B-\x1F\x7F-\x9F]/g;
-const ANSI_RE = /\x1b(?:\[[0-9;]*[A-Za-z]|\][^\x07]*(?:\x07|\x1b\\)|[()][0-9A-B]|[^[\]()])/g;
-function stripAnsi(text) {
-	return text.replace(ANSI_RE, "");
-}
-const REPLACEMENT_CHAR = "�";
-const LONE_SURROGATE_RE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g;
-function toWellFormed(text) {
-	return text.replace(LONE_SURROGATE_RE, REPLACEMENT_CHAR);
-}
-function sanitizeText(text) {
-	const wellFormed = toWellFormed(text);
-	if (wellFormed !== text) return sanitizeWellFormedText(wellFormed.replaceAll(REPLACEMENT_CHAR, ""));
-	return sanitizeWellFormedText(text);
-}
-function sanitizeWellFormedText(text) {
-	CONTROL_RE.lastIndex = 0;
-	if (CONTROL_RE.exec(text) === null) return text;
-	const stripped = text.indexOf(ESC_CHAR) === -1 ? text : stripAnsi(text);
-	CONTROL_RE.lastIndex = 0;
-	return stripped.replace(CONTROL_RE, "");
+* Order follows the input: a directory appears when its first member is
+* emitted, and a node's own files precede its subdirectories.
+*/
+function formatGroupedPaths(paths, annotate) {
+	if (paths.length === 0) return "";
+	const tree = buildPathTree(paths.map((entry) => ({
+		path: entry,
+		isDir: entry.endsWith("/")
+	})));
+	const lines = [];
+	for (const event of walkPathTree(tree)) if (event.kind === "dir") lines.push(`${"#".repeat(event.depth + 1)} ${event.name}/`);
+	else lines.push(annotate ? `${event.name}${annotate(event.key)}` : event.name);
+	return lines.join("\n");
 }
 //#endregion
-//#region src/tools/bash/streaming-output.ts
-/** Format byte count for human-readable display. */
-function formatBytes$1(bytes) {
-	if (bytes < 1024) return `${bytes}B`;
-	if (bytes < 1048576) return `${(bytes / 1024).toFixed(1)}KB`;
-	if (bytes < 1073741824) return `${(bytes / 1048576).toFixed(1)}MB`;
-	return `${(bytes / 1073741824).toFixed(1)}GB`;
+//#region src/tools/omp/utils/sixel.ts
+const SIXEL_START_REGEX = /\x1bP(?:[0-9;]*)q/u;
+const SIXEL_SEQUENCE_REGEX = /\x1bP(?:[0-9;]*)q[\s\S]*?(?:\x1b\\|\x07)/gu;
+const SIXEL_PLACEHOLDER_PREFIX = "__OMP_SIXEL_SEQUENCE_";
+/**
+* Returns whether SIXEL passthrough is explicitly enabled.
+*
+* Both gates must be enabled to preserve SIXEL control sequences:
+* - PI_FORCE_IMAGE_PROTOCOL=sixel
+* - PI_ALLOW_SIXEL_PASSTHROUGH=1
+*/
+function isSixelPassthroughEnabled() {
+	return $env.PI_FORCE_IMAGE_PROTOCOL?.trim().toLowerCase() === "sixel" && $flag("PI_ALLOW_SIXEL_PASSTHROUGH");
 }
-const DEFAULT_MAX_BYTES$1 = 51200;
+/** Returns true when the text contains a SIXEL start sequence. */
+function containsSixelSequence(text) {
+	return SIXEL_START_REGEX.test(text);
+}
+/**
+* Sanitizes text while preserving embedded SIXEL sequences when passthrough is enabled.
+*/
+function sanitizeWithOptionalSixelPassthrough(text, sanitize) {
+	if (!isSixelPassthroughEnabled() || !containsSixelSequence(text)) return sanitize(text);
+	const preservedSequences = [];
+	return sanitize(text.replace(SIXEL_SEQUENCE_REGEX, (match) => {
+		const token = `${SIXEL_PLACEHOLDER_PREFIX}${preservedSequences.length}__`;
+		preservedSequences.push(match);
+		return token;
+	})).replace(/__OMP_SIXEL_SEQUENCE_(\d+)__/gu, (_, indexText) => {
+		return preservedSequences[Number.parseInt(indexText, 10)] ?? "";
+	});
+}
+//#endregion
+//#region src/tools/omp/session/streaming-output.ts
+const DEFAULT_MAX_LINES = 3e3;
+const DEFAULT_MAX_BYTES = 51200;
 /** Default head budget; the remainder becomes the rolling tail window. */
 const ARTIFACT_DEFAULT_HEAD_BYTES = 3145728;
-const NL$1 = "\n";
+const NL = "\n";
+const CR = "\r";
 const ELLIPSIS = "…";
 /** Count newline characters via native substring search. */
-function countNewlines$1(text) {
+function countNewlines(text) {
 	let count = 0;
-	let pos = text.indexOf(NL$1);
+	let pos = text.indexOf(NL);
 	while (pos !== -1) {
 		count++;
-		pos = text.indexOf(NL$1, pos + 1);
+		pos = text.indexOf(NL, pos + 1);
 	}
 	return count;
 }
 /** Zero-copy view of a Uint8Array as a Buffer (copies only if already a Buffer). */
-function asBuffer$1(data) {
+function asBuffer(data) {
 	return Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
 }
 /** Advance past UTF-8 continuation bytes (10xxxxxx) to a leading byte. */
-function findUtf8BoundaryForward$1(buf, pos) {
+function findUtf8BoundaryForward(buf, pos) {
 	let i = Math.max(0, pos);
 	while (i < buf.length && (buf[i] & 192) === 128) i++;
 	return i;
 }
 /** Retreat past UTF-8 continuation bytes to land on a leading byte. */
-function findUtf8BoundaryBackward$1(buf, cut) {
+function findUtf8BoundaryBackward(buf, cut) {
 	let i = Math.min(buf.length, Math.max(0, cut));
 	if (i >= buf.length) return buf.length;
 	while (i > 0 && (buf[i] & 192) === 128) i--;
 	return i;
 }
-function truncateBytesWindowed$1(data, maxBytesRaw, mode) {
+function truncateBytesWindowed(data, maxBytesRaw, mode) {
 	const maxBytes = maxBytesRaw;
 	if (maxBytes === 0) return {
 		text: "",
@@ -544,7 +1033,7 @@ function truncateBytesWindowed$1(data, maxBytesRaw, mode) {
 		const window = mode === "head" ? data.substring(0, Math.min(data.length, maxBytes)) : data.substring(Math.max(0, data.length - maxBytes));
 		const buf = Buffer.from(window, "utf-8");
 		if (mode === "head") {
-			const end = findUtf8BoundaryBackward$1(buf, maxBytes);
+			const end = findUtf8BoundaryBackward(buf, maxBytes);
 			if (end <= 0) return {
 				text: "",
 				bytes: 0
@@ -555,7 +1044,7 @@ function truncateBytesWindowed$1(data, maxBytesRaw, mode) {
 				bytes: slice.length
 			};
 		} else {
-			const start = findUtf8BoundaryForward$1(buf, Math.max(0, buf.length - maxBytes));
+			const start = findUtf8BoundaryForward(buf, Math.max(0, buf.length - maxBytes));
 			const slice = buf.subarray(start);
 			return {
 				text: slice.toString("utf-8"),
@@ -563,13 +1052,13 @@ function truncateBytesWindowed$1(data, maxBytesRaw, mode) {
 			};
 		}
 	}
-	const buf = asBuffer$1(data);
+	const buf = asBuffer(data);
 	if (buf.length <= maxBytes) return {
 		text: buf.toString("utf-8"),
 		bytes: buf.length
 	};
 	if (mode === "head") {
-		const end = findUtf8BoundaryBackward$1(buf, maxBytes);
+		const end = findUtf8BoundaryBackward(buf, maxBytes);
 		if (end <= 0) return {
 			text: "",
 			bytes: 0
@@ -580,7 +1069,7 @@ function truncateBytesWindowed$1(data, maxBytesRaw, mode) {
 			bytes: slice.length
 		};
 	} else {
-		const start = findUtf8BoundaryForward$1(buf, buf.length - maxBytes);
+		const start = findUtf8BoundaryForward(buf, buf.length - maxBytes);
 		const slice = buf.subarray(start);
 		return {
 			text: slice.toString("utf-8"),
@@ -593,18 +1082,31 @@ function truncateBytesWindowed$1(data, maxBytesRaw, mode) {
 * Handles multi-byte UTF-8 boundaries correctly.
 */
 function truncateTailBytes(data, maxBytes) {
-	return truncateBytesWindowed$1(data, maxBytes, "tail");
+	return truncateBytesWindowed(data, maxBytes, "tail");
 }
 /**
 * Truncate a string/buffer to fit within a byte limit, keeping the head.
 * Handles multi-byte UTF-8 boundaries correctly.
 */
-function truncateHeadBytes$1(data, maxBytes) {
-	return truncateBytesWindowed$1(data, maxBytes, "head");
+function truncateHeadBytes(data, maxBytes) {
+	return truncateBytesWindowed(data, maxBytes, "head");
+}
+/**
+* Truncate a single line to max characters, appending '…' if truncated.
+*/
+function truncateLine(line, maxChars = 512) {
+	if (line.length <= maxChars) return {
+		text: line,
+		wasTruncated: false
+	};
+	return {
+		text: `${line.slice(0, maxChars)}…`,
+		wasTruncated: true
+	};
 }
 /** Shared helper to build a no-truncation result. */
-function noTruncResult$1(content, totalLines, totalBytes) {
-	if (totalLines == null) totalLines = countNewlines$1(content) + 1;
+function noTruncResult(content, totalLines, totalBytes) {
+	if (totalLines == null) totalLines = countNewlines(content) + 1;
 	if (totalBytes == null) totalBytes = Buffer.byteLength(content, "utf-8");
 	return {
 		content,
@@ -620,19 +1122,19 @@ function noTruncResult$1(content, totalLines, totalBytes) {
 * This implementation avoids Buffer.from(content) for the whole input.
 * It only computes UTF-8 byteLength for candidate lines that can still fit.
 */
-function truncateHead$1(content, options = {}) {
+function truncateHead(content, options = {}) {
 	const maxLines = options.maxLines ?? 3e3;
 	const maxBytes = options.maxBytes ?? 51200;
 	const totalBytes = Buffer.byteLength(content, "utf-8");
-	const totalLines = countNewlines$1(content) + 1;
-	if (totalLines <= maxLines && totalBytes <= maxBytes) return noTruncResult$1(content, totalLines, totalBytes);
+	const totalLines = countNewlines(content) + 1;
+	if (totalLines <= maxLines && totalBytes <= maxBytes) return noTruncResult(content, totalLines, totalBytes);
 	let includedLines = 0;
 	let bytesUsed = 0;
 	let cutIndex = 0;
 	let cursor = 0;
 	let truncatedBy = "lines";
 	while (includedLines < maxLines) {
-		const nl = content.indexOf(NL$1, cursor);
+		const nl = content.indexOf(NL, cursor);
 		const lineEnd = nl === -1 ? content.length : nl;
 		const sepBytes = includedLines > 0 ? 1 : 0;
 		const remaining = maxBytes - bytesUsed - sepBytes;
@@ -701,15 +1203,15 @@ function truncateTail(content, options = {}) {
 	const maxLines = options.maxLines ?? 3e3;
 	const maxBytes = options.maxBytes ?? 51200;
 	const totalBytes = Buffer.byteLength(content, "utf-8");
-	const totalLines = countNewlines$1(content) + 1;
-	if (totalLines <= maxLines && totalBytes <= maxBytes) return noTruncResult$1(content, totalLines, totalBytes);
+	const totalLines = countNewlines(content) + 1;
+	if (totalLines <= maxLines && totalBytes <= maxBytes) return noTruncResult(content, totalLines, totalBytes);
 	let includedLines = 0;
 	let bytesUsed = 0;
 	let startIndex = content.length;
 	let end = content.length;
 	let truncatedBy = "lines";
 	while (includedLines < maxLines) {
-		const nl = content.lastIndexOf(NL$1, end - 1);
+		const nl = content.lastIndexOf(NL, end - 1);
 		const lineStart = nl === -1 ? 0 : nl + 1;
 		const sepBytes = includedLines > 0 ? 1 : 0;
 		const remaining = maxBytes - bytesUsed - sepBytes;
@@ -799,17 +1301,17 @@ function truncateMiddle(content, options = {}) {
 	const headLines = options.maxHeadLines ?? Math.max(1, Math.floor(maxLines / 2));
 	const tailLines = Math.max(0, maxLines - headLines);
 	const totalBytes = Buffer.byteLength(content, "utf-8");
-	const totalLines = countNewlines$1(content) + 1;
-	if (totalBytes <= maxBytes && totalLines <= maxLines) return noTruncResult$1(content, totalLines, totalBytes);
+	const totalLines = countNewlines(content) + 1;
+	if (totalBytes <= maxBytes && totalLines <= maxLines) return noTruncResult(content, totalLines, totalBytes);
 	if (headBytes <= 0 || headLines <= 0) return truncateTail(content, {
 		maxBytes: tailBytes || maxBytes,
 		maxLines: tailLines || maxLines
 	});
-	if (tailBytes <= 0 || tailLines <= 0) return truncateHead$1(content, {
+	if (tailBytes <= 0 || tailLines <= 0) return truncateHead(content, {
 		maxBytes: headBytes,
 		maxLines: headLines
 	});
-	const head = truncateHead$1(content, {
+	const head = truncateHead(content, {
 		maxBytes: headBytes,
 		maxLines: headLines
 	});
@@ -823,7 +1325,7 @@ function truncateMiddle(content, options = {}) {
 	const tailBytesKept = tail.outputBytes ?? Buffer.byteLength(tail.content, "utf-8");
 	if (headLinesKept === 0 || head.firstLineExceedsLimit) return tail;
 	if (tailLinesKept === 0) return head;
-	if (headLinesKept + tailLinesKept >= totalLines) return noTruncResult$1(content, totalLines, totalBytes);
+	if (headLinesKept + tailLinesKept >= totalLines) return noTruncResult(content, totalLines, totalBytes);
 	const elidedLines = totalLines - headLinesKept - tailLinesKept;
 	const elidedBytes = Math.max(0, totalBytes - headBytesKept - tailBytesKept);
 	const marker = formatMiddleElisionMarker(elidedLines, elidedBytes);
@@ -844,10 +1346,10 @@ function truncateMiddle(content, options = {}) {
 	};
 }
 const MAX_PENDING = 10;
-var TailBuffer = class {
+var TailBuffer$1 = class {
+	maxBytes;
 	#pending = [];
 	#pos = 0;
-	maxBytes;
 	constructor(maxBytes) {
 		this.maxBytes = maxBytes;
 	}
@@ -882,11 +1384,6 @@ var TailBuffer = class {
 		this.#trimTo(max);
 		return this.#flush();
 	}
-	/** Drop all held output; the next {@link append} starts a fresh window. */
-	reset() {
-		this.#pending.length = 0;
-		this.#pos = 0;
-	}
 	bytes() {
 		const max = this.maxBytes;
 		this.#trimTo(max);
@@ -914,7 +1411,7 @@ var TailBuffer = class {
 		this.#pending.length = 1;
 	}
 };
-var OutputSink = class {
+var OutputSink$1 = class {
 	#buffer = "";
 	#bufferBytes = 0;
 	#head = "";
@@ -927,6 +1424,7 @@ var OutputSink = class {
 	#truncated = false;
 	#lastChunkTime = 0;
 	#pendingChunk = "";
+	#pendingCarriageReturn = false;
 	#pendingChunkTimer;
 	#currentLineBytes = 0;
 	#columnEllipsisAdded = false;
@@ -935,6 +1433,10 @@ var OutputSink = class {
 	#file;
 	#pendingFileWrites;
 	#fileReady = false;
+	/** In-flight sink creation, awaited by finalize/dispose so a fd opened by a late chunk is still released. */
+	#fileCreation;
+	/** Set once the spill file has been closed; guards double-close and post-finalize resurrection. */
+	#finalized = false;
 	#artifactPath;
 	#artifactId;
 	#spillThreshold;
@@ -951,11 +1453,11 @@ var OutputSink = class {
 	#artifactTailRingBytes = 0;
 	#artifactTailIncomingBytes = 0;
 	constructor(options) {
-		const { artifactPath, artifactId, spillThreshold = DEFAULT_MAX_BYTES$1, headBytes = 0, maxColumns = 0, onChunk, chunkThrottleMs = 0, artifactMaxBytes = 0, artifactHeadBytes = ARTIFACT_DEFAULT_HEAD_BYTES } = options ?? {};
+		const { artifactPath, artifactId, spillThreshold = DEFAULT_MAX_BYTES, headBytes = 0, maxColumns = 0, onChunk, chunkThrottleMs = 0, artifactMaxBytes = 0, artifactHeadBytes = ARTIFACT_DEFAULT_HEAD_BYTES } = options ?? {};
 		this.#artifactPath = artifactPath;
 		this.#artifactId = artifactId;
 		this.#spillThreshold = spillThreshold;
-		this.#headLimit = Math.max(0, headBytes);
+		this.#headLimit = Math.max(0, Math.min(headBytes, Math.floor(spillThreshold / 2)));
 		this.#maxColumns = Math.max(0, maxColumns);
 		this.#onChunk = onChunk;
 		this.#chunkThrottleMs = chunkThrottleMs;
@@ -964,11 +1466,42 @@ var OutputSink = class {
 		this.#artifactTailBudget = Math.max(0, this.#artifactMaxBytes - this.#artifactHeadBudget);
 	}
 	/**
+	* Converts carriage-return progress updates into line boundaries while
+	* collapsing CRLF to one newline. A trailing CR is held until the next
+	* chunk so split CRLF sequences do not create blank lines.
+	*/
+	#normalizeCarriageReturns(text) {
+		if (text.length === 0 || !this.#pendingCarriageReturn && !text.includes(CR)) return text;
+		let cursor = 0;
+		let normalized = "";
+		if (this.#pendingCarriageReturn) {
+			this.#pendingCarriageReturn = false;
+			normalized = NL;
+			if (text.startsWith(NL)) cursor = 1;
+		}
+		while (cursor < text.length) {
+			const carriageReturn = text.indexOf(CR, cursor);
+			if (carriageReturn === -1) {
+				normalized += text.substring(cursor);
+				break;
+			}
+			normalized += text.substring(cursor, carriageReturn);
+			if (carriageReturn === text.length - 1) {
+				this.#pendingCarriageReturn = true;
+				break;
+			}
+			normalized += NL;
+			cursor = text.startsWith(NL, carriageReturn + 1) ? carriageReturn + 2 : carriageReturn + 1;
+		}
+		return normalized;
+	}
+	/**
 	* Push a chunk of output. The buffer management and onChunk callback run
 	* synchronously. File sink writes are deferred and serialized internally.
 	*/
 	push(chunk) {
-		chunk = sanitizeText(chunk);
+		if (this.#finalized) return;
+		chunk = sanitizeWithOptionalSixelPassthrough(chunk, (text) => sanitizeText(this.#normalizeCarriageReturns(text)));
 		if (this.#onChunk) {
 			const now = Date.now();
 			if (now - this.#lastChunkTime >= this.#chunkThrottleMs) this.#emitPendingChunkWith(chunk, now);
@@ -981,7 +1514,7 @@ var OutputSink = class {
 		this.#totalBytes += rawBytes;
 		if (chunk.length > 0) {
 			this.#sawData = true;
-			this.#totalLines += countNewlines$1(chunk);
+			this.#totalLines += countNewlines(chunk);
 		}
 		const capped = this.#maxColumns > 0 ? this.#applyColumnCap(chunk) : chunk;
 		const cappedBytes = capped === chunk ? rawBytes : Buffer.byteLength(capped, "utf-8");
@@ -995,14 +1528,14 @@ var OutputSink = class {
 			if (cappedBytes <= room) {
 				this.#head += capped;
 				this.#headBytes += cappedBytes;
-				this.#headLines += countNewlines$1(capped);
+				this.#headLines += countNewlines(capped);
 				return;
 			}
-			const headSlice = truncateHeadBytes$1(capped, room);
+			const headSlice = truncateHeadBytes(capped, room);
 			if (headSlice.bytes > 0) {
 				this.#head += headSlice.text;
 				this.#headBytes += headSlice.bytes;
-				this.#headLines += countNewlines$1(headSlice.text);
+				this.#headLines += countNewlines(headSlice.text);
 				tailChunk = capped.substring(headSlice.text.length);
 				tailBytes = cappedBytes - headSlice.bytes;
 			}
@@ -1021,7 +1554,7 @@ var OutputSink = class {
 		const parts = [];
 		let cursor = 0;
 		while (cursor < chunk.length) {
-			const nlIdx = chunk.indexOf(NL$1, cursor);
+			const nlIdx = chunk.indexOf(NL, cursor);
 			const segEnd = nlIdx === -1 ? chunk.length : nlIdx;
 			if (segEnd > cursor) {
 				const segment = chunk.substring(cursor, segEnd);
@@ -1038,7 +1571,7 @@ var OutputSink = class {
 						let kept = "";
 						let keptBytes = 0;
 						if (headRoom > 0) {
-							const sliced = truncateHeadBytes$1(segment, headRoom);
+							const sliced = truncateHeadBytes(segment, headRoom);
 							kept = sliced.text;
 							keptBytes = sliced.bytes;
 							parts.push(kept);
@@ -1052,7 +1585,7 @@ var OutputSink = class {
 				}
 			}
 			if (nlIdx === -1) break;
-			parts.push(NL$1);
+			parts.push(NL);
 			this.#currentLineBytes = 0;
 			this.#columnEllipsisAdded = false;
 			cursor = nlIdx + 1;
@@ -1060,11 +1593,11 @@ var OutputSink = class {
 		return parts.join("");
 	}
 	#willOverflow(dataBytes) {
-		return this.#bufferBytes + dataBytes > this.#spillThreshold;
+		return this.#bufferBytes + dataBytes > this.#spillThreshold - this.#headBytes;
 	}
 	#pushTail(chunk, dataBytes) {
 		if (dataBytes === 0) return;
-		const threshold = this.#spillThreshold;
+		const threshold = Math.max(0, this.#spillThreshold - this.#headBytes);
 		if (!(this.#bufferBytes + dataBytes > threshold)) {
 			this.#buffer += chunk;
 			this.#bufferBytes += dataBytes;
@@ -1097,7 +1630,7 @@ var OutputSink = class {
 		}
 		if (!this.#pendingFileWrites) {
 			this.#pendingFileWrites = [chunk];
-			this.#createFileSink();
+			this.#fileCreation = this.#createFileSink();
 		} else this.#pendingFileWrites.push(chunk);
 	}
 	/**
@@ -1126,7 +1659,7 @@ var OutputSink = class {
 		}
 		let overflow = chunk;
 		if (room > 0) {
-			const headSlice = truncateHeadBytes$1(chunk, room);
+			const headSlice = truncateHeadBytes(chunk, room);
 			if (headSlice.bytes > 0) {
 				this.#file.sink.write(headSlice.text);
 				this.#artifactHeadBytesWritten += headSlice.bytes;
@@ -1161,8 +1694,7 @@ var OutputSink = class {
 	async #createFileSink() {
 		if (!this.#artifactPath || this.#fileReady) return;
 		try {
-			const sink = fs.createWriteStream(this.#artifactPath);
-			sink.on("error", () => void 0);
+			const sink = Bun.file(this.#artifactPath).writer();
 			this.#file = {
 				path: this.#artifactPath,
 				artifactId: this.#artifactId,
@@ -1218,7 +1750,7 @@ var OutputSink = class {
 		this.#headLines = 0;
 		this.#headRetentionDisabled = true;
 		this.#totalBytes = this.#bufferBytes;
-		this.#totalLines = countNewlines$1(text);
+		this.#totalLines = countNewlines(text);
 		this.#sawData = text.length > 0;
 		this.#truncated = false;
 		this.#currentLineBytes = 0;
@@ -1226,6 +1758,7 @@ var OutputSink = class {
 		this.#columnDroppedBytes = 0;
 		this.#columnTruncatedLines = 0;
 		this.#pendingChunk = "";
+		this.#pendingCarriageReturn = false;
 	}
 	#clearPendingChunkTimer() {
 		if (!this.#pendingChunkTimer) return;
@@ -1286,22 +1819,19 @@ var OutputSink = class {
 		if (tailBytes > 0) this.#file.sink.write(this.#artifactTailRing);
 	}
 	async dump(notice) {
+		if (this.#pendingCarriageReturn) {
+			this.#pendingCarriageReturn = false;
+			this.push(NL);
+		}
 		const noticeLine = notice ? `[${notice}]\n` : "";
 		this.#flushPendingChunk();
 		const totalLines = this.#sawData ? this.#totalLines + 1 : 0;
-		if (this.#file) {
-			this.#flushArtifactTailIfCapped();
-			const fileSink = this.#file.sink;
-			await new Promise((resolve) => {
-				fileSink.once("error", () => resolve());
-				fileSink.end(() => resolve());
-			});
-		}
+		await this.#finalizeFile();
 		const headBytes = this.#headBytes;
 		const tailBuf = this.#buffer;
 		const tailBytes = this.#bufferBytes;
 		const headLines = this.#headLines + (headBytes > 0 && !this.#head.endsWith("\n") ? 1 : 0);
-		const tailLines = tailBuf.length > 0 ? countNewlines$1(tailBuf) + 1 : 0;
+		const tailLines = tailBuf.length > 0 ? countNewlines(tailBuf) + 1 : 0;
 		const effectiveTotalBytes = Math.max(0, this.#totalBytes - this.#columnDroppedBytes);
 		let body;
 		let outputBytes;
@@ -1322,7 +1852,7 @@ var OutputSink = class {
 		} else if (headBytes > 0) {
 			body = `${this.#head}${tailBuf}`;
 			outputBytes = headBytes + tailBytes;
-			outputLines = body.length > 0 ? countNewlines$1(body) + 1 : 0;
+			outputLines = body.length > 0 ? countNewlines(body) + 1 : 0;
 		} else {
 			body = tailBuf;
 			outputBytes = tailBytes;
@@ -1340,12 +1870,158 @@ var OutputSink = class {
 			columnDroppedBytes: this.#columnDroppedBytes > 0 ? this.#columnDroppedBytes : void 0,
 			columnTruncatedLines: this.#columnTruncatedLines > 0 ? this.#columnTruncatedLines : void 0,
 			columnMax: this.#columnTruncatedLines > 0 ? this.#maxColumns : void 0,
-			artifactId: this.#file?.artifactId,
-			artifactPath: this.#file?.path
+			artifactId: this.#file?.artifactId
 		};
 	}
+	/**
+	* Flush any capped artifact tail and close the spill file descriptor,
+	* awaiting an in-flight sink creation so a descriptor opened by a late
+	* chunk is still released. Idempotent via {@link #finalized}: the artifact
+	* is finalized exactly once whether the caller reached {@link dump} or
+	* bailed through {@link dispose}. `#file` is left set so {@link dump} can
+	* still read `artifactId` for its summary.
+	*/
+	async #finalizeFile() {
+		if (this.#finalized) return;
+		this.#finalized = true;
+		if (this.#fileCreation) await this.#fileCreation.catch(() => void 0);
+		const file = this.#file;
+		if (!file) return;
+		try {
+			this.#flushArtifactTailIfCapped();
+		} catch {} finally {
+			try {
+				await file.sink.end();
+			} catch {}
+		}
+	}
+	/**
+	* Release the artifact spill descriptor on an exit path that skips
+	* {@link dump} — a thrown error or abort. Idempotent and safe in a
+	* `finally`: if {@link dump} already ran this is a no-op, otherwise it
+	* flushes the capped tail and closes the sink so the descriptor is not
+	* leaked until a later unrelated read hits `EMFILE` (issue #6463).
+	*/
+	async dispose() {
+		this.#clearPendingChunkTimer();
+		await this.#finalizeFile();
+	}
+};
+//#endregion
+//#region src/tools/bash/streaming-output.ts
+/**
+* Marker passed as the verbatim sink's `artifactId` when the caller configured
+* only `artifactPath`: the verbatim sink reports `artifactId` from its internal
+* file record, which is set exactly when the spill file was created — so the
+* marker doubles as a "mirror exists" signal for surfacing `artifactPath` on
+* {@link OutputSink.dump}. Stripped again before the summary leaves this file.
+*/
+const SPILL_PATH_ONLY = "__dsh-spill-path-only__";
+var OutputSink = class extends OutputSink$1 {
+	#artifactPath;
+	constructor(options) {
+		super({
+			...options,
+			artifactId: options?.artifactId ?? (options?.artifactPath !== void 0 ? SPILL_PATH_ONLY : void 0)
+		});
+		this.#artifactPath = options?.artifactPath;
+	}
+	async dump(notice) {
+		const { artifactId, ...rest } = await super.dump(notice);
+		if (artifactId === SPILL_PATH_ONLY) return {
+			...rest,
+			artifactPath: this.#artifactPath
+		};
+		if (artifactId !== void 0) return {
+			...rest,
+			artifactId,
+			artifactPath: this.#artifactPath
+		};
+		return rest;
+	}
+};
+/**
+* Composition wrapper over the verbatim {@link TailBuffer}, adding the DSH
+* `reset()` increment. The verbatim class keeps its state in private fields,
+* so reset is modeled as a fresh window with the same budget.
+*/
+var TailBuffer = class {
+	#inner;
+	maxBytes;
+	constructor(maxBytes) {
+		this.maxBytes = maxBytes;
+		this.#inner = new TailBuffer$1(maxBytes);
+	}
+	append(text) {
+		this.#inner.append(text);
+	}
+	text() {
+		return this.#inner.text();
+	}
+	bytes() {
+		return this.#inner.bytes();
+	}
+	/** Drop all held output; the next {@link append} starts a fresh window. */
+	reset() {
+		this.#inner = new TailBuffer$1(this.maxBytes);
+	}
 };
 //#endregion
+//#region src/tools/bash/windows-shell.ts
+/**
+* Windows shell discovery, ported from oh-my-pi procmgr's `resolveWindowsShell`
+* (refs/oh-my-pi/packages/utils/src/procmgr.ts:148-173) — adapted verbatim:
+* `Bun.env` → injectable Node env (default `process.env`), and pi-utils
+* `$which` → `findOnPath` (src/tools/bash/which.ts).
+*
+* Deliberately NOT ported from procmgr: buildSpawnEnv, shell prefix handling,
+* direnv integration, and PI_SHELL_PREFIX — DSH has no shell-prefix seam;
+* commands run inside the embedded brush shell or the resolved user shell.
+* @module @xiaoso/dsh-tool-plus/bash/windows-shell
+*/
+/**
+* Resolve the external shell to advertise on Windows.
+*
+* A host bash is OPTIONAL: bash tool commands always execute in the embedded
+* brush-core shell. The resolved binary only serves the spawn-a-shell paths,
+* so this prefers a real Git Bash when one exists and otherwise falls back to
+* cmd.exe — it never fails.
+*
+* Search order:
+* 1. Git for Windows install roots (machine + per-user installers)
+* 2. scoop installs — scoop's git manifest sets GIT_INSTALL_ROOT and shims
+*    sh.exe/git.exe but never bash.exe, so PATH lookup alone misses it
+* 3. bash.exe on PATH (Cygwin, MSYS2, ...)
+* 4. sh.exe on PATH (Git for Windows' sh.exe is bash; prefer a sibling
+*    bash.exe when present)
+* 5. cmd.exe from ComSpec
+*
+* Exported for tests; `env` overrides process.env-based discovery.
+*/
+function resolveWindowsShell(env = process.env) {
+	const gitRoots = [
+		env.ProgramFiles && path.join(env.ProgramFiles, "Git"),
+		env["ProgramFiles(x86)"] && path.join(env["ProgramFiles(x86)"], "Git"),
+		env.LOCALAPPDATA && path.join(env.LOCALAPPDATA, "Programs", "Git"),
+		env.GIT_INSTALL_ROOT,
+		env.SCOOP && path.join(env.SCOOP, "apps", "git", "current"),
+		env.USERPROFILE && path.join(env.USERPROFILE, "scoop", "apps", "git", "current")
+	];
+	for (const root of gitRoots) {
+		if (!root) continue;
+		const candidate = path.join(root, "bin", "bash.exe");
+		if (fs.existsSync(candidate)) return candidate;
+	}
+	const bashOnPath = findOnPath("bash.exe", env);
+	if (bashOnPath) return bashOnPath;
+	const shOnPath = findOnPath("sh.exe", env);
+	if (shOnPath) {
+		const siblingBash = path.join(path.dirname(shOnPath), "bash.exe");
+		return fs.existsSync(siblingBash) ? siblingBash : shOnPath;
+	}
+	return env.ComSpec || env.COMSPEC || "C:\\Windows\\System32\\cmd.exe";
+}
+//#endregion
 //#region src/tools/bash/yield.ts
 /**
 * Cooperative yield utility for preventing Bun event-loop busy-wait.
@@ -1468,6 +2144,11 @@ var ExponentialYield = class {
 * Bash command execution with streaming support and cancellation.
 *
 * Uses brush-core via native bindings for shell execution.
+
+* Known deviations from upstream exec/bash-executor.ts:
+* - POSIX getShellConfig does not add `-l` to zsh args and does not honor
+*   PI_BASH_NO_LOGIN — DSH has no PI_BASH_NO_LOGIN semantics and the shell
+*   `args` currently have no consumer beyond the user-shell spawn path.
 */
 function isExecutable(path) {
 	try {
@@ -1481,22 +2162,8 @@ let cachedShellConfig = null;
 function getShellConfig() {
 	if (cachedShellConfig) return cachedShellConfig;
 	if (process.platform === "win32") {
-		const paths = [];
-		const programFiles = process.env.ProgramFiles;
-		if (programFiles) paths.push(`${programFiles}\\Git\\bin\\bash.exe`);
-		const programFilesX86 = process.env["ProgramFiles(x86)"];
-		if (programFilesX86) paths.push(`${programFilesX86}\\Git\\bin\\bash.exe`);
-		for (const p of paths) if (fs.existsSync(p)) {
-			cachedShellConfig = {
-				shell: p,
-				args: ["--login", "-c"],
-				env: {},
-				prefix: void 0
-			};
-			return cachedShellConfig;
-		}
 		cachedShellConfig = {
-			shell: "bash",
+			shell: resolveWindowsShell(),
 			args: ["--login", "-c"],
 			env: {},
 			prefix: void 0
@@ -1563,6 +2230,7 @@ function closeSessionShells(sessionId) {
 */
 const retainedShells = /* @__PURE__ */ new Set();
 const RETAIN_REAP_INTERVAL_MS = 5e3;
+const NATIVE_TIMEOUT_FALLBACK_GRACE_MS = 5e3;
 async function retainShellWithLiveBackgroundJobs(shell) {
 	let live;
 	try {
@@ -1618,7 +2286,8 @@ function isBashShell(shell) {
 	return shellBasename(shell).includes("bash");
 }
 function needsInteractiveShellArg(shell) {
-	return shellBasename(shell).includes("zsh");
+	const basename = shellBasename(shell);
+	return basename.includes("zsh") || basename.includes("fish");
 }
 function supportsAutoUserShell(shell) {
 	const basename = shellBasename(shell);
@@ -1628,16 +2297,18 @@ function hasInteractiveShellArg(args) {
 	return args.some((arg) => arg === "--interactive" || /^-[^-]*i/.test(arg));
 }
 function ensureInteractiveShellArgs(shell, args) {
-	if (!needsInteractiveShellArg(shell) || hasInteractiveShellArg(args)) return args;
-	const commandIndex = args.findIndex((arg) => arg === "-c" || arg === "--command");
+	if (!needsInteractiveShellArg(shell)) return args;
+	const effectiveArgs = shellBasename(shell).includes("fish") ? args.filter((arg) => arg !== "-l" && arg !== "--login") : args;
+	if (hasInteractiveShellArg(effectiveArgs)) return effectiveArgs;
+	const commandIndex = effectiveArgs.findIndex((arg) => arg === "-c" || arg === "--command");
 	if (commandIndex !== -1) return [
-		...args.slice(0, commandIndex),
+		...effectiveArgs.slice(0, commandIndex),
 		"-i",
-		...args.slice(commandIndex)
+		...effectiveArgs.slice(commandIndex)
 	];
-	const compactCommandIndex = args.findIndex((arg) => /^-[^-]*c[^-]*$/.test(arg));
-	if (compactCommandIndex !== -1) return args.map((arg, index) => index === compactCommandIndex ? arg.replace("c", "ic") : arg);
-	return [...args, "-i"];
+	const compactCommandIndex = effectiveArgs.findIndex((arg) => /^-[^-]*c[^-]*$/.test(arg));
+	if (compactCommandIndex !== -1) return effectiveArgs.map((arg, index) => index === compactCommandIndex ? arg.replace("c", "ic") : arg);
+	return [...effectiveArgs, "-i"];
 }
 function quoteShellArg(value) {
 	return `'${value.replace(/'/g, "'\\''")}'`;
@@ -1738,10 +2409,13 @@ async function executeBash(command, options) {
 	const deadlineTimeoutMs = requestedTimeoutMs === 0 ? void 0 : Math.max(1e3, requestedTimeoutMs ?? 3e5);
 	const nativeTimeoutMs = requestedTimeoutMs !== void 0 && requestedTimeoutMs > 0 ? requestedTimeoutMs : void 0;
 	const nativeOwnsTimeout = nativeTimeoutMs !== void 0;
-	if (deadlineTimeoutMs !== void 0) timeoutTimer = setTimeout(() => {
-		if (!nativeOwnsTimeout) abortCurrentExecution();
-		timeoutDeferred.resolve("timeout");
-	}, deadlineTimeoutMs);
+	if (deadlineTimeoutMs !== void 0) {
+		const fallbackTimeoutMs = nativeOwnsTimeout ? deadlineTimeoutMs + NATIVE_TIMEOUT_FALLBACK_GRACE_MS : deadlineTimeoutMs;
+		timeoutTimer = setTimeout(() => {
+			if (!nativeOwnsTimeout) abortCurrentExecution();
+			timeoutDeferred.resolve("timeout");
+		}, fallbackTimeoutMs);
+	}
 	let resetSession = false;
 	try {
 		const runPromise = executionShell.run({
@@ -1771,6 +2445,7 @@ async function executeBash(command, options) {
 			return {
 				exitCode: void 0,
 				cancelled: true,
+				...winner.kind === "timeout" ? { timedOut: true } : {},
 				...await settle(winner.kind === "timeout" && deadlineTimeoutMs !== void 0 ? `Command timed out after ${Math.round(deadlineTimeoutMs / 1e3)} seconds` : "Command cancelled")
 			};
 		}
@@ -1785,6 +2460,7 @@ async function executeBash(command, options) {
 			return {
 				exitCode: void 0,
 				cancelled: true,
+				timedOut: true,
 				...await settle(annotation)
 			};
 		}
@@ -1992,16 +2668,22 @@ function startBashJob(options) {
 		settledText = preview.text();
 		const wallTimeMs = performance.now() - startedAt;
 		const aborted = result.cancelled && abortController.signal.aborted;
+		const timedOut = result.timedOut ?? (result.cancelled && !aborted);
+		let text = result.output;
+		if (timedOut) {
+			const seconds = Math.max(1, Math.round((timeoutMs ?? 0) / 1e3));
+			if (!text.includes("[Command timed out after")) text = `[Command timed out after ${seconds} seconds]\n\n${text}`;
+		}
 		return {
 			kind: "foreground",
 			exitCode: result.exitCode ?? null,
-			timedOut: result.cancelled && !aborted,
+			timedOut,
 			aborted,
 			timeoutMs: timeoutMs ?? null,
 			wallTimeMs,
 			...result.workingDir !== void 0 ? { workingDir: result.workingDir } : {},
 			output: {
-				text: result.output,
+				text,
 				truncated: result.truncated,
 				...result.spillPath !== void 0 ? { spillPath: result.spillPath } : {},
 				...result.originalOutputPath !== void 0 ? { originalSpillPath: result.originalOutputPath } : {},
@@ -2024,6 +2706,10 @@ function startBashJob(options) {
 					status: "killed",
 					detail: "cancelled"
 				};
+				if (value.timedOut) return {
+					status: "failed",
+					detail: `Command timed out after ${Math.max(1, Math.round((value.timeoutMs ?? 0) / 1e3))} seconds`
+				};
 				return {
 					status: "completed",
 					detail: value.exitCode === null ? void 0 : `exit code: ${value.exitCode}`
@@ -2043,157 +2729,52 @@ function startBashJob(options) {
 	};
 }
 //#endregion
-//#region src/tools/omp/config/settings-schema.ts
-/** Schema default for a setting path (verbatim OMP values; unknown -> undefined). */
-function getDefault(path) {
-	return OMP_DEFAULTS[path];
-}
-//#endregion
-//#region node_modules/.pnpm/@oh-my-pi+pi-utils@17.3.5/node_modules/@oh-my-pi/pi-utils/src/path.ts
-const WINDOWS_DRIVE_EXTENDED_PREFIX = /^\\\\[?]\\([A-Za-z]:[\\/].*)$/;
-const WINDOWS_UNC_EXTENDED_PREFIX = /^\\\\[?]\\UNC[\\/]([^\\/]+)[\\/](.+)$/i;
-const WINDOWS_DRIVE_EXTENDED_FORWARD_PREFIX = /^\/\/[?]\/([A-Za-z]:\/.*)$/;
-const WINDOWS_UNC_EXTENDED_FORWARD_PREFIX = /^\/\/[?]\/UNC\/([^/]+)\/(.+)$/i;
-const WINDOWS_DRIVE_NT_PREFIX = /^\\\\[?][?]\\([A-Za-z]:[\\/].*)$/;
-const WINDOWS_UNC_NT_PREFIX = /^\\\\[?][?]\\UNC[\\/]([^\\/]+)[\\/](.+)$/i;
-/** Removes Win32 extended-length prefixes before passing paths to Bun APIs. */
-function stripWindowsExtendedLengthPathPrefix(filePath, platform = process.platform) {
-	if (platform !== "win32") return filePath;
-	const uncMatch = WINDOWS_UNC_EXTENDED_PREFIX.exec(filePath) ?? WINDOWS_UNC_NT_PREFIX.exec(filePath);
-	if (uncMatch) return `\\\\${uncMatch[1]}\\${uncMatch[2]}`;
-	const driveMatch = WINDOWS_DRIVE_EXTENDED_PREFIX.exec(filePath) ?? WINDOWS_DRIVE_NT_PREFIX.exec(filePath);
-	if (driveMatch) return driveMatch[1];
-	const forwardUncMatch = WINDOWS_UNC_EXTENDED_FORWARD_PREFIX.exec(filePath);
-	if (forwardUncMatch) return `//${forwardUncMatch[1]}/${forwardUncMatch[2]}`;
-	const forwardDriveMatch = WINDOWS_DRIVE_EXTENDED_FORWARD_PREFIX.exec(filePath);
-	if (forwardDriveMatch) return forwardDriveMatch[1];
+//#region src/tools/bash/cd-workdir.ts
+/**
+* Leading `cd <path> && …` workdir extraction and `~` expansion for the bash
+* tool.
+*
+* Extraction delegates to `extractLeadingCdTarget` (shell-tokenize.ts, verbatim
+* port of upstream tools/shell-tokenize.ts), so redirect prefixes, extra
+* arguments, command substitution, and unterminated quotes all bail and leave
+* the whole command with the shell. `~`/`~/…` prefixes expand against
+* `os.homedir()` with upstream `expandTilde` semantics
+* (refs packages/coding-agent/src/tools/path-utils.ts).
+* @module @xiaoso/dsh-tool-plus/bash/cd-workdir
+*/
+/**
+* Expand a leading `~`/`~/…`/`~\…` prefix to the home directory, matching
+* upstream `expandTilde` (refs tools/path-utils.ts). A bare `~name` is joined
+* under the home directory like upstream (user-home approximation).
+*/
+function expandTilde$1(filePath, home = os.homedir()) {
+	if (filePath === "~") return home;
+	if (filePath.startsWith("~/") || filePath.startsWith("~\\")) return home + filePath.slice(1);
+	if (filePath.startsWith("~")) return path.join(home, filePath.slice(1));
 	return filePath;
 }
-//#endregion
-//#region node_modules/.pnpm/@oh-my-pi+pi-utils@17.3.5/node_modules/@oh-my-pi/pi-utils/src/path-tree.ts
 /**
-* Multi-level path tree shared by grouped file listings (find / grep / ast tools)
-* and compaction file-operation lists.
+* Extract a leading `cd <path> && …` prefix, expanding `~` in the target.
 *
-* Flat path lists used to group by the *immediate* parent directory and print the
-* full directory path in every header. For results spread across a deep tree — or
-* rooted outside cwd, where paths stay absolute — that repeated the shared prefix
-* on every line. The tree below folds single-child directory chains (so the common
-* prefix collapses into one header) and nests the rest, charging the model one
-* token per path segment instead of one per file.
-*/
-const URL_LIKE_PATH_RE = /^[a-z][a-z0-9+.-]*:\/\//i;
-/** True for `scheme://…` entries that have no meaningful directory structure. */
-function isUrlLikePath(filePath) {
-	return URL_LIKE_PATH_RE.test(filePath);
-}
-function createNode() {
+* Returns `null` when the command does not start with exactly `cd`, one path
+* token, and a top-level `&&` — redirects (`cd /tmp 2>/dev/null && …`), extra
+* arguments, command substitution (`$`, backticks, `(`), and unterminated
+* quotes all leave the whole command for the shell instead of absorbing shell
+* syntax into the structured workdir seam.
+*/
+function extractCdWorkdir(command, home) {
+	const extracted = extractLeadingCdTarget(command);
+	if (extracted === null) return null;
 	return {
-		files: [],
-		fileNames: /* @__PURE__ */ new Set(),
-		subdirs: [],
-		dirIndex: /* @__PURE__ */ new Map()
-	};
-}
-function addFile(node, name, key) {
-	if (node.fileNames.has(name)) return;
-	node.fileNames.add(name);
-	node.files.push({
-		name,
-		key
-	});
-}
-/**
-* Build a directory tree from a flat list of paths. URL-like entries are kept
-* whole as root-level file leaves (they have no meaningful directory structure).
-* Absolute paths carry a leading empty segment so they share a common `/` root
-* and fold like any other prefix.
-*/
-function buildPathTree(entries) {
-	const root = createNode();
-	for (const { path: rawPath, isDir, key } of entries) {
-		const normalized = rawPath.replace(/\\/g, "/");
-		const fileKey = key ?? rawPath;
-		if (isUrlLikePath(normalized)) {
-			addFile(root, normalized, fileKey);
-			continue;
-		}
-		const trimmed = normalized.endsWith("/") ? normalized.slice(0, -1) : normalized;
-		if (trimmed.length === 0) continue;
-		const segments = trimmed.split("/");
-		const dirCount = isDir ? segments.length : segments.length - 1;
-		let node = root;
-		for (let i = 0; i < dirCount; i++) {
-			const segment = segments[i];
-			let child = node.dirIndex.get(segment);
-			if (!child) {
-				child = createNode();
-				node.dirIndex.set(segment, child);
-				node.subdirs.push({
-					name: segment,
-					node: child
-				});
-			}
-			node = child;
-		}
-		if (!isDir) addFile(node, segments[segments.length - 1], fileKey);
-	}
-	return root;
-}
-/**
-* Depth-first walk yielding directory and file events. Directories collapse their
-* single-child chains (`a` → `a/b` → `a/b/c`) so a shared prefix becomes one
-* header. Each node's direct files are emitted before its subdirectories, keeping
-* a file unambiguously attached to the header above it.
-*/
-function* walkPathTree(node, depth = 0) {
-	for (const file of node.files) yield {
-		kind: "file",
-		depth,
-		name: file.name,
-		key: file.key
+		workdir: expandTilde$1(extracted.path, home),
+		command: extracted.rest
 	};
-	for (const subdir of node.subdirs) {
-		let dirNode = subdir.node;
-		const parts = [subdir.name];
-		while (dirNode.files.length === 0 && dirNode.subdirs.length === 1) {
-			const only = dirNode.subdirs[0];
-			parts.push(only.name);
-			dirNode = only.node;
-		}
-		yield {
-			kind: "dir",
-			depth,
-			name: parts.join("/"),
-			key: ""
-		};
-		yield* walkPathTree(dirNode, depth + 1);
-	}
 }
-/**
-* Render a flat path list as a grouped, prefix-folded directory tree without
-* per-file bodies (find-tool output shape, also used by compaction `<files>`
-* lists). Single-child directory chains fold into one header (`# a/b/c/`),
-* each level adds one `#`, and files are listed bare under the deepest
-* directory header that owns them. Trailing-slash entries are directory
-* leaves and keep their slash in the header.
-*
-* `annotate` receives each file's full original path and its return value is
-* appended verbatim to the file line (e.g. ` (RW)`).
-*
-* Order follows the input: a directory appears when its first member is
-* emitted, and a node's own files precede its subdirectories.
-*/
-function formatGroupedPaths(paths, annotate) {
-	if (paths.length === 0) return "";
-	const tree = buildPathTree(paths.map((entry) => ({
-		path: entry,
-		isDir: entry.endsWith("/")
-	})));
-	const lines = [];
-	for (const event of walkPathTree(tree)) if (event.kind === "dir") lines.push(`${"#".repeat(event.depth + 1)} ${event.name}/`);
-	else lines.push(annotate ? `${event.name}${annotate(event.key)}` : event.name);
-	return lines.join("\n");
+//#endregion
+//#region src/tools/omp/config/settings-schema.ts
+/** Schema default for a setting path (verbatim OMP values; unknown -> undefined). */
+function getDefault(path) {
+	return OMP_DEFAULTS[path];
 }
 //#endregion
 //#region src/tools/omp/tools/output-meta.ts
@@ -2469,7 +3050,7 @@ function formatTruncationMetaNotice(truncation) {
 		const elidedLines = truncation.elidedLines ?? Math.max(0, totalLines - truncation.outputLines);
 		const headPart = head ? `lines ${head.start}-${head.end}` : "";
 		const tailPart = tail ? `${tail.start}-${tail.end}` : "";
-		if (headPart && tailPart) notice = `Showing ${headPart} and ${tailPart} of ${totalLines}; ${elidedLines.toLocaleString()} middle line${elidedLines === 1 ? "" : "s"} (${formatBytes$2(elidedBytes)}) elided`;
+		if (headPart && tailPart) notice = `Showing ${headPart} and ${tailPart} of ${totalLines}; ${elidedLines.toLocaleString()} middle line${elidedLines === 1 ? "" : "s"} (${formatBytes$1(elidedBytes)}) elided`;
 		else notice = `Showing ${truncation.outputLines} of ${totalLines} lines; middle elided`;
 		if (truncation.nextOffset != null) notice += `. Use :${truncation.nextOffset} to continue`;
 		if (truncation.artifactId != null) notice += `. ${formatFullOutputReference(truncation.artifactId)}`;
@@ -2480,7 +3061,7 @@ function formatTruncationMetaNotice(truncation) {
 	else notice = `Showing ${truncation.outputLines} of ${truncation.totalLines} lines`;
 	if (truncation.truncatedBy === "bytes") {
 		const maxBytes = truncation.maxBytes ?? truncation.outputBytes;
-		notice += ` (${formatBytes$2(maxBytes)} limit)`;
+		notice += ` (${formatBytes$1(maxBytes)} limit)`;
 	}
 	if (truncation.nextOffset != null) notice += `. Use :${truncation.nextOffset} to continue`;
 	if (truncation.artifactId != null) notice += `. ${formatFullOutputReference(truncation.artifactId)}`;
@@ -2544,9 +3125,10 @@ function formatWallTimeNotice(wallTimeMs) {
 * middle elision, shown range for one-sided truncation) plus elided stats,
 * then the spill-file pointer and a read-back hint. Range reconstruction rides
 * the shared OMP algorithm (`outputMeta().truncationFromSummary`), with the
-* upstream `artifact://` clause replaced by the filesystem path — DSH has no
-* artifact URL space, and the read tool's `:N-M` inline selectors take their
-* place.
+* upstream `artifact://N` clause replaced by the spill-file path — bash spill
+* files are plain files (deliberately not registered in the read tool's
+* artifact:// space, see adapter/spill.ts) and are recovered with `:N-M`
+* inline selectors instead.
 * @returns the notice lines, or `undefined` when output was not truncated.
 */
 function formatTruncationNotice(value) {
@@ -2636,7 +3218,7 @@ const TOOL_PLUS_FIELDS = [
 	{
 		name: "interceptorEnabled",
 		kind: "boolean",
-		default: false,
+		default: true,
 		labelKey: "interceptorEnabled",
 		hintKey: "interceptorEnabledHint",
 		group: "behavior",
@@ -3235,7 +3817,15 @@ const DEFAULT_OUTPUT_TRUNCATE = {
 		tailLines: 100
 	}
 };
-/** OMP-parity defaults for the timing knobs (timeouts in ms; OMP uses seconds). */
+/**
+* Timing knobs (ms). DEFAULT_MAX_TIMEOUT_MS is OMP-parity (= upstream bash
+* per-tool max 3600s); DEFAULT_TIMEOUT_MS was deliberately relaxed from
+* 300_000 to 3_600_000 with the bash-plus settings card (763023e,
+* 2026-08-19) — NOT OMP-parity (OMP bash default is 300s), compensated by
+* auto-backgrounding after DEFAULT_AUTO_BACKGROUND_MS. By design there is no
+* upstream `tools.maxTimeout` global-cap equivalent: maxTimeoutMs always
+* applies. (second-impl-audit.md S-11 终局, 2026-08-29.)
+*/
 const DEFAULT_TIMEOUT_MS = 36e5;
 const DEFAULT_MAX_TIMEOUT_MS = 36e5;
 const DEFAULT_AUTO_BACKGROUND_MS = 6e4;
@@ -3257,7 +3847,7 @@ const Config = z.object({
 	outputSinkTailBytes: z.number().default(fieldDefault("outputSinkTailBytes", 51200)),
 	outputSinkHeadBytes: z.number().default(fieldDefault("outputSinkHeadBytes", 20480)),
 	minimizerEnabled: z.boolean().default(fieldDefault("minimizerEnabled", true)),
-	interceptorEnabled: z.boolean().default(fieldDefault("interceptorEnabled", false)),
+	interceptorEnabled: z.boolean().default(fieldDefault("interceptorEnabled", true)),
 	nonInteractiveEnv: z.boolean().default(fieldDefault("nonInteractiveEnv", true)),
 	snapshotEnabled: z.boolean().default(fieldDefault("snapshotEnabled", true)),
 	useShellCommandWrapper: z.boolean().default(fieldDefault("useShellCommandWrapper", false)),
@@ -3339,7 +3929,7 @@ function resolveConfig(config) {
 		outputSinkTailBytes: config.outputSinkTailBytes ?? fieldDefault("outputSinkTailBytes", 51200),
 		outputSinkHeadBytes: config.outputSinkHeadBytes ?? fieldDefault("outputSinkHeadBytes", 20480),
 		minimizer: resolveMinimizer(),
-		interceptorEnabled: config.interceptorEnabled ?? fieldDefault("interceptorEnabled", false),
+		interceptorEnabled: config.interceptorEnabled ?? fieldDefault("interceptorEnabled", true),
 		nonInteractiveEnv: config.nonInteractiveEnv ?? fieldDefault("nonInteractiveEnv", true),
 		snapshotEnabled: config.snapshotEnabled ?? fieldDefault("snapshotEnabled", true),
 		useShellCommandWrapper: config.useShellCommandWrapper ?? fieldDefault("useShellCommandWrapper", false),
@@ -3418,11 +4008,15 @@ function installBashPlusSettings(ctx, entry, onSource) {
 //#endregion
 //#region src/config/truncate.ts
 /**
-* Config-driven output truncation for background→foreground completion text,
-* ported verbatim in behavior from the OMP bash-runtime
-* `applyConfiguredTruncation` (index.ts). Pure functions over a policy value —
-* no plugin state — so the ported runtime files stay pristine and the
-* `bash-plus` settings surface drives this module.
+* Config-driven output truncation for background→foreground completion text.
+* Provenance (second-impl-audit.md S-1, 2026-08-29): the truncation
+* primitives (truncateHead/Middle/Tail, TruncationResult) are OMP 17.3.5
+* verbatim, imported directly from `../omp/session/streaming-output.ts`;
+* the composition layer below (trigger threshold + retention mode + notice
+* format) is a plugin-specific design shipped with the bash-plus settings
+* card (763023e, 2026-08-19) — `applyConfiguredTruncation` has no
+* counterpart in refs/oh-my-pi 17.3.5, so the old "ported verbatim from the
+* OMP bash-runtime" claim was unverifiable and has been dropped.
 * @module @xiaoso/dsh-tool-plus/truncate
 */
 /** Upper bound standing in for "no limit", matching the OMP helper. */
@@ -3451,7 +4045,7 @@ function applyConfiguredTruncation(text, fullOutputPath, truncate) {
 	const mode = isBytes ? truncate.bytes.mode : truncate.lines.mode;
 	let result;
 	if (isBytes) {
-		if (mode === "head") result = truncateHead$1(text, {
+		if (mode === "head") result = truncateHead(text, {
 			maxBytes: truncate.bytes.headBytes,
 			maxLines: TRUNC_NO_LIMIT
 		});
@@ -3465,7 +4059,7 @@ function applyConfiguredTruncation(text, fullOutputPath, truncate) {
 			maxBytes: truncate.bytes.tailBytes,
 			maxLines: TRUNC_NO_LIMIT
 		});
-	} else if (mode === "head") result = truncateHead$1(text, {
+	} else if (mode === "head") result = truncateHead(text, {
 		maxLines: truncate.lines.headLines,
 		maxBytes: TRUNC_NO_LIMIT
 	});
@@ -3489,10 +4083,28 @@ function applyConfiguredTruncation(text, fullOutputPath, truncate) {
 }
 //#endregion
 //#region src/tools/shared/omp-prompt.ts
-/** 渲染 {{#if KEY}}A{{else}}B{{/if}} 与 {{#if KEY}}A{{/if}}（不支持嵌套）。 */
+/**
+* OMP prompt.md → DSH tool description 适配层（verbatim md 不动，适配在此）。
+*
+* OMP 的 prompts/tools/*.md 用 Handlebars 条件渲染，DSH 的 defineTool
+* description 是静态字符串，这里提供：
+* - `renderOmpPrompt`：完全委托 OMP 自家引擎（@oh-my-pi/pi-utils 的
+*   prompt.render = 结构化 Handlebars 解析 + post-render format 后处理，
+*   与上游 read.ts 渲染工具描述同一条管线）。按「移植绝不允许第二套实现」
+*   （notebook T10-1 同类教训）：自写 regex 渲染器已删除——其全文懒匹配
+*   会跨条件边界吞并并在真值分支残留孤立 `{{/if}}`（2026-08-28 tools:sdk
+*   "malformed prompt variable" 事故根源）。strict:false → 未传变量按 falsy
+*   取 else 分支；畸形模板 compile 期抛错（注册期 fail-loud）。
+* - `sanitizeOmpPrompt`：按工具剔除 DSH 不适用的 OMP 提法（内部协议
+*   artifact:// ssh:// memory:// xd://、browser、scout/Task 子代理、inspect_image），
+*   全部剔除点记录在 step.md「提示词接入」节；md 源文件保持 verbatim 不变。
+*/
+/** 渲染 {{#if KEY}}A{{else}}B{{/if}} 与 {{#if KEY}}A{{/if}}——委托 OMP 引擎
+*  （@oh-my-pi/pi-utils prompt.render，strict:false：未传变量按 falsy 取 else
+*  分支；畸形模板 compile 期抛错，注册期 fail-loud）。保留首尾 trim 对齐
+*  既有调用点行为。 */
 function renderOmpPrompt(text, vars) {
-	const pick = (key) => vars[key] === true;
-	return text.replace(/\{\{#if\s+([A-Za-z_]+)\}\}([\s\S]*?)\{\{else\}\}([\s\S]*?)\{\{\/if\}\}/g, (_m, key, a, b) => pick(key) ? a : b).replace(/\{\{#if\s+([A-Za-z_]+)\}\}([\s\S]*?)\{\{\/if\}\}/g, (m, key, body) => pick(key) ? body : "").trim();
+	return render(text, { ...vars }).trim();
 }
 /** grep.md：internal URLs 提法 + scout 句剔除。 */
 function sanitizeGrepPrompt(text) {
@@ -3550,16 +4162,19 @@ function attachOmpSessionState(session, sessionKey) {
 	if (!sessionKey) return;
 	const state = getOmpSessionState(sessionKey);
 	if (state.conflictHistory) session.conflictHistory = state.conflictHistory;
+	if (state.fileSnapshotStore) session.fileSnapshotStore = state.fileSnapshotStore;
 }
 /**
 * 把 ToolSession 上引擎新建/更新的状态写回共享存储（execute 结束后调用）。
-* OMP 引擎惰性创建 ConflictHistory 并赋到 session 对象上，必须回写才能
-* 被下一次调用恢复。
+* OMP 引擎会惰性新建 ConflictHistory / fileSnapshotStore 并赋到 session
+* 对象上（如 read.ts 经 getFileSnapshotStore 挂快照库），必须回写才能被
+* 下一次调用恢复。
 */
 function persistOmpSessionState(sessionKey, session) {
 	if (!sessionKey) return;
 	const state = getOmpSessionState(sessionKey);
 	if (session.conflictHistory) state.conflictHistory = session.conflictHistory;
+	if (session.fileSnapshotStore) state.fileSnapshotStore = session.fileSnapshotStore;
 }
 function regexEscape(str) {
 	return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -4739,8 +5354,15 @@ function validateClipboardSequence(edits, clipboard) {
 /** Parse-result cache keyed by content hash + path; FIFO-bounded. */
 const parseCache = /* @__PURE__ */ new Map();
 const PARSE_CACHE_MAX = 256;
+/** Syntactic node boundaries outside a visible source range; FIFO-bounded. */
 const boundaryCache = /* @__PURE__ */ new Map();
-/** Syntactic node boundaries outside a visible source range. */
+/**
+* FNV-1a over UTF-16 code units → base36 parse-cache key. In-process only
+* (boundary/parse caches, FIFO ≤256): equal to the bun-shim `Bun.hash`
+* shim's UTF-8 FNV-1a on ASCII keys, differs on non-ASCII; no cross-runtime
+* or persistence contract (second-impl-audit.md S-3). Bun's native
+* `Bun.hash` is wyhash64 — a different function by design.
+*/
 function hashStr(s) {
 	let h = 2166136261;
 	for (let i = 0; i < s.length; i++) {
@@ -7283,7 +7905,7 @@ function restoreLineEndings(text, ending) {
 	return ending === "\r\n" ? text.replace(/\n/g, "\r\n") : text;
 }
 /** Strip a UTF-8 BOM if present and return both the BOM and the trailing text. */
-function stripBom$2(content) {
+function stripBom$1(content) {
 	return content.startsWith("") ? {
 		bom: "",
 		text: content.slice(1)
@@ -7798,7 +8420,7 @@ var Patcher = class {
 			try {
 				const read = await this.#tryRead(section.path);
 				if (read.exists) {
-					const normalized = normalizeToLF(stripBom$2(read.rawContent).text);
+					const normalized = normalizeToLF(stripBom$1(read.rawContent).text);
 					span = this.blockResolver({
 						path: section.path,
 						text: normalized,
@@ -7841,7 +8463,7 @@ var Patcher = class {
 		await this.fs.preflightWrite(target.path, { fileOp });
 		if (!read.exists) throw new Error(`File not found: ${target.path}. Use the write tool to create new files.`);
 		if (fileOp?.kind === "move" && this.fs.canonicalPath(fileOp.dest) === canonicalPath) throw new Error(`MV destination is the same as ${target.path}.`);
-		const { bom: bomFromText, text } = stripBom$2(read.rawContent);
+		const { bom: bomFromText, text } = stripBom$1(read.rawContent);
 		const bom = bomFromText || await this.#readBinaryBom(target.path);
 		const lineEnding = detectLineEnding(text);
 		const normalized = normalizeToLF(text);
@@ -7954,7 +8576,7 @@ var Patcher = class {
 		}
 		const write = await this.fs.writeText(section.path, persisted);
 		const op = exists ? "update" : "create";
-		const recorded = normalizeToLF(stripBom$2(write.text).text);
+		const recorded = normalizeToLF(stripBom$1(write.text).text);
 		const driftedOnWrite = recorded !== after;
 		const fileHash = this.#recordFullSnapshot(canonicalPath, recorded);
 		const allWarnings = driftedOnWrite ? [...warnings, writeDriftWarning(section.path)] : warnings;
@@ -8967,208 +9589,6 @@ function parseInternalUrl(input) {
 //#region src/tools/omp/prompts/tools/read.md
 var read_default = "Read files, directories, archives, SQLite, images, documents, internal resources, and web URLs via `path`.\n\n<instruction>\n- SHOULD parallelize independent reads.\n- SHOULD use `read` (not browser) for web content; browser only when `read` can't deliver.\n</instruction>\n\n## Selectors — append `:<sel>` to `path` (e.g. `src/foo.ts:50-200`, `src/foo.ts:raw`, `db.sqlite:users:42`)\n- `:50` / `:50-` — from line 50 | `:50-200` — inclusive | `:50+150` — 150 lines from 50 | `:5-16,960-973` — multiple ranges\n- `:raw` — verbatim, no anchors/prefixes | `:2-4:raw` / `:raw:2-4` — range + verbatim\n- `:conflicts` — one line per unresolved git merge conflict block\n\n## Source kinds\n- Parseable code, no selector → structural summary (declarations only, body elided). Footer names recovery selector — re-issue ONLY those ranges.\n- {{#if IS_HL_MODE}}File + selector → `[foo.ts#1A2B]` snapshot header + numbered lines. Copy `[FILENAME#TAG]` for anchored edits; NEVER fabricate the tag.{{/if}}\n- Directory → depth-limited dirent listing.\n- SQLite (`.sqlite`, `.sqlite3`, `.db`, `.db3`): `file.db` (tables), `file.db:table` (schema+rows), `file.db:table:key` (by PK), `?limit=`/`?where=`/`?q=SELECT`.\n- Archives (`.tar`, `.tar.gz`, `.tgz`, `.zip`, plus ZIP-based `.jar`/`.war`/`.ear`/`.apk`): `archive.ext:path/inside/archive` reads a member.\n- Documents → extracted text. Notebooks → editable cells. Images → {{#if INSPECT_IMAGE_ENABLED}}metadata; call `inspect_image`{{else}}decoded inline{{/if}}. `:raw` bypasses converters.\n- URLs → reader-mode clean text/markdown; `:raw` → untouched HTML. Bare `host:port` needs trailing slash.\n- Internal URIs — all schemes take selectors. `artifact://<id>` recovers spilled output; page with `:N-M`/`:raw:N-M`.\n- `ssh://host/<path>` reads remote file/dir (UTF-8, ≤1 MiB); bare `ssh://` lists hosts; also `write`/`search`-able.\n  Literal `:`, `?`, `#` → percent-encode (`%3A`/`%3F`/`%23`). Requires POSIX shell (else `ssh` tool).\n\n<critical>\nSummary footer names elided ranges? Re-issue ONLY those ranges. NEVER guess `..`/`…` content.\n</critical>\n";
 //#endregion
-//#region src/tools/omp/session/streaming-output.ts
-const DEFAULT_MAX_LINES = 3e3;
-const DEFAULT_MAX_BYTES = 51200;
-const NL = "\n";
-/** Count newline characters via native substring search. */
-function countNewlines(text) {
-	let count = 0;
-	let pos = text.indexOf(NL);
-	while (pos !== -1) {
-		count++;
-		pos = text.indexOf(NL, pos + 1);
-	}
-	return count;
-}
-/** Zero-copy view of a Uint8Array as a Buffer (copies only if already a Buffer). */
-function asBuffer(data) {
-	return Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
-}
-/** Advance past UTF-8 continuation bytes (10xxxxxx) to a leading byte. */
-function findUtf8BoundaryForward(buf, pos) {
-	let i = Math.max(0, pos);
-	while (i < buf.length && (buf[i] & 192) === 128) i++;
-	return i;
-}
-/** Retreat past UTF-8 continuation bytes to land on a leading byte. */
-function findUtf8BoundaryBackward(buf, cut) {
-	let i = Math.min(buf.length, Math.max(0, cut));
-	if (i >= buf.length) return buf.length;
-	while (i > 0 && (buf[i] & 192) === 128) i--;
-	return i;
-}
-function truncateBytesWindowed(data, maxBytesRaw, mode) {
-	const maxBytes = maxBytesRaw;
-	if (maxBytes === 0) return {
-		text: "",
-		bytes: 0
-	};
-	if (typeof data === "string") {
-		if (data.length <= maxBytes) {
-			const len = Buffer.byteLength(data, "utf-8");
-			if (len <= maxBytes) return {
-				text: data,
-				bytes: len
-			};
-		}
-		const window = mode === "head" ? data.substring(0, Math.min(data.length, maxBytes)) : data.substring(Math.max(0, data.length - maxBytes));
-		const buf = Buffer.from(window, "utf-8");
-		if (mode === "head") {
-			const end = findUtf8BoundaryBackward(buf, maxBytes);
-			if (end <= 0) return {
-				text: "",
-				bytes: 0
-			};
-			const slice = buf.subarray(0, end);
-			return {
-				text: slice.toString("utf-8"),
-				bytes: slice.length
-			};
-		} else {
-			const start = findUtf8BoundaryForward(buf, Math.max(0, buf.length - maxBytes));
-			const slice = buf.subarray(start);
-			return {
-				text: slice.toString("utf-8"),
-				bytes: slice.length
-			};
-		}
-	}
-	const buf = asBuffer(data);
-	if (buf.length <= maxBytes) return {
-		text: buf.toString("utf-8"),
-		bytes: buf.length
-	};
-	if (mode === "head") {
-		const end = findUtf8BoundaryBackward(buf, maxBytes);
-		if (end <= 0) return {
-			text: "",
-			bytes: 0
-		};
-		const slice = buf.subarray(0, end);
-		return {
-			text: slice.toString("utf-8"),
-			bytes: slice.length
-		};
-	} else {
-		const start = findUtf8BoundaryForward(buf, buf.length - maxBytes);
-		const slice = buf.subarray(start);
-		return {
-			text: slice.toString("utf-8"),
-			bytes: slice.length
-		};
-	}
-}
-/**
-* Truncate a string/buffer to fit within a byte limit, keeping the head.
-* Handles multi-byte UTF-8 boundaries correctly.
-*/
-function truncateHeadBytes(data, maxBytes) {
-	return truncateBytesWindowed(data, maxBytes, "head");
-}
-/**
-* Truncate a single line to max characters, appending '…' if truncated.
-*/
-function truncateLine(line, maxChars = 512) {
-	if (line.length <= maxChars) return {
-		text: line,
-		wasTruncated: false
-	};
-	return {
-		text: `${line.slice(0, maxChars)}…`,
-		wasTruncated: true
-	};
-}
-/** Shared helper to build a no-truncation result. */
-function noTruncResult(content, totalLines, totalBytes) {
-	if (totalLines == null) totalLines = countNewlines(content) + 1;
-	if (totalBytes == null) totalBytes = Buffer.byteLength(content, "utf-8");
-	return {
-		content,
-		totalLines,
-		totalBytes
-	};
-}
-/**
-* Truncate content from the head (keep first N lines/bytes).
-* Never returns partial lines. If the first line exceeds the byte limit,
-* returns empty content with firstLineExceedsLimit=true.
-*
-* This implementation avoids Buffer.from(content) for the whole input.
-* It only computes UTF-8 byteLength for candidate lines that can still fit.
-*/
-function truncateHead(content, options = {}) {
-	const maxLines = options.maxLines ?? 3e3;
-	const maxBytes = options.maxBytes ?? 51200;
-	const totalBytes = Buffer.byteLength(content, "utf-8");
-	const totalLines = countNewlines(content) + 1;
-	if (totalLines <= maxLines && totalBytes <= maxBytes) return noTruncResult(content, totalLines, totalBytes);
-	let includedLines = 0;
-	let bytesUsed = 0;
-	let cutIndex = 0;
-	let cursor = 0;
-	let truncatedBy = "lines";
-	while (includedLines < maxLines) {
-		const nl = content.indexOf(NL, cursor);
-		const lineEnd = nl === -1 ? content.length : nl;
-		const sepBytes = includedLines > 0 ? 1 : 0;
-		const remaining = maxBytes - bytesUsed - sepBytes;
-		if (remaining < 0) {
-			truncatedBy = "bytes";
-			break;
-		}
-		if (lineEnd - cursor > remaining) {
-			truncatedBy = "bytes";
-			if (includedLines === 0) return {
-				content: "",
-				truncated: true,
-				truncatedBy: "bytes",
-				totalLines,
-				totalBytes,
-				outputLines: 0,
-				outputBytes: 0,
-				lastLinePartial: false,
-				firstLineExceedsLimit: true
-			};
-			break;
-		}
-		const lineText = content.slice(cursor, lineEnd);
-		const lineBytes = Buffer.byteLength(lineText, "utf-8");
-		if (lineBytes > remaining) {
-			truncatedBy = "bytes";
-			if (includedLines === 0) return {
-				content: "",
-				truncated: true,
-				truncatedBy: "bytes",
-				totalLines,
-				totalBytes,
-				outputLines: 0,
-				outputBytes: 0,
-				lastLinePartial: false,
-				firstLineExceedsLimit: true
-			};
-			break;
-		}
-		bytesUsed += sepBytes + lineBytes;
-		includedLines++;
-		cutIndex = nl === -1 ? content.length : nl;
-		if (nl === -1) break;
-		cursor = nl + 1;
-	}
-	if (includedLines >= maxLines && bytesUsed <= maxBytes) truncatedBy = "lines";
-	return {
-		content: content.slice(0, cutIndex),
-		truncated: true,
-		truncatedBy,
-		totalLines,
-		totalBytes,
-		outputLines: includedLines,
-		outputBytes: bytesUsed,
-		lastLinePartial: false,
-		firstLineExceedsLimit: false
-	};
-}
-//#endregion
 //#region src/tools/omp/utils/block-context.ts
 const OPEN_TO_CLOSE = {
 	"(": ")",
@@ -10256,7 +10676,7 @@ function renderNode(node, formatNodeAge, out) {
 			label: `${indent}- ${node.name}${suffix}`,
 			depth: node.depth,
 			isRoot: false,
-			size: node.isDir ? void 0 : formatBytes$2(node.size),
+			size: node.isDir ? void 0 : formatBytes$1(node.size),
 			age: formatNodeAge(node.mtimeMs)
 		});
 	}
@@ -10511,18 +10931,18 @@ function parseConflictUri(raw) {
 	const idPart = slashIdx === -1 ? tail : tail.slice(0, slashIdx);
 	const scopePart = slashIdx === -1 ? void 0 : tail.slice(slashIdx + 1);
 	if (idPart === "*") {
-		if (scopePart !== void 0) throw new ToolError$1(`Invalid conflict URI '${raw}': wildcard 'conflict://*' does not accept a scope segment. Drop '/${scopePart}' or use a numeric id.`);
+		if (scopePart !== void 0) throw new ToolError(`Invalid conflict URI '${raw}': wildcard 'conflict://*' does not accept a scope segment. Drop '/${scopePart}' or use a numeric id.`);
 		return recoveredPrefix !== void 0 ? {
 			id: "*",
 			recoveredPrefix
 		} : { id: "*" };
 	}
-	if (!/^\d+$/.test(idPart)) throw new ToolError$1(`Invalid conflict URI '${raw}': must be 'conflict://<N>', 'conflict://<N>/<scope>', or 'conflict://*' where N is a positive integer surfaced by a prior \`read\`.`);
+	if (!/^\d+$/.test(idPart)) throw new ToolError(`Invalid conflict URI '${raw}': must be 'conflict://<N>', 'conflict://<N>/<scope>', or 'conflict://*' where N is a positive integer surfaced by a prior \`read\`.`);
 	const id = Number.parseInt(idPart, 10);
-	if (!Number.isFinite(id) || id < 1) throw new ToolError$1(`Invalid conflict URI '${raw}': id must be ≥ 1.`);
+	if (!Number.isFinite(id) || id < 1) throw new ToolError(`Invalid conflict URI '${raw}': id must be ≥ 1.`);
 	let scope;
 	if (scopePart !== void 0) {
-		if (!CONFLICT_SCOPES.has(scopePart)) throw new ToolError$1(`Invalid conflict URI '${raw}': scope must be one of 'ours', 'theirs', 'base', or omitted (e.g. 'conflict://${id}/theirs').`);
+		if (!CONFLICT_SCOPES.has(scopePart)) throw new ToolError(`Invalid conflict URI '${raw}': scope must be one of 'ours', 'theirs', 'base', or omitted (e.g. 'conflict://${id}/theirs').`);
 		scope = scopePart;
 	}
 	return recoveredPrefix !== void 0 ? {
@@ -10555,7 +10975,7 @@ function parseConflictUri(raw) {
 function spliceConflict(originalText, entry, replacement) {
 	const lines = originalText.split("\n");
 	const match = locateRegion(lines, buildRecordedRegion(entry), entry.startLine - 1);
-	if (!match) throw new ToolError$1(`Conflict #${entry.id} no longer present in '${entry.displayPath}': the recorded marker block can't be located. The file changed since the conflict was registered — re-read it to re-register conflicts.`);
+	if (!match) throw new ToolError(`Conflict #${entry.id} no longer present in '${entry.displayPath}': the recorded marker block can't be located. The file changed since the conflict was registered — re-read it to re-register conflicts.`);
 	let replacementLines = normalizeTrailingNewline(replacement).split("\n").map(stripTrailingCr);
 	const echo = trimBoundaryEcho(replacementLines, lines, match, entry);
 	replacementLines = echo.lines;
@@ -10732,7 +11152,7 @@ function expandContentTokens(content, entry) {
 			out.push(...entry.theirsLines);
 			break;
 		case "@base":
-			if (!entry.baseLines) throw new ToolError$1(`Conflict #${entry.id} has no base section (2-way merge). \`@base\` is only valid for diff3 conflicts.`);
+			if (!entry.baseLines) throw new ToolError(`Conflict #${entry.id} has no base section (2-way merge). \`@base\` is only valid for diff3 conflicts.`);
 			out.push(...entry.baseLines);
 			break;
 		case "@both":
@@ -10770,7 +11190,7 @@ function renderConflictRegion(entry, scope) {
 		startLine: entry.separatorLine + 1
 	};
 	if (scope === "base") {
-		if (entry.baseLines === void 0 || entry.baseLine === void 0) throw new ToolError$1(`Conflict #${entry.id} has no base section (2-way merge). 'conflict://${entry.id}/base' is only valid for diff3 conflicts.`);
+		if (entry.baseLines === void 0 || entry.baseLine === void 0) throw new ToolError(`Conflict #${entry.id} has no base section (2-way merge). 'conflict://${entry.id}/base' is only valid for diff3 conflicts.`);
 		return {
 			lines: [...entry.baseLines],
 			startLine: entry.baseLine + 1
@@ -11205,16 +11625,16 @@ function parseLineRangeChunk(sel) {
 	const lineMatch = LINE_RANGE_CHUNK_RE.exec(sel);
 	if (!lineMatch) return null;
 	const rawStart = Number.parseInt(lineMatch[1], 10);
-	if (rawStart < 1) throw new ToolError$1("Line selector 0 is invalid; lines are 1-indexed. Use :1.");
+	if (rawStart < 1) throw new ToolError("Line selector 0 is invalid; lines are 1-indexed. Use :1.");
 	const sep = lineMatch[2] === ".." ? "-" : lineMatch[2];
 	const rhs = lineMatch[3] ? Number.parseInt(lineMatch[3], 10) : void 0;
 	let rawEnd;
 	if (sep === "+") {
-		if (rhs === void 0 || rhs < 1) throw new ToolError$1(`Invalid range ${rawStart}+${rhs ?? 0}: count must be >= 1.`);
+		if (rhs === void 0 || rhs < 1) throw new ToolError(`Invalid range ${rawStart}+${rhs ?? 0}: count must be >= 1.`);
 		rawEnd = rawStart + rhs - 1;
 	} else if (sep === "-") {
 		if (rhs !== void 0) {
-			if (rhs < rawStart) throw new ToolError$1(`Invalid range ${rawStart}-${rhs}: end must be >= start.`);
+			if (rhs < rawStart) throw new ToolError(`Invalid range ${rawStart}-${rhs}: end must be >= start.`);
 			rawEnd = rhs;
 		}
 	}
@@ -11387,7 +11807,7 @@ function peelWriteUrlSelector(rawPath) {
 	const { path, sel } = splitInternalUrlSel(rawPath);
 	if (sel === void 0) return rawPath;
 	if (/^(?:raw|conflicts)$/i.test(sel)) return path;
-	throw new ToolError$1(`write does not accept the trailing selector ":${sel}" — it writes a whole file. Remove ":${sel}", or if the filename truly ends with it, percent-encode the ":" as %3A.`);
+	throw new ToolError(`write does not accept the trailing selector ":${sel}" — it writes a whole file. Remove ":${sel}", or if the filename truly ends with it, percent-encode the ":" as %3A.`);
 }
 function assertNotInternalUrl(expanded, original) {
 	for (const prefix of TOP_LEVEL_INTERNAL_URL_PREFIXES) if (expanded.startsWith(prefix)) throw new Error(`Path "${original}" uses internal scheme "${prefix}" and must be resolved through the proper protocol handler, not as a filesystem path.`);
@@ -11869,9 +12289,9 @@ async function findUniqueWorkspaceSuffix(rawPath, cwd, signal) {
 async function resolveToolSearchScope(opts) {
 	const { rawPaths: inputs, cwd, internalUrlAction } = opts;
 	const normalizedRawPaths = inputs.map(normalizePathLikeInput);
-	if (normalizedRawPaths.some((rawPath) => rawPath.length === 0)) throw new ToolError$1("Search scope entries must be non-empty paths or globs");
+	if (normalizedRawPaths.some((rawPath) => rawPath.length === 0)) throw new ToolError("Search scope entries must be non-empty paths or globs");
 	const rawPaths = await expandDelimitedPathEntries(normalizedRawPaths, cwd);
-	if (rawPaths.some((rawPath) => rawPath.length === 0)) throw new ToolError$1("Search scope entries must be non-empty paths or globs");
+	if (rawPaths.some((rawPath) => rawPath.length === 0)) throw new ToolError("Search scope entries must be non-empty paths or globs");
 	const strictExternalUrlRe = /^(?:https?|ftp|ws|wss):\/\//i;
 	const internalRouter = InternalUrlRouter.instance();
 	const resolvedPathInputs = [];
@@ -11890,14 +12310,14 @@ async function resolveToolSearchScope(opts) {
 				if (opts.trackImmutableSources && resolved.immutable) immutableSourcePaths.add(path.resolve(resolved.sourcePath));
 				continue;
 			}
-			throw new ToolError$1(`Cannot ${internalUrlAction} external URL: ${rawPath}. Use \`read\` to fetch web content, then search the returned text.`);
+			throw new ToolError(`Cannot ${internalUrlAction} external URL: ${rawPath}. Use \`read\` to fetch web content, then search the returned text.`);
 		}
 		if (!internalRouter.canHandle(rawPath)) {
 			resolvedPathInputs.push(rawPath);
 			continue;
 		}
-		if (isSshUrl(rawPath)) throw new ToolError$1(`Cannot ${internalUrlAction} a remote ssh:// path (no local file): ${rawPath}. Use \`read ${rawPath}\` to view it, or the \`search\` tool to grep remote files.`);
-		if (hasGlobPathChars(rawPath)) throw new ToolError$1(`Glob patterns are not supported for internal URLs: ${rawPath}`);
+		if (isSshUrl(rawPath)) throw new ToolError(`Cannot ${internalUrlAction} a remote ssh:// path (no local file): ${rawPath}. Use \`read ${rawPath}\` to view it, or the \`search\` tool to grep remote files.`);
+		if (hasGlobPathChars(rawPath)) throw new ToolError(`Glob patterns are not supported for internal URLs: ${rawPath}`);
 		const resource = await internalRouter.resolve(rawPath, {
 			cwd,
 			settings: opts.settings,
@@ -11906,7 +12326,7 @@ async function resolveToolSearchScope(opts) {
 			skills: opts.skills,
 			pathOnly: true
 		});
-		if (!resource.sourcePath) throw new ToolError$1(`Cannot ${internalUrlAction} internal URL without a backing file: ${rawPath}`);
+		if (!resource.sourcePath) throw new ToolError(`Cannot ${internalUrlAction} internal URL without a backing file: ${rawPath}`);
 		if (opts.trackImmutableSources && resource.immutable) immutableSourcePaths.add(path.resolve(resource.sourcePath));
 		resolvedPathInputs.push(resource.sourcePath);
 	}
@@ -11914,7 +12334,7 @@ async function resolveToolSearchScope(opts) {
 	let effectivePaths = resolvedPathInputs;
 	if (resolvedPathInputs.length > 1) {
 		const partition = await partitionExistingPaths(resolvedPathInputs, cwd, parseSearchPath);
-		if (partition.valid.length === 0) throw new ToolError$1(`Path not found: ${partition.missing.join(", ")}`);
+		if (partition.valid.length === 0) throw new ToolError(`Path not found: ${partition.missing.join(", ")}`);
 		effectivePaths = partition.valid;
 		missingPaths = partition.missing;
 	}
@@ -11930,7 +12350,7 @@ async function resolveToolSearchScope(opts) {
 		scopePath = formatPathRelativeToCwd(searchPath, cwd);
 	} else {
 		const multiSearchPath = await resolveExplicitSearchPaths(effectivePaths, cwd, void 0, opts.fanOutFileTargets === true);
-		if (!multiSearchPath) throw new ToolError$1("`paths` must contain at least one path or glob");
+		if (!multiSearchPath) throw new ToolError("`paths` must contain at least one path or glob");
 		searchPath = multiSearchPath.basePath;
 		multiTargets = multiSearchPath.targets;
 		if (opts.surfaceExactFilePaths) {
@@ -11944,7 +12364,7 @@ async function resolveToolSearchScope(opts) {
 		isDirectory = (await Bun.file(searchPath).stat()).isDirectory();
 	} catch {
 		const hint = opts.multipathStatHint && rawPaths.length > 1 ? opts.multipathStatHint : "";
-		throw new ToolError$1(`Path not found: ${scopePath}${hint}`);
+		throw new ToolError(`Path not found: ${scopePath}${hint}`);
 	}
 	return {
 		searchPath,
@@ -12270,7 +12690,7 @@ var ImageInputTooLargeError = class extends Error {
 	bytes;
 	maxBytes;
 	constructor(bytes, maxBytes) {
-		super(`Image file too large: ${formatBytes$2(bytes)} exceeds ${formatBytes$2(maxBytes)} limit.`);
+		super(`Image file too large: ${formatBytes$1(bytes)} exceeds ${formatBytes$1(maxBytes)} limit.`);
 		this.name = "ImageInputTooLargeError";
 		this.bytes = bytes;
 		this.maxBytes = maxBytes;
@@ -12531,7 +12951,7 @@ function stringifySqliteValue(value) {
 	if (value === void 0) return "";
 	if (typeof value === "string") return value;
 	if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") return String(value);
-	if (value instanceof Uint8Array) return `<BLOB ${formatBytes$2(value.byteLength)}>`;
+	if (value instanceof Uint8Array) return `<BLOB ${formatBytes$1(value.byteLength)}>`;
 	try {
 		return JSON.stringify(value) ?? String(value);
 	} catch {
@@ -12611,18 +13031,18 @@ function buildAsciiTable(columns, rows) {
 function parseLimit(value, fallback) {
 	if (value === null || value.trim().length === 0) return fallback;
 	const parsed = Number.parseInt(value, 10);
-	if (!Number.isFinite(parsed) || parsed < 1) throw new ToolError$1(`SQLite limit must be a positive integer; got '${value}'`);
+	if (!Number.isFinite(parsed) || parsed < 1) throw new ToolError(`SQLite limit must be a positive integer; got '${value}'`);
 	return Math.min(parsed, MAX_QUERY_LIMIT);
 }
 function parseOffset(value) {
 	if (value === null || value.trim().length === 0) return 0;
 	const parsed = Number.parseInt(value, 10);
-	if (!Number.isFinite(parsed) || parsed < 0) throw new ToolError$1(`SQLite offset must be a non-negative integer; got '${value}'`);
+	if (!Number.isFinite(parsed) || parsed < 0) throw new ToolError(`SQLite offset must be a non-negative integer; got '${value}'`);
 	return parsed;
 }
 function getTableMasterRow(db, table) {
 	const row = db.prepare("SELECT name, sql FROM sqlite_master WHERE type = 'table' AND name NOT LIKE 'sqlite_%' AND name = ?").get(table) ?? null;
-	if (!row) throw new ToolError$1(`SQLite table '${table}' not found`);
+	if (!row) throw new ToolError(`SQLite table '${table}' not found`);
 	return row;
 }
 function getTableInfoRows(db, table) {
@@ -12637,7 +13057,7 @@ function getPrimaryKeyColumns(db, table) {
 }
 function coerceIntegerKey(key, label) {
 	const trimmed = key.trim();
-	if (!/^-?\d+$/.test(trimmed)) throw new ToolError$1(`${label} must be an integer; got '${key}'`);
+	if (!/^-?\d+$/.test(trimmed)) throw new ToolError(`${label} must be an integer; got '${key}'`);
 	const asNumber = Number.parseInt(trimmed, 10);
 	if (Number.isSafeInteger(asNumber)) return asNumber;
 	return BigInt(trimmed);
@@ -12658,8 +13078,8 @@ function resolveOrderClause(order, columns) {
 	const separatorIndex = trimmed.lastIndexOf(":");
 	const column = separatorIndex === -1 ? trimmed : trimmed.slice(0, separatorIndex);
 	const direction = separatorIndex === -1 ? "asc" : trimmed.slice(separatorIndex + 1).trim().toLowerCase();
-	if (!columns.includes(column)) throw new ToolError$1(`SQLite order column '${column}' not found in table schema`);
-	if (direction !== "asc" && direction !== "desc") throw new ToolError$1(`SQLite order direction must be 'asc' or 'desc'; got '${direction}'`);
+	if (!columns.includes(column)) throw new ToolError(`SQLite order column '${column}' not found in table schema`);
+	if (direction !== "asc" && direction !== "desc") throw new ToolError(`SQLite order direction must be 'asc' or 'desc'; got '${direction}'`);
 	return ` ORDER BY ${quoteSqliteIdentifier(column)} ${direction.toUpperCase()}`;
 }
 const FORBIDDEN_WHERE_KEYWORDS = /* @__PURE__ */ new Set([
@@ -12741,18 +13161,18 @@ function validateWhereClause(where) {
 	const trimmed = where.trim();
 	if (!trimmed) return void 0;
 	const violation = findWhereClauseViolation(trimmed);
-	if (violation) throw new ToolError$1(violation);
+	if (violation) throw new ToolError(violation);
 	return trimmed;
 }
 function normalizeWriteValue(value, column) {
 	if (value === null) return null;
 	if (typeof value === "string" || typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") return value;
-	throw new ToolError$1(`SQLite column '${column}' only accepts JSON scalar values or null`);
+	throw new ToolError(`SQLite column '${column}' only accepts JSON scalar values or null`);
 }
 function validateWriteColumns(db, table, data) {
 	const columns = new Set(getTableColumns(db, table));
 	return Object.entries(data).map(([column, value]) => {
-		if (!columns.has(column)) throw new ToolError$1(`SQLite table '${table}' has no column named '${column}'`);
+		if (!columns.has(column)) throw new ToolError(`SQLite table '${table}' has no column named '${column}'`);
 		return [column, normalizeWriteValue(value, column)];
 	});
 }
@@ -12791,23 +13211,23 @@ function parseSqliteSelector(subPath, queryString) {
 	const rawQuery = params.get("q");
 	if (rawQuery !== null) {
 		const otherKeys = [...params.keys()].filter((key) => key !== "q");
-		if (normalizedSubPath || otherKeys.length > 0) throw new ToolError$1("SQLite raw queries cannot be combined with table selectors or pagination");
-		if (!rawQuery.trim()) throw new ToolError$1("SQLite query parameter 'q' cannot be empty");
+		if (normalizedSubPath || otherKeys.length > 0) throw new ToolError("SQLite raw queries cannot be combined with table selectors or pagination");
+		if (!rawQuery.trim()) throw new ToolError("SQLite query parameter 'q' cannot be empty");
 		return {
 			kind: "raw",
 			sql: rawQuery
 		};
 	}
 	if (!normalizedSubPath) {
-		if (params.size > 0) throw new ToolError$1("SQLite query parameters require a table selector or q=SELECT...");
+		if (params.size > 0) throw new ToolError("SQLite query parameters require a table selector or q=SELECT...");
 		return { kind: "list" };
 	}
 	const separatorIndex = normalizedSubPath.indexOf(":");
 	const table = separatorIndex === -1 ? normalizedSubPath : normalizedSubPath.slice(0, separatorIndex);
 	const key = separatorIndex === -1 ? void 0 : normalizedSubPath.slice(separatorIndex + 1);
-	if (!table) throw new ToolError$1("SQLite selectors must include a table name");
+	if (!table) throw new ToolError("SQLite selectors must include a table name");
 	if (key !== void 0 && key.length > 0) {
-		if (params.size > 0) throw new ToolError$1("SQLite row lookups cannot be combined with query parameters");
+		if (params.size > 0) throw new ToolError("SQLite row lookups cannot be combined with query parameters");
 		return {
 			kind: "row",
 			table,
@@ -12823,7 +13243,7 @@ function parseSqliteSelector(subPath, queryString) {
 			"order",
 			"where"
 		]);
-		for (const keyName of params.keys()) if (!knownKeys.has(keyName)) throw new ToolError$1(`Unsupported SQLite query parameter '${keyName}'`);
+		for (const keyName of params.keys()) if (!knownKeys.has(keyName)) throw new ToolError(`Unsupported SQLite query parameter '${keyName}'`);
 		return {
 			kind: "query",
 			table,
@@ -12833,7 +13253,7 @@ function parseSqliteSelector(subPath, queryString) {
 			where
 		};
 	}
-	if (params.size > 0) for (const keyName of params.keys()) throw new ToolError$1(`Unsupported SQLite query parameter '${keyName}'`);
+	if (params.size > 0) for (const keyName of params.keys()) throw new ToolError(`Unsupported SQLite query parameter '${keyName}'`);
 	return {
 		kind: "schema",
 		table,
@@ -12893,7 +13313,7 @@ function listTables(db, options = {}) {
 }
 function getTableSchema(db, table) {
 	const row = getTableMasterRow(db, table);
-	if (!row.sql) throw new ToolError$1(`SQLite schema for table '${table}' is unavailable`);
+	if (!row.sql) throw new ToolError(`SQLite schema for table '${table}' is unavailable`);
 	return row.sql;
 }
 function resolveTableRowLookup(db, table) {
@@ -12906,9 +13326,9 @@ function resolveTableRowLookup(db, table) {
 			type: column.type
 		};
 	}
-	if (primaryKeyColumns.length > 1) throw new ToolError$1(`SQLite table '${table}' has a composite primary key; use '?where=' instead`);
+	if (primaryKeyColumns.length > 1) throw new ToolError(`SQLite table '${table}' has a composite primary key; use '?where=' instead`);
 	const schema = getTableSchema(db, table);
-	if (/\bWITHOUT\s+ROWID\b/i.test(schema)) throw new ToolError$1(`SQLite table '${table}' does not expose ROWID; use '?where=' instead`);
+	if (/\bWITHOUT\s+ROWID\b/i.test(schema)) throw new ToolError(`SQLite table '${table}' does not expose ROWID; use '?where=' instead`);
 	return { kind: "rowid" };
 }
 function queryRows(db, table, opts) {
@@ -12920,7 +13340,7 @@ function queryRows(db, table, opts) {
 	const selectSql = `SELECT * FROM ${quoteSqliteIdentifier(table)}${whereClause}${orderClause} LIMIT ? OFFSET ?`;
 	const totalCount = db.prepare(countSql).get()?.count ?? 0;
 	const statement = db.prepare(selectSql);
-	if (statement.paramsCount !== 2) throw new ToolError$1("SQLite where clause changed the expected pagination parameters; use q=SELECT ... for raw SQL");
+	if (statement.paramsCount !== 2) throw new ToolError("SQLite where clause changed the expected pagination parameters; use q=SELECT ... for raw SQL");
 	return {
 		columns,
 		rows: statement.all(opts.limit, opts.offset),
@@ -12940,7 +13360,7 @@ function getRowByRowId(db, table, key) {
 }
 function executeReadQuery(db, sql) {
 	const statement = db.prepare(sql);
-	if (statement.paramsCount > 0) throw new ToolError$1("SQLite raw queries do not support bound parameters");
+	if (statement.paramsCount > 0) throw new ToolError("SQLite raw queries do not support bound parameters");
 	const columns = [...statement.columnNames];
 	const rows = [];
 	let truncated = false;
@@ -12972,7 +13392,7 @@ function insertRow(db, table, data) {
 function updateRowByKey(db, table, pk, key, data) {
 	getTableMasterRow(db, table);
 	const entries = validateWriteColumns(db, table, data);
-	if (entries.length === 0) throw new ToolError$1("SQLite updates require at least one column value");
+	if (entries.length === 0) throw new ToolError("SQLite updates require at least one column value");
 	const assignments = entries.map(([column]) => `${quoteSqliteIdentifier(column)} = ?`).join(", ");
 	const bindings = entries.map(([, value]) => value);
 	bindings.push(coerceLookupValue(key, pk.type ?? ""));
@@ -12981,7 +13401,7 @@ function updateRowByKey(db, table, pk, key, data) {
 function updateRowByRowId(db, table, key, data) {
 	getTableMasterRow(db, table);
 	const entries = validateWriteColumns(db, table, data);
-	if (entries.length === 0) throw new ToolError$1("SQLite updates require at least one column value");
+	if (entries.length === 0) throw new ToolError("SQLite updates require at least one column value");
 	const assignments = entries.map(([column]) => `${quoteSqliteIdentifier(column)} = ?`).join(", ");
 	const bindings = entries.map(([, value]) => value);
 	bindings.push(coerceIntegerKey(key, "SQLite ROWID"));
@@ -13283,9 +13703,9 @@ function parseReadUrlTarget(readPath) {
 			raw = true;
 			continue;
 		}
-		if (ranges !== void 0) throw new ToolError$1(`URL selector has multiple range groups; combine them with commas (e.g. \`:5-10,20-30\`).`);
+		if (ranges !== void 0) throw new ToolError(`URL selector has multiple range groups; combine them with commas (e.g. \`:5-10,20-30\`).`);
 		const parsed = parseLineRanges(sel);
-		if (parsed === null) throw new ToolError$1(`Invalid URL line selector: ${sel}`);
+		if (parsed === null) throw new ToolError(`Invalid URL line selector: ${sel}`);
 		ranges = parsed;
 	}
 	if (!ranges || ranges.length === 0) return {
@@ -13765,7 +14185,7 @@ function binaryContentType(mime) {
 	return mime || "application/octet-stream";
 }
 function buildBinaryNotice(finalUrl, mime, byteLength) {
-	const size = byteLength === void 0 ? "unknown size" : formatBytes$2(byteLength);
+	const size = byteLength === void 0 ? "unknown size" : formatBytes$1(byteLength);
 	return `[Binary content: ${binaryContentType(mime)}, ${size}] ${finalUrl}`;
 }
 function buildBinaryPayloadResult(url, finalUrl, mime, method, content, fetchedAt, notes) {
@@ -13856,7 +14276,7 @@ let specialHandlersPromise;
 * requires a special handler, so we keep them out of the cold-startup graph.
 */
 function loadSpecialHandlers() {
-	specialHandlersPromise ??= import("./scrapers-CL-WgdU1.mjs").then((m) => m.specialHandlers);
+	specialHandlersPromise ??= import("./scrapers-nhQAvc8d.mjs").then((m) => m.specialHandlers);
 	return specialHandlersPromise;
 }
 /**
@@ -13910,7 +14330,7 @@ async function renderUrl(url, timeout, raw, settings, signal, storage, fetchOver
 		notes: [response.status ? `Failed to fetch URL (HTTP ${response.status})` : "Failed to fetch URL", ...response.error ? [`Cause: ${response.error}`] : []]
 	};
 	const { finalUrl, content: rawContent } = response;
-	if (response.truncated) notes.push(`Response body exceeded ${formatBytes$2(MAX_BYTES)} and was cut mid-stream; content is incomplete`);
+	if (response.truncated) notes.push(`Response body exceeded ${formatBytes$1(MAX_BYTES)} and was cut mid-stream; content is incomplete`);
 	const mime = normalizeMime(response.contentType);
 	const extHint = getExtensionHint(finalUrl);
 	const imageMimeType = resolveImageMimeType(mime, extHint);
@@ -14357,7 +14777,7 @@ function readUrlContentExtension(finalUrl) {
 }
 async function materializeReadUrlContent(session, entry, raw) {
 	const root = session.getArtifactsDir?.();
-	if (!root) throw new ToolError$1("Cannot search URL output because this session cannot materialize read artifacts.");
+	if (!root) throw new ToolError("Cannot search URL output because this session cannot materialize read artifacts.");
 	const dir = path.join(root, "url-search");
 	await fs_promises_shim_exports.mkdir(dir, { recursive: true });
 	const hash = Bun.hash(`${raw ? "raw" : "rendered"}:${entry.details.finalUrl}`).toString(36);
@@ -14394,7 +14814,7 @@ async function fetchReadUrl(session, params, signal, options) {
 }
 /** Materialize rendered URL body text to a local file for tools that require filesystem paths. */
 async function materializeReadUrlToFile(session, params, signal) {
-	if (!session.settings.get("fetch.enabled")) throw new ToolError$1("URL reads are disabled by settings.");
+	if (!session.settings.get("fetch.enabled")) throw new ToolError("URL reads are disabled by settings.");
 	const entry = await fetchReadUrl(session, params, signal);
 	return {
 		path: await materializeReadUrlContent(session, entry, params.raw ?? false),
@@ -14722,7 +15142,7 @@ function recordFullHashlineContext(session, absolutePath, displayPath, fullText)
 async function readHashlineHeaderContext(session, absolutePath, cwd) {
 	const fullText = await Bun.file(absolutePath).text();
 	const context = recordFullHashlineContext(session, absolutePath, formatPathRelativeToCwd(absolutePath, cwd), fullText);
-	if (!context) throw new ToolError$1(`Cannot record hashline snapshot for non-absolute path: ${absolutePath}`);
+	if (!context) throw new ToolError(`Cannot record hashline snapshot for non-absolute path: ${absolutePath}`);
 	return context;
 }
 function hashlineHeaderContext(displayPath, tag) {
@@ -14913,9 +15333,9 @@ function buildInMemoryTextResult(session, text, offset, limit, options) {
 		const firstLine = allLines[startLine] ?? "";
 		const firstLineBytes = Buffer.byteLength(firstLine, "utf-8");
 		const snippet = truncateHeadBytes(firstLine, DEFAULT_MAX_BYTES);
-		if (shouldAddHashLines) outputText = `[Line ${startLineDisplay} is ${formatBytes$2(firstLineBytes)}, exceeds ${formatBytes$2(DEFAULT_MAX_BYTES)} limit. Hashline output requires full lines; cannot emit an editable numbered preview for a truncated line.]`;
+		if (shouldAddHashLines) outputText = `[Line ${startLineDisplay} is ${formatBytes$1(firstLineBytes)}, exceeds ${formatBytes$1(DEFAULT_MAX_BYTES)} limit. Hashline output requires full lines; cannot emit an editable numbered preview for a truncated line.]`;
 		else outputText = formatText(snippet.text, startLineDisplay);
-		if (snippet.text.length === 0) outputText = `[Line ${startLineDisplay} is ${formatBytes$2(firstLineBytes)}, exceeds ${formatBytes$2(DEFAULT_MAX_BYTES)} limit. Unable to display a valid UTF-8 snippet.]`;
+		if (snippet.text.length === 0) outputText = `[Line ${startLineDisplay} is ${formatBytes$1(firstLineBytes)}, exceeds ${formatBytes$1(DEFAULT_MAX_BYTES)} limit. Unable to display a valid UTF-8 snippet.]`;
 		details.truncation = truncation;
 		truncationInfo = {
 			result: truncation,
@@ -15089,7 +15509,7 @@ function selectorChunkLooksReadLike(chunk) {
 	return lower === "raw" || lower === "conflicts" || /^-\d+(?:[-+]\d+)?$/.test(chunk) || parseLineRanges(chunk) !== null;
 }
 function invalidSelector(sel) {
-	return new ToolError$1(`Invalid selector ':${sel}'. Use :N, :N-M, :N+K, :N- (open-ended), a comma-separated list of ranges, :raw, or a range combined with raw (e.g. :raw:50-100).`);
+	return new ToolError(`Invalid selector ':${sel}'. Use :N, :N-M, :N+K, :N- (open-ended), a comma-separated list of ranges, :raw, or a range combined with raw (e.g. :raw:50-100).`);
 }
 function parseSel(sel) {
 	if (!sel || sel.length === 0) return { kind: "none" };
@@ -15214,15 +15634,15 @@ async function readArchive(session, readPath, parsedSel, resolvedArchivePath, si
 			sel = wholeSel;
 		}
 	}
-	if (!node) throw new ToolError$1(`Path '${readPath}' not found inside archive`);
+	if (!node) throw new ToolError(`Path '${readPath}' not found inside archive`);
 	if (node.isDirectory) {
-		if (isMultiRange(sel)) throw new ToolError$1("Multi-range line selectors are not supported for archive directory listings.");
+		if (isMultiRange(sel)) throw new ToolError("Multi-range line selectors are not supported for archive directory listings.");
 		const { offset, limit } = selToOffsetLimit(sel);
 		return readArchiveDirectory(archive, resolvedArchivePath.absolutePath, archiveSubPath, offset, limit, details, signal);
 	}
 	const entry = await archive.readFile(archiveSubPath);
 	const text = decodeUtf8Text(entry.bytes);
-	if (text === null) return toolResult(details).text(prependSuffixResolutionNotice(`[Cannot read binary archive entry '${entry.path}' (${formatBytes$2(entry.size)})]`, resolvedArchivePath.suffixResolution)).sourcePath(resolvedArchivePath.absolutePath).done();
+	if (text === null) return toolResult(details).text(prependSuffixResolutionNotice(`[Cannot read binary archive entry '${entry.path}' (${formatBytes$1(entry.size)})]`, resolvedArchivePath.suffixResolution)).sourcePath(resolvedArchivePath.absolutePath).done();
 	const raw = isRawSelector(sel);
 	const result = isMultiRange(sel) && sel.kind === "lines" ? buildInMemoryMultiRangeResult(session, text, sel.ranges, {
 		details,
@@ -15354,10 +15774,10 @@ async function readSqlite(resolvedSqlitePath, signal) {
 				return toolResult(details).text(prependSuffixResolutionNotice(output, resolvedSqlitePath.suffixResolution)).sourcePath(resolvedSqlitePath.absolutePath).done();
 			}
 		}
-		throw new ToolError$1("Unsupported SQLite selector");
+		throw new ToolError("Unsupported SQLite selector");
 	} catch (error) {
-		if (error instanceof ToolError$1) throw error;
-		throw new ToolError$1(error instanceof Error ? error.message : String(error));
+		if (error instanceof ToolError) throw error;
+		throw new ToolError(error instanceof Error ? error.message : String(error));
 	} finally {
 		db?.close();
 	}
@@ -15537,7 +15957,7 @@ function reportIssueDeviceUsage() {
 }
 function parseReportIssueBody(text) {
 	const body = text.trim();
-	if (!body) throw new ToolError$1(`Empty report. ${reportIssueDeviceUsage()}`);
+	if (!body) throw new ToolError(`Empty report. ${reportIssueDeviceUsage()}`);
 	const firstNewline = body.indexOf("\n");
 	if (firstNewline >= 0) {
 		const tool = body.slice(0, firstNewline).trim();
@@ -15556,7 +15976,7 @@ function parseReportIssueBody(text) {
 			report
 		};
 	}
-	throw new ToolError$1(`Invalid report format. ${reportIssueDeviceUsage()}`);
+	throw new ToolError(`Invalid report format. ${reportIssueDeviceUsage()}`);
 }
 /**
 * Whether Auto-QA is active for this session.
@@ -15828,7 +16248,7 @@ async function dispatchReportIssueDevice(session, text) {
 			recordToolIssue(session, tool, report);
 		}
 	} catch (error$1) {
-		if (error$1 instanceof ToolError$1) throw error$1;
+		if (error$1 instanceof ToolError) throw error$1;
 		error("Failed to record tool issue", { error: error$1 });
 	}
 	return {
@@ -15944,9 +16364,9 @@ async function runResolveInvocation(params, options) {
 			try {
 				options.onApplyError?.(error);
 			} catch {}
-			if (error instanceof ToolError$1) throw error;
+			if (error instanceof ToolError) throw error;
 			const message = error instanceof Error ? error.message : String(error);
-			throw new ToolError$1(`Apply failed: ${message}`);
+			throw new ToolError(`Apply failed: ${message}`);
 		}
 		return {
 			...result,
@@ -15985,7 +16405,7 @@ async function dispatchResolutionDevice(session, device, text) {
 	const body = text.trim();
 	if (device === "propose") {
 		const handler = session.peekPlanProposalHandler?.();
-		if (!handler) throw new ToolError$1(`No plan is awaiting approval — ${PROPOSE_DEVICE_PATH} only accepts a plan title while plan mode is active.`);
+		if (!handler) throw new ToolError(`No plan is awaiting approval — ${PROPOSE_DEVICE_PATH} only accepts a plan title while plan mode is active.`);
 		const result = await handler(body);
 		return {
 			result,
@@ -16026,7 +16446,7 @@ async function dispatchResolutionDevice(session, device, text) {
 				}
 			};
 		}
-		throw new ToolError$1(`No pending action to apply — ${RESOLVE_DEVICE_PATH} is only valid while a staged preview is pending.${proposeHint}`);
+		throw new ToolError(`No pending action to apply — ${RESOLVE_DEVICE_PATH} is only valid while a staged preview is pending.${proposeHint}`);
 	}
 	const result = await invoker({
 		action,
@@ -16309,7 +16729,7 @@ var ReadTool = class {
 			}, "the current model does not accept image input")
 		}]);
 		const maxBytes = Math.min(this.#imageInputMaxBytes, imageByteCap(bridge, this.#imageInputMaxBytes));
-		if (fileSize > maxBytes) throw new ToolError$1(`Image file too large: ${fileSize} bytes exceeds ${maxBytes} bytes; downscale the image and read the smaller copy`);
+		if (fileSize > maxBytes) throw new ToolError(`Image file too large: ${fileSize} bytes exceeds ${maxBytes} bytes; downscale the image and read the smaller copy`);
 		let loaded;
 		try {
 			const maybeLoaded = await loadImageInput({
@@ -16322,10 +16742,10 @@ var ReadTool = class {
 				excludeWebP: this.#forceExcludeWebp ? true : webpExclusionForModel(this.session.getActiveModel?.()),
 				resize: this.#imageResizeOptions
 			});
-			if (!maybeLoaded) throw new ToolError$1(`Read image file [${mimeType}] failed: unsupported image format.`);
+			if (!maybeLoaded) throw new ToolError(`Read image file [${mimeType}] failed: unsupported image format.`);
 			loaded = maybeLoaded;
 		} catch (error) {
-			if (error instanceof ImageInputTooLargeError) throw new ToolError$1(error.message);
+			if (error instanceof ImageInputTooLargeError) throw new ToolError(error.message);
 			throw error;
 		}
 		const commitMediaType = ((/* @__PURE__ */ new Set([
@@ -16527,13 +16947,13 @@ var ReadTool = class {
 		if (readPath.startsWith("file://")) readPath = expandPath(readPath);
 		const conflictUri = parseConflictUri(readPath);
 		if (conflictUri) {
-			if (conflictUri.id === "*") throw new ToolError$1("Reading `conflict://*` is not supported — wildcards are write-only. Use the `<path>:conflicts` read selector for the full list of conflicts in a file, or read `conflict://<N>` to inspect a single block.");
+			if (conflictUri.id === "*") throw new ToolError("Reading `conflict://*` is not supported — wildcards are write-only. Use the `<path>:conflicts` read selector for the full list of conflicts in a file, or read `conflict://<N>` to inspect a single block.");
 			return this.#readConflictRegion(conflictUri.id, conflictUri.scope);
 		}
 		const displayMode = resolveFileDisplayMode(this.session);
 		const parsedUrlTarget = parseReadUrlTarget(readPath);
 		if (parsedUrlTarget) {
-			if (!this.session.settings.get("fetch.enabled")) throw new ToolError$1("URL reads are disabled by settings.");
+			if (!this.session.settings.get("fetch.enabled")) throw new ToolError("URL reads are disabled by settings.");
 			const urlRaw = parsedUrlTarget.raw;
 			const urlRanges = parsedUrlTarget.ranges;
 			if (urlRanges !== void 0 && urlRanges.length > 1) {
@@ -16576,7 +16996,7 @@ var ReadTool = class {
 		if (internalRouter.canResolve(readPath)) {
 			const internalTarget = splitInternalUrlSel(readPath);
 			const parsed = parseSel(internalTarget.sel);
-			if (internalTarget.sel !== void 0 && parsed.kind === "none") throw new ToolError$1(`Invalid selector ':${internalTarget.sel}' on '${internalTarget.path}'. Use :N, :N-M, :N+K, :N- (open-ended), a comma-separated list of ranges, :raw, or a range combined with raw (e.g. :raw:50-100).`);
+			if (internalTarget.sel !== void 0 && parsed.kind === "none") throw new ToolError(`Invalid selector ':${internalTarget.sel}' on '${internalTarget.path}'. Use :N, :N-M, :N+K, :N- (open-ended), a comma-separated list of ranges, :raw, or a range combined with raw (e.g. :raw:50-100).`);
 			const urlMeta = parseInternalUrl(internalTarget.path);
 			if (urlMeta.protocol.replace(/:$/, "").toLowerCase() === "local") {
 				const localFile = await resolveLocalUrlToFile(urlMeta, {
@@ -16653,12 +17073,12 @@ var ReadTool = class {
 				if (!recoveredApprovedPlan && !suffixResolution) {
 					const delimitedResult = await this.#tryReadDelimitedPaths(readPath, signal);
 					if (delimitedResult) return delimitedResult;
-					throw new ToolError$1(`Path '${localReadPath}' not found`);
+					throw new ToolError(`Path '${localReadPath}' not found`);
 				}
 			} else throw error;
 		}
 		if (isDirectory) {
-			if (isMultiRange(parsed)) throw new ToolError$1("Multi-range line selectors are not supported for directory listings.");
+			if (isMultiRange(parsed)) throw new ToolError("Multi-range line selectors are not supported for directory listings.");
 			const { offset, limit } = selToOffsetLimit(parsed);
 			const dirResult = await this.#readDirectory(absolutePath, offset, limit, void 0);
 			if (suffixResolution) {
@@ -16751,7 +17171,7 @@ var ReadTool = class {
 			if (!isRawSelector(parsed) && await isProbablyBinary(absolutePath)) return toolResult({
 				resolvedPath: absolutePath,
 				suffixResolution
-			}).text(prependSuffixResolutionNotice(`[Cannot read binary file '${resolvedDisplayPath}' (${formatBytes$2(fileSize)}); not valid UTF-8 text. Use ':raw' to read bytes verbatim.]`, suffixResolution)).sourcePath(absolutePath).done();
+			}).text(prependSuffixResolutionNotice(`[Cannot read binary file '${resolvedDisplayPath}' (${formatBytes$1(fileSize)}); not valid UTF-8 text. Use ':raw' to read bytes verbatim.]`, suffixResolution)).sourcePath(absolutePath).done();
 			if (parsed.kind === "none" && this.session.settings.get("read.summarize.enabled") && (this.session.settings.get("read.summarize.prose") || !isProseSummaryPath(absolutePath))) {
 				const summary = await trySummarize(this.session, absolutePath, fileSize, signal);
 				if (summary?.parsed && summary.elided) {
@@ -16901,9 +17321,9 @@ var ReadTool = class {
 							text: "",
 							bytes: 0
 						};
-						if (shouldAddHashLines) outputText = `[Line ${startLineDisplay} is ${formatBytes$2(firstLineBytes)}, exceeds ${formatBytes$2(maxBytesForRead)} limit. Hashline output requires full lines; cannot emit an editable numbered preview for a truncated line.]`;
+						if (shouldAddHashLines) outputText = `[Line ${startLineDisplay} is ${formatBytes$1(firstLineBytes)}, exceeds ${formatBytes$1(maxBytesForRead)} limit. Hashline output requires full lines; cannot emit an editable numbered preview for a truncated line.]`;
 						else outputText = formatText(snippet.text, startLineDisplay);
-						if (snippet.text.length === 0) outputText = `[Line ${startLineDisplay} is ${formatBytes$2(firstLineBytes)}, exceeds ${formatBytes$2(maxBytesForRead)} limit. Unable to display a valid UTF-8 snippet.]`;
+						if (snippet.text.length === 0) outputText = `[Line ${startLineDisplay} is ${formatBytes$1(firstLineBytes)}, exceeds ${formatBytes$1(maxBytesForRead)} limit. Unable to display a valid UTF-8 snippet.]`;
 						details = { truncation };
 						sourcePath = absolutePath;
 						truncationInfo = {
@@ -16929,7 +17349,7 @@ var ReadTool = class {
 					} else if (startLine + userLimitedLines < totalFileLines || !reachedEof) {
 						const nextOffset = startLine + userLimitedLines + 1;
 						outputText = formatBracketAwareText() ?? formatText(truncation.content, startLineDisplay);
-						outputText += reachedEof ? `\n\n[${totalFileLines - (startLine + userLimitedLines)} more lines in file. Use :${nextOffset} to continue]` : `\n\n[More lines in file (${formatBytes$2(fileSize)} total; not scanned to EOF). Use :${nextOffset} to continue]`;
+						outputText += reachedEof ? `\n\n[${totalFileLines - (startLine + userLimitedLines)} more lines in file. Use :${nextOffset} to continue]` : `\n\n[More lines in file (${formatBytes$1(fileSize)} total; not scanned to EOF). Use :${nextOffset} to continue]`;
 						details = {};
 						sourcePath = absolutePath;
 					} else {
@@ -16999,7 +17419,7 @@ var ReadTool = class {
 	*/
 	async #readConflictRegion(id, scope) {
 		const entry = getConflictHistory(this.session).get(id);
-		if (!entry) throw new ToolError$1(`Conflict #${id} not found. Conflict ids are registered when \`read\` surfaces a marker block; re-read the file to get a current id.`);
+		if (!entry) throw new ToolError(`Conflict #${id} not found. Conflict ids are registered when \`read\` surfaces a marker block; re-read the file to get a current id.`);
 		const region = renderConflictRegion(entry, scope);
 		const displayMode = resolveFileDisplayMode(this.session);
 		const shouldAddHashLines = displayMode.hashLines;
@@ -17043,11 +17463,11 @@ var ReadTool = class {
 		}).text(summary).sourcePath(absolutePath).done();
 	}
 	#formatArtifactWorkflowNotice(artifact, artifactUrl) {
-		return `Artifact storage: ${shortenPath(artifact.path)} (${formatBytes$2(artifact.size)}). Use ${artifactUrl}:N-M to page, ${artifactUrl}:raw:N-M for verbatim chunks, and the artifact file path for search/copy workflows.`;
+		return `Artifact storage: ${shortenPath(artifact.path)} (${formatBytes$1(artifact.size)}). Use ${artifactUrl}:N-M to page, ${artifactUrl}:raw:N-M for verbatim chunks, and the artifact file path for search/copy workflows.`;
 	}
 	#formatRawArtifactBlockedNotice(artifact, artifactUrl) {
 		const displayPath = shortenPath(artifact.path);
-		return `Unbounded raw read blocked for ${artifactUrl} (${formatBytes$2(artifact.size)}). Reading the whole artifact verbatim can exhaust memory. Use ${artifactUrl}:raw:1-3000 for bounded verbatim chunks, ${artifactUrl}:1-3000 for numbered exploration, and the artifact file path for search/copy workflows: ${displayPath}`;
+		return `Unbounded raw read blocked for ${artifactUrl} (${formatBytes$1(artifact.size)}). Reading the whole artifact verbatim can exhaust memory. Use ${artifactUrl}:raw:1-3000 for bounded verbatim chunks, ${artifactUrl}:1-3000 for numbered exploration, and the artifact file path for search/copy workflows: ${displayPath}`;
 	}
 	async #readArtifactFile(url, parsedSel, signal) {
 		const artifact = await resolveArtifactFile(url, {
@@ -17131,7 +17551,7 @@ var ReadTool = class {
 				text: "",
 				bytes: 0
 			};
-			outputText = snippet.text.length > 0 ? formatText(snippet.text, startLineDisplay) : `[Line ${startLineDisplay} is ${formatBytes$2(firstLineBytes)}, exceeds ${formatBytes$2(maxBytesForRead)} limit. Unable to display a valid UTF-8 snippet.]`;
+			outputText = snippet.text.length > 0 ? formatText(snippet.text, startLineDisplay) : `[Line ${startLineDisplay} is ${formatBytes$1(firstLineBytes)}, exceeds ${formatBytes$1(maxBytesForRead)} limit. Unable to display a valid UTF-8 snippet.]`;
 			truncationInfo = {
 				result: truncation,
 				options: {
@@ -17152,7 +17572,7 @@ var ReadTool = class {
 			};
 			else if (startLine + collectedLines.length < totalFileLines || !reachedEof) {
 				const nextOffset = startLine + collectedLines.length + 1;
-				outputText += reachedEof ? `\n\n[${totalFileLines - (startLine + collectedLines.length)} more lines in artifact. Use ${artifactUrl}:${nextOffset} to continue]` : `\n\n[More lines in artifact (${formatBytes$2(artifact.size)} total; not scanned to EOF). Use ${artifactUrl}:${nextOffset} to continue]`;
+				outputText += reachedEof ? `\n\n[${totalFileLines - (startLine + collectedLines.length)} more lines in artifact. Use ${artifactUrl}:${nextOffset} to continue]` : `\n\n[More lines in artifact (${formatBytes$1(artifact.size)} total; not scanned to EOF). Use ${artifactUrl}:${nextOffset} to continue]`;
 			}
 		}
 		if (!rawSelector && artifact.size > MAX_ARTIFACT_RAW_INLINE_BYTES) outputText += `\n\n[${this.#formatArtifactWorkflowNotice(artifact, artifactUrl)}]`;
@@ -17173,7 +17593,7 @@ var ReadTool = class {
 		try {
 			urlMeta = parseInternalUrl(url);
 		} catch (e) {
-			throw new ToolError$1(e instanceof Error ? e.message : String(e));
+			throw new ToolError(e instanceof Error ? e.message : String(e));
 		}
 		const scheme = urlMeta.protocol.replace(/:$/, "").toLowerCase();
 		let hasExtraction = false;
@@ -17187,7 +17607,7 @@ var ReadTool = class {
 			const localImage = await this.#loadLocalImageUrl(urlMeta, signal);
 			if (localImage) return localImage;
 		}
-		if (hasExtraction && parsedSel.kind !== "none" && parsedSel.kind !== "raw") throw new ToolError$1("Cannot combine query extraction with line selectors");
+		if (hasExtraction && parsedSel.kind !== "none" && parsedSel.kind !== "raw") throw new ToolError("Cannot combine query extraction with line selectors");
 		const resource = await internalRouter.resolve(url, {
 			cwd: this.session.cwd,
 			settings: this.session.settings,
@@ -17197,7 +17617,7 @@ var ReadTool = class {
 			xd: { read: async (name) => {
 				if (name === "report_issue") return reportIssueDeviceUsage();
 				if (name && isResolutionDeviceName(name)) return resolutionDeviceUsage(name);
-				throw new ToolError$1(name ? `Unknown xd:// device '${name}'.` : "No xd:// tools are mounted in this session.");
+				throw new ToolError(name ? `Unknown xd:// device '${name}'.` : "No xd:// tools are mounted in this session.");
 			} }
 		});
 		const details = {
@@ -17272,7 +17692,7 @@ var ReadTool = class {
 			});
 		} catch (error) {
 			const message = error instanceof Error ? error.message : String(error);
-			throw new ToolError$1(`Cannot read directory: ${message}`);
+			throw new ToolError(`Cannot read directory: ${message}`);
 		}
 		throwIfAborted(signal);
 		const output = tree.totalLines <= 1 ? "(empty directory)" : tree.rendered;
@@ -17511,7 +17931,7 @@ async function writethroughNoop(dst, content, _signal, file) {
 }
 /** Async UTF-8 write (node:fs) used when no file handle is supplied. */
 async function writeFileUtf8(dst, content) {
-	const { writeFile, mkdir } = await import("./fs-promises-shim-B-9cMxz5.mjs").then((n) => n.n);
+	const { writeFile, mkdir } = await import("./fs-promises-shim-Bx0fpxuk.mjs").then((n) => n.n);
 	const { dirname } = await import("node:path");
 	try {
 		await writeFile(dst, content, "utf8");
@@ -17536,44 +17956,38 @@ function truncateForPrompt(value, maxChars = DEFAULT_PROMPT_TRUNCATE_CHARS) {
 	return `${value.slice(0, maxChars)}[…${omitted}ch elided…]`;
 }
 //#endregion
-//#region src/tools/shared/tool-errors.ts
+//#region src/tools/omp/tools/auto-generated-guard.ts
 /**
-* Standardized error types for tool execution.
+* Auto-generated file detection guard.
 *
-* Tools should throw these instead of returning error text.
-* The agent loop catches and renders them appropriately.
+* Prevents editing of files that appear to be automatically generated
+* by code generation tools (protoc, sqlc, buf, swagger, etc.).
+*
+* 唯一实现（A-3，second-impl-audit.md）：本文件是 OMP refs
+* packages/coding-agent/src/tools/auto-generated-guard.ts 的逐字移植，此前
+* 曾与 `src/tools/shared/auto-generated-guard.dsh.ts`（简化重写）并存，现已
+* 收敛到此处；`src/tools/edit/adapter/tools/auto-generated-guard.ts` 与
+* `src/tools/shared/auto-generated-guard.dsh.ts` 仅保留纯转发。
+* 唯一偏离（T17-1 修复，随合并带入）：basename 提取兼容 Windows 反斜杠路径。
 */
 /**
-* Base error for tool execution failures.
-* Override render() for custom LLM-facing formatting.
+* Number of bytes to read from the start of a file for auto-generated detection.
 */
-var ToolError = class extends Error {
-	context;
-	constructor(message, context) {
-		super(message);
-		this.context = context;
-		this.name = "ToolError";
-	}
-	/** Render error for LLM consumption. Override for custom formatting. */
-	render() {
-		return this.message;
-	}
-};
-//#endregion
-//#region src/tools/shared/auto-generated-guard.dsh.ts
+const CHECK_BYTE_COUNT = 1024;
+const HEADER_LINE_LIMIT = 40;
 /**
-* DSH-adapted auto-generated guard (minimal, Node-only).
-* Port of OMP auto-generated-guard.ts without Bun/pi-utils.
+* Strong marker patterns for generated-file headers.
+*
+* Keep these strict: broad patterns like /auto-generated/ cause false positives
+* in normal hand-written files (including this guard implementation itself).
 */
-const CHECK_BYTE_COUNT$1 = 1024;
-const HEADER_LINE_LIMIT$1 = 40;
-const AUTO_GENERATED_HEADER_MARKERS$1 = [
+const AUTO_GENERATED_HEADER_MARKERS = [
 	/@generated\b/i,
 	/\bcode\s+generated\s+by\s+[a-z0-9_.-]+/i,
 	/\bthis\s+file\s+was\s+automatically\s+generated\b/i,
 	new RegExp(`\\bgenerated\\s+by\\s+(?:protoc(?:-gen-[\\w-]+)?|sqlc|buf|swagger(?:-codegen)?|openapi(?:-generator)?|grpc-gateway|mockery|stringer|easyjson|deepcopy-gen|defaulter-gen|conversion-gen|client-gen|lister-gen|informer-gen|kysely-codegen|napi-rs)\\b`, "i")
 ];
-const COMMENT_STYLES_BY_EXTENSION$1 = /* @__PURE__ */ new Map([
+const COMMENT_STYLES_BY_EXTENSION = /* @__PURE__ */ new Map([
 	[".c", ["slash"]],
 	[".cc", ["slash"]],
 	[".cpp", ["slash"]],
@@ -17616,11 +18030,15 @@ const COMMENT_STYLES_BY_EXTENSION$1 = /* @__PURE__ */ new Map([
 	[".svg", ["html"]],
 	[".xhtml", ["html"]]
 ]);
-const COMMENT_STYLES_BY_BASENAME$1 = /* @__PURE__ */ new Map([
+const COMMENT_STYLES_BY_BASENAME = /* @__PURE__ */ new Map([
 	["dockerfile", ["hash"]],
 	["makefile", ["hash"]],
 	["justfile", ["hash"]]
 ]);
+/**
+* File name patterns that strongly indicate auto-generated files.
+* These are checked against the file name (not content).
+*/
 const AUTO_GENERATED_FILENAME_PATTERNS = [
 	/^zz_generated\./,
 	/\.pb\.(go|cc|h|c|js|ts)$/,
@@ -17633,30 +18051,30 @@ const AUTO_GENERATED_FILENAME_PATTERNS = [
 	/\.mock\.(go|ts)$/,
 	/\.mocks?\.(go|ts|js)$/
 ];
-function stripBom$1(content) {
+function stripBom(content) {
 	if (content.charCodeAt(0) === 65279) return content.slice(1);
 	return content;
 }
-function getCommentStylesForPath$1(filePath) {
+function getCommentStylesForPath(filePath) {
 	const normalizedPath = filePath.toLowerCase();
 	const fileName = path.basename(normalizedPath);
-	const stylesByName = COMMENT_STYLES_BY_BASENAME$1.get(fileName);
+	const stylesByName = COMMENT_STYLES_BY_BASENAME.get(fileName);
 	if (stylesByName) return stylesByName;
 	const ext = path.extname(fileName);
-	return COMMENT_STYLES_BY_EXTENSION$1.get(ext) ?? [];
+	return COMMENT_STYLES_BY_EXTENSION.get(ext) ?? [];
 }
-function extractLeadingHeaderCommentText$1(content, commentStyles) {
+function extractLeadingHeaderCommentText(content, commentStyles) {
 	if (commentStyles.length === 0) return "";
 	const includeSlash = commentStyles.includes("slash");
 	const includeHash = commentStyles.includes("hash");
 	const includeSql = commentStyles.includes("sql");
 	const includeHtml = commentStyles.includes("html");
-	const lines = stripBom$1(content).split(/\r?\n/);
+	const lines = stripBom(content).split(/\r?\n/);
 	const headerLines = [];
 	let started = false;
 	let inSlashBlock = false;
 	let inHtmlBlock = false;
-	for (let lineIndex = 0; lineIndex < lines.length && lineIndex < HEADER_LINE_LIMIT$1; lineIndex++) {
+	for (let lineIndex = 0; lineIndex < lines.length && lineIndex < HEADER_LINE_LIMIT; lineIndex += 1) {
 		const trimmed = lines[lineIndex]?.trim() ?? "";
 		if (lineIndex === 0 && trimmed.startsWith("#!")) continue;
 		if (inSlashBlock) {
@@ -17705,92 +18123,94 @@ function extractLeadingHeaderCommentText$1(content, commentStyles) {
 	}
 	return headerLines.join("\n");
 }
+/**
+* Check if a file name indicates it might be auto-generated.
+* This is a quick pre-check before reading file content.
+*/
 function isAutoGeneratedFileName(filePath) {
 	const fileName = filePath.split(/[\\/]/).pop() ?? "";
-	return AUTO_GENERATED_FILENAME_PATTERNS.some((p) => p.test(fileName));
+	return AUTO_GENERATED_FILENAME_PATTERNS.some((pattern) => pattern.test(fileName));
 }
-function detectAutoGeneratedMarker$1(content, filePath) {
-	const headerCommentText = extractLeadingHeaderCommentText$1(content, getCommentStylesForPath$1(filePath));
+/**
+* Check if leading header comments contain auto-generated markers.
+* Returns the matched marker text if found, undefined otherwise.
+*/
+function detectAutoGeneratedMarker(content, filePath) {
+	const headerCommentText = extractLeadingHeaderCommentText(content, getCommentStylesForPath(filePath));
 	if (!headerCommentText) return void 0;
-	for (const markerPattern of AUTO_GENERATED_HEADER_MARKERS$1) {
+	for (const markerPattern of AUTO_GENERATED_HEADER_MARKERS) {
 		const match = markerPattern.exec(headerCommentText);
 		if (match?.[0]) return match[0];
 	}
 }
-function buildAutoGeneratedError$1(displayPath, detected) {
-	return new ToolError(`Cannot modify auto-generated file: ${displayPath}\n\nThis file appears to be automatically generated (detected marker: "${detected}").\nAuto-generated files should not be edited directly.`);
+/**
+* Build the error message for an auto-generated file.
+*/
+function buildAutoGeneratedError(displayPath, detected) {
+	return new ToolError(`Cannot modify auto-generated file: ${displayPath}\n\nThis file appears to be automatically generated (detected marker: "${detected}").\nAuto-generated files should not be edited directly. Instead:\n1. Find the source file or generator configuration\n2. Make changes to the source\n3. Regenerate the file`);
 }
-var SimpleLRU = class {
-	max;
-	map = /* @__PURE__ */ new Map();
-	constructor(max) {
-		this.max = max;
-	}
-	get(key) {
-		const v = this.map.get(key);
-		if (v !== void 0) {
-			this.map.delete(key);
-			this.map.set(key, v);
-		}
-		return v;
-	}
-	set(key, value) {
-		if (this.map.has(key)) this.map.delete(key);
-		this.map.set(key, value);
-		if (this.map.size > this.max) {
-			const first = this.map.keys().next().value;
-			this.map.delete(first);
-		}
-	}
-};
-const autoGeneratedMap$1 = new SimpleLRU(10);
+const decoder = new TextDecoder("utf-8");
+const autoGeneratedMap = new LRUCache({ max: 10 });
 async function getAutoGeneratedMarker(filePath) {
 	if (isAutoGeneratedFileName(filePath)) return filePath.split(/[\\/]/).pop() ?? "";
-	let mtimeMs, size;
+	let mtimeMs;
+	let size;
 	try {
-		const stat = await fs_promises_shim_exports.stat(filePath);
+		const stat = await Bun.file(filePath).stat();
 		mtimeMs = stat.mtimeMs;
 		size = stat.size;
 	} catch (err) {
-		if (err?.code === "ENOENT") return void 0;
+		if (isEnoent(err)) return;
 		throw err;
 	}
-	const cached = autoGeneratedMap$1.get(filePath);
+	const cached = autoGeneratedMap.get(filePath);
 	if (cached && cached.mtimeMs === mtimeMs && cached.size === size) return cached.marker;
 	let marker;
 	try {
-		const handle = await fs_promises_shim_exports.open(filePath, "r");
-		try {
-			const buf = Buffer.alloc(CHECK_BYTE_COUNT$1);
-			const { bytesRead } = await handle.read(buf, 0, CHECK_BYTE_COUNT$1, 0);
-			marker = detectAutoGeneratedMarker$1(buf.subarray(0, bytesRead).toString("utf-8"), filePath);
-		} finally {
-			await handle.close();
-		}
+		marker = detectAutoGeneratedMarker(await peekFile(filePath, CHECK_BYTE_COUNT, (header) => decoder.decode(header)), filePath);
 	} catch (err) {
-		if (err?.code === "ENOENT") return void 0;
+		if (isEnoent(err)) return;
 		throw err;
 	}
-	autoGeneratedMap$1.set(filePath, {
+	autoGeneratedMap.set(filePath, {
 		mtimeMs,
 		size,
 		marker
 	});
 	return marker;
 }
-let blockAutoGenerated = true;
-/** Update whether auto-generated files are blocked (`edit.blockAutoGenerated`). */
-function setBlockAutoGenerated(enabled) {
-	blockAutoGenerated = enabled;
-}
-function shouldBlockAutoGeneratedFiles$1() {
-	return blockAutoGenerated;
+function shouldBlockAutoGeneratedFiles(activeSettings) {
+	if (activeSettings) return activeSettings.get("edit.blockAutoGenerated");
+	if (isSettingsInitialized()) return settings.get("edit.blockAutoGenerated");
+	return getDefault("edit.blockAutoGenerated");
 }
-async function assertEditableFile(absolutePath, displayPath, _activeSettings) {
-	if (!shouldBlockAutoGeneratedFiles$1()) return;
+/**
+* Check if a file is auto-generated by examining its content.
+* Throws ToolError if the file appears to be auto-generated.
+*
+* @param absolutePath - Absolute path to the file
+* @param displayPath - Path to show in error messages (relative or as provided)
+* @param activeSettings - Session settings; falls back to global settings or the schema default
+*/
+async function assertEditableFile(absolutePath, displayPath, activeSettings) {
+	if (!shouldBlockAutoGeneratedFiles(activeSettings)) return;
 	const pathForDisplay = displayPath ?? absolutePath;
 	const marker = await getAutoGeneratedMarker(absolutePath);
-	if (marker) throw buildAutoGeneratedError$1(pathForDisplay, marker);
+	if (marker) throw buildAutoGeneratedError(pathForDisplay, marker);
+}
+/**
+* Check if file content is auto-generated.
+* Uses only the first CHECK_BYTE_COUNT characters of the content.
+* Throws ToolError if the content appears to be auto-generated.
+*
+* @param content - File content to check (can be full content or prefix)
+* @param displayPath - Path to show in error messages
+* @param activeSettings - Session settings; falls back to global settings or the schema default
+*/
+function assertEditableFileContent(content, displayPath, activeSettings) {
+	if (!shouldBlockAutoGeneratedFiles(activeSettings)) return;
+	const marker = detectAutoGeneratedMarker(content.slice(0, CHECK_BYTE_COUNT), displayPath);
+	if (marker) throw buildAutoGeneratedError(displayPath, marker);
 }
 //#endregion
 //#region src/tools/omp/tools/fs-cache-invalidation.ts
@@ -17912,10 +18332,10 @@ function resolvePlanPath$1(session, targetPath) {
 */
 function enforcePlanModeWrite$1(session, targetPath, options) {
 	if (!(session.getPlanModeState?.())?.enabled) return;
-	if (options?.move) throw new ToolError$1("Plan mode: renaming files is not allowed.");
-	if (options?.op === "delete") throw new ToolError$1("Plan mode: deleting files is not allowed.");
+	if (options?.move) throw new ToolError("Plan mode: renaming files is not allowed.");
+	if (options?.op === "delete") throw new ToolError("Plan mode: deleting files is not allowed.");
 	if (targetsLocalSandbox$1(session, targetPath)) return;
-	throw new ToolError$1("Plan mode: the working tree is read-only. Write your plan to a local://<slug>-plan.md file instead.");
+	throw new ToolError("Plan mode: the working tree is read-only. Write your plan to a local://<slug>-plan.md file instead.");
 }
 //#endregion
 //#region src/tools/omp/tools/write.ts
@@ -17932,14 +18352,14 @@ function assertWriteTargetAddressable(target, router) {
 	const trimmed = target.trim();
 	if (path.win32.isAbsolute(trimmed) || router.canHandle(trimmed)) return;
 	const missingDelimiter = trimmed.match(XD_MISSING_DELIMITER_RE);
-	if (missingDelimiter) throw new ToolError$1(`Unknown URI-like write target '${trimmed}'. Did you mean 'xd://${missingDelimiter[1]}'? Prefix the path with './' to write it as a filesystem path.`);
+	if (missingDelimiter) throw new ToolError(`Unknown URI-like write target '${trimmed}'. Did you mean 'xd://${missingDelimiter[1]}'? Prefix the path with './' to write it as a filesystem path.`);
 	const uriLike = trimmed.match(URI_LIKE_WRITE_PATH_RE);
 	if (!uriLike) return;
 	const scheme = uriLike[1].toLowerCase();
 	if (scheme === "conflict") return;
 	const canonicalScheme = router.getHandler(scheme) ? scheme : XD_SCHEME_NEAR_MISSES[scheme] ? "xd" : void 0;
 	const suggestion = canonicalScheme ? ` Did you mean '${canonicalScheme}://${uriLike[2]}'?` : " Available 'xd://' devices include 'xd://resolve' and 'xd://report_issue'.";
-	throw new ToolError$1(`Unknown URI-like write target '${trimmed}'.${suggestion} Prefix the path with './' to write it as a filesystem path.`);
+	throw new ToolError(`Unknown URI-like write target '${trimmed}'.${suggestion} Prefix the path with './' to write it as a filesystem path.`);
 }
 /**
 * Fail closed when a local write target looks like a mis-dispatched read.
@@ -17963,7 +18383,7 @@ function readSelectorForEmptyWrite(target, content) {
 	return splitPathAndSel(target).sel;
 }
 function throwReadSelectorMisfire(target, sel) {
-	throw new ToolError$1(`write target '${target}' ends with a read-tool selector ':${sel}' and no such file exists — refusing to create a literal file by that name. If you meant to read it, use read({ path: "${target}" }). If you truly intend to create this file, pass its contents in \`content\` (a non-empty write is never blocked).`);
+	throw new ToolError(`write target '${target}' ends with a read-tool selector ':${sel}' and no such file exists — refusing to create a literal file by that name. If you meant to read it, use read({ path: "${target}" }). If you truly intend to create this file, pass its contents in \`content\` (a non-empty write is never blocked).`);
 }
 /**
 * Recognize a semicolon-joined list of read-tool selectors mis-dispatched as a
@@ -17989,7 +18409,7 @@ function readSelectorListMisfire(target) {
 	return segments.length;
 }
 function throwReadSelectorListMisfire(target, count) {
-	throw new ToolError$1(`write target '${target}' is a semicolon-joined list of ${count} read-tool selectors, not a filesystem path — refusing to create it. write creates a single file; issue one read() per path to read these ranges (e.g. read({ path: "<one path>:<range>" })).`);
+	throw new ToolError(`write target '${target}' is a semicolon-joined list of ${count} read-tool selectors, not a filesystem path — refusing to create it. write creates a single file; issue one read() per path to read these ranges (e.g. read({ path: "<one path>:<range>" })).`);
 }
 async function assertNotReadSelectorMisfire(target, content, cwd) {
 	const listCount = readSelectorListMisfire(target);
@@ -18037,14 +18457,14 @@ function parseBulkDirectives(content) {
 		}
 		sawDirective = true;
 		const id = Number.parseInt(match[1], 10);
-		if (map.has(id)) throw new ToolError$1(`Bulk directive lists conflict #${id} twice — each id may appear once.`);
+		if (map.has(id)) throw new ToolError(`Bulk directive lists conflict #${id} twice — each id may appear once.`);
 		map.set(id, match[2]);
 	}
 	if (!sawDirective) return null;
 	if (stray.length > 0) {
 		const sample = stray[0];
 		const tokenHint = BULK_DIRECTIVE_HEAD_RE.test(sample) ? `Per-id bulk only accepts the tokens @ours/@theirs/@base/@both — one side per id, single line. ` : "";
-		throw new ToolError$1(`Malformed \`conflict://*\` per-id block: ${stray.length} line(s) are not \`<id>: @side\` directives (first: \`${truncateDirectiveLine(sample)}\`). ` + tokenHint + "Literal or multi-line replacement content isn't supported in a per-id block — resolve those blocks with individual `write({ path: \"conflict://<N>\", content })` calls (you can issue several at once). For a pure pick-a-side pass, make every non-empty line `<id>: @ours` (or @theirs/@base/@both).");
+		throw new ToolError(`Malformed \`conflict://*\` per-id block: ${stray.length} line(s) are not \`<id>: @side\` directives (first: \`${truncateDirectiveLine(sample)}\`). ` + tokenHint + "Literal or multi-line replacement content isn't supported in a per-id block — resolve those blocks with individual `write({ path: \"conflict://<N>\", content })` calls (you can issue several at once). For a pure pick-a-side pass, make every non-empty line `<id>: @ours` (or @theirs/@base/@both).");
 	}
 	return map;
 }
@@ -18185,27 +18605,27 @@ function isArchivePathNotFound(error) {
 }
 function normalizeArchiveWriteSubPath(rawPath) {
 	const normalized = rawPath.replace(/\\/g, "/");
-	if (normalized.length === 0) throw new ToolError$1("Archive write path must target a file inside the archive");
-	if (normalized.endsWith("/")) throw new ToolError$1("Archive write path must target a file, not a directory");
+	if (normalized.length === 0) throw new ToolError("Archive write path must target a file inside the archive");
+	if (normalized.endsWith("/")) throw new ToolError("Archive write path must target a file, not a directory");
 	const parts = normalized.split("/");
 	const normalizedParts = [];
 	for (const part of parts) {
 		if (!part || part === ".") continue;
-		if (part === "..") throw new ToolError$1("Archive path cannot contain '..'");
+		if (part === "..") throw new ToolError("Archive path cannot contain '..'");
 		normalizedParts.push(part);
 	}
-	if (normalizedParts.length === 0) throw new ToolError$1("Archive write path must target a file inside the archive");
+	if (normalizedParts.length === 0) throw new ToolError("Archive write path must target a file inside the archive");
 	return normalizedParts.join("/");
 }
 function parseSqliteWriteTarget(subPath, queryString) {
-	if (queryString.trim().length > 0) throw new ToolError$1("SQLite write paths do not support query parameters");
+	if (queryString.trim().length > 0) throw new ToolError("SQLite write paths do not support query parameters");
 	const normalized = subPath.replace(/^:+/, "").trim();
-	if (!normalized) throw new ToolError$1("SQLite write path must target a table");
+	if (!normalized) throw new ToolError("SQLite write path must target a table");
 	const separatorIndex = normalized.indexOf(":");
 	const table = separatorIndex === -1 ? normalized : normalized.slice(0, separatorIndex);
 	const key = separatorIndex === -1 ? void 0 : normalized.slice(separatorIndex + 1);
-	if (!table) throw new ToolError$1("SQLite write path must target a table");
-	if (key !== void 0 && key.length === 0) throw new ToolError$1("SQLite row writes require a non-empty row key");
+	if (!table) throw new ToolError("SQLite write path must target a table");
+	if (key !== void 0 && key.length === 0) throw new ToolError("SQLite row writes require a non-empty row key");
 	return {
 		table,
 		key
@@ -18297,7 +18717,7 @@ var WriteTool = class {
 			});
 			for (const [entryPath, data] of existing) entries.set(entryPath, data);
 		} catch (error) {
-			throw new ToolError$1(error instanceof Error ? error.message : String(error));
+			throw new ToolError(error instanceof Error ? error.message : String(error));
 		}
 		const writeTarget = `${resolvedArchivePath.archivePath}:${resolvedArchivePath.archiveSubPath}`;
 		const sel = readSelectorForEmptyWrite(writeTarget, content);
@@ -18308,7 +18728,7 @@ var WriteTool = class {
 			await fs_promises_shim_exports.rename(tmpPath, finalPath);
 		} catch (error) {
 			await fs_promises_shim_exports.rm(tmpPath, { force: true }).catch(() => {});
-			throw new ToolError$1(error instanceof Error ? error.message : String(error));
+			throw new ToolError(error instanceof Error ? error.message : String(error));
 		}
 		invalidateFsScanAfterWrite(resolvedArchivePath.absolutePath);
 		const outputPath = `${formatPathRelativeToCwd(resolvedArchivePath.absolutePath, this.session.cwd)}:${resolvedArchivePath.archiveSubPath}`;
@@ -18359,7 +18779,7 @@ var WriteTool = class {
 	async #writeSqliteRow(displayPath, content, resolvedSqlitePath) {
 		let db = null;
 		try {
-			if (!resolvedSqlitePath.exists) throw new ToolError$1(`SQLite database '${displayPath}' not found`);
+			if (!resolvedSqlitePath.exists) throw new ToolError(`SQLite database '${displayPath}' not found`);
 			db = new Database(resolvedSqlitePath.absolutePath, {
 				create: false,
 				strict: true
@@ -18368,7 +18788,7 @@ var WriteTool = class {
 			const trimmedContent = content.trim();
 			let resultText;
 			if (trimmedContent.length === 0) {
-				if (!resolvedSqlitePath.key) throw new ToolError$1("SQLite deletes require a row key in the path");
+				if (!resolvedSqlitePath.key) throw new ToolError("SQLite deletes require a row key in the path");
 				const lookup = resolveTableRowLookup(db, resolvedSqlitePath.table);
 				resultText = (lookup.kind === "pk" ? deleteRowByKey(db, resolvedSqlitePath.table, lookup, resolvedSqlitePath.key) : deleteRowByRowId(db, resolvedSqlitePath.table, resolvedSqlitePath.key)) > 0 ? `Deleted row '${resolvedSqlitePath.key}' from ${resolvedSqlitePath.table}` : `No row deleted from ${resolvedSqlitePath.table} for key '${resolvedSqlitePath.key}'`;
 			} else {
@@ -18376,9 +18796,9 @@ var WriteTool = class {
 				try {
 					parsedContent = Bun.JSON5.parse(content);
 				} catch (error) {
-					throw new ToolError$1(`SQLite write content must be valid JSON5: ${error instanceof Error ? error.message : String(error)}`);
+					throw new ToolError(`SQLite write content must be valid JSON5: ${error instanceof Error ? error.message : String(error)}`);
 				}
-				if (!isRecord$2(parsedContent)) throw new ToolError$1("SQLite write content must be a JSON object");
+				if (!isRecord$2(parsedContent)) throw new ToolError("SQLite write content must be a JSON object");
 				if (resolvedSqlitePath.key) {
 					const lookup = resolveTableRowLookup(db, resolvedSqlitePath.table);
 					resultText = (lookup.kind === "pk" ? updateRowByKey(db, resolvedSqlitePath.table, lookup, resolvedSqlitePath.key, parsedContent) : updateRowByRowId(db, resolvedSqlitePath.table, resolvedSqlitePath.key, parsedContent)) > 0 ? `Updated row '${resolvedSqlitePath.key}' in ${resolvedSqlitePath.table}` : `No row updated in ${resolvedSqlitePath.table} for key '${resolvedSqlitePath.key}'`;
@@ -18390,9 +18810,9 @@ var WriteTool = class {
 			invalidateFsScanAfterWrite(resolvedSqlitePath.absolutePath);
 			return toolResult({ resolvedPath: resolvedSqlitePath.absolutePath }).text(resultText).sourcePath(resolvedSqlitePath.absolutePath).done();
 		} catch (error) {
-			if (isEnoent(error)) throw new ToolError$1(`SQLite database '${displayPath}' not found`);
-			if (error instanceof ToolError$1) throw error;
-			throw new ToolError$1(error instanceof Error ? error.message : String(error));
+			if (isEnoent(error)) throw new ToolError(`SQLite database '${displayPath}' not found`);
+			if (error instanceof ToolError) throw error;
+			throw new ToolError(error instanceof Error ? error.message : String(error));
 		} finally {
 			db?.close();
 		}
@@ -18411,7 +18831,7 @@ var WriteTool = class {
 	*/
 	async #resolveConflict(entry, replacementContent, stripped, signal) {
 		const absolutePath = entry.absolutePath;
-		if (!await exists(absolutePath)) throw new ToolError$1(`Conflict #${entry.id} target '${entry.displayPath}' no longer exists.`);
+		if (!await exists(absolutePath)) throw new ToolError(`Conflict #${entry.id} target '${entry.displayPath}' no longer exists.`);
 		const expanded = expandContentTokens(replacementContent, entry);
 		const splice = spliceConflict(await Bun.file(absolutePath).text(), entry, expanded);
 		const newContent = splice.text;
@@ -18444,7 +18864,7 @@ var WriteTool = class {
 	*/
 	async #resolveSingleConflictById(id, replacementContent, stripped, signal) {
 		const entry = getConflictHistory(this.session).get(id);
-		if (!entry) throw new ToolError$1(`Conflict #${id} not found. Conflict ids are registered when \`read\` surfaces a marker block; re-read the file to get a current id.`);
+		if (!entry) throw new ToolError(`Conflict #${id} not found. Conflict ids are registered when \`read\` surfaces a marker block; re-read the file to get a current id.`);
 		return this.#resolveConflict(entry, replacementContent, stripped, signal);
 	}
 	/**
@@ -18465,12 +18885,12 @@ var WriteTool = class {
 	async #resolveAllConflicts(replacementContent, stripped, signal, rawContent = replacementContent) {
 		const history = getConflictHistory(this.session);
 		const allEntries = history.entries();
-		if (allEntries.length === 0) throw new ToolError$1("`conflict://*` has nothing to resolve — no conflicts are currently registered. Re-read the file(s) with conflicts first.");
+		if (allEntries.length === 0) throw new ToolError("`conflict://*` has nothing to resolve — no conflicts are currently registered. Re-read the file(s) with conflicts first.");
 		const directives = resolveBulkDirectives(rawContent, replacementContent);
 		if (directives) {
 			const known = new Set(allEntries.map((entry) => entry.id));
 			const unknown = [...directives.keys()].filter((id) => !known.has(id));
-			if (unknown.length > 0) throw new ToolError$1(`Bulk directive references unknown conflict id(s) ${unknown.map((id) => `#${id}`).join(", ")}. Currently registered: ${allEntries.map((e) => `#${e.id}`).join(", ")}.`);
+			if (unknown.length > 0) throw new ToolError(`Bulk directive references unknown conflict id(s) ${unknown.map((id) => `#${id}`).join(", ")}. Currently registered: ${allEntries.map((e) => `#${e.id}`).join(", ")}.`);
 		}
 		const selectedEntries = directives ? allEntries.filter((entry) => directives.has(entry.id)) : allEntries;
 		const contentFor = (entry) => directives ? directives.get(entry.id) : replacementContent;
@@ -18567,7 +18987,7 @@ var WriteTool = class {
 		}
 		if (stripped && !directives) summaryLines.push("Note: auto-stripped hashline display prefixes from content before writing.");
 		const resultText = summaryLines.join("\n");
-		if (failedFiles.length > 0 && succeededFiles.length === 0) throw new ToolError$1(resultText);
+		if (failedFiles.length > 0 && succeededFiles.length === 0) throw new ToolError(resultText);
 		return {
 			content: [{
 				type: "text",
@@ -18615,7 +19035,7 @@ var WriteTool = class {
 								};
 								return;
 							}
-							throw new ToolError$1(name ? `Unknown xd:// device '${name}'. DSH mounts no tool devices.` : "Cannot write to xd:// itself — available devices: xd://resolve, xd://reject, xd://propose, xd://report_issue.");
+							throw new ToolError(name ? `Unknown xd:// device '${name}'. DSH mounts no tool devices.` : "Cannot write to xd:// itself — available devices: xd://resolve, xd://reject, xd://propose, xd://report_issue.");
 						} }
 					});
 					if (xdResult) return xdResult;
@@ -18633,7 +19053,7 @@ var WriteTool = class {
 			}
 			const conflictUri = parseConflictUri(path);
 			if (conflictUri) {
-				if (conflictUri.scope) throw new ToolError$1(`Conflict URI scope '/${conflictUri.scope}' is read-only — read \`conflict://${conflictUri.id}/${conflictUri.scope}\` to inspect that side. To write, drop the scope (\`conflict://${conflictUri.id}\`) and put the chosen content (or shorthand like \`@${conflictUri.scope}\`) in \`content\`.`);
+				if (conflictUri.scope) throw new ToolError(`Conflict URI scope '/${conflictUri.scope}' is read-only — read \`conflict://${conflictUri.id}/${conflictUri.scope}\` to inspect that side. To write, drop the scope (\`conflict://${conflictUri.id}\`) and put the chosen content (or shorthand like \`@${conflictUri.scope}\`) in \`content\`.`);
 				emitWriteProgress(onUpdate, cleanContent, path);
 				const result = conflictUri.id === "*" ? await this.#resolveAllConflicts(cleanContent, stripped, signal, content) : await this.#resolveSingleConflictById(conflictUri.id, cleanContent, stripped, signal);
 				if (conflictUri.recoveredPrefix !== void 0) appendNoteToResult(result, `Note: stripped erroneous '${conflictUri.recoveredPrefix}:' prefix from path; conflict URIs are global (use \`conflict://${conflictUri.id}\`, not \`<file>:conflict://${conflictUri.id}\`).`);
@@ -20231,7 +20651,7 @@ async function executeReplace(options) {
 	if (old_string.length === 0) throw new Error("old_string must not be empty.");
 	const absolutePath = resolvePlanPath(session, path);
 	const rawContent = await readEditFileText(absolutePath, path);
-	const { bom, text: content } = stripBom$2(rawContent);
+	const { bom, text: content } = stripBom$1(rawContent);
 	const originalEnding = detectLineEnding(content);
 	const normalizedContent = normalizeToLF(content);
 	const normalizedOldText = normalizeToLF(old_string);
@@ -21181,7 +21601,7 @@ async function applyNormalizedPatch(input, options) {
 	}
 	if (!input.diff) throw new ApplyPatchError("Update operation requires diff (hunks)");
 	const originalContent = await readExistingPatchFile(fs, absolutePath, input.path);
-	const { bom: bomFromText, text: strippedContent } = stripBom$2(originalContent);
+	const { bom: bomFromText, text: strippedContent } = stripBom$1(originalContent);
 	let bom = bomFromText;
 	if (!bom && fs.readBinary) {
 		const bytes = await fs.readBinary(absolutePath);
@@ -21296,275 +21716,91 @@ async function executePatchSingle(options) {
 		} catch (err) {
 			if (!isEnoent(err)) throw err;
 		}
-		if (postEditContent !== void 0 && postEditContent.length === preEditContent.length && postEditContent.every((b, i) => b === preEditContent[i])) throw new ToolError$1(`edit appeared successful but file content did not change on disk: ${path}`, { path: resolvedPath });
+		if (postEditContent !== void 0 && postEditContent.length === preEditContent.length && postEditContent.every((b, i) => b === preEditContent[i])) throw new ToolError(`edit appeared successful but file content did not change on disk: ${path}`, { path: resolvedPath });
 	}
 	if (resolvedRename) invalidateFsScanAfterRename(resolvedPath, resolvedRename);
-	else if (result.change.type === "delete") invalidateFsScanAfterDelete(resolvedPath);
-	else invalidateFsScanAfterWrite(resolvedPath);
-	const effectiveRename = result.change.newPath ? rename : void 0;
-	let diffResult = {
-		diff: "",
-		firstChangedLine: void 0
-	};
-	if (result.change.type === "update" && result.change.oldContent !== void 0 && result.change.newContent !== void 0) diffResult = generateUnifiedDiffString(normalizeToLF(stripBom$2(result.change.oldContent).text), normalizeToLF(stripBom$2(result.change.newContent).text), void 0, { path: result.change.newPath ?? result.change.path });
-	else if (result.change.type === "create" && result.change.newContent !== void 0) diffResult = generateUnifiedDiffString("", normalizeToLF(stripBom$2(result.change.newContent).text), void 0, { path: result.change.path });
-	let resultText;
-	switch (result.change.type) {
-		case "create":
-			resultText = `Created ${path}`;
-			break;
-		case "delete":
-			resultText = `Deleted ${path}`;
-			break;
-		case "update": resultText = effectiveRename ? `Updated and moved ${path} to ${effectiveRename}` : `Updated ${path}`;
-	}
-	const meta = outputMeta().get();
-	const oldText = result.change.type !== "create" ? result.change.oldContent : void 0;
-	const newText = result.change.type !== "delete" ? result.change.newContent : void 0;
-	return {
-		content: [{
-			type: "text",
-			text: resultText
-		}],
-		details: pruneOversizedEditSnapshots({
-			diff: diffResult.diff,
-			path: result.change.newPath ?? resolvedPath,
-			firstChangedLine: diffResult.firstChangedLine,
-			op,
-			move: effectiveRename,
-			sourcePath: result.change.newPath ? resolvedPath : void 0,
-			meta,
-			oldText,
-			newText
-		})
-	};
-}
-//#endregion
-//#region src/tools/omp/edit/edit-clipboard.ts
-/**
-* Look up (or lazily create) the clipboard register attached to a session.
-* Storage lives on `session.editClipboard` so it ages out exactly with the
-* session itself.
-*/
-function getEditClipboard(session) {
-	session.editClipboard ??= {};
-	return session.editClipboard;
-}
-//#endregion
-//#region src/tools/omp/edit/hashline/block-resolver.ts
-/**
-* `blockRangeAt` runs a full synchronous tree-sitter parse of `text` per
-* call, and streaming previews re-resolve the same (text, line) every
-* streamed chunk. Memoize by content: identical text + line always yields the
-* same span. FIFO-bounded; hashing the text is orders of magnitude cheaper
-* than re-parsing it.
-*/
-const resolutionCache = /* @__PURE__ */ new Map();
-const RESOLUTION_CACHE_MAX = 512;
-const nativeBlockResolver = ({ path, text, line }) => {
-	const key = `${Bun.hash(text).toString(36)}:${text.length}:${line}:${path}`;
-	const cached = resolutionCache.get(key);
-	if (cached !== void 0) return cached;
-	const range = blockRangeAt({
-		code: text,
-		path,
-		line
-	});
-	const result = range ? {
-		start: range.startLine,
-		end: range.endLine
-	} : null;
-	if (resolutionCache.size >= RESOLUTION_CACHE_MAX) {
-		const oldest = resolutionCache.keys().next().value;
-		if (oldest !== void 0) resolutionCache.delete(oldest);
-	}
-	resolutionCache.set(key, result);
-	return result;
-};
-//#endregion
-//#region src/tools/edit/adapter/tools/auto-generated-guard.ts
-/**
-* Auto-generated file detection guard.
-*
-* Prevents editing of files that appear to be automatically generated
-* by code generation tools (protoc, sqlc, buf, swagger, etc.).
-*/
-/**
-* Number of bytes to read from the start of a file for auto-generated detection.
-*/
-const CHECK_BYTE_COUNT = 1024;
-const HEADER_LINE_LIMIT = 40;
-/**
-* Strong marker patterns for generated-file headers.
-*
-* Keep these strict: broad patterns like /auto-generated/ cause false positives
-* in normal hand-written files (including this guard implementation itself).
-*/
-const AUTO_GENERATED_HEADER_MARKERS = [
-	/@generated\b/i,
-	/\bcode\s+generated\s+by\s+[a-z0-9_.-]+/i,
-	/\bthis\s+file\s+was\s+automatically\s+generated\b/i,
-	new RegExp(`\\bgenerated\\s+by\\s+(?:protoc(?:-gen-[\\w-]+)?|sqlc|buf|swagger(?:-codegen)?|openapi(?:-generator)?|grpc-gateway|mockery|stringer|easyjson|deepcopy-gen|defaulter-gen|conversion-gen|client-gen|lister-gen|informer-gen|kysely-codegen|napi-rs)\\b`, "i")
-];
-const COMMENT_STYLES_BY_EXTENSION = /* @__PURE__ */ new Map([
-	[".c", ["slash"]],
-	[".cc", ["slash"]],
-	[".cpp", ["slash"]],
-	[".cs", ["slash"]],
-	[".dart", ["slash"]],
-	[".go", ["slash"]],
-	[".h", ["slash"]],
-	[".hpp", ["slash"]],
-	[".java", ["slash"]],
-	[".js", ["slash"]],
-	[".jsx", ["slash"]],
-	[".kt", ["slash"]],
-	[".kts", ["slash"]],
-	[".mjs", ["slash"]],
-	[".cjs", ["slash"]],
-	[".php", ["slash"]],
-	[".rs", ["slash"]],
-	[".scala", ["slash"]],
-	[".swift", ["slash"]],
-	[".ts", ["slash"]],
-	[".tsx", ["slash"]],
-	[".py", ["hash"]],
-	[".rb", ["hash"]],
-	[".sh", ["hash"]],
-	[".bash", ["hash"]],
-	[".zsh", ["hash"]],
-	[".yml", ["hash"]],
-	[".yaml", ["hash"]],
-	[".toml", ["hash"]],
-	[".ini", ["hash"]],
-	[".cfg", ["hash"]],
-	[".conf", ["hash"]],
-	[".env", ["hash"]],
-	[".pl", ["hash"]],
-	[".r", ["hash"]],
-	[".sql", ["sql"]],
-	[".html", ["html"]],
-	[".htm", ["html"]],
-	[".xml", ["html"]],
-	[".svg", ["html"]],
-	[".xhtml", ["html"]]
-]);
-const COMMENT_STYLES_BY_BASENAME = /* @__PURE__ */ new Map([
-	["dockerfile", ["hash"]],
-	["makefile", ["hash"]],
-	["justfile", ["hash"]]
-]);
-function stripBom(content) {
-	if (content.charCodeAt(0) === 65279) return content.slice(1);
-	return content;
-}
-function getCommentStylesForPath(filePath) {
-	const normalizedPath = filePath.toLowerCase();
-	const fileName = path.basename(normalizedPath);
-	const stylesByName = COMMENT_STYLES_BY_BASENAME.get(fileName);
-	if (stylesByName) return stylesByName;
-	const ext = path.extname(fileName);
-	return COMMENT_STYLES_BY_EXTENSION.get(ext) ?? [];
-}
-function extractLeadingHeaderCommentText(content, commentStyles) {
-	if (commentStyles.length === 0) return "";
-	const includeSlash = commentStyles.includes("slash");
-	const includeHash = commentStyles.includes("hash");
-	const includeSql = commentStyles.includes("sql");
-	const includeHtml = commentStyles.includes("html");
-	const lines = stripBom(content).split(/\r?\n/);
-	const headerLines = [];
-	let started = false;
-	let inSlashBlock = false;
-	let inHtmlBlock = false;
-	for (let lineIndex = 0; lineIndex < lines.length && lineIndex < HEADER_LINE_LIMIT; lineIndex += 1) {
-		const trimmed = lines[lineIndex]?.trim() ?? "";
-		if (lineIndex === 0 && trimmed.startsWith("#!")) continue;
-		if (inSlashBlock) {
-			headerLines.push(trimmed);
-			if (trimmed.includes("*/")) inSlashBlock = false;
-			continue;
-		}
-		if (inHtmlBlock) {
-			headerLines.push(trimmed);
-			if (trimmed.includes("-->")) inHtmlBlock = false;
-			continue;
-		}
-		if (trimmed.length === 0) {
-			if (started) headerLines.push("");
-			continue;
-		}
-		if (includeSlash && trimmed.startsWith("//")) {
-			started = true;
-			headerLines.push(trimmed);
-			continue;
-		}
-		if (includeSlash && trimmed.startsWith("/*")) {
-			started = true;
-			headerLines.push(trimmed);
-			if (!trimmed.includes("*/")) inSlashBlock = true;
-			continue;
-		}
-		if (includeHash && trimmed.startsWith("#")) {
-			started = true;
-			headerLines.push(trimmed);
-			continue;
-		}
-		if (includeSql && trimmed.startsWith("--")) {
-			started = true;
-			headerLines.push(trimmed);
-			continue;
-		}
-		if (includeHtml && trimmed.startsWith("<!--")) {
-			started = true;
-			headerLines.push(trimmed);
-			if (!trimmed.includes("-->")) inHtmlBlock = true;
-			continue;
-		}
-		if (started) break;
-		break;
-	}
-	return headerLines.join("\n");
-}
-/**
-* Check if leading header comments contain auto-generated markers.
-* Returns the matched marker text if found, undefined otherwise.
-*/
-function detectAutoGeneratedMarker(content, filePath) {
-	const headerCommentText = extractLeadingHeaderCommentText(content, getCommentStylesForPath(filePath));
-	if (!headerCommentText) return void 0;
-	for (const markerPattern of AUTO_GENERATED_HEADER_MARKERS) {
-		const match = markerPattern.exec(headerCommentText);
-		if (match?.[0]) return match[0];
+	else if (result.change.type === "delete") invalidateFsScanAfterDelete(resolvedPath);
+	else invalidateFsScanAfterWrite(resolvedPath);
+	const effectiveRename = result.change.newPath ? rename : void 0;
+	let diffResult = {
+		diff: "",
+		firstChangedLine: void 0
+	};
+	if (result.change.type === "update" && result.change.oldContent !== void 0 && result.change.newContent !== void 0) diffResult = generateUnifiedDiffString(normalizeToLF(stripBom$1(result.change.oldContent).text), normalizeToLF(stripBom$1(result.change.newContent).text), void 0, { path: result.change.newPath ?? result.change.path });
+	else if (result.change.type === "create" && result.change.newContent !== void 0) diffResult = generateUnifiedDiffString("", normalizeToLF(stripBom$1(result.change.newContent).text), void 0, { path: result.change.path });
+	let resultText;
+	switch (result.change.type) {
+		case "create":
+			resultText = `Created ${path}`;
+			break;
+		case "delete":
+			resultText = `Deleted ${path}`;
+			break;
+		case "update": resultText = effectiveRename ? `Updated and moved ${path} to ${effectiveRename}` : `Updated ${path}`;
 	}
+	const meta = outputMeta().get();
+	const oldText = result.change.type !== "create" ? result.change.oldContent : void 0;
+	const newText = result.change.type !== "delete" ? result.change.newContent : void 0;
+	return {
+		content: [{
+			type: "text",
+			text: resultText
+		}],
+		details: pruneOversizedEditSnapshots({
+			diff: diffResult.diff,
+			path: result.change.newPath ?? resolvedPath,
+			firstChangedLine: diffResult.firstChangedLine,
+			op,
+			move: effectiveRename,
+			sourcePath: result.change.newPath ? resolvedPath : void 0,
+			meta,
+			oldText,
+			newText
+		})
+	};
 }
+//#endregion
+//#region src/tools/omp/edit/edit-clipboard.ts
 /**
-* Build the error message for an auto-generated file.
+* Look up (or lazily create) the clipboard register attached to a session.
+* Storage lives on `session.editClipboard` so it ages out exactly with the
+* session itself.
 */
-function buildAutoGeneratedError(displayPath, detected) {
-	return new ToolError$1(`Cannot modify auto-generated file: ${displayPath}\n\nThis file appears to be automatically generated (detected marker: "${detected}").\nAuto-generated files should not be edited directly. Instead:\n1. Find the source file or generator configuration\n2. Make changes to the source\n3. Regenerate the file`);
-}
-new TextDecoder("utf-8");
-new LRUCache({ max: 10 });
-function shouldBlockAutoGeneratedFiles(activeSettings) {
-	if (activeSettings) return activeSettings.get("edit.blockAutoGenerated");
-	if (isSettingsInitialized()) return settings.get("edit.blockAutoGenerated");
-	return getDefault("edit.blockAutoGenerated");
+function getEditClipboard(session) {
+	session.editClipboard ??= {};
+	return session.editClipboard;
 }
+//#endregion
+//#region src/tools/omp/edit/hashline/block-resolver.ts
 /**
-* Check if file content is auto-generated.
-* Uses only the first CHECK_BYTE_COUNT characters of the content.
-* Throws ToolError if the content appears to be auto-generated.
-*
-* @param content - File content to check (can be full content or prefix)
-* @param displayPath - Path to show in error messages
-* @param activeSettings - Session settings; falls back to global settings or the schema default
+* `blockRangeAt` runs a full synchronous tree-sitter parse of `text` per
+* call, and streaming previews re-resolve the same (text, line) every
+* streamed chunk. Memoize by content: identical text + line always yields the
+* same span. FIFO-bounded; hashing the text is orders of magnitude cheaper
+* than re-parsing it.
 */
-function assertEditableFileContent(content, displayPath, activeSettings) {
-	if (!shouldBlockAutoGeneratedFiles(activeSettings)) return;
-	const marker = detectAutoGeneratedMarker(content.slice(0, CHECK_BYTE_COUNT), displayPath);
-	if (marker) throw buildAutoGeneratedError(displayPath, marker);
-}
+const resolutionCache = /* @__PURE__ */ new Map();
+const RESOLUTION_CACHE_MAX = 512;
+const nativeBlockResolver = ({ path, text, line }) => {
+	const key = `${Bun.hash(text).toString(36)}:${text.length}:${line}:${path}`;
+	const cached = resolutionCache.get(key);
+	if (cached !== void 0) return cached;
+	const range = blockRangeAt({
+		code: text,
+		path,
+		line
+	});
+	const result = range ? {
+		start: range.startLine,
+		end: range.endLine
+	} : null;
+	if (resolutionCache.size >= RESOLUTION_CACHE_MAX) {
+		const oldest = resolutionCache.keys().next().value;
+		if (oldest !== void 0) resolutionCache.delete(oldest);
+	}
+	resolutionCache.set(key, result);
+	return result;
+};
 //#endregion
 //#region src/tools/omp/edit/hashline/filesystem.ts
 /**
@@ -21714,8 +21950,10 @@ function resetNoopEdit(session, canonicalPath) {
 	guard.entries.delete(canonicalPath);
 }
 /**
-* Stable hash of the raw patch input. Bun's `Bun.hash` is xxHash64 — fast,
+* Stable hash of the raw patch input. Bun's `Bun.hash` is wyhash64 — fast,
 * non-cryptographic, more than adequate for "is this the same payload?".
+* (xxHash64 is the separate `Bun.hash.xxHash64` namespace; the shim serves
+* both — second-impl-audit.md S-3.)
 */
 function hashPatchInput(input) {
 	return Bun.hash(input).toString(16);
@@ -21870,7 +22108,7 @@ async function executeHashlineSingle(options) {
 		commitClipboard(clipboard, sessionClipboard);
 		if (sectionResult.op === "noop") {
 			const { count, escalate } = recordNoopEdit(options.session, sectionResult.canonicalPath, inputHash);
-			if (escalate) throw new ToolError$1(noChangeLoopDiagnostic(sectionResult.path, count));
+			if (escalate) throw new ToolError(noChangeLoopDiagnostic(sectionResult.path, count));
 			return renderSection(sectionResult, prepared.section.path).toolResult;
 		}
 		resetNoopEdit(options.session, sectionResult.canonicalPath);
@@ -21885,7 +22123,7 @@ async function executeHashlineSingle(options) {
 	assertUniqueCanonicalPaths(prepared);
 	for (const entry of prepared) if (entry.isNoop) {
 		const { count, escalate } = recordNoopEdit(options.session, entry.canonicalPath, inputHash);
-		throw escalate ? new ToolError$1(noChangeLoopDiagnostic(entry.section.path, count)) : new ToolError$1(noChangeDiagnostic(entry.section.path));
+		throw escalate ? new ToolError(noChangeLoopDiagnostic(entry.section.path, count)) : new ToolError(noChangeDiagnostic(entry.section.path));
 	}
 	const rendered = [];
 	for (let i = 0; i < prepared.length; i++) {
@@ -21893,7 +22131,7 @@ async function executeHashlineSingle(options) {
 		commitClipboard(sectionStates[i], sessionClipboard);
 		if (sectionResult.op === "noop") {
 			const { count, escalate } = recordNoopEdit(options.session, sectionResult.canonicalPath, inputHash);
-			throw escalate ? new ToolError$1(noChangeLoopDiagnostic(sectionResult.path, count)) : new ToolError$1(noChangeDiagnostic(sectionResult.path));
+			throw escalate ? new ToolError(noChangeLoopDiagnostic(sectionResult.path, count)) : new ToolError(noChangeDiagnostic(sectionResult.path));
 		}
 		resetNoopEdit(options.session, sectionResult.canonicalPath);
 		rendered.push(renderSection(sectionResult, prepared[i].section.path));
@@ -22064,6 +22302,197 @@ function expandApplyPatchToEntries(params) {
 	}));
 }
 //#endregion
+//#region src/tools/omp/edit/dispatch.ts
+/**
+* Edit dispatch layer — path resolution + multi-entry/multi-file aggregation.
+*
+* Ported verbatim from upstream `packages/coding-agent/src/edit/index.ts`
+* (refs/oh-my-pi, 17.3.5): `resolveEditPath` (:77-93), `executeApplyPatchPerFile`
+* (:139-256) and `executeSinglePathEntries` (:258-365). Algorithm and user-facing
+* copy are byte-for-byte upstream; only the import surface was redirected to the
+* DSH-resident modules and the LSP-only surface was cut, per the established
+* omp/ adaptation conventions:
+*   - `renderer` → `./details` (TUI renderer cut, plan.md 拍板#17): the
+*     `EditToolDetails` / `EditToolPerFileResult` shapes live in `./details.ts`;
+*     the upstream per-file `diagnostics` field went with the LSP layer.
+*   - `resolvePlanPath` → DSH adapter shim (`edit/adapter/tools/plan-mode-guard`,
+*     verbatim resolution minus local:// schemes) — same redirection the local
+*     engines (modes/replace.ts, modes/patch.ts) already use.
+*   - `LspBatchRequest` / `flushLspWritethroughBatch` → local type + no-op below.
+*     DSH never constructs an outer batch request, so every `batchRequest` inside
+*     the aggregators resolves to `undefined` and the flush branches stay
+*     unreachable; the flow is kept verbatim so this file stays diffable
+*     against refs.
+*/
+/**
+* Upstream flushes the LSP writethrough batch when aggregation stops early
+* (refs `lsp/writethrough.ts`). DSH has no LSP batch to flush — the engines
+* write through directly — so this is a documented no-op that keeps the
+* verbatim call sites compilable.
+*/
+async function flushLspWritethroughBatch(_id, _cwd, _signal) {}
+async function resolveEditPath(session, authoredPath, options) {
+	if (!options.mustExist || isInternalUrlPath(authoredPath)) return authoredPath;
+	try {
+		await Bun.file(resolvePlanPath(session, authoredPath)).stat();
+		return authoredPath;
+	} catch (error) {
+		if (!isEnoent(error) && !isEnotdir(error)) throw error;
+	}
+	return (await findUniqueWorkspaceSuffix(authoredPath, session.cwd, options.signal))?.displayPath ?? authoredPath;
+}
+/** Run apply_patch file operations and aggregate their multi-file result. */
+async function executeApplyPatchPerFile(fileEntries, outerBatchRequest, cwd, signal, onUpdate) {
+	if (fileEntries.length === 1) return fileEntries[0].run(outerBatchRequest);
+	const perFileResults = [];
+	const contentTexts = [];
+	let hasError = false;
+	for (let i = 0; i < fileEntries.length; i++) {
+		const { path, run } = fileEntries[i];
+		const isLast = i === fileEntries.length - 1;
+		const batchRequest = outerBatchRequest ? {
+			id: outerBatchRequest.id,
+			flush: isLast && outerBatchRequest.flush
+		} : void 0;
+		try {
+			const result = await run(batchRequest);
+			const details = result.details;
+			perFileResults.push({
+				path: details?.path ?? path,
+				diff: details?.diff ?? "",
+				firstChangedLine: details?.firstChangedLine,
+				op: details?.op,
+				move: details?.move,
+				sourcePath: details?.sourcePath,
+				meta: details?.meta,
+				oldText: details?.oldText,
+				newText: details?.newText,
+				snapshotsPruned: details?.snapshotsPruned
+			});
+			const text = result.content?.find((c) => c.type === "text")?.text ?? "";
+			if (text) contentTexts.push(text);
+		} catch (err) {
+			const errorText = err instanceof Error ? err.message : String(err);
+			const displayErrorText = err instanceof MismatchError ? err.displayMessage : void 0;
+			perFileResults.push({
+				path,
+				diff: "",
+				isError: true,
+				errorText,
+				displayErrorText
+			});
+			contentTexts.push(`Error editing ${path}: ${errorText}`);
+			hasError = true;
+			if (i > 0) {
+				const appliedPaths = fileEntries.slice(0, i).map((e) => e.path).join(", ");
+				contentTexts.push(`Files already applied: ${appliedPaths}.`);
+			}
+			if (i + 1 < fileEntries.length) {
+				const skippedPaths = fileEntries.slice(i + 1).map((e) => e.path).join(", ");
+				contentTexts.push(`Files NOT applied: ${skippedPaths}; re-read the affected files and re-issue only the failed and unapplied files.`);
+			}
+			if (outerBatchRequest?.flush) await flushLspWritethroughBatch(outerBatchRequest.id, cwd, signal);
+			break;
+		}
+		if (!isLast && onUpdate) onUpdate({
+			content: [{
+				type: "text",
+				text: contentTexts.join("\n")
+			}],
+			details: {
+				diff: perFileResults.map((r) => r.diff).filter(Boolean).join("\n"),
+				firstChangedLine: perFileResults.find((r) => r.firstChangedLine)?.firstChangedLine,
+				perFileResults: [...perFileResults]
+			}
+		});
+	}
+	return {
+		content: [{
+			type: "text",
+			text: contentTexts.join("\n")
+		}],
+		details: pruneOversizedEditSnapshots({
+			diff: perFileResults.map((r) => r.diff).filter(Boolean).join("\n"),
+			firstChangedLine: perFileResults.find((r) => r.firstChangedLine)?.firstChangedLine,
+			perFileResults
+		}),
+		...hasError ? { isError: true } : {}
+	};
+}
+async function executeSinglePathEntries(path, runs, outerBatchRequest, onUpdate, cwd, signal) {
+	if (runs.length === 1) return runs[0](outerBatchRequest);
+	const contentTexts = [];
+	const diffTexts = [];
+	let firstChangedLine;
+	let hasError = false;
+	let metadataPath;
+	let hasFirstOldText = false;
+	let firstOldText;
+	let hasLastNewText = false;
+	let lastNewText;
+	let snapshotsPruned = false;
+	for (let i = 0; i < runs.length; i++) {
+		const isLast = i === runs.length - 1;
+		const batchRequest = outerBatchRequest ? {
+			id: outerBatchRequest.id,
+			flush: isLast && outerBatchRequest.flush
+		} : void 0;
+		try {
+			const result = await runs[i](batchRequest);
+			const details = result.details;
+			if (details?.diff) diffTexts.push(details.diff);
+			firstChangedLine ??= details?.firstChangedLine;
+			if (details?.path) metadataPath ??= details.path;
+			if (details && "oldText" in details && !hasFirstOldText) {
+				firstOldText = details.oldText;
+				hasFirstOldText = true;
+			}
+			if (details && "newText" in details) {
+				lastNewText = details.newText;
+				hasLastNewText = true;
+			}
+			if (details?.snapshotsPruned) snapshotsPruned = true;
+			const text = result.content?.find((c) => c.type === "text")?.text ?? "";
+			if (text) contentTexts.push(text);
+		} catch (err) {
+			const errorText = err instanceof Error ? err.message : String(err);
+			contentTexts.push(`Error editing ${path} (entry ${i + 1} of ${runs.length}): ${errorText}`);
+			if (i > 0) contentTexts.push(i === 1 ? `Entry 1 was already applied.` : `Entries 1-${i} were already applied.`);
+			if (i + 1 < runs.length) contentTexts.push((i + 2 === runs.length ? `Entry ${runs.length} was NOT applied` : `Entries ${i + 2}-${runs.length} were NOT applied`) + `; re-read the file and re-issue only the failed and unapplied entries.`);
+			hasError = true;
+			if (outerBatchRequest?.flush) await flushLspWritethroughBatch(outerBatchRequest.id, cwd, signal);
+			break;
+		}
+		if (!isLast && onUpdate) onUpdate({
+			content: [{
+				type: "text",
+				text: contentTexts.join("\n")
+			}],
+			details: {
+				diff: diffTexts.join("\n"),
+				firstChangedLine
+			},
+			...hasError ? { isError: true } : {}
+		});
+	}
+	return {
+		content: [{
+			type: "text",
+			text: contentTexts.join("\n")
+		}],
+		details: pruneOversizedEditSnapshots({
+			diff: diffTexts.join("\n"),
+			firstChangedLine,
+			path: metadataPath ?? path,
+			...snapshotsPruned ? { snapshotsPruned: true } : {
+				...hasFirstOldText ? { oldText: firstOldText } : {},
+				...hasLastNewText ? { newText: lastNewText } : {}
+			}
+		}),
+		...hasError ? { isError: true } : {}
+	};
+}
+//#endregion
 //#region src/tools/shared/sandbox-policy.ts
 /**
 * Resolve the per-call mutation policy for the given exec context, or
@@ -22079,21 +22508,54 @@ function resolveSandboxPolicy(ctx, exec) {
 	return policy.resolve(request) ?? void 0;
 }
 //#endregion
+//#region src/tools/edit/adapter/prompts/tools/patch.md
+var patch_default = "Patches files given diff hunks. Primary tool for existing-file edits.\n\n<instruction>\n**Hunk Headers:**\n- `@@` — bare header when context lines unique\n- `@@ $ANCHOR` — anchor copied verbatim from file (full line or unique substring)\n**Anchor Selection:**\n1. Prefer bare `@@` when context lines alone are unique; otherwise choose highly specific anchor copied from file:\n   - full function signature\n   - class declaration\n   - unique string literal/error message\n   - config key with uncommon name\n2. On \"Found multiple matches\": add context lines, use multiple hunks with separate anchors, or use longer anchor substring\n**Context Lines:**\nUse enough ` `-prefixed lines to make match unique (usually 2–8)\nWhen editing structured blocks (nested braces, tags, indented regions), include opening and closing lines so edit stays inside block\n</instruction>\n\n<parameters>\n```ts\n// Input is { path: string, edits: Entry[] }. `path` is required and applies to every entry.\ntype Entry =\n   // Diff is one or more hunks for the top-level path.\n   // - Each hunk begins with \"@@\" (anchor optional).\n   // - Each hunk body only has lines starting with ' ' | '+' | '-'.\n   // - Each hunk includes at least one change (+ or -).\n   | { op: \"update\", diff: string }\n   // Diff is full file content, no prefixes.\n   | { op: \"create\", diff: string }\n   // No diff for delete.\n   | { op: \"delete\" }\n   // New path for update+move from the top-level path.\n   | { op: \"update\", rename: string, diff: string }\n```\n</parameters>\n\n<output>\nReturns success/failure; on failure, error message indicates:\n- \"Found multiple matches\" — anchor/context not unique enough\n- \"No match found\" — context lines don't exist in file (wrong content or stale read)\n- Syntax errors in diff format\n</output>\n\n<critical>\n- You MUST read the target file before editing\n- You MUST copy anchors and context lines verbatim (including whitespace)\n- You NEVER use anchors as comments (no line numbers, location labels, placeholders like `@@ @@`)\n- You NEVER place new lines outside the intended block\n- If edit fails or breaks structure, you MUST re-read the file and produce a new patch from current content — you NEVER retry the same diff\n- NEVER use edit to fix indentation, whitespace, or reformat code. Formatting is a single command run once at the end (`bun fmt`, `cargo fmt`, `prettier --write`, etc.) — not N individual edits. If you see inconsistent indentation after an edit, leave it; the formatter will fix all of it in one pass.\n</critical>\n\n<avoid>\n- Generic anchors: `import`, `export`, `describe`, `function`, `const`\n- Repeating same addition in multiple hunks (duplicate blocks)\n- Full-file overwrites for minor changes (acceptable for major restructures or short files)\n</avoid>\n";
+//#endregion
+//#region src/tools/edit/adapter/prompts/tools/apply-patch.md
+var apply_patch_default = "Edit files: `apply_patch` shell command.\n\n`apply_patch`: stripped-down, file-oriented diff; easy to parse, safe to apply.\n\nEnvelope:\n```\n*** Begin Patch\n[ one or more file sections ]\n*** End Patch\n```\nContains file operations. Each MUST have an action header:\n\n`*** Add File: <path>`: create file; every following line `+` (initial contents).\n\n`*** Delete File: <path>`: remove existing file; nothing follows.\n\n`*** Update File: <path>`: patch existing file in place; optional immediate `*** Move to: <new path>` renames it; then one or more `@@` hunks (optional hunk header). Hunk lines start with space, `-`, or `+`.\n\nContext: default 3 code lines immediately before and after each change. Changes within 3 lines: do NOT duplicate first change's context-after lines as second change's context-before lines. If 3 lines do not uniquely identify code in the file, use `@@` with its class/function; if one `@@` plus 3 context lines still cannot uniquely identify repeated code in a class/function, use multiple `@@` lines to reach it:\n```\n@@ class BaseClass\n[3 lines of pre-context]\n- [old_code]\n+ [new_code]\n[3 lines of post-context]\n```\n```\n@@ class BaseClass\n@@ 	 def method():\n[3 lines of pre-context]\n- [old_code]\n+ [new_code]\n[3 lines of post-context]\n```\n\nGrammar:\n```\nPatch := Begin { FileOp } End\nBegin := \"*** Begin Patch\" NEWLINE\nEnd := \"*** End Patch\" NEWLINE\nFileOp := AddFile | DeleteFile | UpdateFile\nAddFile := \"*** Add File: \" path NEWLINE { \"+\" line NEWLINE }\nDeleteFile := \"*** Delete File: \" path NEWLINE\nUpdateFile := \"*** Update File: \" path NEWLINE [ MoveTo ] { Hunk }\nMoveTo := \"*** Move to: \" newPath NEWLINE\nHunk := \"@@\" [ header ] NEWLINE { HunkLine } [ \"*** End of File\" NEWLINE ]\nHunkLine := (\" \" | \"-\" | \"+\") text NEWLINE\n```\n\nFull patches may combine operations:\n```\n*** Begin Patch\n*** Add File: hello.txt\n+Hello world\n*** Update File: src/app.py\n*** Move to: src/main.py\n@@ def greet():\n-print(\"Hi\")\n+print(\"Hello, world!\")\n*** Delete File: obsolete.txt\n*** End Patch\n```\n\nMUST use Add/Delete/Update header; new-file lines MUST start `+`; file references relative, NEVER absolute.\n";
+//#endregion
+//#region src/tools/edit/adapter/prompts/tools/replace.md
+var replace_default = "Single file string replacement; fuzzy whitespace matching.\n\n<instruction>\n- MUST use smallest `old_string` uniquely identifying change.\n- Nonunique `old_string` → MUST add context or use `replace_all: true` for all occurrences.\n- Rename a string across file → use `replace_all: true`.\n- SHOULD edit existing files, not create new.\n</instruction>\n\n<output>\nSuccess/failure status.\nSuccess: file modified in place; replacement applied.\nFailure — e.g., `old_string` absent or multiple matches without `replace_all: true`: error describes issue.\n</output>\n\n<critical>\n- MUST read file at least once in conversation before editing. Tool errors on edit before read.\n</critical>\n\n<bash-alternatives>\nReplace content-addressed — identify change by text.\n\nPattern-addressed bulk changes: bash more efficient:\n\n|Operation|Command|\n|---|---|\n|Regex replace|`sd 'pattern' 'replacement' file`|\n|Bulk replace across files|`sd 'pattern' 'replacement' **/*.ts`|\n\nUse Replace when content identifies location; `ast_edit` for structure-aware codemods.\nFor in-place edits prefer Replace or `write` — diff preview and fuzzy matching.\n</bash-alternatives>\n";
+//#endregion
+//#region src/tools/hashline/engine/prompt.md
+var prompt_default = "Line-anchored patch language: name original lines/gaps to replace, insert, cut, or paste; then give new content. `:` headers take `+` body rows; colonless paste `PUT`, `CUT`, `REM`, `MV` take none.\r\n\r\n<headers>\r\nSection: `[PATH#TAG]`; `TAG`: 4-hex snapshot from latest `read`/`search`, REQUIRED each section. New files: `write`; hashline edits existing files only.\r\n</headers>\r\n\r\n<ops>\r\n`PUT N.=M:`: replace original inclusive lines N–M with body.\r\n`PUT N*:`: replace syntactic block beginning N; closing line resolved.\r\n`PUT <N:` insert body rows before line N (`PUT <1:` = file head).\r\n`PUT >N:` insert body rows after line N (`PUT >$:` = file tail).\r\n`PUT >N*:`: insert after block N's end, at sibling depth. Append inside block: `PUT >M:`.\r\n`PUT <N @name` / `PUT >N @name` paste register `@name` at the gap before/after line N; omit `@name` for the anonymous register.\r\n`PUT N.=M @name` / `PUT N* @name` paste `@name` over the range / resolved block; `@name` required here.\r\n`CUT N.=M` / `CUT N*`: delete and capture inclusive lines N–M / block N; anonymous or given `@name`.\r\n`REM`: delete section file. `MV DEST`: move/rename (quote paths with spaces); prior edits apply to source, final content to `DEST`.\r\nSingle line: `PUT N.=N:` / `CUT N.=N`. Ranges name original inclusive touched lines; body length irrelevant.\r\n</ops>\r\n\r\n<body-rows>\r\nOnly below `:` headers. Row: verbatim `+TEXT` (leading whitespace preserved); `+`: blank. NEVER `-old`, bare, or context rows: range deletes; body is final content. Keep line: exclude it from every range. Literal initial `-`/`+`: `- item` → `+- item`; `+ item` → `++ item`.\r\n</body-rows>\r\n\r\n<rules>\r\n- Numbers and `#TAG`: latest `read`/`search` `LINE:TEXT`; numbers are original, never shifted by hunks.\r\n- Each edit renumbers and changes `#TAG` → next numbers from edit response or fresh `read`.\r\n- Touch displayed lines only; undisplayed hunks REJECTED. Far from read window: re-`read`; confirm construct.\r\n- Elisions UNSEEN: `…`, `..`, collapsed `N-M:` rows. NEVER hunk in/across one; `read` first.\r\n- NEVER start/end range mid-expression or mid-block.\r\n- Ranges: changed lines only; NEVER widen over keepers. Non-adjacent changes: separate hunks.\r\n- Whole construct: `PUT N*:`; internal lines: `PUT N.=M:`.\r\n- `PUT N*:` resolves exactly node N. Leading decorators/attributes/doc-comments are separate nodes: point N at first decorator to include both. Standalone line-comments never swept: use `PUT N.=M:`.\r\n- Block ops: opening line of multi-line construct, NEVER closer, last line, bare inner statement. One statement: plain `PUT N.=N:` / `CUT N.=N` / `PUT >N:`. At closer: `PUT >M:`.\r\n- Markdown headings are block openers. Block op on `##`/`###`: whole section through deeper headings to next same/higher heading. After section `PUT >N*:`: end body with blank line to separate next heading.\r\n- Pure addition: `PUT <N:` / `PUT >N:`, NEVER widened `PUT N.=M:`.\r\n- Move: `CUT`+`PUT`; `CUT 5.=9 @fn` → `@fn`, `PUT >40 @fn` pastes. Single call-local move: unlabeled `CUT` + `PUT >40`. Named registers persist across edit calls.\r\n- NEVER format/restyle with this tool; run project formatter.\r\n</rules>\r\n\r\n<example>\r\n`read` output shape:\r\n```\r\n[greet.py#A1B2]\r\n1:def greet(name):\r\n2:    msg = \"Hello, \" + name\r\n3:    print(msg)\r\n4:greet(\"world\")\r\n```\r\n\r\nEdit, then move:\r\n```\r\n[greet.py#A1B2]\r\nPUT 1.=3:\r\n+def greet(name):\r\n+    print(f\"Hi, {name}\")\r\nMV lib/greet.py\r\n```\r\n\r\nMarkdown bullets — file receives `- task`:\r\n```\r\n[PLAN.md#A1B2]\r\nPUT >2:\r\n+- task\r\n+  - nested task\r\n```\r\n\r\nMove `greet` to sibling file via named register; flows across sections:\r\n```\r\n[greet.py#A1B2]\r\nCUT 1* @fn\r\n[other.py#3C4D]\r\nPUT <1 @fn\r\n```\r\n\r\n`PUT 1*:` resolves lines 1–3 (`def` through `print(msg)`); line 4 separate, remains:\r\n```\r\n[greet.py#A1B2]\r\nPUT 1*:\r\n+def greet(name):\r\n+    print(f\"Hello, {name}\")\r\n```\r\n\r\nDecorator/doc-comment separate block: point N at decorator to include both; anchoring `def` line 2 orphans `@cache`:\r\n```\r\n[svc.py#C3D4]\r\nPUT 1*:\r\n+@cache\r\n+def load(key):\r\n+    return store[key]\r\n```\r\n</example>\r\n\r\n<anti-patterns>\r\n# WRONG — empty `PUT` to delete. RIGHT: `CUT 4.=4`\r\nPUT 4.=4:\r\n\r\n# WRONG — range sized to the post-edit content. RIGHT: `PUT 1.=1:` (body length irrelevant)\r\nPUT 1.=2:\r\n+def greet(name):\r\n\r\n# WRONG — `-` rows / bare context lines do not exist; the range deletes, the body is only new content.\r\nPUT 3.=3:\r\n    msg = \"Hello, \" + name\r\n-   print(msg)\r\n+   return msg\r\n# RIGHT\r\nPUT 3.=3:\r\n+   return msg\r\n\r\n# WRONG — pure insertion as a widened `PUT`: retyped keepers get dropped (here line 4).\r\nPUT 2.=4:\r\n+    msg = \"Hello, \" + name\r\n+    extra = compute(name)\r\n+    print(msg)\r\n# RIGHT — touch nothing you keep.\r\nPUT >2:\r\n+    extra = compute(name)\r\n\r\n# WRONG — `PUT >N*:` anchored on the closing delimiter / last visible line. RIGHT: plain `PUT >M:`\r\nPUT >3*:\r\n+after()\r\n# RIGHT\r\nPUT >3:\r\n+after()\r\n\r\n# WRONG — body rows under register PUT; register pastes take no body. RIGHT: bodyless `PUT >20 @fn`.\r\nPUT >20 @fn:\r\n+function f() {}\r\n</anti-patterns>\r\n\r\n<critical>\r\n1. RE-GROUND AFTER EVERY EDIT: edits renumber and change `#TAG`; take next numbers from edit response or fresh `read`. Stale tag/surprise: STOP; re-`read`.\r\n2. RANGES TIGHT: changed lines only. Whole construct: `PUT N*:`.\r\n3. BODY FINAL CONTENT: every row starts `+`; Markdown bullet: `+- item`, not `- item`.\r\n</critical>\r\n";
+//#endregion
 //#region src/tools/edit/adapter/index.ts
+/**
+* S-14c：patch.md 是 OMP JSON patch 入口的 verbatim 提示词，其 <parameters>
+* 块教模型发 `{ path, edits: Entry[] }` 形状；而 DSH schema（registerEdit）只收
+* `patch: string`（unified-diff 文本 + `file_path` 定位文件），create/delete/
+* rename 走 `input` 的 `*** Begin Patch` 信封（apply_patch 模式）。此处把该块
+* 重写为与 schema 一致的参数说明，其余段落（hunk/anchor 语法、critical、avoid）
+* 保持 verbatim。sanitize 本体在 shared/omp-prompt.ts（不动）。
+*/
+function rewritePatchParametersForSchema(description) {
+	const block = /<parameters>[\s\S]*?<\/parameters>/.exec(description);
+	if (!block) return description;
+	return description.replace(block[0], [
+		"<parameters>",
+		"- `file_path` (string, required): the file to patch.",
+		"- `patch` (string, required): unified diff applied to that file — one or more hunks, each beginning with `@@` (anchor optional); hunk body lines start with a space (context), `+` (add), or `-` (remove); every hunk must contain at least one change.",
+		"- Creating, deleting or renaming files is not available in patch mode: pass an `input` string with a Codex `*** Begin Patch` envelope instead (`*** Add File:`, `*** Delete File:`, `*** Update File:` with `*** Move to:`).",
+		"</parameters>"
+	].join("\n"));
+}
 /** OMP 原版按模式渲染的 edit 描述（prompts/tools/*.md verbatim + hashline 引擎 prompt.md）。 */
 const EDIT_MODE_DESCRIPTIONS = {
-	replace: renderOmpPrompt(sanitizeReplacePrompt("Single file string replacement; fuzzy whitespace matching.\n\n<instruction>\n- MUST use smallest `old_string` uniquely identifying change.\n- Nonunique `old_string` → MUST add context or use `replace_all: true` for all occurrences.\n- Rename a string across file → use `replace_all: true`.\n- SHOULD edit existing files, not create new.\n</instruction>\n\n<output>\nSuccess/failure status.\nSuccess: file modified in place; replacement applied.\nFailure — e.g., `old_string` absent or multiple matches without `replace_all: true`: error describes issue.\n</output>\n\n<critical>\n- MUST read file at least once in conversation before editing. Tool errors on edit before read.\n</critical>\n\n<bash-alternatives>\nReplace content-addressed — identify change by text.\n\nPattern-addressed bulk changes: bash more efficient:\n\n|Operation|Command|\n|---|---|\n|Regex replace|`sd 'pattern' 'replacement' file`|\n|Bulk replace across files|`sd 'pattern' 'replacement' **/*.ts`|\n\nUse Replace when content identifies location; `ast_edit` for structure-aware codemods.\nFor in-place edits prefer Replace or `write` — diff preview and fuzzy matching.\n</bash-alternatives>\n"), {}),
-	patch: renderOmpPrompt(sanitizePatchPrompt("Patches files given diff hunks. Primary tool for existing-file edits.\n\n<instruction>\n**Hunk Headers:**\n- `@@` — bare header when context lines unique\n- `@@ $ANCHOR` — anchor copied verbatim from file (full line or unique substring)\n**Anchor Selection:**\n1. Prefer bare `@@` when context lines alone are unique; otherwise choose highly specific anchor copied from file:\n   - full function signature\n   - class declaration\n   - unique string literal/error message\n   - config key with uncommon name\n2. On \"Found multiple matches\": add context lines, use multiple hunks with separate anchors, or use longer anchor substring\n**Context Lines:**\nUse enough ` `-prefixed lines to make match unique (usually 2–8)\nWhen editing structured blocks (nested braces, tags, indented regions), include opening and closing lines so edit stays inside block\n</instruction>\n\n<parameters>\n```ts\n// Input is { path: string, edits: Entry[] }. `path` is required and applies to every entry.\ntype Entry =\n   // Diff is one or more hunks for the top-level path.\n   // - Each hunk begins with \"@@\" (anchor optional).\n   // - Each hunk body only has lines starting with ' ' | '+' | '-'.\n   // - Each hunk includes at least one change (+ or -).\n   | { op: \"update\", diff: string }\n   // Diff is full file content, no prefixes.\n   | { op: \"create\", diff: string }\n   // No diff for delete.\n   | { op: \"delete\" }\n   // New path for update+move from the top-level path.\n   | { op: \"update\", rename: string, diff: string }\n```\n</parameters>\n\n<output>\nReturns success/failure; on failure, error message indicates:\n- \"Found multiple matches\" — anchor/context not unique enough\n- \"No match found\" — context lines don't exist in file (wrong content or stale read)\n- Syntax errors in diff format\n</output>\n\n<critical>\n- You MUST read the target file before editing\n- You MUST copy anchors and context lines verbatim (including whitespace)\n- You NEVER use anchors as comments (no line numbers, location labels, placeholders like `@@ @@`)\n- You NEVER place new lines outside the intended block\n- If edit fails or breaks structure, you MUST re-read the file and produce a new patch from current content — you NEVER retry the same diff\n- NEVER use edit to fix indentation, whitespace, or reformat code. Formatting is a single command run once at the end (`bun fmt`, `cargo fmt`, `prettier --write`, etc.) — not N individual edits. If you see inconsistent indentation after an edit, leave it; the formatter will fix all of it in one pass.\n</critical>\n\n<avoid>\n- Generic anchors: `import`, `export`, `describe`, `function`, `const`\n- Repeating same addition in multiple hunks (duplicate blocks)\n- Full-file overwrites for minor changes (acceptable for major restructures or short files)\n</avoid>\n"), {}),
-	apply_patch: renderOmpPrompt(sanitizeApplyPatchPrompt("Edit files: `apply_patch` shell command.\n\n`apply_patch`: stripped-down, file-oriented diff; easy to parse, safe to apply.\n\nEnvelope:\n```\n*** Begin Patch\n[ one or more file sections ]\n*** End Patch\n```\nContains file operations. Each MUST have an action header:\n\n`*** Add File: <path>`: create file; every following line `+` (initial contents).\n\n`*** Delete File: <path>`: remove existing file; nothing follows.\n\n`*** Update File: <path>`: patch existing file in place; optional immediate `*** Move to: <new path>` renames it; then one or more `@@` hunks (optional hunk header). Hunk lines start with space, `-`, or `+`.\n\nContext: default 3 code lines immediately before and after each change. Changes within 3 lines: do NOT duplicate first change's context-after lines as second change's context-before lines. If 3 lines do not uniquely identify code in the file, use `@@` with its class/function; if one `@@` plus 3 context lines still cannot uniquely identify repeated code in a class/function, use multiple `@@` lines to reach it:\n```\n@@ class BaseClass\n[3 lines of pre-context]\n- [old_code]\n+ [new_code]\n[3 lines of post-context]\n```\n```\n@@ class BaseClass\n@@ 	 def method():\n[3 lines of pre-context]\n- [old_code]\n+ [new_code]\n[3 lines of post-context]\n```\n\nGrammar:\n```\nPatch := Begin { FileOp } End\nBegin := \"*** Begin Patch\" NEWLINE\nEnd := \"*** End Patch\" NEWLINE\nFileOp := AddFile | DeleteFile | UpdateFile\nAddFile := \"*** Add File: \" path NEWLINE { \"+\" line NEWLINE }\nDeleteFile := \"*** Delete File: \" path NEWLINE\nUpdateFile := \"*** Update File: \" path NEWLINE [ MoveTo ] { Hunk }\nMoveTo := \"*** Move to: \" newPath NEWLINE\nHunk := \"@@\" [ header ] NEWLINE { HunkLine } [ \"*** End of File\" NEWLINE ]\nHunkLine := (\" \" | \"-\" | \"+\") text NEWLINE\n```\n\nFull patches may combine operations:\n```\n*** Begin Patch\n*** Add File: hello.txt\n+Hello world\n*** Update File: src/app.py\n*** Move to: src/main.py\n@@ def greet():\n-print(\"Hi\")\n+print(\"Hello, world!\")\n*** Delete File: obsolete.txt\n*** End Patch\n```\n\nMUST use Add/Delete/Update header; new-file lines MUST start `+`; file references relative, NEVER absolute.\n"), {}),
-	hashline: renderOmpPrompt(sanitizeHashlinePrompt("Line-anchored patch language: name original lines/gaps to replace, insert, cut, or paste; then give new content. `:` headers take `+` body rows; colonless paste `PUT`, `CUT`, `REM`, `MV` take none.\r\n\r\n<headers>\r\nSection: `[PATH#TAG]`; `TAG`: 4-hex snapshot from latest `read`/`search`, REQUIRED each section. New files: `write`; hashline edits existing files only.\r\n</headers>\r\n\r\n<ops>\r\n`PUT N.=M:`: replace original inclusive lines N–M with body.\r\n`PUT N*:`: replace syntactic block beginning N; closing line resolved.\r\n`PUT <N:` insert body rows before line N (`PUT <1:` = file head).\r\n`PUT >N:` insert body rows after line N (`PUT >$:` = file tail).\r\n`PUT >N*:`: insert after block N's end, at sibling depth. Append inside block: `PUT >M:`.\r\n`PUT <N @name` / `PUT >N @name` paste register `@name` at the gap before/after line N; omit `@name` for the anonymous register.\r\n`PUT N.=M @name` / `PUT N* @name` paste `@name` over the range / resolved block; `@name` required here.\r\n`CUT N.=M` / `CUT N*`: delete and capture inclusive lines N–M / block N; anonymous or given `@name`.\r\n`REM`: delete section file. `MV DEST`: move/rename (quote paths with spaces); prior edits apply to source, final content to `DEST`.\r\nSingle line: `PUT N.=N:` / `CUT N.=N`. Ranges name original inclusive touched lines; body length irrelevant.\r\n</ops>\r\n\r\n<body-rows>\r\nOnly below `:` headers. Row: verbatim `+TEXT` (leading whitespace preserved); `+`: blank. NEVER `-old`, bare, or context rows: range deletes; body is final content. Keep line: exclude it from every range. Literal initial `-`/`+`: `- item` → `+- item`; `+ item` → `++ item`.\r\n</body-rows>\r\n\r\n<rules>\r\n- Numbers and `#TAG`: latest `read`/`search` `LINE:TEXT`; numbers are original, never shifted by hunks.\r\n- Each edit renumbers and changes `#TAG` → next numbers from edit response or fresh `read`.\r\n- Touch displayed lines only; undisplayed hunks REJECTED. Far from read window: re-`read`; confirm construct.\r\n- Elisions UNSEEN: `…`, `..`, collapsed `N-M:` rows. NEVER hunk in/across one; `read` first.\r\n- NEVER start/end range mid-expression or mid-block.\r\n- Ranges: changed lines only; NEVER widen over keepers. Non-adjacent changes: separate hunks.\r\n- Whole construct: `PUT N*:`; internal lines: `PUT N.=M:`.\r\n- `PUT N*:` resolves exactly node N. Leading decorators/attributes/doc-comments are separate nodes: point N at first decorator to include both. Standalone line-comments never swept: use `PUT N.=M:`.\r\n- Block ops: opening line of multi-line construct, NEVER closer, last line, bare inner statement. One statement: plain `PUT N.=N:` / `CUT N.=N` / `PUT >N:`. At closer: `PUT >M:`.\r\n- Markdown headings are block openers. Block op on `##`/`###`: whole section through deeper headings to next same/higher heading. After section `PUT >N*:`: end body with blank line to separate next heading.\r\n- Pure addition: `PUT <N:` / `PUT >N:`, NEVER widened `PUT N.=M:`.\r\n- Move: `CUT`+`PUT`; `CUT 5.=9 @fn` → `@fn`, `PUT >40 @fn` pastes. Single call-local move: unlabeled `CUT` + `PUT >40`. Named registers persist across edit calls.\r\n- NEVER format/restyle with this tool; run project formatter.\r\n</rules>\r\n\r\n<example>\r\n`read` output shape:\r\n```\r\n[greet.py#A1B2]\r\n1:def greet(name):\r\n2:    msg = \"Hello, \" + name\r\n3:    print(msg)\r\n4:greet(\"world\")\r\n```\r\n\r\nEdit, then move:\r\n```\r\n[greet.py#A1B2]\r\nPUT 1.=3:\r\n+def greet(name):\r\n+    print(f\"Hi, {name}\")\r\nMV lib/greet.py\r\n```\r\n\r\nMarkdown bullets — file receives `- task`:\r\n```\r\n[PLAN.md#A1B2]\r\nPUT >2:\r\n+- task\r\n+  - nested task\r\n```\r\n\r\nMove `greet` to sibling file via named register; flows across sections:\r\n```\r\n[greet.py#A1B2]\r\nCUT 1* @fn\r\n[other.py#3C4D]\r\nPUT <1 @fn\r\n```\r\n\r\n`PUT 1*:` resolves lines 1–3 (`def` through `print(msg)`); line 4 separate, remains:\r\n```\r\n[greet.py#A1B2]\r\nPUT 1*:\r\n+def greet(name):\r\n+    print(f\"Hello, {name}\")\r\n```\r\n\r\nDecorator/doc-comment separate block: point N at decorator to include both; anchoring `def` line 2 orphans `@cache`:\r\n```\r\n[svc.py#C3D4]\r\nPUT 1*:\r\n+@cache\r\n+def load(key):\r\n+    return store[key]\r\n```\r\n</example>\r\n\r\n<anti-patterns>\r\n# WRONG — empty `PUT` to delete. RIGHT: `CUT 4.=4`\r\nPUT 4.=4:\r\n\r\n# WRONG — range sized to the post-edit content. RIGHT: `PUT 1.=1:` (body length irrelevant)\r\nPUT 1.=2:\r\n+def greet(name):\r\n\r\n# WRONG — `-` rows / bare context lines do not exist; the range deletes, the body is only new content.\r\nPUT 3.=3:\r\n    msg = \"Hello, \" + name\r\n-   print(msg)\r\n+   return msg\r\n# RIGHT\r\nPUT 3.=3:\r\n+   return msg\r\n\r\n# WRONG — pure insertion as a widened `PUT`: retyped keepers get dropped (here line 4).\r\nPUT 2.=4:\r\n+    msg = \"Hello, \" + name\r\n+    extra = compute(name)\r\n+    print(msg)\r\n# RIGHT — touch nothing you keep.\r\nPUT >2:\r\n+    extra = compute(name)\r\n\r\n# WRONG — `PUT >N*:` anchored on the closing delimiter / last visible line. RIGHT: plain `PUT >M:`\r\nPUT >3*:\r\n+after()\r\n# RIGHT\r\nPUT >3:\r\n+after()\r\n\r\n# WRONG — body rows under register PUT; register pastes take no body. RIGHT: bodyless `PUT >20 @fn`.\r\nPUT >20 @fn:\r\n+function f() {}\r\n</anti-patterns>\r\n\r\n<critical>\r\n1. RE-GROUND AFTER EVERY EDIT: edits renumber and change `#TAG`; take next numbers from edit response or fresh `read`. Stale tag/surprise: STOP; re-`read`.\r\n2. RANGES TIGHT: changed lines only. Whole construct: `PUT N*:`.\r\n3. BODY FINAL CONTENT: every row starts `+`; Markdown bullet: `+- item`, not `- item`.\r\n</critical>\r\n"), {})
+	replace: renderOmpPrompt(sanitizeReplacePrompt(replace_default), {}),
+	patch: rewritePatchParametersForSchema(renderOmpPrompt(sanitizePatchPrompt(patch_default), {})),
+	apply_patch: renderOmpPrompt(sanitizeApplyPatchPrompt(apply_patch_default), {}),
+	hashline: renderOmpPrompt(sanitizeHashlinePrompt(prompt_default), {})
 };
 /** Build the OMP ToolSession facade over a DSH exec context. */
 function createToolSession$4(exec, cfg) {
-	return {
+	const session = {
 		cwd: exec?.agent?.session?.header?.cwd ?? process.cwd(),
 		settings: new Settings(cfg, getDefault),
 		hasEditTool: true
 	};
+	attachOmpSessionState(session, exec?.agent?.session);
+	return session;
 }
 /** File-write channel for DSH (方案A, 2026-08-27): every edit mode funnels
 * through `ctx.fs` with the per-call sandbox policy resolved from the session
@@ -22134,6 +22596,140 @@ function runPatchEntry(options) {
 	});
 }
 /**
+* 把 dispatch 聚合结果转成 DSH 输出。成功：保留引擎 per-entry 摘要原文；
+* 失败：抛出完整聚合文案，并在“失败即末条目”的空档补上游同款未应用指引。
+*
+* 上游 executeSinglePathEntries / executeApplyPatchPerFile 的 NOT-applied 指引
+* 只覆盖失败条目**之后**的未应用条目；失败发生在末条目时（无后续条目）不再
+* 输出，而失败条目本身同样未被应用——此处按上游同款句式补点名（A-7 契约：
+* 错误信息三要素 already applied / NOT applied / re-issue only 齐全）。
+*/
+function toEditToolResult(result, entryCount, failedEntry, failedPath) {
+	const text = result.content.filter((b) => b.type === "text").map((b) => b.text).join("\n");
+	if (result.isError) {
+		const supplement = entryCount > 1 && failedEntry !== void 0 && failedEntry === entryCount ? failedPath !== void 0 ? `\nFiles NOT applied: ${failedPath}; re-read the affected files and re-issue only the failed and unapplied files.` : `\nEntry ${failedEntry} was NOT applied; re-read the file and re-issue only the failed and unapplied entries.` : "";
+		throw new Error(`${text || "edit failed"}${supplement}`);
+	}
+	return { text };
+}
+/**
+* S-13：edit.fuzzyThreshold 解析——上游 settings 面原样放行显式 0/负值
+* （0 = 接受任意置信度的最佳匹配，refs edit/index.ts:112 同款语义），仅
+* undefined/非数值回退引擎默认 0.95。env 层（上游 PI_EDIT_FUZZY* 环境变量
+* 串解析）有意不移植：DSH 无该环境变量面，面板字段是唯一入口。
+*/
+function resolveFuzzyThreshold(raw) {
+	return typeof raw === "number" ? raw : DEFAULT_FUZZY_THRESHOLD;
+}
+/** 完整执行链路（defineTool.execute 与单测共用，镜像 read 的 executeReadTool）。 */
+async function executeEditTool(exec, cfg, args, ctx) {
+	const session = createToolSession$4(exec, cfg);
+	const writethrough = ctx ? createWritethrough(ctx, exec) : writethroughNoop;
+	const cwd = session.cwd;
+	const signal = exec?.signal;
+	const allowFuzzy = session.settings.get("edit.fuzzyMatch") !== false;
+	const fuzzyThreshold = resolveFuzzyThreshold(session.settings.get("edit.fuzzyThreshold"));
+	try {
+		if (typeof args.input === "string" && args.input.trim().length > 0) {
+			if (/^\s*\*\*\* Begin Patch/.test(args.input)) {
+				const entries = expandApplyPatchToEntries({ input: args.input });
+				const resolvedTargets = /* @__PURE__ */ new Map();
+				const resolveOnce = (authoredPath, mustExist) => {
+					let pending = resolvedTargets.get(authoredPath);
+					if (!pending) {
+						pending = resolveEditPath(session, authoredPath, {
+							mustExist,
+							signal
+						});
+						resolvedTargets.set(authoredPath, pending);
+					}
+					return pending;
+				};
+				let failedFile;
+				return toEditToolResult(await executeApplyPatchPerFile(entries.map((entry, idx) => {
+					const { path: entryPath, ...patchParams } = entry;
+					return {
+						path: entryPath,
+						run: async () => {
+							try {
+								const targetPath = await resolveOnce(entryPath, patchParams.op !== "create");
+								return await runPatchEntry({
+									session,
+									path: targetPath,
+									entry: patchParams,
+									signal,
+									writethrough,
+									allowFuzzy,
+									fuzzyThreshold
+								});
+							} catch (err) {
+								failedFile = idx + 1;
+								throw err;
+							}
+						}
+					};
+				}), void 0, cwd, signal), entries.length, failedFile, failedFile !== void 0 ? entries[failedFile - 1]?.path : void 0);
+			}
+			return { text: toText$4(await executeHashlineSingle({
+				session,
+				input: args.input,
+				signal,
+				writethrough
+			})) };
+		}
+		const filePath = args.file_path ?? args.path ?? "";
+		if (!filePath || typeof filePath !== "string" || filePath.trim().length === 0) throw new Error("file_path must be a non-empty string");
+		if (typeof args.patch === "string" && args.patch.trim().length > 0) return { text: toText$4(await runPatchEntry({
+			session,
+			path: await resolveEditPath(session, filePath, {
+				mustExist: true,
+				signal
+			}),
+			entry: {
+				op: "update",
+				diff: args.patch
+			},
+			signal,
+			writethrough,
+			allowFuzzy,
+			fuzzyThreshold,
+			allowCreateOverwrite: true
+		})) };
+		const editsInput = Array.isArray(args.edits) && args.edits.length > 0 ? args.edits : typeof args.old_string === "string" ? [{
+			oldText: args.old_string,
+			newText: String(args.new_string ?? "")
+		}] : [];
+		if (editsInput.length === 0) throw new Error("edit: provide old_string/new_string, edits[], patch, or input");
+		const targetPath = await resolveEditPath(session, filePath, {
+			mustExist: true,
+			signal
+		});
+		let failedEntry;
+		return toEditToolResult(await executeSinglePathEntries(targetPath, editsInput.map((edit, idx) => async () => {
+			try {
+				return await executeReplace({
+					session,
+					path: targetPath,
+					params: {
+						old_string: edit.oldText,
+						new_string: edit.newText,
+						replace_all: args.replace_all ?? false
+					},
+					signal,
+					allowFuzzy,
+					fuzzyThreshold,
+					writethrough
+				});
+			} catch (err) {
+				failedEntry = idx + 1;
+				throw err;
+			}
+		}), void 0, void 0, cwd, signal), editsInput.length, failedEntry);
+	} finally {
+		persistOmpSessionState(exec?.agent?.session, session);
+	}
+}
+/**
 * Register the edit tool. Mode is resolved per call from the argument shape
 * (matching OMP's mode dispatch):
 *  - `input` present → hashline, or apply_patch when it starts with `***`
@@ -22203,86 +22799,7 @@ function registerEdit(ctx, getConfig) {
 			}]
 		},
 		async execute(args, exec) {
-			const session = createToolSession$4(exec, getConfig());
-			const writethrough = createWritethrough(ctx, exec);
-			const signal = exec?.signal;
-			const allowFuzzy = session.settings.get("edit.fuzzyMatch") !== false;
-			const fuzzyThresholdRaw = session.settings.get("edit.fuzzyThreshold");
-			const fuzzyThreshold = typeof fuzzyThresholdRaw === "number" && fuzzyThresholdRaw > 0 ? fuzzyThresholdRaw : .95;
-			if (typeof args.input === "string" && args.input.trim().length > 0) {
-				if (/^\s*\*\*\* Begin Patch/.test(args.input)) {
-					const entries = expandApplyPatchToEntries({ input: args.input });
-					const texts = [];
-					for (const entry of entries) {
-						const result = await runPatchEntry({
-							session,
-							path: entry.path,
-							entry: {
-								op: entry.op,
-								rename: entry.rename,
-								diff: entry.diff
-							},
-							signal,
-							writethrough,
-							allowFuzzy,
-							fuzzyThreshold
-						});
-						texts.push(result.content.filter((b) => b.type === "text").map((b) => b.text).join("\n"));
-						if (result.isError) throw new Error(texts.join("\n") || "apply_patch failed");
-					}
-					return { text: texts.join("\n") };
-				}
-				return { text: toText$4(await executeHashlineSingle({
-					session,
-					input: args.input,
-					signal,
-					writethrough
-				})) };
-			}
-			const filePath = args.file_path ?? args.path ?? "";
-			if (!filePath || typeof filePath !== "string" || filePath.trim().length === 0) throw new Error("file_path must be a non-empty string");
-			if (typeof args.patch === "string" && args.patch.trim().length > 0) return { text: toText$4(await runPatchEntry({
-				session,
-				path: filePath,
-				entry: {
-					op: "update",
-					diff: args.patch
-				},
-				signal,
-				writethrough,
-				allowFuzzy,
-				fuzzyThreshold,
-				allowCreateOverwrite: true
-			})) };
-			const editsInput = Array.isArray(args.edits) && args.edits.length > 0 ? args.edits : typeof args.old_string === "string" ? [{
-				oldText: args.old_string,
-				newText: String(args.new_string ?? "")
-			}] : [];
-			if (editsInput.length === 0) throw new Error("edit: provide old_string/new_string, edits[], patch, or input");
-			let totalReplacements = 0;
-			for (const edit of editsInput) {
-				const result = await executeReplace({
-					session,
-					path: filePath,
-					params: {
-						old_string: edit.oldText,
-						new_string: edit.newText,
-						replace_all: args.replace_all ?? false
-					},
-					signal,
-					allowFuzzy,
-					fuzzyThreshold,
-					writethrough
-				});
-				const text = toText$4(result);
-				const occ = /replaced (\d+) occurrences/.exec(text);
-				totalReplacements += occ ? Number(occ[1]) : text.startsWith("Successfully replaced") ? 1 : 0;
-				if (result.isError) {
-					const first = result.content.find((b) => b.type === "text");
-					throw new Error(first?.text ?? "edit failed");
-				}
-			}
-			return { text: `Edited ${filePath}: ${totalReplacements} replacement(s)` };
+			return executeEditTool(exec, getConfig(), args, ctx);
 		}
 	}));
 }
@@ -22504,7 +23021,7 @@ async function parsePathSpecs(rawEntries, cwd) {
 	for (const entry of rawEntries) {
 		const internalSplit = splitInternalUrlSel(entry);
 		if (internalSplit.sel !== void 0) {
-			if (!isReadSelectorGrammar(internalSplit.sel)) throw new ToolError$1(`path entry "${entry}" has an invalid selector ":${internalSplit.sel}" — use ":N-M" line ranges, ":raw"/":conflicts", a range plus ":raw", or percent-encode a literal ":" as %3A`);
+			if (!isReadSelectorGrammar(internalSplit.sel)) throw new ToolError(`path entry "${entry}" has an invalid selector ":${internalSplit.sel}" — use ":N-M" line ranges, ":raw"/":conflicts", a range plus ":raw", or percent-encode a literal ":" as %3A`);
 			specs.push({
 				original: entry,
 				clean: internalSplit.path,
@@ -22519,8 +23036,8 @@ async function parsePathSpecs(rawEntries, cwd) {
 		let ranges;
 		if (!literalFilesystemMatch && split.sel) {
 			const parsed = parseLineRanges(split.sel);
-			if (!parsed) throw new ToolError$1(`path entry "${entry}" — only line-range selectors like ":50-100" are supported (no ":raw"/":conflicts")`);
-			if (hasGlobPathChars(split.path)) throw new ToolError$1(`Line-range selector requires a single file, not a glob: ${entry}`);
+			if (!parsed) throw new ToolError(`path entry "${entry}" — only line-range selectors like ":50-100" are supported (no ":raw"/":conflicts")`);
+			if (hasGlobPathChars(split.path)) throw new ToolError(`Line-range selector requires a single file, not a glob: ${entry}`);
 			clean = split.path;
 			ranges = parsed;
 		}
@@ -22691,7 +23208,7 @@ function jsMatchedLineIndexes(content, lines, pattern, ignoreCase, multiline) {
 		regex = new RegExp(pattern, flags);
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
-		throw new ToolError$1(`Invalid regex: ${message.replace(/^Invalid regular expression:\s*/i, "")}`);
+		throw new ToolError(`Invalid regex: ${message.replace(/^Invalid regular expression:\s*/i, "")}`);
 	}
 	if (!multiline) {
 		const out = [];
@@ -22765,7 +23282,7 @@ async function nativeChunkedLineIndexes(dir, resourceIdx, content, pattern, igno
 				lineRegex = new RegExp(pattern, ignoreCase ? "i" : "");
 			} catch (err) {
 				const message = err instanceof Error ? err.message : String(err);
-				throw new ToolError$1(`Invalid regex: ${message.replace(/^Invalid regular expression:\s*/i, "")}`);
+				throw new ToolError(`Invalid regex: ${message.replace(/^Invalid regular expression:\s*/i, "")}`);
 			}
 			lineRegex.lastIndex = 0;
 			if (lineRegex.test(line)) indexes.push(i);
@@ -22953,9 +23470,9 @@ async function resolveInternalSearchInputs(opts) {
 	for (let idx = 0; idx < paths.length; idx++) {
 		const rawPath = paths[idx];
 		if (!rawPath || opts.archiveDisplayMap.has(rawPath) || !internalRouter.canHandle(rawPath)) continue;
-		if (hasGlobPathChars(/^ssh:\/\//i.test(rawPath) ? rawPath.replace(/^ssh:\/\/[^/]*/i, "") : rawPath)) throw new ToolError$1(`Glob patterns are not supported for internal URLs: ${rawPath}`);
+		if (hasGlobPathChars(/^ssh:\/\//i.test(rawPath) ? rawPath.replace(/^ssh:\/\/[^/]*/i, "") : rawPath)) throw new ToolError(`Glob patterns are not supported for internal URLs: ${rawPath}`);
 		let resource = await internalRouter.resolve(rawPath, context);
-		if (resource.isDirectory && !resource.sourcePath) throw new ToolError$1(`search cannot recurse the directory listing at ${rawPath}; search a specific file under it (e.g. ${rawPath.replace(/\/+$/, "")}/<file>) or read ${rawPath} to list its entries`);
+		if (resource.isDirectory && !resource.sourcePath) throw new ToolError(`search cannot recurse the directory listing at ${rawPath}; search a specific file under it (e.g. ${rawPath.replace(/\/+$/, "")}/<file>) or read ${rawPath} to list its entries`);
 		if (resource.sourcePath) {
 			paths[idx] = resource.sourcePath;
 			if (resource.immutable) immutableSourcePaths.add(path.resolve(resource.sourcePath));
@@ -23019,10 +23536,10 @@ var GrepTool = class {
 	async execute(_toolCallId, params, signal, _onUpdate, _toolContext) {
 		const { pattern, path: rawPath, case: caseSensitive, gitignore, skip } = params;
 		return untilAborted(signal, async () => {
-			if (!pattern.trim()) throw new ToolError$1("Pattern must not be empty");
+			if (!pattern.trim()) throw new ToolError("Pattern must not be empty");
 			const normalizedPattern = pattern;
 			const normalizedSkip = skip === void 0 || skip === null ? 0 : Number.isFinite(skip) ? Math.floor(skip) : NaN;
-			if (normalizedSkip < 0 || !Number.isFinite(normalizedSkip)) throw new ToolError$1("Skip must be a non-negative number");
+			if (normalizedSkip < 0 || !Number.isFinite(normalizedSkip)) throw new ToolError("Skip must be a non-negative number");
 			const scopedPaths = toPathList(rawPath);
 			const pathSpecs = await parsePathSpecs(await expandDelimitedPathEntries(scopedPaths.length > 0 ? scopedPaths : ["."], this.session.cwd), this.session.cwd);
 			const materializedExternalPaths = /* @__PURE__ */ new Map();
@@ -23054,7 +23571,7 @@ var GrepTool = class {
 				const searchablePaths = internalResolution.paths;
 				const { virtualResources, virtualPathSet, virtualInputIndexes } = internalResolution;
 				const rangesByAbsPath = /* @__PURE__ */ new Map();
-				if (archiveUnreadable.length > 0 && searchablePaths.length === archiveUnreadable.length && virtualResources.length === 0) throw new ToolError$1(`Cannot search archive member(s): ${archiveUnreadable.join(", ")}. Read the member with \`read <archive>:<member>\` and inspect the returned text, or pass a UTF-8 text member.`);
+				if (archiveUnreadable.length > 0 && searchablePaths.length === archiveUnreadable.length && virtualResources.length === 0) throw new ToolError(`Cannot search archive member(s): ${archiveUnreadable.join(", ")}. Read the member with \`read <archive>:<member>\` and inspect the returned text, or pass a UTF-8 text member.`);
 				const normalizedContextBefore = this.#contextOverride ?? this.session.settings.get("grep.contextBefore");
 				const normalizedContextAfter = this.#contextOverride ?? this.session.settings.get("grep.contextAfter");
 				const ignoreCase = !(caseSensitive ?? true);
@@ -23104,8 +23621,8 @@ var GrepTool = class {
 						if (resolved === spec.clean && !archiveDisplayMap.has(resolved)) {
 							const absKey = path.resolve(resolveReadPath(resolved, this.session.cwd));
 							const stats = await (0, fs_promises_shim_exports.stat)(absKey).catch(() => null);
-							if (!stats) throw new ToolError$1(`Path not found for line-range selector: ${spec.original}`);
-							if (!stats.isFile()) throw new ToolError$1(`Line-range selector requires a single file: ${spec.original} is a directory`);
+							if (!stats) throw new ToolError(`Path not found for line-range selector: ${spec.original}`);
+							if (!stats.isFile()) throw new ToolError(`Line-range selector requires a single file: ${spec.original} is a directory`);
 							mergeRangesInto(rangesByAbsPath, absKey, spec.ranges);
 						} else mergeRangesInto(rangesByAbsPath, path.resolve(resolved), spec.ranges);
 					}
@@ -23122,7 +23639,7 @@ var GrepTool = class {
 				}
 				if (missingPaths.length > 0 && missingPaths.length === searchablePaths.length && virtualResources.length === 0) {
 					const archiveHint = archiveUnreadable.length > 0 ? ` (archive members were not searchable: ${archiveUnreadable.join(", ")})` : "";
-					throw new ToolError$1(`Path not found: ${missingPaths.join(", ")}; list each target in the semicolon-delimited \`path\`${archiveHint}`);
+					throw new ToolError(`Path not found: ${missingPaths.join(", ")}; list each target in the semicolon-delimited \`path\`${archiveHint}`);
 				}
 				const baseDisplayMode = resolveFileDisplayMode(this.session);
 				const effectiveOutputMode = GrepOutputMode.Content;
@@ -23217,16 +23734,16 @@ var GrepTool = class {
 						}
 					}
 				} catch (err) {
-					if (err instanceof Error && /^regex(?: parse)? error/i.test(err.message)) throw new ToolError$1(err.message.replace(/^regex(?: parse)? error:?\s*/i, "Invalid regex: "));
-					if (err instanceof Error && err.message.includes("Aborted: Timeout")) throw new ToolError$1(`Grep timed out after ${SEARCH_GREP_TIMEOUT_MS / 1e3}s; narrow paths or pattern, or scope with \`glob\` first`);
+					if (err instanceof Error && /^regex(?: parse)? error/i.test(err.message)) throw new ToolError(err.message.replace(/^regex(?: parse)? error:?\s*/i, "Invalid regex: "));
+					if (err instanceof Error && err.message.includes("Aborted: Timeout")) throw new ToolError(`Grep timed out after ${SEARCH_GREP_TIMEOUT_MS / 1e3}s; narrow paths or pattern, or scope with \`glob\` first`);
 					throw err;
 				}
 				let virtualResult;
 				try {
 					virtualResult = await searchVirtualResources(virtualResources, normalizedPattern, ignoreCase, effectiveMultiline, normalizedContextBefore, normalizedContextAfter, INTERNAL_TOTAL_CAP, signal);
 				} catch (err) {
-					if (err instanceof Error && /^regex(?: parse)? error/i.test(err.message)) throw new ToolError$1(err.message.replace(/^regex(?: parse)? error:?\s*/i, "Invalid regex: "));
-					if (err instanceof SyntaxError) throw new ToolError$1(`Invalid regex: ${err.message}`);
+					if (err instanceof Error && /^regex(?: parse)? error/i.test(err.message)) throw new ToolError(err.message.replace(/^regex(?: parse)? error:?\s*/i, "Invalid regex: "));
+					if (err instanceof SyntaxError) throw new ToolError(`Invalid regex: ${err.message}`);
 					throw err;
 				}
 				result = mergeGrepResults(result, virtualResult, nativeMaxCount);
@@ -23483,6 +24000,41 @@ function toText$3(result) {
 	return text;
 }
 /**
+* 把 OMP AgentToolResult 转成 DSH grep 工具输出。
+*
+* 上游 session 层会把 `formatOutputNotice(details.meta)` 的限量/截断提示追加
+* 进模型可见文本（wrapToolWithMetaNotice → appendOutputNotice，refs
+* tools/output-meta.ts:586）；DSH 无 session 层，适配层在此补上（A-6），
+* 否则 grep 的列宽截断/限量对模型静默。
+*/
+function toGrepToolResult(result) {
+	const text = toText$3(result);
+	const details = result.details ?? {};
+	return {
+		text: text + formatOutputNotice(details.meta),
+		...typeof details.matchCount === "number" ? { matchCount: details.matchCount } : {},
+		...typeof details.fileCount === "number" ? { fileCount: details.fileCount } : {},
+		...Array.isArray(details.files) ? { files: details.files } : {},
+		...typeof details.scopePath === "string" ? { scopePath: details.scopePath } : {},
+		...details.truncated === true ? { truncated: true } : {}
+	};
+}
+/**
+* 完整执行链路（defineTool.execute 与单测共用）。
+*
+* `ctx` 参数与 read 的 executeReadTool 对齐（grep 引擎不需要 image bridge /
+* session state，仅占位保持签名一致）。
+*/
+async function executeGrepTool(exec, cfg, args, ctx) {
+	const tool = new GrepTool(createToolSession$3(exec, cfg));
+	const params = { pattern: String(args.pattern ?? "") };
+	if (args.path !== void 0 && args.path !== null && args.path !== "") params.path = String(args.path);
+	if (typeof args.case === "boolean") params.case = args.case;
+	if (typeof args.gitignore === "boolean") params.gitignore = args.gitignore;
+	if (typeof args.skip === "number") params.skip = args.skip;
+	return toGrepToolResult(await tool.execute("grep", params, exec.signal));
+}
+/**
 * Register the grep tool (OMP-native `pattern` + `path` parameters; the `path`
 * accepts an inline `:N-M` selector and may be a semicolon-delimited list).
 */
@@ -23543,23 +24095,7 @@ function registerGrep(ctx, getConfig) {
 			})
 		},
 		async execute(args, exec) {
-			const tool = new GrepTool(createToolSession$3(exec, getConfig()));
-			const params = { pattern: String(args.pattern ?? "") };
-			if (args.path !== void 0 && args.path !== null && args.path !== "") params.path = String(args.path);
-			if (typeof args.case === "boolean") params.case = args.case;
-			if (typeof args.gitignore === "boolean") params.gitignore = args.gitignore;
-			if (typeof args.skip === "number") params.skip = args.skip;
-			const result = await tool.execute("grep", params, exec.signal);
-			const text = toText$3(result);
-			const details = result.details ?? {};
-			return {
-				text,
-				...typeof details.matchCount === "number" ? { matchCount: details.matchCount } : {},
-				...typeof details.fileCount === "number" ? { fileCount: details.fileCount } : {},
-				...Array.isArray(details.files) ? { files: details.files } : {},
-				...typeof details.scopePath === "string" ? { scopePath: details.scopePath } : {},
-				...details.truncated === true ? { truncated: true } : {}
-			};
+			return executeGrepTool(exec, getConfig(), args, ctx);
 		},
 		presentCall: (args) => ({
 			card: "generic",
@@ -23633,7 +24169,7 @@ var GlobTool = class {
 			const effectivePaths = scopedPaths.length > 0 ? scopedPaths : ["."];
 			const rawPatterns = (this.#customOps ? effectivePaths : await expandDelimitedPathEntries(effectivePaths, this.session.cwd, { splitter: parseFindPattern })).map((input) => normalizePathLikeInput(input).replace(/\\/g, "/"));
 			const aliasResolvedPatterns = this.#rootPathAlias ? rawPatterns.map((pattern) => /^\/+$/.test(pattern) ? "." : pattern) : rawPatterns;
-			if (aliasResolvedPatterns.some((pattern) => /^\/+$/.test(pattern))) throw new ToolError$1("Searching from root directory '/' is not allowed");
+			if (aliasResolvedPatterns.some((pattern) => /^\/+$/.test(pattern))) throw new ToolError("Searching from root directory '/' is not allowed");
 			const internalRouter = InternalUrlRouter.instance();
 			const normalizedPatterns = [];
 			for (const rawPattern of aliasResolvedPatterns) {
@@ -23641,8 +24177,8 @@ var GlobTool = class {
 					normalizedPatterns.push(rawPattern);
 					continue;
 				}
-				if (isSshUrl(rawPattern)) throw new ToolError$1(`find cannot operate on a remote ssh:// path: ${rawPattern}. ssh:// has no local file to glob; use \`read ${rawPattern}\` to list or inspect the remote path.`);
-				if (hasGlobPathChars(rawPattern)) throw new ToolError$1(`Glob patterns are not supported for internal URLs: ${rawPattern}`);
+				if (isSshUrl(rawPattern)) throw new ToolError(`find cannot operate on a remote ssh:// path: ${rawPattern}. ssh:// has no local file to glob; use \`read ${rawPattern}\` to list or inspect the remote path.`);
+				if (hasGlobPathChars(rawPattern)) throw new ToolError(`Glob patterns are not supported for internal URLs: ${rawPattern}`);
 				const resource = await internalRouter.resolve(rawPattern, {
 					cwd: this.session.cwd,
 					settings: this.session.settings,
@@ -23651,15 +24187,15 @@ var GlobTool = class {
 					skills: this.session.skills,
 					pathOnly: true
 				});
-				if (!resource.sourcePath) throw new ToolError$1(`Cannot find internal URL without a backing file: ${rawPattern}`);
+				if (!resource.sourcePath) throw new ToolError(`Cannot find internal URL without a backing file: ${rawPattern}`);
 				normalizedPatterns.push(resource.sourcePath);
 			}
-			if (normalizedPatterns.some((pattern) => pattern.length === 0)) throw new ToolError$1("`path` must contain non-empty globs or paths");
+			if (normalizedPatterns.some((pattern) => pattern.length === 0)) throw new ToolError("`path` must contain non-empty globs or paths");
 			let missingPaths = [];
 			let effectivePatterns = normalizedPatterns;
 			if (normalizedPatterns.length > 1 && !this.#customOps) {
 				const partition = await partitionExistingPaths(normalizedPatterns, this.session.cwd, parseFindPattern);
-				if (partition.valid.length === 0) throw new ToolError$1(`Path not found: ${partition.missing.join(", ")}`);
+				if (partition.valid.length === 0) throw new ToolError(`Path not found: ${partition.missing.join(", ")}`);
 				effectivePatterns = partition.valid;
 				missingPaths = partition.missing;
 			}
@@ -23678,9 +24214,9 @@ var GlobTool = class {
 				};
 			})()];
 			const scopePath = multiPattern?.scopePath ?? formatScopePath(targets[0].searchPath);
-			for (const target of targets) if (target.searchPath === "/") throw new ToolError$1("Searching from root directory '/' is not allowed");
+			for (const target of targets) if (target.searchPath === "/") throw new ToolError("Searching from root directory '/' is not allowed");
 			const requestedLimit = limit ?? DEFAULT_LIMIT;
-			if (!Number.isFinite(requestedLimit) || requestedLimit <= 0) throw new ToolError$1("Limit must be a positive number");
+			if (!Number.isFinite(requestedLimit) || requestedLimit <= 0) throw new ToolError("Limit must be a positive number");
 			const effectiveLimit = Math.min(MAX_LIMIT, Math.max(1, Math.floor(requestedLimit)));
 			const includeHidden = hidden ?? true;
 			const useGitignore = gitignore ?? true;
@@ -23734,7 +24270,7 @@ var GlobTool = class {
 				const customOps = this.#customOps;
 				const perTarget = await Promise.all(targets.map(async (target) => {
 					if (!await customOps.exists(target.searchPath)) {
-						if (isSingle) throw new ToolError$1(`Path not found: ${scopePath}`);
+						if (isSingle) throw new ToolError(`Path not found: ${scopePath}`);
 						return [];
 					}
 					if (!target.hasGlob && customOps.stat) {
@@ -23795,7 +24331,7 @@ var GlobTool = class {
 					stat = await fs.promises.stat(target.searchPath);
 				} catch (err) {
 					if (isEnoent(err) || hasFsCode(err, "ENAMETOOLONG")) {
-						if (isSingle) throw new ToolError$1(`Path not found: ${scopePath}`);
+						if (isSingle) throw new ToolError(`Path not found: ${scopePath}`);
 						return [];
 					}
 					throw err;
@@ -23805,7 +24341,7 @@ var GlobTool = class {
 					mtime: stat.mtimeMs
 				}];
 				if (!stat.isDirectory()) {
-					if (isSingle) throw new ToolError$1(`Path is not a directory: ${target.searchPath}`);
+					if (isSingle) throw new ToolError(`Path is not a directory: ${target.searchPath}`);
 					return [];
 				}
 				try {
@@ -23884,6 +24420,39 @@ function toText$2(result) {
 	return text;
 }
 /**
+* 把 OMP AgentToolResult 转成 DSH glob 工具输出。
+*
+* 上游 session 层会把 `formatOutputNotice(details.meta)` 的限量/截断提示追加
+* 进模型可见文本（wrapToolWithMetaNotice → appendOutputNotice，refs
+* tools/output-meta.ts:586）；DSH 无 session 层，适配层在此补上（A-6），
+* 否则 glob 超限截断对模型静默。
+*/
+function toGlobToolResult(result, args) {
+	const text = toText$2(result);
+	const details = result.details ?? {};
+	const notice = formatOutputNotice(details.meta);
+	return {
+		path: String(details.scopePath ?? args.path ?? ""),
+		text: text + notice,
+		...typeof details.fileCount === "number" ? { fileCount: details.fileCount } : {},
+		...typeof details.truncated === "boolean" ? { truncated: details.truncated } : {}
+	};
+}
+/**
+* 完整执行链路（defineTool.execute 与单测共用）。
+*
+* `ctx` 参数与 read 的 executeReadTool 对齐（glob 引擎不需要 image bridge /
+* session state，仅占位保持签名一致）。
+*/
+async function executeGlobTool(exec, cfg, args, ctx) {
+	return toGlobToolResult(await new GlobTool(createToolSession$2(exec, cfg)).execute("glob", {
+		path: args.path !== void 0 ? String(args.path) : void 0,
+		hidden: args.hidden,
+		gitignore: args.gitignore,
+		limit: args.limit
+	}, exec.signal), args);
+}
+/**
 * Register the glob tool (OMP native `path` + optional `hidden`/`gitignore`/
 * `limit` parameters).
 */
@@ -23936,20 +24505,7 @@ function registerGlob(ctx, getConfig) {
 			})
 		},
 		async execute(args, exec) {
-			const result = await new GlobTool(createToolSession$2(exec, getConfig())).execute("glob", {
-				path: args.path !== void 0 ? String(args.path) : void 0,
-				hidden: args.hidden,
-				gitignore: args.gitignore,
-				limit: args.limit
-			}, exec.signal);
-			const text = toText$2(result);
-			const details = result.details ?? {};
-			return {
-				path: String(details.scopePath ?? args.path ?? ""),
-				text,
-				...typeof details.fileCount === "number" ? { fileCount: details.fileCount } : {},
-				...typeof details.truncated === "boolean" ? { truncated: details.truncated } : {}
-			};
+			return executeGlobTool(exec, getConfig(), args, ctx);
 		},
 		presentCall: (args) => ({
 			card: "generic",
@@ -24135,13 +24691,13 @@ var AstEditTool = class {
 	async execute(_toolCallId, params, signal, _onUpdate, _context) {
 		return untilAborted(signal, async () => {
 			const ops = params.ops.map((entry, index) => {
-				if (entry.pat.length === 0) throw new ToolError$1(`\`ops[${index}].pat\` must be a non-empty pattern`);
+				if (entry.pat.length === 0) throw new ToolError(`\`ops[${index}].pat\` must be a non-empty pattern`);
 				return [entry.pat, entry.out];
 			});
-			if (ops.length === 0) throw new ToolError$1("`ops` must include at least one op entry");
+			if (ops.length === 0) throw new ToolError("`ops` must include at least one op entry");
 			const seenPatterns = /* @__PURE__ */ new Set();
 			for (const [pat] of ops) {
-				if (seenPatterns.has(pat)) throw new ToolError$1(`Duplicate rewrite pattern: ${pat}`);
+				if (seenPatterns.has(pat)) throw new ToolError(`Duplicate rewrite pattern: ${pat}`);
 				seenPatterns.add(pat);
 			}
 			const normalizedRewrites = Object.fromEntries(ops);
@@ -24156,7 +24712,7 @@ var AstEditTool = class {
 				skills: this.session.skills,
 				resolveExternalUrl: async (rawPath) => {
 					if (!parseReadUrlTarget(rawPath)) return void 0;
-					throw new ToolError$1(`Cannot rewrite external URL: ${rawPath}. Use \`read\` or \`search\` to inspect fetched web content; ast_edit only applies to local files.`);
+					throw new ToolError(`Cannot rewrite external URL: ${rawPath}. Use \`read\` or \`search\` to inspect fetched web content; ast_edit only applies to local files.`);
 				}
 			});
 			const result = await runAstEditOnce(multiTargets, resolvedSearchPath, globFilter, {
@@ -24588,10 +25144,10 @@ var AstGrepTool = class {
 	async execute(_toolCallId, params, signal, _onUpdate, _context) {
 		return untilAborted(signal, async () => {
 			const pattern = params.pat.trim();
-			if (pattern.length === 0) throw new ToolError$1("`pat` must be a non-empty pattern");
+			if (pattern.length === 0) throw new ToolError("`pat` must be a non-empty pattern");
 			const patterns = [pattern];
 			const skip = params.skip === void 0 ? 0 : Math.floor(params.skip);
-			if (!Number.isFinite(skip) || skip < 0) throw new ToolError$1("skip must be a non-negative number");
+			if (!Number.isFinite(skip) || skip < 0) throw new ToolError("skip must be a non-negative number");
 			const scopedPaths = toPathList(params.path);
 			const { searchPath: resolvedSearchPath, scopePath, isDirectory, multiTargets, globFilter } = await resolveToolSearchScope({
 				rawPaths: scopedPaths.length > 0 ? scopedPaths : ["."],
@@ -24834,7 +25390,6 @@ const inject = [
 	"fs"
 ];
 const BASH_ENV_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
-const CD_PREFIX_PATTERN = /^cd[ \t]+((?:[^&\\\n\r]|\\.)+?)[ \t]*&&[ \t]*/;
 const ANONYMOUS_SESSION = "anonymous";
 function abortError() {
 	const error = new HarnessError("tool call aborted", TOOL_ABORTED);
@@ -24864,7 +25419,7 @@ function buildForeground(result, wallTimeMs, timeoutMs) {
 	return {
 		kind: "foreground",
 		exitCode: result.exitCode ?? null,
-		timedOut: result.cancelled,
+		timedOut: result.timedOut ?? false,
 		aborted: false,
 		timeoutMs: timeoutMs ?? null,
 		wallTimeMs,
@@ -24925,7 +25480,6 @@ function apply(ctx, config = {}) {
 	let cfg = resolveConfig(config);
 	setRuntimeLogger(ctx.logger);
 	sweepStaleSpillFiles();
-	setBlockAutoGenerated(cfg.editBlockAutoGenerated);
 	let disposeModeSensitive = [];
 	const registerModeSensitive = () => {
 		for (const dispose of disposeModeSensitive) dispose();
@@ -24937,7 +25491,6 @@ function apply(ctx, config = {}) {
 	registerModeSensitive();
 	installBashPlusSettings(ctx, config, (current) => {
 		cfg = current();
-		setBlockAutoGenerated(cfg.editBlockAutoGenerated);
 		registerModeSensitive();
 	});
 	ctx.systemPrompt.section({
@@ -25087,20 +25640,20 @@ function apply(ctx, config = {}) {
 			const commandEnv = normalizeBashEnv(args.env);
 			let workdir = args.workdir;
 			if (workdir === void 0) {
-				const match = CD_PREFIX_PATTERN.exec(command);
-				if (match !== null && !/[$`(]/.test(match[1])) {
-					workdir = match[1].trim().replace(/^['"]|['"]$/g, "");
-					command = command.slice(match[0].length);
+				const cd = extractCdWorkdir(command);
+				if (cd !== null) {
+					workdir = cd.workdir;
+					command = cd.command;
 				}
 			}
-			const commandCwd = workdir === void 0 ? state.cwd : path.isAbsolute(workdir) ? workdir : path.resolve(state.cwd, workdir);
+			const commandCwd = workdir === void 0 ? state.cwd : path.resolve(state.cwd, expandTilde$1(workdir));
 			if (cfg.interceptorEnabled) {
 				const availableTools = [...new Set(DEFAULT_BASH_INTERCEPTOR_RULES.map((rule) => rule.tool))].filter((tool) => ctx.tools.get(tool, exec.agent) !== void 0);
 				const interception = checkBashInterception(command, availableTools);
 				if (interception.block) throw new Error(interception.message);
 			}
 			const rawTimeoutMs = args.timeoutMs ?? cfg.defaultTimeoutMs;
-			const timeoutMs = rawTimeoutMs === 0 ? void 0 : Math.min(Math.max(1e3, rawTimeoutMs), cfg.maxTimeoutMs);
+			const timeoutMs = rawTimeoutMs === 0 ? 0 : Math.max(1e3, Math.min(rawTimeoutMs, cfg.maxTimeoutMs));
 			const env = {
 				...ctx.shellEnv.collect(exec),
 				...commandEnv
@@ -25115,7 +25668,7 @@ function apply(ctx, config = {}) {
 					sessionId,
 					command,
 					cwd: commandCwd,
-					timeoutMs,
+					timeoutMs: args.timeoutMs ?? 0,
 					env,
 					config: cfg
 				});
@@ -25159,7 +25712,7 @@ function apply(ctx, config = {}) {
 				};
 			}
 			if (cfg.autoBackgroundMs > 0 && jobs !== void 0 && backgroundSlotsAvailable() && !exec.signal.aborted) {
-				const autoBgWaitMs = timeoutMs === void 0 ? cfg.autoBackgroundMs : Math.max(0, Math.min(cfg.autoBackgroundMs, timeoutMs - 1e3));
+				const autoBgWaitMs = timeoutMs === 0 ? cfg.autoBackgroundMs : Math.max(0, Math.min(cfg.autoBackgroundMs, timeoutMs - 1e3));
 				let managed;
 				let id;
 				try {