engrm 0.4.8 → 0.4.10

package/dist/cli.js

@@ -20,7 +20,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 // src/cli.ts
 import { existsSync as existsSync7, mkdirSync as mkdirSync3, readFileSync as readFileSync7, statSync } from "fs";
 import { hostname as hostname2, homedir as homedir4, networkInterfaces as networkInterfaces2 } from "os";
-import { dirname as dirname4, join as join7 } from "path";
+import { dirname as dirname5, join as join7 } from "path";
 import { createHash as createHash3 } from "crypto";
 import { fileURLToPath as fileURLToPath4 } from "url";
 
@@ -689,6 +689,11 @@ import { createHash as createHash2 } from "node:crypto";
 var IS_BUN = typeof globalThis.Bun !== "undefined";
 function openDatabase(dbPath) {
   if (IS_BUN) {
+    if (process.platform === "darwin") {
+      try {
+        return openNodeDatabase(dbPath);
+      } catch {}
+    }
     return openBunDatabase(dbPath);
   }
   return openNodeDatabase(dbPath);
@@ -805,6 +810,15 @@ class MemDatabase {
     }
     return row;
   }
+  reassignObservationProject(observationId, projectId) {
+    const existing = this.getObservationById(observationId);
+    if (!existing)
+      return false;
+    if (existing.project_id === projectId)
+      return true;
+    this.db.query("UPDATE observations SET project_id = ? WHERE id = ?").run(projectId, observationId);
+    return true;
+  }
   getObservationById(id) {
     return this.db.query("SELECT * FROM observations WHERE id = ?").get(id) ?? null;
   }
