opencode-claude-memory 1.5.1 → 1.6.0

package/src/prompt.ts

@@ -1,97 +1,179 @@
 import { MEMORY_TYPES } from "./memory.js"
 import { readIndex, truncateEntrypoint } from "./memory.js"
-import { getMemoryDir, ENTRYPOINT_NAME } from "./paths.js"
-
-const FRONTMATTER_EXAMPLE = `\`\`\`markdown
----
-name: {{memory name}}
-description: {{one-line description — used to decide relevance in future conversations, so be specific}}
-type: {{${MEMORY_TYPES.join(", ")}}}
----
-
-{{memory content — for feedback/project types, structure as: rule/fact, then **Why:** and **How to apply:** lines}}
-\`\`\``
-
-const TYPES_SECTION = `## Types of memory
-
-There are several discrete types of memory that you can store:
-
-<types>
-<type>
-    <name>user</name>
-    <description>Information about the user's role, goals, responsibilities, and knowledge. Great user memories help you tailor your future behavior to the user's preferences and perspective.</description>
-    <when_to_save>When you learn any details about the user's role, preferences, responsibilities, or knowledge</when_to_save>
-    <how_to_use>When your work should be informed by the user's profile or perspective.</how_to_use>
-    <examples>
-    user: I'm a data scientist investigating what logging we have in place
-    assistant: [saves user memory: user is a data scientist, currently focused on observability/logging]
-    </examples>
-</type>
-<type>
-    <name>feedback</name>
-    <description>Guidance the user has given you about how to approach work — both what to avoid and what to keep doing. Record from failure AND success.</description>
-    <when_to_save>Any time the user corrects your approach ("no not that", "don't", "stop doing X") OR confirms a non-obvious approach worked ("yes exactly", "perfect, keep doing that"). Include *why* so you can judge edge cases later.</when_to_save>
-    <how_to_use>Let these memories guide your behavior so that the user does not need to offer the same guidance twice.</how_to_use>
-    <body_structure>Lead with the rule itself, then a **Why:** line and a **How to apply:** line.</body_structure>
-    <examples>
-    user: don't mock the database in these tests — we got burned last quarter when mocked tests passed but the prod migration failed
-    assistant: [saves feedback memory: integration tests must hit a real database, not mocks]
-    </examples>
-</type>
-<type>
-    <name>project</name>
-    <description>Information about ongoing work, goals, initiatives, bugs, or incidents that is not derivable from the code or git history.</description>
-    <when_to_save>When you learn who is doing what, why, or by when. Always convert relative dates to absolute dates when saving.</when_to_save>
-    <how_to_use>Use these memories to understand the broader context behind the user's request.</how_to_use>
-    <body_structure>Lead with the fact or decision, then a **Why:** line and a **How to apply:** line.</body_structure>
-    <examples>
-    user: we're freezing all non-critical merges after Thursday — mobile team is cutting a release branch
-    assistant: [saves project memory: merge freeze begins 2026-03-05 for mobile release cut]
-    </examples>
-</type>
-<type>
-    <name>reference</name>
-    <description>Pointers to where information can be found in external systems.</description>
-    <when_to_save>When you learn about resources in external systems and their purpose.</when_to_save>
-    <how_to_use>When the user references an external system or information that may be in an external system.</how_to_use>
-    <examples>
-    user: check the Linear project "INGEST" if you want context on these tickets
-    assistant: [saves reference memory: pipeline bugs are tracked in Linear project "INGEST"]
-    </examples>
-</type>
-</types>`
-
-const WHAT_NOT_TO_SAVE = `## What NOT to save in memory
-
-- Code patterns, conventions, architecture, file paths, or project structure — these can be derived by reading the current project state.
-- Git history, recent changes, or who-changed-what — \`git log\` / \`git blame\` are authoritative.
-- Debugging solutions or fix recipes — the fix is in the code; the commit message has the context.
-- Anything already documented in AGENTS.md or project rules files.
-- Ephemeral task details: in-progress work, temporary state, current conversation context.
-
-These exclusions apply even when the user explicitly asks you to save. If they ask you to save a PR list or activity summary, ask what was *surprising* or *non-obvious* about it — that is the part worth keeping.`
-
-const WHEN_TO_ACCESS = `## When to access memories
-- When memories seem relevant, or the user references prior-conversation work.
-- You MUST access memory when the user explicitly asks you to check, recall, or remember.
-- If the user says to *ignore* or *not use* memory: proceed as if MEMORY.md were empty.
-- Memory records can become stale over time. Before answering based solely on memory, verify against current state. If a recalled memory conflicts with current information, trust what you observe now — and update or remove the stale memory.`
-
-const TRUSTING_RECALL = `## Before recommending from memory
-
-A memory that names a specific function, file, or flag is a claim that it existed *when the memory was written*. It may have been renamed, removed, or never merged. Before recommending it:
-
-- If the memory names a file path: check the file exists.
-- If the memory names a function or flag: grep for it.
-- If the user is about to act on your recommendation, verify first.
-
-"The memory says X exists" is not the same as "X exists now."
+import { getMemoryDir, ENTRYPOINT_NAME, MAX_ENTRYPOINT_LINES, getProjectDir } from "./paths.js"
+
+// Port of Claude Code's MEMORY_FRONTMATTER_EXAMPLE from memoryTypes.ts
+const FRONTMATTER_EXAMPLE = [
+  "```markdown",
+  "---",
+  "name: {{memory name}}",
+  "description: {{one-line description — used to decide relevance in future conversations, so be specific}}",
+  `type: {{${MEMORY_TYPES.join(", ")}}}`,
+  "---",
+  "",
+  "{{memory content — for feedback/project types, structure as: rule/fact, then **Why:** and **How to apply:** lines}}",
+  "```",
+]
+
+// Port of Claude Code's TYPES_SECTION_INDIVIDUAL from memoryTypes.ts
+const TYPES_SECTION = [
+  "## Types of memory",
+  "",
+  "There are several discrete types of memory that you can store in your memory system:",
+  "",
+  "<types>",
+  "<type>",
+  "    <name>user</name>",
+  "    <description>Contain information about the user's role, goals, responsibilities, and knowledge. Great user memories help you tailor your future behavior to the user's preferences and perspective. Your goal in reading and writing these memories is to build up an understanding of who the user is and how you can be most helpful to them specifically. For example, you should collaborate with a senior software engineer differently than a student who is coding for the very first time. Keep in mind, that the aim here is to be helpful to the user. Avoid writing memories about the user that could be viewed as a negative judgement or that are not relevant to the work you're trying to accomplish together.</description>",
+  "    <when_to_save>When you learn any details about the user's role, preferences, responsibilities, or knowledge</when_to_save>",
+  "    <how_to_use>When your work should be informed by the user's profile or perspective. For example, if the user is asking you to explain a part of the code, you should answer that question in a way that is tailored to the specific details that they will find most valuable or that helps them build their mental model in relation to domain knowledge they already have.</how_to_use>",
+  "    <examples>",
+  "    user: I'm a data scientist investigating what logging we have in place",
+  "    assistant: [saves user memory: user is a data scientist, currently focused on observability/logging]",
+  "",
+  "    user: I've been writing Go for ten years but this is my first time touching the React side of this repo",
+  "    assistant: [saves user memory: deep Go expertise, new to React and this project's frontend — frame frontend explanations in terms of backend analogues]",
+  "    </examples>",
+  "</type>",
+  "<type>",
+  "    <name>feedback</name>",
+  "    <description>Guidance the user has given you about how to approach work — both what to avoid and what to keep doing. These are a very important type of memory to read and write as they allow you to remain coherent and responsive to the way you should approach work in the project. Record from failure AND success: if you only save corrections, you will avoid past mistakes but drift away from approaches the user has already validated, and may grow overly cautious.</description>",
+  "    <when_to_save>Any time the user corrects your approach (\"no not that\", \"don't\", \"stop doing X\") OR confirms a non-obvious approach worked (\"yes exactly\", \"perfect, keep doing that\", accepting an unusual choice without pushback). Corrections are easy to notice; confirmations are quieter — watch for them. In both cases, save what is applicable to future conversations, especially if surprising or not obvious from the code. Include *why* so you can judge edge cases later.</when_to_save>",
+  "    <how_to_use>Let these memories guide your behavior so that the user does not need to offer the same guidance twice.</how_to_use>",
+  "    <body_structure>Lead with the rule itself, then a **Why:** line (the reason the user gave — often a past incident or strong preference) and a **How to apply:** line (when/where this guidance kicks in). Knowing *why* lets you judge edge cases instead of blindly following the rule.</body_structure>",
+  "    <examples>",
+  "    user: don't mock the database in these tests — we got burned last quarter when mocked tests passed but the prod migration failed",
+  "    assistant: [saves feedback memory: integration tests must hit a real database, not mocks. Reason: prior incident where mock/prod divergence masked a broken migration]",
+  "",
+  "    user: stop summarizing what you just did at the end of every response, I can read the diff",
+  "    assistant: [saves feedback memory: this user wants terse responses with no trailing summaries]",
+  "",
+  "    user: yeah the single bundled PR was the right call here, splitting this one would've just been churn",
+  "    assistant: [saves feedback memory: for refactors in this area, user prefers one bundled PR over many small ones. Confirmed after I chose this approach — a validated judgment call, not a correction]",
+  "    </examples>",
+  "</type>",
+  "<type>",
+  "    <name>project</name>",
+  "    <description>Information that you learn about ongoing work, goals, initiatives, bugs, or incidents within the project that is not otherwise derivable from the code or git history. Project memories help you understand the broader context and motivation behind the work the user is doing within this working directory.</description>",
+  "    <when_to_save>When you learn who is doing what, why, or by when. These states change relatively quickly so try to keep your understanding of this up to date. Always convert relative dates in user messages to absolute dates when saving (e.g., \"Thursday\" → \"2026-03-05\"), so the memory remains interpretable after time passes.</when_to_save>",
+  "    <how_to_use>Use these memories to more fully understand the details and nuance behind the user's request and make better informed suggestions.</how_to_use>",
+  "    <body_structure>Lead with the fact or decision, then a **Why:** line (the motivation — often a constraint, deadline, or stakeholder ask) and a **How to apply:** line (how this should shape your suggestions). Project memories decay fast, so the why helps future-you judge whether the memory is still load-bearing.</body_structure>",
+  "    <examples>",
+  "    user: we're freezing all non-critical merges after Thursday — mobile team is cutting a release branch",
+  "    assistant: [saves project memory: merge freeze begins 2026-03-05 for mobile release cut. Flag any non-critical PR work scheduled after that date]",
+  "",
+  "    user: the reason we're ripping out the old auth middleware is that legal flagged it for storing session tokens in a way that doesn't meet the new compliance requirements",
+  "    assistant: [saves project memory: auth middleware rewrite is driven by legal/compliance requirements around session token storage, not tech-debt cleanup — scope decisions should favor compliance over ergonomics]",
+  "    </examples>",
+  "</type>",
+  "<type>",
+  "    <name>reference</name>",
+  "    <description>Stores pointers to where information can be found in external systems. These memories allow you to remember where to look to find up-to-date information outside of the project directory.</description>",
+  "    <when_to_save>When you learn about resources in external systems and their purpose. For example, that bugs are tracked in a specific project in Linear or that feedback can be found in a specific Slack channel.</when_to_save>",
+  "    <how_to_use>When the user references an external system or information that may be in an external system.</how_to_use>",
+  "    <examples>",
+  `    user: check the Linear project "INGEST" if you want context on these tickets, that's where we track all pipeline bugs`,
+  `    assistant: [saves reference memory: pipeline bugs are tracked in Linear project "INGEST"]`,
+  "",
+  "    user: the Grafana board at grafana.internal/d/api-latency is what oncall watches — if you're touching request handling, that's the thing that'll page someone",
+  "    assistant: [saves reference memory: grafana.internal/d/api-latency is the oncall latency dashboard — check it when editing request-path code]",
+  "    </examples>",
+  "</type>",
+  "</types>",
+  "",
+].join("\n")
+
+// Port of Claude Code's WHAT_NOT_TO_SAVE_SECTION from memoryTypes.ts
+const WHAT_NOT_TO_SAVE = [
+  "## What NOT to save in memory",
+  "",
+  "- Code patterns, conventions, architecture, file paths, or project structure — these can be derived by reading the current project state.",
+  "- Git history, recent changes, or who-changed-what — `git log` / `git blame` are authoritative.",
+  "- Debugging solutions or fix recipes — the fix is in the code; the commit message has the context.",
+  "- Anything already documented in AGENTS.md or project config files.",
+  "- Ephemeral task details: in-progress work, temporary state, current conversation context.",
+  "",
+  "These exclusions apply even when the user explicitly asks you to save. If they ask you to save a PR list or activity summary, ask what was *surprising* or *non-obvious* about it — that is the part worth keeping.",
+].join("\n")
+
+// Port of Claude Code's WHEN_TO_ACCESS_SECTION from memoryTypes.ts
+const WHEN_TO_ACCESS = [
+  "## When to access memories",
+  "- When memories seem relevant, or the user references prior-conversation work.",
+  "- You MUST access memory when the user explicitly asks you to check, recall, or remember.",
+  "- If the user says to *ignore* or *not use* memory: proceed as if MEMORY.md were empty. Do not apply remembered facts, cite, compare against, or mention memory content.",
+  "- Memory records can become stale over time. Use memory as context for what was true at a given point in time. Before answering the user or building assumptions based solely on information in memory records, verify that the memory is still correct and up-to-date by reading the current state of the files or resources. If a recalled memory conflicts with current information, trust what you observe now — and update or remove the stale memory rather than acting on it.",
+].join("\n")
+
+// Port of Claude Code's TRUSTING_RECALL_SECTION from memoryTypes.ts
+const TRUSTING_RECALL = [
+  "## Before recommending from memory",
+  "",
+  "A memory that names a specific function, file, or flag is a claim that it existed *when the memory was written*. It may have been renamed, removed, or never merged. Before recommending it:",
+  "",
+  "- If the memory names a file path: check the file exists.",
+  "- If the memory names a function or flag: grep for it.",
+  "- If the user is about to act on your recommendation (not just asking about history), verify first.",
+  "",
+  '"The memory says X exists" is not the same as "X exists now."',
+  "",
+  "A memory that summarizes repo state (activity logs, architecture snapshots) is frozen in time. If the user asks about *recent* or *current* state, prefer `git log` or reading the code over recalling the snapshot.",
+].join("\n")
+
+// Port of Claude Code's buildSearchingPastContextSection() from memdir.ts.
+// Guides the model to grep memory files and session transcripts when
+// looking for past context, rather than guessing or hallucinating.
+function buildSearchingPastContextSection(memoryDir: string, projectDir: string): string[] {
+  const memSearch = `grep -rn "<search term>" ${memoryDir} --include="*.md"`
+  const transcriptSearch = `grep -rn "<search term>" ${projectDir}/ --include="*.jsonl"`
+  return [
+    "## Searching past context",
+    "",
+    "When looking for past context:",
+    "1. Search topic files in your memory directory:",
+    "```",
+    memSearch,
+    "```",
+    "2. Session transcript logs (last resort — large files, slow):",
+    "```",
+    transcriptSearch,
+    "```",
+    "Use narrow search terms (error messages, file paths, function names) rather than broad keywords.",
+    "",
+  ]
+}
 
