blun-king-cli 9.1.595 → 9.1.597

package/blun.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// BLUN_BUILD_INPUT_SHA256:bb2a99b699d299ac283bd9b157d0c18555ae0ab62c58c7b3c10d8311dfa87a0d
+// BLUN_BUILD_INPUT_SHA256:631215107f223f910482352d64f8081de5c7ebb282f9e66a53e7cd6dc93ba305
 import { fileURLToPath as __cjsShimFileURLToPath } from 'node:url';
 import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
@@ -1536,6 +1536,7 @@ function parseExplicitMaxContextTokens(message) {
 	return Number.isSafeInteger(parsed) && parsed > 0 ? parsed : void 0;
 }
 function isRetryableGenerateError(error) {
+	if (error instanceof APIContextOverflowError) return false;
 	if (error instanceof CompactionStallError$1) return true;
 	if (error instanceof APIConnectionError || error instanceof APITimeoutError) return true;
 	if (error instanceof APIEmptyResponseError) return true;
@@ -1572,7 +1573,8 @@ function isProviderQuotaExhaustedMessage(message) {
 	return PROVIDER_QUOTA_EXHAUSTED_MESSAGE_PATTERN.test(lowerMessage) && PROVIDER_QUOTA_EXHAUSTED_CONTEXT_PATTERNS.some((pattern) => pattern.test(lowerMessage));
 }
 function isContextOverflowStatusError(statusCode, message) {
-	if (statusCode !== 400 && statusCode !== 413 && statusCode !== 422) return false;
+	const wrappedRejection = statusCode === 502 && /\bHTTP(?: Error)? (?:400|413|422):/i.test(message);
+	if (statusCode !== 400 && statusCode !== 413 && statusCode !== 422 && !wrappedRejection) return false;
 	const lowerMessage = message.toLowerCase();
 	return CONTEXT_OVERFLOW_MESSAGE_PATTERNS.some((pattern) => pattern.test(lowerMessage));
 }
@@ -1998,7 +2000,8 @@ var init_fetch_http_client = __esmMin((() => {
 				const startedAt = performance.now();
 				try {
 					const response = await this.fetch(`${this.baseUrl}${pathname}`, init);
-					const willRetry = attempt < maxRetries && shouldRetryResponse(response);
+					const gatewayError = response.status === 502 ? await responseError(response) : void 0;
+					const willRetry = attempt < maxRetries && shouldRetryResponse(response) && !(gatewayError instanceof APIContextOverflowError);
 					notifyTransportAttempt(requestOptions?.onTransportAttempt, {
 						transportAttempt: attempt + 1,
 						...requestBytes === void 0 ? {} : { requestBytes },
@@ -2010,12 +2013,12 @@ var init_fetch_http_client = __esmMin((() => {
 					if (response.ok) return response;
 					if (willRetry) {
 						const delayMs = retryDelayMs(response.headers, attempt);
-						await response.body?.cancel();
+						if (gatewayError === void 0) await response.body?.cancel();
 						await waitForRetry(delayMs, init.signal);
 						attempt += 1;
 						continue;
 					}
-					throw await responseError(response);
+					throw gatewayError ?? await responseError(response);
 				} catch (error) {
 					if (error instanceof ChatProviderError) throw error;
 					const willRetry = attempt < maxRetries && init.signal?.aborted !== true && isRetryableTransportFailure(error);
@@ -2578,9 +2581,23 @@ function extractUsageFromChunk(chunk) {
 	if (choiceUsage !== null && choiceUsage !== void 0 && typeof choiceUsage === "object") return choiceUsage;
 	return null;
 }
+function contextOverflowOutputCap(error, currentCap) {
+	const maxContext = error.maxContextTokens;
+	const counts = /requested ([\d,_]+) output tokens and your prompt contains (?:at least )?([\d,_]+) input tokens/i.exec(error.message);
+	if (maxContext === void 0 || counts === null || !Number.isSafeInteger(maxContext) || maxContext <= 0) return;
+	const requestedOutput = Number(counts[1].replaceAll(/[,_]/g, ""));
+	const input = Number(counts[2].replaceAll(/[,_]/g, ""));
+	if (!Number.isSafeInteger(input) || input < 0 || !Number.isSafeInteger(requestedOutput) || requestedOutput <= 0 || !Number.isSafeInteger(input + requestedOutput) || input + requestedOutput <= maxContext) return;
+	const available = maxContext - input;
+	const headroom = Math.min(1024, Math.max(1, Math.ceil(available * .01)));
+	const cap = Math.min(requestedOutput - 1, available - headroom);
+	if (cap < 1 || currentCap !== void 0 && (typeof currentCap !== "number" || !Number.isSafeInteger(currentCap) || cap >= currentCap)) return;
+	return cap;
+}
 var BLUN_TOOL_CALL_ID_POLICY, BLUN_INBOUND_REASONING_KEYS, BLUN_VISION_DATA_URL, BLUN_VISION_MAX_ATTACHMENTS, BLUN_VISION_MAX_IMAGE_BYTES, BlunStreamedMessage, BlunChatProvider;
 var init_blun = __esmMin((() => {
 	init_blun_schema();
+	init_errors$10();
 	init_blun_files();
 	init_chat_completions_wire();
 	init_chat_completions_stream();
@@ -2844,8 +2861,23 @@ var init_blun = __esmMin((() => {
 					...options.onTransportAttempt !== void 0 ? { onTransportAttempt: options.onTransportAttempt } : {}
 				} : void 0;
 				options?.onRequestSent?.();
-				return new BlunStreamedMessage(await client.chat.completions.create(createParams, requestOptions), this._stream, reasoningRequested);
+				let response;
+				try {
+					response = await client.chat.completions.create(createParams, requestOptions);
+				} catch (error) {
+					const rejection = normalizeFetchHttpError(error);
+					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
+					}, requestOptions);
+				}
+				return new BlunStreamedMessage(response, this._stream, reasoningRequested);
 			} catch (error) {
+				if (options?.signal?.aborted === true) throw options.signal.reason ?? error;
 				throw normalizeFetchHttpError(error);
 			}
 		}
@@ -530546,6 +530578,7 @@ var SessionEventHandler = class {
 	currentTurnHasAssistantText = false;
 	currentTurnStartedAtMs;
 	currentTurnTokenCount;
+	pendingChannelInterruption;
 	pendingModelBlockedFallback;
 	queuedGoalPromotionPending = false;
 	queuedGoalPromotionInFlight = false;
@@ -530566,6 +530599,7 @@ var SessionEventHandler = class {
 		this.currentTurnHasAssistantText = false;
 		this.currentTurnStartedAtMs = void 0;
 		this.currentTurnTokenCount = void 0;
+		this.pendingChannelInterruption = void 0;
 		this.pendingModelBlockedFallback = void 0;
 		this.queuedGoalPromotionPending = false;
 		this.queuedGoalPromotionInFlight = false;
@@ -530578,6 +530612,27 @@ var SessionEventHandler = class {
 	clearAgentSwarmProgress() {
 		this.subAgentEventHandler.clearAgentSwarmProgress();
 	}
+	async interruptForQueuedChannel() {
+		const session = this.host.session;
+		if (session === void 0) return;
+		const pending = {
+			sessionId: session.id,
+			turnId: this.host.streamingUI.getTurnContext().turnId
+		};
+		this.pendingChannelInterruption = pending;
+		try {
+			await session.cancel();
+		} catch (error) {
+			if (this.pendingChannelInterruption === pending) this.pendingChannelInterruption = void 0;
+			throw error;
+		}
+	}
+	consumeChannelInterruption(sessionId, turnId) {
+		const pending = this.pendingChannelInterruption;
+		if (pending === void 0 || pending.sessionId !== sessionId || pending.turnId !== void 0 && pending.turnId !== String(turnId)) return false;
+		this.pendingChannelInterruption = void 0;
+		return true;
+	}
 	hasActiveAgentSwarmToolCall() {
 		return this.subAgentEventHandler.hasActiveAgentSwarmToolCall();
 	}
@@ -530741,6 +530796,7 @@ var SessionEventHandler = class {
 		this.mcpServerStatusSpinners.clear();
 	}
 	handleTurnBegin(event) {
+		this.pendingChannelInterruption = void 0;
 		this.host.goalChannelReplies?.beginTurn(event.sessionId, this.host.state.appState.goal?.goalId, event.turnId);
 		this.hideCompactionRetry();
 		const sessionId = this.host.session?.id;
@@ -530781,6 +530837,7 @@ var SessionEventHandler = class {
 		});
 	}
 	handleTurnEnd(event, sendQueued) {
+		this.consumeChannelInterruption(event.sessionId, event.turnId);
 		this.host.restoreQueuedSteerAtTurnEnd(event.turnId);
 		const sessionId = this.host.session?.id;
 		if (sessionId !== void 0) finishPersonalMemoryRememberIntentTurn(sessionId, event.turnId);
@@ -530867,10 +530924,11 @@ var SessionEventHandler = class {
 		this.host.streamingUI.resetToolUi();
 		this.host.streamingUI.finalizeLiveTextBuffers("idle");
 		const reason = event.reason;
+		const channelInterruption = this.consumeChannelInterruption(event.sessionId, event.turnId);
 		if (reason === "error") return;
 		if (reason === "aborted" || reason === void 0 || reason === "") {
 			this.markActiveAgentSwarmsCancelled();
-			this.host.showStatus(uiText("sessionEvent.interrupted.user"), "error");
+			this.host.showStatus(channelInterruption ? uiText("sessionEvent.interrupted.reason", { reason: "Telegram" }) : uiText("sessionEvent.interrupted.user"), channelInterruption ? "warning" : "error");
 			return;
 		}
 		this.host.showError(reason === "max_steps" ? uiText("sessionEvent.interrupted.maxSteps") : uiText("sessionEvent.interrupted.reason", { reason }));
@@ -537787,7 +537845,7 @@ var BlunTUI = class {
 			deliverOne: () => this.deliverQueuedChannelHead(),
 			canInterruptWaitingWork: () => this.canInterruptForQueuedChannel(),
 			interruptWaitingWork: async () => {
-				await this.session?.cancel();
+				await this.sessionEventHandler.interruptForQueuedChannel();
 			}
 		});
 		this.managedQuotaWarningController = new ManagedQuotaWarningController({ onChange: (warning) => {

package/package.json

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

package/worker-host.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// BLUN_BUILD_INPUT_SHA256:bb2a99b699d299ac283bd9b157d0c18555ae0ab62c58c7b3c10d8311dfa87a0d
+// BLUN_BUILD_INPUT_SHA256:631215107f223f910482352d64f8081de5c7ebb282f9e66a53e7cd6dc93ba305
 import { fileURLToPath as __cjsShimFileURLToPath } from 'node:url';
 import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
@@ -1664,6 +1664,7 @@ var CompactionStallError$1 = class extends ChatProviderError {
 	}
 };
 function isRetryableGenerateError(error) {
+	if (error instanceof APIContextOverflowError) return false;
 	if (error instanceof CompactionStallError$1) return true;
 	if (error instanceof APIConnectionError || error instanceof APITimeoutError) return true;
 	if (error instanceof APIEmptyResponseError) return true;
@@ -1728,7 +1729,8 @@ function isProviderQuotaExhaustedMessage(message) {
 	return PROVIDER_QUOTA_EXHAUSTED_MESSAGE_PATTERN.test(lowerMessage) && PROVIDER_QUOTA_EXHAUSTED_CONTEXT_PATTERNS.some((pattern) => pattern.test(lowerMessage));
 }
 function isContextOverflowStatusError(statusCode, message) {
-	if (statusCode !== 400 && statusCode !== 413 && statusCode !== 422) return false;
+	const wrappedRejection = statusCode === 502 && /\bHTTP(?: Error)? (?:400|413|422):/i.test(message);
+	if (statusCode !== 400 && statusCode !== 413 && statusCode !== 422 && !wrappedRejection) return false;
 	const lowerMessage = message.toLowerCase();
 	return CONTEXT_OVERFLOW_MESSAGE_PATTERNS.some((pattern) => pattern.test(lowerMessage));
 }
@@ -1854,7 +1856,8 @@ var FetchTransport = class {
 			const startedAt = performance.now();
 			try {
 				const response = await this.fetch(`${this.baseUrl}${pathname}`, init);
-				const willRetry = attempt < maxRetries && shouldRetryResponse(response);
+				const gatewayError = response.status === 502 ? await responseError(response) : void 0;
+				const willRetry = attempt < maxRetries && shouldRetryResponse(response) && !(gatewayError instanceof APIContextOverflowError);
 				notifyTransportAttempt(requestOptions?.onTransportAttempt, {
 					transportAttempt: attempt + 1,
 					...requestBytes === void 0 ? {} : { requestBytes },
@@ -1866,12 +1869,12 @@ var FetchTransport = class {
 				if (response.ok) return response;
 				if (willRetry) {
 					const delayMs = retryDelayMs(response.headers, attempt);
-					await response.body?.cancel();
+					if (gatewayError === void 0) await response.body?.cancel();
 					await waitForRetry(delayMs, init.signal);
 					attempt += 1;
 					continue;
 				}
-				throw await responseError(response);
+				throw gatewayError ?? await responseError(response);
 			} catch (error) {
 				if (error instanceof ChatProviderError) throw error;
 				const willRetry = attempt < maxRetries && init.signal?.aborted !== true && isRetryableTransportFailure(error);
@@ -2698,6 +2701,19 @@ var BlunStreamedMessage = class {
 		}
 	}
 };
+function contextOverflowOutputCap(error, currentCap) {
+	const maxContext = error.maxContextTokens;
+	const counts = /requested ([\d,_]+) output tokens and your prompt contains (?:at least )?([\d,_]+) input tokens/i.exec(error.message);
+	if (maxContext === void 0 || counts === null || !Number.isSafeInteger(maxContext) || maxContext <= 0) return;
+	const requestedOutput = Number(counts[1].replaceAll(/[,_]/g, ""));
+	const input = Number(counts[2].replaceAll(/[,_]/g, ""));
+	if (!Number.isSafeInteger(input) || input < 0 || !Number.isSafeInteger(requestedOutput) || requestedOutput <= 0 || !Number.isSafeInteger(input + requestedOutput) || input + requestedOutput <= maxContext) return;
+	const available = maxContext - input;
+	const headroom = Math.min(1024, Math.max(1, Math.ceil(available * .01)));
+	const cap = Math.min(requestedOutput - 1, available - headroom);
+	if (cap < 1 || currentCap !== void 0 && (typeof currentCap !== "number" || !Number.isSafeInteger(currentCap) || cap >= currentCap)) return;
+	return cap;
+}
 var BlunChatProvider = class {
 	name = "blun";
 	_model;
@@ -2852,8 +2868,23 @@ var BlunChatProvider = class {
 				...options.onTransportAttempt !== void 0 ? { onTransportAttempt: options.onTransportAttempt } : {}
 			} : void 0;
 			options?.onRequestSent?.();
-			return new BlunStreamedMessage(await client.chat.completions.create(createParams, requestOptions), this._stream, reasoningRequested);
+			let response;
+			try {
+				response = await client.chat.completions.create(createParams, requestOptions);
+			} catch (error) {
+				const rejection = normalizeFetchHttpError(error);
+				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
+				}, requestOptions);
+			}
+			return new BlunStreamedMessage(response, this._stream, reasoningRequested);
 		} catch (error) {
+			if (options?.signal?.aborted === true) throw options.signal.reason ?? error;
 			throw normalizeFetchHttpError(error);
 		}
 	}