engrm 0.4.45 → 0.4.46

package/dist/server.js

@@ -13564,11 +13564,20 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir, hostname as hostname3, 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 = hostname3().toLowerCase().replace(/[^a-z0-9-]/g, "");
@@ -13591,7 +13600,7 @@ function generateDeviceId() {
   return `${host}-${suffix}`;
 }
 function createDefaultConfig() {
-  return {
+  const merged = {
     candengo_url: "",
     candengo_api_key: "",
     site_id: "",
@@ -13646,24 +13655,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 config2 = parsed;
   const defaults = createDefaultConfig();
-  return {
+  const merged = {
     candengo_url: asString(config2["candengo_url"], defaults.candengo_url),
     candengo_api_key: asString(config2["candengo_api_key"], defaults.candengo_api_key),
     site_id: asString(config2["site_id"], defaults.site_id),
@@ -13718,16 +13729,27 @@ function loadConfig() {
     },
     tool_profile: asToolProfile(config2["tool_profile"], defaults.tool_profile)
   };
+  if (looksLikePlaceholderAuth(merged)) {
+    return restoreAuthBackup(merged) ?? merged;
+  }
+  return merged;
 }
 function saveConfig(config2) {
-  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(config2, null, 2) + `
+  writeFileSync(settingsPath, JSON.stringify(config2, null, 2) + `
+`, "utf-8");
+  if (!looksLikePlaceholderAuth(config2)) {
+    writeFileSync(authBackupPath, JSON.stringify(extractAuthBackup(config2), null, 2) + `
 `, "utf-8");
+  }
 }
 function configExists() {
-  return existsSync(SETTINGS_PATH);
+  return existsSync(resolveSettingsPath());
 }
 function asString(value, fallback) {
   return typeof value === "string" ? value : fallback;
@@ -13781,6 +13803,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(config2) {
+  const apiKey = config2.candengo_api_key.trim();
+  const siteId = config2.site_id.trim();
+  const namespace = config2.namespace.trim();
+  const email3 = config2.user_email.trim().toLowerCase();
+  if (apiKey === "cvk_org" && siteId === "site-1" && namespace === "org-ns")
+    return true;
+  if (siteId === "site-1" && namespace === "org-ns" && email3.endsWith("@example.com"))
+    return true;
+  return false;
+}
+function extractAuthBackup(config2) {
+  return {
+    candengo_url: config2.candengo_url,
+    candengo_api_key: config2.candengo_api_key,
+    site_id: config2.site_id,
+    namespace: config2.namespace,
+    user_id: config2.user_id,
+    user_email: config2.user_email,
+    teams: config2.teams
+  };
+}
+function restoreAuthBackup(config2) {
+  const authBackupPath = resolveAuthBackupPath();
+  if (!existsSync(authBackupPath))
+    return null;
+  try {
+    const raw = readFileSync(authBackupPath, "utf-8");
+    const parsed = JSON.parse(raw);
+    const restored = {
+      ...config2,
+      candengo_url: asString(parsed["candengo_url"], config2.candengo_url),
+      candengo_api_key: asString(parsed["candengo_api_key"], config2.candengo_api_key),
+      site_id: asString(parsed["site_id"], config2.site_id),
+      namespace: asString(parsed["namespace"], config2.namespace),
+      user_id: asString(parsed["user_id"], config2.user_id),
+      user_email: asString(parsed["user_email"], config2.user_email),
+      teams: asTeams(parsed["teams"], config2.teams)
+    };
+    return looksLikePlaceholderAuth(restored) ? null : restored;
+  } catch {
+    return null;
+  }
+}
 
 // src/storage/migrations.ts
 var MIGRATIONS = [
@@ -19600,13 +19666,8 @@ function getCaptureStatus(db, input = {}) {
        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;
+         AND s.tool_calls_count > 0
+         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
@@ -20648,14 +20709,18 @@ function captureRepoScan(input = {}) {
 
 // src/capture/transcript.ts
 import { createHash as createHash3 } from "node:crypto";
-import { readFileSync as readFileSync4, existsSync as existsSync6 } from "node:fs";
+import { readFileSync as readFileSync4, existsSync as existsSync6, 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 (existsSync6(directPath))
+    return directPath;
+  const discovered = findTranscriptPathBySessionId(sessionId);
+  return discovered ?? directPath;
 }
 function readTranscript(sessionId, cwd, transcriptPath) {
   const path = resolveTranscriptPath(sessionId, cwd, transcriptPath);
@@ -20678,10 +20743,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;
@@ -20766,9 +20831,22 @@ function readHistoryFallback(sessionId, cwd, opts) {
     createdAtEpoch: entry.timestamp
   })));
 }
-async function syncTranscriptChat(db, config2, sessionId, cwd, transcriptPath) {
+async function syncTranscriptChat(db, config2, 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 (existsSync6(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);
@@ -20830,7 +20908,7 @@ async function syncTranscriptChat(db, config2, 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);
@@ -20857,6 +20935,29 @@ 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 findTranscriptPathBySessionId(sessionId) {
+  const projectsDir = join4(homedir3(), ".claude", "projects");
+  if (!existsSync6(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 (existsSync6(candidate))
+        return candidate;
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
 
 // src/tools/repair-recall.ts
 async function repairRecall(db, config2, input = {}) {
@@ -21664,6 +21765,10 @@ function isDue(db, key, interval, now) {
 // src/sync/auth.ts
 import { createHash as createHash4 } from "node:crypto";
 var LEGACY_PUBLIC_HOSTS = new Set(["www.candengo.com", "candengo.com"]);
+var PLACEHOLDER_API_KEYS = new Set(["cvk_org"]);
+var PLACEHOLDER_SITE_IDS = new Set(["site-1"]);
+var PLACEHOLDER_NAMESPACES = new Set(["org-ns", "fleet-ns"]);
+var PLACEHOLDER_EMAIL_SUFFIXES = ["@example.com"];
 function normalizeBaseUrl(url2) {
   const trimmed = url2.trim();
   if (!trimmed)
@@ -21682,7 +21787,7 @@ function getApiKey(config2) {
   const envKey = process.env.ENGRM_TOKEN;
   if (envKey && envKey.startsWith("cvk_"))
     return envKey;
-  if (config2.candengo_api_key && config2.candengo_api_key.length > 0) {
+  if (config2.candengo_api_key && config2.candengo_api_key.length > 0 && !looksLikePlaceholderConfig(config2)) {
     return config2.candengo_api_key;
   }
   return null;
@@ -21703,6 +21808,23 @@ ${apiKey}
 ${config2.namespace}
 ${config2.site_id}`).digest("hex");
 }
+function looksLikePlaceholderConfig(config2) {
+  const apiKey = config2.candengo_api_key?.trim() ?? "";
+  const siteId = config2.site_id?.trim() ?? "";
+  const namespace = config2.namespace?.trim() ?? "";
+  const email3 = config2.user_email?.trim().toLowerCase() ?? "";
+  if (PLACEHOLDER_API_KEYS.has(apiKey) && PLACEHOLDER_SITE_IDS.has(siteId) && PLACEHOLDER_NAMESPACES.has(namespace)) {
+    return true;
+  }
+  if (PLACEHOLDER_SITE_IDS.has(siteId) && PLACEHOLDER_NAMESPACES.has(namespace) && PLACEHOLDER_EMAIL_SUFFIXES.some((suffix) => email3.endsWith(suffix))) {
+    return true;
+  }
+  return false;
+}
+function clearSyncPushBlock(db) {
+  db.setSyncState("sync_push_blocked_until", "0");
+  db.setSyncState("sync_push_block_reason", "");
+}
 function recoverOutboxAfterAuthChange(db, config2) {
   const fingerprint = getAuthFingerprint(config2);
   if (!fingerprint) {
@@ -21721,6 +21843,7 @@ function recoverOutboxAfterAuthChange(db, config2) {
   const syncingReset = resetSyncingEntries(db);
   const staleSyncingReset = 0;
   db.setSyncState(key, fingerprint);
+  clearSyncPushBlock(db);
   return { fingerprintChanged: true, failedReset, authFailedReset: 0, syncingReset, staleSyncingReset };
 }
 function buildSourceId(config2, localId, type = "obs") {
@@ -22093,10 +22216,16 @@ function buildSummaryVectorDocument(summary, config2, project, targetOrObservati
   };
 }
 async function pushOutbox(db, config2, batchSize = 50, options = {}) {
+  resetStaleSyncingEntries(db);
+  if (isPushBlocked(db)) {
+    return { pushed: 0, failed: 0, skipped: 0, blocked: true };
+  }
   const entries = getPendingEntries(db, batchSize);
   let pushed = 0;
   let failed = 0;
   let skipped = 0;
+  let authFailures = 0;
+  let rateLimitFailures = 0;
   const batch = [];
   for (const entry of entries) {
     if (entry.record_type === "summary") {
@@ -22231,14 +22360,44 @@ async function pushOutbox(db, config2, batchSize = 50, options = {}) {
           markSynced(db, entryId);
           pushed++;
         } catch (err) {
-          markFailed(db, entryId, err instanceof Error ? err.message : String(err));
+          const message = err instanceof Error ? err.message : String(err);
+          const kind = classifyOutboxFailure(message);
+          if (kind === "auth")
+            authFailures++;
+          if (kind === "rate_limit")
+            rateLimitFailures++;
+          markFailed(db, entryId, message);
           failed++;
         }
       }
     }
   }
+  updatePushCooldown(db, { pushed, authFailures, rateLimitFailures });
   return { pushed, failed, skipped };
 }
+var PUSH_BLOCK_UNTIL_KEY = "sync_push_blocked_until";
+var PUSH_BLOCK_REASON_KEY = "sync_push_block_reason";
+function isPushBlocked(db) {
+  const blockedUntil = parseInt(db.getSyncState(PUSH_BLOCK_UNTIL_KEY) ?? "0", 10);
+  return Number.isFinite(blockedUntil) && blockedUntil > Math.floor(Date.now() / 1000);
+}
+function updatePushCooldown(db, result) {
+  const now = Math.floor(Date.now() / 1000);
+  if (result.authFailures > 0) {
+    db.setSyncState(PUSH_BLOCK_UNTIL_KEY, String(now + 365 * 24 * 60 * 60));
+    db.setSyncState(PUSH_BLOCK_REASON_KEY, "auth");
+    return;
+  }
+  if (result.rateLimitFailures > 0) {
+    db.setSyncState(PUSH_BLOCK_UNTIL_KEY, String(now + 2 * 60));
+    db.setSyncState(PUSH_BLOCK_REASON_KEY, "rate_limit");
+    return;
+  }
+  if (result.pushed > 0) {
+    db.setSyncState(PUSH_BLOCK_UNTIL_KEY, "0");
+    db.setSyncState(PUSH_BLOCK_REASON_KEY, "");
+  }
+}
 function maybeScrubFleetDocument(doc2, target) {
   if (!target.isFleet)
     return doc2;
@@ -22637,7 +22796,7 @@ async function backfillEmbeddings(db, batchSize = 50) {
 }
 
 // src/packs/recommender.ts
-import { existsSync as existsSync7, readdirSync, readFileSync as readFileSync5 } from "node:fs";
+import { existsSync as existsSync7, readdirSync as readdirSync2, readFileSync as readFileSync5 } from "node:fs";
 import { join as join5, basename as basename2, dirname as dirname2 } from "node:path";
 import { fileURLToPath } from "node:url";
 function getPacksDir() {
@@ -23290,7 +23449,7 @@ function installStdioLivenessGuards() {
 function buildServer() {
   const server = new McpServer({
     name: "engrm",
-    version: "0.4.45"
+    version: "0.4.46"
   });
   const enabledToolNames = getEnabledToolNames(config2.tool_profile);
   const originalTool = server.tool.bind(server);
@@ -25306,7 +25465,7 @@ async function main() {
   await server.connect(transport);
 }
 function shouldStartHttpMode() {
-  return process.argv.includes("--http") || Boolean(process.env.ENGRM_HTTP_PORT) || config2.http.enabled;
+  return process.argv.includes("--http") || Boolean(process.env.ENGRM_HTTP_PORT);
 }
 function resolveHttpPort() {
   const raw = process.env.ENGRM_HTTP_PORT;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "engrm",
-  "version": "0.4.45",
+  "version": "0.4.46",
   "description": "Shared memory across devices, sessions, and agents, with thin MCP tools for durable capture, live continuity, and Hermes-ready remote MCP support",
   "mcpName": "io.github.dr12hes/engrm",
   "type": "module",