blun-king-cli 9.1.207 → 9.1.209

package/bin/launcher-runtime.js

@@ -33,11 +33,15 @@ const {
   RUNNING_UPDATE_HANDOFF_MESSAGE,
   RUNNING_UPDATE_MODE_MESSAGE,
   RUNNING_UPDATE_PREPARED_MESSAGE,
+  RUNTIME_EXIT_INTENT_MESSAGE,
   activateRuntime,
   handoffArgsForMode,
   handoffRuntime,
   prepareRunningUpdate,
+  pruneRunningUpdateReleases,
+  recordRunningUpdateEvent,
   readActiveRuntime,
+  restoreActiveRuntime,
 } = require('./running-update.cjs');
 const {
   RUNNING_UPDATE_MODES,
@@ -64,6 +68,7 @@ const RUNTIME_READY_TIMEOUT_MS = 60_000;
 const RUNNING_UPDATE_RECHECK_MS = 60_000;
 const RUNNING_UPDATE_RECHECK_JITTER_MS = 30_000;
 const RUNNING_UPDATE_HANDOFF_NOTICE = 'Ein Update wird geladen. Die TUI wird anschließend neu gestartet.';
+const RUNNING_UPDATE_STABILIZATION_MS = 2 * 60 * 1000;
 
 function runningUpdateRecheckDelay(randomValue = Math.random()) {
   const normalized = Number.isFinite(randomValue)
@@ -267,6 +272,14 @@ function resolveHandoffCwd(candidate, fallback) {
   }
 }
 
+function shouldRecoverActivatedRuntime(result, recovery, options = {}) {
+  if (recovery === undefined || options.runtimeExitIntent === true) return false;
+  const signal = result?.signal;
+  if (signal === 'SIGINT' || signal === 'SIGTERM' || signal === 'SIGHUP') return false;
+  const now = options.now ?? Date.now();
+  return now - recovery.activatedAt <= RUNNING_UPDATE_STABILIZATION_MS;
+}
+
 async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {}) {
   const packageRoot = path.resolve(options.packageRoot || PKG);
   let preparedTarget;
@@ -275,6 +288,7 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
   let handoffCwd = cwd;
   let updateStarted = false;
   let runtimeReady = false;
+  let runtimeExitIntent = false;
   let runningUpdatePollTimer;
   let runningUpdateMode = readRunningUpdateMode(env.BLUN_HOME);
   const automaticMode = () => runningUpdateMode === RUNNING_UPDATE_MODES.RESUME
@@ -305,11 +319,17 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
   };
   const announcePrepared = (child) => {
     if (preparedTarget === undefined || !automaticMode() || child.connected !== true) return;
-    child.send({
-      type: RUNNING_UPDATE_PREPARED_MESSAGE,
-      version: preparedTarget.version,
-      mode: runningUpdateMode,
-    });
+    try {
+      child.send({
+        type: RUNNING_UPDATE_PREPARED_MESSAGE,
+        version: preparedTarget.version,
+        mode: runningUpdateMode,
+      }, (error) => {
+        if (error) options.onRunningUpdateError?.(error);
+      });
+    } catch (error) {
+      options.onRunningUpdateError?.(error);
+    }
   };
   const startPreparation = (child) => {
     if (updateStarted || options.runningUpdate === false || !automaticMode()) return;
@@ -340,6 +360,7 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
     });
   };
   const handleCoreMessage = (message, child) => {
+    if (message?.type === RUNTIME_EXIT_INTENT_MESSAGE) runtimeExitIntent = true;
     if (message?.type === RUNTIME_READY_MESSAGE) {
       runtimeReady = true;
       refreshRunningUpdateMode();
@@ -394,12 +415,13 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
   const result = await core.completed;
   clearRunningUpdatePoll();
   if (existingMessageHandler) core.child.off('message', existingMessageHandler);
-  if (result.error) throw result.error;
   if (result.code === RUNNING_UPDATE_HANDOFF_EXIT_CODE
     && preparedTarget !== undefined
     && handoffSessionId !== undefined
     && handoffMode !== undefined) {
     writeRunningUpdateHandoffNotice(options.runningUpdateNoticeOutput || process.stdout);
+    const previousActiveRuntime = (options.readActiveRuntime || readActiveRuntime)(env.BLUN_SHARED_HOME);
+    const activatedAt = (options.nowImpl || Date.now)();
     const handoff = await handoffRuntime({
       target: preparedTarget,
       previous: { packageRoot, version: readPackageVersionAt(packageRoot) },
@@ -418,7 +440,21 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
         }
         return { ...nextCore, ready };
       },
-      activateTarget: (target) => (options.activateRuntime || activateRuntime)(env.BLUN_SHARED_HOME, target),
+      activateTarget: async (target) => {
+        await (options.activateRuntime || activateRuntime)(env.BLUN_SHARED_HOME, target);
+        (options.recordRunningUpdateEvent || recordRunningUpdateEvent)(env.BLUN_SHARED_HOME, {
+          event: 'activated',
+          fromVersion: readPackageVersionAt(packageRoot),
+          toVersion: target.version,
+        }, { now: options.nowImpl });
+        try {
+          await (options.pruneRunningUpdateReleases || pruneRunningUpdateReleases)(env.BLUN_SHARED_HOME, {
+            activePackageRoot: target.packageRoot,
+          });
+        } catch (error) {
+          options.onRunningUpdateError?.(error);
+        }
+      },
     });
     const resumed = handoff.core;
     if (resumed === undefined || resumed.ready !== true) return 1;
@@ -427,8 +463,45 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
       ...options,
       existingCore: resumed,
       packageRoot: handoff.runtime.packageRoot,
+      recoveryRuntime: handoff.kind === 'activated' ? {
+        activatedAt,
+        activeRuntime: previousActiveRuntime,
+        packageRoot,
+        version: readPackageVersionAt(packageRoot),
+      } : undefined,
     });
   }
