blun-king-cli 9.1.214 → 9.1.215

package/bin/launcher-runtime.js

@@ -30,6 +30,7 @@ const { acquireSharedRuntimeLease, tryAcquireUpdateLease } = require('./update-l
 const { compareSemver, runExplicitUpdate, runUpdateNotice } = require('./update-notice');
 const {
   RUNNING_UPDATE_HANDOFF_EXIT_CODE,
+  RUNNING_UPDATE_HANDOFF_ACK_MESSAGE,
   RUNNING_UPDATE_HANDOFF_MESSAGE,
   RUNNING_UPDATE_MODE_MESSAGE,
   RUNNING_UPDATE_PREPARED_MESSAGE,
@@ -397,12 +398,26 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
       handoffSessionId = message.sessionId;
       handoffMode = runningUpdateMode;
       handoffCwd = resolveHandoffCwd(message.cwd, cwd);
-      if (preparedTarget !== undefined) {
-        (options.stageRuntime || stageRuntime)(env.BLUN_SHARED_HOME, preparedTarget, {
-          mode: handoffMode,
-          sessionId: handoffSessionId,
-          cwd: handoffCwd,
-        });
+      if (preparedTarget !== undefined && message.version === preparedTarget.version) {
+        try {
+          (options.stageRuntime || stageRuntime)(env.BLUN_SHARED_HOME, preparedTarget, {
+            mode: handoffMode,
+            sessionId: handoffSessionId,
+            cwd: handoffCwd,
+          });
+          child.send({
+            type: RUNNING_UPDATE_HANDOFF_ACK_MESSAGE,
+            version: preparedTarget.version,
+            mode: handoffMode,
+            sessionId: handoffSessionId,
+          }, (error) => {
+            if (error) options.onRunningUpdateError?.(error);
+          });
+        } catch (error) {
+          handoffSessionId = undefined;
+          handoffMode = undefined;
+          options.onRunningUpdateError?.(error);
+        }
       }
     }
   };
@@ -471,6 +486,7 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
       },
       activateTarget: async (target) => {
         await (options.activateRuntime || activateRuntime)(env.BLUN_SHARED_HOME, target);
+        (options.clearPendingRuntime || clearPendingRuntime)(env.BLUN_SHARED_HOME, target);
         (options.recordRunningUpdateEvent || recordRunningUpdateEvent)(env.BLUN_SHARED_HOME, {
           event: 'activated',
           fromVersion: readPackageVersionAt(packageRoot),
@@ -485,6 +501,9 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
         }
       },
     });
+    if (handoff.kind !== 'activated') {
+      (options.clearPendingRuntime || clearPendingRuntime)(env.BLUN_SHARED_HOME, preparedTarget);
+    }
     const resumed = handoff.core;
     if (resumed === undefined || resumed.ready !== true) return 1;
     const resumedArgs = handoffArgsForMode(args, handoffMode, handoffSessionId);

package/bin/running-update.cjs

@@ -16,6 +16,7 @@ const REGISTRY_URL = 'https://registry.npmjs.org/blun-king-cli';
 const ACTIVE_RUNTIME_FILE = 'active-runtime.json';
 const PENDING_RUNTIME_FILE = 'pending-runtime.json';
 const RUNNING_UPDATE_HANDOFF_EXIT_CODE = 76;
+const RUNNING_UPDATE_HANDOFF_ACK_MESSAGE = 'blun-running-update-handoff-ack';
 const RUNNING_UPDATE_PREPARED_MESSAGE = 'blun-running-update-prepared';
 const RUNNING_UPDATE_HANDOFF_MESSAGE = 'blun-running-update-handoff';
 const RUNNING_UPDATE_MODE_MESSAGE = 'blun-running-update-mode';
