audit-tools 0.32.45 → 0.32.47

package/dist/audit/cli/ownerTokens.js

@@ -0,0 +1,86 @@
+// ownerTokens.ts — run-scoped sidecar persisting audit-task claim owner
+// tokens (D-66/67 slice-1, Part A: merge-time ownership gate).
+//
+// `dispatch.ts` captures `ownerTokenByNode` from `ClaimRegistry.claimMany`
+// (task-claims.json) at dispatch time; `mergeAndIngestCommand.ts` reads it
+// back at merge time to `heartbeat()`-verify a terminal task's claim is still
+// ours before folding its result into the ingest and clearing its claim. A
+// task whose lease was reclaimed by a peer (token rotated) fails the
+// heartbeat and is excluded — see the ownership gate in mergeAndIngest.
+//
+// Deliberately RUN-SCOPED (`runs/<runId>/owner-tokens.json`), never parked on
+// `active-dispatch.json`: that file is ONE per artifactsDir (no runId in its
+// path) and is wholly rebuilt by `prepareDispatchArtifacts` every round, so
+// tokens written there would be clobbered by this same run's next dispatch
+// round or a cooperative peer's run — defeating the gate exactly where it
+// matters. This sidecar instead merges ADDITIVELY per task_id, mirroring how
+// `node-claims.json` is run-scoped on the remediate side.
+//
+// Tokens are opaque local strings minted by `ClaimRegistry`, not secrets.
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { isFileMissingError, withFileLock, writeJsonFile } from "audit-tools/shared";
+/** `<runDir>/owner-tokens.json` — see module doc for why this is run-scoped. */
+export function ownerTokensPath(runDir) {
+    return join(runDir, "owner-tokens.json");
+}
+function lockPathFor(path) {
+    return `${path}.lock`;
+}
+// Degrades ANY missing/malformed content to `{}` ("no token known for any
+// task") rather than throwing — a corrupt or absent sidecar must never crash
+// dispatch or merge; at worst every task reads as tokenless, which is the
+// gate's documented fail-open case. Mirrors ClaimRegistry's own readClaimMap.
+async function readOwnerTokenMap(path) {
+    let raw;
+    try {
+        raw = await readFile(path, "utf8");
+    }
+    catch (error) {
+        if (isFileMissingError(error))
+            return {};
+        throw error;
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch {
+        return {};
+    }
+    if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed))
+        return {};
+    const out = {};
+    for (const [taskId, token] of Object.entries(parsed)) {
+        if (typeof token === "string")
+            out[taskId] = token;
+    }
+    return out;
+}
+/**
+ * Read the persisted owner-token map for a run. Never throws — see
+ * `readOwnerTokenMap`. Absent for a task_id means "no token persisted for it"
+ * (fail-open at the ownership gate), not "claim absent".
+ */
+export async function readOwnerTokens(runDir) {
+    return readOwnerTokenMap(ownerTokensPath(runDir));
+}
+/**
+ * Merge `tokensByTaskId` additively into the run-scoped sidecar: each task_id
+ * in `tokensByTaskId` overwrites (or adds) its own entry — a same-run
+ * re-dispatch round's re-grant rotates only that task's token — while every
+ * OTHER task's previously-persisted token is preserved untouched. Runs under
+ * a file lock so concurrent dispatch rounds (same run re-entry, cooperative
+ * peers sharing the run) never race a lost update. No-op when there is
+ * nothing to persist.
+ */
+export async function mergeOwnerTokens(runDir, tokensByTaskId) {
+    if (Object.keys(tokensByTaskId).length === 0)
+        return;
+    const path = ownerTokensPath(runDir);
+    await withFileLock(lockPathFor(path), async () => {
+        const existing = await readOwnerTokenMap(path);
+        await writeJsonFile(path, { ...existing, ...tokensByTaskId });
+    });
+}
+//# sourceMappingURL=ownerTokens.js.map

