@adhdev/daemon-standalone 0.9.82-rc.183 → 0.9.82-rc.185

package/dist/index.js

@@ -46224,9 +46224,10 @@ ${lastSnapshot}`;
       const windowMs = typeof src.recent_window_ms === "number" ? src.recent_window_ms : 5 * 6e4;
       const filePat = src.file_pattern ? globToRegex(src.file_pattern) : /.*\.jsonl$/;
       const sessionFloor = typeof input.sessionStartedAtMs === "number" ? input.sessionStartedAtMs : 0;
+      const workspaceHint = typeof input.workspace === "string" && input.workspace.trim() ? input.workspace.trim() : "";
       let sourcePath = null;
       if (resolved.includes("*")) {
-        sourcePath = newestRecentFileAcrossGlob(resolved, filePat, windowMs, sessionFloor);
+        sourcePath = pickSessionBoundFileAcrossGlob(resolved, filePat, windowMs, sessionFloor, workspaceHint) || newestRecentFileAcrossGlob(resolved, filePat, windowMs, sessionFloor);
       } else {
         let stat2 = null;
         try {
@@ -46236,10 +46237,10 @@ ${lastSnapshot}`;
         if (stat2 && stat2.isFile()) {
           sourcePath = resolved;
         } else if (stat2 && stat2.isDirectory()) {
-          sourcePath = newestRecentFile(resolved, filePat, windowMs, sessionFloor);
+          sourcePath = pickSessionBoundFile(resolved, filePat, windowMs, sessionFloor, workspaceHint) || newestRecentFile(resolved, filePat, windowMs, sessionFloor);
         }
         if (!sourcePath && hasDateTemplateSegment(src.path)) {
-          sourcePath = newestRecentFileAcrossDateWindow(src.path, input, filePat, windowMs, sessionFloor);
+          sourcePath = pickSessionBoundFileAcrossDateWindow(src.path, input, filePat, windowMs, sessionFloor, workspaceHint) || newestRecentFileAcrossDateWindow(src.path, input, filePat, windowMs, sessionFloor);
         }
       }
       if (!sourcePath) return null;
@@ -46551,6 +46552,105 @@ ${lastSnapshot}`;
         return 0;
       }
     }
+    function readCandidateSessionMeta(filePath) {
+      try {
+        const fd = fs13.openSync(filePath, "r");
+        try {
+          const buf = Buffer.alloc(8192);
+          const bytes = fs13.readSync(fd, buf, 0, buf.length, 0);
+          if (bytes <= 0) return null;
+          const text = buf.subarray(0, bytes).toString("utf8");
+          const nl = text.indexOf("\n");
+          const firstLine = (nl >= 0 ? text.slice(0, nl) : text).trim();
+          if (!firstLine) return null;
+          const parsed = JSON.parse(firstLine);
+          if (String(parsed.type ?? "") !== "session_meta") return null;
+          const payload = parsed.payload && typeof parsed.payload === "object" ? parsed.payload : null;
+          if (!payload) return null;
+          const cwd = typeof payload.cwd === "string" ? payload.cwd : void 0;
+          const tsRaw = payload.timestamp;
+          const tsMs = typeof tsRaw === "string" ? Date.parse(tsRaw) : typeof tsRaw === "number" ? tsRaw < 1e12 ? Math.floor(tsRaw * 1e3) : Math.floor(tsRaw) : NaN;
+          return {
+            cwd,
+            sessionTimestampMs: Number.isFinite(tsMs) ? tsMs : void 0
+          };
+        } finally {
+          fs13.closeSync(fd);
+        }
+      } catch {
+        return null;
+      }
+    }
+    function pickBoundFromEntries(candidatePaths, sessionFloorMs, workspaceHint) {
+      if (!sessionFloorMs || !workspaceHint || candidatePaths.length === 0) return null;
+      let workspaceResolved = workspaceHint;
+      try {
+        workspaceResolved = fs13.realpathSync(workspaceHint);
+      } catch {
+      }
+      let best = null;
+      for (const p of candidatePaths) {
+        const meta3 = readCandidateSessionMeta(p);
+        if (!meta3 || !meta3.cwd || meta3.sessionTimestampMs == null) continue;
+        let candidateCwd = meta3.cwd;
+        try {
+          candidateCwd = fs13.realpathSync(meta3.cwd);
+        } catch {
+        }
+        if (candidateCwd !== workspaceResolved && meta3.cwd !== workspaceHint) continue;
+        const diff = Math.abs(meta3.sessionTimestampMs - sessionFloorMs);
+        if (diff > SPAWN_BIND_GRACE_MS) continue;
+        if (!best || diff < best.diff) best = { p, diff };
+      }
+      return best ? best.p : null;
+    }
+    function listMatchingFiles(dir, pattern) {
+      let entries;
+      try {
+        entries = fs13.readdirSync(dir, { withFileTypes: true });
+      } catch {
+        return [];
+      }
+      const out = [];
+      for (const e of entries) {
+        if (!e.isFile() || !pattern.test(e.name)) continue;
+        out.push(path25.join(dir, e.name));
+      }
+      return out;
+    }
+    function pickSessionBoundFile(dir, pattern, windowMs, sessionFloorMs, workspaceHint) {
+      if (!sessionFloorMs || !workspaceHint) return null;
+      const cutoff = Math.max(Date.now() - windowMs, sessionFloorMs - SPAWN_BIND_GRACE_MS);
+      const files = listMatchingFiles(dir, pattern).filter((p) => safeMtimeMs(p) >= cutoff);
+      return pickBoundFromEntries(files, sessionFloorMs, workspaceHint);
+    }
+    function pickSessionBoundFileAcrossGlob(template, pattern, windowMs, sessionFloorMs, workspaceHint) {
+      if (!sessionFloorMs || !workspaceHint) return null;
+      const dirs = expandDirGlob(template);
+      const cutoff = Math.max(Date.now() - windowMs, sessionFloorMs - SPAWN_BIND_GRACE_MS);
+      const files = [];
+      for (const d of dirs) {
+        for (const p of listMatchingFiles(d, pattern)) {
+          if (safeMtimeMs(p) >= cutoff) files.push(p);
+        }
+      }
+      return pickBoundFromEntries(files, sessionFloorMs, workspaceHint);
+    }
+    function pickSessionBoundFileAcrossDateWindow(template, input, pattern, windowMs, sessionFloorMs, workspaceHint) {
+      if (!sessionFloorMs || !workspaceHint) return null;
+      const cutoff = Math.max(Date.now() - windowMs, sessionFloorMs - SPAWN_BIND_GRACE_MS);
+      const files = [];
+      for (let dayOffset = 0; dayOffset < 3; dayOffset += 1) {
+        const dayMs = sessionFloorMs - dayOffset * 24 * 60 * 60 * 1e3;
+        const dayInput = { ...input, sessionStartedAtMs: sessionFloorMs };
+        const resolved = expandPathForDate(template, dayInput, new Date(dayMs));
+        if (!resolved) continue;
+        for (const p of listMatchingFiles(resolved, pattern)) {
+          if (safeMtimeMs(p) >= cutoff) files.push(p);
+        }
+      }
+      return pickBoundFromEntries(files, sessionFloorMs, workspaceHint);
+    }
     function jsonPathGet(record2, expr) {
       if (typeof expr !== "string") return void 0;
       if (expr.includes("||")) {
@@ -46754,6 +46854,7 @@ ${lastSnapshot}`;
     var os18;
     var path25;
     var UUID_RE;
