blun-king-cli 9.1.611 → 9.1.613

package/blun.mjs

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
-// BLUN_BUILD_INPUT_SHA256:0533ca113dc07cc119988be5e76555dec986b6881903f8e2b537f5adf96cc2c5
+// BLUN_BUILD_INPUT_SHA256:5c7277a864ffcc0a6909494ad5ada6956f900fe23735200c5aca26b1e7d78834
 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, randomBytes, randomInt, randomUUID, timingSafeEqual } from "node:crypto";
-import * as fs$16 from "node:fs";
+import crypto$1, { createHash, createHmac, randomBytes, randomInt, randomUUID, timingSafeEqual } from "node:crypto";
+import * as fs$17 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 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 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 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 * 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";
@@ -1211,7 +1211,7 @@ function normalizeBlunToolSchema(schema) {
 }
 function ensureBlunPropertyTypes(schema) {
 	const normalized = cloneJsonValue(schema);
-	if (!isRecord$29(normalized)) throw new Error("JSON Schema root must normalize to an object.");
+	if (!isRecord$33(normalized)) throw new Error("JSON Schema root must normalize to an object.");
 	recurseSchema(normalized);
 	return normalized;
 }
@@ -1272,7 +1272,7 @@ function resolveLocalJsonPointer(root, ref) {
 	let current = root;
 	for (const rawPart of ref.slice(2).split("/")) {
 		const part = unescapeJsonPointerPart(rawPart);
-		if (isRecord$29(current)) {
+		if (isRecord$33(current)) {
 			if (!hasOwn(current, part)) return { found: false };
 			current = current[part];
 		} else if (Array.isArray(current)) {
@@ -1294,20 +1294,20 @@ function parseJsonPointerArrayIndex(part) {
 	return Number(part);
 }
 function recurseSchema(node) {
-	if (!isRecord$29(node)) return;
+	if (!isRecord$33(node)) return;
 	visitChildSchemas(node, normalizeProperty);
 }
 function visitChildSchemas(node, visit) {
 	for (const { key, kind } of CHILD_SCHEMA_SLOTS) {
 		const value = node[key];
 		if (kind === "single") {
-			if (isRecord$29(value)) visit(value);
+			if (isRecord$33(value)) visit(value);
 		} else if (kind === "array") {
 			if (Array.isArray(value)) for (const item of value) visit(item);
 		} else if (kind === "map") {
-			if (isRecord$29(value)) for (const item of Object.values(value)) visit(item);
+			if (isRecord$33(value)) for (const item of Object.values(value)) visit(item);
 		} else if (kind === "schema-or-array") {
-			if (isRecord$29(value)) visit(value);
+			if (isRecord$33(value)) visit(value);
 			else if (Array.isArray(value)) for (const item of value) visit(item);
 		}
 	}
@@ -1319,7 +1319,7 @@ function childSchemaKeysForParentType(parentType) {
 	});
 }
 function normalizeProperty(node) {
-	if (!isRecord$29(node)) return;
+	if (!isRecord$33(node)) return;
 	if (!hasOwn(node, "type") && !hasAnyKey(node, TYPE_COMPLETION_SKIP_KEYS)) {
 		const enumValues = node["enum"];
 		if (Array.isArray(enumValues) && enumValues.length > 0) node["type"] = inferTypeFromValues(enumValues);
@@ -1403,14 +1403,14 @@ function hasAnyKey(obj, keys) {
 }
 function cloneJsonValue(value) {
 	if (Array.isArray(value)) return value.map((item) => cloneJsonValue(item));
-	if (isRecord$29(value)) {
+	if (isRecord$33(value)) {
 		const cloned = {};
 		for (const [key, child] of Object.entries(value)) cloned[key] = cloneJsonValue(child);
 		return cloned;
 	}
 	return value;
 }
-function isRecord$29(value) {
+function isRecord$33(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function hasOwn(obj, key) {
@@ -1819,16 +1819,6 @@ function measureSerializedRequest(body, requestBytes) {
 		const payload = parsed;
 		const messages = Array.isArray(payload["messages"]) ? payload["messages"] : [];
 		const tools = Array.isArray(payload["tools"]) ? payload["tools"] : void 0;
-		let systemMessageBytes = 0;
-		let conversationMessageBytes = 0;
-		let toolResultMessageBytes = 0;
-		for (const message of messages) {
-			const size = Buffer.byteLength(JSON.stringify(message), "utf8");
-			const role = message !== null && typeof message === "object" ? message["role"] : void 0;
-			if (role === "system" || role === "developer") systemMessageBytes += size;
-			else if (role === "tool") toolResultMessageBytes += size;
-			else conversationMessageBytes += size;
-		}
 		const toolDefinitions = Object.freeze((tools ?? []).map((tool, index) => {
 			const entry = tool !== null && typeof tool === "object" ? tool : void 0;
 			const fn = entry?.["function"];
@@ -1839,6 +1829,44 @@ function measureSerializedRequest(body, requestBytes) {
 				...typeof name === "string" && name.length > 0 && name.length <= 128 ? { name } : {}
 			});
 		}));
+		const declaredNames = new Set(toolDefinitions.flatMap((tool) => tool.name === void 0 ? [] : [tool.name]));
+		const callNames = /* @__PURE__ */ new Map();
+		for (const message of messages) {
+			if (message === null || typeof message !== "object" || message["role"] !== "assistant") continue;
+			const calls = message["tool_calls"];
+			if (!Array.isArray(calls)) continue;
+			for (const call of calls) {
+				if (call === null || typeof call !== "object") continue;
+				const entry = call;
+				const fn = entry["function"];
+				const name = fn !== null && typeof fn === "object" ? fn["name"] : void 0;
+				const id = entry["id"];
+				if (typeof id !== "string" || id.length === 0) continue;
+				callNames.set(id, callNames.has(id) ? void 0 : typeof name === "string" && declaredNames.has(name) ? name : void 0);
+			}
+		}
+		let systemMessageBytes = 0;
+		let conversationMessageBytes = 0;
+		let toolResultMessageBytes = 0;
+		const results = /* @__PURE__ */ new Map();
+		for (const message of messages) {
+			const size = Buffer.byteLength(JSON.stringify(message), "utf8");
+			const role = message !== null && typeof message === "object" ? message["role"] : void 0;
+			if (role === "system" || role === "developer") systemMessageBytes += size;
+			else if (role === "tool") {
+				toolResultMessageBytes += size;
+				const id = message["tool_call_id"];
+				const name = typeof id === "string" ? callNames.get(id) : void 0;
+				const key = name ?? "";
+				const previous = results.get(key);
+				results.set(key, {
+					...name === void 0 ? {} : { name },
+					count: (previous?.count ?? 0) + 1,
+					bytes: (previous?.bytes ?? 0) + size
+				});
+			} else conversationMessageBytes += size;
+		}
+		const toolResultByTool = Object.freeze(Array.from(results.values(), (entry) => Object.freeze(entry)));
 		const toolArrayOverheadBytes = tools === void 0 ? 0 : 2 + Math.max(0, tools.length - 1);
 		const toolSchemaBytes = toolDefinitions.reduce((sum, tool) => sum + tool.bytes, toolArrayOverheadBytes);
 		return Object.freeze({
@@ -1848,6 +1876,7 @@ function measureSerializedRequest(body, requestBytes) {
 			systemMessageBytes,
 			conversationMessageBytes,
 			toolResultMessageBytes,
+			...toolResultByTool.length === 0 ? {} : { toolResultByTool },
 			toolSchemaBytes,
 			toolDefinitions,
 			toolArrayOverheadBytes,
@@ -2077,6 +2106,9 @@ var init_fetch_http_client = __esmMin((() => {
 			const maxRetries = normalizeMaxRetries(requestOptions?.maxRetries);
 			const requestBytes = exactBodyBytes(init.body);
 			const requestBreakdown = pathname === "/chat/completions" && requestOptions?.onTransportAttempt !== void 0 && typeof init.body === "string" && requestBytes !== void 0 ? measureSerializedRequest(init.body, requestBytes) : void 0;
+			if (pathname === "/chat/completions" && typeof init.body === "string") try {
+				requestOptions?.onSerializedRequest?.(init.body);
+			} catch {}
 			let attempt = 0;
 			while (true) {
 				const headers = new Headers(init.headers);
@@ -2085,6 +2117,9 @@ var init_fetch_http_client = __esmMin((() => {
 				const startedAt = performance.now();
 				const startedAtMs = Date.now();
 				try {
+					try {
+						requestOptions?.onRequestSent?.();
+					} catch {}
 					const response = await this.fetch(`${this.baseUrl}${pathname}`, {
 						...init,
 						headers
@@ -2236,11 +2271,11 @@ var init_blun_files = __esmMin((() => {
 		async uploadVideo(input, options) {
 			let file;
 			if (typeof input === "string") {
-				if (!fs$16.existsSync(input)) throw new ChatProviderError(`Video file not found: ${input}`);
+				if (!fs$17.existsSync(input)) throw new ChatProviderError(`Video file not found: ${input}`);
 				const filename = path$17.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$16.promises.readFile(input);
+				const data = await fs$17.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}`);
@@ -2344,6 +2379,9 @@ function extractChatCompletionUsage(usage) {
 	const value = usage;
 	const promptTokens = typeof value["prompt_tokens"] === "number" ? value["prompt_tokens"] : 0;
 	const completionTokens = typeof value["completion_tokens"] === "number" ? value["completion_tokens"] : 0;
+	const completionDetails = value["completion_tokens_details"];
+	const reportedReasoning = completionDetails !== null && typeof completionDetails === "object" ? completionDetails["reasoning_tokens"] : void 0;
+	const outputReasoning = typeof reportedReasoning === "number" && Number.isSafeInteger(reportedReasoning) && reportedReasoning >= 0 && reportedReasoning <= completionTokens ? reportedReasoning : void 0;
 	let cachedTokens = 0;
 	if (typeof value["cached_tokens"] === "number") cachedTokens = value["cached_tokens"];
 	else if (value["prompt_tokens_details"] !== null && typeof value["prompt_tokens_details"] === "object") {
@@ -2353,6 +2391,7 @@ function extractChatCompletionUsage(usage) {
 	return {
 		inputOther: promptTokens - cachedTokens,
 		output: completionTokens,
+		...outputReasoning === void 0 ? {} : { outputReasoning },
 		inputCacheRead: cachedTokens,
 		inputCacheCreation: 0
 	};
@@ -2619,6 +2658,13 @@ 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 convertMessage(message) {
 	let reasoningContent = "";
 	const nonThinkParts = [];
@@ -2950,12 +2996,13 @@ var init_blun = __esmMin((() => {
 			if (this._stream) createParams["stream_options"] = { include_usage: true };
 			try {
 				const client = this._createClient(options?.auth);
-				const requestOptions = options?.signal !== void 0 || options?.transportMaxRetries !== void 0 || options?.onTransportAttempt !== void 0 ? {
+				const requestOptions = options?.signal !== void 0 || options?.transportMaxRetries !== void 0 || options?.onRequestSent !== void 0 || options?.onSerializedRequest !== void 0 || options?.onTransportAttempt !== void 0 ? {
 					...options.signal !== void 0 ? { signal: options.signal } : {},
 					...options.transportMaxRetries !== void 0 ? { maxRetries: options.transportMaxRetries } : {},
+					...options.onRequestSent !== void 0 ? { onRequestSent: options.onRequestSent } : {},
+					...options.onSerializedRequest !== void 0 ? { onSerializedRequest: options.onSerializedRequest } : {},
 					...options.onTransportAttempt !== void 0 ? { onTransportAttempt: options.onTransportAttempt } : {}
 				} : void 0;
-				options?.onRequestSent?.();
 				let response;
 				try {
 					response = await client.chat.completions.create(createParams, requestOptions);
@@ -2964,7 +3011,6 @@ var init_blun = __esmMin((() => {
 					const cap = rejection instanceof APIContextOverflowError ? contextOverflowOutputCap(rejection, createParams["max_completion_tokens"]) : void 0;
 					if (cap === void 0) throw rejection;
 					options?.signal?.throwIfAborted();
-					options?.onRequestSent?.();
 					response = await client.chat.completions.create({
 						...createParams,
 						max_completion_tokens: cap
@@ -3360,9 +3406,11 @@ function emptyUsage() {
 * Sum two TokenUsage values.
 */
 function addUsage$1(a, b) {
+	const outputReasoning = a.outputReasoning !== void 0 && b.outputReasoning !== void 0 ? a.outputReasoning + b.outputReasoning : a.output === 0 ? b.outputReasoning : b.output === 0 ? a.outputReasoning : void 0;
 	return {
 		inputOther: a.inputOther + b.inputOther,
 		output: a.output + b.output,
+		...outputReasoning === void 0 ? {} : { outputReasoning },
 		inputCacheRead: a.inputCacheRead + b.inputCacheRead,
 		inputCacheCreation: a.inputCacheCreation + b.inputCacheCreation
 	};
@@ -10140,6 +10188,8 @@ var init_schema = __esmMin((() => {
 	ProviderConfigSchema = object$1({
 		type: ProviderTypeSchema,
 		apiKey: string().optional(),
+		memoryWorkspaceId: string().regex(/^blun-[0-9a-f]{64}$/u).optional(),
+		memoryApiKeyHash: string().regex(/^[0-9a-f]{64}$/u).optional(),
 		baseUrl: string().optional(),
 		defaultModel: string().optional(),
 		oauth: OAuthRefSchema.optional(),
@@ -10630,7 +10680,8 @@ function tokenToWire(token) {
 		expires_at: token.expiresAt,
 		scope: token.scope,
 		token_type: token.tokenType,
-		expires_in: token.expiresIn
+		expires_in: token.expiresIn,
+		...token.memoryWorkspaceId === void 0 ? {} : { memory_workspace_id: token.memoryWorkspaceId }
 	};
 }
 function tokenFromWire(wire) {
@@ -10640,13 +10691,14 @@ function tokenFromWire(wire) {
 		expiresAt: typeof wire.expires_at === "number" ? wire.expires_at : 0,
 		scope: wire.scope ?? "",
 		tokenType: wire.token_type ?? "",
-		expiresIn: typeof wire.expires_in === "number" ? wire.expires_in : 0
+		expiresIn: typeof wire.expires_in === "number" ? wire.expires_in : 0,
+		...typeof wire.memory_workspace_id === "string" && wire.memory_workspace_id.length > 0 ? { memoryWorkspaceId: wire.memory_workspace_id } : {}
 	};
 }
 var init_types$17 = __esmMin((() => {}));
 //#endregion
 //#region ../../packages/oauth/src/utils.ts
-function isRecord$28(value) {
+function isRecord$32(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var init_utils$1 = __esmMin((() => {}));
@@ -11229,7 +11281,7 @@ var init_storage = __esmMin((() => {
 			} catch {
 				return;
 			}
-			if (!isRecord$28(parsed)) return void 0;
+			if (!isRecord$32(parsed)) return void 0;
 			return tokenFromWire(parsed);
 		}
 		async save(name, token) {
@@ -11323,7 +11375,7 @@ function extractApiErrorMessage(value) {
 		}
 		return;
 	}
-	if (!isRecord$28(value)) return void 0;
+	if (!isRecord$32(value)) return void 0;
 	for (const key of DIRECT_ERROR_KEYS) {
 		const message = stringField$4(value, key);
 		if (message !== void 0) return message;
@@ -11331,7 +11383,7 @@ function extractApiErrorMessage(value) {
 	const error = value["error"];
 	const errorString = nonEmptyString$7(error);
 	if (errorString !== void 0) return errorString;
-	if (isRecord$28(error)) for (const key of NESTED_ERROR_KEYS) {
+	if (isRecord$32(error)) for (const key of NESTED_ERROR_KEYS) {
 		const message = stringField$4(error, key);
 		if (message !== void 0) return message;
 	}
@@ -11421,7 +11473,7 @@ async function postForm(url, params, deviceHeaders, options) {
 	let data = {};
 	try {
 		const parsed = await response.json();
-		if (isRecord$28(parsed)) data = parsed;
+		if (isRecord$32(parsed)) data = parsed;
 	} catch {}
 	return {
 		status,
@@ -11897,7 +11949,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$15 = __require("fs");
+	var fs$16 = __require("fs");
 	var polyfills = require_polyfills();
 	var legacy = require_legacy_streams();
 	var clone = require_clone$1();
@@ -11926,36 +11978,36 @@ var require_graceful_fs = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		m = "GFS4: " + m.split(/\n/).join("\nGFS4: ");
 		console.error(m);
 	};
-	if (!fs$15[gracefulQueue]) {
-		publishQueue(fs$15, global[gracefulQueue] || []);
-		fs$15.close = (function(fs$close) {
+	if (!fs$16[gracefulQueue]) {
+		publishQueue(fs$16, global[gracefulQueue] || []);
+		fs$16.close = (function(fs$close) {
 			function close(fd, cb) {
-				return fs$close.call(fs$15, fd, function(err) {
+				return fs$close.call(fs$16, fd, function(err) {
 					if (!err) resetQueue();
 					if (typeof cb === "function") cb.apply(this, arguments);
 				});
 			}
 			Object.defineProperty(close, previousSymbol, { value: fs$close });
 			return close;
-		})(fs$15.close);
-		fs$15.closeSync = (function(fs$closeSync) {
+		})(fs$16.close);
+		fs$16.closeSync = (function(fs$closeSync) {
 			function closeSync(fd) {
-				fs$closeSync.apply(fs$15, arguments);
+				fs$closeSync.apply(fs$16, arguments);
 				resetQueue();
 			}
 			Object.defineProperty(closeSync, previousSymbol, { value: fs$closeSync });
 			return closeSync;
-		})(fs$15.closeSync);
+		})(fs$16.closeSync);
 		if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || "")) process.on("exit", function() {
-			debug(fs$15[gracefulQueue]);
-			__require("assert").equal(fs$15[gracefulQueue].length, 0);
+			debug(fs$16[gracefulQueue]);
+			__require("assert").equal(fs$16[gracefulQueue].length, 0);
 		});
 	}
-	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;
+	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;
 	}
 	function patch(fs) {
 		polyfills(fs);
@@ -12210,23 +12262,23 @@ var require_graceful_fs = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	}
 	function enqueue(elem) {
 		debug("ENQUEUE", elem[0].name, elem[1]);
-		fs$15[gracefulQueue].push(elem);
+		fs$16[gracefulQueue].push(elem);
 		retry();
 	}
 	var retryTimer;
 	function resetQueue() {
 		var now = Date.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;
+		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;
 		}
 		retry();
 	}
 	function retry() {
 		clearTimeout(retryTimer);
 		retryTimer = void 0;
-		if (fs$15[gracefulQueue].length === 0) return;
-		var elem = fs$15[gracefulQueue].shift();
+		if (fs$16[gracefulQueue].length === 0) return;
+		var elem = fs$16[gracefulQueue].shift();
 		var fn = elem[0];
 		var args = elem[1];
 		var err = elem[2];
@@ -12245,7 +12297,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$15[gracefulQueue].push(elem);
+			} else fs$16[gracefulQueue].push(elem);
 		}
 		if (retryTimer === void 0) retryTimer = setTimeout(retry, 0);
 	}
@@ -13051,6 +13103,27 @@ var init_oauth_manager = __esmMin((() => {
 			const state = await this.loadState();
 			return state.kind === "valid" ? state.token.accessToken : void 0;
 		}
+		async getCachedMemoryWorkspaceId() {
+			const state = await this.loadState();
+			return state.kind === "valid" && state.token.expiresAt > this.now() ? state.token.memoryWorkspaceId : void 0;
+		}
+		async cacheMemoryWorkspaceId(workspaceId) {
+			if (workspaceId.length === 0) return false;
+			const release = await this.acquireRefreshLock();
+			try {
+				const state = await this.loadState();
+				if (state.kind !== "valid" || state.token.expiresAt <= this.now()) return false;
+				if (state.token.memoryWorkspaceId === workspaceId) return true;
+				if (state.token.memoryWorkspaceId !== void 0) return false;
+				await this.storage.save(this.config.name, {
+					...state.token,
+					memoryWorkspaceId: workspaceId
+				});
+				return true;
+			} finally {
+				await release();
+			}
+		}
 		async logout() {
 			await this.inFlightRefresh?.promise.catch(() => void 0);
 			const release = await this.acquireRefreshLock();
@@ -13118,7 +13191,10 @@ var init_oauth_manager = __esmMin((() => {
 				if (activeToken.refreshToken.length === 0) throw new OAuthUnauthorizedError(`Token for "${this.config.name}" has no refresh_token; re-login required.`);
 				try {
 					const refreshed = await this.refreshImpl(this.config, activeToken.refreshToken);
-					await this.storage.save(this.config.name, refreshed);
+					await this.storage.save(this.config.name, {
+						...refreshed,
+						memoryWorkspaceId: activeToken.memoryWorkspaceId
+					});
 					this.notifyRefresh({ success: true });
 					return refreshed.accessToken;
 				} catch (error) {
@@ -13333,9 +13409,9 @@ function blunContextWindowsUrl(oauthHost) {
 	return `${(oauthHost ?? process.env["BLUN_OAUTH_HOST"] ?? "https://account.blun.ai").replace(/\/+$/, "")}/api/verbrauch/tarife`;
 }
 function parseManagedContextWindow(payload, plan) {
-	if (!isRecord$28(payload)) return void 0;
+	if (!isRecord$32(payload)) return void 0;
 	const contextWindows = payload["kontext"];
-	if (!isRecord$28(contextWindows)) return void 0;
+	if (!isRecord$32(contextWindows)) return void 0;
 	const value = contextWindows[plan];
 	return typeof value === "number" && Number.isSafeInteger(value) && value > 0 ? value : void 0;
 }
@@ -13370,7 +13446,7 @@ function parseManagedUsagePayload(payload) {
 	const plan = typeof rec["plan"] === "string" && rec["plan"].trim().length > 0 ? rec["plan"].trim() : void 0;
 	const contextWindowTokens = managedContextWindowFrom(rec);
 	const unlimited = rec["unlimited"] === true;
-	const stand = isRecord$28(rec["stand"]) ? rec["stand"] : void 0;
+	const stand = isRecord$32(rec["stand"]) ? rec["stand"] : void 0;
 	if (stand !== void 0) for (const [sourceKey, id, label] of ACCOUNT_USAGE_WINDOWS) {
 		const row = toAccountUsageRow(stand[sourceKey], id, label, unlimited);
 		if (row !== null) limits.push(row);
@@ -13380,9 +13456,9 @@ function parseManagedUsagePayload(payload) {
 		const item = rawLimits[idx];
 		if (!item || typeof item !== "object") continue;
 		const detailRaw = item["detail"];
-		const detail = isRecord$28(detailRaw) ? detailRaw : item;
+		const detail = isRecord$32(detailRaw) ? detailRaw : item;
 		const windowRaw = item["window"];
-		const row = toUsageRow(detail, limitLabel(item, detail, isRecord$28(windowRaw) ? windowRaw : {}, idx));
+		const row = toUsageRow(detail, limitLabel(item, detail, isRecord$32(windowRaw) ? windowRaw : {}, idx));
 		if (row !== null) limits.push(row);
 	}
 	return {
@@ -13406,7 +13482,7 @@ function managedContextWindowFrom(payload) {
 	return values.every((value) => value === first) ? first : void 0;
 }
 function toAccountUsageRow(raw, id, label, accountUnlimited) {
-	if (!isRecord$28(raw)) return null;
+	if (!isRecord$32(raw)) return null;
 	const used = toInt(raw["verbraucht"]);
 	const unlimited = accountUnlimited || raw["unlimited"] === true;
 	const fraction = raw["anteil"];
@@ -13439,7 +13515,7 @@ function toAccountUsageRow(raw, id, label, accountUnlimited) {
 	};
 }
 function toUsageRow(raw, defaultLabel) {
-	if (!isRecord$28(raw)) return null;
+	if (!isRecord$32(raw)) return null;
 	const unlimited = raw["unlimited"] === true;
 	const limit = toInt(raw["limit"]);
 	let used = toInt(raw["used"]);
@@ -13560,7 +13636,7 @@ function isManagedQuotaErrorMessage(message) {
 	return /you(?:'|’)?ve reached your usage limit/.test(normalized) && /billing cycle|quota will be (?:refreshed|reset)|purchase extra usage/.test(normalized);
 }
 function hasManagedUsageShape(payload) {
-	if (!isRecord$28(payload)) return false;
+	if (!isRecord$32(payload)) return false;
 	let recognized = false;
 	if ("context_window_tokens" in payload || "contextWindowTokens" in payload) {
 		recognized = true;
@@ -13576,15 +13652,15 @@ function hasManagedUsageShape(payload) {
 		if (!Array.isArray(limits)) return false;
 		for (let index = 0; index < limits.length; index++) {
 			const item = limits[index];
-			if (!isRecord$28(item)) return false;
-			const detail = isRecord$28(item["detail"]) ? item["detail"] : item;
-			if (toUsageRow(detail, limitLabel(item, detail, isRecord$28(item["window"]) ? item["window"] : {}, index)) === null) return false;
+			if (!isRecord$32(item)) return false;
+			const detail = isRecord$32(item["detail"]) ? item["detail"] : item;
+			if (toUsageRow(detail, limitLabel(item, detail, isRecord$32(item["window"]) ? item["window"] : {}, index)) === null) return false;
 		}
 	}
 	if ("stand" in payload) {
 		recognized = true;
 		const stand = payload["stand"];
-		if (!isRecord$28(stand)) return false;
+		if (!isRecord$32(stand)) return false;
 		const windows = ACCOUNT_USAGE_WINDOWS.filter(([sourceKey]) => sourceKey in stand);
 		if (windows.length === 0) return false;
 		const unlimited = payload["unlimited"] === true;
@@ -13680,8 +13756,8 @@ function userExtras(existing, remoteOwnedFields) {
 	return out;
 }
 function mergeRefreshedModelAlias(existing, remote, remoteOwnedFields) {
-	const current = isRecord$28(existing) ? existing : {};
-	const overrides = cloneOverrides(isRecord$28(current["overrides"]) ? current["overrides"] : void 0);
+	const current = isRecord$32(existing) ? existing : {};
+	const overrides = cloneOverrides(isRecord$32(current["overrides"]) ? current["overrides"] : void 0);
 	return {
 		...userExtras(current, remoteOwnedFields),
 		...remote,
@@ -13870,7 +13946,7 @@ function parseModelContextLength(item, modelId) {
 	return values[0];
 }
 function toModelInfo(item) {
-	if (!isRecord$28(item) || typeof item["id"] !== "string" || item["id"].length === 0) return;
+	if (!isRecord$32(item) || typeof item["id"] !== "string" || item["id"].length === 0) return;
 	const contextLength = parseModelContextLength(item, item["id"]);
 	const displayName = item["display_name"];
 	const normalizedDisplayName = typeof displayName === "string" && displayName.length > 0 ? displayName : void 0;
@@ -13957,7 +14033,7 @@ async function fetchManagedBlunCodeModels(options) {
 			throw new Error(message);
 		}
 		const payload = await response.json();
-		if (!isRecord$28(payload) || !Array.isArray(payload["data"])) throw new Error(`Unexpected models response for ${baseUrl}.`);
+		if (!isRecord$32(payload) || !Array.isArray(payload["data"])) throw new Error(`Unexpected models response for ${baseUrl}.`);
 		return payload["data"].map((item) => toModelInfo(item)).filter((item) => item !== void 0);
 	}
 	throw new Error(`Failed to list BLUN models for ${baseUrl}.`);
@@ -14000,11 +14076,11 @@ function applyManagedBlunCodeConfig(config, options) {
 		apiKey
 	};
 	const upstreamKeys = new Set(options.models.map((m) => managedModelKey(m.id)));
-	for (const [key, model] of Object.entries(existingModels)) if (RETIRED_BLUN_MODEL_KEYS.has(key) || isRecord$28(model) && model["provider"] === "managed:blun" && !upstreamKeys.has(key)) delete existingModels[key];
+	for (const [key, model] of Object.entries(existingModels)) if (RETIRED_BLUN_MODEL_KEYS.has(key) || isRecord$32(model) && model["provider"] === "managed:blun" && !upstreamKeys.has(key)) delete existingModels[key];
 	for (const model of options.models) {
 		const capabilities = capabilitiesForModel(model);
 		const key = managedModelKey(model.id);
-		const existing = isRecord$28(existingModels[key]) ? existingModels[key] : {};
+		const existing = isRecord$32(existingModels[key]) ? existingModels[key] : {};
 		const supportsAdaptiveThinking = capabilities?.includes("thinking") === true || capabilities?.includes("always_thinking") === true;
 		existingModels[key] = mergeRefreshedModelAlias(existing, {
 			provider: BLUN_PROVIDER_NAME$1,
@@ -14052,7 +14128,7 @@ function applyManagedBlunCodeLogoutConfig(config) {
 	let removedDefaultModel = false;
 	const existingModels = config.models ?? {};
 	for (const [key, model] of Object.entries(existingModels)) {
-		if (!isRecord$28(model) || model["provider"] !== "managed:blun") continue;
+		if (!isRecord$32(model) || model["provider"] !== "managed:blun") continue;
 		delete existingModels[key];
 		if (config.defaultModel === key) removedDefaultModel = true;
 	}
@@ -14092,7 +14168,7 @@ function selectDefaultModel(config, models, options) {
 function canPreserveDefaultModel(existingModels, defaultModel, managedModels) {
 	if (managedModels.has(defaultModel)) return true;
 	const existing = existingModels[defaultModel];
-	return isRecord$28(existing) && existing["provider"] !== "managed:blun";
+	return isRecord$32(existing) && existing["provider"] !== "managed:blun";
 }
 function assertPositiveContextLength(model) {
 	if (!Number.isInteger(model.contextLength) || model.contextLength <= 0) throw new Error(`BLUN model "${model.id}" must include a positive context_length.`);
@@ -14168,13 +14244,13 @@ function blunManagedQuotaUrl(oauthHost) {
 	return `${(oauthHost ?? process.env["BLUN_OAUTH_HOST"] ?? "https://account.blun.ai").replace(/\/+$/, "")}${MANAGED_QUOTA_PATH}`;
 }
 function parseManagedQuotaPayload(payload) {
-	if (!isRecord$28(payload)) return void 0;
+	if (!isRecord$32(payload)) return void 0;
 	const plan = nonEmptyString$6(payload["plan"]);
 	const paid = payload["bezahlt"];
 	const creditCents = payload["guthaben_cent"];
 	const billingKind = nonEmptyString$6(payload["art"]);
 	const globalUnlimited = payload["unlimited"];
-	if (plan === void 0 || typeof paid !== "boolean" || !Number.isSafeInteger(creditCents) || creditCents < 0 || billingKind === void 0 || globalUnlimited !== void 0 && typeof globalUnlimited !== "boolean" || !isRecord$28(payload["stand"])) return;
+	if (plan === void 0 || typeof paid !== "boolean" || !Number.isSafeInteger(creditCents) || creditCents < 0 || billingKind === void 0 || globalUnlimited !== void 0 && typeof globalUnlimited !== "boolean" || !isRecord$32(payload["stand"])) return;
 	if (!hasStrictQuotaStand(payload["stand"], globalUnlimited === true)) return void 0;
 	const limits = parseManagedUsagePayload(payload).limits;
 	if (limits.length !== REQUIRED_WINDOWS.length || REQUIRED_WINDOWS.some(([, id]) => limits.filter((row) => row.id === id).length !== 1)) return;
@@ -14244,7 +14320,7 @@ function nonEmptyString$6(value) {
 function hasStrictQuotaStand(stand, globalUnlimited) {
 	return REQUIRED_WINDOWS.every(([sourceKey]) => {
 		const row = stand[sourceKey];
-		if (!isRecord$28(row)) return false;
+		if (!isRecord$32(row)) return false;
 		const used = row["verbraucht"];
 		const rowUnlimited = row["unlimited"];
 		if (rowUnlimited !== void 0 && typeof rowUnlimited !== "boolean") return false;
@@ -14534,6 +14610,16 @@ var init_toolkit = __esmMin((() => {
 				hasToken: await this.managerFor(name, oauthKey, oauthHost).hasToken()
 			}] };
 		}
+		async getCachedMemoryWorkspaceId(oauthRef) {
+			const oauthHost = this.oauthHostFor(oauthRef);
+			const oauthKey = oauthRef?.key ?? this.defaultOAuthKey(void 0, oauthHost);
+			return this.managerFor(BLUN_PROVIDER_NAME$1, oauthKey, oauthHost).getCachedMemoryWorkspaceId();
+		}
+		async cacheMemoryWorkspaceId(workspaceId, oauthRef) {
+			const oauthHost = this.oauthHostFor(oauthRef);
+			const oauthKey = oauthRef?.key ?? this.defaultOAuthKey(void 0, oauthHost);
+			return this.managerFor(BLUN_PROVIDER_NAME$1, oauthKey, oauthHost).cacheMemoryWorkspaceId(workspaceId);
+		}
 		async login(providerName, options = {}) {
 			const name = providerName ?? "managed:blun";
 			const oauthHost = this.oauthHostFor(options.oauthRef, options.oauthHost);
@@ -15089,7 +15175,7 @@ async function syncDir(dirPath) {
 */
 function syncFd(fd) {
 	return new Promise((resolve, reject) => {
-		fs$16.fsync(fd, (err) => {
+		fs$17.fsync(fd, (err) => {
 			if (err) {
 				reject(err);
 				return;
@@ -16674,6 +16760,8 @@ function providerToToml(provider, rawProvider) {
 	for (const key of [
 		"type",
 		"apiKey",
+		"memoryWorkspaceId",
+		"memoryApiKeyHash",
 		"baseUrl",
 		"defaultModel",
 		"oauth",
@@ -21759,7 +21847,7 @@ function parseSkillText(options) {
 		throw error;
 	}
 	const frontmatter = parsed.data ?? {};
-	if (!isRecord$27(frontmatter)) throw new SkillParseError(`Frontmatter in ${options.skillMdPath} must be a mapping at the top level`);
+	if (!isRecord$31(frontmatter)) throw new SkillParseError(`Frontmatter in ${options.skillMdPath} must be a mapping at the top level`);
 	const metadata = normalizeMetadata(frontmatter);
 	if (!isSupportedSkillType(metadata.type)) throw new UnsupportedSkillTypeError(metadata.type ?? String(frontmatter["type"]));
 	const name = nonEmptyString$4(metadata.name);
@@ -21872,7 +21960,7 @@ function tokenizeArgs(raw) {
 function nonEmptyString$4(value) {
 	return typeof value === "string" && value.trim() !== "" ? value.trim() : void 0;
 }
-function isRecord$27(value) {
+function isRecord$31(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var import_regexp_escape, FrontmatterError, SkillParseError, UnsupportedSkillTypeError, FENCE, METADATA_ALIASES;
@@ -21921,7 +22009,7 @@ var init_parser$1 = __esmMin((() => {
 function parseCommandText(input) {
 	const { text, commandPath, pluginId } = input;
 	const parsed = parseFrontmatter(text);
-	const frontmatter = isRecord$26(parsed.data) ? parsed.data : {};
+	const frontmatter = isRecord$30(parsed.data) ? parsed.data : {};
 	const baseName = input.fallbackName ?? path.basename(commandPath).replace(/\.md$/i, "");
 	const name = nonEmptyString$3(frontmatter["name"]) ?? baseName;
 	const body = parsed.body.trim();
@@ -21963,7 +22051,7 @@ function descriptionFromBody(body) {
 	if (firstLine === void 0) return "No description provided.";
 	return firstLine.length > 240 ? `${firstLine.slice(0, 239)}…` : firstLine;
 }
-function isRecord$26(value) {
+function isRecord$30(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var init_commands = __esmMin((() => {
@@ -22273,10 +22361,15 @@ async function loadAgentsMdForRoots(kaos, brandHome, workDirs) {
 	const discovered = [];
 	const emptySources = /* @__PURE__ */ new Map();
 	const seen = /* @__PURE__ */ new Set();
+	const notLoadedCandidates = /* @__PURE__ */ new Set();
 	const collect = async (path) => {
 		const file = await readAgentFile(kaos, path);
-		if (file === void 0) return false;
+		if (file === void 0) {
+			notLoadedCandidates.add(kaos.normpath(path));
+			return false;
+		}
 		const key = kaos.normpath(file.path);
+		notLoadedCandidates.delete(key);
 		if (file.content.length === 0) {
 			emptySources.set(key, InstructionText.file(file.path, "", file.sourceTextBytes));
 			return false;
@@ -22312,7 +22405,10 @@ 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,
-		sources: rendered.measure()
+		sources: {
+			...rendered.measure(),
+			...notLoadedCandidates.size === 0 ? {} : { notLoadedCandidates: [...notLoadedCandidates] }
+		}
 	};
 }
 async function loadAdditionalDirsInfo(kaos, additionalDirs) {
@@ -27708,7 +27804,7 @@ var require_node_loaders = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		};
 		return _setPrototypeOf(o, p);
 	}
-	var fs$14 = __require("fs");
+	var fs$15 = __require("fs");
 	var path$14 = __require("path");
 	var Loader = require_loader();
 	var PrecompiledLoader = require_precompiled_loader().PrecompiledLoader;
@@ -27732,7 +27828,7 @@ 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$14.existsSync);
+					var paths = _this.searchPaths.filter(fs$15.existsSync);
 					var watcher = chokidar.watch(paths);
 					watcher.on("all", function(event, fullname) {
 						fullname = path$14.resolve(fullname);
@@ -27751,7 +27847,7 @@ var require_node_loaders = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				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$14.existsSync(p)) {
+					if (p.indexOf(basePath) === 0 && fs$15.existsSync(p)) {
 						fullpath = p;
 						break;
 					}
@@ -27759,7 +27855,7 @@ var require_node_loaders = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				if (!fullpath) return null;
 				this.pathsToNames[fullpath] = name;
 				var source = {
-					src: fs$14.readFileSync(fullpath, "utf-8"),
+					src: fs$15.readFileSync(fullpath, "utf-8"),
 					path: fullpath,
 					noCache: this.noCache
 				};
@@ -27807,7 +27903,7 @@ var require_node_loaders = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				}
 				this.pathsToNames[fullpath] = name;
 				var source = {
-					src: fs$14.readFileSync(fullpath, "utf-8"),
+					src: fs$15.readFileSync(fullpath, "utf-8"),
 					path: fullpath,
 					noCache: this.noCache
 				};
@@ -28551,7 +28647,7 @@ 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$13 = __require("fs");
+	var fs$14 = __require("fs");
 	var path$12 = __require("path");
 	var _prettifyError = require_lib$8()._prettifyError;
 	var compiler = require_compiler();
@@ -28576,27 +28672,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$13.existsSync(input) && fs$13.statSync(input);
+		var pathStats = fs$14.existsSync(input) && fs$14.statSync(input);
 		var precompiled = [];
 		var templates = [];
 		function addTemplates(dir) {
-			fs$13.readdirSync(dir).forEach(function(file) {
+			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$13.statSync(filepath);
+				var stat = fs$14.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$13.readFileSync(input, "utf-8"), opts.name || input, env));
+		if (pathStats.isFile()) precompiled.push(_precompile(fs$14.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, "/"), "");
 				try {
-					precompiled.push(_precompile(fs$13.readFileSync(templates[i], "utf-8"), name, env));
+					precompiled.push(_precompile(fs$14.readFileSync(templates[i], "utf-8"), name, env));
 				} catch (e) {
 					if (opts.force) console.error(e);
 					else throw e;
@@ -29312,17 +29408,20 @@ function createSystemPromptRenderer(merged) {
 				const counts = renderPromptContributions(merged.systemPromptTemplate, vars, rendered, true) ?? renderPromptContributions(merged.systemPromptTemplate, vars, rendered);
 				const sources = context.agentsMdSources;
 				const copies = counts?.instructionCopies ?? 0;
-				const sourceMatches = sources !== void 0 && sources.version === 1 && Number.isSafeInteger(sources.generatedBytes) && sources.generatedBytes >= 0 && sources.files.every((file) => typeof file.path === "string" && Number.isSafeInteger(file.bytes) && file.bytes >= 0) && sources.totalBytes === Buffer.byteLength(vars["BLUN_AGENTS_MD"] ?? "", "utf8") && sources.generatedBytes + sources.files.reduce((sum, file) => sum + file.bytes, 0) === sources.totalBytes;
+				const sourceMatches = sources !== void 0 && sources.version === 1 && Number.isSafeInteger(sources.generatedBytes) && sources.generatedBytes >= 0 && sources.files.every((file) => typeof file.path === "string" && Number.isSafeInteger(file.bytes) && file.bytes >= 0) && (sources.notLoadedCandidates?.every((path) => typeof path === "string") ?? true) && sources.totalBytes === Buffer.byteLength(vars["BLUN_AGENTS_MD"] ?? "", "utf8") && sources.generatedBytes + sources.files.reduce((sum, file) => sum + file.bytes, 0) === sources.totalBytes;
+				const notLoadedCandidates = sourceMatches && sources.notLoadedCandidates !== void 0 ? { notLoadedCandidates: [...sources.notLoadedCandidates] } : {};
 				const instructionSources = copies === 0 ? {
 					version: 1,
 					totalBytes: 0,
 					generatedBytes: 0,
-					files: sourceMatches ? sources.files.map((file) => copyInstructionFileBytes(file, 0)) : []
+					files: sourceMatches ? sources.files.map((file) => copyInstructionFileBytes(file, 0)) : [],
+					...notLoadedCandidates
 				} : !sourceMatches ? void 0 : {
 					version: 1,
 					totalBytes: sources.totalBytes * copies,
 					generatedBytes: sources.generatedBytes * copies,
-					files: sources.files.map((file) => copyInstructionFileBytes(file, copies))
+					files: sources.files.map((file) => copyInstructionFileBytes(file, copies)),
+					...notLoadedCandidates
 				};
 				const skillListingSources = counts === void 0 ? void 0 : scaleSkillListingSources(skillSources, vars["BLUN_SKILLS"] ?? "", counts.skillListingBytes);
 				context.onContributions(counts === void 0 ? void 0 : {
@@ -29811,7 +29910,7 @@ var init_per_id_json_store = __esmMin((() => {
 }));
 //#endregion
 //#region ../../packages/agent-core/src/agent/background/resume-store.ts
-var BACKGROUND_TASK_ID, id, digest$2, timestamp$2, ResumeIntentSchema, hash$3, isRecord$25, TaskResumeStore;
+var BACKGROUND_TASK_ID, id, digest$2, timestamp$2, ResumeIntentSchema, hash$3, isRecord$29, TaskResumeStore;
 var init_resume_store = __esmMin((() => {
 	init_zod$1();
 	BACKGROUND_TASK_ID = /^[a-z0-9]+(?:-[a-z0-9]+)*-[0-9a-z]{8}$/;
@@ -29836,7 +29935,7 @@ var init_resume_store = __esmMin((() => {
 		startedAt: timestamp$2.nullable()
 	}).strict();
 	hash$3 = (value) => createHash("sha256").update(value).digest("hex");
-	isRecord$25 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+	isRecord$29 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 	TaskResumeStore = class {
 		home;
 		constructor(home) {
@@ -29891,9 +29990,9 @@ var init_resume_store = __esmMin((() => {
 		}
 		async readOwnedTask(taskId) {
 			const task = await this.read("tasks", taskId);
-			if (!isRecord$25(task)) throw new Error("Task has no persisted local record.");
+			if (!isRecord$29(task)) throw new Error("Task has no persisted local record.");
 			const owner = task["resumeOwnership"];
-			if (!isRecord$25(owner) || owner["version"] !== 1 || owner["scope"] !== hash$3(await this.root()) || owner["taskId"] !== taskId || task["taskId"] !== taskId || task["kind"] !== "agent" || owner["agentId"] !== task["agentId"] || owner["startedAt"] !== task["startedAt"]) throw new Error("Task ownership is unverified; historical or foreign records cannot be resumed automatically.");
+			if (!isRecord$29(owner) || owner["version"] !== 1 || owner["scope"] !== hash$3(await this.root()) || owner["taskId"] !== taskId || task["taskId"] !== taskId || task["kind"] !== "agent" || owner["agentId"] !== task["agentId"] || owner["startedAt"] !== task["startedAt"]) throw new Error("Task ownership is unverified; historical or foreign records cannot be resumed automatically.");
 			const { resumeOwnership: _ownership, ...info } = task;
 			return info;
 		}
@@ -30014,12 +30113,12 @@ function legacyStatusToCurrent$1(task) {
 	return task.status;
 }
 function isReadablePersistedTask$1(obj) {
-	return isRecord$24(obj) && (typeof obj["taskId"] === "string" || typeof obj["task_id"] === "string");
+	return isRecord$28(obj) && (typeof obj["taskId"] === "string" || typeof obj["task_id"] === "string");
 }
 function isLegacyPersistedTask$1(task) {
 	return "task_id" in task;
 }
-function isRecord$24(value) {
+function isRecord$28(value) {
 	return typeof value === "object" && value !== null;
 }
 function optionalNonEmptyString$2(value) {
@@ -191962,7 +192061,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$12 = __require("fs");
+	const fs$13 = __require("fs");
 	const ImageQ = require_image_q();
 	const BitmapImage = require_bitmapimage();
 	const { GifFrame } = require_gifframe();
@@ -192229,7 +192328,7 @@ var require_gifutil = /* @__PURE__ */ __commonJSMin(((exports) => {
 	}
 	function _readBinary(path) {
 		return new Promise((resolve, reject) => {
-			fs$12.readFile(path, (err, buffer) => {
+			fs$13.readFile(path, (err, buffer) => {
 				if (err) return reject(err);
 				return resolve(buffer);
 			});
@@ -192237,7 +192336,7 @@ var require_gifutil = /* @__PURE__ */ __commonJSMin(((exports) => {
 	}
 	function _writeBinary(path, buffer) {
 		return new Promise((resolve, reject) => {
-			fs$12.writeFile(path, buffer, (err) => {
+			fs$13.writeFile(path, buffer, (err) => {
 				if (err) return reject(err);
 				return resolve();
 			});
@@ -218055,7 +218154,7 @@ var init_file_type = __esmMin((() => {
 		}
 		async fromFile(path) {
 			this.options.signal?.throwIfAborted();
-			const fileHandle = await ro.open(path, constants.O_RDONLY | constants.O_NONBLOCK);
+			const fileHandle = await fs.open(path, constants.O_RDONLY | constants.O_NONBLOCK);
 			const fileStat = await fileHandle.stat();
 			if (!fileStat.isFile()) {
 				await fileHandle.close();
@@ -229617,7 +229716,7 @@ function escapeXml(value) {
 function locationKey(messageIndex, partIndex) {
 	return `${String(messageIndex)}:${String(partIndex)}`;
 }
-function isRecord$23(value) {
+function isRecord$27(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function isNonNegativeInteger$1(value) {
@@ -229818,7 +229917,7 @@ var init_vision_reader = __esmMin((() => {
 					reason: "malformed"
 				};
 			}
-			if (!isRecord$23(payload) || payload["done"] !== true || typeof payload["response"] !== "string" || !isNonNegativeInteger$1(payload["prompt_eval_count"]) || !isNonNegativeInteger$1(payload["eval_count"])) return {
+			if (!isRecord$27(payload) || payload["done"] !== true || typeof payload["response"] !== "string" || !isNonNegativeInteger$1(payload["prompt_eval_count"]) || !isNonNegativeInteger$1(payload["eval_count"])) return {
 				ok: false,
 				reason: "malformed"
 			};
@@ -231014,16 +231113,19 @@ var init_full = __esmMin((() => {
 			const projected = context.additionalMessages === void 0 ? messages : [...messages, ...context.additionalMessages];
 			const historyBudget = this.requestHistoryByteBudget(projected);
 			const historyThresholdReached = historyBudget !== void 0 && historyBudget.usedHistoryBytes >= historyBudget.thresholdHistoryBytes;
+			const requestBudget = this.requestBodyByteBudget(projected, context);
+			const requestThresholdReached = requestBudget !== void 0 && requestBudget.usedRequestBytesEstimate >= requestBudget.thresholdRequestBytes;
 			if (this.sessionCompactionFailures >= MAX_SESSION_COMPACTION_FAILURES) reason = "session_stopped";
 			else if (this.isCompacting) reason = "already_compacting";
-			else if (thresholdTokens === void 0 && historyBudget === void 0) reason = "no_budget";
-			else if (!historyThresholdReached && (thresholdTokens === void 0 || !Number.isFinite(usedTokens) || usedTokens < thresholdTokens)) reason = "below_threshold";
+			else if (thresholdTokens === void 0 && historyBudget === void 0 && requestBudget === void 0) reason = "no_budget";
+			else if (!historyThresholdReached && !requestThresholdReached && (thresholdTokens === void 0 || !Number.isFinite(usedTokens) || usedTokens < thresholdTokens)) reason = "below_threshold";
 			else if (!this.hasShrinkableHistory(projected)) reason = "nothing_to_compact";
 			return {
 				eligible: reason === "eligible",
 				usedTokens,
 				thresholdTokens,
 				...historyBudget,
+				...requestBudget,
 				reason
 			};
 		}
@@ -231045,6 +231147,35 @@ var init_full = __esmMin((() => {
 				thresholdHistoryBytes: limit
 			};
 		}
+		requestBodyByteBudget(messages, context) {
+			const limit = this.agent.blunConfig?.loopControl?.maxRequestHistoryBytes;
+			if (!this.agent.config.hasProvider || this.strategy.compactionBudgetTokens === void 0 || limit !== void 0 && (!Number.isSafeInteger(limit) || limit <= 0)) return void 0;
+			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;
+			return {
+				usedRequestBytesEstimate: Buffer.byteLength(JSON.stringify({
+					systemPrompt,
+					messages
+				}), "utf8") + extraBytes.toolsBytes + extraBytes.visionBytes,
+				thresholdRequestBytes: BLUN_COMPACTION_REQUEST_BUDGET_BYTES
+			};
+		}
 		requestProactiveCompaction(context = {}) {
 			const status = this.proactiveCompactionStatus(context);
 			if (status.eligible && !this.proactiveCompactionRequested) {
@@ -231053,7 +231184,9 @@ var init_full = __esmMin((() => {
 					used_tokens: status.usedTokens,
 					threshold_tokens: status.thresholdTokens,
 					used_history_bytes: status.usedHistoryBytes,
-					threshold_history_bytes: status.thresholdHistoryBytes
+					threshold_history_bytes: status.thresholdHistoryBytes,
+					used_request_bytes_estimate: status.usedRequestBytesEstimate,
+					threshold_request_bytes: status.thresholdRequestBytes
 				});
 			}
 			return status;
@@ -231182,7 +231315,9 @@ var init_full = __esmMin((() => {
 			const requestTokens = this.estimateCurrentRequestTokens(requestContext);
 			const budget = this.getCompactionBudgetTokens();
 			const historyBudget = this.requestHistoryByteBudget(projectedMessages);
-			const proactive = (historyBudget !== void 0 && historyBudget.usedHistoryBytes >= historyBudget.thresholdHistoryBytes || !this.isCompacting && budget !== void 0 && Number.isFinite(requestTokens) && requestTokens >= Math.max(1, Math.floor(budget * .9))) && this.hasShrinkableHistory(projectedMessages);
+			const historyThresholdReached = historyBudget !== void 0 && historyBudget.usedHistoryBytes >= historyBudget.thresholdHistoryBytes;
+			const requestBudget = this.requestBodyByteBudget(projectedMessages, requestContext);
+			const proactive = (requestBudget !== void 0 && requestBudget.usedRequestBytesEstimate >= requestBudget.thresholdRequestBytes || historyThresholdReached || !this.isCompacting && budget !== void 0 && Number.isFinite(requestTokens) && requestTokens >= Math.max(1, Math.floor(budget * .9))) && this.hasShrinkableHistory(projectedMessages);
 			if (this.checkAutoCompaction(true, requestTokens, projectedMessages, proactive) && (proactive || this.strategy.shouldBlock(requestTokens))) await this.block(signal);
 			signal.throwIfAborted();
 			const compacted = this.agent.context.history !== historyBefore;
@@ -231392,7 +231527,10 @@ var init_full = __esmMin((() => {
 						dropOrphanResults: true
 					}), createUserMessage(requestInstruction)], capability));
 				};
-				const estimateRequestBytes = (messages) => Buffer.byteLength(JSON.stringify(messages), "utf8") + Buffer.byteLength(this.agent.config.systemPrompt, "utf8");
+				const estimateRequestBytes = (messages) => Buffer.byteLength(JSON.stringify({
+					systemPrompt: this.agent.effectiveSystemPrompt,
+					messages
+				}), "utf8");
 				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: {
@@ -236113,7 +236251,7 @@ function structuredOutput(stdout, input) {
 			return {
 				...result,
 				additionalContext: input["hook_event_name"] === "UserPromptSubmit" && hookSpecificOutput?.hookEventName === "UserPromptSubmit" ? hookSpecificOutput.additionalContext : void 0,
-				updatedInput: input["hook_event_name"] === "PreToolUse" && hookSpecificOutput?.hookEventName === "PreToolUse" && isRecord$22(hookSpecificOutput.updatedInput) ? hookSpecificOutput.updatedInput : void 0
+				updatedInput: input["hook_event_name"] === "PreToolUse" && hookSpecificOutput?.hookEventName === "PreToolUse" && isRecord$26(hookSpecificOutput.updatedInput) ? hookSpecificOutput.updatedInput : void 0
 			};
 		}
 		return {
@@ -236182,7 +236320,7 @@ function killProcessTreeWindows(child, force) {
 		} catch {}
 	}
 }
-function isRecord$22(value) {
+function isRecord$26(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function errorMessage$12(error) {
@@ -236199,7 +236337,7 @@ var init_runner = __esmMin((() => {
 		if (typeof value === "string") return value;
 		if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") return String(value);
 	}, string().optional());
-	HookSpecificOutputSchema = preprocess((value) => isRecord$22(value) ? value : void 0, looseObject({
+	HookSpecificOutputSchema = preprocess((value) => isRecord$26(value) ? value : void 0, looseObject({
 		message: OptionalStringSchema,
 		additionalContext: OptionalStringSchema,
 		permissionDecision: unknown().optional(),
@@ -237487,7 +237625,7 @@ function parsePersonalMemoryRecall(output) {
 	} catch {
 		return { kind: "invalid" };
 	}
-	if (!isRecord$21(parsed) || !isRecord$21(parsed["personal_memory"])) return { kind: "invalid" };
+	if (!isRecord$25(parsed) || !isRecord$25(parsed["personal_memory"])) return { kind: "invalid" };
 	const memory = parsed["personal_memory"];
 	const savedRaw = memory["saved"];
 	const threadsRaw = memory["threads"];
@@ -237496,7 +237634,7 @@ function parsePersonalMemoryRecall(output) {
 	if (savedRaw.length > MAX_SAVED_MEMORIES || threadsRaw.length > MAX_THREADS || historyRaw.length > 0) return { kind: "invalid" };
 	const saved = [];
 	for (const value of savedRaw) {
-		if (!isRecord$21(value)) return { kind: "invalid" };
+		if (!isRecord$25(value)) return { kind: "invalid" };
 		const text = boundedTrimmedString(value["text"], MAX_MEMORY_TEXT_CHARS);
 		const confidence = value["confidence"];
 		if (text === void 0 || typeof confidence !== "string" || !CONFIDENCE_VALUES.has(confidence)) return { kind: "invalid" };
@@ -237507,7 +237645,7 @@ function parsePersonalMemoryRecall(output) {
 	}
 	const threads = [];
 	for (const value of threadsRaw) {
-		if (!isRecord$21(value)) return { kind: "invalid" };
+		if (!isRecord$25(value)) return { kind: "invalid" };
 		const title = boundedTrimmedString(value["title"], MAX_THREAD_TITLE_CHARS);
 		const summary = boundedTrimmedString(value["summary"], MAX_THREAD_SUMMARY_CHARS);
 		if (title === void 0 || summary === void 0) return { kind: "invalid" };
@@ -237561,7 +237699,7 @@ function boundedTrimmedString(value, maxChars) {
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : void 0;
 }
-function isRecord$21(value) {
+function isRecord$25(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var PERSONAL_MEMORY_HOST_RECALL_HANDLER$1, RECALL_LIMIT, RECALL_TIMEOUT_MS, MAX_QUERY_CHARS, MAX_WIRE_CHARS, MAX_SAVED_MEMORIES, MAX_THREADS, MAX_MEMORY_TEXT_CHARS, MAX_THREAD_TITLE_CHARS, MAX_THREAD_SUMMARY_CHARS, CONFIDENCE_VALUES, TELEGRAM_GROUP_MARKER_RE, TELEGRAM_MARKER_RE, TELEGRAM_CHANNEL_RE, TELEGRAM_SOURCE_RE, TELEGRAM_CHAT_ID_RE, TELEGRAM_SENDER_LINE_RE, TELEGRAM_ATTACHMENT_BLOCK_RE, TELEGRAM_ATTACHMENT_NOTICE_RE, TELEGRAM_IMAGE_ATTACHMENT_RE, GENERIC_IMAGE_QUERY, GENERIC_FILE_QUERY, GENERIC_EMPTY_QUERY, PERSONAL_MEMORY_RECALL_VARIANT, PersonalMemoryRecallInjector;
@@ -239793,6 +239931,32 @@ var require_turn_tool_performance_policy = /* @__PURE__ */ __commonJSMin(((expor
 		"suchen"
 	]);
 	const TOOL_SEARCH_RELATED_TERM_GROUPS = Object.freeze([
+		Object.freeze([
+			"persist",
+			"save",
+			"speichere",
+			"speichern",
+			"store"
+		]),
+		Object.freeze([
+			"erinnerung",
+			"erinnerungen",
+			"fact",
+			"facts",
+			"fakt",
+			"fakten",
+			"memory",
+			"memories",
+			"merk",
+			"merken",
+			"remember"
+		]),
+		Object.freeze([
+			"note",
+			"notes",
+			"notiz",
+			"notizen"
+		]),
 		Object.freeze([
 			"checklist",
 			"list",
@@ -239990,10 +240154,27 @@ var require_turn_tool_performance_policy = /* @__PURE__ */ __commonJSMin(((expor
 	function relatedSearchTerms(token) {
 		return TOOL_SEARCH_RELATED_TERM_GROUPS.find((terms) => terms.includes(token)) || [token];
 	}
+	function withoutFencedCode(value) {
+		const visibleLines = [];
+		let fence = null;
+		for (const line of String(value || "").split(/\r?\n/)) {
+			const marker = line.match(/^ {0,3}(`{3,}|~{3,})/u)?.[1];
+			if (fence) {
+				if (marker?.[0] === fence[0] && marker.length >= fence.length && /^ {0,3}(?:`{3,}|~{3,})[ \t]*$/u.test(line)) fence = null;
+				continue;
+			}
+			if (marker) {
+				fence = marker;
+				continue;
+			}
+			visibleLines.push(line);
+		}
+		return visibleLines.join("\n");
+	}
 	function rankingIntentTexts(value) {
 		const text = String(value || "");
 		const channelBodies = [...text.matchAll(/(?:^|\r?\n)<channel\b[^>]*>\r?\n([\s\S]*?)\r?\n<\/channel>(?=\r?\n|$)/giu)].map((match) => match[1]);
-		return (channelBodies.length > 0 ? channelBodies : [text]).map((intentText) => normalizeDeferredToolQuery(intentText.replace(TOOL_RANK_EMBEDDED_CONTENT_RE, " ")));
+		return (channelBodies.length > 0 ? channelBodies : [text]).map((intentText) => normalizeDeferredToolQuery(withoutFencedCode(intentText.replace(TOOL_RANK_EMBEDDED_CONTENT_RE, " "))));
 	}
 	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));
@@ -240051,7 +240232,7 @@ var require_turn_tool_performance_policy = /* @__PURE__ */ __commonJSMin(((expor
 				if (document.nameTokens.has(token)) exactNameMatches += 1;
 				else if (relatedSearchTerms(token).some((term) => document.nameTokens.has(term))) relatedNameMatches += 1;
 			}
-			return matchedTokens >= 2 || exactNameMatches >= 1 && score >= 10 || relatedNameMatches >= 1 && score >= 5 ? {
+			return matchedTokens >= 2 || exactNameMatches >= 1 && score >= 10 || queryTokens.length === 1 && relatedNameMatches >= 1 && score >= 5 ? {
 				name: document.name,
 				score,
 				matchedTokens,
@@ -240072,11 +240253,11 @@ var require_turn_tool_performance_policy = /* @__PURE__ */ __commonJSMin(((expor
 	function searchRelatedDeferredTools(tools, query, options = {}) {
 		const normalized = normalizeDeferredToolQuery(query).toLowerCase();
 		if (!normalized || normalized.startsWith("select:")) return [];
-		const tokens = normalized.split(/\s+/).filter(Boolean);
+		const tokens = normalized.match(/\+?[\p{L}\p{N}_-]+/gu) || [];
 		const requestedNameTokens = tokens.filter((token) => token.startsWith("+")).map((token) => token.slice(1)).filter(Boolean);
 		const relaxRequiredNameTokens = options.relaxRequiredNameTokens === true && requestedNameTokens.length > 0;
 		const requiredNameTokens = relaxRequiredNameTokens ? [] : requestedNameTokens;
-		const searchTokens = [...tokens.filter((token) => !token.startsWith("+")), ...relaxRequiredNameTokens ? requestedNameTokens : []].filter((token) => !TOOL_SEARCH_INTENT_WORDS.has(token));
+		const searchTokens = [...tokens.filter((token) => !token.startsWith("+")), ...relaxRequiredNameTokens ? requestedNameTokens : []].filter((token) => !TOOL_SEARCH_INTENT_WORDS.has(token) && !TOOL_RANK_STOP_WORDS.has(token));
 		if (searchTokens.length < 2 && !TOOL_SEARCH_SINGLE_TERM_RELATED_FALLBACKS.has(searchTokens[0])) return [];
 		const minimumMatchedTokens = searchTokens.length === 1 ? 1 : Math.max(2, Math.ceil(searchTokens.length * .75));
 		const ranked = tools.map((tool) => {
@@ -251089,7 +251270,8 @@ function logStepTiming(log, turnId, step, response) {
 		inputOtherTokens: response.usage.inputOther,
 		cacheReadTokens: response.usage.inputCacheRead,
 		cacheCreationTokens: response.usage.inputCacheCreation,
-		outputTokens: response.usage.output
+		outputTokens: response.usage.output,
+		...response.usage.outputReasoning === void 0 ? {} : { outputReasoningTokens: response.usage.outputReasoning }
 	});
 }
 function deriveStepStopReason(response) {
@@ -252163,6 +252345,7 @@ var init_events$1 = __esmMin((() => {
 	tokenUsageSchema = object$1({
 		inputOther: number$1(),
 		output: number$1(),
+		outputReasoning: number$1().optional(),
 		inputCacheRead: number$1(),
 		inputCacheCreation: number$1()
 	});
@@ -253343,7 +253526,7 @@ function createAsyncApiDocument(options = {}) {
 function buildMessages() {
 	const messages = {};
 	for (const operation of ASYNCAPI_OPERATIONS) {
-		const id = messageId$1(operation.type);
+		const id = messageId$2(operation.type);
 		messages[id] = asyncApiMessage(operation.type, operation.description, operation.messageSchema);
 		if (operation.ackSchema !== void 0) {
 			const ackId = `${id}_ack`;
@@ -253353,10 +253536,10 @@ function buildMessages() {
 	return messages;
 }
 function operationMessageRefs(direction) {
-	return ASYNCAPI_OPERATIONS.filter((operation) => operation.direction === direction).map((operation) => ({ $ref: `#/components/messages/${messageId$1(operation.type)}` }));
+	return ASYNCAPI_OPERATIONS.filter((operation) => operation.direction === direction).map((operation) => ({ $ref: `#/components/messages/${messageId$2(operation.type)}` }));
 }
 function ackMessageRefs() {
-	return ASYNCAPI_OPERATIONS.filter((operation) => operation.ackSchema !== void 0).map((operation) => ({ $ref: `#/components/messages/${messageId$1(operation.type)}_ack` }));
+	return ASYNCAPI_OPERATIONS.filter((operation) => operation.ackSchema !== void 0).map((operation) => ({ $ref: `#/components/messages/${messageId$2(operation.type)}_ack` }));
 }
 function asyncApiMessage(name, summary, schema) {
 	return {
@@ -253376,7 +253559,7 @@ function jsonSchema$1(schema) {
 	delete converted["$schema"];
 	return converted;
 }
-function messageId$1(type) {
+function messageId$2(type) {
 	return type.replace(/[^A-Za-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
 }
 function titleFromName(name) {
@@ -259155,7 +259338,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$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 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 init_index_min = __esmMin((() => {
 	zr = Object.defineProperty;
 	Ur = (s, t) => {
@@ -261125,7 +261308,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$11 = 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$12 = Symbol("ondrain"), wt = class extends A$1 {
 		sync = !1;
 		opt;
 		cwd;
@@ -261158,8 +261341,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$11]()), this.on("resume", () => e.resume());
-			} else this.on("drain", this[fs$11]);
+				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]);
 			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) {
@@ -261286,7 +261469,7 @@ while (this[Zs](this[st$1].shift()));
 				this.emit("error", e);
 			}
 		}
-		[fs$11]() {
+		[fs$12]() {
 			this[Et] && this[Et].entry && this[Et].entry.resume();
 		}
 		[di](t) {
@@ -261452,7 +261635,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 ro.mkdir(s, {
+		if (l) return fs.mkdir(s, {
 			mode: r,
 			recursive: !0
 		}).then((E) => y(null, E ?? void 0), y);
@@ -262211,7 +262394,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$10 = __require("fs");
+	var fs$11 = __require("fs");
 	var util$6 = __require("util");
 	var stream$2 = __require("stream");
 	var Readable = stream$2.Readable;
@@ -262236,7 +262419,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$10.read(self.fd, buffer, offset, length, position, function(err, bytesRead, buffer) {
+			fs$11.read(self.fd, buffer, offset, length, position, function(err, bytesRead, buffer) {
 				cb();
 				callback(err, bytesRead, buffer);
 			});
@@ -262245,7 +262428,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$10.write(self.fd, buffer, offset, length, position, function(err, written, buffer) {
+			fs$11.write(self.fd, buffer, offset, length, position, function(err, written, buffer) {
 				cb();
 				callback(err, written, buffer);
 			});
@@ -262265,7 +262448,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$10.close(self.fd, onCloseDone);
+		if (self.autoClose) fs$11.close(self.fd, onCloseDone);
 		function onCloseDone(err) {
 			if (err) self.emit("error", err);
 			else self.emit("close");
@@ -262296,7 +262479,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$10.read(self.context.fd, buffer, 0, toRead, self.pos, function(err, bytesRead) {
+			fs$11.read(self.context.fd, buffer, 0, toRead, self.pos, function(err, bytesRead) {
 				if (err) self.destroy(err);
 				else if (bytesRead === 0) {
 					self.destroyed = true;
@@ -262342,7 +262525,7 @@ var require_fd_slicer = /* @__PURE__ */ __commonJSMin(((exports) => {
 		}
 		self.context.pend.go(function(cb) {
 			if (self.destroyed) return cb();
-			fs$10.write(self.context.fd, buffer, 0, buffer.length, self.pos, function(err, bytes) {
+			fs$11.write(self.context.fd, buffer, 0, buffer.length, self.pos, function(err, bytes) {
 				if (err) {
 					self.destroy();
 					cb();
@@ -268826,6 +269009,7 @@ var init_turn = __esmMin((() => {
 			const appendedMessage = this.agent.context.history.at(-1);
 			const turnAnchor = appendedMessage !== previousLastMessage && appendedMessage?.role === "user" && appendedMessage.origin === origin ? appendedMessage : void 0;
 			const startedAt = Date.now();
+			const preRequestHookStartedAt = performance.now();
 			let ended;
 			let blockedByUserPromptHook = false;
 			let completedStopReason;
@@ -268851,6 +269035,13 @@ var init_turn = __esmMin((() => {
 						this.agent.log.warn("Turn-start observation failed");
 					}
 					signal.throwIfAborted();
+					if (this.agent.type === "main" && process.env["BLUN_DIAG_PRE_REQUEST_PHASES"] === "1") try {
+						this.agent.log.info("turn pre-request phase", {
+							turnId,
+							phase: "turn-hooks",
+							durationMs: Math.max(0, Math.round(performance.now() - preRequestHookStartedAt))
+						});
+					} catch {}
 					const stopReason = await this.runStepLoop(turnId, signal, input, origin, turnAnchor, (response) => {
 						completedResponse = response;
 					});
@@ -268962,6 +269153,10 @@ var init_turn = __esmMin((() => {
 			signal.throwIfAborted();
 			const blockResult = renderUserPromptHookBlockResult(promptHookResults);
 			if (blockResult !== void 0) {
+				this.agent.log.warn("turn blocked by UserPromptSubmit hook", {
+					turnId,
+					reason: blockResult.message
+				});
 				this.agent.context.appendMessage({
 					role: "assistant",
 					content: [{
@@ -269020,9 +269215,26 @@ var init_turn = __esmMin((() => {
 			let stopHookContinuationUsed = false;
 			let goalOutcomeMessageContinuationUsed = false;
 			const deduper = new ToolCallDeduplicator({ telemetry: this.agent.telemetry });
+			const diagnosePreRequest = this.agent.type === "main" && process.env["BLUN_DIAG_PRE_REQUEST_PHASES"] === "1";
+			const recordPreRequestPhase = (phase, startedAt) => {
+				if (!diagnosePreRequest) return;
+				try {
+					this.agent.log.info("turn pre-request phase", {
+						turnId,
+						phase,
+						durationMs: Math.max(0, Math.round(performance.now() - startedAt))
+					});
+				} catch {}
+			};
+			let phaseStartedAt = performance.now();
 			await this.agent.mcp?.waitForInitialLoad(signal);
+			recordPreRequestPhase("mcp-initial-load", phaseStartedAt);
+			phaseStartedAt = performance.now();
 			const personalMemoryRecall = await this.agent.injection.injectPersonalMemoryForTurn(turnId, input, origin, signal);
+			recordPreRequestPhase("personal-memory-recall", phaseStartedAt);
+			phaseStartedAt = performance.now();
 			await this.agent.injection.injectGoal();
+			recordPreRequestPhase("goal-injection", phaseStartedAt);
 			this.setActiveSteerAcceptance(turnId, true);
 			const turnNeedsThinking = blunTurnNeedsTools(blunThinkingIntentInput(input), origin);
 			let toolInput = input;
@@ -269033,12 +269245,14 @@ var init_turn = __esmMin((() => {
 				const raw = [...this.agent.context.history];
 				const history = personalMemoryRecall === void 0 ? raw : [...raw, personalMemoryRecall];
 				const selected = taskToolsNeeded ? history : greetingHistory(history, greetingAnchor);
+				const projectionStartedAt = performance.now();
 				const projected = await this.historicalToolProjection.project(selected, turnAnchor, tools, {
 					turnId: String(turnId),
 					stepNumber: this.currentStep,
 					signal,
 					llm: turnLLM
 				});
+				recordPreRequestPhase("historical-tool-projection", projectionStartedAt);
 				const current = this.agent.context.history;
 				if (current.length !== raw.length || current.some((message, index) => message !== raw[index])) {
 					const latest = personalMemoryRecall === void 0 ? current : [...current, personalMemoryRecall];
@@ -269049,7 +269263,7 @@ var init_turn = __esmMin((() => {
 				partialContext = selected.length < history.length || projected.changed;
 				return projected.history;
 			};
-			const turnLLM = this.agent.llmForTurn(turnNeedsThinking ? void 0 : "off");
+			const turnLLM = this.agent.llmForTurn(turnNeedsThinking ? void 0 : "off", turnId);
 			const turnTools = this.agent.tools.captureTurnTools();
 			while (true) {
 				signal.throwIfAborted();
@@ -269059,6 +269273,7 @@ var init_turn = __esmMin((() => {
 				try {
 					const selectedTools = [];
 					this.refreshSelectedTools = (snapshot) => {
+						const selectionStartedAt = performance.now();
 						if (snapshot.messages.length > 0) toolInput = snapshot.messages.flatMap((message) => message.content);
 						const eligibleTools = blunToolsForOrigin(this.agent.injection.filterPersonalMemoryToolsForTurn(turnId, input, origin, turnTools()), origin);
 						const intent = blunThinkingIntentInput(toolInput);
@@ -269071,6 +269286,7 @@ var init_turn = __esmMin((() => {
 								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);
 							}
 						} 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);
 						return selectedTools;
 					};
 					return (await runTurn({
@@ -269083,14 +269299,24 @@ var init_turn = __esmMin((() => {
 							}, completion);
 						},
 						llm: turnLLM,
-						buildMessages: async () => this.agent.context.project(await turnHistory(selectedTools), { dropOrphanResults: true }),
-						buildMessagesStrict: async () => this.agent.context.project(await turnHistory(selectedTools), {
-							synthesizeMissing: true,
-							dropOrphanResults: true,
-							dedupeDuplicateToolCalls: true,
-							dropLeadingNonUser: true,
-							mergeConsecutiveAssistants: true
-						}),
+						buildMessages: async () => {
+							const startedAt = performance.now();
+							const messages = this.agent.context.project(await turnHistory(selectedTools), { dropOrphanResults: true });
+							recordPreRequestPhase("message-build", startedAt);
+							return messages;
+						},
+						buildMessagesStrict: async () => {
+							const startedAt = performance.now();
+							const messages = this.agent.context.project(await turnHistory(selectedTools), {
+								synthesizeMissing: true,
+								dropOrphanResults: true,
+								dedupeDuplicateToolCalls: true,
+								dropLeadingNonUser: true,
+								mergeConsecutiveAssistants: true
+							});
+							recordPreRequestPhase("message-build-strict", startedAt);
+							return messages;
+						},
 						dispatchEvent: this.buildDispatchEvent(turnId, signal, onFinalResponse, () => partialContext),
 						tools: selectedTools,
 						log: this.agent.log,
@@ -269107,8 +269333,10 @@ var init_turn = __esmMin((() => {
 						},
 						hooks: {
 							beforeStep: async ({ signal: stepSignal, llm }) => {
+								const injectionStartedAt = performance.now();
 								this.agent.microCompaction.detect();
 								await this.agent.injection.inject();
+								recordPreRequestPhase("step-injection", injectionStartedAt);
 								stepSignal.throwIfAborted();
 								deduper.beginStep();
 							},
@@ -269146,6 +269374,17 @@ var init_turn = __esmMin((() => {
 									signal.throwIfAborted();
 									if (stopBlock !== void 0) {
 										stopHookContinuationUsed = true;
+										this.agent.log.warn("turn continuation blocked by Stop hook", {
+											turnId,
+											reason: stopBlock.reason
+										});
+										this.agent.emitEvent({
+											type: "hook.result",
+											turnId,
+											hookEvent: "Stop",
+											content: stopBlock.reason,
+											blocked: true
+										});
 										this.agent.context.appendUserMessage([{
 											type: "text",
 											text: stopBlock.reason
@@ -272612,6 +272851,7 @@ var init_fallback_llm = __esmMin((() => {
 				throw new Error("Fallback request preparation requires a fresh request boundary.");
 			}
 			let requestParams = params;
+			let messagesReady = false;
 			const rebuildRequestMessages = async () => {
 				const messages = await rebuildMessages();
 				const suffix = requestParams.boundaryMessageSuffix;
@@ -272620,7 +272860,14 @@ var init_fallback_llm = __esmMin((() => {
 			while (true) {
 				const candidate = this.current;
 				try {
-					requestParams = await this.prepareRequest?.(candidate, requestParams, rebuildRequestMessages) ?? requestParams;
+					const prepared = await this.prepareRequest?.(candidate, requestParams, rebuildRequestMessages);
+					if (prepared !== void 0) if ("messagesReady" in prepared) {
+						requestParams = prepared.params;
+						messagesReady = true;
+					} else {
+						requestParams = prepared;
+						messagesReady = false;
+					}
 				} catch (error) {
 					if (!isFallbackCandidateError(error) && !isUnavailableFallbackCandidate(error)) throw error;
 					const nextIndex = this.findNextCandidateIndex();
@@ -272630,13 +272877,14 @@ var init_fallback_llm = __esmMin((() => {
 						...requestParams,
 						messages: await rebuildRequestMessages()
 					};
+					messagesReady = false;
 					requestParams.signal.throwIfAborted();
 					this.currentIndex = nextIndex;
 					this.onModelChanged(this.current.alias);
 					continue;
 				}
 				requestParams.signal.throwIfAborted();
-				const messages = await rebuildRequestMessages();
+				const messages = messagesReady ? requestParams.messages : await rebuildRequestMessages();
 				requestParams.signal.throwIfAborted();
 				return {
 					...requestParams,
@@ -272760,7 +273008,8 @@ function copyContributions(value) {
 			version: source.version,
 			totalBytes: source.totalBytes,
 			generatedBytes: source.generatedBytes,
-			files: source.files.map((file) => copyInstructionFileBytes(file))
+			files: source.files.map((file) => copyInstructionFileBytes(file)),
+			...source.notLoadedCandidates === void 0 ? {} : { notLoadedCandidates: [...source.notLoadedCandidates] }
 		} }
 	};
 }
@@ -272799,8 +273048,13 @@ var init_llm_request_logger = __esmMin((() => {
 		toolsEstimatedTokens = 0;
 		requestSequence = 0;
 		lastTurnRequest;
-		constructor(log) {
+		serializedPrefixKey;
+		requestSignatures = /* @__PURE__ */ new Map();
+		prefixComparisons = /* @__PURE__ */ new Map();
+		lastSerializedRequest;
+		constructor(log, serializedPrefixDiagnostic = process.env["BLUN_DIAG_SERIALIZED_PREFIX"] === "1") {
 			this.log = log;
+			this.serializedPrefixKey = serializedPrefixDiagnostic ? randomBytes(32) : void 0;
 		}
 		logRequest(input) {
 			const sequence = ++this.requestSequence;
@@ -272817,6 +273071,10 @@ var init_llm_request_logger = __esmMin((() => {
 				toolsHash: fingerprint(JSON.stringify(toolSignature(tools)))
 			};
 			const signature = JSON.stringify(config);
+			if (this.serializedPrefixKey !== void 0) {
+				this.requestSignatures.set(sequence, signature);
+				if (this.requestSignatures.size > 32) this.requestSignatures.delete(this.requestSignatures.keys().next().value);
+			}
 			if (signature !== this.lastConfigLogSignature) {
 				this.lastConfigLogSignature = signature;
 				this.configRevision++;
@@ -272846,6 +273104,20 @@ var init_llm_request_logger = __esmMin((() => {
 				}
 			};
 			if (partialMessageCount > 0) requestFields.partialMessageCount = partialMessageCount;
+			const source = input.systemPromptContributions;
+			if (source?.version === 1 && [
+				source.totalBytes,
+				source.instructionBytes,
+				source.skillListingBytes,
+				source.runtimeMemoryBytes,
+				source.otherBytes
+			].every((value) => Number.isSafeInteger(value) && value >= 0) && source.instructionBytes + source.skillListingBytes + source.runtimeMemoryBytes + source.otherBytes === source.totalBytes && source.totalBytes === Buffer.byteLength(systemPrompt, "utf8")) requestFields.systemPromptSourceBytes = {
+				totalBytes: source.totalBytes,
+				instructionBytes: source.instructionBytes,
+				skillListingBytes: source.skillListingBytes,
+				runtimeMemoryBytes: source.runtimeMemoryBytes,
+				otherBytes: source.otherBytes
+			};
 			this.log.info("llm request", requestFields);
 			if (fields?.turnStep !== void 0 && /^\d+\.\d+$/.test(fields.turnStep)) {
 				const historyTextOrigins = summarizeRequestTextOrigins(messages);
@@ -272871,10 +273143,51 @@ var init_llm_request_logger = __esmMin((() => {
 		getLastTurnRequest() {
 			return this.lastTurnRequest === void 0 ? void 0 : structuredClone(this.lastTurnRequest);
 		}
+		get serializedPrefixDiagnosticEnabled() {
+			return this.serializedPrefixKey !== void 0;
+		}
+		observeSerializedRequest(body, fields, sequence) {
+			const key = this.serializedPrefixKey;
+			if (key === void 0 || !/^\d+\.\d+$/.test(fields?.turnStep ?? "")) return;
+			const signature = this.requestSignatures.get(sequence);
+			if (signature === void 0) return;
+			try {
+				const bytes = Buffer.from(body, "utf8");
+				const granularityBytes = 1024;
+				const chunks = [];
+				for (let start = 0; start + granularityBytes <= bytes.length; start += granularityBytes) chunks.push(createHmac("sha256", key).update(bytes.subarray(start, start + granularityBytes)).digest("hex"));
+				const previous = this.lastSerializedRequest;
+				if (previous !== void 0 && previous.signature === signature) {
+					let common = 0;
+					while (common < previous.chunks.length && common < chunks.length && previous.chunks[common] === chunks[common]) common++;
+					this.prefixComparisons.set(sequence, {
+						version: 1,
+						granularityBytes,
+						previousBytes: previous.bytes,
+						currentBytes: bytes.length,
+						commonPrefixBytesLowerBound: common * granularityBytes,
+						previousSequence: previous.sequence,
+						currentSequence: sequence
+					});
+					if (this.prefixComparisons.size > 32) this.prefixComparisons.delete(this.prefixComparisons.keys().next().value);
+				}
+				this.lastSerializedRequest = {
+					sequence,
+					signature,
+					bytes: bytes.length,
+					chunks
+				};
+			} catch {
+				this.lastSerializedRequest = void 0;
+			}
+		}
 		logTransportAttempt(stats, fields, sequence) {
+			const serializedPrefix = sequence === void 0 ? void 0 : this.prefixComparisons.get(sequence);
 			this.log.info("llm transport attempt", {
 				...fields,
-				...stats
+				...stats,
+				...this.serializedPrefixKey === void 0 || sequence === void 0 ? {} : { requestSequence: sequence },
+				...serializedPrefix === void 0 ? {} : { serializedPrefix }
 			});
 			if (sequence === void 0 || this.lastTurnRequest?.sequence !== sequence) return;
 			const breakdown = stats.requestBreakdown;
@@ -272896,6 +273209,11 @@ var init_llm_request_logger = __esmMin((() => {
 						systemMessageBytes: breakdown.systemMessageBytes,
 						conversationMessageBytes: breakdown.conversationMessageBytes,
 						toolResultMessageBytes: breakdown.toolResultMessageBytes,
+						...breakdown.toolResultByTool === void 0 ? {} : { toolResultByTool: breakdown.toolResultByTool.map((tool) => ({
+							count: tool.count,
+							bytes: tool.bytes,
+							...tool.name === void 0 ? {} : { name: tool.name }
+						})) },
 						toolSchemaBytes: breakdown.toolSchemaBytes,
 						otherBytes: breakdown.otherBytes,
 						...breakdown.toolArrayOverheadBytes === void 0 ? {} : { toolArrayOverheadBytes: breakdown.toolArrayOverheadBytes },
@@ -273022,6 +273340,7 @@ var init_agent = __esmMin((() => {
 		errorMemory;
 		replayBuilder;
 		additionalDirs;
+		systemPromptStartedAt = /* @__PURE__ */ new Date();
 		activeProfile;
 		brandHome;
 		_activeResponderModel;
@@ -273109,6 +273428,7 @@ var init_agent = __esmMin((() => {
 				const retryScope = providerRetryScope(modelAlias, provider);
 				await this.providerRetryWait.wait(retryScope, generateOptions?.signal);
 				const callerTransportAttempt = generateOptions?.onTransportAttempt;
+				const callerSerializedRequest = generateOptions?.onSerializedRequest;
 				const ownedGenerateOptions = {
 					...generateOptions,
 					transportMaxRetries: 0
@@ -273131,6 +273451,12 @@ var init_agent = __esmMin((() => {
 								callerTransportAttempt?.(stats);
 								this.llmRequestLogger.logTransportAttempt(stats, requestLogFields, requestSequence);
 							},
+							...callerSerializedRequest !== void 0 || this.llmRequestLogger.serializedPrefixDiagnosticEnabled ? { onSerializedRequest: (body) => {
+								try {
+									callerSerializedRequest?.(body);
+								} catch {}
+								this.llmRequestLogger.observeSerializedRequest(body, requestLogFields, requestSequence);
+							} } : {},
 							onRequestStart: () => {
 								requestOptions?.onRequestStart?.();
 								requestStarted = true;
@@ -273156,7 +273482,7 @@ var init_agent = __esmMin((() => {
 		get llm() {
 			return this.llmForTurn();
 		}
-		llmForTurn(thinkingEffort) {
+		llmForTurn(thinkingEffort, diagnosticTurnId) {
 			const selectedAlias = this.config.model;
 			const modelProvider = this.modelProvider;
 			if (modelProvider === void 0) throw new BlunError(ErrorCodes.MODEL_NOT_CONFIGURED, "Provider not set");
@@ -273171,6 +273497,7 @@ var init_agent = __esmMin((() => {
 					messages: await rebuildMessages()
 				};
 				let systemPrompt = this.effectiveSystemPrompt;
+				const preflightStartedAt = performance.now();
 				const compacted = await this.fullCompaction.beforeStep(params.signal, {
 					messages: params.messages,
 					additionalMessages: steers.messages,
@@ -273179,17 +273506,31 @@ var init_agent = __esmMin((() => {
 					rebuildSystemPrompt: () => systemPrompt = this.effectiveSystemPrompt,
 					tools: params.tools
 				});
+				if (this.type === "main" && diagnosticTurnId !== void 0 && process.env["BLUN_DIAG_PRE_REQUEST_PHASES"] === "1") try {
+					this.log.info("turn pre-request phase", {
+						turnId: diagnosticTurnId,
+						phase: "compaction-preflight",
+						durationMs: Math.max(0, Math.round(performance.now() - preflightStartedAt))
+					});
+				} catch {}
 				const tools = params.tools.some((tool) => tool.name === "CompactConversation") && !this.fullCompaction.proactiveCompactionStatus({
 					messages: compacted ? await rebuildMessages() : params.messages,
 					additionalMessages: steers.messages,
 					systemPrompt,
 					tools: params.tools
 				}).eligible ? params.tools.filter((tool) => tool.name !== "CompactConversation") : params.tools;
-				this.turn.commitPendingSteers(steers);
-				return {
+				const steersCommitted = this.turn.commitPendingSteers(steers);
+				if (compacted || steersCommitted) params = {
 					...params,
-					systemPrompt,
-					tools
+					messages: await rebuildMessages()
+				};
+				return {
+					params: {
+						...params,
+						systemPrompt,
+						tools
+					},
+					messagesReady: true
 				};
 			}, (candidate, _params, error) => {
 				this.fullCompaction.observeContextOverflow(error, candidate.alias);
@@ -273283,6 +273624,7 @@ var init_agent = __esmMin((() => {
 			let contributions;
 			const systemPrompt = profile.systemPrompt({
 				osEnv: this.kaos.osEnv,
+				now: this.systemPromptStartedAt,
 				cwd: this.config.cwd,
 				skills: this.skills?.registry,
 				cwdListing: context?.cwdListing,
@@ -303200,7 +303542,7 @@ var init_proxy = __esmMin((() => {
 var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$8 = __require("fs");
+	var fs$9 = __require("fs");
 	function checkPathExt(path, options) {
 		var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
 		if (!pathext) return true;
@@ -303217,12 +303559,12 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		return checkPathExt(path, options);
 	}
 	function isexe(path, options, cb) {
-		fs$8.stat(path, function(er, stat) {
+		fs$9.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, path, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$8.statSync(path), path, options);
+		return checkStat(fs$9.statSync(path), path, options);
 	}
 }));
 //#endregion
@@ -303230,14 +303572,14 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var require_mode = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$7 = __require("fs");
+	var fs$8 = __require("fs");
 	function isexe(path, options, cb) {
-		fs$7.stat(path, function(er, stat) {
+		fs$8.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$7.statSync(path), options);
+		return checkStat(fs$8.statSync(path), options);
 	}
 	function checkStat(stat, options) {
 		return stat.isFile() && checkMode(stat, options);
@@ -303452,16 +303794,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$6 = __require("fs");
+	const fs$7 = __require("fs");
 	const shebangCommand = require_shebang_command();
 	function readShebang(command) {
 		const size = 150;
 		const buffer = Buffer.alloc(size);
 		let fd;
 		try {
-			fd = fs$6.openSync(command, "r");
-			fs$6.readSync(fd, buffer, 0, size, 0);
-			fs$6.closeSync(fd);
+			fd = fs$7.openSync(command, "r");
+			fs$7.readSync(fd, buffer, 0, size, 0);
+			fs$7.closeSync(fd);
 		} catch (e) {}
 		return shebangCommand(buffer.toString());
 	}
@@ -304569,9 +304911,9 @@ function projectAgentSpinePrompt(input) {
 	if (typeof input["hook_event_name"] !== "string" || !PROMPT_EVENTS.has(input["hook_event_name"]) || !Array.isArray(input["prompt"])) return input;
 	let changed = false;
 	const prompt = input["prompt"].map((part) => {
-		if (!isRecord$20(part)) return part;
+		if (!isRecord$24(part)) return part;
 		const field = part["type"] === "image_url" ? "imageUrl" : part["type"] === "audio_url" ? "audioUrl" : part["type"] === "video_url" ? "videoUrl" : void 0;
-		if (field === void 0 || !isRecord$20(part[field]) || typeof part[field]["url"] !== "string") return part;
+		if (field === void 0 || !isRecord$24(part[field]) || typeof part[field]["url"] !== "string") return part;
 		const serialized = JSON.stringify(part);
 		changed = true;
 		return {
@@ -304586,7 +304928,7 @@ function projectAgentSpinePrompt(input) {
 		prompt
 	} : input;
 }
-function isRecord$20(value) {
+function isRecord$24(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var PROMPT_EVENTS, EMPTY_RUNTIME, AgentSpineSessionRuntime;
@@ -337623,7 +337965,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$5 = __require("fs");
+	var fs$6 = __require("fs");
 	var Transform$2 = __require("stream").Transform;
 	var PassThrough$2 = __require("stream").PassThrough;
 	var zlib$1 = __require("zlib");
@@ -337652,14 +337994,14 @@ var require_yazl = /* @__PURE__ */ __commonJSMin(((exports) => {
 		if (shouldIgnoreAdding(self)) return;
 		var entry = new Entry(metadataPath, false, options);
 		self.entries.push(entry);
-		fs$5.stat(realPath, function(err, stats) {
+		fs$6.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$5.createReadStream(realPath);
+				var readStream = fs$6.createReadStream(realPath);
 				entry.state = Entry.FILE_DATA_IN_PROGRESS;
 				readStream.on("error", function(err) {
 					self.emit("error", err);
@@ -339004,10 +339346,10 @@ async function appendForkedMarkers(state) {
 		time: Date.now()
 	};
 	const agents = state["agents"];
-	if (!isRecord$19(agents)) return;
+	if (!isRecord$23(agents)) return;
 	const paths = /* @__PURE__ */ new Set();
 	for (const agentMeta of Object.values(agents)) {
-		if (!isRecord$19(agentMeta)) continue;
+		if (!isRecord$23(agentMeta)) continue;
 		const homedir = agentMeta["homedir"];
 		if (typeof homedir !== "string") continue;
 		paths.add(join$4(homedir, "wire.jsonl"));
@@ -339019,7 +339361,7 @@ async function appendForkedMarkers(state) {
 	}));
 }
 function customMetadataForFork(value) {
-	if (!isRecord$19(value)) return {};
+	if (!isRecord$23(value)) return {};
 	const custom = {};
 	for (const [key, entry] of Object.entries(value)) {
 		if (key === "goal" || key === "managedQuotaWarningThreshold") continue;
@@ -339074,10 +339416,10 @@ function normalizeForkTitle(title, fallback) {
 	return typeof fallback === "string" && fallback.trim().length > 0 ? fallback : "New Session";
 }
 function rewriteAgentHomedirs(value, sourceDir, targetDir) {
-	if (!isRecord$19(value)) return {};
+	if (!isRecord$23(value)) return {};
 	const agents = {};
 	for (const [agentId, agentMeta] of Object.entries(value)) {
-		if (!isRecord$19(agentMeta)) {
+		if (!isRecord$23(agentMeta)) {
 			agents[agentId] = agentMeta;
 			continue;
 		}
@@ -339095,7 +339437,7 @@ function remapSessionPath(value, sourceDir, targetDir) {
 	if (rel.startsWith("..") || isAbsolute$2(rel)) return value;
 	return join$4(targetDir, rel);
 }
-function isRecord$19(value) {
+function isRecord$23(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function statIfExists(path) {
@@ -339359,7 +339701,7 @@ var init_session_store$1 = __esmMin((() => {
 			} catch (error) {
 				throw new BlunError(ErrorCodes.SESSION_STATE_NOT_FOUND, `Session "${input.sourceId}" state.json was not found`, { cause: error });
 			}
-			if (!isRecord$19(parsed)) throw new BlunError(ErrorCodes.SESSION_STATE_INVALID, `Session "${input.sourceId}" state.json is invalid`);
+			if (!isRecord$23(parsed)) throw new BlunError(ErrorCodes.SESSION_STATE_INVALID, `Session "${input.sourceId}" state.json is invalid`);
 			const title = normalizeForkTitle(input.title, parsed["title"]);
 			const now = (/* @__PURE__ */ new Date()).toISOString();
 			const next = {
@@ -350684,6 +351026,39 @@ var BlunAuthFacade = class {
 		}
 		return this.toolkit.status(providerName, this.resolveRuntimeManagedAuth(providerName).oauthRef);
 	}
+	async getCachedMemoryWorkspaceId() {
+		const apiKey = nonEmpty(this.resolveManagedAuth(BLUN_PROVIDER_NAME$1).apiKey);
+		if (apiKey !== void 0) {
+			const provider = readConfigFileForUpdate(this.options.configPath).providers[BLUN_PROVIDER_NAME$1];
+			if (provider?.apiKey !== apiKey || provider.memoryApiKeyHash !== memoryApiKeyHash(apiKey)) return;
+			return provider.memoryWorkspaceId;
+		}
+		return this.toolkit.getCachedMemoryWorkspaceId(this.resolveRuntimeManagedAuth(BLUN_PROVIDER_NAME$1).oauthRef);
+	}
+	async cacheMemoryWorkspaceId(workspaceId) {
+		const apiKey = nonEmpty(this.resolveManagedAuth(BLUN_PROVIDER_NAME$1).apiKey);
+		if (apiKey !== void 0) {
+			const hash = memoryApiKeyHash(apiKey);
+			return mutateConfigFile(this.options.configPath, (config) => {
+				const provider = config.providers[BLUN_PROVIDER_NAME$1];
+				if (provider?.apiKey !== apiKey) return {
+					config,
+					result: false
+				};
+				if (provider.memoryApiKeyHash === hash && provider.memoryWorkspaceId !== void 0 && provider.memoryWorkspaceId !== workspaceId) return {
+					config,
+					result: false
+				};
+				provider.memoryApiKeyHash = hash;
+				provider.memoryWorkspaceId = workspaceId;
+				return {
+					config,
+					result: true
+				};
+			});
+		}
+		return this.toolkit.cacheMemoryWorkspaceId(workspaceId, this.resolveRuntimeManagedAuth(BLUN_PROVIDER_NAME$1).oauthRef);
+	}
 	async login(providerName = BLUN_PROVIDER_NAME$1, options = {}) {
 		const auth = this.resolveManagedAuth(providerName);
 		const loginAuth = resolveBlunCodeLoginAuth({
@@ -350989,6 +351364,9 @@ function nonEmpty(value) {
 	const normalized = value?.trim();
 	return normalized === void 0 || normalized.length === 0 ? void 0 : normalized;
 }
+function memoryApiKeyHash(apiKey) {
+	return createHash("sha256").update(apiKey).digest("hex");
+}
 function transitionAggregateError(message, primary, secondary) {
 	return new AggregateError([primary, secondary], message, { cause: primary });
 }
@@ -353525,7 +353903,7 @@ 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$4 = __require("node:fs");
+	const fs$5 = __require("node:fs");
 	const process$2 = __require("node:process");
 	const { Argument, humanReadableArgName } = require_argument();
 	const { CommanderError } = require_error$2();
@@ -354408,7 +354786,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
 		* @param {string} subcommandName
 		*/
 		_checkForMissingExecutable(executableFile, executableDir, subcommandName) {
-			if (fs$4.existsSync(executableFile)) return;
+			if (fs$5.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
@@ -354432,9 +354810,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
 			];
 			function findFile(baseDir, baseName) {
 				const localBin = path$7.resolve(baseDir, baseName);
-				if (fs$4.existsSync(localBin)) return localBin;
+				if (fs$5.existsSync(localBin)) return localBin;
 				if (sourceExt.includes(path$7.extname(baseName))) return void 0;
-				const foundExt = sourceExt.find((ext) => fs$4.existsSync(`${localBin}${ext}`));
+				const foundExt = sourceExt.find((ext) => fs$5.existsSync(`${localBin}${ext}`));
 				if (foundExt) return `${localBin}${foundExt}`;
 			}
 			this._checkForMissingMandatoryOptions();
@@ -354444,7 +354822,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
 			if (this._scriptPath) {
 				let resolvedScriptPath;
 				try {
-					resolvedScriptPath = fs$4.realpathSync(this._scriptPath);
+					resolvedScriptPath = fs$5.realpathSync(this._scriptPath);
 				} catch {
 					resolvedScriptPath = this._scriptPath;
 				}
@@ -361354,6 +361732,30 @@ var AcpSession = class {
 					}, event.message));
 					return;
 				}
+				if (event.type === "hook.result") {
+					if (!isFromMainAgent(event) || event.content.trim().length === 0) return;
+					if (event.blocked === true) log.warn("acp: turn blocked by hook", {
+						sessionId,
+						hookEvent: event.hookEvent,
+						reason: event.content
+					});
+					conn.sessionUpdate({
+						sessionId,
+						update: {
+							sessionUpdate: "agent_message_chunk",
+							content: {
+								type: "text",
+								text: `${event.content}\n`
+							}
+						}
+					}).catch((err) => {
+						log.warn("acp: failed to push hook result", {
+							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) => {
@@ -364122,8 +364524,8 @@ function createAccountMemoryClient(auth, options = {}) {
 }
 function readAccountMemoryConsentStatus(payload) {
 	const settings = unwrapPayload(payload)?.["settings"];
-	const dataControls = isRecord$18(settings) ? settings["data_controls"] : void 0;
-	if (!isRecord$18(dataControls)) throw new Error("Account memory returned an invalid response.");
+	const dataControls = isRecord$22(settings) ? settings["data_controls"] : void 0;
+	if (!isRecord$22(dataControls)) throw new Error("Account memory returned an invalid response.");
 	if (dataControls["memory_consent_asked"] !== true) return "never_asked";
 	if (dataControls["allow_memory"] === true) return "enabled";
 	if (dataControls["allow_memory"] === false) return "disabled";
@@ -364246,8 +364648,8 @@ function memoryContextSummary(facts, included) {
 	})}`;
 }
 function unwrapPayload(value) {
-	if (!isRecord$18(value)) return void 0;
-	return isRecord$18(value["data"]) ? value["data"] : value;
+	if (!isRecord$22(value)) return void 0;
+	return isRecord$22(value["data"]) ? value["data"] : value;
 }
 function readFacts(root) {
 	let rawFacts = [];
@@ -364255,7 +364657,7 @@ function readFacts(root) {
 	else {
 		const factsJson = parseFactsJson(root["facts_json"]);
 		if (Array.isArray(factsJson)) rawFacts = factsJson;
-		else if (isRecord$18(factsJson) && Array.isArray(factsJson["facts"])) rawFacts = factsJson["facts"];
+		else if (isRecord$22(factsJson) && Array.isArray(factsJson["facts"])) rawFacts = factsJson["facts"];
 	}
 	const facts = [];
 	const seen = /* @__PURE__ */ new Set();
@@ -364284,7 +364686,7 @@ function parseFactsJson(value) {
 	}
 }
 function normalizeFact(value) {
-	const raw = typeof value === "string" ? value : isRecord$18(value) && typeof value["text"] === "string" ? value["text"] : void 0;
+	const raw = typeof value === "string" ? value : isRecord$22(value) && typeof value["text"] === "string" ? value["text"] : void 0;
 	if (raw === void 0) return void 0;
 	const normalized = raw.replaceAll(/\s+/gu, " ").trim();
 	if (normalized.length === 0) return void 0;
@@ -364295,7 +364697,7 @@ function normalizeFact(value) {
 		truncated: normalized.length > ACCOUNT_MEMORY_MAX_FACT_CHARS
 	};
 }
-function isRecord$18(value) {
+function isRecord$22(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -364522,6 +364924,8 @@ registerUiCatalogFragment({
 		"auth.logout.selectTitle": "Select a provider to log out",
 		"auth.logout.none": "Nothing to log out.",
 		"auth.logout.complete": "Logged out from {provider}.",
+		"auth.warning.memoryRetractionOAuthPending": "Deletion has not been sent yet. It will be sent at your next sign-in.",
+		"auth.warning.memoryRetractionApiKeyPending": "Deletion has not been sent yet. It will be sent once you reconnect.",
 		"auth.warning.remoteRevokeFailed": "The local OAuth credentials were removed, but remote revocation could not be confirmed.",
 		"auth.warning.oauthCleanupFailed": "The API key is active, but the previous OAuth credentials could not be fully removed."
 	},
@@ -364554,6 +364958,8 @@ registerUiCatalogFragment({
 		"auth.logout.selectTitle": "Anbieter zum Abmelden auswählen",
 		"auth.logout.none": "Es gibt keine aktive Anmeldung.",
 		"auth.logout.complete": "Von {provider} abgemeldet.",
+		"auth.warning.memoryRetractionOAuthPending": "Löschen noch nicht übertragen – folgt bei deiner nächsten Anmeldung.",
+		"auth.warning.memoryRetractionApiKeyPending": "Löschen noch nicht übertragen – folgt, sobald du wieder verbunden bist.",
 		"auth.warning.remoteRevokeFailed": "Die lokalen OAuth-Zugangsdaten wurden entfernt, aber der Widerruf auf dem Server konnte nicht bestätigt werden.",
 		"auth.warning.oauthCleanupFailed": "Der API-Schlüssel ist aktiv, aber die vorherigen OAuth-Zugangsdaten konnten nicht vollständig entfernt werden."
 	},
@@ -364586,6 +364992,8 @@ registerUiCatalogFragment({
 		"auth.logout.selectTitle": "Selecciona el proveedor cuya sesión quieres cerrar",
 		"auth.logout.none": "No hay ninguna sesión que cerrar.",
 		"auth.logout.complete": "Sesión cerrada en {provider}.",
+		"auth.warning.memoryRetractionOAuthPending": "La eliminación aún no se ha enviado: se enviará en tu próximo inicio de sesión.",
+		"auth.warning.memoryRetractionApiKeyPending": "La eliminación aún no se ha enviado: se enviará cuando se restablezca la conexión.",
 		"auth.warning.remoteRevokeFailed": "Las credenciales OAuth locales se han eliminado, pero no se pudo confirmar su revocación en el servidor.",
 		"auth.warning.oauthCleanupFailed": "La clave de API está activa, pero no se pudieron eliminar por completo las credenciales OAuth anteriores."
 	},
@@ -364618,6 +365026,8 @@ registerUiCatalogFragment({
 		"auth.logout.selectTitle": "Sélectionnez le fournisseur dont vous souhaitez vous déconnecter",
 		"auth.logout.none": "Aucune session à fermer.",
 		"auth.logout.complete": "Déconnexion de {provider} effectuée.",
+		"auth.warning.memoryRetractionOAuthPending": "Suppression pas encore transmise – elle le sera à ta prochaine connexion.",
+		"auth.warning.memoryRetractionApiKeyPending": "Suppression pas encore transmise – elle le sera dès que la connexion sera rétablie.",
 		"auth.warning.remoteRevokeFailed": "Les identifiants OAuth locaux ont été supprimés, mais leur révocation sur le serveur n’a pas pu être confirmée.",
 		"auth.warning.oauthCleanupFailed": "La clé API est active, mais les identifiants OAuth précédents n’ont pas pu être entièrement supprimés."
 	},
@@ -364650,6 +365060,8 @@ registerUiCatalogFragment({
 		"auth.logout.selectTitle": "Välj en leverantör att logga ut från",
 		"auth.logout.none": "Det finns inget att logga ut från.",
 		"auth.logout.complete": "Utloggad från {provider}.",
+		"auth.warning.memoryRetractionOAuthPending": "Raderingen har inte överförts än – sker vid din nästa inloggning.",
+		"auth.warning.memoryRetractionApiKeyPending": "Raderingen har inte överförts än – sker så snart du är ansluten igen.",
 		"auth.warning.remoteRevokeFailed": "De lokala OAuth-uppgifterna har tagits bort, men det gick inte att bekräfta återkallelsen på servern.",
 		"auth.warning.oauthCleanupFailed": "API-nyckeln är aktiv, men de tidigare OAuth-uppgifterna kunde inte tas bort helt."
 	},
@@ -364682,6 +365094,8 @@ registerUiCatalogFragment({
 		"auth.logout.selectTitle": "Vyberte poskytovatele, od kterého se chcete odhlásit",
 		"auth.logout.none": "Nic k odhlášení.",
 		"auth.logout.complete": "Odhlášeno od {provider}.",
+		"auth.warning.memoryRetractionOAuthPending": "Smazání zatím nebylo přeneseno – proběhne při tvém příštím přihlášení.",
+		"auth.warning.memoryRetractionApiKeyPending": "Smazání zatím nebylo přeneseno – proběhne, jakmile se obnoví připojení.",
 		"auth.warning.remoteRevokeFailed": "Místní přihlašovací údaje OAuth byly odstraněny, ale jejich zneplatnění na serveru se nepodařilo potvrdit.",
 		"auth.warning.oauthCleanupFailed": "Klíč API je aktivní, ale předchozí přihlašovací údaje OAuth nebyly zcela odstraněny."
 	}
@@ -365813,7 +366227,7 @@ function formatErrorMessage$4(error, filePath) {
 function findValidationIssues(error) {
 	if (!(error instanceof Error)) return void 0;
 	const details = "details" in error ? error.details : void 0;
-	if (!isRecord$17(details)) return void 0;
+	if (!isRecord$21(details)) return void 0;
 	const validationIssues = details["validationIssues"];
 	return isValidationIssueArray(validationIssues) ? validationIssues : void 0;
 }
@@ -365821,11 +366235,11 @@ function isValidationIssueArray(value) {
 	return Array.isArray(value) && value.every(isValidationIssue);
 }
 function isValidationIssue(value) {
-	if (!isRecord$17(value) || typeof value["message"] !== "string") return false;
+	if (!isRecord$21(value) || typeof value["message"] !== "string") return false;
 	const path = value["path"];
 	return Array.isArray(path) && path.every((segment) => typeof segment === "string" || typeof segment === "number");
 }
-function isRecord$17(value) {
+function isRecord$21(value) {
 	return typeof value === "object" && value !== null;
 }
 function findZodError(error) {
@@ -366320,7 +366734,7 @@ function assertEntryCount(value) {
 	return value;
 }
 function parseMistakeRecordDeclarations(value, sourceId, declaredRecordTypes) {
-	if (!isRecord$16(value) || !hasOnlyKeys(value, [
+	if (!isRecord$20(value) || !hasOnlyKeys(value, [
 		"version",
 		"records",
 		"relations"
@@ -366333,7 +366747,7 @@ function parseMistakeRecordDeclarations(value, sourceId, declaredRecordTypes) {
 	return {
 		version: 1,
 		records: value["records"].map((candidate, index) => {
-			if (!isRecord$16(candidate) || !hasOnlyKeys(candidate, [
+			if (!isRecord$20(candidate) || !hasOnlyKeys(candidate, [
 				"source_record_id",
 				"type",
 				"raw_locator"
@@ -366353,7 +366767,7 @@ function parseMistakeRecordDeclarations(value, sourceId, declaredRecordTypes) {
 			};
 		}),
 		relations: value["relations"].map((candidate, index) => {
-			if (!isRecord$16(candidate) || !hasOnlyKeys(candidate, [
+			if (!isRecord$20(candidate) || !hasOnlyKeys(candidate, [
 				"from_source_record_id",
 				"type",
 				"to"
@@ -366363,7 +366777,7 @@ function parseMistakeRecordDeclarations(value, sourceId, declaredRecordTypes) {
 			const target = candidate["to"];
 			if (typeof fromRecordId !== "string" || !isValidRecordId(fromRecordId) || !recordIds.has(fromRecordId)) throw new Error(`record relation ${index} must start at a declared local record`);
 			if (typeof type !== "string" || !MISTAKE_RELATION_TYPES.includes(type)) throw new Error(`record relation ${index} has an invalid relation type`);
-			if (!isRecord$16(target) || !hasOnlyKeys(target, ["source_id", "source_record_id"])) throw new Error(`record relation ${index} has an invalid target`);
+			if (!isRecord$20(target) || !hasOnlyKeys(target, ["source_id", "source_record_id"])) throw new Error(`record relation ${index} has an invalid target`);
 			const targetSourceId = target["source_id"];
 			const targetRecordId = target["source_record_id"];
 			if (typeof targetSourceId !== "string" || !isNormalizedSourceId(targetSourceId)) throw new Error(`record relation ${index} has an invalid target source id`);
@@ -366633,7 +367047,7 @@ function receiptsEqual(left, right) {
 	return left.version === right.version && left.accepted === right.accepted && left.event_id === right.event_id && left.client_event_id === right.client_event_id && left.source_id === right.source_id && left.canonical_agent_id === right.canonical_agent_id && left.received_at === right.received_at && left.raw_count === right.raw_count && left.accepted_count === right.accepted_count && left.rejected_count === right.rejected_count && left.raw_bytes === right.raw_bytes && left.raw_sha256 === right.raw_sha256 && left.declared_entry_count === right.declared_entry_count;
 }
 function isStateActionReceipt(value) {
-	if (!isRecord$16(value) || !hasOnlyKeys(value, STATE_ACTION_KEYS)) return false;
+	if (!isRecord$20(value) || !hasOnlyKeys(value, STATE_ACTION_KEYS)) return false;
 	const reason = value["reason"];
 	return value["version"] === 1 && typeof value["action_id"] === "string" && UUID_RE$1.test(value["action_id"]) && (value["action"] === "remove" || value["action"] === "restore") && typeof value["target_event_id"] === "string" && UUID_RE$1.test(value["target_event_id"]) && typeof value["acted_at"] === "string" && isIsoTimestamp(value["acted_at"]) && Number.isSafeInteger(value["server_sequence"]) && value["server_sequence"] >= 1 && typeof value["principal_id"] === "string" && isNormalizedSourceId(value["principal_id"]) && typeof reason === "string" && reason.trim() === reason && reason.length >= 3 && reason.length <= 500;
 }
@@ -366736,7 +367150,7 @@ function assertInventoryInvariants(bestandsstatus, aktualitaetsstatus, declaredE
 	if (aktualitaetsstatus === "fresh" && lastRawObservedAt === null) throw new Error("fresh inventory requires a last raw observed timestamp");
 	if (capturedAt !== void 0 && lastRawObservedAt !== null && Date.parse(lastRawObservedAt) > Date.parse(capturedAt)) throw new Error("last raw observed timestamp must not be later than captured at");
 }
-function isRecord$16(value) {
+function isRecord$20(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function hasOnlyKeys(value, allowedKeys) {
@@ -367680,12 +368094,14 @@ const PERSONAL_MEMORY_EXPLICIT_CATEGORY = "user_explicit";
 const SAFE_BROKER_ERROR_CODES = new Set([
 	"AUTHENTICATION_REQUIRED",
 	"EXPLICIT_CONSENT_REQUIRED",
+	"FORGET_GENERATION_CHANGED",
 	"INTERNAL_ERROR",
 	"INTERACTIVE_CONFIRMATION_REQUIRED",
 	"INSUFFICIENT_SCOPE",
 	"INVALID_PAYLOAD",
 	"MEMORY_NOT_FOUND",
 	"MEMORY_WRITE_DISABLED",
+	"PAYLOAD_TOO_LARGE",
 	"SECRET_REJECTED",
 	"UNAVAILABLE"
 ]);
@@ -367700,7 +368116,7 @@ var PersonalMemoryBrokerError = class extends Error {
 	}
 };
 function parsePersonalMemorySettings(payload) {
-	if (!isRecord$15(payload)) return void 0;
+	if (!isRecord$19(payload)) return void 0;
 	const status = payload["status"];
 	if (status !== "configured" && status !== "never_asked") return void 0;
 	const memoryEnabled = payload["memory_enabled"];
@@ -367809,21 +368225,23 @@ async function brokerHttpError(response) {
 	const responseCode = await safeBrokerResponseCode(response);
 	if (responseCode !== void 0) return new PersonalMemoryBrokerError(responseCode, status);
 	if (status === 401) return new PersonalMemoryBrokerError("AUTHENTICATION_REQUIRED", status);
+	if (status === 409) return new PersonalMemoryBrokerError("FORGET_GENERATION_CHANGED", status);
+	if (status === 413) return new PersonalMemoryBrokerError("PAYLOAD_TOO_LARGE", status);
 	if (status === 403) return new PersonalMemoryBrokerError("INSUFFICIENT_SCOPE", status);
 	return new PersonalMemoryBrokerError("UNAVAILABLE", status);
 }
 async function safeBrokerResponseCode(response) {
 	try {
 		const payload = await response.json();
-		if (!isRecord$15(payload)) return void 0;
-		const nested = isRecord$15(payload["error"]) ? payload["error"]["code"] : void 0;
+		if (!isRecord$19(payload)) return void 0;
+		const nested = isRecord$19(payload["error"]) ? payload["error"]["code"] : void 0;
 		const candidate = payload["code"] ?? payload["error_code"] ?? nested;
 		return typeof candidate === "string" && SAFE_BROKER_ERROR_CODES.has(candidate) ? candidate : void 0;
 	} catch {
 		return;
 	}
 }
-function isRecord$15(value) {
+function isRecord$19(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isAllowedBrokerRequest(method, path) {
@@ -367834,13 +368252,17 @@ function isAllowedBrokerRequest(method, path) {
 		return false;
 	}
 	if (url.origin !== "https://personal-memory.invalid") return false;
-	if (url.search.length > 0 || url.hash.length > 0) return false;
+	if (url.hash.length > 0) return false;
+	if (url.pathname === "/api/memory/workspace" && url.search.length > 0) return method === "GET" && url.searchParams.size === 2 && url.searchParams.get("source") === "tui" && url.searchParams.has("sessionId") && (url.searchParams.get("sessionId")?.length ?? 0) > 0 && (url.searchParams.get("sessionId")?.length ?? 0) <= 200;
+	if (url.search.length > 0) return false;
 	const pathname = url.pathname;
 	if (pathname === PERSONAL_MEMORY_SETTINGS_PATH) return method === "GET" || method === "PUT";
 	if (pathname === "/api/account/consent") return method === "POST";
 	if (pathname === PERSONAL_MEMORY_MEMORIES_PATH) return method === "GET" || method === "POST";
 	if (/^\/v1\/me\/memories\/[0-9a-f-]{36}$/i.test(pathname)) return false;
 	if (pathname === PERSONAL_MEMORY_RECALL_PATH) return method === PERSONAL_MEMORY_RECALL_METHOD;
+	if (pathname === "/api/memory/workspace") return method === "GET";
+	if (pathname === "/api/memory/capture" || pathname === "/api/memory/recall" || pathname === "/api/memory/search" || pathname === "/api/memory/retract") return method === "POST";
 	return false;
 }
 //#endregion
@@ -368530,7 +368952,7 @@ function createAttestation(value, createdAt) {
 	};
 }
 function parseProof(value) {
-	if (!isRecord$14(value) || value["schema"] !== "blun.proof" || value["schemaVersion"] !== 1) throw new Error("Unsupported proof document.");
+	if (!isRecord$18(value) || value["schema"] !== "blun.proof" || value["schemaVersion"] !== 1) throw new Error("Unsupported proof document.");
 	assertObjectKeys(value, [
 		"schema",
 		"schemaVersion",
@@ -368550,12 +368972,12 @@ function parseProof(value) {
 		"incomplete",
 		"failed"
 	].includes(proof.outcome)) throw new Error("Invalid proof outcome.");
-	if (!isRecord$14(proof.source) || proof.source.kind !== "workspace") throw new Error("Invalid proof source.");
+	if (!isRecord$18(proof.source) || proof.source.kind !== "workspace") throw new Error("Invalid proof source.");
 	assertObjectKeys(proof.source, ["kind"], ["git"], "proof source");
 	if (proof.source.git !== void 0) validateGitSnapshot(proof.source.git);
 	if (!Array.isArray(proof.checks) || !Array.isArray(proof.artifacts)) throw new TypeError("Invalid proof collections.");
 	if (proof.checks.length > MAX_COMMANDS || proof.artifacts.length > MAX_ARTIFACTS) throw new Error("Proof collections exceed their limits.");
-	if (!isRecord$14(proof.attestation) || proof.attestation.algorithm !== "SHA-256" || proof.attestation.scope !== "content-integrity-only" || !SHA256_PATTERN.test(proof.attestation.hash)) throw new Error("Invalid proof attestation.");
+	if (!isRecord$18(proof.attestation) || proof.attestation.algorithm !== "SHA-256" || proof.attestation.scope !== "content-integrity-only" || !SHA256_PATTERN.test(proof.attestation.hash)) throw new Error("Invalid proof attestation.");
 	assertObjectKeys(proof.attestation, [
 		"algorithm",
 		"scope",
@@ -368570,7 +368992,7 @@ function parseProof(value) {
 		screenshot: 0
 	};
 	for (const artifact of proof.artifacts) {
-		if (!isRecord$14(artifact) || artifact.kind !== "file" && artifact.kind !== "screenshot" || typeof artifact.id !== "string" || typeof artifact.size !== "number" || !Number.isSafeInteger(artifact.size) || artifact.size < 0 || typeof artifact.sha256 !== "string" || !SHA256_PATTERN.test(artifact.sha256)) throw new Error("Invalid proof artifact.");
+		if (!isRecord$18(artifact) || artifact.kind !== "file" && artifact.kind !== "screenshot" || typeof artifact.id !== "string" || typeof artifact.size !== "number" || !Number.isSafeInteger(artifact.size) || artifact.size < 0 || typeof artifact.sha256 !== "string" || !SHA256_PATTERN.test(artifact.sha256)) throw new Error("Invalid proof artifact.");
 		assertObjectKeys(artifact, [
 			"id",
 			"kind",
@@ -368587,14 +369009,14 @@ function parseProof(value) {
 	return proof;
 }
 function validateGitSnapshot(value) {
-	if (!isRecord$14(value)) throw new Error("Invalid proof git snapshot.");
+	if (!isRecord$18(value)) throw new Error("Invalid proof git snapshot.");
 	assertObjectKeys(value, ["dirty", "changedCount"], [], "proof git snapshot");
 	if (typeof value["dirty"] !== "boolean") throw new TypeError("Invalid proof git dirty flag.");
 	if (typeof value["changedCount"] !== "number" || !Number.isSafeInteger(value["changedCount"]) || value["changedCount"] < 0) throw new Error("Invalid proof git changed count.");
 	if (value["dirty"] !== value["changedCount"] > 0) throw new Error("Inconsistent proof git state.");
 }
 function validateProofCheck(value, index) {
-	if (!isRecord$14(value)) throw new Error("Invalid proof check.");
+	if (!isRecord$18(value)) throw new Error("Invalid proof check.");
 	assertObjectKeys(value, [
 		"id",
 		"outcome",
@@ -368606,13 +369028,13 @@ function validateProofCheck(value, index) {
 	if (value["outcome"] !== expectedOutcome) throw new Error("Invalid proof check outcome.");
 }
 function attestedContent(value) {
-	if (!isRecord$14(value)) return value;
+	if (!isRecord$18(value)) return value;
 	const { attestation: _attestation, createdAt: _createdAt, ...content } = value;
 	return content;
 }
 function canonicalize(value) {
 	if (Array.isArray(value)) return value.map(canonicalize);
-	if (!isRecord$14(value)) return value;
+	if (!isRecord$18(value)) return value;
 	return Object.keys(value).toSorted().reduce((result, key) => {
 		result[key] = canonicalize(value[key]);
 		return result;
@@ -368689,7 +369111,7 @@ function sameFileIdentity$1(left, right) {
 function sameFileSnapshot(left, right) {
 	return sameFileIdentity$1(left, right) && left.size === right.size && left.mtimeMs === right.mtimeMs && left.ctimeMs === right.ctimeMs;
 }
-function isRecord$14(value) {
+function isRecord$18(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -372961,7 +373383,7 @@ 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$3 = __require("fs");
+	const fs$4 = __require("fs");
 	const EventEmitter$10 = __require("events");
 	const inherits$6 = __require("util").inherits;
 	const path$6 = __require("path");
@@ -373004,17 +373426,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$3.mkdirSync(path$6.dirname(file), { recursive: true });
-			fileOpened(null, fs$3.openSync(file, flags, mode));
+			if (sonic.mkdir) fs$4.mkdirSync(path$6.dirname(file), { recursive: true });
+			fileOpened(null, fs$4.openSync(file, flags, mode));
 		} catch (err) {
 			fileOpened(err);
 			throw err;
 		}
-		else if (sonic.mkdir) fs$3.mkdir(path$6.dirname(file), { recursive: true }, (err) => {
+		else if (sonic.mkdir) fs$4.mkdir(path$6.dirname(file), { recursive: true }, (err) => {
 			if (err) return fileOpened(err);
-			fs$3.open(file, flags, mode, fileOpened);
+			fs$4.open(file, flags, mode, fileOpened);
 		});
-		else fs$3.open(file, flags, mode, fileOpened);
+		else fs$4.open(file, flags, mode, fileOpened);
 	}
 	function SonicBoom(opts) {
 		if (!(this instanceof SonicBoom)) return new SonicBoom(opts);
@@ -373052,8 +373474,8 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			this.flush = flushBuffer;
 			this.flushSync = flushBufferSync;
 			this._actualWrite = actualWriteBuffer;
-			fsWriteSync = () => fs$3.writeSync(this.fd, this._writingBuf);
-			fsWrite = () => fs$3.write(this.fd, this._writingBuf, this.release);
+			fsWriteSync = () => fs$4.writeSync(this.fd, this._writingBuf);
+			fsWrite = () => fs$4.write(this.fd, this._writingBuf, this.release);
 		} else if (contentMode === void 0 || contentMode === kContentModeUtf8) {
 			this._writingBuf = "";
 			this.write = write;
@@ -373061,12 +373483,12 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			this.flushSync = flushSync;
 			this._actualWrite = actualWrite;
 			fsWriteSync = () => {
-				if (Buffer.isBuffer(this._writingBuf)) return fs$3.writeSync(this.fd, this._writingBuf);
-				return fs$3.writeSync(this.fd, this._writingBuf, "utf8");
+				if (Buffer.isBuffer(this._writingBuf)) return fs$4.writeSync(this.fd, this._writingBuf);
+				return fs$4.writeSync(this.fd, this._writingBuf, "utf8");
 			};
 			fsWrite = () => {
-				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);
+				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);
 			};
 		} else throw new Error(`SonicBoom supports "${kContentModeUtf8}" and "${kContentModeBuffer}", but passed ${contentMode}`);
 		if (typeof fd === "number") {
@@ -373111,7 +373533,7 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					return;
 				}
 			}
-			if (this._fsync) fs$3.fsyncSync(this.fd);
+			if (this._fsync) fs$4.fsyncSync(this.fd);
 			const len = this._len;
 			if (this._reopening) {
 				this._writing = false;
@@ -373208,7 +373630,7 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		this._flushPending = true;
 		const onDrain = () => {
 			if (!this._fsync) try {
-				fs$3.fsync(this.fd, (err) => {
+				fs$4.fsync(this.fd, (err) => {
 					this._flushPending = false;
 					cb(err);
 				});
@@ -373285,7 +373707,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$3.close(fd, (err) => {
+			if (fd !== this.fd) fs$4.close(fd, (err) => {
 				if (err) return this.emit("error", err);
 			});
 		});
@@ -373316,7 +373738,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$3.writeSync(this.fd, buf) : fs$3.writeSync(this.fd, buf, "utf8");
+				const n = Buffer.isBuffer(buf) ? fs$4.writeSync(this.fd, buf) : fs$4.writeSync(this.fd, buf, "utf8");
 				const releasedBufObj = releaseWritingBuf(buf, this._len, n);
 				buf = releasedBufObj.writingBuf;
 				this._len = releasedBufObj.len;
@@ -373327,7 +373749,7 @@ var require_sonic_boom = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			}
 		}
 		try {
-			fs$3.fsyncSync(this.fd);
+			fs$4.fsyncSync(this.fd);
 		} catch {}
 	}
 	function flushBufferSync() {
@@ -373341,7 +373763,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$3.writeSync(this.fd, buf);
+				const n = fs$4.writeSync(this.fd, buf);
 				buf = buf.subarray(n);
 				this._len = Math.max(this._len - n, 0);
 				if (buf.length <= 0) {
@@ -373363,24 +373785,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$3.writeSync(this.fd, this._writingBuf) : fs$3.writeSync(this.fd, this._writingBuf, "utf8"));
+			release(null, Buffer.isBuffer(this._writingBuf) ? fs$4.writeSync(this.fd, this._writingBuf) : fs$4.writeSync(this.fd, this._writingBuf, "utf8"));
 		} catch (err) {
 			release(err);
 		}
-		else fs$3.write(this.fd, this._writingBuf, release);
+		else fs$4.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$3.writeSync(this.fd, this._writingBuf));
+			release(null, fs$4.writeSync(this.fd, this._writingBuf));
 		} catch (err) {
 			release(err);
 		}
 		else {
 			if (kCopyBuffer) this._writingBuf = Buffer.from(this._writingBuf);
-			fs$3.write(this.fd, this._writingBuf, release);
+			fs$4.write(this.fd, this._writingBuf, release);
 		}
 	}
 	function actualClose(sonic) {
@@ -373394,10 +373816,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$3.fsync(sonic.fd, closeWrapped);
+			fs$4.fsync(sonic.fd, closeWrapped);
 		} catch {}
 		function closeWrapped() {
-			if (sonic.fd !== 1 && sonic.fd !== 2) fs$3.close(sonic.fd, done);
+			if (sonic.fd !== 1 && sonic.fd !== 2) fs$4.close(sonic.fd, done);
 			else done();
 		}
 		function done(err) {
@@ -416074,7 +416496,7 @@ var require_dist$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 //#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$2 = __require("node:fs");
+	const fs$3 = __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"));
@@ -416083,14 +416505,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$2.existsSync(path$4.resolve(opts.specification.path))) return done(/* @__PURE__ */ new Error(`${opts.specification.path} does not exist`));
+			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 ([".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));
 			else while (opts.specification.baseDir.endsWith("/")) opts.specification.baseDir = opts.specification.baseDir.slice(0, -1);
-			const source = fs$2.readFileSync(path$4.resolve(opts.specification.path), "utf8");
+			const source = fs$3.readFileSync(path$4.resolve(opts.specification.path), "utf8");
 			switch (extName) {
 				case ".yaml":
 					swaggerObject = yaml.parse(source);
@@ -416357,11 +416779,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$1 = __require("node:fs");
+	const fs$2 = __require("node:fs");
 	const path$3 = __require("node:path");
 	function readPackageJson() {
 		try {
-			return JSON.parse(fs$1.readFileSync(path$3.join(__dirname, "..", "..", "package.json")));
+			return JSON.parse(fs$2.readFileSync(path$3.join(__dirname, "..", "..", "package.json")));
 		} catch {
 			return {};
 		}
@@ -423564,12 +423986,12 @@ function legacyStatusToCurrent(task) {
 	return task.status;
 }
 function isReadablePersistedTask(obj) {
-	return isRecord$13(obj) && (typeof obj["taskId"] === "string" || typeof obj["task_id"] === "string");
+	return isRecord$17(obj) && (typeof obj["taskId"] === "string" || typeof obj["task_id"] === "string");
 }
 function isLegacyPersistedTask(task) {
 	return "task_id" in task;
 }
-function isRecord$13(value) {
+function isRecord$17(value) {
 	return typeof value === "object" && value !== null;
 }
 function optionalNonEmptyString(value) {
@@ -423978,11 +424400,11 @@ const WINDOWS_RESERVED_NAMES = new Set([
 	...Array.from({ length: 9 }, (_value, index) => `COM${String(index + 1)}`),
 	...Array.from({ length: 9 }, (_value, index) => `LPT${String(index + 1)}`)
 ]);
-function isRecord$12(value) {
+function isRecord$16(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function assertRecord(value, label) {
-	if (!isRecord$12(value)) throw new Error(`${label} must be an object.`);
+	if (!isRecord$16(value)) throw new Error(`${label} must be an object.`);
 }
 function assertExactKeys(value, required, optional, label) {
 	const allowed = new Set([...required, ...optional]);
@@ -424273,7 +424695,7 @@ function currentArtifactRecord(artifacts) {
 	return result;
 }
 function readAttestationHash(value) {
-	if (!isRecord$12(value) || !isRecord$12(value["attestation"])) return null;
+	if (!isRecord$16(value) || !isRecord$16(value["attestation"])) return null;
 	const hash = value["attestation"]["hash"];
 	return typeof hash === "string" && /^[a-f0-9]{64}$/.test(hash) ? hash : null;
 }
@@ -425045,21 +425467,21 @@ async function ensureSafeDirectory(path, create, recursive) {
 	return true;
 }
 function validateRegistry(value, context) {
-	if (!isRecord$11(value) || value["version"] !== 1) throw new WorkspaceError("registry_invalid", "Unsupported workspace registry version.");
+	if (!isRecord$15(value) || value["version"] !== 1) throw new WorkspaceError("registry_invalid", "Unsupported workspace registry version.");
 	if (!hasExactKeys(value, REGISTRY_KEYS)) throw new WorkspaceError("registry_invalid", "Workspace registry contains unknown fields.");
-	if (value["repoFingerprint"] !== context.repoFingerprint || value["primaryRoot"] !== context.primaryRoot || !isRecord$11(value["workspaces"])) throw new WorkspaceError("registry_invalid", "Workspace registry does not match this repository.");
+	if (value["repoFingerprint"] !== context.repoFingerprint || value["primaryRoot"] !== context.primaryRoot || !isRecord$15(value["workspaces"])) throw new WorkspaceError("registry_invalid", "Workspace registry does not match this repository.");
 	for (const [name, record] of Object.entries(value["workspaces"])) if (!isWorkspaceRecord(record) || record.name !== name) throw new WorkspaceError("registry_invalid", "Workspace registry contains an invalid entry.");
 	return value;
 }
 function isWorkspaceRecord(value) {
-	if (!isRecord$11(value) || !hasExactKeys(value, WORKSPACE_RECORD_KEYS)) return false;
+	if (!isRecord$15(value) || !hasExactKeys(value, WORKSPACE_RECORD_KEYS)) return false;
 	return typeof value["name"] === "string" && typeof value["path"] === "string" && typeof value["branch"] === "string" && typeof value["baseCommit"] === "string" && typeof value["repoFingerprint"] === "string" && isCanonicalIsoTimestamp(value["createdAt"]);
 }
 function isCanonicalIsoTimestamp(value) {
 	if (typeof value !== "string" || !/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(value)) return false;
 	return new Date(value).toISOString() === value;
 }
-function isRecord$11(value) {
+function isRecord$15(value) {
 	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
 	const prototype = Object.getPrototypeOf(value);
 	return prototype === Object.prototype || prototype === null;
@@ -425150,7 +425572,7 @@ async function readRegistryLockMetadata(lockPath) {
 		if (error.code !== void 0) throw error;
 		return;
 	}
-	if (!isRecord$11(value) || !hasExactKeys(value, [
+	if (!isRecord$15(value) || !hasExactKeys(value, [
 		"version",
 		"pid",
 		"createdAt",
@@ -425859,7 +426281,7 @@ async function searchLocalWorkHistory(homeDir, sessions, query, limit = 8) {
 	let skippedRecords = 0;
 	for (const session of sessions) {
 		const sessionDir = await realpath(session.sessionDir).catch(() => void 0);
-		if (sessionDir === void 0 || path.basename(sessionDir) !== session.id || !isInside(sessionsRoot, sessionDir)) {
+		if (sessionDir === void 0 || path.basename(sessionDir) !== session.id || !isInside$1(sessionsRoot, sessionDir)) {
 			skippedSessions++;
 			continue;
 		}
@@ -425881,7 +426303,7 @@ async function searchLocalWorkHistory(homeDir, sessions, query, limit = 8) {
 			continue;
 		}
 		const canonicalWire = await realpath(wirePath).catch(() => void 0);
-		if (canonicalWire === void 0 || !isInside(sessionDir, canonicalWire)) {
+		if (canonicalWire === void 0 || !isInside$1(sessionDir, canonicalWire)) {
 			skippedSessions++;
 			continue;
 		}
@@ -425899,7 +426321,7 @@ async function searchLocalWorkHistory(homeDir, sessions, query, limit = 8) {
 					skippedRecords++;
 					continue;
 				}
-				const event = isRecord$10(record) && record["type"] === "context.append_loop_event" && isRecord$10(record["event"]) ? record["event"] : void 0;
+				const event = isRecord$14(record) && record["type"] === "context.append_loop_event" && isRecord$14(record["event"]) ? record["event"] : void 0;
 				if (event?.["type"] === "step.end" && typeof event["uuid"] === "string") assistantSteps.delete(event["uuid"]);
 				else if (event?.["type"] === "content.part" && typeof event["stepUuid"] === "string" && isTextPart(event["part"])) {
 					const stepId = event["stepUuid"];
@@ -425976,11 +426398,11 @@ async function* boundedWireLines(wirePath, size) {
 	}
 }
 function searchableText(record) {
-	if (!isRecord$10(record)) return void 0;
-	if (record["type"] === "context.append_message" && isRecord$10(record["message"])) {
+	if (!isRecord$14(record)) return void 0;
+	if (record["type"] === "context.append_message" && isRecord$14(record["message"])) {
 		const message = record["message"];
 		const origin = message["origin"];
-		if (message["role"] !== "user" && message["role"] !== "assistant" || message["role"] === "assistant" && origin !== void 0 || message["role"] === "user" && origin !== void 0 && (!isRecord$10(origin) || origin["kind"] !== "user")) return;
+		if (message["role"] !== "user" && message["role"] !== "assistant" || message["role"] === "assistant" && origin !== void 0 || message["role"] === "user" && origin !== void 0 && (!isRecord$14(origin) || origin["kind"] !== "user")) return;
 		const content = message["content"];
 		if (!Array.isArray(content)) return void 0;
 		const text = content.filter(isTextPart).map((part) => part.text).join(" ");
@@ -426002,12 +426424,12 @@ function snippet(text, firstTerm) {
 	return `${start > 0 ? "..." : ""}${flattened.slice(start, end)}${end < flattened.length ? "..." : ""}`;
 }
 function isTextPart(value) {
-	return isRecord$10(value) && value["type"] === "text" && typeof value["text"] === "string";
+	return isRecord$14(value) && value["type"] === "text" && typeof value["text"] === "string";
 }
-function isRecord$10(value) {
+function isRecord$14(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function isInside(parent, child) {
+function isInside$1(parent, child) {
 	const relative = path.relative(parent, child);
 	return relative !== "" && relative !== ".." && !relative.startsWith(`..${path.sep}`) && !path.isAbsolute(relative);
 }
@@ -426100,7 +426522,7 @@ async function searchLocalToolEvents(homeDir, sessions, query, limit = 8) {
 	};
 }
 function parseSavedEvent(value, sessionId) {
-	if (!isRecord$9(value) || value["version"] !== 1 || value["sessionId"] !== sessionId || typeof value["agentId"] !== "string" || !TOOL_NAME.test(value["agentId"]) || typeof value["tool"] !== "string" || !TOOL_NAME.test(value["tool"]) || typeof value["at"] !== "number" || !Number.isSafeInteger(value["at"]) || value["at"] < 0 || value["status"] !== "ok" && value["status"] !== "error" && value["status"] !== "synthetic") return;
+	if (!isRecord$13(value) || value["version"] !== 1 || value["sessionId"] !== sessionId || typeof value["agentId"] !== "string" || !TOOL_NAME.test(value["agentId"]) || typeof value["tool"] !== "string" || !TOOL_NAME.test(value["tool"]) || typeof value["at"] !== "number" || !Number.isSafeInteger(value["at"]) || value["at"] < 0 || value["status"] !== "ok" && value["status"] !== "error" && value["status"] !== "synthetic") return;
 	const filePath = value["filePath"];
 	if (filePath !== void 0 && (typeof filePath !== "string" || filePath.length > 1024 || /[\u0000-\u001F\u007F]/u.test(filePath))) return void 0;
 	return {
@@ -426132,7 +426554,7 @@ function localToolEventRecordingEnabled(homeDir) {
 		}
 		if (!info.isFile() || info.isSymbolicLink() || info.size > 1024) return false;
 		const parsed = JSON.parse(readFileSync(settingsPath, "utf8"));
-		return isRecord$9(parsed) && parsed["version"] === 1 && parsed["enabled"] === true;
+		return isRecord$13(parsed) && parsed["version"] === 1 && parsed["enabled"] === true;
 	} catch {
 		return false;
 	}
@@ -426195,7 +426617,11 @@ function createLocalToolEventRecorder(homeDir, sessionId, enabled = localToolEve
 			if (event.type === "tool.call.started") {
 				if (!TOOL_NAME.test(event.name) || !TOOL_NAME.test(event.agentId)) return;
 				if (pending.size >= MAX_PENDING_CALLS) pending.delete(pending.keys().next().value);
-				pending.set(event.toolCallId, {
+				pending.set(JSON.stringify([
+					event.agentId,
+					event.turnId,
+					event.toolCallId
+				]), {
 					agentId: event.agentId,
 					turnId: event.turnId,
 					tool: event.name,
@@ -426204,9 +426630,14 @@ function createLocalToolEventRecorder(homeDir, sessionId, enabled = localToolEve
 				return;
 			}
 			if (event.type !== "tool.result") return;
-			const started = pending.get(event.toolCallId);
+			const key = JSON.stringify([
+				event.agentId,
+				event.turnId,
+				event.toolCallId
+			]);
+			const started = pending.get(key);
 			if (started === void 0 || started.agentId !== event.agentId || started.turnId !== event.turnId) return;
-			pending.delete(event.toolCallId);
+			pending.delete(key);
 			const record = {
 				version: 1,
 				sessionId,
@@ -426234,7 +426665,7 @@ function createLocalToolEventRecorder(homeDir, sessionId, enabled = localToolEve
 	};
 }
 function filePathFor(tool, args) {
-	if (!FILE_TOOLS.has(tool) || !isRecord$9(args)) return {};
+	if (!FILE_TOOLS.has(tool) || !isRecord$13(args)) return {};
 	const value = args["path"];
 	if (typeof value !== "string" || value.length === 0 || value.length > 1024 || /[\u0000-\u001F\u007F]/u.test(value)) return {};
 	return { filePath: value };
@@ -426277,11 +426708,11 @@ async function assertPlainDirectory(directory) {
 function samePath(a, b) {
 	return process.platform === "win32" ? path.resolve(a).toLocaleLowerCase() === path.resolve(b).toLocaleLowerCase() : path.resolve(a) === path.resolve(b);
 }
-function isRecord$9(value) {
+function isRecord$13(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isErrno$1(error, code) {
-	return isRecord$9(error) && error["code"] === code;
+	return isRecord$13(error) && error["code"] === code;
 }
 //#endregion
 //#region src/personal-memory/session-mcp.ts
@@ -426463,12 +426894,12 @@ function isPersonalMemoryToolName(name) {
 	return PERSONAL_MEMORY_TOOL_NAMES.includes(name);
 }
 function normalizePhaseOneRecall(payload, limit) {
-	if (!isRecord$8(payload) || !Array.isArray(payload["ergebnis"])) throw new PersonalMemoryBrokerError("INVALID_PAYLOAD");
+	if (!isRecord$12(payload) || !Array.isArray(payload["ergebnis"])) throw new PersonalMemoryBrokerError("INVALID_PAYLOAD");
 	const results = payload["ergebnis"];
 	if (results.length > 100) throw new PersonalMemoryBrokerError("INVALID_PAYLOAD");
 	return { personal_memory: {
 		saved: results.map((entry) => {
-			if (!isRecord$8(entry)) throw new PersonalMemoryBrokerError("INVALID_PAYLOAD");
+			if (!isRecord$12(entry)) throw new PersonalMemoryBrokerError("INVALID_PAYLOAD");
 			const text = entry["inhalt"];
 			if (typeof text !== "string" || text.trim().length === 0 || text.length > 4e3) throw new PersonalMemoryBrokerError("INVALID_PAYLOAD");
 			return {
@@ -426480,7 +426911,46 @@ function normalizePhaseOneRecall(payload, limit) {
 		chat_history_context: []
 	} };
 }
-function isRecord$8(value) {
+function isRecord$12(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+//#endregion
+//#region src/personal-memory/account-memory-recall.ts
+function mergeAccountMemoryRecall(phaseOne, account) {
+	const existing = parsePhaseOne(phaseOne);
+	if (existing === void 0 && account === void 0) throw new PersonalMemoryBrokerError("UNAVAILABLE");
+	const saved = [...(existing?.personal_memory.saved ?? []).slice(0, 4), ...(account?.profile.card ?? []).slice(0, 4).map((text) => ({
+		text: text.slice(0, 1e3),
+		confidence: "medium"
+	}))];
+	const threads = (existing?.personal_memory.threads ?? []).slice(0, 4);
+	if (account?.profile.representation.trim()) threads.push({
+		title: "Account memory profile",
+		summary: account.profile.representation.slice(0, 1e3)
+	});
+	for (const item of account?.items ?? []) {
+		if (threads.length >= 8) break;
+		threads.push({
+			title: `${item.source} / ${item.sessionId}`.slice(0, 200),
+			summary: item.text.slice(0, 1e3)
+		});
+	}
+	return { personal_memory: {
+		saved,
+		threads,
+		chat_history_context: []
+	} };
+}
+function parsePhaseOne(value) {
+	if (!isRecord$11(value) || !isRecord$11(value["personal_memory"])) return void 0;
+	const memory = value["personal_memory"];
+	if (!Array.isArray(memory["saved"]) || !Array.isArray(memory["threads"]) || !Array.isArray(memory["chat_history_context"]) || memory["chat_history_context"].length > 0) return void 0;
+	const saved = memory["saved"];
+	const threads = memory["threads"];
+	if (saved.length > 8 || threads.length > 8 || !saved.every((item) => isRecord$11(item) && typeof item["text"] === "string" && item["text"].length <= 1e3 && item["confidence"] === "medium") || !threads.every((item) => isRecord$11(item) && typeof item["title"] === "string" && item["title"].length <= 200 && typeof item["summary"] === "string" && item["summary"].length <= 1e3)) return void 0;
+	return value;
+}
+function isRecord$11(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -426591,9 +427061,22 @@ const savedSearchResultSchema = object$1({ personal_memory: object$1({ saved: ar
 async function bindPersonalMemoryHostTools(session, harness, options = {}) {
 	if (!supportsPersonalMemoryHostTools(session)) return;
 	const binding = Object.prototype.hasOwnProperty.call(options, "binding") ? options.binding : personalMemoryHostBinding();
-	await clearPersonalMemoryHostTools(session);
 	const localHistory = options.localHistory;
 	const localOnlyEnabled = localHistory !== void 0 && localToolEventRecordingEnabled(localHistory.homeDir);
+	const savedSearchEnabled = binding?.mode === "full" && binding.capabilities.recallEnabled;
+	if (options.searchOnly) {
+		await session.unregisterToolAndWait(PERSONAL_MEMORY_SEARCH_TOOL);
+		if (localHistory === void 0 || !savedSearchEnabled && !localOnlyEnabled) return;
+		const searchClient = savedSearchEnabled ? options.client ?? createPersonalMemoryBrokerClient(harness) : void 0;
+		try {
+			await registerPersonalMemorySearchTool(session, localHistory, searchClient, binding, savedSearchEnabled, localOnlyEnabled, savedSearchEnabled ? options.accountMemory : void 0);
+		} catch (error) {
+			await session.unregisterToolAndWait(PERSONAL_MEMORY_SEARCH_TOOL).catch(() => {});
+			throw error;
+		}
+		return;
+	}
+	await clearPersonalMemoryHostTools(session);
 	if (binding === void 0 && !localOnlyEnabled) return;
 	const client = binding === void 0 ? void 0 : options.client ?? createPersonalMemoryBrokerClient(harness);
 	const context = binding === void 0 ? void 0 : {
@@ -426604,45 +427087,10 @@ async function bindPersonalMemoryHostTools(session, harness, options = {}) {
 		for (const name of binding === void 0 ? [] : personalMemoryToolNames(binding.mode, binding.capabilities)) {
 			if (name === "memory_recall") continue;
 			const definition = personalMemoryToolDefinition(name);
-			await session.registerToolAndWait(qualifiedPersonalMemoryToolName(name), definition.description, definition.parameters, createHostHandler(client, name, context, name === "memory_settings_update" ? () => refreshPersonalMemoryBinding(session, harness, client, localHistory) : void 0));
-		}
-		const savedSearchEnabled = binding?.mode === "full" && binding.capabilities.recallEnabled;
-		if (savedSearchEnabled) session.setHostToolCallHandler(PERSONAL_MEMORY_HOST_RECALL_HANDLER, createHostHandler(client, "memory_recall", context));
-		if (localHistory !== void 0 && (savedSearchEnabled || localOnlyEnabled)) await session.registerToolAndWait(PERSONAL_MEMORY_SEARCH_TOOL, "Search saved memories when enabled and this local profile's past work only when the user asks about prior work. Never use for routine recall.", toJSONSchema(searchInputSchema, { target: "draft-7" }), async (request) => {
-			const parsed = searchInputSchema.safeParse(request.args);
-			if (!parsed.success || !consumeWorkHistorySearchIntent(request)) return {
-				output: "EXPLICIT_HISTORY_REQUEST_REQUIRED",
-				isError: true
-			};
-			try {
-				const sessions = localHistory.listSessions({ includeArchive: true });
-				const [savedResult, workHistoryResult, toolEventsResult] = await Promise.allSettled([
-					savedSearchEnabled ? invokePersonalMemoryTool(client, "memory_recall", parsed.data, context) : Promise.resolve(void 0),
-					sessions.then((list) => searchLocalWorkHistory(localHistory.homeDir, list, parsed.data.query, parsed.data.limit)),
-					sessions.then((list) => searchLocalToolEvents(localHistory.homeDir, list, parsed.data.query, parsed.data.limit))
-				]);
-				const saved = savedSearchEnabled && savedResult.status === "fulfilled" ? savedSearchResultSchema.safeParse(savedResult.value) : void 0;
-				const savedAvailable = saved?.success === true;
-				if (!savedAvailable && workHistoryResult.status === "rejected" && toolEventsResult.status === "rejected") return {
-					output: "MEMORY_SEARCH_UNAVAILABLE",
-					isError: true
-				};
-				return { output: JSON.stringify({
-					saved: savedAvailable ? previewSavedSearchResult(saved.data) : null,
-					savedAvailable,
-					workHistory: workHistoryResult.status === "fulfilled" ? workHistoryResult.value : null,
-					workHistoryAvailable: workHistoryResult.status === "fulfilled",
-					toolEvents: toolEventsResult.status === "fulfilled" ? toolEventsResult.value : null,
-					toolEventsAvailable: toolEventsResult.status === "fulfilled",
-					toolEventRecordingEnabled: localOnlyEnabled
-				}) };
-			} catch {
-				return {
-					output: "MEMORY_SEARCH_UNAVAILABLE",
-					isError: true
-				};
-			}
-		});
+			await session.registerToolAndWait(qualifiedPersonalMemoryToolName(name), definition.description, definition.parameters, createHostHandler(client, name, context, name === "memory_settings_update" ? () => refreshPersonalMemoryBinding(session, harness, client, localHistory, options.accountMemory) : void 0));
+		}
+		if (savedSearchEnabled) session.setHostToolCallHandler(PERSONAL_MEMORY_HOST_RECALL_HANDLER, createHostHandler(client, "memory_recall", context, void 0, options.accountMemory));
+		if (localHistory !== void 0 && (savedSearchEnabled || localOnlyEnabled)) await registerPersonalMemorySearchTool(session, localHistory, client, binding, savedSearchEnabled, localOnlyEnabled, savedSearchEnabled ? options.accountMemory : void 0);
 		if (binding !== void 0) await session.setPersonalMemoryHostCapability(true);
 	} catch (error) {
 		resetPersonalMemorySession();
@@ -426650,6 +427098,55 @@ async function bindPersonalMemoryHostTools(session, harness, options = {}) {
 		throw error;
 	}
 }
+async function registerPersonalMemorySearchTool(session, localHistory, client, binding, savedSearchEnabled, localOnlyEnabled, accountMemory) {
+	const context = binding === void 0 ? void 0 : {
+		mode: binding.mode,
+		capabilities: binding.capabilities
+	};
+	await session.registerToolAndWait(PERSONAL_MEMORY_SEARCH_TOOL, "Search saved memories when enabled and this local profile's past work only when the user asks about prior work. Never use for routine recall.", toJSONSchema(searchInputSchema, { target: "draft-7" }), async (request) => {
+		const parsed = searchInputSchema.safeParse(request.args);
+		if (!parsed.success || !consumeWorkHistorySearchIntent(request)) return {
+			output: "EXPLICIT_HISTORY_REQUEST_REQUIRED",
+			isError: true
+		};
+		try {
+			const sessions = localHistory.listSessions({ includeArchive: true });
+			const [savedResult, workHistoryResult, toolEventsResult, accountResult] = await Promise.allSettled([
+				savedSearchEnabled ? invokePersonalMemoryTool(client, "memory_recall", parsed.data, context) : Promise.resolve(void 0),
+				sessions.then((list) => searchLocalWorkHistory(localHistory.homeDir, list, parsed.data.query, parsed.data.limit)),
+				sessions.then((list) => searchLocalToolEvents(localHistory.homeDir, list, parsed.data.query, parsed.data.limit)),
+				accountMemory?.search(parsed.data.query, Math.min(20, parsed.data.limit)) ?? Promise.resolve(void 0)
+			]);
+			const saved = savedSearchEnabled && savedResult.status === "fulfilled" ? savedSearchResultSchema.safeParse(savedResult.value) : void 0;
+			const savedAvailable = saved?.success === true;
+			if (!savedAvailable && workHistoryResult.status === "rejected" && toolEventsResult.status === "rejected" && (accountResult.status === "rejected" || accountResult.value === void 0)) return {
+				output: "MEMORY_SEARCH_UNAVAILABLE",
+				isError: true
+			};
+			return { output: JSON.stringify({
+				saved: savedAvailable ? previewSavedSearchResult(saved.data) : null,
+				savedAvailable,
+				workHistory: workHistoryResult.status === "fulfilled" ? workHistoryResult.value : null,
+				workHistoryAvailable: workHistoryResult.status === "fulfilled",
+				toolEvents: toolEventsResult.status === "fulfilled" ? toolEventsResult.value : null,
+				toolEventsAvailable: toolEventsResult.status === "fulfilled",
+				accountHistory: accountResult.status === "fulfilled" ? accountResult.value?.items.slice(0, 8).map((item) => ({
+					source: item.source,
+					sessionId: item.sessionId,
+					at: item.at,
+					text: item.text.slice(0, 600)
+				})) ?? null : null,
+				accountHistoryAvailable: accountResult.status === "fulfilled" && accountResult.value !== void 0,
+				toolEventRecordingEnabled: localOnlyEnabled
+			}) };
+		} catch {
+			return {
+				output: "MEMORY_SEARCH_UNAVAILABLE",
+				isError: true
+			};
+		}
+	});
+}
 function previewSavedSearchResult(result) {
 	return { personal_memory: {
 		saved: result.personal_memory.saved.map(({ text, confidence }) => {
@@ -426709,13 +427206,20 @@ function supportsPersonalMemoryHostTools(session) {
 function qualifiedPersonalMemoryToolName(name) {
 	return `${PERSONAL_MEMORY_QUALIFIED_PREFIX}${name}`;
 }
-function createHostHandler(client, name, context, afterSettingsUpdate) {
+function createHostHandler(client, name, context, afterSettingsUpdate, accountMemory) {
 	return async (request) => {
 		try {
-			const result = await invokePersonalMemoryTool(client, name, request.args, {
+			const original = () => invokePersonalMemoryTool(client, name, request.args, {
 				...context,
 				explicitRememberAttested: name === "memory_remember" ? consumePersonalMemoryRememberIntent(request) : void 0
 			});
+			let result;
+			if (name === "memory_recall" && accountMemory !== void 0) {
+				const parsed = searchInputSchema.safeParse(request.args);
+				if (!parsed.success) throw new PersonalMemoryBrokerError("INVALID_PAYLOAD");
+				const [phaseOne, account] = await Promise.all([original().catch(() => void 0), accountMemory.recall(parsed.data.query)]);
+				result = mergeAccountMemoryRecall(phaseOne, account);
+			} else result = await original();
 			if (name === "memory_settings_update") await afterSettingsUpdate?.();
 			return { output: JSON.stringify(result ?? null) };
 		} catch (error) {
@@ -426726,7 +427230,7 @@ function createHostHandler(client, name, context, afterSettingsUpdate) {
 		}
 	};
 }
-async function refreshPersonalMemoryBinding(session, harness, client, localHistory) {
+async function refreshPersonalMemoryBinding(session, harness, client, localHistory, accountMemory) {
 	resetPersonalMemorySession();
 	await clearPersonalMemoryHostTools(session);
 	try {
@@ -426738,7 +427242,8 @@ async function refreshPersonalMemoryBinding(session, harness, client, localHisto
 		await bindPersonalMemoryHostTools(session, harness, {
 			binding,
 			client,
-			localHistory
+			localHistory,
+			accountMemory
 		});
 	} catch (error) {
 		resetPersonalMemorySession();
@@ -433263,7 +433768,7 @@ var TUI = class TUI extends Container {
 			if (!debugRedraw) return;
 			const logPath = path$17.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$16.appendFileSync(logPath, msg);
+			fs$17.appendFileSync(logPath, msg);
 		};
 		if (this.previousLines.length === 0 && !widthChanged && !heightChanged) {
 			logRedraw("first render");
@@ -433410,7 +433915,7 @@ var TUI = class TUI extends Container {
 		buffer += "\x1B[?2026l";
 		if (process.env["PI_TUI_DEBUG"] === "1") {
 			const debugDir = "/tmp/tui";
-			fs$16.mkdirSync(debugDir, { recursive: true });
+			fs$17.mkdirSync(debugDir, { recursive: true });
 			const debugPath = path$17.join(debugDir, `render-${Date.now()}-${Math.random().toString(36).slice(2)}.log`);
 			const debugData = [
 				`firstChanged: ${firstChanged}`,
@@ -433434,7 +433939,7 @@ var TUI = class TUI extends Container {
 				"=== buffer ===",
 				JSON.stringify(buffer)
 			].join("\n");
-			fs$16.writeFileSync(debugPath, debugData);
+			fs$17.writeFileSync(debugPath, debugData);
 		}
 		this.terminal.write(buffer);
 		this.cursorRow = Math.max(0, newLines.length - 1);
@@ -438098,7 +438603,7 @@ var ProcessTerminal = class {
 		const env = process.env["PI_TUI_WRITE_LOG"] || "";
 		if (!env) return "";
 		try {
-			if (fs$16.statSync(env).isDirectory()) {
+			if (fs$17.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`);
@@ -438381,7 +438886,7 @@ var ProcessTerminal = class {
 	write(data) {
 		process.stdout.write(data);
 		if (this.writeLogPath) try {
-			fs$16.appendFileSync(this.writeLogPath, data, { encoding: "utf8" });
+			fs$17.appendFileSync(this.writeLogPath, data, { encoding: "utf8" });
 		} catch {}
 	}
 	get columns() {
@@ -438469,6 +438974,148 @@ function sanitizeTerminalText(value) {
 	return value.replaceAll(OSC_SEQUENCE$1, "").replaceAll(CSI_SEQUENCE$1, "").replaceAll(ESC_SEQUENCE$1, "").replaceAll(CONTROL_CHARACTERS$1, " ");
 }
 //#endregion
+//#region src/tui/utils/export-markdown.copy.ts
+registerUiCatalogFragment({
+	en: {
+		"export.thinking": "Thinking",
+		"export.image": "image",
+		"export.audio": "audio",
+		"export.video": "video",
+		"export.toolCall": "Tool Call: {name}",
+		"export.toolResult": "Tool Result: {name}",
+		"export.turn": "Turn {number}",
+		"export.user": "User",
+		"export.assistant": "Assistant",
+		"export.system": "System",
+		"export.unknownTool": "unknown",
+		"export.overview": "Overview",
+		"export.topic": "Topic",
+		"export.labelSeparator": ":",
+		"export.empty": "empty",
+		"export.conversation": "Conversation",
+		"export.turnCount.one": "{count} turn",
+		"export.turnCount.other": "{count} turns",
+		"export.toolCallCount.one": "{count} tool call",
+		"export.toolCallCount.other": "{count} tool calls",
+		"export.title": "King Session Export"
+	},
+	de: {
+		"export.thinking": "Denken",
+		"export.image": "Bild",
+		"export.audio": "Audio",
+		"export.video": "Video",
+		"export.toolCall": "Werkzeugaufruf: {name}",
+		"export.toolResult": "Werkzeugergebnis: {name}",
+		"export.turn": "Durchlauf {number}",
+		"export.user": "Benutzer",
+		"export.assistant": "Assistent",
+		"export.system": "System",
+		"export.unknownTool": "unbekannt",
+		"export.overview": "Übersicht",
+		"export.topic": "Thema",
+		"export.labelSeparator": ":",
+		"export.empty": "leer",
+		"export.conversation": "Gespräch",
+		"export.turnCount.one": "{count} Durchlauf",
+		"export.turnCount.other": "{count} Durchläufe",
+		"export.toolCallCount.one": "{count} Werkzeugaufruf",
+		"export.toolCallCount.other": "{count} Werkzeugaufrufe",
+		"export.title": "King-Sitzungsexport"
+	},
+	es: {
+		"export.thinking": "Razonamiento",
+		"export.image": "imagen",
+		"export.audio": "audio",
+		"export.video": "vídeo",
+		"export.toolCall": "Llamada a herramienta: {name}",
+		"export.toolResult": "Resultado de la herramienta: {name}",
+		"export.turn": "Turno {number}",
+		"export.user": "Usuario",
+		"export.assistant": "Asistente",
+		"export.system": "Sistema",
+		"export.unknownTool": "desconocida",
+		"export.overview": "Resumen",
+		"export.topic": "Tema",
+		"export.labelSeparator": ":",
+		"export.empty": "vacío",
+		"export.conversation": "Conversación",
+		"export.turnCount.one": "{count} turno",
+		"export.turnCount.other": "{count} turnos",
+		"export.toolCallCount.one": "{count} llamada a herramienta",
+		"export.toolCallCount.other": "{count} llamadas a herramientas",
+		"export.title": "Exportación de la sesión de King"
+	},
+	fr: {
+		"export.thinking": "Réflexion",
+		"export.image": "image",
+		"export.audio": "audio",
+		"export.video": "vidéo",
+		"export.toolCall": "Appel d’outil\xA0: {name}",
+		"export.toolResult": "Résultat de l’outil\xA0: {name}",
+		"export.turn": "Tour {number}",
+		"export.user": "Utilisateur",
+		"export.assistant": "Assistant",
+		"export.system": "Système",
+		"export.unknownTool": "inconnu",
+		"export.overview": "Vue d’ensemble",
+		"export.topic": "Sujet",
+		"export.labelSeparator": "\xA0:",
+		"export.empty": "vide",
+		"export.conversation": "Conversation",
+		"export.turnCount.one": "{count} tour",
+		"export.turnCount.other": "{count} tours",
+		"export.toolCallCount.one": "{count} appel d’outil",
+		"export.toolCallCount.other": "{count} appels d’outil",
+		"export.title": "Export de la session King"
+	},
+	sv: {
+		"export.thinking": "Resonemang",
+		"export.image": "bild",
+		"export.audio": "ljud",
+		"export.video": "video",
+		"export.toolCall": "Verktygsanrop: {name}",
+		"export.toolResult": "Verktygsresultat: {name}",
+		"export.turn": "Omgång {number}",
+		"export.user": "Användare",
+		"export.assistant": "Assistent",
+		"export.system": "System",
+		"export.unknownTool": "okänt",
+		"export.overview": "Översikt",
+		"export.topic": "Ämne",
+		"export.labelSeparator": ":",
+		"export.empty": "tomt",
+		"export.conversation": "Konversation",
+		"export.turnCount.one": "{count} omgång",
+		"export.turnCount.other": "{count} omgångar",
+		"export.toolCallCount.one": "{count} verktygsanrop",
+		"export.toolCallCount.other": "{count} verktygsanrop",
+		"export.title": "Export av King-session"
+	},
+	cs: {
+		"export.thinking": "Uvažování",
+		"export.image": "obrázek",
+		"export.audio": "zvuk",
+		"export.video": "video",
+		"export.toolCall": "Volání nástroje: {name}",
+		"export.toolResult": "Výsledek nástroje: {name}",
+		"export.turn": "Kolo {number}",
+		"export.user": "Uživatel",
+		"export.assistant": "Asistent",
+		"export.system": "Systém",
+		"export.unknownTool": "neznámý",
+		"export.overview": "Přehled",
+		"export.topic": "Téma",
+		"export.labelSeparator": ":",
+		"export.empty": "prázdné",
+		"export.conversation": "Konverzace",
+		"export.turnCount.one": "Kola: {count}",
+		"export.turnCount.other": "Kola: {count}",
+		"export.toolCallCount.one": "{count} volání nástroje",
+		"export.toolCallCount.other": "{count} volání nástrojů",
+		"export.title": "Export relace King"
+	}
+});
+//#endregion
 //#region src/tui/components/messages/usage-panel.ts
 registerUiCatalogFragment({
 	en: {
@@ -438637,6 +439284,11 @@ function usageNumber(value) {
 function usageInputTotal$2(usage) {
 	return usageNumber(usage.inputOther) + usageNumber(usage.inputCacheRead) + usageNumber(usage.inputCacheCreation);
 }
+function knownReasoningTokens(usage) {
+	const value = usage.outputReasoning;
+	const output = usageNumber(usage.output);
+	return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 && value <= output ? value : void 0;
+}
 function managedUsageLabel(row) {
 	switch (row.id) {
 		case "five_hours": return uiText("usage.plan.window.fiveHours");
@@ -438685,14 +439337,23 @@ function buildSessionUsageSection(usage, error, value, muted, errorStyle) {
 	const locale = getCurrentUiLocale();
 	let totalInput = 0;
 	let totalOutput = 0;
+	let totalReasoning = 0;
+	let reasoningComplete = true;
 	for (const [model, row] of entries) {
 		const input = usageInputTotal$2(row);
 		const output = usageNumber(row.output);
+		const reasoning = knownReasoningTokens(row);
 		totalInput += input;
 		totalOutput += output;
-		lines.push(`  ${muted(sanitizeTerminalText(model))}  ${uiText("usage.input")} ${value(formatExactTokenCount(input, locale))}  ${uiText("usage.output")} ${value(formatExactTokenCount(output, locale))}  ${uiText("usage.total")} ${value(formatExactTokenCount(input + output, locale))}`);
+		if (reasoning !== void 0) totalReasoning += reasoning;
+		else if (output > 0) reasoningComplete = false;
+		const reasoningPart = reasoning === void 0 ? "" : `  ${uiText("export.thinking")} ${value(formatExactTokenCount(reasoning, locale))}`;
+		lines.push(`  ${muted(sanitizeTerminalText(model))}  ${uiText("usage.input")} ${value(formatExactTokenCount(input, locale))}  ${uiText("usage.output")} ${value(formatExactTokenCount(output, locale))}${reasoningPart}  ${uiText("usage.total")} ${value(formatExactTokenCount(input + output, locale))}`);
+	}
+	if (entries.length > 1) {
+		const reasoningPart = reasoningComplete && totalOutput > 0 ? `  ${uiText("export.thinking")} ${value(formatExactTokenCount(totalReasoning, locale))}` : "";
+		lines.push(`  ${muted(uiText("usage.total"))}  ${uiText("usage.input")} ${value(formatExactTokenCount(totalInput, locale))}  ${uiText("usage.output")} ${value(formatExactTokenCount(totalOutput, locale))}${reasoningPart}  ${uiText("usage.total")} ${value(formatExactTokenCount(totalInput + totalOutput, locale))}`);
 	}
-	if (entries.length > 1) lines.push(`  ${muted(uiText("usage.total"))}  ${uiText("usage.input")} ${value(formatExactTokenCount(totalInput, locale))}  ${uiText("usage.output")} ${value(formatExactTokenCount(totalOutput, locale))}  ${uiText("usage.total")} ${value(formatExactTokenCount(totalInput + totalOutput, locale))}`);
 	return lines;
 }
 function buildManagedUsageSection(usage, error, accent, value, muted, errorStyle) {
@@ -502741,7 +503402,7 @@ function parsePluginMarketplace(raw, location) {
 	} catch (error) {
 		throw new Error(`Plugin marketplace is not valid JSON: ${formatParseError(error)}`, { cause: error });
 	}
-	if (!isRecord$7(parsed)) throw new TypeError("Plugin marketplace must be an object.");
+	if (!isRecord$10(parsed)) throw new TypeError("Plugin marketplace must be an object.");
 	const rawPlugins = parsed["plugins"];
 	if (!Array.isArray(rawPlugins)) throw new TypeError("Plugin marketplace must contain a \"plugins\" array.");
 	return {
@@ -502785,7 +503446,7 @@ async function readMarketplaceText(location, fetchImpl) {
 	return response.text();
 }
 function parseMarketplaceEntry(value, index, location) {
-	if (!isRecord$7(value)) throw new TypeError(`Plugin marketplace entry ${index + 1} must be an object.`);
+	if (!isRecord$10(value)) throw new TypeError(`Plugin marketplace entry ${index + 1} must be an object.`);
 	const id = requiredString(value, "id", index);
 	validateMarketplaceEntryType(value, id);
 	const source = stringField$2(value, "source") ?? stringField$2(value, "url") ?? stringField$2(value, "downloadUrl");
@@ -502921,7 +503582,7 @@ function stringArrayField(value, field) {
 	const out = raw.filter((item) => typeof item === "string").map((item) => item.trim()).filter((item) => item.length > 0);
 	return out.length > 0 ? out : void 0;
 }
-function isRecord$7(value) {
+function isRecord$10(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function formatParseError(error) {
@@ -505023,6 +505684,7 @@ async function handleBlunApiKeyLogin(host, options, promptOptions) {
 		provider: DEFAULT_OAUTH_PROVIDER_NAME,
 		method: "api_key"
 	});
+	host.accountMemoryRuntime?.retryPending().catch(() => {});
 	host.showStatus(uiText("auth.login.success"));
 	return "authenticated";
 }
@@ -505065,6 +505727,7 @@ async function handleBlunCodeOAuthLogin(host, options = {}) {
 			method: "oauth",
 			already_logged_in: alreadyLoggedIn
 		});
+		host.accountMemoryRuntime?.retryPending().catch(() => {});
 		if (alreadyLoggedIn) host.showStatus(uiText("auth.login.already"));
 		return "authenticated";
 	} catch (error) {
@@ -505109,11 +505772,16 @@ async function handleLogoutCommand(host) {
 	const currentProvider = host.state.appState.availableModels[currentModel]?.provider;
 	const target = await promptLogoutProviderSelection(host, options, currentProvider);
 	if (target === void 0) return;
+	const memoryRetractionPending = await host.accountMemoryRuntime?.flushRetractionsBeforeLogout() ?? false;
 	showAuthWarnings(host, (await host.harness.auth.logout(DEFAULT_OAUTH_PROVIDER_NAME)).warnings);
 	await host.authFlow.refreshConfigAfterLogout({ clearCustomerAccount: true });
 	await host.authFlow.clearActiveSessionAfterLogout({ clearCustomerAccount: true });
 	host.track("logout", { provider: target });
 	host.showStatus(uiText("auth.logout.complete", { provider: PRODUCT_NAME }));
+	if (memoryRetractionPending) {
+		const key = hasManagedApiKey ? "auth.warning.memoryRetractionApiKeyPending" : "auth.warning.memoryRetractionOAuthPending";
+		host.showStatus(uiText(key), "warning");
+	}
 }
 function showAuthWarnings(host, warnings) {
 	if (warnings?.some((warning) => warning.code === "remote_revoke_failed") === true) host.showStatus(uiText("auth.warning.remoteRevokeFailed"), "warning");
@@ -505477,11 +506145,15 @@ async function showContextReport(host, detailed) {
 	const sources = detailed !== "map" && request?.systemPromptContributions?.version === 1 ? request.systemPromptContributions : void 0;
 	const instructionSources = detailed === true && sources?.instructionSources?.version === 1 ? sources.instructionSources : void 0;
 	const skillSources = detailed === true && sources?.skillListingSources?.version === 1 ? sources.skillListingSources : void 0;
-	const files = instructionSources?.files.map((file) => ({
+	const files = instructionSources === void 0 ? void 0 : [...instructionSources.files.map((file) => ({
 		path: diagnosticLabel(file.path),
 		bytes: validTextSize(file.bytes),
 		sourceTextBytes: validTextSize(file.sourceTextBytes)
-	}));
+	})), ...(instructionSources.notLoadedCandidates ?? []).map((path) => ({
+		path: diagnosticLabel(path),
+		bytes: 0,
+		sourceTextBytes: void 0
+	}))];
 	const memorySource = detailed === true ? sources?.runtimeMemorySource : void 0;
 	const origins = detailed === true && request?.historyTextOrigins?.version === 1 && request.historyTextOrigins.unit === "utf8-text" ? request.historyTextOrigins : void 0;
 	const lastRequest = request === void 0 ? void 0 : {
@@ -505541,6 +506213,11 @@ async function showContextReport(host, detailed) {
 			name: tool.name === void 0 ? void 0 : diagnosticLabel(tool.name),
 			bytes: validTextSize(tool.bytes)
 		})) : void 0,
+		toolResults: detailed === true ? breakdown?.toolResultByTool?.map((tool) => ({
+			name: tool.name === void 0 ? void 0 : diagnosticLabel(tool.name),
+			count: validTextSize(tool.count),
+			bytes: validTextSize(tool.bytes)
+		})) : void 0,
 		toolArrayOverheadBytes: validTextSize(breakdown?.toolArrayOverheadBytes),
 		historyOrigins: origins === void 0 ? void 0 : {
 			totalBytes: validTextSize(origins.totalBytes),
@@ -505608,6 +506285,15 @@ async function showContextReport(host, detailed) {
 					if (lastRequest.tools.length > 20) lines.push(`... (+${String(lastRequest.tools.length - 20)})`);
 					lines.push(row("context.otherPart", lastRequest.toolArrayOverheadBytes));
 				}
+				if (lastRequest.toolResults !== void 0) {
+					lines.push("", currentTheme.boldFg("primary", uiText("context.toolResultsPart")));
+					for (const tool of lastRequest.toolResults.toSorted((a, b) => (b.bytes ?? -1) - (a.bytes ?? -1)).slice(0, 20)) {
+						const count = tool.count === void 0 ? "?" : formatExactTokenCount(tool.count, getCurrentUiLocale());
+						const size = tool.bytes === void 0 ? uiText("context.unavailable") : formatExactTokenCount(tool.bytes, getCurrentUiLocale());
+						lines.push(`${tool.name ?? "?"} (${count}): ${size}`);
+					}
+					if (lastRequest.toolResults.length > 20) lines.push(`... (+${String(lastRequest.toolResults.length - 20)})`);
+				}
 				lines.push("", currentTheme.boldFg("primary", uiText("context.promptTextBytes")), currentTheme.fg("textDim", uiText("context.sourceNote")), row("context.instructionPart", lastRequest.sources[0]), row("context.skillListingPart", lastRequest.sources[1]), row("context.runtimeMemoryPart", lastRequest.sources[2]), row("context.templatePart", lastRequest.sources[3]), row("context.totalPart", lastRequest.sources[4]), "", currentTheme.boldFg("primary", uiText("context.sourceFilesPart")), row("context.generatedPart", lastRequest.sources[5]));
 				if (lastRequest.files === void 0) lines.push(uiText("context.unavailable"));
 				else {
@@ -505994,7 +506680,7 @@ var ChannelCommandController = class {
 function requireValid(condition) {
 	if (!condition) throw new Error("Invalid Telegram session queue state or transition");
 }
-function isRecord$6(value) {
+function isRecord$9(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isId(value) {
@@ -506004,7 +506690,7 @@ function isOffset(value) {
 	return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
 }
 function readSpan(value) {
-	requireValid(isRecord$6(value));
+	requireValid(isRecord$9(value));
 	const { start, end } = value;
 	requireValid(isOffset(start) && isOffset(end) && start < end);
 	return {
@@ -506017,7 +506703,7 @@ function ownsRange(state, sessionId, span) {
 }
 /** Reject incompatible or corrupt state; never silently fall back to the profile cursor. */
 function parseSessionQueue(value) {
-	requireValid(isRecord$6(value));
+	requireValid(isRecord$9(value));
 	const { version, fileId, frontier, activeSessionId, sessions, spans, acknowledged } = value;
 	requireValid(version === 1 && isId(fileId) && isOffset(frontier) && isId(activeSessionId));
 	requireValid(Array.isArray(sessions) && sessions.every(isId));
@@ -506026,7 +506712,7 @@ function parseSessionQueue(value) {
 	requireValid(Array.isArray(spans) && Array.isArray(acknowledged));
 	const owned = spans.map((raw) => {
 		const span = readSpan(raw);
-		requireValid(isRecord$6(raw));
+		requireValid(isRecord$9(raw));
 		const sessionId = raw["sessionId"];
 		requireValid(sessionId === null || isId(sessionId) && known.has(sessionId));
 		return {
@@ -508517,14 +509203,14 @@ function findGoalIndex(file, goalId) {
 	return index;
 }
 function isGoalQueueFile(value) {
-	if (!isRecord$5(value)) return false;
+	if (!isRecord$8(value)) return false;
 	return value["version"] === GOAL_QUEUE_VERSION && Array.isArray(value["goals"]) && value["goals"].every(isUpcomingGoal);
 }
 function isUpcomingGoal(value) {
-	if (!isRecord$5(value)) return false;
+	if (!isRecord$8(value)) return false;
 	return isNonEmptyString(value["id"]) && isNonEmptyString(value["objective"]) && isNonEmptyString(value["createdAt"]) && isNonEmptyString(value["updatedAt"]);
 }
-function isRecord$5(value) {
+function isRecord$8(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isNonEmptyString(value) {
@@ -508537,7 +509223,7 @@ function timestampAfter(previous) {
 	return now.toISOString();
 }
 function isErrno(error, code) {
-	return isRecord$5(error) && error["code"] === code;
+	return isRecord$8(error) && error["code"] === code;
 }
 function describeError(error) {
 	return error instanceof Error ? error.message : String(error);
@@ -512178,7 +512864,8 @@ async function handleMemoryCommand(host, args, dependencies) {
 			const enabled = parsed.action === "on";
 			await setLocalToolEventRecordingEnabled(host.harness.homeDir, enabled);
 			host.setLocalToolEventRecordingEnabled?.(enabled);
-			await host.refreshPersonalMemory?.(false);
+			if (host.refreshLocalToolSearch !== void 0) await host.refreshLocalToolSearch();
+			else await host.refreshPersonalMemory?.(false);
 		}
 		host.showStatus(`/memory tools ${localToolEventRecordingEnabled(host.harness.homeDir) ? "enabled" : "disabled"}`);
 		return;
@@ -513307,148 +513994,6 @@ function isAbortError$1(error) {
 	return isAbortMessage(String(error));
 }
 //#endregion
-//#region src/tui/utils/export-markdown.copy.ts
-registerUiCatalogFragment({
-	en: {
-		"export.thinking": "Thinking",
-		"export.image": "image",
-		"export.audio": "audio",
-		"export.video": "video",
-		"export.toolCall": "Tool Call: {name}",
-		"export.toolResult": "Tool Result: {name}",
-		"export.turn": "Turn {number}",
-		"export.user": "User",
-		"export.assistant": "Assistant",
-		"export.system": "System",
-		"export.unknownTool": "unknown",
-		"export.overview": "Overview",
-		"export.topic": "Topic",
-		"export.labelSeparator": ":",
-		"export.empty": "empty",
-		"export.conversation": "Conversation",
-		"export.turnCount.one": "{count} turn",
-		"export.turnCount.other": "{count} turns",
-		"export.toolCallCount.one": "{count} tool call",
-		"export.toolCallCount.other": "{count} tool calls",
-		"export.title": "King Session Export"
-	},
-	de: {
-		"export.thinking": "Denken",
-		"export.image": "Bild",
-		"export.audio": "Audio",
-		"export.video": "Video",
-		"export.toolCall": "Werkzeugaufruf: {name}",
-		"export.toolResult": "Werkzeugergebnis: {name}",
-		"export.turn": "Durchlauf {number}",
-		"export.user": "Benutzer",
-		"export.assistant": "Assistent",
-		"export.system": "System",
-		"export.unknownTool": "unbekannt",
-		"export.overview": "Übersicht",
-		"export.topic": "Thema",
-		"export.labelSeparator": ":",
-		"export.empty": "leer",
-		"export.conversation": "Gespräch",
-		"export.turnCount.one": "{count} Durchlauf",
-		"export.turnCount.other": "{count} Durchläufe",
-		"export.toolCallCount.one": "{count} Werkzeugaufruf",
-		"export.toolCallCount.other": "{count} Werkzeugaufrufe",
-		"export.title": "King-Sitzungsexport"
-	},
-	es: {
-		"export.thinking": "Razonamiento",
-		"export.image": "imagen",
-		"export.audio": "audio",
-		"export.video": "vídeo",
-		"export.toolCall": "Llamada a herramienta: {name}",
-		"export.toolResult": "Resultado de la herramienta: {name}",
-		"export.turn": "Turno {number}",
-		"export.user": "Usuario",
-		"export.assistant": "Asistente",
-		"export.system": "Sistema",
-		"export.unknownTool": "desconocida",
-		"export.overview": "Resumen",
-		"export.topic": "Tema",
-		"export.labelSeparator": ":",
-		"export.empty": "vacío",
-		"export.conversation": "Conversación",
-		"export.turnCount.one": "{count} turno",
-		"export.turnCount.other": "{count} turnos",
-		"export.toolCallCount.one": "{count} llamada a herramienta",
-		"export.toolCallCount.other": "{count} llamadas a herramientas",
-		"export.title": "Exportación de la sesión de King"
-	},
-	fr: {
-		"export.thinking": "Réflexion",
-		"export.image": "image",
-		"export.audio": "audio",
-		"export.video": "vidéo",
-		"export.toolCall": "Appel d’outil\xA0: {name}",
-		"export.toolResult": "Résultat de l’outil\xA0: {name}",
-		"export.turn": "Tour {number}",
-		"export.user": "Utilisateur",
-		"export.assistant": "Assistant",
-		"export.system": "Système",
-		"export.unknownTool": "inconnu",
-		"export.overview": "Vue d’ensemble",
-		"export.topic": "Sujet",
-		"export.labelSeparator": "\xA0:",
-		"export.empty": "vide",
-		"export.conversation": "Conversation",
-		"export.turnCount.one": "{count} tour",
-		"export.turnCount.other": "{count} tours",
-		"export.toolCallCount.one": "{count} appel d’outil",
-		"export.toolCallCount.other": "{count} appels d’outil",
-		"export.title": "Export de la session King"
-	},
-	sv: {
-		"export.thinking": "Resonemang",
-		"export.image": "bild",
-		"export.audio": "ljud",
-		"export.video": "video",
-		"export.toolCall": "Verktygsanrop: {name}",
-		"export.toolResult": "Verktygsresultat: {name}",
-		"export.turn": "Omgång {number}",
-		"export.user": "Användare",
-		"export.assistant": "Assistent",
-		"export.system": "System",
-		"export.unknownTool": "okänt",
-		"export.overview": "Översikt",
-		"export.topic": "Ämne",
-		"export.labelSeparator": ":",
-		"export.empty": "tomt",
-		"export.conversation": "Konversation",
-		"export.turnCount.one": "{count} omgång",
-		"export.turnCount.other": "{count} omgångar",
-		"export.toolCallCount.one": "{count} verktygsanrop",
-		"export.toolCallCount.other": "{count} verktygsanrop",
-		"export.title": "Export av King-session"
-	},
-	cs: {
-		"export.thinking": "Uvažování",
-		"export.image": "obrázek",
-		"export.audio": "zvuk",
-		"export.video": "video",
-		"export.toolCall": "Volání nástroje: {name}",
-		"export.toolResult": "Výsledek nástroje: {name}",
-		"export.turn": "Kolo {number}",
-		"export.user": "Uživatel",
-		"export.assistant": "Asistent",
-		"export.system": "Systém",
-		"export.unknownTool": "neznámý",
-		"export.overview": "Přehled",
-		"export.topic": "Téma",
-		"export.labelSeparator": ":",
-		"export.empty": "prázdné",
-		"export.conversation": "Konverzace",
-		"export.turnCount.one": "Kola: {count}",
-		"export.turnCount.other": "Kola: {count}",
-		"export.toolCallCount.one": "{count} volání nástroje",
-		"export.toolCallCount.other": "{count} volání nástrojů",
-		"export.title": "Export relace King"
-	}
-});
-//#endregion
 //#region src/tui/utils/export-markdown.ts
 const HINT_KEYS = [
 	"path",
@@ -520453,10 +520998,10 @@ function parseGoalValue(output) {
 	} catch {
 		return;
 	}
-	if (!isRecord$4(parsed) || !("goal" in parsed)) return void 0;
+	if (!isRecord$7(parsed) || !("goal" in parsed)) return void 0;
 	const goal = parsed["goal"];
 	if (goal === null) return null;
-	if (!isRecord$4(goal)) return void 0;
+	if (!isRecord$7(goal)) return void 0;
 	return goal;
 }
 function formatGoalStats(goal) {
@@ -520478,7 +521023,7 @@ function stringArg(args, key) {
 	const value = args[key];
 	return typeof value === "string" && value.length > 0 ? value : void 0;
 }
-function isRecord$4(value) {
+function isRecord$7(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function stringField$1(record, key) {
@@ -524530,10 +525075,10 @@ var CustomerMistakeBrokerError = class extends Error {
 	}
 };
 function parseMistakeConsent(payload) {
-	if (!isRecord$3(payload)) return void 0;
-	const settings = (isRecord$3(payload["data"]) ? payload["data"] : payload)["settings"];
-	const dataControls = isRecord$3(settings) ? settings["data_controls"] : void 0;
-	if (!isRecord$3(dataControls)) return void 0;
+	if (!isRecord$6(payload)) return void 0;
+	const settings = (isRecord$6(payload["data"]) ? payload["data"] : payload)["settings"];
+	const dataControls = isRecord$6(settings) ? settings["data_controls"] : void 0;
+	if (!isRecord$6(dataControls)) return void 0;
 	const asked = dataControls["mistake_consent_asked"];
 	const allowed = dataControls["allow_mistake"];
 	if (typeof asked !== "boolean" || typeof allowed !== "boolean") return void 0;
@@ -524647,7 +525192,7 @@ function normalizeBaseUrl(value) {
 	if (url.protocol !== "https:" || url.username.length > 0 || url.password.length > 0 || url.search.length > 0 || url.hash.length > 0 || url.pathname !== "/" && url.pathname !== "") throw new CustomerMistakeBrokerError("INVALID_PAYLOAD");
 	return url.origin;
 }
-function isRecord$3(value) {
+function isRecord$6(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -524739,6 +525284,902 @@ var CustomerMistakeHostController = class {
 	}
 };
 //#endregion
+//#region src/personal-memory/account-memory-broker.ts
+const MAX_CAPTURE_BYTES = 1e6;
+const UUID_V4$1 = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu;
+var AccountMemoryBroker = class {
+	client;
+	constructor(client) {
+		this.client = client;
+	}
+	async workspace(sessionId) {
+		if (sessionId !== void 0 && (!sessionId.trim() || sessionId.length > 200)) invalid();
+		const path = sessionId === void 0 ? "/api/memory/workspace" : `/api/memory/workspace?source=tui&sessionId=${encodeURIComponent(sessionId)}`;
+		const value = await this.client.request("GET", path);
+		if (!isRecord$5(value) || typeof value["workspaceId"] !== "string" || !/^blun-[0-9a-f]{64}$/iu.test(value["workspaceId"]) || !generation(value["forgetGeneration"]) || sessionId !== void 0 && !generation(value["sessionEpoch"]) || value["forgetCutoff"] !== null && !isoTime$1(value["forgetCutoff"])) invalid();
+		return {
+			workspaceId: value["workspaceId"],
+			forgetGeneration: value["forgetGeneration"],
+			forgetCutoff: value["forgetCutoff"],
+			sessionEpoch: sessionId === void 0 ? null : value["sessionEpoch"]
+		};
+	}
+	async capture(input) {
+		if (!UUID_V4$1.test(input.captureId) || !input.sessionId.trim() || !generation(input.forgetGeneration) || input.sessionEpoch !== null && !generation(input.sessionEpoch) || input.messages.length === 0 || input.messages.length > 200 || input.messages.some((message) => !messageId$1(message.id) || !["user", "assistant"].includes(message.role) || !message.content.trim() || !isoTime$1(message.at))) invalid();
+		if (new Set(input.messages.map((message) => message.id)).size !== input.messages.length) invalid();
+		const body = {
+			captureId: input.captureId,
+			source: "tui",
+			sessionId: input.sessionId,
+			forgetGeneration: input.forgetGeneration,
+			sessionEpoch: input.sessionEpoch,
+			messages: input.messages.map((message) => ({
+				id: message.id,
+				role: message.role,
+				content: message.content,
+				at: message.at
+			}))
+		};
+		if (Buffer.byteLength(JSON.stringify(body), "utf8") > MAX_CAPTURE_BYTES) invalid();
+		const value = await this.client.request("POST", "/api/memory/capture", body);
+		if (isRecord$5(value) && value["accepted"] === 0 && value["reason"] === "memory_disabled") return {
+			accepted: 0,
+			reason: "memory_disabled"
+		};
+		if (isRecord$5(value) && value["accepted"] === 0 && value["reason"] === "session_retracted" && generation(value["skipped"]) && generation(value["sessionEpoch"])) return {
+			accepted: 0,
+			skipped: value["skipped"],
+			reason: "session_retracted",
+			sessionEpoch: value["sessionEpoch"]
+		};
+		if (!isRecord$5(value) || !generation(value["accepted"]) || !generation(value["skipped"]) || typeof value["duplicate"] !== "boolean" || !generation(value["forgetGeneration"]) || !generation(value["sessionEpoch"])) invalid();
+		return {
+			accepted: value["accepted"],
+			skipped: value["skipped"],
+			duplicate: value["duplicate"],
+			forgetGeneration: value["forgetGeneration"],
+			sessionEpoch: value["sessionEpoch"]
+		};
+	}
+	async retract(input) {
+		if (!UUID_V4$1.test(input.retractId) || !input.sessionId.trim() || input.sessionId.length > 200 || "wholeSession" in input && input.expectedEpoch !== null && !generation(input.expectedEpoch)) invalid();
+		const body = "wholeSession" in input ? {
+			retractId: input.retractId,
+			source: "tui",
+			sessionId: input.sessionId,
+			wholeSession: true,
+			expectedEpoch: input.expectedEpoch
+		} : {
+			retractId: input.retractId,
+			source: "tui",
+			sessionId: input.sessionId,
+			messageIds: input.messageIds
+		};
+		if (!("wholeSession" in input) && (input.messageIds.length === 0 || input.messageIds.length > 200 || input.messageIds.some((id) => !messageId$1(id)) || new Set(input.messageIds).size !== input.messageIds.length)) invalid();
+		const value = await this.client.request("POST", "/api/memory/retract", body);
+		if ("wholeSession" in input && isRecord$5(value) && value["retracted"] === 0 && value["rederive"] === false && value["reason"] === "already_retracted" && generation(value["sessionEpoch"]) && input.expectedEpoch !== null && value["sessionEpoch"] >= input.expectedEpoch) return {
+			retracted: 0,
+			rederive: false,
+			reason: "already_retracted",
+			sessionEpoch: value["sessionEpoch"]
+		};
+		if (!isRecord$5(value) || !generation(value["retracted"]) || value["rederive"] !== "queued" || "wholeSession" in input && !generation(value["sessionEpoch"]) || value["sessionEpoch"] !== void 0 && !generation(value["sessionEpoch"])) invalid();
+		return {
+			retracted: value["retracted"],
+			rederive: "queued",
+			...value["sessionEpoch"] === void 0 ? {} : { sessionEpoch: value["sessionEpoch"] }
+		};
+	}
+	async recall(query, limit = 8, sources) {
+		const body = queryBody(query, limit, sources);
+		const value = await this.client.request("POST", "/api/memory/recall", body);
+		if (!isRecord$5(value) || !isRecord$5(value["profile"]) || !Array.isArray(value["items"]) || !generation(value["forgetGeneration"])) invalid();
+		const profile = value["profile"];
+		if (!Array.isArray(profile["card"]) || profile["card"].length > 20 || !profile["card"].every((item) => typeof item === "string" && item.length <= 1e3) || typeof profile["representation"] !== "string" || profile["representation"].length > 4e3) invalid();
+		return {
+			profile: {
+				card: profile["card"],
+				representation: profile["representation"]
+			},
+			items: parseItems(value["items"]),
+			forgetGeneration: value["forgetGeneration"]
+		};
+	}
+	async search(query, options = {}) {
+		const body = queryBody(query, options.limit ?? 20, options.sources);
+		if (options.after !== void 0 && !isoTime$1(options.after) || options.before !== void 0 && !isoTime$1(options.before)) invalid();
+		const value = await this.client.request("POST", "/api/memory/search", {
+			...body,
+			...options.after === void 0 ? {} : { after: options.after },
+			...options.before === void 0 ? {} : { before: options.before }
+		});
+		if (!isRecord$5(value) || !Array.isArray(value["items"]) || !generation(value["forgetGeneration"])) invalid();
+		return {
+			items: parseItems(value["items"]),
+			forgetGeneration: value["forgetGeneration"]
+		};
+	}
+};
+function queryBody(query, limit, sources) {
+	if (!query.trim() || query.length > 1e3 || !Number.isInteger(limit) || limit < 1 || limit > 20 || sources !== void 0 && (!Array.isArray(sources) || sources.some((source) => !/^(?:chat|tui|plugin:[a-z0-9_-]+)$/iu.test(source)))) invalid();
+	return {
+		query,
+		limit,
+		...sources === void 0 ? {} : { sources }
+	};
+}
+function parseItems(value) {
+	if (value.length > 20) invalid();
+	return value.map((item) => {
+		if (!isRecord$5(item) || typeof item["id"] !== "string" || item["id"].length > 200 || typeof item["text"] !== "string" || item["text"].length > 2e3 || typeof item["source"] !== "string" || !/^(?:chat|tui|plugin:[a-z0-9_-]+)$/iu.test(item["source"]) || typeof item["sessionId"] !== "string" || item["sessionId"].length > 200 || !isoTime$1(item["at"]) || typeof item["score"] !== "number" || !Number.isFinite(item["score"]) || item["role"] !== void 0 && item["role"] !== "user" && item["role"] !== "assistant") invalid();
+		return item;
+	});
+}
+function generation(value) {
+	return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
+}
+function messageId$1(value) {
+	return typeof value === "string" && value.length > 0 && value.length <= 200 && /^[a-z0-9][a-z0-9._:-]*$/iu.test(value);
+}
+function isoTime$1(value) {
+	return typeof value === "string" && Number.isFinite(Date.parse(value)) && /(?:Z|[+-]\d\d:\d\d)$/u.test(value);
+}
+function isRecord$5(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function invalid() {
+	throw new PersonalMemoryBrokerError("INVALID_PAYLOAD");
+}
+//#endregion
+//#region src/personal-memory/honcho-capture-source.ts
+const SECRET_PATTERN = /\b(?:password|passwort|api[-_ ]?key|secret|bearer|credential|cvv|cvc|iban)\b|sk-[a-z0-9_-]{20,}|ghp_[a-z0-9]{20,}|\b(?:\d[ -]?){13,19}\b/iu;
+const GROUP_MARKER = /^\[tg\s+(?:group|supergroup)\b/im;
+const MAX_WIRE_RECORD_CHARS = 4 * 1024 * 1024;
+async function readCompletedHonchoTurn(homeDir, session, turnId) {
+	const sessionsRoot = await realpath(path.join(homeDir, "sessions"));
+	const sessionDir = await realpath(session.sessionDir);
+	if (path.basename(sessionDir) !== session.id || !isInside(sessionsRoot, sessionDir)) throw new Error("Honcho session path is outside this profile.");
+	const canonicalWire = await realpath(path.join(sessionDir, "agents", "main", "wire.jsonl"));
+	if (!isInside(sessionDir, canonicalWire)) throw new Error("Honcho Wire path escapes the session.");
+	const wireStat = await stat(canonicalWire);
+	if (!wireStat.isFile() || wireStat.size === 0) return void 0;
+	const scanner = createTurnScanner(turnId);
+	for await (const line of boundedLines(canonicalWire, wireStat.size)) scanner.accept(JSON.parse(line));
+	return scanner.finish();
+}
+function createTurnScanner(completedTurnId) {
+	let latestUserText;
+	let latestUserTime;
+	let userText;
+	let occurredAt;
+	let assistantText = "";
+	let finalStepEnded = false;
+	const targetTurnId = String(completedTurnId);
+	const accept = (raw) => {
+		if (!isRecord$4(raw)) return;
+		if (raw["type"] === "turn.prompt") {
+			const origin = raw["origin"];
+			const input = raw["input"];
+			const text = isRecord$4(origin) && origin["kind"] === "user" && Array.isArray(input) && input.every((part) => isRecord$4(part) && part["type"] === "text") ? textParts(input) : void 0;
+			latestUserText = text && !GROUP_MARKER.test(text) && !SECRET_PATTERN.test(text) ? text : void 0;
+			latestUserTime = latestUserText === void 0 ? void 0 : isoTime(raw["time"]);
+			return;
+		}
+		if (raw["type"] !== "context.append_loop_event" || !isRecord$4(raw["event"])) return;
+		const event = raw["event"];
+		if (event["type"] === "step.begin" && event["turnId"] === targetTurnId) {
+			userText ??= latestUserText;
+			occurredAt ??= latestUserTime;
+			assistantText = "";
+			finalStepEnded = false;
+			return;
+		}
+		if (event["type"] === "content.part" && event["turnId"] === targetTurnId && userText !== void 0 && isRecord$4(event["part"]) && event["part"]["type"] === "text" && typeof event["part"]["text"] === "string") {
+			assistantText += event["part"]["text"];
+			return;
+		}
+		if (event["type"] === "step.end" && event["turnId"] === targetTurnId) finalStepEnded = event["finishReason"] === "end_turn";
+	};
+	return {
+		accept,
+		finish: () => {
+			const answer = assistantText.trim();
+			return finalStepEnded && userText !== void 0 && occurredAt !== void 0 && answer.length > 0 && !SECRET_PATTERN.test(answer) ? {
+				userText,
+				assistantText: answer,
+				occurredAt
+			} : void 0;
+		}
+	};
+}
+function isoTime(value) {
+	if (typeof value !== "string") return void 0;
+	const timestamp = Date.parse(value);
+	return Number.isFinite(timestamp) && new Date(timestamp).toISOString() === value ? value : void 0;
+}
+function textParts(parts) {
+	return parts.filter((part) => isRecord$4(part) && part["type"] === "text" && typeof part["text"] === "string").map((part) => part.text).join("\n").trim() || void 0;
+}
+function isRecord$4(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isInside(root, candidate) {
+	const relative = path.relative(root, candidate);
+	return relative !== "" && relative !== ".." && !relative.startsWith(`..${path.sep}`) && !path.isAbsolute(relative);
+}
+async function* boundedLines(wirePath, size) {
+	const stream = createReadStream(wirePath, {
+		encoding: "utf8",
+		end: size - 1
+	});
+	let pending = "";
+	try {
+		for await (const chunk of stream) {
+			let offset = 0;
+			while (offset < chunk.length) {
+				const newline = chunk.indexOf("\n", offset);
+				const end = newline < 0 ? chunk.length : newline;
+				pending += chunk.slice(offset, end);
+				if (pending.length > MAX_WIRE_RECORD_CHARS) throw new Error("Honcho Wire record is too large.");
+				if (newline < 0) break;
+				if (pending.length > 0) yield pending.replace(/\r$/u, "");
+				pending = "";
+				offset = newline + 1;
+			}
+		}
+	} finally {
+		stream.destroy();
+	}
+}
+//#endregion
+//#region src/personal-memory/account-memory-capture.ts
+const MAX_PENDING = 2e3;
+const MAX_COMPLETED = 1e4;
+const MAX_RETRACTIONS = 2e3;
+const UUID_V4 = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu;
+var AccountMemoryCaptureQueue = class {
+	homeDir;
+	broker;
+	readTurn;
+	workspaceCache;
+	work = Promise.resolve();
+	constructor(homeDir, broker, readTurn = readCompletedHonchoTurn, workspaceCache) {
+		this.homeDir = homeDir;
+		this.broker = broker;
+		this.readTurn = readTurn;
+		this.workspaceCache = workspaceCache;
+	}
+	captureCompletedTurn(session, turnId) {
+		return this.serial(async () => {
+			if (!Number.isSafeInteger(turnId) || turnId < 0) return "unavailable";
+			let state;
+			try {
+				state = await this.readSessionState(session.id);
+				if (turnId <= state.blockedThroughTurnId) return "skipped";
+				if (turnId > state.highestObservedTurnId) {
+					state = {
+						...state,
+						highestObservedTurnId: turnId
+					};
+					await this.writeSessionState(state);
+				}
+			} catch {
+				return "unavailable";
+			}
+			let workspace;
+			let turn;
+			try {
+				workspace = await this.broker.workspace(session.id);
+				turn = await this.readTurn(this.homeDir, session, turnId);
+			} catch {
+				return "unavailable";
+			}
+			if (state.workspaceId !== null && state.workspaceId !== workspace.workspaceId) return "unavailable";
+			if (state.workspaceId === null || state.sessionEpoch !== workspace.sessionEpoch) try {
+				await this.writeSessionState({
+					...state,
+					workspaceId: workspace.workspaceId,
+					sessionEpoch: workspace.sessionEpoch
+				});
+			} catch {
+				return "unavailable";
+			}
+			if (this.workspaceCache !== void 0) try {
+				if (!await this.workspaceCache.set(workspace.workspaceId)) return "unavailable";
+			} catch {
+				return "unavailable";
+			}
+			if (turn === void 0 || beforeCutoff(turn.occurredAt, workspace.forgetCutoff)) return "skipped";
+			const journalPath = this.journalPath(workspace.workspaceId);
+			let journal;
+			try {
+				journal = await this.readJournal(journalPath, workspace.workspaceId);
+			} catch {
+				return "unavailable";
+			}
+			if (journal.suppressedTurns.includes(turnKey(session.id, turnId))) return "skipped";
+			if (journal.known.some((entry) => entry.sessionId === session.id && entry.turnId === turnId)) return "skipped";
+			const revision = journal.revisions[turnKey(session.id, turnId)] ?? 0;
+			const messageIds = turnMessageIds(session.id, turnId, turn, revision);
+			const key = captureKey(session.id, turnId, turn.occurredAt, messageIds);
+			if (journal.completed.includes(key)) return "skipped";
+			const old = journal.pending.find((entry) => entry.sessionId === session.id && entry.turnId === turnId);
+			if (old !== void 0 && (old.occurredAt !== turn.occurredAt || old.messageIds.some((id, index) => id !== messageIds[index]))) return "skipped";
+			if (old === void 0) {
+				if (journal.pending.length >= MAX_PENDING) return "unavailable";
+				journal = {
+					...journal,
+					pending: [...journal.pending, {
+						captureId: randomUUID(),
+						sessionId: session.id,
+						sessionDir: session.sessionDir,
+						turnId,
+						occurredAt: turn.occurredAt,
+						messageIds,
+						sessionEpoch: workspace.sessionEpoch,
+						awaitingSessionRetract: journal.retractions.some((entry) => entry.sessionId === session.id && "wholeSession" in entry)
+					}]
+				};
+				try {
+					await this.writeJournal(journalPath, journal);
+				} catch {
+					return "unavailable";
+				}
+			}
+			if (!await this.flushRetractions(journalPath, journal)) return "queued";
+			journal = await this.readJournal(journalPath, workspace.workspaceId);
+			return this.flushJournal(journalPath, journal, workspace, {
+				sessionId: session.id,
+				turnId,
+				turn
+			});
+		});
+	}
+	retryPending() {
+		return this.serial(async () => {
+			try {
+				const workspace = await this.broker.workspace();
+				const journalPath = this.journalPath(workspace.workspaceId);
+				let journal = await this.readJournal(journalPath, workspace.workspaceId);
+				if (!await this.flushRetractions(journalPath, journal)) return "queued";
+				journal = await this.readJournal(journalPath, workspace.workspaceId);
+				return await this.flushJournal(journalPath, journal, workspace);
+			} catch {
+				return "unavailable";
+			}
+		});
+	}
+	retryRetractions() {
+		return this.serial(async () => {
+			try {
+				const workspace = await this.broker.workspace();
+				const journalPath = this.journalPath(workspace.workspaceId);
+				const journal = await this.readJournal(journalPath, workspace.workspaceId);
+				if (journal.retractions.length === 0) return "skipped";
+				return await this.flushRetractions(journalPath, journal) ? "retracted" : "queued";
+			} catch {
+				return "unavailable";
+			}
+		});
+	}
+	flushRetractionsBeforeLogout() {
+		return this.serial(async () => {
+			try {
+				const cachedWorkspaceId = await this.workspaceCache?.get();
+				if (cachedWorkspaceId === void 0) return false;
+				const journalPath = this.journalPath(cachedWorkspaceId);
+				const journal = await this.readJournal(journalPath, cachedWorkspaceId);
+				if (journal.retractions.length === 0) return false;
+				if ((await this.broker.workspace()).workspaceId !== cachedWorkspaceId) return true;
+				return !await this.flushRetractions(journalPath, journal);
+			} catch {
+				return true;
+			}
+		});
+	}
+	retractTurn(sessionId, turnId) {
+		return this.serial(async () => {
+			try {
+				const workspace = await this.broker.workspace();
+				const journalPath = this.journalPath(workspace.workspaceId);
+				const journal = await this.readJournal(journalPath, workspace.workspaceId);
+				const matching = [...journal.pending, ...journal.known].filter((entry) => entry.sessionId === sessionId && entry.turnId === turnId);
+				const messageIds = [...new Set(matching.flatMap((entry) => entry.messageIds))];
+				if (messageIds.length === 0) return "skipped";
+				if (journal.retractions.length >= MAX_RETRACTIONS) return "unavailable";
+				const next = {
+					...journal,
+					pending: journal.pending.filter((entry) => entry.sessionId !== sessionId || entry.turnId !== turnId),
+					known: journal.known.filter((entry) => entry.sessionId !== sessionId || entry.turnId !== turnId),
+					retractions: [...journal.retractions, {
+						retractId: randomUUID(),
+						sessionId,
+						messageIds
+					}],
+					revisions: {
+						...journal.revisions,
+						[turnKey(sessionId, turnId)]: (journal.revisions[turnKey(sessionId, turnId)] ?? 0) + 1
+					}
+				};
+				await this.writeJournal(journalPath, next);
+				return await this.flushRetractions(journalPath, next) ? "retracted" : "queued";
+			} catch {
+				return "unavailable";
+			}
+		});
+	}
+	retractSession(sessionId, throughTurnId) {
+		return this.serial(async () => {
+			if (throughTurnId !== void 0 && (!Number.isSafeInteger(throughTurnId) || throughTurnId < 0)) return "unavailable";
+			let state;
+			try {
+				state = await this.readSessionState(sessionId);
+			} catch {
+				return "unavailable";
+			}
+			let workspace;
+			try {
+				workspace = await this.broker.workspace(sessionId);
+			} catch {
+				if (state.workspaceId !== null) {
+					let cachedWorkspaceId;
+					try {
+						cachedWorkspaceId = await this.workspaceCache?.get();
+					} catch {
+						return "unavailable";
+					}
+					if (cachedWorkspaceId !== state.workspaceId) {
+						try {
+							await this.writeSessionState({
+								...state,
+								highestObservedTurnId: Math.max(state.highestObservedTurnId, throughTurnId ?? -1),
+								blockedThroughTurnId: Math.max(state.blockedThroughTurnId, state.highestObservedTurnId, throughTurnId ?? -1)
+							});
+						} catch {
+							return "unavailable";
+						}
+						return "unavailable";
+					}
+					return this.queueSessionRetraction(sessionId, state, cachedWorkspaceId, state.sessionEpoch, throughTurnId, false);
+				}
+				try {
+					await this.writeSessionState({
+						...state,
+						highestObservedTurnId: Math.max(state.highestObservedTurnId, throughTurnId ?? -1),
+						blockedThroughTurnId: Math.max(state.blockedThroughTurnId, state.highestObservedTurnId, throughTurnId ?? -1)
+					});
+					return "retracted";
+				} catch {
+					return "unavailable";
+				}
+			}
+			if (workspace.sessionEpoch === null) return "unavailable";
+			if (state.workspaceId !== null && state.workspaceId !== workspace.workspaceId) return "unavailable";
+			if (this.workspaceCache !== void 0) try {
+				if (!await this.workspaceCache.set(workspace.workspaceId)) return "unavailable";
+			} catch {
+				return "unavailable";
+			}
+			return this.queueSessionRetraction(sessionId, state, workspace.workspaceId, workspace.sessionEpoch, throughTurnId, true);
+		});
+	}
+	async queueSessionRetraction(sessionId, state, workspaceId, expectedEpoch, throughTurnId, sendNow) {
+		try {
+			const journalPath = this.journalPath(workspaceId);
+			const journal = await this.readJournal(journalPath, workspaceId);
+			if (journal.retractions.length >= MAX_RETRACTIONS) return "unavailable";
+			const next = {
+				...journal,
+				pending: journal.pending.filter((entry) => entry.sessionId !== sessionId),
+				known: journal.known.filter((entry) => entry.sessionId !== sessionId),
+				retractions: [...journal.retractions, {
+					retractId: randomUUID(),
+					sessionId,
+					wholeSession: true,
+					expectedEpoch
+				}],
+				suppressedTurns: [...new Set([...journal.suppressedTurns, ...[...journal.pending, ...journal.known].filter((entry) => entry.sessionId === sessionId).map((entry) => turnKey(entry.sessionId, entry.turnId))])].slice(-MAX_COMPLETED)
+			};
+			await this.writeJournal(journalPath, next);
+			await this.writeSessionState({
+				...state,
+				highestObservedTurnId: Math.max(state.highestObservedTurnId, throughTurnId ?? -1),
+				blockedThroughTurnId: Math.max(state.blockedThroughTurnId, state.highestObservedTurnId, throughTurnId ?? -1),
+				workspaceId,
+				sessionEpoch: expectedEpoch
+			});
+			return sendNow && await this.flushRetractions(journalPath, next) ? "retracted" : "queued";
+		} catch {
+			return "unavailable";
+		}
+	}
+	async flushRetractions(journalPath, journal) {
+		if (this.broker.retract === void 0) return journal.retractions.length === 0;
+		let current = journal;
+		for (const entry of journal.retractions) {
+			let response;
+			try {
+				response = await this.broker.retract(entry);
+			} catch {
+				return false;
+			}
+			if ("wholeSession" in entry && response.sessionEpoch !== void 0) try {
+				const state = await this.readSessionState(entry.sessionId);
+				await this.writeSessionState({
+					...state,
+					sessionEpoch: response.sessionEpoch
+				});
+			} catch {
+				return false;
+			}
+			current = {
+				...current,
+				retractions: current.retractions.filter((item) => item !== entry),
+				pending: "wholeSession" in entry && response.sessionEpoch !== void 0 ? response.rederive === false ? current.pending.filter((item) => item.sessionId !== entry.sessionId || !item.awaitingSessionRetract) : current.pending.map((item) => item.sessionId === entry.sessionId && item.awaitingSessionRetract ? {
+					...item,
+					sessionEpoch: response.sessionEpoch,
+					awaitingSessionRetract: false
+				} : item) : current.pending
+			};
+			await this.writeJournal(journalPath, current);
+		}
+		return true;
+	}
+	discardPending() {
+		return this.serial(async () => {
+			const directory = path.join(this.homeDir, "memory");
+			let names;
+			try {
+				names = await readdir(directory);
+			} catch (error) {
+				if (isMissing(error)) return;
+				throw error;
+			}
+			for (const name of names) {
+				if (!/^honcho-pending-[0-9a-f]{64}\.json$/u.test(name)) continue;
+				const journalPath = path.join(directory, name);
+				if (!(await lstat(journalPath)).isFile()) continue;
+				const value = JSON.parse(await readFile(journalPath, "utf8"));
+				if (!isRecord$3(value) || typeof value["workspaceId"] !== "string") continue;
+				const journal = await this.readJournal(journalPath, value["workspaceId"]);
+				if (journal.pending.length > 0) await this.writeJournal(journalPath, {
+					...journal,
+					pending: []
+				});
+			}
+		});
+	}
+	async flushJournal(journalPath, journal, workspace, fresh) {
+		if (journal.pending.length === 0) return "skipped";
+		let pending = [...journal.pending];
+		let completed = [...journal.completed];
+		let known = [...journal.known];
+		let result = "skipped";
+		for (const entry of journal.pending) {
+			if (entry.awaitingSessionRetract) return "queued";
+			const session = {
+				id: entry.sessionId,
+				sessionDir: entry.sessionDir
+			};
+			let turn;
+			try {
+				turn = fresh?.sessionId === entry.sessionId && fresh.turnId === entry.turnId ? fresh.turn : await this.readTurn(this.homeDir, session, entry.turnId);
+			} catch {
+				return "queued";
+			}
+			if (turn === void 0 || turn.occurredAt !== entry.occurredAt || beforeCutoff(entry.occurredAt, workspace.forgetCutoff)) {
+				pending = pending.filter((item) => item.captureId !== entry.captureId);
+				await this.writeJournal(journalPath, {
+					...journal,
+					pending,
+					completed,
+					known
+				});
+				continue;
+			}
+			const revision = journal.revisions[turnKey(entry.sessionId, entry.turnId)] ?? 0;
+			if (turnMessageIds(entry.sessionId, entry.turnId, turn, revision).some((id, index) => id !== entry.messageIds[index])) {
+				pending = pending.filter((item) => item.captureId !== entry.captureId);
+				await this.writeJournal(journalPath, {
+					...journal,
+					pending,
+					completed,
+					known
+				});
+				continue;
+			}
+			try {
+				const response = await this.broker.capture({
+					captureId: entry.captureId,
+					sessionId: entry.sessionId,
+					forgetGeneration: workspace.forgetGeneration,
+					sessionEpoch: entry.sessionEpoch,
+					messages: [{
+						id: entry.messageIds[0],
+						role: "user",
+						content: turn.userText,
+						at: turn.occurredAt
+					}, {
+						id: entry.messageIds[1],
+						role: "assistant",
+						content: turn.assistantText,
+						at: turn.occurredAt
+					}]
+				});
+				const key = captureKey(entry.sessionId, entry.turnId, entry.occurredAt, entry.messageIds);
+				if ("reason" in response && response.reason === "memory_disabled") {
+					completed = [...completed, key].slice(-MAX_COMPLETED);
+					await this.writeJournal(journalPath, {
+						...journal,
+						pending: [],
+						completed
+					});
+					return "skipped";
+				}
+				if ("reason" in response && response.reason === "session_retracted") {
+					pending = pending.filter((item) => item.sessionId !== entry.sessionId || item.sessionEpoch !== entry.sessionEpoch);
+					await this.writeJournal(journalPath, {
+						...journal,
+						pending,
+						completed,
+						known
+					});
+					return "skipped";
+				}
+				pending = pending.filter((item) => item.captureId !== entry.captureId);
+				completed = [...completed, key].slice(-MAX_COMPLETED);
+				known = [...known, {
+					key,
+					sessionId: entry.sessionId,
+					turnId: entry.turnId,
+					occurredAt: entry.occurredAt,
+					messageIds: entry.messageIds
+				}].slice(-MAX_COMPLETED);
+				await this.writeJournal(journalPath, {
+					...journal,
+					pending,
+					completed,
+					known
+				});
+				result = "captured";
+			} catch (error) {
+				if (error instanceof PersonalMemoryBrokerError && error.status === 403) {
+					const suppressedTurns = [...new Set([...journal.suppressedTurns, ...pending.map((item) => turnKey(item.sessionId, item.turnId))])].slice(-MAX_COMPLETED);
+					try {
+						await this.writeJournal(journalPath, {
+							...journal,
+							pending: [],
+							completed,
+							known,
+							suppressedTurns
+						});
+					} catch {
+						return "unavailable";
+					}
+					return "skipped";
+				}
+				if (error instanceof PersonalMemoryBrokerError && (error.code === "INVALID_PAYLOAD" || error.code === "PAYLOAD_TOO_LARGE" || error.code === "SECRET_REJECTED")) {
+					pending = pending.filter((item) => item.captureId !== entry.captureId);
+					await this.writeJournal(journalPath, {
+						...journal,
+						pending,
+						completed,
+						known
+					});
+					continue;
+				}
+				if (error instanceof PersonalMemoryBrokerError && error.code === "FORGET_GENERATION_CHANGED") return "queued";
+				return "queued";
+			}
+		}
+		return result;
+	}
+	journalPath(workspaceId) {
+		const name = createHash("sha256").update(workspaceId).digest("hex");
+		return path.join(this.homeDir, "memory", `honcho-pending-${name}.json`);
+	}
+	sessionStatePath(sessionId) {
+		const name = createHash("sha256").update(sessionId).digest("hex");
+		return path.join(this.homeDir, "memory", `honcho-session-${name}.json`);
+	}
+	async readSessionState(sessionId) {
+		let value;
+		try {
+			value = JSON.parse(await readFile(this.sessionStatePath(sessionId), "utf8"));
+		} catch (error) {
+			if (isMissing(error)) return {
+				version: 1,
+				sessionId,
+				highestObservedTurnId: -1,
+				blockedThroughTurnId: -1,
+				workspaceId: null,
+				sessionEpoch: null
+			};
+			throw error;
+		}
+		if (!isRecord$3(value) || value["version"] !== 1 || value["sessionId"] !== sessionId || !Number.isSafeInteger(value["highestObservedTurnId"]) || value["highestObservedTurnId"] < -1 || !Number.isSafeInteger(value["blockedThroughTurnId"]) || value["blockedThroughTurnId"] < -1 || value["blockedThroughTurnId"] > value["highestObservedTurnId"] || value["workspaceId"] !== null && (typeof value["workspaceId"] !== "string" || value["workspaceId"].length === 0) || value["sessionEpoch"] !== null && (!Number.isSafeInteger(value["sessionEpoch"]) || value["sessionEpoch"] < 0)) throw new Error("Invalid account memory session state.");
+		return value;
+	}
+	async writeSessionState(state) {
+		const statePath = this.sessionStatePath(state.sessionId);
+		const directory = path.dirname(statePath);
+		await mkdir(directory, {
+			recursive: true,
+			mode: 448
+		});
+		const root = await realpath(this.homeDir);
+		if (path.dirname(await realpath(directory)) !== root) throw new Error("Account memory session state escapes the BLUN profile.");
+		const temporary = `${statePath}.${randomUUID()}.tmp`;
+		try {
+			await writeFile(temporary, JSON.stringify(state), {
+				encoding: "utf8",
+				mode: 384,
+				flag: "wx"
+			});
+			await rename(temporary, statePath);
+		} finally {
+			await unlink(temporary).catch(() => {});
+		}
+	}
+	async readJournal(journalPath, workspaceId) {
+		let text;
+		try {
+			text = await readFile(journalPath, "utf8");
+		} catch (error) {
+			if (isMissing(error)) return {
+				version: 2,
+				workspaceId,
+				pending: [],
+				completed: [],
+				known: [],
+				retractions: [],
+				suppressedTurns: [],
+				revisions: {}
+			};
+			throw error;
+		}
+		const value = JSON.parse(text);
+		if (!isRecord$3(value) || value["version"] !== 2 || value["workspaceId"] !== workspaceId || !Array.isArray(value["pending"]) || value["pending"].length > MAX_PENDING || !value["pending"].every(validPending) || !Array.isArray(value["completed"]) || value["completed"].length > MAX_COMPLETED || !value["completed"].every((item) => typeof item === "string" && /^[0-9a-f]{64}$/u.test(item)) || !Array.isArray(value["known"]) || value["known"].length > MAX_COMPLETED || !value["known"].every(validKnown) || !Array.isArray(value["retractions"]) || value["retractions"].length > MAX_RETRACTIONS || !value["retractions"].every(validRetraction) || !Array.isArray(value["suppressedTurns"]) || value["suppressedTurns"].length > MAX_COMPLETED || !value["suppressedTurns"].every((item) => typeof item === "string" && /^[0-9a-f]{64}$/u.test(item)) || !isRecord$3(value["revisions"]) || Object.keys(value["revisions"]).length > MAX_COMPLETED || !Object.entries(value["revisions"]).every(([key, revision]) => /^[0-9a-f]{64}$/u.test(key) && Number.isSafeInteger(revision) && revision >= 0)) throw new Error("Invalid account memory journal.");
+		return value;
+	}
+	async writeJournal(journalPath, journal) {
+		const directory = path.dirname(journalPath);
+		await mkdir(directory, {
+			recursive: true,
+			mode: 448
+		});
+		const root = await realpath(this.homeDir);
+		if (path.dirname(await realpath(directory)) !== root) throw new Error("Account memory journal escapes the BLUN profile.");
+		const temporary = `${journalPath}.${randomUUID()}.tmp`;
+		try {
+			await writeFile(temporary, JSON.stringify(journal), {
+				encoding: "utf8",
+				mode: 384,
+				flag: "wx"
+			});
+			await rename(temporary, journalPath);
+		} finally {
+			await unlink(temporary).catch(() => {});
+		}
+	}
+	serial(run) {
+		const task = this.work.then(run, run);
+		this.work = task.then(() => void 0, () => void 0);
+		return task;
+	}
+};
+function beforeCutoff(occurredAt, cutoff) {
+	return cutoff !== null && Date.parse(occurredAt) <= Date.parse(cutoff);
+}
+function captureKey(sessionId, turnId, occurredAt, messageIds) {
+	return createHash("sha256").update(`${sessionId}\0${turnId}\0${occurredAt}\0${messageIds.join("\0")}`).digest("hex");
+}
+function turnKey(sessionId, turnId) {
+	return createHash("sha256").update(`${sessionId}\0${turnId}`).digest("hex");
+}
+function turnMessageIds(sessionId, turnId, turn, revision) {
+	return [stableMessageId(sessionId, turnId, revision, "user", turn.userText), stableMessageId(sessionId, turnId, revision, "assistant", turn.assistantText)];
+}
+function stableMessageId(sessionId, turnId, revision, role, content) {
+	return `tui-${createHash("sha256").update(`${sessionId}\0${turnId}\0${revision}\0${role}\0${content}`).digest("hex")}`;
+}
+function validPending(value) {
+	return isRecord$3(value) && typeof value["captureId"] === "string" && UUID_V4.test(value["captureId"]) && typeof value["sessionId"] === "string" && typeof value["sessionDir"] === "string" && Number.isSafeInteger(value["turnId"]) && value["turnId"] >= 0 && typeof value["occurredAt"] === "string" && Number.isFinite(Date.parse(value["occurredAt"])) && validMessageIds(value["messageIds"]) && typeof value["awaitingSessionRetract"] === "boolean" && (value["sessionEpoch"] === null || Number.isSafeInteger(value["sessionEpoch"]) && value["sessionEpoch"] >= 0);
+}
+function validKnown(value) {
+	return isRecord$3(value) && typeof value["key"] === "string" && /^[0-9a-f]{64}$/u.test(value["key"]) && typeof value["sessionId"] === "string" && Number.isSafeInteger(value["turnId"]) && typeof value["occurredAt"] === "string" && Number.isFinite(Date.parse(value["occurredAt"])) && validMessageIds(value["messageIds"]);
+}
+function validRetraction(value) {
+	return isRecord$3(value) && typeof value["retractId"] === "string" && UUID_V4.test(value["retractId"]) && typeof value["sessionId"] === "string" && value["sessionId"].length > 0 && (value["wholeSession"] === true && (value["expectedEpoch"] === null || Number.isSafeInteger(value["expectedEpoch"]) && value["expectedEpoch"] >= 0) || Array.isArray(value["messageIds"]) && value["messageIds"].length > 0 && value["messageIds"].length <= 200 && value["messageIds"].every(validMessageId));
+}
+function validMessageIds(value) {
+	return Array.isArray(value) && value.length === 2 && value.every(validMessageId);
+}
+function validMessageId(value) {
+	return typeof value === "string" && /^tui-[0-9a-f]{64}$/u.test(value);
+}
+function isRecord$3(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isMissing(error) {
+	return isRecord$3(error) && error["code"] === "ENOENT";
+}
+//#endregion
+//#region src/personal-memory/account-memory-runtime.ts
+var TuiAccountMemoryRuntime = class {
+	client;
+	broker;
+	queue;
+	getManagedQuota;
+	constructor(client, broker, queue, getManagedQuota) {
+		this.client = client;
+		this.broker = broker;
+		this.queue = queue;
+		this.getManagedQuota = getManagedQuota;
+	}
+	async captureCompletedTurn(session, turnId) {
+		const permission = await this.permission("write");
+		if (permission === "unavailable") return "unavailable";
+		if (permission === "denied") {
+			await this.queue.discardPending().catch(() => {});
+			return "skipped";
+		}
+		return this.queue.captureCompletedTurn(session, turnId).catch(() => "unavailable");
+	}
+	async retryPending() {
+		const permission = await this.permission("write");
+		if (permission === "denied") await this.queue.discardPending().catch(() => {});
+		const retractions = await this.queue.retryRetractions().catch(() => "unavailable");
+		if (retractions === "queued") return "queued";
+		if (permission === "denied") return "skipped";
+		if (permission === "unavailable" || retractions === "unavailable") return "unavailable";
+		return this.queue.retryPending().catch(() => "unavailable");
+	}
+	retractTurn(sessionId, turnId) {
+		return this.queue.retractTurn(sessionId, turnId).catch(() => "unavailable");
+	}
+	retractSession(sessionId, throughTurnId) {
+		return (throughTurnId === void 0 ? this.queue.retractSession(sessionId) : this.queue.retractSession(sessionId, throughTurnId)).catch(() => "unavailable");
+	}
+	flushRetractionsBeforeLogout() {
+		return this.queue.flushRetractionsBeforeLogout().catch(() => true);
+	}
+	async recall(query) {
+		if (await this.permission("read") !== "allowed") return void 0;
+		return this.broker.recall(query, 8).catch(() => void 0);
+	}
+	async search(query, limit = 20) {
+		if (await this.permission("read") !== "allowed") return void 0;
+		return this.broker.search(query, { limit }).catch(() => void 0);
+	}
+	async permission(operation) {
+		let settings;
+		try {
+			const quota = await this.getManagedQuota();
+			if (quota.kind !== "ok") return "unavailable";
+			if (quota.paid !== true) return "denied";
+			settings = await this.client.getSettings();
+		} catch {
+			return "unavailable";
+		}
+		if (settings.consentStatus !== "enabled" || !settings.memoryEnabled || !settings.useChatHistory) return "denied";
+		return operation === "write" ? settings.allowNewMemories ? "allowed" : "denied" : settings.useSavedMemories ? "allowed" : "denied";
+	}
+};
+function createTuiAccountMemoryRuntime(harness, env = process.env) {
+	if (env["BLUN_ACCOUNT_MEMORY_BROKER_ENABLED"] !== "1") return void 0;
+	try {
+		const client = createPersonalMemoryBrokerClient(harness);
+		const broker = new AccountMemoryBroker(client);
+		return new TuiAccountMemoryRuntime(client, broker, new AccountMemoryCaptureQueue(harness.homeDir, broker, void 0, {
+			get: () => harness.auth.getCachedMemoryWorkspaceId(),
+			set: (workspaceId) => harness.auth.cacheMemoryWorkspaceId(workspaceId)
+		}), () => harness.auth.getManagedQuota(DEFAULT_OAUTH_PROVIDER_NAME));
+	} catch {
+		return;
+	}
+}
+//#endregion
 //#region src/utils/persistence.ts
 /**
 * Small persistence helpers for CLI-owned data files.
@@ -532647,6 +534088,29 @@ var PersonalMemoryController = class {
 		this.queue = run.then(() => {}, () => {});
 		return run;
 	}
+	refreshLocalToolSearch() {
+		const generation = this.generation;
+		const session = this.host.session;
+		const refresh = async () => {
+			if (!this.isCurrent(generation, session)) return "stale";
+			if (session === void 0) return "unavailable";
+			try {
+				await this.dependencies.bindTools(session, this.host.harness, {
+					binding: personalMemoryHostBinding(),
+					localHistory: this.host.harness,
+					searchOnly: true,
+					accountMemory: this.host.accountMemoryRuntime
+				});
+				return this.isCurrent(generation, session) ? "ready" : "stale";
+			} catch {
+				await this.dependencies.clearTools(session).catch(() => {});
+				return "unavailable";
+			}
+		};
+		const run = this.queue.then(refresh, refresh);
+		this.queue = run.then(() => {}, () => {});
+		return run;
+	}
 	clear(session = this.host.session) {
 		++this.generation;
 		const run = this.queue.then(async () => {
@@ -532717,7 +534181,8 @@ var PersonalMemoryController = class {
 				await this.dependencies.bindTools(session, this.host.harness, {
 					binding,
 					client,
-					localHistory: this.host.harness
+					localHistory: this.host.harness,
+					accountMemory: this.host.accountMemoryRuntime
 				});
 				return "ready";
 			} catch {
@@ -535540,7 +537005,10 @@ var SessionEventHandler = class {
 		this.showPendingCompactionRetry();
 		this.goalCompletionTurnEnded = true;
 		this.scheduleQueuedGoalPromotion();
-		if (event.reason === "completed") this.host.refreshManagedQuotaWindows();
+		if (event.reason === "completed") {
+			this.host.refreshManagedQuotaWindows();
+			this.host.recordAccountMemoryTurn?.(event);
+		}
 	}
 	handleStepBegin(event) {
 		this.host.commitQueuedSteerAtStepStart(event.turnId);
@@ -542805,6 +544273,7 @@ var BlunTUI = class {
 	editorKeyboard;
 	scrollbackController;
 	personalMemoryController;
+	accountMemoryRuntime;
 	customerMistakeController;
 	managedQuotaWarningController;
 	managedQuotaWarningPersistence = Promise.resolve();
@@ -542889,6 +544358,7 @@ var BlunTUI = class {
 		this.loopCountdown = new LoopCountdownController(() => this.state.ui.requestRender());
 		this.authFlow = new AuthFlowController(this);
 		this.personalMemoryController = new PersonalMemoryController(this);
+		this.accountMemoryRuntime = createTuiAccountMemoryRuntime(harness);
 		this.customerMistakeController = new CustomerMistakeHostController();
 		this.btwPanelController = new BtwPanelController(this);
 		this.sessionEventHandler = new SessionEventHandler(this);
@@ -544582,9 +546052,21 @@ var BlunTUI = class {
 	refreshManagedQuotaWindows() {
 		this.authFlow.refreshManagedQuotaWindows();
 	}
+	recordAccountMemoryTurn(event) {
+		const session = this.session;
+		const sessionDir = session?.summary?.sessionDir;
+		if (session === void 0 || sessionDir === void 0) return;
+		this.accountMemoryRuntime?.captureCompletedTurn({
+			id: session.id,
+			sessionDir
+		}, event.turnId).catch(() => {});
+	}
 	async refreshPersonalMemory(promptIfNeverAsked = false) {
 		await this.personalMemoryController.refresh({ promptIfNeverAsked });
 	}
+	async refreshLocalToolSearch() {
+		await this.personalMemoryController.refreshLocalToolSearch();
+	}
 	setLocalToolEventRecordingEnabled(enabled) {
 		this.sessionEventHandler.setLocalToolEventRecordingEnabled(enabled);
 	}
@@ -544720,6 +546202,7 @@ var BlunTUI = class {
 		await this.refreshManagedImageReaderAvailability(session);
 		await this.authFlow.applyManagedAccountContextToSession();
 		await this.personalMemoryController.refresh();
+		this.accountMemoryRuntime?.retryPending().catch(() => {});
 		this.telegramSessionScope = queueScope;
 		this.telegramChannel?.bindSessionQueue(queueScope);
 		if (selectionScope !== void 0 && this.session === session) {
@@ -545003,6 +546486,7 @@ var BlunTUI = class {
 		this.registerSessionHandlers(session);
 		await this.refreshManagedImageReaderAvailability(session);
 		await this.personalMemoryController.refresh();
+		this.accountMemoryRuntime?.retryPending().catch(() => {});
 		await this.syncRuntimeState(session);
 		this.updateTerminalTitle();
 		try {
@@ -546066,7 +547550,7 @@ var BlunTUI = class {
 //#endregion
 //#region src/constant/update.ts
 var import_runtime_exit_ledger = (/* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const fs = __require("node:fs");
+	const fs$1 = __require("node:fs");
 	const os$1 = __require("node:os");
 	const path$2 = __require("node:path");
 	const DEFAULT_MAX_BYTES = 1024 * 1024;
@@ -546120,7 +547604,7 @@ var import_runtime_exit_ledger = (/* @__PURE__ */ __commonJSMin(((exports, modul
 		return record;
 	}
 	function directoryIdentity(directory) {
-		const stat = fs.lstatSync(directory, { bigint: true });
+		const stat = fs$1.lstatSync(directory, { bigint: true });
 		if (!stat.isDirectory() || stat.isSymbolicLink()) throw new Error("Unsafe exit directory");
 		return stat;
 	}
@@ -546132,16 +547616,16 @@ var import_runtime_exit_ledger = (/* @__PURE__ */ __commonJSMin(((exports, modul
 		return stat;
 	}
 	function trimLedger(descriptor, maxBytes, retainBytes, incomingBytes) {
-		const size = Number(regularLedger(fs.fstatSync(descriptor, { bigint: true })).size);
+		const size = Number(regularLedger(fs$1.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.readSync(descriptor, contents, 0, keepBytes, size - keepBytes);
+		const read = fs$1.readSync(descriptor, contents, 0, keepBytes, size - keepBytes);
 		const tail = contents.subarray(0, read);
 		const lineStart = size > keepBytes ? tail.indexOf(10) + 1 : 0;
-		fs.ftruncateSync(descriptor, 0);
-		fs.writeFileSync(descriptor, lineStart > 0 || size === keepBytes ? tail.subarray(lineStart) : "");
+		fs$1.ftruncateSync(descriptor, 0);
+		fs$1.writeFileSync(descriptor, lineStart > 0 || size === keepBytes ? tail.subarray(lineStart) : "");
 	}
 	function recordRuntimeExit(input = {}) {
 		let descriptor;
@@ -546149,7 +547633,7 @@ var import_runtime_exit_ledger = (/* @__PURE__ */ __commonJSMin(((exports, modul
 		try {
 			const homeDir = typeof input.homeDir === "string" ? input.homeDir.trim() : "";
 			if (!homeDir || !path$2.isAbsolute(homeDir)) return false;
-			fs.mkdirSync(homeDir, {
+			fs$1.mkdirSync(homeDir, {
 				recursive: true,
 				mode: 448
 			});
@@ -546157,21 +547641,21 @@ var import_runtime_exit_ledger = (/* @__PURE__ */ __commonJSMin(((exports, modul
 			const file = runtimeExitLedgerPath(homeDir);
 			const directory = path$2.dirname(file);
 			try {
-				fs.mkdirSync(directory, { mode: 448 });
+				fs$1.mkdirSync(directory, { mode: 448 });
 			} catch (error) {
 				if (error.code !== "EEXIST") throw error;
 			}
 			const directoryStat = directoryIdentity(directory);
 			let before;
 			try {
-				before = regularLedger(fs.lstatSync(file, { bigint: true }));
+				before = regularLedger(fs$1.lstatSync(file, { bigint: true }));
 			} catch (error) {
 				if (error.code !== "ENOENT") throw error;
 			}
-			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 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 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);
@@ -546194,21 +547678,21 @@ var import_runtime_exit_ledger = (/* @__PURE__ */ __commonJSMin(((exports, modul
 				line = `${JSON.stringify(record)}\n`;
 			}
 			trimLedger(descriptor, maxBytes, retainBytes, Buffer.byteLength(line));
-			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" });
+			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" });
 			try {
-				fs.fchmodSync(descriptor, 384);
+				fs$1.fchmodSync(descriptor, 384);
 			} catch {}
 			return true;
 		} catch {
 			return false;
 		} finally {
 			if (appendDescriptor !== void 0) try {
-				fs.closeSync(appendDescriptor);
+				fs$1.closeSync(appendDescriptor);
 			} catch {}
 			if (descriptor !== void 0) try {
-				fs.closeSync(descriptor);
+				fs$1.closeSync(descriptor);
 			} catch {}
 		}
 	}
@@ -546346,6 +547830,7 @@ async function runShell(opts, version, updateStartupNotice) {
 		}
 	});
 	log.info("blun starting", {
+		pid: process.pid,
 		version,
 		uiMode: CLI_UI_MODE,
 		nodeVersion: process.version,
@@ -546472,11 +547957,16 @@ async function runShell(opts, version, updateStartupNotice) {
 		const initMs = Date.now() - initStartedAt;
 		const startupSessionId = tui.getCurrentSessionId();
 		const mcpMs = await tui.getStartupMcpMs();
-		trackLifecycleForSession(startupSessionId, "startup_perf", {
+		const startupPerformance = {
 			duration_ms: Date.now() - startedAt,
 			config_ms: configMs,
 			init_ms: initMs,
 			mcp_ms: mcpMs
+		};
+		trackLifecycleForSession(startupSessionId, "startup_perf", startupPerformance);
+		log.info("startup performance", {
+			pid: process.pid,
+			...startupPerformance
 		});
 	} catch (error) {
 		removeCrashHandlers();