engrm 0.4.8 → 0.4.9

package/dist/hooks/session-start.js

@@ -11,7 +11,7 @@ import { homedir as homedir3 } from "os";
 // src/storage/projects.ts
 import { execSync } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
-import { basename, join } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
 function normaliseGitRemoteUrl(remoteUrl) {
   let url = remoteUrl.trim();
   url = url.replace(/^(?:https?|ssh|git):\/\//, "");
@@ -65,6 +65,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 = join(directory, ".engrm.json");
   if (!existsSync(configPath))
@@ -87,11 +100,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);
@@ -111,6 +125,32 @@ function detectProject(directory) {
     local_path: directory
   };
 }
+function detectProjectForPath(filePath, fallbackCwd) {
+  const absolutePath = resolve(fallbackCwd ?? process.cwd(), filePath);
+  const candidateDir = existsSync(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);
+}
 
 // src/capture/dedup.ts
 function tokenise(text) {
@@ -356,6 +396,32 @@ function computeObservationPriority(obs, nowEpoch) {
 }
 
 // src/context/inject.ts
+function tokenizeProjectHint(text) {
+  return Array.from(new Set((text.toLowerCase().match(/[a-z0-9_+-]{4,}/g) ?? []).filter(Boolean)));
+}
+function isObservationRelatedToProject(obs, detected) {
+  const hints = new Set([
+    ...tokenizeProjectHint(detected.name),
+    ...tokenizeProjectHint(detected.canonical_id)
+  ]);
+  if (hints.size === 0)
+    return false;
+  const haystack = [
+    obs.title,
+    obs.narrative ?? "",
+    obs.facts ?? "",
+    obs.concepts ?? "",
+    obs.files_read ?? "",
+    obs.files_modified ?? "",
+    obs._source_project ?? ""
+  ].join(` 
+ `).toLowerCase();
+  for (const hint of hints) {
+    if (haystack.includes(hint))
+      return true;
+  }
+  return false;
+}
 function estimateTokens(text) {
   if (!text)
     return 0;
@@ -431,6 +497,9 @@ function buildSessionContext(db, cwd, options = {}) {
       }
       return { ...obs, _source_project: projectNameCache.get(obs.project_id) };
     });
