scip-query 0.4.2 → 0.4.3

package/dist/cli.js

@@ -20,18 +20,10 @@ var ScipDatabase = class {
     this.db = new Database(config.dbPath, { readonly: true });
     this.db.pragma("busy_timeout = 5000");
   }
-  /** Attach a gitignore-based path filter for query results */
-  setPathFilter(filter) {
-    this.pathFilter = filter;
-  }
   /** Check if a path should be excluded based on .gitignore rules */
   isIgnored(relativePath) {
     return this.pathFilter?.isIgnored(relativePath) ?? false;
   }
-  /** Filter an array of paths using the gitignore filter */
-  filterPaths(paths) {
-    return this.pathFilter?.filter(paths) ?? paths;
-  }
   /**
    * The local-symbol predicate: only match symbols that are defined
    * in files NOT excluded by gitignore. This replaces the old hardcoded
@@ -1323,10 +1315,6 @@ var Watcher = class {
     if (this.cooldownTimer) clearTimeout(this.cooldownTimer);
     this.setStatus({ state: "idle" });
   }
-  /** Get current watcher status */
-  getStatus() {
-    return this.status;
-  }
   // ── Internal ─────────────────────────────────────────────
   handleFileChange(filename) {
     const rel = relative2(this.projectRoot, join7(this.projectRoot, filename));
@@ -1479,12 +1467,20 @@ function stats(db) {
 }
 
 // src/queries/files.ts
+function globToLike(pattern) {
+  const hasGlobChars = /[*?]/.test(pattern);
+  if (!hasGlobChars) {
+    return `%${pattern}%`;
+  }
+  return pattern.replace(/\*\*/g, "%").replace(/\*/g, "%").replace(/\?/g, "_");
+}
 function files(db, pattern) {
+  const likePattern = globToLike(pattern);
   const rows = db.all(
     `SELECT relative_path FROM documents
      WHERE relative_path LIKE ?
      ORDER BY relative_path`,
-    `%${pattern}%`
+    likePattern
   );
   return rows.filter((r) => !db.isIgnored(r.relative_path)).map((r) => ({ relativePath: r.relative_path }));
 }
@@ -2539,44 +2535,55 @@ function getCachedMap(cache, db) {
 function normalizePath(path2) {
   return path2.replace(/\\/g, "/");
 }
+var LANGUAGE_EXTENSION_FAMILIES = [
+  SOURCE_EXTENSIONS,
+  PYTHON_SOURCE_EXTENSIONS,
+  JVM_SOURCE_EXTENSIONS,
+  RUST_SOURCE_EXTENSIONS,
+  RUBY_SOURCE_EXTENSIONS,
+  C_LIKE_SOURCE_EXTENSIONS,
+  DOTNET_SOURCE_EXTENSIONS,
+  DART_SOURCE_EXTENSIONS,
+  PHP_SOURCE_EXTENSIONS
+];
+function hasExtensionIn(relativePath, extensions) {
+  return extensions.includes(extname3(relativePath).toLowerCase());
+}
 function isJavaScriptSourcePath(relativePath) {
-  return SOURCE_EXTENSIONS.includes(extname3(relativePath).toLowerCase());
+  return hasExtensionIn(relativePath, SOURCE_EXTENSIONS);
 }
 function isPythonSourcePath(relativePath) {
-  return PYTHON_SOURCE_EXTENSIONS.includes(extname3(relativePath).toLowerCase());
+  return hasExtensionIn(relativePath, PYTHON_SOURCE_EXTENSIONS);
 }
 function isJvmSourcePath(relativePath) {
-  return JVM_SOURCE_EXTENSIONS.includes(extname3(relativePath).toLowerCase());
+  return hasExtensionIn(relativePath, JVM_SOURCE_EXTENSIONS);
 }
 function isRustSourcePath(relativePath) {
-  return RUST_SOURCE_EXTENSIONS.includes(extname3(relativePath).toLowerCase());
+  return hasExtensionIn(relativePath, RUST_SOURCE_EXTENSIONS);
 }
 function isRubySourcePath(relativePath) {
-  return RUBY_SOURCE_EXTENSIONS.includes(extname3(relativePath).toLowerCase());
+  return hasExtensionIn(relativePath, RUBY_SOURCE_EXTENSIONS);
 }
 function isCLikeSourcePath(relativePath) {
-  return C_LIKE_SOURCE_EXTENSIONS.includes(extname3(relativePath).toLowerCase());
+  return hasExtensionIn(relativePath, C_LIKE_SOURCE_EXTENSIONS);
 }
 function isDotNetSourcePath(relativePath) {
-  return DOTNET_SOURCE_EXTENSIONS.includes(extname3(relativePath).toLowerCase());
+  return hasExtensionIn(relativePath, DOTNET_SOURCE_EXTENSIONS);
 }
 function isVisualBasicSourcePath(relativePath) {
   return extname3(relativePath).toLowerCase() === ".vb";
 }
 function isDartSourcePath(relativePath) {
-  return DART_SOURCE_EXTENSIONS.includes(extname3(relativePath).toLowerCase());
+  return hasExtensionIn(relativePath, DART_SOURCE_EXTENSIONS);
 }
 function isPhpSourcePath(relativePath) {
-  return PHP_SOURCE_EXTENSIONS.includes(extname3(relativePath).toLowerCase());
+  return hasExtensionIn(relativePath, PHP_SOURCE_EXTENSIONS);
 }
 function extensionFamilyFor(relativePath) {
-  if (isJvmSourcePath(relativePath)) return JVM_SOURCE_EXTENSIONS;
-  if (isDotNetSourcePath(relativePath)) return DOTNET_SOURCE_EXTENSIONS;
-  if (isPhpSourcePath(relativePath)) return PHP_SOURCE_EXTENSIONS;
-  if (isDartSourcePath(relativePath)) return DART_SOURCE_EXTENSIONS;
-  if (isCLikeSourcePath(relativePath)) return C_LIKE_SOURCE_EXTENSIONS;
-  if (isRustSourcePath(relativePath)) return RUST_SOURCE_EXTENSIONS;
-  if (isRubySourcePath(relativePath)) return RUBY_SOURCE_EXTENSIONS;
+  const ext = extname3(relativePath).toLowerCase();
+  for (const family of LANGUAGE_EXTENSION_FAMILIES) {
+    if (family.includes(ext)) return family;
+  }
   return SOURCE_EXTENSIONS;
 }
 function getSourceText(db, relativePath) {
@@ -2778,6 +2785,9 @@ function leafSuffix(raw) {
   const last = sym.descriptors[sym.descriptors.length - 1];
   return last?.suffix ?? null;
 }
+function isCallableSymbol(raw) {
+  return raw.endsWith("().") || leafSuffix(raw) === "method";
+}
 function isFunctionLikeSymbol(raw) {
   const suffix = leafSuffix(raw);
   return suffix === "method" || suffix === "term";
@@ -3231,56 +3241,41 @@ function findEnclosingDefinition(definitions, line) {
   }
   return best;
 }
-function getPythonSourceCalleeRows(db, symbol, limit) {
-  const match = getFullSymbolMatch(db, symbol);
-  if (!match || !isPythonDocument(db, match.relativePath)) {
-    return [];
-  }
-  const definitions = getDefinitionsForFile(db, match.relativePath);
-  const current = definitions.find((definition) => definition.symbolId === match.symbolId);
-  if (!current) {
-    return [];
-  }
-  const imports2 = getSourceImports(db, match.relativePath);
-  const bindings = new Map(
-    getSourceConstructorBindings(db, match.relativePath, {
-      startLine: match.startLine,
-      endLine: match.endLine
-    }).map((binding) => [binding.localName, binding.typeName])
-  );
-  const rows = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const call of getSourceCalls(db, match.relativePath, {
-    startLine: match.startLine,
-    endLine: match.endLine
-  })) {
-    const resolved = resolvePythonCallTarget(
-      db,
-      current,
-      definitions,
-      imports2,
-      bindings,
-      call.receiverName,
-      call.calleeName
-    );
-    if (!resolved || resolved.symbolId === match.symbolId || db.isIgnored(resolved.relativePath)) continue;
-    const chunkId = 1e9 + call.line;
-    const key = `${resolved.symbol}|${resolved.relativePath}|${chunkId}`;
-    if (seen.has(key)) continue;
-    seen.add(key);
-    rows.push({
-      symbol: resolved.symbol,
-      file: resolved.relativePath,
-      chunkId
-    });
-  }
-  return applyLimit(rows, limit);
-}
-function getJavaScriptSourceCalleeRows(db, symbol, limit) {
-  const match = getFullSymbolMatch(db, symbol);
-  if (!match || !isJavaScriptDocument(db, match.relativePath)) {
-    return [];
-  }
+var LANGUAGE_CALLEE_CONFIGS = [
+  // Python (index 0) — complex resolver
+  { kind: "complex", languageIndex: 0, resolver: resolvePythonCallTarget },
+  // JavaScript/TypeScript (index 1) — complex resolver
+  { kind: "complex", languageIndex: 1, resolver: resolveJavaScriptCallTarget },
+  // Java (index 2) — simple with field bindings
+  { kind: "simple", languageIndex: 2, parseBindings: (_db, source) => parseJavaFieldBindings(source) },
+  // Kotlin (index 3) — simple with field bindings
+  { kind: "simple", languageIndex: 3, parseBindings: (_db, source) => parseKotlinFieldBindings(source) },
+  // Scala (index 4) — simple, no bindings
+  { kind: "simple", languageIndex: 4, parseBindings: null },
+  // C# (index 5) — simple, no bindings
+  { kind: "simple", languageIndex: 5, parseBindings: null },
+  // Visual Basic (index 6) — simple, no bindings
+  { kind: "simple", languageIndex: 6, parseBindings: null },
+  // C++ (index 7) — simple with receiver bindings
+  { kind: "simple", languageIndex: 7, parseBindings: (_db, source) => parseCppReceiverBindings(source) },
+  // Rust (index 8) — simple, no bindings
+  { kind: "simple", languageIndex: 8, parseBindings: null },
+  // Ruby (index 9) — simple with dual-attempt logic
+  {
+    kind: "simple",
+    languageIndex: 9,
+    parseBindings: (db, source) => parseRubyReceiverBindings(db, source),
+    dualAttempt: {
+      baseOpts: { allowInstanceVariables: true },
+      extendedOpts: { allowInstanceVariables: true, allowBareMemberCalls: true }
+    }
+  },
+  // Dart (index 10) — simple, no bindings
+  { kind: "simple", languageIndex: 10, parseBindings: null },
+  // PHP (index 11) — simple, no bindings
+  { kind: "simple", languageIndex: 11, parseBindings: null }
+];
+function getComplexSourceCalleeRows(db, match, config, limit) {
   const definitions = getDefinitionsForFile(db, match.relativePath);
   const current = definitions.find((definition) => definition.symbolId === match.symbolId);
   if (!current) {
@@ -3299,7 +3294,7 @@ function getJavaScriptSourceCalleeRows(db, symbol, limit) {
     startLine: match.startLine,
     endLine: match.endLine
   })) {
-    const resolved = resolveJavaScriptCallTarget(
+    const resolved = config.resolver(
       db,
       current,
       definitions,
@@ -3321,134 +3316,31 @@ function getJavaScriptSourceCalleeRows(db, symbol, limit) {
   }
   return applyLimit(rows, limit);
 }
-function getJavaSourceCalleeRows(db, symbol, limit) {
-  const match = getFullSymbolMatch(db, symbol);
-  if (!match || !isJavaDocument(db, match.relativePath)) {
-    return [];
-  }
-  const calls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine);
-  const bindings = parseJavaFieldBindings(getSourceText(db, match.relativePath));
-  return resolveSimpleSourceCallees(db, match, calls, bindings, limit);
-}
-function getKotlinSourceCalleeRows(db, symbol, limit) {
-  const match = getFullSymbolMatch(db, symbol);
-  if (!match || !isKotlinDocument(db, match.relativePath)) {
-    return [];
-  }
-  const calls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine);
-  const bindings = parseKotlinFieldBindings(getSourceText(db, match.relativePath));
-  return resolveSimpleSourceCallees(db, match, calls, bindings, limit);
-}
-function getScalaSourceCalleeRows(db, symbol, limit) {
-  const match = getFullSymbolMatch(db, symbol);
-  if (!match || !isScalaDocument(db, match.relativePath)) {
-    return [];
-  }
-  const calls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine);
-  return resolveSimpleSourceCallees(db, match, calls, /* @__PURE__ */ new Map(), limit);
-}
-function getCSharpSourceCalleeRows(db, symbol, limit) {
-  const match = getFullSymbolMatch(db, symbol);
-  if (!match || !isCSharpDocument(db, match.relativePath)) {
-    return [];
-  }
-  const calls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine);
-  return resolveSimpleSourceCallees(db, match, calls, /* @__PURE__ */ new Map(), limit);
-}
-function getVisualBasicSourceCalleeRows(db, symbol, limit) {
-  const match = getFullSymbolMatch(db, symbol);
-  if (!match || !isVisualBasicDocument(db, match.relativePath)) {
-    return [];
-  }
-  const calls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine);
-  return resolveSimpleSourceCallees(db, match, calls, /* @__PURE__ */ new Map(), limit);
-}
-function getCppSourceCalleeRows(db, symbol, limit) {
-  const match = getFullSymbolMatch(db, symbol);
-  if (!match || !isCppDocument(db, match.relativePath)) {
-    return [];
+function getSimpleLanguageCalleeRows(db, match, config, limit) {
+  let calls;
+  if (config.dualAttempt) {
+    const baseCalls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine, config.dualAttempt.baseOpts);
+    const extendedCalls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine, config.dualAttempt.extendedOpts);
+    calls = extendedCalls.length > 0 ? extendedCalls : baseCalls;
+  } else {
+    calls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine, config.sourceCallOpts);
   }