package/dist/audit/cli/ownerTokens.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ownerTokens.js","sourceRoot":"","sources":["../../../src/audit/cli/ownerTokens.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,+DAA+D;AAC/D,EAAE;AACF,2EAA2E;AAC3E,2EAA2E;AAC3E,8EAA8E;AAC9E,2EAA2E;AAC3E,qEAAqE;AACrE,wEAAwE;AACxE,EAAE;AACF,8EAA8E;AAC9E,6EAA6E;AAC7E,4EAA4E;AAC5E,2EAA2E;AAC3E,0EAA0E;AAC1E,6EAA6E;AAC7E,0DAA0D;AAC1D,EAAE;AACF,0EAA0E;AAE1E,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIrF,gFAAgF;AAChF,MAAM,UAAU,eAAe,CAAC,MAAc;IAC5C,OAAO,IAAI,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,WAAW,CAAC,IAAY;IAC/B,OAAO,GAAG,IAAI,OAAO,CAAC;AACxB,CAAC;AAED,0EAA0E;AAC1E,6EAA6E;AAC7E,0EAA0E;AAC1E,8EAA8E;AAC9E,KAAK,UAAU,iBAAiB,CAAC,IAAY;IAC3C,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,kBAAkB,CAAC,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACzC,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IACtF,MAAM,GAAG,GAAkB,EAAE,CAAC;IAC9B,KAAK,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAiC,CAAC,EAAE,CAAC;QAChF,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;IACrD,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,MAAc;IAClD,OAAO,iBAAiB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;AACpD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAc,EACd,cAAuC;IAEvC,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACrD,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,EAAE;QAC/C,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,aAAa,CAAC,IAAI,EAAE,EAAE,GAAG,QAAQ,EAAE,GAAG,cAAc,EAAE,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/remediate/phases/close.js

@@ -337,15 +337,15 @@ const AUDIT_TOOLS_EXCLUDE_PATTERN = /^\.audit-tools\//;
  * RUN-START-DIRTY GUARD on source (2) ONLY: declared surfaces are plan-time
  * DECLARATIONS (write-access grants) / audit evidence — never verified against
  * an actual diff. A declared file that was ALREADY dirty when the run started
- * (`state.run_start_dirty`, captured in `runPlanPhase` before any remediation
- * edit exists) cannot be the run's edit, so it is excluded here — otherwise a
- * resolved item declaring a file the run never actually touched would sweep
- * pre-existing user WIP into the closing commit (the exact over-inclusion class
- * this manifest exists to close). Ground-truth entries from source (1) are
- * NEVER excluded by the snapshot: git proved the run landed those paths, and a
- * tool-merged edit to a file the user ALSO had dirty at run start is a path the
- * tool legitimately owns. A state without `run_start_dirty` (pre-field, or a
- * plan flow that bypasses `runPlanPhase`) means no exclusions.
+ * (`state.run_start_dirty`, captured at the extracted-plan join site before any
+ * remediation edit exists) cannot be the run's edit, so it is excluded here —
+ * otherwise a resolved item declaring a file the run never actually touched
+ * would sweep pre-existing user WIP into the closing commit (the exact
+ * over-inclusion class this manifest exists to close). Ground-truth entries
+ * from source (1) are NEVER excluded by the snapshot: git proved the run
+ * landed those paths, and a tool-merged edit to a file the user ALSO had dirty
+ * at run start is a path the tool legitimately owns. A state without
+ * `run_start_dirty` (pre-field) means no exclusions.
  *
  * Both sources empty is legitimate (e.g. a run that only produced
  * `resolved_no_change` / skipped items) and correctly yields an empty

package/dist/remediate/phases/plan.d.ts

@@ -1,8 +1,5 @@
-import { RemediationState } from "../state/store.js";
-import { OrchestratorOptions } from "../types/options.js";
 import { RemediationPlan, Finding, RemediationBlock, RemediationItemState, CoverageLedger } from "../state/types.js";
 import type { AuditFindingsReport, FindingTheme } from "audit-tools/shared";
-import { runTracked } from "audit-tools/shared";
 /**
  * Parse the auditor's canonical `audit-findings.json` (the machine contract) into
  * remediation findings, work blocks, and synthesis themes. The auditor emits this
@@ -22,21 +19,6 @@ export declare function parseAuditFindingsReport(report: AuditFindingsReport): {
  * contract_version is rejected here rather than silently trusted.
  */
 export declare function isAuditFindingsReport(value: unknown): value is AuditFindingsReport;
