blun-king-cli 9.1.209 → 9.1.211

package/bin/launcher-runtime.js

@@ -35,13 +35,17 @@ const {
   RUNNING_UPDATE_PREPARED_MESSAGE,
   RUNTIME_EXIT_INTENT_MESSAGE,
   activateRuntime,
+  clearActiveRuntime,
   handoffArgsForMode,
   handoffRuntime,
   prepareRunningUpdate,
   pruneRunningUpdateReleases,
   recordRunningUpdateEvent,
   readActiveRuntime,
+  readPendingRuntime,
   restoreActiveRuntime,
+  clearPendingRuntime,
+  stageRuntime,
 } = require('./running-update.cjs');
 const {
   RUNNING_UPDATE_MODES,
@@ -65,9 +69,8 @@ const PROFILE = parseProfileLaunchArgs(RAW_ARGS, launcherModeFromArgv(process.ar
 const ARGS = PROFILE.args;
 const CORE_LOAD_TIMEOUT_MS = 30_000;
 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_RECHECK_MS = 5 * 60_000;
+const RUNNING_UPDATE_RECHECK_JITTER_MS = 2 * 60_000;
 const RUNNING_UPDATE_STABILIZATION_MS = 2 * 60 * 1000;
 
 function runningUpdateRecheckDelay(randomValue = Math.random()) {
@@ -87,10 +90,6 @@ function scheduleRunningUpdateRecheck(callback, options = {}) {
   return timer;
 }
 
-function writeRunningUpdateHandoffNotice(output = process.stdout) {
-  output.write(`\n${RUNNING_UPDATE_HANDOFF_NOTICE}\n`);
-}
-
 function normalizeWindowsPath(value) {
   return path.win32.normalize(value).replace(/\\+$/u, '').toLowerCase();
 }
@@ -351,6 +350,15 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
         return;
       }
       preparedTarget = target;
+      (options.stageRuntime || stageRuntime)(sharedHome, target, { mode: runningUpdateMode });
+      (options.recordRunningUpdateEvent || recordRunningUpdateEvent)(sharedHome, {
+        event: 'prepared-for-next-start',
+        fromVersion: readPackageVersionAt(packageRoot),
+        toVersion: target.version,
+      }, { now: options.nowImpl });
+      Promise.resolve((options.pruneRunningUpdateReleases || pruneRunningUpdateReleases)(sharedHome, {
+        activePackageRoot: packageRoot,
+      })).catch((error) => options.onRunningUpdateError?.(error));
       clearRunningUpdatePoll();
       announcePrepared(child);
     }).catch((error) => {
@@ -389,6 +397,13 @@ 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,
+        });
+      }
     }
   };
   const spawnCore = options.spawnProtectedCore || spawnProtectedCore;
@@ -402,6 +417,21 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
     core.child.on('message', existingMessageHandler);
   }
   const loaded = await core.loaded;
+  if (loaded && options.startupPendingRuntime !== undefined) {
+    await (options.activateRuntime || activateRuntime)(env.BLUN_SHARED_HOME, options.startupPendingRuntime);
+    (options.clearPendingRuntime || clearPendingRuntime)(env.BLUN_SHARED_HOME, options.startupPendingRuntime);
+    (options.recordRunningUpdateEvent || recordRunningUpdateEvent)(env.BLUN_SHARED_HOME, {
+      event: 'activated-on-start',
+      version: options.startupPendingRuntime.version,
+    }, { now: options.nowImpl });
+  } else if (loaded && options.staleActiveRuntime !== undefined) {
+    (options.clearActiveRuntime || clearActiveRuntime)(env.BLUN_SHARED_HOME, options.staleActiveRuntime);
+    (options.recordRunningUpdateEvent || recordRunningUpdateEvent)(env.BLUN_SHARED_HOME, {
+      event: 'stale-active-cleared',
+      staleVersion: options.staleActiveRuntime.version,
+      runningVersion: readPackageVersionAt(packageRoot),
+    }, { now: options.nowImpl });
+  }
   if (loaded && !runtimeReady) {
     // Core load is an independent readiness signal. Start the download even
     // when the later TUI-ready IPC message is lost; handoff still waits for
@@ -419,7 +449,6 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
     && 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({
@@ -463,6 +492,8 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
       ...options,
       existingCore: resumed,
       packageRoot: handoff.runtime.packageRoot,
+      startupPendingRuntime: undefined,
+      staleActiveRuntime: undefined,
       recoveryRuntime: handoff.kind === 'activated' ? {
         activatedAt,
         activeRuntime: previousActiveRuntime,
@@ -497,6 +528,8 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
         ...options,
         existingCore: fallback,
         packageRoot: recovery.packageRoot,
+        startupPendingRuntime: undefined,
+        staleActiveRuntime: undefined,
         recoveryRuntime: undefined,
       });
     }
@@ -575,12 +608,12 @@ function spawnManagedLauncher(binary, cwd) {
   });
 }
 
