usebeeline 0.1.58 → 0.1.59

package/dist/usebeeline.mjs

@@ -411,7 +411,7 @@ __export(self_update_exports, {
 });
 import { createHash as createHash3 } from "node:crypto";
 import { constants as fsConstants } from "node:fs";
-import { access, chmod as chmod2, copyFile, lstat as lstat3, mkdir as mkdir3, open, readFile as readFile2, readdir as readdir3, rename, rm as rm3, symlink, writeFile as writeFile2 } from "node:fs/promises";
+import { access, chmod as chmod2, copyFile, lstat as lstat3, mkdir as mkdir3, open, readFile as readFile2, readdir as readdir3, rename as rename2, rm as rm3, symlink, writeFile as writeFile2 } from "node:fs/promises";
 import { spawn as spawn2 } from "node:child_process";
 import { homedir as homedir3 } from "node:os";
 import { dirname as dirname4, join, resolve as resolve6 } from "node:path";
@@ -554,7 +554,7 @@ async function writeUpdateState(layout, state) {
   } finally {
     await handle.close();
   }
-  await rename(temporary, path);
+  await rename2(temporary, path);
   await fsyncDir(dirname4(path));
 }
 async function readInstalledBundleIdentity(layout, _state = {}) {
@@ -804,9 +804,9 @@ async function replaceFile(path, contents, mode) {
   const temp = `${path}.new-${process.pid}`;
   await writeFile2(temp, contents, { mode });
   await chmod2(temp, mode);
-  await rename(temp, path);
+  await rename2(temp, path);
 }
-async function activateRelease(layout, releaseId) {
+async function activateRelease(layout, releaseId, options = {}) {
   assertInstallTestIsolation(layout);
   let releaseDir = join(layout.releasesRoot, releaseId);
   let previousReleaseId = await activeReleaseId(layout);
@@ -821,11 +821,11 @@ async function activateRelease(layout, releaseId) {
     try {
       await access(legacyDir, fsConstants.F_OK);
       const preservedId = `${legacyId}-${Date.now()}`;
-      await rename(layout.libDir, join(layout.releasesRoot, preservedId));
+      await rename2(layout.libDir, join(layout.releasesRoot, preservedId));
       await normalizeLegacyBundleShape(join(layout.releasesRoot, preservedId));
       previousReleaseId = preservedId;
     } catch {
-      await rename(layout.libDir, legacyDir);
+      await rename2(layout.libDir, legacyDir);
       await normalizeLegacyBundleShape(legacyDir);
       previousReleaseId = legacyId;
     }
@@ -833,7 +833,7 @@ async function activateRelease(layout, releaseId) {
   const tempLink = `${layout.libDir}.new-${process.pid}`;
   await rm3(tempLink, { force: true });
   await symlink(join("beeline-releases", releaseId), tempLink);
-  await rename(tempLink, layout.libDir);
+  await rename2(tempLink, layout.libDir);
   await fsyncDir(dirname4(layout.libDir));
   await installRecoveryLauncher(layout, releaseDir);
   await writeBinForwarders(layout, releaseDir);
@@ -843,7 +843,8 @@ async function activateRelease(layout, releaseId) {
     stagedReleaseId: void 0,
     previousReleaseId: previousReleaseId && previousReleaseId !== releaseId ? previousReleaseId : state.previousReleaseId
   });
-  await pruneHelperReleases(layout);
+  if (!options.deferPruning)
+    await pruneHelperReleases(layout);
 }
 async function installRecoveryLauncher(layout, releaseDir) {
   const bootstrap = join(releaseDir, "lib/beeline/recovery-cli.mjs");
@@ -851,7 +852,7 @@ async function installRecoveryLauncher(layout, releaseDir) {
     const stable = resolve6(layout.libDir, "../beeline-bootstrap.mjs");
     const temporary = `${stable}.${process.pid}.tmp`;
     await copyFile(bootstrap, temporary);
-    await rename(temporary, stable);
+    await rename2(temporary, stable);
     await replaceFile(resolve6(layout.libDir, "../beeline-node-path"), `${process.execPath}
 `, 384);
   }
@@ -876,7 +877,7 @@ async function normalizeLegacyBundleShape(bundleDir) {
       continue;
     } catch {
     }
-    await rename(join(bundleDir, name), join(innerLib, name)).catch(() => void 0);
+    await rename2(join(bundleDir, name), join(innerLib, name)).catch(() => void 0);
   }
 }
 async function writeBinForwarders(layout, activeBundleRoot) {
@@ -1394,7 +1395,7 @@ async function requestMachine(stateRoot, request, accept, timeoutMs = 6e5) {
 init_kernel_lock();
 init_lifecycle_test_guard();
 import { execFile } from "node:child_process";
-import { mkdir as mkdir2, readFile, readdir, rm, writeFile } from "node:fs/promises";
+import { mkdir as mkdir2, readFile, readdir, rename, rm, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { resolve as resolve3 } from "node:path";
 import { promisify } from "node:util";
@@ -1416,9 +1417,7 @@ Environment=PATH=%h/.local/bin:/usr/local/bin:/usr/bin:/bin
 ExecStart=%h/.local/bin/beeline helper-bootstrap
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
-RestartSec=5s
-RestartSteps=5
-RestartMaxDelaySec=60s
+RestartSec=1s
 WatchdogSec=180s
 CPUWeight=1000
 IOWeight=1000
@@ -1713,32 +1712,31 @@ async function bootstrapMachine(env = process.env) {
   if (!pid || ![Number(env.BEELINE_BOOT_LAUNCHER_PID), Number(env.BEELINE_BOOT_LAUNCHER_PARENT_PID)].includes(pid))
     throw new Error("helper bootstrap requires native service ownership; run beeline start");
   const layout = beelineInstallLayout(env) ?? discoveredBeelineInstallLayout(env);
+  const state = await readUpdateState(layout);
+  const active = await activeReleaseId(layout);
   let releaseId;
-  try {
+  for (const id of [state.stagedReleaseId, active]) {
+    if (!id || !/^[a-zA-Z0-9][a-zA-Z0-9._-]*$/.test(id))
+      continue;
+    const digest = await readFile3(resolve8(layout.releasesRoot, id, ".stage-ok"), "utf8").catch(() => "");
+    if (/^[0-9a-f]{64}$/i.test(digest.trim()) && await resolveBundleEntrypoint(resolve8(layout.releasesRoot, id))) {
+      releaseId = id;
+      break;
+    }
+  }
+  if (!releaseId) {
     if (env.BEELINE_UPDATE_DISABLE === "1")
-      throw new Error("automatic release selection disabled by BEELINE_UPDATE_DISABLE");
-    const prepared = await prepareMachineRelease(layout, {
+      throw new Error("automatic release selection disabled; no verified runnable release");
+    releaseId = (await prepareMachineRelease(layout, {
       env,
       deadlineAt: Date.now() + 18e4,
       logger: (line) => console.error(line)
-    });
-    releaseId = prepared.releaseId;
-    await withInstallLock(layout, () => activateRelease(layout, releaseId), {
-      waitMs: Math.max(0, bootDeadlineAt - Date.now())
-    });
-  } catch (error) {
-    const state = await readUpdateState(layout);
-    const candidates = [state.stagedReleaseId, await activeReleaseId(layout)];
-    const verified = await Promise.all(candidates.map(async (id) => id && /^[0-9a-f]{64}$/i.test((await readFile3(resolve8(layout.releasesRoot, id, ".stage-ok"), "utf8").catch(() => "")).trim()) ? id : void 0));
-    const candidate = verified.find(Boolean);
-    if (!candidate)
-      throw new Error(`startup release selection failed; no verified runnable release: ${String(error)}`);
-    releaseId = candidate;
-    console.error(`[beeline] serving verified ${releaseId}; release freshness unconfirmed: ${String(error)}`);
-    await withInstallLock(layout, () => activateRelease(layout, releaseId), {
+    })).releaseId;
+  }
+  if (releaseId !== active)
+    await withInstallLock(layout, () => activateRelease(layout, releaseId, { deferPruning: true }), {
       waitMs: Math.max(0, bootDeadlineAt - Date.now())
     });
-  }
   const entry = await resolveBundleEntrypoint(resolve8(layout.releasesRoot, releaseId));
   if (!entry)
     throw new Error(`selected release ${releaseId} has no body entry`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "usebeeline",
-  "version": "0.1.58",
+  "version": "0.1.59",
   "description": "Connect an AI coding agent to Beeline with one command.",
   "homepage": "https://usebeeline.app",
   "bugs": {