blun-king-cli 9.1.430 → 9.1.432

package/bin/noninteractive-shell-env-policy.cjs

@@ -0,0 +1,19 @@
+'use strict';
+
+function buildNoninteractiveShellEnv(parentEnv, shellPath) {
+  return {
+    ...(parentEnv ?? {}),
+    NO_COLOR: '1',
+    TERM: 'dumb',
+    GIT_TERMINAL_PROMPT: '0',
+    GIT_ASKPASS: '',
+    SSH_ASKPASS: '',
+    SSH_ASKPASS_REQUIRE: 'never',
+    GCM_INTERACTIVE: 'Never',
+    SHELL: String(shellPath ?? ''),
+  };
+}
+
+module.exports = {
+  buildNoninteractiveShellEnv,
+};

package/blun.mjs

@@ -30353,6 +30353,7 @@ async function chatWithRetry(input) {
 			nextAttempt: attempt + 1,
 			maxAttempts,
 			delayMs,
+			outputMayHaveStarted: input.llm.didErrorEmitPartialOutput?.(error) === true,
 			...retryErrorFields(error)
 		});
 		await sleepForRetry(delayMs, input.params.signal);
@@ -244541,6 +244542,7 @@ async function chatWithLiveResponseRepetitionRecovery(deps) {
 				nextAttempt: 2,
 				maxAttempts: 2,
 				delayMs: 0,
+				outputMayHaveStarted: true,
 				errorName: "LiveResponseRepetitionError",
 				errorMessage: "Repeated assistant text detected during streaming"
 			});
