scip-query 0.4.1 → 0.4.3

package/dist/{db-C4rPbKkI.d.ts → db-6F9R9e_t.d.ts}

@@ -628,12 +628,8 @@ declare class ScipDatabase {
     readonly config: ScipQueryConfig;
     private pathFilter;
     constructor(config: ScipQueryConfig, pathFilter?: PathFilter);
-    /** Attach a gitignore-based path filter for query results */
-    setPathFilter(filter: PathFilter): void;
     /** Check if a path should be excluded based on .gitignore rules */
     isIgnored(relativePath: string): boolean;
-    /** Filter an array of paths using the gitignore filter */
-    filterPaths(paths: string[]): string[];
     /**
      * The local-symbol predicate: only match symbols that are defined
      * in files NOT excluded by gitignore. This replaces the old hardcoded

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { N as ScipSymbol, Q as ScipLocalSymbol, V as SupportedLanguage, X as IndexerConfig, Y as ProjectConfig, Z as WatcherStatus } from './db-C4rPbKkI.js';
-export { A as AffectedResult, B as BottleneckResult, a as ByKindResult, C as CallGraphResult, _ as ChangeSurfaceEntry, b as ChangeSurfaceResult, c as CodeResult, d as ComplexityHotspot, e as ComplexityResult, f as ConvergenceResult, g as CouplingResult, h as CycleResult, D as DataflowResult, i as DeadOptions, j as DeadSummary, $ as DeadSymbolResult, k as DeepChainResult, l as DepResult, a0 as DescriptorSuffix, m as DiffImpactResult, a1 as DriftResult, n as DriftSummary, E as ExtractCandidate, F as FanResult, o as FileResult, a2 as HealthAction, H as HealthReport, p as HierarchyNode, q as HotspotResult, I as ImportResult, a3 as IndexerOverrides, a4 as InstallMethod, r as IsolatedResult, M as MemberResult, s as MethodResult, O as OutlineNode, P as PassthroughCandidate, K as RedundantReexport, R as RefResult, S as ScipDatabase, a5 as ScipDescriptor, a6 as ScipQueryConfig, z as SimilarChainResult, y as SimilarFileResult, L as SimilarSignatureGroup, x as SimilarSymbolResult, J as SliceResult, G as StaleAbstraction, t as StatsResult, w as SurfaceResult, u as SymbolResult, v as SystemResult, T as TraceResult, U as UnusedImportResult, a7 as WatchConfig, W as WrapperCandidate, a8 as createGitignoreFilter } from './db-C4rPbKkI.js';
+import { N as ScipSymbol, Q as ScipLocalSymbol, V as SupportedLanguage, X as IndexerConfig, Y as ProjectConfig, Z as WatcherStatus } from './db-6F9R9e_t.js';
+export { A as AffectedResult, B as BottleneckResult, a as ByKindResult, C as CallGraphResult, _ as ChangeSurfaceEntry, b as ChangeSurfaceResult, c as CodeResult, d as ComplexityHotspot, e as ComplexityResult, f as ConvergenceResult, g as CouplingResult, h as CycleResult, D as DataflowResult, i as DeadOptions, j as DeadSummary, $ as DeadSymbolResult, k as DeepChainResult, l as DepResult, a0 as DescriptorSuffix, m as DiffImpactResult, a1 as DriftResult, n as DriftSummary, E as ExtractCandidate, F as FanResult, o as FileResult, a2 as HealthAction, H as HealthReport, p as HierarchyNode, q as HotspotResult, I as ImportResult, a3 as IndexerOverrides, a4 as InstallMethod, r as IsolatedResult, M as MemberResult, s as MethodResult, O as OutlineNode, P as PassthroughCandidate, K as RedundantReexport, R as RefResult, S as ScipDatabase, a5 as ScipDescriptor, a6 as ScipQueryConfig, z as SimilarChainResult, y as SimilarFileResult, L as SimilarSignatureGroup, x as SimilarSymbolResult, J as SliceResult, G as StaleAbstraction, t as StatsResult, w as SurfaceResult, u as SymbolResult, v as SystemResult, T as TraceResult, U as UnusedImportResult, a7 as WatchConfig, W as WrapperCandidate, a8 as createGitignoreFilter } from './db-6F9R9e_t.js';
 export { stats } from './queries/stats.js';
 export { files } from './queries/files.js';
 export { symbols } from './queries/symbols.js';
@@ -43,6 +43,7 @@ export { dataflow } from './queries/dataflow.js';
 export { slice } from './queries/slice.js';
 export { redundantReexports } from './queries/redundant-reexports.js';
 export { similarSignatures } from './queries/similar-signatures.js';
+import { Index } from '@c4312/scip';
 import 'better-sqlite3';
 
 /**
@@ -88,6 +89,22 @@ declare const INDEXER_CONFIGS: Record<SupportedLanguage, IndexerConfig>;
 /** Get the indexer config for a language */
 declare function getIndexerConfig(language: SupportedLanguage): IndexerConfig;
 
+interface MergeScipResult {
+    documentCount: number;
+    externalSymbolCount: number;
+    inputCount: number;
+}
+/**
+ * Merge multiple SCIP indices into a single index message.
+ *
+ * A SCIP index is a code graph snapshot: metadata about one indexed project plus
+ * the documents and external symbols discovered by one or more indexers. Merging
+ * means producing one unified snapshot so later conversion to SQLite sees the
+ * whole repo instead of whichever language indexed last.
+ */
+declare function mergeScipIndexes(indexes: readonly Index[]): Index;
+declare function mergeScipFiles(inputPaths: readonly string[], outputPath: string): MergeScipResult;
+
 /**
  * Check if a binary is available on PATH.
  */
@@ -224,8 +241,6 @@ declare class Watcher {
     start(): void;
     /** Stop watching and clean up */
     stop(): void;
-    /** Get current watcher status */
-    getStatus(): WatcherStatus;
     private handleFileChange;
     private triggerReindex;
     /**
@@ -250,4 +265,4 @@ declare function installSkills(opts?: {
     quiet?: boolean;
 }): InstallSkillsResult;
 
-export { INDEXER_CONFIGS, IndexerConfig, ProjectConfig, ScipLocalSymbol, ScipSymbol, SupportedLanguage, Watcher, WatcherStatus, detectLanguages, getIndexerConfig, getScipVersion, initProjectConfig, installSkills, isBinaryAvailable, isIndexerInstalled, isScipInstalled, leafName, loadProjectConfig, parseSymbol, printScipInstallInstructions, reindex, resolveCacheDir, resolveIndexPaths, shortenSymbol, tryInstallIndexer, tryInstallScipCli };
+export { INDEXER_CONFIGS, IndexerConfig, ProjectConfig, ScipLocalSymbol, ScipSymbol, SupportedLanguage, Watcher, WatcherStatus, detectLanguages, getIndexerConfig, getScipVersion, initProjectConfig, installSkills, isBinaryAvailable, isIndexerInstalled, isScipInstalled, leafName, loadProjectConfig, mergeScipFiles, mergeScipIndexes, parseSymbol, printScipInstallInstructions, reindex, resolveCacheDir, resolveIndexPaths, shortenSymbol, tryInstallIndexer, tryInstallScipCli };

package/dist/index.js

@@ -1,150 +1,150 @@
 import "./chunk-FVH3Y44U.js";
 import {
   surface
-} from "./chunk-UJWI5CBB.js";
+} from "./chunk-NNFP4ZRF.js";
 import {
   symbols
-} from "./chunk-SYQR4QGK.js";
+} from "./chunk-B747RITP.js";
 import {
   system
-} from "./chunk-POLELLNM.js";
+} from "./chunk-PSK5BPFE.js";
 import {
   trace
-} from "./chunk-ZVZAIIB5.js";
+} from "./chunk-NYZ6INK3.js";
 import {
   redundantReexports
-} from "./chunk-TWVXFKJA.js";
+} from "./chunk-R2QBMQQN.js";
 import {
   refs
-} from "./chunk-J6QXMYAQ.js";
+} from "./chunk-VJMTX3OR.js";
 import {
   similarChains
-} from "./chunk-QMXSLHZP.js";
+} from "./chunk-T6UVM534.js";
 import {
   similarFiles
-} from "./chunk-RE7POFGI.js";
+} from "./chunk-E74RY6AQ.js";
 import {
   similarSignatures
-} from "./chunk-7BS4CPJX.js";
+} from "./chunk-HESWGDIV.js";
 import {
   slice
-} from "./chunk-5GCORUNV.js";
+} from "./chunk-T3ALCNCP.js";
 import {
   hotspots
-} from "./chunk-VY2L4TP6.js";
+} from "./chunk-J34HAAEQ.js";
 import {
   importedBy,
   imports,
   unusedImports
-} from "./chunk-DUJNJQPO.js";
+} from "./chunk-YQIWS5V6.js";
 import {
   members
-} from "./chunk-GNAMV3JC.js";
+} from "./chunk-NML6M5AS.js";
 import {
   methods
-} from "./chunk-FVJE4MQL.js";
+} from "./chunk-HL2LXSBW.js";
 import {
   outline
-} from "./chunk-KYPXKV64.js";
+} from "./chunk-ZPEI7DRJ.js";
 import {
   deps,
   rdeps
-} from "./chunk-RJ5GULL6.js";
+} from "./chunk-IC5NTO47.js";
 import {
   diffImpact
-} from "./chunk-PCU455MX.js";
+} from "./chunk-JSXGC2EH.js";
 import {
   fanIn,
   fanOut,
   topFanIn,
   topFanOut
-} from "./chunk-24LF6IZB.js";
+} from "./chunk-4YN3PE57.js";
 import {
   files
-} from "./chunk-MGNMHKX3.js";
+} from "./chunk-FO2CBB7U.js";
 import {
   health
-} from "./chunk-JHVQB4Y5.js";
+} from "./chunk-334PCFO3.js";
 import {
   stats
 } from "./chunk-74RFWB5T.js";
 import {
   wrapperCandidates
-} from "./chunk-PU2254N2.js";
+} from "./chunk-7OGXSMLY.js";
 import {
   similar,
   similarAll
-} from "./chunk-6CH23IAS.js";
+} from "./chunk-QZ4FRB65.js";
 import {
   staleAbstractions
-} from "./chunk-SVLUJSY7.js";
+} from "./chunk-XJSPWHNT.js";
 import {
   isolated
-} from "./chunk-XUVPQDXW.js";
+} from "./chunk-UIRCHPOU.js";
 import {
   passthroughCandidates
-} from "./chunk-6ECR2FLR.js";
+} from "./chunk-NWXTQGUE.js";
 import {
   drift
-} from "./chunk-RL74LF47.js";
+} from "./chunk-FIMTTUGE.js";
 import {
   extractCandidates
-} from "./chunk-3NJSJ7TE.js";
+} from "./chunk-5YB6UXQ3.js";
 import {
   hierarchy
-} from "./chunk-R7HPHMRZ.js";
+} from "./chunk-AEBM56CO.js";
 import {
   complexityHotspots
-} from "./chunk-ELFGD5EW.js";
+} from "./chunk-Y7FKURZG.js";
 import {
   complexity
-} from "./chunk-A6XLXV6W.js";
+} from "./chunk-B7LDMCUS.js";
 import {
   convergence
-} from "./chunk-J47VSL6I.js";
+} from "./chunk-PKDFXASW.js";
 import {
   coupling,
   topCoupling
-} from "./chunk-W46L2BXT.js";
+} from "./chunk-XMZAC2VU.js";
 import {
   cycles
-} from "./chunk-OXX3QF24.js";
+} from "./chunk-46ZTW4AI.js";
 import {
   dataflow
-} from "./chunk-EAGKJFDX.js";
+} from "./chunk-7KGTWDAX.js";
 import {
   dead
-} from "./chunk-KLNKDX6A.js";
-import "./chunk-JKXHHV4B.js";
+} from "./chunk-C2VSV54P.js";
+import "./chunk-OMVF3BHY.js";
 import {
   deepChains
-} from "./chunk-Z5VSUOEE.js";
+} from "./chunk-6PVHJ332.js";
 import {
   affected
-} from "./chunk-NXUIWD6K.js";
+} from "./chunk-LQXBFCP2.js";
 import {
   bottlenecks
-} from "./chunk-CBIWNZZZ.js";
+} from "./chunk-PGQXIAJF.js";
 import {
   byKind,
   kindCounts
-} from "./chunk-KG4OFQEN.js";
+} from "./chunk-HW76DVE4.js";
 import {
   callGraph
-} from "./chunk-6UZU7DFL.js";
+} from "./chunk-U74VYTLX.js";
 import {
   changeSurface
-} from "./chunk-43A4UCS7.js";
+} from "./chunk-UNS6ZQVX.js";
 import "./chunk-4TYLS5XX.js";
 import {
   code
-} from "./chunk-VKBOLNYN.js";
-import "./chunk-ALUFWH3U.js";
+} from "./chunk-DIYEUFVP.js";
+import "./chunk-FMAYH7GS.js";
 import {
   leafName,
   parseSymbol,
   shortenSymbol
-} from "./chunk-TO3L4YNK.js";
+} from "./chunk-YMSJCSRG.js";
 
 // src/db.ts
 import Database from "better-sqlite3";
@@ -159,18 +159,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
@@ -254,7 +246,7 @@ var ScipDatabase = class {
 // src/gitignore-filter.ts
 import ignore from "ignore";
 import { readFileSync, existsSync } from "fs";
-import { join, dirname } from "path";
+import { dirname, isAbsolute, join, relative, resolve } from "path";
 function createGitignoreFilter(projectRoot) {
   const ig = ignore();
   let loaded = false;
@@ -271,8 +263,8 @@ function createGitignoreFilter(projectRoot) {
     ig.add(DEFAULT_IGNORES);
   }
   return {
-    isIgnored: (relativePath) => ig.ignores(relativePath),
-    filter: (paths) => paths.filter((p) => !ig.ignores(p))
+    isIgnored: (relativePath) => safeIgnores(ig, projectRoot, relativePath),
+    filter: (paths) => paths.filter((p) => !safeIgnores(ig, projectRoot, p))
   };
 }
 function findGitignoreFiles(projectRoot) {
@@ -352,11 +344,36 @@ Thumbs.db
 # Type definitions (often noise in queries)
 *.d.ts
 `;
+function safeIgnores(ig, projectRoot, inputPath) {
+  const relativePath = normalizeForIgnore(projectRoot, inputPath);
+  if (!relativePath) {
+    return false;
+  }
+  try {
+    return ig.ignores(relativePath);
+  } catch {
+    return false;
+  }
+}
+function normalizeForIgnore(projectRoot, inputPath) {
+  if (!inputPath || inputPath === ".") {
+    return null;
+  }
+  if (!isAbsolute(inputPath) && !inputPath.startsWith("..")) {
+    return inputPath.replaceAll("\\", "/");
+  }
+  const absolutePath = isAbsolute(inputPath) ? inputPath : resolve(projectRoot, inputPath);
+  const relativePath = relative(projectRoot, absolutePath).replaceAll("\\", "/");
+  if (!relativePath || relativePath === "." || relativePath.startsWith("..")) {
+    return null;
+  }
+  return relativePath;
+}
 
 // src/reindex/index.ts
 import { execFileSync as execFileSync3 } from "child_process";
-import { existsSync as existsSync5, renameSync } from "fs";
-import { join as join5 } from "path";
+import { existsSync as existsSync5, renameSync, rmSync } from "fs";
+import { basename, dirname as dirname2, extname as extname2, join as join5 } from "path";
 
 // src/scip-cli.ts
 import { execFileSync as execFileSync2 } from "child_process";
@@ -991,6 +1008,128 @@ function resolveDotnetProject(projectRoot, suffixes) {
   return null;
 }
 
+// src/reindex/merge.ts
+import { readFileSync as readFileSync2, writeFileSync } from "fs";
+import { create } from "@bufbuild/protobuf";
+import {
+  deserializeSCIP,
+  serializeSCIP,
+  DocumentSchema,
+  IndexSchema,
+  SymbolInformationSchema
+} from "@c4312/scip";
+function mergeScipIndexes(indexes) {
+  if (indexes.length === 0) {
+    throw new Error("Cannot merge zero SCIP indexes");
+  }
+  if (indexes.length === 1) {
+    return indexes[0];
+  }
+  const metadata = mergeMetadata(indexes);
+  const documents = mergeDocuments(indexes.flatMap((index) => index.documents ?? []));
+  const externalSymbols = mergeSymbolInfos(indexes.flatMap((index) => index.externalSymbols ?? []));
+  return create(IndexSchema, {
+    metadata,
+    documents,
+    externalSymbols
+  });
+}
+function mergeScipFiles(inputPaths, outputPath) {
+  if (inputPaths.length === 0) {
+    throw new Error("Cannot merge zero SCIP files");
+  }
+  const indexes = inputPaths.map((path) => deserializeSCIP(readFileSync2(path)));
+  const merged = mergeScipIndexes(indexes);
+  writeFileSync(outputPath, Buffer.from(serializeSCIP(merged)));
+  return {
+    documentCount: merged.documents.length,
+    externalSymbolCount: merged.externalSymbols.length,
+    inputCount: inputPaths.length
+  };
+}
+function mergeMetadata(indexes) {
+  const first = indexes[0]?.metadata;
+  if (!first) {
+    return void 0;
+  }
+  const expectedProjectRoot = first.projectRoot;
+  for (const index of indexes.slice(1)) {
+    const actualProjectRoot = index.metadata?.projectRoot;
+    if (expectedProjectRoot && actualProjectRoot && actualProjectRoot !== expectedProjectRoot) {
+      throw new Error(
+        `Cannot merge SCIP indexes with different project roots: ${expectedProjectRoot} vs ${actualProjectRoot}`
+      );
+    }
+  }
+  return first;
+}
+function mergeDocuments(documents) {
+  const byPath = /* @__PURE__ */ new Map();
+  for (const document of documents) {
+    const existing = byPath.get(document.relativePath);
+    if (!existing) {
+      byPath.set(document.relativePath, document);
+      continue;
+    }
+    byPath.set(document.relativePath, create(DocumentSchema, {
+      language: existing.language || document.language,
+      relativePath: existing.relativePath || document.relativePath,
+      occurrences: [...existing.occurrences, ...document.occurrences],
+      symbols: mergeSymbolInfos([...existing.symbols, ...document.symbols]),
+      text: chooseText(existing.text, document.text),
+      positionEncoding: existing.positionEncoding || document.positionEncoding
+    }));
+  }
+  return [...byPath.values()];
+}
+function mergeSymbolInfos(symbols2) {
+  const bySymbol = /* @__PURE__ */ new Map();
+  for (const symbol of symbols2) {
+    const existing = bySymbol.get(symbol.symbol);
+    if (!existing) {
+      bySymbol.set(symbol.symbol, symbol);
+      continue;
+    }
+    bySymbol.set(symbol.symbol, create(SymbolInformationSchema, {
+      symbol: existing.symbol,
+      documentation: uniqueStrings([...existing.documentation, ...symbol.documentation]),
+      relationships: mergeRelationships([...existing.relationships, ...symbol.relationships]),
+      kind: existing.kind || symbol.kind,
+      displayName: existing.displayName || symbol.displayName,
+      enclosingSymbol: existing.enclosingSymbol || symbol.enclosingSymbol,
+      signatureDocumentation: existing.signatureDocumentation ?? symbol.signatureDocumentation
+    }));
+  }
+  return [...bySymbol.values()];
+}
+function mergeRelationships(relationships) {
+  const seen = /* @__PURE__ */ new Set();
+  const merged = [];
+  for (const relationship of relationships) {
+    const key = [
+      relationship.symbol,
+      relationship.isReference ? "1" : "0",
+      relationship.isImplementation ? "1" : "0",
+      relationship.isTypeDefinition ? "1" : "0",
+      relationship.isDefinition ? "1" : "0"
+    ].join("|");
+    if (seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    merged.push(relationship);
+  }
+  return merged;
+}
+function chooseText(left, right) {
+  if (!left) return right;
+  if (!right) return left;
+  return left.length >= right.length ? left : right;
+}
+function uniqueStrings(values) {
+  return [...new Set(values)];
+}
+
 // src/reindex/index.ts
 async function reindex(opts) {
   const {
@@ -1026,7 +1165,11 @@ async function reindex(opts) {
     ...process.env,
     NODE_OPTIONS: `--max-old-space-size=${maxHeapMb}`
   };
-  for (const lang of languages) {
+  const languageOutputs = languages.map((language, index) => ({
+    language,
+    scipPath: languages.length > 1 ? tempScipPath(outputScip, language, index) : outputScip
+  }));
+  for (const { language: lang, scipPath } of languageOutputs) {
     const config = getIndexerConfig(lang);
     const binaryLabel = describeIndexerBinary(config);
     const projectLocalBinary = resolveProjectLocalIndexerBinary(config, projectRoot);
@@ -1056,7 +1199,7 @@ async function reindex(opts) {
     const indexerEnv = getIndexerExecutionEnv(config, env, resolvedBinary);
     const { binary, args } = config.indexArgs({
       projectRoot,
-      outputPath: outputScip,
+      outputPath: scipPath,
       pnpmWorkspaces: opts.pnpmWorkspaces,
       indexerBinary: resolvedBinary
     });
@@ -1075,7 +1218,11 @@ Make sure ${binaryLabel} is installed and available on PATH.`,
         { cause: err }
       );
     }
-    moveDefaultOutputIfNeeded(config, projectRoot, outputScip);
+    moveDefaultOutputIfNeeded(config, projectRoot, scipPath);
+  }
+  if (languageOutputs.length > 1) {
+    onStatus(`Merging ${languageOutputs.length} language indexes...`);
+    mergeScipFiles(languageOutputs.map((entry) => entry.scipPath), outputScip);
   }
   onStatus("Converting to SQLite...");
   if (!existsSync5(outputScip)) {
@@ -1090,6 +1237,12 @@ Make sure ${binaryLabel} is installed and available on PATH.`,
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     throw new Error(`Failed to convert SCIP index to SQLite: ${msg}`, { cause: err });
+  } finally {
+    for (const { scipPath } of languageOutputs) {
+      if (scipPath !== outputScip) {
+        rmSync(scipPath, { force: true });
+      }
+    }
   }
   const durationMs = Date.now() - start;
   onStatus(`Done in ${(durationMs / 1e3).toFixed(1)}s`);
@@ -1104,10 +1257,15 @@ function moveDefaultOutputIfNeeded(config, projectRoot, outputScip) {
     renameSync(defaultOutputPath, outputScip);
   }
 }
+function tempScipPath(outputScip, language, index) {
+  const extension = extname2(outputScip) || ".scip";
+  const stem = basename(outputScip, extension);
+  return join5(dirname2(outputScip), `${stem}.${index + 1}.${language}${extension}`);
+}
 
 // src/config.ts
-import { readFileSync as readFileSync2, writeFileSync, existsSync as existsSync6, mkdirSync } from "fs";
-import { join as join6, resolve } from "path";
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync2, existsSync as existsSync6, mkdirSync } from "fs";
+import { join as join6, resolve as resolve2 } from "path";
 import { createHash } from "crypto";
 import { homedir } from "os";
 var CONFIG_FILENAME = ".scipquery.json";
@@ -1123,7 +1281,7 @@ function loadProjectConfig(projectRoot) {
     return {};
   }
   try {
-    const raw = readFileSync2(configPath, "utf-8");
+    const raw = readFileSync3(configPath, "utf-8");
     return JSON.parse(raw);
   } catch {
     return {};
@@ -1138,10 +1296,10 @@ function resolveWatchConfig(config) {
 function resolveCacheDir(projectRoot, config) {
   const envOverride = process.env["SCIP_QUERY_CACHE_DIR"];
   if (envOverride) return ensureDir(envOverride);
-  if (config?.dbPath) return ensureDir(resolve(projectRoot, config.dbPath));
+  if (config?.dbPath) return ensureDir(resolve2(projectRoot, config.dbPath));
   const xdgCache = process.env["XDG_CACHE_HOME"];
   const cacheBase = xdgCache || join6(homedir(), ".cache");
-  const projectHash = createHash("sha256").update(resolve(projectRoot)).digest("hex").slice(0, 12);
+  const projectHash = createHash("sha256").update(resolve2(projectRoot)).digest("hex").slice(0, 12);
   const dir = join6(cacheBase, "scip-query", "projects", projectHash);
   return ensureDir(dir);
 }
@@ -1167,7 +1325,7 @@ function initProjectConfig(projectRoot, languages) {
       cooldownMs: 6e4
     }
   };
-  writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
+  writeFileSync2(configPath, JSON.stringify(config, null, 2) + "\n");
   return configPath;
 }
 function ensureDir(dir) {
@@ -1178,7 +1336,7 @@ function ensureDir(dir) {
 // src/watch.ts
 import { watch } from "fs";
 import { existsSync as existsSync7, renameSync as renameSync2 } from "fs";
-import { join as join7, relative } from "path";
+import { join as join7, relative as relative2 } from "path";
 import { fork } from "child_process";
 import ignore2 from "ignore";
 var Watcher = class {
@@ -1250,13 +1408,9 @@ 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 = relative(this.projectRoot, join7(this.projectRoot, filename));
+    const rel = relative2(this.projectRoot, join7(this.projectRoot, filename));
     if (this.gitignoreFilter.isIgnored(rel)) return;
     if (this.extraIgnore.ignores(rel)) return;
     if (filename.endsWith("index.db") || filename.endsWith("index.scip") || filename.endsWith("index.db.tmp") || filename.endsWith(".scipquery.json")) {
@@ -1337,10 +1491,10 @@ var Watcher = class {
    * Writes to index.db.tmp, then atomically renames to index.db.
    */
   runReindex() {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const start = Date.now();
       const tmpDb = this.indexPaths.dbPath + ".tmp";
-      const tmpScip = tempScipPath(this.indexPaths.indexPath);
+      const tmpScip = tempScipPath2(this.indexPaths.indexPath);
       const child = fork(
         new URL("./reindex-worker.js", import.meta.url).pathname,
         [],
@@ -1365,7 +1519,7 @@ var Watcher = class {
             if (existsSync7(tmpScip)) {
               renameSync2(tmpScip, this.indexPaths.indexPath);
             }
-            resolve3(Date.now() - start);
+            resolve4(Date.now() - start);
           } catch (err) {
             reject(new Error(`Atomic swap failed: ${err}`));
           }
@@ -1381,7 +1535,7 @@ var Watcher = class {
     this.onStatus(status);
   }
 };
-function tempScipPath(indexPath) {
+function tempScipPath2(indexPath) {
   return indexPath.endsWith(".scip") ? indexPath.slice(0, -".scip".length) + ".tmp.scip" : indexPath + ".tmp.scip";
 }
 
@@ -1393,7 +1547,7 @@ import {
   readlinkSync,
   unlinkSync
 } from "fs";
-import { join as join8, dirname as dirname2, resolve as resolve2 } from "path";
+import { join as join8, dirname as dirname3, resolve as resolve3 } from "path";
 import { homedir as homedir2, platform as platform3 } from "os";
 import { fileURLToPath } from "url";
 var IS_WINDOWS3 = platform3() === "win32";
@@ -1408,7 +1562,7 @@ function installSkills(opts = {}) {
   const log = opts.quiet ? () => {
   } : console.log;
   const thisFile = fileURLToPath(import.meta.url);
-  const skillsSource = resolve2(dirname2(thisFile), "..", "skills");
+  const skillsSource = resolve3(dirname3(thisFile), "..", "skills");
   const targets = [
     join8(homedir2(), ".claude", "skills"),
     join8(homedir2(), ".codex", "skills")
@@ -1419,7 +1573,7 @@ function installSkills(opts = {}) {
     alreadyLinked: []
   };
   for (const targetDir of targets) {
-    const parentDir = dirname2(targetDir);
+    const parentDir = dirname3(targetDir);
     if (!existsSync8(parentDir)) {
       continue;
     }
@@ -1435,7 +1589,7 @@ function installSkills(opts = {}) {
       if (existsSync8(target)) {
         try {
           const existing = readlinkSync(target);
-          if (resolve2(existing) === resolve2(source)) {
+          if (resolve3(existing) === resolve3(source)) {
             result.alreadyLinked.push(`${toolName}/${skill}`);
             log(`  ok:   ${skill} \u2192 ${toolName} (already linked)`);
             continue;
@@ -1498,6 +1652,8 @@ export {
   leafName,
   loadProjectConfig,
   members,
+  mergeScipFiles,
+  mergeScipIndexes,
   methods,
   outline,
   parseSymbol,

package/dist/queries/affected.d.ts

@@ -1,4 +1,4 @@
-import { S as ScipDatabase, A as AffectedResult } from '../db-C4rPbKkI.js';
+import { S as ScipDatabase, A as AffectedResult } from '../db-6F9R9e_t.js';
 import 'better-sqlite3';
 
 /**

package/dist/queries/affected.js

@@ -1,8 +1,8 @@
 import {
   affected
-} from "../chunk-NXUIWD6K.js";
-import "../chunk-ALUFWH3U.js";
-import "../chunk-TO3L4YNK.js";
+} from "../chunk-LQXBFCP2.js";
+import "../chunk-FMAYH7GS.js";
+import "../chunk-YMSJCSRG.js";
 export {
   affected
 };