-function spawnActiveLauncher(packageRoot, cwd) {
+function spawnActiveLauncher(packageRoot, cwd, args = RAW_ARGS) {
   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), ...RAW_ARGS], {
+    const child = spawn(process.execPath, [path.join(packageRoot, 'bin', entryName), ...args], {
       cwd,
       env: { ...process.env, BLUN_ACTIVE_RUNTIME_ROOT: packageRoot },
       stdio: 'inherit',
@@ -598,16 +631,40 @@ function spawnActiveLauncher(packageRoot, cwd) {
 
 async function runLauncher(options = {}) {
   const callerCwd = process.cwd();
+  let startupPendingRuntime;
+  let staleActiveRuntime;
   if (options.skipActiveRuntime !== true) {
     const activeHome = resolveLauncherPrivatePaths().sharedHome;
+    const pendingRuntime = readPendingRuntime(activeHome);
     const activeRuntime = readActiveRuntime(activeHome);
     const currentVersion = readPackageVersion();
-    if (activeRuntime !== null
+    if (pendingRuntime !== null
+      && path.resolve(pendingRuntime.packageRoot) !== PKG
+      && compareSemver(currentVersion, pendingRuntime.version) === -1) {
+      const pendingArgs = pendingRuntime.mode !== undefined && pendingRuntime.sessionId !== undefined
+        ? handoffArgsForMode(RAW_ARGS, pendingRuntime.mode, pendingRuntime.sessionId)
+        : RAW_ARGS;
+      process.exitCode = await spawnActiveLauncher(
+        pendingRuntime.packageRoot,
+        pendingRuntime.cwd || callerCwd,
+        pendingArgs,
+      );
+      return;
+    }
+    if (pendingRuntime !== null && path.resolve(pendingRuntime.packageRoot) === PKG) {
+      startupPendingRuntime = pendingRuntime;
+    }
+    if (startupPendingRuntime === undefined && activeRuntime !== null
       && path.resolve(activeRuntime.packageRoot) !== PKG
       && compareSemver(currentVersion, activeRuntime.version) === -1) {
       process.exitCode = await spawnActiveLauncher(activeRuntime.packageRoot, callerCwd);
       return;
     }
+    if (activeRuntime !== null
+      && path.resolve(activeRuntime.packageRoot) !== PKG
+      && compareSemver(currentVersion, activeRuntime.version) >= 0) {
+      staleActiveRuntime = activeRuntime;
+    }
   }
   const mode = options.mode || launcherModeFromArgv(process.argv);
   const explicitUpdateRequest = isNpmPackageUpdateRequest(ARGS);
@@ -822,6 +879,7 @@ async function runLauncher(options = {}) {
       env,
       callerCwd,
       releaseNotice,
+      { startupPendingRuntime, staleActiveRuntime },
     );
   } finally {
     await releaseNotice();
@@ -842,5 +900,4 @@ module.exports = {
   shouldDetachProtectedCore,
   spawnManagedLauncher,
   superviseProtectedCore,
-  writeRunningUpdateHandoffNotice,
 };

package/bin/running-update.cjs

@@ -14,6 +14,7 @@ const PACKAGE_NAME = 'blun-king-cli';
 const MANIFEST_URL = 'https://chat.blun.ai/blun-code-version.json';
 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_PREPARED_MESSAGE = 'blun-running-update-prepared';
 const RUNNING_UPDATE_HANDOFF_MESSAGE = 'blun-running-update-handoff';
@@ -204,6 +205,10 @@ function activeRuntimePath(sharedHome) {
   return path.join(path.resolve(sharedHome), 'updates', ACTIVE_RUNTIME_FILE);
 }
 
+function pendingRuntimePath(sharedHome) {
+  return path.join(path.resolve(sharedHome), 'updates', PENDING_RUNTIME_FILE);
+}
+
 function pathWithin(root, candidate) {
   const relative = path.relative(root, candidate);
   return relative === '' || (relative !== '..'
@@ -230,9 +235,8 @@ function verifyRuntimePackage(packageRoot, version, options = {}) {
   }
 }
 
-function readActiveRuntime(sharedHome) {
+function readRuntimeRecord(sharedHome, filePath) {
   try {
-    const filePath = activeRuntimePath(sharedHome);
     const stat = fs.lstatSync(filePath);
     if (!stat.isFile() || stat.isSymbolicLink() || stat.size > 16 * 1024) return null;
     const record = JSON.parse(fs.readFileSync(filePath, 'utf8'));
@@ -246,13 +250,31 @@ function readActiveRuntime(sharedHome) {
       || !verifyRuntimePackage(packageRoot, version, { sharedHome })) {
       return null;
     }
-    return Object.freeze({ version, packageRoot: path.resolve(packageRoot), integrity });
+    const mode = ownData(record, 'mode');
+    const sessionId = ownData(record, 'sessionId');
+    const cwd = ownData(record, 'cwd');
+    return Object.freeze({
+      version,
+      packageRoot: path.resolve(packageRoot),
+      integrity,
+      ...(mode === 'resume' || mode === 'new' ? { mode } : {}),
+      ...(typeof sessionId === 'string' && sessionId.length > 0 ? { sessionId } : {}),
+      ...(typeof cwd === 'string' && path.isAbsolute(cwd) ? { cwd: path.resolve(cwd) } : {}),
+    });
   } catch {
     return null;
   }
 }
 
-function activateRuntime(sharedHome, target) {
+function readActiveRuntime(sharedHome) {
+  return readRuntimeRecord(sharedHome, activeRuntimePath(sharedHome));
+}
+
+function readPendingRuntime(sharedHome) {
+  return readRuntimeRecord(sharedHome, pendingRuntimePath(sharedHome));
+}
+
+function writeRuntimeRecord(sharedHome, fileName, target, extra = {}) {
   if (!verifyRuntimePackage(target.packageRoot, target.version, { sharedHome })
     || !validIntegrity(target.integrity)) {
     throw new Error('RUNNING_UPDATE_TARGET_INVALID');
@@ -260,14 +282,14 @@ function activateRuntime(sharedHome, target) {
   const updateRoot = path.join(path.resolve(sharedHome), 'updates');
   ensurePrivateDirectory(path.resolve(sharedHome));
   ensurePrivateDirectory(updateRoot);
-  const filePath = activeRuntimePath(sharedHome);
-  const temporaryPath = path.join(updateRoot, `.${ACTIVE_RUNTIME_FILE}.${process.pid}.${randomUUID()}.tmp`);
+  const filePath = path.join(updateRoot, fileName);
+  const temporaryPath = path.join(updateRoot, `.${fileName}.${process.pid}.${randomUUID()}.tmp`);
   try {
     writePrivateFile(temporaryPath, `${JSON.stringify({
       version: target.version,
       packageRoot: path.resolve(target.packageRoot),
       integrity: target.integrity,
-      activatedAt: new Date().toISOString(),
+      ...extra,
     })}\n`);
     fs.renameSync(temporaryPath, filePath);
     securePrivateFile(filePath);
@@ -277,6 +299,48 @@ function activateRuntime(sharedHome, target) {
   }
 }
 
+function activateRuntime(sharedHome, target) {
+  writeRuntimeRecord(sharedHome, ACTIVE_RUNTIME_FILE, target, {
+    activatedAt: new Date().toISOString(),
+  });
+}
+
+function stageRuntime(sharedHome, target, options = {}) {
+  const mode = options.mode === 'resume' || options.mode === 'new' ? options.mode : undefined;
+  const sessionId = typeof options.sessionId === 'string' && options.sessionId.length > 0
+    ? options.sessionId
+    : undefined;
+  const cwd = typeof options.cwd === 'string' && path.isAbsolute(options.cwd)
+    ? path.resolve(options.cwd)
+    : undefined;
+  writeRuntimeRecord(sharedHome, PENDING_RUNTIME_FILE, target, {
+    preparedAt: new Date((options.now || Date.now)()).toISOString(),
+    ...(mode === undefined ? {} : { mode }),
+    ...(sessionId === undefined ? {} : { sessionId }),
+    ...(cwd === undefined ? {} : { cwd }),
+  });
+}
+
+function clearRuntimeRecord(sharedHome, expected, readRecord, filePath) {
+  const runtime = readRecord(sharedHome);
+  if (runtime === null) return false;
+  if (expected !== undefined
+    && (runtime.version !== expected.version
+      || runtime.packageRoot !== path.resolve(expected.packageRoot))) {
+    return false;
+  }
+  fs.rmSync(filePath(sharedHome), { force: true });
+  return true;
+}
+
+function clearActiveRuntime(sharedHome, expected) {
+  return clearRuntimeRecord(sharedHome, expected, readActiveRuntime, activeRuntimePath);
+}
+
+function clearPendingRuntime(sharedHome, expected) {
+  return clearRuntimeRecord(sharedHome, expected, readPendingRuntime, pendingRuntimePath);
+}
+
 function restoreActiveRuntime(sharedHome, runtime) {
   if (runtime === null || runtime === undefined) {
     fs.rmSync(activeRuntimePath(sharedHome), { force: true });
@@ -492,6 +556,7 @@ async function prepareRunningUpdate(options) {
 
 module.exports = {
   ACTIVE_RUNTIME_FILE,
+  PENDING_RUNTIME_FILE,
   AUTO_UPDATE_SETTLE_MS,
   RUNNING_UPDATE_HANDOFF_EXIT_CODE,
   RUNNING_UPDATE_HANDOFF_MESSAGE,
@@ -501,6 +566,8 @@ module.exports = {
   RUNTIME_READY_MESSAGE,
   activateRuntime,
   activeRuntimePath,
+  clearActiveRuntime,
+  clearPendingRuntime,
   defaultProbeRuntime,
   handoffArgsForMode,
   handoffRuntime,
@@ -509,8 +576,11 @@ module.exports = {
   pruneRunningUpdateReleases,
   recordRunningUpdateEvent,
   readActiveRuntime,
+  readPendingRuntime,
   restoreActiveRuntime,
   resumeArgsForHandoff,
   selectRunningUpdateTarget,
+  stageRuntime,
+  pendingRuntimePath,
   verifyRuntimePackage,
 };

package/blun.mjs

@@ -78012,7 +78012,10 @@ function parseLoopInterval(rawInterval) {
 			cron: hours === 1 ? "0 * * * *" : `0 */${String(hours)} * * *`
 		};
 	}
-	throw invalidLoopInterval(rawInterval);
+	return {
+		interval: `${String(amount)}${unit}`,
+		cron: "* * * * *"
+	};
 }
 function invalidLoopInterval(rawInterval) {
 	return new BlunError(ErrorCodes.LOOP_INTERVAL_INVALID, `Invalid loop interval ${JSON.stringify(rawInterval)}`);
@@ -418410,17 +418413,13 @@ function injectChannelEnvelope(host, envelope, preamble) {
 		host.displayContext?.(envelope.text, origin);
 		return "buffered";
 	}
-	if (!host.canDeliver()) {
-		host.reportUndeliverable(uiText("channelInjection.noActiveSession"));
-		return "dropped";
-	}
 	const modelParts = [...preamble.bufferedByChat?.get(envelope.meta.chat_id) ?? [], envelope.tag];
 	if (!preamble.sent && envelope.preamble !== void 0 && envelope.preamble.length > 0) {
 		modelParts.unshift(envelope.preamble);
 		preamble.sent = true;
 	}
 	const modelInput = modelParts.join("\n\n");
-	if (host.isBusy()) {
+	if (!host.canDeliver() || host.isBusy()) {
 		host.enqueue(modelInput, envelope.text, origin, contextOnly);
 		preamble.bufferedByChat?.delete(envelope.meta.chat_id);
 		return "queued";
@@ -422400,9 +422399,14 @@ function parseLoopCommand(rawArgs) {
 	}
 	if (LOOP_CREATE_FILLERS.has(tokens[startIndex]?.toLowerCase() ?? "")) startIndex += 1;
 	const intervalToken = tokens[startIndex];
-	const interval = intervalToken === void 0 ? null : normalizeLoopIntervalToken(intervalToken);
+	let interval = intervalToken === void 0 ? null : normalizeLoopIntervalToken(intervalToken);
+	let intervalTokenCount = 1;
+	if (interval === null && /^\d+$/u.test(intervalToken ?? "") && tokens[startIndex + 1] !== void 0) {
+		interval = normalizeLoopIntervalToken(`${intervalToken}${tokens[startIndex + 1]}`);
+		if (interval !== null) intervalTokenCount = 2;
+	}
 	if (interval !== null) {
-		const prompt = tokens.slice(startIndex + 1).join(" ").trim();
+		const prompt = tokens.slice(startIndex + intervalTokenCount).join(" ").trim();
 		if (prompt.length === 0) return { kind: "error" };
 		return {
 			kind: "create",
@@ -515067,17 +515071,6 @@ 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,
@@ -515101,9 +515094,7 @@ function requestRunningUpdateAtSafeBoundary(tui) {
 		}, (error) => {
 			if (error || !isSafeRuntimeBoundary(boundaryState())) {
 				tui.runningUpdateHandoffStarted = false;
-				return;
 			}
-			void tui.stop(RUNNING_UPDATE_HANDOFF_EXIT_CODE);
 		});
 	} catch {
 		tui.runningUpdateHandoffStarted = false;
@@ -515116,6 +515107,7 @@ function installRunningUpdateListener(tui) {
 		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);
@@ -515208,8 +515200,6 @@ var BlunTUI = class {
 	runningUpdatePreparedVersion;
 	runningUpdatePreparedMode;
 	runningUpdateHandoffStarted = false;
-	runningUpdateNotBeforeMs = Date.now() + AUTO_UPDATE_SETTLE_MS;
-	runningUpdateDelayTimer;
 	runningUpdateMessageDispose;
 	startupPhaseMs = {};
 	lastActivityMode;
@@ -516327,10 +516317,6 @@ var BlunTUI = class {
 		}, envelope, this.channelPreamble);
 	}
 	injectTelegramRemoteCommand(envelope, command, acknowledge) {
-		if (this.session === void 0 || this.state.appState.model.trim().length === 0) {
-			this.showStatus(uiText("channelInjection.noActiveSession"), "warning");
-			return;
-		}
 		const item = {
 			text: command.input,
 			displayText: command.displayText,
@@ -516341,7 +516327,7 @@ var BlunTUI = class {
 			channelAcknowledge: acknowledge,
 			telegramCommandName: command.name
 		};
-		const busy = this.state.queuedMessages.length > 0 || this.queueSteerInFlight !== void 0 || this.pendingChannelReplyGuard !== void 0 || this.deferUserMessages || this.streamingUI.hasActiveTurn() || this.state.appState.streamingPhase !== "idle" || this.state.appState.isCompacting;
+		const busy = this.session === void 0 || this.state.appState.model.trim().length === 0 || this.state.queuedMessages.length > 0 || this.queueSteerInFlight !== void 0 || this.pendingChannelReplyGuard !== void 0 || this.deferUserMessages || this.streamingUI.hasActiveTurn() || this.state.appState.streamingPhase !== "idle" || this.state.appState.isCompacting;
 		if (busy) {
 			this.state.queuedMessages.push(item);
 			this.track("input_queue", { kind: "channel-command" });

package/package.json

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