@cortexkit/aft 0.50.0 → 0.50.1

package/dist/index.js

@@ -2076,7 +2076,8 @@ var init_platform = __esm(() => {
 // ../aft-bridge/dist/downloader.js
 import { spawnSync } from "node:child_process";
 import { createHash as createHash2, randomUUID } from "node:crypto";
-import { chmodSync, closeSync, copyFileSync, createWriteStream, existsSync as existsSync2, mkdirSync, openSync, readFileSync as readFileSync3, renameSync, rmSync, statSync as statSync2, unlinkSync, writeSync } from "node:fs";
+import { chmodSync, closeSync, copyFileSync, createWriteStream, existsSync as existsSync2, mkdirSync, openSync, readdirSync, readFileSync as readFileSync3, renameSync, rmSync, statSync as statSync2, unlinkSync, writeSync } from "node:fs";
+import { hostname } from "node:os";
 import { join as join4 } from "node:path";
 import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
@@ -2147,11 +2148,37 @@ async function downloadBinary(version) {
   let binaryTimeout = null;
   let checksumTimeout = null;
   const tmpPath = `${binaryPath}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`;
+  const cleanUpPartialDownload = () => {
+    try {
+      if (existsSync2(tmpPath))
+        unlinkSync(tmpPath);
+    } catch {}
+  };
+  let interrupted = false;
+  const cleanUpInterruptedDownload = () => {
+    if (interrupted)
+      return;
+    interrupted = true;
+    binaryController?.abort();
+    checksumController?.abort();
+    cleanUpPartialDownload();
+    releaseLock?.();
+    releaseLock = null;
+  };
+  const handleSigint = () => {
+    cleanUpInterruptedDownload();
+    process.off("SIGINT", handleSigint);
+    process.kill(process.pid, "SIGINT");
+  };
+  const handleExit = () => cleanUpInterruptedDownload();
+  process.once("SIGINT", handleSigint);
+  process.once("exit", handleExit);
   try {
     if (!existsSync2(versionedCacheDir)) {
       mkdirSync(versionedCacheDir, { recursive: true });
     }
     releaseLock = await acquireDownloadLock(lockPath);
+    sweepStaleDownloadTemps(versionedCacheDir, binaryName);
     if (existsSync2(binaryPath) && isExpectedCachedBinary(binaryPath, tag)) {
       return binaryPath;
     }
@@ -2227,13 +2254,11 @@ async function downloadBinary(version) {
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     error(`Failed to download AFT binary: ${msg}`);
-    if (existsSync2(tmpPath)) {
-      try {
-        unlinkSync(tmpPath);
-      } catch {}
-    }
+    cleanUpPartialDownload();
     return null;
   } finally {
+    process.off("SIGINT", handleSigint);
+    process.off("exit", handleExit);
     if (binaryTimeout) {
       binaryController?.abort();
       clearTimeout(binaryTimeout);
@@ -2259,17 +2284,85 @@ async function ensureBinary(version) {
   log("No cached binary found, downloading latest...");
   return downloadBinary();
 }
-async function acquireDownloadLock(lockPath) {
+function createDownloadLockOwner() {
+  return JSON.stringify({
+    pid: process.pid,
+    hostname: hostname(),
+    createdAt: Date.now(),
+    token: randomUUID()
+  });
+}
+function parseDownloadLockOwner(raw) {
+  try {
+    const parsed = JSON.parse(raw);
+    if (typeof parsed === "object" && parsed !== null) {
+      const { pid, hostname: ownerHostname } = parsed;
+      return {
+        pid: typeof pid === "number" && Number.isSafeInteger(pid) && pid > 0 ? pid : null,
+        hostname: typeof ownerHostname === "string" && ownerHostname ? ownerHostname : null
+      };
+    }
+  } catch {}
+  const legacyPid = Number(raw.split(":", 1)[0]);
+  return {
+    pid: Number.isSafeInteger(legacyPid) && legacyPid > 0 ? legacyPid : null,
+    hostname: null
+  };
+}
+function isProcessAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (err) {
+    return err.code !== "ESRCH";
+  }
+}
+function isReclaimableDownloadLock(owner, ageMs, staleMs) {
+  if (Math.abs(ageMs) > staleMs)
+    return true;
+  return (owner.hostname === null || owner.hostname === hostname()) && owner.pid !== null && !isProcessAlive(owner.pid);
+}
+function reclaimDownloadLock(lockPath, expectedOwner) {
+  try {
+    if (readFileSync3(lockPath, "utf-8") !== expectedOwner)
+      return false;
+    rmSync(lockPath, { force: true });
+    return true;
+  } catch (err) {
+    if (err.code === "ENOENT")
+      return true;
+    throw err;
+  }
+}
+function sweepStaleDownloadTemps(versionedCacheDir, binaryName) {
+  const tempPrefix = `${binaryName}.`;
+  try {
+    for (const entry of readdirSync(versionedCacheDir, { withFileTypes: true })) {
+      if (!entry.isFile() || !entry.name.startsWith(tempPrefix) || !entry.name.endsWith(".tmp")) {
+        continue;
+      }
+      const tempPath = join4(versionedCacheDir, entry.name);
+      const ageMs = Date.now() - statSync2(tempPath).mtimeMs;
+      if (Math.abs(ageMs) > DOWNLOAD_LOCK_STALE_MS)
+        unlinkSync(tempPath);
+    }
+  } catch {}
+}
+async function acquireDownloadLock(lockPath, timing = {}) {
+  const timeoutMs = timing.timeoutMs ?? DOWNLOAD_LOCK_TIMEOUT_MS;
+  const staleMs = timing.staleMs ?? DOWNLOAD_LOCK_STALE_MS;
+  const pollIntervalMs = timing.pollIntervalMs ?? 100;
   const startedAt = Date.now();
   while (true) {
     try {
-      const owner = `${process.pid}:${Date.now()}:${randomUUID()}`;
+      const owner = createDownloadLockOwner();
       const fd = openSync(lockPath, "wx");
-      writeSync(fd, owner);
+      try {
+        writeSync(fd, owner);
+      } finally {
+        closeSync(fd);
+      }
       return () => {
-        try {
-          closeSync(fd);
-        } catch {}
         try {
           if (readFileSync3(lockPath, "utf-8") === owner) {
             rmSync(lockPath, { force: true });
@@ -2280,19 +2373,24 @@ async function acquireDownloadLock(lockPath) {
       const code = err.code;
       if (code !== "EEXIST")
         throw err;
+      let existingOwner;
+      let ageMs;
       try {
-        const ageMs = Date.now() - statSync2(lockPath).mtimeMs;
-        if (ageMs > DOWNLOAD_LOCK_STALE_MS) {
-          rmSync(lockPath, { force: true });
+        existingOwner = readFileSync3(lockPath, "utf-8");
+        ageMs = Date.now() - statSync2(lockPath).mtimeMs;
+      } catch (readErr) {
+        if (readErr.code === "ENOENT")
+          continue;
+        throw readErr;
+      }
+      if (isReclaimableDownloadLock(parseDownloadLockOwner(existingOwner), ageMs, staleMs)) {
+        if (reclaimDownloadLock(lockPath, existingOwner))
           continue;
-        }
-      } catch {
-        continue;
       }
-      if (Date.now() - startedAt > DOWNLOAD_LOCK_TIMEOUT_MS) {
+      if (Date.now() - startedAt > timeoutMs) {
         throw new Error(`Timed out waiting for download lock: ${lockPath}`);
       }
-      await new Promise((resolve3) => setTimeout(resolve3, 100));
+      await new Promise((resolve3) => setTimeout(resolve3, pollIntervalMs));
     }
   }
 }
@@ -2327,7 +2425,7 @@ async function fetchLatestTag() {
     clearTimeout(timeout);
   }
 }
-var REPO = "cortexkit/aft", DOWNLOAD_TIMEOUT_MS = 300000, LATEST_TAG_TIMEOUT_MS = 30000, MAX_DOWNLOAD_BYTES, DOWNLOAD_LOCK_TIMEOUT_MS = 120000, DOWNLOAD_LOCK_STALE_MS;
+var REPO = "cortexkit/aft", DOWNLOAD_TIMEOUT_MS = 300000, LATEST_TAG_TIMEOUT_MS = 30000, MAX_DOWNLOAD_BYTES, DOWNLOAD_LOCK_STALE_MS, DOWNLOAD_LOCK_TIMEOUT_MS;
 var init_downloader = __esm(() => {
   init_active_logger();
   init_cache_paths();
@@ -2335,6 +2433,7 @@ var init_downloader = __esm(() => {
   init_cache_paths();
   MAX_DOWNLOAD_BYTES = 200 * 1024 * 1024;
   DOWNLOAD_LOCK_STALE_MS = 10 * 60000;
+  DOWNLOAD_LOCK_TIMEOUT_MS = DOWNLOAD_LOCK_STALE_MS + 30000;
 });
 
 // ../aft-bridge/dist/durable-log.js
@@ -7291,7 +7390,7 @@ var init_migration = __esm(() => {
 
 // ../aft-bridge/dist/npm-resolver.js
 import { execFileSync } from "node:child_process";
-import { readdirSync, statSync as statSync5 } from "node:fs";
+import { readdirSync as readdirSync2, statSync as statSync5 } from "node:fs";
 import { homedir as homedir9 } from "node:os";
 import { delimiter, dirname as dirname4, isAbsolute as isAbsolute3, join as join9 } from "node:path";
 function defaultDeps() {
@@ -7331,7 +7430,7 @@ function npmAdjacentToNode(deps) {
 function highestVersionedNodeBin(installsDir, name) {
   let entries;
   try {
-    entries = readdirSync(installsDir);
+    entries = readdirSync2(installsDir);
   } catch {
     return null;
   }
@@ -7426,7 +7525,7 @@ var init_npm_resolver = () => {};
 // ../aft-bridge/dist/onnx-runtime.js
 import { execFileSync as execFileSync2 } 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 readdirSync2, readFileSync as readFileSync6, readlinkSync, realpathSync as realpathSync2, rmSync as rmSync3, statSync as statSync6, symlinkSync, unlinkSync as unlinkSync4, writeFileSync as writeFileSync3 } from "node:fs";
+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 { Readable as Readable2 } from "node:stream";
 import { pipeline as pipeline2 } from "node:stream/promises";
@@ -7503,7 +7602,7 @@ async function ensureOnnxRuntime(storageDir) {
 }
 function cleanupAbandonedStagingDirs(onnxBaseDir) {
   try {
-    const entries = readdirSync2(onnxBaseDir);
+    const entries = readdirSync3(onnxBaseDir);
     for (const entry of entries) {
       if (!entry.startsWith(`${ORT_VERSION}.tmp.`))
         continue;
@@ -7514,7 +7613,7 @@ function cleanupAbandonedStagingDirs(onnxBaseDir) {
       let abandoned = false;
       if (Number.isFinite(pid) && pid > 0) {
         if (process.platform === "win32") {
-          const ownerAlive = isProcessAlive(pid);
+          const ownerAlive = isProcessAlive2(pid);
           if (!ownerAlive) {
             abandoned = true;
           } else {
@@ -7526,7 +7625,7 @@ function cleanupAbandonedStagingDirs(onnxBaseDir) {
             }
           }
         } else {
-          abandoned = !isProcessAlive(pid);
+          abandoned = !isProcessAlive2(pid);
         }
       } else {
         abandoned = true;
@@ -7578,7 +7677,7 @@ function isPathInsideRoot(root, candidate) {
 }
 function detectOnnxVersion(libDir, libName) {
   try {
-    const entries = readdirSync2(libDir);
+    const entries = readdirSync3(libDir);
     const barePrefix = libName.replace(/\.(so|dylib|dll)$/, "");
     const expectedPrefix = process.platform === "win32" ? barePrefix.toLowerCase() : barePrefix;
     for (const entry of entries) {
@@ -7641,7 +7740,7 @@ function isWindowsSystem32Directory(dir) {
 }
 function directoryContainsLibrary(dir, libName) {
   try {
-    const entries = readdirSync2(dir);
+    const entries = readdirSync3(dir);
     if (process.platform === "win32") {
       const expected = libName.toLowerCase();
       return entries.some((entry) => entry.toLowerCase() === expected);
@@ -7679,7 +7778,7 @@ function findSystemOnnxRuntime(libName) {
       if (!existsSync7(nugetPackageDir))
         return nugetPaths;
       try {
-        for (const entry of readdirSync2(nugetPackageDir, { withFileTypes: true })) {
+        for (const entry of readdirSync3(nugetPackageDir, { withFileTypes: true })) {
           if (!entry.isDirectory())
             continue;
           if (entry.name === "__globalPackagesFolder" || entry.name.startsWith("."))
@@ -7774,7 +7873,7 @@ function validateExtractedTree(stagingRoot) {
   const realRoot = realpathSync2(stagingRoot);
   let totalBytes = 0;
   const walk = (dir) => {
-    const entries = readdirSync2(dir);
+    const entries = readdirSync3(dir);
     for (const entry of entries) {
       const fullPath = join10(dir, entry);
       const lst = lstatSync(fullPath);
@@ -7832,7 +7931,7 @@ async function downloadOnnxRuntime(info, targetDir) {
       throw new Error(`Expected directory not found: ${extractedDir}`);
     }
     mkdirSync5(targetDir, { recursive: true });
-    const libFiles = readdirSync2(extractedDir).filter((f) => f.startsWith("libonnxruntime") || f.startsWith("onnxruntime"));
+    const libFiles = readdirSync3(extractedDir).filter((f) => f.startsWith("libonnxruntime") || f.startsWith("onnxruntime"));
     const realFiles = [];
     const symlinks = [];
     for (const libFile of libFiles) {
@@ -8010,7 +8109,7 @@ ${new Date().toISOString()}
   }
   const age = Date.now() - lockMtimeMs;
   const ageWithinFresh = Math.abs(age) < STALE_LOCK_MS;
-  const ownerAlive = owningPid !== null && isProcessAlive(owningPid);
+  const ownerAlive = owningPid !== null && isProcessAlive2(owningPid);
   if (ownerAlive && ageWithinFresh) {
     return false;
   }
@@ -8074,7 +8173,7 @@ function isWindowsProcessAlive(pid) {
     return false;
   }
 }
-function isProcessAlive(pid) {
+function isProcessAlive2(pid) {
   if (process.platform === "win32")
     return isWindowsProcessAlive(pid);
   try {
@@ -8486,6 +8585,19 @@ function parseEditArray(value) {
   }
   return value;
 }
+function stripLineRangeSentinels(item) {
+  const hasRangeField = ["startLine", "endLine", "content"].some((key) => hasOwn(item, key));
+  if (!hasRangeField)
+    return;
+  if (item.oldString === "")
+    delete item.oldString;
+  if (item.newString === "")
+    delete item.newString;
+  if (item.replaceAll === false)
+    delete item.replaceAll;
+  if (item.occurrence === 1)
+    delete item.occurrence;
+}
 function normalizeEditItem(value, index) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
     throw new InvalidRequestError(`edit: edits[${index}] must be an object`);
@@ -8494,6 +8606,7 @@ function normalizeEditItem(value, index) {
   const item = copyOwnProperties(source);
   normalizeItemAlias(item, "oldString", "oldText");
   normalizeItemAlias(item, "newString", "newText");
+  stripLineRangeSentinels(item);
   const hasFindField = ["oldString", "newString", "replaceAll", "occurrence"].some((key) => hasOwn(item, key));
   const hasRangeField = ["startLine", "endLine", "content"].some((key) => hasOwn(item, key));
   if (hasFindField && hasRangeField) {
@@ -9764,7 +9877,7 @@ var init_binary_probe = __esm(async () => {
 });
 
 // src/lib/fs-util.ts
-import { existsSync as existsSync10, readdirSync as readdirSync3, statSync as statSync7 } from "node:fs";
+import { existsSync as existsSync10, readdirSync as readdirSync4, statSync as statSync7 } from "node:fs";
 import { join as join14 } from "node:path";
 function dirSize(path2) {
   if (!existsSync10(path2)) {
@@ -9778,7 +9891,7 @@ function dirSize(path2) {
     return 0;
   }
   let total = 0;
-  for (const entry of readdirSync3(path2)) {
+  for (const entry of readdirSync4(path2)) {
     total += dirSize(join14(path2, entry));
   }
   return total;
@@ -20205,7 +20318,7 @@ __export(exports_lsp, {
   printLspDoctorHelp: () => printLspDoctorHelp,
   findProjectRootForFile: () => findProjectRootForFile
 });
-import { existsSync as existsSync14, readdirSync as readdirSync4, statSync as statSync9 } from "node:fs";
+import { existsSync as existsSync14, readdirSync as readdirSync5, statSync as statSync9 } from "node:fs";
 import { createRequire as createRequire4 } from "node:module";
 import { dirname as dirname8, join as join17, resolve as resolve8 } from "node:path";
 function findProjectRootForFile(filePath, fallbackCwd = process.cwd()) {
@@ -20377,7 +20490,7 @@ function childDirs(path2) {
   if (!existsSync14(path2))
     return [];
   try {
-    return readdirSync4(path2).map((entry) => join17(path2, entry)).filter((entry) => {
+    return readdirSync5(path2).map((entry) => join17(path2, entry)).filter((entry) => {
       try {
         return statSync9(entry).isDirectory();
       } catch {
@@ -20708,7 +20821,7 @@ var init_doctor_filters = __esm(async () => {
 });
 
 // src/lib/binary-cache.ts
-import { existsSync as existsSync16, readdirSync as readdirSync5, statSync as statSync10 } from "node:fs";
+import { existsSync as existsSync16, readdirSync as readdirSync6, statSync as statSync10 } from "node:fs";
 import { join as join18 } from "node:path";
 function getBinaryCacheInfo(activeVersion) {
   const path2 = getAftBinaryCacheDir();
@@ -20720,7 +20833,7 @@ function getBinaryCacheInfo(activeVersion) {
       path: path2
     };
   }
-  const versions = readdirSync5(path2).filter((entry) => {
+  const versions = readdirSync6(path2).filter((entry) => {
     try {
       return statSync10(join18(path2, entry)).isDirectory();
     } catch {
@@ -20962,7 +21075,7 @@ var init_bridge_tool_failures = __esm(() => {
 });
 
 // src/lib/legacy-storage.ts
-import { existsSync as existsSync18, readdirSync as readdirSync6, statSync as statSync12 } from "node:fs";
+import { existsSync as existsSync18, readdirSync as readdirSync7, statSync as statSync12 } from "node:fs";
 import { join as join19 } from "node:path";
 function summarizeLegacyPartitionDuplication(storageRoot) {
   if (!existsSync18(storageRoot)) {
@@ -21060,7 +21173,7 @@ function looksLikePartitionKey(value) {
 }
 function safeReadDir(path2) {
   try {
-    return readdirSync6(path2).sort((left, right) => left.localeCompare(right));
+    return readdirSync7(path2).sort((left, right) => left.localeCompare(right));
   } catch {
     return [];
   }
@@ -21086,7 +21199,7 @@ var init_legacy_storage = __esm(() => {
 });
 
 // src/lib/lsp-cache.ts
-import { existsSync as existsSync19, readdirSync as readdirSync7, rmSync as rmSync5, statSync as statSync13 } from "node:fs";
+import { existsSync as existsSync19, readdirSync as readdirSync8, rmSync as rmSync5, statSync as statSync13 } from "node:fs";
 import { join as join20 } from "node:path";
 function inspectDir(path2) {
   if (!existsSync19(path2)) {
@@ -21096,7 +21209,7 @@ function inspectDir(path2) {
   let totalSize = 0;
   let names;
   try {
-    names = readdirSync7(path2);
+    names = readdirSync8(path2);
   } catch {
     return { entries: [], totalSize: 0 };
   }
@@ -21159,7 +21272,7 @@ var init_lsp_cache = __esm(() => {
 });
 
 // src/lib/onnx.ts
-import { existsSync as existsSync20, readdirSync as readdirSync8, readlinkSync as readlinkSync2, realpathSync as realpathSync4 } from "node:fs";
+import { existsSync as existsSync20, readdirSync as readdirSync9, readlinkSync as readlinkSync2, realpathSync as realpathSync4 } from "node:fs";
 import { basename as basename3, isAbsolute as isAbsolute6, join as join21, resolve as resolve10, win32 as win322 } from "node:path";
 function getOnnxLibraryName() {
   if (process.platform === "darwin")
@@ -21213,7 +21326,7 @@ function isWindowsSystem32Directory2(dir) {
 }
 function directoryContainsLibrary2(dir, libName) {
   try {
-    const entries = readdirSync8(dir);
+    const entries = readdirSync9(dir);
     if (process.platform === "win32") {
       const expected = libName.toLowerCase();
       return entries.some((entry) => entry.toLowerCase() === expected);
@@ -21261,7 +21374,7 @@ function findSystemOnnxRuntime2() {
       if (!existsSync20(nugetPackageDir))
         return nugetPaths;
       try {
-        for (const entry of readdirSync8(nugetPackageDir, { withFileTypes: true })) {
+        for (const entry of readdirSync9(nugetPackageDir, { withFileTypes: true })) {
           if (!entry.isDirectory())
             continue;
           if (entry.name === "__globalPackagesFolder" || entry.name.startsWith("."))
@@ -21328,7 +21441,7 @@ function detectOrtVersion(libDir) {
     return null;
   const libName = getOnnxLibraryName();
   try {
-    const entries = readdirSync8(libDir);
+    const entries = readdirSync9(libDir);
     const barePrefix = libName.replace(/\.(so|dylib|dll)$/, "");
     const expectedPrefix = process.platform === "win32" ? barePrefix.toLowerCase() : barePrefix;
     for (const entry of entries) {
@@ -21960,7 +22073,7 @@ var init_onnx_fix = __esm(() => {
 });
 
 // src/lib/sessions.ts
-import { existsSync as existsSync23, readdirSync as readdirSync9, readFileSync as readFileSync10, statSync as statSync15 } from "node:fs";
+import { existsSync as existsSync23, readdirSync as readdirSync10, readFileSync as readFileSync10, statSync as statSync15 } from "node:fs";
 import { createRequire as createRequire5 } from "node:module";
 import { homedir as homedir18 } from "node:os";
 import { basename as basename4, join as join23 } from "node:path";
@@ -22056,7 +22169,7 @@ function collectJsonlFiles(root) {
       continue;
     let entries;
     try {
-      entries = readdirSync9(dir, { withFileTypes: true });
+      entries = readdirSync10(dir, { withFileTypes: true });
     } catch {
       continue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft",
-  "version": "0.50.0",
+  "version": "0.50.1",
   "type": "module",
   "description": "Unified CLI for Agent File Tools (AFT) — setup, doctor, and diagnostics across supported agent harnesses (OpenCode, Pi)",
   "license": "MIT",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.6.0",
-    "@cortexkit/aft-bridge": "0.50.0",
+    "@cortexkit/aft-bridge": "0.50.1",
     "comment-json": "^4.6.2"
   },
   "devDependencies": {