engrm 0.4.42 → 0.4.44

package/dist/hooks/session-start.js

@@ -97,10 +97,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),
@@ -108,21 +109,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) {
@@ -1625,7 +1627,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;
@@ -3266,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.42";
+var CLIENT_VERSION = "0.4.44";
 function hashFile(filePath) {
   try {
     if (!existsSync3(filePath))
@@ -3480,7 +3494,8 @@ function createDefaultConfig() {
       project_name: "shared-experience",
       namespace: "",
       api_key: ""
-    }
+    },
+    tool_profile: "full"
   };
 }
 function loadConfig() {
@@ -3551,7 +3566,8 @@ function loadConfig() {
       project_name: asString(config["fleet"]?.["project_name"], defaults.fleet.project_name),
       namespace: asString(config["fleet"]?.["namespace"], defaults.fleet.namespace),
       api_key: asString(config["fleet"]?.["api_key"], defaults.fleet.api_key)
-    }
+    },
+    tool_profile: asToolProfile(config["tool_profile"], defaults.tool_profile)
   };
 }
 function saveConfig(config) {
@@ -3606,12 +3622,107 @@ function asObserverMode(value, fallback) {
     return value;
   return fallback;
 }
+function asToolProfile(value, fallback) {
+  if (value === "full" || value === "memory")
+    return value;
+  return fallback;
+}
 function asTeams(value, fallback) {
   if (!Array.isArray(value))
     return fallback;
   return value.filter((t) => typeof t === "object" && t !== null && typeof t.id === "string" && typeof t.name === "string" && typeof t.namespace === "string");
 }
 
+// src/sync/auth.ts
+import { createHash as createHash3 } from "node:crypto";
+
+// src/storage/outbox.ts
+function getPendingEntries(db, limit = 50) {
+  const now = Math.floor(Date.now() / 1000);
+  return db.db.query(`SELECT * FROM sync_outbox
+      WHERE (status = 'pending')
+        OR (status = 'failed' AND retry_count < max_retries AND (next_retry_epoch IS NULL OR next_retry_epoch <= ?))
+      ORDER BY created_at_epoch ASC
+      LIMIT ?`).all(now, limit);
+}
+function markSyncing(db, entryId) {
+  const now = Math.floor(Date.now() / 1000);
+  db.db.query("UPDATE sync_outbox SET status = 'syncing', next_retry_epoch = ? WHERE id = ?").run(now, entryId);
+}
+function markSynced(db, entryId) {
+  const now = Math.floor(Date.now() / 1000);
+  db.db.query("UPDATE sync_outbox SET status = 'synced', synced_at_epoch = ?, next_retry_epoch = NULL, last_error = NULL WHERE id = ?").run(now, entryId);
+}
+function markFailed(db, entryId, error) {
+  const now = Math.floor(Date.now() / 1000);
+  db.db.query(`UPDATE sync_outbox SET
+        status = 'failed',
+        retry_count = retry_count + 1,
+        last_error = ?,
+        next_retry_epoch = ? + MIN(30 * (1 << retry_count), 3600)
+      WHERE id = ?`).run(error, now, entryId);
+}
+function classifyOutboxFailure(error) {
+  const normalized = error.toLowerCase();
+  if (normalized.includes("401") || normalized.includes("invalid or missing credentials")) {
+    return "auth";
+  }
+  if (normalized.includes("429") || normalized.includes("rate limit")) {
+    return "rate_limit";
+  }
+  if (normalized.includes("timeout") || normalized.includes("abort")) {
+    return "timeout";
+  }
+  if (normalized.includes("network") || normalized.includes("fetch") || normalized.includes("econn")) {
+    return "network";
+  }
+  if (normalized.includes("400") || normalized.includes("422") || normalized.includes("validation")) {
+    return "validation";
+  }
+  return "other";
+}
+function resetFailedEntries(db) {
+  const result = db.db.query(`UPDATE sync_outbox
+       SET status = 'pending',
+           retry_count = 0,
+           last_error = NULL,
+           next_retry_epoch = NULL
+       WHERE status = 'failed'`).run();
+  return result.changes;
+}
+function resetFailedEntriesMatching(db, predicate) {
+  const rows = db.db.query(`SELECT id, last_error
+       FROM sync_outbox
+       WHERE status = 'failed'`).all();
+  const matchingIds = rows.filter((row) => row.last_error && predicate(row.last_error)).map((row) => row.id);
+  if (matchingIds.length === 0)
+    return 0;
+  const placeholders = matchingIds.map(() => "?").join(", ");
+  const result = db.db.query(`UPDATE sync_outbox
+       SET status = 'pending',
+           retry_count = 0,
+           last_error = NULL,
+           next_retry_epoch = NULL
+       WHERE id IN (${placeholders})`).run(...matchingIds);
+  return result.changes;
+}
+function resetSyncingEntries(db) {
+  const result = db.db.query(`UPDATE sync_outbox
+       SET status = 'pending',
+           next_retry_epoch = NULL
+      WHERE status = 'syncing'`).run();
+  return result.changes;
+}
+function resetStaleSyncingEntries(db, maxAgeSeconds = 300) {
+  const cutoff = Math.floor(Date.now() / 1000) - maxAgeSeconds;
+  const result = db.db.query(`UPDATE sync_outbox
+       SET status = 'pending',
+           next_retry_epoch = NULL
+       WHERE status = 'syncing'
+         AND (next_retry_epoch IS NULL OR next_retry_epoch <= ?)`).run(cutoff);
+  return result.changes;
+}
+
 // src/sync/auth.ts
 var LEGACY_PUBLIC_HOSTS = new Set(["www.candengo.com", "candengo.com"]);
 function normalizeBaseUrl(url) {
@@ -3643,6 +3754,36 @@ function getBaseUrl(config) {
   }
   return null;
 }
+function getAuthFingerprint(config) {
+  const apiKey = getApiKey(config);
+  const baseUrl = getBaseUrl(config);
+  if (!apiKey || !baseUrl)
+    return null;
+  return createHash3("sha256").update(`${baseUrl}
+${apiKey}
+${config.namespace}
+${config.site_id}`).digest("hex");
+}
+function recoverOutboxAfterAuthChange(db, config) {
+  const fingerprint = getAuthFingerprint(config);
+  if (!fingerprint) {
+    const staleSyncingReset2 = resetStaleSyncingEntries(db);
+    return { fingerprintChanged: false, failedReset: 0, authFailedReset: 0, syncingReset: 0, staleSyncingReset: staleSyncingReset2 };
+  }
+  const key = "sync_auth_fingerprint";
+  const previous = db.getSyncState(key);
+  const fingerprintChanged = previous !== fingerprint;
+  if (!fingerprintChanged) {
+    const authFailedReset = resetFailedEntriesMatching(db, (error) => classifyOutboxFailure(error) === "auth");
+    const staleSyncingReset2 = resetStaleSyncingEntries(db);
+    return { fingerprintChanged: false, failedReset: 0, authFailedReset, syncingReset: 0, staleSyncingReset: staleSyncingReset2 };
+  }
+  const failedReset = resetFailedEntries(db);
+  const syncingReset = resetSyncingEntries(db);
+  const staleSyncingReset = 0;
+  db.setSyncState(key, fingerprint);
+  return { fingerprintChanged: true, failedReset, authFailedReset: 0, syncingReset, staleSyncingReset };
+}
 function buildSourceId(config, localId, type = "obs") {
   return `${config.user_id}-${config.device_id}-${type}-${localId}`;
 }
@@ -3905,6 +4046,7 @@ class VectorClient {
   apiKey;
   siteId;
   namespace;
+  timeoutMs;
   constructor(config, overrides = {}) {
     const baseUrl = getBaseUrl(config);
     const apiKey = overrides.apiKey ?? getApiKey(config);
@@ -3915,6 +4057,7 @@ class VectorClient {
     this.apiKey = apiKey;
     this.siteId = overrides.siteId ?? config.site_id;
     this.namespace = overrides.namespace ?? config.namespace;
+    this.timeoutMs = overrides.timeoutMs ?? 1e4;
   }
   static isConfigured(config) {
     return getApiKey(config) !== null && getBaseUrl(config) !== null;
@@ -3977,6 +4120,7 @@ class VectorClient {
     if (body && method !== "GET") {
       init.body = JSON.stringify(body);
     }
+    init.signal = AbortSignal.timeout(this.timeoutMs);
     const response = await fetch(url, init);
     if (!response.ok) {
       const text = await response.text().catch(() => "");
@@ -4629,6 +4773,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);
@@ -4761,7 +4906,7 @@ function getSchemaVersion(db) {
 var LATEST_SCHEMA_VERSION = MIGRATIONS.filter((m) => !m.condition).reduce((max, m) => Math.max(max, m.version), 0);
 
 // src/storage/sqlite.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 var IS_BUN = typeof globalThis.Bun !== "undefined";
 function openDatabase(dbPath) {
   if (IS_BUN) {
@@ -4829,6 +4974,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);
@@ -4850,8 +4996,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),
@@ -4866,7 +5020,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) {
@@ -5542,7 +5696,7 @@ class MemDatabase {
   }
 }
 function hashPrompt(prompt) {
-  return createHash3("sha256").update(prompt).digest("hex");
+  return createHash4("sha256").update(prompt).digest("hex");
 }
 
 // src/hooks/common.ts