@cortexkit/aft-opencode 0.52.0 → 0.52.2

package/dist/config.d.ts

@@ -60,6 +60,22 @@ export declare const AftConfigSchema: z.ZodPreprocess<z.ZodObject<{
     disabled_tools: z.ZodOptional<z.ZodArray<z.ZodString>>;
     restrict_to_project_root: z.ZodOptional<z.ZodBoolean>;
     search_index: z.ZodOptional<z.ZodBoolean>;
+    index: z.ZodOptional<z.ZodObject<{
+        roots: z.ZodOptional<z.ZodArray<z.ZodPipe<z.ZodObject<{
+            path: z.ZodString;
+            indexes: z.ZodArray<z.ZodEnum<{
+                search: "search";
+                semantic: "semantic";
+                callgraph: "callgraph";
+            }>>;
+        }, z.core.$strip>, z.ZodTransform<{
+            path: string;
+            indexes: ("search" | "semantic" | "callgraph")[];
+        }, {
+            path: string;
+            indexes: ("search" | "semantic" | "callgraph")[];
+        }>>>>;
+    }, z.core.$strip>>;
     semantic_search: z.ZodOptional<z.ZodBoolean>;
     callgraph_store: z.ZodOptional<z.ZodBoolean>;
     callgraph_chunk_size: z.ZodOptional<z.ZodNumber>;
@@ -154,6 +170,10 @@ export declare const AftConfigSchema: z.ZodPreprocess<z.ZodObject<{
     }, z.core.$strip>>;
     gh_shim: z.ZodOptional<z.ZodObject<{
         enabled: z.ZodOptional<z.ZodBoolean>;
+        binary_path: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+    git: z.ZodOptional<z.ZodObject<{
+        co_author: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
 }, z.core.$strict>>;
 export type AftConfig = z.infer<typeof AftConfigSchema>;

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -7867,7 +7867,7 @@ function error(message, meta) {
 }
 // ../aft-bridge/dist/bash-format.js
 function isTerminalStatus(status) {
-  return status === "completed" || status === "failed" || status === "killed" || status === "timed_out";
+  return status === "completed" || status === "failed" || status === "killed" || status === "timed_out" || status === "fate_unknown";
 }
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -8410,6 +8410,7 @@ var TERMINAL_BASH_STATUSES = new Set([
   "failed",
   "killed",
   "timed_out",
+  "fate_unknown",
   "cancelled",
   "timeout"
 ]);
@@ -10006,34 +10007,54 @@ async function fetchLatestTag() {
 }
 // ../aft-bridge/dist/durable-log.js
 import { appendFile, mkdir, rename, rm, stat } from "node:fs/promises";
+import { dirname } from "node:path";
+
+// ../aft-bridge/dist/storage-paths.js
 import { homedir as homedir4 } from "node:os";
-import { dirname, join as join5 } from "node:path";
-var DEFAULT_LOG_BYTES = 32 * 1024 * 1024;
-var DEFAULT_LOG_GENERATIONS = 1;
+import { join as join5, resolve as resolve3 } from "node:path";
 function homeDir2() {
   if (process.platform === "win32")
     return process.env.USERPROFILE || process.env.HOME || homedir4();
   return process.env.HOME || homedir4();
 }
 function dataHome() {
-  if (process.env.XDG_DATA_HOME)
-    return process.env.XDG_DATA_HOME;
+  const xdg = process.env.XDG_DATA_HOME;
+  if (xdg)
+    return xdg;
   if (process.platform === "win32") {
     return process.env.LOCALAPPDATA || process.env.APPDATA || join5(homeDir2(), "AppData", "Local");
   }
   return join5(homeDir2(), ".local", "share");
 }
+function resolveStoragePath(raw) {
+  let expanded = raw;
+  if (raw === "~") {
+    expanded = homeDir2();
+  } else if (raw.startsWith("~/") || raw.startsWith("~\\")) {
+    expanded = join5(homeDir2(), raw.slice(2));
+  }
+  return resolve3(expanded);
+}
+function resolveCortexKitStorageRoot() {
+  const override = process.env.AFT_STORAGE_DIR;
+  if (override)
+    return resolveStoragePath(override);
+  return resolveStoragePath(join5(dataHome(), "cortexkit", "aft"));
+}
 function resolveAftStorageRoot(configuredRoot) {
+  if (process.env.AFT_STORAGE_DIR)
+    return resolveCortexKitStorageRoot();
   if (configuredRoot)
     return configuredRoot;
-  if (process.env.AFT_CACHE_DIR)
-    return join5(process.env.AFT_CACHE_DIR, "aft");
-  return join5(dataHome(), "cortexkit", "aft");
+  return resolveCortexKitStorageRoot();
 }
 function resolveAftLogPath(filename, configuredRoot) {
   return join5(resolveAftStorageRoot(configuredRoot), "logs", filename);
 }
 
+// ../aft-bridge/dist/durable-log.js
+var DEFAULT_LOG_BYTES = 32 * 1024 * 1024;
+var DEFAULT_LOG_GENERATIONS = 1;
 class RotatingLogSink {
   path;
   maxBytes;
@@ -10359,7 +10380,7 @@ class SubcSocket {
     return this.sock.localPort ?? null;
   }
   static connect(host, port, deadlineMs) {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const sock = net.connect({ host, port });
       sock.setNoDelay(true);
       const timer = setTimeout(() => {
@@ -10368,7 +10389,7 @@ class SubcSocket {
       }, Math.max(0, deadlineMs - Date.now()));
       sock.once("connect", () => {
         clearTimeout(timer);
-        resolve3(new SubcSocket(sock));
+        resolve4(new SubcSocket(sock));
       });
       sock.once("error", (err) => {
         clearTimeout(timer);
@@ -10400,7 +10421,7 @@ class SubcSocket {
     }
     if (n === 0)
       return Promise.resolve(new Uint8Array(0));
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       let timer = null;
       if (Number.isFinite(deadlineMs)) {
         const remaining = deadlineMs - Date.now();
@@ -10413,7 +10434,7 @@ class SubcSocket {
           reject(new SocketTimeoutError(`timed out waiting for ${n} bytes`));
         }, remaining);
       }
-      this.waiter = { need: n, resolve: resolve3, reject, timer };
+      this.waiter = { need: n, resolve: resolve4, reject, timer };
       this.tryServe();
     });
   }
@@ -10449,7 +10470,7 @@ class SubcSocket {
     let queued = false;
     let settled = false;
     let timer = null;
-    const completed = new Promise((resolve3, reject) => {
+    const completed = new Promise((resolve4, reject) => {
       const settle = (run) => {
         if (settled)
           return;
@@ -10473,7 +10494,7 @@ class SubcSocket {
             if (err) {
               reject(new SocketWriteQueuedError("subc socket reported a write error after bytes were handed to the socket", err instanceof Error ? err : new Error(String(err))));
             } else {
-              resolve3();
+              resolve4();
             }
           });
         });
@@ -10896,15 +10917,15 @@ class SubcClient {
     const key = pendingKey(handle, corr);
     let subscriptionPending = null;
     let resolveClosed = null;
-    const closed = new Promise((resolve3, reject) => {
+    const closed = new Promise((resolve4, reject) => {
       if (this.closedErr) {
         reject(this.closedErr);
         return;
       }
-      resolveClosed = resolve3;
+      resolveClosed = resolve4;
       subscriptionPending = {
         handle,
-        resolve: () => resolve3(),
+        resolve: () => resolve4(),
         reject,
         onProgress: onEvent,
         timer: null,
@@ -10993,11 +11014,11 @@ class SubcClient {
     const waiters = [];
     for (const pending of this.pending.values()) {
       if (pending.handle === handle && !pending.subscription) {
-        waiters.push(new Promise((resolve3) => {
+        waiters.push(new Promise((resolve4) => {
           const previous = pending.onSettle;
           pending.onSettle = () => {
             previous?.();
-            resolve3();
+            resolve4();
           };
         }));
       }
@@ -11053,11 +11074,11 @@ class SubcClient {
     const channel = handle?.channel ?? 0;
     const epoch = handle?.epoch ?? 0;
     const frame = buildFrame(FrameType.Request, buildFlags(false, priority, false, admission), channel, epoch, corr, body);
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const ms = timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
       const pending = {
         handle,
-        resolve: resolve3,
+        resolve: resolve4,
         reject,
         onProgress,
         timer: null,
@@ -11131,11 +11152,11 @@ class SubcClient {
       }
       return this.outcomeUnknownCallError("connection dropped before the managed call returned a response", error2);
     };
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const ms = timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
       const pending = {
         handle,
-        resolve: resolve3,
+        resolve: resolve4,
         reject,
         onProgress,
         timer: null,
@@ -11584,7 +11605,7 @@ function normalizeConnectOptions(opts) {
     identity: opts.identity,
     targetKind: opts.targetKind ?? DEFAULT_MANAGED_TARGET_KIND,
     reconnectBackoff: opts.reconnectBackoff ?? DEFAULT_RECONNECT_BACKOFF,
-    sleep: opts.sleep ?? ((ms) => new Promise((resolve3) => setTimeout(resolve3, ms))),
+    sleep: opts.sleep ?? ((ms) => new Promise((resolve4) => setTimeout(resolve4, ms))),
     timeoutArbitrationGraceMs: opts.timeoutArbitrationGraceMs ?? TIMEOUT_ARBITRATION_GRACE_MS,
     livenessProbeWindowMs: opts.livenessProbeWindowMs ?? LIVENESS_PROBE_WINDOW_MS,
     onControlPush: opts.onControlPush
@@ -12044,14 +12065,14 @@ function getLifecycleRegistry() {
 // ../aft-bridge/dist/project-identity.js
 import { createHash as createHash3 } from "node:crypto";
 import { realpathSync } from "node:fs";
-import { resolve as resolve3 } from "node:path";
+import { resolve as resolve4 } from "node:path";
 function canonicalizeProjectRoot(dir) {
   const trimmed = dir.replace(/[/\\]+$/, "");
   let canonical;
   try {
     canonical = realpathSync(trimmed);
   } catch {
-    canonical = resolve3(trimmed);
+    canonical = resolve4(trimmed);
   }
   return normalizeWindowsRoot(canonical);
 }
@@ -12087,6 +12108,8 @@ var AFT_MODULE_ID = "aft";
 var MAX_CONSECUTIVE_TRANSPORT_FAILURES = 3;
 var RECONNECT_RETRY_FLOOR_MS = 100;
 var RECONNECT_RETRY_CAP_MS = 2000;
+var ROUTE_OPEN_RELOAD_WAIT_CAP_MS = 15000;
+var ROUTE_OPEN_RELOAD_WAIT_EXHAUSTED_SUFFIX = " The AFT daemon module did not return within the 15s reload window.";
 var BG_STABLE_MS = 5000;
 function reconnectBackoffMs(attempt) {
   return Math.min(RECONNECT_RETRY_FLOOR_MS * 2 ** Math.min(attempt, 6), RECONNECT_RETRY_CAP_MS);
@@ -12395,6 +12418,15 @@ function isAbsentRootRouteError(err) {
 function absentRootError(root) {
   return new SubcError(`invalid route project root: project root does not exist: ${root}`, "config_divergence");
 }
+function reloadWindowExhaustedError(error2) {
+  if (error2 instanceof Error) {
+    try {
+      error2.message += ROUTE_OPEN_RELOAD_WAIT_EXHAUSTED_SUFFIX;
+      return error2;
+    } catch {}
+  }
+  return new Error(`${String(error2)}${ROUTE_OPEN_RELOAD_WAIT_EXHAUSTED_SUFFIX}`);
+}
 function safeCloseRoute(client, route) {
   try {
     client.closeRouteChannel(route).catch(() => {
@@ -12519,6 +12551,7 @@ class SubcTransportPool {
   connecting = null;
   routeReopenRetryDelayMs = RECONNECT_RETRY_FLOOR_MS;
   routeReopenRetry = null;
+  routeReopenRetryMs = null;
   sessions = new Map;
   rootIndex = new Map;
   dormantRoots = new Map;
@@ -12538,8 +12571,8 @@ class SubcTransportPool {
     this.connectFn = options.connect ?? ((opts) => SubcClient.connect(opts));
     this.onBgEventsNudge = options.onBgEventsNudge;
     this.onBgEventsNudgeRef = options.onBgEventsNudgeRef;
-    this.bgBackoffSleep = options.bgBackoffSleep ?? ((ms) => new Promise((resolve4) => setTimeout(resolve4, ms)));
-    this.routeRetrySleep = options.routeRetrySleep ?? ((ms) => new Promise((resolve4) => setTimeout(resolve4, ms)));
+    this.bgBackoffSleep = options.bgBackoffSleep ?? ((ms) => new Promise((resolve5) => setTimeout(resolve5, ms)));
+    this.routeRetrySleep = options.routeRetrySleep ?? ((ms) => new Promise((resolve5) => setTimeout(resolve5, ms)));
     this.bgDispatchProbeIntervalMs = options.bgDispatchProbeIntervalMs ?? BG_DISPATCH_PROBE_INTERVAL_MS;
     const lifecycle = options.lifecycle;
     const demandCheck = options.lifecycleDemandCheck ?? options.demandCheck ?? lifecycle?.demandCheck;
@@ -12992,6 +13025,23 @@ class SubcTransportPool {
           throw error2;
         }
       };
+      const openRouteAfterReloadWindow = async () => {
+        let reloadWaitedMs = 0;
+        while (true) {
+          try {
+            return await openRoute();
+          } catch (error2) {
+            if (!isRouteOpenReloadWindowError(error2))
+              throw error2;
+            const { delayMs, wait } = this.waitForRouteReopenBackoff();
+            if (reloadWaitedMs + delayMs > ROUTE_OPEN_RELOAD_WAIT_CAP_MS) {
+              throw reloadWindowExhaustedError(error2);
+            }
+            reloadWaitedMs += delayMs;
+            await wait;
+          }
+        }
+      };
       const clearRouteEntry = (entry) => {
         if (record.routeEntry !== entry)
           return;
@@ -13028,7 +13078,7 @@ class SubcTransportPool {
         this.ensureBgSubscription(identity, record);
         return reply;
       };
-      let routeAndEntry = await openRoute();
+      let routeAndEntry = await openRouteAfterReloadWindow();
       try {
         return await requestOnRoute(routeAndEntry.route);
       } catch (error2) {
@@ -13036,8 +13086,8 @@ class SubcTransportPool {
           throw this.annotateReapError(error2, record);
         if (isRouteProvenAbsentError(error2) && this.isCurrentSession(key, record) && this.client === client) {
           clearRouteEntry(routeAndEntry.entry);
-          await this.waitForRouteReopenBackoff();
-          routeAndEntry = await openRoute();
+          await this.waitForRouteReopenBackoff().wait;
+          routeAndEntry = await openRouteAfterReloadWindow();
           try {
             const reply = await requestOnRoute(routeAndEntry.route);
             this.resetRouteReopenBackoff();
@@ -13063,17 +13113,21 @@ class SubcTransportPool {
   }
   waitForRouteReopenBackoff() {
     const pending = this.routeReopenRetry;
-    if (pending)
-      return pending;
-    const delay = this.routeReopenRetryDelayMs;
-    this.routeReopenRetryDelayMs = Math.min(delay * 2, RECONNECT_RETRY_CAP_MS);
+    const pendingDelay = this.routeReopenRetryMs;
+    if (pending && pendingDelay !== null)
+      return { delayMs: pendingDelay, wait: pending };
+    const delayMs = this.routeReopenRetryDelayMs;
+    this.routeReopenRetryDelayMs = Math.min(delayMs * 2, RECONNECT_RETRY_CAP_MS);
     let retry;
-    retry = Promise.resolve().then(() => this.routeRetrySleep(delay)).finally(() => {
-      if (this.routeReopenRetry === retry)
+    retry = Promise.resolve().then(() => this.routeRetrySleep(delayMs)).finally(() => {
+      if (this.routeReopenRetry === retry) {
         this.routeReopenRetry = null;
+        this.routeReopenRetryMs = null;
+      }
     });
     this.routeReopenRetry = retry;
-    return retry;
+    this.routeReopenRetryMs = delayMs;
+    return { delayMs, wait: retry };
   }
   resetRouteReopenBackoff() {
     this.routeReopenRetryDelayMs = RECONNECT_RETRY_FLOOR_MS;
@@ -13360,6 +13414,12 @@ function isRouteGoodbyeError(error2) {
   }
   return error2.code === "route_closed" && error2.message.includes("route closed by subc");
 }
+function isRouteOpenReloadWindowError(error2) {
+  if (error2 === null || typeof error2 !== "object")
+    return false;
+  const code = error2.code;
+  return code === "module_reloading" || code === "module_warming" || code === "target_unavailable";
+}
 function hasEngineResponse(error2) {
   const response = error2.response;
   if (response !== null && typeof response === "object")
@@ -13421,12 +13481,12 @@ function stripJsoncSymbols(value) {
 import { spawnSync as spawnSync2 } from "node:child_process";
 import { closeSync as closeSync3, existsSync as existsSync6, mkdirSync as mkdirSync4, openSync as openSync3, readFileSync as readFileSync5, renameSync as renameSync4, rmSync as rmSync2, statSync as statSync4, unlinkSync as unlinkSync3, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir as homedir7, tmpdir } from "node:os";
-import { basename, dirname as dirname3, join as join8, resolve as resolve5 } from "node:path";
+import { basename, dirname as dirname3, join as join8, resolve as resolve6 } from "node:path";
 
 // ../aft-bridge/dist/paths.js
 import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync4, renameSync as renameSync2, writeFileSync } from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { dirname as dirname2, isAbsolute as isAbsolute2, join as join6, resolve as resolve4 } from "node:path";
+import { dirname as dirname2, isAbsolute as isAbsolute2, join as join6, resolve as resolve5 } from "node:path";
 function homeDir3() {
   if (process.platform === "win32")
     return process.env.USERPROFILE || process.env.HOME || homedir5();
@@ -13441,7 +13501,7 @@ function configHome() {
 function legacyOpenCodeConfigDir() {
   const envDir = process.env.OPENCODE_CONFIG_DIR?.trim();
   if (envDir)
-    return resolve4(envDir);
+    return resolve5(envDir);
   return join6(configHome(), "opencode");
 }
 function legacyPiAgentDir() {
@@ -13684,7 +13744,16 @@ function platformKey(platform = process.platform, arch = process.arch) {
   }
   return key;
 }
+function logBinaryResolution(resolution) {
+  log(`Resolved binary from ${resolution.source}: ${resolution.path}`);
+}
 function findBinarySync(expectedVersion) {
+  const resolution = findBinarySyncInner(expectedVersion);
+  if (resolution)
+    logBinaryResolution(resolution);
+  return resolution?.path ?? null;
+}
+function findBinarySyncInner(expectedVersion) {
   const ext = process.platform === "win32" ? ".exe" : "";
   const env = { ...process.env };
   const pluginVersion = expectedVersion ?? (() => {
@@ -13698,8 +13767,9 @@ function findBinarySync(expectedVersion) {
   if (pluginVersion) {
     const tag = pluginVersion.startsWith("v") ? pluginVersion : `v${pluginVersion}`;
     const versionCached = cachedBinaryPathFromEnv(tag, env, ext);
-    if (versionCached && isExpectedCachedBinary2(versionCached, pluginVersion))
-      return versionCached;
+    if (versionCached && isExpectedCachedBinary2(versionCached, pluginVersion)) {
+      return { path: versionCached, source: "versioned cache" };
+    }
   }
   try {
     const key = platformKey();
@@ -13714,7 +13784,7 @@ function findBinarySync(expectedVersion) {
         warn(`npm platform package binary v${npmVersion} does not match plugin v${pluginVersion}; skipping (continuing to PATH lookup)`);
       } else {
         const copied = copyToVersionedCache(resolved, npmVersion);
-        return copied ?? resolved;
+        return { path: copied ?? resolved, source: "npm platform package" };
       }
     }
   } catch {}
@@ -13732,27 +13802,28 @@ function findBinarySync(expectedVersion) {
       }
       const usable = probeBinaryCandidate(candidate, "PATH", expectedVersion);
       if (usable)
-        return usable;
+        return { path: usable, source: "PATH" };
     }
   } catch {}
   const cargoPath = join7(homeDirFromEnv(env), ".cargo", "bin", `aft${ext}`);
   if (existsSync5(cargoPath)) {
     const usable = probeBinaryCandidate(cargoPath, "cargo", expectedVersion);
     if (usable)
-      return usable;
+      return { path: usable, source: "cargo" };
   }
   return null;
 }
 async function findBinary(expectedVersion) {
   const syncResult = findBinarySync(expectedVersion);
   if (syncResult) {
-    log(`Resolved binary: ${syncResult}`);
     return syncResult;
   }
   log("Binary not found locally, attempting auto-download...");
   const downloaded = await ensureBinaryForResolver(expectedVersion);
-  if (downloaded)
+  if (downloaded) {
+    logBinaryResolution({ path: downloaded, source: "auto-download" });
     return downloaded;
+  }
   throw new Error([
     "Could not find the `aft` binary.",
     "",
@@ -13795,9 +13866,6 @@ function resolveLegacyStorageRoot(harness) {
     return join8(homeDir4(), ".pi", "agent", "aft");
   return join8(dataHome2(), "opencode", "storage", "plugin", "aft");
 }
-function resolveCortexKitStorageRoot() {
-  return join8(dataHome2(), "cortexkit", "aft");
-}
 function stripJsoncForParse(input) {
   let out = "";
   let inString = false;
@@ -14067,8 +14135,8 @@ function visibleConfigMigrationWarning(scope, targetPath, paths, reason) {
 }
 function migrateAftConfigFile(opts) {
   const warnings = [];
-  const resolvedTarget = resolve5(opts.targetPath);
-  const existingSources = opts.legacySources.filter((source) => existsSync6(source.path) && resolve5(source.path) !== resolvedTarget);
+  const resolvedTarget = resolve6(opts.targetPath);
+  const existingSources = opts.legacySources.filter((source) => existsSync6(source.path) && resolve6(source.path) !== resolvedTarget);
   const info = opts.logger?.info ?? opts.logger?.log;
   if (existingSources.length === 0) {
     return { migrated: false, conflict: false, targetPath: opts.targetPath, warnings };
@@ -14317,7 +14385,7 @@ function isNpmAvailable(deps = defaultDeps()) {
 import { execFileSync } from "node:child_process";
 import { createHash as createHash4 } from "node:crypto";
 import { chmodSync as chmodSync3, closeSync as closeSync4, copyFileSync as copyFileSync3, createWriteStream as createWriteStream2, existsSync as existsSync7, lstatSync, mkdirSync as mkdirSync5, openSync as openSync4, readdirSync as readdirSync3, readFileSync as readFileSync6, readlinkSync, realpathSync as realpathSync2, rmSync as rmSync3, statSync as statSync6, symlinkSync, unlinkSync as unlinkSync4, writeFileSync as writeFileSync3 } from "node:fs";
-import { basename as basename2, dirname as dirname5, isAbsolute as isAbsolute4, join as join10, relative as relative2, resolve as resolve6, win32 } from "node:path";
+import { basename as basename2, dirname as dirname5, isAbsolute as isAbsolute4, join as join10, relative as relative2, resolve as resolve7, win32 } from "node:path";
 import { Readable as Readable2 } from "node:stream";
 import { pipeline as pipeline2 } from "node:stream/promises";
 var ORT_VERSION = "1.24.4";
@@ -14625,7 +14693,7 @@ function findSystemOnnxRuntime(libName) {
   const normalizeCase = process.platform === "win32" || process.platform === "darwin";
   const seen = new Set;
   const uniquePaths = searchPaths.filter((p) => {
-    let key = resolve6(p).replace(/[/\\]+$/, "");
+    let key = resolve7(p).replace(/[/\\]+$/, "");
     if (normalizeCase)
       key = key.toLowerCase();
     if (seen.has(key))
@@ -14709,7 +14777,7 @@ function validateExtractedTree(stagingRoot) {
       const lst = lstatSync(fullPath);
       if (lst.isSymbolicLink()) {
         const linkTarget = readlinkSync(fullPath);
-        const resolvedTarget = resolve6(dirname5(fullPath), linkTarget);
+        const resolvedTarget = resolve7(dirname5(fullPath), linkTarget);
         const rel2 = relative2(realRoot, resolvedTarget);
         if (rel2.startsWith("..") || isAbsolute4(rel2) || win32.isAbsolute(rel2)) {
           throw new Error(`extracted symlink ${fullPath} points outside staging root: ${linkTarget}`);
@@ -14827,7 +14895,7 @@ function copyOnnxLibraries(info, extractedDir, targetDir, realFiles, symlinks, c
       unlinkSync4(dst);
     } catch {}
     const dstForContainment = join10(targetRoot, link.name);
-    const resolvedTarget = resolve6(dirname5(dstForContainment), link.target);
+    const resolvedTarget = resolve7(dirname5(dstForContainment), link.target);
     if (!isPathInsideRoot(targetRoot, resolvedTarget)) {
       const message = `ONNX Runtime symlink ${link.name} points outside install dir: ${link.target}`;
       if (requiredLibs.has(link.name)) {
@@ -15876,7 +15944,7 @@ class RevivableTransportPool {
     const delay = Math.max(0, this.revivalRetryNotBefore - Date.now());
     if (delay > 0) {
       let scheduled;
-      scheduled = new Promise((resolve7) => setTimeout(resolve7, delay)).then(() => {
+      scheduled = new Promise((resolve8) => setTimeout(resolve8, delay)).then(() => {
         if (this.revival === scheduled)
           this.revival = null;
         return this.ensureActivePool();
@@ -17389,7 +17457,8 @@ async function signalBashWaitDetachForProject(pool, projectRoot, sessionID) {
 
 // src/config.ts
 import { existsSync as existsSync10, readFileSync as readFileSync7, renameSync as renameSync5, unlinkSync as unlinkSync5, writeFileSync as writeFileSync4 } from "node:fs";
-import { parse as parsePath, resolve as resolvePath } from "node:path";
+import { homedir as homedir11 } from "node:os";
+import { isAbsolute as isAbsolute7, parse as parsePath, resolve as resolvePath } from "node:path";
 var import_comment_json = __toESM(require_src2(), 1);
 
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/classic/external.js
@@ -31694,6 +31763,32 @@ var CheckerEnum = exports_external.enum([
 ]);
 var ConfigureWarningsDeliveryEnum = exports_external.enum(["toast", "log", "chat"]);
 var SemanticBackendEnum = exports_external.enum(["fastembed", "openai_compatible", "ollama"]);
+var IndexKindSchema = exports_external.enum(["search", "semantic", "callgraph"]);
+function isSupportedAbsoluteIndexPath(path3) {
+  if (path3 === "~" || path3.startsWith("~/") || path3.startsWith("~\\")) {
+    return isAbsolute7(homedir11());
+  }
+  return isAbsolute7(path3);
+}
+var IndexRootSchema = exports_external.object({
+  path: exports_external.string().refine(isSupportedAbsoluteIndexPath, {
+    message: "index.roots path must be absolute after ~ expansion"
+  }),
+  indexes: exports_external.array(IndexKindSchema).min(1, "index.roots indexes must be non-empty")
+}).superRefine(({ indexes }, context) => {
+  if (new Set(indexes).size !== indexes.length) {
+    context.addIssue({
+      code: "custom",
+      message: "index.roots indexes must not contain duplicates"
+    });
+  }
+}).transform(({ path: path3, indexes }) => ({
+  path: path3,
+  indexes: ["search", "semantic", "callgraph"].filter((kind) => indexes.includes(kind) || kind === "search" && indexes.includes("semantic"))
+}));
+var IndexConfigSchema = exports_external.object({
+  roots: exports_external.array(IndexRootSchema).optional()
+});
 var SemanticConfigSchema = exports_external.object({
   backend: SemanticBackendEnum.optional(),
   model: exports_external.string().trim().min(1).optional(),
@@ -31760,7 +31855,12 @@ var SubcConfigSchema = exports_external.object({
   client_reaper: exports_external.boolean().optional()
 });
 var GhShimConfigSchema = exports_external.object({
-  enabled: exports_external.boolean().optional()
+  enabled: exports_external.boolean().optional(),
+  binary_path: exports_external.string().trim().refine(isAbsolute7, "gh_shim.binary_path must be absolute").optional()
+});
+var GitCoAuthorSchema = exports_external.string().trim().refine((value) => value === "off" || value === "auto" || /^[^<>\r\n]+\s+<[^<>\s@]+@[^<>\s@]+>$/.test(value), "git.co_author must be 'off', 'auto', or an explicit 'Name <email>' identity");
+var GitConfigSchema = exports_external.object({
+  co_author: GitCoAuthorSchema.optional()
 });
 var DEFAULT_INSPECT_DIAGNOSTICS_TIMEOUT_MS = 120000;
 var MIN_INSPECT_DIAGNOSTICS_TIMEOUT_MS = 1e4;
@@ -31802,6 +31902,7 @@ var AftConfigSchema = exports_external.preprocess((value) => stripHarnessSpecifi
   disabled_tools: exports_external.array(exports_external.string()).optional(),
   restrict_to_project_root: exports_external.boolean().optional(),
   search_index: exports_external.boolean().optional(),
+  index: IndexConfigSchema.optional(),
   semantic_search: exports_external.boolean().optional(),
   callgraph_store: exports_external.boolean().optional(),
   callgraph_chunk_size: exports_external.number().optional(),
@@ -31817,7 +31918,8 @@ var AftConfigSchema = exports_external.preprocess((value) => stripHarnessSpecifi
   auto_update: exports_external.boolean().optional(),
   bridge: BridgeConfigSchema.optional(),
   subc: SubcConfigSchema.optional(),
-  gh_shim: GhShimConfigSchema.optional()
+  gh_shim: GhShimConfigSchema.optional(),
+  git: GitConfigSchema.optional()
 }).strict());
 function resolveInspectDiagnosticsTimeoutMs(config2) {
   return clampInspectDiagnosticsTimeoutMs(config2.inspect?.diagnostics_timeout_ms ?? DEFAULT_INSPECT_DIAGNOSTICS_TIMEOUT_MS);
@@ -32240,6 +32342,7 @@ var PROJECT_SAFE_TOP_LEVEL_FIELDS = new Set([
   "callgraph_chunk_size",
   "inspect",
   "worktree",
+  "git",
   "experimental",
   "bash"
 ]);
@@ -32264,6 +32367,8 @@ function getStrippedTopLevelKeys(override) {
     stripped.push("bridge");
   if (override.backup !== undefined)
     stripped.push("backup");
+  if (override.index?.roots !== undefined)
+    stripped.push("index.roots");
   if (override.sandbox?.enabled === false)
     stripped.push("sandbox.enabled");
   if (override.sandbox?.write_allow !== undefined)
@@ -32392,7 +32497,7 @@ function loadAftConfig(projectDirectory) {
 
 // src/notifications.ts
 import { existsSync as existsSync11, readFileSync as readFileSync8 } from "node:fs";
-import { homedir as homedir11, platform } from "node:os";
+import { homedir as homedir12, platform } from "node:os";
 import { join as join12 } from "node:path";
 function isTuiMode() {
   return process.env.OPENCODE_CLIENT === "cli";
@@ -32413,7 +32518,7 @@ var FEATURE_MARKER = `${AFT_MARKER} New in`;
 var WARNING_MARKER = `${AFT_MARKER} ⚠️`;
 function getDesktopStatePath() {
   const os3 = platform();
-  const home = homedir11();
+  const home = homedir12();
   if (os3 === "darwin") {
     return join12(home, "Library", "Application Support", "ai.opencode.desktop", "opencode.global.dat");
   }
@@ -32950,27 +33055,27 @@ var import_comment_json3 = __toESM(require_src2(), 1);
 // src/hooks/auto-update-checker/checker.ts
 var import_comment_json2 = __toESM(require_src2(), 1);
 import { existsSync as existsSync12, readFileSync as readFileSync9, statSync as statSync7, writeFileSync as writeFileSync5 } from "node:fs";
-import { homedir as homedir13 } from "node:os";
-import { dirname as dirname6, isAbsolute as isAbsolute7, join as join14, resolve as resolve8 } from "node:path";
+import { homedir as homedir14 } from "node:os";
+import { dirname as dirname6, isAbsolute as isAbsolute8, join as join14, resolve as resolve9 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // src/hooks/auto-update-checker/constants.ts
-import { homedir as homedir12, platform as platform2 } from "node:os";
+import { homedir as homedir13, platform as platform2 } from "node:os";
 import { join as join13 } from "node:path";
 var PACKAGE_NAME = "@cortexkit/aft-opencode";
 var NPM_REGISTRY_URL = "https://registry.npmjs.org";
 var NPM_FETCH_TIMEOUT = 1e4;
 function getOpenCodeCacheRoot() {
   if (platform2() === "win32") {
-    return join13(process.env.LOCALAPPDATA ?? homedir12(), "opencode");
+    return join13(process.env.LOCALAPPDATA ?? homedir13(), "opencode");
   }
-  return join13(homedir12(), ".cache", "opencode");
+  return join13(homedir13(), ".cache", "opencode");
 }
 function getOpenCodeConfigRoot() {
   if (platform2() === "win32") {
-    return join13(process.env.APPDATA ?? join13(homedir12(), "AppData", "Roaming"), "opencode");
+    return join13(process.env.APPDATA ?? join13(homedir13(), "AppData", "Roaming"), "opencode");
   }
-  return join13(process.env.XDG_CONFIG_HOME ?? join13(homedir12(), ".config"), "opencode");
+  return join13(process.env.XDG_CONFIG_HOME ?? join13(homedir13(), ".config"), "opencode");
 }
 var CACHE_DIR = join13(getOpenCodeCacheRoot(), "packages");
 var USER_OPENCODE_CONFIG = join13(getOpenCodeConfigRoot(), "opencode.json");
@@ -33046,9 +33151,9 @@ function resolvePathPluginSpec(spec, configPath) {
       return spec.replace(/^file:\/\//, "");
     }
   }
-  if (isAbsolute7(spec) || /^[A-Za-z]:[\\/]/.test(spec))
+  if (isAbsolute8(spec) || /^[A-Za-z]:[\\/]/.test(spec))
     return spec;
-  return resolve8(dirname6(configPath), spec);
+  return resolve9(dirname6(configPath), spec);
 }
 function getLocalDevPath(directory) {
   for (const configPath of getConfigPaths(directory)) {
@@ -33060,7 +33165,7 @@ function getLocalDevPath(directory) {
       for (const entry of plugins) {
         if (entry === PACKAGE_NAME || entry.startsWith(`${PACKAGE_NAME}@`))
           continue;
-        if (entry.startsWith("file://") || entry.startsWith(".") || isAbsolute7(entry)) {
+        if (entry.startsWith("file://") || entry.startsWith(".") || isAbsolute8(entry)) {
           const localPath = resolvePathPluginSpec(entry, configPath);
           const pkgPath = findPackageJsonUp(localPath);
           if (!pkgPath)
@@ -33149,7 +33254,7 @@ function getCachedVersion(spec) {
     getCurrentRuntimePackageJsonPath(),
     spec ? getSpecCachePackageJsonPath(spec) : null,
     getSpecCachePackageJsonPath(`${PACKAGE_NAME}@latest`),
-    join14(homedir13(), ".cache", "opencode", "node_modules", PACKAGE_NAME, "package.json")
+    join14(homedir14(), ".cache", "opencode", "node_modules", PACKAGE_NAME, "package.json")
   ].filter(isString);
   for (const packageJsonPath of candidates) {
     try {
@@ -34267,18 +34372,18 @@ function ensureInstallAnchor(cwd) {
   }
 }
 function runInstall(spec, version2, cwd, signal) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     const target = `${spec.npm}@${version2}`;
     log2(`[lsp] installing ${target} to ${cwd}`);
     if (signal?.aborted) {
       warn2(`[lsp] install ${target} aborted before spawn`);
-      resolve9(false);
+      resolve10(false);
       return;
     }
     const npm = resolveNpm();
     if (!npm) {
       warn2(`[lsp] npm not found on PATH or known locations; cannot install ${target}`);
-      resolve9(false);
+      resolve10(false);
       return;
     }
     ensureInstallAnchor(cwd);
@@ -34301,7 +34406,7 @@ function runInstall(spec, version2, cwd, signal) {
         return;
       settled = true;
       cleanup();
-      resolve9(ok);
+      resolve10(ok);
     };
     const onAbort = () => {
       warn2(`[lsp] install ${target} aborted during shutdown`);
@@ -34402,7 +34507,7 @@ function cachedPackageDir(npmPackage) {
   return lspBinDir(npmPackage).replace(/[\\/]node_modules[\\/]\.bin[\\/]?$/, "");
 }
 function hashInstalledBinary(spec) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     const candidates = process.platform === "win32" ? [
       lspBinaryPath(spec.npm, spec.binary),
       lspBinaryPath(spec.npm, `${spec.binary}.cmd`),
@@ -34426,7 +34531,7 @@ function hashInstalledBinary(spec) {
     const stream = createReadStream(pathToHash);
     stream.on("error", reject);
     stream.on("data", (chunk) => hash2.update(chunk));
-    stream.on("end", () => resolve9(hash2.digest("hex")));
+    stream.on("end", () => resolve10(hash2.digest("hex")));
   });
 }
 function installedBinaryPath(spec) {
@@ -34554,7 +34659,7 @@ import {
   unlinkSync as unlinkSync7,
   writeFileSync as writeFileSync10
 } from "node:fs";
-import { dirname as dirname9, join as join19, relative as relative3, resolve as resolve9 } from "node:path";
+import { dirname as dirname9, join as join19, relative as relative3, resolve as resolve10 } from "node:path";
 import { Readable as Readable3 } from "node:stream";
 import { pipeline as pipeline3 } from "node:stream/promises";
 
@@ -34711,12 +34816,12 @@ function writeGithubInstalledMetaIn(installDir, version2, binarySha256, archiveS
 var MAX_DOWNLOAD_BYTES3 = 256 * 1024 * 1024;
 var MAX_EXTRACT_BYTES2 = 1024 * 1024 * 1024;
 function sha256OfFile(path3) {
-  return new Promise((resolve10, reject) => {
+  return new Promise((resolve11, reject) => {
     const hash2 = createHash7("sha256");
     const stream = createReadStream2(path3);
     stream.on("error", reject);
     stream.on("data", (chunk) => hash2.update(chunk));
-    stream.on("end", () => resolve10(hash2.digest("hex")));
+    stream.on("end", () => resolve11(hash2.digest("hex")));
   });
 }
 function sha256OfFileSync2(path3) {
@@ -34973,7 +35078,7 @@ function validateExtraction(stagingRoot) {
         throw new Error(`failed to realpath ${full}: ${err}`);
       }
       const rel = relative3(realStagingRoot, realFull);
-      if (rel.startsWith("..") || resolve9(realStagingRoot, rel) !== realFull) {
+      if (rel.startsWith("..") || resolve10(realStagingRoot, rel) !== realFull) {
         throw new Error(`archive entry escapes staging root: ${full} → ${realFull} (zip-slip defense)`);
       }
       if (lst.isDirectory()) {
@@ -35684,7 +35789,7 @@ class AftRpcServer {
     return this.port;
   }
   async startNode() {
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve11, reject) => {
       const server = createServer((req, res) => this.dispatch(req, res));
       server.on("error", (err) => {
         warn2(`RPC server error: ${err.message}`);
@@ -35699,7 +35804,7 @@ class AftRpcServer {
         this.port = addr.port;
         this.nodeServer = server;
         this.afterServerStarted();
-        resolve10(this.port);
+        resolve11(this.port);
       });
       server.unref();
     });
@@ -36251,8 +36356,8 @@ function installProcessHandlers() {
       }
       signalShutdownStarted = true;
       process.exitCode = SIGNAL_EXIT_CODES[sig];
-      const timeout = new Promise((resolve10) => {
-        setTimeout(resolve10, SIGNAL_CLEANUP_TIMEOUT_MS);
+      const timeout = new Promise((resolve11) => {
+        setTimeout(resolve11, SIGNAL_CLEANUP_TIMEOUT_MS);
       });
       Promise.race([runCleanups(sig), timeout]).finally(() => {
         process.exit(SIGNAL_EXIT_CODES[sig]);
@@ -37984,6 +38089,7 @@ var HASHLINE_EDIT_DESCRIPTION = [
   "",
   "Quick reference:",
   "- Header: `[path#TAG]`; TAG is exactly four hexadecimal digits from a current tagged read. Read every addressed row and gap boundary; REM and MV require a whole-file tagged read. Re-read after an edit before chaining: an edit-response tag can retain only changed context.",
+  "- Same canonical path: multiple sections compose in patch order against pre-request coordinates.",
   "- Addresses: `0` (BOF), `N` (one line), `N.=M` (range; `N..=M`/`N..M` also work), `<N`/`>N` (gap before/after), `N*`/`<N*`/`>N*` (block), and `$`/`$-K` (EOF-relative). A plain `N` PUT replaces; use `<N` or `>N` to insert.",
   "- PUT text: `PUT <address>:` followed by one or more `+` body rows (`+` alone is blank). A final patch newline is allowed. PUT without `:` copies `@name` (or the anonymous register) and takes no body; names use `@` plus ASCII letters, digits, `_`, or `-`.",
   "- CUT: `CUT <address> [@name]`. REM: bare `REM` only, removing the whole file. MV: `MV <destination>` (one whitespace-free path, optional matching quotes), once and after any line operations. `*** Begin Patch`/`*** End Patch` is an optional envelope."
@@ -39658,7 +39764,7 @@ var PLUGIN_VERSION = (() => {
     return "0.0.0";
   }
 })();
-var ANNOUNCEMENT_VERSION = "0.52.0";
+var ANNOUNCEMENT_VERSION = "0.52.2";
 var ANNOUNCEMENT_FEATURES = [
   "Callgraph stays consistent under load: edits arriving mid-rebuild can no longer be silently lost from navigation results.",
   "aft_zoom handles real-world .jsonc: files with comment banners above the opening brace now resolve, and not-found errors point at the segment that actually failed (thanks @iceteaSA).",

package/dist/shared/storage-paths.d.ts

@@ -1,2 +1,2 @@
-export declare function resolveCortexKitStorageRoot(): string;
+export { resolveCortexKitStorageRoot } from "@cortexkit/aft-bridge";
 //# sourceMappingURL=storage-paths.d.ts.map

package/dist/shared/storage-paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage-paths.d.ts","sourceRoot":"","sources":["../../src/shared/storage-paths.ts"],"names":[],"mappings":"AAmBA,wBAAgB,2BAA2B,IAAI,MAAM,CAEpD"}
+{"version":3,"file":"storage-paths.d.ts","sourceRoot":"","sources":["../../src/shared/storage-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/tools/hoisted.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAe,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAInF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAiDjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AA+OtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAoIjE;AAkrBD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0B/E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA4BnF"}
+{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAe,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAInF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAiDjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AA+OtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAoIjE;AAmrBD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0B/E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA4BnF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.52.0",
+  "version": "0.52.2",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.6.0",
-    "@cortexkit/aft-bridge": "0.52.0",
+    "@cortexkit/aft-bridge": "0.52.2",
     "@opentui/core": "0.4.3",
     "@opentui/solid": "0.4.3",
     "comment-json": "^4.6.2",
@@ -43,12 +43,12 @@
     "zod": "^4.4.3"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.52.0",
-    "@cortexkit/aft-darwin-x64": "0.52.0",
-    "@cortexkit/aft-linux-arm64": "0.52.0",
-    "@cortexkit/aft-linux-x64": "0.52.0",
-    "@cortexkit/aft-win32-arm64": "0.52.0",
-    "@cortexkit/aft-win32-x64": "0.52.0"
+    "@cortexkit/aft-darwin-arm64": "0.52.2",
+    "@cortexkit/aft-darwin-x64": "0.52.2",
+    "@cortexkit/aft-linux-arm64": "0.52.2",
+    "@cortexkit/aft-linux-x64": "0.52.2",
+    "@cortexkit/aft-win32-arm64": "0.52.2",
+    "@cortexkit/aft-win32-x64": "0.52.2"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.17.11",

package/src/shared/storage-paths.ts

@@ -1,22 +1 @@
-import { homedir } from "node:os";
-import { join } from "node:path";
-
-function homeDir(): string {
-  if (process.platform === "win32") return process.env.USERPROFILE || process.env.HOME || homedir();
-  return process.env.HOME || homedir();
-}
-
-function dataHome(): string {
-  // Keep this in sync with the bridge package's storage migration helper,
-  // but do not import that package from TUI code: its public barrel also
-  // exports URL-fetch helpers unsuitable for Bun's TUI runtime.
-  if (process.env.XDG_DATA_HOME) return process.env.XDG_DATA_HOME;
-  if (process.platform === "win32") {
-    return process.env.LOCALAPPDATA || process.env.APPDATA || join(homeDir(), "AppData", "Local");
-  }
-  return join(homeDir(), ".local", "share");
-}
-
-export function resolveCortexKitStorageRoot(): string {
-  return join(dataHome(), "cortexkit", "aft");
-}
+export { resolveCortexKitStorageRoot } from "@cortexkit/aft-bridge";

package/src/tui/sidebar.tsx

@@ -244,9 +244,8 @@ export function collapsedHealthLights(statusBar: StatusBar | undefined): HealthL
   return { diagnostics, code, todos };
 }
 
-// v0.27 moved AFT storage to the CortexKit root. TUI code must use a
-// lightweight local path helper rather than the shared bridge barrel, which
-// also exports URL-fetch helpers unsuitable for Bun's TUI runtime.
+// Keep the TUI on the bridge's shared resolver so its root matches the
+// configure payload used by the plugin and binary.
 export function resolveTuiStorageDir(): string {
   return resolveCortexKitStorageRoot();
 }

package/src/tui-compiled/sidebar.tsx

@@ -247,9 +247,8 @@ export function collapsedHealthLights(statusBar) {
   };
 }
 
-// v0.27 moved AFT storage to the CortexKit root. TUI code must use a
-// lightweight local path helper rather than the shared bridge barrel, which
-// also exports URL-fetch helpers unsuitable for Bun's TUI runtime.
+// Keep the TUI on the bridge's shared resolver so its root matches the
+// configure payload used by the plugin and binary.
 export function resolveTuiStorageDir() {
   return resolveCortexKitStorageRoot();
 }