+    var SPAWN_BIND_GRACE_MS;
     var init_native_history_executor = __esm2({
       "src/providers/spec/native-history-executor.ts"() {
         "use strict";
@@ -46761,6 +46862,7 @@ ${lastSnapshot}`;
         os18 = __toESM2(require("os"));
         path25 = __toESM2(require("path"));
         UUID_RE = /([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i;
+        SPAWN_BIND_GRACE_MS = 1e4;
       }
     });
     function extractTimestampValue(value) {
@@ -87029,6 +87131,21 @@ var StandaloneServer = class {
   }
 };
 async function main() {
+  if (!process.env.ADHDEV_CONFIG_DIR || !process.env.ADHDEV_CONFIG_DIR.trim()) {
+    process.env.ADHDEV_CONFIG_DIR = path4.join(os5.homedir(), ".adhdev-standalone");
+  }
+  try {
+    const isolatedDir = process.env.ADHDEV_CONFIG_DIR;
+    const legacyLedger = path4.join(os5.homedir(), ".adhdev", "mesh-ledger");
+    const isolatedExists = fs3.existsSync(isolatedDir);
+    const isolatedEmpty = !isolatedExists || fs3.readdirSync(isolatedDir).filter((name) => name !== ".DS_Store").length === 0;
+    const legacyHasLedger = fs3.existsSync(legacyLedger) && fs3.readdirSync(legacyLedger).some((name) => name.endsWith(".jsonl"));
+    if (isolatedEmpty && legacyHasLedger) {
+      const line = "\u2139 standalone now stores its state under " + isolatedDir + ". If you want to carry over prior mesh ledger from ~/.adhdev/mesh-ledger, copy ~/.adhdev/mesh-ledger to " + path4.join(isolatedDir, "mesh-ledger") + " once and restart. (Set ADHDEV_CONFIG_DIR=~/.adhdev to keep the legacy location.)";
+      process.stderr.write(line + "\n");
+    }
+  } catch {
+  }
   const helperMode = await (0, import_daemon_core2.maybeRunDaemonUpgradeHelperFromEnv)();
   if (helperMode) {
     return;