+  const recovery = options.recoveryRuntime;
+  if (shouldRecoverActivatedRuntime(result, recovery, {
+    now: (options.nowImpl || Date.now)(),
+    runtimeExitIntent,
+  })) {
+    (options.recordRunningUpdateEvent || recordRunningUpdateEvent)(env.BLUN_SHARED_HOME, {
+      event: 'post-activation-exit',
+      activeVersion: readPackageVersionAt(packageRoot),
+      code: Number.isInteger(result.code) ? result.code : null,
+      error: result.error?.message || null,
+      signal: result.signal || null,
+      recoveryVersion: recovery.version,
+    }, { now: options.nowImpl });
+    await (options.restoreActiveRuntime || restoreActiveRuntime)(env.BLUN_SHARED_HOME, recovery.activeRuntime);
+    const fallback = spawnCore(args, env, cwd, { packageRoot: recovery.packageRoot });
+    const fallbackLoaded = await fallback.loaded;
+    const fallbackReady = fallbackLoaded && await waitForRuntimeReady(fallback, options.readyTimeoutMs);
+    (options.recordRunningUpdateEvent || recordRunningUpdateEvent)(env.BLUN_SHARED_HOME, {
+      event: fallbackReady ? 'recovery-ready' : 'recovery-failed',
+      version: recovery.version,
+    }, { now: options.nowImpl });
+    if (fallbackReady) {
+      return superviseProtectedCore(args, env, cwd, async () => {}, {
+        ...options,
+        existingCore: fallback,
+        packageRoot: recovery.packageRoot,
+        recoveryRuntime: undefined,
+      });
+    }
+  }
+  if (result.error) throw result.error;
   return exitCodeForChild(result, loaded);
 }
 