-  const calls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine);
-  const bindings = parseCppReceiverBindings(getSourceText(db, match.relativePath));
+  const bindings = config.parseBindings ? config.parseBindings(db, getSourceText(db, match.relativePath)) : /* @__PURE__ */ new Map();
   return resolveSimpleSourceCallees(db, match, calls, bindings, limit);
 }
-function getRustSourceCalleeRows(db, symbol, limit) {
-  const match = getFullSymbolMatch(db, symbol);
-  if (!match || !isRustDocument(db, match.relativePath)) {
-    return [];
-  }
-  const calls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine);
-  return resolveSimpleSourceCallees(db, match, calls, /* @__PURE__ */ new Map(), limit);
-}
-function getRubySourceCalleeRows(db, symbol, limit) {
-  const match = getFullSymbolMatch(db, symbol);
-  if (!match || !isRubyDocument(db, match.relativePath)) {
-    return [];
-  }
-  const calls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine, { allowInstanceVariables: true });
-  const rubyCalls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine, {
-    allowInstanceVariables: true,
-    allowBareMemberCalls: true
-  });
-  const bindings = parseRubyReceiverBindings(db, getSourceText(db, match.relativePath));
-  return resolveSimpleSourceCallees(db, match, rubyCalls.length > 0 ? rubyCalls : calls, bindings, limit);
-}
-function getDartSourceCalleeRows(db, symbol, limit) {
-  const match = getFullSymbolMatch(db, symbol);
-  if (!match || !isDartDocument(db, match.relativePath)) {
-    return [];
-  }
-  const calls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine);
-  return resolveSimpleSourceCallees(db, match, calls, /* @__PURE__ */ new Map(), limit);
-}
-function getPhpSourceCalleeRows(db, symbol, limit) {
-  const match = getFullSymbolMatch(db, symbol);
-  if (!match || !isPhpDocument(db, match.relativePath)) {
-    return [];
-  }
-  const calls = getSimpleSourceCalls(db, match.relativePath, match.startLine, match.endLine);
-  return resolveSimpleSourceCallees(db, match, calls, /* @__PURE__ */ new Map(), limit);
-}
 function getSourceBackedCalleeRows(db, symbol, limit) {
   const match = getFullSymbolMatch(db, symbol);
   if (!match) {
     return [];
   }
-  if (isPythonDocument(db, match.relativePath)) {
-    return getPythonSourceCalleeRows(db, match, limit);
-  }
-  if (isJavaScriptDocument(db, match.relativePath)) {
-    return getJavaScriptSourceCalleeRows(db, match, limit);
-  }
-  if (isJavaDocument(db, match.relativePath)) {
-    return getJavaSourceCalleeRows(db, match, limit);
-  }
-  if (isScalaDocument(db, match.relativePath)) {
-    return getScalaSourceCalleeRows(db, match, limit);
-  }
-  if (isKotlinDocument(db, match.relativePath)) {
-    return getKotlinSourceCalleeRows(db, match, limit);
-  }
-  if (isCSharpDocument(db, match.relativePath)) {
-    return getCSharpSourceCalleeRows(db, match, limit);
-  }
-  if (isVisualBasicDocument(db, match.relativePath)) {
-    return getVisualBasicSourceCalleeRows(db, match, limit);
-  }
-  if (isCppDocument(db, match.relativePath)) {
-    return getCppSourceCalleeRows(db, match, limit);
-  }
-  if (isRustDocument(db, match.relativePath)) {
-    return getRustSourceCalleeRows(db, match, limit);
-  }
-  if (isRubyDocument(db, match.relativePath)) {
-    return getRubySourceCalleeRows(db, match, limit);
-  }
-  if (isDartDocument(db, match.relativePath)) {
-    return getDartSourceCalleeRows(db, match, limit);
-  }
-  if (isPhpDocument(db, match.relativePath)) {
-    return getPhpSourceCalleeRows(db, match, limit);
+  for (const config of LANGUAGE_CALLEE_CONFIGS) {
+    if (!isDocumentLanguage(db, match.relativePath, DOCUMENT_LANGUAGE_TABLE[config.languageIndex])) {
+      continue;
+    }
+    if (config.kind === "complex") {
+      return getComplexSourceCalleeRows(db, match, config, limit);
+    }
+    return getSimpleLanguageCalleeRows(db, match, config, limit);
   }
   return [];
 }
@@ -3458,9 +3350,11 @@ function getPythonSourceCallerRows(db, target, limit) {
   }
   const rows = [];
   const seen = /* @__PURE__ */ new Set();
+  const pythonConfig = LANGUAGE_CALLEE_CONFIGS[0];
   for (const candidate of getAllFunctionLikeDefinitions(db)) {
     if (candidate.symbolId === target.symbolId) continue;
-    const callees = getPythonSourceCalleeRows(db, candidate);
+    if (!isDocumentLanguage(db, candidate.relativePath, DOCUMENT_LANGUAGE_TABLE[pythonConfig.languageIndex])) continue;
+    const callees = getComplexSourceCalleeRows(db, candidate, pythonConfig);
     if (!callees.some((callee) => callee.symbol === target.symbol)) continue;
     const key = `${candidate.symbol}|${candidate.relativePath}`;
     if (seen.has(key) || db.isIgnored(candidate.relativePath)) continue;
@@ -3802,6 +3696,17 @@ function getAllDefinitions(db, opts = {}) {
   );
   return rows.filter((row) => !db.isIgnored(row.relative_path)).flatMap((row) => getDefinitionsForFile(db, row.relative_path));
 }
+function getScopedDefinitions(db, scope) {
+  const scopeFilter = scope ? `AND relative_path LIKE '%${scope}%'` : "";
+  return db.all(
+    `SELECT relative_path
+     FROM documents
+     WHERE 1 = 1
+       ${db.pathExclusionsFor("documents")}
+       ${scopeFilter}
+     ORDER BY relative_path`
+  ).flatMap((row) => getDefinitionsForFile(db, row.relative_path)).filter((row) => !db.isIgnored(row.relativePath));
+}
 function getAllFunctionLikeDefinitions(db) {
   return getAllDefinitions(db).filter((definition) => definition.isFunctionLike);
 }
@@ -4219,89 +4124,29 @@ function parentTypeName(rawSymbol) {
   }
   return null;
 }
