engrm 0.4.43 → 0.4.44

package/dist/hooks/post-tool-use.js

@@ -1058,6 +1058,7 @@ function ensureObservationTypes(db) {
         DROP TABLE observations;
         ALTER TABLE observations_repair RENAME TO observations;
         CREATE INDEX IF NOT EXISTS idx_observations_project ON observations(project_id);
+        CREATE INDEX IF NOT EXISTS idx_observations_project_lifecycle ON observations(project_id, lifecycle);
         CREATE INDEX IF NOT EXISTS idx_observations_type ON observations(type);
         CREATE INDEX IF NOT EXISTS idx_observations_created ON observations(created_at_epoch);
         CREATE INDEX IF NOT EXISTS idx_observations_session ON observations(session_id);
@@ -1338,6 +1339,7 @@ class MemDatabase {
     this.db = openDatabase(dbPath);
     this.db.exec("PRAGMA journal_mode = WAL");
     this.db.exec("PRAGMA foreign_keys = ON");
+    this.db.exec("PRAGMA busy_timeout = 5000");
     this.vecAvailable = this.loadVecExtension();
     runMigrations(this.db);
     ensureObservationTypes(this.db);
@@ -1359,8 +1361,16 @@ class MemDatabase {
     this.db.close();
   }
   upsertProject(project) {
+    const canonicalId = project.canonical_id?.trim();
+    const name = project.name?.trim();
+    if (!canonicalId) {
+      throw new Error("Project canonical_id is required");
+    }
+    if (!name) {
+      throw new Error("Project name is required");
+    }
     const now = Math.floor(Date.now() / 1000);
-    const existing = this.db.query("SELECT * FROM projects WHERE canonical_id = ?").get(project.canonical_id);
+    const existing = this.db.query("SELECT * FROM projects WHERE canonical_id = ?").get(canonicalId);
     if (existing) {
       this.db.query(`UPDATE projects SET
             local_path = COALESCE(?, local_path),
@@ -1375,7 +1385,7 @@ class MemDatabase {
       };
     }
     const result = this.db.query(`INSERT INTO projects (canonical_id, name, local_path, remote_url, first_seen_epoch, last_active_epoch)
-        VALUES (?, ?, ?, ?, ?, ?)`).run(project.canonical_id, project.name, project.local_path ?? null, project.remote_url ?? null, now, now);
+        VALUES (?, ?, ?, ?, ?, ?)`).run(canonicalId, name, project.local_path ?? null, project.remote_url ?? null, now, now);
     return this.db.query("SELECT * FROM projects WHERE id = ?").get(Number(result.lastInsertRowid));
   }
   getProjectByCanonicalId(canonicalId) {
@@ -2525,10 +2535,11 @@ function readProjectConfigFile(directory) {
   }
 }
 function detectProject(directory) {
-  const remoteUrl = getGitRemoteUrl(directory);
+  const resolvedDirectory = resolve(directory);
+  const remoteUrl = getGitRemoteUrl(resolvedDirectory);
   if (remoteUrl) {
     const canonicalId = normaliseGitRemoteUrl(remoteUrl);
-    const repoRoot = getGitTopLevel(directory) ?? directory;
+    const repoRoot = getGitTopLevel(resolvedDirectory) ?? resolvedDirectory;
     return {
       canonical_id: canonicalId,
       name: projectNameFromCanonicalId(canonicalId),
@@ -2536,21 +2547,22 @@ function detectProject(directory) {
       local_path: repoRoot
     };
   }
-  const configFile = readProjectConfigFile(directory);
+  const configFile = readProjectConfigFile(resolvedDirectory);
   if (configFile) {
     return {
       canonical_id: configFile.project_id,
       name: configFile.name ?? projectNameFromCanonicalId(configFile.project_id),
       remote_url: null,
-      local_path: directory
+      local_path: resolvedDirectory
     };
   }
-  const dirName = basename(directory);
+  const dirName = basename(resolvedDirectory);
+  const safeDirName = !dirName || dirName === "/" || dirName === "." ? "root" : dirName;
   return {
-    canonical_id: `local/${dirName}`,
-    name: dirName,
+    canonical_id: `local/${safeDirName}`,
+    name: safeDirName,
     remote_url: null,
-    local_path: directory
+    local_path: resolvedDirectory
   };
 }
 function detectProjectForPath(filePath, fallbackCwd) {
@@ -3434,9 +3446,21 @@ function incrementObserverSaveCount(sessionId) {
 // src/capture/recall.ts
 var VEC_DISTANCE_THRESHOLD = 0.25;
 function extractErrorSignature(output) {
-  if (!output || output.length < 10)
+  if (output === null || output === undefined)
     return null;
-  const lines = output.split(`
+  let text;
+  if (typeof output === "string") {
+    text = output;
+  } else {
+    try {
+      text = JSON.stringify(output);
+    } catch {
+      text = String(output);
+    }
+  }
+  if (!text || text.length < 10)
+    return null;
+  const lines = text.split(`
 `);
   for (let i = lines.length - 1;i >= 0; i--) {
     const line = lines[i].trim();
@@ -3766,7 +3790,19 @@ function buildCurrentThread(latestRequest, recentOutcomes, hotFiles, recentToolN
   return null;
 }
 function compactLine(value) {
-  const trimmed = value?.replace(/\s+/g, " ").trim();
+  if (value === null || value === undefined)
+    return null;
+  let text;
+  if (typeof value === "string") {
+    text = value;
+  } else {
+    try {
+      text = JSON.stringify(value);
+    } catch {
+      text = String(value);
+    }
+  }
+  const trimmed = text.replace(/\s+/g, " ").trim();
   if (!trimmed)
     return null;
   return trimmed.length > 120 ? `${trimmed.slice(0, 117)}...` : trimmed;
@@ -4507,7 +4543,19 @@ function parseJsonArray3(value) {
   }
 }
 function compactLine2(value) {
-  const trimmed = value?.replace(/\s+/g, " ").trim();
+  if (value === null || value === undefined)
+    return null;
+  let text;
+  if (typeof value === "string") {
+    text = value;
+  } else {
+    try {
+      text = JSON.stringify(value);
+    } catch {
+      text = String(value);
+    }
+  }
+  const trimmed = text.replace(/\s+/g, " ").trim();
   if (!trimmed)
     return null;
   return trimmed.length > 120 ? `${trimmed.slice(0, 117)}...` : trimmed;
@@ -4539,7 +4587,7 @@ async function main() {
   db.setSyncState("hook_post_tool_last_payload_preview", truncatePreview(raw, 400) ?? "parsed");
   try {
     if (event.session_id) {
-      persistRawToolChronology(event, config.user_id, config.device_id);
+      persistRawToolChronology(db, event, config.user_id, config.device_id);
       await syncTranscriptChat(db, config, event.session_id, event.cwd);
     }
     const textToScan = extractScanText(event);
@@ -4645,24 +4693,22 @@ async function main() {
     db.close();
   }
 }
-function persistRawToolChronology(event, userId, deviceId) {
-  const rawDb = new MemDatabase(getDbPath());
+function persistRawToolChronology(rawDb, event, userId, deviceId) {
+  const detected = detectProjectForEvent(event);
+  const project = rawDb.upsertProject({
+    canonical_id: detected.canonical_id,
+    name: detected.name,
+    local_path: detected.local_path,
+    remote_url: detected.remote_url ?? null
+  });
+  rawDb.upsertSession(event.session_id, project.id, userId, deviceId, "claude-code");
+  const metricsIncrement = {
+    toolCalls: 1
+  };
+  if ((event.tool_name === "Edit" || event.tool_name === "Write") && event.tool_input["file_path"]) {
+    metricsIncrement.files = 1;
+  }
   try {
-    const detected = detectProjectForEvent(event);
-    const project = rawDb.upsertProject({
-      canonical_id: detected.canonical_id,
-      name: detected.name,
-      local_path: detected.local_path,
-      remote_url: detected.remote_url ?? null
-    });
-    rawDb.upsertSession(event.session_id, project.id, userId, deviceId, "claude-code");
-    const metricsIncrement = {
-      toolCalls: 1
-    };
-    if ((event.tool_name === "Edit" || event.tool_name === "Write") && event.tool_input["file_path"]) {
-      metricsIncrement.files = 1;
-    }
-    rawDb.incrementSessionMetrics(event.session_id, metricsIncrement);
     rawDb.insertToolEvent({
       session_id: event.session_id,
       project_id: project.id,
@@ -4675,8 +4721,13 @@ function persistRawToolChronology(event, userId, deviceId) {
       device_id: deviceId,
       agent: "claude-code"
     });
-  } finally {
-    rawDb.close();
+    rawDb.incrementSessionMetrics(event.session_id, metricsIncrement);
+    rawDb.setSyncState("hook_post_tool_last_store_status", "stored");
+    rawDb.setSyncState("hook_post_tool_last_store_error", "");
+  } catch (error) {
+    rawDb.setSyncState("hook_post_tool_last_store_status", "store-error");
+    rawDb.setSyncState("hook_post_tool_last_store_error", truncatePreview(error instanceof Error ? error.message : String(error), 400) ?? "unknown");
+    throw error;
   }
 }
 async function withTimeout(promise, timeoutMs) {
@@ -4761,9 +4812,21 @@ function safeSerializeToolInput(toolInput) {
   }
 }
 function truncatePreview(value, maxLen) {
-  if (!value)
+  if (value === null || value === undefined)
+    return null;
+  let text;
+  if (typeof value === "string") {
+    text = value;
+  } else {
+    try {
+      text = JSON.stringify(value);
+    } catch {
+      text = String(value);
+    }
+  }
+  if (!text)
     return null;
-  const normalized = value.replace(/\s+/g, " ").trim();
+  const normalized = text.replace(/\s+/g, " ").trim();
   if (!normalized)
     return null;
   if (normalized.length <= maxLen)

package/dist/hooks/pre-compact.js

@@ -852,6 +852,7 @@ function ensureObservationTypes(db) {
         DROP TABLE observations;
         ALTER TABLE observations_repair RENAME TO observations;
         CREATE INDEX IF NOT EXISTS idx_observations_project ON observations(project_id);
+        CREATE INDEX IF NOT EXISTS idx_observations_project_lifecycle ON observations(project_id, lifecycle);
         CREATE INDEX IF NOT EXISTS idx_observations_type ON observations(type);
         CREATE INDEX IF NOT EXISTS idx_observations_created ON observations(created_at_epoch);
         CREATE INDEX IF NOT EXISTS idx_observations_session ON observations(session_id);
@@ -1132,6 +1133,7 @@ class MemDatabase {
     this.db = openDatabase(dbPath);
     this.db.exec("PRAGMA journal_mode = WAL");
     this.db.exec("PRAGMA foreign_keys = ON");
+    this.db.exec("PRAGMA busy_timeout = 5000");
     this.vecAvailable = this.loadVecExtension();
     runMigrations(this.db);
     ensureObservationTypes(this.db);
@@ -1153,8 +1155,16 @@ class MemDatabase {
     this.db.close();
   }
   upsertProject(project) {
+    const canonicalId = project.canonical_id?.trim();
+    const name = project.name?.trim();
+    if (!canonicalId) {
+      throw new Error("Project canonical_id is required");
+    }
+    if (!name) {
+      throw new Error("Project name is required");
+    }
     const now = Math.floor(Date.now() / 1000);
-    const existing = this.db.query("SELECT * FROM projects WHERE canonical_id = ?").get(project.canonical_id);
+    const existing = this.db.query("SELECT * FROM projects WHERE canonical_id = ?").get(canonicalId);
     if (existing) {
       this.db.query(`UPDATE projects SET
             local_path = COALESCE(?, local_path),
@@ -1169,7 +1179,7 @@ class MemDatabase {
       };
     }
     const result = this.db.query(`INSERT INTO projects (canonical_id, name, local_path, remote_url, first_seen_epoch, last_active_epoch)
-        VALUES (?, ?, ?, ?, ?, ?)`).run(project.canonical_id, project.name, project.local_path ?? null, project.remote_url ?? null, now, now);
+        VALUES (?, ?, ?, ?, ?, ?)`).run(canonicalId, name, project.local_path ?? null, project.remote_url ?? null, now, now);
     return this.db.query("SELECT * FROM projects WHERE id = ?").get(Number(result.lastInsertRowid));
   }
   getProjectByCanonicalId(canonicalId) {
@@ -1937,10 +1947,11 @@ function readProjectConfigFile(directory) {
   }
 }
 function detectProject(directory) {
-  const remoteUrl = getGitRemoteUrl(directory);
+  const resolvedDirectory = resolve(directory);
+  const remoteUrl = getGitRemoteUrl(resolvedDirectory);
   if (remoteUrl) {
     const canonicalId = normaliseGitRemoteUrl(remoteUrl);
-    const repoRoot = getGitTopLevel(directory) ?? directory;
+    const repoRoot = getGitTopLevel(resolvedDirectory) ?? resolvedDirectory;
     return {
       canonical_id: canonicalId,
       name: projectNameFromCanonicalId(canonicalId),
@@ -1948,21 +1959,22 @@ function detectProject(directory) {
       local_path: repoRoot
     };
   }
-  const configFile = readProjectConfigFile(directory);
+  const configFile = readProjectConfigFile(resolvedDirectory);
   if (configFile) {
     return {
       canonical_id: configFile.project_id,
       name: configFile.name ?? projectNameFromCanonicalId(configFile.project_id),
       remote_url: null,
-      local_path: directory
+      local_path: resolvedDirectory
     };
   }
-  const dirName = basename(directory);
+  const dirName = basename(resolvedDirectory);
+  const safeDirName = !dirName || dirName === "/" || dirName === "." ? "root" : dirName;
   return {
-    canonical_id: `local/${dirName}`,
-    name: dirName,
+    canonical_id: `local/${safeDirName}`,
+    name: safeDirName,
     remote_url: null,
-    local_path: directory
+    local_path: resolvedDirectory
   };
 }
 function detectProjectForPath(filePath, fallbackCwd) {
@@ -3387,7 +3399,19 @@ function parseJsonArray2(value) {
   }
 }
 function compactLine(value) {
-  const trimmed = value?.replace(/\s+/g, " ").trim();
+  if (value === null || value === undefined)
+    return null;
+  let text;
+  if (typeof value === "string") {
+    text = value;
+  } else {
+    try {
+      text = JSON.stringify(value);
+    } catch {
+      text = String(value);
+    }
+  }
+  const trimmed = text.replace(/\s+/g, " ").trim();
   if (!trimmed)
     return null;
   return trimmed.length > 120 ? `${trimmed.slice(0, 117)}...` : trimmed;

package/dist/hooks/sentinel.js

@@ -928,6 +928,7 @@ function ensureObservationTypes(db) {
         DROP TABLE observations;
         ALTER TABLE observations_repair RENAME TO observations;
         CREATE INDEX IF NOT EXISTS idx_observations_project ON observations(project_id);
+        CREATE INDEX IF NOT EXISTS idx_observations_project_lifecycle ON observations(project_id, lifecycle);
         CREATE INDEX IF NOT EXISTS idx_observations_type ON observations(type);
         CREATE INDEX IF NOT EXISTS idx_observations_created ON observations(created_at_epoch);
         CREATE INDEX IF NOT EXISTS idx_observations_session ON observations(session_id);
@@ -1208,6 +1209,7 @@ class MemDatabase {
     this.db = openDatabase(dbPath);
     this.db.exec("PRAGMA journal_mode = WAL");
     this.db.exec("PRAGMA foreign_keys = ON");
+    this.db.exec("PRAGMA busy_timeout = 5000");
     this.vecAvailable = this.loadVecExtension();
     runMigrations(this.db);
     ensureObservationTypes(this.db);
@@ -1229,8 +1231,16 @@ class MemDatabase {
     this.db.close();
   }
   upsertProject(project) {
+    const canonicalId = project.canonical_id?.trim();
+    const name = project.name?.trim();
+    if (!canonicalId) {
+      throw new Error("Project canonical_id is required");
+    }
+    if (!name) {
+      throw new Error("Project name is required");
+    }
     const now = Math.floor(Date.now() / 1000);
-    const existing = this.db.query("SELECT * FROM projects WHERE canonical_id = ?").get(project.canonical_id);
+    const existing = this.db.query("SELECT * FROM projects WHERE canonical_id = ?").get(canonicalId);
     if (existing) {
       this.db.query(`UPDATE projects SET
             local_path = COALESCE(?, local_path),
@@ -1245,7 +1255,7 @@ class MemDatabase {
       };
     }
     const result = this.db.query(`INSERT INTO projects (canonical_id, name, local_path, remote_url, first_seen_epoch, last_active_epoch)
-        VALUES (?, ?, ?, ?, ?, ?)`).run(project.canonical_id, project.name, project.local_path ?? null, project.remote_url ?? null, now, now);
+        VALUES (?, ?, ?, ?, ?, ?)`).run(canonicalId, name, project.local_path ?? null, project.remote_url ?? null, now, now);
     return this.db.query("SELECT * FROM projects WHERE id = ?").get(Number(result.lastInsertRowid));
   }
   getProjectByCanonicalId(canonicalId) {
@@ -2067,10 +2077,11 @@ function readProjectConfigFile(directory) {
   }
 }
 function detectProject(directory) {
-  const remoteUrl = getGitRemoteUrl(directory);
+  const resolvedDirectory = resolve(directory);
+  const remoteUrl = getGitRemoteUrl(resolvedDirectory);
   if (remoteUrl) {
     const canonicalId = normaliseGitRemoteUrl(remoteUrl);
-    const repoRoot = getGitTopLevel(directory) ?? directory;
+    const repoRoot = getGitTopLevel(resolvedDirectory) ?? resolvedDirectory;
     return {
       canonical_id: canonicalId,
       name: projectNameFromCanonicalId(canonicalId),
@@ -2078,21 +2089,22 @@ function detectProject(directory) {
       local_path: repoRoot
     };
   }
-  const configFile = readProjectConfigFile(directory);
+  const configFile = readProjectConfigFile(resolvedDirectory);
   if (configFile) {
     return {
       canonical_id: configFile.project_id,
       name: configFile.name ?? projectNameFromCanonicalId(configFile.project_id),
       remote_url: null,
-      local_path: directory
+      local_path: resolvedDirectory
     };
   }
-  const dirName = basename(directory);
+  const dirName = basename(resolvedDirectory);
+  const safeDirName = !dirName || dirName === "/" || dirName === "." ? "root" : dirName;
   return {
-    canonical_id: `local/${dirName}`,
-    name: dirName,
+    canonical_id: `local/${safeDirName}`,
+    name: safeDirName,
     remote_url: null,
-    local_path: directory
+    local_path: resolvedDirectory
   };
 }
 function detectProjectForPath(filePath, fallbackCwd) {