blun-king-cli 9.1.612 → 9.1.614

package/bundled-agent-sources.json

@@ -506,7 +506,7 @@
     "agent-spine-plugin/src/cli-sharing.js": "4a4700510bfcb75fec34033cd270f3ac8e067a14dbcc7c7220613c365a66eb33",
     "agent-spine-plugin/src/cli.js": "9f0e2c486db488234e84f573804268c4e4e9921a71f59c0d69c2003228ce87a3",
     "agent-spine-plugin/src/codex-reader-launcher.js": "be1b50914e7ea10325b8136dd1926a559541cc9c5f5e2fad16a8c047cc2e8180",
-    "agent-spine-plugin/src/hook.js": "6335bb419ba3fe7aa9da6c2d7e2cf0c45511e71b71e5e8128f58f062011f3866",
+    "agent-spine-plugin/src/hook.js": "cfe335e04fc191180a129e5e416e11181dd2475f208c904059eafc9dc4b5a484",
     "agent-spine-plugin/src/index.js": "ef3a85e94c1e70e054b5afa2ea0ccda28ed4c917ade8aba0388ad859bc9a30b5",
     "agent-spine-plugin/src/lib/acceptance.js": "acace8d372e7580831d9f6352d4dc9a132f222ab288632c4c3d765b23b7a0947",
     "agent-spine-plugin/src/lib/action-lesson-recall.js": "9a36d0602ed98bf0f7a374dc4f7702bffa4d5745fe6d1a05db2e4b327b0c3948",
@@ -554,7 +554,7 @@
     "agent-spine-plugin/src/lib/delivery-shell-wrapper.js": "95e178bcf8e1d7ea0bca58aa6aa5ea594bd15cac31f242e0e19250994732cd13",
     "agent-spine-plugin/src/lib/delivery-target.js": "29109a53a1dc487e10a41315194c88c4d9d0b425a07420d3420166f9050aded6",
     "agent-spine-plugin/src/lib/delivery-verification.js": "b9e094ebccf22a15e35505181b6968644087e455ec6826ba2c67ea61a5f2f5cc",
-    "agent-spine-plugin/src/lib/documents.js": "b3d254241326d57c397bd65c11f3d13abe9bb0d347615b939277a11485f14680",
+    "agent-spine-plugin/src/lib/documents.js": "49043da206c9948f4400048443772e891ee3367bc6a94e15a48df20f36c22870",
     "agent-spine-plugin/src/lib/feed-transport.js": "5236f0a7010e6896dd1dc28eb56b7562d2c9037da171119bf2b3fe82b7055055",
     "agent-spine-plugin/src/lib/filesystem-retry.js": "eba6335a068b0f5226e7c6b001b2dbadb294ad572098a2b713a3c78449ad785a",
     "agent-spine-plugin/src/lib/gateway-common.js": "18b42c4e28963ecad64091f1b3416332aa829fe13d869efbe6b67c749e31992f",
@@ -580,7 +580,7 @@
     "agent-spine-plugin/src/lib/hook-artifact-guards.js": "9e05895e9353afec815127322baccaed619969c752f6b00154354731afc8fac4",
     "agent-spine-plugin/src/lib/hook-audit.js": "05dee25020febcf628f7474b48cb7cd94dab84dd0127394d6ac80a5a5c91312c",
     "agent-spine-plugin/src/lib/hook-briefing-use.js": "ca4aed816d27f027bcc42600e80fa09d886d975d134a596c003f15603a381ed1",
-    "agent-spine-plugin/src/lib/hook-context.js": "e9ad81e9c6ba38bb88547e82bc87322f53d51e0359913868d8b131f334d19493",
+    "agent-spine-plugin/src/lib/hook-context.js": "a2fe610207dbe8e5fb5455aa0d148df8f233fcbe025e8b1007379b875a1fc84a",
     "agent-spine-plugin/src/lib/hook-final-message.js": "364044bba68c211a4b0f0474e5d77b6b3eb9db22fb64faea9bce623e4f4a4c9f",
     "agent-spine-plugin/src/lib/hook-input.js": "61e7257a1b0e06072e6159cf47fad4c97c52d6d7261eafdf0a9ea7f839845891",
     "agent-spine-plugin/src/lib/hook-output.js": "38a05c10e612f8aa449cca3ad25705491825c229191365e114a4978a2b8d32e9",
@@ -589,7 +589,7 @@
     "agent-spine-plugin/src/lib/hook-protection.js": "9a42a3f86c92ae09a6b312faf3b9ea7bbe72e89dd227c3b3468d968cca36628f",
     "agent-spine-plugin/src/lib/hook-stop-verification.js": "f6b4636b2136c8244f4f5deb8cd3fee6fd646b7d6b495093ff0c675411226eb2",
     "agent-spine-plugin/src/lib/hook-timeline.js": "27fcdae15e3b35372f598ee30c1c6ae72afde377e684938fadf76b9fa7b8ee90",