-function isPythonDocument(db, relativePath) {
-  const row = db.get(
-    `SELECT language FROM documents WHERE relative_path = ? LIMIT 1`,
-    relativePath
-  );
-  return row?.language === "python" || relativePath.endsWith(".py") || relativePath.endsWith(".pyi");
-}
-function isJavaScriptDocument(db, relativePath) {
-  const row = db.get(
-    `SELECT language FROM documents WHERE relative_path = ? LIMIT 1`,
-    relativePath
-  );
-  return row?.language === "typescript" || row?.language === "javascript" || /\.(?:[cm]?[jt]sx?)$/.test(relativePath);
-}
-function isJavaDocument(db, relativePath) {
-  const row = db.get(
-    `SELECT language FROM documents WHERE relative_path = ? LIMIT 1`,
-    relativePath
-  );
-  return row?.language === "java" || relativePath.endsWith(".java");
-}
-function isKotlinDocument(db, relativePath) {
-  const row = db.get(
-    `SELECT language FROM documents WHERE relative_path = ? LIMIT 1`,
-    relativePath
-  );
-  return row?.language === "kotlin" || relativePath.endsWith(".kt") || relativePath.endsWith(".kts");
-}
-function isScalaDocument(db, relativePath) {
-  const row = db.get(
-    `SELECT language FROM documents WHERE relative_path = ? LIMIT 1`,
-    relativePath
-  );
-  return row?.language === "scala" || relativePath.endsWith(".scala");
-}
-function isCSharpDocument(db, relativePath) {
-  const row = db.get(
-    `SELECT language FROM documents WHERE relative_path = ? LIMIT 1`,
-    relativePath
-  );
-  return row?.language === "C#" || relativePath.endsWith(".cs");
-}
-function isVisualBasicDocument(db, relativePath) {
-  const row = db.get(
-    `SELECT language FROM documents WHERE relative_path = ? LIMIT 1`,
-    relativePath
-  );
-  return row?.language === "Visual Basic" || relativePath.endsWith(".vb");
-}
-function isCppDocument(db, relativePath) {
-  const row = db.get(
-    `SELECT language FROM documents WHERE relative_path = ? LIMIT 1`,
-    relativePath
-  );
-  return row?.language === "CPP" || /\.(?:cc|cpp|cxx|hpp|hh|hxx)$/.test(relativePath);
-}
-function isRustDocument(db, relativePath) {
-  const row = db.get(
-    `SELECT language FROM documents WHERE relative_path = ? LIMIT 1`,
-    relativePath
-  );
-  return row?.language === "Rust" || relativePath.endsWith(".rs");
-}
-function isRubyDocument(db, relativePath) {
-  const row = db.get(
-    `SELECT language FROM documents WHERE relative_path = ? LIMIT 1`,
-    relativePath
-  );
-  return row?.language === "ruby" || relativePath.endsWith(".rb");
-}
-function isDartDocument(db, relativePath) {
+var DOCUMENT_LANGUAGE_TABLE = [
+  { languages: ["python"], extensionPattern: /\.(?:py|pyi)$/ },
+  { languages: ["typescript", "javascript"], extensionPattern: /\.(?:[cm]?[jt]sx?)$/ },
+  { languages: ["java"], extensionPattern: /\.java$/ },
+  { languages: ["kotlin"], extensionPattern: /\.(?:kt|kts)$/ },
+  { languages: ["scala"], extensionPattern: /\.scala$/ },
+  { languages: ["C#"], extensionPattern: /\.cs$/ },
+  { languages: ["Visual Basic"], extensionPattern: /\.vb$/ },
+  { languages: ["CPP"], extensionPattern: /\.(?:cc|cpp|cxx|hpp|hh|hxx)$/ },
+  { languages: ["Rust"], extensionPattern: /\.rs$/ },
+  { languages: ["ruby"], extensionPattern: /\.rb$/ },
+  { languages: ["Dart"], extensionPattern: /\.dart$/ },
+  { languages: ["PHP"], extensionPattern: /\.php$/ }
+];
+function isDocumentLanguage(db, relativePath, entry) {
   const row = db.get(
     `SELECT language FROM documents WHERE relative_path = ? LIMIT 1`,
     relativePath
   );
-  return row?.language === "Dart" || relativePath.endsWith(".dart");
+  return entry.languages.includes(row?.language ?? "") || entry.extensionPattern.test(relativePath);
 }
-function isPhpDocument(db, relativePath) {
-  const row = db.get(
-    `SELECT language FROM documents WHERE relative_path = ? LIMIT 1`,
-    relativePath
-  );
-  return row?.language === "PHP" || relativePath.endsWith(".php");
+function isPythonDocument(db, relativePath) {
+  return isDocumentLanguage(db, relativePath, DOCUMENT_LANGUAGE_TABLE[0]);
 }
 function applyLimit(values, limit) {
   return typeof limit === "number" ? values.slice(0, limit) : values;
@@ -4403,9 +4248,6 @@ function methods(db, className) {
     name: leafName(definition.symbol)
   }));
 }
