opencode-codebase-index 0.13.1 → 0.14.0

package/dist/cli.cjs

@@ -496,7 +496,7 @@ var require_ignore = __commonJS({
       //   path matching.
       // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE`
       // @returns {TestResult} true if a file is ignored
-      test(path25, checkUnignored, mode) {
+      test(path26, checkUnignored, mode) {
         let ignored = false;
         let unignored = false;
         let matchedRule;
@@ -505,7 +505,7 @@ var require_ignore = __commonJS({
           if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) {
             return;
           }
-          const matched = rule[mode].test(path25);
+          const matched = rule[mode].test(path26);
           if (!matched) {
             return;
           }
@@ -526,17 +526,17 @@ var require_ignore = __commonJS({
     var throwError = (message, Ctor) => {
       throw new Ctor(message);
     };
-    var checkPath = (path25, originalPath, doThrow) => {
-      if (!isString(path25)) {
+    var checkPath = (path26, originalPath, doThrow) => {
+      if (!isString(path26)) {
         return doThrow(
           `path must be a string, but got \`${originalPath}\``,
           TypeError
         );
       }
-      if (!path25) {
+      if (!path26) {
         return doThrow(`path must not be empty`, TypeError);
       }
-      if (checkPath.isNotRelative(path25)) {
+      if (checkPath.isNotRelative(path26)) {
         const r = "`path.relative()`d";
         return doThrow(
           `path should be a ${r} string, but got "${originalPath}"`,
@@ -545,7 +545,7 @@ var require_ignore = __commonJS({
       }
       return true;
     };
-    var isNotRelative = (path25) => REGEX_TEST_INVALID_PATH.test(path25);
+    var isNotRelative = (path26) => REGEX_TEST_INVALID_PATH.test(path26);
     checkPath.isNotRelative = isNotRelative;
     checkPath.convert = (p) => p;
     var Ignore2 = class {
@@ -575,19 +575,19 @@ var require_ignore = __commonJS({
       }
       // @returns {TestResult}
       _test(originalPath, cache, checkUnignored, slices) {
-        const path25 = originalPath && checkPath.convert(originalPath);
+        const path26 = originalPath && checkPath.convert(originalPath);
         checkPath(
-          path25,
+          path26,
           originalPath,
           this._strictPathCheck ? throwError : RETURN_FALSE
         );
-        return this._t(path25, cache, checkUnignored, slices);
+        return this._t(path26, cache, checkUnignored, slices);
       }
-      checkIgnore(path25) {
-        if (!REGEX_TEST_TRAILING_SLASH.test(path25)) {
-          return this.test(path25);
+      checkIgnore(path26) {
+        if (!REGEX_TEST_TRAILING_SLASH.test(path26)) {
+          return this.test(path26);
         }
-        const slices = path25.split(SLASH2).filter(Boolean);
+        const slices = path26.split(SLASH2).filter(Boolean);
         slices.pop();
         if (slices.length) {
           const parent = this._t(
@@ -600,18 +600,18 @@ var require_ignore = __commonJS({
             return parent;
           }
         }
-        return this._rules.test(path25, false, MODE_CHECK_IGNORE);
+        return this._rules.test(path26, false, MODE_CHECK_IGNORE);
       }
-      _t(path25, cache, checkUnignored, slices) {
-        if (path25 in cache) {
-          return cache[path25];
+      _t(path26, cache, checkUnignored, slices) {
+        if (path26 in cache) {
+          return cache[path26];
         }
         if (!slices) {
-          slices = path25.split(SLASH2).filter(Boolean);
+          slices = path26.split(SLASH2).filter(Boolean);
         }
         slices.pop();
         if (!slices.length) {
-          return cache[path25] = this._rules.test(path25, checkUnignored, MODE_IGNORE);
+          return cache[path26] = this._rules.test(path26, checkUnignored, MODE_IGNORE);
         }
         const parent = this._t(
           slices.join(SLASH2) + SLASH2,
@@ -619,29 +619,29 @@ var require_ignore = __commonJS({
           checkUnignored,
           slices
         );
-        return cache[path25] = parent.ignored ? parent : this._rules.test(path25, checkUnignored, MODE_IGNORE);
+        return cache[path26] = parent.ignored ? parent : this._rules.test(path26, checkUnignored, MODE_IGNORE);
       }
-      ignores(path25) {
-        return this._test(path25, this._ignoreCache, false).ignored;
+      ignores(path26) {
+        return this._test(path26, this._ignoreCache, false).ignored;
       }
       createFilter() {
-        return (path25) => !this.ignores(path25);
+        return (path26) => !this.ignores(path26);
       }
       filter(paths) {
         return makeArray(paths).filter(this.createFilter());
       }
       // @returns {TestResult}
-      test(path25) {
-        return this._test(path25, this._testCache, true);
+      test(path26) {
+        return this._test(path26, this._testCache, true);
       }
     };
     var factory = (options) => new Ignore2(options);
-    var isPathValid = (path25) => checkPath(path25 && checkPath.convert(path25), path25, RETURN_FALSE);
+    var isPathValid = (path26) => checkPath(path26 && checkPath.convert(path26), path26, RETURN_FALSE);
     var setupWindows = () => {
       const makePosix = (str) => /^\\\\\?\\/.test(str) || /["<>|\u0000-\u001F]+/u.test(str) ? str : str.replace(/\\/g, "/");
       checkPath.convert = makePosix;
       const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i;
-      checkPath.isNotRelative = (path25) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path25) || isNotRelative(path25);
+      checkPath.isNotRelative = (path26) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path26) || isNotRelative(path26);
     };
     if (
       // Detect `process` so that it can run in browsers.
@@ -667,7 +667,7 @@ module.exports = __toCommonJS(cli_exports);
 var import_stdio = require("@modelcontextprotocol/sdk/server/stdio.js");
 var import_fs15 = require("fs");
 var os5 = __toESM(require("os"), 1);
-var path24 = __toESM(require("path"), 1);
+var path25 = __toESM(require("path"), 1);
 var import_url2 = require("url");
 
 // src/config/constants.ts
@@ -800,7 +800,8 @@ function getDefaultIndexingConfig() {
     requireProjectMarker: true,
     maxDepth: 5,
     maxFilesPerDirectory: 100,
-    fallbackToTextOnMaxChunks: true
+    fallbackToTextOnMaxChunks: true,
+    gitBlame: { enabled: false }
   };
 }
 function getDefaultSearchConfig() {
@@ -924,7 +925,10 @@ function parseConfig(raw) {
     requireProjectMarker: typeof rawIndexing.requireProjectMarker === "boolean" ? rawIndexing.requireProjectMarker : defaultIndexing.requireProjectMarker,
     maxDepth: typeof rawIndexing.maxDepth === "number" ? rawIndexing.maxDepth < -1 ? -1 : rawIndexing.maxDepth : defaultIndexing.maxDepth,
     maxFilesPerDirectory: typeof rawIndexing.maxFilesPerDirectory === "number" ? Math.max(1, rawIndexing.maxFilesPerDirectory) : defaultIndexing.maxFilesPerDirectory,
-    fallbackToTextOnMaxChunks: typeof rawIndexing.fallbackToTextOnMaxChunks === "boolean" ? rawIndexing.fallbackToTextOnMaxChunks : defaultIndexing.fallbackToTextOnMaxChunks
+    fallbackToTextOnMaxChunks: typeof rawIndexing.fallbackToTextOnMaxChunks === "boolean" ? rawIndexing.fallbackToTextOnMaxChunks : defaultIndexing.fallbackToTextOnMaxChunks,
+    gitBlame: {
+      enabled: rawIndexing.gitBlame && typeof rawIndexing.gitBlame === "object" && typeof rawIndexing.gitBlame.enabled === "boolean" ? rawIndexing.gitBlame.enabled : defaultIndexing.gitBlame.enabled
+    }
   };
   const rawSearch = input.search && typeof input.search === "object" ? input.search : {};
   const search = {
@@ -1109,9 +1113,9 @@ var import_fs = require("fs");
 var path = __toESM(require("path"), 1);
 
 // src/eval/report-formatters.ts
-function assertFiniteNumber(value, path25) {
+function assertFiniteNumber(value, path26) {
   if (typeof value !== "number" || Number.isNaN(value) || !Number.isFinite(value)) {
-    throw new Error(`${path25} must be a finite number`);
+    throw new Error(`${path26} must be a finite number`);
   }
   return value;
 }
@@ -1300,15 +1304,15 @@ function buildPerQueryArtifact(perQuery) {
 
 // src/eval/runner.ts
 var import_fs10 = require("fs");
-var path13 = __toESM(require("path"), 1);
+var path14 = __toESM(require("path"), 1);
 var import_perf_hooks2 = require("perf_hooks");
 
 // src/indexer/index.ts
 var import_fs7 = require("fs");
-var path10 = __toESM(require("path"), 1);
+var path11 = __toESM(require("path"), 1);
 var import_perf_hooks = require("perf_hooks");
-var import_child_process2 = require("child_process");
-var import_util2 = require("util");
+var import_child_process3 = require("child_process");
+var import_util3 = require("util");
 
 // node_modules/eventemitter3/index.mjs
 var import_index = __toESM(require_eventemitter3(), 1);
@@ -4839,8 +4843,8 @@ function normalizeFiles(rawFiles, projectRoot) {
     const trimmed = raw.trim();
     if (!trimmed) continue;
     const absolute = path9.resolve(projectRoot, trimmed);
-    const relative10 = path9.relative(projectRoot, absolute);
-    const cleaned = relative10.startsWith("./") ? relative10.slice(2) : relative10;
+    const relative11 = path9.relative(projectRoot, absolute);
+    const cleaned = relative11.startsWith("./") ? relative11.slice(2) : relative11;
     if (!seen.has(cleaned)) {
       seen.add(cleaned);
       result.push(cleaned);
@@ -4849,8 +4853,61 @@ function normalizeFiles(rawFiles, projectRoot) {
   return result;
 }
 
+// src/indexer/git-blame.ts
+var import_child_process2 = require("child_process");
+var path10 = __toESM(require("path"), 1);
+var import_util2 = require("util");
+var execFileAsync2 = (0, import_util2.promisify)(import_child_process2.execFile);
+function parseGitBlamePorcelain(output) {
+  const commits = /* @__PURE__ */ new Map();
+  let current;
+  for (const line of output.split("\n")) {
+    if (/^[0-9a-f]{40} /.test(line)) {
+      const sha = line.slice(0, 40);
+      current = commits.get(sha) ?? {
+        sha,
+        author: "",
+        authorEmail: "",
+        committedAt: 0,
+        summary: "",
+        lines: 0
+      };
+      commits.set(sha, current);
+      continue;
+    }
+    if (!current) {
+      continue;
+    }
+    if (line.startsWith("author ")) {
+      current.author = line.slice("author ".length);
+    } else if (line.startsWith("author-mail ")) {
+      current.authorEmail = line.slice("author-mail ".length).replace(/^<|>$/g, "");
+    } else if (line.startsWith("author-time ")) {
+      current.committedAt = Number.parseInt(line.slice("author-time ".length), 10);
+    } else if (line.startsWith("summary ")) {
+      current.summary = line.slice("summary ".length);
+    } else if (line.startsWith("	")) {
+      current.lines += 1;
+    }
+  }
+  return Array.from(commits.values()).filter((commit) => commit.lines > 0).sort((a, b) => b.lines - a.lines || b.committedAt - a.committedAt)[0];
+}
+async function getChunkGitBlame(projectRoot, filePath, startLine, endLine) {
+  const relativePath = path10.relative(projectRoot, filePath);
+  try {
+    const { stdout } = await execFileAsync2(
+      "git",
+      ["blame", "--line-porcelain", "-L", `${startLine},${endLine}`, "--", relativePath],
+      { cwd: projectRoot, timeout: 3e4 }
+    );
+    return parseGitBlamePorcelain(stdout);
+  } catch {
+    return void 0;
+  }
+}
+
 // src/indexer/index.ts
-var CALL_GRAPH_LANGUAGES = /* @__PURE__ */ new Set(["typescript", "tsx", "javascript", "jsx", "python", "go", "rust", "php", "apex", "zig", "gdscript", "matlab"]);
+var CALL_GRAPH_LANGUAGES = /* @__PURE__ */ new Set(["typescript", "tsx", "javascript", "jsx", "python", "go", "rust", "php", "apex", "zig", "gdscript", "matlab", "bash"]);
 var CASE_INSENSITIVE_LANGUAGES = /* @__PURE__ */ new Set(["apex"]);
 var CALL_GRAPH_SYMBOL_CHUNK_TYPES = /* @__PURE__ */ new Set([
   "function_declaration",
@@ -4930,6 +4987,45 @@ function isSqliteCorruptionError(error) {
   return message.includes("database disk image is malformed") || message.includes("file is not a database") || message.includes("database schema is corrupt") || message.includes("sqlite_corrupt");
 }
 var STARTUP_WARNING_METADATA_KEY = "index.startupWarning";
+function metadataFromBlame(blame) {
+  if (!blame) {
+    return {};
+  }
+  return {
+    blameSha: blame.sha,
+    blameAuthor: blame.author,
+    blameAuthorEmail: blame.authorEmail,
+    blameCommittedAt: blame.committedAt,
+    blameSummary: blame.summary
+  };
+}
+function blameFromChunkData(chunk) {
+  if (!chunk?.blameSha || !chunk.blameAuthor || !chunk.blameAuthorEmail || chunk.blameCommittedAt === void 0 || !chunk.blameSummary) {
+    return void 0;
+  }
+  return {
+    sha: chunk.blameSha,
+    author: chunk.blameAuthor,
+    authorEmail: chunk.blameAuthorEmail,
+    committedAt: chunk.blameCommittedAt,
+    summary: chunk.blameSummary
+  };
+}
+function blameFromMetadata(metadata) {
+  if (!metadata.blameSha || !metadata.blameAuthor || !metadata.blameAuthorEmail || metadata.blameCommittedAt === void 0 || !metadata.blameSummary) {
+    return void 0;
+  }
+  return {
+    sha: metadata.blameSha,
+    author: metadata.blameAuthor,
+    authorEmail: metadata.blameAuthorEmail,
+    committedAt: metadata.blameCommittedAt,
+    summary: metadata.blameSummary
+  };
+}
+function hasBlameMetadata(metadata) {
+  return blameFromMetadata(metadata) !== void 0;
+}
 var INDEX_METADATA_VERSION = "1";
 var EMBEDDING_STRATEGY_VERSION = "2";
 var RANKING_TOKEN_CACHE_LIMIT = 4096;
@@ -5088,9 +5184,9 @@ function hasAllEmbeddingParts(parts, expectedPartCount) {
   return true;
 }
 function isPathWithinRoot(filePath, rootPath) {
-  const normalizedFilePath = path10.resolve(filePath);
-  const normalizedRoot = path10.resolve(rootPath);
-  return normalizedFilePath === normalizedRoot || normalizedFilePath.startsWith(`${normalizedRoot}${path10.sep}`);
+  const normalizedFilePath = path11.resolve(filePath);
+  const normalizedRoot = path11.resolve(rootPath);
+  return normalizedFilePath === normalizedRoot || normalizedFilePath.startsWith(`${normalizedRoot}${path11.sep}`);
 }
 var rankingQueryTokenCache = /* @__PURE__ */ new Map();
 var rankingNameTokenCache = /* @__PURE__ */ new Map();
@@ -5849,7 +5945,8 @@ function promoteIdentifierMatches(query, combined, semanticCandidates, keywordCa
             chunkType,
             name: chunk.name ?? void 0,
             language: chunk.language,
-            hash: chunk.contentHash
+            hash: chunk.contentHash,
+            ...metadataFromBlame(blameFromChunkData(chunk))
           };
           const baselineScore = existing?.score ?? 0.5;
           candidateUnion.set(chunk.chunkId, {
@@ -5933,7 +6030,8 @@ function buildSymbolDefinitionLane(query, database, branchChunkIds, limit, fallb
           chunkType,
           name: chunk.name ?? void 0,
           language: chunk.language,
-          hash: chunk.contentHash
+          hash: chunk.contentHash,
+          ...metadataFromBlame(blameFromChunkData(chunk))
         }
       });
     }
@@ -6102,6 +6200,21 @@ function matchesSearchFilters(candidate, options, minScore) {
   if (options?.chunkType && candidate.metadata.chunkType !== options.chunkType) {
     return false;
   }
+  if (options?.blameAuthor) {
+    const author = options.blameAuthor.toLowerCase();
+    const candidateAuthor = candidate.metadata.blameAuthor?.toLowerCase();
+    const candidateEmail = candidate.metadata.blameAuthorEmail?.toLowerCase();
+    if (candidateAuthor !== author && candidateEmail !== author) return false;
+  }
+  if (options?.blameSha && !candidate.metadata.blameSha?.toLowerCase().startsWith(options.blameSha.toLowerCase())) {
+    return false;
+  }
+  if (options?.blameSince) {
+    const sinceMs = Date.parse(options.blameSince);
+    if (Number.isNaN(sinceMs)) return false;
+    const committedAt = candidate.metadata.blameCommittedAt;
+    if (committedAt === void 0 || committedAt < Math.floor(sinceMs / 1e3)) return false;
+  }
   return true;
 }
 function unionCandidates(semanticCandidates, keywordCandidates) {
@@ -6145,9 +6258,9 @@ var Indexer = class {
     this.config = config;
     this.host = host;
     this.indexPath = this.getIndexPath();
-    this.fileHashCachePath = path10.join(this.indexPath, "file-hashes.json");
-    this.failedBatchesPath = path10.join(this.indexPath, "failed-batches.json");
-    this.indexingLockPath = path10.join(this.indexPath, "indexing.lock");
+    this.fileHashCachePath = path11.join(this.indexPath, "file-hashes.json");
+    this.failedBatchesPath = path11.join(this.indexPath, "failed-batches.json");
+    this.indexingLockPath = path11.join(this.indexPath, "indexing.lock");
     this.logger = initializeLogger(config.debug);
   }
   getIndexPath() {
@@ -6179,14 +6292,14 @@ var Indexer = class {
   }
   atomicWriteSync(targetPath, data) {
     const tempPath = `${targetPath}.tmp`;
-    (0, import_fs7.mkdirSync)(path10.dirname(targetPath), { recursive: true });
+    (0, import_fs7.mkdirSync)(path11.dirname(targetPath), { recursive: true });
     (0, import_fs7.writeFileSync)(tempPath, data);
     (0, import_fs7.renameSync)(tempPath, targetPath);
   }
   getScopedRoots() {
-    const roots = /* @__PURE__ */ new Set([path10.resolve(this.projectRoot)]);
+    const roots = /* @__PURE__ */ new Set([path11.resolve(this.projectRoot)]);
     for (const kbRoot of this.config.knowledgeBases) {
-      roots.add(path10.resolve(this.projectRoot, kbRoot));
+      roots.add(path11.resolve(this.projectRoot, kbRoot));
     }
     return Array.from(roots);
   }
@@ -6195,29 +6308,29 @@ var Indexer = class {
     if (this.config.scope !== "global") {
       return branchName;
     }
-    const projectHash = hashContent(path10.resolve(this.projectRoot)).slice(0, 16);
+    const projectHash = hashContent(path11.resolve(this.projectRoot)).slice(0, 16);
     return `${projectHash}:${branchName}`;
   }
   getBranchCatalogKeyFor(branchName) {
     if (this.config.scope !== "global") {
       return branchName;
     }
-    const projectHash = hashContent(path10.resolve(this.projectRoot)).slice(0, 16);
+    const projectHash = hashContent(path11.resolve(this.projectRoot)).slice(0, 16);
     return `${projectHash}:${branchName}`;
   }
   getLegacyBranchCatalogKey() {
     return this.currentBranch || "default";
   }
   getLegacyMigrationMetadataKey() {
-    const projectHash = hashContent(path10.resolve(this.projectRoot)).slice(0, 16);
+    const projectHash = hashContent(path11.resolve(this.projectRoot)).slice(0, 16);
     return `index.globalBranchMigration.${projectHash}`;
   }
   getProjectEmbeddingStrategyMetadataKey() {
-    const projectHash = hashContent(path10.resolve(this.projectRoot)).slice(0, 16);
+    const projectHash = hashContent(path11.resolve(this.projectRoot)).slice(0, 16);
     return `index.embeddingStrategyVersion.${projectHash}`;
   }
   getProjectForceReembedMetadataKey() {
-    const projectHash = hashContent(path10.resolve(this.projectRoot)).slice(0, 16);
+    const projectHash = hashContent(path11.resolve(this.projectRoot)).slice(0, 16);
     return `index.forceReembed.${projectHash}`;
   }
   hasProjectForceReembedPending() {
@@ -6311,7 +6424,7 @@ var Indexer = class {
     if (!this.database) {
       return { chunkIds, symbolIds };
     }
-    const projectRootPath = path10.resolve(this.projectRoot);
+    const projectRootPath = path11.resolve(this.projectRoot);
     const projectLocalFilePaths = /* @__PURE__ */ new Set([
       ...Array.from(this.fileHashCache.keys()).filter(
         (filePath) => this.isFileInCurrentScope(filePath, roots) && isPathWithinRoot(filePath, projectRootPath)
@@ -6334,7 +6447,7 @@ var Indexer = class {
     if (this.config.scope !== "global") {
       return this.getBranchCatalogCleanupKeys();
     }
-    const projectHash = hashContent(path10.resolve(this.projectRoot)).slice(0, 16);
+    const projectHash = hashContent(path11.resolve(this.projectRoot)).slice(0, 16);
     const keys = /* @__PURE__ */ new Set();
     const projectChunkIdSet = new Set(projectChunkIds);
     const projectSymbolIdSet = new Set(projectSymbolIds);
@@ -6418,7 +6531,7 @@ var Indexer = class {
     if (!this.database || this.config.scope !== "global") {
       return false;
     }
-    const projectHash = hashContent(path10.resolve(this.projectRoot)).slice(0, 16);
+    const projectHash = hashContent(path11.resolve(this.projectRoot)).slice(0, 16);
     const roots = this.getScopedRoots();
     const { chunkIds: projectLocalChunkIds, symbolIds: projectLocalSymbolIds } = this.getProjectLocalScopedOwnershipIds(roots);
     return this.database.getAllBranches().some(
@@ -6452,7 +6565,7 @@ var Indexer = class {
       ...Array.from(this.fileHashCache.keys()).filter((filePath) => this.isFileInCurrentScope(filePath, roots)),
       ...scopedEntries.map(({ metadata }) => metadata.filePath)
     ]);
-    const projectRootPath = path10.resolve(this.projectRoot);
+    const projectRootPath = path11.resolve(this.projectRoot);
     const projectLocalFilePaths = new Set(
       Array.from(filePaths).filter((filePath) => isPathWithinRoot(filePath, projectRootPath))
     );
@@ -6812,13 +6925,13 @@ var Indexer = class {
     }
     await import_fs7.promises.mkdir(this.indexPath, { recursive: true });
     const dimensions = this.configuredProviderInfo.modelInfo.dimensions;
-    const storePath = path10.join(this.indexPath, "vectors");
+    const storePath = path11.join(this.indexPath, "vectors");
     this.store = new VectorStore(storePath, dimensions);
-    const indexFilePath = path10.join(this.indexPath, "vectors.usearch");
+    const indexFilePath = path11.join(this.indexPath, "vectors.usearch");
     if ((0, import_fs7.existsSync)(indexFilePath)) {
       this.store.load();
     }
-    const invertedIndexPath = path10.join(this.indexPath, "inverted-index.json");
+    const invertedIndexPath = path11.join(this.indexPath, "inverted-index.json");
     this.invertedIndex = new InvertedIndex(invertedIndexPath);
     try {
       this.invertedIndex.load();
@@ -6828,7 +6941,7 @@ var Indexer = class {
       }
       this.invertedIndex = new InvertedIndex(invertedIndexPath);
     }
-    const dbPath = path10.join(this.indexPath, "codebase.db");
+    const dbPath = path11.join(this.indexPath, "codebase.db");
     let dbIsNew = !(0, import_fs7.existsSync)(dbPath);
     try {
       this.database = new Database(dbPath);
@@ -6909,7 +7022,7 @@ var Indexer = class {
         if (await this.tryResetCorruptedIndex("running automatic orphan garbage collection", error)) {
           return {
             resetCorruptedIndex: true,
-            warning: this.getCorruptedIndexWarning(path10.join(this.indexPath, "codebase.db"))
+            warning: this.getCorruptedIndexWarning(path11.join(this.indexPath, "codebase.db"))
           };
         }
         throw error;
@@ -6924,7 +7037,7 @@ var Indexer = class {
       return;
     }
     const retainedEntries = store.getAllMetadata().filter(({ key }) => !excludedSet.has(key));
-    const storeBasePath = path10.join(this.indexPath, "vectors");
+    const storeBasePath = path11.join(this.indexPath, "vectors");
     const storeIndexPath = `${storeBasePath}.usearch`;
     const storeMetadataPath = `${storeBasePath}.meta.json`;
     const backupIndexPath = `${storeIndexPath}.bak`;
@@ -7009,7 +7122,7 @@ var Indexer = class {
     if (!isSqliteCorruptionError(error)) {
       return false;
     }
-    const dbPath = path10.join(this.indexPath, "codebase.db");
+    const dbPath = path11.join(this.indexPath, "codebase.db");
     const warning = this.getCorruptedIndexWarning(dbPath);
     const errorMessage = getErrorMessage2(error);
     if (this.config.scope === "global") {
@@ -7032,15 +7145,15 @@ var Indexer = class {
     this.indexCompatibility = null;
     this.fileHashCache.clear();
     const resetPaths = [
-      path10.join(this.indexPath, "codebase.db"),
-      path10.join(this.indexPath, "codebase.db-shm"),
-      path10.join(this.indexPath, "codebase.db-wal"),
-      path10.join(this.indexPath, "vectors.usearch"),
-      path10.join(this.indexPath, "inverted-index.json"),
-      path10.join(this.indexPath, "file-hashes.json"),
-      path10.join(this.indexPath, "failed-batches.json"),
-      path10.join(this.indexPath, "indexing.lock"),
-      path10.join(this.indexPath, "vectors")
+      path11.join(this.indexPath, "codebase.db"),
+      path11.join(this.indexPath, "codebase.db-shm"),
+      path11.join(this.indexPath, "codebase.db-wal"),
+      path11.join(this.indexPath, "vectors.usearch"),
+      path11.join(this.indexPath, "inverted-index.json"),
+      path11.join(this.indexPath, "file-hashes.json"),
+      path11.join(this.indexPath, "failed-batches.json"),
+      path11.join(this.indexPath, "indexing.lock"),
+      path11.join(this.indexPath, "vectors")
     ];
     await Promise.all(resetPaths.map(async (targetPath) => {
       try {
@@ -7277,6 +7390,7 @@ var Indexer = class {
     this.logger.debug("Parsed changed files", { parsedCount: parsedFiles.length, parseMs: parseMs.toFixed(2) });
     const existingChunks = /* @__PURE__ */ new Map();
     const existingChunksByFile = /* @__PURE__ */ new Map();
+    const existingMetadataById = /* @__PURE__ */ new Map();
     for (const { key, metadata } of store.getAllMetadata()) {
       if (scopedRoots && !this.isFileInCurrentScope(metadata.filePath, scopedRoots)) {
         continue;
@@ -7285,6 +7399,7 @@ var Indexer = class {
         continue;
       }
       existingChunks.set(key, metadata.hash);
+      existingMetadataById.set(key, metadata);
       const fileChunks = existingChunksByFile.get(metadata.filePath) || /* @__PURE__ */ new Set();
       fileChunks.add(key);
       existingChunksByFile.set(metadata.filePath, fileChunks);
@@ -7292,6 +7407,8 @@ var Indexer = class {
     const currentChunkIds = /* @__PURE__ */ new Set();
     const currentFilePaths = /* @__PURE__ */ new Set();
     const pendingChunks = [];
+    const gitBlameEnabled = this.config.indexing.gitBlame.enabled && isGitRepo(this.projectRoot);
+    let backfilledBlameMetadata = false;
     for (const filePath of unchangedFilePaths) {
       currentFilePaths.add(filePath);
       const fileChunks = existingChunksByFile.get(filePath);
@@ -7302,10 +7419,52 @@ var Indexer = class {
       }
     }
     const chunkDataBatch = [];
+    if (gitBlameEnabled) {
+      const backfillItems = [];
+      for (const chunkId of currentChunkIds) {
+        const metadata = existingMetadataById.get(chunkId);
+        if (!metadata || hasBlameMetadata(metadata)) {
+          continue;
+        }
+        const chunk = database.getChunk(chunkId);
+        if (!chunk) {
+          continue;
+        }
+        const blame = await getChunkGitBlame(this.projectRoot, chunk.filePath, chunk.startLine, chunk.endLine);
+        const blameMetadata = metadataFromBlame(blame);
+        if (!blameMetadata.blameSha) {
+          continue;
+        }
+        chunkDataBatch.push({
+          ...chunk,
+          blameSha: blameMetadata.blameSha,
+          blameAuthor: blameMetadata.blameAuthor,
+          blameAuthorEmail: blameMetadata.blameAuthorEmail,
+          blameCommittedAt: blameMetadata.blameCommittedAt,
+          blameSummary: blameMetadata.blameSummary
+        });
+        const embeddingBuffer = database.getEmbedding(chunk.contentHash);
+        if (!embeddingBuffer) {
+          continue;
+        }
+        backfillItems.push({
+          id: chunkId,
+          vector: Array.from(bufferToFloat32Array(embeddingBuffer)),
+          metadata: {
+            ...metadata,
+            ...blameMetadata
+          }
+        });
+      }
+      if (backfillItems.length > 0) {
+        store.addBatch(backfillItems);
+        backfilledBlameMetadata = true;
+      }
+    }
     for (const parsed of parsedFiles) {
       currentFilePaths.add(parsed.path);
       if (parsed.chunks.length === 0) {
-        const relativePath = path10.relative(this.projectRoot, parsed.path);
+        const relativePath = path11.relative(this.projectRoot, parsed.path);
         stats.parseFailures.push(relativePath);
       }
       let fileChunkCount = 0;
@@ -7326,6 +7485,10 @@ var Indexer = class {
         }
         const id = generateChunkId(parsed.path, chunk);
         const contentHash = generateChunkHash(chunk);
+        const existingContentHash = existingChunks.get(id);
+        const existingChunk = gitBlameEnabled ? database.getChunk(id) : null;
+        const blame = gitBlameEnabled && existingContentHash !== contentHash ? await getChunkGitBlame(this.projectRoot, parsed.path, chunk.startLine, chunk.endLine) : blameFromChunkData(existingChunk);
+        const blameMetadata = metadataFromBlame(blame);
         currentChunkIds.add(id);
         chunkDataBatch.push({
           chunkId: id,
@@ -7335,9 +7498,14 @@ var Indexer = class {
           endLine: chunk.endLine,
           nodeType: chunk.chunkType,
           name: chunk.name,
-          language: chunk.language
+          language: chunk.language,
+          blameSha: blameMetadata.blameSha,
+          blameAuthor: blameMetadata.blameAuthor,
+          blameAuthorEmail: blameMetadata.blameAuthorEmail,
+          blameCommittedAt: blameMetadata.blameCommittedAt,
+          blameSummary: blameMetadata.blameSummary
         });
-        if (existingChunks.get(id) === contentHash) {
+        if (existingContentHash === contentHash) {
           fileChunkCount++;
           continue;
         }
@@ -7352,7 +7520,8 @@ var Indexer = class {
           chunkType: chunk.chunkType,
           name: chunk.name,
           language: chunk.language,
-          hash: contentHash
+          hash: contentHash,
+          ...blameMetadata
         };
         pendingChunks.push({
           id,
@@ -7495,6 +7664,9 @@ var Indexer = class {
       database.addChunksToBranchBatch(branchCatalogKey, Array.from(currentChunkIds));
       database.clearBranchSymbols(branchCatalogKey);
       database.addSymbolsToBranchBatch(branchCatalogKey, Array.from(allSymbolIds));
+      if (backfilledBlameMetadata) {
+        store.save();
+      }
       if (scopedRoots) {
         this.replaceScopedFileHashCache(currentFileHashes, scopedRoots);
         this.clearScopedFailedBatches(scopedRoots);
@@ -8058,7 +8230,8 @@ var Indexer = class {
           content,
           score: r.score,
           chunkType: r.metadata.chunkType,
-          name: r.metadata.name
+          name: r.metadata.name,
+          blame: blameFromMetadata(r.metadata)
         };
       })
     );
@@ -8150,12 +8323,12 @@ var Indexer = class {
       this.indexCompatibility = compatibility;
       return;
     }
-    const localProjectIndexPaths = [path10.join(this.projectRoot, getHostProjectIndexRelativePath(this.host))];
+    const localProjectIndexPaths = [path11.join(this.projectRoot, getHostProjectIndexRelativePath(this.host))];
     if (this.host !== "opencode") {
-      localProjectIndexPaths.push(path10.join(this.projectRoot, getHostProjectIndexRelativePath("opencode")));
+      localProjectIndexPaths.push(path11.join(this.projectRoot, getHostProjectIndexRelativePath("opencode")));
     }
     const isLocalProjectIndex = localProjectIndexPaths.some(
-      (localPath) => path10.resolve(this.indexPath) === path10.resolve(localPath)
+      (localPath) => path11.resolve(this.indexPath) === path11.resolve(localPath)
     );
     if (!isLocalProjectIndex) {
       throw new Error(
@@ -8245,7 +8418,7 @@ var Indexer = class {
         gcOrphanSymbols: 0,
         gcOrphanCallEdges: 0,
         resetCorruptedIndex: true,
-        warning: this.getCorruptedIndexWarning(path10.join(this.indexPath, "codebase.db"))
+        warning: this.getCorruptedIndexWarning(path11.join(this.indexPath, "codebase.db"))
       };
     }
     this.logger.recordGc(removedCount, gcOrphanChunks, gcOrphanEmbeddings);
@@ -8565,7 +8738,8 @@ var Indexer = class {
           content,
           score: r.score,
           chunkType: r.metadata.chunkType,
-          name: r.metadata.name
+          name: r.metadata.name,
+          blame: blameFromMetadata(r.metadata)
         };
       })
     );
@@ -8602,9 +8776,9 @@ var Indexer = class {
     const { database } = await this.ensureInitialized();
     let shortest = [];
     for (const branchKey of this.getBranchCatalogKeys()) {
-      const path25 = database.findShortestPath(fromName, toName, branchKey, maxDepth);
-      if (path25.length > 0 && (shortest.length === 0 || path25.length < shortest.length)) {
-        shortest = path25;
+      const path26 = database.findShortestPath(fromName, toName, branchKey, maxDepth);
+      if (path26.length > 0 && (shortest.length === 0 || path26.length < shortest.length)) {
+        shortest = path26;
       }
     }
     return shortest;
@@ -8636,7 +8810,7 @@ var Indexer = class {
   }
   async getPrImpact(opts) {
     const { database } = await this.ensureInitialized();
-    const execFileAsync2 = (0, import_util2.promisify)(import_child_process2.execFile);
+    const execFileAsync3 = (0, import_util3.promisify)(import_child_process3.execFile);
     const changedFilesResult = await getChangedFiles({
       pr: opts.pr,
       branch: opts.branch,
@@ -8658,7 +8832,7 @@ var Indexer = class {
         "Run index_codebase first to build the call graph and symbol index for this branch."
       );
     }
-    const absoluteChangedFiles = changedFiles.map((f) => path10.resolve(this.projectRoot, f));
+    const absoluteChangedFiles = changedFiles.map((f) => path11.resolve(this.projectRoot, f));
     const directSymbols = database.getSymbolsForFiles(absoluteChangedFiles, branchKey);
     const directIds = directSymbols.map((s) => s.id);
     const direction = opts.direction ?? "both";
@@ -8720,7 +8894,7 @@ var Indexer = class {
     if (opts.checkConflicts) {
       conflictingPRs = [];
       try {
-        const { stdout } = await execFileAsync2(
+        const { stdout } = await execFileAsync3(
           "gh",
           ["pr", "list", "--state", "open", "--json", "number,headRefName", "--limit", "10000"],
           { cwd: this.projectRoot, timeout: 3e4 }
@@ -8741,7 +8915,7 @@ var Indexer = class {
               projectRoot: this.projectRoot,
               baseBranch: this.baseBranch
             });
-            const otherAbsolute = otherChanged.files.map((f) => path10.resolve(this.projectRoot, f));
+            const otherAbsolute = otherChanged.files.map((f) => path11.resolve(this.projectRoot, f));
             const otherBranchKey = this.getBranchCatalogKeyFor(openPr.headRefName);
             const otherSymbols = database.getSymbolsForFiles(otherAbsolute, otherBranchKey);
             const otherLabels = /* @__PURE__ */ new Set();
@@ -8804,12 +8978,12 @@ var Indexer = class {
         if (meta.filePath) filePaths.add(meta.filePath);
       }
       const directory = options?.directory?.replace(/\/$/, "");
-      const absoluteDirectoryFilter = directory ? path10.resolve(this.projectRoot, directory) : void 0;
+      const absoluteDirectoryFilter = directory ? path11.resolve(this.projectRoot, directory) : void 0;
       for (const filePath of filePaths) {
         if (directory) {
-          const absoluteFilePath = path10.resolve(filePath);
+          const absoluteFilePath = path11.resolve(filePath);
           const matchesRelative = filePath === directory || filePath.startsWith(directory + "/");
-          const matchesProjectRelative = absoluteDirectoryFilter !== void 0 && (absoluteFilePath === absoluteDirectoryFilter || absoluteFilePath.startsWith(absoluteDirectoryFilter + path10.sep));
+          const matchesProjectRelative = absoluteDirectoryFilter !== void 0 && (absoluteFilePath === absoluteDirectoryFilter || absoluteFilePath.startsWith(absoluteDirectoryFilter + path11.sep));
           if (!matchesRelative && !matchesProjectRelative) {
             continue;
           }
@@ -9089,13 +9263,13 @@ function computeEvalMetrics(queries, perQuery, embeddingCallCount, embeddingToke
 // src/eval/runner-config.ts
 var import_fs8 = require("fs");
 var os4 = __toESM(require("os"), 1);
-var path12 = __toESM(require("path"), 1);
+var path13 = __toESM(require("path"), 1);
 
 // src/config/rebase.ts
-var path11 = __toESM(require("path"), 1);
+var path12 = __toESM(require("path"), 1);
 function isWithinRoot(rootDir, targetPath) {
-  const relativePath = path11.relative(rootDir, targetPath);
-  return relativePath === "" || !relativePath.startsWith("..") && !path11.isAbsolute(relativePath);
+  const relativePath = path12.relative(rootDir, targetPath);
+  return relativePath === "" || !relativePath.startsWith("..") && !path12.isAbsolute(relativePath);
 }
 function rebasePathEntries(values, fromDir, toDir) {
   if (!Array.isArray(values)) {
@@ -9103,10 +9277,10 @@ function rebasePathEntries(values, fromDir, toDir) {
   }
   return values.filter((value) => typeof value === "string").map((value) => {
     const trimmed = value.trim();
-    if (!trimmed || path11.isAbsolute(trimmed)) {
+    if (!trimmed || path12.isAbsolute(trimmed)) {
       return trimmed;
     }
-    return normalizePathSeparators(path11.normalize(path11.relative(toDir, path11.resolve(fromDir, trimmed))));
+    return normalizePathSeparators(path12.normalize(path12.relative(toDir, path12.resolve(fromDir, trimmed))));
   }).filter(Boolean);
 }
 function resolveInheritedKnowledgeBaseEntries(values, sourceRoot, targetRoot) {
@@ -9118,17 +9292,17 @@ function resolveInheritedKnowledgeBaseEntries(values, sourceRoot, targetRoot) {
     if (!trimmed) {
       return trimmed;
     }
-    if (path11.isAbsolute(trimmed)) {
+    if (path12.isAbsolute(trimmed)) {
       if (isWithinRoot(sourceRoot, trimmed)) {
-        return normalizePathSeparators(path11.normalize(path11.relative(sourceRoot, trimmed) || "."));
+        return normalizePathSeparators(path12.normalize(path12.relative(sourceRoot, trimmed) || "."));
       }
-      return path11.normalize(trimmed);
+      return path12.normalize(trimmed);
     }
-    const resolvedFromSource = path11.resolve(sourceRoot, trimmed);
+    const resolvedFromSource = path12.resolve(sourceRoot, trimmed);
     if (isWithinRoot(sourceRoot, resolvedFromSource)) {
-      return normalizePathSeparators(path11.normalize(trimmed));
+      return normalizePathSeparators(path12.normalize(trimmed));
     }
-    return normalizePathSeparators(path11.normalize(path11.relative(targetRoot, resolvedFromSource)));
+    return normalizePathSeparators(path12.normalize(path12.relative(targetRoot, resolvedFromSource)));
   }).filter(Boolean);
 }
 
@@ -9176,20 +9350,20 @@ function parseJsonConfigFile(filePath) {
   }
 }
 function toAbsolute(projectRoot, maybeRelative) {
-  return path12.isAbsolute(maybeRelative) ? maybeRelative : path12.join(projectRoot, maybeRelative);
+  return path13.isAbsolute(maybeRelative) ? maybeRelative : path13.join(projectRoot, maybeRelative);
 }
 function isProjectScopedConfigPath(configPath) {
-  return path12.basename(configPath) === "codebase-index.json" && path12.basename(path12.dirname(configPath)) === ".opencode";
+  return path13.basename(configPath) === "codebase-index.json" && path13.basename(path13.dirname(configPath)) === ".opencode";
 }
 function normalizeEvalConfigKnowledgeBases(rawConfig, projectRoot, resolvedConfigPath) {
   const config = rawConfig && typeof rawConfig === "object" ? { ...rawConfig } : {};
   const rebaseEntries = (values) => isProjectScopedConfigPath(resolvedConfigPath) ? resolveInheritedKnowledgeBaseEntries(
     values,
-    path12.dirname(path12.dirname(resolvedConfigPath)),
+    path13.dirname(path13.dirname(resolvedConfigPath)),
     projectRoot
   ) : rebasePathEntries(
     values,
-    path12.dirname(resolvedConfigPath),
+    path13.dirname(resolvedConfigPath),
     projectRoot
   );
   if (Array.isArray(config.knowledgeBases)) {
@@ -9217,7 +9391,7 @@ function loadRawConfig(projectRoot, configPath) {
       projectConfig
     );
   }
-  const globalConfig = path12.join(os4.homedir(), ".config", "opencode", "codebase-index.json");
+  const globalConfig = path13.join(os4.homedir(), ".config", "opencode", "codebase-index.json");
   if ((0, import_fs8.existsSync)(globalConfig)) {
     return parseJsonConfigFile(globalConfig);
   }
@@ -9227,10 +9401,10 @@ function getIndexRootPath(projectRoot, scope) {
   return scope === "global" ? getGlobalIndexPath() : resolveProjectIndexPath(projectRoot, scope);
 }
 function getLocalProjectIndexRoot(projectRoot) {
-  return path12.join(projectRoot, ".opencode", "index");
+  return path13.join(projectRoot, ".opencode", "index");
 }
 function getLocalProjectConfigPath(projectRoot) {
-  return path12.join(projectRoot, ".opencode", "codebase-index.json");
+  return path13.join(projectRoot, ".opencode", "codebase-index.json");
 }
 function clearIndexRoot(projectRoot, scope) {
   const indexRoot = scope === "global" ? getIndexRootPath(projectRoot, scope) : getLocalProjectIndexRoot(projectRoot);
@@ -9252,7 +9426,7 @@ function ensureLocalEvalProjectConfig(projectRoot, configPath) {
     projectRoot,
     resolvedConfigPath
   );
-  (0, import_fs8.mkdirSync)(path12.dirname(localConfigPath), { recursive: true });
+  (0, import_fs8.mkdirSync)(path13.dirname(localConfigPath), { recursive: true });
   (0, import_fs8.writeFileSync)(localConfigPath, JSON.stringify(sourceConfig, null, 2), "utf-8");
   return localConfigPath;
 }
@@ -9302,23 +9476,23 @@ function isRecord2(value) {
 function isStringArray3(value) {
   return Array.isArray(value) && value.every((item) => typeof item === "string");
 }
-function asPositiveNumber(value, path25) {
+function asPositiveNumber(value, path26) {
   if (typeof value !== "number" || Number.isNaN(value) || value < 0) {
-    throw new Error(`${path25} must be a non-negative number`);
+    throw new Error(`${path26} must be a non-negative number`);
   }
   return value;
 }
-function parseQueryType(value, path25) {
+function parseQueryType(value, path26) {
   if (value === "definition" || value === "implementation-intent" || value === "similarity" || value === "keyword-heavy") {
     return value;
   }
   throw new Error(
-    `${path25} must be one of: definition, implementation-intent, similarity, keyword-heavy`
+    `${path26} must be one of: definition, implementation-intent, similarity, keyword-heavy`
   );
 }
-function parseExpected(input, path25) {
+function parseExpected(input, path26) {
   if (!isRecord2(input)) {
-    throw new Error(`${path25} must be an object`);
+    throw new Error(`${path26} must be an object`);
   }
   const filePathRaw = input.filePath;
   const acceptableFilesRaw = input.acceptableFiles;
@@ -9327,16 +9501,16 @@ function parseExpected(input, path25) {
   const filePath = typeof filePathRaw === "string" ? filePathRaw : void 0;
   const acceptableFiles = isStringArray3(acceptableFilesRaw) ? acceptableFilesRaw : void 0;
   if (!filePath && (!acceptableFiles || acceptableFiles.length === 0)) {
-    throw new Error(`${path25} must include either expected.filePath or expected.acceptableFiles`);
+    throw new Error(`${path26} must include either expected.filePath or expected.acceptableFiles`);
   }
   if (acceptableFilesRaw !== void 0 && !isStringArray3(acceptableFilesRaw)) {
-    throw new Error(`${path25}.acceptableFiles must be an array of strings`);
+    throw new Error(`${path26}.acceptableFiles must be an array of strings`);
   }
   if (symbolRaw !== void 0 && typeof symbolRaw !== "string") {
-    throw new Error(`${path25}.symbol must be a string when provided`);
+    throw new Error(`${path26}.symbol must be a string when provided`);
   }
   if (branchRaw !== void 0 && typeof branchRaw !== "string") {
-    throw new Error(`${path25}.branch must be a string when provided`);
+    throw new Error(`${path26}.branch must be a string when provided`);
   }
   return {
     filePath,
@@ -9346,25 +9520,25 @@ function parseExpected(input, path25) {
   };
 }
 function parseQuery(input, index) {
-  const path25 = `queries[${index}]`;
+  const path26 = `queries[${index}]`;
   if (!isRecord2(input)) {
-    throw new Error(`${path25} must be an object`);
+    throw new Error(`${path26} must be an object`);
   }
   const id = input.id;
   const query = input.query;
   const queryType = input.queryType;
   const expected = input.expected;
   if (typeof id !== "string" || id.trim().length === 0) {
-    throw new Error(`${path25}.id must be a non-empty string`);
+    throw new Error(`${path26}.id must be a non-empty string`);
   }
   if (typeof query !== "string" || query.trim().length === 0) {
-    throw new Error(`${path25}.query must be a non-empty string`);
+    throw new Error(`${path26}.query must be a non-empty string`);
   }
   return {
     id,
     query,
-    queryType: parseQueryType(queryType, `${path25}.queryType`),
-    expected: parseExpected(expected, `${path25}.expected`)
+    queryType: parseQueryType(queryType, `${path26}.queryType`),
+    expected: parseExpected(expected, `${path26}.expected`)
   };
 }
 function parseGoldenDataset(raw, sourceLabel) {
@@ -9547,13 +9721,13 @@ async function runEvaluation(options) {
     };
     const outputDir = createRunDirectory(toAbsolute(options.projectRoot, options.outputRoot));
     const perQueryArtifact = buildPerQueryArtifact(perQuery);
-    writeJson(path13.join(outputDir, "summary.json"), summary);
-    writeJson(path13.join(outputDir, "per-query.json"), perQueryArtifact);
+    writeJson(path14.join(outputDir, "summary.json"), summary);
+    writeJson(path14.join(outputDir, "per-query.json"), perQueryArtifact);
     let comparison;
     if (againstPath) {
       const baseline = loadSummary(againstPath);
       comparison = compareSummaries(summary, baseline, againstPath);
-      writeJson(path13.join(outputDir, "compare.json"), comparison);
+      writeJson(path14.join(outputDir, "compare.json"), comparison);
     }
     let gate;
     if (options.ciMode) {
@@ -9566,7 +9740,7 @@ async function runEvaluation(options) {
         if ((0, import_fs10.existsSync)(resolvedBaseline)) {
           const baselineSummary = loadSummary(resolvedBaseline);
           comparison = compareSummaries(summary, baselineSummary, resolvedBaseline);
-          writeJson(path13.join(outputDir, "compare.json"), comparison);
+          writeJson(path14.join(outputDir, "compare.json"), comparison);
         } else if (budget.failOnMissingBaseline) {
           throw new Error(
             `Budget baseline is missing: ${resolvedBaseline}. Set failOnMissingBaseline=false to allow CI run without baseline.`
@@ -9576,7 +9750,7 @@ async function runEvaluation(options) {
       gate = evaluateBudgetGate(budget, summary, comparison);
     }
     const markdown = createSummaryMarkdown(summary, comparison, gate);
-    writeText(path13.join(outputDir, "summary.md"), markdown);
+    writeText(path14.join(outputDir, "summary.md"), markdown);
     return { outputDir, summary, perQuery, comparison, gate };
   } finally {
     await indexer.close();
@@ -9634,23 +9808,23 @@ async function runSweep(options, sweep) {
     bestByMrrAt10,
     bestByP95Latency
   };
-  writeJson(path13.join(outputDir, "compare.json"), aggregate);
+  writeJson(path14.join(outputDir, "compare.json"), aggregate);
   const md = createSummaryMarkdown(
     bestByHitAt5?.summary ?? runs[0].summary,
     bestByHitAt5?.comparison,
     void 0,
     aggregate
   );
-  writeText(path13.join(outputDir, "summary.md"), md);
-  writeJson(path13.join(outputDir, "summary.json"), bestByHitAt5?.summary ?? runs[0].summary);
+  writeText(path14.join(outputDir, "summary.md"), md);
+  writeJson(path14.join(outputDir, "summary.json"), bestByHitAt5?.summary ?? runs[0].summary);
   return { outputDir, aggregate };
 }
 
 // src/eval/cli.ts
-var path15 = __toESM(require("path"), 1);
+var path16 = __toESM(require("path"), 1);
 
 // src/eval/cli-parser.ts
-var path14 = __toESM(require("path"), 1);
+var path15 = __toESM(require("path"), 1);
 function printUsage() {
   console.log(`
 Usage:
@@ -9722,12 +9896,12 @@ function parseEvalArgs(argv, cwd) {
     const arg = argv[i];
     const next = argv[i + 1];
     if (arg === "--project" && next) {
-      parsed.projectRoot = path14.resolve(cwd, next);
+      parsed.projectRoot = path15.resolve(cwd, next);
       i += 1;
       continue;
     }
     if (arg === "--config" && next) {
-      parsed.configPath = path14.resolve(cwd, next);
+      parsed.configPath = path15.resolve(cwd, next);
       i += 1;
       continue;
     }
@@ -9923,22 +10097,22 @@ async function handleEvalCommand(args, cwd) {
     if (!parsed.againstPath.endsWith(".json")) {
       throw new Error("eval diff --against must point to a summary JSON file");
     }
-    const currentSummary = loadSummary(path15.resolve(parsed.projectRoot, currentPath), {
+    const currentSummary = loadSummary(path16.resolve(parsed.projectRoot, currentPath), {
       allowLegacyDiversityMetrics: true
     });
-    const baselineSummary = loadSummary(path15.resolve(parsed.projectRoot, parsed.againstPath), {
+    const baselineSummary = loadSummary(path16.resolve(parsed.projectRoot, parsed.againstPath), {
       allowLegacyDiversityMetrics: true
     });
     const comparison = compareSummaries(
       currentSummary,
       baselineSummary,
-      path15.resolve(parsed.projectRoot, parsed.againstPath)
+      path16.resolve(parsed.projectRoot, parsed.againstPath)
     );
-    const outputDir = createRunDirectory(path15.resolve(parsed.projectRoot, parsed.outputRoot));
+    const outputDir = createRunDirectory(path16.resolve(parsed.projectRoot, parsed.outputRoot));
     const summaryMd = createSummaryMarkdown(currentSummary, comparison);
-    writeJson(path15.join(outputDir, "compare.json"), comparison);
-    writeText(path15.join(outputDir, "summary.md"), summaryMd);
-    writeJson(path15.join(outputDir, "summary.json"), currentSummary);
+    writeJson(path16.join(outputDir, "compare.json"), comparison);
+    writeText(path16.join(outputDir, "summary.md"), summaryMd);
+    writeJson(path16.join(outputDir, "summary.json"), currentSummary);
     console.log(`Eval diff complete. Artifacts: ${outputDir}`);
     return 0;
   }
@@ -10183,6 +10357,17 @@ function calculatePercentage(progress) {
   if (progress.phase === "storing") return 95;
   return 0;
 }
+function formatCodebasePeek(results) {
+  if (results.length === 0) {
+    return "No matching code found. Try a different query or run index_codebase first.";
+  }
+  const formatted = results.map((r, idx) => {
+    const location = `${r.filePath}:${r.startLine}-${r.endLine}`;
+    const name = r.name ? `"${r.name}"` : "(anonymous)";
+    return `[${idx + 1}] ${r.chunkType} ${name} at ${location} (score: ${r.score.toFixed(2)})${formatBlame(r)}`;
+  });
+  return formatted.join("\n");
+}
 function formatHealthCheck(result) {
   if (result.resetCorruptedIndex) {
     return result.warning ?? "Detected a corrupted local index and reset it. Run index_codebase to rebuild search data.";
@@ -10211,16 +10396,68 @@ function formatHealthCheck(result) {
   }
   return lines.join("\n");
 }
+function formatCallGraphCallers(name, callers, relationshipType) {
+  if (callers.length === 0) {
+    return `No callers found for "${name}"${relationshipType ? ` with type ${relationshipType}` : ""}. It may not be called by any tracked function, or the index needs updating.`;
+  }
+  const formatted = callers.map((edge, index) => {
+    const confidence = edge.confidence !== "Direct" ? ` [${edge.confidence.toLowerCase()}]` : "";
+    return `[${index + 1}] \u2190 from ${edge.fromSymbolName ?? "<unknown>"} in ${edge.fromSymbolFilePath ?? "<unknown file>"} [${edge.fromSymbolId}] (${edge.callType})${confidence} at line ${edge.line}${edge.isResolved ? " [resolved]" : " [unresolved]"}`;
+  });
+  return `"${name}" is called by ${callers.length} function(s):
+
+${formatted.join("\n")}`;
+}
+function formatCallGraphCallees(symbolId, callees, relationshipType) {
+  if (callees.length === 0) {
+    return `No callees found for symbol ${symbolId}${relationshipType ? ` with type ${relationshipType}` : ""}. The function may not call any other tracked functions.`;
+  }
+  return callees.map((edge, index) => {
+    const confidence = edge.confidence !== "Direct" ? ` [${edge.confidence.toLowerCase()}]` : "";
+    return `[${index + 1}] \u2192 ${edge.targetName} (${edge.callType})${confidence} at line ${edge.line}${edge.isResolved ? ` [resolved: ${edge.toSymbolId}]` : " [unresolved]"}`;
+  }).join("\n");
+}
+function formatCallGraphPath(from, to, path26) {
+  if (path26.length === 0) {
+    return `No path found between "${from}" and "${to}". They may be in disconnected components, or the call graph index needs updating.`;
+  }
+  const formatted = path26.map((hop, index) => {
+    const prefix = index === 0 ? "[start]" : `--${hop.callType}-->`;
+    const location = hop.filePath ? ` (${hop.filePath}:${hop.line})` : "";
+    return `${prefix} ${hop.symbolName}${location}`;
+  });
+  return `Path (${path26.length} hops):
+${formatted.join("\n")}`;
+}
 function formatResultHeader(result, index) {
   return result.name ? `[${index + 1}] ${result.chunkType} "${result.name}" in ${result.filePath}:${result.startLine}-${result.endLine}` : `[${index + 1}] ${result.chunkType} in ${result.filePath}:${result.startLine}-${result.endLine}`;
 }
+function formatBlame(result) {
+  if (!result.blame) {
+    return "";
+  }
+  const date = new Date(result.blame.committedAt * 1e3).toISOString().slice(0, 10);
+  return `
+    ${result.blame.sha.slice(0, 7)} | ${result.blame.author} | ${date} | ${result.blame.summary}`;
+}
 function formatDefinitionLookup(results, query) {
   if (results.length === 0) {
     return `No definition found for "${query}". Try codebase_search for broader discovery, or verify the symbol name.`;
   }
   const formatted = results.map((r, idx) => {
     const header = formatResultHeader(r, idx);
-    return `${header} (score: ${r.score.toFixed(2)})
+    return `${header} (score: ${r.score.toFixed(2)})${formatBlame(r)}
+\`\`\`
+${truncateContent(r.content)}
+\`\`\``;
+  });
+  return formatted.join("\n\n");
+}
+function formatSearchResults(results, scoreFormat = "similarity") {
+  const formatted = results.map((r, idx) => {
+    const header = formatResultHeader(r, idx);
+    const scoreLabel = scoreFormat === "similarity" ? `(similarity: ${(r.score * 100).toFixed(1)}%)` : `(score: ${r.score.toFixed(2)})`;
+    return `${header} ${scoreLabel}${formatBlame(r)}
 \`\`\`
 ${truncateContent(r.content)}
 \`\`\``;
@@ -10281,11 +10518,11 @@ function formatPrImpact(result) {
 
 // src/tools/operations.ts
 var import_fs13 = require("fs");
-var path19 = __toESM(require("path"), 1);
+var path20 = __toESM(require("path"), 1);
 
 // src/config/merger.ts
 var import_fs11 = require("fs");
-var path16 = __toESM(require("path"), 1);
+var path17 = __toESM(require("path"), 1);
 var PROJECT_OVERRIDE_KEYS = [
   "embeddingProvider",
   "customProvider",
@@ -10318,8 +10555,8 @@ function mergeUniqueStringArray(values) {
   return [...new Set(values.map((value) => String(value).trim()))];
 }
 function normalizeKnowledgeBasePath(value) {
-  let normalized = path16.normalize(String(value).trim());
-  const root = path16.parse(normalized).root;
+  let normalized = path17.normalize(String(value).trim());
+  const root = path17.parse(normalized).root;
   while (normalized.length > root.length && /[\\/]$/.test(normalized)) {
     normalized = normalized.slice(0, -1);
   }
@@ -10372,7 +10609,7 @@ function loadConfigFile(filePath) {
 }
 function materializeLocalProjectConfig(projectRoot, config, host = "opencode") {
   const localConfigPath = resolveWritableProjectConfigPath(projectRoot, host);
-  (0, import_fs11.mkdirSync)(path16.dirname(localConfigPath), { recursive: true });
+  (0, import_fs11.mkdirSync)(path17.dirname(localConfigPath), { recursive: true });
   (0, import_fs11.writeFileSync)(localConfigPath, JSON.stringify(config, null, 2), "utf-8");
   return localConfigPath;
 }
@@ -10383,7 +10620,7 @@ function loadProjectConfigLayer(projectRoot, host = "opencode") {
     return {};
   }
   const normalizedConfig = { ...projectConfig };
-  const projectConfigBaseDir = path16.dirname(path16.dirname(projectConfigPath));
+  const projectConfigBaseDir = path17.dirname(path17.dirname(projectConfigPath));
   if (Array.isArray(normalizedConfig.knowledgeBases)) {
     normalizedConfig.knowledgeBases = resolveInheritedKnowledgeBaseEntries(
       normalizedConfig.knowledgeBases,
@@ -10447,19 +10684,19 @@ function loadMergedConfig(projectRoot, host = "opencode") {
 }
 
 // src/tools/knowledge-base-paths.ts
-var path17 = __toESM(require("path"), 1);
+var path18 = __toESM(require("path"), 1);
 function resolveConfigPathValue(value, baseDir) {
   const trimmed = value.trim();
   if (!trimmed) {
     return trimmed;
   }
-  const absolutePath = path17.isAbsolute(trimmed) ? trimmed : path17.resolve(baseDir, trimmed);
-  return path17.normalize(absolutePath);
+  const absolutePath = path18.isAbsolute(trimmed) ? trimmed : path18.resolve(baseDir, trimmed);
+  return path18.normalize(absolutePath);
 }
 
 // src/tools/config-state.ts
 var import_fs12 = require("fs");
-var path18 = __toESM(require("path"), 1);
+var path19 = __toESM(require("path"), 1);
 function normalizeKnowledgeBasePaths(config, projectRoot) {
   const normalized = { ...config };
   if (Array.isArray(normalized.knowledgeBases)) {
@@ -10527,7 +10764,7 @@ function refreshIndexerForDirectory(projectRoot, host = "opencode", config = par
 }
 function shouldForceLocalizeProjectIndex(projectRoot, host = "opencode") {
   const root = getProjectRoot(projectRoot, host);
-  const localIndexPath = path19.join(root, getHostProjectIndexRelativePath(host));
+  const localIndexPath = path20.join(root, getHostProjectIndexRelativePath(host));
   if ((0, import_fs13.existsSync)(localIndexPath)) {
     return false;
   }
@@ -10542,7 +10779,10 @@ async function searchCodebase(projectRoot, host, query, options = {}) {
     chunkType: options.chunkType,
     contextLines: options.contextLines,
     metadataOnly: options.metadataOnly,
-    definitionIntent: options.definitionIntent
+    definitionIntent: options.definitionIntent,
+    blameAuthor: options.blameAuthor,
+    blameSha: options.blameSha,
+    blameSince: options.blameSince
   });
 }
 async function findSimilarCode(projectRoot, host, code, options = {}) {
@@ -10684,13 +10924,6 @@ async function getIndexLogs(projectRoot, host, args) {
 }
 
 // src/mcp-server/shared.ts
-var MAX_CONTENT_LINES2 = 30;
-function truncateContent2(content) {
-  const lines = content.split("\n");
-  if (lines.length <= MAX_CONTENT_LINES2) return content;
-  return lines.slice(0, MAX_CONTENT_LINES2).join("\n") + `
-// ... (${lines.length - MAX_CONTENT_LINES2} more lines)`;
-}
 var CHUNK_TYPE_ENUM = [
   "function",
   "class",
@@ -10716,7 +10949,10 @@ function registerMcpTools(server, runtime) {
       fileType: import_zod2.z.string().optional().describe("Filter by file extension (e.g., 'ts', 'py', 'rs')"),
       directory: import_zod2.z.string().optional().describe("Filter by directory path (e.g., 'src/utils', 'lib')"),
       chunkType: import_zod2.z.enum(CHUNK_TYPE_ENUM).optional().describe("Filter by code chunk type"),
-      contextLines: import_zod2.z.number().optional().describe("Number of extra lines to include before/after each match (default: 0)")
+      contextLines: import_zod2.z.number().optional().describe("Number of extra lines to include before/after each match (default: 0)"),
+      blameAuthor: import_zod2.z.string().optional().describe("Filter by git blame author name or email"),
+      blameSha: import_zod2.z.string().optional().describe("Filter by git blame commit SHA or prefix"),
+      blameSince: import_zod2.z.string().optional().describe("Filter to chunks last changed on or after this date")
     },
     async (args) => {
       const results = await searchCodebase(runtime.projectRoot, runtime.host, args.query, {
@@ -10724,21 +10960,17 @@ function registerMcpTools(server, runtime) {
         fileType: args.fileType,
         directory: args.directory,
         chunkType: args.chunkType,
-        contextLines: args.contextLines
+        contextLines: args.contextLines,
+        blameAuthor: args.blameAuthor,
+        blameSha: args.blameSha,
+        blameSince: args.blameSince
       });
       if (results.length === 0) {
         return { content: [{ type: "text", text: "No matching code found. Try a different query or run index_codebase first." }] };
       }
-      const formatted = results.map((r, idx) => {
-        const header = r.name ? `[${idx + 1}] ${r.chunkType} "${r.name}" in ${r.filePath}:${r.startLine}-${r.endLine}` : `[${idx + 1}] ${r.chunkType} in ${r.filePath}:${r.startLine}-${r.endLine}`;
-        return `${header} (score: ${r.score.toFixed(2)})
-\`\`\`
-${truncateContent2(r.content)}
-\`\`\``;
-      });
       return { content: [{ type: "text", text: `Found ${results.length} results for "${args.query}":
 
-${formatted.join("\n\n")}` }] };
+${formatSearchResults(results, "score")}` }] };
     }
   );
   server.tool(
@@ -10749,7 +10981,10 @@ ${formatted.join("\n\n")}` }] };
       limit: import_zod2.z.number().optional().default(10).describe("Maximum number of results to return"),
       fileType: import_zod2.z.string().optional().describe("Filter by file extension (e.g., 'ts', 'py', 'rs')"),
       directory: import_zod2.z.string().optional().describe("Filter by directory path (e.g., 'src/utils', 'lib')"),
-      chunkType: import_zod2.z.enum(CHUNK_TYPE_ENUM).optional().describe("Filter by code chunk type")
+      chunkType: import_zod2.z.enum(CHUNK_TYPE_ENUM).optional().describe("Filter by code chunk type"),
+      blameAuthor: import_zod2.z.string().optional().describe("Filter by git blame author name or email"),
+      blameSha: import_zod2.z.string().optional().describe("Filter by git blame commit SHA or prefix"),
+      blameSince: import_zod2.z.string().optional().describe("Filter to chunks last changed on or after this date")
     },
     async (args) => {
       const results = await searchCodebase(runtime.projectRoot, runtime.host, args.query, {
@@ -10757,19 +10992,17 @@ ${formatted.join("\n\n")}` }] };
         fileType: args.fileType,
         directory: args.directory,
         chunkType: args.chunkType,
-        metadataOnly: true
+        metadataOnly: true,
+        blameAuthor: args.blameAuthor,
+        blameSha: args.blameSha,
+        blameSince: args.blameSince
       });
       if (results.length === 0) {
         return { content: [{ type: "text", text: "No matching code found. Try a different query or run index_codebase first." }] };
       }
-      const formatted = results.map((r, idx) => {
-        const location = `${r.filePath}:${r.startLine}-${r.endLine}`;
-        const name = r.name ? `"${r.name}"` : "(anonymous)";
-        return `[${idx + 1}] ${r.chunkType} ${name} at ${location} (score: ${r.score.toFixed(2)})`;
-      });
       return { content: [{ type: "text", text: `Found ${results.length} locations for "${args.query}":
 
-${formatted.join("\n")}
+${formatCodebasePeek(results)}
 
 Use Read tool to examine specific files.` }] };
     }
@@ -10850,16 +11083,9 @@ Use Read tool to examine specific files.` }] };
       if (results.length === 0) {
         return { content: [{ type: "text", text: "No similar code found. Try a different snippet or run index_codebase first." }] };
       }
-      const formatted = results.map((r, idx) => {
-        const header = r.name ? `[${idx + 1}] ${r.chunkType} "${r.name}" in ${r.filePath}:${r.startLine}-${r.endLine}` : `[${idx + 1}] ${r.chunkType} in ${r.filePath}:${r.startLine}-${r.endLine}`;
-        return `${header} (similarity: ${(r.score * 100).toFixed(1)}%)
-\`\`\`
-${truncateContent2(r.content)}
-\`\`\``;
-      });
       return { content: [{ type: "text", text: `Found ${results.length} similar code blocks:
 
-${formatted.join("\n\n")}` }] };
+${formatSearchResults(results)}` }] };
     }
   );
   server.tool(
@@ -10895,28 +11121,10 @@ ${formatted.join("\n\n")}` }] };
           return { content: [{ type: "text", text: "Error: 'symbolId' is required when direction is 'callees'." }] };
         }
         const { callees } = await getCallGraphData(runtime.projectRoot, runtime.host, args);
-        if (callees.length === 0) {
-          return { content: [{ type: "text", text: `No callees found for symbol ${args.symbolId}${args.relationshipType ? ` with type ${args.relationshipType}` : ""}.` }] };
-        }
-        const formatted2 = callees.map((e, i) => {
-          const conf = e.confidence !== "Direct" ? ` [${e.confidence.toLowerCase()}]` : "";
-          return `[${i + 1}] \u2192 ${e.targetName} (${e.callType})${conf} at line ${e.line}${e.isResolved ? ` [resolved: ${e.toSymbolId}]` : " [unresolved]"}`;
-        });
-        return { content: [{ type: "text", text: `Callees (${callees.length}):
-
-${formatted2.join("\n")}` }] };
+        return { content: [{ type: "text", text: formatCallGraphCallees(args.symbolId, callees, args.relationshipType) }] };
       }
       const { callers } = await getCallGraphData(runtime.projectRoot, runtime.host, args);
-      if (callers.length === 0) {
-        return { content: [{ type: "text", text: `No callers found for "${args.name}"${args.relationshipType ? ` with type ${args.relationshipType}` : ""}.` }] };
-      }
-      const formatted = callers.map((e, i) => {
-        const conf = e.confidence !== "Direct" ? ` [${e.confidence.toLowerCase()}]` : "";
-        return `[${i + 1}] \u2190 from ${e.fromSymbolName ?? "<unknown>"} in ${e.fromSymbolFilePath ?? "<unknown file>"} [${e.fromSymbolId}] (${e.callType})${conf} at line ${e.line}${e.isResolved ? " [resolved]" : " [unresolved]"}`;
-      });
-      return { content: [{ type: "text", text: `"${args.name}" is called by ${callers.length} function(s):
-
-${formatted.join("\n")}` }] };
+      return { content: [{ type: "text", text: formatCallGraphCallers(args.name, callers, args.relationshipType) }] };
     }
   );
   server.tool(
@@ -10928,17 +11136,8 @@ ${formatted.join("\n")}` }] };
       maxDepth: import_zod2.z.number().optional().default(10).describe("Maximum traversal depth (default: 10)")
     },
     async (args) => {
-      const path25 = await getCallGraphPath(runtime.projectRoot, runtime.host, args.from, args.to, args.maxDepth);
-      if (path25.length === 0) {
-        return { content: [{ type: "text", text: `No path found between "${args.from}" and "${args.to}". They may be in disconnected components, or the call graph index needs updating.` }] };
-      }
-      const formatted = path25.map((hop, i) => {
-        const prefix = i === 0 ? "[start]" : `--${hop.callType}-->`;
-        const location = hop.filePath ? ` (${hop.filePath}:${hop.line})` : "";
-        return `${prefix} ${hop.symbolName}${location}`;
-      });
-      return { content: [{ type: "text", text: `Path (${path25.length} hops):
-${formatted.join("\n")}` }] };
+      const path26 = await getCallGraphPath(runtime.projectRoot, runtime.host, args.from, args.to, args.maxDepth);
+      return { content: [{ type: "text", text: formatCallGraphPath(args.from, args.to, path26) }] };
     }
   );
   server.tool(
@@ -11098,7 +11297,7 @@ var ReaddirpStream = class extends import_node_stream.Readable {
     this._directoryFilter = normalizeFilter(opts.directoryFilter);
     const statMethod = opts.lstat ? import_promises.lstat : import_promises.stat;
     if (wantBigintFsStats) {
-      this._stat = (path25) => statMethod(path25, { bigint: true });
+      this._stat = (path26) => statMethod(path26, { bigint: true });
     } else {
       this._stat = statMethod;
     }
@@ -11123,8 +11322,8 @@ var ReaddirpStream = class extends import_node_stream.Readable {
         const par = this.parent;
         const fil = par && par.files;
         if (fil && fil.length > 0) {
-          const { path: path25, depth } = par;
-          const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path25));
+          const { path: path26, depth } = par;
+          const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path26));
           const awaited = await Promise.all(slice);
           for (const entry of awaited) {
             if (!entry)
@@ -11164,20 +11363,20 @@ var ReaddirpStream = class extends import_node_stream.Readable {
       this.reading = false;
     }
   }
-  async _exploreDir(path25, depth) {
+  async _exploreDir(path26, depth) {
     let files;
     try {
-      files = await (0, import_promises.readdir)(path25, this._rdOptions);
+      files = await (0, import_promises.readdir)(path26, this._rdOptions);
     } catch (error) {
       this._onError(error);
     }
-    return { files, depth, path: path25 };
+    return { files, depth, path: path26 };
   }
-  async _formatEntry(dirent, path25) {
+  async _formatEntry(dirent, path26) {
     let entry;
     const basename5 = this._isDirent ? dirent.name : dirent;
     try {
-      const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path25, basename5));
+      const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path26, basename5));
       entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename5 };
       entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
     } catch (err) {
@@ -11577,16 +11776,16 @@ var delFromSet = (main2, prop, item) => {
 };
 var isEmptySet = (val) => val instanceof Set ? val.size === 0 : !val;
 var FsWatchInstances = /* @__PURE__ */ new Map();
-function createFsWatchInstance(path25, options, listener, errHandler, emitRaw) {
+function createFsWatchInstance(path26, options, listener, errHandler, emitRaw) {
   const handleEvent = (rawEvent, evPath) => {
-    listener(path25);
-    emitRaw(rawEvent, evPath, { watchedPath: path25 });
-    if (evPath && path25 !== evPath) {
-      fsWatchBroadcast(sp.resolve(path25, evPath), KEY_LISTENERS, sp.join(path25, evPath));
+    listener(path26);
+    emitRaw(rawEvent, evPath, { watchedPath: path26 });
+    if (evPath && path26 !== evPath) {
+      fsWatchBroadcast(sp.resolve(path26, evPath), KEY_LISTENERS, sp.join(path26, evPath));
     }
   };
   try {
-    return (0, import_node_fs.watch)(path25, {
+    return (0, import_node_fs.watch)(path26, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error) {
@@ -11602,12 +11801,12 @@ var fsWatchBroadcast = (fullPath, listenerType, val1, val2, val3) => {
     listener(val1, val2, val3);
   });
 };
-var setFsWatchListener = (path25, fullPath, options, handlers) => {
+var setFsWatchListener = (path26, fullPath, options, handlers) => {
   const { listener, errHandler, rawEmitter } = handlers;
   let cont = FsWatchInstances.get(fullPath);
   let watcher;
   if (!options.persistent) {
-    watcher = createFsWatchInstance(path25, options, listener, errHandler, rawEmitter);
+    watcher = createFsWatchInstance(path26, options, listener, errHandler, rawEmitter);
     if (!watcher)
       return;
     return watcher.close.bind(watcher);
@@ -11618,7 +11817,7 @@ var setFsWatchListener = (path25, fullPath, options, handlers) => {
     addAndConvert(cont, KEY_RAW, rawEmitter);
   } else {
     watcher = createFsWatchInstance(
-      path25,
+      path26,
       options,
       fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS),
       errHandler,
@@ -11633,7 +11832,7 @@ var setFsWatchListener = (path25, fullPath, options, handlers) => {
         cont.watcherUnusable = true;
       if (isWindows && error.code === "EPERM") {
         try {
-          const fd = await (0, import_promises2.open)(path25, "r");
+          const fd = await (0, import_promises2.open)(path26, "r");
           await fd.close();
           broadcastErr(error);
         } catch (err) {
@@ -11664,7 +11863,7 @@ var setFsWatchListener = (path25, fullPath, options, handlers) => {
   };
 };
 var FsWatchFileInstances = /* @__PURE__ */ new Map();
-var setFsWatchFileListener = (path25, fullPath, options, handlers) => {
+var setFsWatchFileListener = (path26, fullPath, options, handlers) => {
   const { listener, rawEmitter } = handlers;
   let cont = FsWatchFileInstances.get(fullPath);
   const copts = cont && cont.options;
@@ -11686,7 +11885,7 @@ var setFsWatchFileListener = (path25, fullPath, options, handlers) => {
         });
         const currmtime = curr.mtimeMs;
         if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
-          foreach(cont.listeners, (listener2) => listener2(path25, curr));
+          foreach(cont.listeners, (listener2) => listener2(path26, curr));
         }
       })
     };
@@ -11716,13 +11915,13 @@ var NodeFsHandler = class {
    * @param listener on fs change
    * @returns closer for the watcher instance
    */
-  _watchWithNodeFs(path25, listener) {
+  _watchWithNodeFs(path26, listener) {
     const opts = this.fsw.options;
-    const directory = sp.dirname(path25);
-    const basename5 = sp.basename(path25);
+    const directory = sp.dirname(path26);
+    const basename5 = sp.basename(path26);
     const parent = this.fsw._getWatchedDir(directory);
     parent.add(basename5);
-    const absolutePath = sp.resolve(path25);
+    const absolutePath = sp.resolve(path26);
     const options = {
       persistent: opts.persistent
     };
@@ -11732,12 +11931,12 @@ var NodeFsHandler = class {
     if (opts.usePolling) {
       const enableBin = opts.interval !== opts.binaryInterval;
       options.interval = enableBin && isBinaryPath(basename5) ? opts.binaryInterval : opts.interval;
-      closer = setFsWatchFileListener(path25, absolutePath, options, {
+      closer = setFsWatchFileListener(path26, absolutePath, options, {
         listener,
         rawEmitter: this.fsw._emitRaw
       });
     } else {
-      closer = setFsWatchListener(path25, absolutePath, options, {
+      closer = setFsWatchListener(path26, absolutePath, options, {
         listener,
         errHandler: this._boundHandleError,
         rawEmitter: this.fsw._emitRaw
@@ -11759,7 +11958,7 @@ var NodeFsHandler = class {
     let prevStats = stats;
     if (parent.has(basename5))
       return;
-    const listener = async (path25, newStats) => {
+    const listener = async (path26, newStats) => {
       if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file, 5))
         return;
       if (!newStats || newStats.mtimeMs === 0) {
@@ -11773,11 +11972,11 @@ var NodeFsHandler = class {
             this.fsw._emit(EV.CHANGE, file, newStats2);
           }
           if ((isMacos || isLinux || isFreeBSD) && prevStats.ino !== newStats2.ino) {
-            this.fsw._closeFile(path25);
+            this.fsw._closeFile(path26);
             prevStats = newStats2;
             const closer2 = this._watchWithNodeFs(file, listener);
             if (closer2)
-              this.fsw._addPathCloser(path25, closer2);
+              this.fsw._addPathCloser(path26, closer2);
           } else {
             prevStats = newStats2;
           }
@@ -11809,7 +12008,7 @@ var NodeFsHandler = class {
    * @param item basename of this item
    * @returns true if no more processing is needed for this entry.
    */
-  async _handleSymlink(entry, directory, path25, item) {
+  async _handleSymlink(entry, directory, path26, item) {
     if (this.fsw.closed) {
       return;
     }
@@ -11819,7 +12018,7 @@ var NodeFsHandler = class {
       this.fsw._incrReadyCount();
       let linkPath;
       try {
-        linkPath = await (0, import_promises2.realpath)(path25);
+        linkPath = await (0, import_promises2.realpath)(path26);
       } catch (e) {
         this.fsw._emitReady();
         return true;
@@ -11829,12 +12028,12 @@ var NodeFsHandler = class {
       if (dir.has(item)) {
         if (this.fsw._symlinkPaths.get(full) !== linkPath) {
           this.fsw._symlinkPaths.set(full, linkPath);
-          this.fsw._emit(EV.CHANGE, path25, entry.stats);
+          this.fsw._emit(EV.CHANGE, path26, entry.stats);
         }
       } else {
         dir.add(item);
         this.fsw._symlinkPaths.set(full, linkPath);
-        this.fsw._emit(EV.ADD, path25, entry.stats);
+        this.fsw._emit(EV.ADD, path26, entry.stats);
       }
       this.fsw._emitReady();
       return true;
@@ -11864,9 +12063,9 @@ var NodeFsHandler = class {
         return;
       }
       const item = entry.path;
-      let path25 = sp.join(directory, item);
+      let path26 = sp.join(directory, item);
       current.add(item);
-      if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path25, item)) {
+      if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path26, item)) {
         return;
       }
       if (this.fsw.closed) {
@@ -11875,8 +12074,8 @@ var NodeFsHandler = class {
       }
       if (item === target || !target && !previous.has(item)) {
         this.fsw._incrReadyCount();
-        path25 = sp.join(dir, sp.relative(dir, path25));
-        this._addToNodeFs(path25, initialAdd, wh, depth + 1);
+        path26 = sp.join(dir, sp.relative(dir, path26));
+        this._addToNodeFs(path26, initialAdd, wh, depth + 1);
       }
     }).on(EV.ERROR, this._boundHandleError);
     return new Promise((resolve15, reject) => {
@@ -11945,13 +12144,13 @@ var NodeFsHandler = class {
    * @param depth Child path actually targeted for watch
    * @param target Child path actually targeted for watch
    */
-  async _addToNodeFs(path25, initialAdd, priorWh, depth, target) {
+  async _addToNodeFs(path26, initialAdd, priorWh, depth, target) {
     const ready = this.fsw._emitReady;
-    if (this.fsw._isIgnored(path25) || this.fsw.closed) {
+    if (this.fsw._isIgnored(path26) || this.fsw.closed) {
       ready();
       return false;
     }
-    const wh = this.fsw._getWatchHelpers(path25);
+    const wh = this.fsw._getWatchHelpers(path26);
     if (priorWh) {
       wh.filterPath = (entry) => priorWh.filterPath(entry);
       wh.filterDir = (entry) => priorWh.filterDir(entry);
@@ -11967,8 +12166,8 @@ var NodeFsHandler = class {
       const follow = this.fsw.options.followSymlinks;
       let closer;
       if (stats.isDirectory()) {
-        const absPath = sp.resolve(path25);
-        const targetPath = follow ? await (0, import_promises2.realpath)(path25) : path25;
+        const absPath = sp.resolve(path26);
+        const targetPath = follow ? await (0, import_promises2.realpath)(path26) : path26;
         if (this.fsw.closed)
           return;
         closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
@@ -11978,29 +12177,29 @@ var NodeFsHandler = class {
           this.fsw._symlinkPaths.set(absPath, targetPath);
         }
       } else if (stats.isSymbolicLink()) {
-        const targetPath = follow ? await (0, import_promises2.realpath)(path25) : path25;
+        const targetPath = follow ? await (0, import_promises2.realpath)(path26) : path26;
         if (this.fsw.closed)
           return;
         const parent = sp.dirname(wh.watchPath);
         this.fsw._getWatchedDir(parent).add(wh.watchPath);
         this.fsw._emit(EV.ADD, wh.watchPath, stats);
-        closer = await this._handleDir(parent, stats, initialAdd, depth, path25, wh, targetPath);
+        closer = await this._handleDir(parent, stats, initialAdd, depth, path26, wh, targetPath);
         if (this.fsw.closed)
           return;
         if (targetPath !== void 0) {
-          this.fsw._symlinkPaths.set(sp.resolve(path25), targetPath);
+          this.fsw._symlinkPaths.set(sp.resolve(path26), targetPath);
         }
       } else {
         closer = this._handleFile(wh.watchPath, stats, initialAdd);
       }
       ready();
       if (closer)
-        this.fsw._addPathCloser(path25, closer);
+        this.fsw._addPathCloser(path26, closer);
       return false;
     } catch (error) {
       if (this.fsw._handleError(error)) {
         ready();
-        return path25;
+        return path26;
       }
     }
   }
@@ -12032,35 +12231,35 @@ function createPattern(matcher) {
       if (matcher.path === string)
         return true;
       if (matcher.recursive) {
-        const relative10 = sp2.relative(matcher.path, string);
-        if (!relative10) {
+        const relative11 = sp2.relative(matcher.path, string);
+        if (!relative11) {
           return false;
         }
-        return !relative10.startsWith("..") && !sp2.isAbsolute(relative10);
+        return !relative11.startsWith("..") && !sp2.isAbsolute(relative11);
       }
       return false;
     };
   }
   return () => false;
 }
-function normalizePath2(path25) {
-  if (typeof path25 !== "string")
+function normalizePath2(path26) {
+  if (typeof path26 !== "string")
     throw new Error("string expected");
-  path25 = sp2.normalize(path25);
-  path25 = path25.replace(/\\/g, "/");
+  path26 = sp2.normalize(path26);
+  path26 = path26.replace(/\\/g, "/");
   let prepend = false;
-  if (path25.startsWith("//"))
+  if (path26.startsWith("//"))
     prepend = true;
-  path25 = path25.replace(DOUBLE_SLASH_RE, "/");
+  path26 = path26.replace(DOUBLE_SLASH_RE, "/");
   if (prepend)
-    path25 = "/" + path25;
-  return path25;
+    path26 = "/" + path26;
+  return path26;
 }
 function matchPatterns(patterns, testString, stats) {
-  const path25 = normalizePath2(testString);
+  const path26 = normalizePath2(testString);
   for (let index = 0; index < patterns.length; index++) {
     const pattern = patterns[index];
-    if (pattern(path25, stats)) {
+    if (pattern(path26, stats)) {
       return true;
     }
   }
@@ -12098,19 +12297,19 @@ var toUnix = (string) => {
   }
   return str;
 };
-var normalizePathToUnix = (path25) => toUnix(sp2.normalize(toUnix(path25)));
-var normalizeIgnored = (cwd = "") => (path25) => {
-  if (typeof path25 === "string") {
-    return normalizePathToUnix(sp2.isAbsolute(path25) ? path25 : sp2.join(cwd, path25));
+var normalizePathToUnix = (path26) => toUnix(sp2.normalize(toUnix(path26)));
+var normalizeIgnored = (cwd = "") => (path26) => {
+  if (typeof path26 === "string") {
+    return normalizePathToUnix(sp2.isAbsolute(path26) ? path26 : sp2.join(cwd, path26));
   } else {
-    return path25;
+    return path26;
   }
 };
-var getAbsolutePath = (path25, cwd) => {
-  if (sp2.isAbsolute(path25)) {
-    return path25;
+var getAbsolutePath = (path26, cwd) => {
+  if (sp2.isAbsolute(path26)) {
+    return path26;
   }
-  return sp2.join(cwd, path25);
+  return sp2.join(cwd, path26);
 };
 var EMPTY_SET = Object.freeze(/* @__PURE__ */ new Set());
 var DirEntry = class {
@@ -12175,10 +12374,10 @@ var WatchHelper = class {
   dirParts;
   followSymlinks;
   statMethod;
-  constructor(path25, follow, fsw) {
+  constructor(path26, follow, fsw) {
     this.fsw = fsw;
-    const watchPath = path25;
-    this.path = path25 = path25.replace(REPLACER_RE, "");
+    const watchPath = path26;
+    this.path = path26 = path26.replace(REPLACER_RE, "");
     this.watchPath = watchPath;
     this.fullWatchPath = sp2.resolve(watchPath);
     this.dirParts = [];
@@ -12318,20 +12517,20 @@ var FSWatcher = class extends import_node_events.EventEmitter {
     this._closePromise = void 0;
     let paths = unifyPaths(paths_);
     if (cwd) {
-      paths = paths.map((path25) => {
-        const absPath = getAbsolutePath(path25, cwd);
+      paths = paths.map((path26) => {
+        const absPath = getAbsolutePath(path26, cwd);
         return absPath;
       });
     }
-    paths.forEach((path25) => {
-      this._removeIgnoredPath(path25);
+    paths.forEach((path26) => {
+      this._removeIgnoredPath(path26);
     });
     this._userIgnored = void 0;
     if (!this._readyCount)
       this._readyCount = 0;
     this._readyCount += paths.length;
-    Promise.all(paths.map(async (path25) => {
-      const res = await this._nodeFsHandler._addToNodeFs(path25, !_internal, void 0, 0, _origAdd);
+    Promise.all(paths.map(async (path26) => {
+      const res = await this._nodeFsHandler._addToNodeFs(path26, !_internal, void 0, 0, _origAdd);
       if (res)
         this._emitReady();
       return res;
@@ -12353,17 +12552,17 @@ var FSWatcher = class extends import_node_events.EventEmitter {
       return this;
     const paths = unifyPaths(paths_);
     const { cwd } = this.options;
-    paths.forEach((path25) => {
-      if (!sp2.isAbsolute(path25) && !this._closers.has(path25)) {
+    paths.forEach((path26) => {
+      if (!sp2.isAbsolute(path26) && !this._closers.has(path26)) {
         if (cwd)
-          path25 = sp2.join(cwd, path25);
-        path25 = sp2.resolve(path25);
+          path26 = sp2.join(cwd, path26);
+        path26 = sp2.resolve(path26);
       }
-      this._closePath(path25);
-      this._addIgnoredPath(path25);
-      if (this._watched.has(path25)) {
+      this._closePath(path26);
+      this._addIgnoredPath(path26);
+      if (this._watched.has(path26)) {
         this._addIgnoredPath({
-          path: path25,
+          path: path26,
           recursive: true
         });
       }
@@ -12427,38 +12626,38 @@ var FSWatcher = class extends import_node_events.EventEmitter {
    * @param stats arguments to be passed with event
    * @returns the error if defined, otherwise the value of the FSWatcher instance's `closed` flag
    */
-  async _emit(event, path25, stats) {
+  async _emit(event, path26, stats) {
     if (this.closed)
       return;
     const opts = this.options;
     if (isWindows)
-      path25 = sp2.normalize(path25);
+      path26 = sp2.normalize(path26);
     if (opts.cwd)
-      path25 = sp2.relative(opts.cwd, path25);
-    const args = [path25];
+      path26 = sp2.relative(opts.cwd, path26);
+    const args = [path26];
     if (stats != null)
       args.push(stats);
     const awf = opts.awaitWriteFinish;
     let pw;
-    if (awf && (pw = this._pendingWrites.get(path25))) {
+    if (awf && (pw = this._pendingWrites.get(path26))) {
       pw.lastChange = /* @__PURE__ */ new Date();
       return this;
     }
     if (opts.atomic) {
       if (event === EVENTS.UNLINK) {
-        this._pendingUnlinks.set(path25, [event, ...args]);
+        this._pendingUnlinks.set(path26, [event, ...args]);
         setTimeout(() => {
-          this._pendingUnlinks.forEach((entry, path26) => {
+          this._pendingUnlinks.forEach((entry, path27) => {
             this.emit(...entry);
             this.emit(EVENTS.ALL, ...entry);
-            this._pendingUnlinks.delete(path26);
+            this._pendingUnlinks.delete(path27);
           });
         }, typeof opts.atomic === "number" ? opts.atomic : 100);
         return this;
       }
-      if (event === EVENTS.ADD && this._pendingUnlinks.has(path25)) {
+      if (event === EVENTS.ADD && this._pendingUnlinks.has(path26)) {
         event = EVENTS.CHANGE;
-        this._pendingUnlinks.delete(path25);
+        this._pendingUnlinks.delete(path26);
       }
     }
     if (awf && (event === EVENTS.ADD || event === EVENTS.CHANGE) && this._readyEmitted) {
@@ -12476,16 +12675,16 @@ var FSWatcher = class extends import_node_events.EventEmitter {
           this.emitWithAll(event, args);
         }
       };
-      this._awaitWriteFinish(path25, awf.stabilityThreshold, event, awfEmit);
+      this._awaitWriteFinish(path26, awf.stabilityThreshold, event, awfEmit);
       return this;
     }
     if (event === EVENTS.CHANGE) {
-      const isThrottled = !this._throttle(EVENTS.CHANGE, path25, 50);
+      const isThrottled = !this._throttle(EVENTS.CHANGE, path26, 50);
       if (isThrottled)
         return this;
     }
     if (opts.alwaysStat && stats === void 0 && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-      const fullPath = opts.cwd ? sp2.join(opts.cwd, path25) : path25;
+      const fullPath = opts.cwd ? sp2.join(opts.cwd, path26) : path26;
       let stats2;
       try {
         stats2 = await (0, import_promises3.stat)(fullPath);
@@ -12516,23 +12715,23 @@ var FSWatcher = class extends import_node_events.EventEmitter {
    * @param timeout duration of time to suppress duplicate actions
    * @returns tracking object or false if action should be suppressed
    */
-  _throttle(actionType, path25, timeout) {
+  _throttle(actionType, path26, timeout) {
     if (!this._throttled.has(actionType)) {
       this._throttled.set(actionType, /* @__PURE__ */ new Map());
     }
     const action = this._throttled.get(actionType);
     if (!action)
       throw new Error("invalid throttle");
-    const actionPath = action.get(path25);
+    const actionPath = action.get(path26);
     if (actionPath) {
       actionPath.count++;
       return false;
     }
     let timeoutObject;
     const clear = () => {
-      const item = action.get(path25);
+      const item = action.get(path26);
       const count = item ? item.count : 0;
-      action.delete(path25);
+      action.delete(path26);
       clearTimeout(timeoutObject);
       if (item)
         clearTimeout(item.timeoutObject);
@@ -12540,7 +12739,7 @@ var FSWatcher = class extends import_node_events.EventEmitter {
     };
     timeoutObject = setTimeout(clear, timeout);
     const thr = { timeoutObject, clear, count: 0 };
-    action.set(path25, thr);
+    action.set(path26, thr);
     return thr;
   }
   _incrReadyCount() {
@@ -12554,44 +12753,44 @@ var FSWatcher = class extends import_node_events.EventEmitter {
    * @param event
    * @param awfEmit Callback to be called when ready for event to be emitted.
    */
-  _awaitWriteFinish(path25, threshold, event, awfEmit) {
+  _awaitWriteFinish(path26, threshold, event, awfEmit) {
     const awf = this.options.awaitWriteFinish;
     if (typeof awf !== "object")
       return;
     const pollInterval = awf.pollInterval;
     let timeoutHandler;
-    let fullPath = path25;
-    if (this.options.cwd && !sp2.isAbsolute(path25)) {
-      fullPath = sp2.join(this.options.cwd, path25);
+    let fullPath = path26;
+    if (this.options.cwd && !sp2.isAbsolute(path26)) {
+      fullPath = sp2.join(this.options.cwd, path26);
     }
     const now = /* @__PURE__ */ new Date();
     const writes = this._pendingWrites;
     function awaitWriteFinishFn(prevStat) {
       (0, import_node_fs2.stat)(fullPath, (err, curStat) => {
-        if (err || !writes.has(path25)) {
+        if (err || !writes.has(path26)) {
           if (err && err.code !== "ENOENT")
             awfEmit(err);
           return;
         }
         const now2 = Number(/* @__PURE__ */ new Date());
         if (prevStat && curStat.size !== prevStat.size) {
-          writes.get(path25).lastChange = now2;
+          writes.get(path26).lastChange = now2;
         }
-        const pw = writes.get(path25);
+        const pw = writes.get(path26);
         const df = now2 - pw.lastChange;
         if (df >= threshold) {
-          writes.delete(path25);
+          writes.delete(path26);
           awfEmit(void 0, curStat);
         } else {
           timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
         }
       });
     }
-    if (!writes.has(path25)) {
-      writes.set(path25, {
+    if (!writes.has(path26)) {
+      writes.set(path26, {
         lastChange: now,
         cancelWait: () => {
-          writes.delete(path25);
+          writes.delete(path26);
           clearTimeout(timeoutHandler);
           return event;
         }
@@ -12602,8 +12801,8 @@ var FSWatcher = class extends import_node_events.EventEmitter {
   /**
    * Determines whether user has asked to ignore this path.
    */
-  _isIgnored(path25, stats) {
-    if (this.options.atomic && DOT_RE.test(path25))
+  _isIgnored(path26, stats) {
+    if (this.options.atomic && DOT_RE.test(path26))
       return true;
     if (!this._userIgnored) {
       const { cwd } = this.options;
@@ -12613,17 +12812,17 @@ var FSWatcher = class extends import_node_events.EventEmitter {
       const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
       this._userIgnored = anymatch(list, void 0);
     }
-    return this._userIgnored(path25, stats);
+    return this._userIgnored(path26, stats);
   }
-  _isntIgnored(path25, stat4) {
-    return !this._isIgnored(path25, stat4);
+  _isntIgnored(path26, stat4) {
+    return !this._isIgnored(path26, stat4);
   }
   /**
    * Provides a set of common helpers and properties relating to symlink handling.
    * @param path file or directory pattern being watched
    */
-  _getWatchHelpers(path25) {
-    return new WatchHelper(path25, this.options.followSymlinks, this);
+  _getWatchHelpers(path26) {
+    return new WatchHelper(path26, this.options.followSymlinks, this);
   }
   // Directory helpers
   // -----------------
@@ -12655,63 +12854,63 @@ var FSWatcher = class extends import_node_events.EventEmitter {
    * @param item      base path of item/directory
    */
   _remove(directory, item, isDirectory) {
-    const path25 = sp2.join(directory, item);
-    const fullPath = sp2.resolve(path25);
-    isDirectory = isDirectory != null ? isDirectory : this._watched.has(path25) || this._watched.has(fullPath);
-    if (!this._throttle("remove", path25, 100))
+    const path26 = sp2.join(directory, item);
+    const fullPath = sp2.resolve(path26);
+    isDirectory = isDirectory != null ? isDirectory : this._watched.has(path26) || this._watched.has(fullPath);
+    if (!this._throttle("remove", path26, 100))
       return;
     if (!isDirectory && this._watched.size === 1) {
       this.add(directory, item, true);
     }
-    const wp = this._getWatchedDir(path25);
+    const wp = this._getWatchedDir(path26);
     const nestedDirectoryChildren = wp.getChildren();
-    nestedDirectoryChildren.forEach((nested) => this._remove(path25, nested));
+    nestedDirectoryChildren.forEach((nested) => this._remove(path26, nested));
     const parent = this._getWatchedDir(directory);
     const wasTracked = parent.has(item);
     parent.remove(item);
     if (this._symlinkPaths.has(fullPath)) {
       this._symlinkPaths.delete(fullPath);
     }
-    let relPath = path25;
+    let relPath = path26;
     if (this.options.cwd)
-      relPath = sp2.relative(this.options.cwd, path25);
+      relPath = sp2.relative(this.options.cwd, path26);
     if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
       const event = this._pendingWrites.get(relPath).cancelWait();
       if (event === EVENTS.ADD)
         return;
     }
-    this._watched.delete(path25);
+    this._watched.delete(path26);
     this._watched.delete(fullPath);
     const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
-    if (wasTracked && !this._isIgnored(path25))
-      this._emit(eventName, path25);
-    this._closePath(path25);
+    if (wasTracked && !this._isIgnored(path26))
+      this._emit(eventName, path26);
+    this._closePath(path26);
   }
   /**
    * Closes all watchers for a path
    */
-  _closePath(path25) {
-    this._closeFile(path25);
-    const dir = sp2.dirname(path25);
-    this._getWatchedDir(dir).remove(sp2.basename(path25));
+  _closePath(path26) {
+    this._closeFile(path26);
+    const dir = sp2.dirname(path26);
+    this._getWatchedDir(dir).remove(sp2.basename(path26));
   }
   /**
    * Closes only file-specific watchers
    */
-  _closeFile(path25) {
-    const closers = this._closers.get(path25);
+  _closeFile(path26) {
+    const closers = this._closers.get(path26);
     if (!closers)
       return;
     closers.forEach((closer) => closer());
-    this._closers.delete(path25);
+    this._closers.delete(path26);
   }
-  _addPathCloser(path25, closer) {
+  _addPathCloser(path26, closer) {
     if (!closer)
       return;
-    let list = this._closers.get(path25);
+    let list = this._closers.get(path26);
     if (!list) {
       list = [];
-      this._closers.set(path25, list);
+      this._closers.set(path26, list);
     }
     list.push(closer);
   }
@@ -12741,7 +12940,7 @@ function watch(paths, options = {}) {
 var chokidar_default = { watch, FSWatcher };
 
 // src/watcher/file-watcher.ts
-var path20 = __toESM(require("path"), 1);
+var path21 = __toESM(require("path"), 1);
 var FileWatcher = class {
   watcher = null;
   projectRoot;
@@ -12767,15 +12966,15 @@ var FileWatcher = class {
     const watchTargets = this.configPath ? [this.projectRoot, this.configPath] : this.projectRoot;
     this.watcher = chokidar_default.watch(watchTargets, {
       ignored: (filePath) => {
-        const relativePath = path20.relative(this.projectRoot, filePath);
+        const relativePath = path21.relative(this.projectRoot, filePath);
         if (!relativePath) return false;
         if (this.isProjectConfigPathOrAncestor(relativePath)) {
           return false;
         }
-        if (hasFilteredPathSegment(relativePath, path20.sep)) {
+        if (hasFilteredPathSegment(relativePath, path21.sep)) {
           return true;
         }
-        if (isRestrictedDirectory(relativePath, path20.sep)) {
+        if (isRestrictedDirectory(relativePath, path21.sep)) {
           return true;
         }
         if (ignoreFilter.ignores(relativePath)) {
@@ -12821,24 +13020,24 @@ var FileWatcher = class {
     this.scheduleFlush();
   }
   isProjectConfigPath(filePath) {
-    const relativePath = path20.relative(this.projectRoot, filePath);
-    const normalizedRelativePath = path20.normalize(relativePath);
+    const relativePath = path21.relative(this.projectRoot, filePath);
+    const normalizedRelativePath = path21.normalize(relativePath);
     return this.getProjectConfigRelativePaths().some((configPath) => configPath === normalizedRelativePath);
   }
   isProjectConfigPathOrAncestor(relativePath) {
-    const normalizedRelativePath = path20.normalize(relativePath);
+    const normalizedRelativePath = path21.normalize(relativePath);
     return this.getProjectConfigRelativePaths().some(
-      (configPath) => configPath === normalizedRelativePath || configPath.startsWith(`${normalizedRelativePath}${path20.sep}`)
+      (configPath) => configPath === normalizedRelativePath || configPath.startsWith(`${normalizedRelativePath}${path21.sep}`)
     );
   }
   getProjectConfigRelativePaths() {
     if (this.configPath) {
-      return [path20.normalize(path20.relative(this.projectRoot, this.configPath))];
+      return [path21.normalize(path21.relative(this.projectRoot, this.configPath))];
     }
     return [
       resolveProjectConfigPath(this.projectRoot, this.host),
       resolveWritableProjectConfigPath(this.projectRoot, this.host)
-    ].map((configPath) => path20.normalize(path20.relative(this.projectRoot, configPath)));
+    ].map((configPath) => path21.normalize(path21.relative(this.projectRoot, configPath)));
   }
   scheduleFlush() {
     if (this.debounceTimer) {
@@ -12853,7 +13052,7 @@ var FileWatcher = class {
       return;
     }
     const changes = Array.from(this.pendingChanges.entries()).map(
-      ([path25, type]) => ({ path: path25, type })
+      ([path26, type]) => ({ path: path26, type })
     );
     this.pendingChanges.clear();
     try {
@@ -12880,7 +13079,7 @@ var FileWatcher = class {
 };
 
 // src/watcher/git-head-watcher.ts
-var path21 = __toESM(require("path"), 1);
+var path22 = __toESM(require("path"), 1);
 var GitHeadWatcher = class {
   watcher = null;
   projectRoot;
@@ -12902,7 +13101,7 @@ var GitHeadWatcher = class {
     this.onBranchChange = handler;
     this.currentBranch = getCurrentBranch(this.projectRoot);
     const headPath = getHeadPath(this.projectRoot);
-    const refsPath = path21.join(this.projectRoot, ".git", "refs", "heads");
+    const refsPath = path22.join(this.projectRoot, ".git", "refs", "heads");
     this.watcher = chokidar_default.watch([headPath, refsPath], {
       persistent: true,
       ignoreInitial: true,
@@ -13045,8 +13244,8 @@ function getConfigPaths(projectRoot, host, options) {
 }
 
 // src/tools/visualize/activity.ts
-var import_child_process3 = require("child_process");
-var path22 = __toESM(require("path"), 1);
+var import_child_process4 = require("child_process");
+var path23 = __toESM(require("path"), 1);
 function attachRecentActivity(data, projectRoot) {
   const activity = readGitActivity(projectRoot);
   const changes = activity.size > 0 ? buildGitChanges(data, activity, projectRoot) : buildGraphChanges(data);
@@ -13057,7 +13256,7 @@ function attachRecentActivity(data, projectRoot) {
 }
 function readGitActivity(projectRoot) {
   try {
-    const output = (0, import_child_process3.execFileSync)(
+    const output = (0, import_child_process4.execFileSync)(
       "git",
       ["-C", projectRoot, "log", "--since=90.days", "--numstat", "--date=short", "--pretty=format:__COMMIT__%x09%h%x09%ad%x09%s"],
       { encoding: "utf8", maxBuffer: 8 * 1024 * 1024, stdio: ["ignore", "pipe", "ignore"] }
@@ -13208,7 +13407,7 @@ function normalizePath3(filePath) {
   return filePath.replace(/\\/g, "/");
 }
 function toGitRelativePath(projectRoot, filePath) {
-  const relativePath = path22.isAbsolute(filePath) ? path22.relative(projectRoot, filePath) : filePath;
+  const relativePath = path23.isAbsolute(filePath) ? path23.relative(projectRoot, filePath) : filePath;
   return normalizePath3(relativePath);
 }
 
@@ -13466,7 +13665,7 @@ render();
 }
 
 // src/tools/visualize/transform.ts
-var path23 = __toESM(require("path"), 1);
+var path24 = __toESM(require("path"), 1);
 
 // src/tools/visualize/modules.ts
 var MAX_MODULES = 18;
@@ -13599,8 +13798,8 @@ function compactModules(prefixToNodes) {
 function deriveModules(nodes) {
   const initial = /* @__PURE__ */ new Map();
   for (const node of nodes) {
-    const relative10 = stripToProjectRelative(node.filePath);
-    const prefix = modulePrefixFromRelativePath(relative10);
+    const relative11 = stripToProjectRelative(node.filePath);
+    const prefix = modulePrefixFromRelativePath(relative11);
     if (!initial.has(prefix)) initial.set(prefix, []);
     initial.get(prefix)?.push(node);
   }
@@ -13726,7 +13925,7 @@ function transformForVisualization(symbols, edges, options = {}) {
     filePath: s.filePath,
     kind: s.kind,
     line: s.startLine,
-    directory: path23.dirname(s.filePath),
+    directory: path24.dirname(s.filePath),
     moduleId: "",
     moduleLabel: ""
   }));
@@ -13755,9 +13954,9 @@ function parseArgs(argv) {
   let host = "opencode";
   for (let i = 2; i < argv.length; i++) {
     if (argv[i] === "--project" && argv[i + 1]) {
-      project = path24.resolve(argv[++i]);
+      project = path25.resolve(argv[++i]);
     } else if (argv[i] === "--config" && argv[i + 1]) {
-      config = path24.resolve(argv[++i]);
+      config = path25.resolve(argv[++i]);
     } else if (argv[i] === "--host" && argv[i + 1]) {
       host = parseHostMode(argv[++i]);
     } else if (argv[i] === "--host") {
@@ -13780,7 +13979,7 @@ function parseVisualizeArgs(argv, cwd) {
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i];
     if (arg === "--project" && argv[i + 1]) {
-      project = path24.resolve(argv[++i]);
+      project = path25.resolve(argv[++i]);
     } else if (arg === "--max" && argv[i + 1]) {
       maxNodes = Number(argv[++i]);
     } else if (arg.startsWith("--max=") || arg.startsWith("max=")) {
@@ -13817,7 +14016,7 @@ async function handleVisualizeCommand(argv, cwd) {
       console.error("No connected symbols found. Retry with: npm run visualize -- orphans");
       return 1;
     }
-    const outputPath = path24.join(os5.tmpdir(), `call-graph-${Date.now()}.html`);
+    const outputPath = path25.join(os5.tmpdir(), `call-graph-${Date.now()}.html`);
     (0, import_fs15.writeFileSync)(outputPath, generateVisualizationHtml(vizData), "utf-8");
     console.log(`Temporal call graph visualization generated: ${outputPath}`);
     console.log(`Nodes: ${vizData.nodes.length} | Edges: ${vizData.edges.length}`);
@@ -13847,7 +14046,7 @@ async function main() {
   const transport = new import_stdio.StdioServerTransport();
   await server.connect(transport);
   let watcher = null;
-  const isHomeDir = path24.resolve(args.project) === path24.resolve(os5.homedir());
+  const isHomeDir = path25.resolve(args.project) === path25.resolve(os5.homedir());
   const isValidProject = !isHomeDir && (!config.indexing.requireProjectMarker || hasProjectMarker(args.project));
   if (config.indexing.autoIndex && isValidProject) {
     const indexer = getIndexerForProject(args.project, args.host);