@@ -938,8 +952,13 @@ class MemDatabase {
   }
   upsertSession(sessionId, projectId, userId, deviceId, agent = "claude-code") {
     const existing = this.db.query("SELECT * FROM sessions WHERE session_id = ?").get(sessionId);
-    if (existing)
+    if (existing) {
+      if (existing.project_id === null && projectId !== null) {
+        this.db.query("UPDATE sessions SET project_id = ? WHERE session_id = ?").run(projectId, sessionId);
+        return this.db.query("SELECT * FROM sessions WHERE session_id = ?").get(sessionId);
+      }
       return existing;
+    }
     const now = Math.floor(Date.now() / 1000);
     this.db.query(`INSERT INTO sessions (session_id, project_id, user_id, device_id, agent, started_at_epoch)
         VALUES (?, ?, ?, ?, ?, ?)`).run(sessionId, projectId, userId, deviceId, agent, now);
@@ -2108,7 +2127,7 @@ function registerAll() {
 
 // src/packs/loader.ts
 import { existsSync as existsSync4, readFileSync as readFileSync4, readdirSync } from "node:fs";
-import { join as join4, dirname as dirname2 } from "node:path";
+import { join as join4, dirname as dirname3 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/tools/save.ts
@@ -2436,7 +2455,7 @@ function looksMeaningful(value) {
 // src/storage/projects.ts
 import { execSync } from "node:child_process";
 import { existsSync as existsSync3, readFileSync as readFileSync3 } from "node:fs";
-import { basename, join as join3 } from "node:path";
+import { basename, dirname as dirname2, join as join3, resolve } from "node:path";
 function normaliseGitRemoteUrl(remoteUrl) {
   let url = remoteUrl.trim();
   url = url.replace(/^(?:https?|ssh|git):\/\//, "");
@@ -2490,6 +2509,19 @@ function getGitRemoteUrl(directory) {
     }
   }
 }
+function getGitTopLevel(directory) {
+  try {
+    const root = execSync("git rev-parse --show-toplevel", {
+      cwd: directory,
+      encoding: "utf-8",
+      timeout: 5000,
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    return root || null;
+  } catch {
+    return null;
+  }
+}
 function readProjectConfigFile(directory) {
   const configPath = join3(directory, ".engrm.json");
   if (!existsSync3(configPath))
@@ -2512,11 +2544,12 @@ function detectProject(directory) {
   const remoteUrl = getGitRemoteUrl(directory);
   if (remoteUrl) {
     const canonicalId = normaliseGitRemoteUrl(remoteUrl);
+    const repoRoot = getGitTopLevel(directory) ?? directory;
     return {
       canonical_id: canonicalId,
       name: projectNameFromCanonicalId(canonicalId),
       remote_url: remoteUrl,
-      local_path: directory
+      local_path: repoRoot
     };
   }
   const configFile = readProjectConfigFile(directory);
@@ -2536,6 +2569,32 @@ function detectProject(directory) {
     local_path: directory
   };
 }
+function detectProjectForPath(filePath, fallbackCwd) {
+  const absolutePath = resolve(fallbackCwd ?? process.cwd(), filePath);
+  const candidateDir = existsSync3(absolutePath) && !absolutePath.endsWith("/") ? dirname2(absolutePath) : dirname2(absolutePath);
+  const detected = detectProject(candidateDir);
+  if (detected.canonical_id.startsWith("local/"))
+    return null;
+  return detected;
+}
+function detectProjectFromTouchedPaths(paths, fallbackCwd) {
+  const counts = new Map;
+  for (const rawPath of paths) {
+    if (!rawPath || !rawPath.trim())
+      continue;
+    const detected = detectProjectForPath(rawPath, fallbackCwd);
+    if (!detected)
+      continue;
+    const existing = counts.get(detected.canonical_id);
+    if (existing) {
+      existing.count += 1;
+    } else {
+      counts.set(detected.canonical_id, { project: detected, count: 1 });
+    }
+  }
+  const ranked = [...counts.values()].sort((a, b) => b.count - a.count || a.project.name.localeCompare(b.project.name));
+  return ranked[0]?.project ?? detectProject(fallbackCwd);
+}
 
 // src/embeddings/embedder.ts
 var _available = null;
@@ -2814,7 +2873,8 @@ async function saveObservation(db, config, input) {
     return { success: false, reason: "Title is required" };
   }
   const cwd = input.cwd ?? process.cwd();
-  const detected = detectProject(cwd);
+  const touchedPaths = [...input.files_read ?? [], ...input.files_modified ?? []];
+  const detected = touchedPaths.length > 0 ? detectProjectFromTouchedPaths(touchedPaths, cwd) : detectProject(cwd);
   const project = db.upsertProject({
     canonical_id: detected.canonical_id,
     name: detected.name,
@@ -2941,7 +3001,7 @@ function toRelativePath(filePath, projectRoot) {
 
 // src/packs/loader.ts
 function getPacksDir() {
-  const thisDir = dirname2(fileURLToPath2(import.meta.url));
+  const thisDir = dirname3(fileURLToPath2(import.meta.url));
   return join4(thisDir, "..", "..", "packs");
 }
 function listPacks() {
@@ -2991,10 +3051,10 @@ async function installPack(db, config, packName, cwd) {
 
 // src/sentinel/rules.ts
 import { existsSync as existsSync5, readFileSync as readFileSync5, readdirSync as readdirSync2 } from "node:fs";
-import { join as join5, dirname as dirname3 } from "node:path";
+import { join as join5, dirname as dirname4 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function getRulePacksDir() {
-  const thisDir = dirname3(fileURLToPath3(import.meta.url));
+  const thisDir = dirname4(fileURLToPath3(import.meta.url));
   return join5(thisDir, "rule-packs");
 }
 function listRulePacks() {
@@ -3065,10 +3125,18 @@ function getCaptureStatus(db, input = {}) {
   const codexMcpRegistered = codexConfigContent.includes("[mcp_servers.engrm]") || codexConfigContent.includes(`[mcp_servers.${LEGACY_CODEX_SERVER_NAME2}]`);
   const codexHooksRegistered = codexHooksContent.includes('"SessionStart"') && codexHooksContent.includes('"Stop"');
   let claudeHookCount = 0;
+  let claudeSessionStartHook = false;
+  let claudeUserPromptHook = false;
+  let claudePostToolHook = false;
+  let claudeStopHook = false;
   if (claudeHooksRegistered) {
     try {
       const settings = JSON.parse(claudeSettingsContent);
       const hooks = settings?.hooks ?? {};
+      claudeSessionStartHook = Array.isArray(hooks["SessionStart"]);
+      claudeUserPromptHook = Array.isArray(hooks["UserPromptSubmit"]);
+      claudePostToolHook = Array.isArray(hooks["PostToolUse"]);
+      claudeStopHook = Array.isArray(hooks["Stop"]);
       for (const entries of Object.values(hooks)) {
         if (!Array.isArray(entries))
           continue;
@@ -3081,6 +3149,13 @@ function getCaptureStatus(db, input = {}) {
       }
     } catch {}
   }
+  let codexSessionStartHook = false;
+  let codexStopHook = false;
+  try {
+    const hooks = codexHooksContent ? JSON.parse(codexHooksContent)?.hooks ?? {} : {};
+    codexSessionStartHook = Array.isArray(hooks["SessionStart"]);
+    codexStopHook = Array.isArray(hooks["Stop"]);
+  } catch {}
   const visibilityClause = input.user_id ? " AND user_id = ?" : "";
   const params = input.user_id ? [sinceEpoch, input.user_id] : [sinceEpoch];
   const recentUserPrompts = db.db.query(`SELECT COUNT(*) as count FROM user_prompts
@@ -3095,6 +3170,17 @@ function getCaptureStatus(db, input = {}) {
            EXISTS (SELECT 1 FROM user_prompts up WHERE up.session_id = s.session_id)
            OR EXISTS (SELECT 1 FROM tool_events te WHERE te.session_id = s.session_id)
          )`).get(...params)?.count ?? 0;
+  const recentSessionsWithPartialCapture = db.db.query(`SELECT COUNT(*) as count
+       FROM sessions s
+       WHERE COALESCE(s.completed_at_epoch, s.started_at_epoch, 0) >= ?
+         ${input.user_id ? "AND s.user_id = ?" : ""}
+         AND (
+           (s.tool_calls_count > 0 AND NOT EXISTS (SELECT 1 FROM tool_events te WHERE te.session_id = s.session_id))
+           OR (
+             EXISTS (SELECT 1 FROM user_prompts up WHERE up.session_id = s.session_id)
+             AND NOT EXISTS (SELECT 1 FROM tool_events te WHERE te.session_id = s.session_id)
+           )
+         )`).get(...params)?.count ?? 0;
   const latestPromptEpoch = db.db.query(`SELECT created_at_epoch FROM user_prompts
        WHERE 1 = 1${input.user_id ? " AND user_id = ?" : ""}
        ORDER BY created_at_epoch DESC, prompt_number DESC
@@ -3103,6 +3189,9 @@ function getCaptureStatus(db, input = {}) {
        WHERE 1 = 1${input.user_id ? " AND user_id = ?" : ""}
        ORDER BY created_at_epoch DESC, id DESC
        LIMIT 1`).get(...input.user_id ? [input.user_id] : [])?.created_at_epoch ?? null;
+  const latestPostToolHookEpoch = parseNullableInt(db.getSyncState("hook_post_tool_last_seen_epoch"));
+  const latestPostToolParseStatus = db.getSyncState("hook_post_tool_last_parse_status");
+  const latestPostToolName = db.getSyncState("hook_post_tool_last_tool_name");
   const schemaVersion = getSchemaVersion(db.db);
   return {
     schema_version: schemaVersion,
@@ -3110,16 +3199,33 @@ function getCaptureStatus(db, input = {}) {
     claude_mcp_registered: claudeMcpRegistered,
     claude_hooks_registered: claudeHooksRegistered,
     claude_hook_count: claudeHookCount,
+    claude_session_start_hook: claudeSessionStartHook,
+    claude_user_prompt_hook: claudeUserPromptHook,
+    claude_post_tool_hook: claudePostToolHook,
+    claude_stop_hook: claudeStopHook,
     codex_mcp_registered: codexMcpRegistered,
     codex_hooks_registered: codexHooksRegistered,
+    codex_session_start_hook: codexSessionStartHook,
+    codex_stop_hook: codexStopHook,
+    codex_raw_chronology_supported: false,
     recent_user_prompts: recentUserPrompts,
     recent_tool_events: recentToolEvents,
     recent_sessions_with_raw_capture: recentSessionsWithRawCapture,
+    recent_sessions_with_partial_capture: recentSessionsWithPartialCapture,
     latest_prompt_epoch: latestPromptEpoch,
     latest_tool_event_epoch: latestToolEventEpoch,
+    latest_post_tool_hook_epoch: latestPostToolHookEpoch,
+    latest_post_tool_parse_status: latestPostToolParseStatus,
+    latest_post_tool_name: latestPostToolName,
     raw_capture_active: recentUserPrompts > 0 || recentToolEvents > 0 || recentSessionsWithRawCapture > 0
   };
 }
+function parseNullableInt(value) {
+  if (!value)
+    return null;
+  const parsed = Number.parseInt(value, 10);
+  return Number.isFinite(parsed) ? parsed : null;
+}
 
 // src/sync/auth.ts
 var LEGACY_PUBLIC_HOSTS = new Set(["www.candengo.com", "candengo.com"]);
@@ -3142,7 +3248,7 @@ function normalizeBaseUrl(url) {
 var LEGACY_CODEX_SERVER_NAME3 = `candengo-${"mem"}`;
 var args = process.argv.slice(2);
 var command = args[0];
-var THIS_DIR = dirname4(fileURLToPath4(import.meta.url));
+var THIS_DIR = dirname5(fileURLToPath4(import.meta.url));
 var IS_BUILT_DIST = THIS_DIR.endsWith("/dist") || THIS_DIR.endsWith("\\dist");
 switch (command) {
   case "init":
@@ -3629,7 +3735,16 @@ function handleStatus() {
       const capture = getCaptureStatus(db, { user_id: config.user_id });
       console.log(`    Raw capture:   ${capture.raw_capture_active ? "active" : "observations-only so far"}`);
       console.log(`    Prompts/tools: ${capture.recent_user_prompts}/${capture.recent_tool_events} in last 24h`);
-      console.log(`    Hook state:    Claude ${capture.claude_hooks_registered ? "ok" : "missing"}, Codex ${capture.codex_hooks_registered ? "ok" : "missing"}`);
+      if (capture.recent_sessions_with_partial_capture > 0) {
+        console.log(`    Partial raw:   ${capture.recent_sessions_with_partial_capture} recent session${capture.recent_sessions_with_partial_capture === 1 ? "" : "s"} missing some chronology`);
+      }
+      console.log(`    Hook state:    Claude ${capture.claude_user_prompt_hook && capture.claude_post_tool_hook ? "raw-ready" : "partial"}, Codex ${capture.codex_raw_chronology_supported ? "raw-ready" : "start/stop only"}`);
+      if (capture.latest_post_tool_hook_epoch) {
+        const lastSeen = new Date(capture.latest_post_tool_hook_epoch * 1000).toISOString();
+        const parseStatus = capture.latest_post_tool_parse_status ?? "unknown";
+        const toolName = capture.latest_post_tool_name ?? "unknown";
+        console.log(`    PostToolUse:   ${parseStatus} (${toolName}, ${lastSeen})`);
+      }
       try {
         const activeObservations = db.db.query(`SELECT * FROM observations
              WHERE lifecycle IN ('active', 'aging', 'pinned') AND superseded_by IS NULL`).all();
@@ -3910,9 +4025,17 @@ async function handleDoctor() {
     if (existsSync7(claudeSettings)) {
       const content = readFileSync7(claudeSettings, "utf-8");
       let hookCount = 0;
+      let hasSessionStart = false;
+      let hasUserPrompt = false;
+      let hasPostToolUse = false;
+      let hasStop = false;
       try {
         const settings = JSON.parse(content);
         const hooks = settings?.hooks ?? {};
+        hasSessionStart = Array.isArray(hooks["SessionStart"]);
+        hasUserPrompt = Array.isArray(hooks["UserPromptSubmit"]);
+        hasPostToolUse = Array.isArray(hooks["PostToolUse"]);
+        hasStop = Array.isArray(hooks["Stop"]);
         for (const entries of Object.values(hooks)) {
           if (Array.isArray(entries)) {
             for (const entry of entries) {
@@ -3924,8 +4047,19 @@ async function handleDoctor() {
           }
         }
       } catch {}
-      if (hookCount > 0) {
+      const missingCritical = [];
+      if (!hasSessionStart)
+        missingCritical.push("SessionStart");
+      if (!hasUserPrompt)
+        missingCritical.push("UserPromptSubmit");
+      if (!hasPostToolUse)
+        missingCritical.push("PostToolUse");
+      if (!hasStop)
+        missingCritical.push("Stop");
+      if (hookCount > 0 && missingCritical.length === 0) {
         pass(`Hooks registered (${hookCount} hook${hookCount === 1 ? "" : "s"})`);
+      } else if (hookCount > 0) {
+        warn(`Hooks registered but incomplete \u2014 missing ${missingCritical.join(", ")}`);
       } else {
         warn("No Engrm hooks found in Claude Code settings");
       }
@@ -4057,10 +4191,16 @@ async function handleDoctor() {
   }
   try {
     const capture = getCaptureStatus(db, { user_id: config.user_id });
-    if (capture.raw_capture_active) {
+    if (capture.raw_capture_active && capture.recent_tool_events > 0 && capture.recent_sessions_with_partial_capture === 0) {
       pass(`Raw chronology active (${capture.recent_user_prompts} prompts, ${capture.recent_tool_events} tools in last 24h)`);
+    } else if (capture.raw_capture_active && capture.recent_sessions_with_partial_capture > 0) {
+      warn(`Raw chronology is only partially active (${capture.recent_user_prompts} prompts, ${capture.recent_tool_events} tools in last 24h; ${capture.recent_sessions_with_partial_capture} recent session${capture.recent_sessions_with_partial_capture === 1 ? "" : "s"} missing some chronology).`);
+      if (capture.latest_post_tool_hook_epoch) {
+        info(`Last PostToolUse hook: ${new Date(capture.latest_post_tool_hook_epoch * 1000).toISOString()} (${capture.latest_post_tool_parse_status ?? "unknown"}${capture.latest_post_tool_name ? `, ${capture.latest_post_tool_name}` : ""})`);
+      }
     } else if (capture.claude_hooks_registered || capture.codex_hooks_registered) {
-      warn("Hooks are registered, but no raw prompt/tool chronology has been captured in the last 24h");
+      const guidance = capture.claude_user_prompt_hook && capture.claude_post_tool_hook ? "Claude is raw-ready; open a fresh Claude Code session and perform a few actions to verify capture." : "Claude raw chronology hooks are incomplete, and Codex currently supports start/stop capture only.";
+      warn(`Hooks are registered, but no raw prompt/tool chronology has been captured in the last 24h. ${guidance}`);
     } else {
       warn("Raw chronology inactive \u2014 hook registration is incomplete");
     }

package/dist/hooks/elicitation-result.js

@@ -327,7 +327,7 @@ function looksMeaningful(value) {
 // src/storage/projects.ts
 import { execSync } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
-import { basename, join } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
 function normaliseGitRemoteUrl(remoteUrl) {
   let url = remoteUrl.trim();
   url = url.replace(/^(?:https?|ssh|git):\/\//, "");
@@ -381,6 +381,19 @@ function getGitRemoteUrl(directory) {
     }
   }
 }
+function getGitTopLevel(directory) {
+  try {
+    const root = execSync("git rev-parse --show-toplevel", {
+      cwd: directory,
+      encoding: "utf-8",
+      timeout: 5000,
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    return root || null;
+  } catch {
+    return null;
+  }
+}
 function readProjectConfigFile(directory) {
   const configPath = join(directory, ".engrm.json");
   if (!existsSync(configPath))
@@ -403,11 +416,12 @@ function detectProject(directory) {
   const remoteUrl = getGitRemoteUrl(directory);
   if (remoteUrl) {
     const canonicalId = normaliseGitRemoteUrl(remoteUrl);
+    const repoRoot = getGitTopLevel(directory) ?? directory;
     return {
       canonical_id: canonicalId,
       name: projectNameFromCanonicalId(canonicalId),
       remote_url: remoteUrl,
-      local_path: directory
+      local_path: repoRoot
     };
   }
   const configFile = readProjectConfigFile(directory);
@@ -427,6 +441,32 @@ function detectProject(directory) {
     local_path: directory
   };
 }
+function detectProjectForPath(filePath, fallbackCwd) {
+  const absolutePath = resolve(fallbackCwd ?? process.cwd(), filePath);
+  const candidateDir = existsSync(absolutePath) && !absolutePath.endsWith("/") ? dirname(absolutePath) : dirname(absolutePath);
+  const detected = detectProject(candidateDir);
+  if (detected.canonical_id.startsWith("local/"))
+    return null;
+  return detected;
+}
+function detectProjectFromTouchedPaths(paths, fallbackCwd) {
+  const counts = new Map;
+  for (const rawPath of paths) {
+    if (!rawPath || !rawPath.trim())
+      continue;
+    const detected = detectProjectForPath(rawPath, fallbackCwd);
+    if (!detected)
+      continue;
+    const existing = counts.get(detected.canonical_id);
+    if (existing) {
+      existing.count += 1;
+    } else {
+      counts.set(detected.canonical_id, { project: detected, count: 1 });
+    }
+  }
+  const ranked = [...counts.values()].sort((a, b) => b.count - a.count || a.project.name.localeCompare(b.project.name));
+  return ranked[0]?.project ?? detectProject(fallbackCwd);
+}
 
 // src/embeddings/embedder.ts
 var _available = null;
@@ -694,7 +734,8 @@ async function saveObservation(db, config, input) {
     return { success: false, reason: "Title is required" };
   }
   const cwd = input.cwd ?? process.cwd();
-  const detected = detectProject(cwd);
+  const touchedPaths = [...input.files_read ?? [], ...input.files_modified ?? []];
+  const detected = touchedPaths.length > 0 ? detectProjectFromTouchedPaths(touchedPaths, cwd) : detectProject(cwd);
   const project = db.upsertProject({
     canonical_id: detected.canonical_id,
     name: detected.name,
@@ -1474,6 +1515,11 @@ import { createHash as createHash2 } from "node:crypto";
 var IS_BUN = typeof globalThis.Bun !== "undefined";
 function openDatabase(dbPath) {
   if (IS_BUN) {
+    if (process.platform === "darwin") {
+      try {
+        return openNodeDatabase(dbPath);
+      } catch {}
+    }
     return openBunDatabase(dbPath);
   }
   return openNodeDatabase(dbPath);
@@ -1590,6 +1636,15 @@ class MemDatabase {
     }
     return row;
   }
+  reassignObservationProject(observationId, projectId) {
+    const existing = this.getObservationById(observationId);
+    if (!existing)
+      return false;
+    if (existing.project_id === projectId)
+      return true;
+    this.db.query("UPDATE observations SET project_id = ? WHERE id = ?").run(projectId, observationId);
+    return true;
+  }
   getObservationById(id) {
     return this.db.query("SELECT * FROM observations WHERE id = ?").get(id) ?? null;
   }
@@ -1723,8 +1778,13 @@ class MemDatabase {
   }
   upsertSession(sessionId, projectId, userId, deviceId, agent = "claude-code") {
     const existing = this.db.query("SELECT * FROM sessions WHERE session_id = ?").get(sessionId);
-    if (existing)
+    if (existing) {
+      if (existing.project_id === null && projectId !== null) {
+        this.db.query("UPDATE sessions SET project_id = ? WHERE session_id = ?").run(projectId, sessionId);
+        return this.db.query("SELECT * FROM sessions WHERE session_id = ?").get(sessionId);
+      }
       return existing;
+    }
     const now = Math.floor(Date.now() / 1000);
     this.db.query(`INSERT INTO sessions (session_id, project_id, user_id, device_id, agent, started_at_epoch)
         VALUES (?, ?, ?, ?, ?, ?)`).run(sessionId, projectId, userId, deviceId, agent, now);