engrm 0.4.7 → 0.4.8

package/dist/hooks/session-start.js

@@ -457,12 +457,20 @@ function buildSessionContext(db, cwd, options = {}) {
   if (maxCount !== undefined) {
     const remaining = Math.max(0, maxCount - pinned.length - dedupedRecent.length);
     const all = [...pinned, ...dedupedRecent, ...sorted.slice(0, remaining)];
+    const recentPrompts2 = db.getRecentUserPrompts(isNewProject ? null : projectId, isNewProject ? 8 : 6, opts.userId);
+    const recentToolEvents2 = db.getRecentToolEvents(isNewProject ? null : projectId, isNewProject ? 8 : 6, opts.userId);
+    const recentSessions2 = isNewProject ? [] : db.getRecentSessions(projectId, 5, opts.userId);
+    const projectTypeCounts2 = isNewProject ? undefined : getProjectTypeCounts(db, projectId, opts.userId);
     return {
       project_name: projectName,
       canonical_id: canonicalId,
       observations: all.map(toContextObservation),
       session_count: all.length,
-      total_active: totalActive
+      total_active: totalActive,
+      recentPrompts: recentPrompts2.length > 0 ? recentPrompts2 : undefined,
+      recentToolEvents: recentToolEvents2.length > 0 ? recentToolEvents2 : undefined,
+      recentSessions: recentSessions2.length > 0 ? recentSessions2 : undefined,
+      projectTypeCounts: projectTypeCounts2
     };
   }
   let remainingBudget = tokenBudget - 30;
@@ -485,6 +493,10 @@ function buildSessionContext(db, cwd, options = {}) {
     selected.push(obs);
   }
   const summaries = isNewProject ? [] : db.getRecentSummaries(projectId, 5);
+  const recentPrompts = db.getRecentUserPrompts(isNewProject ? null : projectId, isNewProject ? 8 : 6, opts.userId);
+  const recentToolEvents = db.getRecentToolEvents(isNewProject ? null : projectId, isNewProject ? 8 : 6, opts.userId);
+  const recentSessions = isNewProject ? [] : db.getRecentSessions(projectId, 5, opts.userId);
+  const projectTypeCounts = isNewProject ? undefined : getProjectTypeCounts(db, projectId, opts.userId);
   let securityFindings = [];
   if (!isNewProject) {
     try {
@@ -538,7 +550,11 @@ function buildSessionContext(db, cwd, options = {}) {
     summaries: summaries.length > 0 ? summaries : undefined,
     securityFindings: securityFindings.length > 0 ? securityFindings : undefined,
     recentProjects,
-    staleDecisions
+    staleDecisions,
+    recentPrompts: recentPrompts.length > 0 ? recentPrompts : undefined,
+    recentToolEvents: recentToolEvents.length > 0 ? recentToolEvents : undefined,
+    recentSessions: recentSessions.length > 0 ? recentSessions : undefined,
+    projectTypeCounts
   };
 }
 function estimateObservationTokens(obs, index) {
@@ -551,7 +567,7 @@ function estimateObservationTokens(obs, index) {
   return titleCost + estimateTokens(detailText);
 }
 function formatContextForInjection(context) {
-  if (context.observations.length === 0) {
+  if (context.observations.length === 0 && (!context.recentPrompts || context.recentPrompts.length === 0) && (!context.recentToolEvents || context.recentToolEvents.length === 0) && (!context.recentSessions || context.recentSessions.length === 0) && (!context.projectTypeCounts || Object.keys(context.projectTypeCounts).length === 0)) {
     return `Project: ${context.project_name} (no prior observations)`;
   }
   const DETAILED_COUNT = 5;
@@ -574,11 +590,43 @@ function formatContextForInjection(context) {
     lines.push(`${context.session_count} relevant observation(s) from prior sessions:`);
     lines.push("");
   }
+  if (context.recentPrompts && context.recentPrompts.length > 0) {
+    lines.push("## Recent Requests");
+    for (const prompt of context.recentPrompts.slice(0, 5)) {
+      const label = prompt.prompt_number > 0 ? `#${prompt.prompt_number}` : new Date(prompt.created_at_epoch * 1000).toISOString().split("T")[0];
+      lines.push(`- ${label}: ${truncateText(prompt.prompt.replace(/\s+/g, " "), 160)}`);
+    }
+    lines.push("");
+  }
+  if (context.recentToolEvents && context.recentToolEvents.length > 0) {
+    lines.push("## Recent Tools");
+    for (const tool of context.recentToolEvents.slice(0, 5)) {
+      lines.push(`- ${tool.tool_name}: ${formatToolEventDetail(tool)}`);
+    }
+    lines.push("");
+  }
+  if (context.recentSessions && context.recentSessions.length > 0) {
+    lines.push("## Recent Sessions");
+    for (const session of context.recentSessions.slice(0, 4)) {
+      const summary = session.request ?? session.completed ?? "(no summary)";
+      lines.push(`- ${session.session_id}: ${truncateText(summary.replace(/\s+/g, " "), 140)} ` + `(prompts ${session.prompt_count}, tools ${session.tool_event_count}, obs ${session.observation_count})`);
+    }
+    lines.push("");
+  }
+  if (context.projectTypeCounts && Object.keys(context.projectTypeCounts).length > 0) {
+    const topTypes = Object.entries(context.projectTypeCounts).sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).slice(0, 5).map(([type, count]) => `${type} ${count}`).join(" · ");
+    if (topTypes) {
+      lines.push(`## Project Signals`);
+      lines.push(`Top memory types: ${topTypes}`);
+      lines.push("");
+    }
+  }
   for (let i = 0;i < context.observations.length; i++) {
     const obs = context.observations[i];
     const date = obs.created_at.split("T")[0];
     const fromLabel = obs.source_project ? ` [from: ${obs.source_project}]` : "";
-    lines.push(`- **[${obs.type}]** ${obs.title} (${date}, q=${obs.quality.toFixed(1)})${fromLabel}`);
+    const fileLabel = formatObservationFiles(obs);
+    lines.push(`- **#${obs.id} [${obs.type}]** ${obs.title} (${date}, q=${obs.quality.toFixed(1)})${fromLabel}${fileLabel}`);
     if (i < DETAILED_COUNT) {
       const detail = formatObservationDetailFromContext(obs);
       if (detail) {
@@ -715,11 +763,55 @@ function toContextObservation(obs) {
     title: obs.title,
     narrative: obs.narrative,
     facts: obs.facts,
+    files_read: obs.files_read,
+    files_modified: obs.files_modified,
     quality: obs.quality,
     created_at: obs.created_at,
     ...obs._source_project ? { source_project: obs._source_project } : {}
   };
 }
+function formatObservationFiles(obs) {
+  const modified = parseJsonStringArray(obs.files_modified);
+  if (modified.length > 0) {
+    return ` · files: ${truncateText(modified.slice(0, 2).join(", "), 60)}`;
+  }
+  const read = parseJsonStringArray(obs.files_read);
+  if (read.length > 0) {
+    return ` · read: ${truncateText(read.slice(0, 2).join(", "), 60)}`;
+  }
+  return "";
+}
+function parseJsonStringArray(value) {
+  if (!value)
+    return [];
+  try {
+    const parsed = JSON.parse(value);
+    if (!Array.isArray(parsed))
+      return [];
+    return parsed.filter((item) => typeof item === "string" && item.trim().length > 0);
+  } catch {
+    return [];
+  }
+}
+function formatToolEventDetail(tool) {
+  const detail = tool.file_path ?? tool.command ?? tool.tool_response_preview ?? "";
+  return truncateText(detail || "recent tool execution", 160);
+}
+function getProjectTypeCounts(db, projectId, userId) {
+  const visibilityClause = userId ? " AND (sensitivity != 'personal' OR user_id = ?)" : "";
+  const rows = db.db.query(`SELECT type, COUNT(*) as count
+       FROM observations
+       WHERE project_id = ?
+         AND lifecycle IN ('active', 'aging', 'pinned')
+         AND superseded_by IS NULL
+         ${visibilityClause}
+       GROUP BY type`).all(projectId, ...userId ? [userId] : []);
+  const counts = {};
+  for (const row of rows) {
+    counts[row.type] = row.count;
+  }
+  return counts;
+}
 
 // src/telemetry/stack-detect.ts
 import { existsSync as existsSync2 } from "node:fs";
@@ -1168,6 +1260,21 @@ function asTeams(value, fallback) {
 }
 
 // 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(/\/$/, "");
+  }
+}
 function getApiKey(config) {
   const envKey = process.env.ENGRM_TOKEN;
   if (envKey && envKey.startsWith("cvk_"))
@@ -1179,7 +1286,7 @@ function getApiKey(config) {
 }
 function getBaseUrl(config) {
   if (config.candengo_url && config.candengo_url.length > 0) {
-    return config.candengo_url;
+    return normalizeBaseUrl(config.candengo_url);
   }
   return null;
 }
@@ -1809,6 +1916,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) {
@@ -1893,6 +2058,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 createHash3 } from "node:crypto";
 var IS_BUN = typeof globalThis.Bun !== "undefined";
 function openDatabase(dbPath) {
   if (IS_BUN) {
@@ -2156,6 +2322,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)
@@ -2326,6 +2596,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 createHash3("sha256").update(prompt).digest("hex");
+}
 
 // src/hooks/common.ts
 var c = {
@@ -2491,6 +2764,15 @@ function formatSplashScreen(data) {
   if (data.available > 0) {
     statParts.push(`${c2.dim}${data.available.toLocaleString()} searchable${c2.reset}`);
   }
+  if (data.context.recentSessions && data.context.recentSessions.length > 0) {
+    statParts.push(`${c2.white}${data.context.recentSessions.length} sessions${c2.reset}`);
+  }
+  if (data.context.recentPrompts && data.context.recentPrompts.length > 0) {
+    statParts.push(`${c2.magenta}${data.context.recentPrompts.length} requests${c2.reset}`);
+  }
+  if (data.context.recentToolEvents && data.context.recentToolEvents.length > 0) {
+    statParts.push(`${c2.yellow}${data.context.recentToolEvents.length} tools${c2.reset}`);
+  }
   if (data.synced > 0) {
     statParts.push(`${c2.cyan}${data.synced} synced${c2.reset}`);
   }
@@ -2523,9 +2805,13 @@ function formatVisibleStartupBrief(context) {
   const lines = [];
   const latest = pickBestSummary(context);
   const observationFallbacks = buildObservationFallbacks(context);
+  const promptFallback = buildPromptFallback(context);
+  const toolFallbacks = buildToolFallbacks(context);
+  const sessionFallbacks = buildSessionFallbacks(context);
+  const projectSignals = buildProjectSignalLine(context);
   if (latest) {
     const sections = [
-      ["Request", chooseRequest(latest.request, observationFallbacks.request), 1],
+      ["Request", chooseRequest(latest.request, promptFallback ?? observationFallbacks.request), 1],
       ["Investigated", chooseSection(latest.investigated, observationFallbacks.investigated, "Investigated"), 2],
       ["Learned", latest.learned, 2],
       ["Completed", chooseSection(latest.completed, observationFallbacks.completed, "Completed"), 2],
@@ -2540,6 +2826,25 @@ function formatVisibleStartupBrief(context) {
         }
       }
     }
+  } else if (promptFallback) {
+    lines.push(`${c2.cyan}Request:${c2.reset}`);
+    lines.push(`  - ${truncateInline(promptFallback, 140)}`);
+    if (toolFallbacks.length > 0) {
+      lines.push(`${c2.cyan}Recent Tools:${c2.reset}`);
+      for (const item of toolFallbacks) {
+        lines.push(`  - ${truncateInline(item, 140)}`);
+      }
+    }
+  }
+  if (sessionFallbacks.length > 0) {
+    lines.push(`${c2.cyan}Recent Sessions:${c2.reset}`);
+    for (const item of sessionFallbacks) {
+      lines.push(`  - ${truncateInline(item, 140)}`);
+    }
+  }
+  if (projectSignals) {
+    lines.push(`${c2.cyan}Project Signals:${c2.reset}`);
+    lines.push(`  - ${truncateInline(projectSignals, 140)}`);
   }
   const stale = pickRelevantStaleDecision(context, latest);
   if (stale) {
@@ -2553,6 +2858,32 @@ function formatVisibleStartupBrief(context) {
   }
   return lines.slice(0, 10);
 }
+function buildPromptFallback(context) {
+  const latest = context.recentPrompts?.[0];
+  if (!latest?.prompt)
+    return null;
+  return latest.prompt.replace(/\s+/g, " ").trim();
+}
+function buildToolFallbacks(context) {
+  return (context.recentToolEvents ?? []).slice(0, 3).map((tool) => {
+    const detail = tool.file_path ?? tool.command ?? tool.tool_response_preview ?? "";
+    return `${tool.tool_name}: ${detail}`.trim();
+  }).filter((item) => item.length > 0);
+}
+function buildSessionFallbacks(context) {
+  return (context.recentSessions ?? []).slice(0, 2).map((session) => {
+    const summary = session.request ?? session.completed ?? "";
+    if (!summary)
+      return "";
+    return `${session.session_id}: ${summary}`;
+  }).filter((item) => item.length > 0);
+}
+function buildProjectSignalLine(context) {
+  if (!context.projectTypeCounts)
+    return null;
+  const top = Object.entries(context.projectTypeCounts).sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).slice(0, 4).map(([type, count]) => `${type} ${count}`).join("; ");
+  return top || null;
+}
 function toSplashLines(value, maxItems) {
   if (!value)
     return [];