ushman-ledger 1.2.1 → 1.3.0

package/dist/storage/lock.js

@@ -1,5 +1,6 @@
 import { randomUUID } from 'node:crypto';
-import { open, readFile, rename, rm, stat } from 'node:fs/promises';
+import { open, readFile, rename, rm } from 'node:fs/promises';
+import { isProcessAlive } from "../process.js";
 const DEFAULT_LOCK_OPTIONS = {
     // Give writers enough time to detect and reclaim a stale lock before timing out.
     retryDelayMs: 10,
@@ -7,6 +8,12 @@ const DEFAULT_LOCK_OPTIONS = {
     timeoutMs: 35_000,
 };
 const sleep = async (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const parseOwnerPid = (value) => {
+    if (typeof value !== 'number' || !Number.isInteger(value) || value <= 0) {
+        return null;
+    }
+    return value;
+};
 const readLockState = async (lockPath) => {
     try {
         const rawText = await readFile(lockPath, 'utf8');
@@ -14,6 +21,7 @@ const readLockState = async (lockPath) => {
             const parsed = JSON.parse(rawText);
             const startedAt = typeof parsed.startedAt === 'string' ? Date.parse(parsed.startedAt) : Number.NaN;
             return {
+                ownerPid: parseOwnerPid(parsed.pid),
                 rawText,
                 startedAtMs: Number.isNaN(startedAt) ? null : startedAt,
                 token: typeof parsed.token === 'string' && parsed.token.length > 0 ? parsed.token : null,
@@ -21,6 +29,7 @@ const readLockState = async (lockPath) => {
         }
         catch {
             return {
+                ownerPid: null,
                 rawText,
                 startedAtMs: null,
                 token: null,
@@ -35,6 +44,9 @@ const readLockState = async (lockPath) => {
     }
 };
 const isFreshLockState = (lockState, staleMs) => {
+    if (lockState.ownerPid !== null && !isProcessAlive(lockState.ownerPid)) {
+        return false;
+    }
     if (lockState.startedAtMs === null) {
         return false;
     }
@@ -62,17 +74,17 @@ const writeExclusiveTextFile = async (filePath, text) => {
         await handle.close();
     }
 };
-const reclaimMarkerExists = async (lockPath) => {
-    try {
-        await stat(buildReclaimMarkerPath(lockPath));
-        return true;
+const hasActiveReclaimMarker = async (lockPath, staleMs) => {
+    const reclaimMarkerPath = buildReclaimMarkerPath(lockPath);
+    const reclaimMarkerState = await readLockState(reclaimMarkerPath);
+    if (!reclaimMarkerState) {
+        return false;
     }
-    catch (error) {
-        if (error.code === 'ENOENT') {
-            return false;
-        }
-        throw error;
+    if (isFreshLockState(reclaimMarkerState, staleMs)) {
+        return true;
     }
+    await rm(reclaimMarkerPath, { force: true });
+    return false;
 };
 const acquireReclaimMarker = async (lockPath) => {
     const reclaimMarkerPath = buildReclaimMarkerPath(lockPath);
@@ -126,17 +138,24 @@ const reclaimIfObservedStateMatches = async ({ lockPath, observedState, testHook
             }
             throw error;
         }
+        let shouldRemoveQuarantine = false;
         try {
             const quarantinedState = await readLockState(quarantinePath);
             if (!quarantinedState || quarantinedState.rawText !== observedState.rawText) {
                 await restoreQuarantinedLock(lockPath, quarantinePath);
                 return false;
             }
-            await rm(quarantinePath, { force: true });
+            shouldRemoveQuarantine = true;
             return true;
         }
+        catch (error) {
+            await restoreQuarantinedLock(lockPath, quarantinePath);
+            throw error;
+        }
         finally {
-            await rm(quarantinePath, { force: true });
+            if (shouldRemoveQuarantine) {
+                await rm(quarantinePath, { force: true });
+            }
         }
     }
     finally {
@@ -155,7 +174,10 @@ const reclaimIfStale = async (lockPath, options) => {
     });
 };
 const describeCurrentLockState = async (lockPath) => {
-    const [currentState, reclaiming] = await Promise.all([readLockState(lockPath), reclaimMarkerExists(lockPath)]);
+    const [currentState, reclaiming] = await Promise.all([
+        readLockState(lockPath),
+        hasActiveReclaimMarker(lockPath, DEFAULT_LOCK_OPTIONS.staleMs),
+    ]);
     if (!currentState) {
         return reclaiming ? 'lock missing while stale reclamation marker is present' : 'lock file is missing';
     }
@@ -163,7 +185,7 @@ const describeCurrentLockState = async (lockPath) => {
     return `${ageMs}, token=${currentState.token ?? 'missing'}, reclaiming=${reclaiming ? 'yes' : 'no'}`;
 };
 const assertOwnership = async (lockPath, token) => {
-    if (await reclaimMarkerExists(lockPath)) {
+    if (await hasActiveReclaimMarker(lockPath, DEFAULT_LOCK_OPTIONS.staleMs)) {
         throw new Error(`Lost ledger lock ownership for ${lockPath}: stale reclamation is in progress.`);
     }
     const currentState = await readLockState(lockPath);
@@ -182,7 +204,7 @@ export const acquireLock = async (lockPath, options = {}) => {
     const mergedOptions = { ...DEFAULT_LOCK_OPTIONS, ...options };
     const deadline = Date.now() + mergedOptions.timeoutMs;
     while (Date.now() <= deadline) {
-        if (await reclaimMarkerExists(lockPath)) {
+        if (await hasActiveReclaimMarker(lockPath, mergedOptions.staleMs)) {
             await sleep(mergedOptions.retryDelayMs);
             continue;
         }
@@ -201,7 +223,7 @@ export const acquireLock = async (lockPath, options = {}) => {
             finally {
                 await handle.close();
             }
-            if (await reclaimMarkerExists(lockPath)) {
+            if (await hasActiveReclaimMarker(lockPath, mergedOptions.staleMs)) {
                 await releaseIfOwned(lockPath, token);
                 await sleep(mergedOptions.retryDelayMs);
                 continue;

package/dist/text-lines.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Visit each logical line in `text`, normalizing trailing `\r` from CRLF input.
+ *
+ * The final unterminated line is still visited, which keeps diff parsing stable for
+ * patch content that does not end with a trailing newline.
+ */
+export declare const forEachLine: (text: string, visit: (line: string) => void) => void;
+//# sourceMappingURL=text-lines.d.ts.map

package/dist/text-lines.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"text-lines.d.ts","sourceRoot":"","sources":["../src/text-lines.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,SAatE,CAAC"}

package/dist/text-lines.js

@@ -0,0 +1,20 @@
+/**
+ * Visit each logical line in `text`, normalizing trailing `\r` from CRLF input.
+ *
+ * The final unterminated line is still visited, which keeps diff parsing stable for
+ * patch content that does not end with a trailing newline.
+ */
+export const forEachLine = (text, visit) => {
+    let lineStart = 0;
+    for (let index = 0; index <= text.length; index += 1) {
+        if (index !== text.length && text.charCodeAt(index) !== 10) {
+            continue;
+        }
+        let line = text.slice(lineStart, index);
+        if (line.endsWith('\r')) {
+            line = line.slice(0, -1);
+        }
+        visit(line);
+        lineStart = index + 1;
+    }
+};

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const LEDGER_LIBRARY_VERSION = "1.2.0";
+export declare const LEDGER_LIBRARY_VERSION: string;
 //# sourceMappingURL=version.d.ts.map

package/dist/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,UAAU,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,sBAAsB,QAAsB,CAAC"}

package/dist/version.js

@@ -1 +1,2 @@
-export const LEDGER_LIBRARY_VERSION = '1.2.0';
+import packageJson from '../package.json' with { type: 'json' };
+export const LEDGER_LIBRARY_VERSION = packageJson.version;

package/package.json

@@ -16,7 +16,7 @@
     },
     "description": "Append-only workspace ledger library and CLI for Ushman v4.",
     "devDependencies": {
-        "@biomejs/biome": "^2.4.15",
+        "@biomejs/biome": "^2.4.16",
         "@types/bun": "^1.3.14",
         "@types/node": "^25.9.1",
         "typescript": "^6.0.3"
@@ -37,7 +37,9 @@
     },
     "files": [
         "dist",
+        "ARCHITECTURE.md",
         "CHANGELOG.md",
+        "TROUBLESHOOTING.md",
         "README.md",
         "AGENTS.md",
         "LICENSE.md"
@@ -68,5 +70,5 @@
     },
     "type": "module",
     "types": "dist/index.d.ts",
-    "version": "1.2.1"
+    "version": "1.3.0"
 }