-interface PlanPhaseDeps {
-    enumerateTestFiles?: (root: string) => string[];
-    runCommand?: typeof runTracked;
-    now?: () => number;
-    /** Test seam: replaces the provider-backed free-form extraction worker. */
-    extractFindings?: (content: string, options: OrchestratorOptions) => Promise<{
-        findings: Finding[];
-        blocks: RemediationBlock[];
-    }>;
-    /** Test seam: replaces the provider-backed bounded path-repair worker. */
-    repairExtractedFindingPaths?: (requests: {
-        finding: Finding;
-        phantomPaths: string[];
-    }[]) => Promise<Map<string, string[]>>;
-}
 export declare function deriveBlocksFromTestGraph(findings: Finding[], testFiles: string[]): {
     blocks: RemediationBlock[];
     useful: boolean;
@@ -103,21 +85,11 @@ export declare function mergeBlocksSharingFiles(blocks: RemediationBlock[], find
  *   2. splitBlocksByContextBudget — keeps each block within the agent context window
  *   3. snapshotAffectedFileHashes — records baseline hashes for integrity checks
  *
- * Extracted so that both runPlanPhase (fast-path JSON reports) and
- * handlePendingExtractedPlan (LLM-extracted plans) run identical post-dedup
- * logic and the two paths cannot drift apart.
+ * Sole caller is handlePendingExtractedPlan (LLM-extracted plans join site);
+ * kept as its own function so the post-dedup logic has one home.
  */
 export declare function applyPlanPipeline(plan: RemediationPlan, options: {
     root: string;
     artifactsDir?: string;
 }): Promise<RemediationPlan>;
-/**
- * Prune blocks so that every item reference is still in the kept-findings set,
- * and drop blocks whose item list becomes empty after pruning.
- * Used in runPlanPhase wherever a reduction step drops some findings.
- * Extracted to eliminate the three formerly-duplicated inline occurrences of
- * blocks.map(b => ({...b, items: b.items.filter(id => keptIds.has(id))})).filter(...)
- */
-export declare function pruneBlocksForKeptFindings(blocks: RemediationBlock[], keptFindings: Finding[]): RemediationBlock[];
-export declare function runPlanPhase(state: RemediationState, options: OrchestratorOptions, deps?: PlanPhaseDeps): Promise<RemediationState>;
 //# sourceMappingURL=plan.d.ts.map

package/dist/remediate/phases/plan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../../src/remediate/phases/plan.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../../src/remediate/phases/plan.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,OAAO,EACP,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAe5E;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,mBAAmB,GAAG;IACrE,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB,CAgBA;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,mBAAmB,CAE9B;AAuBD,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,OAAO,EAAE,EACnB,SAAS,EAAE,MAAM,EAAE,GAClB;IAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAiDjD;AAKD,OAAO,EACL,gCAAgC,IAAI,2BAA2B,EAC/D,8BAA8B,IAAI,iCAAiC,GACpE,MAAM,oBAAoB,CAAC;AAoH5B,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAAE,EACpB,QAAQ,EAAE,OAAO,EAAE,EACnB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAMnC,IAAI,CAAC,EAAE,MAAM,GACZ,MAAM,CAeR;AA2BD,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,gBAAgB,EAAE,EAC1B,QAAQ,EAAE,OAAO,EAAE,EACnB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,GACpB,gBAAgB,EAAE,CA+FpB;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,OAAO,EAAE,CAAC;IAC1B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,iFAAiF;IACjF,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5C,oEAAoE;IACpE,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5C;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjE,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;CAC7C,GAAG,cAAc,CAwFjB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,gBAAgB,EAAE,EAC1B,QAAQ,EAAE,OAAO,EAAE,EACnB,IAAI,SAAM,GACT,gBAAgB,EAAE,CA2DpB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAC/C,OAAO,CAAC,eAAe,CAAC,CAkB1B"}