@giovannijecha/jecode 0.3.0 → 0.3.2

package/dist/store-lock.js

@@ -4,7 +4,7 @@
 // from replacing unrelated settings, API keys, or rotated OAuth credentials
 // with snapshots they cached before the other process wrote.
 import { randomUUID } from "node:crypto";
-import { mkdir, open, readFile, rename, rmdir, stat, unlink } from "node:fs/promises";
+import { mkdir, open, readFile, rmdir, stat, unlink } from "node:fs/promises";
 import * as path from "node:path";
 const WAIT_MS = 50;
 const WAIT_LIMIT_MS = 20_000;
@@ -59,10 +59,12 @@ async function recoverStale(directory) {
         const details = await stat(directory);
         if (Date.now() - details.mtimeMs < STALE_MS)
             return;
-        const quarantined = `${directory}.${randomUUID()}.stale`;
-        await rename(directory, quarantined);
-        await unlink(path.join(quarantined, "owner")).catch(() => undefined);
-        await rmdir(quarantined).catch(() => undefined);
+        if (await ownerIsAlive(directory))
+            return;
+        // Remove the owner first, then the now-empty directory. `rmdir` cannot
+        // erase a fresh lock acquired after another waiter wins this recovery,
+        // whereas renaming the shared path can steal that new lock in an ABA race.
+        await removeLock(directory);
     }
     catch (error) {
         const code = error.code;
@@ -70,6 +72,36 @@ async function recoverStale(directory) {
             throw error;
     }
 }
+async function ownerIsAlive(directory) {
+    let token;
+    try {
+        token = await readFile(path.join(directory, "owner"), "utf8");
+    }
+    catch (error) {
+        const code = error.code;
+        if (code === "ENOENT")
+            return false;
+        if (code === "EACCES" || code === "EPERM")
+            return true;
+        throw error;
+    }
+    const match = /^([1-9]\d*):/.exec(token.trim());
+    if (match === null)
+        return false;
+    const pid = Number(match[1]);
+    if (!Number.isSafeInteger(pid) || pid > 0x7fff_ffff)
+        return false;
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (error) {
+        // ESRCH is the one portable proof that the owner no longer exists.
+        // Permission failures and unknown platform errors must not authorize a
+        // second writer to enter the same store.
+        return error.code !== "ESRCH";
+    }
+}
 async function release(directory, token) {
     try {
         const owner = path.join(directory, "owner");

package/dist/tools/ripgrep.js

@@ -102,6 +102,7 @@ function searchBatch(executable, files, options) {
         let buffered = "";
         let stderr = "";
         let invalid = false;
+        let overLimit = false;
         let settled = false;
         const onAbort = () => child.kill();
         options.signal?.addEventListener("abort", onAbort, { once: true });
@@ -118,13 +119,23 @@ function searchBatch(executable, files, options) {
                 resolve(value);
         };
         const consume = (line) => {
-            if (line === "" || invalid)
+            if (line === "" || invalid || overLimit)
                 return;
             try {
                 const event = JSON.parse(line);
                 const parsed = ripgrepEvent(event);
-                if (parsed?.kind === "match")
+                if (parsed?.kind === "match") {
+                    // `rg --max-count` is per file, not global. Once the raw stream
+                    // exceeds the requested result count, stop the accelerator and let
+                    // the portable scanner produce the exact bounded answer. Returning
+                    // early here would lose the later binary-file end marker.
+                    if (matches.length >= options.limit) {
+                        overLimit = true;
+                        child.kill();
+                        return;
+                    }
                     matches.push(parsed.match);
+                }
                 if (parsed?.kind === "binary")
                     binaryPaths.add(parsed.path);
             }
@@ -166,7 +177,7 @@ function searchBatch(executable, files, options) {
                 return;
             }
             consume(buffered);
-            if (invalid || (code !== 0 && code !== 1) || stderr.trim() !== "") {
+            if (invalid || overLimit || (code !== 0 && code !== 1) || stderr.trim() !== "") {
                 finish(undefined);
                 return;
             }

package/dist/tui/components/tool.js

@@ -2,7 +2,6 @@
 import { hasColor, row } from "../../ui/render.js";
 const OUTPUT_ROWS = 8;
 const LIVE_OUTPUT_ROWS = 6;
-const DIFF_ROWS = 12;
 export function renderTool(block, width, pal, context = {}) {
     const shown = visibleDetails(block);
     const right = liveLabel(block, context);
@@ -31,54 +30,9 @@ function visibleDetails(block) {
             : `… ${hidden} earlier lines · ctrl+o expand`;
         return [{ kind: "gap", text: note }, ...all.slice(-limit)];
     }
-    return diffWindow(all);
-}
-/** Keep change rows and their nearest context; never turn a diff into a tail. */
-function diffWindow(all) {
-    if (all.length <= DIFF_ROWS)
-        return [...all];
-    const important = all.flatMap((detail, index) => detail.kind === "keep" ? [] : [index]);
-    const chosen = new Set();
-    const budgeted = important.length <= DIFF_ROWS
-        ? important
-        : [
-            ...important.slice(0, Math.ceil(DIFF_ROWS / 2)),
-            ...important.slice(-Math.floor(DIFF_ROWS / 2)),
-        ];
-    for (const index of budgeted)
-        chosen.add(index);
-    for (let radius = 1; chosen.size < DIFF_ROWS && radius < all.length; radius++) {
-        for (const index of important) {
-            for (const candidate of [index - radius, index + radius]) {
-                if (candidate < 0 || candidate >= all.length || chosen.has(candidate))
-                    continue;
-                chosen.add(candidate);
-                if (chosen.size >= DIFF_ROWS)
-                    break;
-            }
-            if (chosen.size >= DIFF_ROWS)
-                break;
-        }
-    }
-    const indexes = [...chosen].sort((left, right) => left - right);
-    const out = [];
-    let previous = -1;
-    for (const index of indexes) {
-        if (index > previous + 1) {
-            out.push({ kind: "gap", text: `… ${index - previous - 1} lines hidden · ctrl+o expand` });
-        }
-        const detail = all[index];
-        if (detail !== undefined)
-            out.push(detail);
-        previous = index;
-    }
-    if (previous < all.length - 1) {
-        out.push({
-            kind: "gap",
-            text: `… ${all.length - previous - 1} lines hidden · ctrl+o expand`,
-        });
-    }
-    return out;
+    // The compact transcript is an audit of what changed, not a code excerpt.
+    // Context and gap rows remain in semantic state for the explicit full view.
+    return all.filter((detail) => detail.kind === "add" || detail.kind === "del");
 }
 function renderDetail(detail, tone, width, pal) {
     const lead = { text: " " };

package/dist/ui/theme.js

@@ -18,7 +18,7 @@ export const STEEL = {
     },
     surface: {
         subtle: [31, 38, 47],
-        inset: [18, 24, 31],
+        inset: [42, 52, 66],
         added: [22, 55, 34],
         removed: [62, 24, 27],
         attention: [62, 50, 19],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giovannijecha/jecode",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "An owned coding agent with zero external runtime dependencies.",
   "license": "MIT",
   "repository": {