@@ -559,6 +560,7 @@ module.exports = {
   PENDING_RUNTIME_FILE,
   AUTO_UPDATE_SETTLE_MS,
   RUNNING_UPDATE_HANDOFF_EXIT_CODE,
+  RUNNING_UPDATE_HANDOFF_ACK_MESSAGE,
   RUNNING_UPDATE_HANDOFF_MESSAGE,
   RUNNING_UPDATE_MODE_MESSAGE,
   RUNNING_UPDATE_PREPARED_MESSAGE,

package/blun.mjs

@@ -502555,7 +502555,10 @@ var ChannelQueueDeadlineController = class {
 	}
 	requestDeliveryNow() {
 		if (this.retainReleaseWhileDeliveryIsInFlight()) return;
-		if (this.host.hasWaitingWork() && !this.host.canDeliverWork()) return;
+		if (this.host.hasWaitingWork() && !this.host.canDeliverWork()) {
+			this.scheduleRetry();
+			return;
+		}
 		this.requestDelivery();
 	}
 	retainReleaseWhileDeliveryIsInFlight() {
@@ -515086,6 +515089,7 @@ function turnsToTrim(turns, maxTurns, hysteresis) {
 const {
 	AUTO_UPDATE_SETTLE_MS,
 	RUNNING_UPDATE_HANDOFF_EXIT_CODE,
+	RUNNING_UPDATE_HANDOFF_ACK_MESSAGE,
 	RUNNING_UPDATE_HANDOFF_MESSAGE,
 	RUNNING_UPDATE_MODE_MESSAGE,
 	RUNNING_UPDATE_PREPARED_MESSAGE,
@@ -515148,10 +515152,29 @@ function requestRunningUpdateAtSafeBoundary(tui) {
 }
 function installRunningUpdateListener(tui) {
 	const handler = (message) => {
+		if (message?.type === RUNNING_UPDATE_HANDOFF_ACK_MESSAGE) {
+			if (!tui.runningUpdateHandoffStarted || message.version !== tui.runningUpdatePreparedVersion || message.mode !== tui.runningUpdatePreparedMode || message.sessionId !== tui.getCurrentSessionId()) return;
+			if (!isSafeRuntimeBoundary({
+				isShuttingDown: tui.isShuttingDown,
+				streamingPhase: tui.state.appState.streamingPhase,
+				isCompacting: tui.state.appState.isCompacting,
+				queuedMessages: tui.state.queuedMessages.length,
+				activeToolCalls: tui.streamingUI.hasActiveToolCalls() ? 1 : 0,
+				shellCommands: tui.shellOutputStreams.size,
+				queueCommandRunning: tui.queueCommandRunning
+			})) {
+				tui.runningUpdateHandoffStarted = false;
+				return;
+			}
+			tui.showStatus("Ein Update wird geladen und die TUI wird neu gestartet.", "success");
+			void tui.stop(RUNNING_UPDATE_HANDOFF_EXIT_CODE).catch(() => {
+				tui.runningUpdateHandoffStarted = false;
+			});
+			return;
+		}
 		if (message?.type !== RUNNING_UPDATE_PREPARED_MESSAGE || typeof message.version !== "string" || message.mode !== RUNNING_UPDATE_MODES.RESUME && message.mode !== RUNNING_UPDATE_MODES.NEW) return;
 		tui.runningUpdatePreparedVersion = message.version;
 		tui.runningUpdatePreparedMode = message.mode;
-		tui.showStatus(`Update ${message.version} ist bereit und wird beim nächsten Start aktiviert.`, "success");
 		requestRunningUpdateAtSafeBoundary(tui);
 	};
 	process.on("message", handler);
@@ -516033,7 +516056,8 @@ var BlunTUI = class {
 	}
 	canDeliverQueuedChannelHead() {
 		const item = this.state.queuedMessages[0];
-		if (this.isShuttingDown || this.queueCommandRunning || this.queueSteerInFlight !== void 0 || this.editorReplacementActive || this.deferUserMessages || this.session === void 0 || this.state.appState.model.trim().length === 0 || this.state.appState.streamingPhase === "idle" || this.state.appState.streamingPhase === "shell" || item?.mode !== "channel") return false;
+		const hasActiveTurn = this.streamingUI.hasActiveTurn() || (this.state.appState.streamingPhase !== "idle" && this.state.appState.streamingPhase !== "shell");
+		if (this.isShuttingDown || this.queueCommandRunning || this.queueSteerInFlight !== void 0 || this.editorReplacementActive || this.deferUserMessages || this.session === void 0 || this.state.appState.model.trim().length === 0 || !hasActiveTurn || item?.mode !== "channel") return false;
 		return true;
 	}
 	async deliverQueuedChannelHead() {
@@ -516224,7 +516248,8 @@ var BlunTUI = class {
 		this.scheduleQueueDrain();
 	}
 	steerQueueFlushPrefix() {
-		if (this.queueSteerInFlight !== void 0 || this.queueFlushBatchRemaining === 0 || this.deferUserMessages || this.state.appState.isCompacting || this.state.appState.streamingPhase === "idle" || this.state.appState.streamingPhase === "shell") return;
+		const hasActiveTurn = this.streamingUI.hasActiveTurn() || this.state.appState.streamingPhase !== "idle";
+		if (this.queueSteerInFlight !== void 0 || this.queueFlushBatchRemaining === 0 || this.deferUserMessages || this.state.appState.isCompacting || this.state.appState.streamingPhase === "shell" || !hasActiveTurn) return;
 		const session = this.session;
 		if (session === void 0 || this.state.appState.model.trim().length === 0) {
 			this.showError(llmNotSetMessage());
@@ -516337,7 +516362,7 @@ var BlunTUI = class {
 					channelAcknowledge: acknowledge,
 					...envelope.meta["image_path"] !== void 0 ? { channelImagePath: envelope.meta["image_path"] } : {}
 				});
-				this.syncChannelQueueDeadline();
+				this.channelQueueDeadline.requestDeliveryNow();
 				this.scheduleQueueDrain();
 				this.track("input_queue");
 				this.updateQueueDisplay();
@@ -516809,7 +516834,7 @@ var BlunTUI = class {
 			this.sendTelegramRemoteCommandMessage(session, input, options, telegramContext);
 			return;
 		}
-		if (this.deferUserMessages || this.state.appState.streamingPhase !== "idle" || this.state.appState.isCompacting) {
+		if (this.deferUserMessages || this.streamingUI.hasActiveTurn() || this.state.appState.streamingPhase !== "idle" || this.state.appState.isCompacting) {
 			this.enqueueMessage(input, options);
 			return;
 		}
@@ -516820,7 +516845,8 @@ var BlunTUI = class {
 			for (const part of input) this.enqueueMessage(part);
 			return;
 		}
-		if (this.state.appState.streamingPhase === "idle") {
+		const hasActiveTurn = this.streamingUI.hasActiveTurn() || this.state.appState.streamingPhase !== "idle";
+		if (!hasActiveTurn) {
 			for (const part of input) this.sendMessageInternal(session, part);
 			return;
 		}

package/package.json

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