@@ -758,12 +831,14 @@ async function runLauncher(options = {}) {
 module.exports = {
   RUNNING_UPDATE_RECHECK_JITTER_MS,
   RUNNING_UPDATE_RECHECK_MS,
+  RUNNING_UPDATE_STABILIZATION_MS,
   createManagedNodeEnvironment,
   resolveLauncherPrivatePaths,
   resolveHandoffCwd,
   runningUpdateRecheckDelay,
   runLauncher,
   scheduleRunningUpdateRecheck,
+  shouldRecoverActivatedRuntime,
   shouldDetachProtectedCore,
   spawnManagedLauncher,
   superviseProtectedCore,

package/bin/running-update.cjs

@@ -7,6 +7,7 @@ const path = require('node:path');
 const { spawn } = require('node:child_process');
 
 const { compareSemver, requestTrustedJson } = require('./update-notice');
+const { tryAcquireUpdateLease } = require('./update-lease');
 const { ensurePrivateDirectory, securePrivateFile, writePrivateFile } = require('./private-paths');
 
 const PACKAGE_NAME = 'blun-king-cli';
@@ -18,7 +19,10 @@ 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';
 const RUNTIME_READY_MESSAGE = 'blun-runtime-session-ready';
+const RUNTIME_EXIT_INTENT_MESSAGE = 'blun-runtime-exit-intent';
 const MAX_TARBALL_BYTES = 128 * 1024 * 1024;
+const AUTO_UPDATE_SETTLE_MS = 30 * 60 * 1000;
+const DEFAULT_RETAINED_RELEASE_VERSIONS = 3;
 
 function ownData(value, key) {
   if (typeof value !== 'object' || value === null || Array.isArray(value)) return undefined;
@@ -37,22 +41,110 @@ function validIntegrity(value) {
   }
 }
 
-function selectRunningUpdateTarget(currentVersion, manifest) {
+function selectRunningUpdateTarget(currentVersion, manifest, options = {}) {
   const name = ownData(manifest, 'name');
   const version = ownData(manifest, 'latest');
   const integrity = ownData(manifest, 'integrity');
   const releasedAt = ownData(manifest, 'releasedAt');
+  const releasedAtMs = Date.parse(releasedAt);
+  const now = options.now || Date.now;
   if (name !== PACKAGE_NAME
     || typeof version !== 'string'
     || compareSemver(currentVersion, version) !== -1
     || !validIntegrity(integrity)
     || typeof releasedAt !== 'string'
-    || !Number.isFinite(Date.parse(releasedAt))) {
+    || !Number.isFinite(releasedAtMs)
+    || now() - releasedAtMs < AUTO_UPDATE_SETTLE_MS) {
     return null;
   }
   return Object.freeze({ version, integrity });
 }
 
+function releaseVersionEntries(sharedHome) {
+  const root = releasesRoot(sharedHome);
+  let entries;
+  try {
+    entries = fs.readdirSync(root, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+  const releases = [];
+  for (const entry of entries) {
+    if (!entry.isDirectory() || entry.isSymbolicLink()) continue;
+    const version = entry.name;
+    try {
+      if (compareSemver('0.0.0', version) !== -1) continue;
+    } catch {
+      continue;
+    }
+    const versionRoot = path.join(root, version);
+    const digestEntries = fs.readdirSync(versionRoot, { withFileTypes: true });
+    const packageRoots = [];
+    let valid = digestEntries.length > 0;
+    for (const digestEntry of digestEntries) {
+      if (!digestEntry.isDirectory() || digestEntry.isSymbolicLink()) {
+        valid = false;
+        break;
+      }
+      const packageRoot = path.join(versionRoot, digestEntry.name, 'node_modules', PACKAGE_NAME);
+      if (!verifyRuntimePackage(packageRoot, version, { allowedRoot: versionRoot })) {
+        valid = false;
+        break;
+      }
+      packageRoots.push(path.resolve(packageRoot));
+    }
+    if (valid && packageRoots.length > 0) releases.push({ packageRoots, version, versionRoot });
+  }
+  releases.sort((left, right) => compareSemver(right.version, left.version));
+  return releases;
+}
+
+async function pruneRunningUpdateReleases(sharedHome, options = {}) {
+  const keepVersions = Number.isInteger(options.keepVersions) && options.keepVersions >= 1
+    ? options.keepVersions
+    : DEFAULT_RETAINED_RELEASE_VERSIONS;
+  const activePackageRoot = typeof options.activePackageRoot === 'string'
+    ? path.resolve(options.activePackageRoot)
+    : readActiveRuntime(sharedHome)?.packageRoot;
+  const acquire = options.tryAcquireLease
+    || (({ packageRoot }) => tryAcquireUpdateLease({ packageRoot, role: 'install' }));
+  const releases = releaseVersionEntries(sharedHome);
+  const kept = new Set(releases.slice(0, keepVersions).map((release) => release.version));
+  for (const release of releases) {
+    if (release.packageRoots.includes(activePackageRoot)) kept.add(release.version);
+  }
+  const removedVersions = [];
+  const busyVersions = [];
+  for (const release of releases) {
+    if (kept.has(release.version)) continue;
+    const leases = [];
+    let blocked = false;
+    try {
+      for (const packageRoot of release.packageRoots) {
+        const result = await acquire({ packageRoot });
+        if (!result?.acquired || !result.lease) {
+          blocked = true;
+          break;
+        }
+        leases.push(result.lease);
+      }
+      if (blocked) {
+        busyVersions.push(release.version);
+        continue;
+      }
+      for (const lease of leases) lease.assertOwned();
+      fs.rmSync(release.versionRoot, { recursive: true, force: true });
+      removedVersions.push(release.version);
+    } finally {
+      await Promise.allSettled(leases.map((lease) => lease.release()));
+    }
+  }
+  return Object.freeze({
+    busyVersions: Object.freeze(busyVersions),
+    removedVersions: Object.freeze(removedVersions),
+  });
+}
+
 function isSafeRuntimeBoundary(state) {
   return state?.isShuttingDown === false
     && state.streamingPhase === 'idle'
@@ -185,6 +277,28 @@ function activateRuntime(sharedHome, target) {
   }
 }
 
+function restoreActiveRuntime(sharedHome, runtime) {
+  if (runtime === null || runtime === undefined) {
+    fs.rmSync(activeRuntimePath(sharedHome), { force: true });
+    return;
+  }
+  activateRuntime(sharedHome, runtime);
+}
+
+function recordRunningUpdateEvent(sharedHome, event, options = {}) {
+  if (typeof sharedHome !== 'string' || !path.isAbsolute(sharedHome)) return false;
+  const updateRoot = path.join(path.resolve(sharedHome), 'updates');
+  ensurePrivateDirectory(path.resolve(sharedHome));
+  ensurePrivateDirectory(updateRoot);
+  const filePath = path.join(updateRoot, 'handoff.jsonl');
+  fs.appendFileSync(filePath, `${JSON.stringify({
+    at: new Date((options.now || Date.now)()).toISOString(),
+    ...event,
+  })}\n`, { encoding: 'utf8', mode: 0o600 });
+  securePrivateFile(filePath);
+  return true;
+}
+
 function registryRelease(registry, version) {
   const versions = ownData(registry, 'versions');
   const entry = ownData(versions, version);
@@ -325,7 +439,7 @@ async function prepareRunningUpdate(options) {
   const manifest = await (options.loadManifest
     ? options.loadManifest()
     : requestTrustedJson(MANIFEST_URL));
-  const target = selectRunningUpdateTarget(options.currentVersion, manifest);
+  const target = selectRunningUpdateTarget(options.currentVersion, manifest, { now: options.now });
   if (target === null) return null;
   const registry = await (options.loadRegistry
     ? options.loadRegistry()
@@ -378,10 +492,12 @@ async function prepareRunningUpdate(options) {
 
 module.exports = {
   ACTIVE_RUNTIME_FILE,
+  AUTO_UPDATE_SETTLE_MS,
   RUNNING_UPDATE_HANDOFF_EXIT_CODE,
   RUNNING_UPDATE_HANDOFF_MESSAGE,
   RUNNING_UPDATE_MODE_MESSAGE,
   RUNNING_UPDATE_PREPARED_MESSAGE,
+  RUNTIME_EXIT_INTENT_MESSAGE,
   RUNTIME_READY_MESSAGE,
   activateRuntime,
   activeRuntimePath,
@@ -390,7 +506,10 @@ module.exports = {
   handoffRuntime,
   isSafeRuntimeBoundary,
   prepareRunningUpdate,
+  pruneRunningUpdateReleases,
+  recordRunningUpdateEvent,
   readActiveRuntime,
+  restoreActiveRuntime,
   resumeArgsForHandoff,
   selectRunningUpdateTarget,
   verifyRuntimePackage,

package/blun.mjs

@@ -515036,12 +515036,15 @@ function turnsToTrim(turns, maxTurns, hysteresis) {
 //#endregion
 //#region src/tui/blun-tui.ts
 const {
+	AUTO_UPDATE_SETTLE_MS,
 	RUNNING_UPDATE_HANDOFF_EXIT_CODE,
 	RUNNING_UPDATE_HANDOFF_MESSAGE,
 	RUNNING_UPDATE_MODE_MESSAGE,
 	RUNNING_UPDATE_PREPARED_MESSAGE,
+	RUNTIME_EXIT_INTENT_MESSAGE,
 	RUNTIME_READY_MESSAGE,
-	isSafeRuntimeBoundary
+	isSafeRuntimeBoundary,
+	pruneRunningUpdateReleases
 } = __require("./bin/running-update.cjs");
 const {
 	RUNNING_UPDATE_MODES,
@@ -515049,6 +515052,9 @@ const {
 	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(() => {});
 	if (!process.connected) return;
 	const sessionId = tui.getCurrentSessionId();
 	if (sessionId.length === 0) return;
@@ -515061,6 +515067,17 @@ function notifyRunningRuntimeReady(tui) {
 }
 function requestRunningUpdateAtSafeBoundary(tui) {
 	if (tui.runningUpdatePreparedVersion === void 0 || tui.runningUpdatePreparedMode === void 0 || tui.runningUpdateHandoffStarted || !process.connected) return false;
+	const waitMs = tui.runningUpdateNotBeforeMs - Date.now();
+	if (Number.isFinite(waitMs) && waitMs > 0) {
+		if (tui.runningUpdateDelayTimer === void 0) {
+			tui.runningUpdateDelayTimer = setTimeout(() => {
+				tui.runningUpdateDelayTimer = void 0;
+				requestRunningUpdateAtSafeBoundary(tui);
+			}, waitMs);
+			tui.runningUpdateDelayTimer.unref?.();
+		}
+		return false;
+	}
 	const boundaryState = () => ({
 		isShuttingDown: tui.isShuttingDown,
 		streamingPhase: tui.state.appState.streamingPhase,
@@ -515191,6 +515208,8 @@ var BlunTUI = class {
 	runningUpdatePreparedVersion;
 	runningUpdatePreparedMode;
 	runningUpdateHandoffStarted = false;
+	runningUpdateNotBeforeMs = Date.now() + AUTO_UPDATE_SETTLE_MS;
+	runningUpdateDelayTimer;
 	runningUpdateMessageDispose;
 	startupPhaseMs = {};
 	lastActivityMode;
@@ -515716,6 +515735,9 @@ var BlunTUI = class {
 	async stop(exitCode) {
 		if (this.isShuttingDown) return;
 		this.isShuttingDown = true;
+		if (exitCode === 0 && process.connected) try {
+			process.send({ type: RUNTIME_EXIT_INTENT_MESSAGE });
+		} catch {}
 		this.unregisterSignalHandlers();
 		this.aborted = true;
 		this.channelQueueDeadline?.dispose();

package/package.json

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