memorix 1.1.9 → 1.1.10

package/dist/index.js

@@ -6404,6 +6404,44 @@ var init_store = __esm({
       ORDER BY path, startLine
       LIMIT ?
     `).all(projectId, like, like, like, limit).map(rowToSymbol);
+      }
+      listSymbols(projectId) {
+        return this.db.prepare(`
+      SELECT * FROM code_symbols
+      WHERE projectId = ? AND stale = 0
+      ORDER BY path, startLine
+    `).all(projectId).map(rowToSymbol);
+      }
+      findSymbolsByNames(projectId, names, fileIds = []) {
+        const candidates = [...new Set(names.map((name) => name.trim()).filter(Boolean))];
+        if (candidates.length === 0) return [];
+        const candidateJson = JSON.stringify(candidates);
+        const hintedFiles = [...new Set(fileIds.map((fileId) => fileId.trim()).filter(Boolean))];
+        if (hintedFiles.length > 0) {
+          return this.db.prepare(`
+        SELECT * FROM code_symbols
+        WHERE projectId = ?
+          AND stale = 0
+          AND name IN (SELECT value FROM json_each(?))
+          AND fileId IN (SELECT value FROM json_each(?))
+        ORDER BY path, startLine
+      `).all(projectId, candidateJson, JSON.stringify(hintedFiles)).map(rowToSymbol);
+        }
+        return this.db.prepare(`
+      SELECT symbols.*
+      FROM code_symbols AS symbols
+      INNER JOIN (
+        SELECT name
+        FROM code_symbols
+        WHERE projectId = ?
+          AND stale = 0
+          AND name IN (SELECT value FROM json_each(?))
+        GROUP BY name
+        HAVING COUNT(*) = 1
+      ) AS unambiguous ON unambiguous.name = symbols.name
+      WHERE symbols.projectId = ? AND symbols.stale = 0
+      ORDER BY symbols.path, symbols.startLine
+    `).all(projectId, candidateJson, projectId).map(rowToSymbol);
       }
       listSymbolsForFile(fileId) {
         return this.db.prepare(`SELECT * FROM code_symbols WHERE fileId = ? AND stale = 0 ORDER BY startLine`).all(fileId).map(rowToSymbol);
@@ -6417,6 +6455,22 @@ var init_store = __esm({
       WHERE projectId = ? AND observationId = ?
       ORDER BY status, id
     `).all(projectId, observationId).map(rowToRef);
+      }
+      listProjectObservationRefs(projectId) {
+        return this.db.prepare(`
+      SELECT * FROM observation_code_refs
+      WHERE projectId = ?
+      ORDER BY observationId, status, id
+    `).all(projectId).map(rowToRef);
+      }
+      listReferencedSymbols(projectId) {
+        return this.db.prepare(`
+      SELECT DISTINCT symbols.*
+      FROM code_symbols AS symbols
+      INNER JOIN observation_code_refs AS refs ON refs.symbolId = symbols.id
+      WHERE refs.projectId = ? AND symbols.projectId = ? AND symbols.stale = 0
+      ORDER BY symbols.path, symbols.startLine
+    `).all(projectId, projectId).map(rowToSymbol);
       }
       status(projectId) {
         const files = this.db.prepare(`SELECT COUNT(*) AS count FROM code_files WHERE projectId = ?`).get(projectId).count;
@@ -6443,6 +6497,15 @@ function mentionsSymbol(text, symbol) {
   const name = symbol.name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   return new RegExp(`(^|[^\\w$])${name}([^\\w$]|$)`).test(text);
 }
+function identifierCandidates(text) {
+  return [...new Set(text.match(/[A-Za-z_$][\w$]*(?:::[A-Za-z_$][\w$]*)*[!?=]?/g) ?? [])];
+}
+function codeIdentifierCandidates(text) {
+  const explicit = /* @__PURE__ */ new Set();
+  for (const match of text.matchAll(/`([A-Za-z_$][\w$]*(?:::[A-Za-z_$][\w$]*)*[!?=]?)`/g)) explicit.add(match[1]);
+  for (const match of text.matchAll(/\b([A-Za-z_$][\w$]*(?:::[A-Za-z_$][\w$]*)*[!?=]?)\s*\(/g)) explicit.add(match[1]);
+  return identifierCandidates(text).filter((candidate) => explicit.has(candidate) || candidate.includes("::") || /[!?=]$/.test(candidate) || /^[A-Z]/.test(candidate) || /[_$]/.test(candidate) || /[a-z0-9][A-Z]/.test(candidate) || /[A-Z]{2}/.test(candidate));
+}
 function fileRef(projectId, obs, file) {
   return {
     id: makeObservationCodeRefId(projectId, obs.id, file.id),
@@ -6469,40 +6532,101 @@ function symbolRef(projectId, obs, file, symbol) {
     createdAt: obs.createdAt
   };
 }
-async function bindObservationToCode(store, obs) {
+function resolveObservationCodeRefs(obs, lookup) {
   const refs = /* @__PURE__ */ new Map();
   const text = observationText(obs);
   const candidateFiles = /* @__PURE__ */ new Map();
   for (const rawPath of obs.filesModified ?? []) {
-    const file = store.getFile(obs.projectId, normalizeCodePath(rawPath));
+    const file = lookup.findFile(normalizeCodePath(rawPath));
     if (!file) continue;
     candidateFiles.set(file.id, file);
     const ref = fileRef(obs.projectId, obs, file);
     refs.set(ref.id, ref);
   }
-  const symbols = store.findSymbols(obs.projectId, "", 500);
+  const hintedFileIds = new Set(candidateFiles.keys());
+  const symbolNames = hintedFileIds.size > 0 ? identifierCandidates(text) : codeIdentifierCandidates(text);
+  const symbols = lookup.findSymbols(symbolNames, [...hintedFileIds]);
+  const symbolsByName = /* @__PURE__ */ new Map();
   for (const symbol of symbols) {
-    if (!mentionsSymbol(text, symbol)) continue;
-    const file = candidateFiles.get(symbol.fileId) ?? store.getFile(obs.projectId, symbol.path);
-    if (!file) continue;
-    candidateFiles.set(file.id, file);
-    const ref = symbolRef(obs.projectId, obs, file, symbol);
-    refs.set(ref.id, ref);
+    const group = symbolsByName.get(symbol.name) ?? [];
+    group.push(symbol);
+    symbolsByName.set(symbol.name, group);
   }
-  const result = [...refs.values()];
-  store.replaceObservationRefs(obs.projectId, obs.id, result);
-  return result;
+  for (const group of symbolsByName.values()) {
+    const candidates = group.length === 1 ? group : [];
+    for (const symbol of candidates) {
+      if (!mentionsSymbol(text, symbol)) continue;
+      const file = candidateFiles.get(symbol.fileId) ?? lookup.findFile(symbol.path);
+      if (!file) continue;
+      candidateFiles.set(file.id, file);
+      const ref = symbolRef(obs.projectId, obs, file, symbol);
+      refs.set(ref.id, ref);
+    }
+  }
+  return [...refs.values()];
+}
+function createStoreLookup(store, projectId) {
+  return {
+    findFile: (path20) => store.getFile(projectId, path20) ?? void 0,
+    findSymbols: (names, hintedFileIds) => store.findSymbolsByNames(projectId, names, hintedFileIds)
+  };
+}
+function createSnapshotLookup(files, symbols) {
+  const filesByPath = new Map(files.map((file) => [normalizeCodePath(file.path), file]));
+  const symbolsByName = /* @__PURE__ */ new Map();
+  for (const symbol of symbols) {
+    const group = symbolsByName.get(symbol.name) ?? [];
+    group.push(symbol);
+    symbolsByName.set(symbol.name, group);
+  }
+  return {
+    findFile: (path20) => filesByPath.get(normalizeCodePath(path20)),
+    findSymbols: (names, hintedFileIds) => {
+      const hinted = new Set(hintedFileIds);
+      const found = [];
+      for (const name of names) {
+        const candidates = symbolsByName.get(name) ?? [];
+        found.push(...hinted.size > 0 ? candidates.filter((symbol) => hinted.has(symbol.fileId)) : candidates);
+      }
+      return found;
+    }
+  };
+}
+async function bindObservationToCode(store, obs) {
+  const refs = resolveObservationCodeRefs(obs, createStoreLookup(store, obs.projectId));
+  store.replaceObservationRefs(obs.projectId, obs.id, refs);
+  return refs;
 }
 async function backfillMissingObservationCodeRefs(store, observations2) {
   let observationsBackfilled = 0;
   let refsBackfilled = 0;
+  const boundObservationIdsByProject = /* @__PURE__ */ new Map();
+  const lookupByProject = /* @__PURE__ */ new Map();
+  for (const projectId of new Set(observations2.map((observation) => observation.projectId))) {
+    boundObservationIdsByProject.set(
+      projectId,
+      new Set(store.listProjectObservationRefs(projectId).map((ref) => ref.observationId))
+    );
+    lookupByProject.set(
+      projectId,
+      createSnapshotLookup(store.listFiles(projectId), store.listSymbols(projectId))
+    );
+  }
+  const refsToInsert = [];
   for (const observation of observations2) {
-    if (store.listObservationRefs(observation.projectId, observation.id).length > 0) continue;
-    const refs = await bindObservationToCode(store, observation);
+    if (boundObservationIdsByProject.get(observation.projectId)?.has(observation.id)) continue;
+    if ((observation.filesModified?.length ?? 0) === 0 && codeIdentifierCandidates(observationText(observation)).length === 0) {
+      continue;
+    }
+    const lookup = lookupByProject.get(observation.projectId);
+    if (!lookup) continue;
+    const refs = resolveObservationCodeRefs(observation, lookup);
     if (refs.length === 0) continue;
     observationsBackfilled += 1;
     refsBackfilled += refs.length;
+    refsToInsert.push(...refs);
   }
+  store.upsertObservationRefs(refsToInsert);
   return {
     observationsScanned: observations2.length,
     observationsBackfilled,
@@ -9642,8 +9766,8 @@ var init_lite_provider = __esm({
       },
       ruby: {
         symbols: [
-          { kind: "class", re: /^class\s+([A-Za-z_][\w:]*?)\b/gm },
-          { kind: "function", re: /^def\s+([A-Za-z_][\w!?=]*)\b/gm }
+          { kind: "class", re: /^class\s+([A-Za-z_][\w]*(?:::[A-Za-z_][\w]*)*)/gm },
+          { kind: "function", re: /^def\s+([A-Za-z_][\w]*[!?=]?)/gm }
         ],
         imports: [/require\s+['"]([^'"]+)['"]/g]
       },
@@ -9712,11 +9836,12 @@ function compactSuggestedReads(paths, limit = 8, exclude) {
 }
 function collectGraph(store, projectId, observations2, exclude) {
   const files = store.listFiles(projectId);
-  const symbols = files.flatMap((file) => store.listSymbolsForFile(file.id));
+  const symbols = store.listReferencedSymbols(projectId);
   const filesById = new Map(files.map((file) => [file.id, file]));
   const symbolsById = new Map(symbols.map((symbol) => [symbol.id, symbol]));
   const observationsById = new Map(observations2.map((obs) => [obs.id, obs]));
-  const refs = observations2.flatMap((obs) => store.listObservationRefs(projectId, obs.id));
+  const activeObservationIds = new Set(observations2.map((obs) => obs.id));
+  const refs = store.listProjectObservationRefs(projectId).filter((ref) => activeObservationIds.has(ref.observationId));
   const freshness = {
     current: 0,
     suspect: 0,
@@ -9754,9 +9879,7 @@ function collectGraph(store, projectId, observations2, exclude) {
     suggestedReads: compactSuggestedReads(suggestedReads, 8, exclude)
   };
 }
-function buildProjectContextOverview(input) {
-  const active = activeObservations(input.observations, input.project.id);
-  const graph = collectGraph(input.store, input.project.id, active, input.exclude);
+function overviewFromGraph(input) {
   const status = input.store.status(input.project.id);
   return {
     project: input.project,
@@ -9767,20 +9890,26 @@ function buildProjectContextOverview(input) {
       edges: status.edges,
       refs: status.refs,
       ...status.indexedAt ? { indexedAt: status.indexedAt } : {},
-      languages: countLanguages(graph.files)
+      languages: countLanguages(input.graph.files)
     },
     memory: {
       total: input.observations.filter((obs) => obs.projectId === input.project.id).length,
-      active: active.length
+      active: input.active.length
     },
-    freshness: graph.freshness,
-    suggestedReads: graph.suggestedReads
+    freshness: input.graph.freshness,
+    suggestedReads: input.graph.suggestedReads
   };
 }
 function buildProjectContextExplain(input) {
-  const overview = buildProjectContextOverview(input);
   const active = activeObservations(input.observations, input.project.id);
   const graph = collectGraph(input.store, input.project.id, active, input.exclude);
+  const overview = overviewFromGraph({
+    project: input.project,
+    store: input.store,
+    observations: input.observations,
+    active,
+    graph
+  });
   return {
     project: input.project,
     sources: graph.sources.sort((a, b) => a.observationId - b.observationId || (a.path ?? "").localeCompare(b.path ?? "")),
@@ -10175,18 +10304,13 @@ async function buildAutoProjectContext(input) {
       };
     }
   }
-  const overview = buildProjectContextOverview({
-    project: input.project,
-    store,
-    observations: input.observations,
-    exclude
-  });
   const explain = buildProjectContextExplain({
     project: input.project,
     store,
     observations: input.observations,
     exclude
   });
+  const overview = explain.overview;
   return {
     project: input.project,
     ...task ? { task } : {},
@@ -20066,7 +20190,7 @@ The path should point to a directory containing a .git folder.`
   };
   const server = existingServer ?? new McpServer({
     name: "memorix",
-    version: true ? "1.1.9" : "1.0.1"
+    version: true ? "1.1.10" : "1.0.1"
   });
   const originalRegisterTool = server.registerTool.bind(server);
   server.registerTool = ((name, ...args) => {