+    if (isNewProject) {
+      crossProjectCandidates = crossProjectCandidates.filter((obs) => isObservationRelatedToProject(obs, detected));
+    }
   }
   const seenIds = new Set(pinned.map((o) => o.id));
   const dedupedRecent = recent.filter((o) => {
@@ -461,6 +530,7 @@ function buildSessionContext(db, cwd, options = {}) {
     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);
+    const recentOutcomes2 = isNewProject ? undefined : getRecentOutcomes(db, projectId, opts.userId);
     return {
       project_name: projectName,
       canonical_id: canonicalId,
@@ -470,7 +540,8 @@ function buildSessionContext(db, cwd, options = {}) {
       recentPrompts: recentPrompts2.length > 0 ? recentPrompts2 : undefined,
       recentToolEvents: recentToolEvents2.length > 0 ? recentToolEvents2 : undefined,
       recentSessions: recentSessions2.length > 0 ? recentSessions2 : undefined,
-      projectTypeCounts: projectTypeCounts2
+      projectTypeCounts: projectTypeCounts2,
+      recentOutcomes: recentOutcomes2
     };
   }
   let remainingBudget = tokenBudget - 30;
@@ -497,6 +568,7 @@ function buildSessionContext(db, cwd, options = {}) {
   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);
+  const recentOutcomes = isNewProject ? undefined : getRecentOutcomes(db, projectId, opts.userId);
   let securityFindings = [];
   if (!isNewProject) {
     try {
@@ -554,7 +626,8 @@ function buildSessionContext(db, cwd, options = {}) {
     recentPrompts: recentPrompts.length > 0 ? recentPrompts : undefined,
     recentToolEvents: recentToolEvents.length > 0 ? recentToolEvents : undefined,
     recentSessions: recentSessions.length > 0 ? recentSessions : undefined,
-    projectTypeCounts
+    projectTypeCounts,
+    recentOutcomes
   };
 }
 function estimateObservationTokens(obs, index) {
@@ -591,12 +664,15 @@ function formatContextForInjection(context) {
     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)}`);
+    const promptLines = context.recentPrompts.filter((prompt) => isMeaningfulPrompt(prompt.prompt)).slice(0, 5);
+    if (promptLines.length > 0) {
+      lines.push("## Recent Requests");
+      for (const prompt of promptLines) {
+        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("");
     }
-    lines.push("");
   }
   if (context.recentToolEvents && context.recentToolEvents.length > 0) {
     lines.push("## Recent Tools");
@@ -606,10 +682,22 @@ function formatContextForInjection(context) {
     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})`);
+    const recentSessionLines = context.recentSessions.slice(0, 4).map((session) => {
+      const summary = chooseMeaningfulSessionHeadline(session.request, session.completed);
+      if (summary === "(no summary)")
+        return null;
+      return `- ${session.session_id}: ${truncateText(summary.replace(/\s+/g, " "), 140)} ` + `(prompts ${session.prompt_count}, tools ${session.tool_event_count}, obs ${session.observation_count})`;
+    }).filter((line) => Boolean(line));
+    if (recentSessionLines.length > 0) {
+      lines.push("## Recent Sessions");
+      lines.push(...recentSessionLines);
+      lines.push("");
+    }
+  }
+  if (context.recentOutcomes && context.recentOutcomes.length > 0) {
+    lines.push("## Recent Outcomes");
+    for (const outcome of context.recentOutcomes.slice(0, 5)) {
+      lines.push(`- ${truncateText(outcome, 160)}`);
     }
     lines.push("");
   }
@@ -689,6 +777,14 @@ function formatSessionBrief(summary) {
   }
   return lines;
 }
