blun-king-cli 9.1.611 → 9.1.613

package/worker-host.mjs

@@ -1,11 +1,11 @@
 #!/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 } from "node:crypto";
+import crypto$1, { createHash, createHmac, randomBytes, randomInt, randomUUID } from "node:crypto";
 import * as fs$12 from "node:fs";
 import Kt, { appendFileSync, chmodSync, closeSync, constants, createReadStream, createWriteStream, existsSync, fstatSync, fsyncSync, linkSync, lstatSync, mkdirSync, openSync, opendirSync, promises, readFileSync, readSync, readdirSync, realpathSync, renameSync, statSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
 import * as path$11 from "node:path";
@@ -1888,6 +1888,9 @@ var FetchTransport = class {
 		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);
@@ -1896,6 +1899,9 @@ var FetchTransport = class {
 			const startedAt = performance.now();
 			const startedAtMs = Date.now();
 			try {
+				try {
+					requestOptions?.onRequestSent?.();
+				} catch {}
 				const response = await this.fetch(`${this.baseUrl}${pathname}`, {
 					...init,
 					headers
@@ -1953,16 +1959,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"];
@@ -1973,6 +1969,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({
@@ -1982,6 +2016,7 @@ function measureSerializedRequest(body, requestBytes) {
 			systemMessageBytes,
 			conversationMessageBytes,
 			toolResultMessageBytes,
+			...toolResultByTool.length === 0 ? {} : { toolResultByTool },
 			toolSchemaBytes,
 			toolDefinitions,
 			toolArrayOverheadBytes,
@@ -2366,6 +2401,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") {
@@ -2375,6 +2413,7 @@ function extractChatCompletionUsage(usage) {
 	return {
 		inputOther: promptTokens - cachedTokens,
 		output: completionTokens,
+		...outputReasoning === void 0 ? {} : { outputReasoning },
 		inputCacheRead: cachedTokens,
 		inputCacheCreation: 0
 	};
@@ -2648,6 +2687,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 = [];
@@ -2957,12 +3003,13 @@ var BlunChatProvider = class {
 		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);
@@ -2971,7 +3018,6 @@ var BlunChatProvider = class {
 				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
@@ -3358,9 +3404,11 @@ function emptyUsage() {
 * Sum two TokenUsage values.
 */
 function addUsage(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
 	};
@@ -9770,6 +9818,8 @@ const StringRecordSchema = record$2(string(), string());
 const ProviderConfigSchema = object({
 	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(),
@@ -10318,7 +10368,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) {
@@ -10328,7 +10379,8 @@ 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 } : {}
 	};
 }
 //#endregion
@@ -12719,6 +12771,27 @@ var OAuthManager = class {
 		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();
@@ -12786,7 +12859,10 @@ var OAuthManager = class {
 			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) {
@@ -14163,6 +14239,16 @@ var BlunOAuthToolkit = class {
 			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);
@@ -16230,6 +16316,8 @@ function providerToToml(provider, rawProvider) {
 	for (const key of [
 		"type",
 		"apiKey",
+		"memoryWorkspaceId",
+		"memoryApiKeyHash",
 		"baseUrl",
 		"defaultModel",
 		"oauth",
@@ -21757,10 +21845,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;
@@ -21796,7 +21889,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) {
@@ -28778,17 +28874,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 : {
@@ -230235,16 +230334,19 @@ var FullCompaction = class {
 		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
 		};
 	}
@@ -230266,6 +230368,35 @@ var FullCompaction = class {
 			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) {
@@ -230274,7 +230405,9 @@ var FullCompaction = class {
 				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;
@@ -230403,7 +230536,9 @@ var FullCompaction = class {
 		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;
@@ -230613,7 +230748,10 @@ var FullCompaction = class {
 					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: {
@@ -238976,6 +239114,32 @@ var import_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",
@@ -239173,10 +239337,27 @@ var import_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));
@@ -239234,7 +239415,7 @@ var import_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,
@@ -239255,11 +239436,11 @@ var import_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) => {
@@ -250063,7 +250244,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) {
@@ -251051,6 +251233,7 @@ const MCP_OAUTH_AUTHORIZATION_URL_TOOL_UPDATE = "mcp.oauth.authorization_url";
 const tokenUsageSchema = object({
 	inputOther: number$1(),
 	output: number$1(),
+	outputReasoning: number$1().optional(),
 	inputCacheRead: number$1(),
 	inputCacheCreation: number$1()
 });
@@ -267590,6 +267773,7 @@ var TurnFlow = class {
 		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;
@@ -267615,6 +267799,13 @@ var TurnFlow = class {
 					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;
 				});
@@ -267726,6 +267917,10 @@ var TurnFlow = class {
 		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: [{
@@ -267784,9 +267979,26 @@ var TurnFlow = class {
 		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;
@@ -267797,12 +268009,14 @@ var TurnFlow = class {
 			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];
@@ -267813,7 +268027,7 @@ var TurnFlow = class {
 			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();
@@ -267823,6 +268037,7 @@ var TurnFlow = class {
 			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);
@@ -267835,6 +268050,7 @@ var TurnFlow = class {
 							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({
@@ -267847,14 +268063,24 @@ var TurnFlow = class {
 						}, 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,
@@ -267871,8 +268097,10 @@ var TurnFlow = class {
 					},
 					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();
 						},
@@ -267910,6 +268138,17 @@ var TurnFlow = class {
 								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
@@ -271412,6 +271651,7 @@ var FallbackLLM = class {
 			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;
@@ -271420,7 +271660,14 @@ var FallbackLLM = class {
 		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();
@@ -271430,13 +271677,14 @@ var FallbackLLM = class {
 					...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,
@@ -271538,8 +271786,13 @@ var LlmRequestLogger = class {
 	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;
@@ -271556,6 +271809,10 @@ var LlmRequestLogger = class {
 			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++;
@@ -271585,6 +271842,20 @@ var LlmRequestLogger = class {
 			}
 		};
 		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);
@@ -271610,10 +271881,51 @@ var LlmRequestLogger = class {
 	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;
@@ -271635,6 +271947,11 @@ var LlmRequestLogger = class {
 					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 },
@@ -271696,7 +272013,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] }
 		} }
 	};
 }
@@ -271792,6 +272110,7 @@ var Agent$1 = class {
 	errorMemory;
 	replayBuilder;
 	additionalDirs;
+	systemPromptStartedAt = /* @__PURE__ */ new Date();
 	activeProfile;
 	brandHome;
 	_activeResponderModel;
@@ -271879,6 +272198,7 @@ var Agent$1 = class {
 			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
@@ -271901,6 +272221,12 @@ var Agent$1 = class {
 							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;
@@ -271926,7 +272252,7 @@ var Agent$1 = class {
 	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");
@@ -271941,6 +272267,7 @@ var Agent$1 = class {
 				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,
@@ -271949,17 +272276,31 @@ var Agent$1 = class {
 				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);
@@ -272053,6 +272394,7 @@ var Agent$1 = class {
 		let contributions;
 		const systemPrompt = profile.systemPrompt({
 			osEnv: this.kaos.osEnv,
+			now: this.systemPromptStartedAt,
 			cwd: this.config.cwd,
 			skills: this.skills?.registry,
 			cwdListing: context?.cwdListing,
@@ -347752,6 +348094,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({
@@ -348057,6 +348432,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 });
 }