blun-king-cli 9.1.613 → 9.1.615

package/blun.mjs

@@ -1,27 +1,28 @@
 #!/usr/bin/env node
-// BLUN_BUILD_INPUT_SHA256:5c7277a864ffcc0a6909494ad5ada6956f900fe23735200c5aca26b1e7d78834
+// BLUN_BUILD_INPUT_SHA256:57a7160081cd6a2ce9e3535b31b87f9410c0dafd58da9629b68cb0042a8e57e5
 import { fileURLToPath as __cjsShimFileURLToPath } from 'node:url';
 import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
 const __dirname = __cjsShimDirname(__filename);
 import { createRequire } from "node:module";
 import crypto$1, { createHash, createHmac, randomBytes, randomInt, randomUUID, timingSafeEqual } from "node:crypto";
-import * as fs$17 from "node:fs";
+import * as fs$16 from "node:fs";
 import Kt, { accessSync, appendFileSync, chmodSync, closeSync, constants, copyFileSync, createReadStream, createWriteStream, existsSync, fstatSync, fsyncSync, linkSync, lstatSync, mkdirSync, openSync, opendirSync, promises, readFileSync, readSync, readdirSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
-import * as path$17 from "node:path";
+import * as path$16 from "node:path";
 import path, { basename, dirname, extname, isAbsolute, join, normalize, parse, posix, relative, resolve, sep, win32 } from "node:path";
 import { Blob as Blob$1, Buffer as Buffer$1, File as File$1 } from "node:buffer";
-import fs, { access, appendFile, chmod, constants as constants$1, copyFile, cp, link, lstat, mkdir, mkdtemp, open, readFile, readdir, readlink, realpath, rename, rm, rmdir, stat, unlink, writeFile } from "node:fs/promises";
+import ro, { access, appendFile, chmod, constants as constants$1, copyFile, cp, link, lstat, mkdir, mkdtemp, open, readFile, readdir, readlink, realpath, rename, rm, rmdir, stat, unlink, writeFile } from "node:fs/promises";
 import * as nodeOs from "node:os";
 import os, { arch, homedir, hostname, networkInterfaces, platform, release, tmpdir, type, userInfo } from "node:os";
 import { execFile, execFileSync, execSync, spawn, spawnSync } from "node:child_process";
 import { Worker } from "node:worker_threads";
 import * as sysPath from "path";
-import path$1, { basename as basename$1, dirname as dirname$1, join as join$1, parse as parse$1 } from "path";
+import js, { basename as basename$1, dirname as dirname$1, join as join$1, parse as parse$1 } from "path";
 import I, { existsSync as existsSync$1, promises as promises$1, readdirSync as readdirSync$1, stat as stat$1, statSync as statSync$1, unwatchFile, watch, watchFile } from "fs";
 import { Readable } from "stream";
 import zi from "assert";
 import Qr, { EventEmitter } from "events";
+import { StringDecoder } from "node:string_decoder";
 import { lstat as lstat$1, open as open$1, readdir as readdir$1, realpath as realpath$1, stat as stat$2 } from "fs/promises";
 import Cs, { PassThrough, Readable as Readable$1, Writable, pipeline } from "node:stream";
 import { homedir as homedir$1, type as type$1 } from "os";
@@ -37,7 +38,6 @@ import * as win32Path from "node:path/win32";
 import { createServer } from "node:http";
 import { pipeline as pipeline$1 } from "node:stream/promises";
 import { EventEmitter as EventEmitter$1 } from "node:events";
-import { StringDecoder } from "node:string_decoder";
 import co from "node:assert";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { QuickJSAsyncWASMModule, RELEASE_ASYNC, newQuickJSAsyncWASMModule, shouldInterruptAfterDeadline } from "quickjs-emscripten";
@@ -2271,11 +2271,11 @@ var init_blun_files = __esmMin((() => {
 		async uploadVideo(input, options) {
 			let file;
 			if (typeof input === "string") {
-				if (!fs$17.existsSync(input)) throw new ChatProviderError(`Video file not found: ${input}`);
-				const filename = path$17.basename(input);
+				if (!fs$16.existsSync(input)) throw new ChatProviderError(`Video file not found: ${input}`);
+				const filename = path$16.basename(input);
 				const mimeType = guessMimeTypeFromExt(filename);
 				if (mimeType === void 0 || !mimeType.startsWith("video/")) throw new ChatProviderError(`BlunFiles.uploadVideo: file extension does not indicate a video type: ${filename}`);
-				const data = await fs$17.promises.readFile(input);
+				const data = await fs$16.promises.readFile(input);
 				file = new File$1([new Blob$1([new Uint8Array(data)], { type: mimeType })], filename, { type: mimeType });
 			} else {
 				if (!input.mimeType.startsWith("video/")) throw new ChatProviderError(`Expected a video mime type, got ${input.mimeType}`);
@@ -2658,12 +2658,22 @@ function collectBlunVisionAttachments(messages) {
 	}
 	return attachments;
 }
-function estimateBlunRequestExtraBytes(tools, messages) {
-	const attachments = collectBlunVisionAttachments(messages);
-	return {
-		toolsBytes: tools.length === 0 ? 0 : Buffer.byteLength(JSON.stringify({ tools: tools.map(convertTool) }), "utf8"),
-		visionBytes: attachments.length === 0 ? 0 : Buffer.byteLength(JSON.stringify({ visionAttachments: attachments }), "utf8")
-	};
+function estimateBlunSerializedBodyBytes(systemPrompt, tools, history) {
+	const normalizedHistory = normalizeToolCallIdsForProvider([...history], BLUN_TOOL_CALL_ID_POLICY);
+	const messages = systemPrompt ? [{
+		role: "system",
+		content: systemPrompt
+	}] : [];
+	for (const message of normalizedHistory) if (!isEmptyAssistantHistoryMessage(message)) messages.push(convertMessage(message));
+	const attachments = collectBlunVisionAttachments(normalizedHistory);
+	return Buffer.byteLength(JSON.stringify({
+		model: "king",
+		messages,
+		stream: true,
+		...tools.length > 0 ? { tools: tools.map(convertTool) } : {},
+		...attachments.length > 0 ? { visionAttachments: attachments } : {},
+		stream_options: { include_usage: true }
+	}), "utf8");
 }
 function convertMessage(message) {
 	let reasoningContent = "";
@@ -11949,7 +11959,7 @@ var require_clone$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region ../../node_modules/.pnpm/graceful-fs@4.2.11/node_modules/graceful-fs/graceful-fs.js
 var require_graceful_fs = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	var fs$16 = __require("fs");
+	var fs$15 = __require("fs");
 	var polyfills = require_polyfills();
 	var legacy = require_legacy_streams();
 	var clone = require_clone$1();
@@ -11978,36 +11988,36 @@ var require_graceful_fs = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		m = "GFS4: " + m.split(/\n/).join("\nGFS4: ");
 		console.error(m);
 	};
-	if (!fs$16[gracefulQueue]) {
-		publishQueue(fs$16, global[gracefulQueue] || []);
-		fs$16.close = (function(fs$close) {
+	if (!fs$15[gracefulQueue]) {
+		publishQueue(fs$15, global[gracefulQueue] || []);
+		fs$15.close = (function(fs$close) {
 			function close(fd, cb) {
-				return fs$close.call(fs$16, fd, function(err) {
+				return fs$close.call(fs$15, fd, function(err) {
 					if (!err) resetQueue();
 					if (typeof cb === "function") cb.apply(this, arguments);
 				});
 			}
 			Object.defineProperty(close, previousSymbol, { value: fs$close });
 			return close;
-		})(fs$16.close);
-		fs$16.closeSync = (function(fs$closeSync) {
+		})(fs$15.close);
+		fs$15.closeSync = (function(fs$closeSync) {
 			function closeSync(fd) {
-				fs$closeSync.apply(fs$16, arguments);
+				fs$closeSync.apply(fs$15, arguments);
 				resetQueue();
 			}
 			Object.defineProperty(closeSync, previousSymbol, { value: fs$closeSync });
 			return closeSync;
-		})(fs$16.closeSync);
+		})(fs$15.closeSync);
 		if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || "")) process.on("exit", function() {
-			debug(fs$16[gracefulQueue]);
-			__require("assert").equal(fs$16[gracefulQueue].length, 0);
+			debug(fs$15[gracefulQueue]);
+			__require("assert").equal(fs$15[gracefulQueue].length, 0);
 		});
 	}
-	if (!global[gracefulQueue]) publishQueue(global, fs$16[gracefulQueue]);
-	module.exports = patch(clone(fs$16));
-	if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs$16.__patched) {
-		module.exports = patch(fs$16);
-		fs$16.__patched = true;
+	if (!global[gracefulQueue]) publishQueue(global, fs$15[gracefulQueue]);
+	module.exports = patch(clone(fs$15));
+	if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs$15.__patched) {
+		module.exports = patch(fs$15);
+		fs$15.__patched = true;
 	}
 	function patch(fs) {
 		polyfills(fs);
@@ -12262,23 +12272,23 @@ var require_graceful_fs = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	}
 	function enqueue(elem) {
 		debug("ENQUEUE", elem[0].name, elem[1]);
-		fs$16[gracefulQueue].push(elem);
+		fs$15[gracefulQueue].push(elem);
 		retry();
 	}
 	var retryTimer;
 	function resetQueue() {
 		var now = Date.now();
-		for (var i = 0; i < fs$16[gracefulQueue].length; ++i) if (fs$16[gracefulQueue][i].length > 2) {
-			fs$16[gracefulQueue][i][3] = now;
-			fs$16[gracefulQueue][i][4] = now;
+		for (var i = 0; i < fs$15[gracefulQueue].length; ++i) if (fs$15[gracefulQueue][i].length > 2) {
+			fs$15[gracefulQueue][i][3] = now;
+			fs$15[gracefulQueue][i][4] = now;
 		}
 		retry();
 	}
 	function retry() {
 		clearTimeout(retryTimer);
 		retryTimer = void 0;
-		if (fs$16[gracefulQueue].length === 0) return;
-		var elem = fs$16[gracefulQueue].shift();
+		if (fs$15[gracefulQueue].length === 0) return;
+		var elem = fs$15[gracefulQueue].shift();
 		var fn = elem[0];
 		var args = elem[1];
 		var err = elem[2];
@@ -12297,7 +12307,7 @@ var require_graceful_fs = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if (sinceAttempt >= Math.min(sinceStart * 1.2, 100)) {
 				debug("RETRY", fn.name, args);
 				fn.apply(null, args.concat([startTime]));
-			} else fs$16[gracefulQueue].push(elem);
+			} else fs$15[gracefulQueue].push(elem);
 		}
 		if (retryTimer === void 0) retryTimer = setTimeout(retry, 0);
 	}
@@ -12649,7 +12659,7 @@ var require_mtime_precision = /* @__PURE__ */ __commonJSMin(((exports, module) =
 //#endregion
 //#region ../../node_modules/.pnpm/proper-lockfile@4.1.2/node_modules/proper-lockfile/lib/lockfile.js
 var require_lockfile = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$16 = __require("path");
+	const path$15 = __require("path");
 	const fs = require_graceful_fs();
 	const retry = require_retry$3();
 	const onExit = require_signal_exit();
@@ -12659,7 +12669,7 @@ var require_lockfile = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		return options.lockfilePath || `${file}.lock`;
 	}
 	function resolveCanonicalPath(file, options, callback) {
-		if (!options.realpath) return callback(null, path$16.resolve(file));
+		if (!options.realpath) return callback(null, path$15.resolve(file));
 		options.fs.realpath(file, callback);
 	}
 	function acquireLock(file, options, callback) {
@@ -15175,7 +15185,7 @@ async function syncDir(dirPath) {
 */
 function syncFd(fd) {
 	return new Promise((resolve, reject) => {
-		fs$17.fsync(fd, (err) => {
+		fs$16.fsync(fd, (err) => {
 			if (err) {
 				reject(err);
 				return;
@@ -22286,6 +22296,31 @@ var init_instruction_provenance = __esmMin((() => {
 		get content() {
 			return this.pieces.map((piece) => piece.text).join("");
 		}
+		prefixUtf8(maxBytes) {
+			if (!Number.isSafeInteger(maxBytes) || maxBytes < 0) throw new RangeError("Invalid instruction byte budget");
+			const kept = [];
+			let remaining = maxBytes;
+			let totalBytes = 0;
+			let readBytes = 0;
+			for (const piece of this.pieces) {
+				const encoded = Buffer.from(piece.text, "utf8");
+				totalBytes += encoded.length;
+				if (remaining <= 0) continue;
+				const content = encoded.length <= remaining ? piece.text : new StringDecoder("utf8").write(encoded.subarray(0, remaining));
+				const bytes = Buffer.byteLength(content, "utf8");
+				if (content.length > 0) kept.push({
+					...piece,
+					text: content
+				});
+				readBytes += bytes;
+				remaining -= bytes;
+				if (bytes < encoded.length) remaining = 0;
+			}
+			return {
+				text: new InstructionText(kept, new Map(this.sources)),
+				omittedBytes: totalBytes - readBytes
+			};
+		}
 		replaceFirst(needle, replacement) {
 			const start = this.content.indexOf(needle);
 			if (start >= 0) this.replaceRange(start, start + needle.length, replacement);
@@ -22339,6 +22374,64 @@ var init_instruction_provenance = __esmMin((() => {
 }));
 //#endregion
 //#region ../../packages/agent-core/src/profile/context.ts
+function fitAgentsMdContext(context, maxFixedRequestBytes, measureFixedRequestBytes) {
+	if (!Number.isSafeInteger(maxFixedRequestBytes) || maxFixedRequestBytes <= 0) throw new RangeError("Invalid fixed request byte budget");
+	const originalBytes = measureFixedRequestBytes(context);
+	if (originalBytes <= maxFixedRequestBytes) return {
+		context,
+		fixedRequestBytes: originalBytes,
+		omittedBytes: 0,
+		fits: true
+	};
+	const source = context.agentsMdText;
+	if (source === void 0) return {
+		context,
+		fixedRequestBytes: originalBytes,
+		omittedBytes: 0,
+		fits: false
+	};
+	const totalBytes = source.measure().totalBytes;
+	const candidateAt = (maxBytes) => {
+		const { text } = source.prefixUtf8(maxBytes);
+		return {
+			...context,
+			agentsMd: text.content,
+			agentsMdSources: text.measure(),
+			agentsMdText: text
+		};
+	};
+	let low = 0;
+	let high = totalBytes;
+	let fitted = candidateAt(0);
+	let fittedBytes = measureFixedRequestBytes(fitted);
+	if (fittedBytes > maxFixedRequestBytes) {
+		const omittedBytes = context.agentsMdSources?.files.reduce((sum, file) => sum + file.bytes, 0) ?? totalBytes;
+		return {
+			context: fitted,
+			fixedRequestBytes: fittedBytes,
+			omittedBytes,
+			fits: false
+		};
+	}
+	while (low < high) {
+		const middle = Math.ceil((low + high) / 2);
+		const candidate = candidateAt(middle);
+		const bytes = measureFixedRequestBytes(candidate);
+		if (bytes <= maxFixedRequestBytes) {
+			low = middle;
+			fitted = candidate;
+			fittedBytes = bytes;
+		} else high = middle - 1;
+	}
+	const omittedBytes = context.agentsMdSources?.files.reduce((sum, file) => sum + file.bytes, 0) ?? totalBytes;
+	const retainedBytes = fitted.agentsMdSources?.files.reduce((sum, file) => sum + file.bytes, 0) ?? 0;
+	return {
+		context: fitted,
+		fixedRequestBytes: fittedBytes,
+		omittedBytes: omittedBytes - retainedBytes,
+		fits: true
+	};
+}
 async function prepareSystemPromptContext(kaos, brandHome, options) {
 	const additionalDirs = normalizeAdditionalDirs(options?.additionalDirs ?? []);
 	const [cwdListing, agentsMdResult, additionalDirsInfo] = await Promise.all([
@@ -22351,7 +22444,8 @@ async function prepareSystemPromptContext(kaos, brandHome, options) {
 		agentsMd: agentsMdResult.content,
 		additionalDirsInfo,
 		agentsMdWarning: agentsMdResult.warning,
-		agentsMdSources: agentsMdResult.sources
+		agentsMdSources: agentsMdResult.sources,
+		agentsMdText: agentsMdResult.text
 	};
 }
 async function loadAgentsMd(kaos, brandHome) {
@@ -22405,6 +22499,7 @@ async function loadAgentsMdForRoots(kaos, brandHome, workDirs) {
 	return {
 		content,
 		warning: totalBytes > AGENTS_MD_RECOMMENDED_MAX_BYTES ? `AGENTS.md total ${formatKB(totalBytes)} KB exceeds the recommended ${formatKB(AGENTS_MD_RECOMMENDED_MAX_BYTES)} KB. Large instruction files increase cost and may impact performance; consider trimming.` : void 0,
+		text: rendered,
 		sources: {
 			...rendered.measure(),
 			...notLoadedCandidates.size === 0 ? {} : { notLoadedCandidates: [...notLoadedCandidates] }
@@ -26140,7 +26235,7 @@ var require_loader = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		};
 		return _setPrototypeOf(o, p);
 	}
-	var path$15 = __require("path");
+	var path$14 = __require("path");
 	module.exports = /* @__PURE__ */ function(_EmitterObj) {
 		_inheritsLoose(Loader, _EmitterObj);
 		function Loader() {
@@ -26148,7 +26243,7 @@ var require_loader = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		}
 		var _proto = Loader.prototype;
 		_proto.resolve = function resolve(from, to) {
-			return path$15.resolve(path$15.dirname(from), to);
+			return path$14.resolve(path$14.dirname(from), to);
 		};
 		_proto.isRelative = function isRelative(filename) {
 			return filename.indexOf("./") === 0 || filename.indexOf("../") === 0;
@@ -27804,8 +27899,8 @@ var require_node_loaders = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		};
 		return _setPrototypeOf(o, p);
 	}
-	var fs$15 = __require("fs");
-	var path$14 = __require("path");
+	var fs$14 = __require("fs");
+	var path$13 = __require("path");
 	var Loader = require_loader();
 	var PrecompiledLoader = require_precompiled_loader().PrecompiledLoader;
 	var chokidar;
@@ -27820,7 +27915,7 @@ var require_node_loaders = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				_this.noCache = !!opts.noCache;
 				if (searchPaths) {
 					searchPaths = Array.isArray(searchPaths) ? searchPaths : [searchPaths];
-					_this.searchPaths = searchPaths.map(path$14.normalize);
+					_this.searchPaths = searchPaths.map(path$13.normalize);
 				} else _this.searchPaths = ["."];
 				if (opts.watch) {
 					try {
@@ -27828,10 +27923,10 @@ var require_node_loaders = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					} catch (e) {
 						throw new Error("watch requires chokidar to be installed");
 					}
-					var paths = _this.searchPaths.filter(fs$15.existsSync);
+					var paths = _this.searchPaths.filter(fs$14.existsSync);
 					var watcher = chokidar.watch(paths);
 					watcher.on("all", function(event, fullname) {
-						fullname = path$14.resolve(fullname);
+						fullname = path$13.resolve(fullname);
 						if (event === "change" && fullname in _this.pathsToNames) _this.emit("update", _this.pathsToNames[fullname], fullname);
 					});
 					watcher.on("error", function(error) {
@@ -27845,9 +27940,9 @@ var require_node_loaders = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				var fullpath = null;
 				var paths = this.searchPaths;
 				for (var i = 0; i < paths.length; i++) {
-					var basePath = path$14.resolve(paths[i]);
-					var p = path$14.resolve(paths[i], name);
-					if (p.indexOf(basePath) === 0 && fs$15.existsSync(p)) {
+					var basePath = path$13.resolve(paths[i]);
+					var p = path$13.resolve(paths[i], name);
+					if (p.indexOf(basePath) === 0 && fs$14.existsSync(p)) {
 						fullpath = p;
 						break;
 					}
@@ -27855,7 +27950,7 @@ var require_node_loaders = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				if (!fullpath) return null;
 				this.pathsToNames[fullpath] = name;
 				var source = {
-					src: fs$15.readFileSync(fullpath, "utf-8"),
+					src: fs$14.readFileSync(fullpath, "utf-8"),
 					path: fullpath,
 					noCache: this.noCache
 				};
@@ -27903,7 +27998,7 @@ var require_node_loaders = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				}
 				this.pathsToNames[fullpath] = name;
 				var source = {
-					src: fs$15.readFileSync(fullpath, "utf-8"),
+					src: fs$14.readFileSync(fullpath, "utf-8"),
 					path: fullpath,
 					noCache: this.noCache
 				};
@@ -28205,13 +28300,13 @@ var require_globals = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region ../../node_modules/.pnpm/nunjucks@3.2.4_chokidar@4.0.3/node_modules/nunjucks/src/express-app.js
 var require_express_app = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	var path$13 = __require("path");
+	var path$12 = __require("path");
 	module.exports = function express(env, app) {
 		function NunjucksView(name, opts) {
 			this.name = name;
 			this.path = name;
 			this.defaultEngine = opts.defaultEngine;
-			this.ext = path$13.extname(name);
+			this.ext = path$12.extname(name);
 			if (!this.ext && !this.defaultEngine) throw new Error("No default engine was specified and no extension was provided.");
 			if (!this.ext) this.name += this.ext = (this.defaultEngine[0] !== "." ? "." : "") + this.defaultEngine;
 		}
@@ -28647,8 +28742,8 @@ var require_precompile_global = /* @__PURE__ */ __commonJSMin(((exports, module)
 //#endregion
 //#region ../../node_modules/.pnpm/nunjucks@3.2.4_chokidar@4.0.3/node_modules/nunjucks/src/precompile.js
 var require_precompile = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	var fs$14 = __require("fs");
-	var path$12 = __require("path");
+	var fs$13 = __require("fs");
+	var path$11 = __require("path");
 	var _prettifyError = require_lib$8()._prettifyError;
 	var compiler = require_compiler();
 	var Environment = require_environment().Environment;
@@ -28672,27 +28767,27 @@ var require_precompile = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		var env = opts.env || new Environment([]);
 		var wrapper = opts.wrapper || precompileGlobal;
 		if (opts.isString) return precompileString(input, opts);
-		var pathStats = fs$14.existsSync(input) && fs$14.statSync(input);
+		var pathStats = fs$13.existsSync(input) && fs$13.statSync(input);
 		var precompiled = [];
 		var templates = [];
 		function addTemplates(dir) {
-			fs$14.readdirSync(dir).forEach(function(file) {
-				var filepath = path$12.join(dir, file);
-				var subpath = filepath.substr(path$12.join(input, "/").length);
-				var stat = fs$14.statSync(filepath);
+			fs$13.readdirSync(dir).forEach(function(file) {
+				var filepath = path$11.join(dir, file);
+				var subpath = filepath.substr(path$11.join(input, "/").length);
+				var stat = fs$13.statSync(filepath);
 				if (stat && stat.isDirectory()) {
 					subpath += "/";
 					if (!match(subpath, opts.exclude)) addTemplates(filepath);
 				} else if (match(subpath, opts.include)) templates.push(filepath);
 			});
 		}
-		if (pathStats.isFile()) precompiled.push(_precompile(fs$14.readFileSync(input, "utf-8"), opts.name || input, env));
+		if (pathStats.isFile()) precompiled.push(_precompile(fs$13.readFileSync(input, "utf-8"), opts.name || input, env));
 		else if (pathStats.isDirectory()) {
 			addTemplates(input);
 			for (var i = 0; i < templates.length; i++) {
-				var name = templates[i].replace(path$12.join(input, "/"), "");
+				var name = templates[i].replace(path$11.join(input, "/"), "");
 				try {
-					precompiled.push(_precompile(fs$14.readFileSync(templates[i], "utf-8"), name, env));
+					precompiled.push(_precompile(fs$13.readFileSync(templates[i], "utf-8"), name, env));
 				} catch (e) {
 					if (opts.force) console.error(e);
 					else throw e;
@@ -32733,7 +32828,7 @@ var require_buffer_from = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#region ../../node_modules/.pnpm/source-map-support@0.5.21/node_modules/source-map-support/source-map-support.js
 var require_source_map_support = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var SourceMapConsumer = require_source_map().SourceMapConsumer;
-	var path$11 = __require("path");
+	var path$10 = __require("path");
 	var fs;
 	try {
 		fs = __require("fs");
@@ -32810,15 +32905,15 @@ var require_source_map_support = /* @__PURE__ */ __commonJSMin(((exports, module
 	});
 	function supportRelativeURL(file, url) {
 		if (!file) return url;
-		var dir = path$11.dirname(file);
+		var dir = path$10.dirname(file);
 		var match = /^\w+:\/\/[^\/]*/.exec(dir);
 		var protocol = match ? match[0] : "";
 		var startPath = dir.slice(protocol.length);
 		if (protocol && /^\/\w\:/.test(startPath)) {
 			protocol += "/";
-			return protocol + path$11.resolve(dir.slice(protocol.length), url).replace(/\\/g, "/");
+			return protocol + path$10.resolve(dir.slice(protocol.length), url).replace(/\\/g, "/");
 		}
-		return protocol + path$11.resolve(dir.slice(protocol.length), url);
+		return protocol + path$10.resolve(dir.slice(protocol.length), url);
 	}
 	function retrieveSourceMapURL(source) {
 		var fileData;
@@ -181397,6 +181492,10 @@ var init_goal$1 = __esmMin((() => {
 		restoreUpdate(record) {
 			const state = this.state;
 			if (state === void 0) return;
+			if (record.objective !== void 0) {
+				state.objective = record.objective;
+				this.lifecycleRevision += 1;
+			}
 			const status = record.status;
 			if (status !== void 0) {
 				this.lifecycleRevision += 1;
@@ -181411,7 +181510,17 @@ var init_goal$1 = __esmMin((() => {
 				state.wallClockResumedAt = void 0;
 			}
 			if (record.budgetLimits !== void 0) state.budgetLimits = record.budgetLimits;
-			if (status === void 0) return;
+			if (status === void 0) {
+				if (record.objective !== void 0) this.agent.replayBuilder.push({
+					type: "goal_updated",
+					snapshot: this.toSnapshot(state),
+					change: {
+						kind: "edited",
+						actor: record.actor
+					}
+				});
+				return;
+			}
 			this.agent.replayBuilder.push({
 				type: "goal_updated",
 				snapshot: this.toSnapshot(state),
@@ -181455,11 +181564,11 @@ var init_goal$1 = __esmMin((() => {
 			if (objective.length === 0) throw new BlunError(ErrorCodes.GOAL_OBJECTIVE_EMPTY, "Goal objective cannot be empty");
 			if (objective.length > MAX_GOAL_OBJECTIVE_LENGTH$3) throw new BlunError(ErrorCodes.GOAL_OBJECTIVE_TOO_LONG, `Goal objective cannot exceed ${MAX_GOAL_OBJECTIVE_LENGTH$3} characters`);
 			const verificationScope = normalizeVerificationScope(input.verificationScope);
+			const completionCriterion = normalizeCompletionCriterion(input.completionCriterion);
 			if (this.state !== void 0) {
 				if (input.replace !== true) throw new BlunError(ErrorCodes.GOAL_ALREADY_EXISTS, "A goal already exists; use replace to start a new one");
 				this.clearInternal("system");
 			}
-			const completionCriterion = normalizeCompletionCriterion(input.completionCriterion);
 			const state = {
 				goalId: randomUUID(),
 				objective,
@@ -181483,6 +181592,35 @@ var init_goal$1 = __esmMin((() => {
 			this.trackGoalCreated(actor, input.replace === true);
 			return this.toSnapshot(state);
 		}
+		async completeGoal() {
+			const state = this.requireState();
+			if (state.status !== "active") throw new BlunError(ErrorCodes.GOAL_STATUS_INVALID, `Cannot complete a goal in status "${state.status}"`);
+			return this.markComplete({}, "user");
+		}
+		async blockGoal(input = {}) {
+			const state = this.requireState();
+			if (state.status === "blocked") return this.toSnapshot(state);
+			if (state.status !== "active") throw new BlunError(ErrorCodes.GOAL_STATUS_INVALID, `Cannot block a goal in status "${state.status}"`);
+			return await this.markBlocked(input, "user");
+		}
+		async editGoal(input, actor = "user") {
+			const state = this.requireState();
+			const objective = input.objective.trim();
+			if (objective.length === 0) throw new BlunError(ErrorCodes.GOAL_OBJECTIVE_EMPTY, "Goal objective cannot be empty");
+			if (objective.length > MAX_GOAL_OBJECTIVE_LENGTH$3) throw new BlunError(ErrorCodes.GOAL_OBJECTIVE_TOO_LONG, `Goal objective cannot exceed ${MAX_GOAL_OBJECTIVE_LENGTH$3} characters`);
+			if (objective === state.objective) return this.toSnapshot(state);
+			state.objective = objective;
+			this.lifecycleRevision += 1;
+			this.appendGoalUpdate({
+				objective,
+				actor
+			});
+			this.persistState(state, { change: {
+				kind: "edited",
+				actor
+			} });
+			return this.toSnapshot(state);
+		}
 		async pauseGoal(input = {}, actor = "user") {
 			const state = this.requireState();
 			if (state.status === "paused") return this.toSnapshot(state);
@@ -182225,6 +182363,621 @@ var init_provider_retry_wait = __esmMin((() => {
 	};
 }));
 //#endregion
+//#region ../../packages/agent-core/src/tools/support/file-type.ts
+function toBuffer$2(data) {
+	return Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
+}
+function startsWith(buf, prefix) {
+	const needle = Buffer.isBuffer(prefix) ? prefix : Buffer.from(prefix);
+	if (buf.length < needle.length) return false;
+	for (let i = 0; i < needle.length; i += 1) if (buf[i] !== needle[i]) return false;
+	return true;
+}
+function sniffFtypBrand(header) {
+	if (header.length < 12) return null;
+	if (header.subarray(4, 8).toString("latin1") !== "ftyp") return null;
+	return header.subarray(8, 12).toString("latin1").toLowerCase().replaceAll(/[\s\u0000]+$/g, "").trim();
+}
+function sniffMediaFromMagic(data) {
+	const buf = toBuffer$2(data);
+	const header = buf.length > 512 ? buf.subarray(0, 512) : buf;
+	if (startsWith(header, [
+		137,
+		80,
+		78,
+		71,
+		13,
+		10,
+		26,
+		10
+	])) return {
+		kind: "image",
+		mimeType: "image/png"
+	};
+	if (startsWith(header, [
+		255,
+		216,
+		255
+	])) return {
+		kind: "image",
+		mimeType: "image/jpeg"
+	};
+	if (startsWith(header, Buffer.from("GIF87a")) || startsWith(header, Buffer.from("GIF89a"))) return {
+		kind: "image",
+		mimeType: "image/gif"
+	};
+	if (startsWith(header, Buffer.from("BM"))) return {
+		kind: "image",
+		mimeType: "image/bmp"
+	};
+	if (startsWith(header, [
+		73,
+		73,
+		42,
+		0
+	]) || startsWith(header, [
+		77,
+		77,
+		0,
+		42
+	])) return {
+		kind: "image",
+		mimeType: "image/tiff"
+	};
+	if (startsWith(header, [
+		0,
+		0,
+		1,
+		0
+	])) return {
+		kind: "image",
+		mimeType: "image/x-icon"
+	};
+	if (startsWith(header, Buffer.from("RIFF")) && header.length >= 12) {
+		const chunk = header.subarray(8, 12).toString("latin1");
+		if (chunk === "WEBP") return {
+			kind: "image",
+			mimeType: "image/webp"
+		};
+		if (chunk === "AVI ") return {
+			kind: "video",
+			mimeType: "video/x-msvideo"
+		};
+	}
+	if (startsWith(header, Buffer.from("FLV"))) return {
+		kind: "video",
+		mimeType: "video/x-flv"
+	};
+	if (startsWith(header, ASF_HEADER)) return {
+		kind: "video",
+		mimeType: "video/x-ms-wmv"
+	};
+	if (startsWith(header, [
+		26,
+		69,
+		223,
+		163
+	])) {
+		const lowered = header.toString("latin1").toLowerCase();
+		if (lowered.includes("webm")) return {
+			kind: "video",
+			mimeType: "video/webm"
+		};
+		if (lowered.includes("matroska")) return {
+			kind: "video",
+			mimeType: "video/x-matroska"
+		};
+	}
+	const brand = sniffFtypBrand(header);
+	if (brand !== null && brand !== "") {
+		if (brand in FTYP_IMAGE_BRANDS) return {
+			kind: "image",
+			mimeType: FTYP_IMAGE_BRANDS[brand]
+		};
+		if (brand in FTYP_VIDEO_BRANDS) return {
+			kind: "video",
+			mimeType: FTYP_VIDEO_BRANDS[brand]
+		};
+	}
+	return null;
+}
+/**
+* Best-effort pixel-dimension reader for common raster formats.
+*
+* Inspects only the fixed region near the start of the file where each
+* format records its dimensions (the IHDR/DIB header, the RIFF chunk
+* after the `WEBP` tag, or the first JPEG SOFn segment). Returns `null`
+* for formats whose dimensions are not locatable from that region, or
+* when the supplied buffer is too short to cover it.
+*/
+function sniffImageDimensions(data) {
+	const buf = toBuffer$2(data);
+	if (startsWith(buf, [
+		137,
+		80,
+		78,
+		71,
+		13,
+		10,
+		26,
+		10
+	]) && buf.length >= 24) return {
+		width: buf.readUInt32BE(16),
+		height: buf.readUInt32BE(20)
+	};
+	if ((startsWith(buf, Buffer.from("GIF87a")) || startsWith(buf, Buffer.from("GIF89a"))) && buf.length >= 10) return {
+		width: buf.readUInt16LE(6),
+		height: buf.readUInt16LE(8)
+	};
+	if (startsWith(buf, Buffer.from("BM")) && buf.length >= 26) return {
+		width: buf.readInt32LE(18),
+		height: Math.abs(buf.readInt32LE(22))
+	};
+	if (startsWith(buf, Buffer.from("RIFF")) && buf.length >= 30) {
+		const fourCc = buf.subarray(12, 16).toString("latin1");
+		if (fourCc === "VP8 ") return {
+			width: buf.readUInt16LE(26) & 16383,
+			height: buf.readUInt16LE(28) & 16383
+		};
+		if (fourCc === "VP8L" && buf.length >= 25) {
+			const bits = buf.readUInt32LE(21);
+			return {
+				width: (bits & 16383) + 1,
+				height: (bits >> 14 & 16383) + 1
+			};
+		}
+		if (fourCc === "VP8X") return {
+			width: 1 + (buf[24] | buf[25] << 8 | buf[26] << 16),
+			height: 1 + (buf[27] | buf[28] << 8 | buf[29] << 16)
+		};
+	}
+	if (startsWith(buf, [255, 216])) {
+		let offset = 2;
+		while (offset + 9 < buf.length) {
+			if (buf[offset] !== 255) {
+				offset += 1;
+				continue;
+			}
+			const marker = buf[offset + 1];
+			if (marker >= 192 && marker <= 207 && marker !== 196 && marker !== 200 && marker !== 204) return {
+				height: buf.readUInt16BE(offset + 5),
+				width: buf.readUInt16BE(offset + 7)
+			};
+			if (marker === 216 || marker === 217 || marker >= 208 && marker <= 215) {
+				offset += 2;
+				continue;
+			}
+			const segmentLength = buf.readUInt16BE(offset + 2);
+			if (segmentLength < 2) break;
+			offset += 2 + segmentLength;
+		}
+	}
+	return null;
+}
+function getSuffix(path) {
+	const idx = path.lastIndexOf(".");
+	if (idx === -1) return "";
+	if (idx <= Math.max(path.lastIndexOf("/"), path.lastIndexOf("\\")) + 1) return "";
+	return path.slice(idx).toLowerCase();
+}
+function detectFileType(path, header, type = "text") {
+	const suffix = getSuffix(path);
+	let mediaHint = null;
+	if (suffix in TEXT_MIME_BY_SUFFIX) mediaHint = {
+		kind: "text",
+		mimeType: TEXT_MIME_BY_SUFFIX[suffix]
+	};
+	else if (suffix in IMAGE_MIME_BY_SUFFIX) mediaHint = {
+		kind: "image",
+		mimeType: IMAGE_MIME_BY_SUFFIX[suffix]
+	};
+	else if (suffix in VIDEO_MIME_BY_SUFFIX$1) mediaHint = {
+		kind: "video",
+		mimeType: VIDEO_MIME_BY_SUFFIX$1[suffix]
+	};
+	if (header !== void 0) {
+		const buf = toBuffer$2(header);
+		const sniffed = sniffMediaFromMagic(buf);
+		if (sniffed) {
+			if (type === "media") return sniffed;
+			if (mediaHint) {
+				if (sniffed.kind !== mediaHint.kind) return {
+					kind: "unknown",
+					mimeType: ""
+				};
+				return mediaHint;
+			}
+			return sniffed;
+		}
+		if (mediaHint?.kind === "image") return {
+			kind: "unknown",
+			mimeType: ""
+		};
+		if (type === "media" && mediaHint?.kind === "video") return mediaHint;
+		if (buf.includes(0)) return {
+			kind: "unknown",
+			mimeType: ""
+		};
+	}
+	if (mediaHint) return mediaHint;
+	if (NON_TEXT_SUFFIXES.has(suffix)) return {
+		kind: "unknown",
+		mimeType: ""
+	};
+	return {
+		kind: "text",
+		mimeType: "text/plain"
+	};
+}
+var IMAGE_MIME_BY_SUFFIX, VIDEO_MIME_BY_SUFFIX$1, TEXT_MIME_BY_SUFFIX, NON_TEXT_SUFFIXES, ASF_HEADER, FTYP_IMAGE_BRANDS, FTYP_VIDEO_BRANDS;
+var init_file_type$1 = __esmMin((() => {
+	IMAGE_MIME_BY_SUFFIX = Object.freeze({
+		".png": "image/png",
+		".jpg": "image/jpeg",
+		".jpeg": "image/jpeg",
+		".gif": "image/gif",
+		".bmp": "image/bmp",
+		".tif": "image/tiff",
+		".tiff": "image/tiff",
+		".webp": "image/webp",
+		".ico": "image/x-icon",
+		".heic": "image/heic",
+		".heif": "image/heif",
+		".avif": "image/avif",
+		".svgz": "image/svg+xml"
+	});
+	VIDEO_MIME_BY_SUFFIX$1 = Object.freeze({
+		".mp4": "video/mp4",
+		".mpg": "video/mpeg",
+		".mpeg": "video/mpeg",
+		".mkv": "video/x-matroska",
+		".avi": "video/x-msvideo",
+		".mov": "video/quicktime",
+		".ogv": "video/ogg",
+		".wmv": "video/x-ms-wmv",
+		".webm": "video/webm",
+		".m4v": "video/x-m4v",
+		".flv": "video/x-flv",
+		".3gp": "video/3gpp",
+		".3g2": "video/3gpp2"
+	});
+	TEXT_MIME_BY_SUFFIX = Object.freeze({ ".svg": "image/svg+xml" });
+	NON_TEXT_SUFFIXES = new Set([
+		".icns",
+		".psd",
+		".ai",
+		".eps",
+		".pdf",
+		".doc",
+		".docx",
+		".dot",
+		".dotx",
+		".rtf",
+		".odt",
+		".xls",
+		".xlsx",
+		".xlsm",
+		".xlt",
+		".xltx",
+		".xltm",
+		".ods",
+		".ppt",
+		".pptx",
+		".pptm",
+		".pps",
+		".ppsx",
+		".odp",
+		".pages",
+		".numbers",
+		".key",
+		".zip",
+		".rar",
+		".7z",
+		".tar",
+		".gz",
+		".tgz",
+		".bz2",
+		".xz",
+		".zst",
+		".lz",
+		".lz4",
+		".br",
+		".cab",
+		".ar",
+		".deb",
+		".rpm",
+		".mp3",
+		".wav",
+		".flac",
+		".ogg",
+		".oga",
+		".opus",
+		".aac",
+		".m4a",
+		".wma",
+		".ttf",
+		".otf",
+		".woff",
+		".woff2",
+		".exe",
+		".dll",
+		".so",
+		".dylib",
+		".bin",
+		".apk",
+		".ipa",
+		".jar",
+		".class",
+		".pyc",
+		".pyo",
+		".wasm",
+		".dmg",
+		".iso",
+		".img",
+		".sqlite",
+		".sqlite3",
+		".db",
+		".db3"
+	]);
+	ASF_HEADER = Buffer.from([
+		48,
+		38,
+		178,
+		117,
+		142,
+		102,
+		207,
+		17,
+		166,
+		217,
+		0,
+		170,
+		0,
+		98,
+		206,
+		108
+	]);
+	FTYP_IMAGE_BRANDS = Object.freeze({
+		avif: "image/avif",
+		avis: "image/avif",
+		heic: "image/heic",
+		heif: "image/heif",
+		heix: "image/heif",
+		hevc: "image/heic",
+		mif1: "image/heif",
+		msf1: "image/heif"
+	});
+	FTYP_VIDEO_BRANDS = Object.freeze({
+		isom: "video/mp4",
+		iso2: "video/mp4",
+		iso5: "video/mp4",
+		mp41: "video/mp4",
+		mp42: "video/mp4",
+		avc1: "video/mp4",
+		mp4v: "video/mp4",
+		m4v: "video/x-m4v",
+		qt: "video/quicktime",
+		"3gp4": "video/3gpp",
+		"3gp5": "video/3gpp",
+		"3gp6": "video/3gpp",
+		"3gp7": "video/3gpp",
+		"3g2": "video/3gpp2"
+	});
+}));
+//#endregion
+//#region ../../packages/agent-core/src/utils/tokens.ts
+/** Open assistant messages grow while streaming; completed history stays cached. */
+function invalidateMessageTokenEstimate(message) {
+	messageTokenEstimateCache.delete(message);
+}
+/**
+* Estimate token count from text using a character-based heuristic.
+*   - ASCII (~4 chars per token)
+*   - CJK and other non-ASCII (~1 char per token)
+* The estimate is transient — the next LLM call returns the real count
+* and supersedes this value. Used to keep `tokenCountWithPending`
+* monotonic between LLM round-trips without paying for a tokenizer.
+*/
+function estimateTokens(text) {
+	let asciiCount = 0;
+	let nonAsciiCount = 0;
+	for (const char of text) if (char.codePointAt(0) <= 127) asciiCount++;
+	else nonAsciiCount++;
+	return Math.ceil(asciiCount / 4) + nonAsciiCount;
+}
+function estimateTokensForMessages(messages) {
+	let total = 0;
+	for (const message of messages) total += estimateTokensForMessage(message);
+	return total;
+}
+/** With stopAfter, the result is a lower bound once it exceeds that budget. */
+function estimateTokensForTools(tools, stopAfter = Infinity) {
+	let total = 0;
+	for (const tool of tools) {
+		total += estimateTokens(tool.name);
+		total += estimateTokens(tool.description);
+		total += estimateTokens(JSON.stringify(tool.parameters));
+		if (total > stopAfter) return total;
+	}
+	return total;
+}
+function estimateTokensForMessage(message) {
+	const cached = messageTokenEstimateCache.get(message);
+	if (cached !== void 0) return cached;
+	let total = estimateTokens(message.role);
+	total += estimateTokensForContentParts(message.content);
+	if (message.toolCalls !== void 0) for (const call of message.toolCalls) {
+		total += estimateTokens(call.name);
+		total += estimateTokens(JSON.stringify(call.arguments));
+	}
+	messageTokenEstimateCache.set(message, total);
+	return total;
+}
+function estimateTokensForContentParts(parts) {
+	let total = 0;
+	for (const part of parts) total += estimateTokensForContentPart(part);
+	return total;
+}
+function imageDimensionsFromDataUrl(url) {
+	const commaIndex = url.indexOf(",");
+	if (commaIndex <= 0) return null;
+	const metadata = url.slice(0, commaIndex).toLowerCase();
+	if (!metadata.startsWith("data:image/") || !metadata.split(";").includes("base64")) return null;
+	const maxBase64Chars = Math.ceil(MAX_IMAGE_HEADER_BYTES / 3) * 4;
+	const encodedHeader = url.slice(commaIndex + 1, commaIndex + 1 + maxBase64Chars);
+	if (encodedHeader.length === 0) return null;
+	try {
+		const dimensions = sniffImageDimensions(Buffer.from(encodedHeader, "base64"));
+		if (dimensions === null || !Number.isSafeInteger(dimensions.width) || !Number.isSafeInteger(dimensions.height) || dimensions.width <= 0 || dimensions.height <= 0) return null;
+		return dimensions;
+	} catch {
+		return null;
+	}
+}
+function estimateImageTokensFromDimensions(width, height) {
+	if (!Number.isSafeInteger(width) || !Number.isSafeInteger(height) || width <= 0 || height <= 0) return MEDIA_TOKEN_ESTIMATE;
+	const patchSize = BigInt(32);
+	const tokens = (BigInt(width) + patchSize - 1n) / patchSize * ((BigInt(height) + patchSize - 1n) / patchSize);
+	return tokens > BigInt(Number.MAX_SAFE_INTEGER) ? Number.MAX_SAFE_INTEGER : Number(tokens);
+}
+function estimateImageTokens(url) {
+	const dimensions = imageDimensionsFromDataUrl(url);
+	return dimensions === null ? MEDIA_TOKEN_ESTIMATE : estimateImageTokensFromDimensions(dimensions.width, dimensions.height);
+}
+function estimateTokensForContentPart(part) {
+	switch (part.type) {
+		case "text": return estimateTokens(part.text);
+		case "think": return estimateTokens(part.think);
+		case "image_url": return estimateImageTokens(part.imageUrl.url);
+		case "audio_url":
+		case "video_url": return MEDIA_TOKEN_ESTIMATE;
+		default: return 0;
+	}
+}
+var messageTokenEstimateCache, MEDIA_TOKEN_ESTIMATE, MAX_IMAGE_HEADER_BYTES;
+var init_tokens = __esmMin((() => {
+	init_file_type$1();
+	messageTokenEstimateCache = /* @__PURE__ */ new WeakMap();
+	MEDIA_TOKEN_ESTIMATE = 2e3;
+	MAX_IMAGE_HEADER_BYTES = 1024 * 1024;
+}));
+//#endregion
+//#region ../../packages/agent-core/src/agent/compaction/tool-continuity.ts
+function saturatingAdd(left, right) {
+	return left + Math.min(right, Number.MAX_SAFE_INTEGER - left);
+}
+function renderUnchecked(value) {
+	return [
+		"",
+		"",
+		"<tool-continuity>",
+		"Observed tool-result flags; may be synthetic, not verified job success or permission. omitted counts excluded observations cumulatively, not jobs.",
+		JSON.stringify(value).replaceAll(/[<>&]/g, (character) => {
+			return `\\u${character.codePointAt(0).toString(16).padStart(4, "0")}`;
+		}),
+		"</tool-continuity>"
+	].join("\n");
+}
+function hasExactKeys$1(value, expected) {
+	const prototype = Object.getPrototypeOf(value);
+	if (prototype !== Object.prototype && prototype !== null) return false;
+	return Reflect.ownKeys(value).length === expected.length && expected.every((key) => {
+		const descriptor = Object.getOwnPropertyDescriptor(value, key);
+		return descriptor !== void 0 && descriptor.enumerable === true && Object.hasOwn(descriptor, "value");
+	});
+}
+function isDataArray(value) {
+	if (!Array.isArray(value) || Object.getPrototypeOf(value) !== Array.prototype || value.length > 8 || Reflect.ownKeys(value).length !== value.length + 1) return false;
+	for (let index = 0; index < value.length; index++) {
+		const descriptor = Object.getOwnPropertyDescriptor(value, String(index));
+		if (descriptor === void 0 || descriptor.enumerable !== true || !Object.hasOwn(descriptor, "value")) return false;
+	}
+	return true;
+}
+/** Validate restored metadata without interpreting any summarizer or tool prose. */
+function isToolContinuity(value) {
+	try {
+		if (value === null || typeof value !== "object" || !hasExactKeys$1(value, ["receipts", "omitted"])) return false;
+		const candidate = value;
+		if (!Number.isSafeInteger(candidate["omitted"]) || candidate["omitted"] < 0 || !isDataArray(candidate["receipts"]) || candidate["receipts"].length > 8) return false;
+		for (const receipt of candidate["receipts"]) if (receipt === null || typeof receipt !== "object" || !hasExactKeys$1(receipt, ["toolCallId", "observedIsError"]) || !("toolCallId" in receipt) || !("observedIsError" in receipt) || typeof receipt.toolCallId !== "string" || receipt.toolCallId.length === 0 || Buffer.byteLength(receipt.toolCallId, "utf8") > 256 || receipt.observedIsError !== null && typeof receipt.observedIsError !== "boolean") return false;
+		return Buffer.byteLength(JSON.stringify(renderUnchecked(value)), "utf8") <= MAX_TOOL_CONTINUITY_SERIALIZED_BYTES;
+	} catch {
+		return false;
+	}
+}
+function renderToolContinuity(value) {
+	if (!isToolContinuity(value) || value.receipts.length === 0 && value.omitted === 0) return void 0;
+	return renderUnchecked(value);
+}
+/** The caller passes only the compactable prefix, excluding the preserved tool suffix. */
+function collectToolContinuity(messages) {
+	const observed = /* @__PURE__ */ new Map();
+	let ordinal = 0;
+	let inheritedOmitted = 0;
+	let excluded = 0;
+	const remember = (toolCallId, observedIsError) => {
+		if (toolCallId.length === 0 || Buffer.byteLength(toolCallId, "utf8") > 256) {
+			excluded = saturatingAdd(excluded, 1);
+			return;
+		}
+		const key = JSON.stringify([toolCallId, observedIsError]);
+		observed.set(key, {
+			toolCallId,
+			observedIsError,
+			ordinal: ordinal++
+		});
+	};
+	for (const message of messages) if (message.role === "tool" && typeof message.toolCallId === "string") remember(message.toolCallId, typeof message.isError === "boolean" ? message.isError : null);
+	else if (message.role === "user" && message.origin?.kind === "compaction_summary") {
+		const previous = message.origin.toolContinuity;
+		if (!isToolContinuity(previous)) continue;
+		for (const receipt of previous.receipts.toReversed()) remember(receipt.toolCallId, receipt.observedIsError);
+		inheritedOmitted = Math.max(inheritedOmitted, previous.omitted);
+	}
+	const prioritized = [...observed.values()].toSorted((left, right) => Number(right.observedIsError === true) - Number(left.observedIsError === true) || right.ordinal - left.ordinal);
+	const receipts = prioritized.slice(0, 8).map(({ toolCallId, observedIsError }) => ({
+		toolCallId,
+		observedIsError
+	}));
+	let omitted = saturatingAdd(saturatingAdd(inheritedOmitted, excluded), prioritized.length - receipts.length);
+	while (true) {
+		const result = {
+			receipts: [...receipts],
+			omitted
+		};
+		if (renderToolContinuity(result) !== void 0) return result;
+		if (receipts.length === 0) return void 0;
+		receipts.pop();
+		omitted = saturatingAdd(omitted, 1);
+	}
+}
+/** Fit complete tuples and their disclaimer; never start a new failure or retry path. */
+function fitToolContinuity(value, additionalTokenBudget) {
+	if (value === void 0 || !isToolContinuity(value) || !(additionalTokenBudget > 0)) return void 0;
+	const receipts = [...value.receipts];
+	let omitted = value.omitted;
+	while (true) {
+		const continuity = {
+			receipts: [...receipts],
+			omitted
+		};
+		const text = renderToolContinuity(continuity);
+		if (text !== void 0 && estimateTokens(text) <= additionalTokenBudget) return {
+			continuity,
+			text
+		};
+		if (receipts.length === 0) return void 0;
+		receipts.pop();
+		omitted = saturatingAdd(omitted, 1);
+	}
+}
+var MAX_TOOL_CONTINUITY_SERIALIZED_BYTES;
+var init_tool_continuity = __esmMin((() => {
+	init_tokens();
+	MAX_TOOL_CONTINUITY_SERIALIZED_BYTES = 4096;
+}));
+//#endregion
 //#region ../../packages/agent-core/src/agent/records/resume-snapshot.ts
 function resumeRecordKind(type) {
 	if ([
@@ -182313,6 +183066,7 @@ var init_resume_snapshot = __esmMin((() => {
 	init_schema();
 	init_goal$1();
 	init_provider_retry_wait();
+	init_tool_continuity();
 	init_migration();
 	integer$1 = number$1().int().nonnegative().max(Number.MAX_SAFE_INTEGER);
 	finite = number$1().finite().nonnegative();
@@ -182406,6 +183160,7 @@ var init_resume_snapshot = __esmMin((() => {
 			verificationScope: _enum(GOAL_VERIFICATION_SCOPES).optional()
 		}),
 		record$1("goal.update", {
+			objective: text.min(1).max(4e3).regex(/\S/).optional(),
 			status: _enum([
 				"active",
 				"paused",
@@ -182457,7 +183212,7 @@ var init_resume_snapshot = __esmMin((() => {
 	}).passthrough();
 	origin = union([
 		originCase("user"),
-		originCase("compaction_summary"),
+		originCase("compaction_summary", { toolContinuity: custom$1(isToolContinuity).optional() }),
 		originCase("skill_activation", {
 			activationId: text,
 			skillName: text,
@@ -182694,6 +183449,7 @@ async function writeResumeCheckpoint(wirePath, position, snapshot) {
 	if (Buffer.byteLength(bytes) > MAX_CHECKPOINT_BYTES) return false;
 	const target = resumeCheckpointPath(wirePath);
 	const temporary = `${target}.tmp-${process.pid}-${randomBytes(8).toString("hex")}`;
+	let renamed = false;
 	try {
 		const output = await open(temporary, "wx", 384);
 		try {
@@ -182703,10 +183459,11 @@ async function writeResumeCheckpoint(wirePath, position, snapshot) {
 			await output.close();
 		}
 		await rename(temporary, target);
+		renamed = true;
 		await syncDir(dirname$3(target));
 		return true;
 	} finally {
-		await rm(temporary, { force: true }).catch(() => {});
+		if (!renamed) await rm(temporary, { force: true }).catch(() => {});
 	}
 }
 var MAX_RESUME_SNAPSHOT_BYTES, MAX_CHECKPOINT_BYTES, SAMPLE_BYTES, integer, digest$1, exactInteger, samplesSchema, identitySchema, envelopeSchema$2, resumeCheckpointPath, sha256$6, milliseconds;
@@ -186120,503 +186877,6 @@ var init_todo_list = __esmMin((() => {
 	};
 }));
 //#endregion
-//#region ../../packages/agent-core/src/tools/support/file-type.ts
-function toBuffer$2(data) {
-	return Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
-}
-function startsWith(buf, prefix) {
-	const needle = Buffer.isBuffer(prefix) ? prefix : Buffer.from(prefix);
-	if (buf.length < needle.length) return false;
-	for (let i = 0; i < needle.length; i += 1) if (buf[i] !== needle[i]) return false;
-	return true;
-}
-function sniffFtypBrand(header) {
-	if (header.length < 12) return null;
-	if (header.subarray(4, 8).toString("latin1") !== "ftyp") return null;
-	return header.subarray(8, 12).toString("latin1").toLowerCase().replaceAll(/[\s\u0000]+$/g, "").trim();
-}
-function sniffMediaFromMagic(data) {
-	const buf = toBuffer$2(data);
-	const header = buf.length > 512 ? buf.subarray(0, 512) : buf;
-	if (startsWith(header, [
-		137,
-		80,
-		78,
-		71,
-		13,
-		10,
-		26,
-		10
-	])) return {
-		kind: "image",
-		mimeType: "image/png"
-	};
-	if (startsWith(header, [
-		255,
-		216,
-		255
-	])) return {
-		kind: "image",
-		mimeType: "image/jpeg"
-	};
-	if (startsWith(header, Buffer.from("GIF87a")) || startsWith(header, Buffer.from("GIF89a"))) return {
-		kind: "image",
-		mimeType: "image/gif"
-	};
-	if (startsWith(header, Buffer.from("BM"))) return {
-		kind: "image",
-		mimeType: "image/bmp"
-	};
-	if (startsWith(header, [
-		73,
-		73,
-		42,
-		0
-	]) || startsWith(header, [
-		77,
-		77,
-		0,
-		42
-	])) return {
-		kind: "image",
-		mimeType: "image/tiff"
-	};
-	if (startsWith(header, [
-		0,
-		0,
-		1,
-		0
-	])) return {
-		kind: "image",
-		mimeType: "image/x-icon"
-	};
-	if (startsWith(header, Buffer.from("RIFF")) && header.length >= 12) {
-		const chunk = header.subarray(8, 12).toString("latin1");
-		if (chunk === "WEBP") return {
-			kind: "image",
-			mimeType: "image/webp"
-		};
-		if (chunk === "AVI ") return {
-			kind: "video",
-			mimeType: "video/x-msvideo"
-		};
-	}
-	if (startsWith(header, Buffer.from("FLV"))) return {
-		kind: "video",
-		mimeType: "video/x-flv"
-	};
-	if (startsWith(header, ASF_HEADER)) return {
-		kind: "video",
-		mimeType: "video/x-ms-wmv"
-	};
-	if (startsWith(header, [
-		26,
-		69,
-		223,
-		163
-	])) {
-		const lowered = header.toString("latin1").toLowerCase();
-		if (lowered.includes("webm")) return {
-			kind: "video",
-			mimeType: "video/webm"
-		};
-		if (lowered.includes("matroska")) return {
-			kind: "video",
-			mimeType: "video/x-matroska"
-		};
-	}
-	const brand = sniffFtypBrand(header);
-	if (brand !== null && brand !== "") {
-		if (brand in FTYP_IMAGE_BRANDS) return {
-			kind: "image",
-			mimeType: FTYP_IMAGE_BRANDS[brand]
-		};
-		if (brand in FTYP_VIDEO_BRANDS) return {
-			kind: "video",
-			mimeType: FTYP_VIDEO_BRANDS[brand]
-		};
-	}
-	return null;
-}
-/**
-* Best-effort pixel-dimension reader for common raster formats.
-*
-* Inspects only the fixed region near the start of the file where each
-* format records its dimensions (the IHDR/DIB header, the RIFF chunk
-* after the `WEBP` tag, or the first JPEG SOFn segment). Returns `null`
-* for formats whose dimensions are not locatable from that region, or
-* when the supplied buffer is too short to cover it.
-*/
-function sniffImageDimensions(data) {
-	const buf = toBuffer$2(data);
-	if (startsWith(buf, [
-		137,
-		80,
-		78,
-		71,
-		13,
-		10,
-		26,
-		10
-	]) && buf.length >= 24) return {
-		width: buf.readUInt32BE(16),
-		height: buf.readUInt32BE(20)
-	};
-	if ((startsWith(buf, Buffer.from("GIF87a")) || startsWith(buf, Buffer.from("GIF89a"))) && buf.length >= 10) return {
-		width: buf.readUInt16LE(6),
-		height: buf.readUInt16LE(8)
-	};
-	if (startsWith(buf, Buffer.from("BM")) && buf.length >= 26) return {
-		width: buf.readInt32LE(18),
-		height: Math.abs(buf.readInt32LE(22))
-	};
-	if (startsWith(buf, Buffer.from("RIFF")) && buf.length >= 30) {
-		const fourCc = buf.subarray(12, 16).toString("latin1");
-		if (fourCc === "VP8 ") return {
-			width: buf.readUInt16LE(26) & 16383,
-			height: buf.readUInt16LE(28) & 16383
-		};
-		if (fourCc === "VP8L" && buf.length >= 25) {
-			const bits = buf.readUInt32LE(21);
-			return {
-				width: (bits & 16383) + 1,
-				height: (bits >> 14 & 16383) + 1
-			};
-		}
-		if (fourCc === "VP8X") return {
-			width: 1 + (buf[24] | buf[25] << 8 | buf[26] << 16),
-			height: 1 + (buf[27] | buf[28] << 8 | buf[29] << 16)
-		};
-	}
-	if (startsWith(buf, [255, 216])) {
-		let offset = 2;
-		while (offset + 9 < buf.length) {
-			if (buf[offset] !== 255) {
-				offset += 1;
-				continue;
-			}
-			const marker = buf[offset + 1];
-			if (marker >= 192 && marker <= 207 && marker !== 196 && marker !== 200 && marker !== 204) return {
-				height: buf.readUInt16BE(offset + 5),
-				width: buf.readUInt16BE(offset + 7)
-			};
-			if (marker === 216 || marker === 217 || marker >= 208 && marker <= 215) {
-				offset += 2;
-				continue;
-			}
-			const segmentLength = buf.readUInt16BE(offset + 2);
-			if (segmentLength < 2) break;
-			offset += 2 + segmentLength;
-		}
-	}
-	return null;
-}
-function getSuffix(path) {
-	const idx = path.lastIndexOf(".");
-	if (idx === -1) return "";
-	if (idx <= Math.max(path.lastIndexOf("/"), path.lastIndexOf("\\")) + 1) return "";
-	return path.slice(idx).toLowerCase();
-}
-function detectFileType(path, header, type = "text") {
-	const suffix = getSuffix(path);
-	let mediaHint = null;
-	if (suffix in TEXT_MIME_BY_SUFFIX) mediaHint = {
-		kind: "text",
-		mimeType: TEXT_MIME_BY_SUFFIX[suffix]
-	};
-	else if (suffix in IMAGE_MIME_BY_SUFFIX) mediaHint = {
-		kind: "image",
-		mimeType: IMAGE_MIME_BY_SUFFIX[suffix]
-	};
-	else if (suffix in VIDEO_MIME_BY_SUFFIX$1) mediaHint = {
-		kind: "video",
-		mimeType: VIDEO_MIME_BY_SUFFIX$1[suffix]
-	};
-	if (header !== void 0) {
-		const buf = toBuffer$2(header);
-		const sniffed = sniffMediaFromMagic(buf);
-		if (sniffed) {
-			if (type === "media") return sniffed;
-			if (mediaHint) {
-				if (sniffed.kind !== mediaHint.kind) return {
-					kind: "unknown",
-					mimeType: ""
-				};
-				return mediaHint;
-			}
-			return sniffed;
-		}
-		if (mediaHint?.kind === "image") return {
-			kind: "unknown",
-			mimeType: ""
-		};
-		if (type === "media" && mediaHint?.kind === "video") return mediaHint;
-		if (buf.includes(0)) return {
-			kind: "unknown",
-			mimeType: ""
-		};
-	}
-	if (mediaHint) return mediaHint;
-	if (NON_TEXT_SUFFIXES.has(suffix)) return {
-		kind: "unknown",
-		mimeType: ""
-	};
-	return {
-		kind: "text",
-		mimeType: "text/plain"
-	};
-}
-var IMAGE_MIME_BY_SUFFIX, VIDEO_MIME_BY_SUFFIX$1, TEXT_MIME_BY_SUFFIX, NON_TEXT_SUFFIXES, ASF_HEADER, FTYP_IMAGE_BRANDS, FTYP_VIDEO_BRANDS;
-var init_file_type$1 = __esmMin((() => {
-	IMAGE_MIME_BY_SUFFIX = Object.freeze({
-		".png": "image/png",
-		".jpg": "image/jpeg",
-		".jpeg": "image/jpeg",
-		".gif": "image/gif",
-		".bmp": "image/bmp",
-		".tif": "image/tiff",
-		".tiff": "image/tiff",
-		".webp": "image/webp",
-		".ico": "image/x-icon",
-		".heic": "image/heic",
-		".heif": "image/heif",
-		".avif": "image/avif",
-		".svgz": "image/svg+xml"
-	});
-	VIDEO_MIME_BY_SUFFIX$1 = Object.freeze({
-		".mp4": "video/mp4",
-		".mpg": "video/mpeg",
-		".mpeg": "video/mpeg",
-		".mkv": "video/x-matroska",
-		".avi": "video/x-msvideo",
-		".mov": "video/quicktime",
-		".ogv": "video/ogg",
-		".wmv": "video/x-ms-wmv",
-		".webm": "video/webm",
-		".m4v": "video/x-m4v",
-		".flv": "video/x-flv",
-		".3gp": "video/3gpp",
-		".3g2": "video/3gpp2"
-	});
-	TEXT_MIME_BY_SUFFIX = Object.freeze({ ".svg": "image/svg+xml" });
-	NON_TEXT_SUFFIXES = new Set([
-		".icns",
-		".psd",
-		".ai",
-		".eps",
-		".pdf",
-		".doc",
-		".docx",
-		".dot",
-		".dotx",
-		".rtf",
-		".odt",
-		".xls",
-		".xlsx",
-		".xlsm",
-		".xlt",
-		".xltx",
-		".xltm",
-		".ods",
-		".ppt",
-		".pptx",
-		".pptm",
-		".pps",
-		".ppsx",
-		".odp",
-		".pages",
-		".numbers",
-		".key",
-		".zip",
-		".rar",
-		".7z",
-		".tar",
-		".gz",
-		".tgz",
-		".bz2",
-		".xz",
-		".zst",
-		".lz",
-		".lz4",
-		".br",
-		".cab",
-		".ar",
-		".deb",
-		".rpm",
-		".mp3",
-		".wav",
-		".flac",
-		".ogg",
-		".oga",
-		".opus",
-		".aac",
-		".m4a",
-		".wma",
-		".ttf",
-		".otf",
-		".woff",
-		".woff2",
-		".exe",
-		".dll",
-		".so",
-		".dylib",
-		".bin",
-		".apk",
-		".ipa",
-		".jar",
-		".class",
-		".pyc",
-		".pyo",
-		".wasm",
-		".dmg",
-		".iso",
-		".img",
-		".sqlite",
-		".sqlite3",
-		".db",
-		".db3"
-	]);
-	ASF_HEADER = Buffer.from([
-		48,
-		38,
-		178,
-		117,
-		142,
-		102,
-		207,
-		17,
-		166,
-		217,
-		0,
-		170,
-		0,
-		98,
-		206,
-		108
-	]);
-	FTYP_IMAGE_BRANDS = Object.freeze({
-		avif: "image/avif",
-		avis: "image/avif",
-		heic: "image/heic",
-		heif: "image/heif",
-		heix: "image/heif",
-		hevc: "image/heic",
-		mif1: "image/heif",
-		msf1: "image/heif"
-	});
-	FTYP_VIDEO_BRANDS = Object.freeze({
-		isom: "video/mp4",
-		iso2: "video/mp4",
-		iso5: "video/mp4",
-		mp41: "video/mp4",
-		mp42: "video/mp4",
-		avc1: "video/mp4",
-		mp4v: "video/mp4",
-		m4v: "video/x-m4v",
-		qt: "video/quicktime",
-		"3gp4": "video/3gpp",
-		"3gp5": "video/3gpp",
-		"3gp6": "video/3gpp",
-		"3gp7": "video/3gpp",
-		"3g2": "video/3gpp2"
-	});
-}));
-//#endregion
-//#region ../../packages/agent-core/src/utils/tokens.ts
-/** Open assistant messages grow while streaming; completed history stays cached. */
-function invalidateMessageTokenEstimate(message) {
-	messageTokenEstimateCache.delete(message);
-}
-/**
-* Estimate token count from text using a character-based heuristic.
-*   - ASCII (~4 chars per token)
-*   - CJK and other non-ASCII (~1 char per token)
-* The estimate is transient — the next LLM call returns the real count
-* and supersedes this value. Used to keep `tokenCountWithPending`
-* monotonic between LLM round-trips without paying for a tokenizer.
-*/
-function estimateTokens(text) {
-	let asciiCount = 0;
-	let nonAsciiCount = 0;
-	for (const char of text) if (char.codePointAt(0) <= 127) asciiCount++;
-	else nonAsciiCount++;
-	return Math.ceil(asciiCount / 4) + nonAsciiCount;
-}
-function estimateTokensForMessages(messages) {
-	let total = 0;
-	for (const message of messages) total += estimateTokensForMessage(message);
-	return total;
-}
-function estimateTokensForTools(tools) {
-	let total = 0;
-	for (const tool of tools) {
-		total += estimateTokens(tool.name);
-		total += estimateTokens(tool.description);
-		total += estimateTokens(JSON.stringify(tool.parameters));
-	}
-	return total;
-}
-function estimateTokensForMessage(message) {
-	const cached = messageTokenEstimateCache.get(message);
-	if (cached !== void 0) return cached;
-	let total = estimateTokens(message.role);
-	total += estimateTokensForContentParts(message.content);
-	if (message.toolCalls !== void 0) for (const call of message.toolCalls) {
-		total += estimateTokens(call.name);
-		total += estimateTokens(JSON.stringify(call.arguments));
-	}
-	messageTokenEstimateCache.set(message, total);
-	return total;
-}
-function estimateTokensForContentParts(parts) {
-	let total = 0;
-	for (const part of parts) total += estimateTokensForContentPart(part);
-	return total;
-}
-function imageDimensionsFromDataUrl(url) {
-	const commaIndex = url.indexOf(",");
-	if (commaIndex <= 0) return null;
-	const metadata = url.slice(0, commaIndex).toLowerCase();
-	if (!metadata.startsWith("data:image/") || !metadata.split(";").includes("base64")) return null;
-	const maxBase64Chars = Math.ceil(MAX_IMAGE_HEADER_BYTES / 3) * 4;
-	const encodedHeader = url.slice(commaIndex + 1, commaIndex + 1 + maxBase64Chars);
-	if (encodedHeader.length === 0) return null;
-	try {
-		const dimensions = sniffImageDimensions(Buffer.from(encodedHeader, "base64"));
-		if (dimensions === null || !Number.isSafeInteger(dimensions.width) || !Number.isSafeInteger(dimensions.height) || dimensions.width <= 0 || dimensions.height <= 0) return null;
-		return dimensions;
-	} catch {
-		return null;
-	}
-}
-function estimateImageTokensFromDimensions(width, height) {
-	if (!Number.isSafeInteger(width) || !Number.isSafeInteger(height) || width <= 0 || height <= 0) return MEDIA_TOKEN_ESTIMATE;
-	const patchSize = BigInt(32);
-	const tokens = (BigInt(width) + patchSize - 1n) / patchSize * ((BigInt(height) + patchSize - 1n) / patchSize);
-	return tokens > BigInt(Number.MAX_SAFE_INTEGER) ? Number.MAX_SAFE_INTEGER : Number(tokens);
-}
-function estimateImageTokens(url) {
-	const dimensions = imageDimensionsFromDataUrl(url);
-	return dimensions === null ? MEDIA_TOKEN_ESTIMATE : estimateImageTokensFromDimensions(dimensions.width, dimensions.height);
-}
-function estimateTokensForContentPart(part) {
-	switch (part.type) {
-		case "text": return estimateTokens(part.text);
-		case "think": return estimateTokens(part.think);
-		case "image_url": return estimateImageTokens(part.imageUrl.url);
-		case "audio_url":
-		case "video_url": return MEDIA_TOKEN_ESTIMATE;
-		default: return 0;
-	}
-}
-var messageTokenEstimateCache, MEDIA_TOKEN_ESTIMATE, MAX_IMAGE_HEADER_BYTES;
-var init_tokens = __esmMin((() => {
-	init_file_type$1();
-	messageTokenEstimateCache = /* @__PURE__ */ new WeakMap();
-	MEDIA_TOKEN_ESTIMATE = 2e3;
-	MAX_IMAGE_HEADER_BYTES = 1024 * 1024;
-}));
-//#endregion
 //#region ../../node_modules/.pnpm/bmp-ts@1.0.9/node_modules/bmp-ts/dist/esm/header-types.js
 var HeaderTypes, header_types_default;
 var init_header_types = __esmMin((() => {
@@ -192061,7 +192321,7 @@ var require_gifframe = /* @__PURE__ */ __commonJSMin(((exports) => {
 //#region ../../node_modules/.pnpm/gifwrap@0.10.1/node_modules/gifwrap/src/gifutil.js
 var require_gifutil = /* @__PURE__ */ __commonJSMin(((exports) => {
 	/** @namespace GifUtil */
-	const fs$13 = __require("fs");
+	const fs$12 = __require("fs");
 	const ImageQ = require_image_q();
 	const BitmapImage = require_bitmapimage();
 	const { GifFrame } = require_gifframe();
@@ -192328,7 +192588,7 @@ var require_gifutil = /* @__PURE__ */ __commonJSMin(((exports) => {
 	}
 	function _readBinary(path) {
 		return new Promise((resolve, reject) => {
-			fs$13.readFile(path, (err, buffer) => {
+			fs$12.readFile(path, (err, buffer) => {
 				if (err) return reject(err);
 				return resolve(buffer);
 			});
@@ -192336,7 +192596,7 @@ var require_gifutil = /* @__PURE__ */ __commonJSMin(((exports) => {
 	}
 	function _writeBinary(path, buffer) {
 		return new Promise((resolve, reject) => {
-			fs$13.writeFile(path, buffer, (err) => {
+			fs$12.writeFile(path, buffer, (err) => {
 				if (err) return reject(err);
 				return resolve();
 			});
@@ -218154,7 +218414,7 @@ var init_file_type = __esmMin((() => {
 		}
 		async fromFile(path) {
 			this.options.signal?.throwIfAborted();
-			const fileHandle = await fs.open(path, constants.O_RDONLY | constants.O_NONBLOCK);
+			const fileHandle = await ro.open(path, constants.O_RDONLY | constants.O_NONBLOCK);
 			const fileStat = await fileHandle.stat();
 			if (!fileStat.isFile()) {
 				await fileHandle.close();
@@ -228659,7 +228919,7 @@ async function processBitmapFont(file, font) {
 		...font,
 		chars,
 		kernings,
-		pages: await Promise.all(font.pages.map(async (page) => CharacterJimp.read(path$1.join(path$1.dirname(file), page))))
+		pages: await Promise.all(font.pages.map(async (page) => CharacterJimp.read(js.join(js.dirname(file), page))))
 	};
 }
 var import_parse_bmfont_ascii, import_lib$1, import_parse_bmfont_binary, convertXML, isWebWorker, CharacterJimp, HEADER;
@@ -230997,7 +231257,7 @@ var init_full = __esmMin((() => {
 	MAX_SESSION_COMPACTION_FAILURES = 2;
 	DEFAULT_COMPACTION_MAX_COMPLETION_TOKENS = 128 * 1024;
 	COMPACTION_SUMMARY_RESERVE_RATIO = .1;
-	BLUN_COMPACTION_REQUEST_BUDGET_BYTES = 75e4;
+	BLUN_COMPACTION_REQUEST_BUDGET_BYTES = 48e4;
 	MAX_HIERARCHICAL_COMPACTION_PASSES = 64;
 	HIERARCHICAL_COMPACTION_PREFIX = "This is a complete summary of an earlier chronological segment. Preserve it as source material when merging it with the following conversation:";
 	CompactionTruncatedError = class extends Error {
@@ -231153,26 +231413,10 @@ var init_full = __esmMin((() => {
 			const model = this.agent.activeResponderModel ?? this.agent.config.modelAlias;
 			if (model === void 0 || this.agent.config.runtimeModel(model).provider.name !== "blun") return void 0;
 			const systemPrompt = context.systemPrompt ?? this.agent.effectiveSystemPrompt;
-			const tools = (context.tools ?? this.agent.tools.loopTools).map((tool) => ({
-				name: tool.name,
-				description: tool.description,
-				parameters: tool.parameters
-			}));
-			let extraBytes;
-			try {
-				extraBytes = estimateBlunRequestExtraBytes(tools, messages);
-			} catch {
-				return;
-			}
-			if (Buffer.byteLength(JSON.stringify({
-				systemPrompt,
-				messages: []
-			}), "utf8") >= BLUN_COMPACTION_REQUEST_BUDGET_BYTES) return void 0;
+			const tools = context.tools ?? this.agent.tools.loopTools;
+			if (estimateBlunSerializedBodyBytes(systemPrompt, [], []) + 4096 >= BLUN_COMPACTION_REQUEST_BUDGET_BYTES) return void 0;
 			return {
-				usedRequestBytesEstimate: Buffer.byteLength(JSON.stringify({
-					systemPrompt,
-					messages
-				}), "utf8") + extraBytes.toolsBytes + extraBytes.visionBytes,
+				usedRequestBytesEstimate: estimateBlunSerializedBodyBytes(systemPrompt, tools, messages) + 4096,
 				thresholdRequestBytes: BLUN_COMPACTION_REQUEST_BUDGET_BYTES
 			};
 		}
@@ -231527,10 +231771,7 @@ var init_full = __esmMin((() => {
 						dropOrphanResults: true
 					}), createUserMessage(requestInstruction)], capability));
 				};
-				const estimateRequestBytes = (messages) => Buffer.byteLength(JSON.stringify({
-					systemPrompt: this.agent.effectiveSystemPrompt,
-					messages
-				}), "utf8");
+				const estimateRequestBytes = (messages) => estimateBlunSerializedBodyBytes(this.agent.effectiveSystemPrompt, compactionTools, messages) + 4096;
 				while (true) {
 					signal.throwIfAborted();
 					if (hierarchicalPassCount >= MAX_HIERARCHICAL_COMPACTION_PASSES) throw new BlunError(ErrorCodes.COMPACTION_FAILED, `Compaction stopped after ${String(MAX_HIERARCHICAL_COMPACTION_PASSES)} staged requests without reaching a final summary. The conversation history was not changed.`, { details: {
@@ -235027,8 +235268,9 @@ function makeSyntheticToolResult(toolCallId) {
 }
 function mergeAdjacentUserMessages(history, onAnomaly) {
 	const out = [];
-	for (const source of history) {
-		const message = prepareMessageForProjection(source, onAnomaly);
+	const latestUserIndex = history.findLastIndex((message) => message.role === "user" && message.partial !== true && (message.origin === void 0 || message.origin.kind === "user"));
+	for (const [index, source] of history.entries()) {
+		const message = prepareMessageForProjection(source, onAnomaly, index < latestUserIndex);
 		if (message === null) continue;
 		const previous = out.at(-1);
 		if (canMergeUserMessage(message) && previous !== void 0 && canMergeUserMessage(previous)) {
@@ -235039,7 +235281,7 @@ function mergeAdjacentUserMessages(history, onAnomaly) {
 	}
 	return out.map(stripContextMetadata);
 }
-function prepareMessageForProjection(message, onAnomaly) {
+function prepareMessageForProjection(message, onAnomaly, historical = false) {
 	if (message.partial === true) return null;
 	let content;
 	for (const [index, part] of message.content.entries()) {
@@ -235051,6 +235293,19 @@ function prepareMessageForProjection(message, onAnomaly) {
 			});
 			continue;
 		}
+		if (historical && message.role === "user" && part.type === "text") {
+			const text = withoutHistoricalTelegramGroupReminder(part.text);
+			if (text !== part.text) {
+				content ??= message.content.slice(0, index);
+				const shortened = {
+					...part,
+					text
+				};
+				copyRequestTextOrigin(part, shortened, message.origin);
+				content.push(shortened);
+				continue;
+			}
+		}
 		content?.push(part);
 	}
 	const next = content === void 0 ? message : {
@@ -235060,6 +235315,14 @@ function prepareMessageForProjection(message, onAnomaly) {
 	if (next.role === "tool" && next.content.length === 0) throw new BlunError(ErrorCodes.REQUEST_INVALID, "Tool result message content cannot be empty after removing empty text blocks.", { details: { toolCallId: next.toolCallId } });
 	return next.content.length === 0 && next.toolCalls.length === 0 ? null : next;
 }
+function withoutHistoricalTelegramGroupReminder(text) {
+	if (!text.startsWith("<channel source=\"telegram\"") && !text.startsWith("You are connected to a Telegram channel.")) return text;
+	const start = text.lastIndexOf(`</channel>\n[GRUPPENANTWORT:`);
+	if (start < 0) return text;
+	const reminder = text.slice(start + 10 + 1);
+	if (!/^\[GRUPPENANTWORT:[^\r\n]*\]$/.test(reminder)) return text;
+	return text.slice(0, start + 10);
+}
 function canMergeUserMessage(message) {
 	return message.role === "user" && message.origin?.kind === "user";
 }
@@ -235191,6 +235454,7 @@ var init_context$2 = __esmMin((() => {
 	init_tokens();
 	init_xml_escape();
 	init_compaction();
+	init_tool_continuity();
 	init_projector();
 	init_types$6();
 	init_types$6();
@@ -235201,6 +235465,8 @@ var init_context$2 = __esmMin((() => {
 	TOOL_INTERRUPTED_ON_RESUME_OUTPUT$2 = "Tool execution was interrupted before its result was recorded. Do not assume the tool completed successfully.";
 	ContextMemory = class {
 		agent;
+		mutationGeneration = randomUUID();
+		mutationRevision = 0;
 		_history = [];
 		_tokenCount = 0;
 		tokenCountCoveredMessageCount = 0;
@@ -235212,6 +235478,15 @@ var init_context$2 = __esmMin((() => {
 		constructor(agent) {
 			this.agent = agent;
 		}
+		publishMutation(reason) {
+			if (this.agent.records.restoring) return;
+			this.agent.emitEvent({
+				type: "context.changed",
+				generation: this.mutationGeneration,
+				revision: ++this.mutationRevision,
+				reason
+			});
+		}
 		get lastAssistantAt() {
 			return this._lastAssistantAt;
 		}
@@ -235365,6 +235640,7 @@ var init_context$2 = __esmMin((() => {
 			return removedMessages.size;
 		}
 		clear() {
+			const changed = this._history.length > 0;
 			this.agent.records.logRecord({ type: "context.clear" });
 			this._history = [];
 			this._tokenCount = 0;
@@ -235376,6 +235652,7 @@ var init_context$2 = __esmMin((() => {
 			this.agent.microCompaction.reset();
 			this.agent.injection.onContextClear();
 			this.agent.emitStatusUpdated();
+			if (changed) this.publishMutation("clear");
 		}
 		undo(count) {
 			if (count <= 0) return;
@@ -235413,6 +235690,7 @@ var init_context$2 = __esmMin((() => {
 			this.deferredMessages = [];
 			this.agent.microCompaction.reset(this._history.length);
 			this.agent.emitStatusUpdated();
+			if (removedMessages.size > 0) this.publishMutation("undo");
 			if (!this.agent.records.restoring && (stoppedAtBoundary || removedUserCount < count)) throw new BlunError(ErrorCodes.REQUEST_INVALID, formatUndoUnavailableMessage(count, removedUserCount, stoppedAtBoundary), { details: {
 				reason: "undo_limit",
 				requestedCount: count,
@@ -235421,6 +235699,7 @@ var init_context$2 = __esmMin((() => {
 			} });
 		}
 		applyCompaction(input, options = {}) {
+			if (this.agent.records.restoring !== null && input.toolContinuity !== void 0 && !isToolContinuity(input.toolContinuity)) throw new Error("Invalid compaction tool continuity");
 			let preservedToolTailCount = input.preservedToolTailCount;
 			if (this.agent.records.restoring === null && this.hasOpenToolExchange()) {
 				const start = this._history.findIndex((message) => message.role === "assistant" && message.toolCalls.some((call) => this.pendingToolResultIds.has(call.id)));
@@ -235457,25 +235736,75 @@ var init_context$2 = __esmMin((() => {
 				elisionMessage,
 				...selection.tail
 			];
-			const contextSummary = input.contextSummary ?? input.summary;
-			const summaryMessage = {
+			let contextSummary = input.contextSummary ?? input.summary;
+			let toolContinuity = this.agent.records.restoring === null ? void 0 : input.toolContinuity;
+			let summaryMessage = {
 				role: "user",
 				content: [{
 					type: "text",
 					text: contextSummary
 				}],
 				toolCalls: [],
-				origin: { kind: "compaction_summary" }
+				origin: {
+					kind: "compaction_summary",
+					...toolContinuity === void 0 ? {} : { toolContinuity }
+				}
 			};
-			const replacement = [
+			let replacement = [
 				...keptMessages,
 				summaryMessage,
 				...preservedToolTail
 			];
+			const previousHistoryTokens = options.requireReduction && this.agent.records.restoring === null ? estimateTokensForMessages(project(this.agent.microCompaction.compact(this._history), { dropOrphanResults: true })) : void 0;
+			if (this.agent.records.restoring === null) {
+				toolContinuity = void 0;
+				const observations = collectToolContinuity(this._history.slice(0, tailStart));
+				if (observations !== void 0) {
+					const baseProjected = project(replacement, { dropOrphanResults: true });
+					const baseTokens = estimateTokensForMessages(baseProjected);
+					let extraTokens = previousHistoryTokens === void 0 ? Number.POSITIVE_INFINITY : Math.max(0, previousHistoryTokens - baseTokens - 1);
+					if (this.agent.config.hasProvider) {
+						const window = this.agent.fullCompaction.getEffectiveMaxContextTokens();
+						const budget = this.agent.fullCompaction.getCompactionBudgetTokens();
+						const requestLimit = Math.min(window > 0 ? window - 1 : Number.POSITIVE_INFINITY, budget ?? Number.POSITIVE_INFINITY);
+						extraTokens = Math.min(extraTokens, Math.max(0, requestLimit - this.agent.fullCompaction.estimateProjectedRequestTokens({ messages: baseProjected }) - 1));
+					}
+					let fitted = fitToolContinuity(observations, extraTokens);
+					while (fitted !== void 0) {
+						const candidateSummary = {
+							...summaryMessage,
+							content: [{
+								type: "text",
+								text: contextSummary + fitted.text
+							}],
+							origin: {
+								kind: "compaction_summary",
+								toolContinuity: fitted.continuity
+							}
+						};
+						const candidate = [
+							...keptMessages,
+							candidateSummary,
+							...preservedToolTail
+						];
+						const projected = project(candidate, { dropOrphanResults: true });
+						const status = this.agent.fullCompaction.proactiveCompactionStatus({ messages: projected });
+						const reducing = previousHistoryTokens === void 0 || estimateTokensForMessages(projected) < previousHistoryTokens;
+						const bytesFit = (status.usedHistoryBytes === void 0 || status.thresholdHistoryBytes === void 0 || status.usedHistoryBytes < status.thresholdHistoryBytes) && (status.usedRequestBytesEstimate === void 0 || status.thresholdRequestBytes === void 0 || status.usedRequestBytesEstimate < status.thresholdRequestBytes);
+						if (reducing && bytesFit) {
+							toolContinuity = fitted.continuity;
+							contextSummary += fitted.text;
+							summaryMessage = candidateSummary;
+							replacement = candidate;
+							break;
+						}
+						fitted = fitToolContinuity(observations, estimateTokens(fitted.text) - 1);
+					}
+				}
+			}
 			if (options.requireReduction && this.agent.records.restoring === null) {
-				const previousHistoryTokens = estimateTokensForMessages(project(this.agent.microCompaction.compact(this._history), { dropOrphanResults: true }));
 				const nextHistoryTokens = estimateTokensForMessages(project(replacement, { dropOrphanResults: true }));
-				if (nextHistoryTokens >= previousHistoryTokens) throw new BlunError(ErrorCodes.COMPACTION_FAILED, "Automatic compaction did not reduce the history. The conversation history was not changed.", { details: {
+				if (previousHistoryTokens !== void 0 && nextHistoryTokens >= previousHistoryTokens) throw new BlunError(ErrorCodes.COMPACTION_FAILED, "Automatic compaction did not reduce the history. The conversation history was not changed.", { details: {
 					reason: "non_reducing_summary",
 					contextUnchanged: true,
 					previousHistoryTokens,
@@ -235488,6 +235817,7 @@ var init_context$2 = __esmMin((() => {
 			const result = {
 				summary: input.summary,
 				contextSummary,
+				...toolContinuity === void 0 ? {} : { toolContinuity },
 				compactedCount: input.compactedCount,
 				tokensBefore: input.tokensBefore,
 				tokensAfter,
@@ -235504,6 +235834,7 @@ var init_context$2 = __esmMin((() => {
 			this.agent.replayBuilder.patchLast("compaction", { result: {
 				summary: result.summary,
 				contextSummary: result.contextSummary,
+				...result.toolContinuity === void 0 ? {} : { toolContinuity: result.toolContinuity },
 				compactedCount: result.compactedCount,
 				tokensBefore: result.tokensBefore,
 				tokensAfter: result.tokensAfter,
@@ -237058,20 +237389,75 @@ function fingerprintTitle(title) {
 	return createHash("sha256").update(title.trim().toLowerCase()).digest("hex");
 }
 async function loadRegister(mistakeDir = defaultMistakeDir()) {
+	const target = join(mistakeDir, REGISTER_FILENAME);
 	try {
 		await mkdir(mistakeDir, { recursive: true });
-		const content = await readFile(join(mistakeDir, REGISTER_FILENAME), "utf-8");
-		return JSON.parse(content);
-	} catch {
-		return {
+		const before = await lstat(target).catch((error) => {
+			if (error.code === "ENOENT") return void 0;
+			throw error;
+		});
+		if (before === void 0) return {
 			version: 1,
 			entries: []
 		};
+		if (!before.isFile() || before.isSymbolicLink()) throw new Error("Mistake register must be a regular file.");
+		const handle = await open(target, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0));
+		let content;
+		try {
+			const opened = await handle.stat();
+			if (!opened.isFile() || opened.dev !== before.dev || opened.ino !== before.ino) throw new Error("Mistake register changed while opening.");
+			content = await handle.readFile("utf8");
+		} finally {
+			await handle.close();
+		}
+		let parsed;
+		try {
+			parsed = JSON.parse(content);
+		} catch {
+			throw new Error("Mistake register has invalid JSON.");
+		}
+		assertRegister(parsed);
+		return parsed;
+	} catch (error) {
+		throw registerError(error, "read");
 	}
 }
 async function saveRegister(register, mistakeDir = defaultMistakeDir()) {
-	await mkdir(mistakeDir, { recursive: true });
-	await writeFile(join(mistakeDir, REGISTER_FILENAME), JSON.stringify(register, null, 2), "utf-8");
+	assertRegister(register);
+	const target = join(mistakeDir, REGISTER_FILENAME);
+	const temporary = `${target}.tmp.${process.pid}.${randomUUID()}`;
+	let created = false;
+	try {
+		await loadRegister(mistakeDir);
+		const handle = await open(temporary, "wx", 384);
+		created = true;
+		try {
+			await handle.writeFile(JSON.stringify(register, null, 2), "utf8");
+			await handle.sync();
+		} finally {
+			await handle.close();
+		}
+		await rename(temporary, target);
+	} catch (error) {
+		throw registerError(error, "write");
+	} finally {
+		if (created) await unlink(temporary).catch(() => {});
+	}
+}
+function assertRegister(value) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) throw new Error("Mistake register has an invalid v1 schema.");
+	const register = value;
+	if (register["version"] !== 1 || !Array.isArray(register["entries"]) || !register["entries"].every((entry) => {
+		if (typeof entry !== "object" || entry === null || Array.isArray(entry)) return false;
+		const fields = entry;
+		return typeof fields["entryIndex"] === "number" && Number.isSafeInteger(fields["entryIndex"]) && fields["entryIndex"] >= 0 && typeof fields["titleFingerprint"] === "string" && fields["titleFingerprint"].trim().length > 0 && typeof fields["title"] === "string" && fields["title"].trim().length > 0 && typeof fields["count"] === "number" && Number.isSafeInteger(fields["count"]) && fields["count"] >= 0 && typeof fields["lastHitAt"] === "string" && fields["lastHitAt"].trim().length > 0 && (fields["origin"] === "program" || fields["origin"] === "hand");
+	})) throw new Error("Mistake register has an invalid v1 schema.");
+}
+function registerError(error, operation) {
+	if (error instanceof Error && error.message.startsWith("Mistake register ")) return error;
+	const code = typeof error === "object" && error !== null ? error.code : void 0;
+	const suffix = typeof code === "string" && /^[A-Z0-9_]+$/u.test(code) ? ` (${code})` : "";
+	return /* @__PURE__ */ new Error(`Mistake register ${operation} failed${suffix}.`);
 }
 /**
 * Findet einen Register-Eintrag anhand des Titels (Fingerabdruck).
@@ -239861,6 +240247,7 @@ var require_turn_tool_performance_policy = /* @__PURE__ */ __commonJSMin(((expor
 	const DEFERRED_TOOL_LOADER_NAME = "ToolSearch";
 	const MAX_PERSISTENT_DEFERRED_TOOLS = 12;
 	const MAX_TOOL_SEARCH_QUERY_CHARS = 1e3;
+	const MAX_TOOL_CATALOG_RESULT_BYTES = 4096;
 	const MAX_AUTO_RANKED_TOOLS = 6;
 	const deferredToolLoaders = /* @__PURE__ */ new WeakSet();
 	const TOOL_RANK_EMBEDDED_CONTENT_RE = /<(attached_documents?|attachment_content|document_content|file_content)\b[^>]*>[\s\S]*?<\/\1>/giu;
@@ -240105,6 +240492,27 @@ var require_turn_tool_performance_policy = /* @__PURE__ */ __commonJSMin(((expor
 		for (const leaf of leaves) leafCounts.set(leaf, (leafCounts.get(leaf) || 0) + 1);
 		return names.map((name, index) => leafCounts.get(leaves[index]) === 1 ? leaves[index] : name).sort((left, right) => left.localeCompare(right));
 	}
+	function boundedDeferredToolCatalog(tools, filter) {
+		const needle = filter.toLowerCase();
+		const matched = deferredToolCatalog(tools).filter((name) => name.toLowerCase().includes(needle));
+		const names = [];
+		let bytes = Buffer.byteLength(JSON.stringify({
+			names,
+			total: matched.length,
+			truncated: false
+		}));
+		for (const name of matched) {
+			const nextBytes = Buffer.byteLength(JSON.stringify(name)) + (names.length > 0 ? 1 : 0);
+			if (bytes + nextBytes > MAX_TOOL_CATALOG_RESULT_BYTES) break;
+			names.push(name);
+			bytes += nextBytes;
+		}
+		return JSON.stringify({
+			names,
+			total: matched.length,
+			truncated: names.length < matched.length
+		});
+	}
 	function normalizeDeferredToolQuery(value) {
 		const query = String(value ?? "").trim();
 		if (query.length <= MAX_TOOL_SEARCH_QUERY_CHARS) return query;
@@ -240179,14 +240587,14 @@ var require_turn_tool_performance_policy = /* @__PURE__ */ __commonJSMin(((expor
 	function rankingTokens(value) {
 		return [...new Set(String(value || "").normalize("NFKC").toLowerCase().match(/[\p{L}\p{N}]{3,}/gu) || [])].filter((token) => !TOOL_RANK_STOP_WORDS.has(token));
 	}
-	function toolRankingDocument(tool) {
+	function toolRankingDocument(tool, trustedToolNames) {
 		const name = String(tool?.name || "");
 		const leaf = name.split(/__|:/).at(-1) || name;
 		const splitToolName = (value) => String(value || "").replace(/([a-z0-9])([A-Z])/g, "$1 $2").replaceAll("_", " ");
 		const nameTokens = rankingTokens(`${splitToolName(name)} ${splitToolName(leaf)}`);
 		const descriptionTokens = rankingTokens(tool?.description);
 		const parameterText = [];
-		const properties = tool?.parameters?.properties;
+		const properties = /^mcp__/iu.test(name) && !trustedToolNames?.has(name) ? void 0 : tool?.parameters?.properties;
 		if (properties && typeof properties === "object") for (const [parameterName, definition] of Object.entries(properties)) parameterText.push(parameterName, definition?.description || "");
 		const exampleText = Array.isArray(tool?.examples) ? tool.examples.map((example) => example?.prompt || "").join(" ") : "";
 		return {
@@ -240218,7 +240626,7 @@ var require_turn_tool_performance_policy = /* @__PURE__ */ __commonJSMin(((expor
 		const queryTokens = [...new Set(rankingIntentTexts(value).flatMap(rankingTokens))];
 		if (queryTokens.length === 0) return /* @__PURE__ */ new Set();
 		const ranked = (Array.isArray(tools) ? tools : []).map((tool) => {
-			const document = toolRankingDocument(tool);
+			const document = toolRankingDocument(tool, options.trustedToolNames);
 			if (!document.name) return null;
 			let score = 0;
 			let matchedTokens = 0;
@@ -240326,8 +240734,8 @@ var require_turn_tool_performance_policy = /* @__PURE__ */ __commonJSMin(((expor
 			name: loaderName,
 			description: [
 				`Search ${deferredCount} deferred ${deferredCount === 1 ? "tool schema" : "tool schemas"} without loading all definitions.`,
-				"Use select:leaf_name for one known tool, plain keywords to search, or +word to require that word in the tool name.",
-				`Loaded tools are available in the next step; the ${MAX_PERSISTENT_DEFERRED_TOOLS} most recently selected schemas remain loaded.`
+				"Use select:leaf_name for one known tool, plain keywords to search, +word to require a name word, or catalog:fragment to list matching names.",
+				`Loaded tools are available in the next step; up to ${MAX_PERSISTENT_DEFERRED_TOOLS} recently selected schemas remain loaded when the context budget allows.`
 			].join("\n"),
 			parameters: {
 				type: "object",
@@ -240344,7 +240752,12 @@ var require_turn_tool_performance_policy = /* @__PURE__ */ __commonJSMin(((expor
 				return {
 					description: query ? `Searching tool schemas for ${query}` : "Searching tool schemas",
 					approvalRule: loaderName,
-					execute: async () => {
+					execute: async (context) => {
+						context?.signal?.throwIfAborted();
+						if (query.toLowerCase().startsWith("catalog:")) return {
+							isError: false,
+							output: boundedDeferredToolCatalog([...available.values()], query.slice(8).trim())
+						};
 						let matches = searchDeferredTools([...available.values()], query);
 						let relatedFallback = false;
 						if (matches.length === 0) {
@@ -252331,7 +252744,7 @@ var init_modelCatalog$2 = __esmMin((() => {
 function isVolatileEventType(type) {
 	return volatileEventTypeSet.has(type);
 }
-var MCP_OAUTH_AUTHORIZATION_URL_TOOL_UPDATE, tokenUsageSchema, finishReasonSchema, usageStatusSchema, permissionModeSchema, skillSourceSchema, userPromptOriginSchema, skillActivationOriginSchema, pluginCommandOriginSchema, injectionOriginSchema, shellCommandOriginSchema, compactionSummaryOriginSchema, systemTriggerOriginSchema, agentCoreBackgroundTaskStatusSchema, backgroundTaskOriginSchema, cronJobOriginSchema, cronMissedOriginSchema, hookResultOriginSchema, retryOriginSchema, promptOriginSchema, goalStatusSchema, goalActorSchema, goalBudgetReportSchema, goalSnapshotSchema, goalChangeStatsSchema, goalChangeKindSchema, goalChangeSchema, blunErrorCodeSchema, blunErrorPayloadSchema, backgroundTaskInfoBaseSchema, processBackgroundTaskInfoSchema, agentBackgroundTaskInfoSchema, questionBackgroundTaskInfoSchema, backgroundTaskInfoSchema, compactionResultSchema, toolUpdateSchema, turnEndReasonSchema, agentStatusUpdatedEventSchema, sessionMetaUpdatedEventSchema, sessionCreatedEventSchema, workspaceCreatedEventSchema, workspaceUpdatedEventSchema, workspaceDeletedEventSchema, sessionStatusChangedEventSchema, modelCatalogChangedEventSchema, goalUpdatedEventSchema, skillActivatedEventSchema, pluginCommandActivatedEventSchema, errorEventSchema, warningEventSchema, turnStartedEventSchema, turnEndedEventSchema, turnStepStartedEventSchema, turnStepCompletedEventSchema, turnStepRetryingEventSchema, turnStepInterruptedEventSchema, assistantDeltaEventSchema, hookResultEventSchema, thinkingDeltaEventSchema, toolCallDeltaEventSchema, toolCallStartedEventSchema, toolProgressEventSchema, shellOutputEventSchema, shellStartedEventSchema, toolResultEventSchema, subagentSpawnedEventSchema, subagentStartedEventSchema, subagentSuspendedEventSchema, subagentCompletedEventSchema, subagentFailedEventSchema, compactionStartedEventSchema, compactionBlockedEventSchema, compactionCancelledEventSchema, compactionProgressEventSchema, compactionCompletedEventSchema, backgroundTaskStartedEventSchema, backgroundTaskTerminatedEventSchema, cronFiredEventSchema, cronRunUpdatedEventSchema, promptSubmittedEventSchema, toolListUpdatedReasonSchema, toolListUpdatedEventSchema, mcpServerStatusPayloadSchema, mcpServerStatusEventSchema, mediaDroppedEventSchema, agentEventSchema, eventSchema, VOLATILE_EVENT_TYPES, volatileEventTypeSet;
+var MCP_OAUTH_AUTHORIZATION_URL_TOOL_UPDATE, tokenUsageSchema, finishReasonSchema, usageStatusSchema, permissionModeSchema, skillSourceSchema, userPromptOriginSchema, skillActivationOriginSchema, pluginCommandOriginSchema, injectionOriginSchema, shellCommandOriginSchema, compactionSummaryOriginSchema, systemTriggerOriginSchema, agentCoreBackgroundTaskStatusSchema, backgroundTaskOriginSchema, cronJobOriginSchema, cronMissedOriginSchema, hookResultOriginSchema, retryOriginSchema, promptOriginSchema, goalStatusSchema, goalActorSchema, goalBudgetReportSchema, goalSnapshotSchema, goalChangeStatsSchema, goalChangeKindSchema, goalChangeSchema, blunErrorCodeSchema, blunErrorPayloadSchema, backgroundTaskInfoBaseSchema, processBackgroundTaskInfoSchema, agentBackgroundTaskInfoSchema, questionBackgroundTaskInfoSchema, backgroundTaskInfoSchema, compactionResultSchema, toolUpdateSchema, turnEndReasonSchema, contextChangedEventSchema, agentStatusUpdatedEventSchema, sessionMetaUpdatedEventSchema, sessionCreatedEventSchema, workspaceCreatedEventSchema, workspaceUpdatedEventSchema, workspaceDeletedEventSchema, sessionStatusChangedEventSchema, modelCatalogChangedEventSchema, goalUpdatedEventSchema, skillActivatedEventSchema, pluginCommandActivatedEventSchema, errorEventSchema, warningEventSchema, turnStartedEventSchema, turnEndedEventSchema, turnStepStartedEventSchema, turnStepCompletedEventSchema, turnStepRetryingEventSchema, turnStepInterruptedEventSchema, assistantDeltaEventSchema, hookResultEventSchema, thinkingDeltaEventSchema, toolCallDeltaEventSchema, toolCallStartedEventSchema, toolProgressEventSchema, shellOutputEventSchema, shellStartedEventSchema, toolResultEventSchema, subagentSpawnedEventSchema, subagentStartedEventSchema, subagentSuspendedEventSchema, subagentCompletedEventSchema, subagentFailedEventSchema, compactionStartedEventSchema, compactionBlockedEventSchema, compactionCancelledEventSchema, compactionProgressEventSchema, compactionCompletedEventSchema, backgroundTaskStartedEventSchema, backgroundTaskTerminatedEventSchema, cronFiredEventSchema, cronRunUpdatedEventSchema, promptSubmittedEventSchema, toolListUpdatedReasonSchema, toolListUpdatedEventSchema, mcpServerStatusPayloadSchema, mcpServerStatusEventSchema, mediaDroppedEventSchema, agentEventSchema, eventSchema, VOLATILE_EVENT_TYPES, volatileEventTypeSet;
 var init_events$1 = __esmMin((() => {
 	init_zod$1();
 	init_display();
@@ -252507,7 +252920,11 @@ var init_events$1 = __esmMin((() => {
 		tokensUsed: number$1(),
 		wallClockMs: number$1()
 	});
-	goalChangeKindSchema = _enum(["lifecycle", "completion"]);
+	goalChangeKindSchema = _enum([
+		"lifecycle",
+		"completion",
+		"edited"
+	]);
 	goalChangeSchema = object$1({
 		kind: goalChangeKindSchema,
 		status: goalStatusSchema.optional(),
@@ -252664,6 +253081,12 @@ var init_events$1 = __esmMin((() => {
 		"failed",
 		"filtered"
 	]);
+	contextChangedEventSchema = object$1({
+		type: literal("context.changed"),
+		generation: string().uuid(),
+		revision: number$1().int().positive().max(Number.MAX_SAFE_INTEGER),
+		reason: _enum(["clear", "undo"])
+	});
 	agentStatusUpdatedEventSchema = object$1({
 		type: literal("agent.status.updated"),
 		model: string().optional(),
@@ -253000,6 +253423,7 @@ var init_events$1 = __esmMin((() => {
 		errorEventSchema,
 		warningEventSchema,
 		agentStatusUpdatedEventSchema,
+		contextChangedEventSchema,
 		sessionMetaUpdatedEventSchema,
 		sessionCreatedEventSchema,
 		workspaceCreatedEventSchema,
@@ -259338,7 +259762,7 @@ function Yn(s, t) {
 function Kn(s, t) {
 	s.head = new ue$1(t, void 0, s.head, s), s.tail || (s.tail = s.head), s.length++;
 }
-var zr, Ur, Ds, Wr, Gr, Zr, Q$1, J$1, nt$1, De$1, qt, Ne$1, Ns, Ae$1, As, z$1, Mt, g$1, Qt, Bt, b$1, N$1, _$1, bi, Ie$1, L$1, S, _i, Oi, Is, Ti, Z$1, xi, Ce$1, Jt$1, Rt, C, jt, Yr, Kr, Vr, $r, Fe$1, Li, Xr, qr, A$1, Jr, ht, H$1, te, m$1, Ni, tt$1, Ai, ki, vi, ie$1, ke$1, Ut$1, Ht, Ii, Pt, at, U$1, ot, Y$1, zt, Ci, j$1, ee$1, Fi, ve$1, gt$2, Me, bt, _t, Be$1, et$1, Wt$1, jr, Fs, ks, vs, Ms, Bs, tn, se$1, K$1, sn, M$1, rn, zs, nn, Bi, Tt, Gt, Pi, re, Pe$1, ze$1, Ue, He$1, We$1, Ge$1, Ze$1, Ye$1, Ke$1, Us, hn, an, Hs, ln, cn, Ws, Gs, Hi, ne, dn, Ui, oe$1, Ve$1, un, F$1, mn, xt, Wi, pn, lt, En, wn, Sn, ct, yn, Rn, gn, Gi, bn, Lt, ft, On, Tn, xn, f, $e$1, Dt, Nn, Xi, qi, An, B$1, Nt, it, Zi, Zs, V$1, he$1, dt, Ys, p, st$1, ut, Yi, At, w$1, Xe$1, qe$1, Ki, Ks, Vs, ae$1, Vi, Qe$1, Yt$1, $$1, Je$1, It, je$1, ti, $s, In, le$1, $i, Xs, Cn, rt$1, mt, vn, Qi, Mn, Bn, Ct, Ji, zn, qs, ce$1, ei, ji, Un, Hn, ts, Qs, rr, Wn, tr, er, ir, is$2, sr, fe$1, ii, ss, si, rs, ns, os$6, hs, pt, ri, as, es, q$1, de$1, ni, oi, Gn, hi, ue$1, pi, nr, li, me$1, W$1, pe$2, Et, Ft$1, Ee$1, ai, G, ls, ci, or, ds, us, fi, di, hr, cs, ui, lr, fs$12, wt, kt, Vn, $n, fr, dr, Xn, qn, Er, wr, ur, Sr, yr, Rr, jn, to, eo, mr, ms, ps, Ei, io, Es, so, ws, Se$1, St, no, gr, Ss, br, oo, _r, ys, Or, Vt$1, Tr, ao, lo, yi, Lr, Dr, _s, Nr, Os, P$1, Ts, xs, gi, Ar, Ir, Re, Cr, Fr, Rs, yt, O$1, Ri, kr, $t, gs, bs, Ls, ge$1, be, _e$1, Oe$1, Te$1, uo, mo, po, vr, Xt$1, ye$1, xe$1, Eo, wo, So, yo, Ro, go, bo, _o, vt, To;
+var zr, Ur, Ds, Wr, Gr, Zr, Q$1, J$1, nt$1, De$1, qt, Ne$1, Ns, Ae$1, As, z$1, Mt, g$1, Qt, Bt, b$1, N$1, _$1, bi, Ie$1, L$1, S, _i, Oi, Is, Ti, Z$1, xi, Ce$1, Jt$1, Rt, C, jt, Yr, Kr, Vr, $r, Fe$1, Li, Xr, qr, A$1, Jr, ht, H$1, te, m$1, Ni, tt$1, Ai, ki, vi, ie$1, ke$1, Ut$1, Ht, Ii, Pt, at, U$1, ot, Y$1, zt, Ci, j$1, ee$1, Fi, ve$1, gt$2, Me, bt, _t, Be$1, et$1, Wt$1, jr, Fs, ks, vs, Ms, Bs, tn, se$1, K$1, sn, M$1, rn, zs, nn, Bi, Tt, Gt, Pi, re, Pe$1, ze$1, Ue, He$1, We$1, Ge$1, Ze$1, Ye$1, Ke$1, Us, hn, an, Hs, ln, cn, Ws, Gs, Hi, ne, dn, Ui, oe$1, Ve$1, un, F$1, mn, xt, Wi, pn, lt, En, wn, Sn, ct, yn, Rn, gn, Gi, bn, Lt, ft, On, Tn, xn, f, $e$1, Dt, Nn, Xi, qi, An, B$1, Nt, it, Zi, Zs, V$1, he$1, dt, Ys, p, st$1, ut, Yi, At, w$1, Xe$1, qe$1, Ki, Ks, Vs, ae$1, Vi, Qe$1, Yt$1, $$1, Je$1, It, je$1, ti, $s, In, le$1, $i, Xs, Cn, rt$1, mt, vn, Qi, Mn, Bn, Ct, Ji, zn, qs, ce$1, ei, ji, Un, Hn, ts, Qs, rr, Wn, tr, er, ir, is$2, sr, fe$1, ii, ss, si, rs, ns, os$6, hs, pt, ri, as, es, q$1, de$1, ni, oi, Gn, hi, ue$1, pi, nr, li, me$1, W$1, pe$2, Et, Ft$1, Ee$1, ai, G, ls, ci, or, ds, us, fi, di, hr, cs, ui, lr, fs$11, wt, kt, Vn, $n, fr, dr, Xn, qn, Er, wr, ur, Sr, yr, Rr, jn, to, eo, mr, ms, ps, Ei, io, Es, so, ws, Se$1, St, no, gr, Ss, br, oo, _r, ys, Or, Vt$1, Tr, ao, lo, yi, Lr, Dr, _s, Nr, Os, P$1, Ts, xs, gi, Ar, Ir, Re, Cr, Fr, Rs, yt, O$1, Ri, kr, $t, gs, bs, Ls, ge$1, be, _e$1, Oe$1, Te$1, uo, mo, po, vr, Xt$1, ye$1, xe$1, Eo, wo, So, yo, Ro, go, bo, _o, vt, To;
 var init_index_min = __esmMin((() => {
 	zr = Object.defineProperty;
 	Ur = (s, t) => {
@@ -260866,7 +261290,7 @@ while (this[Zs](this[st$1].shift()));
 				let [o, h] = ce$1(this.path);
 				o && typeof h == "string" && (this.path = h, r = o);
 			}
-			this.win32 = !!i.win32 || process.platform === "win32", this.win32 && (this.path = Qs(this.path.replaceAll(/\\/g, "/")), t = t.replaceAll(/\\/g, "/")), this.absolute = f(i.absolute || path$1.resolve(this.cwd, t)), this.path === "" && (this.path = "./"), r && this.warn("TAR_ENTRY_INFO", `stripping ${r} from absolute path`, {
+			this.win32 = !!i.win32 || process.platform === "win32", this.win32 && (this.path = Qs(this.path.replaceAll(/\\/g, "/")), t = t.replaceAll(/\\/g, "/")), this.absolute = f(i.absolute || js.resolve(this.cwd, t)), this.path === "" && (this.path = "./"), r && this.warn("TAR_ENTRY_INFO", `stripping ${r} from absolute path`, {
 				entry: this,
 				path: r + this.path
 			});
@@ -260949,7 +261373,7 @@ while (this[Zs](this[st$1].shift()));
 		}
 		[sr](t) {
 			if (!this.stat) throw new Error("cannot create link entry without stat");
-			this.type = "Link", this.linkpath = f(path$1.relative(this.cwd, t)), this.stat.size = 0, this[fe$1](), this.end();
+			this.type = "Link", this.linkpath = f(js.relative(this.cwd, t)), this.stat.size = 0, this[fe$1](), this.end();
 		}
 		[er]() {
 			if (!this.stat) throw new Error("cannot create file entry without stat");
@@ -261308,7 +261732,7 @@ while (this[Zs](this[st$1].shift()));
 		constructor(t, e) {
 			this.path = t || "./", this.absolute = e;
 		}
-	}, nr = Buffer.alloc(1024), li = Symbol("onStat"), me$1 = Symbol("ended"), W$1 = Symbol("queue"), pe$2 = Symbol("pendingLinks"), Et = Symbol("current"), Ft$1 = Symbol("process"), Ee$1 = Symbol("processing"), ai = Symbol("processJob"), G = Symbol("jobs"), ls = Symbol("jobDone"), ci = Symbol("addFSEntry"), or = Symbol("addTarEntry"), ds = Symbol("stat"), us = Symbol("readdir"), fi = Symbol("onreaddir"), di = Symbol("pipe"), hr = Symbol("entry"), cs = Symbol("entryOpt"), ui = Symbol("writeEntryClass"), lr = Symbol("write"), fs$12 = Symbol("ondrain"), wt = class extends A$1 {
+	}, nr = Buffer.alloc(1024), li = Symbol("onStat"), me$1 = Symbol("ended"), W$1 = Symbol("queue"), pe$2 = Symbol("pendingLinks"), Et = Symbol("current"), Ft$1 = Symbol("process"), Ee$1 = Symbol("processing"), ai = Symbol("processJob"), G = Symbol("jobs"), ls = Symbol("jobDone"), ci = Symbol("addFSEntry"), or = Symbol("addTarEntry"), ds = Symbol("stat"), us = Symbol("readdir"), fi = Symbol("onreaddir"), di = Symbol("pipe"), hr = Symbol("entry"), cs = Symbol("entryOpt"), ui = Symbol("writeEntryClass"), lr = Symbol("write"), fs$11 = Symbol("ondrain"), wt = class extends A$1 {
 		sync = !1;
 		opt;
 		cwd;
@@ -261341,8 +261765,8 @@ while (this[Zs](this[st$1].shift()));
 				if ((t.gzip ? 1 : 0) + (t.brotli ? 1 : 0) + (t.zstd ? 1 : 0) > 1) throw new TypeError("gzip, brotli, zstd are mutually exclusive");
 				if (t.gzip && (typeof t.gzip != "object" && (t.gzip = {}), this.portable && (t.gzip.portable = !0), this.zip = new ze$1(t.gzip)), t.brotli && (typeof t.brotli != "object" && (t.brotli = {}), this.zip = new We$1(t.brotli)), t.zstd && (typeof t.zstd != "object" && (t.zstd = {}), this.zip = new Ye$1(t.zstd)), !this.zip) throw new Error("impossible");
 				let e = this.zip;
-				e.on("data", (i) => super.write(i)), e.on("end", () => super.end()), e.on("drain", () => this[fs$12]()), this.on("resume", () => e.resume());
-			} else this.on("drain", this[fs$12]);
+				e.on("data", (i) => super.write(i)), e.on("end", () => super.end()), e.on("drain", () => this[fs$11]()), this.on("resume", () => e.resume());
+			} else this.on("drain", this[fs$11]);
 			this.noDirRecurse = !!t.noDirRecurse, this.follow = !!t.follow, this.noMtime = !!t.noMtime, t.mtime && (this.mtime = t.mtime), this.filter = typeof t.filter == "function" ? t.filter : () => !0, this[W$1] = new hi(), this[G] = 0, this.jobs = Number(t.jobs) || 4, this[Ee$1] = !1, this[me$1] = !1;
 		}
 		[lr](t) {
@@ -261359,7 +261783,7 @@ while (this[Zs](this[st$1].shift()));
 			return typeof t == "string" ? this[ci](t) : this[or](t), this.flowing;
 		}
 		[or](t) {
-			let e = f(path$1.resolve(this.cwd, t.path));
+			let e = f(js.resolve(this.cwd, t.path));
 			if (!this.filter(t.path, t)) t.resume();
 			else {
 				let i = new pi(t.path, e);
@@ -261368,7 +261792,7 @@ while (this[Zs](this[st$1].shift()));
 			this[Ft$1]();
 		}
 		[ci](t) {
-			let e = f(path$1.resolve(this.cwd, t));
+			let e = f(js.resolve(this.cwd, t));
 			this[W$1].push(new pi(t, e)), this[Ft$1]();
 		}
 		[ds](t) {
@@ -261469,7 +261893,7 @@ while (this[Zs](this[st$1].shift()));
 				this.emit("error", e);
 			}
 		}
-		[fs$12]() {
+		[fs$11]() {
 			this[Et] && this[Et].entry && this[Et].entry.resume();
 		}
 		[di](t) {
@@ -261635,7 +262059,7 @@ while (this[Zs](this[st$1].shift()));
 			E ? e(E) : x && a ? Es(x, o, h, (Le) => y(Le)) : n ? Kt.chmod(s, r, e) : e();
 		};
 		if (s === d) return no(s, y);
-		if (l) return fs.mkdir(s, {
+		if (l) return ro.mkdir(s, {
 			mode: r,
 			recursive: !0
 		}).then((E) => y(null, E ?? void 0), y);
@@ -262394,7 +262818,7 @@ var require_pend = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region ../../node_modules/.pnpm/yauzl@3.3.0/node_modules/yauzl/fd-slicer.js
 var require_fd_slicer = /* @__PURE__ */ __commonJSMin(((exports) => {
-	var fs$11 = __require("fs");
+	var fs$10 = __require("fs");
 	var util$6 = __require("util");
 	var stream$2 = __require("stream");
 	var Readable = stream$2.Readable;
@@ -262419,7 +262843,7 @@ var require_fd_slicer = /* @__PURE__ */ __commonJSMin(((exports) => {
 	FdSlicer.prototype.read = function(buffer, offset, length, position, callback) {
 		var self = this;
 		self.pend.go(function(cb) {
-			fs$11.read(self.fd, buffer, offset, length, position, function(err, bytesRead, buffer) {
+			fs$10.read(self.fd, buffer, offset, length, position, function(err, bytesRead, buffer) {
 				cb();
 				callback(err, bytesRead, buffer);
 			});
@@ -262428,7 +262852,7 @@ var require_fd_slicer = /* @__PURE__ */ __commonJSMin(((exports) => {
 	FdSlicer.prototype.write = function(buffer, offset, length, position, callback) {
 		var self = this;
 		self.pend.go(function(cb) {
-			fs$11.write(self.fd, buffer, offset, length, position, function(err, written, buffer) {
+			fs$10.write(self.fd, buffer, offset, length, position, function(err, written, buffer) {
 				cb();
 				callback(err, written, buffer);
 			});
@@ -262448,7 +262872,7 @@ var require_fd_slicer = /* @__PURE__ */ __commonJSMin(((exports) => {
 		self.refCount -= 1;
 		if (self.refCount > 0) return;
 		if (self.refCount < 0) throw new Error("invalid unref");
-		if (self.autoClose) fs$11.close(self.fd, onCloseDone);
+		if (self.autoClose) fs$10.close(self.fd, onCloseDone);
 		function onCloseDone(err) {
 			if (err) self.emit("error", err);
 			else self.emit("close");
@@ -262479,7 +262903,7 @@ var require_fd_slicer = /* @__PURE__ */ __commonJSMin(((exports) => {
 		self.context.pend.go(function(cb) {
 			if (self.destroyed) return cb();
 			var buffer = Buffer.allocUnsafe(toRead);
-			fs$11.read(self.context.fd, buffer, 0, toRead, self.pos, function(err, bytesRead) {
+			fs$10.read(self.context.fd, buffer, 0, toRead, self.pos, function(err, bytesRead) {
 				if (err) self.destroy(err);
 				else if (bytesRead === 0) {
 					self.destroyed = true;
@@ -262525,7 +262949,7 @@ var require_fd_slicer = /* @__PURE__ */ __commonJSMin(((exports) => {
 		}
 		self.context.pend.go(function(cb) {
 			if (self.destroyed) return cb();
-			fs$11.write(self.context.fd, buffer, 0, buffer.length, self.pos, function(err, bytes) {
+			fs$10.write(self.context.fd, buffer, 0, buffer.length, self.pos, function(err, bytes) {
 				if (err) {
 					self.destroy();
 					cb();
@@ -266239,9 +266663,16 @@ var init_tool_dedup = __esmMin((() => {
 }));
 //#endregion
 //#region ../../packages/agent-core/src/agent/turn/tool-result-budget.ts
+function toolResultMaxChars(maxContextTokens) {
+	if (maxContextTokens === void 0 || !Number.isFinite(maxContextTokens) || maxContextTokens <= 0) return TOOL_RESULT_MAX_CHARS;
+	if (maxContextTokens < 1e5) return 16e3;
+	if (maxContextTokens < 2e5) return 32e3;
+	return TOOL_RESULT_MAX_CHARS;
+}
 async function budgetToolResultForModel(options) {
 	const text = persistableToolResultText(options.result.output);
-	if (text === void 0 || text.length <= TOOL_RESULT_MAX_CHARS) return options.result;
+	const maxChars = toolResultMaxChars(options.maxContextTokens);
+	if (text === void 0 || text.length <= maxChars) return options.result;
 	if (options.result.truncated === true) return options.result;
 	if (options.homedir === void 0) return options.result;
 	if (text.includes("\0") || Buffer.from(text, "utf8").toString("utf8") !== text || text.split("\n").some((line) => line.length > 2e3)) return options.result;
@@ -266252,7 +266683,7 @@ async function budgetToolResultForModel(options) {
 		toolCallId: options.toolCallId
 	}, text);
 	if (outputPath === void 0) return options.result;
-	const output = renderPersistedToolResult(options.toolName, options.toolCallId, text, outputPath);
+	const output = renderPersistedToolResult(options.toolName, options.toolCallId, text, outputPath, maxChars);
 	return options.result.isError === true ? {
 		...options.result,
 		output,
@@ -266284,9 +266715,9 @@ async function saveToolResult(options, text) {
 		return;
 	}
 }
-function renderPersistedToolResult(toolName, toolCallId, text, outputPath) {
+function renderPersistedToolResult(toolName, toolCallId, text, outputPath, maxChars) {
 	const lines = [
-		`Tool output exceeded ${String(TOOL_RESULT_MAX_CHARS)} characters; showing a preview only.`,
+		`Tool output exceeded ${String(maxChars)} characters; showing a preview only.`,
 		`tool_name: ${toolName}`,
 		`tool_call_id: ${toolCallId}`,
 		`output_size_chars: ${String(text.length)}`,
@@ -266438,14 +266869,14 @@ async function readGitExecPath(deps, gitExe) {
 	}
 }
 function gitBashCandidatesFromGitExe(gitExe) {
-	const normalizedGitExe = path$17.win32.normalize(normalizeWindowsPath(gitExe));
-	const gitDir = path$17.win32.dirname(normalizedGitExe);
-	const gitDirName = path$17.win32.basename(gitDir).toLowerCase();
+	const normalizedGitExe = path$16.win32.normalize(normalizeWindowsPath(gitExe));
+	const gitDir = path$16.win32.dirname(normalizedGitExe);
+	const gitDirName = path$16.win32.basename(gitDir).toLowerCase();
 	if (gitDirName !== "cmd" && gitDirName !== "bin") return;
-	return gitBashCandidatesFromGitRoot(path$17.win32.dirname(gitDir));
+	return gitBashCandidatesFromGitRoot(path$16.win32.dirname(gitDir));
 }
 function gitBashCandidatesFromGitExecPath(execPath) {
-	const normalized = path$17.win32.normalize(normalizeWindowsPath(execPath));
+	const normalized = path$16.win32.normalize(normalizeWindowsPath(execPath));
 	const parts = normalized.split("\\");
 	for (let i = parts.length - 1; i >= 0; i -= 1) {
 		const segment = parts[i]?.toLowerCase();
@@ -266454,16 +266885,16 @@ function gitBashCandidatesFromGitExecPath(execPath) {
 			if (root.length > 0) return gitBashCandidatesFromGitRoot(root);
 		}
 	}
-	return gitBashCandidatesFromGitRoot(path$17.win32.join(normalized, "..", ".."));
+	return gitBashCandidatesFromGitRoot(path$16.win32.join(normalized, "..", ".."));
 }
 function gitBashCandidatesFromGitRoot(root) {
-	return [path$17.win32.normalize(path$17.win32.join(root, "bin", "bash.exe")), path$17.win32.normalize(path$17.win32.join(root, "usr", "bin", "bash.exe"))];
+	return [path$16.win32.normalize(path$16.win32.join(root, "bin", "bash.exe")), path$16.win32.normalize(path$16.win32.join(root, "usr", "bin", "bash.exe"))];
 }
 function normalizeWindowsPath(path) {
 	return path.replaceAll("/", "\\");
 }
 function isAbsoluteWindowsPath(path) {
-	return path$17.win32.isAbsolute(normalizeWindowsPath(path));
+	return path$16.win32.isAbsolute(normalizeWindowsPath(path));
 }
 function dedupeWindowsPaths(paths) {
 	const deduped = [];
@@ -268244,14 +268675,27 @@ function blunToolsForOrigin(tools, origin) {
 * the ordinary permission pipeline.
 */
 function blunSelectTurnTools(tools, maxContextTokens, loadedToolNames = /* @__PURE__ */ new Set(), requiredToolNames = /* @__PURE__ */ new Set(), selected = []) {
-	if (estimateTokensForTools(tools) <= (0, import_turn_tool_performance_policy.toolSchemaBudgetTokens)(maxContextTokens) || tools.some(import_turn_tool_performance_policy.isDeferredToolLoader)) {
+	const schemaBudget = (0, import_turn_tool_performance_policy.toolSchemaBudgetTokens)(maxContextTokens);
+	if (estimateTokensForTools(tools, schemaBudget) <= schemaBudget || tools.some(import_turn_tool_performance_policy.isDeferredToolLoader)) {
 		selected.splice(0, selected.length, ...tools);
 		return selected;
 	}
-	selected.splice(0, selected.length, ...tools.filter((tool) => BLUN_LEAN_TOOL_NAMES.has(tool.name) || BLUN_LEAN_KEEP_RE.test(tool.name) || BLUN_LANGUAGE_REVIEW_TOOL_NAMES.has(tool.name) || loadedToolNames.has(tool.name) || requiredToolNames.has(tool.name)));
-	const names = new Set(selected.map((tool) => tool.name));
-	const deferred = tools.filter((tool) => !names.has(tool.name));
-	if (deferred.length > 0) selected.push((0, import_turn_tool_performance_policy.createDeferredToolLoader)(selected, deferred, loadedToolNames));
+	const priorLoaderIndex = selected.findIndex(import_turn_tool_performance_policy.isDeferredToolLoader);
+	const justLoaded = new Set(priorLoaderIndex < 0 ? [] : selected.slice(priorLoaderIndex + 1).filter((tool) => loadedToolNames.has(tool.name)).map((tool) => tool.name));
+	const remembered = new Set(loadedToolNames);
+	const choose = () => {
+		selected.splice(0, selected.length, ...tools.filter((tool) => BLUN_LEAN_TOOL_NAMES.has(tool.name) || BLUN_LEAN_KEEP_RE.test(tool.name) || BLUN_LANGUAGE_REVIEW_TOOL_NAMES.has(tool.name) || remembered.has(tool.name) || requiredToolNames.has(tool.name)));
+		const names = new Set(selected.map((tool) => tool.name));
+		const deferred = tools.filter((tool) => !names.has(tool.name));
+		if (deferred.length > 0) selected.push((0, import_turn_tool_performance_policy.createDeferredToolLoader)(selected, deferred, loadedToolNames));
+	};
+	choose();
+	for (const name of loadedToolNames) {
+		if (estimateTokensForTools(selected, schemaBudget) <= schemaBudget) break;
+		if (justLoaded.has(name)) continue;
+		if (!remembered.delete(name)) continue;
+		choose();
+	}
 	return selected;
 }
 function goalContinuationOrigin(origin) {
@@ -269280,10 +269724,12 @@ var init_turn = __esmMin((() => {
 						taskToolsNeeded ||= blunTurnNeedsTools(intent, origin) || blunTurnHasAttachment(toolInput);
 						const required = (0, import_turn_tool_performance_policy.mediaToolNamesForTurnText)(blunExtractText(toolInput));
 						if (taskToolsNeeded) {
-							blunSelectTurnTools(eligibleTools, this.agent.config.modelCapabilities?.max_context_tokens, this.loadedToolNames, required, selectedTools);
-							for (const name of (0, import_turn_tool_performance_policy.rankedToolNamesForTurnText)(eligibleTools, blunExtractText(intent))) {
+							const maxContextTokens = this.agent.fullCompaction.getEffectiveMaxContextTokens();
+							blunSelectTurnTools(eligibleTools, maxContextTokens, this.loadedToolNames, required, selectedTools);
+							const trustedToolNames = new Set(eligibleTools.filter((tool) => this.agent.tools.isUserTool(tool)).map((tool) => tool.name));
+							for (const name of (0, import_turn_tool_performance_policy.rankedToolNamesForTurnText)(eligibleTools, blunExtractText(intent), { trustedToolNames })) {
 								const tool = eligibleTools.find((candidate) => candidate.name === name);
-								if (tool !== void 0 && !selectedTools.some((candidate) => candidate.name === name) && estimateTokensForTools([...selectedTools, tool]) <= (0, import_turn_tool_performance_policy.toolSchemaBudgetTokens)(this.agent.config.modelCapabilities?.max_context_tokens)) selectedTools.push(tool);
+								if (tool !== void 0 && !selectedTools.some((candidate) => candidate.name === name) && estimateTokensForTools([...selectedTools, tool]) <= (0, import_turn_tool_performance_policy.toolSchemaBudgetTokens)(maxContextTokens)) selectedTools.push(tool);
 							}
 						} else selectedTools.splice(0, selectedTools.length, ...eligibleTools.filter((tool) => BLUN_LANGUAGE_REVIEW_TOOL_NAMES.has(tool.name) || BLUN_TELEGRAM_OUTBOUND_TOOL_RE.test(tool.name)));
 						recordPreRequestPhase("tool-selection", selectionStartedAt);
@@ -269424,6 +269870,7 @@ var init_turn = __esmMin((() => {
 								});
 								return budgetToolResultForModel({
 									homedir: this.agent.homedir,
+									maxContextTokens: this.agent.fullCompaction.getEffectiveMaxContextTokens(),
 									toolName: ctx.toolCall.name,
 									toolCallId: ctx.toolCall.id,
 									result: finalResult
@@ -270134,10 +270581,10 @@ var init_bash = __esmMin((() => {
 				},
 				approvalRule: literalRulePattern(this.name, args.command),
 				matchesRule: (ruleArgs) => matchesGlobRuleSubject(ruleArgs, args.command),
-				execute: ({ signal, onUpdate, onForegroundTaskStart }) => this.execution(args, signal, onUpdate, onForegroundTaskStart)
+				execute: ({ signal, onUpdate, onForegroundTaskStart, executionOrigin }) => this.execution(args, signal, onUpdate, onForegroundTaskStart, executionOrigin)
 			};
 		}
-		spawn(effectiveCwd, command) {
+		spawn(effectiveCwd, command, executionOrigin) {
 			const shellCwd = this.isWindowsBash ? windowsPathToPosixPath(effectiveCwd) : effectiveCwd;
 			const shellArgs = [
 				this.kaos.osEnv.shellPath,
@@ -270154,9 +270601,11 @@ var init_bash = __esmMin((() => {
 				...process.env,
 				...noninteractiveEnv
 			};
+			delete mergedEnv["BLUN_SHELL"];
+			if (executionOrigin === "operator_shell") mergedEnv["BLUN_SHELL"] = "operator-local";
 			return this.kaos.execWithEnv(shellArgs, mergedEnv);
 		}
-		async execution(args, signal, onUpdate, onForegroundTaskStart) {
+		async execution(args, signal, onUpdate, onForegroundTaskStart, executionOrigin) {
 			const validationError = this.validateRunRequest(args, signal);
 			if (validationError !== void 0) return validationError;
 			const startsInBackground = args.run_in_background === true;
@@ -270168,7 +270617,7 @@ var init_bash = __esmMin((() => {
 			const builder = new ToolResultBuilder();
 			let proc;
 			try {
-				proc = await this.spawn(effectiveCwd, command);
+				proc = await this.spawn(effectiveCwd, command, executionOrigin);
 			} catch (error) {
 				return {
 					isError: true,
@@ -270503,7 +270952,7 @@ var init_web_search = __esmMin((() => {
 //#region ../../packages/agent-core/src/tools/builtin/search/codebase-search.md?raw
 var codebase_search_default;
 var init_codebase_search$1 = __esmMin((() => {
-	codebase_search_default = "Find code by **meaning**, not by keywords.\n\nThis tool runs a semantic search over the codebase index. It understands what a file or function *does*, not just what words appear in it. Use it when you are looking for *where* something is handled, *which file* implements a concept, or *how* a particular concern is addressed — even when the exact term never appears in the source.\n\n**When to use this tool:**\n- \"Where is keyboard input handled?\" — finds the handler even if the word \"keyboard\" never appears.\n- \"Which file manages the retry logic for API calls?\"\n- \"How does the app decide which model to route a message to?\"\n- \"Find the code that handles user authentication flow.\"\n- Any question where you want to locate code by its *purpose* or *behavior*.\n\n**When NOT to use this tool — use a different one instead:**\n- Exact string matches, regex patterns, or specific identifiers → `Grep`\n- Finding files by name, extension, or path glob → `Glob`\n- Reading a known file path → `Read`\n\n**Parameters:**\n- `query` (required): A natural-language question, concept, or phrase describing what the code does. Examples: `\"keyboard event handling\"`, `\"retry with exponential backoff\"`, `\"where chat messages are routed to the model\"`.\n- `top` (optional, default 5): Maximum number of results to return.\n\n**Output:**\nEach result includes a file path and a relevance snippet. The index is rebuilt incrementally; if a file was recently added it may not appear until the next index update. Always verify the finding by reading the file before relying on it.\n";
+	codebase_search_default = "Find code by **meaning**, not by keywords.\n\nThis tool runs a semantic search over the codebase index. It understands what a file or function *does*, not just what words appear in it. Use it when you are looking for *where* something is handled, *which file* implements a concept, or *how* a particular concern is addressed — even when the exact term never appears in the source.\n\n**When to use this tool:**\n- \"Where is keyboard input handled?\" — finds the handler even if the word \"keyboard\" never appears.\n- \"Which file manages the retry logic for API calls?\"\n- \"How does the app decide which model to route a message to?\"\n- \"Find the code that handles user authentication flow.\"\n- Any question where you want to locate code by its *purpose* or *behavior*.\n\n**When NOT to use this tool — use a different one instead:**\n- Exact string matches, regex patterns, or specific identifiers → `Grep`\n- Finding files by name, extension, or path glob → `Glob`\n- Reading a known file path → `Read`\n\n**Parameters:**\n- `query` (required): A natural-language question, concept, or phrase describing what the code does. Examples: `\"keyboard event handling\"`, `\"retry with exponential backoff\"`, `\"where chat messages are routed to the model\"`.\n- `top` (optional, default 5, maximum 100): Maximum number of results to return.\n\n**Output:**\nEach result includes a file path and a relevance score, plus the index model and revision. The index is rebuilt incrementally; if a file was recently added it may not appear until the next index update. Always verify the finding by reading the file before relying on it.\n";
 }));
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/search/codebase-search.ts
@@ -270511,7 +270960,7 @@ var init_codebase_search$1 = __esmMin((() => {
 * CodebaseSearchTool — semantic code search via the codebase-index.
 *
 * Shells out to `python codebase_index.py query <repo> "<frage>" --top N`
-* through spawnSync. The script lives at
+* through asynchronous execFile. The script lives at
 * `packages/codebase-index/codebase_index.py` relative to the workspace root.
 *
 * Unlike Grep (keyword/regex) or Glob (file-name patterns), this tool finds
@@ -270535,18 +270984,20 @@ function resolveScriptPath() {
 	}
 	return "";
 }
-var CodebaseSearchInputSchema, SCRIPT_TIMEOUT_MS, CodebaseSearchTool;
+var MAX_SEARCH_RESULTS, CodebaseSearchInputSchema, SCRIPT_TIMEOUT_MS, SCRIPT_MAX_BUFFER, CodebaseSearchTool;
 var init_codebase_search = __esmMin((() => {
 	init_zod$1();
 	init_rule_match();
 	init_input_schema();
 	init_result_builder();
 	init_codebase_search$1();
+	MAX_SEARCH_RESULTS = 100;
 	CodebaseSearchInputSchema = object$1({
 		query: string().min(1, "Query cannot be empty.").describe("A natural-language question or concept describing what the code does. Examples: \"keyboard event handling\", \"retry with exponential backoff\", \"where chat messages are routed to the model\"."),
-		top: number$1().int().positive().default(5).describe("Maximum number of results to return. Defaults to 5.")
+		top: number$1().int().positive().max(MAX_SEARCH_RESULTS).default(5).describe(`Maximum number of results to return (1-${String(MAX_SEARCH_RESULTS)}). Defaults to 5.`)
 	});
 	SCRIPT_TIMEOUT_MS = 6e4;
+	SCRIPT_MAX_BUFFER = 1024 * 1024;
 	CodebaseSearchTool = class {
 		cwd;
 		name = "CodebaseSearch";
@@ -270569,45 +271020,72 @@ var init_codebase_search = __esmMin((() => {
 				},
 				approvalRule: literalRulePattern(this.name, args.query),
 				matchesRule: (ruleArgs) => matchesGlobRuleSubject(ruleArgs, args.query),
-				execute: () => this.execution(args)
+				execute: async (context) => {
+					context.signal.throwIfAborted();
+					return this.execution(args, context.signal);
+				}
 			};
 		}
-		execution(args) {
+		async execution(args, signal) {
 			const builder = new ToolResultBuilder();
-			if (this.scriptPath.length === 0) return Promise.resolve(builder.error("Could not locate codebase_index.py. Set CODEBASE_INDEX_SCRIPT to its absolute path."));
+			if (!Number.isSafeInteger(args.top) || args.top < 1 || args.top > MAX_SEARCH_RESULTS) return builder.error(`Codebase search top must be between 1 and ${String(MAX_SEARCH_RESULTS)}.`);
+			if (this.scriptPath.length === 0) return builder.error("Could not locate codebase_index.py. Set CODEBASE_INDEX_SCRIPT to its absolute path.");
 			try {
-				const result = spawnSync("python", [
-					this.scriptPath,
-					"query",
-					this.cwd,
-					args.query,
-					"--top",
-					String(args.top),
-					"--model",
-					"auto"
-				], {
-					cwd: this.cwd,
-					timeout: SCRIPT_TIMEOUT_MS,
-					encoding: "utf-8",
-					windowsHide: true
+				const result = await new Promise((resolve) => {
+					let closed = false;
+					let output;
+					const finish = () => {
+						if (closed && output !== void 0) resolve(output);
+					};
+					execFile("python", [
+						this.scriptPath,
+						"query",
+						this.cwd,
+						args.query,
+						"--top",
+						String(args.top),
+						"--model",
+						"auto"
+					], {
+						cwd: this.cwd,
+						timeout: SCRIPT_TIMEOUT_MS,
+						encoding: "utf-8",
+						windowsHide: true,
+						shell: false,
+						maxBuffer: SCRIPT_MAX_BUFFER,
+						signal
+					}, (error, stdout, stderr) => {
+						output = {
+							error,
+							stdout,
+							stderr
+						};
+						finish();
+					}).once("close", () => {
+						closed = true;
+						finish();
+					});
 				});
-				if (result.error !== void 0) {
+				signal.throwIfAborted();
+				if (result.error !== null && typeof result.error.code !== "number") {
 					const msg = result.error instanceof Error ? result.error.message : String(result.error);
-					return Promise.resolve(builder.error(`Failed to run codebase_index.py: ${msg}`));
+					builder.write(result.stdout + result.stderr);
+					return builder.error(`Failed to run codebase_index.py: ${msg}`);
 				}
 				const stdout = result.stdout ?? "";
 				const stderr = result.stderr ?? "";
-				const exitCode = result.status ?? -1;
+				const exitCode = result.error?.code ?? 0;
 				if (exitCode !== 0) {
 					const combined = stderr.trim().length > 0 ? `${stdout}${stdout.length > 0 ? "\n" : ""}Error: ${stderr.trim()}` : stdout;
 					builder.write(combined.length > 0 ? combined : `codebase_index.py exited with code ${String(exitCode)}`);
-					return Promise.resolve(builder.error(`Codebase search failed with exit code ${String(exitCode)}.`));
+					return builder.error(`Codebase search failed with exit code ${String(exitCode)}.`);
 				}
 				builder.write(stdout.length > 0 ? stdout : "No results found.");
-				return Promise.resolve(builder.ok());
+				return builder.ok();
 			} catch (error) {
+				signal.throwIfAborted();
 				const msg = error instanceof Error ? error.message : String(error);
-				return Promise.resolve(builder.error(`Codebase search error: ${msg}`));
+				return builder.error(`Codebase search error: ${msg}`);
 			}
 		}
 	};
@@ -271941,6 +272419,7 @@ var init_tool$1 = __esmMin((() => {
 				const result = await execution.execute({
 					turnId: "",
 					toolCallId: "shell-command",
+					executionOrigin: "operator_shell",
 					signal: controller.signal,
 					onUpdate: (update) => {
 						if (update.kind === "stdout") stdout += update.text ?? "";
@@ -272029,6 +272508,9 @@ var init_tool$1 = __esmMin((() => {
 		hasUserTool(name) {
 			return this.userTools.has(name);
 		}
+		isUserTool(tool) {
+			return this.userTools.get(tool.name) === tool;
+		}
 		inheritUserTools(parent) {
 			for (const tool of parent.userTools.values()) {
 				if (!parent.enabledTools.has(tool.name)) continue;
@@ -273256,6 +273738,7 @@ var init_agent = __esmMin((() => {
 	init_errors$8();
 	init_logger$1();
 	init_src$4();
+	init_blun();
 	init_commands();
 	init_flags();
 	init_profile();
@@ -273342,6 +273825,9 @@ var init_agent = __esmMin((() => {
 		additionalDirs;
 		systemPromptStartedAt = /* @__PURE__ */ new Date();
 		activeProfile;
+		rawSystemPromptContext;
+		profileSystemPromptText;
+		agentsMdRequestWarningShown = false;
 		brandHome;
 		_activeResponderModel;
 		allowModelFallback = true;
@@ -273496,6 +273982,7 @@ var init_agent = __esmMin((() => {
 					tools: requestTools,
 					messages: await rebuildMessages()
 				};
+				if (this.activeProfile !== void 0 && this.rawSystemPromptContext !== void 0 && this.config.systemPrompt === this.profileSystemPromptText) this.updateSystemPromptFromProfile(this.activeProfile, this.fitProfileInstructions(this.activeProfile, this.rawSystemPromptContext, requestTools, true));
 				let systemPrompt = this.effectiveSystemPrompt;
 				const preflightStartedAt = performance.now();
 				const compacted = await this.fullCompaction.beforeStep(params.signal, {
@@ -273524,6 +274011,13 @@ var init_agent = __esmMin((() => {
 					...params,
 					messages: await rebuildMessages()
 				};
+				if (this.config.runtimeModel(_candidate.alias).provider.name === "blun") {
+					const requestBytes = estimateBlunSerializedBodyBytes(systemPrompt, tools, params.messages) + 4096;
+					if (requestBytes >= 5e5) throw new BlunError(ErrorCodes.CONTEXT_OVERFLOW, "The BLUN request is too large after compaction. Shorten fixed instructions or tools.", { details: {
+						estimatedRequestBytes: requestBytes,
+						requestBudgetBytes: 5e5
+					} });
+				}
 				return {
 					params: {
 						...params,
@@ -273602,8 +274096,14 @@ var init_agent = __esmMin((() => {
 		}
 		useProfile(profile, context, brandHome) {
 			this.setActiveProfile(profile, brandHome);
-			this.updateSystemPromptFromProfile(profile, context);
+			this.rawSystemPromptContext = context;
+			if (context?.agentsMdText === void 0) {
+				this.updateSystemPromptFromProfile(profile, context);
+				this.tools.setActiveTools(profile.tools);
+				return;
+			}
 			this.tools.setActiveTools(profile.tools);
+			this.updateSystemPromptFromProfile(profile, this.fitProfileInstructions(profile, context));
 		}
 		setActiveProfile(profile, brandHome) {
 			this.activeProfile = profile;
@@ -273618,7 +274118,68 @@ var init_agent = __esmMin((() => {
 		async refreshSystemPrompt() {
 			if (this.activeProfile === void 0) return;
 			const context = this.systemPromptContextProvider === void 0 ? await prepareSystemPromptContext(this.kaos, this.brandHome, { additionalDirs: this.additionalDirs }) : await this.systemPromptContextProvider();
-			this.updateSystemPromptFromProfile(this.activeProfile, context);
+			this.rawSystemPromptContext = context;
+			this.updateSystemPromptFromProfile(this.activeProfile, this.fitProfileInstructions(this.activeProfile, context));
+		}
+		fitProfileInstructions(profile, context, tools = this.tools.loopTools, notify = false) {
+			if (context?.agentsMdText === void 0 || this.config.modelAlias === void 0) return context;
+			if (this.config.runtimeModel(this.config.modelAlias).provider.name !== "blun") return context;
+			const renderFixedPrompt = (candidate) => {
+				const rendered = profile.systemPrompt({
+					osEnv: this.kaos.osEnv,
+					now: this.systemPromptStartedAt,
+					cwd: this.config.cwd,
+					skills: this.skills?.registry,
+					cwdListing: candidate.cwdListing,
+					agentsMd: candidate.agentsMd,
+					additionalDirsInfo: candidate.additionalDirsInfo
+				});
+				const compact = this.skills?.registry === void 0 ? rendered : compactLegacyModelSkillListing(rendered, this.skills.registry);
+				return this.runtimeSystemPromptAppend.length === 0 ? compact : compact.length === 0 ? this.runtimeSystemPromptAppend : `${compact}\n\n${this.runtimeSystemPromptAppend}`;
+			};
+			const fitted = fitAgentsMdContext(context, 4e5, (candidate) => {
+				return estimateBlunSerializedBodyBytes(renderFixedPrompt(candidate), tools, []) + 4096;
+			});
+			const describeFixedEstimate = () => {
+				const systemPrompt = renderFixedPrompt(fitted.context);
+				const envelopeBytes = estimateBlunSerializedBodyBytes("", [], []);
+				const withoutToolsBytes = estimateBlunSerializedBodyBytes(systemPrompt, [], []);
+				return {
+					estimationStage: notify ? "request" : "profile",
+					toolCount: tools.length,
+					serializedPromptBytes: withoutToolsBytes - envelopeBytes,
+					serializedToolsBytes: fitted.fixedRequestBytes - 4096 - withoutToolsBytes,
+					envelopeBytes,
+					reserveBytes: 4096,
+					instructionBytes: fitted.context.agentsMdSources?.totalBytes ?? 0,
+					runtimeAppendBytes: Buffer.byteLength(this.runtimeSystemPromptAppend, "utf8")
+				};
+			};
+			if (!fitted.fits) this.log.warn("fixed BLUN request exceeds 400000 bytes without AGENTS.md", {
+				fixedRequestBytes: fitted.fixedRequestBytes,
+				...describeFixedEstimate()
+			});
+			else if (fitted.omittedBytes > 0) {
+				this.log.warn("AGENTS.md content shortened for BLUN request budget", {
+					omittedBytes: fitted.omittedBytes,
+					fixedRequestBytes: fitted.fixedRequestBytes,
+					...describeFixedEstimate()
+				});
+				if (notify && !this.agentsMdRequestWarningShown) {
+					this.agentsMdRequestWarningShown = true;
+					const retained = new Map(fitted.context.agentsMdSources?.files.map((file) => [file.path, file.bytes]));
+					const files = context.agentsMdSources?.files.flatMap((file) => {
+						const read = retained.get(file.path) ?? 0;
+						return read < file.bytes ? [`${file.path}: ${file.bytes} bytes, ${read} read, ${file.bytes - read} omitted`] : [];
+					}) ?? [];
+					this.emitEvent({
+						type: "warning",
+						code: "agents-md-request-truncated",
+						message: `Instructions shortened for the request size limit: ${files.join("; ")}.`
+					});
+				}
+			}
+			return fitted.context;
 		}
 		updateSystemPromptFromProfile(profile, context) {
 			let contributions;
@@ -273639,6 +274200,7 @@ var init_agent = __esmMin((() => {
 				profileName: profile.name,
 				systemPrompt
 			});
+			this.profileSystemPromptText = systemPrompt;
 			this.renderedPromptContributions = contributions === void 0 ? void 0 : {
 				text: systemPrompt,
 				value: structuredClone(contributions)
@@ -273815,6 +274377,9 @@ var init_agent = __esmMin((() => {
 				},
 				startBtw: () => this.subagentHost.startBtw(),
 				createGoal: (payload) => this.goal.createGoal(payload),
+				editGoal: (payload) => this.goal.editGoal(payload),
+				blockGoal: (payload) => this.goal.blockGoal(payload),
+				completeGoal: () => this.goal.completeGoal(),
 				getGoal: () => this.goal.getGoal(),
 				pauseGoal: () => this.goal.pauseGoal(),
 				resumeGoal: () => this.goal.resumeGoal(),
@@ -303542,7 +304107,7 @@ var init_proxy = __esmMin((() => {
 var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$9 = __require("fs");
+	var fs$8 = __require("fs");
 	function checkPathExt(path, options) {
 		var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
 		if (!pathext) return true;
@@ -303559,12 +304124,12 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		return checkPathExt(path, options);
 	}
 	function isexe(path, options, cb) {
-		fs$9.stat(path, function(er, stat) {
+		fs$8.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, path, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$9.statSync(path), path, options);
+		return checkStat(fs$8.statSync(path), path, options);
 	}
 }));
 //#endregion
@@ -303572,14 +304137,14 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var require_mode = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$8 = __require("fs");
+	var fs$7 = __require("fs");
 	function isexe(path, options, cb) {
-		fs$8.stat(path, function(er, stat) {
+		fs$7.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$8.statSync(path), options);
+		return checkStat(fs$7.statSync(path), options);
 	}
 	function checkStat(stat, options) {
 		return stat.isFile() && checkMode(stat, options);
@@ -303643,7 +304208,7 @@ var require_isexe = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#region ../../node_modules/.pnpm/which@2.0.2/node_modules/which/which.js
 var require_which = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-	const path$10 = __require("path");
+	const path$9 = __require("path");
 	const COLON = isWindows ? ";" : ":";
 	const isexe = require_isexe();
 	const getNotFoundError = (cmd) => Object.assign(/* @__PURE__ */ new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -303673,7 +304238,7 @@ var require_which = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if (i === pathEnv.length) return opt.all && found.length ? resolve(found) : reject(getNotFoundError(cmd));
 			const ppRaw = pathEnv[i];
 			const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-			const pCmd = path$10.join(pathPart, cmd);
+			const pCmd = path$9.join(pathPart, cmd);
 			resolve(subStep(!pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd, i, 0));
 		});
 		const subStep = (p, i, ii) => new Promise((resolve, reject) => {
@@ -303694,7 +304259,7 @@ var require_which = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		for (let i = 0; i < pathEnv.length; i++) {
 			const ppRaw = pathEnv[i];
 			const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-			const pCmd = path$10.join(pathPart, cmd);
+			const pCmd = path$9.join(pathPart, cmd);
 			const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
 			for (let j = 0; j < pathExt.length; j++) {
 				const cur = p + pathExt[j];
@@ -303725,7 +304290,7 @@ var require_path_key = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js
 var require_resolveCommand = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$9 = __require("path");
+	const path$8 = __require("path");
 	const which = require_which();
 	const getPathKey = require_path_key();
 	function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -303740,12 +304305,12 @@ var require_resolveCommand = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 		try {
 			resolved = which.sync(parsed.command, {
 				path: env[getPathKey({ env })],
-				pathExt: withoutPathExt ? path$9.delimiter : void 0
+				pathExt: withoutPathExt ? path$8.delimiter : void 0
 			});
 		} catch (e) {} finally {
 			if (shouldSwitchCwd) process.chdir(cwd);
 		}
-		if (resolved) resolved = path$9.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+		if (resolved) resolved = path$8.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
 		return resolved;
 	}
 	function resolveCommand(parsed) {
@@ -303794,16 +304359,16 @@ var require_shebang_command = /* @__PURE__ */ __commonJSMin(((exports, module) =
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/readShebang.js
 var require_readShebang = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const fs$7 = __require("fs");
+	const fs$6 = __require("fs");
 	const shebangCommand = require_shebang_command();
 	function readShebang(command) {
 		const size = 150;
 		const buffer = Buffer.alloc(size);
 		let fd;
 		try {
-			fd = fs$7.openSync(command, "r");
-			fs$7.readSync(fd, buffer, 0, size, 0);
-			fs$7.closeSync(fd);
+			fd = fs$6.openSync(command, "r");
+			fs$6.readSync(fd, buffer, 0, size, 0);
+			fs$6.closeSync(fd);
 		} catch (e) {}
 		return shebangCommand(buffer.toString());
 	}
@@ -303812,7 +304377,7 @@ var require_readShebang = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/parse.js
 var require_parse$5 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$8 = __require("path");
+	const path$7 = __require("path");
 	const resolveCommand = require_resolveCommand();
 	const escape = require_escape();
 	const readShebang = require_readShebang();
@@ -303835,7 +304400,7 @@ var require_parse$5 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		const needsShell = !isExecutableRegExp.test(commandFile);
 		if (parsed.options.forceShell || needsShell) {
 			const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-			parsed.command = path$8.normalize(parsed.command);
+			parsed.command = path$7.normalize(parsed.command);
 			parsed.command = escape.command(parsed.command);
 			parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
 			parsed.args = [
@@ -337965,7 +338530,7 @@ var require_dist$5 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region ../../node_modules/.pnpm/yazl@3.3.1/node_modules/yazl/index.js
 var require_yazl = /* @__PURE__ */ __commonJSMin(((exports) => {
-	var fs$6 = __require("fs");
+	var fs$5 = __require("fs");
 	var Transform$2 = __require("stream").Transform;
 	var PassThrough$2 = __require("stream").PassThrough;
 	var zlib$1 = __require("zlib");
@@ -337994,14 +338559,14 @@ var require_yazl = /* @__PURE__ */ __commonJSMin(((exports) => {
 		if (shouldIgnoreAdding(self)) return;
 		var entry = new Entry(metadataPath, false, options);
 		self.entries.push(entry);
-		fs$6.stat(realPath, function(err, stats) {
+		fs$5.stat(realPath, function(err, stats) {
 			if (err) return self.emit("error", err);
 			if (!stats.isFile()) return self.emit("error", /* @__PURE__ */ new Error("not a file: " + realPath));
 			entry.uncompressedSize = stats.size;
 			if (options.mtime == null) entry.setLastModDate(stats.mtime);
 			if (options.mode == null) entry.setFileAttributesMode(stats.mode);
 			entry.setFileDataPumpFunction(function() {
-				var readStream = fs$6.createReadStream(realPath);
+				var readStream = fs$5.createReadStream(realPath);
 				entry.state = Entry.FILE_DATA_IN_PROGRESS;
 				readStream.on("error", function(err) {
 					self.emit("error", err);
@@ -339138,6 +339703,15 @@ var init_rpc$1 = __esmMin((() => {
 		async createGoal({ agentId, ...payload }) {
 			return (await this.getAgent(agentId)).createGoal(payload);
 		}
+		async editGoal({ agentId, ...payload }) {
+			return (await this.getAgent(agentId)).editGoal(payload);
+		}
+		async blockGoal({ agentId, ...payload }) {
+			return (await this.getAgent(agentId)).blockGoal(payload);
+		}
+		async completeGoal({ agentId }) {
+			return (await this.getAgent(agentId)).completeGoal({});
+		}
 		async getGoal({ agentId, ...payload }) {
 			return (await this.getAgent(agentId, true)).getGoal(payload);
 		}
@@ -340572,6 +341146,15 @@ var init_core_impl = __esmMin((() => {
 		getGoal({ sessionId, ...payload }) {
 			return Promise.resolve(this.sessionApi(sessionId).getGoal(payload));
 		}
+		editGoal({ sessionId, ...payload }) {
+			return Promise.resolve(this.sessionApi(sessionId).editGoal(payload));
+		}
+		blockGoal({ sessionId, ...payload }) {
+			return Promise.resolve(this.sessionApi(sessionId).blockGoal(payload));
+		}
+		completeGoal({ sessionId, ...payload }) {
+			return Promise.resolve(this.sessionApi(sessionId).completeGoal(payload));
+		}
 		pauseGoal({ sessionId, ...payload }) {
 			return Promise.resolve(this.sessionApi(sessionId).pauseGoal(payload));
 		}
@@ -348185,7 +348768,10 @@ function reduceWireRecords(records) {
 						text: record.summary
 					}],
 					toolCalls: [],
-					origin: { kind: "compaction_summary" }
+					origin: {
+						kind: "compaction_summary",
+						...record.toolContinuity === void 0 ? {} : { toolContinuity: record.toolContinuity }
+					}
 				},
 				time: record.time
 			};
@@ -350459,6 +351045,24 @@ var Session = class {
 		this.ensureOpen();
 		return this.rpc.getGoal({ sessionId: this.id });
 	}
+	async editGoal(input) {
+		this.ensureOpen();
+		return this.rpc.editGoal({
+			sessionId: this.id,
+			objective: input.objective
+		});
+	}
+	async blockGoal(input = {}) {
+		this.ensureOpen();
+		return this.rpc.blockGoal({
+			sessionId: this.id,
+			reason: input.reason
+		});
+	}
+	async completeGoal() {
+		this.ensureOpen();
+		return this.rpc.completeGoal({ sessionId: this.id });
+	}
 	async pauseGoal() {
 		this.ensureOpen();
 		return this.rpc.pauseGoal({ sessionId: this.id });
@@ -351848,6 +352452,26 @@ var SDKRpcClientBase = class {
 			replace: input.replace
 		});
 	}
+	async editGoal(input) {
+		return (await this.getRpc()).editGoal({
+			sessionId: input.sessionId,
+			agentId: this.interactiveAgentId,
+			objective: input.objective
+		});
+	}
+	async blockGoal(input) {
+		return (await this.getRpc()).blockGoal({
+			sessionId: input.sessionId,
+			agentId: this.interactiveAgentId,
+			reason: input.reason
+		});
+	}
+	async completeGoal(input) {
+		return (await this.getRpc()).completeGoal({
+			sessionId: input.sessionId,
+			agentId: this.interactiveAgentId
+		});
+	}
 	async getGoal(input) {
 		return (await this.getRpc()).getGoal({
 			sessionId: input.sessionId,
@@ -353902,8 +354526,8 @@ var require_suggestSimilar = /* @__PURE__ */ __commonJSMin(((exports) => {
 var require_command = /* @__PURE__ */ __commonJSMin(((exports) => {
 	const EventEmitter$12 = __require("node:events").EventEmitter;
 	const childProcess = __require("node:child_process");
-	const path$7 = __require("node:path");
-	const fs$5 = __require("node:fs");
+	const path$6 = __require("node:path");
+	const fs$4 = __require("node:fs");
 	const process$2 = __require("node:process");
 	const { Argument, humanReadableArgName } = require_argument();
 	const { CommanderError } = require_error$2();
@@ -354786,7 +355410,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
 		* @param {string} subcommandName
 		*/
 		_checkForMissingExecutable(executableFile, executableDir, subcommandName) {
-			if (fs$5.existsSync(executableFile)) return;
+			if (fs$4.existsSync(executableFile)) return;
 			const executableMissing = `'${executableFile}' does not exist
  - if '${subcommandName}' is not meant to be an executable command, remove description parameter from '.command()' and use '.description()' instead
  - if the default executable name is not suitable, use the executableFile option to supply a custom name or path
@@ -354809,10 +355433,10 @@ Expecting one of '${allowedValues.join("', '")}'`);
 				".cjs"
 			];
 			function findFile(baseDir, baseName) {
-				const localBin = path$7.resolve(baseDir, baseName);
-				if (fs$5.existsSync(localBin)) return localBin;
-				if (sourceExt.includes(path$7.extname(baseName))) return void 0;
-				const foundExt = sourceExt.find((ext) => fs$5.existsSync(`${localBin}${ext}`));
+				const localBin = path$6.resolve(baseDir, baseName);
+				if (fs$4.existsSync(localBin)) return localBin;
+				if (sourceExt.includes(path$6.extname(baseName))) return void 0;
+				const foundExt = sourceExt.find((ext) => fs$4.existsSync(`${localBin}${ext}`));
 				if (foundExt) return `${localBin}${foundExt}`;
 			}
 			this._checkForMissingMandatoryOptions();
@@ -354822,21 +355446,21 @@ Expecting one of '${allowedValues.join("', '")}'`);
 			if (this._scriptPath) {
 				let resolvedScriptPath;
 				try {
-					resolvedScriptPath = fs$5.realpathSync(this._scriptPath);
+					resolvedScriptPath = fs$4.realpathSync(this._scriptPath);
 				} catch {
 					resolvedScriptPath = this._scriptPath;
 				}
-				executableDir = path$7.resolve(path$7.dirname(resolvedScriptPath), executableDir);
+				executableDir = path$6.resolve(path$6.dirname(resolvedScriptPath), executableDir);
 			}
 			if (executableDir) {
 				let localFile = findFile(executableDir, executableFile);
 				if (!localFile && !subcommand._executableFile && this._scriptPath) {
-					const legacyName = path$7.basename(this._scriptPath, path$7.extname(this._scriptPath));
+					const legacyName = path$6.basename(this._scriptPath, path$6.extname(this._scriptPath));
 					if (legacyName !== this._name) localFile = findFile(executableDir, `${legacyName}-${subcommand._name}`);
 				}
 				executableFile = localFile || executableFile;
 			}
-			launchWithNode = sourceExt.includes(path$7.extname(executableFile));
+			launchWithNode = sourceExt.includes(path$6.extname(executableFile));
 			let proc;
 			if (process$2.platform !== "win32") if (launchWithNode) {
 				args.unshift(executableFile);
@@ -355540,7 +356164,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
 		* @return {Command}
 		*/
 		nameFromFilename(filename) {
-			this._name = path$7.basename(filename, path$7.extname(filename));
+			this._name = path$6.basename(filename, path$6.extname(filename));
 			return this;
 		}
 		/**
@@ -361756,6 +362380,25 @@ var AcpSession = class {
 					});
 					return;
 				}
+				if (event.type === "warning" && event.code === "agents-md-request-truncated") {
+					if (!isFromMainAgent(event)) return;
+					conn.sessionUpdate({
+						sessionId,
+						update: {
+							sessionUpdate: "agent_message_chunk",
+							content: {
+								type: "text",
+								text: `${event.message}\n`
+							}
+						}
+					}).catch((err) => {
+						log.warn("acp: failed to push instruction warning", {
+							sessionId,
+							error: err instanceof Error ? err.message : String(err)
+						});
+					});
+					return;
+				}
 				if (event.type === "assistant.delta") {
 					if (!isFromMainAgent(event)) return;
 					conn.sessionUpdate(assistantDeltaToSessionUpdate(sessionId, event)).catch((err) => {
@@ -373383,10 +374026,10 @@ var require_atomic_sleep = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region ../../node_modules/.pnpm/sonic-boom@4.2.1/node_modules/sonic-boom/index.js
 var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const fs$4 = __require("fs");
+	const fs$3 = __require("fs");
 	const EventEmitter$10 = __require("events");
 	const inherits$6 = __require("util").inherits;
-	const path$6 = __require("path");
+	const path$5 = __require("path");
 	const sleep = require_atomic_sleep();
 	const assert$8 = __require("assert");
 	const BUSY_WRITE_TIMEOUT = 100;
@@ -373426,17 +374069,17 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		const flags = sonic.append ? "a" : "w";
 		const mode = sonic.mode;
 		if (sonic.sync) try {
-			if (sonic.mkdir) fs$4.mkdirSync(path$6.dirname(file), { recursive: true });
-			fileOpened(null, fs$4.openSync(file, flags, mode));
+			if (sonic.mkdir) fs$3.mkdirSync(path$5.dirname(file), { recursive: true });
+			fileOpened(null, fs$3.openSync(file, flags, mode));
 		} catch (err) {
 			fileOpened(err);
 			throw err;
 		}
-		else if (sonic.mkdir) fs$4.mkdir(path$6.dirname(file), { recursive: true }, (err) => {
+		else if (sonic.mkdir) fs$3.mkdir(path$5.dirname(file), { recursive: true }, (err) => {
 			if (err) return fileOpened(err);
-			fs$4.open(file, flags, mode, fileOpened);
+			fs$3.open(file, flags, mode, fileOpened);
 		});
-		else fs$4.open(file, flags, mode, fileOpened);
+		else fs$3.open(file, flags, mode, fileOpened);
 	}
 	function SonicBoom(opts) {
 		if (!(this instanceof SonicBoom)) return new SonicBoom(opts);
@@ -373474,8 +374117,8 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			this.flush = flushBuffer;
 			this.flushSync = flushBufferSync;
 			this._actualWrite = actualWriteBuffer;
-			fsWriteSync = () => fs$4.writeSync(this.fd, this._writingBuf);
-			fsWrite = () => fs$4.write(this.fd, this._writingBuf, this.release);
+			fsWriteSync = () => fs$3.writeSync(this.fd, this._writingBuf);
+			fsWrite = () => fs$3.write(this.fd, this._writingBuf, this.release);
 		} else if (contentMode === void 0 || contentMode === kContentModeUtf8) {
 			this._writingBuf = "";
 			this.write = write;
@@ -373483,12 +374126,12 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			this.flushSync = flushSync;
 			this._actualWrite = actualWrite;
 			fsWriteSync = () => {
-				if (Buffer.isBuffer(this._writingBuf)) return fs$4.writeSync(this.fd, this._writingBuf);
-				return fs$4.writeSync(this.fd, this._writingBuf, "utf8");
+				if (Buffer.isBuffer(this._writingBuf)) return fs$3.writeSync(this.fd, this._writingBuf);
+				return fs$3.writeSync(this.fd, this._writingBuf, "utf8");
 			};
 			fsWrite = () => {
-				if (Buffer.isBuffer(this._writingBuf)) return fs$4.write(this.fd, this._writingBuf, this.release);
-				return fs$4.write(this.fd, this._writingBuf, "utf8", this.release);
+				if (Buffer.isBuffer(this._writingBuf)) return fs$3.write(this.fd, this._writingBuf, this.release);
+				return fs$3.write(this.fd, this._writingBuf, "utf8", this.release);
 			};
 		} else throw new Error(`SonicBoom supports "${kContentModeUtf8}" and "${kContentModeBuffer}", but passed ${contentMode}`);
 		if (typeof fd === "number") {
@@ -373533,7 +374176,7 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					return;
 				}
 			}
-			if (this._fsync) fs$4.fsyncSync(this.fd);
+			if (this._fsync) fs$3.fsyncSync(this.fd);
 			const len = this._len;
 			if (this._reopening) {
 				this._writing = false;
@@ -373630,7 +374273,7 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		this._flushPending = true;
 		const onDrain = () => {
 			if (!this._fsync) try {
-				fs$4.fsync(this.fd, (err) => {
+				fs$3.fsync(this.fd, (err) => {
 					this._flushPending = false;
 					cb(err);
 				});
@@ -373707,7 +374350,7 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		if (this._writing) return;
 		const fd = this.fd;
 		this.once("ready", () => {
-			if (fd !== this.fd) fs$4.close(fd, (err) => {
+			if (fd !== this.fd) fs$3.close(fd, (err) => {
 				if (err) return this.emit("error", err);
 			});
 		});
@@ -373738,7 +374381,7 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		while (this._bufs.length || buf.length) {
 			if (buf.length <= 0) buf = this._bufs[0];
 			try {
-				const n = Buffer.isBuffer(buf) ? fs$4.writeSync(this.fd, buf) : fs$4.writeSync(this.fd, buf, "utf8");
+				const n = Buffer.isBuffer(buf) ? fs$3.writeSync(this.fd, buf) : fs$3.writeSync(this.fd, buf, "utf8");
 				const releasedBufObj = releaseWritingBuf(buf, this._len, n);
 				buf = releasedBufObj.writingBuf;
 				this._len = releasedBufObj.len;
@@ -373749,7 +374392,7 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			}
 		}
 		try {
-			fs$4.fsyncSync(this.fd);
+			fs$3.fsyncSync(this.fd);
 		} catch {}
 	}
 	function flushBufferSync() {
@@ -373763,7 +374406,7 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		while (this._bufs.length || buf.length) {
 			if (buf.length <= 0) buf = mergeBuf(this._bufs[0], this._lens[0]);
 			try {
-				const n = fs$4.writeSync(this.fd, buf);
+				const n = fs$3.writeSync(this.fd, buf);
 				buf = buf.subarray(n);
 				this._len = Math.max(this._len - n, 0);
 				if (buf.length <= 0) {
@@ -373785,24 +374428,24 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		this._writing = true;
 		this._writingBuf = this._writingBuf.length ? this._writingBuf : this._bufs.shift() || "";
 		if (this.sync) try {
-			release(null, Buffer.isBuffer(this._writingBuf) ? fs$4.writeSync(this.fd, this._writingBuf) : fs$4.writeSync(this.fd, this._writingBuf, "utf8"));
+			release(null, Buffer.isBuffer(this._writingBuf) ? fs$3.writeSync(this.fd, this._writingBuf) : fs$3.writeSync(this.fd, this._writingBuf, "utf8"));
 		} catch (err) {
 			release(err);
 		}
-		else fs$4.write(this.fd, this._writingBuf, release);
+		else fs$3.write(this.fd, this._writingBuf, release);
 	}
 	function actualWriteBuffer() {
 		const release = this.release;
 		this._writing = true;
 		this._writingBuf = this._writingBuf.length ? this._writingBuf : mergeBuf(this._bufs.shift(), this._lens.shift());
 		if (this.sync) try {
-			release(null, fs$4.writeSync(this.fd, this._writingBuf));
+			release(null, fs$3.writeSync(this.fd, this._writingBuf));
 		} catch (err) {
 			release(err);
 		}
 		else {
 			if (kCopyBuffer) this._writingBuf = Buffer.from(this._writingBuf);
-			fs$4.write(this.fd, this._writingBuf, release);
+			fs$3.write(this.fd, this._writingBuf, release);
 		}
 	}
 	function actualClose(sonic) {
@@ -373816,10 +374459,10 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		sonic._lens = [];
 		assert$8(typeof sonic.fd === "number", `sonic.fd must be a number, got ${typeof sonic.fd}`);
 		try {
-			fs$4.fsync(sonic.fd, closeWrapped);
+			fs$3.fsync(sonic.fd, closeWrapped);
 		} catch {}
 		function closeWrapped() {
-			if (sonic.fd !== 1 && sonic.fd !== 2) fs$4.close(sonic.fd, done);
+			if (sonic.fd !== 1 && sonic.fd !== 2) fs$3.close(sonic.fd, done);
 			else done();
 		}
 		function done(err) {
@@ -403459,7 +404102,7 @@ var import_multipart = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((
 	const fp = require_plugin();
 	const { createWriteStream: createWriteStream$1 } = __require("node:fs");
 	const { unlink: unlink$1 } = __require("node:fs/promises");
-	const path$5 = __require("node:path");
+	const path$4 = __require("node:path");
 	const { generateId } = require_generateId();
 	const createError = require_error$1();
 	const streamToNull = require_stream_consumer();
@@ -403754,7 +404397,7 @@ var import_multipart = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((
 			for await (const part of parts) {
 				values = part.fields;
 				if (!part.file) continue;
-				const filepath = path$5.join(tmpdir, generateId() + path$5.extname(part.filename || "file" + i++));
+				const filepath = path$4.join(tmpdir, generateId() + path$4.extname(part.filename || "file" + i++));
 				const target = createWriteStream$1(filepath);
 				try {
 					this.tmpUploads.push(filepath);
@@ -416495,8 +417138,8 @@ var require_dist$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 //#endregion
 //#region ../../node_modules/.pnpm/@fastify+swagger@9.7.0/node_modules/@fastify/swagger/lib/mode/static.js
 var require_static = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$4 = __require("node:path");
-	const fs$3 = __require("node:fs");
+	const path$3 = __require("node:path");
+	const fs$2 = __require("node:fs");
 	const yaml = require_dist$1();
 	module.exports = function(fastify, opts, done) {
 		if (!opts.specification) return done(/* @__PURE__ */ new Error("specification is missing in the module options"));
@@ -416505,14 +417148,14 @@ var require_static = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		if (!opts.specification.path && !opts.specification.document) return done(/* @__PURE__ */ new Error("both specification.path and specification.document are missing, should be path to the file or swagger document spec"));
 		else if (opts.specification.path) {
 			if (typeof opts.specification.path !== "string") return done(/* @__PURE__ */ new Error("specification.path is not a string"));
-			if (!fs$3.existsSync(path$4.resolve(opts.specification.path))) return done(/* @__PURE__ */ new Error(`${opts.specification.path} does not exist`));
-			const extName = path$4.extname(opts.specification.path).toLowerCase();
+			if (!fs$2.existsSync(path$3.resolve(opts.specification.path))) return done(/* @__PURE__ */ new Error(`${opts.specification.path} does not exist`));
+			const extName = path$3.extname(opts.specification.path).toLowerCase();
 			if ([".yaml", ".json"].indexOf(extName) === -1) return done(/* @__PURE__ */ new Error("specification.path extension name is not supported, should be one from ['.yaml', '.json']"));
 			if (opts.specification.postProcessor && typeof opts.specification.postProcessor !== "function") return done(/* @__PURE__ */ new Error("specification.postProcessor should be a function"));
 			if (opts.specification.baseDir && typeof opts.specification.baseDir !== "string") return done(/* @__PURE__ */ new Error("specification.baseDir should be string"));
-			if (!opts.specification.baseDir) opts.specification.baseDir = path$4.resolve(path$4.dirname(opts.specification.path));
+			if (!opts.specification.baseDir) opts.specification.baseDir = path$3.resolve(path$3.dirname(opts.specification.path));
 			else while (opts.specification.baseDir.endsWith("/")) opts.specification.baseDir = opts.specification.baseDir.slice(0, -1);
-			const source = fs$3.readFileSync(path$4.resolve(opts.specification.path), "utf8");
+			const source = fs$2.readFileSync(path$3.resolve(opts.specification.path), "utf8");
 			switch (extName) {
 				case ".yaml":
 					swaggerObject = yaml.parse(source);
@@ -416779,11 +417422,11 @@ var require_should_route_hide = /* @__PURE__ */ __commonJSMin(((exports, module)
 //#endregion
 //#region ../../node_modules/.pnpm/@fastify+swagger@9.7.0/node_modules/@fastify/swagger/lib/util/read-package-json.js
 var require_read_package_json = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const fs$2 = __require("node:fs");
-	const path$3 = __require("node:path");
+	const fs$1 = __require("node:fs");
+	const path$2 = __require("node:path");
 	function readPackageJson() {
 		try {
-			return JSON.parse(fs$2.readFileSync(path$3.join(__dirname, "..", "..", "package.json")));
+			return JSON.parse(fs$1.readFileSync(path$2.join(__dirname, "..", "..", "package.json")));
 		} catch {
 			return {};
 		}
@@ -426506,7 +427149,7 @@ async function searchLocalToolEvents(homeDir, sessions, query, limit = 8) {
 				skippedRecords++;
 				continue;
 			}
-			const searchable = `${event.tool} ${event.filePath ?? ""}`.normalize("NFKC").toLocaleLowerCase();
+			const searchable = `${event.tool} ${event.status} ${event.filePath ?? ""}`.normalize("NFKC").toLocaleLowerCase();
 			if (terms.every((term) => searchable.includes(term))) {
 				hits.push(event);
 				hits.sort((a, b) => b.at - a.at || a.sessionId.localeCompare(b.sessionId));
@@ -433766,9 +434409,9 @@ var TUI = class TUI extends Container {
 		const debugRedraw = process.env["PI_DEBUG_REDRAW"] === "1";
 		const logRedraw = (reason) => {
 			if (!debugRedraw) return;
-			const logPath = path$17.join(nodeOs.homedir(), ".pi", "agent", "pi-debug.log");
+			const logPath = path$16.join(nodeOs.homedir(), ".pi", "agent", "pi-debug.log");
 			const msg = `[${(/* @__PURE__ */ new Date()).toISOString()}] fullRender: ${reason} (prev=${this.previousLines.length}, new=${newLines.length}, height=${height})\n`;
-			fs$17.appendFileSync(logPath, msg);
+			fs$16.appendFileSync(logPath, msg);
 		};
 		if (this.previousLines.length === 0 && !widthChanged && !heightChanged) {
 			logRedraw("first render");
@@ -433915,8 +434558,8 @@ var TUI = class TUI extends Container {
 		buffer += "\x1B[?2026l";
 		if (process.env["PI_TUI_DEBUG"] === "1") {
 			const debugDir = "/tmp/tui";
-			fs$17.mkdirSync(debugDir, { recursive: true });
-			const debugPath = path$17.join(debugDir, `render-${Date.now()}-${Math.random().toString(36).slice(2)}.log`);
+			fs$16.mkdirSync(debugDir, { recursive: true });
+			const debugPath = path$16.join(debugDir, `render-${Date.now()}-${Math.random().toString(36).slice(2)}.log`);
 			const debugData = [
 				`firstChanged: ${firstChanged}`,
 				`viewportTop: ${viewportTop}`,
@@ -433939,7 +434582,7 @@ var TUI = class TUI extends Container {
 				"=== buffer ===",
 				JSON.stringify(buffer)
 			].join("\n");
-			fs$17.writeFileSync(debugPath, debugData);
+			fs$16.writeFileSync(debugPath, debugData);
 		}
 		this.terminal.write(buffer);
 		this.cursorRow = Math.max(0, newLines.length - 1);
@@ -438525,12 +439168,12 @@ function loadNativeModifiersHelper() {
 	if (process.platform !== "darwin") return void 0;
 	const arch = process.arch;
 	if (arch !== "x64" && arch !== "arm64") return void 0;
-	const moduleDir = path$17.dirname(fileURLToPath(import.meta.url));
-	const nativePath = path$17.join("native", "darwin", "prebuilds", `darwin-${arch}`, "darwin-modifiers.node");
+	const moduleDir = path$16.dirname(fileURLToPath(import.meta.url));
+	const nativePath = path$16.join("native", "darwin", "prebuilds", `darwin-${arch}`, "darwin-modifiers.node");
 	const candidates = [
-		path$17.join(moduleDir, "..", nativePath),
-		path$17.join(moduleDir, nativePath),
-		path$17.join(path$17.dirname(process.execPath), nativePath)
+		path$16.join(moduleDir, "..", nativePath),
+		path$16.join(moduleDir, nativePath),
+		path$16.join(path$16.dirname(process.execPath), nativePath)
 	];
 	for (const modulePath of candidates) try {
 		const helper = cjsRequire$1(modulePath);
@@ -438603,10 +439246,10 @@ var ProcessTerminal = class {
 		const env = process.env["PI_TUI_WRITE_LOG"] || "";
 		if (!env) return "";
 		try {
-			if (fs$17.statSync(env).isDirectory()) {
+			if (fs$16.statSync(env).isDirectory()) {
 				const now = /* @__PURE__ */ new Date();
 				const ts = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}_${String(now.getHours()).padStart(2, "0")}-${String(now.getMinutes()).padStart(2, "0")}-${String(now.getSeconds()).padStart(2, "0")}`;
-				return path$17.join(env, `tui-${ts}-${process.pid}.log`);
+				return path$16.join(env, `tui-${ts}-${process.pid}.log`);
 			}
 		} catch {}
 		return env;
@@ -438809,12 +439452,12 @@ var ProcessTerminal = class {
 		try {
 			const arch = process.arch;
 			if (arch !== "x64" && arch !== "arm64") return;
-			const moduleDir = path$17.dirname(fileURLToPath(import.meta.url));
-			const nativePath = path$17.join("native", "win32", "prebuilds", `win32-${arch}`, "win32-console-mode.node");
+			const moduleDir = path$16.dirname(fileURLToPath(import.meta.url));
+			const nativePath = path$16.join("native", "win32", "prebuilds", `win32-${arch}`, "win32-console-mode.node");
 			const candidates = [
-				path$17.join(moduleDir, "..", nativePath),
-				path$17.join(moduleDir, nativePath),
-				path$17.join(path$17.dirname(process.execPath), nativePath)
+				path$16.join(moduleDir, "..", nativePath),
+				path$16.join(moduleDir, nativePath),
+				path$16.join(path$16.dirname(process.execPath), nativePath)
 			];
 			for (const modulePath of candidates) try {
 				cjsRequire(modulePath).enableVirtualTerminalInput?.();
@@ -438886,7 +439529,7 @@ var ProcessTerminal = class {
 	write(data) {
 		process.stdout.write(data);
 		if (this.writeLogPath) try {
-			fs$17.appendFileSync(this.writeLogPath, data, { encoding: "utf8" });
+			fs$16.appendFileSync(this.writeLogPath, data, { encoding: "utf8" });
 		} catch {}
 	}
 	get columns() {
@@ -439421,7 +440064,7 @@ function buildUsageReportLines(options) {
 	const errorStyle = (text) => currentTheme.fg("error", text);
 	const severityColor = (sev) => sev === "danger" ? "error" : sev === "warn" ? "warning" : "success";
 	const lines = [accent(uiText("usage.session.title")), ...buildSessionUsageSection(options.sessionUsage, options.sessionUsageError, value, muted, errorStyle)];
-	if (options.maxContextTokens > 0) {
+	if (Number.isFinite(options.maxContextTokens) && options.maxContextTokens > 0) {
 		const ratio = safeUsageRatio(options.contextTokens / options.maxContextTokens);
 		const bar = renderProgressBar(ratio, 20);
 		const pct = `${(ratio * 100).toFixed(1)}%`;
@@ -439672,7 +440315,7 @@ function buildStatusReportLines(options) {
 	const { ratio, tokens, maxTokens } = contextValues(options);
 	lines.push("");
 	lines.push(accent(uiText("usage.context.title")));
-	if (maxTokens > 0) {
+	if (Number.isFinite(maxTokens) && maxTokens > 0) {
 		const safeRatio = safeUsageRatio(ratio);
 		const bar = renderProgressBar(safeRatio, 20);
 		const barColoured = currentTheme.fg(severityToken(ratioSeverity(safeRatio)), bar);
@@ -440623,11 +441266,18 @@ registerUiCatalogFragment({
 //#endregion
 //#region src/tui/utils/event-payload.ts
 function appendStreamingArgsPreview(current, next) {
-	const existing = (current ?? "").slice(0, STREAMING_ARGS_PREVIEW_MAX_CHARS);
+	let existing = (current ?? "").slice(0, STREAMING_ARGS_PREVIEW_MAX_CHARS);
+	const boundary = existing.charCodeAt(existing.length - 1);
+	if (existing.length === 65536 && boundary >= 55296 && boundary <= 56319) existing = existing.slice(0, -1);
 	if (next === null || next === void 0 || next.length === 0) return existing;
 	const remaining = STREAMING_ARGS_PREVIEW_MAX_CHARS - existing.length;
 	if (remaining <= 0) return existing;
-	return `${existing}${next.slice(0, remaining)}`;
+	const first = next.charCodeAt(0);
+	const previous = existing.charCodeAt(existing.length - 1);
+	const continuation = first >= 56320 && first <= 57343 && !(previous >= 55296 && previous <= 56319) ? next.slice(1) : next;
+	const preview = `${existing}${continuation.slice(0, remaining)}`;
+	const last = preview.charCodeAt(preview.length - 1);
+	return preview.length === 65536 && last >= 55296 && last <= 56319 ? preview.slice(0, -1) : preview;
 }
 function unescapeJsonString$1(s) {
 	return s.replaceAll(/\\(["\\/bfnrt])/g, (_, ch) => {
@@ -502538,6 +503188,7 @@ const BUILTIN_SLASH_COMMAND_DEFINITIONS = [
 			const tokens = trimmed.split(/\s+/);
 			const action = tokens[0]?.toLowerCase();
 			if (action === "next") return "always";
+			if (action === "edit" || action === "block") return "always";
 			if (tokens.length === 1 && (action === "status" || action === "pause" || action === "paused" || action === "cancel" || action === "clear" || action === "stop")) return "always";
 			return "idle-only";
 		}
@@ -509362,7 +510013,9 @@ registerUiCatalogFragment({
 //#region src/tui/commands/goal.ts
 const MAX_GOAL_OBJECTIVE_LENGTH = 4e3;
 const RESUME_GOAL_INPUT = "Resume the active goal.";
+const pendingGoalEdits = /* @__PURE__ */ new WeakMap();
 const CONTROL_SUBCOMMANDS = new Map([
+	["complete", "complete"],
 	["pause", "pause"],
 	["paused", "pause"],
 	["resume", "resume"],
@@ -509384,6 +510037,26 @@ function parseGoalCommand(rawArgs) {
 	if (args.length === 0 || args.toLowerCase() === "status") return { kind: "status" };
 	const tokens = args.split(/\s+/);
 	const first = tokens[0]?.toLowerCase();
+	if (first === "block") return {
+		kind: "block",
+		reason: tokens.slice(1).join(" ").trim() || void 0
+	};
+	if (first === "edit") {
+		const objective = tokens.slice(1).join(" ").trim();
+		if (objective.length === 0) return {
+			kind: "error",
+			severity: "hint",
+			message: uiText("goal.error.objectiveRequired")
+		};
+		if (objective.length > MAX_GOAL_OBJECTIVE_LENGTH) return {
+			kind: "error",
+			message: uiText("goal.error.objectiveTooLong", { max: MAX_GOAL_OBJECTIVE_LENGTH })
+		};
+		return {
+			kind: "edit",
+			objective
+		};
+	}
 	if (first === "next") return parseNextGoalCommand(tokens);
 	const control = first === void 0 ? void 0 : CONTROL_SUBCOMMANDS.get(first);
 	if (control !== void 0 && tokens.length === 1) return { kind: control };
@@ -509421,6 +510094,15 @@ async function handleGoalCommand(host, args) {
 		case "status":
 			await showGoalStatus(host);
 			return;
+		case "edit":
+			await editGoal(host, parsed.objective);
+			return;
+		case "block":
+			await blockGoal(host, parsed.reason);
+			return;
+		case "complete":
+			await completeGoal(host);
+			return;
 		case "pause":
 			await pauseGoal(host);
 			return;
@@ -509666,12 +510348,78 @@ async function startGoal(host, parsed, options) {
 	else host.sendNormalUserInput(parsed.objective);
 	return true;
 }
+async function completeGoal(host) {
+	if (isBusy(host)) {
+		host.showStatus(slashBusyMessage("goal", host.state.appState.isCompacting ? "compacting" : "streaming"));
+		return;
+	}
+	const session = host.requireSession();
+	pendingGoalEdits.delete(host);
+	try {
+		const result = await session.completeGoal();
+		if (host.session !== session || result !== null) return;
+		const { goal } = await session.getGoal();
+		if (host.session !== session) return;
+		host.setAppState({ goal });
+		if (goal === null) host.showStatus(uiText("goal.status.noneSet"));
+		else renderGoalStatus(host, goal);
+	} catch (error) {
+		if (host.session !== session) return;
+		if (isBlunError(error) && error.code === ErrorCodes.GOAL_NOT_FOUND) {
+			host.showStatus(uiText("goal.status.noneSet"));
+			return;
+		}
+		host.showError(formatErrorMessage$2(error));
+	}
+}
+async function blockGoal(host, reason) {
+	const session = host.requireSession();
+	pendingGoalEdits.delete(host);
+	try {
+		const goal = await session.blockGoal({ reason });
+		if (host.session !== session) return;
+		if (isStreaming$1(host)) await session.cancel();
+		if (host.session !== session) return;
+		host.setAppState({ goal });
+		renderGoalStatus(host, goal);
+	} catch (error) {
+		if (host.session !== session) return;
+		if (isBlunError(error) && error.code === ErrorCodes.GOAL_NOT_FOUND) {
+			host.showStatus(uiText("goal.status.noneSet"));
+			return;
+		}
+		host.showError(formatErrorMessage$2(error));
+	}
+}
+async function editGoal(host, objective) {
+	const session = host.requireSession();
+	const request = Symbol("goal-edit");
+	pendingGoalEdits.set(host, request);
+	try {
+		const goal = await session.editGoal({ objective });
+		if (host.session !== session || pendingGoalEdits.get(host) !== request) return;
+		host.setAppState({ goal });
+		renderGoalStatus(host, goal);
+	} catch (error) {
+		if (host.session !== session || pendingGoalEdits.get(host) !== request) return;
+		if (isBlunError(error) && error.code === ErrorCodes.GOAL_NOT_FOUND) {
+			host.showStatus(uiText("goal.status.noneSet"));
+			return;
+		}
+		host.showError(formatErrorMessage$2(error));
+	} finally {
+		if (pendingGoalEdits.get(host) === request) pendingGoalEdits.delete(host);
+	}
+}
 async function pauseGoal(host) {
 	const session = host.requireSession();
+	pendingGoalEdits.delete(host);
 	try {
 		await session.pauseGoal();
+		if (host.session !== session) return;
 		if (isStreaming$1(host)) await session.cancel();
 	} catch (error) {
+		if (host.session !== session) return;
 		if (isBlunError(error) && error.code === ErrorCodes.GOAL_NOT_FOUND) {
 			host.showStatus(uiText("goal.status.noneToPause"));
 			return;
@@ -509679,6 +510427,7 @@ async function pauseGoal(host) {
 		host.showError(formatErrorMessage$2(error));
 		return;
 	}
+	if (host.session !== session) return;
 	host.track("goal_pause");
 	host.showStatus(uiText("goal.status.paused"));
 }
@@ -509687,9 +510436,12 @@ async function resumeGoal(host) {
 		host.showError(uiText("goal.error.modelNotSet"));
 		return;
 	}
+	const session = host.requireSession();
+	pendingGoalEdits.delete(host);
 	try {
-		await host.requireSession().resumeGoal();
+		await session.resumeGoal();
 	} catch (error) {
+		if (host.session !== session) return;
 		if (isBlunError(error) && error.code === ErrorCodes.GOAL_NOT_FOUND) {
 			host.showStatus(uiText("goal.status.noneToResume"));
 			return;
@@ -509697,15 +510449,19 @@ async function resumeGoal(host) {
 		host.showError(formatErrorMessage$2(error));
 		return;
 	}
+	if (host.session !== session) return;
 	host.track("goal_resume");
 	host.sendNormalUserInput(RESUME_GOAL_INPUT);
 }
 async function cancelGoal(host) {
 	const session = host.requireSession();
+	pendingGoalEdits.delete(host);
 	try {
 		await session.cancelGoal();
+		if (host.session !== session) return;
 		if (isStreaming$1(host)) await session.cancel();
 	} catch (error) {
+		if (host.session !== session) return;
 		if (isBlunError(error) && error.code === ErrorCodes.GOAL_NOT_FOUND) {
 			host.showStatus(uiText("goal.status.noneToCancel"));
 			return;
@@ -509713,6 +510469,7 @@ async function cancelGoal(host) {
 		host.showError(formatErrorMessage$2(error));
 		return;
 	}
+	if (host.session !== session) return;
 	host.track("goal_cancel");
 	host.showNotice(uiText("goal.status.cancelled"));
 }
@@ -509723,6 +510480,9 @@ async function showGoalStatus(host) {
 		host.showStatus(uiText("goal.status.noneSet"));
 		return;
 	}
+	renderGoalStatus(host, goal);
+}
+function renderGoalStatus(host, goal) {
 	if (host.getChannelCommandContext?.() !== void 0) {
 		host.showStatus(`${goalPanelTitle(goal).trim()}\n${goal.objective}`);
 		return;
@@ -521035,6 +521795,196 @@ function numberField(record, key) {
 	return typeof value === "number" && Number.isFinite(value) ? value : 0;
 }
 //#endregion
+//#region src/tui/components/media/image-thumbnail.ts
+/**
+* Transcript-side rendering of a pasted image.
+*
+* On terminals that speak the Kitty graphics protocol or iTerm2 inline
+* image protocol (detected by pi-tui's `getCapabilities()`), we show
+* the actual image. Everywhere else we fall back to a one-line text
+* marker matching the placeholder the user sees in the input box —
+* this keeps the transcript readable on Terminal.app / Linux default
+* terminals / `script` recordings without extra chrome.
+*
+* Height is capped at ~12 rows so a single screenshot can't monopolize
+* the viewport; pi-tui handles proportional scaling internally.
+*/
+const MAX_IMAGE_ROWS = 12;
+const MAX_IMAGE_WIDTH = 40;
+var ImageThumbnail = class extends Container {
+	attachment;
+	image;
+	lastBuiltProtocol;
+	constructor(attachment) {
+		super();
+		this.attachment = attachment;
+		this.buildChildren();
+	}
+	buildChildren() {
+		this.clear();
+		const caps = getCapabilities();
+		const supportsInline = caps.images === "kitty" || caps.images === "iterm2";
+		this.lastBuiltProtocol = caps.images;
+		if (!supportsInline) {
+			this.addChild(new Text(currentTheme.fg("accent", this.attachment.placeholder), 0, 0));
+			return;
+		}
+		const theme = { fallbackColor: (s) => currentTheme.fg("textDim", s) };
+		this.image ??= new Image(Buffer.from(this.attachment.bytes).toString("base64"), this.attachment.mime, theme, {
+			maxHeightCells: MAX_IMAGE_ROWS,
+			maxWidthCells: MAX_IMAGE_WIDTH,
+			filename: this.attachment.placeholder
+		}, {
+			widthPx: this.attachment.width,
+			heightPx: this.attachment.height
+		});
+		this.image.invalidate();
+		this.addChild(this.image);
+	}
+	render(width) {
+		const safeWidth = Math.max(0, width);
+		if (safeWidth === 0) return [""];
+		if (safeWidth < MAX_IMAGE_WIDTH + 2) return new Text(currentTheme.fg("accent", this.attachment.placeholder), 0, 0).render(safeWidth);
+		const caps = getCapabilities();
+		if (this.lastBuiltProtocol !== caps.images) this.buildChildren();
+		return super.render(safeWidth);
+	}
+	invalidate() {
+		this.buildChildren();
+		super.invalidate();
+	}
+};
+//#endregion
+//#region src/utils/image/image-mime.ts
+function parseImageMeta(bytes) {
+	if (isPng(bytes)) return parsePng(bytes);
+	if (isJpeg(bytes)) return parseJpeg(bytes);
+	if (isGif(bytes)) return parseGif(bytes);
+	if (isWebp(bytes)) return parseWebp(bytes);
+	return null;
+}
+function isPng(b) {
+	return b.length >= 8 && b[0] === 137 && b[1] === 80 && b[2] === 78 && b[3] === 71 && b[4] === 13 && b[5] === 10 && b[6] === 26 && b[7] === 10;
+}
+function parsePng(b) {
+	if (b.length < 24) return null;
+	const width = readUInt32BE(b, 16);
+	const height = readUInt32BE(b, 20);
+	if (width <= 0 || height <= 0) return null;
+	return {
+		mime: "image/png",
+		width,
+		height
+	};
+}
+function isJpeg(b) {
+	return b.length >= 3 && b[0] === 255 && b[1] === 216 && b[2] === 255;
+}
+function parseJpeg(b) {
+	let i = 2;
+	while (i < b.length) {
+		if (b[i] !== 255) {
+			i += 1;
+			continue;
+		}
+		while (i < b.length && b[i] === 255) i += 1;
+		if (i >= b.length) return null;
+		const marker = b[i];
+		i += 1;
+		if (marker === 216 || marker === 217) continue;
+		if (i + 1 >= b.length) return null;
+		const segLen = readUInt16BE(b, i);
+		if (isSofMarker(marker)) {
+			if (i + 7 >= b.length) return null;
+			const height = readUInt16BE(b, i + 3);
+			const width = readUInt16BE(b, i + 5);
+			if (width <= 0 || height <= 0) return null;
+			return {
+				mime: "image/jpeg",
+				width,
+				height
+			};
+		}
+		i += segLen;
+	}
+	return null;
+}
+function isSofMarker(marker) {
+	if (marker < 192 || marker > 207) return false;
+	return marker !== 196 && marker !== 200 && marker !== 204;
+}
+function isGif(b) {
+	return b.length >= 6 && b[0] === 71 && b[1] === 73 && b[2] === 70 && b[3] === 56 && (b[4] === 55 || b[4] === 57) && b[5] === 97;
+}
+function parseGif(b) {
+	if (b.length < 10) return null;
+	const width = readUInt16LE(b, 6);
+	const height = readUInt16LE(b, 8);
+	if (width <= 0 || height <= 0) return null;
+	return {
+		mime: "image/gif",
+		width,
+		height
+	};
+}
+function isWebp(b) {
+	return b.length >= 12 && b[0] === 82 && b[1] === 73 && b[2] === 70 && b[3] === 70 && b[8] === 87 && b[9] === 69 && b[10] === 66 && b[11] === 80;
+}
+function parseWebp(b) {
+	if (b.length < 30) return null;
+	const chunk = String.fromCodePoint(b[12], b[13], b[14], b[15]);
+	if (chunk === "VP8 ") {
+		const widthRaw = readUInt16LE(b, 26);
+		const heightRaw = readUInt16LE(b, 28);
+		const width = widthRaw & 16383;
+		const height = heightRaw & 16383;
+		if (width <= 0 || height <= 0) return null;
+		return {
+			mime: "image/webp",
+			width,
+			height
+		};
+	}
+	if (chunk === "VP8L") {
+		if (b[20] !== 47) return null;
+		const b1 = b[21];
+		const b2 = b[22];
+		const b3 = b[23];
+		const b4 = b[24];
+		const width = 1 + ((b2 & 63) << 8 | b1);
+		const height = 1 + ((b4 & 15) << 10 | b3 << 2 | (b2 & 192) >> 6);
+		if (width <= 0 || height <= 0) return null;
+		return {
+			mime: "image/webp",
+			width,
+			height
+		};
+	}
+	if (chunk === "VP8X") {
+		const width = 1 + readUInt24LE(b, 24);
+		const height = 1 + readUInt24LE(b, 27);
+		if (width <= 0 || height <= 0) return null;
+		return {
+			mime: "image/webp",
+			width,
+			height
+		};
+	}
+	return null;
+}
+function readUInt16BE(b, off) {
+	return b[off] << 8 | b[off + 1];
+}
+function readUInt16LE(b, off) {
+	return b[off] | b[off + 1] << 8;
+}
+function readUInt24LE(b, off) {
+	return b[off] | b[off + 1] << 8 | b[off + 2] << 16;
+}
+function readUInt32BE(b, off) {
+	return Math.trunc(b[off] * 16777216 + (b[off + 1] << 16) + (b[off + 2] << 8) + b[off + 3]);
+}
+//#endregion
 //#region src/tui/components/messages/tool-renderers/media.copy.ts
 registerUiCatalogFragment({
 	en: { "mediaChip.uploaded": "uploaded" },
@@ -521049,6 +521999,51 @@ registerUiCatalogFragment({
 const PATH_TAG_RE = /^<(image|video)\s+path="([^"]+)">$/;
 const ORIGINAL_SIZE_RE = /original size\s+(\d+x\d+px)/;
 const DATA_URL_RE = /^data:([^;]+);base64,(.*)$/s;
+const MAX_PREVIEW_BYTES = 8 * 1024 * 1024;
+const MAX_PREVIEW_IMAGES = 4;
+function imagePreviews(output) {
+	const protocol = getCapabilities().images;
+	if (protocol !== "kitty" && protocol !== "iterm2") return [];
+	let parts;
+	try {
+		parts = JSON.parse(output);
+	} catch {
+		return [];
+	}
+	if (!Array.isArray(parts)) return [];
+	const previews = [];
+	let remainingBytes = MAX_PREVIEW_BYTES;
+	for (const raw of parts) {
+		if (previews.length >= MAX_PREVIEW_IMAGES || remainingBytes <= 0) break;
+		if (typeof raw !== "object" || raw === null) continue;
+		const part = raw;
+		if (part["type"] !== "image_url") continue;
+		const holder = part["imageUrl"];
+		if (typeof holder !== "object" || holder === null) continue;
+		const url = holder["url"];
+		if (typeof url !== "string") continue;
+		const data = DATA_URL_RE.exec(url);
+		if (data === null || data[2] === void 0) continue;
+		const encoded = data[2];
+		if (bytesFromBase64(encoded) > remainingBytes || !/^[A-Za-z0-9+/]*={0,2}$/.test(encoded)) continue;
+		const bytes = Buffer.from(encoded, "base64");
+		if (bytes.length > remainingBytes) continue;
+		const meta = parseImageMeta(bytes);
+		if (meta === null || meta.mime !== data[1]) continue;
+		const attachment = {
+			id: 0,
+			kind: "image",
+			bytes,
+			mime: meta.mime,
+			width: meta.width,
+			height: meta.height,
+			placeholder: `${meta.mime} (${meta.width}x${meta.height})`
+		};
+		previews.push(new ImageThumbnail(attachment));
+		remainingBytes -= bytes.length;
+	}
+	return previews;
+}
 function bytesFromBase64(b64) {
 	const len = b64.length;
 	if (len === 0) return 0;
@@ -521132,7 +522127,6 @@ const readMediaChip = (_toolCall, result) => {
 	return `${summary.kind} (${meta.join(", ")})`;
 };
 const readMediaSummary = (toolCall, result, ctx) => {
-	if (result.is_error) return renderTruncated(toolCall, result, ctx);
 	const summary = parseReadMediaOutput(result.output);
 	if (summary === null) return renderTruncated(toolCall, result, ctx);
 	if (!ctx.expanded) return [];
@@ -521144,6 +522138,22 @@ const readMediaSummary = (toolCall, result, ctx) => {
 	if (meta.length > 0) tail.push(meta.join(", "));
 	if (summary.url !== void 0) tail.push(summary.url);
 	out.push(new Text(`  ${dim(tail.join(" · "))}`, 0, 0));
+	if (!result.is_error && summary.kind === "image") out.push(...imagePreviews(result.output));
+	return out;
+};
+const genericMediaResult = (toolCall, result, ctx) => {
+	if (!result.output.includes("\"image_url\"") && !result.output.includes("\"video_url\"")) return renderTruncated(toolCall, result, ctx);
+	const summary = parseReadMediaOutput(result.output);
+	if (summary === null) return renderTruncated(toolCall, result, ctx);
+	const textParts = JSON.parse(result.output).filter((part) => typeof part === "object" && part !== null && part["type"] === "text" && typeof part["text"] === "string").map((part) => part.text);
+	const meta = metaSegments(summary);
+	const label = [summary.kind, ...meta].join(" · ");
+	const out = [new Text(`  ${chalk.dim(label)}`, 0, 0)];
+	if (textParts.length > 0) out.push(...renderTruncated(toolCall, {
+		...result,
+		output: textParts.join("\n")
+	}, ctx));
+	if (ctx.expanded && !result.is_error) out.push(...imagePreviews(result.output));
 	return out;
 };
 //#endregion
@@ -521310,8 +522320,8 @@ const globSummary = withGlance(globGlance);
 *
 * Each tool name maps to a `ResultRenderer` that turns the tool's
 * `ToolResultBlockData` into renderable Components. Tools without an
-* explicit entry fall through to `renderTruncated` (the original
-* 3-line + ctrl+o behavior).
+* explicit entry fall through to the generic renderer, which keeps the
+* original 3-line + ctrl+o behavior for text results.
 *
 * Keep this dispatch flat — tool names live next to the renderer they
 * choose, so adding a new tool means appending one case.
@@ -521323,7 +522333,7 @@ const globSummary = withGlance(globGlance);
 * the main agent previews it.
 */
 function isGenericToolResult(toolName) {
-	return pickResultRenderer(toolName) === renderTruncated;
+	return pickResultRenderer(toolName) === genericMediaResult;
 }
 function pickResultRenderer(toolName) {
 	switch (toolName) {
@@ -521341,7 +522351,7 @@ function pickResultRenderer(toolName) {
 		case "GetGoal":
 		case "SetGoalBudget":
 		case "UpdateGoal": return goalSummary;
-		default: return renderTruncated;
+		default: return genericMediaResult;
 	}
 }
 //#endregion
@@ -523296,66 +524306,6 @@ function formatActivityLine(phase, toolName, args, workspaceDir) {
 	return keyArg ? `${verb} ${toolName} (${keyArg})` : `${verb} ${toolName}`;
 }
 //#endregion
-//#region src/tui/components/media/image-thumbnail.ts
-/**
-* Transcript-side rendering of a pasted image.
-*
-* On terminals that speak the Kitty graphics protocol or iTerm2 inline
-* image protocol (detected by pi-tui's `getCapabilities()`), we show
-* the actual image. Everywhere else we fall back to a one-line text
-* marker matching the placeholder the user sees in the input box —
-* this keeps the transcript readable on Terminal.app / Linux default
-* terminals / `script` recordings without extra chrome.
-*
-* Height is capped at ~12 rows so a single screenshot can't monopolize
-* the viewport; pi-tui handles proportional scaling internally.
-*/
-const MAX_IMAGE_ROWS = 12;
-const MAX_IMAGE_WIDTH = 40;
-var ImageThumbnail = class extends Container {
-	attachment;
-	image;
-	lastBuiltProtocol;
-	constructor(attachment) {
-		super();
-		this.attachment = attachment;
-		this.buildChildren();
-	}
-	buildChildren() {
-		this.clear();
-		const caps = getCapabilities();
-		const supportsInline = caps.images === "kitty" || caps.images === "iterm2";
-		this.lastBuiltProtocol = caps.images;
-		if (!supportsInline) {
-			this.addChild(new Text(currentTheme.fg("accent", this.attachment.placeholder), 0, 0));
-			return;
-		}
-		const theme = { fallbackColor: (s) => currentTheme.fg("textDim", s) };
-		this.image ??= new Image(Buffer.from(this.attachment.bytes).toString("base64"), this.attachment.mime, theme, {
-			maxHeightCells: MAX_IMAGE_ROWS,
-			maxWidthCells: MAX_IMAGE_WIDTH,
-			filename: this.attachment.placeholder
-		}, {
-			widthPx: this.attachment.width,
-			heightPx: this.attachment.height
-		});
-		this.image.invalidate();
-		this.addChild(this.image);
-	}
-	render(width) {
-		const safeWidth = Math.max(0, width);
-		if (safeWidth === 0) return [""];
-		if (safeWidth < MAX_IMAGE_WIDTH + 2) return new Text(currentTheme.fg("accent", this.attachment.placeholder), 0, 0).render(safeWidth);
-		const caps = getCapabilities();
-		if (this.lastBuiltProtocol !== caps.images) this.buildChildren();
-		return super.render(safeWidth);
-	}
-	invalidate() {
-		this.buildChildren();
-		super.invalidate();
-	}
-};
-//#endregion
 //#region src/tui/components/messages/user-message.ts
 /**
 * Renders a user message in the transcript.
@@ -523460,6 +524410,14 @@ async function handleUndoCommand(host, args = "") {
 	await undoByCount(host, count);
 }
 async function undoByCount(host, count) {
+	const finish = host.beginLocalContextMutation?.();
+	try {
+		return await undoByCountOwned(host, count);
+	} finally {
+		finish?.();
+	}
+}
+async function undoByCountOwned(host, count) {
 	const session = host.session;
 	if (session === void 0) {
 		host.showError(uiText("undo.error.noActiveSession"));
@@ -532435,136 +533393,6 @@ var ClipboardImageHintController = class {
 	}
 };
 //#endregion
-//#region src/utils/image/image-mime.ts
-function parseImageMeta(bytes) {
-	if (isPng(bytes)) return parsePng(bytes);
-	if (isJpeg(bytes)) return parseJpeg(bytes);
-	if (isGif(bytes)) return parseGif(bytes);
-	if (isWebp(bytes)) return parseWebp(bytes);
-	return null;
-}
-function isPng(b) {
-	return b.length >= 8 && b[0] === 137 && b[1] === 80 && b[2] === 78 && b[3] === 71 && b[4] === 13 && b[5] === 10 && b[6] === 26 && b[7] === 10;
-}
-function parsePng(b) {
-	if (b.length < 24) return null;
-	const width = readUInt32BE(b, 16);
-	const height = readUInt32BE(b, 20);
-	if (width <= 0 || height <= 0) return null;
-	return {
-		mime: "image/png",
-		width,
-		height
-	};
-}
-function isJpeg(b) {
-	return b.length >= 3 && b[0] === 255 && b[1] === 216 && b[2] === 255;
-}
-function parseJpeg(b) {
-	let i = 2;
-	while (i < b.length) {
-		if (b[i] !== 255) {
-			i += 1;
-			continue;
-		}
-		while (i < b.length && b[i] === 255) i += 1;
-		if (i >= b.length) return null;
-		const marker = b[i];
-		i += 1;
-		if (marker === 216 || marker === 217) continue;
-		if (i + 1 >= b.length) return null;
-		const segLen = readUInt16BE(b, i);
-		if (isSofMarker(marker)) {
-			if (i + 7 >= b.length) return null;
-			const height = readUInt16BE(b, i + 3);
-			const width = readUInt16BE(b, i + 5);
-			if (width <= 0 || height <= 0) return null;
-			return {
-				mime: "image/jpeg",
-				width,
-				height
-			};
-		}
-		i += segLen;
-	}
-	return null;
-}
-function isSofMarker(marker) {
-	if (marker < 192 || marker > 207) return false;
-	return marker !== 196 && marker !== 200 && marker !== 204;
-}
-function isGif(b) {
-	return b.length >= 6 && b[0] === 71 && b[1] === 73 && b[2] === 70 && b[3] === 56 && (b[4] === 55 || b[4] === 57) && b[5] === 97;
-}
-function parseGif(b) {
-	if (b.length < 10) return null;
-	const width = readUInt16LE(b, 6);
-	const height = readUInt16LE(b, 8);
-	if (width <= 0 || height <= 0) return null;
-	return {
-		mime: "image/gif",
-		width,
-		height
-	};
-}
-function isWebp(b) {
-	return b.length >= 12 && b[0] === 82 && b[1] === 73 && b[2] === 70 && b[3] === 70 && b[8] === 87 && b[9] === 69 && b[10] === 66 && b[11] === 80;
-}
-function parseWebp(b) {
-	if (b.length < 30) return null;
-	const chunk = String.fromCodePoint(b[12], b[13], b[14], b[15]);
-	if (chunk === "VP8 ") {
-		const widthRaw = readUInt16LE(b, 26);
-		const heightRaw = readUInt16LE(b, 28);
-		const width = widthRaw & 16383;
-		const height = heightRaw & 16383;
-		if (width <= 0 || height <= 0) return null;
-		return {
-			mime: "image/webp",
-			width,
-			height
-		};
-	}
-	if (chunk === "VP8L") {
-		if (b[20] !== 47) return null;
-		const b1 = b[21];
-		const b2 = b[22];
-		const b3 = b[23];
-		const b4 = b[24];
-		const width = 1 + ((b2 & 63) << 8 | b1);
-		const height = 1 + ((b4 & 15) << 10 | b3 << 2 | (b2 & 192) >> 6);
-		if (width <= 0 || height <= 0) return null;
-		return {
-			mime: "image/webp",
-			width,
-			height
-		};
-	}
-	if (chunk === "VP8X") {
-		const width = 1 + readUInt24LE(b, 24);
-		const height = 1 + readUInt24LE(b, 27);
-		if (width <= 0 || height <= 0) return null;
-		return {
-			mime: "image/webp",
-			width,
-			height
-		};
-	}
-	return null;
-}
-function readUInt16BE(b, off) {
-	return b[off] << 8 | b[off + 1];
-}
-function readUInt16LE(b, off) {
-	return b[off] | b[off + 1] << 8;
-}
-function readUInt24LE(b, off) {
-	return b[off] | b[off + 1] << 8 | b[off + 2] << 16;
-}
-function readUInt32BE(b, off) {
-	return Math.trunc(b[off] * 16777216 + (b[off + 1] << 16) + (b[off + 2] << 8) + b[off + 3]);
-}
-//#endregion
 //#region src/utils/clipboard/clipboard-image.ts
 /**
 * Read media from the system clipboard with graceful platform fallbacks.
@@ -535490,7 +536318,7 @@ function isTelegramBridgeFraming(value) {
 	let remaining = value.trim();
 	let foundFrame = false;
 	while (remaining.length > 0) {
-		const frame = /^(?:\[(?:REPLY-PFLICHT|SEMANTISCHE ADRESSIERUNG|NUR MITLESEN|SPRACH-GATE)\b[\s\S]*?\]|<vision-observation\s+source="telegram"\b[^>]*>[\s\S]*?<\/vision-observation>)/i.exec(remaining);
+		const frame = /^(?:\[GRUPPENANTWORT:[^[\]\r\n]*(?:\[\[BLUN_TELEGRAM_SILENT\]\][^[\]\r\n]*)*\]|\[(?:REPLY-PFLICHT|SEMANTISCHE ADRESSIERUNG|NUR MITLESEN|SPRACH-GATE)\b[\s\S]*?\]|<vision-observation\s+source="telegram"\b[^>]*>[\s\S]*?<\/vision-observation>)/i.exec(remaining);
 		if (frame === null) return false;
 		foundFrame = true;
 		remaining = remaining.slice(frame[0].length).trim();
@@ -536701,10 +537529,71 @@ var SessionEventHandler = class {
 	pendingCompactionRetry;
 	compactionRetryPanel;
 	localToolEvents;
+	contextRefreshEpoch = 0;
+	contextRefreshPending = false;
+	contextRefreshRunning = false;
+	contextRefreshTurnActive = false;
+	contextRefreshFailed = false;
+	localContextMutations = 0;
+	contextRevisions = /* @__PURE__ */ new Map();
+	beginLocalContextMutation() {
+		const epoch = this.contextRefreshEpoch;
+		this.localContextMutations++;
+		let finished = false;
+		return () => {
+			if (finished) return;
+			finished = true;
+			if (epoch !== this.contextRefreshEpoch) return;
+			this.localContextMutations--;
+			this.drainContextRefresh();
+		};
+	}
+	handleContextChanged(event) {
+		if (event.agentId !== "main") return;
+		const previous = this.contextRevisions.get(event.generation) ?? 0;
+		if (event.revision < previous || event.revision === previous && !this.contextRefreshFailed) return;
+		this.contextRevisions.delete(event.generation);
+		this.contextRevisions.set(event.generation, event.revision);
+		if (this.contextRevisions.size > 64) {
+			const oldest = this.contextRevisions.keys().next().value;
+			if (oldest !== void 0) this.contextRevisions.delete(oldest);
+		}
+		this.contextRefreshPending = true;
+		this.drainContextRefresh();
+	}
+	drainContextRefresh() {
+		const session = this.host.session;
+		const refresh = this.host.refreshContextFromReplay;
+		if (!this.contextRefreshPending || this.contextRefreshRunning || this.contextRefreshTurnActive || this.localContextMutations > 0 || session === void 0 || refresh === void 0) return;
+		const epoch = this.contextRefreshEpoch;
+		const isCurrent = () => epoch === this.contextRefreshEpoch && !this.host.aborted && this.host.session === session && this.host.state.appState.sessionId === session.id && this.localContextMutations === 0 && !this.contextRefreshPending && !this.contextRefreshTurnActive;
+		this.contextRefreshPending = false;
+		this.contextRefreshRunning = true;
+		this.contextRefreshFailed = false;
+		refresh.call(this.host, session, isCurrent).then((result) => {
+			if (result === false && isCurrent()) this.contextRefreshFailed = true;
+		}).catch((error) => {
+			if (isCurrent()) {
+				this.contextRefreshFailed = true;
+				this.host.showError(formatErrorMessage$2(error));
+			}
+		}).finally(() => {
+			if (epoch !== this.contextRefreshEpoch) return;
+			this.contextRefreshRunning = false;
+			this.drainContextRefresh();
+		});
+	}
 	setLocalToolEventRecordingEnabled(enabled) {
 		this.localToolEvents?.setEnabled(enabled);
 	}
 	resetRuntimeState() {
+		this.contextRefreshEpoch++;
+		this.contextRefreshPending = false;
+		this.contextRefreshRunning = false;
+		this.contextRefreshTurnActive = false;
+		this.contextRefreshFailed = false;
+		this.localContextMutations = 0;
+		this.contextRevisions.clear();
 		this.backgroundTasks.clear();
 		this.backgroundTaskTranscriptedTerminal.clear();
 		this.subAgentEventHandler.resetRuntimeState();
@@ -536826,10 +537715,14 @@ var SessionEventHandler = class {
 		if ("turnId" in event && event.turnId !== void 0) this.host.streamingUI.setTurnId(String(event.turnId));
 		switch (event.type) {
 			case "turn.started":
+				this.contextRefreshTurnActive = true;
+				if (this.contextRefreshRunning) this.contextRefreshPending = true;
 				this.handleTurnBegin(event);
 				break;
 			case "turn.ended":
+				this.contextRefreshTurnActive = false;
 				this.handleTurnEnd(event, sendQueued);
+				this.drainContextRefresh();
 				break;
 			case "turn.step.started":
 				this.handleStepBegin(event);
@@ -536875,6 +537768,9 @@ var SessionEventHandler = class {
 			case "agent.status.updated":
 				this.handleStatusUpdate(event);
 				break;
+			case "context.changed":
+				this.handleContextChanged(event);
+				break;
 			case "session.meta.updated":
 				this.handleSessionMetaChanged(event);
 				break;
@@ -537270,7 +538166,7 @@ var SessionEventHandler = class {
 		if (change.kind === "completion" && event.snapshot !== null) {
 			this.pendingModelBlockedFallback = void 0;
 			this.goalCompletionAwaitingClear = true;
-			this.goalCompletionTurnEnded = false;
+			this.goalCompletionTurnEnded = change.actor === "user" && state.appState.streamingPhase === "idle";
 			this.host.appendTranscriptEntry({
 				id: nextTranscriptId(),
 				kind: "assistant",
@@ -537342,7 +538238,7 @@ var SessionEventHandler = class {
 		this.scheduleQueuedGoalPromotion();
 	}
 	isReadyForQueuedGoalPromotion(session) {
-		return (session === void 0 || this.host.session === session) && !this.host.aborted && this.host.state.appState.streamingPhase === "idle" && this.host.state.queuedMessages.length === 0;
+		return (session === void 0 || this.host.session === session) && !this.host.aborted && this.host.state.appState.streamingPhase === "idle" && !this.host.state.appState.isCompacting && this.host.state.queuedMessages.length === 0;
 	}
 	async promoteNextQueuedGoal() {
 		const { host } = this;
@@ -537947,6 +538843,14 @@ var SessionReplayRenderer = class {
 	constructor(host) {
 		this.host = host;
 	}
+	async refreshFromReplay(session, isCurrent, clearTranscript, historyLimit = 200) {
+		if (!isCurrent()) return false;
+		await session.refreshResumeState({ historyLimit });
+		if (!isCurrent()) return false;
+		if (session.getResumeState()?.agents["main"] === void 0) return this.hydrateFromReplay(session);
+		clearTranscript();
+		return this.hydrateFromReplay(session);
+	}
 	/** Records-only projection for a detached page; never hydrates the live snapshot. */
 	renderHistoricalPage(agent) {
 		this.renderRecords(agent);
@@ -539255,7 +540159,8 @@ function contextMetrics(state) {
 	const responder = state.availableModels[responderAlias];
 	const responderMax = responder === void 0 ? void 0 : effectiveModelAlias(responder).maxContextSize;
 	const runtimeMax = Number.isFinite(state.maxContextTokens) ? Math.max(0, state.maxContextTokens) : 0;
-	const maxTokens = runtimeMax > 0 ? runtimeMax : responderMax ?? 0;
+	const hardMaxTokens = runtimeMax > 0 ? runtimeMax : responderMax ?? 0;
+	const maxTokens = Number.isFinite(hardMaxTokens) && hardMaxTokens > 0 ? hardMaxTokens : 0;
 	return {
 		tokens,
 		maxTokens,
@@ -542927,9 +543832,12 @@ function isGroupNoiseReply(text) {
 function isGroupSuppressed(text, _contextOnly) {
 	return isGroupNoiseReply(text);
 }
+function isSilentTurnMarker(text) {
+	return text.trim() === "[[BLUN_TELEGRAM_SILENT]]";
+}
 async function sendReplyFallback(chatId, text, contextOnly = false, requireDelivery = false, progress, threadId) {
 	if (threadId !== void 0 && !validChannelThreadId(threadId)) return false;
-	if (text.trim() === "[[BLUN_TELEGRAM_SILENT]]") return !requireDelivery;
+	if (isSilentTurnMarker(text)) return !requireDelivery;
 	const topic = threadId === void 0 ? {} : { message_thread_id: Number(threadId) };
 	if (isGroupChat(chatId) && isGroupSuppressed(text, contextOnly)) {
 		try {
@@ -545617,7 +546525,7 @@ var BlunTUI = class {
 		})) return;
 		if (outboxGrewForChat(guard.outboxMarker, guard.chatId, guard.threadId)) return;
 		const finalText = this.state.transcriptEntries.slice(guard.transcriptStart).filter((entry) => entry.kind === "assistant" && entry.content.trim().length > 0).map((entry) => entry.content.trim()).at(-1) ?? "";
-		if (finalText.length === 0) return;
+		if (finalText.length === 0 || isSilentTurnMarker(finalText)) return;
 		(guard.threadId === void 0 ? sendReplyFallback(guard.chatId, finalText, guard.contextOnly) : sendReplyFallback(guard.chatId, finalText, guard.contextOnly, false, void 0, guard.threadId)).then((sent) => {
 			if (sent) this.showStatus(uiText("blunTui.telegram.fallbackDelivered"));
 		});
@@ -546566,6 +547474,14 @@ var BlunTUI = class {
 			mergeSteps: (state) => this.mergeAllTurnSteps(state)
 		});
 	}
+	beginLocalContextMutation() {
+		return this.sessionEventHandler.beginLocalContextMutation();
+	}
+	async refreshContextFromReplay(session, isCurrent) {
+		return this.sessionReplay.refreshFromReplay(session, isCurrent, () => {
+			this.clearTranscriptAndRedraw();
+		}, this.historyLimit);
+	}
 	createTranscriptComponent(entry, state = this.state) {
 		if (entry.compactionData !== void 0) {
 			const data = entry.compactionData;
@@ -547550,13 +548466,13 @@ var BlunTUI = class {
 //#endregion
 //#region src/constant/update.ts
 var import_runtime_exit_ledger = (/* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const fs$1 = __require("node:fs");
+	const fs = __require("node:fs");
 	const os$1 = __require("node:os");
-	const path$2 = __require("node:path");
+	const path$1 = __require("node:path");
 	const DEFAULT_MAX_BYTES = 1024 * 1024;
 	const DEFAULT_RETAIN_BYTES = 512 * 1024;
 	function runtimeExitLedgerPath(homeDir) {
-		return path$2.join(homeDir, "diagnostics", "runtime-exits.jsonl");
+		return path$1.join(homeDir, "diagnostics", "runtime-exits.jsonl");
 	}
 	function sanitizeExitText(input, maxChars = 2048) {
 		let value = String(input ?? "");
@@ -547565,7 +548481,7 @@ var import_runtime_exit_ledger = (/* @__PURE__ */ __commonJSMin(((exports, modul
 			process.env.USERPROFILE,
 			process.env.HOME
 		].filter((entry) => typeof entry === "string" && entry.length > 2));
-		for (const home of homes) for (const variant of [path$2.normalize(home), home.replaceAll("\\", "/")]) {
+		for (const home of homes) for (const variant of [path$1.normalize(home), home.replaceAll("\\", "/")]) {
 			const escaped = variant.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
 			value = value.replace(new RegExp(escaped, process.platform === "win32" ? "giu" : "gu"), "$HOME");
 		}
@@ -547604,7 +548520,7 @@ var import_runtime_exit_ledger = (/* @__PURE__ */ __commonJSMin(((exports, modul
 		return record;
 	}
 	function directoryIdentity(directory) {
-		const stat = fs$1.lstatSync(directory, { bigint: true });
+		const stat = fs.lstatSync(directory, { bigint: true });
 		if (!stat.isDirectory() || stat.isSymbolicLink()) throw new Error("Unsafe exit directory");
 		return stat;
 	}
@@ -547616,46 +548532,46 @@ var import_runtime_exit_ledger = (/* @__PURE__ */ __commonJSMin(((exports, modul
 		return stat;
 	}
 	function trimLedger(descriptor, maxBytes, retainBytes, incomingBytes) {
-		const size = Number(regularLedger(fs$1.fstatSync(descriptor, { bigint: true })).size);
+		const size = Number(regularLedger(fs.fstatSync(descriptor, { bigint: true })).size);
 		if (!Number.isSafeInteger(size)) throw new Error("Invalid exit ledger size");
 		if (size + incomingBytes <= maxBytes) return;
 		const keepBytes = Math.max(0, Math.min(size, retainBytes, maxBytes - incomingBytes));
 		const contents = Buffer.alloc(keepBytes);
-		const read = fs$1.readSync(descriptor, contents, 0, keepBytes, size - keepBytes);
+		const read = fs.readSync(descriptor, contents, 0, keepBytes, size - keepBytes);
 		const tail = contents.subarray(0, read);
 		const lineStart = size > keepBytes ? tail.indexOf(10) + 1 : 0;
-		fs$1.ftruncateSync(descriptor, 0);
-		fs$1.writeFileSync(descriptor, lineStart > 0 || size === keepBytes ? tail.subarray(lineStart) : "");
+		fs.ftruncateSync(descriptor, 0);
+		fs.writeFileSync(descriptor, lineStart > 0 || size === keepBytes ? tail.subarray(lineStart) : "");
 	}
 	function recordRuntimeExit(input = {}) {
 		let descriptor;
 		let appendDescriptor;
 		try {
 			const homeDir = typeof input.homeDir === "string" ? input.homeDir.trim() : "";
-			if (!homeDir || !path$2.isAbsolute(homeDir)) return false;
-			fs$1.mkdirSync(homeDir, {
+			if (!homeDir || !path$1.isAbsolute(homeDir)) return false;
+			fs.mkdirSync(homeDir, {
 				recursive: true,
 				mode: 448
 			});
 			const homeIdentity = directoryIdentity(homeDir);
 			const file = runtimeExitLedgerPath(homeDir);
-			const directory = path$2.dirname(file);
+			const directory = path$1.dirname(file);
 			try {
-				fs$1.mkdirSync(directory, { mode: 448 });
+				fs.mkdirSync(directory, { mode: 448 });
 			} catch (error) {
 				if (error.code !== "EEXIST") throw error;
 			}
 			const directoryStat = directoryIdentity(directory);
 			let before;
 			try {
-				before = regularLedger(fs$1.lstatSync(file, { bigint: true }));
+				before = regularLedger(fs.lstatSync(file, { bigint: true }));
 			} catch (error) {
 				if (error.code !== "ENOENT") throw error;
 			}
-			const flags = fs$1.constants.O_RDWR | (fs$1.constants.O_NOFOLLOW ?? 0) | (fs$1.constants.O_NONBLOCK ?? 0) | (before ? 0 : fs$1.constants.O_CREAT | fs$1.constants.O_EXCL);
-			descriptor = fs$1.openSync(file, flags, 384);
-			const opened = regularLedger(fs$1.fstatSync(descriptor, { bigint: true }));
-			if (before && !sameIdentity(before, opened) || !sameIdentity(opened, regularLedger(fs$1.lstatSync(file, { bigint: true }))) || !sameIdentity(homeIdentity, directoryIdentity(homeDir)) || !sameIdentity(directoryStat, directoryIdentity(directory))) throw new Error("Exit ledger changed");
+			const flags = fs.constants.O_RDWR | (fs.constants.O_NOFOLLOW ?? 0) | (fs.constants.O_NONBLOCK ?? 0) | (before ? 0 : fs.constants.O_CREAT | fs.constants.O_EXCL);
+			descriptor = fs.openSync(file, flags, 384);
+			const opened = regularLedger(fs.fstatSync(descriptor, { bigint: true }));
+			if (before && !sameIdentity(before, opened) || !sameIdentity(opened, regularLedger(fs.lstatSync(file, { bigint: true }))) || !sameIdentity(homeIdentity, directoryIdentity(homeDir)) || !sameIdentity(directoryStat, directoryIdentity(directory))) throw new Error("Exit ledger changed");
 			const maxBytes = Math.max(1024, Number.isInteger(input.maxBytes) ? input.maxBytes : DEFAULT_MAX_BYTES);
 			const retainBytes = Math.max(0, Number.isInteger(input.retainBytes) ? input.retainBytes : DEFAULT_RETAIN_BYTES);
 			const record = buildRuntimeExitRecord(input);
@@ -547678,21 +548594,21 @@ var import_runtime_exit_ledger = (/* @__PURE__ */ __commonJSMin(((exports, modul
 				line = `${JSON.stringify(record)}\n`;
 			}
 			trimLedger(descriptor, maxBytes, retainBytes, Buffer.byteLength(line));
-			appendDescriptor = fs$1.openSync(file, fs$1.constants.O_WRONLY | fs$1.constants.O_APPEND | (fs$1.constants.O_NOFOLLOW ?? 0) | (fs$1.constants.O_NONBLOCK ?? 0));
-			if (!sameIdentity(opened, regularLedger(fs$1.fstatSync(appendDescriptor, { bigint: true }))) || !sameIdentity(opened, regularLedger(fs$1.lstatSync(file, { bigint: true }))) || !sameIdentity(homeIdentity, directoryIdentity(homeDir)) || !sameIdentity(directoryStat, directoryIdentity(directory))) throw new Error("Exit ledger changed");
-			fs$1.appendFileSync(appendDescriptor, line, { encoding: "utf8" });
+			appendDescriptor = fs.openSync(file, fs.constants.O_WRONLY | fs.constants.O_APPEND | (fs.constants.O_NOFOLLOW ?? 0) | (fs.constants.O_NONBLOCK ?? 0));
+			if (!sameIdentity(opened, regularLedger(fs.fstatSync(appendDescriptor, { bigint: true }))) || !sameIdentity(opened, regularLedger(fs.lstatSync(file, { bigint: true }))) || !sameIdentity(homeIdentity, directoryIdentity(homeDir)) || !sameIdentity(directoryStat, directoryIdentity(directory))) throw new Error("Exit ledger changed");
+			fs.appendFileSync(appendDescriptor, line, { encoding: "utf8" });
 			try {
-				fs$1.fchmodSync(descriptor, 384);
+				fs.fchmodSync(descriptor, 384);
 			} catch {}
 			return true;
 		} catch {
 			return false;
 		} finally {
 			if (appendDescriptor !== void 0) try {
-				fs$1.closeSync(appendDescriptor);
+				fs.closeSync(appendDescriptor);
 			} catch {}
 			if (descriptor !== void 0) try {
-				fs$1.closeSync(descriptor);
+				fs.closeSync(descriptor);
 			} catch {}
 		}
 	}