engrm 0.4.45 → 0.4.47

package/dist/hooks/elicitation-result.js

@@ -909,11 +909,20 @@ import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, wr
 import { homedir, hostname, networkInterfaces } from "node:os";
 import { join as join2 } from "node:path";
 import { createHash } from "node:crypto";
-var CONFIG_DIR = join2(homedir(), ".engrm");
-var SETTINGS_PATH = join2(CONFIG_DIR, "settings.json");
-var DB_PATH = join2(CONFIG_DIR, "engrm.db");
+function resolveConfigDir() {
+  return process.env["ENGRM_CONFIG_DIR"]?.trim() || join2(homedir(), ".engrm");
+}
+function resolveSettingsPath() {
+  return join2(resolveConfigDir(), "settings.json");
+}
+function resolveDbPath() {
+  return join2(resolveConfigDir(), "engrm.db");
+}
+function resolveAuthBackupPath() {
+  return join2(resolveConfigDir(), "auth-backup.json");
+}
 function getDbPath() {
-  return DB_PATH;
+  return resolveDbPath();
 }
 function generateDeviceId() {
   const host = hostname().toLowerCase().replace(/[^a-z0-9-]/g, "");
@@ -936,7 +945,7 @@ function generateDeviceId() {
   return `${host}-${suffix}`;
 }
 function createDefaultConfig() {
-  return {
+  const merged = {
     candengo_url: "",
     candengo_api_key: "",
     site_id: "",
@@ -991,24 +1000,26 @@ function createDefaultConfig() {
     },
     tool_profile: "full"
   };
+  return merged;
 }
 function loadConfig() {
-  if (!existsSync2(SETTINGS_PATH)) {
-    throw new Error(`Config not found at ${SETTINGS_PATH}. Run 'engrm init --manual' to configure.`);
+  const settingsPath = resolveSettingsPath();
+  if (!existsSync2(settingsPath)) {
+    throw new Error(`Config not found at ${settingsPath}. Run 'engrm init --manual' to configure.`);
   }
-  const raw = readFileSync2(SETTINGS_PATH, "utf-8");
+  const raw = readFileSync2(settingsPath, "utf-8");
   let parsed;
   try {
     parsed = JSON.parse(raw);
   } catch {
-    throw new Error(`Invalid JSON in ${SETTINGS_PATH}`);
+    throw new Error(`Invalid JSON in ${settingsPath}`);
   }
   if (typeof parsed !== "object" || parsed === null) {
-    throw new Error(`Config at ${SETTINGS_PATH} is not a JSON object`);
+    throw new Error(`Config at ${settingsPath} is not a JSON object`);
   }
   const config = parsed;
   const defaults = createDefaultConfig();
-  return {
+  const merged = {
     candengo_url: asString(config["candengo_url"], defaults.candengo_url),
     candengo_api_key: asString(config["candengo_api_key"], defaults.candengo_api_key),
     site_id: asString(config["site_id"], defaults.site_id),
@@ -1063,16 +1074,27 @@ function loadConfig() {
     },
     tool_profile: asToolProfile(config["tool_profile"], defaults.tool_profile)
   };
+  if (looksLikePlaceholderAuth(merged)) {
+    return restoreAuthBackup(merged) ?? merged;
+  }
+  return merged;
 }
 function saveConfig(config) {
-  if (!existsSync2(CONFIG_DIR)) {
-    mkdirSync(CONFIG_DIR, { recursive: true });
+  const configDir = resolveConfigDir();
+  const settingsPath = resolveSettingsPath();
+  const authBackupPath = resolveAuthBackupPath();
+  if (!existsSync2(configDir)) {
+    mkdirSync(configDir, { recursive: true });
   }
-  writeFileSync(SETTINGS_PATH, JSON.stringify(config, null, 2) + `
+  writeFileSync(settingsPath, JSON.stringify(config, null, 2) + `
 `, "utf-8");
+  if (!looksLikePlaceholderAuth(config)) {
+    writeFileSync(authBackupPath, JSON.stringify(extractAuthBackup(config), null, 2) + `
+`, "utf-8");
+  }
 }
 function configExists() {
-  return existsSync2(SETTINGS_PATH);
+  return existsSync2(resolveSettingsPath());
 }
 function asString(value, fallback) {
   return typeof value === "string" ? value : fallback;
@@ -1126,6 +1148,50 @@ function asTeams(value, fallback) {
     return fallback;
   return value.filter((t) => typeof t === "object" && t !== null && typeof t.id === "string" && typeof t.name === "string" && typeof t.namespace === "string");
 }
+function looksLikePlaceholderAuth(config) {
+  const apiKey = config.candengo_api_key.trim();
+  const siteId = config.site_id.trim();
+  const namespace = config.namespace.trim();
+  const email = config.user_email.trim().toLowerCase();
+  if (apiKey === "cvk_org" && siteId === "site-1" && namespace === "org-ns")
+    return true;
+  if (siteId === "site-1" && namespace === "org-ns" && email.endsWith("@example.com"))
+    return true;
+  return false;
+}
+function extractAuthBackup(config) {
+  return {
+    candengo_url: config.candengo_url,
+    candengo_api_key: config.candengo_api_key,
+    site_id: config.site_id,
+    namespace: config.namespace,
+    user_id: config.user_id,
+    user_email: config.user_email,
+    teams: config.teams
+  };
+}
+function restoreAuthBackup(config) {
+  const authBackupPath = resolveAuthBackupPath();
+  if (!existsSync2(authBackupPath))
+    return null;
+  try {
+    const raw = readFileSync2(authBackupPath, "utf-8");
+    const parsed = JSON.parse(raw);
+    const restored = {
+      ...config,
+      candengo_url: asString(parsed["candengo_url"], config.candengo_url),
+      candengo_api_key: asString(parsed["candengo_api_key"], config.candengo_api_key),
+      site_id: asString(parsed["site_id"], config.site_id),
+      namespace: asString(parsed["namespace"], config.namespace),
+      user_id: asString(parsed["user_id"], config.user_id),
+      user_email: asString(parsed["user_email"], config.user_email),
+      teams: asTeams(parsed["teams"], config.teams)
+    };
+    return looksLikePlaceholderAuth(restored) ? null : restored;
+  } catch {
+    return null;
+  }
+}
 
 // src/storage/migrations.ts
 var MIGRATIONS = [
@@ -1813,6 +1879,20 @@ function ensureChatMessageColumns(db) {
     db.exec("PRAGMA user_version = 17");
   }
 }
+function ensureObservationVectorTable(db) {
+  if (!isVecExtensionLoaded(db))
+    return;
+  db.exec(`
+    CREATE VIRTUAL TABLE IF NOT EXISTS vec_observations USING vec0(
+      observation_id INTEGER PRIMARY KEY,
+      embedding FLOAT[384]
+    );
+  `);
+  const current = getSchemaVersion(db);
+  if (current < 4) {
+    db.exec("PRAGMA user_version = 4");
+  }
+}
 function ensureChatVectorTable(db) {
   if (!isVecExtensionLoaded(db))
     return;
@@ -2041,6 +2121,7 @@ class MemDatabase {
     ensureObservationTypes(this.db);
     ensureSessionSummaryColumns(this.db);
     ensureChatMessageColumns(this.db);
+    ensureObservationVectorTable(this.db);
     ensureChatVectorTable(this.db);
     ensureSyncOutboxSupportsChatMessages(this.db);
   }

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

@@ -213,11 +213,20 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir, hostname, networkInterfaces } from "node:os";
 import { join } from "node:path";
 import { createHash } from "node:crypto";
-var CONFIG_DIR = join(homedir(), ".engrm");
-var SETTINGS_PATH = join(CONFIG_DIR, "settings.json");
-var DB_PATH = join(CONFIG_DIR, "engrm.db");
+function resolveConfigDir() {
+  return process.env["ENGRM_CONFIG_DIR"]?.trim() || join(homedir(), ".engrm");
+}
+function resolveSettingsPath() {
+  return join(resolveConfigDir(), "settings.json");
+}
+function resolveDbPath() {
+  return join(resolveConfigDir(), "engrm.db");
+}
+function resolveAuthBackupPath() {
+  return join(resolveConfigDir(), "auth-backup.json");
+}
 function getDbPath() {
-  return DB_PATH;
+  return resolveDbPath();
 }
 function generateDeviceId() {
   const host = hostname().toLowerCase().replace(/[^a-z0-9-]/g, "");
@@ -240,7 +249,7 @@ function generateDeviceId() {
   return `${host}-${suffix}`;
 }
 function createDefaultConfig() {
-  return {
+  const merged = {
     candengo_url: "",
     candengo_api_key: "",
     site_id: "",
@@ -295,24 +304,26 @@ function createDefaultConfig() {
     },
     tool_profile: "full"
   };
+  return merged;
 }
 function loadConfig() {
-  if (!existsSync(SETTINGS_PATH)) {
-    throw new Error(`Config not found at ${SETTINGS_PATH}. Run 'engrm init --manual' to configure.`);
+  const settingsPath = resolveSettingsPath();
+  if (!existsSync(settingsPath)) {
+    throw new Error(`Config not found at ${settingsPath}. Run 'engrm init --manual' to configure.`);
   }
-  const raw = readFileSync(SETTINGS_PATH, "utf-8");
+  const raw = readFileSync(settingsPath, "utf-8");
   let parsed;
   try {
     parsed = JSON.parse(raw);
   } catch {
-    throw new Error(`Invalid JSON in ${SETTINGS_PATH}`);
+    throw new Error(`Invalid JSON in ${settingsPath}`);
   }
   if (typeof parsed !== "object" || parsed === null) {
-    throw new Error(`Config at ${SETTINGS_PATH} is not a JSON object`);
+    throw new Error(`Config at ${settingsPath} is not a JSON object`);
   }
   const config = parsed;
   const defaults = createDefaultConfig();
-  return {
+  const merged = {
     candengo_url: asString(config["candengo_url"], defaults.candengo_url),
     candengo_api_key: asString(config["candengo_api_key"], defaults.candengo_api_key),
     site_id: asString(config["site_id"], defaults.site_id),
@@ -367,16 +378,27 @@ function loadConfig() {
     },
     tool_profile: asToolProfile(config["tool_profile"], defaults.tool_profile)
   };
+  if (looksLikePlaceholderAuth(merged)) {
+    return restoreAuthBackup(merged) ?? merged;
+  }
+  return merged;
 }
 function saveConfig(config) {
-  if (!existsSync(CONFIG_DIR)) {
-    mkdirSync(CONFIG_DIR, { recursive: true });
+  const configDir = resolveConfigDir();
+  const settingsPath = resolveSettingsPath();
+  const authBackupPath = resolveAuthBackupPath();
+  if (!existsSync(configDir)) {
+    mkdirSync(configDir, { recursive: true });
   }
-  writeFileSync(SETTINGS_PATH, JSON.stringify(config, null, 2) + `
+  writeFileSync(settingsPath, JSON.stringify(config, null, 2) + `
 `, "utf-8");
+  if (!looksLikePlaceholderAuth(config)) {
+    writeFileSync(authBackupPath, JSON.stringify(extractAuthBackup(config), null, 2) + `
+`, "utf-8");
+  }
 }
 function configExists() {
-  return existsSync(SETTINGS_PATH);
+  return existsSync(resolveSettingsPath());
 }
 function asString(value, fallback) {
   return typeof value === "string" ? value : fallback;
@@ -430,6 +452,50 @@ function asTeams(value, fallback) {
     return fallback;
   return value.filter((t) => typeof t === "object" && t !== null && typeof t.id === "string" && typeof t.name === "string" && typeof t.namespace === "string");
 }
+function looksLikePlaceholderAuth(config) {
+  const apiKey = config.candengo_api_key.trim();
+  const siteId = config.site_id.trim();
+  const namespace = config.namespace.trim();
+  const email = config.user_email.trim().toLowerCase();
+  if (apiKey === "cvk_org" && siteId === "site-1" && namespace === "org-ns")
+    return true;
+  if (siteId === "site-1" && namespace === "org-ns" && email.endsWith("@example.com"))
+    return true;
+  return false;
+}
+function extractAuthBackup(config) {
+  return {
+    candengo_url: config.candengo_url,
+    candengo_api_key: config.candengo_api_key,
+    site_id: config.site_id,
+    namespace: config.namespace,
+    user_id: config.user_id,
+    user_email: config.user_email,
+    teams: config.teams
+  };
+}
+function restoreAuthBackup(config) {
+  const authBackupPath = resolveAuthBackupPath();
+  if (!existsSync(authBackupPath))
+    return null;
+  try {
+    const raw = readFileSync(authBackupPath, "utf-8");
+    const parsed = JSON.parse(raw);
+    const restored = {
+      ...config,
+      candengo_url: asString(parsed["candengo_url"], config.candengo_url),
+      candengo_api_key: asString(parsed["candengo_api_key"], config.candengo_api_key),
+      site_id: asString(parsed["site_id"], config.site_id),
+      namespace: asString(parsed["namespace"], config.namespace),
+      user_id: asString(parsed["user_id"], config.user_id),
+      user_email: asString(parsed["user_email"], config.user_email),
+      teams: asTeams(parsed["teams"], config.teams)
+    };
+    return looksLikePlaceholderAuth(restored) ? null : restored;
+  } catch {
+    return null;
+  }
+}
 
 // src/storage/migrations.ts
 var MIGRATIONS = [
@@ -1117,6 +1183,20 @@ function ensureChatMessageColumns(db) {
     db.exec("PRAGMA user_version = 17");
   }
 }
+function ensureObservationVectorTable(db) {
+  if (!isVecExtensionLoaded(db))
+    return;
+  db.exec(`
+    CREATE VIRTUAL TABLE IF NOT EXISTS vec_observations USING vec0(
+      observation_id INTEGER PRIMARY KEY,
+      embedding FLOAT[384]
+    );
+  `);
+  const current = getSchemaVersion(db);
+  if (current < 4) {
+    db.exec("PRAGMA user_version = 4");
+  }
+}
 function ensureChatVectorTable(db) {
   if (!isVecExtensionLoaded(db))
     return;
@@ -1345,6 +1425,7 @@ class MemDatabase {
     ensureObservationTypes(this.db);
     ensureSessionSummaryColumns(this.db);
     ensureChatMessageColumns(this.db);
+    ensureObservationVectorTable(this.db);
     ensureChatVectorTable(this.db);
     ensureSyncOutboxSupportsChatMessages(this.db);
   }
@@ -3826,14 +3907,18 @@ function parseJsonArray(value) {
 
 // src/capture/transcript.ts
 import { createHash as createHash3 } from "node:crypto";
-import { readFileSync as readFileSync4, existsSync as existsSync4 } from "node:fs";
+import { readFileSync as readFileSync4, existsSync as existsSync4, statSync, readdirSync } from "node:fs";
 import { join as join4 } from "node:path";
 import { homedir as homedir3 } from "node:os";
 function resolveTranscriptPath(sessionId, cwd, transcriptPath) {
   if (transcriptPath)
     return transcriptPath;
   const encodedCwd = cwd.replace(/\//g, "-");
-  return join4(homedir3(), ".claude", "projects", encodedCwd, `${sessionId}.jsonl`);
+  const directPath = join4(homedir3(), ".claude", "projects", encodedCwd, `${sessionId}.jsonl`);
+  if (existsSync4(directPath))
+    return directPath;
+  const discovered = findTranscriptPathBySessionId(sessionId);
+  return discovered ?? directPath;
 }
 function readTranscript(sessionId, cwd, transcriptPath) {
   const path = resolveTranscriptPath(sessionId, cwd, transcriptPath);
@@ -3856,10 +3941,10 @@ function readTranscript(sessionId, cwd, transcriptPath) {
     } catch {
       continue;
     }
-    const role = entry.role;
+    const role = getTranscriptRole(entry);
     if (role !== "user" && role !== "assistant")
       continue;
-    const content = entry.content;
+    const content = getTranscriptContent(entry);
     if (typeof content === "string") {
       messages.push({ role, text: content });
       continue;
@@ -3879,6 +3964,66 @@ function readTranscript(sessionId, cwd, transcriptPath) {
   }
   return messages;
 }
+function readTranscriptToolEvents(sessionId, cwd, transcriptPath) {
+  const path = resolveTranscriptPath(sessionId, cwd, transcriptPath);
+  if (!existsSync4(path))
+    return [];
+  let raw;
+  try {
+    raw = readFileSync4(path, "utf-8");
+  } catch {
+    return [];
+  }
+  const toolEvents = [];
+  const toolEventIndexes = new Map;
+  for (const line of raw.split(`
+`)) {
+    if (!line.trim())
+      continue;
+    let entry;
+    try {
+      entry = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    const createdAtEpoch = parseTranscriptTimestamp(entry);
+    const content = getTranscriptContent(entry);
+    if (!Array.isArray(content))
+      continue;
+    for (const block of content) {
+      if (!block || typeof block !== "object")
+        continue;
+      if (block.type === "tool_result" && typeof block.tool_use_id === "string") {
+        const preview = extractToolResultPreview(block.content);
+        const index = toolEventIndexes.get(block.tool_use_id);
+        if (preview && index !== undefined) {
+          toolEvents[index] = {
+            ...toolEvents[index],
+            tool_response_preview: preview
+          };
+        }
+        continue;
+      }
+      if (block.type !== "tool_use")
+        continue;
+      const input = block.input && typeof block.input === "object" ? block.input : {};
+      const toolUseId = typeof block.id === "string" ? block.id : null;
+      const nextEvent = {
+        tool_name: typeof block.name === "string" ? block.name : "Unknown",
+        tool_input_json: JSON.stringify(input),
+        tool_response_preview: null,
+        file_path: extractToolFilePath(input),
+        command: typeof input.command === "string" ? input.command : null,
+        created_at_epoch: createdAtEpoch
+      };
+      toolEvents.push(nextEvent);
+      if (toolUseId) {
+        toolEventIndexes.set(toolUseId, toolEvents.length - 1);
+      }
+    }
+  }
+  return toolEvents;
+}
 function resolveHistoryPath(historyPath) {
   if (historyPath)
     return historyPath;
@@ -3944,9 +4089,22 @@ function readHistoryFallback(sessionId, cwd, opts) {
     createdAtEpoch: entry.timestamp
   })));
 }
-async function syncTranscriptChat(db, config, sessionId, cwd, transcriptPath) {
+async function syncTranscriptChat(db, config, sessionId, cwd, transcriptPath, options = {}) {
+  const embed = options.embed ?? true;
   const session = db.getSessionById(sessionId);
-  const transcriptMessages = readTranscript(sessionId, cwd, transcriptPath).map((message) => ({
+  const resolvedTranscriptPath = resolveTranscriptPath(sessionId, cwd, transcriptPath);
+  const syncCursorKey = `transcript_sync_cursor:${sessionId}`;
+  if (existsSync4(resolvedTranscriptPath)) {
+    try {
+      const stat = statSync(resolvedTranscriptPath);
+      const cursor = `${stat.size}:${Math.floor(stat.mtimeMs)}`;
+      if (db.getSyncState(syncCursorKey) === cursor) {
+        return { imported: 0, total: 0 };
+      }
+      db.setSyncState(syncCursorKey, cursor);
+    } catch {}
+  }
+  const transcriptMessages = readTranscript(sessionId, cwd, resolvedTranscriptPath).map((message) => ({
     ...message,
     text: message.text.trim()
   })).filter((message) => message.text.length > 0);
@@ -4008,7 +4166,7 @@ async function syncTranscriptChat(db, config, sessionId, cwd, transcriptPath) {
         created_at_epoch: createdAtEpoch
       });
     }
-    if (db.vecAvailable) {
+    if (embed && db.vecAvailable) {
       const embedding = await embedText(composeChatEmbeddingText(message.text));
       if (embedding) {
         db.vecChatInsert(row.id, embedding);
@@ -4018,6 +4176,35 @@ async function syncTranscriptChat(db, config, sessionId, cwd, transcriptPath) {
   }
   return { imported, total: messages.length };
 }
+function syncTranscriptToolEvents(db, config, sessionId, cwd, transcriptPath) {
+  const session = db.getSessionById(sessionId);
+  if (!session)
+    return { imported: 0, total: 0 };
+  if (db.getSessionToolEvents(sessionId, 1).length > 0) {
+    return { imported: 0, total: 0 };
+  }
+  const toolEvents = readTranscriptToolEvents(sessionId, cwd, transcriptPath);
+  if (toolEvents.length === 0)
+    return { imported: 0, total: 0 };
+  let imported = 0;
+  for (const event of toolEvents) {
+    db.insertToolEvent({
+      session_id: sessionId,
+      project_id: session.project_id,
+      tool_name: event.tool_name,
+      tool_input_json: event.tool_input_json,
+      tool_response_preview: event.tool_response_preview,
+      file_path: event.file_path,
+      command: event.command,
+      user_id: config.user_id,
+      device_id: config.device_id,
+      agent: "claude-code",
+      created_at_epoch: event.created_at_epoch ?? undefined
+    });
+    imported++;
+  }
+  return { imported, total: toolEvents.length };
+}
 function dedupeHistoryMessages(messages) {
   const deduped = [];
   for (const message of messages) {
@@ -4035,6 +4222,59 @@ function buildHistorySourceId(sessionId, createdAtEpoch, text) {
   const digest = createHash3("sha1").update(text).digest("hex").slice(0, 12);
   return `history:${sessionId}:${createdAtEpoch}:${digest}`;
 }
+function getTranscriptRole(entry) {
+  return entry.role ?? entry.message?.role ?? entry.type ?? entry.message?.type;
+}
+function getTranscriptContent(entry) {
+  return entry.content ?? entry.message?.content;
+}
+function parseTranscriptTimestamp(entry) {
+  const raw = entry.timestamp ?? entry.message?.timestamp;
+  if (typeof raw !== "string")
+    return null;
+  const epoch = Date.parse(raw);
+  return Number.isFinite(epoch) ? Math.floor(epoch / 1000) : null;
+}
+function extractToolResultPreview(content) {
+  if (typeof content === "string")
+    return content.slice(0, 4000);
+  if (Array.isArray(content)) {
+    const text = content.map((item) => {
+      if (typeof item === "string")
+        return item;
+      if (item && typeof item === "object" && typeof item.text === "string")
+        return item.text;
+      return "";
+    }).filter(Boolean).join(`
+`);
+    return text ? text.slice(0, 4000) : null;
+  }
+  return null;
+}
+function extractToolFilePath(input) {
+  for (const key of ["file_path", "path", "target_file"]) {
+    if (typeof input[key] === "string")
+      return input[key];
+  }
+  return null;
+}
+function findTranscriptPathBySessionId(sessionId) {
+  const projectsDir = join4(homedir3(), ".claude", "projects");
+  if (!existsSync4(projectsDir))
+    return null;
+  try {
+    for (const entry of readdirSync(projectsDir, { withFileTypes: true })) {
+      if (!entry.isDirectory())
+        continue;
+      const candidate = join4(projectsDir, entry.name, `${sessionId}.jsonl`);
+      if (existsSync4(candidate))
+        return candidate;
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
 function truncateTranscript(messages, maxBytes = 50000) {
   const lines = [];
   for (const msg of messages) {
@@ -4588,7 +4828,9 @@ async function main() {
   try {
     if (event.session_id) {
       persistRawToolChronology(db, event, config.user_id, config.device_id);
-      await syncTranscriptChat(db, config, event.session_id, event.cwd);
+      await syncTranscriptChat(db, config, event.session_id, event.cwd, undefined, {
+        embed: false
+      });
     }
     const textToScan = extractScanText(event);
     if (textToScan) {