+function chooseMeaningfulSessionHeadline(request, completed) {
+  if (request && !looksLikeFileOperationTitle(request))
+    return request;
+  const completedItems = extractMeaningfulLines(completed, 1);
+  if (completedItems.length > 0)
+    return completedItems[0];
+  return request ?? completed ?? "(no summary)";
+}
 function formatSummarySection(value, maxLen) {
   if (!value)
     return null;
@@ -713,6 +809,26 @@ function truncateText(text, maxLen) {
     return text;
   return text.slice(0, maxLen - 3) + "...";
 }
+function isMeaningfulPrompt(value) {
+  if (!value)
+    return false;
+  const compact = value.replace(/\s+/g, " ").trim();
+  if (compact.length < 8)
+    return false;
+  return /[a-z]{3,}/i.test(compact);
+}
+function looksLikeFileOperationTitle(value) {
+  return /^(modified|updated|edited|touched|changed|extended|refactored|redesigned)\s+[A-Za-z0-9_.\-\/]+(?:\s*\([^)]*\))?$/i.test(value.trim());
+}
+function stripInlineSectionLabel(value) {
+  return value.replace(/^(request|investigated|learned|completed|next steps|digest|summary):\s*/i, "").trim();
+}
+function extractMeaningfulLines(value, limit) {
+  if (!value)
+    return [];
+  return value.split(`
+`).map((line) => line.trim()).filter(Boolean).map((line) => line.replace(/^[-*]\s*/, "")).map((line) => stripInlineSectionLabel(line)).filter((line) => line.length > 0 && !looksLikeFileOperationTitle(line)).slice(0, limit);
+}
 function formatObservationDetailFromContext(obs) {
   if (obs.facts) {
     const bullets = parseFacts(obs.facts);
@@ -812,6 +928,50 @@ function getProjectTypeCounts(db, projectId, userId) {
   }
   return counts;
 }
+function getRecentOutcomes(db, projectId, userId) {
+  const visibilityClause = userId ? " AND (sensitivity != 'personal' OR user_id = ?)" : "";
+  const visibilityParams = userId ? [userId] : [];
+  const summaries = db.db.query(`SELECT * FROM session_summaries
+       WHERE project_id = ?
+       ORDER BY created_at_epoch DESC
+       LIMIT 6`).all(projectId);
+  const picked = [];
+  const seen = new Set;
+  for (const summary of summaries) {
+    for (const line of [
+      ...extractMeaningfulLines(summary.completed, 2),
+      ...extractMeaningfulLines(summary.learned, 1)
+    ]) {
+      const normalized = line.toLowerCase().replace(/\s+/g, " ").trim();
+      if (!normalized || seen.has(normalized))
+        continue;
+      seen.add(normalized);
+      picked.push(line);
+      if (picked.length >= 5)
+        return picked;
+    }
+  }
+  const rows = db.db.query(`SELECT * FROM observations
+       WHERE project_id = ?
+         AND lifecycle IN ('active', 'aging', 'pinned')
+         AND superseded_by IS NULL
+         ${visibilityClause}
+       ORDER BY created_at_epoch DESC
+       LIMIT 20`).all(projectId, ...visibilityParams);
+  for (const obs of rows) {
+    if (!["bugfix", "feature", "refactor", "change", "decision"].includes(obs.type))
+      continue;
+    const title = stripInlineSectionLabel(obs.title);
+    const normalized = title.toLowerCase().replace(/\s+/g, " ").trim();
+    if (!normalized || seen.has(normalized) || looksLikeFileOperationTitle(title))
+      continue;
+    seen.add(normalized);
+    picked.push(title);
+    if (picked.length >= 5)
+      break;
+  }
+  return picked;
+}
 
 // src/telemetry/stack-detect.ts
 import { existsSync as existsSync2 } from "node:fs";
@@ -1003,7 +1163,7 @@ function computeAndSaveFingerprint(cwd) {
 
 // src/packs/recommender.ts
 import { existsSync as existsSync4, readdirSync as readdirSync2, readFileSync as readFileSync3 } from "node:fs";
-import { join as join4, basename as basename3, dirname } from "node:path";
+import { join as join4, basename as basename3, dirname as dirname2 } from "node:path";
 import { fileURLToPath } from "node:url";
 var STACK_PACK_MAP = {
   typescript: ["typescript-patterns"],
@@ -1015,7 +1175,7 @@ var STACK_PACK_MAP = {
   bun: ["node-security"]
 };
 function getPacksDir() {
-  const thisDir = dirname(fileURLToPath(import.meta.url));
+  const thisDir = dirname2(fileURLToPath(import.meta.url));
   return join4(thisDir, "../../packs");
 }
 function listAvailablePacks() {
@@ -1420,10 +1580,15 @@ function mergeChanges(db, config, changes) {
         name: change.metadata?.project_name ?? projectCanonical.split("/").pop() ?? "unknown"
       });
     }
+    const normalizedType = normalizeRemoteObservationType(change.metadata?.type, change.source_id);
+    if (!normalizedType) {
+      skipped++;
+      continue;
+    }
     const obs = db.insertObservation({
       session_id: change.metadata?.session_id ?? null,
       project_id: project.id,
-      type: change.metadata?.type ?? "discovery",
+      type: normalizedType,
       title: change.metadata?.title ?? change.content.split(`
 `)[0] ?? "Untitled",
       narrative: extractNarrative(change.content),
@@ -1446,6 +1611,23 @@ function mergeChanges(db, config, changes) {
   }
   return { merged, skipped };
 }
+function normalizeRemoteObservationType(rawType, sourceId) {
+  const type = typeof rawType === "string" ? rawType.trim().toLowerCase() : "";
+  if (type === "bugfix" || type === "discovery" || type === "decision" || type === "pattern" || type === "change" || type === "feature" || type === "refactor" || type === "digest" || type === "standard" || type === "message") {
+    return type;
+  }
+  if (type === "summary") {
+    return "digest";
+  }
+  if (!type) {
+    if (sourceId.includes("-summary-"))
+      return "digest";
+    if (sourceId.includes("-message-"))
+      return "message";
+    return "standard";
+  }
+  return "standard";
+}
 async function embedAndInsert(db, obs) {
   const text = composeEmbeddingText(obs);
   const embedding = await embedText(text);
@@ -2178,6 +2360,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;
   }
@@ -2311,8 +2502,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);
@@ -2792,7 +2988,7 @@ function formatSplashScreen(data) {
   const brief = formatVisibleStartupBrief(data.context);
   if (brief.length > 0) {
     lines.push("");
-    lines.push(`  ${c2.bold}Startup brief${c2.reset}`);
+    lines.push(`  ${c2.bold}Startup context${c2.reset}`);
     for (const line of brief) {
       lines.push(`  ${line}`);
     }
@@ -2803,15 +2999,25 @@ function formatSplashScreen(data) {
 }
 function formatVisibleStartupBrief(context) {
   const lines = [];
-  const latest = pickBestSummary(context);
+  const latest = pickPrimarySummary(context);
   const observationFallbacks = buildObservationFallbacks(context);
   const promptFallback = buildPromptFallback(context);
+  const promptLines = buildPromptLines(context);
+  const latestPromptLine = promptLines[0] ?? null;
+  const currentRequest = latest ? chooseRequest(latest.request, promptFallback ?? sessionFallbacksFromContext(context)[0] ?? observationFallbacks.request) : promptFallback;
   const toolFallbacks = buildToolFallbacks(context);
-  const sessionFallbacks = buildSessionFallbacks(context);
+  const sessionFallbacks = sessionFallbacksFromContext(context);
+  const recentOutcomeLines = buildRecentOutcomeLines(context, latest);
   const projectSignals = buildProjectSignalLine(context);
+  if (promptLines.length > 0) {
+    lines.push(`${c2.cyan}Recent Requests:${c2.reset}`);
+    for (const item of promptLines) {
+      lines.push(`  - ${truncateInline(item, 160)}`);
+    }
+  }
   if (latest) {
     const sections = [
-      ["Request", chooseRequest(latest.request, promptFallback ?? observationFallbacks.request), 1],
+      ["Request", currentRequest, 1],
       ["Investigated", chooseSection(latest.investigated, observationFallbacks.investigated, "Investigated"), 2],
       ["Learned", latest.learned, 2],
       ["Completed", chooseSection(latest.completed, observationFallbacks.completed, "Completed"), 2],
@@ -2826,58 +3032,131 @@ function formatVisibleStartupBrief(context) {
         }
       }
     }
-  } else if (promptFallback) {
-    lines.push(`${c2.cyan}Request:${c2.reset}`);
-    lines.push(`  - ${truncateInline(promptFallback, 140)}`);
+  } else if (currentRequest && !duplicatesPromptLine(currentRequest, latestPromptLine)) {
+    lines.push(`${c2.cyan}Current Request:${c2.reset}`);
+    lines.push(`  - ${truncateInline(currentRequest, 160)}`);
     if (toolFallbacks.length > 0) {
       lines.push(`${c2.cyan}Recent Tools:${c2.reset}`);
       for (const item of toolFallbacks) {
-        lines.push(`  - ${truncateInline(item, 140)}`);
+        lines.push(`  - ${truncateInline(item, 160)}`);
       }
     }
   }
+  if (latest && currentRequest && !hasRequestSection(lines) && !duplicatesPromptLine(currentRequest, latestPromptLine)) {
+    lines.push(`${c2.cyan}Current Request:${c2.reset}`);
+    lines.push(`  - ${truncateInline(currentRequest, 160)}`);
+  }
+  if (recentOutcomeLines.length > 0) {
+    lines.push(`${c2.cyan}Recent Work:${c2.reset}`);
+    for (const item of recentOutcomeLines) {
+      lines.push(`  - ${truncateInline(item, 160)}`);
+    }
+  }
+  if (toolFallbacks.length > 0 && latest) {
+    lines.push(`${c2.cyan}Recent Tools:${c2.reset}`);
+    for (const item of toolFallbacks) {
+      lines.push(`  - ${truncateInline(item, 160)}`);
+    }
+  }
   if (sessionFallbacks.length > 0) {
     lines.push(`${c2.cyan}Recent Sessions:${c2.reset}`);
     for (const item of sessionFallbacks) {
-      lines.push(`  - ${truncateInline(item, 140)}`);
+      lines.push(`  - ${truncateInline(item, 160)}`);
     }
   }
   if (projectSignals) {
     lines.push(`${c2.cyan}Project Signals:${c2.reset}`);
-    lines.push(`  - ${truncateInline(projectSignals, 140)}`);
+    lines.push(`  - ${truncateInline(projectSignals, 160)}`);
   }
   const stale = pickRelevantStaleDecision(context, latest);
   if (stale) {
     lines.push(`${c2.yellow}Watch:${c2.reset} ${truncateInline(`Decision still looks unfinished: ${stale.title}`, 170)}`);
   }
   if (lines.length === 0 && context.observations.length > 0) {
-    const top = context.observations.filter((obs) => obs.type !== "digest").filter((obs) => !looksLikeFileOperationTitle(obs.title)).slice(0, 2);
+    const top = context.observations.filter((obs) => obs.type !== "digest").filter((obs) => obs.type !== "decision").filter((obs) => !looksLikeFileOperationTitle2(obs.title)).slice(0, 3);
     for (const obs of top) {
       lines.push(`${c2.cyan}${capitalize(obs.type)}:${c2.reset} ${truncateInline(obs.title, 170)}`);
     }
   }
-  return lines.slice(0, 10);
+  return lines.slice(0, 14);
 }
 function buildPromptFallback(context) {
-  const latest = context.recentPrompts?.[0];
+  const latest = (context.recentPrompts ?? []).find((prompt) => isMeaningfulPrompt2(prompt.prompt));
   if (!latest?.prompt)
     return null;
   return latest.prompt.replace(/\s+/g, " ").trim();
 }
+function buildPromptLines(context) {
+  return (context.recentPrompts ?? []).filter((prompt) => isMeaningfulPrompt2(prompt.prompt)).slice(0, 2).map((prompt) => {
+    const prefix = prompt.prompt_number > 0 ? `#${prompt.prompt_number}` : "request";
+    return `${prefix}: ${prompt.prompt.replace(/\s+/g, " ").trim()}`;
+  }).filter((item) => item.length > 0);
+}
+function duplicatesPromptLine(request, promptLine) {
+  if (!request || !promptLine)
+    return false;
+  const promptBody = promptLine.replace(/^#?\d+:\s*/, "").trim();
+  return normalizeStartupItem(request) === normalizeStartupItem(promptBody);
+}
 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();
+    return `${tool.tool_name}${detail ? `: ${detail}` : ""}`.trim();
   }).filter((item) => item.length > 0);
 }
-function buildSessionFallbacks(context) {
+function sessionFallbacksFromContext(context) {
   return (context.recentSessions ?? []).slice(0, 2).map((session) => {
-    const summary = session.request ?? session.completed ?? "";
+    const summary = chooseMeaningfulSessionSummary(session.request, session.completed);
     if (!summary)
       return "";
-    return `${session.session_id}: ${summary}`;
+    return `${session.session_id}: ${summary} (prompts ${session.prompt_count}, tools ${session.tool_event_count}, obs ${session.observation_count})`;
   }).filter((item) => item.length > 0);
 }
+function buildRecentOutcomeLines(context, summary) {
+  const picked = [];
+  const seen = new Set;
+  const push = (value) => {
+    for (const line of toSplashLines(value ?? null, 2)) {
+      const normalized = normalizeStartupItem(line);
+      if (!normalized || seen.has(normalized))
+        continue;
+      seen.add(normalized);
+      picked.push(line.replace(/^-\s*/, ""));
+      if (picked.length >= 2)
+        return;
+    }
+  };
+  push(summary?.completed);
+  push(summary?.learned);
+  if (picked.length < 2) {
+    for (const obs of context.observations) {
+      if (!["bugfix", "feature", "refactor", "change", "decision"].includes(obs.type))
+        continue;
+      const title = stripInlineSectionLabel2(obs.title);
+      if (!title || looksLikeFileOperationTitle2(title))
+        continue;
+      const normalized = normalizeStartupItem(title);
+      if (!normalized || seen.has(normalized))
+        continue;
+      seen.add(normalized);
+      picked.push(title);
+      if (picked.length >= 2)
+        break;
+    }
+  }
+  return picked;
+}
+function chooseMeaningfulSessionSummary(request, completed) {
+  if (request && !looksLikeFileOperationTitle2(request))
+    return request;
+  if (completed) {
+    const lines = completed.split(`
+`).map((line) => line.trim().replace(/^[-*]\s*/, "")).filter(Boolean).map((line) => stripInlineSectionLabel2(line)).filter((line) => !looksLikeFileOperationTitle2(line));
+    if (lines.length > 0)
+      return lines[0] ?? null;
+  }
+  return request ?? completed ?? null;
+}
 function buildProjectSignalLine(context) {
   if (!context.projectTypeCounts)
     return null;
@@ -2888,29 +3167,26 @@ function toSplashLines(value, maxItems) {
   if (!value)
     return [];
   const lines = value.split(`
-`).map((line) => line.trim()).filter(Boolean).map((line) => line.replace(/^[-*]\s*/, "")).map((line) => stripInlineSectionLabel(line)).map((line) => dedupeFragments(line)).filter(Boolean).sort((a, b) => scoreSplashLine(b) - scoreSplashLine(a)).slice(0, maxItems).map((line) => `- ${truncateInline(line, 140)}`);
+`).map((line) => line.trim()).filter(Boolean).map((line) => line.replace(/^[-*]\s*/, "")).map((line) => stripInlineSectionLabel2(line)).map((line) => dedupeFragments(line)).filter(Boolean).sort((a, b) => scoreSplashLine(b) - scoreSplashLine(a)).slice(0, maxItems).map((line) => `- ${truncateInline(line, 140)}`);
   return dedupeFragmentsInLines(lines);
 }
-function pickBestSummary(context) {
+function pickPrimarySummary(context) {
   const summaries = context.summaries || [];
   if (!summaries.length)
     return null;
-  return [...summaries].sort((a, b) => scoreSummary(b) - scoreSummary(a))[0] ?? null;
+  const meaningfulRecent = summaries.find((summary) => {
+    const request = summary.request?.trim();
+    const learned = summary.learned?.trim();
+    const completed = summary.completed?.trim();
+    return Boolean(request && !looksLikeFileOperationTitle2(request) || learned || hasMeaningfulCompleted(completed));
+  });
+  return meaningfulRecent ?? summaries[0] ?? null;
 }
-function scoreSummary(summary) {
-  let score = 0;
-  if (summary.request)
-    score += 3;
-  if (summary.investigated)
-    score += 4;
-  if (summary.learned)
-    score += 5;
-  if (summary.completed)
-    score += 5;
-  if (summary.next_steps)
-    score += 4;
-  score += Math.min(4, sectionItemCount(summary.completed) + sectionItemCount(summary.learned));
-  return score;
+function hasMeaningfulCompleted(value) {
+  if (!value)
+    return false;
+  return value.split(`
+`).map((line) => line.trim().replace(/^[-*]\s*/, "")).filter(Boolean).some((line) => !looksLikeFileOperationTitle2(stripInlineSectionLabel2(line)));
 }
 function sectionItemCount(value) {
   if (!value)
@@ -2935,7 +3211,7 @@ function dedupeFragmentsInLines(lines) {
   const seen = new Set;
   const deduped = [];
   for (const line of lines) {
-    const normalized = stripInlineSectionLabel(line).toLowerCase().replace(/\s+/g, " ").trim();
+    const normalized = stripInlineSectionLabel2(line).toLowerCase().replace(/\s+/g, " ").trim();
     if (!normalized || seen.has(normalized))
       continue;
     seen.add(normalized);
@@ -2943,8 +3219,22 @@ function dedupeFragmentsInLines(lines) {
   }
   return deduped;
 }
+function hasRequestSection(lines) {
+  return lines.some((line) => line.includes("Request:"));
+}
+function normalizeStartupItem(value) {
+  return stripInlineSectionLabel2(value).replace(/^#?\d+:\s*/, "").replace(/^-\s*/, "").toLowerCase().replace(/\s+/g, " ").trim();
+}
+function isMeaningfulPrompt2(value) {
+  if (!value)
+    return false;
+  const compact = value.replace(/\s+/g, " ").trim();
+  if (compact.length < 8)
+    return false;
+  return /[a-z]{3,}/i.test(compact);
+}
 function chooseRequest(primary, fallback) {
-  if (primary && !looksLikeFileOperationTitle(primary))
+  if (primary && !looksLikeFileOperationTitle2(primary))
     return primary;
   return fallback;
 }
@@ -2962,15 +3252,15 @@ function isWeakCompletedSection(value) {
 `).map((line) => line.trim().replace(/^[-*]\s*/, "")).filter(Boolean);
   if (!items.length)
     return true;
-  const weakCount = items.filter((item) => looksLikeFileOperationTitle(item)).length;
+  const weakCount = items.filter((item) => looksLikeFileOperationTitle2(item)).length;
   return weakCount === items.length;
 }
-function looksLikeFileOperationTitle(value) {
+function looksLikeFileOperationTitle2(value) {
   return /^(modified|updated|edited|touched|changed|extended|refactored|redesigned)\s+[A-Za-z0-9_.\-\/]+(?:\s*\([^)]*\))?$/i.test(value.trim());
 }
 function scoreSplashLine(value) {
   let score = 0;
-  if (!looksLikeFileOperationTitle(value))
+  if (!looksLikeFileOperationTitle2(value))
     score += 2;
   if (/[:;]/.test(value))
     score += 1;
@@ -2979,9 +3269,9 @@ function scoreSplashLine(value) {
   return score;
 }
 function buildObservationFallbacks(context) {
-  const request = context.observations.find((obs) => !looksLikeFileOperationTitle(obs.title))?.title ?? null;
+  const request = context.observations.find((obs) => obs.type !== "decision" && !looksLikeFileOperationTitle2(obs.title))?.title ?? null;
   const investigated = collectObservationTitles(context, (obs) => obs.type === "discovery", 2);
-  const completed = collectObservationTitles(context, (obs) => ["feature", "refactor", "change"].includes(obs.type) && !looksLikeFileOperationTitle(obs.title), 2);
+  const completed = collectObservationTitles(context, (obs) => ["bugfix", "feature", "refactor", "change"].includes(obs.type) && !looksLikeFileOperationTitle2(obs.title), 2);
   return {
     request,
     investigated,
@@ -2994,18 +3284,18 @@ function collectObservationTitles(context, predicate, limit) {
   for (const obs of context.observations) {
     if (!predicate(obs))
       continue;
-    const normalized = stripInlineSectionLabel(obs.title).toLowerCase().replace(/\s+/g, " ").trim();
+    const normalized = stripInlineSectionLabel2(obs.title).toLowerCase().replace(/\s+/g, " ").trim();
     if (!normalized || seen.has(normalized))
       continue;
     seen.add(normalized);
-    picked.push(`- ${stripInlineSectionLabel(obs.title)}`);
+    picked.push(`- ${stripInlineSectionLabel2(obs.title)}`);
     if (picked.length >= limit)
       break;
   }
   return picked.length ? picked.join(`
 `) : null;
 }
-function stripInlineSectionLabel(value) {
+function stripInlineSectionLabel2(value) {
   return value.replace(/^(request|investigated|learned|completed|next steps|digest|summary):\s*/i, "").trim();
 }
 function pickRelevantStaleDecision(context, summary) {
@@ -3094,4 +3384,10 @@ function capitalize(value) {
     return value;
   return value.charAt(0).toUpperCase() + value.slice(1);
 }
+var __testables = {
+  formatVisibleStartupBrief
+};
 runHook("session-start", main);
+export {
+  __testables
+};