blun-king-cli 9.1.615 → 9.1.616

package/worker-host.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// BLUN_BUILD_INPUT_SHA256:57a7160081cd6a2ce9e3535b31b87f9410c0dafd58da9629b68cb0042a8e57e5
+// BLUN_BUILD_INPUT_SHA256:8034cba54fd011bf9ce255483d60f6d12f8cdb9862b405ccf424ae40ac14b7c5
 import { fileURLToPath as __cjsShimFileURLToPath } from 'node:url';
 import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
@@ -10181,7 +10181,17 @@ async function canonicalWriterPath(target) {
 async function readOwner(lockDirectory) {
 	const directory = await lstat(lockDirectory);
 	if (!directory.isDirectory() || directory.isSymbolicLink()) throw unavailable();
-	const names = await readdir(lockDirectory);
+	let names;
+	try {
+		names = await readdir(lockDirectory);
+	} catch (error) {
+		if (process.platform === "win32" && codeOf(error) === "EPERM") try {
+			await lstat(lockDirectory);
+		} catch (inspectionError) {
+			if (codeOf(inspectionError) === "ENOENT") throw inspectionError;
+		}
+		throw error;
+	}
 	if (names.length === 0) return void 0;
 	const name = names[0];
 	const match = markerPattern.exec(name);
@@ -10256,7 +10266,10 @@ async function reclaimDeadOwner(lockDirectory) {
 	}
 }
 /** A local-host writer claim. It never expires based on age or missed heartbeats. */
-async function acquireSessionWriter(sessionDirectory) {
+async function acquireSessionWriter(sessionDirectory, options = {}) {
+	const waitForBusyMs = options.waitForBusyMs ?? 0;
+	if (!Number.isFinite(waitForBusyMs) || waitForBusyMs < 0 || waitForBusyMs > 5e3) throw new RangeError("Writer contention budget must be between 0 and 5000 milliseconds");
+	const deadline = performance.now() + waitForBusyMs;
 	let staged;
 	let name;
 	try {
@@ -10275,7 +10288,8 @@ async function acquireSessionWriter(sessionDirectory) {
 			flag: "wx",
 			mode: 384
 		});
-		for (let attempt = 0; attempt < 8; attempt += 1) {
+		let unownedCollisions = 0;
+		for (;;) {
 			try {
 				await rename(staged, lockDirectory);
 			} catch (error) {
@@ -10285,7 +10299,19 @@ async function acquireSessionWriter(sessionDirectory) {
 					"EPERM",
 					"EACCES"
 				].includes(codeOf(error) ?? "")) throw error;
-				await reclaimDeadOwner(lockDirectory);
+				try {
+					await reclaimDeadOwner(lockDirectory);
+				} catch (ownershipError) {
+					if (!(ownershipError instanceof BlunError) || ownershipError.code !== ErrorCodes.SESSION_WRITER_BUSY) throw ownershipError;
+					const remaining = deadline - performance.now();
+					if (waitForBusyMs === 0 || remaining <= 0) throw ownershipError;
+					await new Promise((resolve) => {
+						setTimeout(resolve, Math.min(25, remaining));
+					});
+					unownedCollisions = 0;
+					continue;
+				}
+				if (++unownedCollisions >= 8) throw unavailable();
 				continue;
 			}
 			let released = false;
@@ -10308,7 +10334,6 @@ async function acquireSessionWriter(sessionDirectory) {
 				}
 			};
 		}
-		throw unavailable();
 	} catch (error) {
 		if (error instanceof BlunError) throw error;
 		throw unavailable(error);
@@ -16473,16 +16498,11 @@ function configWriterError(error) {
 	return error;
 }
 async function acquireConfigWriter(filePath) {
-	const deadline = performance.now() + 5e3;
-	for (;;) try {
-		return await acquireSessionWriter(filePath);
+	try {
+		return await acquireSessionWriter(filePath, { waitForBusyMs: 5e3 });
 	} catch (error) {
 		if (!(error instanceof BlunError) || error.code !== ErrorCodes.SESSION_WRITER_BUSY) throw error;
-		const remaining = deadline - performance.now();
-		if (remaining <= 0) throw new BlunError(ErrorCodes.CONFIG_WRITE_BUSY, "Another configuration change is still being saved", { cause: error });
-		await new Promise((resolve) => {
-			setTimeout(resolve, Math.min(25, remaining));
-		});
+		throw new BlunError(ErrorCodes.CONFIG_WRITE_BUSY, "Another configuration change is still being saved", { cause: error });
 	}
 }
 /** Keep transforms synchronous; credential validation and discovery belong before this boundary. */
@@ -30005,7 +30025,7 @@ var FileSystemAgentRecordPersistence = class {
 	async *readFrom(offset, recordCount) {
 		if (!Number.isSafeInteger(offset) || offset < 0 || !Number.isSafeInteger(recordCount) || recordCount < 0) throw new Error("Invalid Wire replay offset");
 		await this.flush();
-		let line = "";
+		const fragments = [];
 		let lineNumber = recordCount;
 		let byteLength = offset;
 		const stream = createReadStream(this.filePath, {
@@ -30014,29 +30034,36 @@ var FileSystemAgentRecordPersistence = class {
 		});
 		try {
 			for await (const chunk of stream) {
-				line += chunk;
-				let newlineIndex = line.indexOf("\n");
+				let start = 0;
+				let newlineIndex = chunk.indexOf("\n", start);
 				while (newlineIndex !== -1) {
-					const rawLine = line.slice(0, newlineIndex);
-					line = line.slice(newlineIndex + 1);
+					const part = chunk.slice(start, newlineIndex);
+					let rawLine = part;
+					if (fragments.length > 0) {
+						fragments.push(part);
+						rawLine = fragments.join("");
+						fragments.length = 0;
+					}
 					lineNumber++;
 					byteLength += Buffer.byteLength(rawLine, "utf8") + 1;
 					const record = parseRecordLine(rawLine.endsWith("\r") ? rawLine.slice(0, -1) : rawLine, lineNumber, this.filePath, false);
 					if (record !== void 0) yield record;
-					newlineIndex = line.indexOf("\n");
+					start = newlineIndex + 1;
+					newlineIndex = chunk.indexOf("\n", start);
 				}
+				if (start < chunk.length) fragments.push(chunk.slice(start));
 			}
 		} catch (error) {
 			if (error.code === "ENOENT") return;
 			throw error;
 		}
-		if (line.length > 0) {
+		if (fragments.length > 0) {
 			lineNumber++;
-			const record = parseRecordLine(line, lineNumber, this.filePath, true);
+			const record = parseRecordLine(fragments.join(""), lineNumber, this.filePath, true);
 			if (record !== void 0) yield record;
 		}
 		this.persistedRecordCount = lineNumber;
-		this.persistedByteLength = line.length === 0 ? byteLength : void 0;
+		this.persistedByteLength = fragments.length === 0 ? byteLength : void 0;
 	}
 	append(input) {
 		this.throwIfError();
@@ -228677,6 +228704,8 @@ async function compressImageForModel(bytes, mimeType, options = {}) {
 	if (bytes.length <= byteBudget && (longestEdge > 0 && longestEdge <= maxEdge || longestEdge === 0)) return passthrough();
 	if (dims && dims.width * dims.height > MAX_DECODE_PIXELS) return passthrough();
 	if (bytes.length > maxDecodeBytes) return passthrough();
+	const detected = detectFileType("", bytes.subarray(0, 512), "media");
+	if (!RECODABLE_MIME.has(detected.mimeType)) return passthrough();
 	try {
 		const { Jimp } = await Promise.resolve().then(() => (init_esm(), esm_exports$3));
 		const image = await Jimp.fromBuffer(Buffer.from(bytes));
@@ -231664,6 +231693,13 @@ const CronRunStatusSchema = _enum([
 ]);
 const counter = number$1().int().nonnegative().max(Number.MAX_SAFE_INTEGER);
 const timestamp$1 = string().datetime();
+const CronProviderUsageSchema = object({
+	inputOther: counter,
+	inputCacheRead: counter,
+	inputCacheCreation: counter,
+	output: counter,
+	outputReasoning: counter.optional()
+}).strict();
 const CronRunReceiptSchema = object({
 	runId: CronRunIdSchema,
 	jobId: CronJobIdSchema,
@@ -231684,6 +231720,7 @@ const CronRunReceiptSchema = object({
 		names: array(string().regex(/^[\w.:-]{1,160}$/)).max(64),
 		excessNames: counter
 	}).strict(),
+	providerUsage: CronProviderUsageSchema.nullable().optional(),
 	outputs: array(object({
 		rootRef: string().regex(/^(workspace|additional:[0-9]+)$/),
 		path: string().min(1).max(1024).refine((value) => Buffer.byteLength(value) <= 1024 && !value.startsWith("/") && !value.includes("\\") && !value.includes(":") && !value.split("/").some((part) => part === ".." || part === ".") && !/[\u0000-\u001F\u007F]/.test(value))
@@ -231719,6 +231756,7 @@ function publicCronRun(run) {
 		coalescedCount: receipt.coalescedCount,
 		toolCalls: receipt.toolSummary.calls,
 		toolErrors: receipt.toolSummary.errors,
+		providerUsage: receipt.providerUsage ?? null,
 		outputCount: receipt.outputs.length,
 		finalMessageAvailable: run.finalMessage !== null,
 		durable: run.durable
@@ -231920,6 +231958,8 @@ var CronRunOutputCollector = class {
 	errors = 0;
 	excessNames = 0;
 	outputs = [];
+	providerUsage;
+	usageComplete = true;
 	invalid = false;
 	constructor(roots) {
 		this.roots = roots;
@@ -231940,6 +231980,7 @@ var CronRunOutputCollector = class {
 		}
 		if (event.type === "step.retrying") {
 			if (event.turnId !== String(this.turnId)) return;
+			this.usageComplete = false;
 			if (this.step === void 0 || this.step.id !== event.stepUuid || this.step.step !== event.step || this.step.tools) this.invalid = true;
 			else {
 				this.step = {
@@ -232008,19 +232049,29 @@ var CronRunOutputCollector = class {
 		} else if (event.type === "step.end") {
 			const step = this.step;
 			if (step === void 0 || event.uuid !== step.id || event.step !== step.step) this.invalid = true;
-			else if (event.finishReason === "end_turn" && !step.tools && !this.invalid) {
-				const clipped = prefix(step.text);
-				const truncated = step.chars > clipped.length;
-				const text = clipped + (truncated ? CRON_RUN_TRUNCATION_MARKER : "");
-				if (text) this.candidate = {
-					stepId: step.id,
-					turnId: this.turnId,
-					message: {
-						text,
-						truncated,
-						chars: step.chars
-					}
-				};
+			else {
+				const usage = event.usage === void 0 ? void 0 : CronProviderUsageSchema.safeParse(event.usage);
+				if (usage?.success !== true) this.usageComplete = false;
+				else {
+					const total = this.providerUsage === void 0 ? usage.data : addUsage(this.providerUsage, usage.data);
+					const checked = CronProviderUsageSchema.safeParse(total);
+					if (checked.success) this.providerUsage = checked.data;
+					else this.usageComplete = false;
+				}
+				if (event.finishReason === "end_turn" && !step.tools && !this.invalid) {
+					const clipped = prefix(step.text);
+					const truncated = step.chars > clipped.length;
+					const text = clipped + (truncated ? CRON_RUN_TRUNCATION_MARKER : "");
+					if (text) this.candidate = {
+						stepId: step.id,
+						turnId: this.turnId,
+						message: {
+							text,
+							truncated,
+							chars: step.chars
+						}
+					};
+				}
 			}
 			this.step = void 0;
 		}
@@ -232035,6 +232086,7 @@ var CronRunOutputCollector = class {
 				excessNames: this.excessNames
 			},
 			outputs: structuredClone(this.outputs),
+			providerUsage: complete && this.usageComplete && this.providerUsage !== void 0 ? structuredClone(this.providerUsage) : null,
 			final: complete ? this.candidate : void 0,
 			complete
 		};
@@ -233193,6 +233245,7 @@ var CronManager = class {
 			status,
 			endedAt: new Date(this.clocks.wallNow()).toISOString(),
 			toolSummary: result.toolSummary,
+			providerUsage: completed ? result.providerUsage : null,
 			outputs: result.outputs,
 			finalMessageRef: final === void 0 ? null : {
 				stepId: final.stepId,
@@ -233380,6 +233433,7 @@ var CronManager = class {
 				names: [],
 				excessNames: 0
 			},
+			providerUsage: null,
 			outputs: [],
 			finalMessageRef: null,
 			unavailableReason
@@ -234435,6 +234489,10 @@ const SYNTHETIC_TOOL_RESULT_TEXT = "Tool result is not available in the current
 function repairToolExchangeAdjacency(messages, options) {
 	let lastNonToolIndex = messages.length - 1;
 	while (lastNonToolIndex >= 0 && messages[lastNonToolIndex]?.role === "tool") lastNonToolIndex -= 1;
+	let remainingResults;
+	const consumeResult = (toolCallId) => {
+		if (remainingResults !== void 0) remainingResults.set(toolCallId, (remainingResults.get(toolCallId) ?? 0) - 1);
+	};
 	const out = [];
 	const consumed = /* @__PURE__ */ new Set();
 	for (let i = 0; i < messages.length; i++) {
@@ -234442,12 +234500,15 @@ function repairToolExchangeAdjacency(messages, options) {
 		const message = messages[i];
 		if (message.role !== "assistant" || message.toolCalls.length === 0) {
 			out.push(message);
+			if (message.role === "tool" && message.toolCallId !== void 0) consumeResult(message.toolCallId);
 			continue;
 		}
 		out.push(message);
 		const pending = new Set(message.toolCalls.map((toolCall) => toolCall.id));
+		const counts = remainingResults;
+		let searchable = counts === void 0 ? void 0 : new Set([...pending].filter((id) => (counts.get(id) ?? 0) > 0));
 		let foreignBetween = false;
-		for (let j = i + 1; j < messages.length && pending.size > 0; j++) {
+		for (let j = i + 1; j < messages.length && (searchable ?? pending).size > 0; j++) {
 			if (consumed.has(j)) continue;
 			const next = messages[j];
 			const toolCallId = next.toolCallId;
@@ -234455,11 +234516,25 @@ function repairToolExchangeAdjacency(messages, options) {
 				out.push(next);
 				consumed.add(j);
 				pending.delete(toolCallId);
+				searchable?.delete(toolCallId);
+				consumeResult(toolCallId);
 				if (foreignBetween) options?.onAnomaly?.({
 					kind: "tool_result_reordered",
 					toolCallId
 				});
-			} else foreignBetween = true;
+			} else {
+				foreignBetween = true;
+				if (remainingResults === void 0) {
+					remainingResults = /* @__PURE__ */ new Map();
+					for (let index = j; index < messages.length; index += 1) {
+						if (consumed.has(index)) continue;
+						const result = messages[index];
+						if (result.role === "tool" && result.toolCallId !== void 0) remainingResults.set(result.toolCallId, (remainingResults.get(result.toolCallId) ?? 0) + 1);
+					}
+				}
+				const counts = remainingResults;
+				searchable ??= new Set([...pending].filter((id) => (counts.get(id) ?? 0) > 0));
+			}
 		}
 		const isMidHistory = i < lastNonToolIndex;
 		if (options?.synthesizeMissing === true || isMidHistory) for (const missingId of pending) {
@@ -234837,17 +234912,29 @@ var ContextMemory = class {
 			deferredIndexes: [...deferredIndexes]
 		});
 		const removedMessages = /* @__PURE__ */ new Set();
+		let shiftedSlots = -historyIndexes.size * (historyIndexes.size - 1) / 2;
+		for (const index of historyIndexes) shiftedSlots += this._history.length - 1 - index;
+		const compactHistory = shiftedSlots > this._history.length * 64;
 		for (let i = this._history.length - 1; i >= 0; i--) {
 			const message = this._history[i];
 			if (message === void 0 || !historyIndexes.has(i)) continue;
 			removedMessages.add(message);
-			this._history.splice(i, 1);
+			if (!compactHistory) this._history.splice(i, 1);
 			this.agent.injection.onContextMessageRemoved(i);
 			if (i < this.tokenCountCoveredMessageCount) {
 				this.tokenCountCoveredMessageCount--;
 				this._tokenCount -= estimateTokensForMessages([message]);
 			}
 		}
+		if (compactHistory) {
+			let retained = 0;
+			for (let index = 0; index < this._history.length; index++) {
+				if (historyIndexes.has(index)) continue;
+				if (retained !== index) this._history[retained] = this._history[index];
+				retained++;
+			}
+			this._history.length = retained;
+		}
 		this.deferredMessages = this.deferredMessages.filter((message, index) => {
 			if (!deferredIndexes.has(index)) return true;
 			removedMessages.add(message);
@@ -239636,10 +239723,18 @@ var import_turn_tool_performance_policy = (/* @__PURE__ */ __commonJSMin(((expor
 		if (VIDEO_MEDIA_TERM_RE.test(text)) selected.add("GenerateVideo");
 		return selected;
 	}
+	function channelMessagesForTurnText(value) {
+		return [...String(value || "").matchAll(/(?:^|\r?\n)<channel\b[^>]*>\r?\n([\s\S]*?)\r?\n<\/channel>(?=\r?\n|$)/giu)].map((match) => ({
+			text: match[1],
+			start: match.index,
+			end: match.index + match[0].length,
+			telegram: /^<channel\s+source=["']telegram["'](?:\s|>)/iu.test(match[0].trimStart())
+		}));
+	}
 	function mediaToolNamesForTurnText(value) {
 		const text = String(value || "");
 		const selected = /* @__PURE__ */ new Set();
-		const channelBodies = [...text.matchAll(/(?:^|\r?\n)<channel\b[^>]*>\r?\n([\s\S]*?)\r?\n<\/channel>(?=\r?\n|$)/giu)].map((match) => match[1]);
+		const channelBodies = channelMessagesForTurnText(text).map((message) => message.text);
 		const intentTexts = channelBodies.length > 0 ? channelBodies : [text];
 		for (const intentText of intentTexts) for (const name of mediaGenerationToolNamesForText(intentText)) selected.add(name);
 		if (/\bimage_path\s*=\s*["'][^"']+["']/iu.test(text)) {
@@ -239756,7 +239851,7 @@ var import_turn_tool_performance_policy = (/* @__PURE__ */ __commonJSMin(((expor
 	}
 	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]);
+		const channelBodies = channelMessagesForTurnText(text).map((message) => message.text);
 		return (channelBodies.length > 0 ? channelBodies : [text]).map((intentText) => normalizeDeferredToolQuery(withoutFencedCode(intentText.replace(TOOL_RANK_EMBEDDED_CONTENT_RE, " "))));
 	}
 	function rankingTokens(value) {
@@ -239833,17 +239928,15 @@ var import_turn_tool_performance_policy = (/* @__PURE__ */ __commonJSMin(((expor
 		if (!supportChoice.match(/^(?:tool|skill)\s*:\s*(.+)$/iu)?.[1]) return /* @__PURE__ */ new Set();
 		return rankedToolNamesForTurnText(tools, supportChoice, { maxTools: 1 });
 	}
-	function searchRelatedDeferredTools(tools, query, options = {}) {
+	function searchRelatedDeferredTools(tools, query) {
 		const normalized = normalizeDeferredToolQuery(query).toLowerCase();
 		if (!normalized || normalized.startsWith("select:")) return [];
 		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) && !TOOL_RANK_STOP_WORDS.has(token));
+		const requiredNameTokens = tokens.filter((token) => token.startsWith("+")).map((token) => token.slice(1)).filter(Boolean);
+		const searchTokens = tokens.filter((token) => !token.startsWith("+")).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) => {
+		return tools.map((tool) => {
 			const name = String(tool?.name || "").toLowerCase();
 			const description = String(tool?.description || "").toLowerCase();
 			if (!requiredNameTokens.every((token) => name.includes(token))) return null;
@@ -239874,12 +239967,7 @@ var import_turn_tool_performance_policy = (/* @__PURE__ */ __commonJSMin(((expor
 				score,
 				matchedTokens
 			} : null;
-		}).filter(Boolean).sort((left, right) => right.matchedTokens - left.matchedTokens || right.score - left.score || String(left.tool.name).localeCompare(String(right.tool.name)));
-		if (relaxRequiredNameTokens && ranked.length > 0) {
-			const best = ranked[0];
-			return ranked.filter((entry) => entry.matchedTokens === best.matchedTokens && entry.score === best.score).slice(0, 5).map((entry) => entry.tool);
-		}
-		return ranked.slice(0, 5).map((entry) => entry.tool);
+		}).filter(Boolean).sort((left, right) => right.matchedTokens - left.matchedTokens || right.score - left.score || String(left.tool.name).localeCompare(String(right.tool.name))).slice(0, 5).map((entry) => entry.tool);
 	}
 	function rememberLoadedTool(loadedToolNames, name) {
 		loadedToolNames.delete(name);
@@ -239904,11 +239992,10 @@ var import_turn_tool_performance_policy = (/* @__PURE__ */ __commonJSMin(((expor
 		const usedNames = new Set([...selectedTools, ...available.values()].map((tool) => String(tool?.name ?? "")));
 		let loaderName = DEFERRED_TOOL_LOADER_NAME;
 		for (let suffix = 1; usedNames.has(loaderName); suffix += 1) loaderName = `${DEFERRED_TOOL_LOADER_NAME}_${suffix}`;
-		const deferredCount = available.size;
 		const loader = {
 			name: loaderName,
 			description: [
-				`Search ${deferredCount} deferred ${deferredCount === 1 ? "tool schema" : "tool schemas"} without loading all definitions.`,
+				"Search deferred tool schemas without loading all definitions.",
 				"Use select:leaf_name for one known tool, plain keywords to search, +word to require a name word, or catalog:fragment to list matching names.",
 				`Loaded tools are available in the next step; up to ${MAX_PERSISTENT_DEFERRED_TOOLS} recently selected schemas remain loaded when the context budget allows.`
 			].join("\n"),
@@ -239939,10 +240026,6 @@ var import_turn_tool_performance_policy = (/* @__PURE__ */ __commonJSMin(((expor
 							matches = searchRelatedDeferredTools([...available.values()], query);
 							relatedFallback = matches.length > 0;
 						}
-						if (matches.length === 0) {
-							matches = searchRelatedDeferredTools([...available.values()], query, { relaxRequiredNameTokens: true });
-							relatedFallback = matches.length > 0;
-						}
 						if (matches.length === 0) {
 							const alreadyLoaded = query.toLowerCase().startsWith("select:") ? searchDeferredTools(selectedTools.filter((tool) => tool?.name !== loaderName), query) : [];
 							if (alreadyLoaded.length === 1) return {
@@ -239981,6 +240064,7 @@ var import_turn_tool_performance_policy = (/* @__PURE__ */ __commonJSMin(((expor
 		return loader;
 	}
 	module.exports = {
+		channelMessagesForTurnText,
 		isDeferredToolLoader: (tool) => deferredToolLoaders.has(tool),
 		CORE_TOOL_NAMES,
 		DEFERRED_TOOL_LOADER_NAME,
@@ -241283,10 +241367,14 @@ var ReplayBuilder = class {
 		return this.records;
 	}
 	removeMessagesFrom(records, removedMessages) {
-		for (let i = records.length - 1; i >= 0; i--) {
-			const record = records[i];
-			if (record.type === "message" && removedMessages.has(record.message)) records.splice(i, 1);
+		let retained = 0;
+		for (let index = 0; index < records.length; index++) {
+			const record = records[index];
+			if (record.type === "message" && removedMessages.has(record.message)) continue;
+			if (retained !== index) records[retained] = record;
+			retained++;
 		}
+		records.length = retained;
 	}
 };
 //#endregion
@@ -242225,6 +242313,7 @@ function withThinkingOnlyRecovery(llm, onTimeout, observeExecution) {
 		systemPrompt: llm.systemPrompt,
 		modelName: llm.modelName,
 		capability: llm.capability,
+		rebuildsMessagesAtRequestBoundary: llm.rebuildsMessagesAtRequestBoundary,
 		prepareRequestBoundary: llm.prepareRequestBoundary?.bind(llm),
 		isRetryableError: llm.isRetryableError === void 0 ? void 0 : (error) => !recoveryCallbackFailed && !(error instanceof ThinkingOnlyTimeoutError) && (llm.isRetryableError?.(error) ?? false),
 		async chat(params) {
@@ -250458,7 +250547,9 @@ async function executeLoopStep(deps) {
 		if (beforeStep?.block === true) throw new Error(beforeStep.reason ?? `Step ${String(currentStep)} was blocked`);
 	}
 	signal.throwIfAborted();
-	const messages = await buildMessages();
+	const prepareRequestBoundary = llm.prepareRequestBoundary?.bind(llm);
+	const deferMessageBuild = prepareRequestBoundary !== void 0 && llm.rebuildsMessagesAtRequestBoundary === true;
+	const messages = deferMessageBuild ? [] : await buildMessages();
 	signal.throwIfAborted();
 	const stepUuid = randomUUID();
 	const stepEvents = createStepEventGate({
@@ -250468,7 +250559,6 @@ async function executeLoopStep(deps) {
 		stepUuid,
 		onStepStarted
 	});
-	const prepareRequestBoundary = llm.prepareRequestBoundary?.bind(llm);
 	const step = {
 		tools,
 		hooks,
@@ -250548,7 +250638,7 @@ async function executeLoopStep(deps) {
 			turnStep: `${turnId}.${String(currentStep)}`,
 			model: llm.modelName
 		});
-		const strictMessages = await buildMessagesStrict();
+		const strictMessages = deferMessageBuild ? [] : await buildMessagesStrict();
 		signal.throwIfAborted();
 		let strictParams = {
 			...chatParams,
@@ -265741,7 +265831,9 @@ function renderPersistedToolResult(toolName, toolCallId, text, outputPath, maxCh
 		`output_path: ${outputPath}`,
 		"next_step: Use Read with output_path to page through the full output."
 	];
-	lines.push("", "[preview]", text.slice(0, TOOL_RESULT_PREVIEW_CHARS));
+	let preview = text.slice(0, TOOL_RESULT_PREVIEW_CHARS);
+	if (/[\uD800-\uDBFF]$/.test(preview)) preview = preview.slice(0, -1);
+	lines.push("", "[preview]", preview);
 	return lines.join("\n");
 }
 function safeToolResultFileStem(toolName, toolCallId) {
@@ -267298,6 +267390,48 @@ var HistoricalToolProjection = class {
 	}
 };
 //#endregion
+//#region ../../packages/agent-core/src/agent/turn/baseline-skill-projection.ts
+const BASELINE_ORIGIN = "baseline_skill:blun-design-dna";
+const NONVISUAL_TASK = /\b(?:backend|back-end|serverseitig|server-side|datenbank|database|sql|api[- ](?:endpoint|route)|memory broker)\b/i;
+const VISUAL_TASK = /\b(?:ui|ux|frontend|front-end|website|webseite|web|page|screen|screenshot|bild|image|design|layout|css|html|react|vue|svelte|komponente|component|button|formular|form|style|visual|visuell|interaction|interaktion|interface|oberfl[aä]che|dashboard|landing|mobile|responsive|accessibility|barrierefreiheit|tui|terminal|konsole|console|browser|diagram|chart|graph)\b/i;
+const SHORT_REFERENCE = [
+	"<system-reminder>",
+	"The BLUN Design DNA baseline is retained in the session. Its visual rules are dormant for this explicitly non-visual backend or data task. Preserve security, privacy, accessibility, permissions, and verification. If the work turns visual or interactive, use the complete baseline before continuing.",
+	"</system-reminder>"
+].join("\n");
+function shortNonVisualText(text) {
+	return text.length <= 500 && !/[<>]/.test(text) && !/https?:\/\//i.test(text) && NONVISUAL_TASK.test(text) && !VISUAL_TASK.test(text);
+}
+function clearlyNonVisual(input, origin) {
+	if (origin.kind !== "user" || input.length !== 1 || input[0]?.type !== "text") return false;
+	const text = input[0].text;
+	if (text.length > 16e3 || /\b(?:image_path|attachment_file_id)\s*=|Telegram-Anhang:/i.test(text)) return false;
+	const messages = (0, import_turn_tool_performance_policy.channelMessagesForTurnText)(text);
+	if (messages.length === 0) return shortNonVisualText(text);
+	if (messages.some((message) => !message.telegram || !shortNonVisualText(message.text)) || messages.reduce((size, message) => size + message.text.length, 0) > 500) return false;
+	let cursor = 0;
+	let remainder = "";
+	for (const message of messages) {
+		remainder += text.slice(cursor, message.start);
+		cursor = message.end;
+	}
+	remainder += text.slice(cursor);
+	return !VISUAL_TASK.test(remainder) && remainder.split(/\r?\n/).every((line) => line.trim().length === 0 || /^\[(?:GRUPPENANTWORT|REPLY-PFLICHT|SEMANTISCHE ADRESSIERUNG|NUR MITLESEN)\b[^\r\n]*\]$/.test(line.trim()));
+}
+/** Request-only view; the context, records, and resume state keep the full skill. */
+function projectBaselineSkillForTurn(history, input, origin, turnAnchor) {
+	if (!clearlyNonVisual(input, origin)) return history;
+	const anchorIndex = turnAnchor === void 0 ? -1 : history.indexOf(turnAnchor);
+	if (anchorIndex >= 0 && history.slice(anchorIndex + 1).some((message) => message.role === "tool" && message.content.some((part) => part.type !== "text" || VISUAL_TASK.test(part.text)))) return history;
+	return history.map((message) => message.origin?.kind === "injection" && message.origin.variant === BASELINE_ORIGIN ? {
+		...message,
+		content: [{
+			type: "text",
+			text: SHORT_REFERENCE
+		}]
+	} : message);
+}
+//#endregion
 //#region ../../packages/agent-core/src/agent/response-review-decision.ts
 const STAGES = [
 	"setup",
@@ -267606,6 +267740,23 @@ function createReviewedOutputDispatcher(options) {
 }
 //#endregion
 //#region ../../packages/agent-core/src/agent/turn/index.ts
+function restoreRecentMcpToolNames(history, loadedNames) {
+	const successfulResults = /* @__PURE__ */ new Set();
+	const recentNames = [];
+	const start = Math.max(0, history.length - 256);
+	for (let index = history.length - 1; index >= start && recentNames.length < import_turn_tool_performance_policy.MAX_PERSISTENT_DEFERRED_TOOLS; index--) {
+		const message = history[index];
+		if (message.role === "tool" && message.isError !== true && message.toolCallId !== void 0) {
+			if (successfulResults.size < 64) successfulResults.add(message.toolCallId);
+		} else if (message.role === "assistant") for (let callIndex = message.toolCalls.length - 1; callIndex >= 0; callIndex--) {
+			const call = message.toolCalls[callIndex];
+			if (!successfulResults.delete(call.id) || !/^mcp__[\w.:-]{1,160}$/.test(call.name) || recentNames.includes(call.name)) continue;
+			recentNames.push(call.name);
+			if (recentNames.length >= import_turn_tool_performance_policy.MAX_PERSISTENT_DEFERRED_TOOLS) break;
+		}
+	}
+	for (const name of recentNames.reverse()) loadedNames.add(name);
+}
 function blunExtractText(content) {
 	if (typeof content === "string") return content;
 	if (Array.isArray(content)) return content.map((c) => typeof c === "string" ? c : c && typeof c === "object" && "text" in c && typeof c.text === "string" ? c.text : "").join(" ");
@@ -267625,7 +267776,7 @@ function blunTurnNeedsTools(input, origin) {
 	return !/^(?:hi|hallo|hey|hello|hoi|moin|servus|yo|danke|thanks|thx|bye|tschau|ciao)[.!?]*$/.test(text) && !/^(?:wer bist du|who are you|wie geht(?: es dir)?|how are you|na)[.!?]*$/.test(text);
 }
 function blunThinkingIntentInput(input) {
-	const channelText = [...blunExtractText(input).matchAll(/(?:^|\r?\n)<channel\b[^>]*>\r?\n([\s\S]*?)\r?\n<\/channel>(?=\r?\n|$)/gi)].at(-1)?.[1];
+	const channelText = (0, import_turn_tool_performance_policy.channelMessagesForTurnText)(blunExtractText(input)).at(-1)?.text;
 	return channelText === void 0 ? input : [{
 		type: "text",
 		text: channelText
@@ -267700,7 +267851,31 @@ function blunToolsForOrigin(tools, origin) {
 */
 function blunSelectTurnTools(tools, maxContextTokens, loadedToolNames = /* @__PURE__ */ new Set(), requiredToolNames = /* @__PURE__ */ new Set(), selected = []) {
 	const schemaBudget = (0, import_turn_tool_performance_policy.toolSchemaBudgetTokens)(maxContextTokens);
-	if (estimateTokensForTools(tools, schemaBudget) <= schemaBudget || tools.some(import_turn_tool_performance_policy.isDeferredToolLoader)) {
+	const estimates = /* @__PURE__ */ new Map();
+	const estimateSummary = (tool) => {
+		let estimate = estimates.get(tool);
+		if (estimate === void 0) {
+			estimate = { summary: estimateTokens(tool.name) + estimateTokens(tool.description) };
+			estimates.set(tool, estimate);
+		}
+		return estimate;
+	};
+	const estimateSelection = (candidates) => {
+		let total = 0;
+		for (const candidate of candidates) {
+			const estimate = estimateSummary(candidate);
+			if (estimate.complete === void 0) estimate.complete = estimate.summary + estimateTokens(JSON.stringify(candidate.parameters));
+			total += estimate.complete;
+			if (total > schemaBudget) break;
+		}
+		return total;
+	};
+	let summaryTokens = 0;
+	for (const tool of tools) {
+		summaryTokens += estimateSummary(tool).summary;
+		if (summaryTokens > schemaBudget) break;
+	}
+	if (tools.some(import_turn_tool_performance_policy.isDeferredToolLoader) || summaryTokens <= schemaBudget && estimateSelection(tools) <= schemaBudget) {
 		selected.splice(0, selected.length, ...tools);
 		return selected;
 	}
@@ -267715,7 +267890,7 @@ function blunSelectTurnTools(tools, maxContextTokens, loadedToolNames = /* @__PU
 	};
 	choose();
 	for (const name of loadedToolNames) {
-		if (estimateTokensForTools(selected, schemaBudget) <= schemaBudget) break;
+		if (estimateSelection(selected) <= schemaBudget) break;
 		if (justLoaded.has(name)) continue;
 		if (!remembered.delete(name)) continue;
 		choose();
@@ -268079,6 +268254,7 @@ var TurnFlow = class {
 	}
 	finishResume() {
 		if (this.activeTurn === "resuming") this.activeTurn = null;
+		restoreRecentMcpToolNames(this.agent.context.history, this.loadedToolNames);
 		this.steerBuffer.length = 0;
 	}
 	/**
@@ -268457,11 +268633,13 @@ var TurnFlow = class {
 			if (current.length !== raw.length || current.some((message, index) => message !== raw[index])) {
 				const latest = personalMemoryRecall === void 0 ? current : [...current, personalMemoryRecall];
 				const retained = taskToolsNeeded ? latest : greetingHistory(latest, greetingAnchor);
-				partialContext = retained.length < latest.length;
-				return retained;
+				const request = projectBaselineSkillForTurn(retained, toolInput, origin, turnAnchor);
+				partialContext = retained.length < latest.length || request !== retained;
+				return request;
 			}
-			partialContext = selected.length < history.length || projected.changed;
-			return projected.history;
+			const request = projectBaselineSkillForTurn(projected.history, toolInput, origin, turnAnchor);
+			partialContext = selected.length < history.length || projected.changed || request !== projected.history;
+			return request;
 		};
 		const turnLLM = this.agent.llmForTurn(turnNeedsThinking ? void 0 : "off", turnId);
 		const turnTools = this.agent.tools.captureTurnTools();
@@ -272040,15 +272218,17 @@ var FallbackLLM = class {
 	onModelChanged;
 	prepareRequest;
 	onContextOverflow;
+	messagePreparation;
 	currentIndex = 0;
 	attemptedProviders = /* @__PURE__ */ new Set();
 	errorsAfterOutput = /* @__PURE__ */ new WeakSet();
 	rebuildBoundaryMessages;
-	constructor(candidates, onModelChanged = () => {}, prepareRequest, onContextOverflow) {
+	constructor(candidates, onModelChanged = () => {}, prepareRequest, onContextOverflow, messagePreparation = "eager") {
 		this.candidates = candidates;
 		this.onModelChanged = onModelChanged;
 		this.prepareRequest = prepareRequest;
 		this.onContextOverflow = onContextOverflow;
+		this.messagePreparation = messagePreparation;
 		if (candidates.length === 0) throw new Error("FallbackLLM requires at least one model candidate.");
 	}
 	get activeAlias() {
@@ -272063,6 +272243,9 @@ var FallbackLLM = class {
 	get capability() {
 		return this.current.llm.capability;
 	}
+	get rebuildsMessagesAtRequestBoundary() {
+		return this.messagePreparation === "boundary" && this.prepareRequest !== void 0;
+	}
 	async prepareRequestBoundary(params, rebuildMessages) {
 		params.signal.throwIfAborted();
 		this.rebuildBoundaryMessages = rebuildMessages;
@@ -272745,6 +272928,15 @@ var Agent$1 = class {
 			};
 			if (this.activeProfile !== void 0 && this.rawSystemPromptContext !== void 0 && this.config.systemPrompt === this.profileSystemPromptText) this.updateSystemPromptFromProfile(this.activeProfile, this.fitProfileInstructions(this.activeProfile, this.rawSystemPromptContext, requestTools, true));
 			let systemPrompt = this.effectiveSystemPrompt;
+			if (this.config.runtimeModel(_candidate.alias).provider.name === "blun") {
+				const fixedTools = requestTools.filter((tool) => tool.name !== "CompactConversation");
+				const fixedRequestBytes = estimateBlunSerializedBodyBytes(systemPrompt, fixedTools, []) + 4096;
+				if (fixedRequestBytes >= 5e5) throw new BlunError(ErrorCodes.CONTEXT_OVERFLOW, "Fixed instructions or tools exceed the BLUN request limit; compaction cannot reduce them.", { details: {
+					contextBrakeBlocked: true,
+					estimatedRequestBytes: fixedRequestBytes,
+					requestBudgetBytes: 5e5
+				} });
+			}
 			const preflightStartedAt = performance.now();
 			const compacted = await this.fullCompaction.beforeStep(params.signal, {
 				messages: params.messages,
@@ -272789,7 +272981,7 @@ var Agent$1 = class {
 			};
 		}, (candidate, _params, error) => {
 			this.fullCompaction.observeContextOverflow(error, candidate.alias);
-		});
+		}, "boundary");
 	}
 	createKosongLLM(modelAlias, thinkingEffort) {
 		const runtimeModel = this.config.runtimeModel(modelAlias);
@@ -349778,6 +349970,7 @@ var SDKRpcClient = class extends SDKRpcClientBase {
 	core;
 	ready;
 	usesDefaultConfigPath;
+	restoreProfileModel;
 	constructor(options = {}) {
 		super();
 		this.identity = options.identity === void 0 ? void 0 : assertBlunHostIdentity(options.identity);
@@ -349787,9 +349980,11 @@ var SDKRpcClient = class extends SDKRpcClientBase {
 			configPath: options.configPath
 		});
 		this.usesDefaultConfigPath = options.configPath === void 0;
+		const authHomeDir = authHomeForProfile(this.homeDir);
+		this.restoreProfileModel = this.usesDefaultConfigPath && authHomeDir !== this.homeDir;
 		this.telemetry = options.telemetry ?? noopTelemetryClient;
 		this.auth = new BlunAuthFacade({
-			homeDir: authHomeForProfile(this.homeDir),
+			homeDir: authHomeDir,
 			configPath: this.configPath,
 			identity: this.identity,
 			onRefresh: options.onOAuthRefresh
@@ -349809,7 +350004,7 @@ var SDKRpcClient = class extends SDKRpcClientBase {
 	}
 	async ensureConfigFile() {
 		await ensureConfigFile(this.configPath);
-		if (this.usesDefaultConfigPath && authHomeForProfile(this.homeDir) !== this.homeDir) await this.auth.restoreMissingProfileModel();
+		if (this.restoreProfileModel) await this.auth.restoreMissingProfileModel();
 	}
 	async close() {
 		try {