-function isCallableSymbol(rawSymbol) {
-  return rawSymbol.endsWith("().") || leafSuffix(rawSymbol) === "method";
-}
 function stripExtension(relativePath) {
   return relativePath.replace(/\.[^.]+$/, "");
 }
@@ -4743,7 +4585,7 @@ function surface(db, modulePattern) {
     ...matchedPaths
   );
   const exposedDefinitions = matchedPaths.flatMap(
-    (relativePath) => getDefinitionsForFile(db, relativePath).filter((definition) => isCallableSymbol2(definition.symbol)).map((definition) => ({
+    (relativePath) => getDefinitionsForFile(db, relativePath).filter((definition) => isCallableSymbol(definition.symbol)).map((definition) => ({
       relative_path: relativePath,
       symbol: definition.symbol
     }))
@@ -4760,9 +4602,6 @@ function surface(db, modulePattern) {
     shortName: shortenSymbol(r.symbol)
   }));
 }
-function isCallableSymbol2(rawSymbol) {
-  return rawSymbol.endsWith("().") || leafSuffix(rawSymbol) === "method";
-}
 
 // src/entry-surfaces.ts
 var liveBarrelCache = /* @__PURE__ */ new WeakMap();
@@ -5148,22 +4987,37 @@ function outline(db, filePattern) {
     ORDER BY d.relative_path, der.start_line`,
     ...resolvedPaths
   );
+  const nodes = rows.map((r) => ({
+    symbol: r.symbol,
+    shortName: shortenSymbol(r.symbol),
+    startLine: r.start_line,
+    endLine: r.end_line,
+    children: []
+  }));
   const nodeMap = /* @__PURE__ */ new Map();
+  for (const n of nodes) nodeMap.set(n.symbol, n);
   const roots = [];
-  for (const r of rows) {
-    const node = {
-      symbol: r.symbol,
-      shortName: shortenSymbol(r.symbol),
-      startLine: r.start_line,
-      endLine: r.end_line,
-      children: []
-    };
-    nodeMap.set(r.symbol, node);
-  }
-  for (const r of rows) {
-    const node = nodeMap.get(r.symbol);
+  for (let i = 0; i < rows.length; i++) {
+    const r = rows[i];
+    const node = nodes[i];
     if (r.enclosing_symbol && nodeMap.has(r.enclosing_symbol)) {
       nodeMap.get(r.enclosing_symbol).children.push(node);
+      continue;
+    }
+    let bestParent = null;
+    let bestSize = Infinity;
+    for (const candidate of nodes) {
+      if (candidate === node) continue;
+      if (candidate.startLine <= node.startLine && candidate.endLine >= node.endLine) {
+        const size = candidate.endLine - candidate.startLine;
+        if (size < bestSize) {
+          bestSize = size;
+          bestParent = candidate;
+        }
+      }
+    }
+    if (bestParent) {
+      bestParent.children.push(node);
     } else {
       roots.push(node);
     }
@@ -5885,7 +5739,7 @@ function similar(db, symbolPattern, opts = {}) {
   return similarBySourceShape(db, symbolPattern, { minSimilarity, limit });
 }
 function similarAll(db, opts = {}) {
-  const { minSimilarity = 0.5, limit = 20, scope, minCallees = 4 } = opts;
+  const { minSimilarity = 0.5, limit = 20, scope, minCallees = 4, crossFileOnly = false } = opts;
   const all = getAllCalleeFingerprints(db, { minCallees, scope });
   const idfWeights = computeIdf(all);
   const results = [];
@@ -5893,14 +5747,16 @@ function similarAll(db, opts = {}) {
     for (let j = i + 1; j < all.length; j++) {
       const a = all[i];
       const b = all[j];
-      if (a.file === b.file) continue;
+      if (crossFileOnly && a.file === b.file) continue;
       const { similarity, significantShared } = weightedSimilarity(
         a.callees,
         b.callees,
         idfWeights
       );
       if (similarity < minSimilarity) continue;
-      if (significantShared.length < 2) continue;
+      const sharedCount = intersection(a.callees, b.callees).size;
+      if (significantShared.length < 2 && sharedCount < 4) continue;
+      const displayShared = significantShared.length > 0 ? significantShared : [...intersection(a.callees, b.callees)];
       results.push({
         symbolA: a.symbol,
         shortNameA: shortenSymbol(a.symbol),
@@ -5909,7 +5765,7 @@ function similarAll(db, opts = {}) {
         shortNameB: shortenSymbol(b.symbol),
         fileB: b.file,
         similarity,
-        sharedCallees: significantShared.map(shortenSymbol),
+        sharedCallees: displayShared.map(shortenSymbol),
         uniqueToA: [...difference(a.callees, b.callees)].map(shortenSymbol),
         uniqueToB: [...difference(b.callees, a.callees)].map(shortenSymbol)
       });
@@ -6539,17 +6395,6 @@ function extractCandidates(db, opts = {}) {
   results.sort((a, b) => b.clusters.length - a.clusters.length || b.loc - a.loc);
   return results.slice(0, limit);
 }
-function getScopedDefinitions(db, scope) {
-  const scopeFilter = scope ? `AND relative_path LIKE '%${scope}%'` : "";
-  return db.all(
-    `SELECT relative_path
-     FROM documents
-     WHERE 1 = 1
-       ${db.pathExclusionsFor("documents")}
-       ${scopeFilter}
-     ORDER BY relative_path`
-  ).flatMap((row) => getDefinitionsForFile(db, row.relative_path)).filter((row) => !db.isIgnored(row.relativePath));
-}
 function definitionLoc(definition) {
   return definition.endLine - definition.startLine + 1;
 }
@@ -6993,7 +6838,7 @@ import { basename as basename5, extname as extname4 } from "path";
 function wrapperCandidates(db, opts) {
   const { scope, maxLoc = 15, limit = 30 } = opts ?? {};
   const reverseFanIn = buildReverseFileFanIn(buildFileDepGraph(db, scope));
-  const symbols2 = getScopedDefinitions2(db, scope).filter((definition) => definitionLoc2(definition) <= maxLoc && definitionLoc2(definition) >= 2);
+  const symbols2 = getScopedDefinitions(db, scope).filter((definition) => definitionLoc2(definition) <= maxLoc && definitionLoc2(definition) >= 2);
   const results = [];
   for (const symbol of symbols2) {
     if (db.isIgnored(symbol.relativePath) || !isFunctionLikeSymbol(symbol.symbol)) continue;
@@ -7032,17 +6877,6 @@ function wrapperCandidates(db, opts) {
 function definitionLoc2(definition) {
   return definition.endLine - definition.startLine + 1;
 }
-function getScopedDefinitions2(db, scope) {
-  const scopeFilter = scope ? `AND relative_path LIKE '%${scope}%'` : "";
-  return db.all(
-    `SELECT relative_path
-     FROM documents
-     WHERE 1 = 1
-       ${db.pathExclusionsFor("documents")}
-       ${scopeFilter}
-     ORDER BY relative_path`
-  ).flatMap((row) => getDefinitionsForFile(db, row.relative_path)).filter((row) => !db.isIgnored(row.relativePath));
-}
 function dedupeRows(rows) {
   const seen = /* @__PURE__ */ new Set();
   const unique = [];
@@ -7092,7 +6926,7 @@ function fallbackCallerFanIn(db, reverseFanIn, callerFile) {
 // src/queries/passthrough-candidates.ts
 function passthroughCandidates(db, opts) {
   const { scope, maxLoc = 15, limit = 30 } = opts ?? {};
-  const symbols2 = getScopedDefinitions3(db, scope).filter((definition) => definitionLoc3(definition) >= 3 && definitionLoc3(definition) <= maxLoc);
+  const symbols2 = getScopedDefinitions(db, scope).filter((definition) => definitionLoc3(definition) >= 3 && definitionLoc3(definition) <= maxLoc);
   const results = [];
   for (const sym of symbols2) {
     if (db.isIgnored(sym.relativePath) || !isFunctionLikeSymbol(sym.symbol)) continue;
@@ -7121,17 +6955,6 @@ function passthroughCandidates(db, opts) {
   results.sort((a, b) => a.loc - b.loc || a.file.localeCompare(b.file));
   return results.slice(0, limit);
 }
-function getScopedDefinitions3(db, scope) {
-  const scopeFilter = scope ? `AND relative_path LIKE '%${scope}%'` : "";
-  return db.all(
-    `SELECT relative_path
-     FROM documents
-     WHERE 1 = 1
-       ${db.pathExclusionsFor("documents")}
-       ${scopeFilter}
-     ORDER BY relative_path`
-  ).flatMap((row) => getDefinitionsForFile(db, row.relative_path)).filter((row) => !db.isIgnored(row.relativePath));
-}
 function definitionLoc3(definition) {
   return definition.endLine - definition.startLine + 1;
 }
@@ -7139,7 +6962,7 @@ function definitionLoc3(definition) {
 // src/queries/stale-abstractions.ts
 function staleAbstractions(db, opts) {
   const { scope, minLoc = 3, limit = 30 } = opts ?? {};
-  const rows = getScopedDefinitions4(db, scope).filter((definition) => definition.isTypeLike && definitionLoc4(definition) >= minLoc).map((definition) => ({
+  const rows = getScopedDefinitions(db, scope).filter((definition) => definition.isTypeLike && definitionLoc4(definition) >= minLoc).map((definition) => ({
     symbol: definition.symbol,
     file: definition.relativePath,
     start_line: definition.startLine,
@@ -7159,7 +6982,7 @@ function staleAbstractions(db, opts) {
   })).slice(0, limit);
 }
 function getFilesWithFunctions(db, scope) {
-  return new Set(getScopedDefinitions4(db, scope).filter((definition) => definition.isFunctionLike).map((definition) => definition.relativePath));
+  return new Set(getScopedDefinitions(db, scope).filter((definition) => definition.isFunctionLike).map((definition) => definition.relativePath));
 }
 function isTrueStaleAbstraction(row, filesWithFunctions) {
   const basename6 = row.file.split("/").pop() ?? "";
@@ -7172,17 +6995,6 @@ function isTrueStaleAbstraction(row, filesWithFunctions) {
   }
   return true;
 }
-function getScopedDefinitions4(db, scope) {
-  const scopeFilter = scope ? `AND relative_path LIKE '%${scope}%'` : "";
-  return db.all(
-    `SELECT relative_path
-     FROM documents
-     WHERE 1 = 1
-       ${db.pathExclusionsFor("documents")}
-       ${scopeFilter}
-     ORDER BY relative_path`
-  ).flatMap((row) => getDefinitionsForFile(db, row.relative_path)).filter((row) => !db.isIgnored(row.relativePath));
-}
 function countCrossFileConsumers(db, definition) {
   const callers = db.all(
     `SELECT DISTINCT d.relative_path
@@ -7590,9 +7402,11 @@ function code(db, symbolPattern, opts = {}) {
     symbol: match.symbol,
     shortName: shortenSymbol(match.symbol),
     relativePath: match.relativePath,
-    startLine: startLine + 1,
-    // 1-indexed for display
-    endLine: endLine + 1,
+    // 0-indexed, like every other query result. The CLI's displayLine()
+    // converts once at render time. Returning 1-indexed here caused a
+    // double-conversion in the CLI and printed labels off by +1.
+    startLine,
+    endLine,
     language: doc?.language ?? null,
     source
   };
@@ -7620,8 +7434,8 @@ function readFileRange(db, filePath, startLine, endLine, context) {
     symbol: `${doc.relative_path}:${startLine}-${endLine}`,
     shortName: `${doc.relative_path}:${startLine}-${endLine}`,
     relativePath: doc.relative_path,
-    startLine: start + 1,
-    endLine: end + 1,
+    startLine: start,
+    endLine: end,
     language: doc.language,
     source
   };
@@ -7801,28 +7615,40 @@ function uniqueSymbolRows(rows) {
 
 // src/queries/slice.ts
 function slice(db, symbolPattern, opts = {}) {
-  const { direction = "backward" } = opts;
+  const { direction = "backward", maxDepth = 3 } = opts;
   const match = findFirstSymbolMatch(db, symbolPattern);
   if (!match) return null;
   if (direction === "backward") {
-    return backwardSlice(db, match);
+    return backwardSlice(db, match, maxDepth);
   } else {
     return forwardSlice(db, match);
   }
 }
-function backwardSlice(db, match) {
-  const callees = getCalleeRowsForSymbol(db, match);
-  const seen = /* @__PURE__ */ new Set();
+function backwardSlice(db, match, maxDepth) {
   const connected = [];
-  for (const c of callees) {
-    if (seen.has(c.symbol)) continue;
-    seen.add(c.symbol);
-    connected.push({
-      symbol: c.symbol,
-      shortName: shortenSymbol(c.symbol),
-      file: c.file,
-      relationship: "referenced within definition (callee)"
-    });
+  const visited = /* @__PURE__ */ new Set([match.symbol]);
+  let frontier = [match];
+  for (let depth = 1; depth <= maxDepth; depth++) {
+    if (frontier.length === 0) break;
+    const nextFrontier = [];
+    for (const current of frontier) {
+      const callees = getCalleeRowsForSymbol(db, current);
+      for (const c of callees) {
+        if (visited.has(c.symbol)) continue;
+        visited.add(c.symbol);
+        connected.push({
+          symbol: c.symbol,
+          shortName: shortenSymbol(c.symbol),
+          file: c.file,
+          relationship: depth === 1 ? "referenced within definition (callee)" : `depth ${depth} callee`
+        });
+        const calleeMatch = findExactSymbolMatch(db, c.symbol);
+        if (calleeMatch && !db.isIgnored(calleeMatch.relativePath)) {
+          nextFrontier.push(calleeMatch);
+        }
+      }
+    }
+    frontier = nextFrontier;
   }
   return {
     symbol: match.symbol,
@@ -8833,7 +8659,7 @@ program.command("call-graph <symbol>").description("Show incoming callers and ou
     }
   );
 });
-program.command("similar [symbol]").description("Find functions with similar callee fingerprints (consolidation candidates)").option("--min-similarity <n>", "Minimum Jaccard similarity (0-1)", parseFloat, 0.4).option("-n, --limit <n>", "Number of results", parseIntSafe, 20).option("-s, --scope <path>", "Limit to files matching path").option("--min-callees <n>", "Minimum callees to consider", parseIntSafe, 4).action((symbol, opts) => {
+program.command("similar [symbol]").description("Find functions with similar callee fingerprints (consolidation candidates)").option("--min-similarity <n>", "Minimum Jaccard similarity (0-1)", parseFloat, 0.4).option("-n, --limit <n>", "Number of results", parseIntSafe, 20).option("-s, --scope <path>", "Limit to files matching path").option("--min-callees <n>", "Minimum callees to consider", parseIntSafe, 4).option("--cross-file-only", "Only show cross-file pairs (skip same-file matches)").action((symbol, opts) => {
   withDb((db) => {
     if (symbol) {
       const results = queries.similar(db, symbol, {
@@ -8858,7 +8684,8 @@ ${Math.round(r.similarity * 100)}% similar:`);
         minSimilarity: opts.minSimilarity,
         limit: opts.limit,
         scope: opts.scope,
-        minCallees: opts.minCallees
+        minCallees: opts.minCallees,
+        crossFileOnly: opts.crossFileOnly
       });
       if (results.length === 0) {
         console.log("No similar symbol pairs found.");
@@ -9253,10 +9080,10 @@ program.command("dataflow <symbol>").description("Reference-level dataflow: defi
   }
   db.close();
 });
-program.command("slice <symbol>").description("Reference-level program slice: what affects this (backward) or what this affects (forward)").option("--forward", "Forward slice (what does this affect). Default is backward.").action((symbol, opts) => {
+program.command("slice <symbol>").description("Reference-level program slice: what affects this (backward) or what this affects (forward)").option("--forward", "Forward slice (what does this affect). Default is backward.").option("--depth <n>", "Max transitive depth for backward slice", parseIntSafe, 3).action((symbol, opts) => {
   const db = openDb();
   const direction = opts.forward ? "forward" : "backward";
-  const result = queries.slice(db, symbol, { direction });
+  const result = queries.slice(db, symbol, { direction, maxDepth: opts.depth });
   if (!result) {
     console.log("Symbol not found.");
     db.close();