audit-tools 0.31.2 → 0.31.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/remediate/index.d.ts.map +1 -1
- package/dist/remediate/index.js +1 -0
- package/dist/remediate/index.js.map +1 -1
- package/dist/remediate/steps/dispatch.d.ts +15 -0
- package/dist/remediate/steps/dispatch.d.ts.map +1 -1
- package/dist/remediate/steps/dispatch.js +57 -1
- package/dist/remediate/steps/dispatch.js.map +1 -1
- package/dist/remediate/steps/intakeResolver.d.ts +6 -0
- package/dist/remediate/steps/intakeResolver.d.ts.map +1 -1
- package/dist/remediate/steps/intakeResolver.js +65 -39
- package/dist/remediate/steps/intakeResolver.js.map +1 -1
- package/dist/remediate/steps/nextStep.d.ts +9 -0
- package/dist/remediate/steps/nextStep.d.ts.map +1 -1
- package/dist/remediate/steps/nextStep.js +25 -17
- package/dist/remediate/steps/nextStep.js.map +1 -1
- package/package.json +1 -1
|
@@ -75,50 +75,68 @@ export async function resolveIntakeStep(params) {
|
|
|
75
75
|
// source set is fixed by the user, so it is preserved across bare calls.
|
|
76
76
|
manifest = undefined;
|
|
77
77
|
}
|
|
78
|
-
//
|
|
79
|
-
//
|
|
80
|
-
//
|
|
81
|
-
//
|
|
82
|
-
//
|
|
83
|
-
//
|
|
84
|
-
//
|
|
78
|
+
// Discovered-sources gate: on a fresh run (no manifest ever written) with no
|
|
79
|
+
// explicit source — neither `--input` (inputResolution.supplied) NOR
|
|
80
|
+
// `--guidance-file` (which lands as intake.conversationStart) — surface EVERY
|
|
81
|
+
// auto-discovered candidate to the host as a context manifest before writing
|
|
82
|
+
// source-manifest.json. The host decides (confirm the auto-selected best, or
|
|
83
|
+
// pass `--input <path>` to pick another / a new file). Awareness never blocks
|
|
84
|
+
// an explicit source: when the host supplied one, this gate is skipped entirely
|
|
85
|
+
// (that is what broke the old decline→re-offer loop — a `--guidance-file` reply
|
|
86
|
+
// used to re-trigger the identical single-candidate prompt). Re-derivation
|
|
87
|
+
// (previousManifest set but cleared above) does NOT re-trigger it.
|
|
85
88
|
if (!inputResolution.supplied &&
|
|
89
|
+
!intake.conversationStart &&
|
|
86
90
|
inputResolution.existing.length > 0 &&
|
|
87
91
|
!manifest &&
|
|
88
92
|
!previousManifest) {
|
|
89
93
|
const ackPath = join(artifactsDir, "confirm_auto_discovered_input_ack.json");
|
|
90
94
|
const ack = await readOptionalJsonFile(ackPath);
|
|
91
|
-
if (
|
|
92
|
-
|
|
93
|
-
//
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
if
|
|
95
|
+
if (ack?.status === "declined") {
|
|
96
|
+
// Host explicitly rejected the discovered defaults — do NOT silently build a
|
|
97
|
+
// manifest from the very candidate they declined; ask for an explicit source
|
|
98
|
+
// instead. This breaks the loop even without a `--guidance-file` reply.
|
|
99
|
+
return collectStartingPointStep([], "Stop after collecting an explicit remediation source (--input <path>) and rerunning next-step.");
|
|
100
|
+
}
|
|
101
|
+
if (ack?.status !== "confirmed") {
|
|
102
|
+
// Build one manifest row per discovered source, each with provenance the
|
|
103
|
+
// host can weigh (type, mtime, finding count) — the full context set, not
|
|
104
|
+
// just the single best match the pipeline would auto-select.
|
|
105
|
+
const sourceRows = [];
|
|
106
|
+
// Defensive: fall back to the single-best `existing` if a caller omitted
|
|
107
|
+
// the full context set (older callers/tests predate `allExisting`).
|
|
108
|
+
const discovered = inputResolution.allExisting ?? inputResolution.existing;
|
|
109
|
+
for (const candidatePath of discovered) {
|
|
110
|
+
let sourceTypeLabel = "document";
|
|
111
|
+
let findingCount;
|
|
112
|
+
let mtimeStr;
|
|
103
113
|
try {
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
114
|
+
const fileStat = await stat(candidatePath);
|
|
115
|
+
mtimeStr = fileStat.mtime.toISOString();
|
|
116
|
+
}
|
|
117
|
+
catch { /* best-effort */ }
|
|
118
|
+
if (candidatePath.toLowerCase().endsWith(".json")) {
|
|
119
|
+
try {
|
|
120
|
+
const content = await readFile(candidatePath, "utf8");
|
|
121
|
+
const parsed = JSON.parse(content);
|
|
122
|
+
if (isAuditFindingsReport(parsed)) {
|
|
123
|
+
sourceTypeLabel = "structured_audit";
|
|
124
|
+
const asRecord = parsed;
|
|
125
|
+
if (Array.isArray(asRecord.findings)) {
|
|
126
|
+
findingCount = asRecord.findings.length;
|
|
127
|
+
}
|
|
111
128
|
}
|
|
112
129
|
}
|
|
130
|
+
catch { /* best-effort */ }
|
|
113
131
|
}
|
|
114
|
-
|
|
132
|
+
const meta = [
|
|
133
|
+
`type: ${sourceTypeLabel}`,
|
|
134
|
+
mtimeStr ? `modified ${mtimeStr}` : undefined,
|
|
135
|
+
findingCount !== undefined ? `${findingCount} finding(s)` : undefined,
|
|
136
|
+
].filter((s) => Boolean(s));
|
|
137
|
+
sourceRows.push(`- \`${candidatePath}\` — ${meta.join(", ")}`);
|
|
115
138
|
}
|
|
116
|
-
const
|
|
117
|
-
`- **Path**: \`${candidatePath}\``,
|
|
118
|
-
`- **Type**: ${sourceTypeLabel}`,
|
|
119
|
-
mtimeStr ? `- **Last modified**: ${mtimeStr}` : undefined,
|
|
120
|
-
findingCount !== undefined ? `- **Findings**: ${findingCount}` : undefined,
|
|
121
|
-
].filter((line) => Boolean(line));
|
|
139
|
+
const autoSelected = inputResolution.existing[0];
|
|
122
140
|
return {
|
|
123
141
|
kind: "step",
|
|
124
142
|
step: await writeCurrentStep({
|
|
@@ -128,19 +146,27 @@ export async function resolveIntakeStep(params) {
|
|
|
128
146
|
repoRoot: root,
|
|
129
147
|
artifactsDir,
|
|
130
148
|
prompt: [
|
|
131
|
-
"# Confirm
|
|
149
|
+
"# Confirm discovered remediation source(s)",
|
|
132
150
|
"",
|
|
133
|
-
"
|
|
151
|
+
"No `--input`/`--guidance-file` was supplied. The following remediation",
|
|
152
|
+
"source(s) were auto-discovered on disk. Review them and decide with the user",
|
|
153
|
+
"which to use — the tool would otherwise auto-select the highest-priority one",
|
|
154
|
+
`(\`${autoSelected}\`).`,
|
|
134
155
|
"",
|
|
135
|
-
|
|
156
|
+
"**Discovered sources:**",
|
|
157
|
+
...sourceRows,
|
|
136
158
|
"",
|
|
137
|
-
`
|
|
159
|
+
`To proceed with the auto-selected source (\`${autoSelected}\`), write to \`${ackPath}\`:`,
|
|
138
160
|
"",
|
|
139
161
|
"```json",
|
|
140
162
|
'{ "status": "confirmed" }',
|
|
141
163
|
"```",
|
|
142
164
|
"",
|
|
143
|
-
|
|
165
|
+
"To use a DIFFERENT discovered source, or a file not listed, re-run with",
|
|
166
|
+
"`--input <path>` (it takes the lossless structured fast-path for a `.json`).",
|
|
167
|
+
"",
|
|
168
|
+
`To reject all discovered defaults, write \`{ "status": "declined" }\` to \`${ackPath}\``,
|
|
169
|
+
"and re-run with an explicit `--input <path>`.",
|
|
144
170
|
"",
|
|
145
171
|
`Then run: \`${params.loaderCommand("next-step")}\``,
|
|
146
172
|
].join("\n"),
|
|
@@ -148,7 +174,7 @@ export async function resolveIntakeStep(params) {
|
|
|
148
174
|
params.loaderCommand("next-step"),
|
|
149
175
|
params.loaderCommand("next-step --input <path>"),
|
|
150
176
|
],
|
|
151
|
-
stopCondition: "Stop after presenting the discovered
|
|
177
|
+
stopCondition: "Stop after presenting the discovered sources to the user and writing the ack.",
|
|
152
178
|
artifactPaths: {
|
|
153
179
|
confirm_auto_discovered_input_ack: ackPath,
|
|
154
180
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intakeResolver.js","sourceRoot":"","sources":["../../../src/remediate/steps/intakeResolver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"intakeResolver.js","sourceRoot":"","sources":["../../../src/remediate/steps/intakeResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,15 @@ export interface NextStepOptions {
|
|
|
20
20
|
hostModelId?: string | null;
|
|
21
21
|
finalizeClosing?: boolean;
|
|
22
22
|
forceReplan?: boolean;
|
|
23
|
+
/**
|
|
24
|
+
* True when this invocation supplied `--guidance-file` (folded into
|
|
25
|
+
* intake/conversation-start.md before the step decision). Like a fresh
|
|
26
|
+
* `--input`, a guidance file introduces NEW intake, so against a run already
|
|
27
|
+
* past intake it must trip the resume-vs-restart conflict gate rather than
|
|
28
|
+
* silently resuming (and executing) the old, unrelated run. Set once at the
|
|
29
|
+
* bootstrap call; bare `next-step` follow-ups leave it undefined.
|
|
30
|
+
*/
|
|
31
|
+
guidanceFileSupplied?: boolean;
|
|
23
32
|
/**
|
|
24
33
|
* Opt IN to the in-process rolling dispatch engine for the implement phase.
|
|
25
34
|
* Defaults off (proven host-fanned wave path). See `resolveRollingEngineEnabled`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextStep.d.ts","sourceRoot":"","sources":["../../../src/remediate/steps/nextStep.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"nextStep.d.ts","sourceRoot":"","sources":["../../../src/remediate/steps/nextStep.ts"],"names":[],"mappings":"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"}
|
|
@@ -215,11 +215,13 @@ function resolveInputPaths(root, input) {
|
|
|
215
215
|
const values = inputValues(input).filter((value) => value.trim().length > 0);
|
|
216
216
|
if (values.length > 0) {
|
|
217
217
|
const checked = values.map((value) => resolve(root, value));
|
|
218
|
+
const existing = checked.filter((candidate) => existsSync(candidate));
|
|
218
219
|
return {
|
|
219
220
|
supplied: true,
|
|
220
|
-
existing
|
|
221
|
+
existing,
|
|
221
222
|
missing: checked.filter((candidate) => !existsSync(candidate)),
|
|
222
223
|
checked,
|
|
224
|
+
allExisting: existing,
|
|
223
225
|
};
|
|
224
226
|
}
|
|
225
227
|
const checked = defaultInputCandidates(root);
|
|
@@ -228,12 +230,14 @@ function resolveInputPaths(root, input) {
|
|
|
228
230
|
// highest-priority match — never feed both the structured contract and its
|
|
229
231
|
// markdown render — so a lone .json input takes the lossless structured
|
|
230
232
|
// fast-path instead of being demoted to multi-source LLM extraction.
|
|
231
|
-
const
|
|
233
|
+
const allExisting = checked.filter((candidate) => existsSync(candidate));
|
|
234
|
+
const best = allExisting[0];
|
|
232
235
|
return {
|
|
233
236
|
supplied: false,
|
|
234
237
|
existing: best ? [best] : [],
|
|
235
238
|
missing: [],
|
|
236
239
|
checked,
|
|
240
|
+
allExisting,
|
|
237
241
|
};
|
|
238
242
|
}
|
|
239
243
|
/**
|
|
@@ -2194,7 +2198,7 @@ async function handleInputConflict(root, artifactsDir, state, inputResolution) {
|
|
|
2194
2198
|
const itemCount = state.items ? Object.keys(state.items).length : 0;
|
|
2195
2199
|
const suppliedInline = inputResolution.checked.length > 0
|
|
2196
2200
|
? inputResolution.checked.map((p) => `\`${p}\``).join(", ")
|
|
2197
|
-
: "(
|
|
2201
|
+
: "(new intake source via `--guidance-file`)";
|
|
2198
2202
|
return writeCurrentStep({
|
|
2199
2203
|
stepKind: "input_conflict",
|
|
2200
2204
|
status: "blocked",
|
|
@@ -2202,11 +2206,11 @@ async function handleInputConflict(root, artifactsDir, state, inputResolution) {
|
|
|
2202
2206
|
repoRoot: root,
|
|
2203
2207
|
artifactsDir,
|
|
2204
2208
|
prompt: `
|
|
2205
|
-
# New
|
|
2209
|
+
# New intake source given, but a remediation run is already in progress
|
|
2206
2210
|
|
|
2207
2211
|
A remediation run already exists in \`${artifactsDir}\` and has advanced past intake,
|
|
2208
|
-
so the new \`--input\`
|
|
2209
|
-
existing plan resumed.
|
|
2212
|
+
so the new intake source you passed (\`--input\` or \`--guidance-file\`) will **not**
|
|
2213
|
+
replace it — it would be ignored and the existing plan resumed and executed.
|
|
2210
2214
|
|
|
2211
2215
|
- **Current state**: \`${state.status}\`
|
|
2212
2216
|
- **Plan**: \`${planId}\` (${itemCount} item(s))
|
|
@@ -2214,11 +2218,11 @@ existing plan resumed.
|
|
|
2214
2218
|
|
|
2215
2219
|
Choose one explicitly and report the choice to the user:
|
|
2216
2220
|
|
|
2217
|
-
1. **Resume the existing run** — re-run WITHOUT \`--input\`: \`${loaderCommand("next-step")}\`
|
|
2218
|
-
2. **Start fresh from the new
|
|
2221
|
+
1. **Resume the existing run** — re-run WITHOUT any \`--input\`/\`--guidance-file\`: \`${loaderCommand("next-step")}\`
|
|
2222
|
+
2. **Start fresh from the new source** — first move aside or delete the existing
|
|
2219
2223
|
\`${artifactsDir}\` directory (and the stale \`remediation-report.md\` /
|
|
2220
2224
|
\`remediation-outcomes.json\` in \`.audit-tools/\`, which would otherwise be overwritten on completion),
|
|
2221
|
-
then re-run \`${loaderCommand("next-step --input <path>")}
|
|
2225
|
+
then re-run with your new source (\`${loaderCommand("next-step --input <path>")}\` or \`--guidance-file <path>\`).
|
|
2222
2226
|
|
|
2223
2227
|
Stop after presenting this choice. Do not advance the run until the user decides.
|
|
2224
2228
|
`,
|
|
@@ -3169,7 +3173,7 @@ const PRE_INTAKE_PRIORITY = [
|
|
|
3169
3173
|
*/
|
|
3170
3174
|
function buildPreIntakeObligations(ctx, snapshot) {
|
|
3171
3175
|
const { artifactsDir, inputResolution } = ctx;
|
|
3172
|
-
const { existingCheckpoint, resumeAck, entryState, suppliedInputUnchanged } = snapshot;
|
|
3176
|
+
const { existingCheckpoint, resumeAck, entryState, suppliedInputUnchanged, guidanceFileSupplied } = snapshot;
|
|
3173
3177
|
const ip = intakePaths(artifactsDir);
|
|
3174
3178
|
const checkpointPath = join(artifactsDir, "intent_checkpoint.json");
|
|
3175
3179
|
const ackPath = join(artifactsDir, "confirm_resume_ack.json");
|
|
@@ -3177,14 +3181,17 @@ function buildPreIntakeObligations(ctx, snapshot) {
|
|
|
3177
3181
|
const reportPath = join(dirname(artifactsDir), "remediation-report.md");
|
|
3178
3182
|
return [
|
|
3179
3183
|
{
|
|
3180
|
-
// A new, DIFFERENT
|
|
3181
|
-
// silently resume the old plan; require an explicit
|
|
3182
|
-
// choice.
|
|
3183
|
-
//
|
|
3184
|
-
//
|
|
3184
|
+
// A new, DIFFERENT intake source against a run already past intake must not
|
|
3185
|
+
// silently resume (and re-execute) the old plan; require an explicit
|
|
3186
|
+
// resume-vs-restart choice. Two ways a fresh source arrives: a new `--input`
|
|
3187
|
+
// (the SAME --input re-passed by the loader every next-step is an unchanged
|
|
3188
|
+
// input → a resume, not a conflict), OR a `--guidance-file` (a one-shot
|
|
3189
|
+
// bootstrap that lands as conversation-start.md — it has no
|
|
3190
|
+
// "unchanged" notion, so any guidance file against an advanced run conflicts;
|
|
3191
|
+
// bare follow-ups don't set the flag). Derives from the frozen entry state.
|
|
3185
3192
|
id: "input_conflict",
|
|
3186
|
-
derive: () => inputResolution.supplied &&
|
|
3187
|
-
|
|
3193
|
+
derive: () => ((inputResolution.supplied && !suppliedInputUnchanged) ||
|
|
3194
|
+
guidanceFileSupplied) &&
|
|
3188
3195
|
entryState != null &&
|
|
3189
3196
|
entryState.status !== "pending"
|
|
3190
3197
|
? "missing"
|
|
@@ -3640,6 +3647,7 @@ async function decideNextStepLoop(options, runLogger) {
|
|
|
3640
3647
|
resumeAck,
|
|
3641
3648
|
entryState: state,
|
|
3642
3649
|
suppliedInputUnchanged,
|
|
3650
|
+
guidanceFileSupplied: Boolean(options.guidanceFileSupplied),
|
|
3643
3651
|
}),
|
|
3644
3652
|
}, state, ctx);
|
|
3645
3653
|
if (preIntake.step)
|