blun-king-cli 9.1.599 → 9.1.600

package/blun.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// BLUN_BUILD_INPUT_SHA256:25c271186c418490335e30ef395705d13d90d816c66cac47bb57835f2482f093
+// BLUN_BUILD_INPUT_SHA256:c0b3db57102f82b976cc669375212221a4788318dbd6d1bfc28e943f7bf649db
 import { fileURLToPath as __cjsShimFileURLToPath } from 'node:url';
 import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
@@ -230341,7 +230341,7 @@ var init_full = __esmMin((() => {
 					this.agent.log.error("failed to refresh system prompt after compaction", { error });
 				}
 				await this.agent.injection.injectAfterCompaction();
-				this.fitRetainedInput();
+				this.fitRetainedInput({}, result.keptHeadUserMessageCount !== void 0);
 				this.lastCompactedState = {
 					tokenCount: this.tokenCountWithPending,
 					modelAlias: this.agent.activeResponderModel ?? this.agent.config.modelAlias,
@@ -230377,17 +230377,18 @@ var init_full = __esmMin((() => {
 				this.agent.turn.onCompactionFinished();
 			}
 		}
-		fitRetainedInput(context = {}) {
+		fitRetainedInput(context = {}, freshBudgetedSelection = false) {
 			const budget = this.getCompactionBudgetTokens();
 			const window = this.getEffectiveMaxContextTokens();
 			const limit = window > 0 ? window - 1 : Infinity;
+			const hardContextLimit = window > 0 && !freshBudgetedSelection ? window : void 0;
 			const estimate = (messages) => this.estimateProjectedRequestTokens({
 				...context,
 				messages
 			});
 			const preserveLatestUser = this.agent.turn.hasActiveTurn;
-			if (budget === void 0) return this.agent.context.fitCompactionPrefix(limit, estimate, preserveLatestUser);
-			return this.agent.context.fitCompactionPrefix(Math.min(Math.floor(budget * .8), limit), estimate, preserveLatestUser) || this.agent.context.fitCompactionPrefix(Math.min(Math.floor(budget * .9) - 1, limit), estimate, preserveLatestUser);
+			if (budget === void 0) return this.agent.context.fitCompactionPrefix(limit, estimate, preserveLatestUser, hardContextLimit);
+			return this.agent.context.fitCompactionPrefix(Math.min(Math.floor(budget * .8), limit), estimate, preserveLatestUser, hardContextLimit) || this.agent.context.fitCompactionPrefix(Math.min(Math.floor(budget * .9) - 1, limit), estimate, preserveLatestUser, hardContextLimit);
 		}
 		buildInstruction(customInstruction) {
 			return renderPrompt(compaction_instruction_default, { customInstruction: customInstruction?.trim() ?? "" }).trimEnd();
@@ -234338,7 +234339,7 @@ var init_context$2 = __esmMin((() => {
 			this.agent.microCompaction.reset();
 			this.agent.emitStatusUpdated();
 		}
-		fitCompactionPrefix(maxRequestTokens, estimateRequest, preserveLatestUser = false) {
+		fitCompactionPrefix(maxRequestTokens, estimateRequest, preserveLatestUser = false, hardContextLimit) {
 			const prefixLength = this._history.findIndex((message) => message.origin?.kind === "compaction_summary");
 			if (prefixLength <= 0 || !Number.isSafeInteger(maxRequestTokens) || maxRequestTokens <= 0) return false;
 			const suffix = this._history.slice(prefixLength);
@@ -234350,7 +234351,9 @@ var init_context$2 = __esmMin((() => {
 				];
 				return Math.max(estimateTokensForMessages(messages), estimateRequest(project(messages, { dropOrphanResults: true })));
 			};
-			if (estimate(this._history.slice(0, prefixLength)) <= maxRequestTokens) return false;
+			const requestTokens = estimate(this._history.slice(0, prefixLength));
+			if (requestTokens <= maxRequestTokens) return false;
+			if (hardContextLimit !== void 0 && requestTokens >= hardContextLimit) return false;
 			const sourceKey = Symbol("compaction source");
 			const sources = collectCompactableUserMessages(this._history.slice(0, prefixLength)).map((message) => ({
 				...message,
@@ -265018,6 +265021,71 @@ var init_response_review_decision = __esmMin((() => {
 	]);
 }));
 //#endregion
+//#region ../../packages/agent-core/src/agent/response-review-deadline.ts
+function createResponseReviewDeadline(source) {
+	const absoluteExpiresAt = performance.now() + ABSOLUTE_TIMEOUT_MS;
+	const absolute = createDeadlineAbortSignal(source, ABSOLUTE_TIMEOUT_MS);
+	const controller = new AbortController();
+	const unlink = linkAbortSignal(absolute.signal, controller);
+	let stage = "setup";
+	let didTimeout = false;
+	let closed = false;
+	let idle;
+	let idleExpiresAt = 0;
+	const expire = () => {
+		didTimeout = true;
+		controller.abort(abortError$1());
+	};
+	const expireIfDue = () => {
+		if (closed || controller.signal.aborted) return;
+		const now = performance.now();
+		if (now >= absoluteExpiresAt || now >= idleExpiresAt) expire();
+	};
+	const refresh = (timeoutMs) => {
+		idleExpiresAt = performance.now() + timeoutMs;
+		if (idle !== void 0) clearTimeout(idle);
+		idle = setTimeout(expire, timeoutMs);
+	};
+	refresh(IDLE_TIMEOUT_MS);
+	return {
+		signal: controller.signal,
+		timedOut: () => didTimeout || absolute.timedOut(),
+		throwIfAborted: () => {
+			expireIfDue();
+			controller.signal.throwIfAborted();
+		},
+		progress: (event) => {
+			expireIfDue();
+			if (closed || controller.signal.aborted) return;
+			if (event === "native.start" && stage === "setup") {
+				stage = "native";
+				refresh(NATIVE_FIRST_CONTENT_MS);
+			} else if (event === "native.text" && stage === "native") refresh(IDLE_TIMEOUT_MS);
+			else if (event === "release.start" && stage === "native") {
+				stage = "release";
+				refresh(IDLE_TIMEOUT_MS);
+			} else if (event === "verification.start" && stage === "release") {
+				stage = "verification";
+				refresh(IDLE_TIMEOUT_MS);
+			}
+		},
+		clear: () => {
+			closed = true;
+			if (idle !== void 0) clearTimeout(idle);
+			idle = void 0;
+			unlink();
+			absolute.clear();
+		}
+	};
+}
+var IDLE_TIMEOUT_MS, NATIVE_FIRST_CONTENT_MS, ABSOLUTE_TIMEOUT_MS;
+var init_response_review_deadline = __esmMin((() => {
+	init_abort();
+	IDLE_TIMEOUT_MS = 3e4;
+	NATIVE_FIRST_CONTENT_MS = 9e4;
+	ABSOLUTE_TIMEOUT_MS = 12e4;
+}));
+//#endregion
 //#region ../../packages/agent-core/src/agent/response-review.ts
 function createReviewedOutputDispatcher(options) {
 	let pending = [];
@@ -265103,6 +265171,7 @@ function createReviewedOutputDispatcher(options) {
 		if (pending.length === 0) return options.dispatch(event);
 		if (event.uuid !== stepUuid) throw new Error("Response review step mismatch");
 		const currentEpoch = epoch;
+		const isCurrentCandidate = () => epoch === currentEpoch;
 		const parts = [...pending];
 		reviewing = true;
 		const text = parts.map((part) => part.part.type === "text" ? part.part.text : "").join("");
@@ -265116,8 +265185,9 @@ function createReviewedOutputDispatcher(options) {
 			for (let attempt = 1; attempt <= MAX_REVIEW_ATTEMPTS; attempt += 1) {
 				options.signal.throwIfAborted();
 				if (epoch !== currentEpoch) throw new Error("Response review candidate changed during verification");
-				const deadline = createDeadlineAbortSignal(options.signal, REVIEW_TIMEOUT_MS);
+				const deadline = createResponseReviewDeadline(options.signal);
 				let requested;
+				const pendingOperations = [];
 				let attemptRejection;
 				let attemptNativeRejection = false;
 				try {
@@ -265126,6 +265196,12 @@ function createReviewedOutputDispatcher(options) {
 						turnId: event.turnId,
 						step: event.step,
 						signal: deadline.signal,
+						onProgress: (progress) => {
+							if (isCurrentCandidate()) deadline.progress(progress);
+						},
+						onPendingOperation: (operation) => {
+							pendingOperations.push(operation.then(() => void 0, () => void 0));
+						},
 						onRejected: (decision) => {
 							if (!deadline.signal.aborted) {
 								const message = rejectionMessage(decision);
@@ -265135,13 +265211,14 @@ function createReviewedOutputDispatcher(options) {
 						}
 					});
 					approval = await abortable(requested, deadline.signal);
+					deadline.throwIfAborted();
 					rejection = attemptRejection;
 					nativeRejection = attemptNativeRejection;
 					break;
 				} catch {
 					options.signal.throwIfAborted();
 					if (attemptRejection !== void 0) throw new Error(attemptRejection);
-					if (deadline.timedOut() && attempt < MAX_REVIEW_ATTEMPTS && requested !== void 0 && epoch === currentEpoch && await waitForCancelledReview(requested)) continue;
+					if (deadline.timedOut() && attempt < MAX_REVIEW_ATTEMPTS && requested !== void 0 && epoch === currentEpoch && await waitForCancelledReview(requested, pendingOperations)) continue;
 					throw new Error(deadline.timedOut() ? "Response review timed out" : "Response review failed");
 				} finally {
 					deadline.clear();
@@ -265178,10 +265255,16 @@ function createReviewedOutputDispatcher(options) {
 			if (epoch === currentEpoch) clear();
 		}
 	}
-	async function waitForCancelledReview(requested) {
+	async function waitForCancelledReview(requested, pendingOperations) {
 		const deadline = createDeadlineAbortSignal(options.signal, REVIEW_CANCEL_SETTLE_MS);
 		try {
 			await abortable(requested.then(() => void 0, () => void 0), deadline.signal);
+			let observed = 0;
+			while (observed < pendingOperations.length) {
+				const batch = pendingOperations.slice(observed);
+				observed = pendingOperations.length;
+				await abortable(Promise.all(batch), deadline.signal);
+			}
 			options.signal.throwIfAborted();
 			return true;
 		} catch {
@@ -265193,13 +265276,13 @@ function createReviewedOutputDispatcher(options) {
 	}
 	return dispatch;
 }
-var MAX_CANDIDATE_BYTES, MAX_CANDIDATE_PARTS, REVIEW_TIMEOUT_MS, REVIEW_CANCEL_SETTLE_MS, MAX_REVIEW_ATTEMPTS;
+var MAX_CANDIDATE_BYTES, MAX_CANDIDATE_PARTS, REVIEW_CANCEL_SETTLE_MS, MAX_REVIEW_ATTEMPTS;
 var init_response_review = __esmMin((() => {
 	init_abort();
 	init_response_review_decision();
+	init_response_review_deadline();
 	MAX_CANDIDATE_BYTES = 1048576;
 	MAX_CANDIDATE_PARTS = 4096;
-	REVIEW_TIMEOUT_MS = 3e4;
 	REVIEW_CANCEL_SETTLE_MS = 1e3;
 	MAX_REVIEW_ATTEMPTS = 2;
 }));
@@ -269318,12 +269401,14 @@ function readPayload(result, includeError = false) {
 /** Receipts never enter ordinary tool execution, hooks, replay or model history. */
 function createGuardResponseReviewer(host) {
 	const { language, guardVersion } = host;
-	return async ({ text, turnId, step, signal, onRejected }) => {
+	return async ({ text, turnId, step, signal, onRejected, onPendingOperation, onProgress }) => {
 		const input = {
 			text,
 			turnId,
 			step,
-			signal
+			signal,
+			onPendingOperation,
+			onProgress
 		};
 		const targetSha256 = digest(text);
 		let stage = "setup";
@@ -269350,6 +269435,10 @@ function createGuardResponseReviewer(host) {
 		const blocked = (reason, findings) => {
 			record(signal.aborted ? "cancelled" : reason, findings);
 		};
+		const track = (operation) => {
+			onPendingOperation?.(operation.then(() => void 0, () => void 0));
+			return operation;
+		};
 		try {
 			if (!/^[A-Za-z]{2,3}(?:-[A-Za-z0-9]{2,8})*$/.test(language) || /^(auto|all)$/i.test(language) || guardVersion.trim().length === 0) return blocked("invalid_settings");
 			const resolve = () => {
@@ -269362,13 +269451,14 @@ function createGuardResponseReviewer(host) {
 			const current = () => !signal.aborted && resolve()?.client === connection.client;
 			if (!current()) return blocked("connection_changed");
 			stage = "native";
-			const native = await abortable(host.reviewNative({ ...input }), signal);
+			onProgress?.("native.start");
+			const native = await abortable(track(host.reviewNative({ ...input })), signal);
 			if (!current()) return blocked("connection_changed");
 			if (native === void 0) return blocked("native_unavailable");
 			if (!passed(native.nativeness) || !passed(native.orthography)) return blocked("native_rejected");
 			const authorized = async (name) => {
 				if (!current()) return false;
-				return passed(await abortable(host.authorize({
+				return passed(await abortable(track(host.authorize({
 					toolName: qualifyMcpToolName(SERVER_NAME, name),
 					targetSha256,
 					language,
@@ -269377,11 +269467,12 @@ function createGuardResponseReviewer(host) {
 					turnId,
 					step,
 					signal
-				}), signal)) && current();
+				})), signal)) && current();
 			};
 			stage = "release";
+			onProgress?.("release.start");
 			if (!await authorized("release_response")) return blocked("release_denied");
-			const releaseResult = await abortable(connection.client.callTool("release_response", {
+			const releaseResult = await abortable(track(connection.client.callTool("release_response", {
 				target_text: text,
 				language,
 				content_type: "prose",
@@ -269390,7 +269481,7 @@ function createGuardResponseReviewer(host) {
 					nativeness: true,
 					orthography: true
 				}
-			}, signal), signal);
+			}, signal)), signal);
 			if (!current()) return blocked("connection_changed");
 			if (releaseResult.isError) return blocked("release_rejected", rejectionFindings(readPayload(releaseResult, true)));
 			const released = readPayload(releaseResult);
@@ -269398,8 +269489,9 @@ function createGuardResponseReviewer(host) {
 			if (!current()) return blocked("connection_changed");
 			if (status !== "PASS" || release_allowed !== true || blocking === true || typeof release_token !== "string" || release_token.length === 0 || release_token.length > 65536) return blocked("release_rejected", rejectionFindings(released));
 			stage = "verification";
+			onProgress?.("verification.start");
 			if (!await authorized("verify_release_token")) return blocked("verification_denied");
-			const { status: verificationStatus, valid, checks, payload } = readPayload(await abortable(connection.client.callTool("verify_release_token", {
+			const { status: verificationStatus, valid, checks, payload } = readPayload(await abortable(track(connection.client.callTool("verify_release_token", {
 				release_token,
 				source_text: "",
 				target_text: text,
@@ -269407,7 +269499,7 @@ function createGuardResponseReviewer(host) {
 				purpose: "response",
 				content_type: "prose",
 				short_text_reviewed: false
-			}, signal), signal)) ?? {};
+			}, signal)), signal)) ?? {};
 			if (!current()) return blocked("connection_changed");
 			if (verificationStatus !== "PASS" || valid !== true || !isPlainRecord(checks) || !CHECK_NAMES.every((name) => checks[name] === true) || !isPlainRecord(payload)) return blocked("verification_rejected");
 			const { v, source_sha256, target_sha256, language: verifiedLanguage, purpose, content_type, short_text_reviewed, exp, iat } = payload;
@@ -269497,6 +269589,9 @@ async function reviewNativeResponse(agent, language, input) {
 		};
 		const options = {
 			signal,
+			onExecution: (completion) => {
+				input.onPendingOperation?.(completion.then(() => void 0, () => void 0));
+			},
 			requestLogFields: {
 				turnStep: `review:${input.turnId}.${String(input.step)}`,
 				attempt: `${attempt}/2`
@@ -269505,13 +269600,16 @@ async function reviewNativeResponse(agent, language, input) {
 		const prompt = attempt === 1 ? NATIVE_REVIEW_PROMPT : `${NATIVE_REVIEW_PROMPT}\nThe previous review did not satisfy the required JSON format. Return exactly one object with the two required boolean keys nativeness and orthography, no wrapper or additional keys. Use true or false, not strings or null. Set a check to false if it fails or you are uncertain.`;
 		try {
 			signal.throwIfAborted();
-			const response = await abortable(agent.generate(provider, prompt, [], [createUserMessage(candidateMessage)], { onMessagePart: (part) => {
+			const requested = agent.generate(provider, prompt, [], [createUserMessage(candidateMessage)], { onMessagePart: (part) => {
 				if (part.type === "text") receivedBytes += Buffer.byteLength(part.text);
 				if (receivedBytes > MAX_REVIEW_RESULT_BYTES) {
 					outputLimitExceeded = true;
 					throw new Error("Native review output exceeds limit");
 				}
-			} }, options), signal);
+				if (!signal.aborted && part.type === "text" && part.text.trim().length > 0) input.onProgress?.("native.text");
+			} }, options);
+			input.onPendingOperation?.(requested.then(() => void 0, () => void 0));
+			const response = await abortable(requested, signal);
 			if (response.usage !== null) agent.usage.record(modelAlias, response.usage, "turn");
 			signal.throwIfAborted();
 			if (response.message.toolCalls.length > 0) return invalid("tool_calls");
@@ -393762,7 +393860,7 @@ var require_constants$2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
-//#region ../../../../node_modules/node-gyp-build/node-gyp-build.js
+//#region ../../node_modules/node-gyp-build/node-gyp-build.js
 var require_node_gyp_build$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var fs$4 = __require("fs");
 	var path$6 = __require("path");
@@ -393918,14 +394016,14 @@ var require_node_gyp_build$1 = /* @__PURE__ */ __commonJSMin(((exports, module)
 	load.compareTuples = compareTuples;
 }));
 //#endregion
-//#region ../../../../node_modules/node-gyp-build/index.js
+//#region ../../node_modules/node-gyp-build/index.js
 var require_node_gyp_build = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const runtimeRequire = typeof __webpack_require__ === "function" ? __non_webpack_require__ : __require;
 	if (typeof runtimeRequire.addon === "function") module.exports = runtimeRequire.addon.bind(runtimeRequire);
 	else module.exports = require_node_gyp_build$1();
 }));
 //#endregion
-//#region ../../../../node_modules/bufferutil/fallback.js
+//#region ../../node_modules/bufferutil/fallback.js
 var require_fallback$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	/**
 	* Masks a buffer using the given mask.
@@ -393957,7 +394055,7 @@ var require_fallback$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
-//#region ../../../../node_modules/bufferutil/index.js
+//#region ../../node_modules/bufferutil/index.js
 var require_bufferutil = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	try {
 		module.exports = require_node_gyp_build()(__dirname);
@@ -394450,7 +394548,7 @@ var require_permessage_deflate = /* @__PURE__ */ __commonJSMin(((exports, module
 	}
 }));
 //#endregion
-//#region ../../../../node_modules/utf-8-validate/fallback.js
+//#region ../../node_modules/utf-8-validate/fallback.js
 var require_fallback = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	/**
 	* Checks if a given buffer contains only correct UTF-8.
@@ -394480,7 +394578,7 @@ var require_fallback = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isValidUTF8;
 }));
 //#endregion
-//#region ../../../../node_modules/utf-8-validate/index.js
+//#region ../../node_modules/utf-8-validate/index.js
 var require_utf_8_validate = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	try {
 		module.exports = require_node_gyp_build()(__dirname);