codemini-cli 0.5.10 → 0.5.11

package/src/core/project-index.js

@@ -1,614 +1,803 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import { getFileIndexPath, getProjectIndexDir, getProjectMapPath, getProjectWorkspaceDir } from './paths.js';
-import { INDEX_SKIP_DIRS as SKIP_DIRS, SOURCE_EXTENSIONS, EXTENSION_LANGUAGE_MAP } from './constants.js';
-import { sha256 } from './crypto-utils.js';
-import { BoundedCache } from './bounded-cache.js';
-import { trimInline, normalizeRelativePath, escapeRegex } from './string-utils.js';
-
-const PROJECT_MARKER_FILES = new Set([
-  'package.json',
-  'tsconfig.json',
-  'pyproject.toml',
-  'requirements.txt',
-  'go.mod',
-  'Cargo.toml',
-  'composer.json',
-  'Gemfile',
-  'pom.xml',
-  'build.gradle',
-  'build.gradle.kts',
-  'Makefile',
-  '.gitignore'
-]);
-
-const LANGUAGE_BY_EXT = EXTENSION_LANGUAGE_MAP;
-
-const initCache = new BoundedCache({ maxSize: 32, ttlMs: 10 * 60 * 1000 });
-const ignoreRulesCache = new BoundedCache({ maxSize: 128, ttlMs: 60 * 1000 });
-const PROJECT_CONTEXT_MAX_FILES = 6;
-
-function clipList(values, max = 32) {
-  return [...new Set((Array.isArray(values) ? values : []).filter(Boolean))].slice(0, max);
-}
-
-function rel(cwd, filePath) {
-  return normalizeRelativePath(path.relative(cwd, filePath));
-}
-
-async function safeStat(filePath) {
-  try {
-    return await fs.stat(filePath);
-  } catch {
-    return null;
-  }
-}
-
-async function safeReadJson(filePath, fallback) {
-  try {
-    return JSON.parse(await fs.readFile(filePath, 'utf8'));
-  } catch {
-    return fallback;
-  }
-}
-
-function tokenizeQuery(text) {
-  return [...new Set(String(text || '').toLowerCase().match(/[a-z0-9_./-]+/g) || [])].filter(Boolean);
-}
-
-function trimMultiline(value, max = 1800) {
-  const text = String(value || '').trim();
-  if (!text) return '';
-  if (text.length <= max) return text;
-  return `${text.slice(0, max - 3).trimEnd()}...`;
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { getFileIndexPath, getProjectIndexDir, getProjectMapPath, getProjectWorkspaceDir } from './paths.js';
+import { INDEX_SKIP_DIRS as SKIP_DIRS, SOURCE_EXTENSIONS, EXTENSION_LANGUAGE_MAP } from './constants.js';
+import { sha256 } from './crypto-utils.js';
+import { BoundedCache } from './bounded-cache.js';
+import { trimInline, normalizeRelativePath, escapeRegex } from './string-utils.js';
+
+const PROJECT_MARKER_FILES = new Set([
+  'package.json',
+  'tsconfig.json',
+  'pyproject.toml',
+  'requirements.txt',
+  'go.mod',
+  'Cargo.toml',
+  'composer.json',
+  'Gemfile',
+  'pom.xml',
+  'build.gradle',
+  'build.gradle.kts',
+  'Makefile',
+  '.gitignore'
+]);
+
+const LANGUAGE_BY_EXT = EXTENSION_LANGUAGE_MAP;
+
+const initCache = new BoundedCache({ maxSize: 32, ttlMs: 10 * 60 * 1000 });
+const ignoreRulesCache = new BoundedCache({ maxSize: 128, ttlMs: 60 * 1000 });
+const PROJECT_CONTEXT_MAX_FILES = 6;
+
+function clipList(values, max = 32) {
+  return [...new Set((Array.isArray(values) ? values : []).filter(Boolean))].slice(0, max);
+}
+
+function rel(cwd, filePath) {
+  return normalizeRelativePath(path.relative(cwd, filePath));
+}
+
+async function safeStat(filePath) {
+  try {
+    return await fs.stat(filePath);
+  } catch {
+    return null;
+  }
+}
+
+async function safeReadJson(filePath, fallback) {
+  try {
+    return JSON.parse(await fs.readFile(filePath, 'utf8'));
+  } catch {
+    return fallback;
+  }
+}
+
+function tokenizeQuery(text) {
+  return [...new Set(String(text || '').toLowerCase().match(/[a-z0-9_./-]+/g) || [])].filter(Boolean);
+}
+
+function trimMultiline(value, max = 1800) {
+  const text = String(value || '').trim();
+  if (!text) return '';
+  if (text.length <= max) return text;
+  return `${text.slice(0, max - 3).trimEnd()}...`;
+}
+
+async function writeJson(filePath, value) {
+  await fs.mkdir(path.dirname(filePath), { recursive: true });
+  await fs.writeFile(filePath, `${JSON.stringify(value, null, 2)}\n`, 'utf8');
+}
+
+function gitignorePatternToRegex(pattern) {
+  const normalized = normalizeRelativePath(pattern);
+  let regexBody = '';
+  for (let index = 0; index < normalized.length; index += 1) {
+    const ch = normalized[index];
+    const next = normalized[index + 1];
+    if (ch === '*') {
+      if (next === '*') {
+        regexBody += '.*';
+        index += 1;
+      } else {
+        regexBody += '[^/]*';
+      }
+      continue;
+    }
+    if (ch === '?') {
+      regexBody += '[^/]';
+      continue;
+    }
+    regexBody += escapeRegex(ch);
+  }
+  return new RegExp(`^${regexBody}$`);
+}
+
+async function readIgnoreFileRules(cwd, fileName) {
+  const filePath = path.join(cwd, fileName);
+  const stat = await safeStat(filePath);
+  const cacheKey = `${filePath}:${Number(stat?.mtimeMs || 0)}:${Number(stat?.size || 0)}`;
+  if (ignoreRulesCache.has(cacheKey)) return ignoreRulesCache.get(cacheKey);
+
+  for (const key of ignoreRulesCache.keys()) {
+    if (String(key).startsWith(`${filePath}:`) && key !== cacheKey) {
+      ignoreRulesCache.delete(key);
+    }
+  }
+
+  try {
+    if (!stat?.isFile()) {
+      ignoreRulesCache.set(cacheKey, []);
+      return [];
+    }
+    const raw = await fs.readFile(filePath, 'utf8');
+    const rules = raw
+      .split(/\r?\n/)
+      .map((line) => line.trim())
+      .filter((line) => line && !line.startsWith('#'))
+      .map((line) => {
+        const negated = line.startsWith('!');
+        const source = negated ? line.slice(1) : line;
+        const dirOnly = source.endsWith('/');
+        const anchored = source.startsWith('/');
+        const normalized = normalizeRelativePath(dirOnly ? source.slice(0, -1) : source);
+        return {
+          negated,
+          dirOnly,
+          anchored,
+          normalized,
+          hasSlash: normalized.includes('/'),
+          regex: gitignorePatternToRegex(normalized)
+        };
+      })
+      .filter((rule) => rule.normalized);
+    ignoreRulesCache.set(cacheKey, rules);
+    return rules;
+  } catch {
+    ignoreRulesCache.set(cacheKey, []);
+    return [];
+  }
+}
+
+async function readProjectIgnoreRules(cwd) {
+  const [gitignoreRules, llmignoreRules] = await Promise.all([
+    readIgnoreFileRules(cwd, '.gitignore'),
+    readIgnoreFileRules(cwd, '.llmignore')
+  ]);
+  return {
+    gitignoreRules,
+    llmignoreRules,
+    combinedRules: [...gitignoreRules, ...llmignoreRules]
+  };
+}
+
+function matchesGitignoreRule(rule, relativePath, isDirectory) {
+  if (!rule || !relativePath) return false;
+  if (rule.dirOnly && !isDirectory) return false;
+  const normalizedPath = normalizeRelativePath(relativePath);
+  if (!normalizedPath) return false;
+  if (rule.anchored || rule.hasSlash) {
+    return rule.regex.test(normalizedPath);
+  }
+  return normalizedPath.split('/').some((segment) => rule.regex.test(segment));
+}
+
+function shouldIgnorePath(relativePath, isDirectory, gitignoreRules = []) {
+  const normalizedPath = normalizeRelativePath(relativePath);
+  if (!normalizedPath) return false;
+  const segments = normalizedPath.split('/').filter(Boolean);
+  if (segments.some((segment) => SKIP_DIRS.has(segment))) return true;
+  if (segments.some((segment) => /^venv[-_]/i.test(segment) || /\.egg-info$/i.test(segment))) return true;
+  let ignored = false;
+  for (const rule of gitignoreRules) {
+    if (!matchesGitignoreRule(rule, normalizedPath, isDirectory)) continue;
+    ignored = !rule.negated;
+  }
+  return ignored;
+}
+
+async function detectWorkspaceKind(cwd) {
+  const gitDir = await safeStat(path.join(cwd, '.git'));
+  if (gitDir?.isDirectory()) return 'project';
+  for (const marker of PROJECT_MARKER_FILES) {
+    const stat = await safeStat(path.join(cwd, marker));
+    if (stat?.isFile()) return 'project';
+  }
+  return 'directory';
+}
+
+async function findNearestProjectRoot(startDir, workspaceRoot) {
+  let current = path.resolve(startDir);
+  const root = path.resolve(workspaceRoot);
+  while (current.startsWith(root)) {
+    if ((await detectWorkspaceKind(current)) === 'project') return current;
+    if (current === root) break;
+    const parent = path.dirname(current);
+    if (parent === current) break;
+    current = parent;
+  }
+  return null;
+}
+
+async function findProjectRootFromFile(workspaceRoot, relativePath = '') {
+  const absolutePath = path.resolve(workspaceRoot, String(relativePath || '.'));
+  const stat = await safeStat(absolutePath);
+  const probeStart = stat?.isDirectory() ? absolutePath : path.dirname(absolutePath);
+  return findNearestProjectRoot(probeStart, workspaceRoot);
+}
+
+async function findNearestIndexedProjectRoot(startDir, workspaceRoot) {
+  let current = path.resolve(startDir);
+  const root = path.resolve(workspaceRoot);
+  while (current.startsWith(root)) {
+    const projectMapStat = await safeStat(getProjectMapPath(current));
+    const fileIndexStat = await safeStat(getFileIndexPath(current));
+    if (projectMapStat?.isFile() && fileIndexStat?.isFile()) return current;
+    if (current === root) break;
+    const parent = path.dirname(current);
+    if (parent === current) break;
+    current = parent;
+  }
+  return null;
+}
+
+async function walkFiles(cwd, start = cwd, out = [], ignoreRules = []) {
+  const entries = await fs.readdir(start, { withFileTypes: true });
+  for (const entry of entries) {
+    const absolutePath = path.join(start, entry.name);
+    const relativePath = rel(cwd, absolutePath);
+    if (entry.isDirectory()) {
+      if (shouldIgnorePath(relativePath, true, ignoreRules)) continue;
+      await walkFiles(cwd, absolutePath, out, ignoreRules);
+      continue;
+    }
+    if (shouldIgnorePath(relativePath, false, ignoreRules)) continue;
+    out.push(absolutePath);
+  }
+  return out;
+}
+
+function categorizeDirectory(relativeDir) {
+  const text = String(relativeDir || '').toLowerCase();
+  if (!text || text === '.') return 'root';
+  if (/(^|\/)(src|app|apps)\b/.test(text)) return 'source';
+  if (/(^|\/)(test|tests|__tests__|spec)\b/.test(text)) return 'test';
+  if (/(^|\/)(scripts|bin)\b/.test(text)) return 'script';
+  if (/(^|\/)(config|configs)\b/.test(text)) return 'config';
+  return 'other';
+}
+
+function extractMatches(regex, text, group = 1) {
+  const out = [];
+  for (const match of String(text || '').matchAll(regex)) {
+    const value = String(match[group] || '').trim();
+    if (value) out.push(value);
+  }
+  return out;
 }
 
-async function writeJson(filePath, value) {
-  await fs.mkdir(path.dirname(filePath), { recursive: true });
-  await fs.writeFile(filePath, `${JSON.stringify(value, null, 2)}\n`, 'utf8');
+function lineNumberForIndex(content, index) {
+  return String(content || '').slice(0, Math.max(0, index)).split(/\r?\n/).length;
 }
 
-function gitignorePatternToRegex(pattern) {
-  const normalized = normalizeRelativePath(pattern);
-  let regexBody = '';
-  for (let index = 0; index < normalized.length; index += 1) {
-    const ch = normalized[index];
-    const next = normalized[index + 1];
-    if (ch === '*') {
-      if (next === '*') {
-        regexBody += '.*';
-        index += 1;
-      } else {
-        regexBody += '[^/]*';
-      }
-      continue;
+function findBraceRange(content, openBraceIndex) {
+  if (openBraceIndex < 0) return null;
+  let depth = 0;
+  for (let index = openBraceIndex; index < content.length; index += 1) {
+    const ch = content[index];
+    if (ch === '{') depth += 1;
+    if (ch === '}') {
+      depth -= 1;
+      if (depth === 0) return { start: openBraceIndex, end: index + 1 };
     }
-    if (ch === '?') {
-      regexBody += '[^/]';
-      continue;
-    }
-    regexBody += escapeRegex(ch);
   }
-  return new RegExp(`^${regexBody}$`);
+  return null;
 }
 
-async function readIgnoreFileRules(cwd, fileName) {
-  const filePath = path.join(cwd, fileName);
-  const stat = await safeStat(filePath);
-  const cacheKey = `${filePath}:${Number(stat?.mtimeMs || 0)}:${Number(stat?.size || 0)}`;
-  if (ignoreRulesCache.has(cacheKey)) return ignoreRulesCache.get(cacheKey);
-
-  for (const key of ignoreRulesCache.keys()) {
-    if (String(key).startsWith(`${filePath}:`) && key !== cacheKey) {
-      ignoreRulesCache.delete(key);
-    }
-  }
-
-  try {
-    if (!stat?.isFile()) {
-      ignoreRulesCache.set(cacheKey, []);
-      return [];
-    }
-    const raw = await fs.readFile(filePath, 'utf8');
-    const rules = raw
-      .split(/\r?\n/)
-      .map((line) => line.trim())
-      .filter((line) => line && !line.startsWith('#'))
-      .map((line) => {
-        const negated = line.startsWith('!');
-        const source = negated ? line.slice(1) : line;
-        const dirOnly = source.endsWith('/');
-        const anchored = source.startsWith('/');
-        const normalized = normalizeRelativePath(dirOnly ? source.slice(0, -1) : source);
-        return {
-          negated,
-          dirOnly,
-          anchored,
-          normalized,
-          hasSlash: normalized.includes('/'),
-          regex: gitignorePatternToRegex(normalized)
-        };
-      })
-      .filter((rule) => rule.normalized);
-    ignoreRulesCache.set(cacheKey, rules);
-    return rules;
-  } catch {
-    ignoreRulesCache.set(cacheKey, []);
-    return [];
-  }
+function inferSymbolType(kind) {
+  if (kind === 'class') return 'class';
+  if (kind === 'method') return 'method';
+  if (kind === 'const') return 'function';
+  return 'function';
 }
 
-async function readProjectIgnoreRules(cwd) {
-  const [gitignoreRules, llmignoreRules] = await Promise.all([
-    readIgnoreFileRules(cwd, '.gitignore'),
-    readIgnoreFileRules(cwd, '.llmignore')
-  ]);
-  return {
-    gitignoreRules,
-    llmignoreRules,
-    combinedRules: [...gitignoreRules, ...llmignoreRules]
-  };
+function extractCallNames(content) {
+  return clipList(
+    extractMatches(/\b([A-Za-z_$][A-Za-z0-9_$]*(?:\.[A-Za-z_$][A-Za-z0-9_$]*)?)\s*\(/g, content)
+      .filter((name) => !['if', 'for', 'while', 'switch', 'return', 'function', 'class', 'catch'].includes(String(name).split('.')[0])),
+    64
+  );
 }
 
-function matchesGitignoreRule(rule, relativePath, isDirectory) {
-  if (!rule || !relativePath) return false;
-  if (rule.dirOnly && !isDirectory) return false;
-  const normalizedPath = normalizeRelativePath(relativePath);
-  if (!normalizedPath) return false;
-  if (rule.anchored || rule.hasSlash) {
-    return rule.regex.test(normalizedPath);
-  }
-  return normalizedPath.split('/').some((segment) => rule.regex.test(segment));
+function extractSemanticWrites(calls) {
+  return clipList((calls || []).filter((name) => /\.(insert|update|upsert|delete|save|write|create)$/i.test(String(name)) || /^(insert|update|upsert|delete|save|write|create)$/i.test(String(name))), 16);
 }
 
-function shouldIgnorePath(relativePath, isDirectory, gitignoreRules = []) {
-  const normalizedPath = normalizeRelativePath(relativePath);
-  if (!normalizedPath) return false;
-  const topName = normalizedPath.split('/')[0];
-  if (topName && SKIP_DIRS.has(topName)) return true;
-  let ignored = false;
-  for (const rule of gitignoreRules) {
-    if (!matchesGitignoreRule(rule, normalizedPath, isDirectory)) continue;
-    ignored = !rule.negated;
-  }
-  return ignored;
+function extractSemanticEmits(calls, content) {
+  const eventNames = extractMatches(/\b(?:emit|publish|dispatch)\s*\(\s*['"`]([^'"`]+)['"`]/g, content);
+  return clipList([
+    ...eventNames,
+    ...(calls || []).filter((name) => /\.(emit|publish|dispatch)$/i.test(String(name)) || /^(emit|publish|dispatch)$/i.test(String(name)))
+  ], 16);
 }
 
-async function detectWorkspaceKind(cwd) {
-  const gitDir = await safeStat(path.join(cwd, '.git'));
-  if (gitDir?.isDirectory()) return 'project';
-  for (const marker of PROJECT_MARKER_FILES) {
-    const stat = await safeStat(path.join(cwd, marker));
-    if (stat?.isFile()) return 'project';
-  }
-  return 'directory';
-}
+function extractSymbolDefinitions(relativePath, content, imports = []) {
+  const definitions = [];
+  const patterns = [
+    { kind: 'class', regex: /\b(?:export\s+)?class\s+([A-Za-z_$][A-Za-z0-9_$]*)[^{]*\{/g },
+    { kind: 'function', regex: /\b(?:export\s+)?(?:async\s+)?function\s+([A-Za-z_$][A-Za-z0-9_$]*)\s*\([^)]*\)\s*\{/g },
+    { kind: 'const', regex: /\b(?:export\s+)?const\s+([A-Za-z_$][A-Za-z0-9_$]*)\s*=\s*(?:async\s*)?\([^)]*\)\s*=>\s*\{/g },
+    { kind: 'python', regex: /^\s*(?:async\s+)?def\s+([A-Za-z_][A-Za-z0-9_]*)\s*\([^)]*\)\s*:/gm },
+    { kind: 'go', regex: /^\s*func\s+(?:\([^)]*\)\s*)?([A-Za-z_][A-Za-z0-9_]*)\s*\([^)]*\)\s*\{/gm }
+  ];
 
-async function findNearestProjectRoot(startDir, workspaceRoot) {
-  let current = path.resolve(startDir);
-  const root = path.resolve(workspaceRoot);
-  while (current.startsWith(root)) {
-    if ((await detectWorkspaceKind(current)) === 'project') return current;
-    if (current === root) break;
-    const parent = path.dirname(current);
-    if (parent === current) break;
-    current = parent;
+  for (const { kind, regex } of patterns) {
+    for (const match of String(content || '').matchAll(regex)) {
+      const name = String(match[1] || '').trim();
+      if (!name) continue;
+      const start = match.index || 0;
+      const openBrace = content.indexOf('{', start);
+      const braceRange = openBrace >= 0 ? findBraceRange(content, openBrace) : null;
+      const end = braceRange?.end || content.indexOf('\n', start + String(match[0] || '').length);
+      const safeEnd = end > start ? end : start + String(match[0] || '').length;
+      const body = content.slice(start, safeEnd);
+      const startLine = lineNumberForIndex(content, start);
+      const endLine = lineNumberForIndex(content, safeEnd);
+      const signature = trimInline(String(match[0] || '').replace(/\s*\{\s*$/, '').replace(/\s*:\s*$/, ''), 220);
+      const calls = extractCallNames(body);
+      definitions.push({
+        symbol_id: `${relativePath}#${name}`,
+        name,
+        type: inferSymbolType(kind),
+        file: relativePath,
+        range: { start_line: startLine, end_line: endLine },
+        signature,
+        calls,
+        called_by: [],
+        imports: clipList(imports, 12),
+        writes: extractSemanticWrites(calls),
+        emits: extractSemanticEmits(calls, body),
+        used_by: []
+      });
+
+      if (kind === 'class' && braceRange) {
+        const classBodyStart = openBrace + 1;
+        const classBody = content.slice(classBodyStart, braceRange.end - 1);
+        for (const methodMatch of classBody.matchAll(/^\s*(?:async\s+)?([A-Za-z_$][A-Za-z0-9_$]*)\s*\([^)]*\)\s*\{/gm)) {
+          const methodName = String(methodMatch[1] || '').trim();
+          if (!methodName || ['if', 'for', 'while', 'switch', 'catch'].includes(methodName)) continue;
+          const leadingWhitespace = String(methodMatch[0] || '').search(/\S/);
+          const methodStart = classBodyStart + (methodMatch.index || 0) + Math.max(0, leadingWhitespace);
+          const methodOpenBrace = content.indexOf('{', methodStart);
+          const methodBraceRange = findBraceRange(content, methodOpenBrace);
+          const methodEnd = methodBraceRange?.end || methodStart + String(methodMatch[0] || '').length;
+          const methodBody = content.slice(methodStart, methodEnd);
+          const methodCalls = extractCallNames(methodBody);
+          definitions.push({
+            symbol_id: `${relativePath}#${name}.${methodName}`,
+            name: `${name}.${methodName}`,
+            type: 'method',
+            file: relativePath,
+            range: {
+              start_line: lineNumberForIndex(content, methodStart),
+              end_line: lineNumberForIndex(content, methodEnd)
+            },
+            signature: trimInline(`${name}.${String(methodMatch[0] || '').replace(/\s*\{\s*$/, '')}`, 220),
+            calls: methodCalls,
+            called_by: [],
+            imports: clipList(imports, 12),
+            writes: extractSemanticWrites(methodCalls),
+            emits: extractSemanticEmits(methodCalls, methodBody),
+            used_by: []
+          });
+        }
+      }
+    }
   }
-  return null;
-}
 
-async function findProjectRootFromFile(workspaceRoot, relativePath = '') {
-  const absolutePath = path.resolve(workspaceRoot, String(relativePath || '.'));
-  const stat = await safeStat(absolutePath);
-  const probeStart = stat?.isDirectory() ? absolutePath : path.dirname(absolutePath);
-  return findNearestProjectRoot(probeStart, workspaceRoot);
+  return definitions
+    .sort((left, right) => left.range.start_line - right.range.start_line || left.name.localeCompare(right.name))
+    .slice(0, 200);
 }
 
-async function findNearestIndexedProjectRoot(startDir, workspaceRoot) {
-  let current = path.resolve(startDir);
-  const root = path.resolve(workspaceRoot);
-  while (current.startsWith(root)) {
-    const projectMapStat = await safeStat(getProjectMapPath(current));
-    const fileIndexStat = await safeStat(getFileIndexPath(current));
-    if (projectMapStat?.isFile() && fileIndexStat?.isFile()) return current;
-    if (current === root) break;
-    const parent = path.dirname(current);
-    if (parent === current) break;
-    current = parent;
+function enrichSymbolGraph(files) {
+  const nextFiles = (Array.isArray(files) ? files : []).map((entry) => ({
+    ...entry,
+    symbols: Array.isArray(entry.symbols) ? entry.symbols.map((symbol) => ({ ...symbol, called_by: [], used_by: [] })) : []
+  }));
+  const symbols = nextFiles.flatMap((entry) => entry.symbols || []);
+  const byName = new Map();
+  for (const symbol of symbols) {
+    const shortName = String(symbol.name || '').split('.').pop();
+    if (!shortName) continue;
+    if (!byName.has(shortName)) byName.set(shortName, []);
+    byName.get(shortName).push(symbol);
   }
-  return null;
-}
 
-async function walkFiles(cwd, start = cwd, out = [], ignoreRules = []) {
-  const entries = await fs.readdir(start, { withFileTypes: true });
-  for (const entry of entries) {
-    const absolutePath = path.join(start, entry.name);
-    const relativePath = rel(cwd, absolutePath);
-    if (entry.isDirectory()) {
-      if (shouldIgnorePath(relativePath, true, ignoreRules)) continue;
-      await walkFiles(cwd, absolutePath, out, ignoreRules);
-      continue;
+  for (const source of symbols) {
+    for (const rawCall of source.calls || []) {
+      const callName = String(rawCall || '').split('.').pop();
+      const targets = byName.get(callName) || [];
+      for (const target of targets) {
+        if (!target?.symbol_id || target.symbol_id === source.symbol_id) continue;
+        target.called_by = clipList([...(target.called_by || []), source.symbol_id], 32);
+      }
     }
-    if (shouldIgnorePath(relativePath, false, ignoreRules)) continue;
-    out.push(absolutePath);
   }
-  return out;
-}
 
-function categorizeDirectory(relativeDir) {
-  const text = String(relativeDir || '').toLowerCase();
-  if (!text || text === '.') return 'root';
-  if (/(^|\/)(src|app|apps)\b/.test(text)) return 'source';
-  if (/(^|\/)(test|tests|__tests__|spec)\b/.test(text)) return 'test';
-  if (/(^|\/)(scripts|bin)\b/.test(text)) return 'script';
-  if (/(^|\/)(config|configs)\b/.test(text)) return 'config';
-  return 'other';
-}
-
-function extractMatches(regex, text, group = 1) {
-  const out = [];
-  for (const match of String(text || '').matchAll(regex)) {
-    const value = String(match[group] || '').trim();
-    if (value) out.push(value);
-  }
-  return out;
+  return nextFiles;
 }
 
 function buildFileEntry(relativePath, content, stat) {
   const ext = path.extname(relativePath).toLowerCase();
   const imports = clipList([
-    ...extractMatches(/import\s+(?:[^'"]*from\s+)?['"]([^'"]+)['"]/g, content),
-    ...extractMatches(/require\(\s*['"]([^'"]+)['"]\s*\)/g, content),
-    ...extractMatches(/\buse\s+([A-Za-z0-9_:\\]+)/g, ext === '.rs' ? content : '')
-  ]);
-  const exports = clipList([
-    ...extractMatches(/export\s+(?:async\s+)?function\s+([A-Za-z0-9_$]+)/g, content),
-    ...extractMatches(/export\s+class\s+([A-Za-z0-9_$]+)/g, content),
-    ...extractMatches(/export\s+const\s+([A-Za-z0-9_$]+)/g, content),
-    ...extractMatches(/module\.exports\s*=\s*([A-Za-z0-9_$]+)/g, content),
-    ...extractMatches(/exports\.([A-Za-z0-9_$]+)/g, content)
-  ]);
-  const functions = clipList([
-    ...extractMatches(/\bfunction\s+([A-Za-z0-9_$]+)/g, content),
-    ...extractMatches(/\bdef\s+([A-Za-z0-9_]+)/g, content),
-    ...extractMatches(/\bfunc\s+([A-Za-z0-9_]+)/g, content),
-    ...extractMatches(/\bfn\s+([A-Za-z0-9_]+)/g, content),
-    ...extractMatches(/^\s*(?:public|private|protected|internal)?\s*(?:static\s+)?[A-Za-z0-9_<>,[\]?]+\s+([A-Za-z0-9_]+)\s*\(/gm, content),
-    ...extractMatches(/^\s*function\s+([A-Za-z0-9_]+)/gm, content),
-    ...extractMatches(/^\s*def\s+([A-Za-z0-9_]+)/gm, content)
-  ]);
-  const classes = clipList([
-    ...extractMatches(/\bclass\s+([A-Za-z0-9_$]+)/g, content)
-  ]);
-  const calls = clipList([
-    ...extractMatches(/\b([A-Za-z0-9_$]+)\s*\(/g, content).filter((name) => !['if', 'for', 'while', 'switch', 'return', 'function', 'class', 'catch'].includes(name))
-  ], 64);
+    ...extractMatches(/import\s+(?:[^'"]*from\s+)?['"]([^'"]+)['"]/g, content),
+    ...extractMatches(/require\(\s*['"]([^'"]+)['"]\s*\)/g, content),
+    ...extractMatches(/\buse\s+([A-Za-z0-9_:\\]+)/g, ext === '.rs' ? content : '')
+  ]);
+  const exports = clipList([
+    ...extractMatches(/export\s+(?:async\s+)?function\s+([A-Za-z0-9_$]+)/g, content),
+    ...extractMatches(/export\s+class\s+([A-Za-z0-9_$]+)/g, content),
+    ...extractMatches(/export\s+const\s+([A-Za-z0-9_$]+)/g, content),
+    ...extractMatches(/module\.exports\s*=\s*([A-Za-z0-9_$]+)/g, content),
+    ...extractMatches(/exports\.([A-Za-z0-9_$]+)/g, content)
+  ]);
+  const functions = clipList([
+    ...extractMatches(/\bfunction\s+([A-Za-z0-9_$]+)/g, content),
+    ...extractMatches(/\bdef\s+([A-Za-z0-9_]+)/g, content),
+    ...extractMatches(/\bfunc\s+([A-Za-z0-9_]+)/g, content),
+    ...extractMatches(/\bfn\s+([A-Za-z0-9_]+)/g, content),
+    ...extractMatches(/^\s*(?:public|private|protected|internal)?\s*(?:static\s+)?[A-Za-z0-9_<>,[\]?]+\s+([A-Za-z0-9_]+)\s*\(/gm, content),
+    ...extractMatches(/^\s*function\s+([A-Za-z0-9_]+)/gm, content),
+    ...extractMatches(/^\s*def\s+([A-Za-z0-9_]+)/gm, content)
+  ]);
+  const classes = clipList([
+    ...extractMatches(/\bclass\s+([A-Za-z0-9_$]+)/g, content)
+  ]);
+  const calls = extractCallNames(content);
+  const symbols = extractSymbolDefinitions(relativePath, content, imports);
 
   return {
-    file: relativePath,
-    language: LANGUAGE_BY_EXT[ext] || 'text',
-    hash: sha256(content),
-    size: Number(stat?.size || content.length || 0),
-    mtimeMs: Number(stat?.mtimeMs || 0),
-    imports,
-    exports,
+    file: relativePath,
+    language: LANGUAGE_BY_EXT[ext] || 'text',
+    hash: sha256(content),
+    size: Number(stat?.size || content.length || 0),
+    mtimeMs: Number(stat?.mtimeMs || 0),
+    imports,
+    exports,
     functions,
     classes,
-    calls
+    calls,
+    symbols
   };
 }
-
-async function scanProject(cwd) {
-  const workspaceKind = await detectWorkspaceKind(cwd);
-  if (workspaceKind !== 'project') {
-    return {
-      workspaceKind,
-      projectMap: null,
-      fileIndex: null,
-      ignoreRules: []
-    };
-  }
-
-  const { gitignoreRules, llmignoreRules, combinedRules } = await readProjectIgnoreRules(cwd);
-  const allFiles = await walkFiles(cwd, cwd, [], combinedRules);
-  const relativeFiles = allFiles.map((filePath) => rel(cwd, filePath));
-  const sourceFiles = allFiles.filter((filePath) => SOURCE_EXTENSIONS.has(path.extname(filePath).toLowerCase()));
-
-  const packageJson = await safeReadJson(path.join(cwd, 'package.json'), null);
-  const tsconfigExists = Boolean(await safeStat(path.join(cwd, 'tsconfig.json')));
-  const sourceRoots = clipList(relativeFiles.filter((value) => /^(src|app|apps)\b/.test(value)).map((value) => value.split('/')[0]), 12);
-  const testRoots = clipList(relativeFiles.filter((value) => /^(tests|test|__tests__)\b/.test(value)).map((value) => value.split('/')[0]), 12);
-  const entryCandidates = clipList(
-    relativeFiles.filter((value) => /(^|\/)(main|index|server|app)\.(js|jsx|mjs|cjs|ts|tsx|py|go|rs|java|cs|php|rb)$/.test(value)),
-    16
-  );
-  const languages = clipList(sourceFiles.map((filePath) => LANGUAGE_BY_EXT[path.extname(filePath).toLowerCase()] || '').filter(Boolean), 16);
-  const importantFiles = clipList(
-    relativeFiles.filter((value) => ['package.json', 'tsconfig.json', 'pyproject.toml', 'go.mod', 'Cargo.toml', 'composer.json', 'Gemfile'].includes(value)),
-    16
-  );
-  const packageManagers = clipList([
-    packageJson ? 'npm' : '',
-    relativeFiles.includes('bun.lockb') ? 'bun' : '',
-    relativeFiles.includes('pnpm-lock.yaml') ? 'pnpm' : '',
-    relativeFiles.includes('yarn.lock') ? 'yarn' : ''
-  ].filter(Boolean));
-  const frameworkHints = clipList([
-    packageJson?.dependencies?.react || packageJson?.devDependencies?.react ? 'react' : '',
-    packageJson?.dependencies?.express ? 'express' : '',
-    packageJson?.dependencies?.vue ? 'vue' : '',
-    packageJson?.dependencies?.next ? 'next' : '',
-    tsconfigExists ? 'typescript' : ''
-  ].filter(Boolean));
-
-  const directories = {};
-  for (const value of relativeFiles) {
-    const dir = path.posix.dirname(value);
-    if (!dir || dir === '.') continue;
-    if (!(dir in directories)) directories[dir] = categorizeDirectory(dir);
-  }
-
-  const files = [];
+
+async function scanProject(cwd) {
+  const workspaceKind = await detectWorkspaceKind(cwd);
+  if (workspaceKind !== 'project') {
+    return {
+      workspaceKind,
+      projectMap: null,
+      fileIndex: null,
+      ignoreRules: []
+    };
+  }
+
+  const { gitignoreRules, llmignoreRules, combinedRules } = await readProjectIgnoreRules(cwd);
+  const allFiles = await walkFiles(cwd, cwd, [], combinedRules);
+  const relativeFiles = allFiles.map((filePath) => rel(cwd, filePath));
+  const sourceFiles = allFiles.filter((filePath) => SOURCE_EXTENSIONS.has(path.extname(filePath).toLowerCase()));
+
+  const packageJson = await safeReadJson(path.join(cwd, 'package.json'), null);
+  const tsconfigExists = Boolean(await safeStat(path.join(cwd, 'tsconfig.json')));
+  const sourceRoots = clipList(relativeFiles.filter((value) => /^(src|app|apps)\b/.test(value)).map((value) => value.split('/')[0]), 12);
+  const testRoots = clipList(relativeFiles.filter((value) => /^(tests|test|__tests__)\b/.test(value)).map((value) => value.split('/')[0]), 12);
+  const entryCandidates = clipList(
+    relativeFiles.filter((value) => /(^|\/)(main|index|server|app)\.(js|jsx|mjs|cjs|ts|tsx|py|go|rs|java|cs|php|rb)$/.test(value)),
+    16
+  );
+  const languages = clipList(sourceFiles.map((filePath) => LANGUAGE_BY_EXT[path.extname(filePath).toLowerCase()] || '').filter(Boolean), 16);
+  const importantFiles = clipList(
+    relativeFiles.filter((value) => ['package.json', 'tsconfig.json', 'pyproject.toml', 'go.mod', 'Cargo.toml', 'composer.json', 'Gemfile'].includes(value)),
+    16
+  );
+  const packageManagers = clipList([
+    packageJson ? 'npm' : '',
+    relativeFiles.includes('bun.lockb') ? 'bun' : '',
+    relativeFiles.includes('pnpm-lock.yaml') ? 'pnpm' : '',
+    relativeFiles.includes('yarn.lock') ? 'yarn' : ''
+  ].filter(Boolean));
+  const frameworkHints = clipList([
+    packageJson?.dependencies?.react || packageJson?.devDependencies?.react ? 'react' : '',
+    packageJson?.dependencies?.express ? 'express' : '',
+    packageJson?.dependencies?.vue ? 'vue' : '',
+    packageJson?.dependencies?.next ? 'next' : '',
+    tsconfigExists ? 'typescript' : ''
+  ].filter(Boolean));
+
+  const directories = {};
+  for (const value of relativeFiles) {
+    const dir = path.posix.dirname(value);
+    if (!dir || dir === '.') continue;
+    if (!(dir in directories)) directories[dir] = categorizeDirectory(dir);
+  }
+
+  let files = [];
   for (const filePath of sourceFiles) {
     const content = await fs.readFile(filePath, 'utf8');
     const stat = await fs.stat(filePath);
     files.push(buildFileEntry(rel(cwd, filePath), content, stat));
   }
-
-  return {
-    workspaceKind,
-    projectMap: {
-      projectRoot: cwd,
-      workspaceKind,
-      languages,
-      packageManagers,
-      importantFiles,
-      sourceRoots,
-      testRoots,
-      entryCandidates,
-      frameworkHints,
-      directories,
-      gitignoreEnabled: gitignoreRules.length > 0,
-      llmignoreEnabled: llmignoreRules.length > 0,
-      updatedAt: new Date().toISOString()
-    },
-    fileIndex: {
-      updatedAt: new Date().toISOString(),
-      files
-    },
-    ignoreRules: combinedRules
-  };
-}
-
-export async function initializeProjectIndex(cwd = process.cwd()) {
-  const targetRoot = (await findNearestProjectRoot(cwd, cwd)) || path.resolve(cwd);
-  const cacheKey = targetRoot;
-  if (initCache.has(cacheKey)) return initCache.get(cacheKey);
-  const promise = (async () => {
-    const workspaceDir = getProjectWorkspaceDir(cwd);
-    await fs.mkdir(workspaceDir, { recursive: true });
-    const { workspaceKind, projectMap, fileIndex } = await scanProject(targetRoot);
-    if (workspaceKind !== 'project' || !projectMap || !fileIndex) {
-      return {
-        workspaceKind,
-        projectRoot: null,
-        projectMap: null,
-        fileIndex: null,
-        summary: '',
-        skipped: true
-      };
-    }
-    await fs.mkdir(getProjectIndexDir(targetRoot), { recursive: true });
-    await writeJson(getProjectMapPath(targetRoot), projectMap);
-    await writeJson(getFileIndexPath(targetRoot), fileIndex);
-    return {
-      workspaceKind,
-      projectRoot: targetRoot,
-      projectMap,
-      fileIndex,
-      summary: `initialized ${path.basename(targetRoot) || '.'}/.codemini (${Array.isArray(fileIndex?.files) ? fileIndex.files.length : 0} files)`
-    };
-  })();
-  initCache.set(cacheKey, promise);
-  try {
-    return await promise;
-  } catch (error) {
-    initCache.delete(cacheKey);
-    throw error;
-  }
-}
-
-export async function refreshIndexedFile(cwd = process.cwd(), relativePath = '') {
-  if (!relativePath) return null;
-  const workspaceDir = getProjectWorkspaceDir(cwd);
-  await fs.mkdir(workspaceDir, { recursive: true });
-  const projectRoot = await findProjectRootFromFile(cwd, relativePath);
-  if (!projectRoot) return null;
-  const fileIndexPath = getFileIndexPath(projectRoot);
-  const { combinedRules } = await readProjectIgnoreRules(projectRoot);
-  const absolutePath = path.join(cwd, relativePath);
-  const stat = await safeStat(absolutePath);
-  let action = 'updated';
-  const projectRelativePath = path.relative(projectRoot, absolutePath).replace(/\\/g, '/');
-  const current = await safeReadJson(fileIndexPath, { updatedAt: '', files: [] });
-  const files = Array.isArray(current.files) ? [...current.files] : [];
-  const index = files.findIndex((entry) => entry.file === projectRelativePath);
-
-  if (shouldIgnorePath(projectRelativePath, Boolean(stat?.isDirectory?.()), combinedRules)) {
-    if (index >= 0) files.splice(index, 1);
-    action = 'removed';
-  } else if (!stat || !stat.isFile()) {
-    if (index >= 0) files.splice(index, 1);
-    action = 'removed';
-  } else {
-    const ext = path.extname(relativePath).toLowerCase();
-    if (!SOURCE_EXTENSIONS.has(ext)) {
-      if (index >= 0) files.splice(index, 1);
-      action = 'removed';
-    } else {
-      const content = await fs.readFile(absolutePath, 'utf8');
-      const nextEntry = buildFileEntry(projectRelativePath, content, stat);
-      if (index >= 0) {
-        files[index] = nextEntry;
-      } else {
-        files.push(nextEntry);
-        action = 'added';
-      }
-    }
-  }
-
+  files = enrichSymbolGraph(files);
+
+  return {
+    workspaceKind,
+    projectMap: {
+      projectRoot: cwd,
+      workspaceKind,
+      languages,
+      packageManagers,
+      importantFiles,
+      sourceRoots,
+      testRoots,
+      entryCandidates,
+      frameworkHints,
+      directories,
+      gitignoreEnabled: gitignoreRules.length > 0,
+      llmignoreEnabled: llmignoreRules.length > 0,
+      updatedAt: new Date().toISOString()
+    },
+    fileIndex: {
+      updatedAt: new Date().toISOString(),
+      files
+    },
+    ignoreRules: combinedRules
+  };
+}
+
+export async function initializeProjectIndex(cwd = process.cwd()) {
+  const targetRoot = (await findNearestProjectRoot(cwd, cwd)) || path.resolve(cwd);
+  const cacheKey = targetRoot;
+  if (initCache.has(cacheKey)) return initCache.get(cacheKey);
+  const promise = (async () => {
+    const workspaceDir = getProjectWorkspaceDir(cwd);
+    await fs.mkdir(workspaceDir, { recursive: true });
+    const { workspaceKind, projectMap, fileIndex } = await scanProject(targetRoot);
+    if (workspaceKind !== 'project' || !projectMap || !fileIndex) {
+      return {
+        workspaceKind,
+        projectRoot: null,
+        projectMap: null,
+        fileIndex: null,
+        summary: '',
+        skipped: true
+      };
+    }
+    await fs.mkdir(getProjectIndexDir(targetRoot), { recursive: true });
+    await writeJson(getProjectMapPath(targetRoot), projectMap);
+    await writeJson(getFileIndexPath(targetRoot), fileIndex);
+    return {
+      workspaceKind,
+      projectRoot: targetRoot,
+      projectMap,
+      fileIndex,
+      summary: `initialized ${path.basename(targetRoot) || '.'}/.codemini (${Array.isArray(fileIndex?.files) ? fileIndex.files.length : 0} files)`
+    };
+  })();
+  initCache.set(cacheKey, promise);
+  try {
+    return await promise;
+  } catch (error) {
+    initCache.delete(cacheKey);
+    throw error;
+  }
+}
+
+export async function refreshIndexedFile(cwd = process.cwd(), relativePath = '') {
+  if (!relativePath) return null;
+  const workspaceDir = getProjectWorkspaceDir(cwd);
+  await fs.mkdir(workspaceDir, { recursive: true });
+  const projectRoot = await findProjectRootFromFile(cwd, relativePath);
+  if (!projectRoot) return null;
+  const fileIndexPath = getFileIndexPath(projectRoot);
+  const { combinedRules } = await readProjectIgnoreRules(projectRoot);
+  const absolutePath = path.join(cwd, relativePath);
+  const stat = await safeStat(absolutePath);
+  let action = 'updated';
+  const projectRelativePath = path.relative(projectRoot, absolutePath).replace(/\\/g, '/');
+  const current = await safeReadJson(fileIndexPath, { updatedAt: '', files: [] });
+  const files = Array.isArray(current.files) ? [...current.files] : [];
+  const index = files.findIndex((entry) => entry.file === projectRelativePath);
+
+  if (shouldIgnorePath(projectRelativePath, Boolean(stat?.isDirectory?.()), combinedRules)) {
+    if (index >= 0) files.splice(index, 1);
+    action = 'removed';
+  } else if (!stat || !stat.isFile()) {
+    if (index >= 0) files.splice(index, 1);
+    action = 'removed';
+  } else {
+    const ext = path.extname(relativePath).toLowerCase();
+    if (!SOURCE_EXTENSIONS.has(ext)) {
+      if (index >= 0) files.splice(index, 1);
+      action = 'removed';
+    } else {
+      const content = await fs.readFile(absolutePath, 'utf8');
+      const nextEntry = buildFileEntry(projectRelativePath, content, stat);
+      if (index >= 0) {
+        files[index] = nextEntry;
+      } else {
+        files.push(nextEntry);
+        action = 'added';
+      }
+    }
+  }
+
+  const enrichedFiles = enrichSymbolGraph(files);
   await writeJson(fileIndexPath, {
     updatedAt: new Date().toISOString(),
-    files: files.sort((left, right) => left.file.localeCompare(right.file))
+    files: enrichedFiles.sort((left, right) => left.file.localeCompare(right.file))
   });
-
-  return {
-    path: projectRelativePath,
-    projectRoot,
-    action,
-    summary: `${action} ${path.basename(projectRoot) || '.'}/.codemini for ${projectRelativePath}`
-  };
-}
-
-export async function buildProjectContextSnippet(cwd = process.cwd(), userText = '') {
-  const indexedRoot = await findNearestIndexedProjectRoot(cwd, cwd);
-  if (!indexedRoot) return '';
-
-  const projectMap = await safeReadJson(getProjectMapPath(indexedRoot), null);
-  const fileIndex = await safeReadJson(getFileIndexPath(indexedRoot), null);
-  if (!projectMap || !Array.isArray(fileIndex?.files)) return '';
-
-  const lines = [
-    'Project Context:',
-    `- project_root: ${indexedRoot}`,
-    `- languages: ${(projectMap.languages || []).slice(0, 6).join(', ') || 'unknown'}`,
-    `- source_roots: ${(projectMap.sourceRoots || []).slice(0, 6).join(', ') || 'none'}`,
-    `- test_roots: ${(projectMap.testRoots || []).slice(0, 6).join(', ') || 'none'}`,
-    `- entry_candidates: ${(projectMap.entryCandidates || []).slice(0, 6).join(', ') || 'none'}`,
-    `- framework_hints: ${(projectMap.frameworkHints || []).slice(0, 6).join(', ') || 'none'}`
-  ];
-
-  const tokens = tokenizeQuery(userText);
-  const scored = [];
-  for (const entry of fileIndex.files) {
-    let score = 0;
-    const fileText = String(entry.file || '').toLowerCase();
-    for (const token of tokens) {
-      if (fileText.includes(token)) score += 5;
-      if ((entry.exports || []).some((value) => String(value).toLowerCase() === token)) score += 4;
-      if ((entry.functions || []).some((value) => String(value).toLowerCase() === token)) score += 4;
-      if ((entry.classes || []).some((value) => String(value).toLowerCase() === token)) score += 4;
-      if ((entry.imports || []).some((value) => String(value).toLowerCase().includes(token))) score += 1;
-    }
-    if (score > 0) scored.push({ entry, score });
-  }
-  scored.sort((left, right) => right.score - left.score || String(left.entry.file).localeCompare(String(right.entry.file)));
-  const selected = scored.slice(0, PROJECT_CONTEXT_MAX_FILES).map((item) => item.entry);
-  if (selected.length > 0) {
-    lines.push('- relevant_files:');
+
+  return {
+    path: projectRelativePath,
+    projectRoot,
+    action,
+    summary: `${action} ${path.basename(projectRoot) || '.'}/.codemini for ${projectRelativePath}`
+  };
+}
+
+export async function buildProjectContextSnippet(cwd = process.cwd(), userText = '') {
+  const indexedRoot = await findNearestIndexedProjectRoot(cwd, cwd);
+  if (!indexedRoot) return '';
+
+  const projectMap = await safeReadJson(getProjectMapPath(indexedRoot), null);
+  const fileIndex = await safeReadJson(getFileIndexPath(indexedRoot), null);
+  if (!projectMap || !Array.isArray(fileIndex?.files)) return '';
+
+  const lines = [
+    'Project Context:',
+    `- project_root: ${indexedRoot}`,
+    `- languages: ${(projectMap.languages || []).slice(0, 6).join(', ') || 'unknown'}`,
+    `- source_roots: ${(projectMap.sourceRoots || []).slice(0, 6).join(', ') || 'none'}`,
+    `- test_roots: ${(projectMap.testRoots || []).slice(0, 6).join(', ') || 'none'}`,
+    `- entry_candidates: ${(projectMap.entryCandidates || []).slice(0, 6).join(', ') || 'none'}`,
+    `- framework_hints: ${(projectMap.frameworkHints || []).slice(0, 6).join(', ') || 'none'}`
+  ];
+
+  const tokens = tokenizeQuery(userText);
+  const scored = [];
+  for (const entry of fileIndex.files) {
+    let score = 0;
+    const fileText = String(entry.file || '').toLowerCase();
+    for (const token of tokens) {
+      if (fileText.includes(token)) score += 5;
+      if ((entry.exports || []).some((value) => String(value).toLowerCase() === token)) score += 4;
+      if ((entry.functions || []).some((value) => String(value).toLowerCase() === token)) score += 4;
+      if ((entry.classes || []).some((value) => String(value).toLowerCase() === token)) score += 4;
+      if ((entry.imports || []).some((value) => String(value).toLowerCase().includes(token))) score += 1;
+    }
+    if (score > 0) scored.push({ entry, score });
+  }
+  scored.sort((left, right) => right.score - left.score || String(left.entry.file).localeCompare(String(right.entry.file)));
+  const selected = scored.slice(0, PROJECT_CONTEXT_MAX_FILES).map((item) => item.entry);
+  if (selected.length > 0) {
+    lines.push('- relevant_files:');
     for (const entry of selected) {
+      const symbolText = (entry.symbols || [])
+        .slice(0, 4)
+        .map((symbol) => `${symbol.name}@${symbol.range?.start_line || '?'}`)
+        .join(', ');
       lines.push(
-        `  - ${entry.file} :: exports=[${(entry.exports || []).slice(0, 4).join(', ')}] functions=[${(entry.functions || []).slice(0, 4).join(', ')}] classes=[${(entry.classes || []).slice(0, 4).join(', ')}]`
+        `  - ${entry.file} :: symbols=[${symbolText}] exports=[${(entry.exports || []).slice(0, 4).join(', ')}] classes=[${(entry.classes || []).slice(0, 4).join(', ')}]`
       );
     }
   }
-
-  const snippet = trimMultiline(lines.join('\n'));
-  return snippet;
-}
-
-export async function queryProjectIndex(cwd = process.cwd(), args = {}) {
-  const indexedRoot = await findNearestIndexedProjectRoot(cwd, cwd);
-  if (!indexedRoot) {
-    return {
-      query: String(args?.query || '').trim(),
-      project_root: '',
-      project_map: null,
-      matches: []
-    };
-  }
-
-  const projectMap = await safeReadJson(getProjectMapPath(indexedRoot), null);
-  const fileIndex = await safeReadJson(getFileIndexPath(indexedRoot), null);
-  const query = String(args?.query || '').trim();
-  const pathPrefix = normalizeRelativePath(args?.path || args?.path_prefix || '');
-  const languageFilter = String(args?.language || '').trim().toLowerCase();
-  const maxResults = Math.max(1, Math.min(20, Number(args?.max_results || 8) || 8));
-  const files = Array.isArray(fileIndex?.files) ? fileIndex.files : [];
-  const tokens = tokenizeQuery(query);
-
+
+  const snippet = trimMultiline(lines.join('\n'));
+  return snippet;
+}
+
+export async function queryProjectIndex(cwd = process.cwd(), args = {}) {
+  const indexedRoot = await findNearestIndexedProjectRoot(cwd, cwd);
+  if (!indexedRoot) {
+    return {
+      query: String(args?.query || '').trim(),
+      project_root: '',
+      project_map: null,
+      matches: []
+    };
+  }
+
+  const projectMap = await safeReadJson(getProjectMapPath(indexedRoot), null);
+  const fileIndex = await safeReadJson(getFileIndexPath(indexedRoot), null);
+  const query = String(args?.query || '').trim();
+  const pathPrefix = normalizeRelativePath(args?.path || args?.path_prefix || '');
+  const languageFilter = String(args?.language || '').trim().toLowerCase();
+  const maxResults = Math.max(1, Math.min(20, Number(args?.max_results || 8) || 8));
+  const files = Array.isArray(fileIndex?.files) ? fileIndex.files : [];
+  const tokens = tokenizeQuery(query);
+
   const matches = [];
   for (const entry of files) {
-    const relativePath = String(entry?.file || '');
-    if (!relativePath) continue;
-    if (pathPrefix && !relativePath.startsWith(pathPrefix)) continue;
-    if (languageFilter && String(entry?.language || '').toLowerCase() !== languageFilter) continue;
-
-    let score = 0;
-    const reasons = [];
-    const fileText = relativePath.toLowerCase();
+    const relativePath = String(entry?.file || '');
+    if (!relativePath) continue;
+    if (pathPrefix && !relativePath.startsWith(pathPrefix)) continue;
+    if (languageFilter && String(entry?.language || '').toLowerCase() !== languageFilter) continue;
+
+    let score = 0;
+    const reasons = [];
+    const fileText = relativePath.toLowerCase();
+    const symbolMatches = [];
     for (const token of tokens) {
       if (!token) continue;
       if (fileText.includes(token)) {
         score += 5;
-        reasons.push(`path:${token}`);
-      }
-      if ((entry.exports || []).some((value) => String(value).toLowerCase() === token)) {
-        score += 4;
-        reasons.push(`export:${token}`);
-      }
-      if ((entry.functions || []).some((value) => String(value).toLowerCase().includes(token))) {
-        score += 4;
-        reasons.push(`function:${token}`);
-      }
-      if ((entry.classes || []).some((value) => String(value).toLowerCase().includes(token))) {
-        score += 4;
-        reasons.push(`class:${token}`);
-      }
+        reasons.push(`path:${token}`);
+      }
+      if ((entry.exports || []).some((value) => String(value).toLowerCase() === token)) {
+        score += 4;
+        reasons.push(`export:${token}`);
+      }
+      if ((entry.functions || []).some((value) => String(value).toLowerCase().includes(token))) {
+        score += 4;
+        reasons.push(`function:${token}`);
+      }
+      if ((entry.classes || []).some((value) => String(value).toLowerCase().includes(token))) {
+        score += 4;
+        reasons.push(`class:${token}`);
+      }
       if ((entry.imports || []).some((value) => String(value).toLowerCase().includes(token))) {
         score += 2;
         reasons.push(`import:${token}`);
       }
+      for (const symbol of entry.symbols || []) {
+        const nameText = String(symbol.name || '').toLowerCase();
+        const idText = String(symbol.symbol_id || '').toLowerCase();
+        if (nameText.includes(token) || idText.includes(token)) {
+          score += 6;
+          reasons.push(`symbol:${token}`);
+          symbolMatches.push(symbol);
+        } else if ((symbol.calls || []).some((value) => String(value).toLowerCase().includes(token))) {
+          score += 3;
+          reasons.push(`calls:${token}`);
+          symbolMatches.push(symbol);
+        } else if ((symbol.called_by || []).some((value) => String(value).toLowerCase().includes(token))) {
+          score += 3;
+          reasons.push(`called_by:${token}`);
+          symbolMatches.push(symbol);
+        }
+      }
     }
-
-    if (!query) {
-      if ((projectMap?.entryCandidates || []).includes(relativePath)) score += 3;
-      if ((projectMap?.importantFiles || []).includes(relativePath)) score += 2;
-      if (String(relativePath).startsWith('src/')) score += 1;
-    }
-
-    if (score <= 0 && query) continue;
-    matches.push({
-      file: relativePath,
-      language: entry.language || 'text',
-      score,
-      reasons: clipList(reasons, 8),
+
+    if (!query) {
+      if ((projectMap?.entryCandidates || []).includes(relativePath)) score += 3;
+      if ((projectMap?.importantFiles || []).includes(relativePath)) score += 2;
+      if (String(relativePath).startsWith('src/')) score += 1;
+    }
+
+    if (score <= 0 && query) continue;
+    matches.push({
+      file: relativePath,
+      language: entry.language || 'text',
+      score,
+      reasons: clipList(reasons, 8),
       exports: clipList(entry.exports || [], 6),
       functions: clipList(entry.functions || [], 6),
       classes: clipList(entry.classes || [], 6),
-      imports: clipList(entry.imports || [], 6)
+      imports: clipList(entry.imports || [], 6),
+      symbols: clipList((symbolMatches.length > 0 ? symbolMatches : entry.symbols || []).map((symbol) => ({
+        symbol_id: symbol.symbol_id,
+        name: symbol.name,
+        type: symbol.type,
+        range: symbol.range,
+        signature: symbol.signature,
+        calls: clipList(symbol.calls || [], 8),
+        called_by: clipList(symbol.called_by || [], 8),
+        imports: clipList(symbol.imports || [], 6),
+        writes: clipList(symbol.writes || [], 6),
+        emits: clipList(symbol.emits || [], 6)
+      })), 6)
     });
   }
-
-  matches.sort((left, right) => right.score - left.score || String(left.file).localeCompare(String(right.file)));
-
-  return {
-    query,
-    project_root: indexedRoot,
-    project_map: projectMap
-      ? {
-          workspace_kind: projectMap.workspaceKind || 'project',
-          languages: clipList(projectMap.languages || [], 8),
-          package_managers: clipList(projectMap.packageManagers || [], 8),
-          important_files: clipList(projectMap.importantFiles || [], 8),
-          source_roots: clipList(projectMap.sourceRoots || [], 8),
-          test_roots: clipList(projectMap.testRoots || [], 8),
-          entry_candidates: clipList(projectMap.entryCandidates || [], 8),
-          framework_hints: clipList(projectMap.frameworkHints || [], 8),
-          gitignore_enabled: Boolean(projectMap.gitignoreEnabled),
-          llmignore_enabled: Boolean(projectMap.llmignoreEnabled)
-        }
-      : null,
-    matches: matches.slice(0, maxResults)
-  };
-}
+
+  matches.sort((left, right) => right.score - left.score || String(left.file).localeCompare(String(right.file)));
+
+  return {
+    query,
+    project_root: indexedRoot,
+    project_map: projectMap
+      ? {
+          workspace_kind: projectMap.workspaceKind || 'project',
+          languages: clipList(projectMap.languages || [], 8),
+          package_managers: clipList(projectMap.packageManagers || [], 8),
+          important_files: clipList(projectMap.importantFiles || [], 8),
+          source_roots: clipList(projectMap.sourceRoots || [], 8),
+          test_roots: clipList(projectMap.testRoots || [], 8),
+          entry_candidates: clipList(projectMap.entryCandidates || [], 8),
+          framework_hints: clipList(projectMap.frameworkHints || [], 8),
+          gitignore_enabled: Boolean(projectMap.gitignoreEnabled),
+          llmignore_enabled: Boolean(projectMap.llmignoreEnabled)
+        }
+      : null,
+    matches: matches.slice(0, maxResults)
+  };
+}