-    "agent-spine-plugin/src/lib/host-instruction-budget.js": "1d2515e15455e4149ba2c60de3445f67afc586bfaaf233a1538027e838eb43ae",
+    "agent-spine-plugin/src/lib/host-instruction-budget.js": "214bafaa4dc54405bea73ad78aeb63f78dd27ccd34a27fb4c2245f6c9f578cd0",
     "agent-spine-plugin/src/lib/https-transport.js": "c3482f88851d6c04bffac160bfcc8fb447e8b188abf0e3a1ce5a4d25a3ce2307",
     "agent-spine-plugin/src/lib/identifier-analysis.js": "a925db33ea8efabd3ce0a5fac1e74418b8a95c36fac1fedb4eaf846d0b4bcc76",
     "agent-spine-plugin/src/lib/indexed-memory-offline.js": "0d4c14fcdabda4bbe35c20a5526c8511253839bb310c0c2bfb5dd1abc57e047c",
@@ -637,7 +637,7 @@
     "agent-spine-plugin/src/lib/persona-runtime.js": "1f4c2f44edacc80bf92fc6906c78410ead0e379f2aaf34fed4bda55d4effe393",
     "agent-spine-plugin/src/lib/pre-answer-timeline-recall.js": "50780f8f6ec1578fc06b82cf8f2902a203232964b6745d8155049f5284ff9221",
     "agent-spine-plugin/src/lib/preflight-delivery-id.js": "d1467ac8278de877a44253428c7503991a08cc64f61ec6409f0f153535c7a2a6",
-    "agent-spine-plugin/src/lib/preflight.js": "f3e2df94fcc3370aebdfaccdd4f387d9aac7bfbec0eee441bbce2fbc91bac208",
+    "agent-spine-plugin/src/lib/preflight.js": "d3ef8476146c825c110335b38e8fa37ae95313845384251d801df208698dd0e2",
     "agent-spine-plugin/src/lib/project-portfolio.js": "9125715201d97b694827b400c8829cecfbbc142d01b19bd16f92915be08a904f",
     "agent-spine-plugin/src/lib/runtime.js": "e9cb158700de18038651bbb21ac8211fcad8d50b016c7276dd078146a21f5555",
     "agent-spine-plugin/src/lib/selfstarter-core.js": "428ab53db57163b53d6125df914fee14bfbdd555c761cf89993d273f4d92f5a9",
@@ -672,7 +672,7 @@
     "agent-spine-plugin/src/lib/session-timeline-windows-acl.js": "e76fe7834ea45758c38aba39ebe956336785a8978a9edc79bd2873def6657b75",
     "agent-spine-plugin/src/lib/session-timeline.js": "6f14664024b454c3186ecba0b1b4d3402b5fc1e491f7cf5a4787a7be22536c07",
     "agent-spine-plugin/src/lib/sharing.js": "dee040d25122a39d3b44e752d1a22f64331c14bdd800f7b85cb9edc3ca9728b6",
-    "agent-spine-plugin/src/lib/source-roots.js": "d41d8d6e22236fd3e536029f0de436f5144f0fbd05c6e15483dd914748a34b54",
+    "agent-spine-plugin/src/lib/source-roots.js": "3091993a184e4eccbc08faedca8524810d2589cb606d3b8128a13968a27fc069",
     "agent-spine-plugin/src/lib/source-tree-scan.js": "23bcac5c72aca9c43556fc606e5d37bde43c4ae8ee92017b02a8a5b7098fcbf3",
     "agent-spine-plugin/src/lib/sqlite-transport.js": "5a329d4428c69e67fd56280b7258654572a792c0f03fb11e1f6a95ba8e0cf68a",
     "agent-spine-plugin/src/lib/task-knowledge-context.js": "4163bde2cf3fdcc1b51b4981d4425e996a042a2295e123b5941f360da029e543",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blun-king-cli",
