opencode-codebase-index 0.20.1 → 0.21.0

package/dist/index.js

@@ -650,7 +650,7 @@ var require_eventemitter3 = __commonJS({
   }
 });
 
-// src/index.ts
+// src/adapters/opencode.ts
 import * as path26 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
@@ -1060,12 +1060,12 @@ var autoDetectProviders = AUTO_DETECT_PROVIDER_ORDER.filter(
 
 // src/config/merger.ts
 import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
-import * as path6 from "path";
+import * as path7 from "path";
 
 // src/config/paths.ts
 import { existsSync as existsSync3 } from "fs";
 import * as os from "os";
-import * as path3 from "path";
+import * as path4 from "path";
 
 // src/git/index.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2, statSync as statSync2 } from "fs";
@@ -1204,15 +1204,125 @@ function getHeadPath(repoRoot) {
   return path2.join(repoRoot, ".git", "HEAD");
 }
 
+// src/utils/canonical-path.ts
+import * as crypto from "crypto";
+import * as fs from "fs";
+import * as path3 from "path";
+
+// node_modules/unicode-case-folding/index.js
+var FOLDING_MAP = /* @__PURE__ */ new Map([[65, [97]], [66, [98]], [67, [99]], [68, [100]], [69, [101]], [70, [102]], [71, [103]], [72, [104]], [73, [105]], [74, [106]], [75, [107]], [76, [108]], [77, [109]], [78, [110]], [79, [111]], [80, [112]], [81, [113]], [82, [114]], [83, [115]], [84, [116]], [85, [117]], [86, [118]], [87, [119]], [88, [120]], [89, [121]], [90, [122]], [181, [956]], [192, [224]], [193, [225]], [194, [226]], [195, [227]], [196, [228]], [197, [229]], [198, [230]], [199, [231]], [200, [232]], [201, [233]], [202, [234]], [203, [235]], [204, [236]], [205, [237]], [206, [238]], [207, [239]], [208, [240]], [209, [241]], [210, [242]], [211, [243]], [212, [244]], [213, [245]], [214, [246]], [216, [248]], [217, [249]], [218, [250]], [219, [251]], [220, [252]], [221, [253]], [222, [254]], [223, [115, 115]], [256, [257]], [258, [259]], [260, [261]], [262, [263]], [264, [265]], [266, [267]], [268, [269]], [270, [271]], [272, [273]], [274, [275]], [276, [277]], [278, [279]], [280, [281]], [282, [283]], [284, [285]], [286, [287]], [288, [289]], [290, [291]], [292, [293]], [294, [295]], [296, [297]], [298, [299]], [300, [301]], [302, [303]], [304, [105, 775]], [306, [307]], [308, [309]], [310, [311]], [313, [314]], [315, [316]], [317, [318]], [319, [320]], [321, [322]], [323, [324]], [325, [326]], [327, [328]], [329, [700, 110]], [330, [331]], [332, [333]], [334, [335]], [336, [337]], [338, [339]], [340, [341]], [342, [343]], [344, [345]], [346, [347]], [348, [349]], [350, [351]], [352, [353]], [354, [355]], [356, [357]], [358, [359]], [360, [361]], [362, [363]], [364, [365]], [366, [367]], [368, [369]], [370, [371]], [372, [373]], [374, [375]], [376, [255]], [377, [378]], [379, [380]], [381, [382]], [383, [115]], [385, [595]], [386, [387]], [388, [389]], [390, [596]], [391, [392]], [393, [598]], [394, [599]], [395, [396]], [398, [477]], [399, [601]], [400, [603]], [401, [402]], [403, [608]], [404, [611]], [406, [617]], [407, [616]], [408, [409]], [412, [623]], [413, [626]], [415, [629]], [416, [417]], [418, [419]], [420, [421]], [422, [640]], [423, [424]], [425, [643]], [428, [429]], [430, [648]], [431, [432]], [433, [650]], [434, [651]], [435, [436]], [437, [438]], [439, [658]], [440, [441]], [444, [445]], [452, [454]], [453, [454]], [455, [457]], [456, [457]], [458, [460]], [459, [460]], [461, [462]], [463, [464]], [465, [466]], [467, [468]], [469, [470]], [471, [472]], [473, [474]], [475, [476]], [478, [479]], [480, [481]], [482, [483]], [484, [485]], [486, [487]], [488, [489]], [490, [491]], [492, [493]], [494, [495]], [496, [106, 780]], [497, [499]], [498, [499]], [500, [501]], [502, [405]], [503, [447]], [504, [505]], [506, [507]], [508, [509]], [510, [511]], [512, [513]], [514, [515]], [516, [517]], [518, [519]], [520, [521]], [522, [523]], [524, [525]], [526, [527]], [528, [529]], [530, [531]], [532, [533]], [534, [535]], [536, [537]], [538, [539]], [540, [541]], [542, [543]], [544, [414]], [546, [547]], [548, [549]], [550, [551]], [552, [553]], [554, [555]], [556, [557]], [558, [559]], [560, [561]], [562, [563]], [570, [11365]], [571, [572]], [573, [410]], [574, [11366]], [577, [578]], [579, [384]], [580, [649]], [581, [652]], [582, [583]], [584, [585]], [586, [587]], [588, [589]], [590, [591]], [837, [953]], [880, [881]], [882, [883]], [886, [887]], [895, [1011]], [902, [940]], [904, [941]], [905, [942]], [906, [943]], [908, [972]], [910, [973]], [911, [974]], [912, [953, 776, 769]], [913, [945]], [914, [946]], [915, [947]], [916, [948]], [917, [949]], [918, [950]], [919, [951]], [920, [952]], [921, [953]], [922, [954]], [923, [955]], [924, [956]], [925, [957]], [926, [958]], [927, [959]], [928, [960]], [929, [961]], [931, [963]], [932, [964]], [933, [965]], [934, [966]], [935, [967]], [936, [968]], [937, [969]], [938, [970]], [939, [971]], [944, [965, 776, 769]], [962, [963]], [975, [983]], [976, [946]], [977, [952]], [981, [966]], [982, [960]], [984, [985]], [986, [987]], [988, [989]], [990, [991]], [992, [993]], [994, [995]], [996, [997]], [998, [999]], [1e3, [1001]], [1002, [1003]], [1004, [1005]], [1006, [1007]], [1008, [954]], [1009, [961]], [1012, [952]], [1013, [949]], [1015, [1016]], [1017, [1010]], [1018, [1019]], [1021, [891]], [1022, [892]], [1023, [893]], [1024, [1104]], [1025, [1105]], [1026, [1106]], [1027, [1107]], [1028, [1108]], [1029, [1109]], [1030, [1110]], [1031, [1111]], [1032, [1112]], [1033, [1113]], [1034, [1114]], [1035, [1115]], [1036, [1116]], [1037, [1117]], [1038, [1118]], [1039, [1119]], [1040, [1072]], [1041, [1073]], [1042, [1074]], [1043, [1075]], [1044, [1076]], [1045, [1077]], [1046, [1078]], [1047, [1079]], [1048, [1080]], [1049, [1081]], [1050, [1082]], [1051, [1083]], [1052, [1084]], [1053, [1085]], [1054, [1086]], [1055, [1087]], [1056, [1088]], [1057, [1089]], [1058, [1090]], [1059, [1091]], [1060, [1092]], [1061, [1093]], [1062, [1094]], [1063, [1095]], [1064, [1096]], [1065, [1097]], [1066, [1098]], [1067, [1099]], [1068, [1100]], [1069, [1101]], [1070, [1102]], [1071, [1103]], [1120, [1121]], [1122, [1123]], [1124, [1125]], [1126, [1127]], [1128, [1129]], [1130, [1131]], [1132, [1133]], [1134, [1135]], [1136, [1137]], [1138, [1139]], [1140, [1141]], [1142, [1143]], [1144, [1145]], [1146, [1147]], [1148, [1149]], [1150, [1151]], [1152, [1153]], [1162, [1163]], [1164, [1165]], [1166, [1167]], [1168, [1169]], [1170, [1171]], [1172, [1173]], [1174, [1175]], [1176, [1177]], [1178, [1179]], [1180, [1181]], [1182, [1183]], [1184, [1185]], [1186, [1187]], [1188, [1189]], [1190, [1191]], [1192, [1193]], [1194, [1195]], [1196, [1197]], [1198, [1199]], [1200, [1201]], [1202, [1203]], [1204, [1205]], [1206, [1207]], [1208, [1209]], [1210, [1211]], [1212, [1213]], [1214, [1215]], [1216, [1231]], [1217, [1218]], [1219, [1220]], [1221, [1222]], [1223, [1224]], [1225, [1226]], [1227, [1228]], [1229, [1230]], [1232, [1233]], [1234, [1235]], [1236, [1237]], [1238, [1239]], [1240, [1241]], [1242, [1243]], [1244, [1245]], [1246, [1247]], [1248, [1249]], [1250, [1251]], [1252, [1253]], [1254, [1255]], [1256, [1257]], [1258, [1259]], [1260, [1261]], [1262, [1263]], [1264, [1265]], [1266, [1267]], [1268, [1269]], [1270, [1271]], [1272, [1273]], [1274, [1275]], [1276, [1277]], [1278, [1279]], [1280, [1281]], [1282, [1283]], [1284, [1285]], [1286, [1287]], [1288, [1289]], [1290, [1291]], [1292, [1293]], [1294, [1295]], [1296, [1297]], [1298, [1299]], [1300, [1301]], [1302, [1303]], [1304, [1305]], [1306, [1307]], [1308, [1309]], [1310, [1311]], [1312, [1313]], [1314, [1315]], [1316, [1317]], [1318, [1319]], [1320, [1321]], [1322, [1323]], [1324, [1325]], [1326, [1327]], [1329, [1377]], [1330, [1378]], [1331, [1379]], [1332, [1380]], [1333, [1381]], [1334, [1382]], [1335, [1383]], [1336, [1384]], [1337, [1385]], [1338, [1386]], [1339, [1387]], [1340, [1388]], [1341, [1389]], [1342, [1390]], [1343, [1391]], [1344, [1392]], [1345, [1393]], [1346, [1394]], [1347, [1395]], [1348, [1396]], [1349, [1397]], [1350, [1398]], [1351, [1399]], [1352, [1400]], [1353, [1401]], [1354, [1402]], [1355, [1403]], [1356, [1404]], [1357, [1405]], [1358, [1406]], [1359, [1407]], [1360, [1408]], [1361, [1409]], [1362, [1410]], [1363, [1411]], [1364, [1412]], [1365, [1413]], [1366, [1414]], [1415, [1381, 1410]], [4256, [11520]], [4257, [11521]], [4258, [11522]], [4259, [11523]], [4260, [11524]], [4261, [11525]], [4262, [11526]], [4263, [11527]], [4264, [11528]], [4265, [11529]], [4266, [11530]], [4267, [11531]], [4268, [11532]], [4269, [11533]], [4270, [11534]], [4271, [11535]], [4272, [11536]], [4273, [11537]], [4274, [11538]], [4275, [11539]], [4276, [11540]], [4277, [11541]], [4278, [11542]], [4279, [11543]], [4280, [11544]], [4281, [11545]], [4282, [11546]], [4283, [11547]], [4284, [11548]], [4285, [11549]], [4286, [11550]], [4287, [11551]], [4288, [11552]], [4289, [11553]], [4290, [11554]], [4291, [11555]], [4292, [11556]], [4293, [11557]], [4295, [11559]], [4301, [11565]], [5112, [5104]], [5113, [5105]], [5114, [5106]], [5115, [5107]], [5116, [5108]], [5117, [5109]], [7296, [1074]], [7297, [1076]], [7298, [1086]], [7299, [1089]], [7300, [1090]], [7301, [1090]], [7302, [1098]], [7303, [1123]], [7304, [42571]], [7305, [7306]], [7312, [4304]], [7313, [4305]], [7314, [4306]], [7315, [4307]], [7316, [4308]], [7317, [4309]], [7318, [4310]], [7319, [4311]], [7320, [4312]], [7321, [4313]], [7322, [4314]], [7323, [4315]], [7324, [4316]], [7325, [4317]], [7326, [4318]], [7327, [4319]], [7328, [4320]], [7329, [4321]], [7330, [4322]], [7331, [4323]], [7332, [4324]], [7333, [4325]], [7334, [4326]], [7335, [4327]], [7336, [4328]], [7337, [4329]], [7338, [4330]], [7339, [4331]], [7340, [4332]], [7341, [4333]], [7342, [4334]], [7343, [4335]], [7344, [4336]], [7345, [4337]], [7346, [4338]], [7347, [4339]], [7348, [4340]], [7349, [4341]], [7350, [4342]], [7351, [4343]], [7352, [4344]], [7353, [4345]], [7354, [4346]], [7357, [4349]], [7358, [4350]], [7359, [4351]], [7680, [7681]], [7682, [7683]], [7684, [7685]], [7686, [7687]], [7688, [7689]], [7690, [7691]], [7692, [7693]], [7694, [7695]], [7696, [7697]], [7698, [7699]], [7700, [7701]], [7702, [7703]], [7704, [7705]], [7706, [7707]], [7708, [7709]], [7710, [7711]], [7712, [7713]], [7714, [7715]], [7716, [7717]], [7718, [7719]], [7720, [7721]], [7722, [7723]], [7724, [7725]], [7726, [7727]], [7728, [7729]], [7730, [7731]], [7732, [7733]], [7734, [7735]], [7736, [7737]], [7738, [7739]], [7740, [7741]], [7742, [7743]], [7744, [7745]], [7746, [7747]], [7748, [7749]], [7750, [7751]], [7752, [7753]], [7754, [7755]], [7756, [7757]], [7758, [7759]], [7760, [7761]], [7762, [7763]], [7764, [7765]], [7766, [7767]], [7768, [7769]], [7770, [7771]], [7772, [7773]], [7774, [7775]], [7776, [7777]], [7778, [7779]], [7780, [7781]], [7782, [7783]], [7784, [7785]], [7786, [7787]], [7788, [7789]], [7790, [7791]], [7792, [7793]], [7794, [7795]], [7796, [7797]], [7798, [7799]], [7800, [7801]], [7802, [7803]], [7804, [7805]], [7806, [7807]], [7808, [7809]], [7810, [7811]], [7812, [7813]], [7814, [7815]], [7816, [7817]], [7818, [7819]], [7820, [7821]], [7822, [7823]], [7824, [7825]], [7826, [7827]], [7828, [7829]], [7830, [104, 817]], [7831, [116, 776]], [7832, [119, 778]], [7833, [121, 778]], [7834, [97, 702]], [7835, [7777]], [7838, [115, 115]], [7840, [7841]], [7842, [7843]], [7844, [7845]], [7846, [7847]], [7848, [7849]], [7850, [7851]], [7852, [7853]], [7854, [7855]], [7856, [7857]], [7858, [7859]], [7860, [7861]], [7862, [7863]], [7864, [7865]], [7866, [7867]], [7868, [7869]], [7870, [7871]], [7872, [7873]], [7874, [7875]], [7876, [7877]], [7878, [7879]], [7880, [7881]], [7882, [7883]], [7884, [7885]], [7886, [7887]], [7888, [7889]], [7890, [7891]], [7892, [7893]], [7894, [7895]], [7896, [7897]], [7898, [7899]], [7900, [7901]], [7902, [7903]], [7904, [7905]], [7906, [7907]], [7908, [7909]], [7910, [7911]], [7912, [7913]], [7914, [7915]], [7916, [7917]], [7918, [7919]], [7920, [7921]], [7922, [7923]], [7924, [7925]], [7926, [7927]], [7928, [7929]], [7930, [7931]], [7932, [7933]], [7934, [7935]], [7944, [7936]], [7945, [7937]], [7946, [7938]], [7947, [7939]], [7948, [7940]], [7949, [7941]], [7950, [7942]], [7951, [7943]], [7960, [7952]], [7961, [7953]], [7962, [7954]], [7963, [7955]], [7964, [7956]], [7965, [7957]], [7976, [7968]], [7977, [7969]], [7978, [7970]], [7979, [7971]], [7980, [7972]], [7981, [7973]], [7982, [7974]], [7983, [7975]], [7992, [7984]], [7993, [7985]], [7994, [7986]], [7995, [7987]], [7996, [7988]], [7997, [7989]], [7998, [7990]], [7999, [7991]], [8008, [8e3]], [8009, [8001]], [8010, [8002]], [8011, [8003]], [8012, [8004]], [8013, [8005]], [8016, [965, 787]], [8018, [965, 787, 768]], [8020, [965, 787, 769]], [8022, [965, 787, 834]], [8025, [8017]], [8027, [8019]], [8029, [8021]], [8031, [8023]], [8040, [8032]], [8041, [8033]], [8042, [8034]], [8043, [8035]], [8044, [8036]], [8045, [8037]], [8046, [8038]], [8047, [8039]], [8064, [7936, 953]], [8065, [7937, 953]], [8066, [7938, 953]], [8067, [7939, 953]], [8068, [7940, 953]], [8069, [7941, 953]], [8070, [7942, 953]], [8071, [7943, 953]], [8072, [7936, 953]], [8073, [7937, 953]], [8074, [7938, 953]], [8075, [7939, 953]], [8076, [7940, 953]], [8077, [7941, 953]], [8078, [7942, 953]], [8079, [7943, 953]], [8080, [7968, 953]], [8081, [7969, 953]], [8082, [7970, 953]], [8083, [7971, 953]], [8084, [7972, 953]], [8085, [7973, 953]], [8086, [7974, 953]], [8087, [7975, 953]], [8088, [7968, 953]], [8089, [7969, 953]], [8090, [7970, 953]], [8091, [7971, 953]], [8092, [7972, 953]], [8093, [7973, 953]], [8094, [7974, 953]], [8095, [7975, 953]], [8096, [8032, 953]], [8097, [8033, 953]], [8098, [8034, 953]], [8099, [8035, 953]], [8100, [8036, 953]], [8101, [8037, 953]], [8102, [8038, 953]], [8103, [8039, 953]], [8104, [8032, 953]], [8105, [8033, 953]], [8106, [8034, 953]], [8107, [8035, 953]], [8108, [8036, 953]], [8109, [8037, 953]], [8110, [8038, 953]], [8111, [8039, 953]], [8114, [8048, 953]], [8115, [945, 953]], [8116, [940, 953]], [8118, [945, 834]], [8119, [945, 834, 953]], [8120, [8112]], [8121, [8113]], [8122, [8048]], [8123, [8049]], [8124, [945, 953]], [8126, [953]], [8130, [8052, 953]], [8131, [951, 953]], [8132, [942, 953]], [8134, [951, 834]], [8135, [951, 834, 953]], [8136, [8050]], [8137, [8051]], [8138, [8052]], [8139, [8053]], [8140, [951, 953]], [8146, [953, 776, 768]], [8147, [953, 776, 769]], [8150, [953, 834]], [8151, [953, 776, 834]], [8152, [8144]], [8153, [8145]], [8154, [8054]], [8155, [8055]], [8162, [965, 776, 768]], [8163, [965, 776, 769]], [8164, [961, 787]], [8166, [965, 834]], [8167, [965, 776, 834]], [8168, [8160]], [8169, [8161]], [8170, [8058]], [8171, [8059]], [8172, [8165]], [8178, [8060, 953]], [8179, [969, 953]], [8180, [974, 953]], [8182, [969, 834]], [8183, [969, 834, 953]], [8184, [8056]], [8185, [8057]], [8186, [8060]], [8187, [8061]], [8188, [969, 953]], [8486, [969]], [8490, [107]], [8491, [229]], [8498, [8526]], [8544, [8560]], [8545, [8561]], [8546, [8562]], [8547, [8563]], [8548, [8564]], [8549, [8565]], [8550, [8566]], [8551, [8567]], [8552, [8568]], [8553, [8569]], [8554, [8570]], [8555, [8571]], [8556, [8572]], [8557, [8573]], [8558, [8574]], [8559, [8575]], [8579, [8580]], [9398, [9424]], [9399, [9425]], [9400, [9426]], [9401, [9427]], [9402, [9428]], [9403, [9429]], [9404, [9430]], [9405, [9431]], [9406, [9432]], [9407, [9433]], [9408, [9434]], [9409, [9435]], [9410, [9436]], [9411, [9437]], [9412, [9438]], [9413, [9439]], [9414, [9440]], [9415, [9441]], [9416, [9442]], [9417, [9443]], [9418, [9444]], [9419, [9445]], [9420, [9446]], [9421, [9447]], [9422, [9448]], [9423, [9449]], [11264, [11312]], [11265, [11313]], [11266, [11314]], [11267, [11315]], [11268, [11316]], [11269, [11317]], [11270, [11318]], [11271, [11319]], [11272, [11320]], [11273, [11321]], [11274, [11322]], [11275, [11323]], [11276, [11324]], [11277, [11325]], [11278, [11326]], [11279, [11327]], [11280, [11328]], [11281, [11329]], [11282, [11330]], [11283, [11331]], [11284, [11332]], [11285, [11333]], [11286, [11334]], [11287, [11335]], [11288, [11336]], [11289, [11337]], [11290, [11338]], [11291, [11339]], [11292, [11340]], [11293, [11341]], [11294, [11342]], [11295, [11343]], [11296, [11344]], [11297, [11345]], [11298, [11346]], [11299, [11347]], [11300, [11348]], [11301, [11349]], [11302, [11350]], [11303, [11351]], [11304, [11352]], [11305, [11353]], [11306, [11354]], [11307, [11355]], [11308, [11356]], [11309, [11357]], [11310, [11358]], [11311, [11359]], [11360, [11361]], [11362, [619]], [11363, [7549]], [11364, [637]], [11367, [11368]], [11369, [11370]], [11371, [11372]], [11373, [593]], [11374, [625]], [11375, [592]], [11376, [594]], [11378, [11379]], [11381, [11382]], [11390, [575]], [11391, [576]], [11392, [11393]], [11394, [11395]], [11396, [11397]], [11398, [11399]], [11400, [11401]], [11402, [11403]], [11404, [11405]], [11406, [11407]], [11408, [11409]], [11410, [11411]], [11412, [11413]], [11414, [11415]], [11416, [11417]], [11418, [11419]], [11420, [11421]], [11422, [11423]], [11424, [11425]], [11426, [11427]], [11428, [11429]], [11430, [11431]], [11432, [11433]], [11434, [11435]], [11436, [11437]], [11438, [11439]], [11440, [11441]], [11442, [11443]], [11444, [11445]], [11446, [11447]], [11448, [11449]], [11450, [11451]], [11452, [11453]], [11454, [11455]], [11456, [11457]], [11458, [11459]], [11460, [11461]], [11462, [11463]], [11464, [11465]], [11466, [11467]], [11468, [11469]], [11470, [11471]], [11472, [11473]], [11474, [11475]], [11476, [11477]], [11478, [11479]], [11480, [11481]], [11482, [11483]], [11484, [11485]], [11486, [11487]], [11488, [11489]], [11490, [11491]], [11499, [11500]], [11501, [11502]], [11506, [11507]], [42560, [42561]], [42562, [42563]], [42564, [42565]], [42566, [42567]], [42568, [42569]], [42570, [42571]], [42572, [42573]], [42574, [42575]], [42576, [42577]], [42578, [42579]], [42580, [42581]], [42582, [42583]], [42584, [42585]], [42586, [42587]], [42588, [42589]], [42590, [42591]], [42592, [42593]], [42594, [42595]], [42596, [42597]], [42598, [42599]], [42600, [42601]], [42602, [42603]], [42604, [42605]], [42624, [42625]], [42626, [42627]], [42628, [42629]], [42630, [42631]], [42632, [42633]], [42634, [42635]], [42636, [42637]], [42638, [42639]], [42640, [42641]], [42642, [42643]], [42644, [42645]], [42646, [42647]], [42648, [42649]], [42650, [42651]], [42786, [42787]], [42788, [42789]], [42790, [42791]], [42792, [42793]], [42794, [42795]], [42796, [42797]], [42798, [42799]], [42802, [42803]], [42804, [42805]], [42806, [42807]], [42808, [42809]], [42810, [42811]], [42812, [42813]], [42814, [42815]], [42816, [42817]], [42818, [42819]], [42820, [42821]], [42822, [42823]], [42824, [42825]], [42826, [42827]], [42828, [42829]], [42830, [42831]], [42832, [42833]], [42834, [42835]], [42836, [42837]], [42838, [42839]], [42840, [42841]], [42842, [42843]], [42844, [42845]], [42846, [42847]], [42848, [42849]], [42850, [42851]], [42852, [42853]], [42854, [42855]], [42856, [42857]], [42858, [42859]], [42860, [42861]], [42862, [42863]], [42873, [42874]], [42875, [42876]], [42877, [7545]], [42878, [42879]], [42880, [42881]], [42882, [42883]], [42884, [42885]], [42886, [42887]], [42891, [42892]], [42893, [613]], [42896, [42897]], [42898, [42899]], [42902, [42903]], [42904, [42905]], [42906, [42907]], [42908, [42909]], [42910, [42911]], [42912, [42913]], [42914, [42915]], [42916, [42917]], [42918, [42919]], [42920, [42921]], [42922, [614]], [42923, [604]], [42924, [609]], [42925, [620]], [42926, [618]], [42928, [670]], [42929, [647]], [42930, [669]], [42931, [43859]], [42932, [42933]], [42934, [42935]], [42936, [42937]], [42938, [42939]], [42940, [42941]], [42942, [42943]], [42944, [42945]], [42946, [42947]], [42948, [42900]], [42949, [642]], [42950, [7566]], [42951, [42952]], [42953, [42954]], [42955, [612]], [42956, [42957]], [42958, [42959]], [42960, [42961]], [42962, [42963]], [42964, [42965]], [42966, [42967]], [42968, [42969]], [42970, [42971]], [42972, [411]], [42997, [42998]], [43888, [5024]], [43889, [5025]], [43890, [5026]], [43891, [5027]], [43892, [5028]], [43893, [5029]], [43894, [5030]], [43895, [5031]], [43896, [5032]], [43897, [5033]], [43898, [5034]], [43899, [5035]], [43900, [5036]], [43901, [5037]], [43902, [5038]], [43903, [5039]], [43904, [5040]], [43905, [5041]], [43906, [5042]], [43907, [5043]], [43908, [5044]], [43909, [5045]], [43910, [5046]], [43911, [5047]], [43912, [5048]], [43913, [5049]], [43914, [5050]], [43915, [5051]], [43916, [5052]], [43917, [5053]], [43918, [5054]], [43919, [5055]], [43920, [5056]], [43921, [5057]], [43922, [5058]], [43923, [5059]], [43924, [5060]], [43925, [5061]], [43926, [5062]], [43927, [5063]], [43928, [5064]], [43929, [5065]], [43930, [5066]], [43931, [5067]], [43932, [5068]], [43933, [5069]], [43934, [5070]], [43935, [5071]], [43936, [5072]], [43937, [5073]], [43938, [5074]], [43939, [5075]], [43940, [5076]], [43941, [5077]], [43942, [5078]], [43943, [5079]], [43944, [5080]], [43945, [5081]], [43946, [5082]], [43947, [5083]], [43948, [5084]], [43949, [5085]], [43950, [5086]], [43951, [5087]], [43952, [5088]], [43953, [5089]], [43954, [5090]], [43955, [5091]], [43956, [5092]], [43957, [5093]], [43958, [5094]], [43959, [5095]], [43960, [5096]], [43961, [5097]], [43962, [5098]], [43963, [5099]], [43964, [5100]], [43965, [5101]], [43966, [5102]], [43967, [5103]], [64256, [102, 102]], [64257, [102, 105]], [64258, [102, 108]], [64259, [102, 102, 105]], [64260, [102, 102, 108]], [64261, [115, 116]], [64262, [115, 116]], [64275, [1396, 1398]], [64276, [1396, 1381]], [64277, [1396, 1387]], [64278, [1406, 1398]], [64279, [1396, 1389]], [65313, [65345]], [65314, [65346]], [65315, [65347]], [65316, [65348]], [65317, [65349]], [65318, [65350]], [65319, [65351]], [65320, [65352]], [65321, [65353]], [65322, [65354]], [65323, [65355]], [65324, [65356]], [65325, [65357]], [65326, [65358]], [65327, [65359]], [65328, [65360]], [65329, [65361]], [65330, [65362]], [65331, [65363]], [65332, [65364]], [65333, [65365]], [65334, [65366]], [65335, [65367]], [65336, [65368]], [65337, [65369]], [65338, [65370]], [66560, [66600]], [66561, [66601]], [66562, [66602]], [66563, [66603]], [66564, [66604]], [66565, [66605]], [66566, [66606]], [66567, [66607]], [66568, [66608]], [66569, [66609]], [66570, [66610]], [66571, [66611]], [66572, [66612]], [66573, [66613]], [66574, [66614]], [66575, [66615]], [66576, [66616]], [66577, [66617]], [66578, [66618]], [66579, [66619]], [66580, [66620]], [66581, [66621]], [66582, [66622]], [66583, [66623]], [66584, [66624]], [66585, [66625]], [66586, [66626]], [66587, [66627]], [66588, [66628]], [66589, [66629]], [66590, [66630]], [66591, [66631]], [66592, [66632]], [66593, [66633]], [66594, [66634]], [66595, [66635]], [66596, [66636]], [66597, [66637]], [66598, [66638]], [66599, [66639]], [66736, [66776]], [66737, [66777]], [66738, [66778]], [66739, [66779]], [66740, [66780]], [66741, [66781]], [66742, [66782]], [66743, [66783]], [66744, [66784]], [66745, [66785]], [66746, [66786]], [66747, [66787]], [66748, [66788]], [66749, [66789]], [66750, [66790]], [66751, [66791]], [66752, [66792]], [66753, [66793]], [66754, [66794]], [66755, [66795]], [66756, [66796]], [66757, [66797]], [66758, [66798]], [66759, [66799]], [66760, [66800]], [66761, [66801]], [66762, [66802]], [66763, [66803]], [66764, [66804]], [66765, [66805]], [66766, [66806]], [66767, [66807]], [66768, [66808]], [66769, [66809]], [66770, [66810]], [66771, [66811]], [66928, [66967]], [66929, [66968]], [66930, [66969]], [66931, [66970]], [66932, [66971]], [66933, [66972]], [66934, [66973]], [66935, [66974]], [66936, [66975]], [66937, [66976]], [66938, [66977]], [66940, [66979]], [66941, [66980]], [66942, [66981]], [66943, [66982]], [66944, [66983]], [66945, [66984]], [66946, [66985]], [66947, [66986]], [66948, [66987]], [66949, [66988]], [66950, [66989]], [66951, [66990]], [66952, [66991]], [66953, [66992]], [66954, [66993]], [66956, [66995]], [66957, [66996]], [66958, [66997]], [66959, [66998]], [66960, [66999]], [66961, [67e3]], [66962, [67001]], [66964, [67003]], [66965, [67004]], [68736, [68800]], [68737, [68801]], [68738, [68802]], [68739, [68803]], [68740, [68804]], [68741, [68805]], [68742, [68806]], [68743, [68807]], [68744, [68808]], [68745, [68809]], [68746, [68810]], [68747, [68811]], [68748, [68812]], [68749, [68813]], [68750, [68814]], [68751, [68815]], [68752, [68816]], [68753, [68817]], [68754, [68818]], [68755, [68819]], [68756, [68820]], [68757, [68821]], [68758, [68822]], [68759, [68823]], [68760, [68824]], [68761, [68825]], [68762, [68826]], [68763, [68827]], [68764, [68828]], [68765, [68829]], [68766, [68830]], [68767, [68831]], [68768, [68832]], [68769, [68833]], [68770, [68834]], [68771, [68835]], [68772, [68836]], [68773, [68837]], [68774, [68838]], [68775, [68839]], [68776, [68840]], [68777, [68841]], [68778, [68842]], [68779, [68843]], [68780, [68844]], [68781, [68845]], [68782, [68846]], [68783, [68847]], [68784, [68848]], [68785, [68849]], [68786, [68850]], [68944, [68976]], [68945, [68977]], [68946, [68978]], [68947, [68979]], [68948, [68980]], [68949, [68981]], [68950, [68982]], [68951, [68983]], [68952, [68984]], [68953, [68985]], [68954, [68986]], [68955, [68987]], [68956, [68988]], [68957, [68989]], [68958, [68990]], [68959, [68991]], [68960, [68992]], [68961, [68993]], [68962, [68994]], [68963, [68995]], [68964, [68996]], [68965, [68997]], [71840, [71872]], [71841, [71873]], [71842, [71874]], [71843, [71875]], [71844, [71876]], [71845, [71877]], [71846, [71878]], [71847, [71879]], [71848, [71880]], [71849, [71881]], [71850, [71882]], [71851, [71883]], [71852, [71884]], [71853, [71885]], [71854, [71886]], [71855, [71887]], [71856, [71888]], [71857, [71889]], [71858, [71890]], [71859, [71891]], [71860, [71892]], [71861, [71893]], [71862, [71894]], [71863, [71895]], [71864, [71896]], [71865, [71897]], [71866, [71898]], [71867, [71899]], [71868, [71900]], [71869, [71901]], [71870, [71902]], [71871, [71903]], [93760, [93792]], [93761, [93793]], [93762, [93794]], [93763, [93795]], [93764, [93796]], [93765, [93797]], [93766, [93798]], [93767, [93799]], [93768, [93800]], [93769, [93801]], [93770, [93802]], [93771, [93803]], [93772, [93804]], [93773, [93805]], [93774, [93806]], [93775, [93807]], [93776, [93808]], [93777, [93809]], [93778, [93810]], [93779, [93811]], [93780, [93812]], [93781, [93813]], [93782, [93814]], [93783, [93815]], [93784, [93816]], [93785, [93817]], [93786, [93818]], [93787, [93819]], [93788, [93820]], [93789, [93821]], [93790, [93822]], [93791, [93823]], [93856, [93883]], [93857, [93884]], [93858, [93885]], [93859, [93886]], [93860, [93887]], [93861, [93888]], [93862, [93889]], [93863, [93890]], [93864, [93891]], [93865, [93892]], [93866, [93893]], [93867, [93894]], [93868, [93895]], [93869, [93896]], [93870, [93897]], [93871, [93898]], [93872, [93899]], [93873, [93900]], [93874, [93901]], [93875, [93902]], [93876, [93903]], [93877, [93904]], [93878, [93905]], [93879, [93906]], [93880, [93907]], [125184, [125218]], [125185, [125219]], [125186, [125220]], [125187, [125221]], [125188, [125222]], [125189, [125223]], [125190, [125224]], [125191, [125225]], [125192, [125226]], [125193, [125227]], [125194, [125228]], [125195, [125229]], [125196, [125230]], [125197, [125231]], [125198, [125232]], [125199, [125233]], [125200, [125234]], [125201, [125235]], [125202, [125236]], [125203, [125237]], [125204, [125238]], [125205, [125239]], [125206, [125240]], [125207, [125241]], [125208, [125242]], [125209, [125243]], [125210, [125244]], [125211, [125245]], [125212, [125246]], [125213, [125247]], [125214, [125248]], [125215, [125249]], [125216, [125250]], [125217, [125251]]]);
+function caseFold(input) {
+  if (typeof input !== "string") {
+    throw new TypeError("Input must be a string");
+  }
+  let result = [];
+  for (const char of input) {
+    const codePoint = char.codePointAt(0);
+    const mapping = FOLDING_MAP.get(codePoint);
+    result.push(mapping ? String.fromCodePoint(...mapping) : char);
+  }
+  return result.join("");
+}
+
+// src/utils/canonical-path.ts
+function alternateAsciiCase(value) {
+  const index = value.search(/[A-Za-z]/);
+  if (index === -1) return null;
+  const character = value[index];
+  const alternate = character === character.toLowerCase() ? character.toUpperCase() : character.toLowerCase();
+  return `${value.slice(0, index)}${alternate}${value.slice(index + 1)}`;
+}
+function probeEntryCaseSensitivity(entryPath) {
+  const alternateName = alternateAsciiCase(path3.basename(entryPath));
+  if (!alternateName) return void 0;
+  try {
+    const canonicalPath = fs.realpathSync.native(entryPath);
+    const alternatePath = fs.realpathSync.native(path3.join(path3.dirname(entryPath), alternateName));
+    return canonicalPath === alternatePath;
+  } catch (error) {
+    const code = error.code;
+    if (code === "ENOENT" || code === "ENOTDIR") return false;
+    return void 0;
+  }
+}
+function probeEmptyWindowsDirectory(existingAncestor) {
+  const probePath = path3.join(
+    existingAncestor,
+    `.codebase-index-case-probe-${crypto.randomBytes(8).toString("hex")}`
+  );
+  let created = false;
+  try {
+    const descriptor = fs.openSync(probePath, "wx", 384);
+    created = true;
+    fs.closeSync(descriptor);
+    return probeEntryCaseSensitivity(probePath);
+  } catch {
+    return void 0;
+  } finally {
+    if (created) fs.unlinkSync(probePath);
+  }
+}
+function detectCaseInsensitiveFileSystem(existingAncestor) {
+  try {
+    if (fs.statSync(existingAncestor).isDirectory()) {
+      const directory = fs.opendirSync(existingAncestor);
+      try {
+        let entry = directory.readSync();
+        while (entry) {
+          if (!entry.isSymbolicLink() && alternateAsciiCase(entry.name)) {
+            const result = probeEntryCaseSensitivity(path3.join(existingAncestor, entry.name));
+            if (result !== void 0) return result;
+          }
+          entry = directory.readSync();
+        }
+      } finally {
+        directory.closeSync();
+      }
+    }
+  } catch {
+    return void 0;
+  }
+  if (process.platform === "darwin") {
+    return probeEntryCaseSensitivity(existingAncestor);
+  }
+  if (process.platform === "win32") {
+    return probeEmptyWindowsDirectory(existingAncestor);
+  }
+  return void 0;
+}
+function foldMissingPathComponent(component) {
+  return caseFold(component);
+}
+function canonicalizePathForComparison(targetPath, options = {}) {
+  const resolved = path3.resolve(targetPath);
+  const missingParts = [];
+  let candidate = resolved;
+  while (true) {
+    try {
+      const existingAncestor = fs.realpathSync.native(candidate);
+      const isCaseInsensitive = missingParts.length > 0 ? (options.isCaseInsensitive ?? detectCaseInsensitiveFileSystem)(existingAncestor) : false;
+      const suffix = isCaseInsensitive === true ? missingParts.map(foldMissingPathComponent) : missingParts;
+      return path3.join(existingAncestor, ...suffix);
+    } catch (error) {
+      const code = error.code;
+      if (code !== "ENOENT" && code !== "ENOTDIR") throw error;
+      const parent = path3.dirname(candidate);
+      if (parent === candidate) return resolved;
+      missingParts.unshift(path3.basename(candidate));
+      candidate = parent;
+    }
+  }
+}
+
 // src/config/paths.ts
-var OPENCODE_PROJECT_CONFIG_RELATIVE_PATH = path3.join(".opencode", "codebase-index.json");
-var OPENCODE_PROJECT_INDEX_RELATIVE_PATH = path3.join(".opencode", "index");
+var OPENCODE_PROJECT_CONFIG_RELATIVE_PATH = path4.join(".opencode", "codebase-index.json");
+var OPENCODE_PROJECT_INDEX_RELATIVE_PATH = path4.join(".opencode", "index");
 var CODEBASE_INDEX_DIR = ".codebase-index";
-var CODEBASE_PROJECT_CONFIG_RELATIVE_PATH = path3.join(CODEBASE_INDEX_DIR, "config.json");
-var CODEBASE_PROJECT_INDEX_RELATIVE_PATH = path3.join(CODEBASE_INDEX_DIR, "index");
+var CODEBASE_PROJECT_CONFIG_RELATIVE_PATH = path4.join(CODEBASE_INDEX_DIR, "config.json");
+var CODEBASE_PROJECT_INDEX_RELATIVE_PATH = path4.join(CODEBASE_INDEX_DIR, "index");
 var CLAUDE_DIR = ".claude";
-var CLAUDE_PROJECT_CONFIG_RELATIVE_PATH = path3.join(CLAUDE_DIR, "codebase-index.json");
-var CLAUDE_PROJECT_INDEX_RELATIVE_PATH = path3.join(CLAUDE_DIR, "index");
+var CLAUDE_PROJECT_CONFIG_RELATIVE_PATH = path4.join(CLAUDE_DIR, "codebase-index.json");
+var CLAUDE_PROJECT_INDEX_RELATIVE_PATH = path4.join(CLAUDE_DIR, "index");
 function getProjectConfigRelativePath(host) {
   switch (host) {
     case "opencode":
@@ -1238,42 +1348,71 @@ function resolveWorktreeFallbackPath(projectRoot, relativePath) {
   if (!mainRepoRoot) {
     return null;
   }
-  const fallbackPath = path3.join(mainRepoRoot, relativePath);
+  const fallbackPath = path4.join(mainRepoRoot, relativePath);
   return existsSync3(fallbackPath) ? fallbackPath : null;
 }
 function getHostProjectConfigRelativePath(host) {
   return getProjectConfigRelativePath(host);
 }
-function getHostProjectIndexRelativePath(host) {
-  return getProjectIndexRelativePath(host);
+function getProjectConfigCandidatePaths(projectRoot, host) {
+  const candidates = [path4.join(projectRoot, getProjectConfigRelativePath(host))];
+  if (host !== "opencode") {
+    candidates.push(path4.join(projectRoot, OPENCODE_PROJECT_CONFIG_RELATIVE_PATH));
+  }
+  const mainRepoRoot = resolveWorktreeMainRepoRoot(projectRoot);
+  if (mainRepoRoot) {
+    candidates.push(path4.join(mainRepoRoot, getProjectConfigRelativePath(host)));
+    if (host !== "opencode") {
+      candidates.push(path4.join(mainRepoRoot, OPENCODE_PROJECT_CONFIG_RELATIVE_PATH));
+    }
+  }
+  return [...new Set(candidates)];
+}
+function isProjectIndexPathOwnedByProject(projectRoot, indexPath, host) {
+  const projectRoots = [projectRoot];
+  const mainRepoRoot = resolveWorktreeMainRepoRoot(projectRoot);
+  if (mainRepoRoot) {
+    projectRoots.push(mainRepoRoot);
+  }
+  const ownedIndexPaths = projectRoots.flatMap((root) => {
+    const indexPaths = [path4.join(root, getProjectIndexRelativePath(host))];
+    if (host !== "opencode") {
+      indexPaths.push(path4.join(root, OPENCODE_PROJECT_INDEX_RELATIVE_PATH));
+    }
+    return indexPaths;
+  });
+  const canonicalIndexPath = canonicalizePathForComparison(indexPath);
+  return ownedIndexPaths.some(
+    (ownedPath) => canonicalizePathForComparison(ownedPath) === canonicalIndexPath
+  );
 }
 function hasHostProjectConfig(projectRoot, host) {
-  return existsSync3(path3.join(projectRoot, getProjectConfigRelativePath(host)));
+  return existsSync3(path4.join(projectRoot, getProjectConfigRelativePath(host)));
 }
 function hasHostGlobalConfig(host) {
   return existsSync3(getGlobalConfigPath(host));
 }
-function getGlobalIndexPath(host = "opencode") {
+function getGlobalIndexPath(host) {
   switch (host) {
     case "opencode":
-      return path3.join(os.homedir(), ".opencode", "global-index");
+      return path4.join(os.homedir(), ".opencode", "global-index");
     case "claude":
-      return path3.join(os.homedir(), ".claude", "global-index");
+      return path4.join(os.homedir(), ".claude", "global-index");
     default:
-      return path3.join(os.homedir(), ".codebase-index", "global-index");
+      return path4.join(os.homedir(), ".codebase-index", "global-index");
   }
 }
-function getGlobalConfigPath(host = "opencode") {
+function getGlobalConfigPath(host) {
   switch (host) {
     case "opencode":
-      return path3.join(os.homedir(), ".config", "opencode", "codebase-index.json");
+      return path4.join(os.homedir(), ".config", "opencode", "codebase-index.json");
     case "claude":
-      return path3.join(os.homedir(), ".claude", "codebase-index.json");
+      return path4.join(os.homedir(), ".claude", "codebase-index.json");
     default:
-      return path3.join(os.homedir(), ".config", "codebase-index", "config.json");
+      return path4.join(os.homedir(), ".config", "codebase-index", "config.json");
   }
 }
-function resolveGlobalConfigPath(host = "opencode") {
+function resolveGlobalConfigPath(host) {
   const hostConfigPath = getGlobalConfigPath(host);
   if (existsSync3(hostConfigPath)) {
     return hostConfigPath;
@@ -1286,7 +1425,7 @@ function resolveGlobalConfigPath(host = "opencode") {
   }
   return hostConfigPath;
 }
-function resolveGlobalIndexPath(host = "opencode") {
+function resolveGlobalIndexPath(host) {
   const hostIndexPath = getGlobalIndexPath(host);
   if (existsSync3(hostIndexPath)) {
     return hostIndexPath;
@@ -1302,42 +1441,43 @@ function resolveGlobalIndexPath(host = "opencode") {
   }
   return hostIndexPath;
 }
-function resolveProjectConfigPath(projectRoot, host = "opencode") {
-  const hostConfigPath = path3.join(projectRoot, getProjectConfigRelativePath(host));
-  if (existsSync3(hostConfigPath)) {
-    return hostConfigPath;
-  }
-  if (host !== "opencode") {
-    const legacyConfigPath = path3.join(projectRoot, OPENCODE_PROJECT_CONFIG_RELATIVE_PATH);
-    if (existsSync3(legacyConfigPath)) {
-      return legacyConfigPath;
-    }
-  }
-  const hostFallback = resolveWorktreeFallbackPath(projectRoot, getProjectConfigRelativePath(host));
-  if (hostFallback) {
-    return hostFallback;
-  }
-  if (host !== "opencode") {
-    const legacyFallback = resolveWorktreeFallbackPath(projectRoot, OPENCODE_PROJECT_CONFIG_RELATIVE_PATH);
-    if (legacyFallback) {
-      return legacyFallback;
-    }
-  }
-  return hostConfigPath;
+function resolveProjectConfigPath(projectRoot, host) {
+  const candidates = getProjectConfigCandidatePaths(projectRoot, host);
+  return candidates.find((candidate) => existsSync3(candidate)) ?? path4.join(projectRoot, getProjectConfigRelativePath(host));
 }
-function resolveWritableProjectConfigPath(projectRoot, host = "opencode") {
-  return path3.join(projectRoot, getProjectConfigRelativePath(host));
+function resolveWritableProjectConfigPath(projectRoot, host) {
+  return path4.join(projectRoot, getProjectConfigRelativePath(host));
 }
-function resolveProjectIndexPath(projectRoot, scope, host = "opencode") {
+function resolveProjectIndexPath(projectRoot, scope, host) {
   if (scope === "global") {
     return resolveGlobalIndexPath(host);
   }
-  const localIndexPath = path3.join(projectRoot, getProjectIndexRelativePath(host));
+  const localIndexPath = path4.join(projectRoot, getProjectIndexRelativePath(host));
+  const mainRepoRoot = resolveWorktreeMainRepoRoot(projectRoot);
+  if (mainRepoRoot) {
+    if (hasHostProjectConfig(projectRoot, host)) {
+      return localIndexPath;
+    }
+    if (host !== "opencode") {
+      const localLegacyConfigPath = path4.join(projectRoot, OPENCODE_PROJECT_CONFIG_RELATIVE_PATH);
+      if (existsSync3(localLegacyConfigPath)) {
+        return path4.join(projectRoot, OPENCODE_PROJECT_INDEX_RELATIVE_PATH);
+      }
+      const mainHostConfigPath = path4.join(mainRepoRoot, getProjectConfigRelativePath(host));
+      const mainHostIndexPath = path4.join(mainRepoRoot, getProjectIndexRelativePath(host));
+      const mainLegacyConfigPath = path4.join(mainRepoRoot, OPENCODE_PROJECT_CONFIG_RELATIVE_PATH);
+      const mainLegacyIndexPath = path4.join(mainRepoRoot, OPENCODE_PROJECT_INDEX_RELATIVE_PATH);
+      if (!existsSync3(mainHostConfigPath) && !existsSync3(mainHostIndexPath) && (existsSync3(mainLegacyConfigPath) || existsSync3(mainLegacyIndexPath))) {
+        return mainLegacyIndexPath;
+      }
+    }
+    return path4.join(mainRepoRoot, getProjectIndexRelativePath(host));
+  }
   if (existsSync3(localIndexPath)) {
     return localIndexPath;
   }
   if (host !== "opencode") {
-    const legacyIndexPath = path3.join(projectRoot, OPENCODE_PROJECT_INDEX_RELATIVE_PATH);
+    const legacyIndexPath = path4.join(projectRoot, OPENCODE_PROJECT_INDEX_RELATIVE_PATH);
     if (existsSync3(legacyIndexPath) && !hasHostProjectConfig(projectRoot, host)) {
       return legacyIndexPath;
     }
@@ -1345,9 +1485,6 @@ function resolveProjectIndexPath(projectRoot, scope, host = "opencode") {
   if (hasHostProjectConfig(projectRoot, host)) {
     return localIndexPath;
   }
-  if (resolveWorktreeMainRepoRoot(projectRoot)) {
-    return localIndexPath;
-  }
   const hostFallback = resolveWorktreeFallbackPath(projectRoot, getProjectIndexRelativePath(host));
   if (hostFallback) {
     return hostFallback;
@@ -1362,10 +1499,10 @@ function resolveProjectIndexPath(projectRoot, scope, host = "opencode") {
 }
 
 // src/config/rebase.ts
-import * as path5 from "path";
+import * as path6 from "path";
 
 // src/utils/paths.ts
-import * as path4 from "path";
+import * as path5 from "path";
 function normalizePathSeparators(value) {
   return value.replace(/\\/g, "/");
 }
@@ -1375,7 +1512,7 @@ function isHiddenPathSegment(part) {
 function isBuildPathSegment(part) {
   return part.toLowerCase().includes("build");
 }
-function hasFilteredPathSegment(relativePath, separator = path4.sep) {
+function hasFilteredPathSegment(relativePath, separator = path5.sep) {
   return relativePath.split(separator).some(
     (part) => isHiddenPathSegment(part) || isBuildPathSegment(part)
   );
@@ -1401,7 +1538,7 @@ var RESTRICTED_DIRECTORIES = /* @__PURE__ */ new Set([
   "program files (x86)",
   "$recycle.bin"
 ]);
-function isRestrictedDirectory(relativePath, separator = path4.sep) {
+function isRestrictedDirectory(relativePath, separator = path5.sep) {
   const firstSegment = relativePath.split(separator)[0];
   if (!firstSegment) return false;
   return RESTRICTED_DIRECTORIES.has(firstSegment.toLowerCase());
@@ -1409,8 +1546,8 @@ function isRestrictedDirectory(relativePath, separator = path4.sep) {
 
 // src/config/rebase.ts
 function isWithinRoot(rootDir, targetPath) {
-  const relativePath = path5.relative(rootDir, targetPath);
-  return relativePath === "" || !relativePath.startsWith("..") && !path5.isAbsolute(relativePath);
+  const relativePath = path6.relative(rootDir, targetPath);
+  return relativePath === "" || !relativePath.startsWith("..") && !path6.isAbsolute(relativePath);
 }
 function resolveInheritedKnowledgeBaseEntries(values, sourceRoot, targetRoot) {
   if (!Array.isArray(values)) {
@@ -1421,17 +1558,17 @@ function resolveInheritedKnowledgeBaseEntries(values, sourceRoot, targetRoot) {
     if (!trimmed) {
       return trimmed;
     }
-    if (path5.isAbsolute(trimmed)) {
+    if (path6.isAbsolute(trimmed)) {
       if (isWithinRoot(sourceRoot, trimmed)) {
-        return normalizePathSeparators(path5.normalize(path5.relative(sourceRoot, trimmed) || "."));
+        return normalizePathSeparators(path6.normalize(path6.relative(sourceRoot, trimmed) || "."));
       }
-      return path5.normalize(trimmed);
+      return path6.normalize(trimmed);
     }
-    const resolvedFromSource = path5.resolve(sourceRoot, trimmed);
+    const resolvedFromSource = path6.resolve(sourceRoot, trimmed);
     if (isWithinRoot(sourceRoot, resolvedFromSource)) {
-      return normalizePathSeparators(path5.normalize(trimmed));
+      return normalizePathSeparators(path6.normalize(trimmed));
     }
-    return normalizePathSeparators(path5.normalize(path5.relative(targetRoot, resolvedFromSource)));
+    return normalizePathSeparators(path6.normalize(path6.relative(targetRoot, resolvedFromSource)));
   }).filter(Boolean);
 }
 
@@ -1469,8 +1606,8 @@ function mergeUniqueStringArray(values) {
   return [...new Set(values.map((value) => String(value).trim()))];
 }
 function normalizeKnowledgeBasePath(value) {
-  let normalized = path6.normalize(String(value).trim());
-  const root = path6.parse(normalized).root;
+  let normalized = path7.normalize(String(value).trim());
+  const root = path7.parse(normalized).root;
   while (normalized.length > root.length && /[\\/]$/.test(normalized)) {
     normalized = normalized.slice(0, -1);
   }
@@ -1521,14 +1658,14 @@ function loadJsonFile(filePath) {
 function loadConfigFile(filePath) {
   return loadJsonFile(filePath);
 }
-function loadProjectConfigLayer(projectRoot, host = "opencode") {
+function loadProjectConfigLayer(projectRoot, host) {
   const projectConfigPath = resolveProjectConfigPath(projectRoot, host);
   const projectConfig = loadJsonFile(projectConfigPath);
   if (!projectConfig) {
     return {};
   }
   const normalizedConfig = { ...projectConfig };
-  const projectConfigBaseDir = path6.dirname(path6.dirname(projectConfigPath));
+  const projectConfigBaseDir = path7.dirname(path7.dirname(projectConfigPath));
   if (Array.isArray(normalizedConfig.knowledgeBases)) {
     normalizedConfig.knowledgeBases = resolveInheritedKnowledgeBaseEntries(
       normalizedConfig.knowledgeBases,
@@ -1538,7 +1675,7 @@ function loadProjectConfigLayer(projectRoot, host = "opencode") {
   }
   return normalizedConfig;
 }
-function loadMergedConfig(projectRoot, host = "opencode") {
+function loadMergedConfig(projectRoot, host) {
   const globalConfigPath = resolveGlobalConfigPath(host);
   const projectConfigPath = resolveProjectConfigPath(projectRoot, host);
   let globalConfig = null;
@@ -1596,43 +1733,43 @@ import { existsSync as existsSync11, realpathSync as realpathSync5, statSync as
 import * as path19 from "path";
 
 // src/tools/knowledge-base-paths.ts
-import * as path7 from "path";
+import * as path8 from "path";
 function resolveConfigPathValue(value, baseDir) {
   const trimmed = value.trim();
   if (!trimmed) {
     return trimmed;
   }
-  const absolutePath = path7.isAbsolute(trimmed) ? trimmed : path7.resolve(baseDir, trimmed);
-  return path7.normalize(absolutePath);
+  const absolutePath = path8.isAbsolute(trimmed) ? trimmed : path8.resolve(baseDir, trimmed);
+  return path8.normalize(absolutePath);
 }
 function serializeConfigPathValue(value, baseDir) {
   const trimmed = value.trim();
   if (!trimmed) {
     return trimmed;
   }
-  if (!path7.isAbsolute(trimmed)) {
-    return normalizePathSeparators(path7.normalize(trimmed));
+  if (!path8.isAbsolute(trimmed)) {
+    return normalizePathSeparators(path8.normalize(trimmed));
   }
-  const relativePath = path7.relative(baseDir, trimmed);
-  if (!relativePath || !relativePath.startsWith("..") && !path7.isAbsolute(relativePath)) {
-    return normalizePathSeparators(path7.normalize(relativePath || "."));
+  const relativePath = path8.relative(baseDir, trimmed);
+  if (!relativePath || !relativePath.startsWith("..") && !path8.isAbsolute(relativePath)) {
+    return normalizePathSeparators(path8.normalize(relativePath || "."));
   }
-  return path7.normalize(trimmed);
+  return path8.normalize(trimmed);
 }
 function resolveKnowledgeBasePath(value, projectRoot) {
-  return path7.isAbsolute(value) ? value : path7.resolve(projectRoot, value);
+  return path8.isAbsolute(value) ? value : path8.resolve(projectRoot, value);
 }
 function normalizeKnowledgeBasePath2(value, projectRoot) {
-  return path7.normalize(resolveKnowledgeBasePath(value, projectRoot));
+  return path8.normalize(resolveKnowledgeBasePath(value, projectRoot));
 }
 function hasMatchingKnowledgeBasePath(knowledgeBases, inputPath, projectRoot) {
-  const normalizedInput = path7.normalize(inputPath);
+  const normalizedInput = path8.normalize(inputPath);
   return knowledgeBases.some((kb) => normalizeKnowledgeBasePath2(kb, projectRoot) === normalizedInput);
 }
 function findKnowledgeBasePathIndex(knowledgeBases, inputPath, projectRoot) {
-  const normalizedInput = path7.normalize(inputPath);
+  const normalizedInput = path8.normalize(inputPath);
   return knowledgeBases.findIndex(
-    (kb) => path7.normalize(kb) === normalizedInput || normalizeKnowledgeBasePath2(kb, projectRoot) === normalizedInput
+    (kb) => path8.normalize(kb) === normalizedInput || normalizeKnowledgeBasePath2(kb, projectRoot) === normalizedInput
   );
 }
 
@@ -2913,9 +3050,9 @@ function formatEffectivenessMetrics(snapshot) {
 }
 
 // src/utils/auto-index.ts
-import { existsSync as existsSync7, realpathSync as realpathSync2 } from "fs";
+import { existsSync as existsSync7, realpathSync as realpathSync3 } from "fs";
 import * as os3 from "os";
-import * as path10 from "path";
+import * as path11 from "path";
 
 // src/indexer/index-lock.ts
 import { randomUUID } from "crypto";
@@ -2925,13 +3062,13 @@ import {
   mkdirSync,
   readFileSync as readFileSync4,
   readdirSync as readdirSync2,
-  realpathSync,
+  realpathSync as realpathSync2,
   renameSync,
   rmSync,
   writeFileSync
 } from "fs";
 import * as os2 from "os";
-import * as path8 from "path";
+import * as path9 from "path";
 var OWNER_FILE_NAME = "owner.json";
 var RECLAIM_DIRECTORY_NAME = "reclaiming";
 var RECOVERY_MARKER_PREFIX = "indexing.lock.recovery.";
@@ -2988,7 +3125,7 @@ function parseReclaimOwner(value) {
 }
 function readJsonDirectory(directoryPath, parser) {
   try {
-    return parser(JSON.parse(readFileSync4(path8.join(directoryPath, OWNER_FILE_NAME), "utf-8")));
+    return parser(JSON.parse(readFileSync4(path9.join(directoryPath, OWNER_FILE_NAME), "utf-8")));
   } catch {
     return null;
   }
@@ -3045,7 +3182,7 @@ function publishJsonDirectory(finalPath, value) {
     throw error;
   }
   try {
-    writeFileSync(path8.join(candidatePath, OWNER_FILE_NAME), JSON.stringify(value), {
+    writeFileSync(path9.join(candidatePath, OWNER_FILE_NAME), JSON.stringify(value), {
       encoding: "utf-8",
       flag: "wx",
       mode: 384
@@ -3076,7 +3213,7 @@ function createOwner(operation) {
   };
 }
 function recoveryMarkerPath(indexPath, owner) {
-  return path8.join(indexPath, `${RECOVERY_MARKER_PREFIX}${owner.token}`);
+  return path9.join(indexPath, `${RECOVERY_MARKER_PREFIX}${owner.token}`);
 }
 function publishRecoveryMarker(indexPath, owner) {
   const markerPath = recoveryMarkerPath(indexPath, owner);
@@ -3095,7 +3232,7 @@ function getPendingRecoveries(indexPath) {
     return UUID_PATTERN.test(name.slice(RECOVERY_MARKER_PREFIX.length));
   }).sort();
   for (const markerName of markerNames) {
-    const markerPath = path8.join(indexPath, markerName);
+    const markerPath = path9.join(indexPath, markerName);
     const markerToken = markerName.slice(RECOVERY_MARKER_PREFIX.length);
     let markerStats;
     try {
@@ -3127,11 +3264,11 @@ function cleanupDeadPublicationCandidates(indexPath) {
     const pid = Number(match[1]);
     if (!Number.isInteger(pid) || pid <= 0) continue;
     if (getOwnerLiveness({ pid, hostname: os2.hostname() }) !== "dead") continue;
-    rmSync(path8.join(indexPath, entry), { recursive: true, force: true });
+    rmSync(path9.join(indexPath, entry), { recursive: true, force: true });
   }
 }
 function removeDeadReclaimMarker(lockPath, expectedOwner) {
-  const markerPath = path8.join(lockPath, RECLAIM_DIRECTORY_NAME);
+  const markerPath = path9.join(lockPath, RECLAIM_DIRECTORY_NAME);
   const marker = readReclaimOwner(markerPath);
   if (!marker || marker.expectedOwnerToken !== expectedOwner.token || getOwnerLiveness(marker) !== "dead") {
     return false;
@@ -3159,7 +3296,7 @@ function removeDeadReclaimMarker(lockPath, expectedOwner) {
   return true;
 }
 function reclaimDeadOwner(indexPath, lockPath, expectedOwner) {
-  const reclaimPath = path8.join(lockPath, RECLAIM_DIRECTORY_NAME);
+  const reclaimPath = path9.join(lockPath, RECLAIM_DIRECTORY_NAME);
   const reclaimOwner = {
     pid: process.pid,
     hostname: os2.hostname(),
@@ -3216,8 +3353,8 @@ function isTransientIndexLockContention(error) {
 }
 function acquireIndexLock(indexPath, operation) {
   mkdirSync(indexPath, { recursive: true });
-  const canonicalIndexPath = realpathSync.native(indexPath);
-  const lockPath = path8.join(canonicalIndexPath, "indexing.lock");
+  const canonicalIndexPath = realpathSync2.native(indexPath);
+  const lockPath = path9.join(canonicalIndexPath, "indexing.lock");
   cleanupDeadPublicationCandidates(canonicalIndexPath);
   for (let attempt = 0; attempt < 6; attempt += 1) {
     const owner = createOwner(operation);
@@ -3303,7 +3440,7 @@ function recoverLeaseArtifacts(indexPath, owner, backupTargets) {
   const temporaryOwnerMarker = `.tmp.${owner.pid}.${owner.token}.`;
   for (const entry of readdirSync2(indexPath)) {
     if (!entry.includes(temporaryOwnerMarker)) continue;
-    rmSync(path8.join(indexPath, entry), { recursive: true, force: true });
+    rmSync(path9.join(indexPath, entry), { recursive: true, force: true });
   }
 }
 function completeLeaseRecovery(lease) {
@@ -3321,7 +3458,7 @@ function completeLeaseRecovery(lease) {
 // src/utils/files.ts
 var import_ignore = __toESM(require_ignore(), 1);
 import { existsSync as existsSync6, readFileSync as readFileSync5, promises as fsPromises } from "fs";
-import * as path9 from "path";
+import * as path10 from "path";
 var PROJECT_MARKERS = [
   ".git",
   "package.json",
@@ -3339,7 +3476,7 @@ var PROJECT_MARKERS = [
 ];
 function hasProjectMarker(projectRoot) {
   for (const marker of PROJECT_MARKERS) {
-    if (existsSync6(path9.join(projectRoot, marker))) {
+    if (existsSync6(path10.join(projectRoot, marker))) {
       return true;
     }
   }
@@ -3366,7 +3503,7 @@ function createIgnoreFilter(projectRoot) {
     "**/*build*/**"
   ];
   ig.add(defaultIgnores);
-  const gitignorePath = path9.join(projectRoot, ".gitignore");
+  const gitignorePath = path10.join(projectRoot, ".gitignore");
   if (existsSync6(gitignorePath)) {
     const gitignoreContent = readFileSync5(gitignorePath, "utf-8");
     ig.add(gitignoreContent);
@@ -3374,8 +3511,8 @@ function createIgnoreFilter(projectRoot) {
   return ig;
 }
 function shouldIncludeFile(filePath, projectRoot, includePatterns, excludePatterns, ignoreFilter) {
-  const relativePath = path9.relative(projectRoot, filePath);
-  if (hasFilteredPathSegment(relativePath, path9.sep)) {
+  const relativePath = path10.relative(projectRoot, filePath);
+  if (hasFilteredPathSegment(relativePath, path10.sep)) {
     return false;
   }
   if (ignoreFilter.ignores(relativePath)) {
@@ -3413,8 +3550,8 @@ async function* walkDirectory(dir, projectRoot, includePatterns, excludePatterns
   const filesInDir = [];
   const subdirs = [];
   for (const entry of entries) {
-    const fullPath = path9.join(dir, entry.name);
-    const relativePath = path9.relative(projectRoot, fullPath);
+    const fullPath = path10.join(dir, entry.name);
+    const relativePath = path10.relative(projectRoot, fullPath);
     if (isHiddenPathSegment(entry.name)) {
       if (entry.isDirectory()) {
         skipped.push({ path: relativePath, reason: "excluded" });
@@ -3463,7 +3600,7 @@ async function* walkDirectory(dir, projectRoot, includePatterns, excludePatterns
     yield f;
   }
   for (let i = options.maxFilesPerDirectory; i < filesInDir.length; i++) {
-    skipped.push({ path: path9.relative(projectRoot, filesInDir[i].path), reason: "excluded" });
+    skipped.push({ path: path10.relative(projectRoot, filesInDir[i].path), reason: "excluded" });
   }
   const canRecurse = options.maxDepth === -1 || currentDepth < options.maxDepth;
   if (canRecurse) {
@@ -3503,8 +3640,8 @@ async function collectFiles(projectRoot, includePatterns, excludePatterns, maxFi
   if (additionalRoots && additionalRoots.length > 0) {
     const normalizedRoots = /* @__PURE__ */ new Set();
     for (const kbRoot of additionalRoots) {
-      const resolved = path9.normalize(
-        path9.isAbsolute(kbRoot) ? kbRoot : path9.resolve(projectRoot, kbRoot)
+      const resolved = path10.normalize(
+        path10.isAbsolute(kbRoot) ? kbRoot : path10.resolve(projectRoot, kbRoot)
       );
       normalizedRoots.add(resolved);
     }
@@ -3648,17 +3785,17 @@ function now() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
 function canonicalizePath(targetPath) {
-  const resolved = path10.resolve(targetPath);
+  const resolved = path11.resolve(targetPath);
   if (existsSync7(resolved)) {
     try {
-      return realpathSync2.native(resolved);
+      return realpathSync3.native(resolved);
     } catch {
       return resolved;
     }
   }
-  const parent = path10.dirname(resolved);
+  const parent = path11.dirname(resolved);
   if (parent === resolved) return resolved;
-  return path10.join(canonicalizePath(parent), path10.basename(resolved));
+  return path11.join(canonicalizePath(parent), path11.basename(resolved));
 }
 function isHomeDirectory(projectRoot) {
   return canonicalizePath(projectRoot) === canonicalizePath(os3.homedir());
@@ -4177,10 +4314,10 @@ function configureAutoIndex(projectRoot, host, config, getIndexer) {
   }
   coordinatorKeysByProject.set(projectKey, key);
 }
-function startAutoIndex(projectRoot, host = "opencode", source = "startup") {
+function startAutoIndex(projectRoot, host, source = "startup") {
   return getCoordinator(projectRoot, host)?.start(source) ?? null;
 }
-function requestBackgroundIndex(projectRoot, host = "opencode") {
+function requestBackgroundIndex(projectRoot, host) {
   return getCoordinator(projectRoot, host)?.request({
     checkFreshness: false,
     force: false,
@@ -4195,14 +4332,14 @@ function runCoordinatedIndex(projectRoot, host, force, onProgress) {
     source: "manual"
   }) ?? null;
 }
-function getAutoIndexStatus(projectRoot, host = "opencode") {
+function getAutoIndexStatus(projectRoot, host) {
   return getCoordinator(projectRoot, host)?.snapshot() ?? {
     enabled: false,
     state: "idle",
     updatedAt: now()
   };
 }
-async function waitForAutoIndexForRetrieval(projectRoot, host = "opencode") {
+async function waitForAutoIndexForRetrieval(projectRoot, host) {
   const coordinator = getCoordinator(projectRoot, host);
   if (!coordinator) return { ready: true };
   const initial = coordinator.snapshot();
@@ -4260,7 +4397,7 @@ async function hasReadableCurrentIndex(coordinator) {
 
 // src/tools/config-state.ts
 import { existsSync as existsSync8, mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "fs";
-import * as path11 from "path";
+import * as path12 from "path";
 function normalizeKnowledgeBasePaths(config, projectRoot) {
   const normalized = { ...config };
   if (Array.isArray(normalized.knowledgeBases)) {
@@ -4276,19 +4413,19 @@ function toConfigRecord(rawConfig) {
   }
   return { ...rawConfig };
 }
-function getConfigPath(projectRoot, host = "opencode") {
+function getConfigPath(projectRoot, host) {
   return resolveWritableProjectConfigPath(projectRoot, host);
 }
-function loadRuntimeConfig(projectRoot, host = "opencode") {
+function loadRuntimeConfig(projectRoot, host) {
   return normalizeKnowledgeBasePaths(toConfigRecord(loadMergedConfig(projectRoot, host)), projectRoot);
 }
-function loadEditableConfig(projectRoot, host = "opencode") {
+function loadEditableConfig(projectRoot, host) {
   return normalizeKnowledgeBasePaths(toConfigRecord(loadProjectConfigLayer(projectRoot, host)), projectRoot);
 }
-function saveConfig(projectRoot, config, host = "opencode") {
+function saveConfig(projectRoot, config, host) {
   const configPath = getConfigPath(projectRoot, host);
-  const configDir = path11.dirname(configPath);
-  const configBaseDir = path11.dirname(configDir);
+  const configDir = path12.dirname(configPath);
+  const configBaseDir = path12.dirname(configDir);
   if (!existsSync8(configDir)) {
     mkdirSync2(configDir, { recursive: true });
   }
@@ -5354,10 +5491,10 @@ async function pRetry(input, options = {}) {
 
 // src/embeddings/detector.ts
 import { existsSync as existsSync9, readFileSync as readFileSync6 } from "fs";
-import * as path12 from "path";
+import * as path13 from "path";
 import * as os4 from "os";
 function getOpenCodeAuthPath() {
-  return path12.join(os4.homedir(), ".local", "share", "opencode", "auth.json");
+  return path13.join(os4.homedir(), ".local", "share", "opencode", "auth.json");
 }
 function loadOpenCodeAuth() {
   const authPath = getOpenCodeAuthPath();
@@ -6764,42 +6901,80 @@ function extractParamNames(params) {
 
 // src/native/binding.ts
 import * as os5 from "os";
-import * as path13 from "path";
+import * as path14 from "path";
 import * as module from "module";
 import { fileURLToPath } from "url";
-function getNativeBinding() {
-  const platform2 = os5.platform();
-  const arch2 = os5.arch();
-  let bindingName;
+
+// src/identity-catalog.json
+var identity_catalog_default = {
+  product: {
+    current: {
+      productName: "opencode-codebase-index",
+      packageName: "opencode-codebase-index",
+      repository: "https://github.com/Helweg/opencode-codebase-index",
+      mcpBinary: "opencode-codebase-index-mcp",
+      mcpServerName: "opencode-codebase-index"
+    },
+    future: {
+      productName: "open-codebase-index",
+      packageName: "open-codebase-index",
+      repository: "https://github.com/Helweg/open-codebase-index",
+      mcpBinary: "open-codebase-index-mcp",
+      mcpServerName: "open-codebase-index"
+    }
+  },
+  native: {
+    binaryName: "codebase-index-native"
+  }
+};
+
+// src/identity-catalog.ts
+var IDENTITY_CATALOG = identity_catalog_default;
+var CURRENT_PRODUCT = IDENTITY_CATALOG.product.current;
+var FUTURE_PRODUCT = IDENTITY_CATALOG.product.future;
+var MCP_SERVER_CURRENT_NAME = CURRENT_PRODUCT.mcpServerName;
+var MCP_BINARY_CURRENT_NAME = CURRENT_PRODUCT.mcpBinary;
+var STABLE_NATIVE_BINARY_NAME = IDENTITY_CATALOG.native.binaryName;
+
+// src/native/binding.ts
+function getNativeBindingFilename(platform2 = os5.platform(), arch2 = os5.arch()) {
   if (platform2 === "darwin" && arch2 === "arm64") {
-    bindingName = "codebase-index-native.darwin-arm64.node";
-  } else if (platform2 === "darwin" && arch2 === "x64") {
-    bindingName = "codebase-index-native.darwin-x64.node";
-  } else if (platform2 === "linux" && arch2 === "x64") {
-    bindingName = "codebase-index-native.linux-x64-gnu.node";
-  } else if (platform2 === "linux" && arch2 === "arm64") {
-    bindingName = "codebase-index-native.linux-arm64-gnu.node";
-  } else if (platform2 === "win32" && arch2 === "x64") {
-    bindingName = "codebase-index-native.win32-x64-msvc.node";
-  } else {
-    throw new Error(`Unsupported platform: ${platform2}-${arch2}`);
+    return `${STABLE_NATIVE_BINARY_NAME}.darwin-arm64.node`;
   }
+  if (platform2 === "darwin" && arch2 === "x64") {
+    return `${STABLE_NATIVE_BINARY_NAME}.darwin-x64.node`;
+  }
+  if (platform2 === "linux" && arch2 === "x64") {
+    return `${STABLE_NATIVE_BINARY_NAME}.linux-x64-gnu.node`;
+  }
+  if (platform2 === "linux" && arch2 === "arm64") {
+    return `${STABLE_NATIVE_BINARY_NAME}.linux-arm64-gnu.node`;
+  }
+  if (platform2 === "win32" && arch2 === "x64") {
+    return `${STABLE_NATIVE_BINARY_NAME}.win32-x64-msvc.node`;
+  }
+  throw new Error(`Unsupported platform: ${platform2}-${arch2}`);
+}
+function resolveNativeBindingPath(packageRoot, platform2 = os5.platform(), arch2 = os5.arch()) {
+  return path14.join(packageRoot, "native", getNativeBindingFilename(platform2, arch2));
+}
+function getNativeBinding() {
   let currentDir;
   let requireTarget;
   if (typeof import.meta !== "undefined" && import.meta.url) {
-    currentDir = path13.dirname(fileURLToPath(import.meta.url));
+    currentDir = path14.dirname(fileURLToPath(import.meta.url));
     requireTarget = import.meta.url;
   } else if (typeof __dirname !== "undefined") {
     currentDir = __dirname;
     requireTarget = __filename;
   } else {
     currentDir = process.cwd();
-    requireTarget = path13.join(currentDir, "index.js");
+    requireTarget = path14.join(currentDir, "index.js");
   }
   const normalizedDir = currentDir.replace(/\\/g, "/");
-  const isDevMode = normalizedDir.includes("/src/native") || currentDir.includes(path13.join("src", "native"));
-  const packageRoot = isDevMode ? path13.resolve(currentDir, "../..") : path13.resolve(currentDir, "..");
-  const nativePath = path13.join(packageRoot, "native", bindingName);
+  const isDevMode = normalizedDir.includes("/src/native") || currentDir.includes(path14.join("src", "native"));
+  const packageRoot = isDevMode ? path14.resolve(currentDir, "../..") : path14.resolve(currentDir, "..");
+  const nativePath = resolveNativeBindingPath(packageRoot);
   const require2 = module.createRequire(requireTarget);
   return require2(nativePath);
 }
@@ -7359,116 +7534,6 @@ import { promises as fsPromises2 } from "fs";
 import * as os6 from "os";
 import * as path15 from "path";
 
-// src/utils/canonical-path.ts
-import * as crypto from "crypto";
-import * as fs from "fs";
-import * as path14 from "path";
-
-// node_modules/unicode-case-folding/index.js
-var FOLDING_MAP = /* @__PURE__ */ new Map([[65, [97]], [66, [98]], [67, [99]], [68, [100]], [69, [101]], [70, [102]], [71, [103]], [72, [104]], [73, [105]], [74, [106]], [75, [107]], [76, [108]], [77, [109]], [78, [110]], [79, [111]], [80, [112]], [81, [113]], [82, [114]], [83, [115]], [84, [116]], [85, [117]], [86, [118]], [87, [119]], [88, [120]], [89, [121]], [90, [122]], [181, [956]], [192, [224]], [193, [225]], [194, [226]], [195, [227]], [196, [228]], [197, [229]], [198, [230]], [199, [231]], [200, [232]], [201, [233]], [202, [234]], [203, [235]], [204, [236]], [205, [237]], [206, [238]], [207, [239]], [208, [240]], [209, [241]], [210, [242]], [211, [243]], [212, [244]], [213, [245]], [214, [246]], [216, [248]], [217, [249]], [218, [250]], [219, [251]], [220, [252]], [221, [253]], [222, [254]], [223, [115, 115]], [256, [257]], [258, [259]], [260, [261]], [262, [263]], [264, [265]], [266, [267]], [268, [269]], [270, [271]], [272, [273]], [274, [275]], [276, [277]], [278, [279]], [280, [281]], [282, [283]], [284, [285]], [286, [287]], [288, [289]], [290, [291]], [292, [293]], [294, [295]], [296, [297]], [298, [299]], [300, [301]], [302, [303]], [304, [105, 775]], [306, [307]], [308, [309]], [310, [311]], [313, [314]], [315, [316]], [317, [318]], [319, [320]], [321, [322]], [323, [324]], [325, [326]], [327, [328]], [329, [700, 110]], [330, [331]], [332, [333]], [334, [335]], [336, [337]], [338, [339]], [340, [341]], [342, [343]], [344, [345]], [346, [347]], [348, [349]], [350, [351]], [352, [353]], [354, [355]], [356, [357]], [358, [359]], [360, [361]], [362, [363]], [364, [365]], [366, [367]], [368, [369]], [370, [371]], [372, [373]], [374, [375]], [376, [255]], [377, [378]], [379, [380]], [381, [382]], [383, [115]], [385, [595]], [386, [387]], [388, [389]], [390, [596]], [391, [392]], [393, [598]], [394, [599]], [395, [396]], [398, [477]], [399, [601]], [400, [603]], [401, [402]], [403, [608]], [404, [611]], [406, [617]], [407, [616]], [408, [409]], [412, [623]], [413, [626]], [415, [629]], [416, [417]], [418, [419]], [420, [421]], [422, [640]], [423, [424]], [425, [643]], [428, [429]], [430, [648]], [431, [432]], [433, [650]], [434, [651]], [435, [436]], [437, [438]], [439, [658]], [440, [441]], [444, [445]], [452, [454]], [453, [454]], [455, [457]], [456, [457]], [458, [460]], [459, [460]], [461, [462]], [463, [464]], [465, [466]], [467, [468]], [469, [470]], [471, [472]], [473, [474]], [475, [476]], [478, [479]], [480, [481]], [482, [483]], [484, [485]], [486, [487]], [488, [489]], [490, [491]], [492, [493]], [494, [495]], [496, [106, 780]], [497, [499]], [498, [499]], [500, [501]], [502, [405]], [503, [447]], [504, [505]], [506, [507]], [508, [509]], [510, [511]], [512, [513]], [514, [515]], [516, [517]], [518, [519]], [520, [521]], [522, [523]], [524, [525]], [526, [527]], [528, [529]], [530, [531]], [532, [533]], [534, [535]], [536, [537]], [538, [539]], [540, [541]], [542, [543]], [544, [414]], [546, [547]], [548, [549]], [550, [551]], [552, [553]], [554, [555]], [556, [557]], [558, [559]], [560, [561]], [562, [563]], [570, [11365]], [571, [572]], [573, [410]], [574, [11366]], [577, [578]], [579, [384]], [580, [649]], [581, [652]], [582, [583]], [584, [585]], [586, [587]], [588, [589]], [590, [591]], [837, [953]], [880, [881]], [882, [883]], [886, [887]], [895, [1011]], [902, [940]], [904, [941]], [905, [942]], [906, [943]], [908, [972]], [910, [973]], [911, [974]], [912, [953, 776, 769]], [913, [945]], [914, [946]], [915, [947]], [916, [948]], [917, [949]], [918, [950]], [919, [951]], [920, [952]], [921, [953]], [922, [954]], [923, [955]], [924, [956]], [925, [957]], [926, [958]], [927, [959]], [928, [960]], [929, [961]], [931, [963]], [932, [964]], [933, [965]], [934, [966]], [935, [967]], [936, [968]], [937, [969]], [938, [970]], [939, [971]], [944, [965, 776, 769]], [962, [963]], [975, [983]], [976, [946]], [977, [952]], [981, [966]], [982, [960]], [984, [985]], [986, [987]], [988, [989]], [990, [991]], [992, [993]], [994, [995]], [996, [997]], [998, [999]], [1e3, [1001]], [1002, [1003]], [1004, [1005]], [1006, [1007]], [1008, [954]], [1009, [961]], [1012, [952]], [1013, [949]], [1015, [1016]], [1017, [1010]], [1018, [1019]], [1021, [891]], [1022, [892]], [1023, [893]], [1024, [1104]], [1025, [1105]], [1026, [1106]], [1027, [1107]], [1028, [1108]], [1029, [1109]], [1030, [1110]], [1031, [1111]], [1032, [1112]], [1033, [1113]], [1034, [1114]], [1035, [1115]], [1036, [1116]], [1037, [1117]], [1038, [1118]], [1039, [1119]], [1040, [1072]], [1041, [1073]], [1042, [1074]], [1043, [1075]], [1044, [1076]], [1045, [1077]], [1046, [1078]], [1047, [1079]], [1048, [1080]], [1049, [1081]], [1050, [1082]], [1051, [1083]], [1052, [1084]], [1053, [1085]], [1054, [1086]], [1055, [1087]], [1056, [1088]], [1057, [1089]], [1058, [1090]], [1059, [1091]], [1060, [1092]], [1061, [1093]], [1062, [1094]], [1063, [1095]], [1064, [1096]], [1065, [1097]], [1066, [1098]], [1067, [1099]], [1068, [1100]], [1069, [1101]], [1070, [1102]], [1071, [1103]], [1120, [1121]], [1122, [1123]], [1124, [1125]], [1126, [1127]], [1128, [1129]], [1130, [1131]], [1132, [1133]], [1134, [1135]], [1136, [1137]], [1138, [1139]], [1140, [1141]], [1142, [1143]], [1144, [1145]], [1146, [1147]], [1148, [1149]], [1150, [1151]], [1152, [1153]], [1162, [1163]], [1164, [1165]], [1166, [1167]], [1168, [1169]], [1170, [1171]], [1172, [1173]], [1174, [1175]], [1176, [1177]], [1178, [1179]], [1180, [1181]], [1182, [1183]], [1184, [1185]], [1186, [1187]], [1188, [1189]], [1190, [1191]], [1192, [1193]], [1194, [1195]], [1196, [1197]], [1198, [1199]], [1200, [1201]], [1202, [1203]], [1204, [1205]], [1206, [1207]], [1208, [1209]], [1210, [1211]], [1212, [1213]], [1214, [1215]], [1216, [1231]], [1217, [1218]], [1219, [1220]], [1221, [1222]], [1223, [1224]], [1225, [1226]], [1227, [1228]], [1229, [1230]], [1232, [1233]], [1234, [1235]], [1236, [1237]], [1238, [1239]], [1240, [1241]], [1242, [1243]], [1244, [1245]], [1246, [1247]], [1248, [1249]], [1250, [1251]], [1252, [1253]], [1254, [1255]], [1256, [1257]], [1258, [1259]], [1260, [1261]], [1262, [1263]], [1264, [1265]], [1266, [1267]], [1268, [1269]], [1270, [1271]], [1272, [1273]], [1274, [1275]], [1276, [1277]], [1278, [1279]], [1280, [1281]], [1282, [1283]], [1284, [1285]], [1286, [1287]], [1288, [1289]], [1290, [1291]], [1292, [1293]], [1294, [1295]], [1296, [1297]], [1298, [1299]], [1300, [1301]], [1302, [1303]], [1304, [1305]], [1306, [1307]], [1308, [1309]], [1310, [1311]], [1312, [1313]], [1314, [1315]], [1316, [1317]], [1318, [1319]], [1320, [1321]], [1322, [1323]], [1324, [1325]], [1326, [1327]], [1329, [1377]], [1330, [1378]], [1331, [1379]], [1332, [1380]], [1333, [1381]], [1334, [1382]], [1335, [1383]], [1336, [1384]], [1337, [1385]], [1338, [1386]], [1339, [1387]], [1340, [1388]], [1341, [1389]], [1342, [1390]], [1343, [1391]], [1344, [1392]], [1345, [1393]], [1346, [1394]], [1347, [1395]], [1348, [1396]], [1349, [1397]], [1350, [1398]], [1351, [1399]], [1352, [1400]], [1353, [1401]], [1354, [1402]], [1355, [1403]], [1356, [1404]], [1357, [1405]], [1358, [1406]], [1359, [1407]], [1360, [1408]], [1361, [1409]], [1362, [1410]], [1363, [1411]], [1364, [1412]], [1365, [1413]], [1366, [1414]], [1415, [1381, 1410]], [4256, [11520]], [4257, [11521]], [4258, [11522]], [4259, [11523]], [4260, [11524]], [4261, [11525]], [4262, [11526]], [4263, [11527]], [4264, [11528]], [4265, [11529]], [4266, [11530]], [4267, [11531]], [4268, [11532]], [4269, [11533]], [4270, [11534]], [4271, [11535]], [4272, [11536]], [4273, [11537]], [4274, [11538]], [4275, [11539]], [4276, [11540]], [4277, [11541]], [4278, [11542]], [4279, [11543]], [4280, [11544]], [4281, [11545]], [4282, [11546]], [4283, [11547]], [4284, [11548]], [4285, [11549]], [4286, [11550]], [4287, [11551]], [4288, [11552]], [4289, [11553]], [4290, [11554]], [4291, [11555]], [4292, [11556]], [4293, [11557]], [4295, [11559]], [4301, [11565]], [5112, [5104]], [5113, [5105]], [5114, [5106]], [5115, [5107]], [5116, [5108]], [5117, [5109]], [7296, [1074]], [7297, [1076]], [7298, [1086]], [7299, [1089]], [7300, [1090]], [7301, [1090]], [7302, [1098]], [7303, [1123]], [7304, [42571]], [7305, [7306]], [7312, [4304]], [7313, [4305]], [7314, [4306]], [7315, [4307]], [7316, [4308]], [7317, [4309]], [7318, [4310]], [7319, [4311]], [7320, [4312]], [7321, [4313]], [7322, [4314]], [7323, [4315]], [7324, [4316]], [7325, [4317]], [7326, [4318]], [7327, [4319]], [7328, [4320]], [7329, [4321]], [7330, [4322]], [7331, [4323]], [7332, [4324]], [7333, [4325]], [7334, [4326]], [7335, [4327]], [7336, [4328]], [7337, [4329]], [7338, [4330]], [7339, [4331]], [7340, [4332]], [7341, [4333]], [7342, [4334]], [7343, [4335]], [7344, [4336]], [7345, [4337]], [7346, [4338]], [7347, [4339]], [7348, [4340]], [7349, [4341]], [7350, [4342]], [7351, [4343]], [7352, [4344]], [7353, [4345]], [7354, [4346]], [7357, [4349]], [7358, [4350]], [7359, [4351]], [7680, [7681]], [7682, [7683]], [7684, [7685]], [7686, [7687]], [7688, [7689]], [7690, [7691]], [7692, [7693]], [7694, [7695]], [7696, [7697]], [7698, [7699]], [7700, [7701]], [7702, [7703]], [7704, [7705]], [7706, [7707]], [7708, [7709]], [7710, [7711]], [7712, [7713]], [7714, [7715]], [7716, [7717]], [7718, [7719]], [7720, [7721]], [7722, [7723]], [7724, [7725]], [7726, [7727]], [7728, [7729]], [7730, [7731]], [7732, [7733]], [7734, [7735]], [7736, [7737]], [7738, [7739]], [7740, [7741]], [7742, [7743]], [7744, [7745]], [7746, [7747]], [7748, [7749]], [7750, [7751]], [7752, [7753]], [7754, [7755]], [7756, [7757]], [7758, [7759]], [7760, [7761]], [7762, [7763]], [7764, [7765]], [7766, [7767]], [7768, [7769]], [7770, [7771]], [7772, [7773]], [7774, [7775]], [7776, [7777]], [7778, [7779]], [7780, [7781]], [7782, [7783]], [7784, [7785]], [7786, [7787]], [7788, [7789]], [7790, [7791]], [7792, [7793]], [7794, [7795]], [7796, [7797]], [7798, [7799]], [7800, [7801]], [7802, [7803]], [7804, [7805]], [7806, [7807]], [7808, [7809]], [7810, [7811]], [7812, [7813]], [7814, [7815]], [7816, [7817]], [7818, [7819]], [7820, [7821]], [7822, [7823]], [7824, [7825]], [7826, [7827]], [7828, [7829]], [7830, [104, 817]], [7831, [116, 776]], [7832, [119, 778]], [7833, [121, 778]], [7834, [97, 702]], [7835, [7777]], [7838, [115, 115]], [7840, [7841]], [7842, [7843]], [7844, [7845]], [7846, [7847]], [7848, [7849]], [7850, [7851]], [7852, [7853]], [7854, [7855]], [7856, [7857]], [7858, [7859]], [7860, [7861]], [7862, [7863]], [7864, [7865]], [7866, [7867]], [7868, [7869]], [7870, [7871]], [7872, [7873]], [7874, [7875]], [7876, [7877]], [7878, [7879]], [7880, [7881]], [7882, [7883]], [7884, [7885]], [7886, [7887]], [7888, [7889]], [7890, [7891]], [7892, [7893]], [7894, [7895]], [7896, [7897]], [7898, [7899]], [7900, [7901]], [7902, [7903]], [7904, [7905]], [7906, [7907]], [7908, [7909]], [7910, [7911]], [7912, [7913]], [7914, [7915]], [7916, [7917]], [7918, [7919]], [7920, [7921]], [7922, [7923]], [7924, [7925]], [7926, [7927]], [7928, [7929]], [7930, [7931]], [7932, [7933]], [7934, [7935]], [7944, [7936]], [7945, [7937]], [7946, [7938]], [7947, [7939]], [7948, [7940]], [7949, [7941]], [7950, [7942]], [7951, [7943]], [7960, [7952]], [7961, [7953]], [7962, [7954]], [7963, [7955]], [7964, [7956]], [7965, [7957]], [7976, [7968]], [7977, [7969]], [7978, [7970]], [7979, [7971]], [7980, [7972]], [7981, [7973]], [7982, [7974]], [7983, [7975]], [7992, [7984]], [7993, [7985]], [7994, [7986]], [7995, [7987]], [7996, [7988]], [7997, [7989]], [7998, [7990]], [7999, [7991]], [8008, [8e3]], [8009, [8001]], [8010, [8002]], [8011, [8003]], [8012, [8004]], [8013, [8005]], [8016, [965, 787]], [8018, [965, 787, 768]], [8020, [965, 787, 769]], [8022, [965, 787, 834]], [8025, [8017]], [8027, [8019]], [8029, [8021]], [8031, [8023]], [8040, [8032]], [8041, [8033]], [8042, [8034]], [8043, [8035]], [8044, [8036]], [8045, [8037]], [8046, [8038]], [8047, [8039]], [8064, [7936, 953]], [8065, [7937, 953]], [8066, [7938, 953]], [8067, [7939, 953]], [8068, [7940, 953]], [8069, [7941, 953]], [8070, [7942, 953]], [8071, [7943, 953]], [8072, [7936, 953]], [8073, [7937, 953]], [8074, [7938, 953]], [8075, [7939, 953]], [8076, [7940, 953]], [8077, [7941, 953]], [8078, [7942, 953]], [8079, [7943, 953]], [8080, [7968, 953]], [8081, [7969, 953]], [8082, [7970, 953]], [8083, [7971, 953]], [8084, [7972, 953]], [8085, [7973, 953]], [8086, [7974, 953]], [8087, [7975, 953]], [8088, [7968, 953]], [8089, [7969, 953]], [8090, [7970, 953]], [8091, [7971, 953]], [8092, [7972, 953]], [8093, [7973, 953]], [8094, [7974, 953]], [8095, [7975, 953]], [8096, [8032, 953]], [8097, [8033, 953]], [8098, [8034, 953]], [8099, [8035, 953]], [8100, [8036, 953]], [8101, [8037, 953]], [8102, [8038, 953]], [8103, [8039, 953]], [8104, [8032, 953]], [8105, [8033, 953]], [8106, [8034, 953]], [8107, [8035, 953]], [8108, [8036, 953]], [8109, [8037, 953]], [8110, [8038, 953]], [8111, [8039, 953]], [8114, [8048, 953]], [8115, [945, 953]], [8116, [940, 953]], [8118, [945, 834]], [8119, [945, 834, 953]], [8120, [8112]], [8121, [8113]], [8122, [8048]], [8123, [8049]], [8124, [945, 953]], [8126, [953]], [8130, [8052, 953]], [8131, [951, 953]], [8132, [942, 953]], [8134, [951, 834]], [8135, [951, 834, 953]], [8136, [8050]], [8137, [8051]], [8138, [8052]], [8139, [8053]], [8140, [951, 953]], [8146, [953, 776, 768]], [8147, [953, 776, 769]], [8150, [953, 834]], [8151, [953, 776, 834]], [8152, [8144]], [8153, [8145]], [8154, [8054]], [8155, [8055]], [8162, [965, 776, 768]], [8163, [965, 776, 769]], [8164, [961, 787]], [8166, [965, 834]], [8167, [965, 776, 834]], [8168, [8160]], [8169, [8161]], [8170, [8058]], [8171, [8059]], [8172, [8165]], [8178, [8060, 953]], [8179, [969, 953]], [8180, [974, 953]], [8182, [969, 834]], [8183, [969, 834, 953]], [8184, [8056]], [8185, [8057]], [8186, [8060]], [8187, [8061]], [8188, [969, 953]], [8486, [969]], [8490, [107]], [8491, [229]], [8498, [8526]], [8544, [8560]], [8545, [8561]], [8546, [8562]], [8547, [8563]], [8548, [8564]], [8549, [8565]], [8550, [8566]], [8551, [8567]], [8552, [8568]], [8553, [8569]], [8554, [8570]], [8555, [8571]], [8556, [8572]], [8557, [8573]], [8558, [8574]], [8559, [8575]], [8579, [8580]], [9398, [9424]], [9399, [9425]], [9400, [9426]], [9401, [9427]], [9402, [9428]], [9403, [9429]], [9404, [9430]], [9405, [9431]], [9406, [9432]], [9407, [9433]], [9408, [9434]], [9409, [9435]], [9410, [9436]], [9411, [9437]], [9412, [9438]], [9413, [9439]], [9414, [9440]], [9415, [9441]], [9416, [9442]], [9417, [9443]], [9418, [9444]], [9419, [9445]], [9420, [9446]], [9421, [9447]], [9422, [9448]], [9423, [9449]], [11264, [11312]], [11265, [11313]], [11266, [11314]], [11267, [11315]], [11268, [11316]], [11269, [11317]], [11270, [11318]], [11271, [11319]], [11272, [11320]], [11273, [11321]], [11274, [11322]], [11275, [11323]], [11276, [11324]], [11277, [11325]], [11278, [11326]], [11279, [11327]], [11280, [11328]], [11281, [11329]], [11282, [11330]], [11283, [11331]], [11284, [11332]], [11285, [11333]], [11286, [11334]], [11287, [11335]], [11288, [11336]], [11289, [11337]], [11290, [11338]], [11291, [11339]], [11292, [11340]], [11293, [11341]], [11294, [11342]], [11295, [11343]], [11296, [11344]], [11297, [11345]], [11298, [11346]], [11299, [11347]], [11300, [11348]], [11301, [11349]], [11302, [11350]], [11303, [11351]], [11304, [11352]], [11305, [11353]], [11306, [11354]], [11307, [11355]], [11308, [11356]], [11309, [11357]], [11310, [11358]], [11311, [11359]], [11360, [11361]], [11362, [619]], [11363, [7549]], [11364, [637]], [11367, [11368]], [11369, [11370]], [11371, [11372]], [11373, [593]], [11374, [625]], [11375, [592]], [11376, [594]], [11378, [11379]], [11381, [11382]], [11390, [575]], [11391, [576]], [11392, [11393]], [11394, [11395]], [11396, [11397]], [11398, [11399]], [11400, [11401]], [11402, [11403]], [11404, [11405]], [11406, [11407]], [11408, [11409]], [11410, [11411]], [11412, [11413]], [11414, [11415]], [11416, [11417]], [11418, [11419]], [11420, [11421]], [11422, [11423]], [11424, [11425]], [11426, [11427]], [11428, [11429]], [11430, [11431]], [11432, [11433]], [11434, [11435]], [11436, [11437]], [11438, [11439]], [11440, [11441]], [11442, [11443]], [11444, [11445]], [11446, [11447]], [11448, [11449]], [11450, [11451]], [11452, [11453]], [11454, [11455]], [11456, [11457]], [11458, [11459]], [11460, [11461]], [11462, [11463]], [11464, [11465]], [11466, [11467]], [11468, [11469]], [11470, [11471]], [11472, [11473]], [11474, [11475]], [11476, [11477]], [11478, [11479]], [11480, [11481]], [11482, [11483]], [11484, [11485]], [11486, [11487]], [11488, [11489]], [11490, [11491]], [11499, [11500]], [11501, [11502]], [11506, [11507]], [42560, [42561]], [42562, [42563]], [42564, [42565]], [42566, [42567]], [42568, [42569]], [42570, [42571]], [42572, [42573]], [42574, [42575]], [42576, [42577]], [42578, [42579]], [42580, [42581]], [42582, [42583]], [42584, [42585]], [42586, [42587]], [42588, [42589]], [42590, [42591]], [42592, [42593]], [42594, [42595]], [42596, [42597]], [42598, [42599]], [42600, [42601]], [42602, [42603]], [42604, [42605]], [42624, [42625]], [42626, [42627]], [42628, [42629]], [42630, [42631]], [42632, [42633]], [42634, [42635]], [42636, [42637]], [42638, [42639]], [42640, [42641]], [42642, [42643]], [42644, [42645]], [42646, [42647]], [42648, [42649]], [42650, [42651]], [42786, [42787]], [42788, [42789]], [42790, [42791]], [42792, [42793]], [42794, [42795]], [42796, [42797]], [42798, [42799]], [42802, [42803]], [42804, [42805]], [42806, [42807]], [42808, [42809]], [42810, [42811]], [42812, [42813]], [42814, [42815]], [42816, [42817]], [42818, [42819]], [42820, [42821]], [42822, [42823]], [42824, [42825]], [42826, [42827]], [42828, [42829]], [42830, [42831]], [42832, [42833]], [42834, [42835]], [42836, [42837]], [42838, [42839]], [42840, [42841]], [42842, [42843]], [42844, [42845]], [42846, [42847]], [42848, [42849]], [42850, [42851]], [42852, [42853]], [42854, [42855]], [42856, [42857]], [42858, [42859]], [42860, [42861]], [42862, [42863]], [42873, [42874]], [42875, [42876]], [42877, [7545]], [42878, [42879]], [42880, [42881]], [42882, [42883]], [42884, [42885]], [42886, [42887]], [42891, [42892]], [42893, [613]], [42896, [42897]], [42898, [42899]], [42902, [42903]], [42904, [42905]], [42906, [42907]], [42908, [42909]], [42910, [42911]], [42912, [42913]], [42914, [42915]], [42916, [42917]], [42918, [42919]], [42920, [42921]], [42922, [614]], [42923, [604]], [42924, [609]], [42925, [620]], [42926, [618]], [42928, [670]], [42929, [647]], [42930, [669]], [42931, [43859]], [42932, [42933]], [42934, [42935]], [42936, [42937]], [42938, [42939]], [42940, [42941]], [42942, [42943]], [42944, [42945]], [42946, [42947]], [42948, [42900]], [42949, [642]], [42950, [7566]], [42951, [42952]], [42953, [42954]], [42955, [612]], [42956, [42957]], [42958, [42959]], [42960, [42961]], [42962, [42963]], [42964, [42965]], [42966, [42967]], [42968, [42969]], [42970, [42971]], [42972, [411]], [42997, [42998]], [43888, [5024]], [43889, [5025]], [43890, [5026]], [43891, [5027]], [43892, [5028]], [43893, [5029]], [43894, [5030]], [43895, [5031]], [43896, [5032]], [43897, [5033]], [43898, [5034]], [43899, [5035]], [43900, [5036]], [43901, [5037]], [43902, [5038]], [43903, [5039]], [43904, [5040]], [43905, [5041]], [43906, [5042]], [43907, [5043]], [43908, [5044]], [43909, [5045]], [43910, [5046]], [43911, [5047]], [43912, [5048]], [43913, [5049]], [43914, [5050]], [43915, [5051]], [43916, [5052]], [43917, [5053]], [43918, [5054]], [43919, [5055]], [43920, [5056]], [43921, [5057]], [43922, [5058]], [43923, [5059]], [43924, [5060]], [43925, [5061]], [43926, [5062]], [43927, [5063]], [43928, [5064]], [43929, [5065]], [43930, [5066]], [43931, [5067]], [43932, [5068]], [43933, [5069]], [43934, [5070]], [43935, [5071]], [43936, [5072]], [43937, [5073]], [43938, [5074]], [43939, [5075]], [43940, [5076]], [43941, [5077]], [43942, [5078]], [43943, [5079]], [43944, [5080]], [43945, [5081]], [43946, [5082]], [43947, [5083]], [43948, [5084]], [43949, [5085]], [43950, [5086]], [43951, [5087]], [43952, [5088]], [43953, [5089]], [43954, [5090]], [43955, [5091]], [43956, [5092]], [43957, [5093]], [43958, [5094]], [43959, [5095]], [43960, [5096]], [43961, [5097]], [43962, [5098]], [43963, [5099]], [43964, [5100]], [43965, [5101]], [43966, [5102]], [43967, [5103]], [64256, [102, 102]], [64257, [102, 105]], [64258, [102, 108]], [64259, [102, 102, 105]], [64260, [102, 102, 108]], [64261, [115, 116]], [64262, [115, 116]], [64275, [1396, 1398]], [64276, [1396, 1381]], [64277, [1396, 1387]], [64278, [1406, 1398]], [64279, [1396, 1389]], [65313, [65345]], [65314, [65346]], [65315, [65347]], [65316, [65348]], [65317, [65349]], [65318, [65350]], [65319, [65351]], [65320, [65352]], [65321, [65353]], [65322, [65354]], [65323, [65355]], [65324, [65356]], [65325, [65357]], [65326, [65358]], [65327, [65359]], [65328, [65360]], [65329, [65361]], [65330, [65362]], [65331, [65363]], [65332, [65364]], [65333, [65365]], [65334, [65366]], [65335, [65367]], [65336, [65368]], [65337, [65369]], [65338, [65370]], [66560, [66600]], [66561, [66601]], [66562, [66602]], [66563, [66603]], [66564, [66604]], [66565, [66605]], [66566, [66606]], [66567, [66607]], [66568, [66608]], [66569, [66609]], [66570, [66610]], [66571, [66611]], [66572, [66612]], [66573, [66613]], [66574, [66614]], [66575, [66615]], [66576, [66616]], [66577, [66617]], [66578, [66618]], [66579, [66619]], [66580, [66620]], [66581, [66621]], [66582, [66622]], [66583, [66623]], [66584, [66624]], [66585, [66625]], [66586, [66626]], [66587, [66627]], [66588, [66628]], [66589, [66629]], [66590, [66630]], [66591, [66631]], [66592, [66632]], [66593, [66633]], [66594, [66634]], [66595, [66635]], [66596, [66636]], [66597, [66637]], [66598, [66638]], [66599, [66639]], [66736, [66776]], [66737, [66777]], [66738, [66778]], [66739, [66779]], [66740, [66780]], [66741, [66781]], [66742, [66782]], [66743, [66783]], [66744, [66784]], [66745, [66785]], [66746, [66786]], [66747, [66787]], [66748, [66788]], [66749, [66789]], [66750, [66790]], [66751, [66791]], [66752, [66792]], [66753, [66793]], [66754, [66794]], [66755, [66795]], [66756, [66796]], [66757, [66797]], [66758, [66798]], [66759, [66799]], [66760, [66800]], [66761, [66801]], [66762, [66802]], [66763, [66803]], [66764, [66804]], [66765, [66805]], [66766, [66806]], [66767, [66807]], [66768, [66808]], [66769, [66809]], [66770, [66810]], [66771, [66811]], [66928, [66967]], [66929, [66968]], [66930, [66969]], [66931, [66970]], [66932, [66971]], [66933, [66972]], [66934, [66973]], [66935, [66974]], [66936, [66975]], [66937, [66976]], [66938, [66977]], [66940, [66979]], [66941, [66980]], [66942, [66981]], [66943, [66982]], [66944, [66983]], [66945, [66984]], [66946, [66985]], [66947, [66986]], [66948, [66987]], [66949, [66988]], [66950, [66989]], [66951, [66990]], [66952, [66991]], [66953, [66992]], [66954, [66993]], [66956, [66995]], [66957, [66996]], [66958, [66997]], [66959, [66998]], [66960, [66999]], [66961, [67e3]], [66962, [67001]], [66964, [67003]], [66965, [67004]], [68736, [68800]], [68737, [68801]], [68738, [68802]], [68739, [68803]], [68740, [68804]], [68741, [68805]], [68742, [68806]], [68743, [68807]], [68744, [68808]], [68745, [68809]], [68746, [68810]], [68747, [68811]], [68748, [68812]], [68749, [68813]], [68750, [68814]], [68751, [68815]], [68752, [68816]], [68753, [68817]], [68754, [68818]], [68755, [68819]], [68756, [68820]], [68757, [68821]], [68758, [68822]], [68759, [68823]], [68760, [68824]], [68761, [68825]], [68762, [68826]], [68763, [68827]], [68764, [68828]], [68765, [68829]], [68766, [68830]], [68767, [68831]], [68768, [68832]], [68769, [68833]], [68770, [68834]], [68771, [68835]], [68772, [68836]], [68773, [68837]], [68774, [68838]], [68775, [68839]], [68776, [68840]], [68777, [68841]], [68778, [68842]], [68779, [68843]], [68780, [68844]], [68781, [68845]], [68782, [68846]], [68783, [68847]], [68784, [68848]], [68785, [68849]], [68786, [68850]], [68944, [68976]], [68945, [68977]], [68946, [68978]], [68947, [68979]], [68948, [68980]], [68949, [68981]], [68950, [68982]], [68951, [68983]], [68952, [68984]], [68953, [68985]], [68954, [68986]], [68955, [68987]], [68956, [68988]], [68957, [68989]], [68958, [68990]], [68959, [68991]], [68960, [68992]], [68961, [68993]], [68962, [68994]], [68963, [68995]], [68964, [68996]], [68965, [68997]], [71840, [71872]], [71841, [71873]], [71842, [71874]], [71843, [71875]], [71844, [71876]], [71845, [71877]], [71846, [71878]], [71847, [71879]], [71848, [71880]], [71849, [71881]], [71850, [71882]], [71851, [71883]], [71852, [71884]], [71853, [71885]], [71854, [71886]], [71855, [71887]], [71856, [71888]], [71857, [71889]], [71858, [71890]], [71859, [71891]], [71860, [71892]], [71861, [71893]], [71862, [71894]], [71863, [71895]], [71864, [71896]], [71865, [71897]], [71866, [71898]], [71867, [71899]], [71868, [71900]], [71869, [71901]], [71870, [71902]], [71871, [71903]], [93760, [93792]], [93761, [93793]], [93762, [93794]], [93763, [93795]], [93764, [93796]], [93765, [93797]], [93766, [93798]], [93767, [93799]], [93768, [93800]], [93769, [93801]], [93770, [93802]], [93771, [93803]], [93772, [93804]], [93773, [93805]], [93774, [93806]], [93775, [93807]], [93776, [93808]], [93777, [93809]], [93778, [93810]], [93779, [93811]], [93780, [93812]], [93781, [93813]], [93782, [93814]], [93783, [93815]], [93784, [93816]], [93785, [93817]], [93786, [93818]], [93787, [93819]], [93788, [93820]], [93789, [93821]], [93790, [93822]], [93791, [93823]], [93856, [93883]], [93857, [93884]], [93858, [93885]], [93859, [93886]], [93860, [93887]], [93861, [93888]], [93862, [93889]], [93863, [93890]], [93864, [93891]], [93865, [93892]], [93866, [93893]], [93867, [93894]], [93868, [93895]], [93869, [93896]], [93870, [93897]], [93871, [93898]], [93872, [93899]], [93873, [93900]], [93874, [93901]], [93875, [93902]], [93876, [93903]], [93877, [93904]], [93878, [93905]], [93879, [93906]], [93880, [93907]], [125184, [125218]], [125185, [125219]], [125186, [125220]], [125187, [125221]], [125188, [125222]], [125189, [125223]], [125190, [125224]], [125191, [125225]], [125192, [125226]], [125193, [125227]], [125194, [125228]], [125195, [125229]], [125196, [125230]], [125197, [125231]], [125198, [125232]], [125199, [125233]], [125200, [125234]], [125201, [125235]], [125202, [125236]], [125203, [125237]], [125204, [125238]], [125205, [125239]], [125206, [125240]], [125207, [125241]], [125208, [125242]], [125209, [125243]], [125210, [125244]], [125211, [125245]], [125212, [125246]], [125213, [125247]], [125214, [125248]], [125215, [125249]], [125216, [125250]], [125217, [125251]]]);
-function caseFold(input) {
-  if (typeof input !== "string") {
-    throw new TypeError("Input must be a string");
-  }
-  let result = [];
-  for (const char of input) {
-    const codePoint = char.codePointAt(0);
-    const mapping = FOLDING_MAP.get(codePoint);
-    result.push(mapping ? String.fromCodePoint(...mapping) : char);
-  }
-  return result.join("");
-}
-
-// src/utils/canonical-path.ts
-function alternateAsciiCase(value) {
-  const index = value.search(/[A-Za-z]/);
-  if (index === -1) return null;
-  const character = value[index];
-  const alternate = character === character.toLowerCase() ? character.toUpperCase() : character.toLowerCase();
-  return `${value.slice(0, index)}${alternate}${value.slice(index + 1)}`;
-}
-function probeEntryCaseSensitivity(entryPath) {
-  const alternateName = alternateAsciiCase(path14.basename(entryPath));
-  if (!alternateName) return void 0;
-  try {
-    const canonicalPath = fs.realpathSync.native(entryPath);
-    const alternatePath = fs.realpathSync.native(path14.join(path14.dirname(entryPath), alternateName));
-    return canonicalPath === alternatePath;
-  } catch (error) {
-    const code = error.code;
-    if (code === "ENOENT" || code === "ENOTDIR") return false;
-    return void 0;
-  }
-}
-function probeEmptyWindowsDirectory(existingAncestor) {
-  const probePath = path14.join(
-    existingAncestor,
-    `.codebase-index-case-probe-${crypto.randomBytes(8).toString("hex")}`
-  );
-  let created = false;
-  try {
-    const descriptor = fs.openSync(probePath, "wx", 384);
-    created = true;
-    fs.closeSync(descriptor);
-    return probeEntryCaseSensitivity(probePath);
-  } catch {
-    return void 0;
-  } finally {
-    if (created) fs.unlinkSync(probePath);
-  }
-}
-function detectCaseInsensitiveFileSystem(existingAncestor) {
-  try {
-    if (fs.statSync(existingAncestor).isDirectory()) {
-      const directory = fs.opendirSync(existingAncestor);
-      try {
-        let entry = directory.readSync();
-        while (entry) {
-          if (!entry.isSymbolicLink() && alternateAsciiCase(entry.name)) {
-            const result = probeEntryCaseSensitivity(path14.join(existingAncestor, entry.name));
-            if (result !== void 0) return result;
-          }
-          entry = directory.readSync();
-        }
-      } finally {
-        directory.closeSync();
-      }
-    }
-  } catch {
-    return void 0;
-  }
-  if (process.platform === "darwin") {
-    return probeEntryCaseSensitivity(existingAncestor);
-  }
-  if (process.platform === "win32") {
-    return probeEmptyWindowsDirectory(existingAncestor);
-  }
-  return void 0;
-}
-function foldMissingPathComponent(component) {
-  return caseFold(component);
-}
-function canonicalizePathForComparison(targetPath, options = {}) {
-  const resolved = path14.resolve(targetPath);
-  const missingParts = [];
-  let candidate = resolved;
-  while (true) {
-    try {
-      const existingAncestor = fs.realpathSync.native(candidate);
-      const isCaseInsensitive = missingParts.length > 0 ? (options.isCaseInsensitive ?? detectCaseInsensitiveFileSystem)(existingAncestor) : false;
-      const suffix = isCaseInsensitive === true ? missingParts.map(foldMissingPathComponent) : missingParts;
-      return path14.join(existingAncestor, ...suffix);
-    } catch (error) {
-      const code = error.code;
-      if (code !== "ENOENT" && code !== "ENOTDIR") throw error;
-      const parent = path14.dirname(candidate);
-      if (parent === candidate) return resolved;
-      missingParts.unshift(path14.basename(candidate));
-      candidate = parent;
-    }
-  }
-}
-
 // src/git/branch-resolution.ts
 import { execFile as execFile2 } from "child_process";
 import { randomBytes as randomBytes2 } from "crypto";
@@ -9102,6 +9167,8 @@ function hasBlameMetadata(metadata) {
   return blameFromMetadata(metadata) !== void 0;
 }
 var INDEX_METADATA_VERSION = "1";
+var PROJECT_PATH_STORAGE_VERSION = "2";
+var GLOBAL_PATH_STORAGE_VERSION = "1";
 var EMBEDDING_STRATEGY_VERSION = "2";
 var SWIFT_PARSER_VERSION = "1";
 var METAL_PARSER_VERSION = "1";
@@ -9432,18 +9499,20 @@ function selectIndexableChunks(chunks, limit, semanticOnly) {
   const indexableChunks = semanticOnly ? chunks.filter((chunk) => chunk.chunkType !== "other") : chunks;
   return selectChunksWithFileCoverage(indexableChunks, limit);
 }
-function matchesHardSearchFilters(candidate, options) {
+function matchesHardSearchFilters(candidate, options, projectRoot) {
   if (options?.fileType) {
     const ext = candidate.metadata.filePath.split(".").pop()?.toLowerCase();
     const requestedExtension = options.fileType.trim().toLowerCase().replace(/^\./, "");
     if (ext !== requestedExtension) return false;
   }
   if (options?.directory) {
-    const normalizedPath = candidate.metadata.filePath.replace(/\\/g, "/");
-    const normalizedDir = options.directory.trim().replace(/\\/g, "/").replace(/^\.\//, "").replace(/\/$/, "");
-    const isAbsoluteDirectory = normalizedDir.startsWith("/");
-    const matchesDirectory = isAbsoluteDirectory ? normalizedPath === normalizedDir || normalizedPath.startsWith(`${normalizedDir}/`) : normalizedPath === normalizedDir || normalizedPath.startsWith(`${normalizedDir}/`) || normalizedPath.includes(`/${normalizedDir}/`) || normalizedPath.endsWith(`/${normalizedDir}`);
-    if (!matchesDirectory) return false;
+    const candidatePath = canonicalizePathForComparison(
+      path18.resolve(projectRoot, candidate.metadata.filePath.replace(/\\/g, path18.sep))
+    );
+    const directoryPath = canonicalizePathForComparison(
+      path18.resolve(projectRoot, options.directory.trim().replace(/\\/g, path18.sep))
+    );
+    if (!isPathWithinRoot2(candidatePath, directoryPath)) return false;
   }
   if (options?.chunkType && candidate.metadata.chunkType !== options.chunkType) {
     return false;
@@ -9465,8 +9534,8 @@ function matchesHardSearchFilters(candidate, options) {
   }
   return true;
 }
-function matchesSearchFilters(candidate, options, minScore) {
-  return candidate.score >= minScore && matchesHardSearchFilters(candidate, options);
+function matchesSearchFilters(candidate, options, minScore, projectRoot) {
+  return candidate.score >= minScore && matchesHardSearchFilters(candidate, options, projectRoot);
 }
 function unionCandidates(semanticCandidates, keywordCandidates) {
   const byId = /* @__PURE__ */ new Map();
@@ -9517,7 +9586,7 @@ var Indexer = class _Indexer {
   readerArtifactFingerprint = null;
   writerArtifactFingerprint = null;
   readerArtifactRetryAfter = /* @__PURE__ */ new Map();
-  constructor(projectRoot, config, host = "opencode", runtimeOptions = {}) {
+  constructor(projectRoot, config, host, runtimeOptions = {}) {
     this.projectRoot = projectRoot;
     this.projectIdentityHash = hashContent(this.getCanonicalPath(projectRoot)).slice(0, 16);
     this.materializedProjectRoot = runtimeOptions.materializedProjectRoot ?? projectRoot;
@@ -9530,37 +9599,90 @@ var Indexer = class _Indexer {
     this.indexPathOverride = runtimeOptions.indexPath;
     this.config = config;
     this.host = host;
+    if (isGitRepo(this.materializedProjectRoot)) {
+      this.currentBranch = this.branchNameOverride ?? getBranchOrDefault(this.materializedProjectRoot);
+      this.baseBranch = getBaseBranch(this.materializedProjectRoot);
+    } else {
+      this.currentBranch = "default";
+      this.baseBranch = "default";
+    }
     this.indexPath = this.getIndexPath();
-    this.fileHashCachePath = this.getRuntimeArtifactPath("file-hashes.json");
-    this.failedBatchesPath = this.getRuntimeArtifactPath("failed-batches.json");
+    this.refreshRuntimeArtifactPaths();
     this.logger = initializeLogger(config.debug);
   }
   getIndexPath() {
     return this.indexPathOverride ?? resolveProjectIndexPath(this.projectRoot, this.config.scope, this.host);
   }
   toCanonicalFilePath(filePath) {
+    if (!path18.isAbsolute(filePath)) {
+      return this.resolveStoredFilePath(filePath, this.projectRoot);
+    }
     if (path18.resolve(this.materializedProjectRoot) === path18.resolve(this.projectRoot) || !isPathWithinRoot2(filePath, this.materializedProjectRoot)) {
       return filePath;
     }
     return path18.resolve(this.projectRoot, path18.relative(this.materializedProjectRoot, filePath));
   }
-  toMaterializedFilePath(filePath) {
-    if (path18.resolve(this.materializedProjectRoot) === path18.resolve(this.projectRoot) || !isPathWithinRoot2(filePath, this.projectRoot)) {
+  toStoredFilePath(filePath) {
+    const canonicalFilePath = this.toCanonicalFilePath(filePath);
+    if (this.config.scope !== "project" || !isPathWithinRoot2(canonicalFilePath, this.projectRoot)) {
+      return canonicalFilePath;
+    }
+    return path18.relative(this.projectRoot, canonicalFilePath).split(path18.sep).join("/");
+  }
+  resolveStoredFilePath(filePath, rootPath = this.projectRoot) {
+    if (path18.isAbsolute(filePath)) {
       return filePath;
     }
-    return path18.resolve(this.materializedProjectRoot, path18.relative(this.projectRoot, filePath));
+    const resolvedPath = path18.resolve(rootPath, ...filePath.split("/"));
+    if (!isPathWithinRoot2(resolvedPath, rootPath)) {
+      throw new Error(`Stored project path escapes project root: ${JSON.stringify(filePath)}`);
+    }
+    return resolvedPath;
+  }
+  getCanonicalStoredFilePath(filePath) {
+    return this.getCanonicalPath(this.resolveStoredFilePath(filePath));
+  }
+  resolveFilePathRecord(record) {
+    return {
+      ...record,
+      filePath: this.resolveStoredFilePath(record.filePath)
+    };
+  }
+  resolveCallEdgeFilePath(edge) {
+    if (!edge.fromSymbolFilePath) return edge;
+    return {
+      ...edge,
+      fromSymbolFilePath: this.resolveStoredFilePath(edge.fromSymbolFilePath)
+    };
+  }
+  toMaterializedFilePath(filePath) {
+    const storedFilePath = this.toStoredFilePath(filePath);
+    if (path18.isAbsolute(storedFilePath)) {
+      return storedFilePath;
+    }
+    return this.resolveStoredFilePath(storedFilePath, this.materializedProjectRoot);
   }
   getPreparedBranchNamespace() {
     if (!this.branchNameOverride && !this.catalogIdentityOverride) return null;
     return hashContent(this.getBranchCatalogKey()).slice(0, 16);
   }
+  getRuntimeArtifactNamespace() {
+    if (this.config.scope !== "project" || this.getBranchCatalogIdentity() === "default") {
+      return this.getPreparedBranchNamespace();
+    }
+    return hashContent(this.getBranchCatalogKey()).slice(0, 16);
+  }
   getRuntimeArtifactPath(fileName) {
-    const namespace = this.getPreparedBranchNamespace();
+    const namespace = this.getRuntimeArtifactNamespace();
     if (!namespace) return path18.join(this.indexPath, fileName);
     const extension = path18.extname(fileName);
     const baseName = fileName.slice(0, fileName.length - extension.length);
     return path18.join(this.indexPath, `${baseName}.${namespace}${extension}`);
   }
+  refreshRuntimeArtifactPaths() {
+    this.fileHashCachePath = this.getRuntimeArtifactPath("file-hashes.json");
+    this.failedBatchesPath = this.getRuntimeArtifactPath("failed-batches.json");
+  }
   getPreparedChunkId(chunkId) {
     const namespace = this.getPreparedBranchNamespace();
     return namespace ? `${chunkId}_${namespace}` : chunkId;
@@ -9586,19 +9708,8 @@ var Indexer = class _Indexer {
       return path18.resolve(targetPath);
     }
   }
-  isLocalProjectIndexPath() {
-    const localProjectIndexPaths = [path18.join(this.projectRoot, getHostProjectIndexRelativePath(this.host))];
-    if (this.host !== "opencode") {
-      localProjectIndexPaths.push(path18.join(this.projectRoot, getHostProjectIndexRelativePath("opencode")));
-    }
-    return localProjectIndexPaths.some((localPath) => {
-      if (!existsSync10(localPath) || !existsSync10(this.indexPath)) {
-        return path18.resolve(this.indexPath) === path18.resolve(localPath);
-      }
-      const indexStats = statSync4(this.indexPath);
-      const localStats = statSync4(localPath);
-      return indexStats.dev === localStats.dev && indexStats.ino === localStats.ino;
-    });
+  isProjectOwnedIndexPath() {
+    return isProjectIndexPathOwnedByProject(this.projectRoot, this.indexPath, this.host);
   }
   resetLoadedIndexState(retireDatabase = false) {
     if (this.database) {
@@ -9633,10 +9744,10 @@ var Indexer = class _Indexer {
     this.readerArtifactRetryAfter.clear();
   }
   async withIndexMutationLease(operation, callback) {
+    this.refreshBranchInfo();
     const lease = acquireIndexLock(this.indexPath, operation);
     this.indexPath = lease.canonicalIndexPath;
-    this.fileHashCachePath = this.getRuntimeArtifactPath("file-hashes.json");
-    this.failedBatchesPath = this.getRuntimeArtifactPath("failed-batches.json");
+    this.refreshRuntimeArtifactPaths();
     this.activeIndexLease = lease;
     let result;
     let callbackError;
@@ -9808,29 +9919,24 @@ var Indexer = class _Indexer {
   getProjectForceReembedMetadataKey() {
     return `index.forceReembed.${this.projectIdentityHash}`;
   }
-  getCallGraphResolutionMetadataKey() {
-    if (this.config.scope !== "global") {
-      return "index.callGraphResolutionVersion";
-    }
-    return `index.callGraphResolutionVersion.${this.projectIdentityHash}`;
+  getBranchMigrationMetadataKey(prefix, catalogIdentity = this.getBranchCatalogIdentity()) {
+    const branchKey = this.getBranchCatalogKeyFor(catalogIdentity);
+    return `${prefix}.${hashContent(branchKey).slice(0, 24)}`;
   }
-  getSwiftParserVersionMetadataKey() {
-    const key = "index.parser.swiftVersion";
-    if (this.config.scope !== "global") {
-      return key;
-    }
-    return `${key}.${this.projectIdentityHash}`;
+  getCallGraphResolutionMetadataKey(catalogIdentity = this.getBranchCatalogIdentity()) {
+    return this.getBranchMigrationMetadataKey("index.callGraphResolutionVersion", catalogIdentity);
   }
-  getMetalParserVersionMetadataKey() {
-    const key = "index.parser.metalVersion";
-    if (this.config.scope !== "global") {
-      return key;
-    }
-    return `${key}.${this.projectIdentityHash}`;
+  getSwiftParserVersionMetadataKey(catalogIdentity = this.getBranchCatalogIdentity()) {
+    return this.getBranchMigrationMetadataKey("index.parser.swiftVersion", catalogIdentity);
+  }
+  getMetalParserVersionMetadataKey(catalogIdentity = this.getBranchCatalogIdentity()) {
+    return this.getBranchMigrationMetadataKey("index.parser.metalVersion", catalogIdentity);
   }
   getSymbolExtractorVersionMetadataKey(catalogIdentity = this.getBranchCatalogIdentity()) {
-    const branchKey = this.getBranchCatalogKeyFor(catalogIdentity);
-    return `index.symbolExtractorVersion.${hashContent(branchKey).slice(0, 24)}`;
+    return this.getBranchMigrationMetadataKey("index.symbolExtractorVersion", catalogIdentity);
+  }
+  areBranchMigrationVersionsCurrent(database, catalogIdentity = this.getBranchCatalogIdentity()) {
+    return database.getMetadata(this.getCallGraphResolutionMetadataKey(catalogIdentity)) === CALL_GRAPH_RESOLUTION_VERSION && database.getMetadata(this.getSwiftParserVersionMetadataKey(catalogIdentity)) === SWIFT_PARSER_VERSION && database.getMetadata(this.getMetalParserVersionMetadataKey(catalogIdentity)) === METAL_PARSER_VERSION && database.getMetadata(this.getSymbolExtractorVersionMetadataKey(catalogIdentity)) === SYMBOL_EXTRACTOR_VERSION;
   }
   hasProjectForceReembedPending() {
     return this.config.scope === "global" && this.database?.getMetadata(this.getProjectForceReembedMetadataKey()) === "true";
@@ -9965,13 +10071,14 @@ var Indexer = class _Indexer {
     return Array.from(keys);
   }
   isFileInCurrentScope(filePath, roots) {
-    if (roots.some((root) => isPathWithinRoot2(filePath, root))) return true;
-    const canonicalFilePath = this.getCanonicalPath(filePath);
+    const canonicalFilePath = this.getCanonicalStoredFilePath(filePath);
     return roots.some((root) => isPathWithinRoot2(canonicalFilePath, root));
   }
   isFileInProjectRoot(filePath) {
-    if (isPathWithinRoot2(filePath, this.projectRoot)) return true;
-    return isPathWithinRoot2(this.getCanonicalPath(filePath), this.getCanonicalPath(this.projectRoot));
+    return isPathWithinRoot2(
+      this.getCanonicalStoredFilePath(filePath),
+      this.getCanonicalPath(this.projectRoot)
+    );
   }
   clearScopedFileHashCache(roots) {
     for (const filePath of Array.from(this.fileHashCache.keys())) {
@@ -10372,7 +10479,10 @@ var Indexer = class _Indexer {
     const intent = isLikelyImplementationPath2(candidate.metadata.filePath) ? "implementation" : "doc_or_test";
     parts.push(`intent_hint: ${intent}`);
     try {
-      const fileContent = await fsPromises3.readFile(candidate.metadata.filePath, "utf-8");
+      const fileContent = await fsPromises3.readFile(
+        this.toMaterializedFilePath(candidate.metadata.filePath),
+        "utf-8"
+      );
       const lines = fileContent.split("\n");
       const snippetStartLine = Math.max(1, candidate.metadata.startLine);
       const snippetEndLine = Math.min(lines.length, candidate.metadata.endLine);
@@ -10441,7 +10551,7 @@ var Indexer = class _Indexer {
     if (this.config.scope === "global") {
       return "Shared vector index could not be read. Restore or repair the complete fingerprinted shared vector artifacts; automatic reset is disabled for global scope.";
     }
-    if (!this.isLocalProjectIndexPath()) {
+    if (!this.isProjectOwnedIndexPath()) {
       return "Vector index could not be read from an inherited project index. Restore or fingerprint it from the checkout that owns the index; do not remove or rebuild it from this worktree.";
     }
     return "Vector index could not be read. Run index_codebase after the active writer finishes to fingerprint a structurally valid legacy pair, or remove this checkout's local index directory and run index_codebase to rebuild it.";
@@ -10450,7 +10560,7 @@ var Indexer = class _Indexer {
     if (this.config.scope === "global") {
       return "Shared keyword index could not be read; semantic search remains available. Restore or repair the shared keyword artifact; automatic reset is disabled for global scope.";
     }
-    if (!this.isLocalProjectIndexPath()) {
+    if (!this.isProjectOwnedIndexPath()) {
       return "Keyword index could not be read from an inherited project index; semantic search remains available. Restore or repair it from the checkout that owns the index; do not rebuild it from this worktree.";
     }
     return "Keyword index could not be read; semantic search remains available. Restore a readable published keyword index, or run index_codebase with force=true after the active writer finishes.";
@@ -10459,10 +10569,10 @@ var Indexer = class _Indexer {
     if (this.config.scope === "global") {
       return "Shared index database could not be read. Restore or repair the shared SQLite database; automatic reset is disabled for global scope.";
     }
-    if (!this.isLocalProjectIndexPath()) {
+    if (!this.isProjectOwnedIndexPath()) {
       return "Index database could not be read from an inherited project index. Restore or repair it from the checkout that owns the index; do not migrate or rebuild it from this worktree.";
     }
-    return "Index database could not be read. Run index_codebase after the active writer finishes to repair or migrate it under the writer lease.";
+    return "Index database could not be read. Run index_codebase with force=true to rebuild a legacy absolute-path schema, or repair the database after the active writer finishes.";
   }
   getReaderFileFingerprint(filePath, identityOnly = false) {
     try {
@@ -10642,7 +10752,7 @@ var Indexer = class _Indexer {
     const readerArtifactFingerprint = mode === "reader" ? this.captureReaderArtifactFingerprint() : null;
     if (mode === "writer") {
       await fsPromises3.mkdir(this.indexPath, { recursive: true });
-      if (recoveredOwners.length > 0 && this.config.scope === "project" && !this.isLocalProjectIndexPath()) {
+      if (recoveredOwners.length > 0 && this.config.scope === "project" && !this.isProjectOwnedIndexPath()) {
         throw new Error(
           "Interrupted indexing recovery is unsafe while using an inherited worktree index. Run index_codebase with force=true to create a local project index boundary."
         );
@@ -10743,6 +10853,7 @@ var Indexer = class _Indexer {
       this.baseBranch = "default";
       this.logger.branch("debug", "Not a git repository, using default branch");
     }
+    this.refreshRuntimeArtifactPaths();
     if (mode === "writer" && recoveredOwners.length > 0) {
       await this.recoverFromInterruptedIndexingUnlocked(recoveredOwners);
     }
@@ -10898,6 +11009,14 @@ var Indexer = class _Indexer {
     }
     return `Detected a corrupted local SQLite index at ${dbPath} and reset the local index. Run index_codebase to rebuild search data.`;
   }
+  async removeProjectRuntimeStateArtifacts() {
+    if (!existsSync10(this.indexPath)) return;
+    const names = await fsPromises3.readdir(this.indexPath);
+    const runtimeStatePattern = /^(?:file-hashes|failed-batches)(?:\.[a-f0-9]{16})?\.json$/;
+    await Promise.all(
+      names.filter((name) => runtimeStatePattern.test(name)).map((name) => fsPromises3.rm(path18.join(this.indexPath, name), { force: true }))
+    );
+  }
   async resetLocalIndexArtifacts() {
     this.store = null;
     this.invertedIndex = null;
@@ -10917,11 +11036,10 @@ var Indexer = class _Indexer {
       path18.join(this.indexPath, "vectors"),
       path18.join(this.indexPath, "vectors.usearch"),
       path18.join(this.indexPath, "vectors.meta.json"),
-      path18.join(this.indexPath, "inverted-index.json"),
-      path18.join(this.indexPath, "file-hashes.json"),
-      path18.join(this.indexPath, "failed-batches.json")
+      path18.join(this.indexPath, "inverted-index.json")
     ];
     await Promise.all(resetPaths.map((targetPath) => fsPromises3.rm(targetPath, { recursive: true, force: true })));
+    await this.removeProjectRuntimeStateArtifacts();
     await fsPromises3.mkdir(this.indexPath, { recursive: true });
   }
   async tryResetCorruptedIndex(stage, error) {
@@ -10971,12 +11089,20 @@ var Indexer = class _Indexer {
     }
     this.database.addChunksToBranchBatch(this.getBranchCatalogKey(), chunkIds);
   }
+  getExpectedPathStorageVersion() {
+    return this.config.scope === "project" ? PROJECT_PATH_STORAGE_VERSION : GLOBAL_PATH_STORAGE_VERSION;
+  }
+  hasStoredIndexData() {
+    const stats = this.database?.getStats();
+    return (this.store?.count() ?? 0) > 0 || (stats?.chunkCount ?? 0) > 0 || (stats?.symbolCount ?? 0) > 0 || this.fileHashCache.size > 0;
+  }
   loadIndexMetadata() {
     if (!this.database) return null;
     const version = this.database.getMetadata("index.version");
     if (!version) return null;
     return {
       indexVersion: version,
+      pathStorageVersion: this.database.getMetadata("index.pathStorageVersion") ?? GLOBAL_PATH_STORAGE_VERSION,
       embeddingProvider: this.database.getMetadata("index.embeddingProvider") ?? "",
       embeddingModel: this.database.getMetadata("index.embeddingModel") ?? "",
       embeddingDimensions: parseInt(this.database.getMetadata("index.embeddingDimensions") ?? "0", 10),
@@ -10991,6 +11117,7 @@ var Indexer = class _Indexer {
     const existingCreatedAt = this.database.getMetadata("index.createdAt");
     const completeProjectEmbeddingStrategyReset = !this.hasProjectForceReembedPending();
     this.database.setMetadata("index.version", INDEX_METADATA_VERSION);
+    this.database.setMetadata("index.pathStorageVersion", this.getExpectedPathStorageVersion());
     this.database.setMetadata("index.embeddingProvider", provider.provider);
     this.database.setMetadata("index.embeddingModel", provider.modelInfo.model);
     this.database.setMetadata("index.embeddingDimensions", provider.modelInfo.dimensions.toString());
@@ -11013,6 +11140,16 @@ var Indexer = class _Indexer {
   }
   validateIndexCompatibility(provider) {
     const storedMetadata = this.loadIndexMetadata();
+    const storedPathStorageVersion = this.database?.getMetadata("index.pathStorageVersion") ?? GLOBAL_PATH_STORAGE_VERSION;
+    const expectedPathStorageVersion = this.getExpectedPathStorageVersion();
+    if (this.hasStoredIndexData() && storedPathStorageVersion !== expectedPathStorageVersion) {
+      return {
+        compatible: false,
+        code: "PATH_STORAGE_MISMATCH" /* PATH_STORAGE_MISMATCH */,
+        reason: `Path storage format mismatch: index uses v${storedPathStorageVersion} checkout-absolute paths, but this project requires portable v${expectedPathStorageVersion} paths. Run index_codebase with force=true to rebuild the shared project index once.`,
+        storedMetadata: storedMetadata ?? void 0
+      };
+    }
     if (!storedMetadata) {
       return { compatible: true };
     }
@@ -11064,6 +11201,7 @@ var Indexer = class _Indexer {
     return this.indexCompatibility;
   }
   async ensureInitialized() {
+    this.refreshBranchInfo();
     let initializedReader = false;
     while (true) {
       if (this.initializationPromise) {
@@ -11171,8 +11309,8 @@ var Indexer = class _Indexer {
       }
       const branchKey = this.getBranchCatalogKey();
       const alreadyIndexed = database.getBranchChunkIds(branchKey).length > 0 && database.getBranchSymbolIds(branchKey).length > 0;
-      const symbolsCurrent = database.getMetadata(this.getSymbolExtractorVersionMetadataKey()) === SYMBOL_EXTRACTOR_VERSION;
-      if (alreadyIndexed && symbolsCurrent && this.getStoredBranchCommit(database) === normalizedCommit) {
+      const migrationsCurrent = this.areBranchMigrationVersionsCurrent(database);
+      if (alreadyIndexed && migrationsCurrent && this.getStoredBranchCommit(database) === normalizedCommit) {
         return { prepared: false };
       }
       const stats = await this.indexUnlocked(onProgress, [], true);
@@ -11266,21 +11404,21 @@ var Indexer = class _Indexer {
     const currentFileHashes = /* @__PURE__ */ new Map();
     const needsCallGraphResolutionMigration = database.getMetadata(this.getCallGraphResolutionMetadataKey()) !== CALL_GRAPH_RESOLUTION_VERSION;
     for (const f of files) {
-      const canonicalPath = this.toCanonicalFilePath(f.path);
+      const storedPath = this.toStoredFilePath(f.path);
       const currentHash = hashFile(f.path);
-      currentFileHashes.set(canonicalPath, currentHash);
-      const cachedHashMatches = this.fileHashCache.get(canonicalPath) === currentHash;
-      const needsCallGraphRefresh = cachedHashMatches && needsCallGraphResolutionMigration && database.getChunksByFile(canonicalPath).some(
+      currentFileHashes.set(storedPath, currentHash);
+      const cachedHashMatches = this.fileHashCache.get(storedPath) === currentHash;
+      const needsCallGraphRefresh = cachedHashMatches && needsCallGraphResolutionMigration && database.getChunksByFile(storedPath).some(
         (chunk) => chunk.language === "php" || chunk.language === "c" || chunk.language === "cpp"
       );
-      const requiresSwiftParserUpgrade = reparseCachedSwiftFiles && path18.extname(canonicalPath).toLowerCase() === ".swift";
-      const requiresMetalParserUpgrade = reparseCachedMetalFiles && path18.extname(canonicalPath).toLowerCase() === ".metal";
+      const requiresSwiftParserUpgrade = reparseCachedSwiftFiles && path18.extname(storedPath).toLowerCase() === ".swift";
+      const requiresMetalParserUpgrade = reparseCachedMetalFiles && path18.extname(storedPath).toLowerCase() === ".metal";
       if (cachedHashMatches && !needsCallGraphRefresh && !requiresSwiftParserUpgrade && !requiresMetalParserUpgrade && !refreshCachedSymbols) {
-        unchangedFilePaths.add(canonicalPath);
+        unchangedFilePaths.add(storedPath);
         this.logger.recordCacheHit();
       } else {
         const content = await fsPromises3.readFile(f.path, "utf-8");
-        changedFiles.push({ path: canonicalPath, content, hash: currentHash });
+        changedFiles.push({ path: storedPath, content, hash: currentHash });
         this.logger.recordCacheMiss();
       }
     }
@@ -11385,8 +11523,7 @@ var Indexer = class _Indexer {
     for (const parsed of parsedFiles) {
       currentFilePaths.add(parsed.path);
       if (parsed.chunks.length === 0) {
-        const relativePath = path18.relative(this.projectRoot, parsed.path);
-        stats.parseFailures.push(relativePath);
+        stats.parseFailures.push(path18.isAbsolute(parsed.path) ? path18.relative(this.projectRoot, parsed.path) : parsed.path);
       }
       let chunksToProcess = parsed.chunks;
       if (this.config.indexing.fallbackToTextOnMaxChunks && chunksToProcess.length > this.config.indexing.maxChunksPerFile) {
@@ -12027,6 +12164,43 @@ var Indexer = class _Indexer {
     const union = a.size + b.size - intersection;
     return intersection / union;
   }
+  getBranchPrefilterState(database, branchChunkIds) {
+    const hasInitializedBranchCatalog = branchChunkIds !== null && database.getAllBranches().length > 0;
+    return {
+      hasInitializedBranchCatalog,
+      shouldPrefilterByBranch: branchChunkIds !== null && (this.config.scope === "global" || hasInitializedBranchCatalog)
+    };
+  }
+  searchCandidatesWithBranchPrefilter(initialLimit, totalCount, branchChunkIds, shouldPrefilterByBranch, search, getChunkId) {
+    const normalizedLimit = Math.max(0, Math.floor(initialLimit));
+    if (normalizedLimit === 0) return [];
+    if (!shouldPrefilterByBranch || !branchChunkIds) {
+      return search(normalizedLimit);
+    }
+    const targetCount = Math.min(normalizedLimit, branchChunkIds.size);
+    if (targetCount === 0 || totalCount === 0) return [];
+    let requestedLimit = Math.min(normalizedLimit, totalCount);
+    while (true) {
+      const results = search(requestedLimit);
+      const branchResults = results.filter((candidate) => branchChunkIds.has(getChunkId(candidate)));
+      if (branchResults.length >= targetCount || results.length < requestedLimit || requestedLimit >= totalCount) {
+        return branchResults;
+      }
+      const nextLimit = Math.min(totalCount, Math.max(requestedLimit + 1, requestedLimit * 2));
+      if (nextLimit === requestedLimit) return branchResults;
+      requestedLimit = nextLimit;
+    }
+  }
+  searchSemanticCandidates(store, embedding, initialLimit, branchChunkIds, shouldPrefilterByBranch) {
+    return this.searchCandidatesWithBranchPrefilter(
+      initialLimit,
+      store.count(),
+      branchChunkIds,
+      shouldPrefilterByBranch,
+      (requestedLimit) => store.search(embedding, requestedLimit),
+      (candidate) => candidate.id
+    );
+  }
   async search(query, limit, options) {
     const { store, provider, invertedIndex, database, readIssues, compatibility } = await this.ensureInitialized();
     this.requireReadableComponents(readIssues, "vectors", "database");
@@ -12071,12 +12245,7 @@ var Indexer = class _Indexer {
       });
     }
     const embeddingMs = performance2.now() - embeddingStartTime;
-    const vectorStartTime = performance2.now();
-    const semanticResults = embedding ? store.search(embedding, maxResults * 4) : [];
-    const vectorMs = performance2.now() - vectorStartTime;
-    const keywordStartTime = performance2.now();
-    const keywordResults = await this.keywordSearch(query, maxResults * 4, store, invertedIndex);
-    const keywordMs = performance2.now() - keywordStartTime;
+    const prefilterStartTime = performance2.now();
     let branchChunkIds = null;
     let branchSymbolIds = null;
     if (filterByBranch && (this.config.scope === "global" || this.currentBranch !== "default")) {
@@ -12084,35 +12253,38 @@ var Indexer = class _Indexer {
       branchChunkIds = new Set(branchCatalogKeys.flatMap((branchKey) => database.getBranchChunkIds(branchKey)));
       branchSymbolIds = new Set(branchCatalogKeys.flatMap((branchKey) => database.getBranchSymbolIds(branchKey)));
     }
-    const prefilterStartTime = performance2.now();
-    const shouldPrefilterByBranch = branchChunkIds !== null && (this.config.scope === "global" || branchChunkIds.size > 0);
-    const allowBranchPrefilterFallback = this.config.scope !== "global";
-    const prefilteredSemantic = shouldPrefilterByBranch && branchChunkIds ? semanticResults.filter((r) => branchChunkIds.has(r.id)) : semanticResults;
-    const prefilteredKeyword = shouldPrefilterByBranch && branchChunkIds ? keywordResults.filter((r) => branchChunkIds.has(r.id)) : keywordResults;
-    const semanticCandidates = allowBranchPrefilterFallback && shouldPrefilterByBranch && semanticResults.length > 0 && prefilteredSemantic.length === 0 ? semanticResults : prefilteredSemantic;
-    const keywordCandidates = allowBranchPrefilterFallback && shouldPrefilterByBranch && keywordResults.length > 0 && prefilteredKeyword.length === 0 ? keywordResults : prefilteredKeyword;
+    const { hasInitializedBranchCatalog, shouldPrefilterByBranch } = this.getBranchPrefilterState(database, branchChunkIds);
+    const prefilterMs = performance2.now() - prefilterStartTime;
+    const vectorStartTime = performance2.now();
+    const semanticCandidates = embedding ? this.searchSemanticCandidates(
+      store,
+      embedding,
+      maxResults * 4,
+      branchChunkIds,
+      shouldPrefilterByBranch
+    ) : [];
+    const vectorMs = performance2.now() - vectorStartTime;
+    const keywordStartTime = performance2.now();
+    const keywordCandidates = await this.keywordSearch(
+      query,
+      maxResults * 4,
+      store,
+      invertedIndex,
+      branchChunkIds,
+      shouldPrefilterByBranch
+    );
+    const keywordMs = performance2.now() - keywordStartTime;
     const scopedSemanticCandidates = semanticCandidates.filter(
-      (candidate) => matchesHardSearchFilters(candidate, options)
+      (candidate) => matchesHardSearchFilters(candidate, options, this.projectRoot)
     );
     const scopedKeywordCandidates = keywordCandidates.filter(
-      (candidate) => matchesHardSearchFilters(candidate, options)
+      (candidate) => matchesHardSearchFilters(candidate, options, this.projectRoot)
     );
-    const prefilterMs = performance2.now() - prefilterStartTime;
-    if (this.config.scope !== "global" && branchChunkIds && branchChunkIds.size === 0) {
+    if (this.config.scope !== "global" && branchChunkIds && !hasInitializedBranchCatalog) {
       this.logger.search("warn", "Branch prefilter skipped because branch catalog is empty", {
         branch: this.currentBranch
       });
     }
-    if (allowBranchPrefilterFallback && shouldPrefilterByBranch && semanticResults.length > 0 && prefilteredSemantic.length === 0) {
-      this.logger.search("warn", "Branch prefilter produced no semantic overlap, using unfiltered semantic candidates", {
-        branch: this.currentBranch
-      });
-    }
-    if (allowBranchPrefilterFallback && shouldPrefilterByBranch && keywordResults.length > 0 && prefilteredKeyword.length === 0) {
-      this.logger.search("warn", "Branch prefilter produced no keyword overlap, using unfiltered keyword candidates", {
-        branch: this.currentBranch
-      });
-    }
     const fusionStartTime = performance2.now();
     const rankingHybridWeight = embedding === void 0 && fusionStrategy === "weighted" ? 1 : effectiveHybridWeight;
     const combined = rankHybridResults(query, scopedSemanticCandidates, scopedKeywordCandidates, {
@@ -12163,12 +12335,14 @@ var Indexer = class _Indexer {
     const primaryLane = mergeTieredResults(prePrimaryLane, symbolLane, maxResults * 4);
     const tiered = mergeTieredResults(primaryLane, rescued, maxResults * 4);
     const hasCodeHints = extractCodeTermHints(query).length > 0 || identifierHints.length > 0;
-    const baseFiltered = tiered.filter((r) => matchesSearchFilters(r, options, this.config.search.minScore));
+    const baseFiltered = tiered.filter(
+      (r) => matchesSearchFilters(r, options, this.config.search.minScore, this.projectRoot)
+    );
     const implementationOnly = baseFiltered.filter(
       (r) => isLikelyImplementationPath2(r.metadata.filePath) && isImplementationChunkType(r.metadata.chunkType)
     );
     const filtered = (sourceIntent && hasCodeHints && implementationOnly.length > 0 ? implementationOnly : baseFiltered).slice(0, maxResults);
-    const identifierFallback = !options?.definitionIntent && filtered.length === 0 && identifierHints.length > 0 ? buildSymbolDefinitionLane(query, database, branchChunkIds, branchSymbolIds, maxResults, union, true).filter((r) => matchesSearchFilters(r, options, this.config.search.minScore)).slice(0, maxResults) : [];
+    const identifierFallback = !options?.definitionIntent && filtered.length === 0 && identifierHints.length > 0 ? buildSymbolDefinitionLane(query, database, branchChunkIds, branchSymbolIds, maxResults, union, true).filter((r) => matchesSearchFilters(r, options, this.config.search.minScore, this.projectRoot)).slice(0, maxResults) : [];
     const finalResults = filtered.length > 0 ? filtered : identifierFallback;
     const totalSearchMs = performance2.now() - searchStartTime;
     this.logger.recordSearch(totalSearchMs, {
@@ -12193,10 +12367,11 @@ var Indexer = class _Indexer {
         let content = "";
         let contextStartLine = r.metadata.startLine;
         let contextEndLine = r.metadata.endLine;
+        const resolvedFilePath = this.resolveStoredFilePath(r.metadata.filePath);
         if (!metadataOnly && this.config.search.includeContext) {
           try {
             const fileContent = await fsPromises3.readFile(
-              r.metadata.filePath,
+              resolvedFilePath,
               "utf-8"
             );
             const lines = fileContent.split("\n");
@@ -12209,7 +12384,7 @@ var Indexer = class _Indexer {
           }
         }
         return {
-          filePath: r.metadata.filePath,
+          filePath: resolvedFilePath,
           startLine: contextStartLine,
           endLine: contextEndLine,
           content,
@@ -12221,8 +12396,18 @@ var Indexer = class _Indexer {
       })
     );
   }
-  async keywordSearch(query, limit, store, invertedIndex) {
-    const scores = invertedIndex.search(query);
+  async keywordSearch(query, limit, store, invertedIndex, branchChunkIds = null, shouldPrefilterByBranch = false) {
+    const normalizedLimit = Math.max(0, Math.floor(limit));
+    if (normalizedLimit === 0) return [];
+    const scoreEntries = this.searchCandidatesWithBranchPrefilter(
+      normalizedLimit,
+      invertedIndex.getDocumentCount(),
+      branchChunkIds,
+      shouldPrefilterByBranch,
+      (requestedLimit) => Array.from(invertedIndex.search(query, requestedLimit)),
+      ([chunkId]) => chunkId
+    );
+    const scores = new Map(scoreEntries);
     if (scores.size === 0) {
       return [];
     }
@@ -12236,7 +12421,7 @@ var Indexer = class _Indexer {
       }
     }
     results.sort((a, b) => b.score - a.score);
-    return results.slice(0, limit);
+    return results.slice(0, normalizedLimit);
   }
   async getStatus() {
     const { store, configuredProviderInfo, database, readIssues, compatibility } = await this.ensureInitialized();
@@ -12303,7 +12488,7 @@ var Indexer = class _Indexer {
     );
     const currentFileHashes = /* @__PURE__ */ new Map();
     for (const file of files) {
-      currentFileHashes.set(this.toCanonicalFilePath(file.path), hashFile(file.path));
+      currentFileHashes.set(this.toStoredFilePath(file.path), hashFile(file.path));
     }
     const scopedRoots = this.config.scope === "global" ? this.getScopedRoots() : null;
     const cachedFileHashes = scopedRoots ? new Map(Array.from(this.fileHashCache).filter(([filePath]) => this.isFileInCurrentScope(filePath, scopedRoots))) : this.fileHashCache;
@@ -12315,17 +12500,7 @@ var Indexer = class _Indexer {
         return { readable: true, current: false, reason: "files-changed" };
       }
     }
-    const hasSwiftFiles = Array.from(currentFileHashes.keys()).some(
-      (filePath) => path18.extname(filePath).toLowerCase() === ".swift"
-    );
-    const hasMetalFiles = Array.from(currentFileHashes.keys()).some(
-      (filePath) => path18.extname(filePath).toLowerCase() === ".metal"
-    );
-    const hasCallGraphMigrationFiles = Array.from(currentFileHashes.keys()).some((filePath) => {
-      const extension = path18.extname(filePath).toLowerCase();
-      return extension === ".php" || extension === ".c" || extension === ".cc" || extension === ".cpp" || extension === ".cxx";
-    });
-    if (hasSwiftFiles && database.getMetadata(this.getSwiftParserVersionMetadataKey()) !== SWIFT_PARSER_VERSION || hasMetalFiles && database.getMetadata(this.getMetalParserVersionMetadataKey()) !== METAL_PARSER_VERSION || database.getMetadata(this.getSymbolExtractorVersionMetadataKey()) !== SYMBOL_EXTRACTOR_VERSION || hasCallGraphMigrationFiles && database.getMetadata(this.getCallGraphResolutionMetadataKey()) !== CALL_GRAPH_RESOLUTION_VERSION) {
+    if (!this.areBranchMigrationVersionsCurrent(database)) {
       return { readable: true, current: false, reason: "migration-required" };
     }
     if (isGitRepo(this.materializedProjectRoot)) {
@@ -12385,6 +12560,7 @@ var Indexer = class _Indexer {
         this.deleteBranchCommitMetadata(database, clearedBranchKeys2);
         this.saveFailedBatches([]);
         database.deleteMetadata("index.version");
+        database.deleteMetadata("index.pathStorageVersion");
         database.deleteMetadata("index.embeddingProvider");
         database.deleteMetadata("index.embeddingModel");
         database.deleteMetadata("index.embeddingDimensions");
@@ -12403,7 +12579,7 @@ var Indexer = class _Indexer {
       this.indexCompatibility = compatibility;
       return;
     }
-    if (!this.isLocalProjectIndexPath()) {
+    if (!this.isProjectOwnedIndexPath()) {
       throw new Error(
         "Project-scoped force rebuild is unsafe while using an inherited worktree index. Create a local project config boundary before clearing the index."
       );
@@ -12414,11 +12590,11 @@ var Indexer = class _Indexer {
     invertedIndex.clear();
     this.saveInvertedIndex(invertedIndex);
     this.fileHashCache.clear();
-    this.saveFileHashCache();
+    await this.removeProjectRuntimeStateArtifacts();
     database.clearAllIndexedData();
     this.deleteBranchCommitMetadata(database, clearedBranchKeys);
-    this.saveFailedBatches([]);
     database.deleteMetadata("index.version");
+    database.deleteMetadata("index.pathStorageVersion");
     database.deleteMetadata("index.embeddingProvider");
     database.deleteMetadata("index.embeddingModel");
     database.deleteMetadata("index.embeddingDimensions");
@@ -12446,32 +12622,46 @@ var Indexer = class _Indexer {
       existing.push(key);
       filePathsToChunkKeys.set(metadata.filePath, existing);
     }
-    const removedFilePaths = [];
-    const removedChunkKeys = [];
+    const missingStoredFilePaths = [];
+    const missingChunkKeys = [];
     const chunkKeysByRemovedFile = /* @__PURE__ */ new Map();
     for (const [filePath, chunkKeys] of filePathsToChunkKeys) {
-      if (!existsSync10(filePath)) {
+      if (!existsSync10(this.toMaterializedFilePath(filePath))) {
         chunkKeysByRemovedFile.set(filePath, chunkKeys);
         for (const key of chunkKeys) {
-          removedChunkKeys.push(key);
+          missingChunkKeys.push(key);
         }
-        removedFilePaths.push(filePath);
+        missingStoredFilePaths.push(filePath);
       }
     }
+    const branchCatalogKeys = this.getBranchCatalogKeys();
+    for (const branchKey of branchCatalogKeys) {
+      database.deleteBranchChunksForBranch(branchKey, missingChunkKeys);
+    }
+    const referencedChunkKeys = new Set(database.getReferencedChunkIds(missingChunkKeys));
+    const removedChunkKeys = missingChunkKeys.filter((key) => !referencedChunkKeys.has(key));
     if (removedChunkKeys.length > 0) {
       this.rebuildVectorStoreExcludingChunkIds(store, database, removedChunkKeys);
       for (const key of removedChunkKeys) {
         invertedIndex.removeChunk(key);
       }
+      database.deleteChunksByIds(removedChunkKeys);
     }
-    for (const filePath of removedFilePaths) {
-      const fileChunkKeys = chunkKeysByRemovedFile.get(filePath) ?? [];
-      if (fileChunkKeys.length > 0) {
-        database.deleteChunksByIds(fileChunkKeys);
-      }
-      database.deleteCallEdgesByFile(filePath);
-      database.deleteSymbolsByFile(filePath);
-    }
+    const missingSymbolIds = Array.from(new Set(
+      missingStoredFilePaths.flatMap(
+        (filePath) => database.getSymbolsByFile(filePath).map((symbol) => symbol.id)
+      )
+    ));
+    for (const branchKey of branchCatalogKeys) {
+      database.deleteBranchSymbolsForBranch(branchKey, missingSymbolIds);
+    }
+    const referencedSymbolIds = new Set(database.getReferencedSymbolIds(missingSymbolIds));
+    const removedSymbolIds = missingSymbolIds.filter((symbolId) => !referencedSymbolIds.has(symbolId));
+    database.clearCallEdgeTargetsForSymbols(removedSymbolIds);
+    const removedChunkKeySet = new Set(removedChunkKeys);
+    const removedStoredFilePaths = missingStoredFilePaths.filter(
+      (filePath) => (chunkKeysByRemovedFile.get(filePath) ?? []).some((key) => removedChunkKeySet.has(key))
+    );
     const removedCount = removedChunkKeys.length;
     if (removedCount > 0) {
       store.save();
@@ -12507,9 +12697,16 @@ var Indexer = class _Indexer {
       removedStale: removedCount,
       orphanEmbeddings: gcOrphanEmbeddings,
       orphanChunks: gcOrphanChunks,
-      removedFiles: removedFilePaths.length
+      removedFiles: removedStoredFilePaths.length
     });
-    return { removed: removedCount, filePaths: removedFilePaths, gcOrphanEmbeddings, gcOrphanChunks, gcOrphanSymbols, gcOrphanCallEdges };
+    return {
+      removed: removedCount,
+      filePaths: removedStoredFilePaths.map((filePath) => this.resolveStoredFilePath(filePath)),
+      gcOrphanEmbeddings,
+      gcOrphanChunks,
+      gcOrphanSymbols,
+      gcOrphanCallEdges
+    };
   }
   async retryFailedBatches() {
     return this.withIndexMutationLease("retry-failed-batches", async (recoveredOwners) => {
@@ -12704,9 +12901,18 @@ var Indexer = class _Indexer {
     return this.baseBranch;
   }
   refreshBranchInfo() {
+    const previousBranch = this.currentBranch;
     if (isGitRepo(this.materializedProjectRoot)) {
       this.currentBranch = this.branchNameOverride ?? getBranchOrDefault(this.materializedProjectRoot);
       this.baseBranch = getBaseBranch(this.materializedProjectRoot);
+    } else {
+      this.currentBranch = "default";
+      this.baseBranch = "default";
+    }
+    if (this.currentBranch !== previousBranch) {
+      this.refreshRuntimeArtifactPaths();
+      this.fileHashCache.clear();
+      this.loadFileHashCache();
     }
   }
   async getDatabaseStats() {
@@ -12731,6 +12937,7 @@ var Indexer = class _Indexer {
       return [];
     }
     const filterByBranch = options?.filterByBranch ?? true;
+    const excludedStoredFile = options?.excludeFile ? this.toStoredFilePath(options.excludeFile) : void 0;
     this.logger.search("debug", "Starting find similar", {
       codeLength: code.length,
       limit,
@@ -12740,31 +12947,29 @@ var Indexer = class _Indexer {
     const { embedding, tokensUsed } = await provider.embedDocument(code);
     const embeddingMs = performance2.now() - embeddingStartTime;
     this.logger.recordEmbeddingApiCall(tokensUsed);
-    const vectorStartTime = performance2.now();
-    const semanticResults = store.search(embedding, limit * 2);
-    const vectorMs = performance2.now() - vectorStartTime;
+    const prefilterStartTime = performance2.now();
     let branchChunkIds = null;
     if (filterByBranch && (this.config.scope === "global" || this.currentBranch !== "default")) {
       branchChunkIds = new Set(
         this.getBranchCatalogKeys().flatMap((branchKey) => database.getBranchChunkIds(branchKey))
       );
     }
-    const prefilterStartTime = performance2.now();
-    const shouldPrefilterByBranch = branchChunkIds !== null && (this.config.scope === "global" || branchChunkIds.size > 0);
-    const allowBranchPrefilterFallback = this.config.scope !== "global";
-    const prefilteredSemantic = shouldPrefilterByBranch && branchChunkIds ? semanticResults.filter((r) => branchChunkIds.has(r.id)) : semanticResults;
-    const semanticCandidates = allowBranchPrefilterFallback && shouldPrefilterByBranch && semanticResults.length > 0 && prefilteredSemantic.length === 0 ? semanticResults : prefilteredSemantic;
+    const { hasInitializedBranchCatalog, shouldPrefilterByBranch } = this.getBranchPrefilterState(database, branchChunkIds);
     const prefilterMs = performance2.now() - prefilterStartTime;
-    if (this.config.scope !== "global" && branchChunkIds && branchChunkIds.size === 0) {
+    const vectorStartTime = performance2.now();
+    const semanticCandidates = this.searchSemanticCandidates(
+      store,
+      embedding,
+      limit * 2,
+      branchChunkIds,
+      shouldPrefilterByBranch
+    );
+    const vectorMs = performance2.now() - vectorStartTime;
+    if (this.config.scope !== "global" && branchChunkIds && !hasInitializedBranchCatalog) {
       this.logger.search("warn", "Branch prefilter skipped because branch catalog is empty", {
         branch: this.currentBranch
       });
     }
-    if (allowBranchPrefilterFallback && shouldPrefilterByBranch && semanticResults.length > 0 && prefilteredSemantic.length === 0) {
-      this.logger.search("warn", "Branch prefilter produced no semantic overlap, using unfiltered semantic candidates", {
-        branch: this.currentBranch
-      });
-    }
     const rerankTopN = this.config.search.rerankTopN;
     const ranked = rankSemanticOnlyResults(code, semanticCandidates, {
       rerankTopN,
@@ -12773,21 +12978,10 @@ var Indexer = class _Indexer {
     });
     const filtered = ranked.filter((r) => {
       if (r.score < this.config.search.minScore) return false;
-      if (options?.excludeFile) {
-        if (r.metadata.filePath === options.excludeFile) return false;
-      }
-      if (options?.fileType) {
-        const ext = r.metadata.filePath.split(".").pop()?.toLowerCase();
-        if (ext !== options.fileType.toLowerCase().replace(/^\./, "")) return false;
+      if (excludedStoredFile) {
+        if (r.metadata.filePath === excludedStoredFile) return false;
       }
-      if (options?.directory) {
-        const normalizedDir = options.directory.replace(/^\/|\/$/g, "");
-        if (!r.metadata.filePath.includes(`/${normalizedDir}/`) && !r.metadata.filePath.includes(`${normalizedDir}/`)) return false;
-      }
-      if (options?.chunkType) {
-        if (r.metadata.chunkType !== options.chunkType) return false;
-      }
-      return true;
+      return matchesHardSearchFilters(r, options, this.projectRoot);
     }).slice(0, limit);
     const totalSearchMs = performance2.now() - searchStartTime;
     this.logger.recordSearch(totalSearchMs, {
@@ -12807,10 +13001,11 @@ var Indexer = class _Indexer {
     return Promise.all(
       filtered.map(async (r) => {
         let content = "";
+        const resolvedFilePath = this.resolveStoredFilePath(r.metadata.filePath);
         if (this.config.search.includeContext) {
           try {
             const fileContent = await fsPromises3.readFile(
-              r.metadata.filePath,
+              resolvedFilePath,
               "utf-8"
             );
             const lines = fileContent.split("\n");
@@ -12820,7 +13015,7 @@ var Indexer = class _Indexer {
           }
         }
         return {
-          filePath: r.metadata.filePath,
+          filePath: resolvedFilePath,
           startLine: r.metadata.startLine,
           endLine: r.metadata.endLine,
           content,
@@ -12841,7 +13036,7 @@ var Indexer = class _Indexer {
       for (const edge of database.getCallersWithContext(targetName, branchKey, callTypeFilter)) {
         if (!seen.has(edge.id)) {
           seen.add(edge.id);
-          results.push(edge);
+          results.push(this.resolveCallEdgeFilePath(edge));
         }
       }
     }
@@ -12860,7 +13055,7 @@ var Indexer = class _Indexer {
         const safelyMatchesUnresolvedSymbol = includeUnresolved && !edge.toSymbolId;
         if (!matchesResolvedSymbol && !safelyMatchesUnresolvedSymbol || seen.has(edge.id)) continue;
         seen.add(edge.id);
-        results.push(edge);
+        results.push(this.resolveCallEdgeFilePath(edge));
       }
     }
     return results;
@@ -12874,7 +13069,7 @@ var Indexer = class _Indexer {
       for (const edge of database.getCallees(symbolId, branchKey, callTypeFilter)) {
         if (!seen.has(edge.id)) {
           seen.add(edge.id);
-          results.push(edge);
+          results.push(this.resolveCallEdgeFilePath(edge));
         }
       }
     }
@@ -12890,7 +13085,7 @@ var Indexer = class _Indexer {
         shortest = path27;
       }
     }
-    return shortest;
+    return shortest.map((hop) => this.resolveFilePathRecord(hop));
   }
   async findCallPathBySymbolIds(fromSymbolId, toSymbolId, maxDepth = 10) {
     const { database, readIssues } = await this.ensureInitialized();
@@ -12956,7 +13151,7 @@ var Indexer = class _Indexer {
         shortest = path27;
       }
     }
-    return shortest;
+    return shortest.map((hop) => this.resolveFilePathRecord(hop));
   }
   async getCallGraphSymbols() {
     const { database, readIssues } = await this.ensureInitialized();
@@ -12964,7 +13159,7 @@ var Indexer = class _Indexer {
     const symbols = /* @__PURE__ */ new Map();
     for (const branchKey of this.getBranchCatalogKeys()) {
       for (const symbol of database.getSymbolsForBranch(branchKey)) {
-        symbols.set(symbol.id, symbol);
+        symbols.set(symbol.id, this.resolveFilePathRecord(symbol));
       }
     }
     return [...symbols.values()];
@@ -12973,31 +13168,32 @@ var Indexer = class _Indexer {
     const { database, readIssues } = await this.ensureInitialized();
     this.requireReadableComponents(readIssues, "database");
     const resolvedBranch = branch ?? this.getBranchCatalogKey();
-    return database.getSymbolsForBranch(resolvedBranch);
+    return database.getSymbolsForBranch(resolvedBranch).map((symbol) => this.resolveFilePathRecord(symbol));
   }
   async getSymbolsForFiles(filePaths, branch) {
     const { database, readIssues } = await this.ensureInitialized();
     this.requireReadableComponents(readIssues, "database");
     const resolvedBranch = branch ?? this.getBranchCatalogKey();
-    return database.getSymbolsForFiles(filePaths, resolvedBranch);
+    const storedFilePaths = filePaths.map((filePath) => this.toStoredFilePath(filePath));
+    return database.getSymbolsForFiles(storedFilePaths, resolvedBranch).map((symbol) => this.resolveFilePathRecord(symbol));
   }
   async getTransitiveReachability(rootSymbolIds, direction, maxDepth) {
     const { database, readIssues } = await this.ensureInitialized();
     this.requireReadableComponents(readIssues, "database");
     const branch = this.getBranchCatalogKey();
-    return database.getTransitiveReachability(rootSymbolIds, branch, direction, maxDepth);
+    return database.getTransitiveReachability(rootSymbolIds, branch, direction, maxDepth).map((entry) => this.resolveFilePathRecord(entry));
   }
   async detectCommunities(branch, symbolIds) {
     const { database, readIssues } = await this.ensureInitialized();
     this.requireReadableComponents(readIssues, "database");
     const resolvedBranch = branch ?? this.getBranchCatalogKey();
-    return database.detectCommunities(resolvedBranch, symbolIds);
+    return database.detectCommunities(resolvedBranch, symbolIds).map((entry) => this.resolveFilePathRecord(entry));
   }
   async computeCentrality(branch) {
     const { database, readIssues } = await this.ensureInitialized();
     this.requireReadableComponents(readIssues, "database");
     const resolvedBranch = branch ?? this.getBranchCatalogKey();
-    return database.computeCentrality(resolvedBranch);
+    return database.computeCentrality(resolvedBranch).map((entry) => this.resolveFilePathRecord(entry));
   }
   async getPrImpact(opts, onPreparationProgress) {
     const initialState = await this.ensureInitialized();
@@ -13033,10 +13229,8 @@ var Indexer = class _Indexer {
     const requestedRef = opts.pr !== void 0 ? expectedCommit : headRefName ?? resolvedBranch;
     const storedCommit = this.getStoredBranchCommit(database, catalogIdentity);
     const catalogIdentityMatches = storedCommit === expectedCommit;
-    const symbolsCurrent = database.getMetadata(
-      this.getSymbolExtractorVersionMetadataKey(catalogIdentity)
-    ) === SYMBOL_EXTRACTOR_VERSION;
-    if (branchSymbols.length === 0 || !catalogIdentityMatches || !symbolsCurrent) {
+    const migrationsCurrent = this.areBranchMigrationVersionsCurrent(database, catalogIdentity);
+    if (branchSymbols.length === 0 || !catalogIdentityMatches || !migrationsCurrent) {
       if (!resolvedBranch || resolvedBranch === "default") {
         throw new Error("Run index_codebase first to build the call graph and symbol index for this project.");
       }
@@ -13092,8 +13286,9 @@ var Indexer = class _Indexer {
         );
       }
     }
-    const absoluteChangedFiles = changedFiles.map((f) => path18.resolve(this.projectRoot, f));
-    const directSymbols = database.getSymbolsForFiles(absoluteChangedFiles, branchKey);
+    const toStoredChangedFiles = (filePaths) => filePaths.map((filePath) => this.toStoredFilePath(path18.resolve(this.projectRoot, filePath)));
+    const storedChangedFiles = toStoredChangedFiles(changedFiles);
+    const directSymbols = database.getSymbolsForFiles(storedChangedFiles, branchKey);
     const directIds = directSymbols.map((s) => s.id);
     const direction = opts.direction ?? "both";
     const maxDepth = opts.maxDepth ?? 5;
@@ -13135,7 +13330,7 @@ var Indexer = class _Indexer {
       id: c.symbolId,
       name: c.symbolName,
       callerCount: c.callerCount,
-      filePath: c.filePath
+      filePath: this.resolveStoredFilePath(c.filePath)
     }));
     const totalAffected = allAffectedIds.length;
     let riskLevel;
@@ -13175,9 +13370,9 @@ var Indexer = class _Indexer {
               projectRoot: this.projectRoot,
               baseBranch: this.baseBranch
             });
-            const otherAbsolute = otherChanged.files.map((f) => path18.resolve(this.projectRoot, f));
+            const otherStored = toStoredChangedFiles(otherChanged.files);
             const prBranchKey = this.getBranchCatalogKeyFor(otherChanged.catalogIdentity);
-            const otherSymbols = database.getSymbolsForFiles(otherAbsolute, prBranchKey);
+            const otherSymbols = database.getSymbolsForFiles(otherStored, prBranchKey);
             const otherLabels = /* @__PURE__ */ new Set();
             for (const sym of otherSymbols) {
               const label = symbolToCommunity.get(structuralKey(sym.filePath, sym.name));
@@ -13208,12 +13403,12 @@ var Indexer = class _Indexer {
         id: s.id,
         name: s.name,
         kind: s.kind,
-        filePath: s.filePath
+        filePath: this.resolveStoredFilePath(s.filePath)
       })),
       transitiveCallers: transitiveCallers.map((c) => ({
         id: c.symbolId,
         name: c.symbolName,
-        filePath: c.filePath,
+        filePath: this.resolveStoredFilePath(c.filePath),
         depth: c.depth
       })),
       totalAffected,
@@ -13243,7 +13438,7 @@ var Indexer = class _Indexer {
       const absoluteDirectoryFilter = directory ? path18.resolve(this.projectRoot, directory) : void 0;
       for (const filePath of filePaths) {
         if (directory) {
-          const absoluteFilePath = path18.resolve(filePath);
+          const absoluteFilePath = this.resolveStoredFilePath(filePath);
           const matchesRelative = filePath === directory || filePath.startsWith(directory + "/");
           const matchesProjectRelative = absoluteDirectoryFilter !== void 0 && (absoluteFilePath === absoluteDirectoryFilter || absoluteFilePath.startsWith(absoluteDirectoryFilter + path18.sep));
           if (!matchesRelative && !matchesProjectRelative) {
@@ -13252,14 +13447,14 @@ var Indexer = class _Indexer {
         }
         for (const sym of database.getSymbolsByFile(filePath)) {
           if (symbolIdSet.has(sym.id) && !seenSymbols.has(sym.id)) {
-            seenSymbols.set(sym.id, sym);
+            seenSymbols.set(sym.id, this.resolveFilePathRecord(sym));
           }
         }
       }
       for (const symbolId of seenSymbols.keys()) {
         for (const edge of database.getCallees(symbolId, branchKey)) {
           if (!seenEdges.has(edge.id)) {
-            seenEdges.set(edge.id, edge);
+            seenEdges.set(edge.id, this.resolveCallEdgeFilePath(edge));
           }
         }
       }
@@ -13366,14 +13561,14 @@ function getOrCreateIndexer(projectRoot, host) {
   configureAutoIndex(projectRoot, host, config, () => getOrCreateIndexer(projectRoot, host));
   return indexer;
 }
-function initializeTools(projectRoot, config, host = "opencode") {
+function initializeTools(projectRoot, config, host) {
   defaultProjectRoots.set(host, projectRoot);
   const key = getIndexerCacheKey(projectRoot, host);
   configCache.set(key, config);
   indexerCache.set(key, new Indexer(projectRoot, config, host));
   configureAutoIndex(projectRoot, host, config, () => getOrCreateIndexer(projectRoot, host));
 }
-function getIndexerForProject(projectRoot, host = "opencode") {
+function getIndexerForProject(projectRoot, host) {
   const root = getProjectRoot(projectRoot, host);
   return getOrCreateIndexer(root, host);
 }
@@ -13381,7 +13576,7 @@ function recordToolEffectiveness(projectRoot, host, event) {
   if (!isToolEffectivenessEnabled(projectRoot, host)) return;
   safelyRecordToolEffectiveness(event);
 }
-function refreshIndexerForDirectory(projectRoot, host = "opencode", config = parseConfig(loadRuntimeConfig(projectRoot, host))) {
+function refreshIndexerForDirectory(projectRoot, host, config = parseConfig(loadRuntimeConfig(projectRoot, host))) {
   const key = getIndexerCacheKey(projectRoot, host);
   configCache.set(key, config);
   indexerCache.set(key, new Indexer(projectRoot, config, host));
@@ -13889,6 +14084,9 @@ Run /index to rebuild the index without the removed knowledge base.`;
   return result;
 }
 
+// src/watcher/file-watcher.ts
+import { existsSync as existsSync12 } from "fs";
+
 // node_modules/chokidar/index.js
 import { EventEmitter as EventEmitter2 } from "events";
 import { stat as statcb, Stats } from "fs";
@@ -14056,10 +14254,10 @@ var ReaddirpStream = class extends Readable {
   }
   async _formatEntry(dirent, path27) {
     let entry;
-    const basename7 = this._isDirent ? dirent.name : dirent;
+    const basename8 = this._isDirent ? dirent.name : dirent;
     try {
-      const fullPath = presolve(pjoin(path27, basename7));
-      entry = { path: prelative(this._root, fullPath), fullPath, basename: basename7 };
+      const fullPath = presolve(pjoin(path27, basename8));
+      entry = { path: prelative(this._root, fullPath), fullPath, basename: basename8 };
       entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
     } catch (err) {
       this._onError(err);
@@ -14600,9 +14798,9 @@ var NodeFsHandler = class {
   _watchWithNodeFs(path27, listener) {
     const opts = this.fsw.options;
     const directory = sp.dirname(path27);
-    const basename7 = sp.basename(path27);
+    const basename8 = sp.basename(path27);
     const parent = this.fsw._getWatchedDir(directory);
-    parent.add(basename7);
+    parent.add(basename8);
     const absolutePath = sp.resolve(path27);
     const options = {
       persistent: opts.persistent
@@ -14612,7 +14810,7 @@ var NodeFsHandler = class {
     let closer;
     if (opts.usePolling) {
       const enableBin = opts.interval !== opts.binaryInterval;
-      options.interval = enableBin && isBinaryPath(basename7) ? opts.binaryInterval : opts.interval;
+      options.interval = enableBin && isBinaryPath(basename8) ? opts.binaryInterval : opts.interval;
       closer = setFsWatchFileListener(path27, absolutePath, options, {
         listener,
         rawEmitter: this.fsw._emitRaw
@@ -14634,11 +14832,11 @@ var NodeFsHandler = class {
     if (this.fsw.closed) {
       return;
     }
-    const dirname13 = sp.dirname(file);
-    const basename7 = sp.basename(file);
-    const parent = this.fsw._getWatchedDir(dirname13);
+    const dirname14 = sp.dirname(file);
+    const basename8 = sp.basename(file);
+    const parent = this.fsw._getWatchedDir(dirname14);
     let prevStats = stats;
-    if (parent.has(basename7))
+    if (parent.has(basename8))
       return;
     const listener = async (path27, newStats) => {
       if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file, 5))
@@ -14663,9 +14861,9 @@ var NodeFsHandler = class {
             prevStats = newStats2;
           }
         } catch (error) {
-          this.fsw._remove(dirname13, basename7);
+          this.fsw._remove(dirname14, basename8);
         }
-      } else if (parent.has(basename7)) {
+      } else if (parent.has(basename8)) {
         const at = newStats.atimeMs;
         const mt = newStats.mtimeMs;
         if (!at || at <= mt || mt !== prevStats.mtimeMs) {
@@ -15627,8 +15825,8 @@ var FileWatcher = class {
   watcher = null;
   projectRoot;
   config;
-  host;
   configPath;
+  projectConfigPaths;
   pendingChanges = /* @__PURE__ */ new Map();
   debounceTimer = null;
   debounceMs = 1e3;
@@ -15637,11 +15835,11 @@ var FileWatcher = class {
   resolveReady = null;
   pollingFallbackAttempted = false;
   pendingClose = null;
-  constructor(projectRoot, config, host = "opencode", options = {}) {
+  constructor(projectRoot, config, host, options = {}) {
     this.projectRoot = projectRoot;
     this.config = config;
-    this.host = host;
     this.configPath = options.configPath;
+    this.projectConfigPaths = options.configPath ? [options.configPath] : getProjectConfigCandidatePaths(projectRoot, host);
   }
   start(handler) {
     if (this.watcher) {
@@ -15659,7 +15857,19 @@ var FileWatcher = class {
   }
   createWatcher(usePolling = false) {
     const ignoreFilter = createIgnoreFilter(this.projectRoot);
-    const watchTargets = this.configPath ? [this.projectRoot, this.configPath] : this.projectRoot;
+    let watchTargets = this.projectRoot;
+    if (this.configPath) {
+      watchTargets = [this.projectRoot, this.configPath];
+    } else {
+      const externalConfigTargets = this.projectConfigPaths.filter((projectConfigPath) => {
+        const relativeConfigPath = path20.relative(this.projectRoot, projectConfigPath);
+        return this.isOutsideProjectPath(relativeConfigPath);
+      }).map((projectConfigPath) => existsSync12(projectConfigPath) ? projectConfigPath : this.getNearestExistingDirectory(path20.dirname(projectConfigPath)));
+      const uniqueExternalConfigTargets = [...new Set(externalConfigTargets)];
+      if (uniqueExternalConfigTargets.length > 0) {
+        watchTargets = [this.projectRoot, ...uniqueExternalConfigTargets];
+      }
+    }
     const watcherOptions = {
       ignored: (filePath) => {
         const relativePath = path20.relative(this.projectRoot, filePath);
@@ -15667,6 +15877,9 @@ var FileWatcher = class {
         if (this.isProjectConfigPathOrAncestor(relativePath)) {
           return false;
         }
+        if (this.isOutsideProjectPath(relativePath)) {
+          return true;
+        }
         if (hasFilteredPathSegment(relativePath, path20.sep)) {
           return true;
         }
@@ -15769,14 +15982,22 @@ var FileWatcher = class {
       (configPath) => configPath === normalizedRelativePath || configPath.startsWith(`${normalizedRelativePath}${path20.sep}`)
     );
   }
-  getProjectConfigRelativePaths() {
-    if (this.configPath) {
-      return [path20.normalize(path20.relative(this.projectRoot, this.configPath))];
+  isOutsideProjectPath(relativePath) {
+    return relativePath === ".." || relativePath.startsWith(`..${path20.sep}`) || path20.isAbsolute(relativePath);
+  }
+  getNearestExistingDirectory(directoryPath) {
+    let candidate = directoryPath;
+    while (!existsSync12(candidate)) {
+      const parent = path20.dirname(candidate);
+      if (parent === candidate) break;
+      candidate = parent;
     }
-    return [
-      resolveProjectConfigPath(this.projectRoot, this.host),
-      resolveWritableProjectConfigPath(this.projectRoot, this.host)
-    ].map((configPath) => path20.normalize(path20.relative(this.projectRoot, configPath)));
+    return candidate;
+  }
+  getProjectConfigRelativePaths() {
+    return this.projectConfigPaths.map(
+      (configPath) => path20.normalize(path20.relative(this.projectRoot, configPath))
+    );
   }
   scheduleFlush() {
     if (this.debounceTimer) {
@@ -15903,8 +16124,9 @@ var GitHeadWatcher = class {
 };
 
 // src/watcher/index.ts
-function createWatcherWithIndexer(getIndexer, projectRoot, config, host = "opencode", options = {}) {
+function createWatcherWithIndexer(getIndexer, projectRoot, config, host, options = {}) {
   const fileWatcher = new FileWatcher(projectRoot, config, host, options);
+  const configPaths = getConfigPaths(projectRoot, host, options);
   configureAutoIndex(projectRoot, host, parseConfig(config), getIndexer);
   let stopped = false;
   const requestReindex = () => {
@@ -15921,7 +16143,6 @@ function createWatcherWithIndexer(getIndexer, projectRoot, config, host = "openc
     );
     const hasDelete = changes.some((c) => c.type === "unlink");
     if (hasAddOrChange || hasDelete) {
-      const configPaths = getConfigPaths(projectRoot, host, options);
       if (changes.some((change) => configPaths.includes(pathNormalize(change.path)))) {
         const parsedConfig = options.configPath ? parseConfig(loadConfigFile(options.configPath)) : void 0;
         const refreshedConfig = refreshIndexerForDirectory(projectRoot, host, parsedConfig);
@@ -15936,7 +16157,9 @@ function createWatcherWithIndexer(getIndexer, projectRoot, config, host = "openc
   if (isGitRepo(projectRoot)) {
     gitWatcher = new GitHeadWatcher(projectRoot);
     gitWatcher.start(async (oldBranch, newBranch) => {
-      getIndexer().getLogger().branch("info", "Branch changed", {
+      const indexer = getIndexer();
+      indexer.refreshBranchInfo();
+      indexer.getLogger().branch("info", "Branch changed", {
         oldBranch,
         newBranch
       });
@@ -15962,10 +16185,9 @@ function getConfigPaths(projectRoot, host, options) {
   if (options.configPath) {
     return [pathNormalize(options.configPath)];
   }
-  return [
-    resolveProjectConfigPath(projectRoot, host),
-    resolveWritableProjectConfigPath(projectRoot, host)
-  ].map((configPath) => pathNormalize(configPath));
+  return getProjectConfigCandidatePaths(projectRoot, host).map(
+    (configPath) => pathNormalize(configPath)
+  );
 }
 
 // node_modules/@opencode-ai/plugin/dist/tool.js
@@ -16057,7 +16279,7 @@ function formatPrImpact(result) {
   return lines.join("\n");
 }
 
-// src/tools/pr-impact.ts
+// src/adapters/opencode/pr-impact.ts
 var z2 = tool.schema;
 var AUTOMATIC_PREPARATION_POLICY = "Uses configured maxFileSize, maxChunksPerFile, maxDepth, and maxFilesPerDirectory guards. No separate aggregate token or cost ceiling is configured; maxDepth=-1 remains unlimited.";
 var pr_impact = tool({
@@ -16754,7 +16976,7 @@ async function executeCallGraphPath(projectRoot, host, args) {
   return { text: formatCallGraphPathResult(path27) };
 }
 
-// src/tools/index.ts
+// src/adapters/opencode/tools.ts
 import { writeFileSync as writeFileSync4 } from "fs";
 import * as os7 from "os";
 import * as path24 from "path";
@@ -17462,7 +17684,7 @@ function transformForVisualization(symbols, edges, options = {}) {
   };
 }
 
-// src/tools/index.ts
+// src/adapters/opencode/tools.ts
 var z3 = tool.schema;
 var DEFAULT_HOST = "opencode";
 var CHUNK_TYPE_VALUES = CHUNK_TYPES;
@@ -17729,8 +17951,84 @@ var index_visualize = tool({
   }
 });
 
+// src/tools/tool-names.ts
+var TOOL_NAME = {
+  CODEBASE_CONTEXT: "codebase_context",
+  CODEBASE_SEARCH: "codebase_search",
+  CODEBASE_PEEK: "codebase_peek",
+  FIND_SIMILAR: "find_similar",
+  IMPLEMENTATION_LOOKUP: "implementation_lookup",
+  INDEX_CODEBASE: "index_codebase",
+  INDEX_STATUS: "index_status",
+  INDEX_HEALTH_CHECK: "index_health_check",
+  INDEX_METRICS: "index_metrics",
+  INDEX_LOGS: "index_logs",
+  CALL_GRAPH: "call_graph",
+  CALL_GRAPH_PATH: "call_graph_path",
+  PR_IMPACT: "pr_impact",
+  ADD_KNOWLEDGE_BASE: "add_knowledge_base",
+  LIST_KNOWLEDGE_BASES: "list_knowledge_bases",
+  REMOVE_KNOWLEDGE_BASE: "remove_knowledge_base",
+  PI_KNOWLEDGE_BASE_ADD: "knowledge_base_add",
+  PI_KNOWLEDGE_BASE_LIST: "knowledge_base_list",
+  PI_KNOWLEDGE_BASE_REMOVE: "knowledge_base_remove",
+  INDEX_VISUALIZE: "index_visualize"
+};
+var PORTABLE_TOOL_NAMES = [
+  TOOL_NAME.CODEBASE_CONTEXT,
+  TOOL_NAME.CODEBASE_SEARCH,
+  TOOL_NAME.CODEBASE_PEEK,
+  TOOL_NAME.INDEX_CODEBASE,
+  TOOL_NAME.INDEX_STATUS,
+  TOOL_NAME.INDEX_HEALTH_CHECK,
+  TOOL_NAME.INDEX_METRICS,
+  TOOL_NAME.INDEX_LOGS,
+  TOOL_NAME.FIND_SIMILAR,
+  TOOL_NAME.IMPLEMENTATION_LOOKUP,
+  TOOL_NAME.CALL_GRAPH,
+  TOOL_NAME.CALL_GRAPH_PATH,
+  TOOL_NAME.PR_IMPACT
+];
+var OPENCODE_TOOL_NAMES = [
+  TOOL_NAME.CODEBASE_CONTEXT,
+  TOOL_NAME.CODEBASE_SEARCH,
+  TOOL_NAME.CODEBASE_PEEK,
+  TOOL_NAME.INDEX_CODEBASE,
+  TOOL_NAME.INDEX_STATUS,
+  TOOL_NAME.INDEX_HEALTH_CHECK,
+  TOOL_NAME.INDEX_METRICS,
+  TOOL_NAME.INDEX_LOGS,
+  TOOL_NAME.FIND_SIMILAR,
+  TOOL_NAME.CALL_GRAPH,
+  TOOL_NAME.CALL_GRAPH_PATH,
+  TOOL_NAME.IMPLEMENTATION_LOOKUP,
+  TOOL_NAME.ADD_KNOWLEDGE_BASE,
+  TOOL_NAME.LIST_KNOWLEDGE_BASES,
+  TOOL_NAME.REMOVE_KNOWLEDGE_BASE,
+  TOOL_NAME.PR_IMPACT,
+  TOOL_NAME.INDEX_VISUALIZE
+];
+var PI_TOOL_NAMES = [
+  TOOL_NAME.CODEBASE_CONTEXT,
+  TOOL_NAME.CODEBASE_SEARCH,
+  TOOL_NAME.CODEBASE_PEEK,
+  TOOL_NAME.FIND_SIMILAR,
+  TOOL_NAME.IMPLEMENTATION_LOOKUP,
+  TOOL_NAME.INDEX_CODEBASE,
+  TOOL_NAME.INDEX_STATUS,
+  TOOL_NAME.INDEX_HEALTH_CHECK,
+  TOOL_NAME.INDEX_METRICS,
+  TOOL_NAME.INDEX_LOGS,
+  TOOL_NAME.CALL_GRAPH,
+  TOOL_NAME.CALL_GRAPH_PATH,
+  TOOL_NAME.PR_IMPACT,
+  TOOL_NAME.PI_KNOWLEDGE_BASE_LIST,
+  TOOL_NAME.PI_KNOWLEDGE_BASE_ADD,
+  TOOL_NAME.PI_KNOWLEDGE_BASE_REMOVE
+];
+
 // src/commands/loader.ts
-import { existsSync as existsSync12, readdirSync as readdirSync3, readFileSync as readFileSync8 } from "fs";
+import { existsSync as existsSync13, readdirSync as readdirSync3, readFileSync as readFileSync8 } from "fs";
 import * as path25 from "path";
 function parseFrontmatter(content) {
   const frontmatterRegex = /^---\s*\n([\s\S]*?)\n---\s*\n([\s\S]*)$/;
@@ -17752,7 +18050,7 @@ function parseFrontmatter(content) {
 }
 function loadCommandsFromDirectory(commandsDir) {
   const commands = /* @__PURE__ */ new Map();
-  if (!existsSync12(commandsDir)) {
+  if (!existsSync13(commandsDir)) {
     return commands;
   }
   const files = readdirSync3(commandsDir).filter((f) => f.endsWith(".md"));
@@ -18098,7 +18396,7 @@ var RoutingHintController = class {
   }
 };
 
-// src/index.ts
+// src/adapters/opencode.ts
 var activeWatchers = /* @__PURE__ */ new Map();
 function replaceActiveWatcher(projectRoot, nextWatcher) {
   const existing = activeWatchers.get(projectRoot);
@@ -18115,7 +18413,8 @@ function getCommandsDir() {
   if (typeof import.meta !== "undefined" && import.meta.url) {
     currentDir = path26.dirname(fileURLToPath2(import.meta.url));
   }
-  return path26.join(currentDir, "..", "commands");
+  const packageRoot = path26.basename(currentDir) === "adapters" ? path26.join(currentDir, "..", "..") : path26.join(currentDir, "..");
+  return path26.join(packageRoot, "commands");
 }
 function appendRoutingHints(output, hints, preferredRole) {
   const preferredBucket = preferredRole === "developer" ? output.developer : output.system;
@@ -18136,7 +18435,7 @@ function resolveProjectRoot(directory, worktree) {
 var plugin = async ({ directory, worktree }) => {
   try {
     const projectRoot = resolveProjectRoot(directory, worktree);
-    const rawConfig = loadMergedConfig(projectRoot);
+    const rawConfig = loadMergedConfig(projectRoot, "opencode");
     const config = parseConfig(rawConfig);
     initializeTools2(projectRoot, config);
     const getProjectIndexer = () => getIndexerForProject2(projectRoot);
@@ -18162,23 +18461,23 @@ var plugin = async ({ directory, worktree }) => {
     }
     return {
       tool: {
-        codebase_context,
-        codebase_search,
-        codebase_peek,
-        index_codebase,
-        index_status,
-        index_health_check,
-        index_metrics,
-        index_logs,
-        find_similar,
-        call_graph,
-        call_graph_path,
-        implementation_lookup,
-        add_knowledge_base,
-        list_knowledge_bases,
-        remove_knowledge_base,
-        pr_impact,
-        index_visualize
+        [TOOL_NAME.CODEBASE_CONTEXT]: codebase_context,
+        [TOOL_NAME.CODEBASE_SEARCH]: codebase_search,
+        [TOOL_NAME.CODEBASE_PEEK]: codebase_peek,
+        [TOOL_NAME.INDEX_CODEBASE]: index_codebase,
+        [TOOL_NAME.INDEX_STATUS]: index_status,
+        [TOOL_NAME.INDEX_HEALTH_CHECK]: index_health_check,
+        [TOOL_NAME.INDEX_METRICS]: index_metrics,
+        [TOOL_NAME.INDEX_LOGS]: index_logs,
+        [TOOL_NAME.FIND_SIMILAR]: find_similar,
+        [TOOL_NAME.CALL_GRAPH]: call_graph,
+        [TOOL_NAME.CALL_GRAPH_PATH]: call_graph_path,
+        [TOOL_NAME.IMPLEMENTATION_LOOKUP]: implementation_lookup,
+        [TOOL_NAME.ADD_KNOWLEDGE_BASE]: add_knowledge_base,
+        [TOOL_NAME.LIST_KNOWLEDGE_BASES]: list_knowledge_bases,
+        [TOOL_NAME.REMOVE_KNOWLEDGE_BASE]: remove_knowledge_base,
+        [TOOL_NAME.PR_IMPACT]: pr_impact,
+        [TOOL_NAME.INDEX_VISUALIZE]: index_visualize
       },
       async "chat.message"(input, output) {
         routingHints?.observeUserMessage(input.sessionID, output.parts);
@@ -18218,9 +18517,9 @@ var plugin = async ({ directory, worktree }) => {
     };
   }
 };
-var index_default = plugin;
+var opencode_default = plugin;
 export {
-  index_default as default
+  opencode_default as default
 };
 /*! Bundled license information: