engrm 0.4.7 → 0.4.8

package/dist/cli.js

@@ -18,10 +18,10 @@ var __export = (target, all) => {
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // src/cli.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync6, statSync } from "fs";
-import { hostname as hostname2, homedir as homedir3, networkInterfaces as networkInterfaces2 } from "os";
-import { dirname as dirname4, join as join6 } from "path";
-import { createHash as createHash2 } from "crypto";
+import { existsSync as existsSync7, mkdirSync as mkdirSync3, readFileSync as readFileSync7, statSync } from "fs";
+import { hostname as hostname2, homedir as homedir4, networkInterfaces as networkInterfaces2 } from "os";
+import { dirname as dirname4, join as join7 } from "path";
+import { createHash as createHash3 } from "crypto";
 import { fileURLToPath as fileURLToPath4 } from "url";
 
 // src/config.ts
@@ -539,6 +539,64 @@ var MIGRATIONS = [
       );
       INSERT INTO observations_fts(observations_fts) VALUES('rebuild');
     `
+  },
+  {
+    version: 9,
+    description: "Add first-class user prompt capture",
+    sql: `
+      CREATE TABLE IF NOT EXISTS user_prompts (
+          id                INTEGER PRIMARY KEY AUTOINCREMENT,
+          session_id        TEXT NOT NULL,
+          project_id        INTEGER REFERENCES projects(id),
+          prompt_number     INTEGER NOT NULL,
+          prompt            TEXT NOT NULL,
+          prompt_hash       TEXT NOT NULL,
+          cwd               TEXT,
+          user_id           TEXT NOT NULL,
+          device_id         TEXT NOT NULL,
+          agent             TEXT DEFAULT 'claude-code',
+          created_at_epoch  INTEGER NOT NULL,
+          UNIQUE(session_id, prompt_number)
+      );
+
+      CREATE INDEX IF NOT EXISTS idx_user_prompts_session
+        ON user_prompts(session_id, prompt_number DESC);
+      CREATE INDEX IF NOT EXISTS idx_user_prompts_project
+        ON user_prompts(project_id, created_at_epoch DESC);
+      CREATE INDEX IF NOT EXISTS idx_user_prompts_created
+        ON user_prompts(created_at_epoch DESC);
+      CREATE INDEX IF NOT EXISTS idx_user_prompts_hash
+        ON user_prompts(prompt_hash);
+    `
+  },
+  {
+    version: 10,
+    description: "Add first-class tool event chronology",
+    sql: `
+      CREATE TABLE IF NOT EXISTS tool_events (
+          id                  INTEGER PRIMARY KEY AUTOINCREMENT,
+          session_id          TEXT NOT NULL,
+          project_id          INTEGER REFERENCES projects(id),
+          tool_name           TEXT NOT NULL,
+          tool_input_json     TEXT,
+          tool_response_preview TEXT,
+          file_path           TEXT,
+          command             TEXT,
+          user_id             TEXT NOT NULL,
+          device_id           TEXT NOT NULL,
+          agent               TEXT DEFAULT 'claude-code',
+          created_at_epoch    INTEGER NOT NULL
+      );
+
+      CREATE INDEX IF NOT EXISTS idx_tool_events_session
+        ON tool_events(session_id, created_at_epoch DESC, id DESC);
+      CREATE INDEX IF NOT EXISTS idx_tool_events_project
+        ON tool_events(project_id, created_at_epoch DESC, id DESC);
+      CREATE INDEX IF NOT EXISTS idx_tool_events_tool_name
+        ON tool_events(tool_name, created_at_epoch DESC);
+      CREATE INDEX IF NOT EXISTS idx_tool_events_created
+        ON tool_events(created_at_epoch DESC, id DESC);
+    `
   }
 ];
 function isVecExtensionLoaded(db) {
@@ -620,9 +678,14 @@ function ensureObservationTypes(db) {
     }
   }
 }
+function getSchemaVersion(db) {
+  const result = db.query("PRAGMA user_version").get();
+  return result.user_version;
+}
 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 createHash2 } from "node:crypto";
 var IS_BUN = typeof globalThis.Bun !== "undefined";
 function openDatabase(dbPath) {
   if (IS_BUN) {
@@ -886,6 +949,110 @@ class MemDatabase {
     const now = Math.floor(Date.now() / 1000);
     this.db.query("UPDATE sessions SET status = 'completed', completed_at_epoch = ? WHERE session_id = ?").run(now, sessionId);
   }
+  getSessionById(sessionId) {
+    return this.db.query("SELECT * FROM sessions WHERE session_id = ?").get(sessionId) ?? null;
+  }
+  getRecentSessions(projectId, limit = 10, userId) {
+    const visibilityClause = userId ? " AND s.user_id = ?" : "";
+    if (projectId !== null) {
+      return this.db.query(`SELECT
+             s.*,
+             p.name AS project_name,
+             ss.request AS request,
+             ss.completed AS completed,
+             (SELECT COUNT(*) FROM user_prompts up WHERE up.session_id = s.session_id) AS prompt_count,
+             (SELECT COUNT(*) FROM tool_events te WHERE te.session_id = s.session_id) AS tool_event_count
+           FROM sessions s
+           LEFT JOIN projects p ON p.id = s.project_id
+           LEFT JOIN session_summaries ss ON ss.session_id = s.session_id
+           WHERE s.project_id = ?${visibilityClause}
+           ORDER BY COALESCE(s.completed_at_epoch, s.started_at_epoch, 0) DESC, s.id DESC
+           LIMIT ?`).all(projectId, ...userId ? [userId] : [], limit);
+    }
+    return this.db.query(`SELECT
+           s.*,
+           p.name AS project_name,
+           ss.request AS request,
+           ss.completed AS completed,
+           (SELECT COUNT(*) FROM user_prompts up WHERE up.session_id = s.session_id) AS prompt_count,
+           (SELECT COUNT(*) FROM tool_events te WHERE te.session_id = s.session_id) AS tool_event_count
+         FROM sessions s
+         LEFT JOIN projects p ON p.id = s.project_id
+         LEFT JOIN session_summaries ss ON ss.session_id = s.session_id
+         WHERE 1 = 1${visibilityClause}
+         ORDER BY COALESCE(s.completed_at_epoch, s.started_at_epoch, 0) DESC, s.id DESC
+         LIMIT ?`).all(...userId ? [userId] : [], limit);
+  }
+  insertUserPrompt(input) {
+    const createdAt = input.created_at_epoch ?? Math.floor(Date.now() / 1000);
+    const normalizedPrompt = input.prompt.trim();
+    const promptHash = hashPrompt(normalizedPrompt);
+    const latest = this.db.query(`SELECT * FROM user_prompts
+         WHERE session_id = ?
+         ORDER BY prompt_number DESC
+         LIMIT 1`).get(input.session_id);
+    if (latest && latest.prompt_hash === promptHash) {
+      return latest;
+    }
+    const promptNumber = (latest?.prompt_number ?? 0) + 1;
+    const result = this.db.query(`INSERT INTO user_prompts (
+          session_id, project_id, prompt_number, prompt, prompt_hash, cwd,
+          user_id, device_id, agent, created_at_epoch
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(input.session_id, input.project_id, promptNumber, normalizedPrompt, promptHash, input.cwd ?? null, input.user_id, input.device_id, input.agent ?? "claude-code", createdAt);
+    return this.getUserPromptById(Number(result.lastInsertRowid));
+  }
+  getUserPromptById(id) {
+    return this.db.query("SELECT * FROM user_prompts WHERE id = ?").get(id) ?? null;
+  }
+  getRecentUserPrompts(projectId, limit = 10, userId) {
+    const visibilityClause = userId ? " AND user_id = ?" : "";
+    if (projectId !== null) {
+      return this.db.query(`SELECT * FROM user_prompts
+           WHERE project_id = ?${visibilityClause}
+           ORDER BY created_at_epoch DESC, prompt_number DESC
+           LIMIT ?`).all(projectId, ...userId ? [userId] : [], limit);
+    }
+    return this.db.query(`SELECT * FROM user_prompts
+         WHERE 1 = 1${visibilityClause}
+         ORDER BY created_at_epoch DESC, prompt_number DESC
+         LIMIT ?`).all(...userId ? [userId] : [], limit);
+  }
+  getSessionUserPrompts(sessionId, limit = 20) {
+    return this.db.query(`SELECT * FROM user_prompts
+         WHERE session_id = ?
+         ORDER BY prompt_number ASC
+         LIMIT ?`).all(sessionId, limit);
+  }
+  insertToolEvent(input) {
+    const createdAt = input.created_at_epoch ?? Math.floor(Date.now() / 1000);
+    const result = this.db.query(`INSERT INTO tool_events (
+          session_id, project_id, tool_name, tool_input_json, tool_response_preview,
+          file_path, command, user_id, device_id, agent, created_at_epoch
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(input.session_id, input.project_id, input.tool_name, input.tool_input_json ?? null, input.tool_response_preview ?? null, input.file_path ?? null, input.command ?? null, input.user_id, input.device_id, input.agent ?? "claude-code", createdAt);
+    return this.getToolEventById(Number(result.lastInsertRowid));
+  }
+  getToolEventById(id) {
+    return this.db.query("SELECT * FROM tool_events WHERE id = ?").get(id) ?? null;
+  }
+  getSessionToolEvents(sessionId, limit = 20) {
+    return this.db.query(`SELECT * FROM tool_events
+         WHERE session_id = ?
+         ORDER BY created_at_epoch ASC, id ASC
+         LIMIT ?`).all(sessionId, limit);
+  }
+  getRecentToolEvents(projectId, limit = 20, userId) {
+    const visibilityClause = userId ? " AND user_id = ?" : "";
+    if (projectId !== null) {
+      return this.db.query(`SELECT * FROM tool_events
+           WHERE project_id = ?${visibilityClause}
+           ORDER BY created_at_epoch DESC, id DESC
+           LIMIT ?`).all(projectId, ...userId ? [userId] : [], limit);
+    }
+    return this.db.query(`SELECT * FROM tool_events
+         WHERE 1 = 1${visibilityClause}
+         ORDER BY created_at_epoch DESC, id DESC
+         LIMIT ?`).all(...userId ? [userId] : [], limit);
+  }
   addToOutbox(recordType, recordId) {
     const now = Math.floor(Date.now() / 1000);
     this.db.query(`INSERT INTO sync_outbox (record_type, record_id, created_at_epoch)
@@ -1056,6 +1223,9 @@ class MemDatabase {
     this.db.query("INSERT OR REPLACE INTO packs_installed (name, installed_at, observation_count) VALUES (?, ?, ?)").run(name, now, observationCount);
   }
 }
+function hashPrompt(prompt) {
+  return createHash2("sha256").update(prompt).digest("hex");
+}
 
 // src/storage/outbox.ts
 function getOutboxStats(db) {
@@ -1410,6 +1580,64 @@ var MIGRATIONS2 = [
       );
       INSERT INTO observations_fts(observations_fts) VALUES('rebuild');
     `
+  },
+  {
+    version: 9,
+    description: "Add first-class user prompt capture",
+    sql: `
+      CREATE TABLE IF NOT EXISTS user_prompts (
+          id                INTEGER PRIMARY KEY AUTOINCREMENT,
+          session_id        TEXT NOT NULL,
+          project_id        INTEGER REFERENCES projects(id),
+          prompt_number     INTEGER NOT NULL,
+          prompt            TEXT NOT NULL,
+          prompt_hash       TEXT NOT NULL,
+          cwd               TEXT,
+          user_id           TEXT NOT NULL,
+          device_id         TEXT NOT NULL,
+          agent             TEXT DEFAULT 'claude-code',
+          created_at_epoch  INTEGER NOT NULL,
+          UNIQUE(session_id, prompt_number)
+      );
+
+      CREATE INDEX IF NOT EXISTS idx_user_prompts_session
+        ON user_prompts(session_id, prompt_number DESC);
+      CREATE INDEX IF NOT EXISTS idx_user_prompts_project
+        ON user_prompts(project_id, created_at_epoch DESC);
+      CREATE INDEX IF NOT EXISTS idx_user_prompts_created
+        ON user_prompts(created_at_epoch DESC);
+      CREATE INDEX IF NOT EXISTS idx_user_prompts_hash
+        ON user_prompts(prompt_hash);
+    `
+  },
+  {
+    version: 10,
+    description: "Add first-class tool event chronology",
+    sql: `
+      CREATE TABLE IF NOT EXISTS tool_events (
+          id                  INTEGER PRIMARY KEY AUTOINCREMENT,
+          session_id          TEXT NOT NULL,
+          project_id          INTEGER REFERENCES projects(id),
+          tool_name           TEXT NOT NULL,
+          tool_input_json     TEXT,
+          tool_response_preview TEXT,
+          file_path           TEXT,
+          command             TEXT,
+          user_id             TEXT NOT NULL,
+          device_id           TEXT NOT NULL,
+          agent               TEXT DEFAULT 'claude-code',
+          created_at_epoch    INTEGER NOT NULL
+      );
+
+      CREATE INDEX IF NOT EXISTS idx_tool_events_session
+        ON tool_events(session_id, created_at_epoch DESC, id DESC);
+      CREATE INDEX IF NOT EXISTS idx_tool_events_project
+        ON tool_events(project_id, created_at_epoch DESC, id DESC);
+      CREATE INDEX IF NOT EXISTS idx_tool_events_tool_name
+        ON tool_events(tool_name, created_at_epoch DESC);
+      CREATE INDEX IF NOT EXISTS idx_tool_events_created
+        ON tool_events(created_at_epoch DESC, id DESC);
+    `
   }
 ];
 function isVecExtensionLoaded2(db) {
@@ -1420,14 +1648,14 @@ function isVecExtensionLoaded2(db) {
     return false;
   }
 }
-function getSchemaVersion(db) {
+function getSchemaVersion2(db) {
   const result = db.query("PRAGMA user_version").get();
   return result.user_version;
 }
 var LATEST_SCHEMA_VERSION2 = MIGRATIONS2.filter((m) => !m.condition).reduce((max, m) => Math.max(max, m.version), 0);
 
 // src/provisioning/provision.ts
-var DEFAULT_CANDENGO_URL = "https://www.candengo.com";
+var DEFAULT_CANDENGO_URL = "https://engrm.dev";
 
 class ProvisionError extends Error {
   status;
@@ -1819,6 +2047,7 @@ function registerHooks() {
     return [runtime, ...runArg, join2(hooksDir, `${name}${ext}`)].join(" ");
   }
   const sessionStartCmd = hookCmd("session-start");
+  const userPromptSubmitCmd = hookCmd("user-prompt-submit");
   const preCompactCmd = hookCmd("pre-compact");
   const preToolUseCmd = hookCmd("sentinel");
   const postToolUseCmd = hookCmd("post-tool-use");
@@ -1827,6 +2056,7 @@ function registerHooks() {
   const settings = readJsonFile(CLAUDE_SETTINGS);
   const hooks = settings["hooks"] ?? {};
   hooks["SessionStart"] = replaceEngrmHook(hooks["SessionStart"], { hooks: [{ type: "command", command: sessionStartCmd }] }, "session-start");
+  hooks["UserPromptSubmit"] = replaceEngrmHook(hooks["UserPromptSubmit"], { hooks: [{ type: "command", command: userPromptSubmitCmd }] }, "user-prompt-submit");
   hooks["PreCompact"] = replaceEngrmHook(hooks["PreCompact"], { hooks: [{ type: "command", command: preCompactCmd }] }, "pre-compact");
   hooks["PreToolUse"] = replaceEngrmHook(hooks["PreToolUse"], {
     matcher: "Edit|Write",
@@ -2813,8 +3043,103 @@ async function installRulePacks(db, config, packNames) {
   return { installed, skipped };
 }
 
-// src/cli.ts
+// src/tools/capture-status.ts
+import { existsSync as existsSync6, readFileSync as readFileSync6 } from "node:fs";
+import { homedir as homedir3 } from "node:os";
+import { join as join6 } from "node:path";
 var LEGACY_CODEX_SERVER_NAME2 = `candengo-${"mem"}`;
+function getCaptureStatus(db, input = {}) {
+  const hours = Math.max(1, Math.min(input.lookback_hours ?? 24, 24 * 30));
+  const sinceEpoch = Math.floor(Date.now() / 1000) - hours * 3600;
+  const home = input.home_dir ?? homedir3();
+  const claudeJson = join6(home, ".claude.json");
+  const claudeSettings = join6(home, ".claude", "settings.json");
+  const codexConfig = join6(home, ".codex", "config.toml");
+  const codexHooks = join6(home, ".codex", "hooks.json");
+  const claudeJsonContent = existsSync6(claudeJson) ? readFileSync6(claudeJson, "utf-8") : "";
+  const claudeSettingsContent = existsSync6(claudeSettings) ? readFileSync6(claudeSettings, "utf-8") : "";
+  const codexConfigContent = existsSync6(codexConfig) ? readFileSync6(codexConfig, "utf-8") : "";
+  const codexHooksContent = existsSync6(codexHooks) ? readFileSync6(codexHooks, "utf-8") : "";
+  const claudeMcpRegistered = claudeJsonContent.includes('"engrm"');
+  const claudeHooksRegistered = claudeSettingsContent.includes("engrm") || claudeSettingsContent.includes("session-start") || claudeSettingsContent.includes("user-prompt-submit");
+  const codexMcpRegistered = codexConfigContent.includes("[mcp_servers.engrm]") || codexConfigContent.includes(`[mcp_servers.${LEGACY_CODEX_SERVER_NAME2}]`);
+  const codexHooksRegistered = codexHooksContent.includes('"SessionStart"') && codexHooksContent.includes('"Stop"');
+  let claudeHookCount = 0;
+  if (claudeHooksRegistered) {
+    try {
+      const settings = JSON.parse(claudeSettingsContent);
+      const hooks = settings?.hooks ?? {};
+      for (const entries of Object.values(hooks)) {
+        if (!Array.isArray(entries))
+          continue;
+        for (const entry of entries) {
+          const e = entry;
+          if (e.hooks?.some((h) => h.command?.includes("engrm") || h.command?.includes("session-start") || h.command?.includes("user-prompt-submit") || h.command?.includes("sentinel") || h.command?.includes("post-tool-use") || h.command?.includes("pre-compact") || h.command?.includes("stop") || h.command?.includes("elicitation"))) {
+            claudeHookCount++;
+          }
+        }
+      }
+    } catch {}
+  }
+  const visibilityClause = input.user_id ? " AND user_id = ?" : "";
+  const params = input.user_id ? [sinceEpoch, input.user_id] : [sinceEpoch];
+  const recentUserPrompts = db.db.query(`SELECT COUNT(*) as count FROM user_prompts
+       WHERE created_at_epoch >= ?${visibilityClause}`).get(...params)?.count ?? 0;
+  const recentToolEvents = db.db.query(`SELECT COUNT(*) as count FROM tool_events
+       WHERE created_at_epoch >= ?${visibilityClause}`).get(...params)?.count ?? 0;
+  const recentSessionsWithRawCapture = db.db.query(`SELECT COUNT(*) as count
+       FROM sessions s
+       WHERE COALESCE(s.completed_at_epoch, s.started_at_epoch, 0) >= ?
+         ${input.user_id ? "AND s.user_id = ?" : ""}
+         AND (
+           EXISTS (SELECT 1 FROM user_prompts up WHERE up.session_id = s.session_id)
+           OR 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
+       LIMIT 1`).get(...input.user_id ? [input.user_id] : [])?.created_at_epoch ?? null;
+  const latestToolEventEpoch = db.db.query(`SELECT created_at_epoch FROM tool_events
+       WHERE 1 = 1${input.user_id ? " AND user_id = ?" : ""}
+       ORDER BY created_at_epoch DESC, id DESC
+       LIMIT 1`).get(...input.user_id ? [input.user_id] : [])?.created_at_epoch ?? null;
+  const schemaVersion = getSchemaVersion(db.db);
+  return {
+    schema_version: schemaVersion,
+    schema_current: schemaVersion >= LATEST_SCHEMA_VERSION,
+    claude_mcp_registered: claudeMcpRegistered,
+    claude_hooks_registered: claudeHooksRegistered,
+    claude_hook_count: claudeHookCount,
+    codex_mcp_registered: codexMcpRegistered,
+    codex_hooks_registered: codexHooksRegistered,
+    recent_user_prompts: recentUserPrompts,
+    recent_tool_events: recentToolEvents,
+    recent_sessions_with_raw_capture: recentSessionsWithRawCapture,
+    latest_prompt_epoch: latestPromptEpoch,
+    latest_tool_event_epoch: latestToolEventEpoch,
+    raw_capture_active: recentUserPrompts > 0 || recentToolEvents > 0 || recentSessionsWithRawCapture > 0
+  };
+}
+
+// src/sync/auth.ts
+var LEGACY_PUBLIC_HOSTS = new Set(["www.candengo.com", "candengo.com"]);
+function normalizeBaseUrl(url) {
+  const trimmed = url.trim();
+  if (!trimmed)
+    return trimmed;
+  try {
+    const parsed = new URL(trimmed);
+    if (LEGACY_PUBLIC_HOSTS.has(parsed.hostname)) {
+      parsed.hostname = "engrm.dev";
+    }
+    return parsed.toString().replace(/\/$/, "");
+  } catch {
+    return trimmed.replace(/\/$/, "");
+  }
+}
+
+// src/cli.ts
+var LEGACY_CODEX_SERVER_NAME3 = `candengo-${"mem"}`;
 var args = process.argv.slice(2);
 var command = args[0];
 var THIS_DIR = dirname4(fileURLToPath4(import.meta.url));
@@ -3041,13 +3366,13 @@ function writeConfigFromProvision(baseUrl, result) {
   console.log(`Database initialised at ${getDbPath()}`);
 }
 function initFromFile(configPath) {
-  if (!existsSync6(configPath)) {
+  if (!existsSync7(configPath)) {
     console.error(`Config file not found: ${configPath}`);
     process.exit(1);
   }
   let parsed;
   try {
-    const raw = readFileSync6(configPath, "utf-8");
+    const raw = readFileSync7(configPath, "utf-8");
     parsed = JSON.parse(raw);
   } catch {
     console.error(`Invalid JSON in ${configPath}`);
@@ -3134,7 +3459,7 @@ async function initManual() {
       return;
     }
   }
-  const candengoUrl = await prompt("Candengo Vector URL (e.g. https://www.candengo.com): ");
+  const candengoUrl = await prompt("Engrm server URL (e.g. https://engrm.dev): ");
   const apiKey = await prompt("API key (cvk_...): ");
   const siteId = await prompt("Site ID: ");
   const namespace = await prompt("Namespace: ");
@@ -3227,18 +3552,18 @@ function handleStatus() {
   console.log(`    Plan:          ${tierLabels[tier] ?? tier}`);
   console.log(`
   Integration`);
-  console.log(`    Candengo:      ${config.candengo_url || "(not set)"}`);
+  console.log(`    Server:        ${config.candengo_url ? normalizeBaseUrl(config.candengo_url) : "(not set)"}`);
   console.log(`    Sync:          ${config.sync.enabled ? "enabled" : "disabled"}`);
-  const claudeJson = join6(homedir3(), ".claude.json");
-  const claudeSettings = join6(homedir3(), ".claude", "settings.json");
-  const codexConfig = join6(homedir3(), ".codex", "config.toml");
-  const codexHooks = join6(homedir3(), ".codex", "hooks.json");
-  const mcpRegistered = existsSync6(claudeJson) && readFileSync6(claudeJson, "utf-8").includes('"engrm"');
-  const settingsContent = existsSync6(claudeSettings) ? readFileSync6(claudeSettings, "utf-8") : "";
-  const codexContent = existsSync6(codexConfig) ? readFileSync6(codexConfig, "utf-8") : "";
-  const codexHooksContent = existsSync6(codexHooks) ? readFileSync6(codexHooks, "utf-8") : "";
-  const hooksRegistered = settingsContent.includes("engrm") || settingsContent.includes("session-start");
-  const codexRegistered = codexContent.includes("[mcp_servers.engrm]") || codexContent.includes(`[mcp_servers.${LEGACY_CODEX_SERVER_NAME2}]`);
+  const claudeJson = join7(homedir4(), ".claude.json");
+  const claudeSettings = join7(homedir4(), ".claude", "settings.json");
+  const codexConfig = join7(homedir4(), ".codex", "config.toml");
+  const codexHooks = join7(homedir4(), ".codex", "hooks.json");
+  const mcpRegistered = existsSync7(claudeJson) && readFileSync7(claudeJson, "utf-8").includes('"engrm"');
+  const settingsContent = existsSync7(claudeSettings) ? readFileSync7(claudeSettings, "utf-8") : "";
+  const codexContent = existsSync7(codexConfig) ? readFileSync7(codexConfig, "utf-8") : "";
+  const codexHooksContent = existsSync7(codexHooks) ? readFileSync7(codexHooks, "utf-8") : "";
+  const hooksRegistered = settingsContent.includes("engrm") || settingsContent.includes("session-start") || settingsContent.includes("user-prompt-submit");
+  const codexRegistered = codexContent.includes("[mcp_servers.engrm]") || codexContent.includes(`[mcp_servers.${LEGACY_CODEX_SERVER_NAME3}]`);
   const codexHooksRegistered = codexHooksContent.includes('"SessionStart"') && codexHooksContent.includes('"Stop"');
   let hookCount = 0;
   if (hooksRegistered) {
@@ -3249,7 +3574,7 @@ function handleStatus() {
         if (Array.isArray(entries)) {
           for (const entry of entries) {
             const e = entry;
-            if (e.hooks?.some((h) => h.command?.includes("engrm") || h.command?.includes("session-start") || h.command?.includes("sentinel") || h.command?.includes("post-tool-use") || h.command?.includes("pre-compact") || h.command?.includes("stop") || h.command?.includes("elicitation"))) {
+            if (e.hooks?.some((h) => h.command?.includes("engrm") || h.command?.includes("session-start") || h.command?.includes("user-prompt-submit") || h.command?.includes("sentinel") || h.command?.includes("post-tool-use") || h.command?.includes("pre-compact") || h.command?.includes("stop") || h.command?.includes("elicitation"))) {
               hookCount++;
             }
           }
@@ -3269,7 +3594,7 @@ function handleStatus() {
     if (config.sentinel.provider) {
       console.log(`    Provider:      ${config.sentinel.provider}${config.sentinel.model ? ` (${config.sentinel.model})` : ""}`);
     }
-    if (existsSync6(getDbPath())) {
+    if (existsSync7(getDbPath())) {
       try {
         const db = new MemDatabase(getDbPath());
         const todayStart = Math.floor(new Date().setHours(0, 0, 0, 0) / 1000);
@@ -3282,7 +3607,7 @@ function handleStatus() {
     console.log(`
   Sentinel:        disabled`);
   }
-  if (existsSync6(getDbPath())) {
+  if (existsSync7(getDbPath())) {
     try {
       const db = new MemDatabase(getDbPath());
       const obsCount = db.getActiveObservationCount();
@@ -3301,6 +3626,10 @@ function handleStatus() {
       } catch {}
       const summaryCount = db.db.query("SELECT COUNT(*) as count FROM session_summaries").get()?.count ?? 0;
       console.log(`    Sessions:      ${summaryCount} summarised`);
+      const capture = getCaptureStatus(db, { user_id: config.user_id });
+      console.log(`    Raw capture:   ${capture.raw_capture_active ? "active" : "observations-only so far"}`);
+      console.log(`    Prompts/tools: ${capture.recent_user_prompts}/${capture.recent_tool_events} in last 24h`);
+      console.log(`    Hook state:    Claude ${capture.claude_hooks_registered ? "ok" : "missing"}, Codex ${capture.codex_hooks_registered ? "ok" : "missing"}`);
       try {
         const activeObservations = db.db.query(`SELECT * FROM observations
              WHERE lifecycle IN ('active', 'aging', 'pinned') AND superseded_by IS NULL`).all();
@@ -3374,8 +3703,8 @@ function handleStatus() {
   Files`);
   console.log(`    Config:        ${getSettingsPath()}`);
   console.log(`    Database:      ${getDbPath()}`);
-  console.log(`    Codex config:  ${join6(homedir3(), ".codex", "config.toml")}`);
-  console.log(`    Codex hooks:   ${join6(homedir3(), ".codex", "hooks.json")}`);
+  console.log(`    Codex config:  ${join7(homedir4(), ".codex", "config.toml")}`);
+  console.log(`    Codex hooks:   ${join7(homedir4(), ".codex", "hooks.json")}`);
 }
 function formatTimeAgo(epoch) {
   const ago = Math.floor(Date.now() / 1000) - epoch;
@@ -3397,7 +3726,7 @@ function formatSyncTime(epochStr) {
 }
 function ensureConfigDir() {
   const dir = getConfigDir();
-  if (!existsSync6(dir)) {
+  if (!existsSync7(dir)) {
     mkdirSync3(dir, { recursive: true });
   }
 }
@@ -3418,7 +3747,7 @@ function generateDeviceId2() {
       break;
   }
   const material = `${host}:${mac || "no-mac"}`;
-  const suffix = createHash2("sha256").update(material).digest("hex").slice(0, 8);
+  const suffix = createHash3("sha256").update(material).digest("hex").slice(0, 8);
   return `${host}-${suffix}`;
 }
 async function handleInstallPack(flags) {
@@ -3552,7 +3881,7 @@ async function handleDoctor() {
     return;
   }
   try {
-    const currentVersion = getSchemaVersion(db.db);
+    const currentVersion = getSchemaVersion2(db.db);
     if (currentVersion >= LATEST_SCHEMA_VERSION2) {
       pass(`Database schema is current (v${currentVersion})`);
     } else {
@@ -3561,10 +3890,10 @@ async function handleDoctor() {
   } catch {
     warn("Could not check database schema version");
   }
-  const claudeJson = join6(homedir3(), ".claude.json");
+  const claudeJson = join7(homedir4(), ".claude.json");
   try {
-    if (existsSync6(claudeJson)) {
-      const content = readFileSync6(claudeJson, "utf-8");
+    if (existsSync7(claudeJson)) {
+      const content = readFileSync7(claudeJson, "utf-8");
       if (content.includes('"engrm"')) {
         pass("MCP server registered in Claude Code");
       } else {
@@ -3576,10 +3905,10 @@ async function handleDoctor() {
   } catch {
     warn("Could not check MCP server registration");
   }
-  const claudeSettings = join6(homedir3(), ".claude", "settings.json");
+  const claudeSettings = join7(homedir4(), ".claude", "settings.json");
   try {
-    if (existsSync6(claudeSettings)) {
-      const content = readFileSync6(claudeSettings, "utf-8");
+    if (existsSync7(claudeSettings)) {
+      const content = readFileSync7(claudeSettings, "utf-8");
       let hookCount = 0;
       try {
         const settings = JSON.parse(content);
@@ -3588,7 +3917,7 @@ async function handleDoctor() {
           if (Array.isArray(entries)) {
             for (const entry of entries) {
               const e = entry;
-              if (e.hooks?.some((h) => h.command?.includes("engrm") || h.command?.includes("session-start") || h.command?.includes("sentinel") || h.command?.includes("post-tool-use") || h.command?.includes("pre-compact") || h.command?.includes("stop") || h.command?.includes("elicitation"))) {
+              if (e.hooks?.some((h) => h.command?.includes("engrm") || h.command?.includes("session-start") || h.command?.includes("user-prompt-submit") || h.command?.includes("sentinel") || h.command?.includes("post-tool-use") || h.command?.includes("pre-compact") || h.command?.includes("stop") || h.command?.includes("elicitation"))) {
                 hookCount++;
               }
             }
@@ -3606,11 +3935,11 @@ async function handleDoctor() {
   } catch {
     warn("Could not check hooks registration");
   }
-  const codexConfig = join6(homedir3(), ".codex", "config.toml");
+  const codexConfig = join7(homedir4(), ".codex", "config.toml");
   try {
-    if (existsSync6(codexConfig)) {
-      const content = readFileSync6(codexConfig, "utf-8");
-      if (content.includes("[mcp_servers.engrm]") || content.includes(`[mcp_servers.${LEGACY_CODEX_SERVER_NAME2}]`)) {
+    if (existsSync7(codexConfig)) {
+      const content = readFileSync7(codexConfig, "utf-8");
+      if (content.includes("[mcp_servers.engrm]") || content.includes(`[mcp_servers.${LEGACY_CODEX_SERVER_NAME3}]`)) {
         pass("MCP server registered in Codex");
       } else {
         warn("MCP server not registered in Codex");
@@ -3621,10 +3950,10 @@ async function handleDoctor() {
   } catch {
     warn("Could not check Codex MCP registration");
   }
-  const codexHooks = join6(homedir3(), ".codex", "hooks.json");
+  const codexHooks = join7(homedir4(), ".codex", "hooks.json");
   try {
-    if (existsSync6(codexHooks)) {
-      const content = readFileSync6(codexHooks, "utf-8");
+    if (existsSync7(codexHooks)) {
+      const content = readFileSync7(codexHooks, "utf-8");
       if (content.includes('"SessionStart"') && content.includes('"Stop"')) {
         pass("Hooks registered in Codex");
       } else {
@@ -3638,14 +3967,23 @@ async function handleDoctor() {
   }
   if (config.candengo_url) {
     try {
+      const baseUrl = normalizeBaseUrl(config.candengo_url);
       const controller = new AbortController;
       const timeout = setTimeout(() => controller.abort(), 5000);
       const start = Date.now();
-      const res = await fetch(`${config.candengo_url}/health`, { signal: controller.signal });
+      let res = await fetch(`${baseUrl}/health`, { signal: controller.signal });
+      if (res.status === 404) {
+        res = await fetch(`${baseUrl}/v1/mem/provision`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: "{}",
+          signal: controller.signal
+        });
+      }
       clearTimeout(timeout);
       const elapsed = Date.now() - start;
-      if (res.ok) {
-        const host = new URL(config.candengo_url).hostname;
+      if (res.ok || res.status === 400) {
+        const host = new URL(baseUrl).hostname;
         pass(`Server connectivity (${host}, ${elapsed}ms)`);
       } else {
         fail(`Server returned HTTP ${res.status}`);
@@ -3659,16 +3997,16 @@ async function handleDoctor() {
   }
   if (config.candengo_url && config.candengo_api_key) {
     try {
+      const baseUrl = normalizeBaseUrl(config.candengo_url);
       const controller = new AbortController;
       const timeout = setTimeout(() => controller.abort(), 5000);
-      const res = await fetch(`${config.candengo_url}/v1/account/me`, {
+      const res = await fetch(`${baseUrl}/v1/mem/user-settings`, {
         headers: { Authorization: `Bearer ${config.candengo_api_key}` },
         signal: controller.signal
       });
       clearTimeout(timeout);
       if (res.ok) {
-        const data = await res.json();
-        const email = data.email ?? config.user_email ?? "unknown";
+        const email = config.user_email ?? "configured";
         pass(`Authentication valid (${email})`);
       } else if (res.status === 401 || res.status === 403) {
         fail("Authentication failed \u2014 API key may be expired");
@@ -3717,9 +4055,21 @@ async function handleDoctor() {
   } catch {
     warn("Could not count observations");
   }
+  try {
+    const capture = getCaptureStatus(db, { user_id: config.user_id });
+    if (capture.raw_capture_active) {
+      pass(`Raw chronology active (${capture.recent_user_prompts} prompts, ${capture.recent_tool_events} tools in last 24h)`);
+    } else if (capture.claude_hooks_registered || capture.codex_hooks_registered) {
+      warn("Hooks are registered, but no raw prompt/tool chronology has been captured in the last 24h");
+    } else {
+      warn("Raw chronology inactive \u2014 hook registration is incomplete");
+    }
+  } catch {
+    warn("Could not check raw chronology capture");
+  }
   try {
     const dbPath = getDbPath();
-    if (existsSync6(dbPath)) {
+    if (existsSync7(dbPath)) {
       const stats = statSync(dbPath);
       const sizeMB = stats.size / (1024 * 1024);
       const sizeStr = sizeMB >= 1 ? `${sizeMB.toFixed(1)} MB` : `${(stats.size / 1024).toFixed(0)} KB`;
@@ -3787,11 +4137,11 @@ Registering with Claude Code and Codex...`);
     console.log(`
 Engrm is ready! Start a new Claude Code or Codex session to use memory.`);
   } catch (error) {
-    const packageRoot = join6(THIS_DIR, "..");
+    const packageRoot = join7(THIS_DIR, "..");
     const runtime = IS_BUILT_DIST ? process.execPath : "bun";
-    const serverArgs = IS_BUILT_DIST ? [join6(packageRoot, "dist", "server.js")] : ["run", join6(packageRoot, "src", "server.ts")];
-    const sessionStartCommand = IS_BUILT_DIST ? `${process.execPath} ${join6(packageRoot, "dist", "hooks", "session-start.js")}` : `bun run ${join6(packageRoot, "hooks", "session-start.ts")}`;
-    const codexStopCommand = IS_BUILT_DIST ? `${process.execPath} ${join6(packageRoot, "dist", "hooks", "codex-stop.js")}` : `bun run ${join6(packageRoot, "hooks", "codex-stop.ts")}`;
+    const serverArgs = IS_BUILT_DIST ? [join7(packageRoot, "dist", "server.js")] : ["run", join7(packageRoot, "src", "server.ts")];
+    const sessionStartCommand = IS_BUILT_DIST ? `${process.execPath} ${join7(packageRoot, "dist", "hooks", "session-start.js")}` : `bun run ${join7(packageRoot, "hooks", "session-start.ts")}`;
+    const codexStopCommand = IS_BUILT_DIST ? `${process.execPath} ${join7(packageRoot, "dist", "hooks", "codex-stop.js")}` : `bun run ${join7(packageRoot, "hooks", "codex-stop.ts")}`;
     console.log(`
 Could not auto-register with Claude Code and Codex.`);
     console.log(`Error: ${error instanceof Error ? error.message : String(error)}`);