engrm 0.4.45 → 0.4.46

package/dist/hooks/session-start.js

@@ -3280,7 +3280,7 @@ import { existsSync as existsSync3, readFileSync as readFileSync2, writeFileSync
 import { join as join3 } from "node:path";
 import { homedir } from "node:os";
 var STATE_PATH = join3(homedir(), ".engrm", "config-fingerprint.json");
-var CLIENT_VERSION = "0.4.45";
+var CLIENT_VERSION = "0.4.46";
 function hashFile(filePath) {
   try {
     if (!existsSync3(filePath))
@@ -3415,11 +3415,20 @@ import { existsSync as existsSync5, mkdirSync as mkdirSync2, readFileSync as rea
 import { homedir as homedir2, hostname, networkInterfaces } from "node:os";
 import { join as join5 } from "node:path";
 import { createHash as createHash2 } from "node:crypto";
-var CONFIG_DIR = join5(homedir2(), ".engrm");
-var SETTINGS_PATH = join5(CONFIG_DIR, "settings.json");
-var DB_PATH = join5(CONFIG_DIR, "engrm.db");
+function resolveConfigDir() {
+  return process.env["ENGRM_CONFIG_DIR"]?.trim() || join5(homedir2(), ".engrm");
+}
+function resolveSettingsPath() {
+  return join5(resolveConfigDir(), "settings.json");
+}
+function resolveDbPath() {
+  return join5(resolveConfigDir(), "engrm.db");
+}
+function resolveAuthBackupPath() {
+  return join5(resolveConfigDir(), "auth-backup.json");
+}
 function getDbPath() {
-  return DB_PATH;
+  return resolveDbPath();
 }
 function generateDeviceId() {
   const host = hostname().toLowerCase().replace(/[^a-z0-9-]/g, "");
@@ -3442,7 +3451,7 @@ function generateDeviceId() {
   return `${host}-${suffix}`;
 }
 function createDefaultConfig() {
-  return {
+  const merged = {
     candengo_url: "",
     candengo_api_key: "",
     site_id: "",
@@ -3497,24 +3506,26 @@ function createDefaultConfig() {
     },
     tool_profile: "full"
   };
+  return merged;
 }
 function loadConfig() {
-  if (!existsSync5(SETTINGS_PATH)) {
-    throw new Error(`Config not found at ${SETTINGS_PATH}. Run 'engrm init --manual' to configure.`);
+  const settingsPath = resolveSettingsPath();
+  if (!existsSync5(settingsPath)) {
+    throw new Error(`Config not found at ${settingsPath}. Run 'engrm init --manual' to configure.`);
   }
-  const raw = readFileSync4(SETTINGS_PATH, "utf-8");
+  const raw = readFileSync4(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),
@@ -3569,16 +3580,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 (!existsSync5(CONFIG_DIR)) {
-    mkdirSync2(CONFIG_DIR, { recursive: true });
+  const configDir = resolveConfigDir();
+  const settingsPath = resolveSettingsPath();
+  const authBackupPath = resolveAuthBackupPath();
+  if (!existsSync5(configDir)) {
+    mkdirSync2(configDir, { recursive: true });
   }
-  writeFileSync2(SETTINGS_PATH, JSON.stringify(config, null, 2) + `
+  writeFileSync2(settingsPath, JSON.stringify(config, null, 2) + `
 `, "utf-8");
+  if (!looksLikePlaceholderAuth(config)) {
+    writeFileSync2(authBackupPath, JSON.stringify(extractAuthBackup(config), null, 2) + `
+`, "utf-8");
+  }
 }
 function configExists() {
-  return existsSync5(SETTINGS_PATH);
+  return existsSync5(resolveSettingsPath());
 }
 function asString(value, fallback) {
   return typeof value === "string" ? value : fallback;
@@ -3632,6 +3654,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 (!existsSync5(authBackupPath))
+    return null;
+  try {
+    const raw = readFileSync4(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/sync/auth.ts
 import { createHash as createHash3 } from "node:crypto";
@@ -3725,6 +3791,10 @@ function resetStaleSyncingEntries(db, maxAgeSeconds = 300) {
 
 // src/sync/auth.ts
 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(url) {
   const trimmed = url.trim();
   if (!trimmed)
@@ -3743,7 +3813,7 @@ function getApiKey(config) {
   const envKey = process.env.ENGRM_TOKEN;
   if (envKey && envKey.startsWith("cvk_"))
     return envKey;
-  if (config.candengo_api_key && config.candengo_api_key.length > 0) {
+  if (config.candengo_api_key && config.candengo_api_key.length > 0 && !looksLikePlaceholderConfig(config)) {
     return config.candengo_api_key;
   }
   return null;
@@ -3764,6 +3834,23 @@ ${apiKey}
 ${config.namespace}
 ${config.site_id}`).digest("hex");
 }
+function looksLikePlaceholderConfig(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 (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) => email.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, config) {
   const fingerprint = getAuthFingerprint(config);
   if (!fingerprint) {
@@ -3782,6 +3869,7 @@ function recoverOutboxAfterAuthChange(db, config) {
   const syncingReset = resetSyncingEntries(db);
   const staleSyncingReset = 0;
   db.setSyncState(key, fingerprint);
+  clearSyncPushBlock(db);
   return { fingerprintChanged: true, failedReset, authFailedReset: 0, syncingReset, staleSyncingReset };
 }
 function buildSourceId(config, localId, type = "obs") {