audit-tools 0.31.2 → 0.31.4

package/dist/remediate/steps/intakeResolver.js

@@ -75,50 +75,68 @@ export async function resolveIntakeStep(params) {
         // source set is fixed by the user, so it is preserved across bare calls.
         manifest = undefined;
     }
-    // Auto-discovered input confirmation gate: when a candidate was found via
-    // default discovery (no --input supplied) and no manifest has ever been
-    // written for this run (previousManifest is undefined), present the file to
-    // the user before writing source-manifest.json. Only after the user confirms
-    // (via confirm_auto_discovered_input_ack.json) does the run proceed to write
-    // the manifest and continue. Re-derivation (previousManifest set but cleared
-    // above) does NOT re-trigger the gate — the user already confirmed that input.
+    // Discovered-sources gate: on a fresh run (no manifest ever written) with no
+    // explicit source — neither `--input` (inputResolution.supplied) NOR
+    // `--guidance-file` (which lands as intake.conversationStart) — surface EVERY
+    // auto-discovered candidate to the host as a context manifest before writing
+    // source-manifest.json. The host decides (confirm the auto-selected best, or
+    // pass `--input <path>` to pick another / a new file). Awareness never blocks
+    // an explicit source: when the host supplied one, this gate is skipped entirely
+    // (that is what broke the old decline→re-offer loop — a `--guidance-file` reply
+    // used to re-trigger the identical single-candidate prompt). Re-derivation
+    // (previousManifest set but cleared above) does NOT re-trigger it.
     if (!inputResolution.supplied &&
+        !intake.conversationStart &&
         inputResolution.existing.length > 0 &&
         !manifest &&
         !previousManifest) {
         const ackPath = join(artifactsDir, "confirm_auto_discovered_input_ack.json");
         const ack = await readOptionalJsonFile(ackPath);
-        if (!ack || ack.status !== "confirmed") {
-            const candidatePath = inputResolution.existing[0];
-            // Determine source type label for the prompt
-            let sourceTypeLabel = "document";
-            let findingCount;
-            let mtimeStr;
-            try {
-                const fileStat = await stat(candidatePath);
-                mtimeStr = fileStat.mtime.toISOString();
-            }
-            catch { /* best-effort */ }
-            if (candidatePath.toLowerCase().endsWith(".json")) {
+        if (ack?.status === "declined") {
+            // Host explicitly rejected the discovered defaults — do NOT silently build a
+            // manifest from the very candidate they declined; ask for an explicit source
+            // instead. This breaks the loop even without a `--guidance-file` reply.
+            return collectStartingPointStep([], "Stop after collecting an explicit remediation source (--input <path>) and rerunning next-step.");
+        }
+        if (ack?.status !== "confirmed") {
+            // Build one manifest row per discovered source, each with provenance the
+            // host can weigh (type, mtime, finding count) — the full context set, not
+            // just the single best match the pipeline would auto-select.
+            const sourceRows = [];
+            // Defensive: fall back to the single-best `existing` if a caller omitted
+            // the full context set (older callers/tests predate `allExisting`).
+            const discovered = inputResolution.allExisting ?? inputResolution.existing;
+            for (const candidatePath of discovered) {
+                let sourceTypeLabel = "document";
+                let findingCount;
+                let mtimeStr;
                 try {
-                    const content = await readFile(candidatePath, "utf8");
-                    const parsed = JSON.parse(content);
-                    if (isAuditFindingsReport(parsed)) {
-                        sourceTypeLabel = "structured_audit";
-                        const asRecord = parsed;
-                        if (Array.isArray(asRecord.findings)) {
-                            findingCount = asRecord.findings.length;
+                    const fileStat = await stat(candidatePath);
+                    mtimeStr = fileStat.mtime.toISOString();
+                }
+                catch { /* best-effort */ }
+                if (candidatePath.toLowerCase().endsWith(".json")) {
+                    try {
+                        const content = await readFile(candidatePath, "utf8");
+                        const parsed = JSON.parse(content);
+                        if (isAuditFindingsReport(parsed)) {
+                            sourceTypeLabel = "structured_audit";
+                            const asRecord = parsed;
+                            if (Array.isArray(asRecord.findings)) {
+                                findingCount = asRecord.findings.length;
+                            }
                         }
                     }
+                    catch { /* best-effort */ }
                 }
-                catch { /* best-effort */ }
+                const meta = [
+                    `type: ${sourceTypeLabel}`,
+                    mtimeStr ? `modified ${mtimeStr}` : undefined,
+                    findingCount !== undefined ? `${findingCount} finding(s)` : undefined,
+                ].filter((s) => Boolean(s));
+                sourceRows.push(`- \`${candidatePath}\` — ${meta.join(", ")}`);
             }
-            const detailLines = [
-                `- **Path**: \`${candidatePath}\``,
-                `- **Type**: ${sourceTypeLabel}`,
-                mtimeStr ? `- **Last modified**: ${mtimeStr}` : undefined,
-                findingCount !== undefined ? `- **Findings**: ${findingCount}` : undefined,
-            ].filter((line) => Boolean(line));
+            const autoSelected = inputResolution.existing[0];
             return {
                 kind: "step",
                 step: await writeCurrentStep({
@@ -128,19 +146,27 @@ export async function resolveIntakeStep(params) {
                     repoRoot: root,
                     artifactsDir,
                     prompt: [
-                        "# Confirm Auto-Discovered Input",
+                        "# Confirm discovered remediation source(s)",
                         "",
-                        "A remediation input was automatically discovered. Please confirm whether to use it.",
+                        "No `--input`/`--guidance-file` was supplied. The following remediation",
+                        "source(s) were auto-discovered on disk. Review them and decide with the user",
+                        "which to use — the tool would otherwise auto-select the highest-priority one",
+                        `(\`${autoSelected}\`).`,
                         "",
-                        ...detailLines,
+                        "**Discovered sources:**",
+                        ...sourceRows,
                         "",
-                        `If you want to use this file, write the following to \`${ackPath}\`:`,
+                        `To proceed with the auto-selected source (\`${autoSelected}\`), write to \`${ackPath}\`:`,
                         "",
                         "```json",
                         '{ "status": "confirmed" }',
                         "```",
                         "",
-                        `If you want to use a different file, write \`{ "status": "declined" }\` to \`${ackPath}\` and re-run with \`--input <path>\`.`,
+                        "To use a DIFFERENT discovered source, or a file not listed, re-run with",
+                        "`--input <path>` (it takes the lossless structured fast-path for a `.json`).",
+                        "",
+                        `To reject all discovered defaults, write \`{ "status": "declined" }\` to \`${ackPath}\``,
+                        "and re-run with an explicit `--input <path>`.",
                         "",
                         `Then run: \`${params.loaderCommand("next-step")}\``,
                     ].join("\n"),
@@ -148,7 +174,7 @@ export async function resolveIntakeStep(params) {
                         params.loaderCommand("next-step"),
                         params.loaderCommand("next-step --input <path>"),
                     ],
-                    stopCondition: "Stop after presenting the discovered file to the user and writing the ack.",
+                    stopCondition: "Stop after presenting the discovered sources to the user and writing the ack.",
                     artifactPaths: {
                         confirm_auto_discovered_input_ack: ackPath,
                     },

package/dist/remediate/steps/intakeResolver.js.map

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

package/dist/remediate/steps/nextStep.d.ts

@@ -20,6 +20,15 @@ export interface NextStepOptions {
     hostModelId?: string | null;
     finalizeClosing?: boolean;
     forceReplan?: boolean;
+    /**
+     * True when this invocation supplied `--guidance-file` (folded into
+     * intake/conversation-start.md before the step decision). Like a fresh
+     * `--input`, a guidance file introduces NEW intake, so against a run already
+     * past intake it must trip the resume-vs-restart conflict gate rather than
+     * silently resuming (and executing) the old, unrelated run. Set once at the
+     * bootstrap call; bare `next-step` follow-ups leave it undefined.
+     */
+    guidanceFileSupplied?: boolean;
     /**
      * Opt IN to the in-process rolling dispatch engine for the implement phase.
      * Defaults off (proven host-fanned wave path). See `resolveRollingEngineEnabled`.

package/dist/remediate/steps/nextStep.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nextStep.d.ts","sourceRoot":"","sources":["../../../src/remediate/steps/nextStep.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nextStep.d.ts","sourceRoot":"","sources":["../../../src/remediate/steps/nextStep.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAGV,gBAAgB,EAGjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAA4W,KAAK,sBAAsB,EAA8C,KAAK,iBAAiB,EAAE,KAAK,aAAa,EAAE,KAAK,oBAAoB,EAAE,KAAK,YAAY,EAAE,KAAK,yBAAyB,EAA8B,KAAK,qBAAqB,EAAE,KAAK,YAAY,EAAqB,KAAK,sBAAsB,EAAE,KAAK,cAAc,EAAiJ,sBAAsB,EAAqG,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAOpgC,OAAO,EASL,KAAK,kBAAkB,EACxB,MAAM,eAAe,CAAC;AAQvB,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAE3E,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EAEzB,MAAM,wBAAwB,CAAC;AAQhC,OAAO,EAKL,KAAK,UAAU,EAChB,MAAM,gBAAgB,CAAC;AAuCxB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAmC3D,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,0EAA0E;IAC1E,UAAU,CAAC,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC;IAC3C,2EAA2E;IAC3E,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;;;;OAOG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,UAAU,CAAC;CAC9B;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE;IACrD,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,GAAG,OAAO,CAgBV;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,GAAE;IAC7C,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACpB,GAAG,OAAO,CAQf;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE;IACnD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,GAAG,OAAO,CAQV;AAED,iFAAiF;AACjF,MAAM,WAAW,wBAAwB;IACvC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AASD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,wBAAwB,GAAG,SAAS,EAC9C,SAAS,EAAE,gBAAgB,GAAG,SAAS,GACtC;IAAE,QAAQ,EAAE,gBAAgB,CAAC;IAAC,SAAS,EAAE,gBAAgB,CAAA;CAAE,CAuC7D;AA2JD,YAAY,EACV,eAAe,EACf,qBAAqB,GACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,YAAY,EACZ,qBAAqB,EACrB,0BAA0B,EAC1B,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;AA+DtD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,EAAE,EAAE,CAoFtB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAa1E;AAED,0EAA0E;AAC1E,MAAM,MAAM,qBAAqB,GAAG,CAClC,KAAK,EAAE,gBAAgB,EACvB,IAAI,EAAE,YAAY,KACf,OAAO,CAAC,qBAAqB,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAAC;AAE1D,MAAM,WAAW,2BAA2B;IAC1C,kFAAkF;IAClF,cAAc,EAAE,YAAY,EAAE,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,mFAAmF;IACnF,YAAY,EAAE,qBAAqB,CAAC;IACpC;;;;OAIG;IACH,0BAA0B,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,8EAA8E;IAC9E,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,MAAM,CAAC;IACrD,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,MAAM,EAAE,CAAC;IACtD,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,sBAAsB,CAAC;CACtC;AAED,MAAM,WAAW,0BAA0B;IACzC,kDAAkD;IAClD,MAAM,EAAE,KAAK,CAAC;QACZ,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,EAAE,qBAAqB,CAAC;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC,EAAE,CAAC;KACxD,CAAC,CAAC;IACH,4FAA4F;IAC5F,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,yBAAyB,CAAC;CACtC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,gBAAgB,EAAE,EAAE,EAC5B,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,0BAA0B,CAAC,CAyFrC;AAsDD,0GAA0G;AAC1G,MAAM,MAAM,0BAA0B,GAAG,CAAC,IAAI,EAAE;IAC9C,KAAK,EAAE,gBAAgB,CAAC;IACxB,IAAI,EAAE,YAAY,CAAC;IACnB,8DAA8D;IAC9D,YAAY,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,UAAU,EAAE,MAAM,CAAC;CACpB,KAAK,OAAO,CAAC,qBAAqB,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAAC;AAE3D,MAAM,WAAW,oCAAoC;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,0BAA0B,CAAC;IAC1C,qFAAqF;IACrF,0BAA0B,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,uEAAuE;IACvE,WAAW,CAAC,EAAE;QACZ,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAClC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACjC,UAAU,CAAC,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC;QAC3C,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC7B,CAAC;CACH;AAED,MAAM,WAAW,mCAAmC;IAClD,0DAA0D;IAC1D,KAAK,EAAE,KAAK,CAAC;QACX,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,qBAAqB,CAAC;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QAChE,aAAa,EAAE,OAAO,CAAC;QACvB,MAAM,EAAE,OAAO,CAAC;KACjB,CAAC,CAAC;IACH,uDAAuD;IACvD,QAAQ,EAAE,MAAM,CAAC;IACjB,0EAA0E;IAC1E,YAAY,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;CAC1C;AAwDD;;;;;;;;;;;;GAYG;AACH,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,oCAAoC,GAC5C,OAAO,CAAC,mCAAmC,GAAG,IAAI,CAAC,CA2NrD;AAUD,4EAA4E;AAC5E,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,KAAK,CAAC;QACX,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,qBAAqB,CAAC;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QAChE,aAAa,EAAE,OAAO,CAAC;QACvB,MAAM,EAAE,OAAO,CAAC;KACjB,CAAC,CAAC;CACJ;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,SAAS,EAAE,cAAc,EAAE,CAAC;IAC5B,IAAI,EAAE,uBAAuB,CAAC;IAC9B,WAAW,EAAE,sBAAsB,CAAC;IACpC;;;;OAIG;IACH,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC;;;;;OAKG;IACH,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CAClD,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAkEpC;AAaD,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACV,oBAAoB,EACpB,sBAAsB,EACtB,wBAAwB,EACxB,UAAU,EACV,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,gBAAgB,CAAC;AAkzBxB;;;;;;;;;;GAUG;AACH,wBAAsB,+BAA+B,CACnD,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,gBAAgB,GAAG,IAAI,GAC7B,OAAO,CAAC,sBAAsB,CAAC,CAEjC;AAslDD,wBAAsB,cAAc,CAClC,OAAO,GAAE,eAAe,GAAG,MAAW,GACrC,OAAO,CAAC,eAAe,CAAC,CAmC1B;AA8OD,uFAAuF;AACvF,eAAO,MAAM,8BAA8B,+BAA+B,CAAC;AAC3E,eAAO,MAAM,oCAAoC,kDACA,CAAC;AAElD,MAAM,WAAW,6BAA6B;IAC5C,cAAc,EAAE,OAAO,oCAAoC,CAAC;IAC5D,6EAA6E;IAC7E,WAAW,EAAE,iBAAiB,CAAC;IAC/B;;;;OAIG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,wBAAsB,kCAAkC,CACtD,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,gBAAgB,GAAG,SAAS,GACvC,OAAO,CAAC,6BAA6B,GAAG,IAAI,CAAC,CA6B/C"}

package/dist/remediate/steps/nextStep.js

@@ -12,6 +12,9 @@ import { mergeImplementResults, prepareImplementDispatch, readExtractedPlanIfPre
 import { makeProviderNodeDispatcher } from "./providerNodeDispatch.js";
 import { ownershipSubWaves } from "../dispatch/ownershipScheduler.js";
 import { prepareHostRollingDispatch, nodeClaimRegistry, nodeSettledPoolsPath } from "./rollingSession.js";
+import { ClaimRegistry } from "../../shared/quota/claimRegistry.js";
+import { claimWithBackoff, withClaimHeartbeat } from "../../shared/quota/claimLease.js";
+import { nodeClaimsPath } from "../../shared/io/auditToolsPaths.js";
 import { writeCurrentStep } from "./stepWriter.js";
 import { dependencyVerifiedComplete } from "./stepUtils.js";
 import { isTerminalStatus, isVerifiedCompleteStatus, } from "../state/itemStatus.js";
@@ -215,11 +218,13 @@ function resolveInputPaths(root, input) {
     const values = inputValues(input).filter((value) => value.trim().length > 0);
     if (values.length > 0) {
         const checked = values.map((value) => resolve(root, value));
+        const existing = checked.filter((candidate) => existsSync(candidate));
         return {
             supplied: true,
-            existing: checked.filter((candidate) => existsSync(candidate)),
+            existing,
             missing: checked.filter((candidate) => !existsSync(candidate)),
             checked,
+            allExisting: existing,
         };
     }
     const checked = defaultInputCandidates(root);
@@ -228,12 +233,14 @@ function resolveInputPaths(root, input) {
     // highest-priority match — never feed both the structured contract and its
     // markdown render — so a lone .json input takes the lossless structured
     // fast-path instead of being demoted to multi-source LLM extraction.
-    const best = checked.find((candidate) => existsSync(candidate));
+    const allExisting = checked.filter((candidate) => existsSync(candidate));
+    const best = allExisting[0];
     return {
         supplied: false,
         existing: best ? [best] : [],
         missing: [],
         checked,
+        allExisting,
     };
 }
 /**
@@ -1549,6 +1556,43 @@ ${resetLine}
         stopCondition: "Stop and wait for the provider reset. Re-running next-step resumes the stranded nodes.",
     });
 }
+// Cooperative multi-agent (slice 4): the single mutex node guarding this run's
+// in-process serial state-machine advance, and the heartbeat interval (well inside
+// STALE_LOCK_MS so a live long phase is never reclaimed).
+const REMEDIATE_PHASE_NODE = "phase:main";
+const PHASE_CLAIM_HEARTBEAT_MS = 10_000;
+// Cooperative multi-agent (slice 4, spec/multi-ide-concurrent-runs-design.md):
+// emitted when another agent/IDE currently holds the phase mutex and is advancing
+// this run's serial state machine. A non-blocking "retry shortly" — the host
+// re-runs next-step and joins once the peer yields (or finishes into the pooled
+// implement phase this peer can then join).
+async function buildPhaseBusyStep(params) {
+    const { root, artifactsDir, runId } = params;
+    const nextCommand = loaderCommand("next-step");
+    return writeCurrentStep({
+        stepKind: "phase_busy",
+        status: "ready",
+        runId,
+        repoRoot: root,
+        artifactsDir,
+        prompt: `
+# Remediation busy — another agent is advancing this run
+
+Another agent/IDE is currently advancing this remediation's state machine (a
+serial phase — plan, triage, or close). Nothing is wrong; this is the cooperative
+multi-agent guard that stops two agents from running the same phase at once.
+
+Wait a few seconds, then run:
+
+\`${nextCommand}\`
+
+Once the peer yields — or the run reaches the parallel implement phase — your
+next-step joins in and takes on unclaimed work.
+`,
+        allowedCommands: [nextCommand],
+        stopCondition: "Stop briefly, then re-run next-step to join the run once the peer yields the phase.",
+    });
+}
 // --- Per-state handlers -----------------------------------------------------
 // Each handler owns one branch of the original decideNextStepInner dispatch.
 // Handlers that emit a step return RemediationStep directly; handlers that need
@@ -2194,7 +2238,7 @@ async function handleInputConflict(root, artifactsDir, state, inputResolution) {
     const itemCount = state.items ? Object.keys(state.items).length : 0;
     const suppliedInline = inputResolution.checked.length > 0
         ? inputResolution.checked.map((p) => `\`${p}\``).join(", ")
-        : "(input supplied)";
+        : "(new intake source via `--guidance-file`)";
     return writeCurrentStep({
         stepKind: "input_conflict",
         status: "blocked",
@@ -2202,11 +2246,11 @@ async function handleInputConflict(root, artifactsDir, state, inputResolution) {
         repoRoot: root,
         artifactsDir,
         prompt: `
-# New \`--input\` given, but a remediation run is already in progress
+# New intake source given, but a remediation run is already in progress
 
 A remediation run already exists in \`${artifactsDir}\` and has advanced past intake,
-so the new \`--input\` you passed will **not** replace it — it would be ignored and the
-existing plan resumed.
+so the new intake source you passed (\`--input\` or \`--guidance-file\`) will **not**
+replace it — it would be ignored and the existing plan resumed and executed.
 
 - **Current state**: \`${state.status}\`
 - **Plan**: \`${planId}\` (${itemCount} item(s))
@@ -2214,11 +2258,11 @@ existing plan resumed.
 
 Choose one explicitly and report the choice to the user:
 
-1. **Resume the existing run** — re-run WITHOUT \`--input\`: \`${loaderCommand("next-step")}\`
-2. **Start fresh from the new input** — first move aside or delete the existing
+1. **Resume the existing run** — re-run WITHOUT any \`--input\`/\`--guidance-file\`: \`${loaderCommand("next-step")}\`
+2. **Start fresh from the new source** — first move aside or delete the existing
    \`${artifactsDir}\` directory (and the stale \`remediation-report.md\` /
    \`remediation-outcomes.json\` in \`.audit-tools/\`, which would otherwise be overwritten on completion),
-   then re-run \`${loaderCommand("next-step --input <path>")}\`.
+   then re-run with your new source (\`${loaderCommand("next-step --input <path>")}\` or \`--guidance-file <path>\`).
 
 Stop after presenting this choice. Do not advance the run until the user decides.
 `,
@@ -3169,7 +3213,7 @@ const PRE_INTAKE_PRIORITY = [
  */
 function buildPreIntakeObligations(ctx, snapshot) {
     const { artifactsDir, inputResolution } = ctx;
-    const { existingCheckpoint, resumeAck, entryState, suppliedInputUnchanged } = snapshot;
+    const { existingCheckpoint, resumeAck, entryState, suppliedInputUnchanged, guidanceFileSupplied } = snapshot;
     const ip = intakePaths(artifactsDir);
     const checkpointPath = join(artifactsDir, "intent_checkpoint.json");
     const ackPath = join(artifactsDir, "confirm_resume_ack.json");
@@ -3177,14 +3221,17 @@ function buildPreIntakeObligations(ctx, snapshot) {
     const reportPath = join(dirname(artifactsDir), "remediation-report.md");
     return [
         {
-            // A new, DIFFERENT --input against a run already past intake must not
-            // silently resume the old plan; require an explicit resume-vs-restart
-            // choice. The SAME --input re-passed (the loader does this every next-step)
-            // is an unchanged input → a resume, not a conflict. Derives from the frozen
-            // entry state — never an intake-created one.
+            // A new, DIFFERENT intake source against a run already past intake must not
+            // silently resume (and re-execute) the old plan; require an explicit
+            // resume-vs-restart choice. Two ways a fresh source arrives: a new `--input`
+            // (the SAME --input re-passed by the loader every next-step is an unchanged
+            // input → a resume, not a conflict), OR a `--guidance-file` (a one-shot
+            // bootstrap that lands as conversation-start.md — it has no
+            // "unchanged" notion, so any guidance file against an advanced run conflicts;
+            // bare follow-ups don't set the flag). Derives from the frozen entry state.
             id: "input_conflict",
-            derive: () => inputResolution.supplied &&
-                !suppliedInputUnchanged &&
+            derive: () => ((inputResolution.supplied && !suppliedInputUnchanged) ||
+                guidanceFileSupplied) &&
                 entryState != null &&
                 entryState.status !== "pending"
                 ? "missing"
@@ -3640,6 +3687,7 @@ async function decideNextStepLoop(options, runLogger) {
             resumeAck,
             entryState: state,
             suppliedInputUnchanged,
+            guidanceFileSupplied: Boolean(options.guidanceFileSupplied),
         }),
     }, state, ctx);
     if (preIntake.step)
@@ -3652,11 +3700,37 @@ async function decideNextStepLoop(options, runLogger) {
         return handleNoState(root, artifactsDir);
     }
     await countStep(state);
-    const main = await advance({ priority: MAIN_PRIORITY, obligations: buildMainObligations(ctx) }, state, ctx);
-    if (main.step)
-        return main.step;
-    // The unhandled catch-all always emits on a non-null state, so a null step here
-    // is unreachable; keep an explicit fallback rather than a non-null assertion.
-    return handleUnhandledState(root, artifactsDir, state);
+    // Cooperative multi-agent (slice 4): a single phase mutex serializes the
+    // in-process MAIN advance so two joining peers never run the same SERIAL phase
+    // (planning / triage / close) and clobber state.json. This does NOT serialize
+    // the heavy implement work — that runs out-of-process via per-node claims; the
+    // mutex only guards the quick in-process advance + dispatch-emission, during
+    // which each peer claims its own disjoint nodes. Mirrors audit's bundle-mutation
+    // mutex (slice 1). Registry is the repo-level remediation node-claims file
+    // (distinct from the per-run implement node-claims under runs/<runId>/implement).
+    const phaseRegistry = new ClaimRegistry(nodeClaimsPath(artifactsDir));
+    const phaseRunId = stateRunId(state);
+    const phaseClaim = await claimWithBackoff(phaseRegistry, REMEDIATE_PHASE_NODE, {
+        poolId: phaseRunId,
+    });
+    if (!phaseClaim.acquired) {
+        return buildPhaseBusyStep({ root, artifactsDir, runId: phaseRunId });
+    }
+    try {
+        // Re-load fresh under the mutex: a peer may have advanced (and persisted)
+        // state between our initial load and winning the claim. For an established
+        // run (the multi-agent case) the pre-intake gates above were all no-ops, so
+        // the reload is simply the latest persisted state.
+        const advanceState = (await store.loadState()) ?? state;
+        const main = await withClaimHeartbeat(phaseRegistry, REMEDIATE_PHASE_NODE, phaseClaim.ownerToken, { intervalMs: PHASE_CLAIM_HEARTBEAT_MS }, () => advance({ priority: MAIN_PRIORITY, obligations: buildMainObligations(ctx) }, advanceState, ctx));
+        if (main.step)
+            return main.step;
+        // The unhandled catch-all always emits on a non-null state, so a null step
+        // here is unreachable; keep an explicit fallback rather than a non-null assert.
+        return handleUnhandledState(root, artifactsDir, advanceState);
+    }
+    finally {
+        await phaseRegistry.release(REMEDIATE_PHASE_NODE, phaseClaim.ownerToken);
+    }
 }
 //# sourceMappingURL=nextStep.js.map