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

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 ? "e28347641639c9d0a1e46a6141e3cfed2bc90ac2" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "e2834764" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.315" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-06-18T05:47:44.462Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -31399,6 +31399,7 @@ function collectStableSizes(when, sizes) {
 var fs12 = __toESM(require("fs"));
 var os17 = __toESM(require("os"));
 var path21 = __toESM(require("path"));
+init_logger();
 var UUID_RE = /([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i;
 function executeNativeHistory(cfg, input) {
   if (!cfg?.source) return null;
@@ -31431,8 +31432,33 @@ function executeJsonl(src, input) {
     if (!sourcePath && hasDateTemplateSegment(src.path)) {
       sourcePath = pickExactSessionFileAcrossDateWindow(src.path, input, filePat, requestedSessionId) || (requestedSessionId ? null : pickSessionBoundFileAcrossDateWindow(src.path, input, filePat, windowMs, sessionFloor, workspaceHint)) || (requestedSessionId ? null : newestRecentFileAcrossDateWindow(src.path, input, filePat, windowMs, sessionFloor));
     }
+    if (!sourcePath && !hasDateTemplateSegment(src.path)) {
+      const resolvedRaw = expandPath2(src.path, input, { skipWorkspaceRealpath: true });
+      if (resolvedRaw && resolvedRaw !== resolved) {
+        try {
+          const rawStat = fs12.statSync(resolvedRaw);
+          if (rawStat.isFile()) sourcePath = resolvedRaw;
+          else if (rawStat.isDirectory()) {
+            sourcePath = pickExactSessionFile(resolvedRaw, filePat, requestedSessionId) || (requestedSessionId ? null : newestRecentFile(resolvedRaw, filePat, windowMs, sessionFloor));
+          }
+        } catch {
+        }
+      }
+    }
+    if (!sourcePath && requestedSessionId) {
+      sourcePath = scanProjectsRootForSessionFile(src.path, input, requestedSessionId);
+    }
+  }
+  if (!sourcePath) {
+    const wsRaw = typeof input.workspace === "string" ? input.workspace : "";
+    let wsReal = wsRaw;
+    try {
+      if (wsRaw) wsReal = fs12.realpathSync(wsRaw);
+    } catch {
+    }
+    LOG.debug("NativeHistory", `jsonl unresolved: tried=${JSON.stringify(resolved)} sessionId=${requestedSessionId || "(none)"} wsRaw=${JSON.stringify(wsRaw)} wsReal=${JSON.stringify(wsReal)} rawSlug=${JSON.stringify(claudeProjectDirName(wsRaw))} realSlug=${JSON.stringify(claudeProjectDirName(wsReal))} (concrete miss + raw-slug retry + projects scan all failed)`);
+    return null;
   }
-  if (!sourcePath) return null;
   const mtime = safeMtimeMs(sourcePath);
   const lines = readJsonlLines(sourcePath);
   if (lines.length === 0) return null;
@@ -31551,7 +31577,7 @@ function executeSqlite(src, input) {
     }
   }
 }
-function expandPath2(template, input) {
+function expandPath2(template, input, opts) {
   if (!template) return null;
   let out = template;
   if (out.startsWith("~/") || out === "~") {
@@ -31565,7 +31591,7 @@ function expandPath2(template, input) {
   const now = /* @__PURE__ */ new Date();
   const workspaceRaw = input.workspace ?? "";
   let workspaceResolved = workspaceRaw;
-  if (workspaceRaw) {
+  if (workspaceRaw && !opts?.skipWorkspaceRealpath) {
     try {
       workspaceResolved = fs12.realpathSync(workspaceRaw);
     } catch {
@@ -31592,6 +31618,50 @@ function expandPath2(template, input) {
 function claudeProjectDirName(workspace) {
   return workspace.replace(/[^A-Za-z0-9_-]/g, "-");
 }
+function scanProjectsRootForSessionFile(template, input, requestedSessionId) {
+  if (!requestedSessionId) return null;
+  let head = template;
+  if (head.startsWith("~/") || head === "~") head = path21.join(os17.homedir(), head.slice(2));
+  const segs = head.split("/");
+  const baseParts = [];
+  for (const seg of segs) {
+    if (/[{}*?]/.test(seg)) break;
+    baseParts.push(seg);
+  }
+  const base = baseParts.join("/");
+  if (!base) return null;
+  let baseStat = null;
+  try {
+    baseStat = fs12.statSync(base);
+  } catch {
+    return null;
+  }
+  if (!baseStat.isDirectory()) return null;
+  const needle = `${requestedSessionId.toLowerCase()}.jsonl`;
+  const dirsToScan = [base];
+  try {
+    for (const entry of fs12.readdirSync(base, { withFileTypes: true })) {
+      if (entry.isDirectory()) dirsToScan.push(path21.join(base, entry.name));
+    }
+  } catch {
+  }
+  for (const dir of dirsToScan) {
+    let entries;
+    try {
+      entries = fs12.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      if (!entry.isFile()) continue;
+      if (entry.name.toLowerCase() !== needle) continue;
+      const found = path21.join(dir, entry.name);
+      LOG.debug("NativeHistory", `jsonl scan-fallback hit: sessionId=${requestedSessionId} resolved via projects-root scan \u2192 ${JSON.stringify(found)} (slug-derived path missed; likely realpath/slug divergence)`);
+      return found;
+    }
+  }
+  return null;
+}
 function globToRegex(pattern) {
   const re = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, "[^/]*").replace(/\?/g, "[^/]");
   return new RegExp(`^${re}$`);
@@ -42167,39 +42237,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) {