@skillsmith/core 0.11.4 → 0.11.6

package/dist/src/compatibility/slugs.js

@@ -31,11 +31,15 @@ export const COMPATIBILITY_LABELS = {
 };
 /**
  * Slugs that are filterable/browsable but have NO install target yet — the
- * install-client enum (`install/paths.ts` `ClientId`) lacks them. Adding
- * `antigravity`/`gemini` ClientIds + auto-detect is Phase 2c (SMI-5179). Until
- * then the UI labels these "browse-only" rather than implying installability.
+ * install-client enum (`install/paths.ts` `ClientId`) lacks them.
+ * `antigravity` was un-deferred (SMI-5982 Wave 6) — it now has a real
+ * `ClientId` + `CLIENT_NATIVE_PATHS` entry, so it moved out of this list.
+ * `gemini` has no install target (it names a model family, not a distinct
+ * install client) and remains browse-only; adding it (if ever justified) is
+ * still Phase 2c (SMI-5179). Until then the UI labels `gemini` "browse-only"
+ * rather than implying installability.
  */
-export const BROWSE_ONLY_SLUGS = ['antigravity', 'gemini'];
+export const BROWSE_ONLY_SLUGS = ['gemini'];
 /**
  * Map an install `ClientId` to the compatibility slug to restrict by when that
  * client is the user's explicit tool (MCP restrictive default, SMI-5178).
@@ -49,6 +53,9 @@ export const CLIENT_TO_COMPATIBILITY_SLUG = {
     copilot: 'copilot',
     windsurf: 'windsurf',
     agents: 'codex',
+    // SMI-5982 Wave 6: antigravity is now a real ClientId with its own 1:1
+    // compatibility slug (same pattern as claude-code/cursor/copilot/windsurf).
+    antigravity: 'antigravity',
 };
 /** Display label for a slug; falls back to the raw slug for unknown values. */
 export function compatibilityLabel(slug) {

package/dist/src/compatibility/slugs.js.map

@@ -1 +1 @@
-{"version":3,"file":"slugs.js","sourceRoot":"","sources":["../../../src/compatibility/slugs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,6FAA6F;AAC7F,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,aAAa;IACb,QAAQ;IACR,SAAS;IACT,UAAU;IACV,aAAa;IACb,OAAO;IACP,QAAQ;CACA,CAAA;AAIV,8DAA8D;AAC9D,MAAM,CAAC,MAAM,oBAAoB,GAAsC;IACrE,aAAa,EAAE,aAAa;IAC5B,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,gBAAgB;IACzB,QAAQ,EAAE,UAAU;IACpB,WAAW,EAAE,aAAa;IAC1B,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;CACjB,CAAA;AAED;;;;;GAKG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAiC,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAA;AAExF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAsC;IAC7E,aAAa,EAAE,aAAa;IAC5B,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,OAAO;CAChB,CAAA;AAED,+EAA+E;AAC/E,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,OAAQ,oBAA+C,CAAC,IAAI,CAAC,IAAI,IAAI,CAAA;AACvE,CAAC"}
+{"version":3,"file":"slugs.js","sourceRoot":"","sources":["../../../src/compatibility/slugs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,6FAA6F;AAC7F,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,aAAa;IACb,QAAQ;IACR,SAAS;IACT,UAAU;IACV,aAAa;IACb,OAAO;IACP,QAAQ;CACA,CAAA;AAIV,8DAA8D;AAC9D,MAAM,CAAC,MAAM,oBAAoB,GAAsC;IACrE,aAAa,EAAE,aAAa;IAC5B,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,gBAAgB;IACzB,QAAQ,EAAE,UAAU;IACpB,WAAW,EAAE,aAAa;IAC1B,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;CACjB,CAAA;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAiC,CAAC,QAAQ,CAAC,CAAA;AAEzE;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAsC;IAC7E,aAAa,EAAE,aAAa;IAC5B,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,OAAO;IACf,uEAAuE;IACvE,4EAA4E;IAC5E,WAAW,EAAE,aAAa;CAC3B,CAAA;AAED,+EAA+E;AAC/E,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,OAAQ,oBAA+C,CAAC,IAAI,CAAC,IAAI,IAAI,CAAA;AACvE,CAAC"}

package/dist/src/config/config-atomic-write.d.ts

@@ -17,9 +17,17 @@
  *     principle observe a partially-written file.
  *
  * This module fixes both:
- *  - {@link acquireConfigLock} serializes ALL writers (cross-process, via a
- *    create-exclusive `.lock` sentinel file) so a caller's full
- *    read-modify-write sequence is one atomic critical section.
+ *  - {@link acquireConfigLock} serializes ALL writers (cross-process) so a
+ *    caller's full read-modify-write sequence is one atomic critical
+ *    section. SMI-5883 Wave 2: this is now a thin wrapper over the shared
+ *    two-level {@link acquireOwnedLock} primitive (`owned-lock.ts`) —
+ *    staleness is determined by OWNER LIVENESS (not file age), and a stale
+ *    lock is reclaimed only from inside a second, strict-no-auto-reclaim
+ *    lock that serializes reclaim decisions. The prior age-based
+ *    `STALE_LOCK_AGE_MS` force-clear is REMOVED, not tuned — a lock held
+ *    legitimately longer than any timeout now correctly times out instead
+ *    of being force-cleared out from under its live holder. See
+ *    `owned-lock.ts`'s module docstring for the full soundness argument.
  *  - {@link atomicWriteFile} writes to a temp file in the same directory,
  *    then `renameSync`s it into place — POSIX guarantees `rename(2)` is
  *    atomic, so a concurrent reader (which never needs the lock — only
@@ -27,14 +35,26 @@
  *    never a torn write.
  */
 /**
- * Acquire an exclusive, cross-process lock guarding `configPath`.
+ * Acquire an exclusive, cross-process lock guarding `configPath`. Thin
+ * wrapper over {@link acquireOwnedLock} (SMI-5883 Wave 2) — preserves this
+ * function's signature and its `${configPath}.lock` path so no caller needs
+ * to change. Behaviour deltas vs the pre-SMI-5883 implementation (each
+ * covered by a test in `config-atomic-write.test.ts`):
  *
- * Uses atomic create-exclusive (the `wx` flag — fails with `EEXIST` if the
- * lock file already exists) as the mutual-exclusion primitive: portable
- * (identical behavior on macOS/Linux/Windows) and needs no extra
- * dependency. Retries with a short backoff until `LOCK_ACQUIRE_TIMEOUT_MS`
- * elapses. If the held lock is older than `STALE_LOCK_AGE_MS` it is assumed
- * abandoned by a crashed process and force-cleared once, then retried.
+ *  1. A stale lock is cleared on OWNER DEATH, not on AGE. A lock held by a
+ *     live process for longer than the old 10s threshold is no longer
+ *     force-cleared — it now correctly waits, then times out.
+ *  2. A legacy bare-PID lock (this module's OWN pre-SMI-5883 on-disk format)
+ *     is no longer cleared at all — `StuckLockError { reason:
+ *     'unreclaimable_legacy' }` (D-5: a legacy claim carries no `host`, so
+ *     "dead on this host" cannot establish "dead").
+ *  3. The on-disk lock content changes from a bare PID to a v1 JSON record.
+ *     No in-repo consumer parses it directly (only this module's own
+ *     `acquireConfigLock`/release touch the file).
+ *  4. The timeout message keeps the stable prefix "Timed out waiting for
+ *     config lock" (via `label: 'config lock'`) so existing assertions
+ *     still match, with the failure reason and the manual unstick procedure
+ *     appended.
  *
  * @param configPath - Path to the config file being guarded (NOT the lock
  * file itself — the lock file is `${configPath}.lock`).

package/dist/src/config/config-atomic-write.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-atomic-write.d.ts","sourceRoot":"","sources":["../../../src/config/config-atomic-write.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AA2CH;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,SAAS,GAAE,MAAgC,GAC1C,MAAM,IAAI,CAmDZ;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAarF"}
+{"version":3,"file":"config-atomic-write.d.ts","sourceRoot":"","sources":["../../../src/config/config-atomic-write.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAeH;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,SAAS,GAAE,MAAgC,GAC1C,MAAM,IAAI,CAEZ;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAarF"}

package/dist/src/config/config-atomic-write.js

@@ -17,9 +17,17 @@
  *     principle observe a partially-written file.
  *
  * This module fixes both:
- *  - {@link acquireConfigLock} serializes ALL writers (cross-process, via a
- *    create-exclusive `.lock` sentinel file) so a caller's full
- *    read-modify-write sequence is one atomic critical section.
+ *  - {@link acquireConfigLock} serializes ALL writers (cross-process) so a
+ *    caller's full read-modify-write sequence is one atomic critical
+ *    section. SMI-5883 Wave 2: this is now a thin wrapper over the shared
+ *    two-level {@link acquireOwnedLock} primitive (`owned-lock.ts`) —
+ *    staleness is determined by OWNER LIVENESS (not file age), and a stale
+ *    lock is reclaimed only from inside a second, strict-no-auto-reclaim
+ *    lock that serializes reclaim decisions. The prior age-based
+ *    `STALE_LOCK_AGE_MS` force-clear is REMOVED, not tuned — a lock held
+ *    legitimately longer than any timeout now correctly times out instead
+ *    of being force-cleared out from under its live holder. See
+ *    `owned-lock.ts`'s module docstring for the full soundness argument.
  *  - {@link atomicWriteFile} writes to a temp file in the same directory,
  *    then `renameSync`s it into place — POSIX guarantees `rename(2)` is
  *    atomic, so a concurrent reader (which never needs the lock — only
@@ -27,42 +35,36 @@
  *    never a torn write.
  */
 import { randomBytes } from 'node:crypto';
-import { openSync, closeSync, unlinkSync, writeFileSync, renameSync, statSync, chmodSync, } from 'node:fs';
+import { writeFileSync, renameSync, chmodSync } from 'node:fs';
 import { dirname, join } from 'node:path';
+import { acquireOwnedLock } from './owned-lock.js';
 /**
  * Max time to wait for a lock before giving up (ms). This guards a
  * user-facing CLI/MCP-server startup path, so it must fail loudly with a
  * clear error rather than hang indefinitely.
  */
 const LOCK_ACQUIRE_TIMEOUT_MS = 5_000;
-/** Backoff between lock-acquisition retries (ms). */
-const LOCK_RETRY_DELAY_MS = 20;
 /**
- * A lock file older than this is assumed to be left behind by a crashed
- * process (stale) and is force-removed. A healthy holder releases the lock
- * within milliseconds of a local JSON read+write, so this is a generous
- * margin, not a tight race.
- */
-const STALE_LOCK_AGE_MS = 10_000;
-/**
- * Synchronously block the calling thread for `ms` milliseconds without
- * spinning the CPU. `Atomics.wait` on a throwaway `SharedArrayBuffer` is the
- * standard synchronous-sleep primitive in Node (unlike browsers, Node does
- * not forbid calling it on the main thread).
- */
-function sleepSync(ms) {
-    const view = new Int32Array(new SharedArrayBuffer(4));
-    Atomics.wait(view, 0, 0, ms);
-}
-/**
- * Acquire an exclusive, cross-process lock guarding `configPath`.
+ * Acquire an exclusive, cross-process lock guarding `configPath`. Thin
+ * wrapper over {@link acquireOwnedLock} (SMI-5883 Wave 2) — preserves this
+ * function's signature and its `${configPath}.lock` path so no caller needs
+ * to change. Behaviour deltas vs the pre-SMI-5883 implementation (each
+ * covered by a test in `config-atomic-write.test.ts`):
  *
- * Uses atomic create-exclusive (the `wx` flag — fails with `EEXIST` if the
- * lock file already exists) as the mutual-exclusion primitive: portable
- * (identical behavior on macOS/Linux/Windows) and needs no extra
- * dependency. Retries with a short backoff until `LOCK_ACQUIRE_TIMEOUT_MS`
- * elapses. If the held lock is older than `STALE_LOCK_AGE_MS` it is assumed
- * abandoned by a crashed process and force-cleared once, then retried.
+ *  1. A stale lock is cleared on OWNER DEATH, not on AGE. A lock held by a
+ *     live process for longer than the old 10s threshold is no longer
+ *     force-cleared — it now correctly waits, then times out.
+ *  2. A legacy bare-PID lock (this module's OWN pre-SMI-5883 on-disk format)
+ *     is no longer cleared at all — `StuckLockError { reason:
+ *     'unreclaimable_legacy' }` (D-5: a legacy claim carries no `host`, so
+ *     "dead on this host" cannot establish "dead").
+ *  3. The on-disk lock content changes from a bare PID to a v1 JSON record.
+ *     No in-repo consumer parses it directly (only this module's own
+ *     `acquireConfigLock`/release touch the file).
+ *  4. The timeout message keeps the stable prefix "Timed out waiting for
+ *     config lock" (via `label: 'config lock'`) so existing assertions
+ *     still match, with the failure reason and the manual unstick procedure
+ *     appended.
  *
  * @param configPath - Path to the config file being guarded (NOT the lock
  * file itself — the lock file is `${configPath}.lock`).
@@ -72,56 +74,7 @@ function sleepSync(ms) {
  * `finally` block, so the lock is released even if the guarded work throws.
  */
 export function acquireConfigLock(configPath, timeoutMs = LOCK_ACQUIRE_TIMEOUT_MS) {
-    const lockPath = `${configPath}.lock`;
-    const deadline = Date.now() + timeoutMs;
-    let staleClearAttempted = false;
-    for (;;) {
-        try {
-            const fd = openSync(lockPath, 'wx', 0o600);
-            try {
-                writeFileSync(fd, String(process.pid));
-            }
-            finally {
-                closeSync(fd);
-            }
-            return () => {
-                try {
-                    unlinkSync(lockPath);
-                }
-                catch {
-                    // Already gone. Releasing an already-released lock is a no-op,
-                    // not an error (defensive — should not happen in practice since
-                    // each acquire pairs with exactly one release).
-                }
-            };
-        }
-        catch (err) {
-            if (err.code !== 'EEXIST')
-                throw err;
-            if (!staleClearAttempted) {
-                staleClearAttempted = true;
-                try {
-                    const age = Date.now() - statSync(lockPath).mtimeMs;
-                    if (age > STALE_LOCK_AGE_MS) {
-                        unlinkSync(lockPath);
-                        continue; // retry immediately — don't burn the backoff budget on this attempt
-                    }
-                }
-                catch {
-                    // Lock file vanished between the failed open and this stat (the
-                    // holder released it concurrently, or another waiter already
-                    // cleared it) — just retry the open below.
-                    continue;
-                }
-            }
-            if (Date.now() >= deadline) {
-                throw new Error(`[skillsmith] Timed out waiting for config lock at ${lockPath} after ` +
-                    `${timeoutMs}ms. If this persists, a crashed process may have left a ` +
-                    `stale lock — verify no other skillsmith process is running, then remove ${lockPath} manually.`);
-            }
-            sleepSync(LOCK_RETRY_DELAY_MS);
-        }
-    }
+    return acquireOwnedLock(configPath, { timeoutMs, label: 'config lock' });
 }
 /**
  * Write `content` to `filePath` atomically: write to a temp file in the same

package/dist/src/config/config-atomic-write.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-atomic-write.js","sourceRoot":"","sources":["../../../src/config/config-atomic-write.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config-atomic-write.js","sourceRoot":"","sources":["../../../src/config/config-atomic-write.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAElD;;;;GAIG;AACH,MAAM,uBAAuB,GAAG,KAAK,CAAA;AAErC;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,UAAU,iBAAiB,CAC/B,UAAkB,EAClB,YAAoB,uBAAuB;IAE3C,OAAO,gBAAgB,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAA;AAC1E,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB,EAAE,OAAe,EAAE,IAAY;IAC7E,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IACnE,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;IAC5D,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC7B,uEAAuE;IACvE,2EAA2E;IAC3E,mCAAmC;IACnC,IAAI,CAAC;QACH,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,kCAAkC;IACpC,CAAC;AACH,CAAC"}

package/dist/src/config/config-atomic-write.test.d.ts

@@ -1,5 +1,13 @@
 /**
  * SMI-5531: Atomic config-write primitive tests.
+ * SMI-5883 Wave 2 (§8d/§8e): `acquireConfigLock` is now a thin wrapper over
+ * the shared two-level `acquireOwnedLock` primitive (`owned-lock.ts`). The
+ * age-based stale-lock test below is DELETED (its premise — clearing on file
+ * age — is the behavior being removed), replaced by three tests asserting
+ * the new owner-liveness-based contract: a v1 dead-PID lock reclaims
+ * quickly, a v1 live-PID lock times out regardless of a backdated mtime, and
+ * a legacy bare-PID lock (this module's OWN pre-SMI-5883 format) is NEVER
+ * auto-reclaimed even when definitely dead (D-5).
  *
  * Uses the same tmpdir-per-test isolation harness as device-identity.test.ts
  * / index.test.ts (no shared HOME mutation needed here — these primitives

package/dist/src/config/config-atomic-write.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-atomic-write.test.d.ts","sourceRoot":"","sources":["../../../src/config/config-atomic-write.test.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG"}
+{"version":3,"file":"config-atomic-write.test.d.ts","sourceRoot":"","sources":["../../../src/config/config-atomic-write.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG"}

package/dist/src/config/config-atomic-write.test.js

@@ -1,5 +1,13 @@
 /**
  * SMI-5531: Atomic config-write primitive tests.
+ * SMI-5883 Wave 2 (§8d/§8e): `acquireConfigLock` is now a thin wrapper over
+ * the shared two-level `acquireOwnedLock` primitive (`owned-lock.ts`). The
+ * age-based stale-lock test below is DELETED (its premise — clearing on file
+ * age — is the behavior being removed), replaced by three tests asserting
+ * the new owner-liveness-based contract: a v1 dead-PID lock reclaims
+ * quickly, a v1 live-PID lock times out regardless of a backdated mtime, and
+ * a legacy bare-PID lock (this module's OWN pre-SMI-5883 format) is NEVER
+ * auto-reclaimed even when definitely dead (D-5).
  *
  * Uses the same tmpdir-per-test isolation harness as device-identity.test.ts
  * / index.test.ts (no shared HOME mutation needed here — these primitives
@@ -9,7 +17,9 @@ import { describe, it, expect } from 'vitest';
 import { existsSync, mkdirSync, readFileSync, readdirSync, utimesSync, writeFileSync } from 'fs';
 import * as path from 'path';
 import * as os from 'os';
+import { hostname } from 'node:os';
 import { acquireConfigLock, atomicWriteFile } from './config-atomic-write.js';
+import { mintDeadPid } from '../../tests/helpers/deterministic-dead-pid.js';
 function makeTempDir() {
     const dir = path.join(os.tmpdir(), `skillsmith-atomic-write-test-${Date.now()}-${Math.random().toString(36).slice(2)}`);
     mkdirSync(dir, { recursive: true });
@@ -36,29 +46,71 @@ describe('acquireConfigLock — mutual exclusion', () => {
         const secondRelease = acquireConfigLock(configPath, 200);
         secondRelease();
     });
-    it('force-clears a stale lock (older than the staleness threshold) instead of waiting out the full timeout', () => {
+    it('release() is idempotent — calling it twice does not throw', () => {
+        const dir = makeTempDir();
+        const configPath = path.join(dir, 'config.json');
+        const release = acquireConfigLock(configPath);
+        release();
+        expect(() => release()).not.toThrow();
+    });
+    it('reclaims a v1 dead-PID lock quickly (owner-liveness based, not age)', () => {
         const dir = makeTempDir();
         const configPath = path.join(dir, 'config.json');
         const lockPath = `${configPath}.lock`;
-        // Simulate a lock abandoned by a crashed process: create it, then
-        // backdate its mtime well past the staleness threshold.
-        writeFileSync(lockPath, '99999');
-        const longAgo = new Date(Date.now() - 60_000);
-        utimesSync(lockPath, longAgo, longAgo);
+        const deadPid = mintDeadPid();
+        writeFileSync(lockPath, JSON.stringify({
+            v: 1,
+            pid: deadPid,
+            token: 'a'.repeat(16),
+            host: hostname(),
+            acquiredAt: Date.now(),
+        }) + '\n');
         const start = Date.now();
-        // Even with a tight timeout budget, stale-lock recovery should let this
-        // succeed almost immediately rather than burning the whole window.
-        const release = acquireConfigLock(configPath, 500);
+        const release = acquireConfigLock(configPath, 5_000);
         const elapsedMs = Date.now() - start;
         release();
-        expect(elapsedMs).toBeLessThan(500);
+        expect(elapsedMs).toBeLessThan(2_000);
     });
-    it('release() is idempotent — calling it twice does not throw', () => {
+    it('does NOT force-clear a v1 live-PID lock even with a backdated mtime — age is irrelevant now', () => {
+        const dir = makeTempDir();
+        const configPath = path.join(dir, 'config.json');
+        const lockPath = `${configPath}.lock`;
+        writeFileSync(lockPath, JSON.stringify({
+            v: 1,
+            pid: process.pid, // definitively alive for the duration of this test
+            token: 'b'.repeat(16),
+            host: hostname(),
+            acquiredAt: Date.now() - 60_000,
+        }) + '\n');
+        const longAgo = new Date(Date.now() - 60_000);
+        utimesSync(lockPath, longAgo, longAgo);
+        const before = readFileSync(lockPath);
+        expect(() => acquireConfigLock(configPath, 200)).toThrow(/Timed out waiting for config lock/);
+        expect(readFileSync(lockPath).equals(before)).toBe(true);
+    });
+    it('never auto-reclaims a legacy bare-PID lock even when the PID is definitely live (D-5, §8d)', () => {
         const dir = makeTempDir();
         const configPath = path.join(dir, 'config.json');
+        const lockPath = `${configPath}.lock`;
+        writeFileSync(lockPath, String(process.pid)); // bare integer, no JSON, definitely live
+        const before = readFileSync(lockPath);
+        expect(() => acquireConfigLock(configPath, 150)).toThrow(/Timed out waiting for config lock/);
+        expect(readFileSync(lockPath).equals(before)).toBe(true); // byte-identical
+        expect(existsSync(`${lockPath}.reclaim`)).toBe(false); // no orphan left behind
+        expect(readdirSync(dir).filter((f) => f.endsWith('.tmp'))).toEqual([]);
+    });
+    it('the on-disk lock format is a v1 JSON record, not a bare PID integer', () => {
+        const dir = makeTempDir();
+        const configPath = path.join(dir, 'config.json');
+        const lockPath = `${configPath}.lock`;
         const release = acquireConfigLock(configPath);
+        const raw = readFileSync(lockPath, 'utf-8');
         release();
-        expect(() => release()).not.toThrow();
+        const parsed = JSON.parse(raw);
+        expect(parsed.v).toBe(1);
+        expect(parsed.pid).toBe(process.pid);
+        expect(typeof parsed.token).toBe('string');
+        expect(parsed.host).toBe(hostname());
     });
 });
 describe('atomicWriteFile', () => {

package/dist/src/config/config-atomic-write.test.js.map

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

package/dist/src/config/owned-lock.acquire.d.ts

@@ -0,0 +1,53 @@
+/**
+ * Core acquire loop + `StuckLockError` for the owned-lock primitive.
+ * @module @skillsmith/core/config/owned-lock.acquire
+ * @see owned-lock.ts for the full soundness argument and the PUBLIC API.
+ * @see owned-lock.claim.ts for claim parsing, exclusive creation, and reclaim.
+ *
+ * INTERNAL module -- not part of the public surface (no `package.json`
+ * subpath export), split out of `owned-lock.claim.ts` purely to keep both
+ * files under the repo's 500-line-per-file gate. `owned-lock.ts`'s public
+ * `acquireOwnedLock` is a thin wrapper over this file's
+ * {@link acquireOwnedLockCore}; the cross-process race-test child harness
+ * imports directly from here, by relative path, specifically to reach the
+ * two destructive test-only options
+ * ({@link AcquireOwnedLockCoreOptions.unsafeSkipReclaimRevalidation} and
+ * `.linkSyncOverride`) that must NEVER be reachable via the public
+ * `@skillsmith/core/config/owned-lock` subpath.
+ */
+import type { Claim, ReclaimOutcome, StuckLockReason } from './owned-lock.types.js';
+/**
+ * Thrown when {@link acquireOwnedLockCore} (and, through it, the public
+ * `acquireOwnedLock`) times out. `reason` is a stable discriminant for
+ * mechanical triage (never prose-matching); the message embeds the manual
+ * unstick procedure verbatim.
+ */
+export declare class StuckLockError extends Error {
+    readonly lockPath: string;
+    readonly reclaimPath: string;
+    readonly reason: StuckLockReason;
+    constructor(lockPath: string, reclaimPath: string, label: string, reason: StuckLockReason, claim: Claim);
+}
+/**
+ * Full internal option set, including the two options the public
+ * `AcquireOwnedLockOptions` (owned-lock.types.ts) deliberately omits.
+ */
+export interface AcquireOwnedLockCoreOptions {
+    timeoutMs?: number;
+    label?: string;
+    reclaimProbeAfterMs?: number;
+    onReclaimBoundary?: () => void;
+    onReclaimOutcome?: (outcome: ReclaimOutcome) => void;
+    /** @internal NEGATIVE CONTROL ONLY (owned-lock-reclaim-race.test.ts §8b). Removes the authoritative re-read that makes this mechanism sound -- reintroduces the round-3 lock-theft race on purpose. Never set outside that spec, and never reachable via the public acquireOwnedLock(). */
+    unsafeSkipReclaimRevalidation?: boolean;
+    /** @internal test seam (owned-lock.test.ts item 14). Never reachable via the public acquireOwnedLock(). */
+    linkSyncOverride?: (existingPath: string, newPath: string) => void;
+}
+/**
+ * The full acquire loop. `owned-lock.ts`'s public `acquireOwnedLock` is a
+ * thin wrapper over this that only ever forwards the PUBLIC-SAFE option
+ * subset -- see the module-level comment above for why the two unsafe
+ * options must never be reachable from there.
+ */
+export declare function acquireOwnedLockCore(target: string, opts?: AcquireOwnedLockCoreOptions): () => void;
+//# sourceMappingURL=owned-lock.acquire.d.ts.map

package/dist/src/config/owned-lock.acquire.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"owned-lock.acquire.d.ts","sourceRoot":"","sources":["../../../src/config/owned-lock.acquire.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAoBH,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAmB,eAAe,EAAE,MAAM,uBAAuB,CAAA;AA2BpG;;;;;GAKG;AACH,qBAAa,cAAe,SAAQ,KAAK;IACvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAA;gBAG9B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,KAAK;CAcf;AAmBD;;;GAGG;AACH,MAAM,WAAW,2BAA2B;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAA;IAC9B,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAA;IACpD,2RAA2R;IAC3R,6BAA6B,CAAC,EAAE,OAAO,CAAA;IACvC,2GAA2G;IAC3G,gBAAgB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACnE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,2BAAgC,GACrC,MAAM,IAAI,CA4DZ"}

package/dist/src/config/owned-lock.acquire.js

@@ -0,0 +1,140 @@
+/**
+ * Core acquire loop + `StuckLockError` for the owned-lock primitive.
+ * @module @skillsmith/core/config/owned-lock.acquire
+ * @see owned-lock.ts for the full soundness argument and the PUBLIC API.
+ * @see owned-lock.claim.ts for claim parsing, exclusive creation, and reclaim.
+ *
+ * INTERNAL module -- not part of the public surface (no `package.json`
+ * subpath export), split out of `owned-lock.claim.ts` purely to keep both
+ * files under the repo's 500-line-per-file gate. `owned-lock.ts`'s public
+ * `acquireOwnedLock` is a thin wrapper over this file's
+ * {@link acquireOwnedLockCore}; the cross-process race-test child harness
+ * imports directly from here, by relative path, specifically to reach the
+ * two destructive test-only options
+ * ({@link AcquireOwnedLockCoreOptions.unsafeSkipReclaimRevalidation} and
+ * `.linkSyncOverride`) that must NEVER be reachable via the public
+ * `@skillsmith/core/config/owned-lock` subpath.
+ */
+import { hostname } from 'node:os';
+import { classifyRefusal, createLockExclusive, isOwnerDefinitelyDead, makeRelease, randomHex, readClaim, sleepSync, tryReclaimUnderLock, } from './owned-lock.claim.js';
+import { LOCK_ACQUIRE_TIMEOUT_MS, LOCK_RETRY_DELAY_MS, RECLAIM_PROBE_AFTER_MS, RECLAIM_PROBE_INTERVAL_MS, } from './owned-lock.types.js';
+function describeReason(reason, claim, reclaimPath) {
+    switch (reason) {
+        case 'held':
+            return claim.kind === 'v1'
+                ? `held by pid ${claim.pid} on host '${claim.host}' (still alive)`
+                : 'held by another process';
+        case 'unreclaimable_legacy':
+            return ('held by a legacy (pre-v1) claim' +
+                (claim.kind === 'legacy' ? ` (pid ${claim.pid})` : '') +
+                ' -- legacy claims carry no host attribution and are NEVER auto-reclaimed (SMI-5883 D-5)');
+        case 'unreclaimable_unparseable':
+            return 'the lock file could not be parsed as a recognized claim -- never auto-reclaimed';
+        case 'reclaim_unavailable':
+            return `the reclaim lock at ${reclaimPath} is held or was orphaned by a crash inside the reclaim critical section (residual R1)`;
+        case 'reclaim_disabled':
+            return 'auto-reclaim is disabled (SKILLSMITH_LOCK_NO_AUTO_RECLAIM=1)';
+        default: {
+            const exhaustive = reason;
+            return exhaustive;
+        }
+    }
+}
+/**
+ * Thrown when {@link acquireOwnedLockCore} (and, through it, the public
+ * `acquireOwnedLock`) times out. `reason` is a stable discriminant for
+ * mechanical triage (never prose-matching); the message embeds the manual
+ * unstick procedure verbatim.
+ */
+export class StuckLockError extends Error {
+    lockPath;
+    reclaimPath;
+    reason;
+    constructor(lockPath, reclaimPath, label, reason, claim) {
+        const namesReclaim = reason === 'reclaim_unavailable';
+        const message = `[skillsmith] Timed out waiting for ${label} at ${lockPath}: ${describeReason(reason, claim, reclaimPath)}. ` +
+            `Manual unstick -- 1) confirm no skillsmith process is running: ps -ax | grep -E '[s]killsmith|[s]klx'; ` +
+            `2) inspect (read-only): cat ${lockPath}${namesReclaim ? ` ; cat ${reclaimPath}` : ''}; ` +
+            `3) remove ONLY the file(s) named above: rm ${lockPath}${namesReclaim ? ` ; rm ${reclaimPath}` : ''}.`;
+        super(message);
+        this.name = 'StuckLockError';
+        this.lockPath = lockPath;
+        this.reclaimPath = reclaimPath;
+        this.reason = reason;
+    }
+}
+function mapRefusalToReason(refusal) {
+    switch (refusal) {
+        case 'legacy':
+            return 'unreclaimable_legacy';
+        case 'unparseable':
+            return 'unreclaimable_unparseable';
+        case 'reclaim-disabled':
+            return 'reclaim_disabled';
+        case 'unavailable':
+            return 'reclaim_unavailable';
+        default:
+            // 'held' | 'not-stale' | 'gone' | 'reclaimed' (the latter two never
+            // reach the caller as a refusal -- they trigger an immediate retry).
+            return 'held';
+    }
+}
+/**
+ * The full acquire loop. `owned-lock.ts`'s public `acquireOwnedLock` is a
+ * thin wrapper over this that only ever forwards the PUBLIC-SAFE option
+ * subset -- see the module-level comment above for why the two unsafe
+ * options must never be reachable from there.
+ */
+export function acquireOwnedLockCore(target, opts = {}) {
+    const lockPath = `${target}.lock`;
+    const reclaimPath = `${lockPath}.reclaim`;
+    const token = randomHex(8);
+    const label = opts.label ?? 'lock';
+    const timeoutMs = opts.timeoutMs ?? LOCK_ACQUIRE_TIMEOUT_MS;
+    const started = Date.now();
+    const deadline = started + timeoutMs;
+    let nextProbeAt = started + (opts.reclaimProbeAfterMs ?? RECLAIM_PROBE_AFTER_MS);
+    let lastRefusal = 'held'; // safe default: EEXIST already implies SOMETHING is there
+    let lastObservedClaim = { kind: 'absent' };
+    for (;;) {
+        const record = JSON.stringify({ v: 1, pid: process.pid, token, host: hostname(), acquiredAt: Date.now() }) +
+            '\n';
+        if (createLockExclusive(lockPath, record, opts.linkSyncOverride)) {
+            return makeRelease(lockPath, token);
+        }
+        // ---- contended ----
+        if (Date.now() >= nextProbeAt) {
+            const claim = readClaim(lockPath);
+            lastObservedClaim = claim;
+            if (isOwnerDefinitelyDead(claim)) {
+                opts.onReclaimBoundary?.();
+                const outcome = tryReclaimUnderLock(lockPath, reclaimPath, {
+                    unsafeSkipRevalidation: opts.unsafeSkipReclaimRevalidation,
+                    linkSyncOverride: opts.linkSyncOverride,
+                });
+                opts.onReclaimOutcome?.(outcome);
+                if (outcome === 'reclaimed' || outcome === 'gone') {
+                    nextProbeAt = 0; // retry create at once -- don't burn the backoff budget
+                    continue;
+                }
+                lastRefusal = outcome; // 'not-stale' | 'unavailable'
+            }
+            else {
+                lastRefusal = classifyRefusal(claim);
+            }
+            nextProbeAt = Date.now() + RECLAIM_PROBE_INTERVAL_MS;
+        }
+        if (Date.now() >= deadline) {
+            // A final, read-only claim fetch purely for an accurate message -- does
+            // NOT affect the reclaim decision or `lastRefusal`. Needed because a
+            // very tight `timeoutMs` (shorter than `reclaimProbeAfterMs`) can
+            // otherwise expire before the periodic probe above ever runs once.
+            if (lastObservedClaim.kind === 'absent') {
+                lastObservedClaim = readClaim(lockPath);
+            }
+            throw new StuckLockError(lockPath, reclaimPath, label, mapRefusalToReason(lastRefusal), lastObservedClaim);
+        }
+        sleepSync(LOCK_RETRY_DELAY_MS);
+    }
+}
+//# sourceMappingURL=owned-lock.acquire.js.map

package/dist/src/config/owned-lock.acquire.js.map

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