-A memory that summarizes repo state is frozen in time. If the user asks about *recent* or *current* state, prefer \`git log\` or reading the code over recalling the snapshot.`
+export type BuildMemorySystemPromptOptions = {
+  includeIndex?: boolean
+}
 
-export function buildMemorySystemPrompt(worktree: string, recalledMemoriesSection?: string): string {
+export function buildMemorySystemPrompt(
+  worktree: string,
+  recalledMemoriesSection?: string,
+  options: BuildMemorySystemPromptOptions = {},
+): string {
   const memoryDir = getMemoryDir(worktree)
+  const projectDir = getProjectDir(worktree)
   const indexContent = readIndex(worktree)
+  const includeIndex = options.includeIndex ?? true
+
+  const howToSave = [
+    "## How to save memories",
+    "",
+    "Saving a memory is a two-step process:",
+    "",
+    '**Step 1** — write the memory to its own file (e.g., `user_role.md`, `feedback_testing.md`) using this frontmatter format:',
+    "",
+    ...FRONTMATTER_EXAMPLE,
+    "",
+    `**Step 2** — add a pointer to that file in \`${ENTRYPOINT_NAME}\`. \`${ENTRYPOINT_NAME}\` is an index, not a memory — each entry should be one line, under ~150 characters: \`- [Title](file.md) — one-line hook\`. It has no frontmatter. Never write memory content directly into \`${ENTRYPOINT_NAME}\`.`,
+    "",
+    `- \`${ENTRYPOINT_NAME}\` is always loaded into your conversation context — lines after ${MAX_ENTRYPOINT_LINES} will be truncated, so keep the index concise`,
+    "- Keep the name, description, and type fields in memory files up-to-date with the content",
+    "- Organize memory semantically by topic, not chronologically",
+    "- Update or remove memories that turn out to be wrong or outdated",
+    "- Do not write duplicate memories. First check if there is an existing memory you can update before writing a new one.",
+  ].join("\n")
 
   const lines: string[] = [
     "# Auto Memory",
@@ -100,43 +182,36 @@ export function buildMemorySystemPrompt(worktree: string, recalledMemoriesSectio
     "",
     "You should build up this memory system over time so that future conversations can have a complete picture of who the user is, how they'd like to collaborate with you, what behaviors to avoid or repeat, and the context behind the work the user gives you.",
     "",
-    "If the user explicitly asks you to remember something, save it immediately using the `memory_save` tool as whichever type fits best. If they ask you to forget something, find and remove the relevant entry using `memory_delete`.",
+    "If the user explicitly asks you to remember something, save it immediately as whichever type fits best. If they ask you to forget something, find and remove the relevant entry.",
     "",
     TYPES_SECTION,
-    "",
     WHAT_NOT_TO_SAVE,
     "",
-    `## How to save memories`,
-    "",
-    "Use the `memory_save` tool to create or update a memory. Each memory goes in its own file with frontmatter:",
-    "",
-    FRONTMATTER_EXAMPLE,
-    "",
-    `- The \`${ENTRYPOINT_NAME}\` index is managed automatically — you don't need to edit it`,
-    "- Organize memory semantically by topic, not chronologically",
-    "- Update or remove memories that turn out to be wrong or outdated",
-    "- Do not write duplicate memories. First use `memory_list` or `memory_search` to check if there is an existing memory you can update before writing a new one.",
+    howToSave,
     "",
     WHEN_TO_ACCESS,
     "",
     TRUSTING_RECALL,
     "",
     "## Memory and other forms of persistence",
-    "Memory is one of several persistence mechanisms. The distinction is that memory can be recalled in future conversations and should not be used for persisting information that is only useful within the scope of the current conversation.",
-    "- When to use or update a plan instead of memory: If you are about to start a non-trivial implementation task, use a Plan rather than saving this to memory.",
-    "- When to use or update tasks instead of memory: When you need to break your work into discrete steps or track progress, use tasks instead of saving to memory.",
+    "Memory is one of several persistence mechanisms available to you as you assist the user in a given conversation. The distinction is often that memory can be recalled in future conversations and should not be used for persisting information that is only useful within the scope of the current conversation.",
+    "- When to use or update a plan instead of memory: If you are about to start a non-trivial implementation task and would like to reach alignment with the user on your approach you should use a Plan rather than saving this information to memory. Similarly, if you already have a plan within the conversation and you have changed your approach persist that change by updating the plan rather than saving a memory.",
+    "- When to use or update tasks instead of memory: When you need to break your work in current conversation into discrete steps or keep track of your progress use tasks instead of saving to memory. Tasks are great for persisting information about the work that needs to be done in the current conversation, but memory should be reserved for information that will be useful in future conversations.",
     "",
+    ...buildSearchingPastContextSection(memoryDir, projectDir),
   ]
 
-  if (indexContent.trim()) {
-    const { content: truncated } = truncateEntrypoint(indexContent)
-    lines.push(`## ${ENTRYPOINT_NAME}`, "", truncated)
-  } else {
-    lines.push(
-      `## ${ENTRYPOINT_NAME}`,
-      "",
-      `Your ${ENTRYPOINT_NAME} is currently empty. When you save new memories, they will appear here.`,
-    )
+  if (includeIndex) {
+    if (indexContent.trim()) {
+      const { content: truncated } = truncateEntrypoint(indexContent)
+      lines.push(`## ${ENTRYPOINT_NAME}`, "", truncated)
+    } else {
+      lines.push(
+        `## ${ENTRYPOINT_NAME}`,
+        "",
+        `Your ${ENTRYPOINT_NAME} is currently empty. When you save new memories, they will appear here.`,
+      )
+    }
   }
 
   if (recalledMemoriesSection?.trim()) {

package/src/recall.ts

@@ -1,10 +1,10 @@
-import { statSync } from "fs"
-import { listMemories, type MemoryEntry } from "./memory.js"
-
-const encoder = new TextEncoder()
+import { readFileSync } from "fs"
+import { scanMemoryFiles, type MemoryHeader } from "./memoryScan.js"
+import { getMemoryDir } from "./paths.js"
 
 export type RecalledMemory = {
   fileName: string
+  filePath: string
   name: string
   type: string
   description: string
@@ -16,24 +16,46 @@ const MAX_RECALLED_MEMORIES = 5
 const MAX_MEMORY_LINES = 200
 const MAX_MEMORY_BYTES = 4096
 
+const encoder = new TextEncoder()
+
 function tokenizeQuery(query: string): string[] {
   return [...new Set(query.toLowerCase().split(/\s+/).map((token) => token.trim()).filter((token) => token.length >= 2))]
 }
 
-function getMemoryMtimeMs(entry: MemoryEntry): number {
+function readMemoryContent(filePath: string): string {
   try {
-    return statSync(entry.filePath).mtimeMs
+    const raw = readFileSync(filePath, "utf-8")
+    const trimmed = raw.trim()
+    if (!trimmed.startsWith("---")) return trimmed
+
+    const lines = trimmed.split("\n")
+    let closingIdx = -1
+    for (let i = 1; i < lines.length; i++) {
+      if (lines[i].trimEnd() === "---") {
+        closingIdx = i
+        break
+      }
+    }
+    return closingIdx === -1 ? trimmed : lines.slice(closingIdx + 1).join("\n").trim()
   } catch {
-    return 0
+    return ""
   }
 }
 
-function scoreMemory(entry: MemoryEntry, terms: string[]): number {
+function scoreHeader(header: MemoryHeader, content: string, terms: string[]): number {
   if (terms.length === 0) return 0
-  const haystack = `${entry.name}\n${entry.description}\n${entry.content}`.toLowerCase()
+
+  const nameHaystack = (header.name ?? "").toLowerCase()
+  const descHaystack = (header.description ?? "").toLowerCase()
+  const filenameHaystack = header.filename.toLowerCase()
+  const contentHaystack = content.toLowerCase()
+
   let score = 0
   for (const term of terms) {
-    if (haystack.includes(term)) score += 1
+    if (nameHaystack.includes(term)) score += 3
+    if (descHaystack.includes(term)) score += 3
+    if (filenameHaystack.includes(term)) score += 1
+    if (contentHaystack.includes(term)) score += 1
   }
   return score
 }
@@ -60,53 +82,68 @@ function truncateMemoryContent(content: string): string {
   return kept.join("\n")
 }
 
-export function recallRelevantMemories(worktree: string, query?: string): RecalledMemory[] {
-  const memories = listMemories(worktree)
-  if (memories.length === 0) return []
+// Port of Claude Code's findRelevantMemories pattern, adapted for
+// keyword-based selection (no LLM side query available in plugin context).
+function isToolReferenceMemory(header: MemoryHeader, content: string, recentTools: readonly string[]): boolean {
+  if (recentTools.length === 0) return false
+  const type = header.type
+  if (type !== "reference") return false
 
-  const now = Date.now()
-  const memoriesWithMeta = memories.map((entry) => {
-    const mtimeMs = getMemoryMtimeMs(entry)
-    return {
-      entry,
-      mtimeMs,
-    }
-  })
+  const haystack = `${header.name ?? ""}\n${header.description ?? ""}\n${content}`.toLowerCase()
+  const warningSignals = ["warning", "gotcha", "issue", "bug", "caveat", "pitfall", "known issue"]
+  if (warningSignals.some((w) => haystack.includes(w))) return false
 
-  const terms = query ? tokenizeQuery(query) : []
+  const toolHaystack = recentTools.map((t) => t.toLowerCase())
+  return toolHaystack.some((tool) => haystack.includes(tool))
+}
 
-  let selected = memoriesWithMeta
+export function recallRelevantMemories(
+  worktree: string,
+  query?: string,
+  alreadySurfaced: ReadonlySet<string> = new Set(),
+  recentTools: readonly string[] = [],
+): RecalledMemory[] {
+  const memoryDir = getMemoryDir(worktree)
+  const headers = scanMemoryFiles(memoryDir).filter(
+    (h) => !alreadySurfaced.has(`${h.name ?? h.filename.replace(/\.md$/, "").replace(/.*\//, "")}|${h.type ?? "user"}`),
+  )
+  if (headers.length === 0) return []
 
-  if (terms.length > 0) {
-    const withScores = memoriesWithMeta
-      .map((item) => ({
-        ...item,
-        score: scoreMemory(item.entry, terms),
-      }))
-      .sort((a, b) => b.score - a.score || b.mtimeMs - a.mtimeMs)
+  const now = Date.now()
+  const terms = query ? tokenizeQuery(query) : []
 
-    if (withScores.some((item) => item.score > 0)) {
-      selected = withScores
+  const scored = headers.map((header) => {
+    const content = readMemoryContent(header.filePath)
+    return {
+      header,
+      content,
+      score: scoreHeader(header, content, terms),
     }
-  }
+  }).filter(({ header, content }) => !isToolReferenceMemory(header, content, recentTools))
 
-  if (selected === memoriesWithMeta) {
-    selected = [...memoriesWithMeta].sort((a, b) => b.mtimeMs - a.mtimeMs)
+  if (terms.length > 0 && scored.some((s) => s.score > 0)) {
+    scored.sort((a, b) => b.score - a.score || b.header.mtimeMs - a.header.mtimeMs)
+  } else {
+    scored.sort((a, b) => b.header.mtimeMs - a.header.mtimeMs)
   }
 
-  return selected.slice(0, MAX_RECALLED_MEMORIES).map(({ entry, mtimeMs }) => ({
-    fileName: entry.fileName,
-    name: entry.name,
-    type: entry.type,
-    description: entry.description,
-    content: truncateMemoryContent(entry.content),
-    ageInDays: Math.max(0, Math.floor((now - mtimeMs) / (1000 * 60 * 60 * 24))),
-  }))
+  return scored.slice(0, MAX_RECALLED_MEMORIES).map(({ header, content }) => {
+    const nameFromFilename = header.filename.replace(/\.md$/, "").replace(/.*\//, "")
+    return {
+      fileName: header.filename,
+      filePath: header.filePath,
+      name: header.name ?? nameFromFilename,
+      type: header.type ?? "user",
+      description: header.description ?? "",
+      content: truncateMemoryContent(content),
+      ageInDays: Math.max(0, Math.floor((now - header.mtimeMs) / (1000 * 60 * 60 * 24))),
+    }
+  })
 }
 
 function formatAgeWarning(ageInDays: number): string {
   if (ageInDays <= 1) return ""
-  return `\n> ⚠️ This memory is ${ageInDays} days old. Memories are point-in-time observations, not live state — claims about code behavior or file:line citations may be outdated. Verify against current code before asserting as fact.\n`
+  return `\n> This memory is ${ageInDays} days old. Memories are point-in-time observations, not live state — claims about code behavior or file:line citations may be outdated. Verify against current code before asserting as fact.\n`
 }
 
 export function formatRecalledMemories(memories: RecalledMemory[]): string {