blun-king-cli 9.1.307 → 9.1.308

package/bin/launcher-runtime.js

@@ -68,6 +68,7 @@ const RAW_ARGS = process.argv.slice(2);
 const PROFILE = parseProfileLaunchArgs(RAW_ARGS, launcherModeFromArgv(process.argv));
 const ARGS = PROFILE.args;
 const CORE_LOAD_TIMEOUT_MS = 30_000;
+const RUNNING_UPDATE_RESUME_SESSION_ENV = 'BLUN_RUNNING_UPDATE_RESUME_SESSION_ID';
 const RUNTIME_READY_TIMEOUT_MS = 60_000;
 const RUNNING_UPDATE_RECHECK_MS = 5 * 60_000;
 const RUNNING_UPDATE_RECHECK_JITTER_MS = 2 * 60_000;
@@ -312,6 +313,7 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
   let pendingHandoff;
   let updateStarted = false;
   let runtimeReady = false;
+  let activeSession;
   let runtimeExitIntent = false;
   let supervisionCompleted = false;
   let runningUpdatePollTimer;
@@ -329,6 +331,23 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
     (options.clearTimeoutImpl || clearTimeout)(runningUpdatePollTimer);
     runningUpdatePollTimer = undefined;
   };
+  const validSessionMessage = (message) => typeof message?.sessionId === 'string'
+    && message.sessionId.length > 0
+    && message.sessionId.length <= 256
+    && !/[\u0000-\u001f\u007f]/u.test(message.sessionId)
+    && resolveHandoffCwd(message.cwd, '') !== '';
+  const stagedRuntimeOptions = () => ({
+    mode: runningUpdateMode,
+    ...(runningUpdateMode === RUNNING_UPDATE_MODES.RESUME && activeSession !== undefined
+      ? { cwd: activeSession.cwd, sessionId: activeSession.sessionId }
+      : {}),
+  });
+  const persistPreparedRuntime = () => {
+    if (preparedTarget === undefined) return;
+    const sharedHome = env.BLUN_SHARED_HOME;
+    if (typeof sharedHome !== 'string' || sharedHome.length === 0) return;
+    (options.stageRuntime || stageRuntime)(sharedHome, preparedTarget, stagedRuntimeOptions());
+  };
   const scheduleNextPreparation = (child) => {
     clearRunningUpdatePoll();
     if (supervisionCompleted || pendingHandoff !== undefined || updateStarted) return;
@@ -367,7 +386,7 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
         return;
       }
       preparedTarget = target;