@@ -246082,6 +246084,7 @@ var init_events$1 = __esmMin((() => {
 		nextAttempt: number$1(),
 		maxAttempts: number$1(),
 		delayMs: number$1(),
+		outputMayHaveStarted: boolean$1().optional(),
 		errorName: string(),
 		errorMessage: string(),
 		statusCode: number$1().optional()
@@ -261463,6 +261466,7 @@ function mapLoopEvent(event, turnId) {
 			nextAttempt: event.nextAttempt,
 			maxAttempts: event.maxAttempts,
 			delayMs: event.delayMs,
+			outputMayHaveStarted: event.outputMayHaveStarted,
 			errorName: event.errorName,
 			errorMessage: event.errorMessage,
 			statusCode: event.statusCode
@@ -263225,7 +263229,7 @@ function windowsPathToPosixPath(path) {
 function rewriteWindowsNullRedirect(command) {
 	return command.replace(WINDOWS_NUL_REDIRECT, "$1/dev/null");
 }
-var MS_PER_SECOND, DEFAULT_TIMEOUT_S, MAX_TIMEOUT_S, DEFAULT_BACKGROUND_TIMEOUT_S, MAX_BACKGROUND_TIMEOUT_S, USER_INTERRUPT_REASON, BashInputSchema, SHELL_TIMEOUT_VARS, BashTool, WINDOWS_NUL_REDIRECT, broadRecursiveSearchRefusal, windowsBashDialectRefusal;
+var MS_PER_SECOND, DEFAULT_TIMEOUT_S, MAX_TIMEOUT_S, DEFAULT_BACKGROUND_TIMEOUT_S, MAX_BACKGROUND_TIMEOUT_S, USER_INTERRUPT_REASON, BashInputSchema, SHELL_TIMEOUT_VARS, BashTool, WINDOWS_NUL_REDIRECT, broadRecursiveSearchRefusal, windowsBashDialectRefusal, buildNoninteractiveShellEnv;
 var init_bash = __esmMin((() => {
 	init_zod$1();
 	init_background();
@@ -263236,6 +263240,7 @@ var init_bash = __esmMin((() => {
 	init_bash$1();
 	({ broadRecursiveSearchRefusal } = createRequire(import.meta.url)("./bin/bash-search-scope-policy.cjs"));
 	({ windowsBashDialectRefusal } = createRequire(import.meta.url)("./bin/windows-bash-dialect-policy.cjs"));
+	({ buildNoninteractiveShellEnv } = createRequire(import.meta.url)("./bin/noninteractive-shell-env-policy.cjs"));
 	MS_PER_SECOND = 1e3;
 	DEFAULT_TIMEOUT_S = 60;
 	MAX_TIMEOUT_S = 300;
@@ -263315,16 +263320,7 @@ var init_bash = __esmMin((() => {
 				"-c",
 				`cd ${shellQuote(shellCwd)} && ${command}`
 			];
-			const noninteractiveEnv = {
-				NO_COLOR: "1",
-				TERM: "dumb",
-				GIT_TERMINAL_PROMPT: process.env["GIT_TERMINAL_PROMPT"] ?? "0",
-				SHELL: this.kaos.osEnv.shellPath
-			};
-			const mergedEnv = {
-				...process.env,
-				...noninteractiveEnv
-			};
+			const mergedEnv = buildNoninteractiveShellEnv(process.env, this.kaos.osEnv.shellPath);
 			return this.kaos.execWithEnv(shellArgs, mergedEnv);
 		}
 		async execution(args, signal, onUpdate, onForegroundTaskStart) {
@@ -265068,9 +265064,13 @@ var init_fallback_llm = __esmMin((() => {
 			}
 		}
 		isRetryableError(error) {
-			if (typeof error === "object" && error !== null && this.errorsAfterOutput.has(error) || isAccountQuotaExhausted(error) || isFallbackCandidateError(error) || error instanceof APIContextOverflowError || isUnavailableFallbackCandidate(error)) return false;
+			const outputMayHaveStarted = this.didErrorEmitPartialOutput(error);
+			if (isAccountQuotaExhausted(error) || !outputMayHaveStarted && isFallbackCandidateError(error) || error instanceof APIContextOverflowError || isUnavailableFallbackCandidate(error)) return false;
 			return this.current.llm.isRetryableError?.(error) ?? false;
 		}
+		didErrorEmitPartialOutput(error) {
+			return typeof error === "object" && error !== null && this.errorsAfterOutput.has(error);
+		}
 		get current() {
 			return this.candidates[this.currentIndex];
 		}
@@ -496404,6 +496404,7 @@ function runPromptTurn(session, prompt, outputFormat, stdout, stderr, model) {
 					return;
 				case "turn.step.retrying":
 					outputWriter.discardAssistant();
+					outputWriter.writeRetry?.(formatModelRetryProgress(event), event.outputMayHaveStarted === true);
 					return;
 				case "assistant.delta":
 					outputWriter.writeAssistantDelta(event.delta);
@@ -496502,7 +496503,16 @@ var PromptTranscriptWriter = class {
 	writeToolCallDelta() {}
 	writeToolResult() {}
 	flushAssistant() {}
-	discardAssistant() {}
+	discardAssistant() {
+		this.assistantFilter = new ThoughtTagFilter();
+		this.thinkingWriter.finish();
+		this.assistantWriter.finish();
+	}
+	writeRetry(hint, outputMayHaveStarted) {
+		if (!outputMayHaveStarted) return;
+		this.thinkingWriter.write(hint);
+		this.thinkingWriter.finish();
+	}
 	finish() {
 		const { visible, thought } = this.assistantFilter.flush();
 		if (thought.length > 0) this.thinkingWriter.write(thought);
@@ -496588,6 +496598,7 @@ var PromptJsonStreamWriter = class {
 	discardAssistant() {
 		this.assistantText = "";
 		this.toolCalls.length = 0;
+		this.assistantFilter = new ThoughtTagFilter();
 	}
 	finish() {
 		this.assistantText += this.assistantFilter.flush().visible;
@@ -496682,6 +496693,7 @@ var PromptJsonSingleWriter = class {
 	discardAssistant() {
 		this.assistantText = "";
 		this.toolCalls.length = 0;
+		this.assistantFilter = new ThoughtTagFilter();
 	}
 	setTurnEnded(reason) {
 		this.turnEndReason = reason;
@@ -508130,6 +508142,19 @@ var SessionEventHandler = class {
 	handleStepRetrying(event) {
 		this.turnWatchdog.recordProgress();
 		const hint = formatModelRetryProgress(event);
+		if (event.outputMayHaveStarted === true) {
+			const { streamingUI } = this.host;
+			streamingUI.flushNow();
+			streamingUI.discardUnfinishedToolUi();
+			streamingUI.finalizeLiveTextBuffers("idle");
+			this.host.appendTranscriptEntry({
+				id: nextTranscriptId(),
+				kind: "status",
+				turnId: String(event.turnId),
+				renderMode: "plain",
+				content: uiText("sessionEvent.interrupted.reason", { reason: hint })
+			});
+		}
 		this.modelRetryHint = hint;
 		this.host.state.footer.setTransientHint(hint);
 		this.host.state.ui.requestRender();
@@ -511630,6 +511655,15 @@ var StreamingUIController = class {
 		this._pendingReadGroup = null;
 		this.resetToolCallState();
 	}
+	discardUnfinishedToolUi() {
+		const { state } = this.host;
+		const components = [...this._pendingToolComponents.values()];
+		const toolCallIds = /* @__PURE__ */ new Set(this._pendingToolComponents.keys());
+		this.resetToolUi();
+		for (const component of components) state.transcriptContainer.removeChild(component);
+		if (toolCallIds.size > 0) state.transcriptEntries = state.transcriptEntries.filter((entry) => !toolCallIds.has(entry.toolCallData?.id));
+		state.ui.requestRender();
+	}
 	resetToolCallState() {
 		this._activeToolCalls.clear();
 	}

package/package.json

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