@adhdev/daemon-core 0.9.82-rc.313 → 0.9.82-rc.314

package/dist/commands/upgrade-helper.d.ts

@@ -40,5 +40,17 @@ export declare function buildPinnedGlobalInstallCommand(options: {
 export declare function getNpmExecOptions(platform?: NodeJS.Platform): NpmExecOptions;
 export declare function execNpmCommandSync(args: string[], options?: ExecFileSyncOptions, surface?: Pick<CurrentGlobalInstallSurface, 'npmExecutable' | 'npmArgsPrefix' | 'execOptions'>): Buffer | string;
 export declare function stopSessionHostProcesses(appName: string): void;
+/**
+ * Best-effort removal of a leftover npm staging entry.
+ *
+ * A stale staging dir can hold a locked native binary — e.g. `ghostty-vt.dll`
+ * from `@adhdev/ghostty-vt-node` still mapped by a lingering session-host
+ * process — which makes `rmSync` throw `EPERM` on Windows. Staging cleanup is
+ * only housekeeping: the leftover is inert and npm creates its own fresh
+ * staging dir for the real install, so a lock on an old leftover must NOT abort
+ * the upgrade. Log and continue instead of letting the error propagate.
+ */
+export declare function safeRemoveStaleEntry(target: string, label: string): void;
+export declare function cleanupStaleGlobalInstallDirs(pkgName: string, surface: CurrentGlobalInstallSurface): void;
 export declare function spawnDetachedDaemonUpgradeHelper(payload: DaemonUpgradeHelperPayload): void;
 export declare function maybeRunDaemonUpgradeHelperFromEnv(): Promise<boolean>;

package/dist/index.js

@@ -316,10 +316,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "ed3b7279be8ea9fa191f854f7e9b6ce969159e67" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "ed3b7279" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.313" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-18T00:14:56.582Z" : void 0);
+  const commit = readInjected(true ? "f236ed7432cf04dbcfd2e530fa6c69e77e809c80" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "f236ed74" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.314" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-06-18T04:15:40.033Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -42167,39 +42167,48 @@ function removeDaemonPidFile() {
   } catch {
   }
 }
+function safeRemoveStaleEntry(target, label) {
+  try {
+    fs24.rmSync(target, { recursive: true, force: true });
+    appendUpgradeLog(`${label}: ${target}`);
+  } catch (error) {
+    appendUpgradeLog(`Skipped locked stale entry (${error?.code || "error"}): ${target} \u2014 ${error?.message || String(error)}`);
+  }
+}
 function cleanupStaleGlobalInstallDirs(pkgName, surface) {
-  const prefixArgs = surface.installPrefix ? ["--prefix", surface.installPrefix] : [];
-  const npmRoot = String(execNpmCommandSync(["root", "-g", ...prefixArgs], { encoding: "utf8" }, surface)).trim();
-  if (!npmRoot) return;
-  const npmPrefix = surface.installPrefix || String(execNpmCommandSync(["prefix", "-g", ...prefixArgs], { encoding: "utf8" }, surface)).trim();
-  const binDir = process.platform === "win32" ? npmPrefix : path35.join(npmPrefix, "bin");
-  const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
-  const binNames = /* @__PURE__ */ new Set([packageBaseName]);
-  if (pkgName === "@adhdev/daemon-standalone") {
-    binNames.add("adhdev-standalone");
-  }
-  if (pkgName.startsWith("@")) {
-    const [scope, name] = pkgName.split("/");
-    const scopeDir = path35.join(npmRoot, scope);
-    if (!fs24.existsSync(scopeDir)) return;
-    for (const entry of fs24.readdirSync(scopeDir)) {
-      if (!entry.startsWith(`.${name}-`)) continue;
-      fs24.rmSync(path35.join(scopeDir, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale scoped staging dir: ${path35.join(scopeDir, entry)}`);
-    }
-  } else {
-    for (const entry of fs24.readdirSync(npmRoot)) {
-      if (!entry.startsWith(`.${pkgName}-`)) continue;
-      fs24.rmSync(path35.join(npmRoot, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale staging dir: ${path35.join(npmRoot, entry)}`);
+  try {
+    const prefixArgs = surface.installPrefix ? ["--prefix", surface.installPrefix] : [];
+    const npmRoot = String(execNpmCommandSync(["root", "-g", ...prefixArgs], { encoding: "utf8" }, surface)).trim();
+    if (!npmRoot) return;
+    const npmPrefix = surface.installPrefix || String(execNpmCommandSync(["prefix", "-g", ...prefixArgs], { encoding: "utf8" }, surface)).trim();
+    const binDir = process.platform === "win32" ? npmPrefix : path35.join(npmPrefix, "bin");
+    const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
+    const binNames = /* @__PURE__ */ new Set([packageBaseName]);
+    if (pkgName === "@adhdev/daemon-standalone") {
+      binNames.add("adhdev-standalone");
+    }
+    if (pkgName.startsWith("@")) {
+      const [scope, name] = pkgName.split("/");
+      const scopeDir = path35.join(npmRoot, scope);
+      if (!fs24.existsSync(scopeDir)) return;
+      for (const entry of fs24.readdirSync(scopeDir)) {
+        if (!entry.startsWith(`.${name}-`)) continue;
+        safeRemoveStaleEntry(path35.join(scopeDir, entry), "Removed stale scoped staging dir");
+      }
+    } else {
+      for (const entry of fs24.readdirSync(npmRoot)) {
+        if (!entry.startsWith(`.${pkgName}-`)) continue;
+        safeRemoveStaleEntry(path35.join(npmRoot, entry), "Removed stale staging dir");
+      }
     }
-  }
-  if (fs24.existsSync(binDir)) {
-    for (const entry of fs24.readdirSync(binDir)) {
-      if (!Array.from(binNames).some((name) => entry.startsWith(`.${name}-`))) continue;
-      fs24.rmSync(path35.join(binDir, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale bin staging entry: ${path35.join(binDir, entry)}`);
+    if (fs24.existsSync(binDir)) {
+      for (const entry of fs24.readdirSync(binDir)) {
+        if (!Array.from(binNames).some((name) => entry.startsWith(`.${name}-`))) continue;
+        safeRemoveStaleEntry(path35.join(binDir, entry), "Removed stale bin staging entry");
+      }
     }
+  } catch (error) {
+    appendUpgradeLog(`Stale staging cleanup skipped (${error?.code || "error"}): ${error?.message || String(error)}`);
   }
 }
 function spawnDetachedDaemonUpgradeHelper(payload) {