@deepthonk/core 0.1.4 → 0.1.5

package/dist/lifecycle.js

@@ -1,36 +1,237 @@
+import { createHash, randomUUID } from "node:crypto";
 import { mkdir, readFile, unlink, writeFile } from "node:fs/promises";
+import { hostname } from "node:os";
 import { join } from "node:path";
 import { runArtifactFiles } from "./artifacts.js";
 import { ConfigError } from "./errors.js";
+const localClaims = new Map();
+const runLockGuardFile = ".run.lock.guard";
+const lockWaitTimeoutMs = 1_000;
 export async function claimRunLock(runDir, jobId) {
+    return Boolean(await claimRunLockOwnership(runDir, jobId));
+}
+export async function claimRunLockOwnership(runDir, jobId) {
     await mkdir(runDir, { recursive: true });
+    const path = join(runDir, runArtifactFiles.lock);
+    const guard = await acquireRunLockGuard(runDir);
     try {
-        await writeFile(join(runDir, runArtifactFiles.lock), `${JSON.stringify({ job_id: jobId, worker_pid: process.pid, claimed_at: new Date().toISOString() }, null, 2)}\n`, { encoding: "utf8", flag: "wx" });
-        return true;
+        const inspection = await inspectRunLock(runDir);
+        if (inspection.state !== "missing") {
+            if (inspection.state !== "valid" || !inspection.sameHost || inspection.workerAlive)
+                return undefined;
+            const current = await readFile(path, "utf8").catch(() => undefined);
+            if (current === undefined || lockFingerprint(current) !== inspection.fingerprint)
+                return undefined;
+            await unlink(path);
+            localClaims.delete(path);
+        }
+        const lock = {
+            schema_version: 1,
+            claim_id: randomUUID(),
+            job_id: jobId,
+            hostname: hostname(),
+            worker_pid: process.pid,
+            claimed_at: new Date().toISOString()
+        };
+        const raw = `${JSON.stringify(lock, null, 2)}\n`;
+        await writeFile(path, raw, { encoding: "utf8", flag: "wx" });
+        const claim = { claimId: lock.claim_id, fingerprint: lockFingerprint(raw), lock };
+        localClaims.set(path, claim.claimId);
+        return claim;
     }
     catch (error) {
-        if (error.code === "EEXIST")
-            return false;
+        if (error instanceof ConfigError)
+            throw error;
         throw new ConfigError(`Could not claim run directory lock: ${error.message}`, {
             code: "run.lock_failed",
             retryable: false,
             fix: "Choose a writable run directory."
         });
     }
+    finally {
+        await releaseRunLockGuard(guard);
+    }
+}
+export async function inspectRunLock(runDir) {
+    const path = join(runDir, runArtifactFiles.lock);
+    let raw;
+    try {
+        raw = await readFile(path, "utf8");
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return { state: "missing" };
+        throw new ConfigError(`Could not inspect run directory lock: ${error.message}`, {
+            code: "run.lock_inspect_failed",
+            retryable: false,
+            fix: "Inspect the run directory lock file and permissions."
+        });
+    }
+    const fingerprint = lockFingerprint(raw);
+    try {
+        const value = JSON.parse(raw);
+        if (value.schema_version !== 1 ||
+            typeof value.claim_id !== "string" ||
+            typeof value.hostname !== "string" ||
+            typeof value.worker_pid !== "number" ||
+            !Number.isInteger(value.worker_pid) ||
+            typeof value.claimed_at !== "string") {
+            return { state: "malformed", fingerprint };
+        }
+        const lock = value;
+        const sameHost = lock.hostname === hostname();
+        return { state: "valid", fingerprint, lock, sameHost, workerAlive: sameHost ? isLivePid(lock.worker_pid) : true };
+    }
+    catch {
+        return { state: "malformed", fingerprint };
+    }
 }
