yaver-cli 1.99.459 → 1.99.460

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaver-cli",
-  "version": "1.99.459",
+  "version": "1.99.460",
   "mcpName": "io.github.yaver-io/yaver",
   "description": "Unified npm bootstrap for the Yaver agent, SDK injection, and local-first developer runtime",
   "bin": {

package/src/agent-runtime.js

@@ -32,7 +32,17 @@ const EXECUTABLE_MAGICS = [
   Buffer.from([0x4d, 0x5a]),             // PE (Windows) — MZ
 ];
 
-async function ensureAgentBinary({ quiet = false } = {}) {
+async function ensureAgentBinary({
+  quiet = false,
+  resolveBinary = resolveAgentBinary,
+  refreshLink = refreshCurrentSymlink,
+} = {}) {
+  const binaryPath = await resolveBinary({ quiet });
+  refreshLink(binaryPath, { quiet });
+  return binaryPath;
+}
+
+async function resolveAgentBinary({ quiet = false } = {}) {
   // Try cache first — when the user already has any version of yaver
   // installed locally, we shouldn't fail just because GitHub's API
   // rate-limited the unauthenticated /releases call. Falling back to
@@ -96,6 +106,69 @@ async function ensureAgentBinary({ quiet = false } = {}) {
   }
 }
 
+// Keep the supervisor's stable path aligned with the binary the wrapper has
+// actually selected. Postinstall also does this, but agent releases can be
+// discovered and downloaded lazily on any later CLI invocation. Before this
+// guard, that path ran the new binary for the command while launchd/systemd
+// continued restarting `current`, which could still name an older version
+// (observed 2026-09-08: wrapper 1.99.459, live launchd agent 1.99.452).
+//
+// Use an atomic rename so a concurrent supervisor restart never observes a
+// missing `current` entry. The function is deliberately best-effort: resolving
+// a usable agent must not fail because a local symlink cannot be repaired.
+function refreshCurrentSymlink(binaryPath, {
+  quiet = false,
+  platform = process.platform,
+  cacheRoot = CACHE_ROOT,
+  fsImpl = fs,
+} = {}) {
+  let temporaryLink = '';
+  try {
+    if (platform === 'win32' || !binaryPath) return 'skipped';
+
+    const resolvedCacheRoot = path.resolve(cacheRoot);
+    const versionDir = path.resolve(path.dirname(path.dirname(binaryPath)));
+    const relativeVersionDir = path.relative(resolvedCacheRoot, versionDir);
+    if (
+      !relativeVersionDir ||
+      relativeVersionDir.startsWith(`..${path.sep}`) ||
+      path.isAbsolute(relativeVersionDir) ||
+      !semver.valid(path.basename(versionDir)) ||
+      !fsImpl.existsSync(versionDir)
+    ) {
+      return 'skipped';
+    }
+
+    const currentLink = path.join(resolvedCacheRoot, 'current');
+    try {
+      const existingTarget = fsImpl.readlinkSync(currentLink);
+      const existingResolved = path.resolve(path.dirname(currentLink), existingTarget);
+      if (existingResolved === versionDir) return 'already-current';
+    } catch (_) {}
+
+    temporaryLink = path.join(
+      resolvedCacheRoot,
+      `.current-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}`,
+    );
+    fsImpl.symlinkSync(versionDir, temporaryLink);
+    fsImpl.renameSync(temporaryLink, currentLink);
+    temporaryLink = '';
+    if (!quiet) {
+      console.error(`[yaver] Repointed ~/.yaver/bin/current -> ${path.basename(versionDir)}`);
+    }
+    return 'repointed';
+  } catch (err) {
+    if (!quiet) {
+      console.error(`[yaver] Could not refresh the current agent link: ${err.message}`);
+    }
+    return 'failed';
+  } finally {
+    if (temporaryLink) {
+      try { fsImpl.unlinkSync(temporaryLink); } catch (_) {}
+    }
+  }
+}
+
 /** A cached agent binary is only usable if it actually RUNS.
  *
  *  `fs.existsSync` answers "is there a file here", which is a proxy for the
@@ -730,6 +803,7 @@ async function extractTarball(archivePath, destDir) {
 module.exports = {
   ensureAgentBinary,
   ensureValidMacSignature,
+  refreshCurrentSymlink,
   resolveAgentInfo,
   runAgentCommand,
 };

package/src/postinstall.js

@@ -400,39 +400,6 @@ function ensureZshenvRescue() {
   }
 }
 
-// Update ~/.yaver/bin/current → versioned dir for the binary just
-// installed. Without this, the symlink can lag behind npm — every time
-// I bumped CLI on the user's Mac mini, `~/.yaver/bin/current` kept
-// pointing at an older version, so `~/.yaver/bin/current/<arch>/yaver`
-// silently ran the wrong binary even though `npm install -g yaver-cli@
-// <new>` had succeeded. The auto-update watchdogs (heartbeat_watcher
-// systemctl/launchctl kickstart paths) trust `current` too — so a
-// stale symlink keeps the old binary running across a "restart"
-// without anyone noticing. This belongs in postinstall, runs every
-// global install, never throws.
-function refreshCurrentSymlink(binaryPath) {
-  try {
-    if (process.platform === "win32") return;
-    if (!binaryPath) return;
-    // binaryPath is like ~/.yaver/bin/<version>/<cacheKey>/yaver — walk
-    // up two levels to the version dir, point `current` at it.
-    const versionDir = path.dirname(path.dirname(binaryPath));
-    if (!versionDir.startsWith(path.join(os.homedir(), ".yaver", "bin") + path.sep)) {
-      return;
-    }
-    if (!fs.existsSync(versionDir)) return;
-    const symlink = path.join(os.homedir(), ".yaver", "bin", "current");
-    let already = "";
-    try { already = fs.readlinkSync(symlink); } catch (_) {}
-    if (already === versionDir) return;
-    try { fs.unlinkSync(symlink); } catch (_) {}
-    fs.symlinkSync(versionDir, symlink);
-    log(`Repointed ~/.yaver/bin/current → ${path.basename(versionDir)}`);
-  } catch (err) {
-    log(`Skipping current symlink refresh: ${err.message}`);
-  }
-}
-
 // Restart whichever service supervisor the user has registered. Without
 // this, a fresh `npm install -g yaver-cli@latest` updates the binary on
 // disk but leaves the still-running agent process on the OLD binary
@@ -497,10 +464,8 @@ async function main() {
     log(`Skipping agent prefetch: ${error.message}`);
     return;
   }
-  // Repoint the canonical `current` symlink + bounce any registered
-  // service so a fresh `npm install -g yaver-cli@latest` actually
-  // takes effect without a manual `yaver restart`.
-  refreshCurrentSymlink(installedBinary);
+  // ensureAgentBinary has atomically reconciled the canonical `current`
+  // symlink. Bounce any registered service so the selected binary is live.
   bounceRunningAgent();
 
   if (isIotEdgeInstall()) {