@adhdev/daemon-core 0.9.82-rc.182 → 0.9.82-rc.184

package/dist/index.mjs

@@ -11397,9 +11397,10 @@ function executeJsonl(src, input) {
   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 {
@@ -11409,10 +11410,10 @@ function executeJsonl(src, input) {
     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;
@@ -11724,6 +11725,105 @@ function safeMtimeMs(p) {
     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 meta = readCandidateSessionMeta(p);
+    if (!meta || !meta.cwd || meta.sessionTimestampMs == null) continue;
+    let candidateCwd = meta.cwd;
+    try {
+      candidateCwd = fs13.realpathSync(meta.cwd);
+    } catch {
+    }
+    if (candidateCwd !== workspaceResolved && meta.cwd !== workspaceHint) continue;
+    const diff = Math.abs(meta.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(record, expr) {
   if (typeof expr !== "string") return void 0;
   if (expr.includes("||")) {
@@ -11923,11 +12023,12 @@ function evalTerm(t, record) {
   }
   return t.negate ? !result : result;
 }
-var UUID_RE;
+var UUID_RE, SPAWN_BIND_GRACE_MS;
 var init_native_history_executor = __esm({
   "src/providers/spec/native-history-executor.ts"() {
     "use strict";
     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;
   }
 });