-export async function releaseRunLock(runDir) {
+export async function reclaimRunLock(runDir, expectedFingerprint) {
+    const path = join(runDir, runArtifactFiles.lock);
+    const guard = await acquireRunLockGuard(runDir);
     try {
-        await unlink(join(runDir, runArtifactFiles.lock));
+        const raw = await readFile(path, "utf8");
+        if (lockFingerprint(raw) !== expectedFingerprint)
+            return false;
+        await unlink(path);
+        localClaims.delete(path);
+        return true;
     }
     catch (error) {
         if (error.code === "ENOENT")
+            return false;
+        throw error;
+    }
+    finally {
+        await releaseRunLockGuard(guard);
+    }
+}
+export async function verifyRunLockClaim(runDir, claim, jobId) {
+    const path = join(runDir, runArtifactFiles.lock);
+    if (localClaims.get(path) !== claim.claimId)
+        return false;
+    const guard = await acquireRunLockGuard(runDir);
+    try {
+        const inspection = await inspectRunLock(runDir);
+        return (inspection.state === "valid" &&
+            inspection.fingerprint === claim.fingerprint &&
+            inspection.lock.claim_id === claim.claimId &&
+            inspection.lock.job_id === jobId);
+    }
+    finally {
+        await releaseRunLockGuard(guard);
+    }
+}
+export async function releaseRunLock(runDir, claimId) {
+    const path = join(runDir, runArtifactFiles.lock);
+    const expectedClaimId = claimId ?? localClaims.get(path);
+    const guard = await acquireRunLockGuard(runDir);
+    try {
+        const inspection = await inspectRunLock(runDir);
+        if (inspection.state === "missing") {
+            localClaims.delete(path);
             return;
+        }
+        if (inspection.state !== "valid" || !expectedClaimId || inspection.lock.claim_id !== expectedClaimId) {
+            throw new ConfigError("Refusing to release a run lock not owned by this claimant.", {
+                code: "run.lock_not_owned",
+                retryable: false,
+                fix: "Inspect the current lock and use fingerprinted reclaim only after verifying that its owner is no longer active."
+            });
+        }
+        await unlink(path);
+        localClaims.delete(path);
+    }
+    catch (error) {
+        if (error instanceof ConfigError)
+            throw error;
         throw new ConfigError(`Could not release run directory lock: ${error.message}`, {
             code: "run.lock_release_failed",
             retryable: false,
             fix: "Inspect the run directory lock file and permissions."
         });
     }
+    finally {
+        await releaseRunLockGuard(guard);
+    }
+}
+async function acquireRunLockGuard(runDir) {
+    await mkdir(runDir, { recursive: true });
+    const path = join(runDir, runLockGuardFile);
+    const deadline = Date.now() + lockWaitTimeoutMs;
+    let blockingFingerprint;
+    while (true) {
+        const owner = {
+            schema_version: 1,
+            claim_id: randomUUID(),
+            job_id: "run-lock-guard",
+            hostname: hostname(),
+            worker_pid: process.pid,
+            claimed_at: new Date().toISOString()
+        };
+        const raw = `${JSON.stringify(owner)}\n`;
+        try {
+            await writeFile(path, raw, { encoding: "utf8", flag: "wx" });
+            return { path, claimId: owner.claim_id, fingerprint: lockFingerprint(raw) };
+        }
+        catch (error) {
+            if (error.code !== "EEXIST")
+                throw error;
+            const observed = await readFile(path, "utf8").catch(() => undefined);
+            if (observed)
+                blockingFingerprint = lockFingerprint(observed);
+            if (Date.now() >= deadline) {
+                throw new ConfigError(`Timed out waiting for the run-lock guard${blockingFingerprint ? ` (${blockingFingerprint})` : ""}.`, {
+                    code: "run.lock_guard_timeout",
+                    retryable: true,
+                    fix: "Retry after the active lock operation finishes. If its process crashed, inspect .run.lock.guard and remove that exact verified file manually; guards are never auto-reclaimed."
+                });
+            }
+            await delay(5);
+        }
+    }
+}
+async function releaseRunLockGuard(claim) {
+    const raw = await readFile(claim.path, "utf8").catch(() => undefined);
+    if (!raw || lockFingerprint(raw) !== claim.fingerprint || parseLockOwner(raw)?.claim_id !== claim.claimId) {
+        throw new ConfigError("Run-lock guard ownership changed before release.", {
+            code: "run.lock_guard_not_owned",
+            retryable: true
+        });
+    }
+    await unlink(claim.path);
+}
+function parseLockOwner(raw) {
+    try {
+        const value = JSON.parse(raw);
+        if (value.schema_version === 1 &&
+            typeof value.claim_id === "string" &&
+            typeof value.hostname === "string" &&
+            typeof value.worker_pid === "number" &&
+            Number.isInteger(value.worker_pid) &&
+            typeof value.claimed_at === "string") {
+            return value;
+        }
+    }
+    catch {
+        // Invalid guards are never auto-reclaimed.
+    }
+    return undefined;
+}
+function delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function lockFingerprint(raw) {
+    return `sha256:${createHash("sha256").update(raw).digest("hex")}`;
+}
+function isLivePid(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (error) {
+        return error.code !== "ESRCH";
+    }
 }
 export async function readRunStatus(runDir) {
     try {

package/dist/lifecycle.js.map

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

package/dist/resume.d.ts

@@ -1,5 +1,5 @@
 import { BudgetTracker } from "./budgetTracker.js";
-import type { RunStatus, UsageRecord } from "./lifecycle.js";
+import { type RunStatus, type UsageRecord } from "./lifecycle.js";
 import type { BtScore, Candidate, Comparison, PhaseName, RunConfig } from "./schemas.js";
 export declare const pruneSentinelFile = ".prune-in-progress";
 export interface ResumeTrace {
@@ -41,11 +41,13 @@ export declare function resolveResumeRunId(config: RunConfig & {
 }, status: RunStatus | undefined, events: Array<Record<string, unknown>>): string;
 export declare function buildResumePlan(config: RunConfig, events: Array<Record<string, unknown>>): InternalResumePlan;
 export declare function resumeConfigError(message: string, code: string, fix?: string): never;
+export declare function assertNoLegacyRedactedBudget(config: Record<string, unknown>): void;
+export declare function repairLegacyBudgetConfig(runDir: string, replacements: Record<string, number>): Promise<string[]>;
 export declare function toResumePlanStatus(runDir: string, runId: string, plan: InternalResumePlan): ResumePlanStatus;
 export declare function pruneTraceToPlan(trace: ResumeTrace, plan: InternalResumePlan): ResumeTrace;
 export declare function buildPopulationMap(config: RunConfig, populations: Map<number, Candidate[]>, candidates: Candidate[], plan: InternalResumePlan): Map<number, Candidate[]>;
 export declare function groupComparisons(comparisons: Comparison[]): Map<number | "final", Comparison[]>;
-export declare function reconstructScores(config: RunConfig, populationByGeneration: Map<number, Candidate[]>, comparisonsByGeneration: Map<number | "final", Comparison[]>, existingScores: BtScore[], plan: InternalResumePlan): Map<number | "final", BtScore[]>;
+export declare function reconstructScores(config: RunConfig, populationByGeneration: Map<number, Candidate[]>, comparisonsByGeneration: Map<number | "final", Comparison[]>, existingScores: BtScore[], plan: InternalResumePlan, runId?: string): Map<number | "final", BtScore[]>;
 export declare function replayBudgetUsage(config: RunConfig, usage: UsageRecord[]): BudgetTracker;
 export declare function persistPrunedTrace(runDir: string, pruned: ResumeTrace): Promise<void>;
 export declare function assertNoPruneInProgress(runDir: string): void;