engrm 0.4.7 → 0.4.9

package/dist/hooks/sentinel.js

@@ -587,6 +587,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) {
@@ -671,6 +729,7 @@ function ensureObservationTypes(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 createHash2 } from "node:crypto";
 var IS_BUN = typeof globalThis.Bun !== "undefined";
 function openDatabase(dbPath) {
   if (IS_BUN) {
@@ -790,6 +849,15 @@ class MemDatabase {
     }
     return row;
   }
+  reassignObservationProject(observationId, projectId) {
+    const existing = this.getObservationById(observationId);
+    if (!existing)
+      return false;
+    if (existing.project_id === projectId)
+      return true;
+    this.db.query("UPDATE observations SET project_id = ? WHERE id = ?").run(projectId, observationId);
+    return true;
+  }
   getObservationById(id) {
     return this.db.query("SELECT * FROM observations WHERE id = ?").get(id) ?? null;
   }
@@ -923,8 +991,13 @@ class MemDatabase {
   }
   upsertSession(sessionId, projectId, userId, deviceId, agent = "claude-code") {
     const existing = this.db.query("SELECT * FROM sessions WHERE session_id = ?").get(sessionId);
-    if (existing)
+    if (existing) {
+      if (existing.project_id === null && projectId !== null) {
+        this.db.query("UPDATE sessions SET project_id = ? WHERE session_id = ?").run(projectId, sessionId);
+        return this.db.query("SELECT * FROM sessions WHERE session_id = ?").get(sessionId);
+      }
       return existing;
+    }
     const now = Math.floor(Date.now() / 1000);
     this.db.query(`INSERT INTO sessions (session_id, project_id, user_id, device_id, agent, started_at_epoch)
         VALUES (?, ?, ?, ?, ?, ?)`).run(sessionId, projectId, userId, deviceId, agent, now);
@@ -934,6 +1007,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)
@@ -1104,6 +1281,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/hooks/common.ts
 var c = {
@@ -1162,7 +1342,7 @@ function runHook(hookName, fn) {
 // src/storage/projects.ts
 import { execSync } from "node:child_process";
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
-import { basename, join as join2 } from "node:path";
+import { basename, dirname, join as join2, resolve } from "node:path";
 function normaliseGitRemoteUrl(remoteUrl) {
   let url = remoteUrl.trim();
   url = url.replace(/^(?:https?|ssh|git):\/\//, "");
@@ -1216,6 +1396,19 @@ function getGitRemoteUrl(directory) {
     }
   }
 }
+function getGitTopLevel(directory) {
+  try {
+    const root = execSync("git rev-parse --show-toplevel", {
+      cwd: directory,
+      encoding: "utf-8",
+      timeout: 5000,
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    return root || null;
+  } catch {
+    return null;
+  }
+}
 function readProjectConfigFile(directory) {
   const configPath = join2(directory, ".engrm.json");
   if (!existsSync2(configPath))
@@ -1238,11 +1431,12 @@ function detectProject(directory) {
   const remoteUrl = getGitRemoteUrl(directory);
   if (remoteUrl) {
     const canonicalId = normaliseGitRemoteUrl(remoteUrl);
+    const repoRoot = getGitTopLevel(directory) ?? directory;
     return {
       canonical_id: canonicalId,
       name: projectNameFromCanonicalId(canonicalId),
       remote_url: remoteUrl,
-      local_path: directory
+      local_path: repoRoot
     };
   }
   const configFile = readProjectConfigFile(directory);
@@ -1262,6 +1456,32 @@ function detectProject(directory) {
     local_path: directory
   };
 }
+function detectProjectForPath(filePath, fallbackCwd) {
+  const absolutePath = resolve(fallbackCwd ?? process.cwd(), filePath);
+  const candidateDir = existsSync2(absolutePath) && !absolutePath.endsWith("/") ? dirname(absolutePath) : dirname(absolutePath);
+  const detected = detectProject(candidateDir);
+  if (detected.canonical_id.startsWith("local/"))
+    return null;
+  return detected;
+}
+function detectProjectFromTouchedPaths(paths, fallbackCwd) {
+  const counts = new Map;
+  for (const rawPath of paths) {
+    if (!rawPath || !rawPath.trim())
+      continue;
+    const detected = detectProjectForPath(rawPath, fallbackCwd);
+    if (!detected)
+      continue;
+    const existing = counts.get(detected.canonical_id);
+    if (existing) {
+      existing.count += 1;
+    } else {
+      counts.set(detected.canonical_id, { project: detected, count: 1 });
+    }
+  }
+  const ranked = [...counts.values()].sort((a, b) => b.count - a.count || a.project.name.localeCompare(b.project.name));
+  return ranked[0]?.project ?? detectProject(fallbackCwd);
+}
 
 // hooks/sentinel.ts
 async function main() {