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

package/dist/index.js

@@ -30029,10 +30029,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "ed3b7279be8ea9fa191f854f7e9b6ce969159e67" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "ed3b7279" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = 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:15:22.605Z" : 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 version2 = 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:48:10.109Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -61009,6 +61009,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
     var fs12 = __toESM2(require("fs"));
     var os17 = __toESM2(require("os"));
     var path21 = __toESM2(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;
@@ -61041,8 +61042,33 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         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 {
+        }
+        LOG2.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;
@@ -61161,7 +61187,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         }
       }
     }
-    function expandPath2(template, input) {
+    function expandPath2(template, input, opts) {
       if (!template) return null;
       let out = template;
       if (out.startsWith("~/") || out === "~") {
@@ -61175,7 +61201,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       const now = /* @__PURE__ */ new Date();
       const workspaceRaw = input.workspace ?? "";
       let workspaceResolved = workspaceRaw;
-      if (workspaceRaw) {
+      if (workspaceRaw && !opts?.skipWorkspaceRealpath) {
         try {
           workspaceResolved = fs12.realpathSync(workspaceRaw);
         } catch {
@@ -61202,6 +61228,50 @@ ${formatManifestValidationIssues2(validation.issues)}`,
     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);
+          LOG2.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}$`);
@@ -71707,39 +71777,48 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       } catch {
       }
     }
+    function safeRemoveStaleEntry(target, label) {
+      try {
+        fs24.rmSync(target, { recursive: true, force: true });
+        appendUpgradeLog(`${label}: ${target}`);
+      } catch (error48) {
+        appendUpgradeLog(`Skipped locked stale entry (${error48?.code || "error"}): ${target} \u2014 ${error48?.message || String(error48)}`);
+      }
+    }
     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 (error48) {
+        appendUpgradeLog(`Stale staging cleanup skipped (${error48?.code || "error"}): ${error48?.message || String(error48)}`);
       }
     }
     function spawnDetachedDaemonUpgradeHelper(payload) {