-  "version": "9.1.612",
+  "version": "9.1.614",
   "description": "BLUN CLI - your own AI agent with a Telegram channel. Get it done. With BLUN.",
   "license": "MIT",
   "bin": {

package/worker-host.mjs

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-// BLUN_BUILD_INPUT_SHA256:f9f2527561c5e5ec1afc53eef27313667c4d323a444532439e73a66865340f69
+// BLUN_BUILD_INPUT_SHA256:0533ca113dc07cc119988be5e76555dec986b6881903f8e2b537f5adf96cc2c5
 import { fileURLToPath as __cjsShimFileURLToPath } from 'node:url';
 import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
 const __dirname = __cjsShimDirname(__filename);
 import { createRequire } from "node:module";
-import crypto$1, { createHash, createHmac, randomBytes, randomInt, randomUUID } from "node:crypto";
+import crypto$1, { createHash, 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,9 +1888,6 @@ 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);
@@ -1899,9 +1896,6 @@ 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
@@ -2654,13 +2648,6 @@ 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 = [];
@@ -2970,13 +2957,12 @@ 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?.onRequestSent !== void 0 || options?.onSerializedRequest !== void 0 || options?.onTransportAttempt !== void 0 ? {
+			const requestOptions = options?.signal !== void 0 || options?.transportMaxRetries !== 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);
@@ -2985,6 +2971,7 @@ 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
@@ -21770,15 +21757,10 @@ 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) {
-			notLoadedCandidates.add(kaos.normpath(path));
-			return false;
-		}
+		if (file === void 0) 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;
@@ -21814,10 +21796,7 @@ async function loadAgentsMdForRoots(kaos, brandHome, workDirs) {
 	return {
 		content,
 		warning: totalBytes > AGENTS_MD_RECOMMENDED_MAX_BYTES ? `AGENTS.md total ${formatKB(totalBytes)} KB exceeds the recommended ${formatKB(AGENTS_MD_RECOMMENDED_MAX_BYTES)} KB. Large instruction files increase cost and may impact performance; consider trimming.` : void 0,
-		sources: {
-			...rendered.measure(),
-			...notLoadedCandidates.size === 0 ? {} : { notLoadedCandidates: [...notLoadedCandidates] }
-		}
+		sources: rendered.measure()
 	};
 }
 async function loadAdditionalDirsInfo(kaos, additionalDirs) {
@@ -28799,20 +28778,17 @@ 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.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 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 instructionSources = copies === 0 ? {
 					version: 1,
 					totalBytes: 0,
 					generatedBytes: 0,
-					files: sourceMatches ? sources.files.map((file) => copyInstructionFileBytes(file, 0)) : [],
-					...notLoadedCandidates
+					files: sourceMatches ? sources.files.map((file) => copyInstructionFileBytes(file, 0)) : []
 				} : !sourceMatches ? void 0 : {
 					version: 1,
 					totalBytes: sources.totalBytes * copies,
 					generatedBytes: sources.generatedBytes * copies,
-					files: sources.files.map((file) => copyInstructionFileBytes(file, copies)),
-					...notLoadedCandidates
+					files: sources.files.map((file) => copyInstructionFileBytes(file, copies))
 				};
 				const skillListingSources = counts === void 0 ? void 0 : scaleSkillListingSources(skillSources, vars["BLUN_SKILLS"] ?? "", counts.skillListingBytes);
 				context.onContributions(counts === void 0 ? void 0 : {
@@ -230259,19 +230235,16 @@ 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 && requestBudget === void 0) reason = "no_budget";
-		else if (!historyThresholdReached && !requestThresholdReached && (thresholdTokens === void 0 || !Number.isFinite(usedTokens) || usedTokens < thresholdTokens)) reason = "below_threshold";
+		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 (!this.hasShrinkableHistory(projected)) reason = "nothing_to_compact";
 		return {
 			eligible: reason === "eligible",
 			usedTokens,
 			thresholdTokens,
 			...historyBudget,
-			...requestBudget,
 			reason
 		};
 	}
@@ -230293,35 +230266,6 @@ 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") + extraBytes.toolsBytes >= 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) {
@@ -230330,9 +230274,7 @@ var FullCompaction = class {
 				used_tokens: status.usedTokens,
 				threshold_tokens: status.thresholdTokens,
 				used_history_bytes: status.usedHistoryBytes,
-				threshold_history_bytes: status.thresholdHistoryBytes,
-				used_request_bytes_estimate: status.usedRequestBytesEstimate,
-				threshold_request_bytes: status.thresholdRequestBytes
+				threshold_history_bytes: status.thresholdHistoryBytes
 			});
 		}
 		return status;
@@ -230461,9 +230403,7 @@ var FullCompaction = class {
 		const requestTokens = this.estimateCurrentRequestTokens(requestContext);
 		const budget = this.getCompactionBudgetTokens();
 		const historyBudget = this.requestHistoryByteBudget(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);
+		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);
 		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;
@@ -239036,32 +238976,6 @@ 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",
@@ -239320,7 +239234,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 || queryTokens.length === 1 && relatedNameMatches >= 1 && score >= 5 ? {
+			return matchedTokens >= 2 || exactNameMatches >= 1 && score >= 10 || relatedNameMatches >= 1 && score >= 5 ? {
 				name: document.name,
 				score,
 				matchedTokens,
@@ -239341,11 +239255,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.match(/\+?[\p{L}\p{N}_-]+/gu) || [];
+		const tokens = normalized.split(/\s+/).filter(Boolean);
 		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 searchTokens = [...tokens.filter((token) => !token.startsWith("+")), ...relaxRequiredNameTokens ? requestedNameTokens : []].filter((token) => !TOOL_SEARCH_INTENT_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) => {
@@ -267676,7 +267590,6 @@ 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;
@@ -267702,13 +267615,6 @@ 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;
 				});
@@ -267878,26 +267784,9 @@ 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;
@@ -267908,14 +267797,12 @@ 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];
@@ -267926,7 +267813,7 @@ var TurnFlow = class {
 			partialContext = selected.length < history.length || projected.changed;
 			return projected.history;
 		};
-		const turnLLM = this.agent.llmForTurn(turnNeedsThinking ? void 0 : "off", turnId);
+		const turnLLM = this.agent.llmForTurn(turnNeedsThinking ? void 0 : "off");
 		const turnTools = this.agent.tools.captureTurnTools();
 		while (true) {
 			signal.throwIfAborted();
@@ -267936,7 +267823,6 @@ 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);
@@ -267949,7 +267835,6 @@ 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({
@@ -267962,24 +267847,14 @@ var TurnFlow = class {
 						}, completion);
 					},
 					llm: turnLLM,
-					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;
-					},
+					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
+					}),
 					dispatchEvent: this.buildDispatchEvent(turnId, signal, onFinalResponse, () => partialContext),
 					tools: selectedTools,
 					log: this.agent.log,
@@ -267996,10 +267871,8 @@ 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();
 						},
@@ -271665,13 +271538,8 @@ var LlmRequestLogger = class {
 	toolsEstimatedTokens = 0;
 	requestSequence = 0;
 	lastTurnRequest;
-	serializedPrefixKey;
-	requestSignatures = /* @__PURE__ */ new Map();
-	prefixComparisons = /* @__PURE__ */ new Map();
-	lastSerializedRequest;
-	constructor(log, serializedPrefixDiagnostic = process.env["BLUN_DIAG_SERIALIZED_PREFIX"] === "1") {
+	constructor(log) {
 		this.log = log;
-		this.serializedPrefixKey = serializedPrefixDiagnostic ? randomBytes(32) : void 0;
 	}
 	logRequest(input) {
 		const sequence = ++this.requestSequence;
@@ -271688,10 +271556,6 @@ 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++;
@@ -271721,20 +271585,6 @@ 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);
@@ -271760,51 +271610,10 @@ 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,
-			...this.serializedPrefixKey === void 0 || sequence === void 0 ? {} : { requestSequence: sequence },
-			...serializedPrefix === void 0 ? {} : { serializedPrefix }
+			...stats
 		});
 		if (sequence === void 0 || this.lastTurnRequest?.sequence !== sequence) return;
 		const breakdown = stats.requestBreakdown;
@@ -271887,8 +271696,7 @@ function copyContributions(value) {
 			version: source.version,
 			totalBytes: source.totalBytes,
 			generatedBytes: source.generatedBytes,
-			files: source.files.map((file) => copyInstructionFileBytes(file)),
-			...source.notLoadedCandidates === void 0 ? {} : { notLoadedCandidates: [...source.notLoadedCandidates] }
+			files: source.files.map((file) => copyInstructionFileBytes(file))
 		} }
 	};
 }
@@ -271984,7 +271792,6 @@ var Agent$1 = class {
 	errorMemory;
 	replayBuilder;
 	additionalDirs;
-	systemPromptStartedAt = /* @__PURE__ */ new Date();
 	activeProfile;
 	brandHome;
 	_activeResponderModel;
@@ -272072,7 +271879,6 @@ 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
@@ -272095,12 +271901,6 @@ 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;
@@ -272126,7 +271926,7 @@ var Agent$1 = class {
 	get llm() {
 		return this.llmForTurn();
 	}
-	llmForTurn(thinkingEffort, diagnosticTurnId) {
+	llmForTurn(thinkingEffort) {
 		const selectedAlias = this.config.model;
 		const modelProvider = this.modelProvider;
 		if (modelProvider === void 0) throw new BlunError(ErrorCodes.MODEL_NOT_CONFIGURED, "Provider not set");
@@ -272141,7 +271941,6 @@ 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,
@@ -272150,13 +271949,6 @@ 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,
@@ -272261,7 +272053,6 @@ 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,