blun-king-cli 9.1.392 → 9.1.393

package/bin/update-notice.js

@@ -35,6 +35,7 @@ const UPDATE_SIGNAL_EXIT_CODES = Object.freeze({
   SIGTERM: 143,
 });
 const INTERACTIVE_START_MODE_FLAGS = new Set([
+  '-c',
   '-y',
   '--auto',
   '--auto-approve',
@@ -556,51 +557,6 @@ function pendingUpdatePath(blunDir) {
   return path.join(blunDir, PENDING_UPDATE_FILE);
 }
 
-function readPendingUpdate(blunDir) {
-  try {
-    const filePath = pendingUpdatePath(blunDir);
-    if (!fs.existsSync(filePath)) return undefined;
-    securePrivateFile(filePath);
-    const stat = fs.lstatSync(filePath);
-    if (!stat.isFile() || stat.isSymbolicLink() || stat.size > 1_024) return undefined;
-    const record = exactDataRecord(JSON.parse(fs.readFileSync(filePath, 'utf8')), [
-      'targetVersion',
-      'version',
-    ]);
-    if (!record || record.version !== 1 || !parseSemver(record.targetVersion)) return undefined;
-    return record.targetVersion;
-  } catch {
-    return undefined;
-  }
-}
-
-function writePendingUpdate(blunDir, targetVersion) {
-  if (!parseSemver(targetVersion)) throw new Error('INVALID_UPDATE_VERSION');
-  ensurePrivateDirectory(blunDir);
-  const filePath = pendingUpdatePath(blunDir);
-  const temporaryPath = path.join(
-    blunDir,
-    `.${PENDING_UPDATE_FILE}.${process.pid}.${randomUUID()}.tmp`,
-  );
-  try {
-    writePrivateFile(temporaryPath, `${JSON.stringify({
-      version: 1,
-      targetVersion,
-    })}\n`);
-    const handle = fs.openSync(temporaryPath, 'r+');
-    try {
-      fs.fsyncSync(handle);
-    } finally {
-      fs.closeSync(handle);
-    }
-    fs.renameSync(temporaryPath, filePath);
-    securePrivateFile(filePath);
-  } catch (error) {
-    fs.rmSync(temporaryPath, { force: true });
-    throw error;
-  }
-}
-
 function clearPendingUpdate(blunDir) {
   fs.rmSync(pendingUpdatePath(blunDir), { force: true });
 }
@@ -1029,14 +985,6 @@ function pathIsWithin(root, candidate) {
     && !path.isAbsolute(relative));
 }
 
-function isManagedReleasePackageRoot(blunDir, packageRoot) {
-  if (typeof blunDir !== 'string' || typeof packageRoot !== 'string') return false;
-  return pathIsWithin(
-    path.join(path.resolve(blunDir), UPDATE_DIRECTORY, 'releases'),
-    path.resolve(packageRoot),
-  );
-}
-
 function resolveInstallTempRoot(options) {
   if (typeof options.blunDir !== 'string' || options.blunDir.trim().length === 0) {
     throw new Error('INVALID_UPDATE_BLUN_HOME');
@@ -1363,19 +1311,6 @@ function explicitFailure(stderr, reason, exitCode) {
   };
 }
 
-function queueExplicitUpdate(blunDir, release, stdout, stderr) {
-  try {
-    ensurePrivateDirectory(blunDir);
-    writePendingUpdate(blunDir, release.version);
-  } catch {
-    return explicitFailure(stderr, 'private_home_unavailable');
-  }
-  stdout.write(
-    `Update ${release.version} vorgemerkt. Es wird beim ersten freien Start automatisch installiert.\n`,
-  );
-  return { kind: 'queued', version: release.version };
-}
-
 async function runUpdateFlow(options, explicitUpdate) {
   const {
     currentVersion,
@@ -1395,11 +1330,6 @@ async function runUpdateFlow(options, explicitUpdate) {
       : { kind: 'continue', reason: 'invalid_current_version' };
   }
 
-  let pendingVersion = readPendingUpdate(blunDir);
-  if (pendingVersion !== undefined && compareSemver(currentVersion, pendingVersion) >= 0) {
-    clearPendingUpdate(blunDir);
-    pendingVersion = undefined;
-  }
   const now = (options.now || Date.now)();
 
   const packageRoot = path.resolve(options.packageRoot || path.resolve(__dirname, '..'));
@@ -1448,26 +1378,14 @@ async function runUpdateFlow(options, explicitUpdate) {
         ? explicitNoTarget(stdout, reason, currentVersion)
         : { kind: 'continue', reason };
     }
-    const preparedRuntime = options.preparedRuntime;
-    const preparedRuntimeReady = preparedRuntime !== null
-      && typeof preparedRuntime === 'object'
-      && preparedRuntime.version === release.version
-      && typeof preparedRuntime.packageRoot === 'string'
-      && path.isAbsolute(preparedRuntime.packageRoot)
-      && verifyInstalledPackageVersion(preparedRuntime.packageRoot, release.version);
-    const automaticPreparedRuntimeReady = options.autoInstallPreparedRuntime === true
-      && preparedRuntimeReady;
     if (!explicitUpdate
-      && pendingVersion === undefined
-      && !automaticPreparedRuntimeReady
       && readSnoozeState(blunDir, release.version, now)) {
       return { kind: 'continue', reason: 'snoozed' };
     }
-    const queuedForRelease = pendingVersion === release.version;
     const initialInstallLease = await probeInstallLease(options, packageRoot);
     if (initialInstallLease === 'busy') {
       return explicitUpdate
-        ? queueExplicitUpdate(blunDir, release, stdout, stderr)
+        ? explicitFailure(stderr, 'update_in_progress')
         : { kind: 'update_in_progress' };
     }
     if (initialInstallLease !== 'clear') {
@@ -1476,12 +1394,10 @@ async function runUpdateFlow(options, explicitUpdate) {
         : { kind: 'continue', reason: 'lease_unavailable' };
     }
     if (!explicitUpdate
-      && !queuedForRelease
-      && !automaticPreparedRuntimeReady
       && readSkippedVersion(blunDir) === release.version) {
       return { kind: 'continue', reason: 'skipped_version' };
     }
-    if (explicitUpdate || queuedForRelease) {
+    if (explicitUpdate) {
       try {
         ensurePrivateDirectory(blunDir);
       } catch {
@@ -1498,7 +1414,7 @@ async function runUpdateFlow(options, explicitUpdate) {
     const prePromptInstallLease = await probeInstallLease(options, packageRoot);
     if (prePromptInstallLease === 'busy') {
       return explicitUpdate
-        ? queueExplicitUpdate(blunDir, release, stdout, stderr)
+        ? explicitFailure(stderr, 'update_in_progress')
         : { kind: 'update_in_progress' };
     }
     if (prePromptInstallLease !== 'clear') {
@@ -1506,7 +1422,7 @@ async function runUpdateFlow(options, explicitUpdate) {
         ? explicitFailure(stderr, 'lease_unavailable')
         : { kind: 'continue', reason: 'lease_unavailable' };
     }
-    if (!options.installVersion && !preparedRuntimeReady) {
+    if (!options.installVersion) {
       installerSession = await (options.prepareInstaller || preparePinnedInstaller)(
         release.version,
         { blunDir, packageRoot },
@@ -1521,7 +1437,7 @@ async function runUpdateFlow(options, explicitUpdate) {
       }
     }
     let action;
-    if (explicitUpdate || queuedForRelease || automaticPreparedRuntimeReady) {
+    if (explicitUpdate) {
       action = 'install';
     } else {
       try {
@@ -1536,7 +1452,10 @@ async function runUpdateFlow(options, explicitUpdate) {
       }
     }
     if (action !== 'install') {
-      if (installerSession?.ready) await installerSession.cancel();
+      if (installerSession?.ready) {
+        await installerSession.cancel();
+        installerSession = undefined;
+      }
       if (action === 'skip-once') {
         return { kind: 'continue', reason: 'skipped_once' };
       }
@@ -1570,11 +1489,9 @@ async function runUpdateFlow(options, explicitUpdate) {
     let installResult;
     updateProgress(3, 'Paket wird installiert');
     try {
-      installResult = preparedRuntimeReady
-        ? { code: 0, verified: true, preparedRuntime: true }
-        : options.installVersion
-          ? await options.installVersion(release.version)
-          : await installerSession.commit();
+      installResult = options.installVersion
+        ? await options.installVersion(release.version)
+        : await installerSession.commit();
     } catch {
       installResult = { code: undefined };
     }
@@ -1588,22 +1505,14 @@ async function runUpdateFlow(options, explicitUpdate) {
     }
     if (installResult?.code === 0 && installResult?.verified === true) {
       updateProgress(4, 'Installation geprüft');
-      if (explicitUpdate && installResult.preparedRuntime === true) {
-        writePendingUpdate(blunDir, release.version);
-      } else {
-        clearPendingUpdate(blunDir);
-      }
+      clearPendingUpdate(blunDir);
       try {
         writeCoreInstallSuccess(
           blunDir,
           currentVersion,
           release.version,
           release.releaseNotes,
-          explicitUpdate || queuedForRelease
-            ? 'manual'
-            : automaticPreparedRuntimeReady
-              ? 'automatic'
-              : 'startup_prompt',
+          explicitUpdate ? 'manual' : 'startup_prompt',
           (options.now || Date.now)(),
         );
       } catch {
@@ -1611,14 +1520,16 @@ async function runUpdateFlow(options, explicitUpdate) {
           `Update ${release.version} wurde installiert, aber die Startmeldung konnte nicht gespeichert werden.\n`,
         );
       }
-      stdout.write(
-        `Update ${currentVersion} -> ${release.version} erfolgreich installiert. Starte BLUN Code neu, um die neue Version zu verwenden.\n`,
-      );
+      const continuesLastSession = Array.isArray(options.argv)
+        && options.argv.length === 1
+        && options.argv[0] === '-c';
+      stdout.write(continuesLastSession
+        ? `Update ${currentVersion} -> ${release.version} erfolgreich installiert. Die letzte Sitzung wird mit der neuen Version fortgesetzt.\n`
+        : `Update ${currentVersion} -> ${release.version} erfolgreich installiert. Starte BLUN Code neu, um die neue Version zu verwenden.\n`);
       if (release.notesUrl) stdout.write(`Versionshinweise: ${release.notesUrl}\n`);
       return {
         kind: 'installed',
         version: release.version,
-        ...(installResult.preparedRuntime === true ? { source: 'prepared_runtime' } : {}),
       };
     }
 
@@ -1649,22 +1560,7 @@ async function runUpdateFlow(options, explicitUpdate) {
 }
 
 async function runExplicitUpdate(options) {
-  let preparedRuntime = options.preparedRuntime;
-  if (preparedRuntime === undefined
-    && isManagedReleasePackageRoot(options.blunDir, options.packageRoot)) {
-    const runningUpdate = options.prepareRunningUpdate && options.stageRuntime
-      ? undefined
-      : require('./running-update.cjs');
-    preparedRuntime = await (options.prepareRunningUpdate || runningUpdate.prepareRunningUpdate)({
-      currentVersion: options.currentVersion,
-      sharedHome: options.blunDir,
-      env: options.env,
-    });
-    if (preparedRuntime !== null) {
-      (options.stageRuntime || runningUpdate.stageRuntime)(options.blunDir, preparedRuntime);
-    }
-  }
-  return runUpdateFlow({ ...options, preparedRuntime }, true);
+  return runUpdateFlow(options, true);
 }
 
 function runUpdateNotice(options) {