-      (options.stageRuntime || stageRuntime)(sharedHome, target, { mode: runningUpdateMode });
+      persistPreparedRuntime();
       const runningVersion = readPackageVersionAt(packageRoot);
       (options.recordRunningUpdateEvent || recordRunningUpdateEvent)(sharedHome, previousTarget === undefined ? {
         event: 'prepared-for-next-start',
@@ -396,13 +415,20 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
       && preparedTarget !== undefined
       && message.version === preparedTarget.version
       && message.mode === runningUpdateMode
-      && typeof message.sessionId === 'string'
-      && message.sessionId.length > 0
-      && message.sessionId.length <= 256
-      && !/[\u0000-\u001f\u007f]/u.test(message.sessionId)
-      && resolveHandoffCwd(message.cwd, '') !== '') {
-      pendingHandoff = Object.freeze({
+      && validSessionMessage(message)) {
+      activeSession = Object.freeze({
         cwd: resolveHandoffCwd(message.cwd, cwd),
+        sessionId: message.sessionId,
+      });
+      try {
+        persistPreparedRuntime();
+      } catch (error) {
+        options.onRunningUpdateError?.(error);
+        scheduleNextPreparation(child);
+        return;
+      }
+      pendingHandoff = Object.freeze({
+        cwd: activeSession.cwd,
         mode: message.mode,
         sessionId: message.sessionId,
         target: preparedTarget,
@@ -423,6 +449,17 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
       }
     }
     if (message?.type === RUNTIME_READY_MESSAGE) {
+      if (validSessionMessage(message)) {
+        activeSession = Object.freeze({
+          cwd: resolveHandoffCwd(message.cwd, cwd),
+          sessionId: message.sessionId,
+        });
+        try {
+          persistPreparedRuntime();
+        } catch (error) {
+          options.onRunningUpdateError?.(error);
+        }
+      }
       runtimeReady = true;
       refreshRunningUpdateMode();
       if (automaticMode()) startPreparation(child);
@@ -482,7 +519,11 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
     const handoffArgs = handoffArgsForMode(args, pendingHandoff.mode, pendingHandoff.sessionId);
     const handoffCwd = pendingHandoff.cwd;
     const previousActive = (options.readActiveRuntime || readActiveRuntime)(sharedHome);
-    const nextCore = spawnCore(handoffArgs, env, handoffCwd, { packageRoot: target.packageRoot });
+    const resumeEnv = {
+      ...env,
+      [RUNNING_UPDATE_RESUME_SESSION_ENV]: pendingHandoff.sessionId,
+    };
+    const nextCore = spawnCore(handoffArgs, resumeEnv, handoffCwd, { packageRoot: target.packageRoot });
     const nextLoaded = await nextCore.loaded;
     const nextReady = nextLoaded && await (options.waitForRuntimeReady || waitForRuntimeReady)(
       nextCore,
@@ -498,7 +539,7 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
         toVersion: target.version,
         mode: pendingHandoff.mode,
       }, { now: options.nowImpl });
-      return superviseProtectedCore(handoffArgs, env, handoffCwd, async () => {}, {
+      return superviseProtectedCore(handoffArgs, resumeEnv, handoffCwd, async () => {}, {
         ...options,
         existingCore: nextCore,
         packageRoot: target.packageRoot,
@@ -519,14 +560,14 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
       fromVersion: readPackageVersionAt(packageRoot),
       toVersion: target.version,
     }, { now: options.nowImpl });
-    const fallback = spawnCore(handoffArgs, env, handoffCwd, { packageRoot });
+    const fallback = spawnCore(handoffArgs, resumeEnv, handoffCwd, { packageRoot });
     const fallbackLoaded = await fallback.loaded;
     const fallbackReady = fallbackLoaded && await (options.waitForRuntimeReady || waitForRuntimeReady)(
       fallback,
       options.readyTimeoutMs,
     );
     if (!fallbackReady) return 1;
-    return superviseProtectedCore(handoffArgs, env, handoffCwd, async () => {}, {
+    return superviseProtectedCore(handoffArgs, resumeEnv, handoffCwd, async () => {}, {
       ...options,
       existingCore: fallback,
       packageRoot,
@@ -641,14 +682,20 @@ function spawnManagedLauncher(binary, cwd) {
   });
 }
 
-function spawnActiveLauncher(packageRoot, cwd, args = RAW_ARGS) {
+function spawnActiveLauncher(packageRoot, cwd, args = RAW_ARGS, options = {}) {
   const entryName = path.basename(process.argv[1] || 'king.js').toLowerCase() === 'blun.js'
     ? 'blun.js'
     : 'king.js';
   return new Promise((resolve, reject) => {
     const child = spawn(process.execPath, [path.join(packageRoot, 'bin', entryName), ...args], {
       cwd,
-      env: { ...process.env, BLUN_ACTIVE_RUNTIME_ROOT: packageRoot },
+      env: {
+        ...process.env,
+        BLUN_ACTIVE_RUNTIME_ROOT: packageRoot,
+        ...(typeof options.resumeSessionId === 'string' && options.resumeSessionId.length > 0
+          ? { [RUNNING_UPDATE_RESUME_SESSION_ENV]: options.resumeSessionId }
+          : {}),
+      },
       stdio: 'inherit',
       windowsHide: true,
     });
@@ -873,6 +920,9 @@ async function runLauncher(options = {}) {
         deferredPendingRuntime.packageRoot,
         deferredPendingRuntime.cwd || callerCwd,
         pendingArgs,
+        deferredPendingRuntime.mode === RUNNING_UPDATE_MODES.RESUME
+          ? { resumeSessionId: deferredPendingRuntime.sessionId }
+          : {},
       );
       return;
     }

package/blun.mjs

@@ -515728,20 +515728,28 @@ const {
 	readRunningUpdateMode,
 	writeRunningUpdateMode
 } = __require("./bin/running-update-preference.cjs");
-function notifyRunningRuntimeReady(tui) {
-	if (typeof process.env["BLUN_SHARED_HOME"] === "string" && process.env["BLUN_SHARED_HOME"].length > 0) void pruneRunningUpdateReleases(process.env["BLUN_SHARED_HOME"], {
-		activePackageRoot: __dirname
-	}).catch(() => {});
+const RUNNING_UPDATE_RESUME_SESSION_ENV = "BLUN_RUNNING_UPDATE_RESUME_SESSION_ID";
+function shouldContinueActiveGoalAfterRunningUpdate(expectedSessionId, currentSessionId, goalStatus) {
+	return typeof expectedSessionId === "string" && expectedSessionId.length > 0 && currentSessionId === expectedSessionId && goalStatus === "active";
+}
+function sendRunningRuntimeSession(tui) {
 	if (!process.connected) return;
 	const sessionId = tui.getCurrentSessionId();
 	if (sessionId.length === 0) return;
 	try {
 		process.send({
 			type: RUNTIME_READY_MESSAGE,
-			sessionId
+			sessionId,
+			cwd: tui.state.appState.workDir
 		});
 	} catch {}
 }
+function notifyRunningRuntimeReady(tui) {
+	if (typeof process.env["BLUN_SHARED_HOME"] === "string" && process.env["BLUN_SHARED_HOME"].length > 0) void pruneRunningUpdateReleases(process.env["BLUN_SHARED_HOME"], {
+		activePackageRoot: __dirname
+	}).catch(() => {});
+	sendRunningRuntimeSession(tui);
+}
 function requestRunningUpdateAtSafeBoundary(tui) {
 	if (tui.runningUpdateHandoffStarted || tui.isShuttingDown || !process.connected) return false;
 	const version = tui.runningUpdatePreparedVersion;
@@ -516268,7 +516276,8 @@ var BlunTUI = class {
 		if (this.session !== void 0) {
 			this.sessionEventHandler.startSubscription();
 			if (shouldReplayHistory) {
-				await this.promptStartupResumeGoalIfNeeded();
+				const continuedAfterUpdate = this.continueActiveGoalAfterRunningUpdateIfNeeded();
+				if (!continuedAfterUpdate) await this.promptStartupResumeGoalIfNeeded();
 				if (this.aborted) return;
 			}
 			this.showSessionWarnings(this.session);
@@ -516418,6 +516427,13 @@ var BlunTUI = class {
 		}
 		if (choice === "resume") await handleGoalCommand(this, "resume");
 	}
+	continueActiveGoalAfterRunningUpdateIfNeeded() {
+		const expectedSessionId = process.env[RUNNING_UPDATE_RESUME_SESSION_ENV];
+		delete process.env[RUNNING_UPDATE_RESUME_SESSION_ENV];
+		if (!shouldContinueActiveGoalAfterRunningUpdate(expectedSessionId, this.session?.id, this.state.appState.goal?.status)) return false;
+		this.sendNormalUserInput(RESUME_GOAL_INPUT);
+		return true;
+	}
 	async stop(exitCode) {
 		if (this.isShuttingDown) return;
 		this.isShuttingDown = true;
@@ -517913,6 +517929,7 @@ var BlunTUI = class {
 		if (resumeState?.warning !== void 0) this.showStatus(uiText("blunTui.warning", { warning: resumeState.warning }), "warning");
 		this.showStatus(statusMessage);
 		this.showSessionWarnings(session);
+		sendRunningRuntimeSession(this);
 	}
 	async reloadCurrentSessionView(session, statusMessage) {
 		await this.personalMemoryController.clear(session);
@@ -517976,6 +517993,7 @@ var BlunTUI = class {
 		this.showStatus(uiText("blunTui.session.started", { sessionId: session.id }));
 		this.showSessionWarnings(session);
 		this.showConfigWarningsIfAny();
+		sendRunningRuntimeSession(this);
 	}
 	/** Surface config.toml load warnings (degraded or kept-previous config) in the status bar. */
 	async showConfigWarningsIfAny() {

package/package.json

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