openpitstop 1.9.0 → 1.10.0
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/PRIVACY.md +77 -90
- package/README.md +365 -887
- package/dist/agentBudget.d.ts +33 -0
- package/dist/agentBudget.js +165 -0
- package/dist/agentBudget.js.map +1 -0
- package/dist/analyzers/ledger/index.d.ts +2 -1
- package/dist/analyzers/ledger/index.js +10 -1
- package/dist/analyzers/ledger/index.js.map +1 -1
- package/dist/analyzers/types.d.ts +2 -0
- package/dist/candidate.d.ts +20 -0
- package/dist/candidate.js +87 -0
- package/dist/candidate.js.map +1 -0
- package/dist/cli.js +1 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/ask.d.ts +0 -8
- package/dist/commands/ask.js +36 -34
- package/dist/commands/ask.js.map +1 -1
- package/dist/commands/budget.d.ts +1 -0
- package/dist/commands/budget.js +12 -3
- package/dist/commands/budget.js.map +1 -1
- package/dist/commands/drive.js +77 -51
- package/dist/commands/drive.js.map +1 -1
- package/dist/commands/fix.d.ts +7 -0
- package/dist/commands/fix.js +90 -108
- package/dist/commands/fix.js.map +1 -1
- package/dist/commands/gate.js +6 -2
- package/dist/commands/gate.js.map +1 -1
- package/dist/commands/pen.d.ts +3 -1
- package/dist/commands/pen.js +31 -42
- package/dist/commands/pen.js.map +1 -1
- package/dist/commands/readyCheck.d.ts +1 -1
- package/dist/commands/readyCheck.js +6 -36
- package/dist/commands/readyCheck.js.map +1 -1
- package/dist/commands/scan.d.ts +6 -5
- package/dist/commands/scan.js +26 -28
- package/dist/commands/scan.js.map +1 -1
- package/dist/commands/verify.d.ts +3 -1
- package/dist/commands/verify.js +5 -1
- package/dist/commands/verify.js.map +1 -1
- package/dist/evidence.js +4 -0
- package/dist/evidence.js.map +1 -1
- package/dist/installer/targets.js +1 -1
- package/dist/installer/targets.js.map +1 -1
- package/dist/intent.d.ts +4 -7
- package/dist/intent.js +41 -77
- package/dist/intent.js.map +1 -1
- package/dist/pen/dynamic.d.ts +1 -24
- package/dist/pen/dynamic.js +10 -1
- package/dist/pen/dynamic.js.map +1 -1
- package/dist/pen/fix.js +5 -1
- package/dist/pen/fix.js.map +1 -1
- package/dist/repro/generate.js +1 -0
- package/dist/repro/generate.js.map +1 -1
- package/dist/repro/pen.js +1 -0
- package/dist/repro/pen.js.map +1 -1
- package/dist/repro/run.d.ts +1 -0
- package/dist/repro/run.js +17 -1
- package/dist/repro/run.js.map +1 -1
- package/dist/sandbox/container.d.ts +9 -0
- package/dist/sandbox/container.js +129 -0
- package/dist/sandbox/container.js.map +1 -0
- package/dist/sandbox/worker.d.ts +1 -0
- package/dist/sandbox/worker.js +41 -0
- package/dist/sandbox/worker.js.map +1 -0
- package/dist/scanCache.d.ts +27 -0
- package/dist/scanCache.js +89 -0
- package/dist/scanCache.js.map +1 -0
- package/dist/verify/acceptance.d.ts +5 -1
- package/dist/verify/acceptance.js +29 -16
- package/dist/verify/acceptance.js.map +1 -1
- package/dist/verify/architecture.d.ts +5 -1
- package/dist/verify/architecture.js +6 -1
- package/dist/verify/architecture.js.map +1 -1
- package/dist/verify/baseline.d.ts +5 -1
- package/dist/verify/baseline.js +5 -1
- package/dist/verify/baseline.js.map +1 -1
- package/dist/verify/chain.js +17 -0
- package/dist/verify/chain.js.map +1 -1
- package/dist/verify/flow.d.ts +2 -0
- package/dist/verify/flow.js +18 -3
- package/dist/verify/flow.js.map +1 -1
- package/dist/verify/gateMatrix.d.ts +4 -0
- package/dist/verify/gateMatrix.js +23 -12
- package/dist/verify/gateMatrix.js.map +1 -1
- package/dist/verify/holdout.d.ts +5 -1
- package/dist/verify/holdout.js +8 -2
- package/dist/verify/holdout.js.map +1 -1
- package/dist/verify/regression.d.ts +5 -1
- package/dist/verify/regression.js +6 -1
- package/dist/verify/regression.js.map +1 -1
- package/dist/verify/stack.d.ts +5 -1
- package/dist/verify/stack.js +6 -1
- package/dist/verify/stack.js.map +1 -1
- package/dist/verify/state.d.ts +5 -1
- package/dist/verify/state.js +6 -1
- package/dist/verify/state.js.map +1 -1
- package/dist/verify/verifier.d.ts +5 -1
- package/dist/verify/verifier.js +6 -1
- package/dist/verify/verifier.js.map +1 -1
- package/docs/release-controls.md +107 -0
- package/package.json +70 -69
- package/templates/pitstop.command.md +17 -5
- package/templates/pitstop.prompt.md +390 -390
- package/scripts/__pycache__/gen-gifs.cpython-313.pyc +0 -0
- package/scripts/gen-gifs.py +0 -231
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"budget.js","sourceRoot":"","sources":["../../src/commands/budget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAGzB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"budget.js","sourceRoot":"","sources":["../../src/commands/budget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAGzB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAsB7C,SAAS,OAAO,CAAI,IAAY,EAAE,IAAY;IAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACxC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;IACnC,MAAM,GAAG,GAA8B,EAAE,CAAC;IAC1C,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC;YAAE,SAAS;QACxD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAM,CAAC;YACzE,MAAM,EAAE,GAAI,IAA+B,CAAC,SAAS,IAAI,CAAC,CAAC;YAC3D,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QACzB,CAAC;QAAC,MAAM,CAAC;YACP,UAAU;QACZ,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,IAAY;IACjC,MAAM,KAAK,GAAG,OAAO,CAAa,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,OAAO,CAAyB,IAAI,EAAE,kBAAkB,CAAC,CAAC;IAC3E,MAAM,IAAI,GAAG,OAAO,CAAyB,IAAI,EAAE,eAAe,CAAC,CAAC;IACpE,MAAM,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC3D,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM;QACxG,CAAC,CAAC,CAAC,CAAC;IAEN,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACtD,MAAM,cAAc,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;QAC5C,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM;QAC/E,CAAC,CAAC,CAAC,CAAC;IAEN,IAAI,eAAe,GAAG,CAAC,CAAC;IACxB,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;QACjB,eAAe,IAAI,CAAC,CAAC,WAAW,EAAE,IAAI,IAAI,CAAC,CAAC;QAC5C,MAAM,IAAI,CAAC,CAAC,KAAK,EAAE,UAAU,IAAI,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC,CAAC,IAAI,EAAE,WAAW,IAAI,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;IAElE,OAAO;QACL,KAAK,EAAE;YACL,KAAK,EAAE,KAAK,CAAC,MAAM;YACnB,eAAe;YACf,MAAM;YACN,OAAO;YACP,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,GAAG;SACzC;QACD,QAAQ,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,GAAG,EAAE;QACpF,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,GAAG,EAAE;QACpE,UAAU;QACV,cAAc;QACd,mBAAmB;QACnB,QAAQ,EAAE,QAAQ,CAAC,MAAM;QACzB,YAAY,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YAAC,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,0BAA0B,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC,CAAC,CAAC,CAAC,EAAE;KAChK,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC;KAC3C,WAAW,CACV,8GAA8G;IAC5G,8GAA8G;IAC9G,gCAAgC,CACnC;KACA,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,CAAC;KAC3C,MAAM,CAAC,QAAQ,EAAE,6BAA6B,CAAC;KAC/C,MAAM,CAAC,CAAC,OAAe,EAAE,OAA2B,EAAE,EAAE;IACvD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACvB,MAAM,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAE5B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACrE,OAAO;IACT,CAAC;IAED,IAAI,CAAC,CAAC,YAAY;QAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,YAAY,CAAC,KAAK,eAAe,CAAC,CAAC,YAAY,CAAC,WAAW,uDAAuD,CAAC,CAAC;IACxK,MAAM,KAAK,GAAG,CAAC,EAAU,EAAU,EAAE,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9F,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,KAAK,wBAAwB,CAAC,CAAC,KAAK,CAAC,eAAe,aAAa,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACzL,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,KAAK,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC;IAClG,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;IAC1F,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;IACnE,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,cAAc,6CAA6C,CAAC,CAAC;IAClH,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,mGAAmG,CAAC,CAAC;IACjM,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;QACb,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,sGAAsG,CAAC,CAAC,CAAC;IAClI,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,2BAA2B,EAAE,CAAC,WAAW,IAAI,gBAAgB,GAAG,CAAC,CAAC,CAAC;IAC7F,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;IACxC,KAAK,CAAC,IAAI,CAAC,mGAAmG,CAAC,CAAC;IAChH,KAAK,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAC;IAC/E,KAAK,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;IACxE,KAAK,CAAC,IAAI,CAAC,yEAAyE,CAAC,CAAC;IACtF,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACtB,KAAK,EAAE,oBAAoB;QAC3B,cAAc,EAAE,QAAQ;QACxB,WAAW,EAAE,OAAO;QACpB,OAAO,EAAE,CAAC;QACV,WAAW,EAAE,MAAM;KACpB,CAAC,CACH,CAAC;AACJ,CAAC,CAAC,CAAC;AAEL,eAAe,SAAS,CAAC"}
|
package/dist/commands/drive.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { AgentBudget, DEFAULT_AGENT_LIMITS, positiveLimit, runBudgetedAgent } from "../agentBudget.js";
|
|
1
2
|
import { Command } from "commander";
|
|
2
3
|
import chalk from "chalk";
|
|
3
4
|
import boxen from "boxen";
|
|
@@ -177,38 +178,24 @@ ${loop.lastFailure
|
|
|
177
178
|
.filter(Boolean)
|
|
178
179
|
.join("\n");
|
|
179
180
|
}
|
|
180
|
-
async function runAgent(repo, agentCmd, prompt) {
|
|
181
|
-
const tokens = agentCmd.split(/\s+/).map((t) => (t.includes("{prompt}") ? prompt : t)).filter(Boolean);
|
|
182
|
-
const [cmd, ...args] = tokens;
|
|
183
|
-
const finalArgs = args.map((a) => a.replace("{prompt}", prompt));
|
|
184
|
-
try {
|
|
185
|
-
const sub = execa(cmd, finalArgs, {
|
|
186
|
-
cwd: repo,
|
|
187
|
-
stdout: "inherit",
|
|
188
|
-
stderr: "inherit",
|
|
189
|
-
reject: false,
|
|
190
|
-
timeout: 30 * 60 * 1000,
|
|
191
|
-
windowsHide: true,
|
|
192
|
-
});
|
|
193
|
-
return (await sub).exitCode ?? -1;
|
|
194
|
-
}
|
|
195
|
-
catch (err) {
|
|
196
|
-
console.log(chalk.red(`agent could not be started: ${err.message}`));
|
|
197
|
-
return -1;
|
|
198
|
-
}
|
|
199
|
-
}
|
|
200
181
|
/**
|
|
201
182
|
* Loop the agent + acceptance gate on a single finding until it is verified solved
|
|
202
183
|
* or attempts run out. Each failed attempt's evidence is fed back into the next
|
|
203
184
|
* mission so the agent converges instead of repeating itself.
|
|
204
185
|
*/
|
|
205
|
-
async function loopDriveFinding(repo, finding, fromPen, reproHint, agentCmd, maxAttempts) {
|
|
186
|
+
async function loopDriveFinding(repo, finding, fromPen, reproHint, agentCmd, maxAttempts, budget) {
|
|
206
187
|
const trajectory = [];
|
|
207
188
|
let lastFailure;
|
|
208
189
|
for (let attempt = 1; attempt <= maxAttempts; attempt++) {
|
|
209
190
|
console.log(chalk.cyan(`\n[attempt ${attempt}/${maxAttempts}] driving ${finding.id} → agent (its own credits; OpenPitStop verifies)\n`));
|
|
210
191
|
const prompt = missionPrompt(repo, finding, reproHint, fromPen, { attempt, maxAttempts, lastFailure });
|
|
211
|
-
|
|
192
|
+
let agentCode;
|
|
193
|
+
try {
|
|
194
|
+
agentCode = await runBudgetedAgent(repo, agentCmd, prompt, budget);
|
|
195
|
+
}
|
|
196
|
+
catch (error) {
|
|
197
|
+
return { solved: false, attempts: attempt - 1, lastFailure: String(error), trajectory: [...trajectory, String(error)] };
|
|
198
|
+
}
|
|
212
199
|
// Acceptance gate: the bug must actually be gone, not merely "no regression".
|
|
213
200
|
// 1) a failing-first repro that now PASSES (gold standard), or
|
|
214
201
|
// 2) the owning analyzer's fresh re-scan no longer contains this finding id.
|
|
@@ -217,18 +204,21 @@ async function loopDriveFinding(repo, finding, fromPen, reproHint, agentCmd, max
|
|
|
217
204
|
const reproPassed = ran && r.ran?.passed === true;
|
|
218
205
|
const still = await freshScanStillHas(repo, finding);
|
|
219
206
|
const freshScanGone = still === false; // confirmed absent by the relevant analyzer
|
|
220
|
-
|
|
207
|
+
const v = await runVerify(repo);
|
|
208
|
+
const accepted = agentCode === 0 && v.exitCode === 0 && (ran ? reproPassed : freshScanGone);
|
|
221
209
|
if (accepted) {
|
|
222
210
|
trajectory.push(`attempt ${attempt}: agent exited ${agentCode} → ACCEPTED (${reproPassed ? "repro PASSES" : "finding gone from re-scan"})`);
|
|
223
211
|
markDriven(repo, finding.id);
|
|
224
212
|
return { solved: true, attempts: attempt, trajectory };
|
|
225
213
|
}
|
|
226
|
-
const v = await runVerify(repo);
|
|
227
214
|
const stillTxt = still === null ? "re-scan n/a for this source" : still ? "finding still present in re-scan" : "finding gone from re-scan";
|
|
215
|
+
const previousFailure = lastFailure;
|
|
228
216
|
lastFailure =
|
|
229
217
|
`repro ${ran ? (r.ran?.passed ? "passed" : "still FAILS") : "unavailable (" + (r.reason ?? r.status) + ")"}${still ? "; " + stillTxt : ""}` +
|
|
230
218
|
` · pitstop verify exited ${v.exitCode} (risk ${v.risk}, integrity ${v.integrity.verdict})`;
|
|
231
219
|
trajectory.push(`attempt ${attempt}: agent exited ${agentCode} → ${lastFailure}`);
|
|
220
|
+
if (agentCode !== 0 || previousFailure === lastFailure)
|
|
221
|
+
return { solved: false, attempts: attempt, lastFailure, trajectory };
|
|
232
222
|
console.log(chalk.yellow(` ${lastFailure}\n feeding evidence back into the next attempt…\n`));
|
|
233
223
|
}
|
|
234
224
|
return { solved: false, attempts: maxAttempts, lastFailure, trajectory };
|
|
@@ -300,10 +290,14 @@ async function runPitstop(repo, args) {
|
|
|
300
290
|
* from `pitstop next`, looping each `pitstop drive <id>` until verified, until the
|
|
301
291
|
* repo is fully fixed or the round cap is hit.
|
|
302
292
|
*/
|
|
303
|
-
async function driveRepoLoop(repo, agentCmd, maxAttempts) {
|
|
293
|
+
async function driveRepoLoop(repo, agentCmd, maxAttempts, budget) {
|
|
304
294
|
const MAX_ROUNDS = 24;
|
|
305
295
|
const paint = (ok) => (ok ? chalk.green : chalk.red);
|
|
306
296
|
for (let round = 0; round < MAX_ROUNDS; round++) {
|
|
297
|
+
if (!budget.remainingMs()) {
|
|
298
|
+
console.log("Global drive time limit reached.");
|
|
299
|
+
return false;
|
|
300
|
+
}
|
|
307
301
|
const s = computeNext(repo);
|
|
308
302
|
if (s.fullyFixed) {
|
|
309
303
|
await celebrateCard();
|
|
@@ -344,7 +338,7 @@ async function driveRepoLoop(repo, agentCmd, maxAttempts) {
|
|
|
344
338
|
markDriven(repo, id);
|
|
345
339
|
continue;
|
|
346
340
|
}
|
|
347
|
-
const res = await loopDriveFinding(repo, resolved.finding, resolved.fromPen, resolved.reproHint, agentCmd, maxAttempts);
|
|
341
|
+
const res = await loopDriveFinding(repo, resolved.finding, resolved.fromPen, resolved.reproHint, agentCmd, maxAttempts, budget);
|
|
348
342
|
const ok = res.solved;
|
|
349
343
|
console.log(boxen(`${paint(ok)("DRIVE " + (ok ? "SOLVED" : "NOT SOLVED"))} — ${resolved.finding.id}\n\n` +
|
|
350
344
|
res.trajectory.map((t) => ` ${t}`).join("\n") +
|
|
@@ -379,10 +373,29 @@ export const drive = new Command("drive")
|
|
|
379
373
|
.argument("[finding-id]", "finding id from scan-latest.json or pen-latest.json (omit to drive the whole repo)")
|
|
380
374
|
.argument("[repo]", "path to the repo", ".")
|
|
381
375
|
.option("--agent <cmd>", "agent command with {prompt} placeholder (or set PITSTOP_AGENT)")
|
|
382
|
-
.option("--max-attempts <n>", "max
|
|
376
|
+
.option("--max-attempts <n>", "max attempts per finding, within the shared session budget", "3")
|
|
377
|
+
.option("--max-agent-calls <n>", "total agent launches across ALL findings", "3")
|
|
378
|
+
.option("--max-seconds <n>", "shared agent session deadline in seconds", "600")
|
|
379
|
+
.option("--max-prompt-chars <n>", "total prompt characters sent across ALL calls", "48000")
|
|
380
|
+
.option("--max-cost-usd <amount>", "provider-enforced dollar ceiling (Claude print mode only; other providers refuse)")
|
|
383
381
|
.action(async (findingId, repoArg, options) => {
|
|
384
382
|
const repo = path.resolve(repoArg);
|
|
385
|
-
|
|
383
|
+
let maxAttempts;
|
|
384
|
+
let budget;
|
|
385
|
+
try {
|
|
386
|
+
maxAttempts = positiveLimit(options.maxAttempts ?? 3, "max-attempts");
|
|
387
|
+
budget = new AgentBudget(repo, { ...DEFAULT_AGENT_LIMITS,
|
|
388
|
+
maxCalls: positiveLimit(options.maxAgentCalls ?? 3, "max-agent-calls"),
|
|
389
|
+
maxSeconds: positiveLimit(options.maxSeconds ?? 600, "max-seconds"),
|
|
390
|
+
maxPromptChars: positiveLimit(options.maxPromptChars ?? 48000, "max-prompt-chars"),
|
|
391
|
+
...(options.maxCostUsd !== undefined ? { maxCostUsd: positiveLimit(options.maxCostUsd, "max-cost-usd", false) } : {}),
|
|
392
|
+
});
|
|
393
|
+
}
|
|
394
|
+
catch (error) {
|
|
395
|
+
console.error(String(error));
|
|
396
|
+
process.exitCode = 2;
|
|
397
|
+
return;
|
|
398
|
+
}
|
|
386
399
|
const agent = resolveAgentCmd(options.agent);
|
|
387
400
|
const agentCmd = agent.cmd;
|
|
388
401
|
if (!agentCmd) {
|
|
@@ -404,32 +417,45 @@ export const drive = new Command("drive")
|
|
|
404
417
|
}
|
|
405
418
|
if (agent.detected)
|
|
406
419
|
console.log(chalk.dim(`(auto-detected agent: ${agent.detected})\n`));
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
const ok = await driveRepoLoop(repo, agentCmd, maxAttempts);
|
|
410
|
-
process.exitCode = ok ? 0 : 1;
|
|
411
|
-
return;
|
|
420
|
+
try {
|
|
421
|
+
budget.acquire();
|
|
412
422
|
}
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
423
|
+
catch (error) {
|
|
424
|
+
console.error(String(error));
|
|
425
|
+
process.exitCode = 2;
|
|
416
426
|
return;
|
|
417
427
|
}
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
428
|
+
try {
|
|
429
|
+
// No id → drive the whole repo to fully-fixed.
|
|
430
|
+
if (!findingId) {
|
|
431
|
+
const ok = await driveRepoLoop(repo, agentCmd, maxAttempts, budget);
|
|
432
|
+
process.exitCode = ok ? 0 : 1;
|
|
433
|
+
return;
|
|
434
|
+
}
|
|
435
|
+
const resolved = resolveById(repo, findingId);
|
|
436
|
+
if (!resolved) {
|
|
437
|
+
console.log(chalk.yellow(`\nfinding "${findingId}" not found in scan-latest.json or pen-latest.json\n`));
|
|
438
|
+
return;
|
|
439
|
+
}
|
|
440
|
+
const res = await loopDriveFinding(repo, resolved.finding, resolved.fromPen, resolved.reproHint, agentCmd, maxAttempts, budget);
|
|
441
|
+
const ok = res.solved;
|
|
442
|
+
const paint = ok ? chalk.green : chalk.red;
|
|
443
|
+
console.log(boxen(`${paint(ok ? "VERIFIED — finding solved" : "NOT VERIFIED — finding still live")}\n\n` +
|
|
444
|
+
res.trajectory.map((t) => ` ${t}`).join("\n") +
|
|
445
|
+
(ok
|
|
446
|
+
? "\n\nthe repro now passes (or verify is clean) — the fix holds."
|
|
447
|
+
: `\n\nnext: re-run \`pitstop drive ${findingId}\` (it loops) or fix by hand.`), {
|
|
448
|
+
title: ` PITSTOP — Drive ${findingId} `,
|
|
449
|
+
titleAlignment: "center",
|
|
450
|
+
borderStyle: "round",
|
|
451
|
+
padding: 1,
|
|
452
|
+
borderColor: ok ? "green" : "red",
|
|
453
|
+
}));
|
|
454
|
+
process.exitCode = ok ? 0 : 1;
|
|
455
|
+
}
|
|
456
|
+
finally {
|
|
457
|
+
budget.release();
|
|
458
|
+
}
|
|
433
459
|
});
|
|
434
460
|
export default drive;
|
|
435
461
|
//# sourceMappingURL=drive.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drive.js","sourceRoot":"","sources":["../../src/commands/drive.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"drive.js","sourceRoot":"","sources":["../../src/commands/drive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACvG,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAGtE;;;;;;;;;;;;;;;;;GAiBG;AAEH,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAErE;;;;GAIG;AACH,SAAS,aAAa,CAAC,GAAW;IAChC,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;YAAE,QAAQ,CAAC,SAAS,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;;YAC3E,QAAQ,CAAC,cAAc,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,gBAAgB,GAAmC;IACvD,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,sBAAsB,EAAE;IAC9C,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,0BAA0B,EAAE;IACjD,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,yBAAyB,EAAE;IACnD,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,4BAA4B,EAAE;IACnD,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,sBAAsB,EAAE;CAC/C,CAAC;AAEF,SAAS,eAAe,CAAC,QAAiB;IACxC,IAAI,QAAQ;QAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;IACvC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IACtC,IAAI,GAAG;QAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,IAAI,gBAAgB,EAAE,CAAC;QACjC,IAAI,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC;YAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;IACnE,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;AACrB,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,iBAAiB,CAAC,IAAY,EAAE,OAAgB;IAC7D,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;YACtC,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC;QAC9G,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC9B,MAAM,CAAC,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;YACrC,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC;QAC1G,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YAC/B,MAAM,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;YAC7B,OAAO,CAAC,CAAC,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC;QAClH,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;YACrC,MAAM,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;YACnC,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAC1B,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,EAAE,CAC3F,CAAC;QACJ,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;YACrC,0EAA0E;YAC1E,MAAM,CAAC,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;YACtD,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC;YACzH,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,gBAAgB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC,EAAE,CAC3F,CAAC;YACF,OAAO,KAAK,IAAI,IAAI,CAAC;QACvB,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAChC,iFAAiF;YACjF,gFAAgF;YAChF,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC5B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;gBAAE,OAAO,IAAI,CAAC;YACjD,MAAM,CAAC,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACxC,OAAO,CAAC,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;AAEjF,SAAS,UAAU,CAAC,IAAY;IAC9B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5B,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,IAAY,EAAE,EAAU;IAC1C,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC7B,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACZ,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACnE,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAcD,SAAS,aAAa,CACpB,IAAY,EACZ,OAAgB,EAChB,SAAiB,EACjB,OAAgB,EAChB,IAAqE;IAErE,MAAM,WAAW,GAAG,IAAI;QACtB,CAAC,CAAC;2BACqB,IAAI,CAAC,OAAO,OAAO,IAAI,CAAC,WAAW;EAE5D,IAAI,CAAC,WAAW;YACd,CAAC,CAAC,6DAA6D,IAAI,CAAC,WAAW,4HAA4H;YAC3M,CAAC,CAAC,4BACN;CACC;QACG,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO;QACL,kEAAkE,IAAI,GAAG;QACzE,EAAE;QACF,YAAY,OAAO,CAAC,EAAE,KAAK,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,cAAc,OAAO,CAAC,QAAQ,GAAG;QAC1F,gBAAgB,OAAO,CAAC,WAAW,EAAE;QACrC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;QACvD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,oBAAoB,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE;QACpD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE;QACxF,WAAW;QACX,EAAE;QACF,0DAA0D;QAC1D,gEAAgE,OAAO,CAAC,EAAE,kIAAkI;QAC5M,4FAA4F;QAC5F,sFAAsF;QACtF,yFAAyF;QACzF,+GAA+G;QAC/G,sDAAsD;QACtD,EAAE;QACF,2BAA2B;QAC3B,mDAAmD,OAAO,CAAC,EAAE,mBAAmB;QAChF,SAAS;QACT,yFAAyF;QACzF,6CAA6C;QAC7C,OAAO;YACL,CAAC,CAAC,0HAA0H;YAC5H,CAAC,CAAC,iGAAiG;QACrG,mEAAmE;QACnE,EAAE;QACF,wFAAwF;KACzF;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AASD;;;;GAIG;AACH,KAAK,UAAU,gBAAgB,CAC7B,IAAY,EACZ,OAAgB,EAChB,OAAgB,EAChB,SAAiB,EACjB,QAAgB,EAChB,WAAmB,EACnB,MAAmB;IAEnB,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,IAAI,WAA+B,CAAC;IAEpC,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC;QACxD,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CACR,cAAc,OAAO,IAAI,WAAW,aAAa,OAAO,CAAC,EAAE,oDAAoD,CAChH,CACF,CAAC;QACF,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC;QACvG,IAAI,SAAiB,CAAC;QACtB,IAAI,CAAC;YAAC,SAAS,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,CAAC;QAC3E,OAAO,KAAK,EAAE,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAAC,CAAC;QAE1I,8EAA8E;QAC9E,gEAAgE;QAChE,8EAA8E;QAC9E,MAAM,CAAC,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,CAAC,CAAC,MAAM,KAAK,mBAAmB,CAAC;QAC7C,MAAM,WAAW,GAAG,GAAG,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAElD,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,aAAa,GAAG,KAAK,KAAK,KAAK,CAAC,CAAC,4CAA4C;QAEnF,MAAM,CAAC,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,QAAQ,GAAG,SAAS,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QAC5F,IAAI,QAAQ,EAAE,CAAC;YACb,UAAU,CAAC,IAAI,CAAC,WAAW,OAAO,kBAAkB,SAAS,gBAAgB,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,2BAA2B,GAAG,CAAC,CAAC;YAC5I,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;YAC7B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;QACzD,CAAC;QAED,MAAM,QAAQ,GACZ,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAAC,2BAA2B,CAAC;QAC5H,MAAM,eAAe,GAAG,WAAW,CAAC;QACpC,WAAW;YACT,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC3I,4BAA4B,CAAC,CAAC,QAAQ,UAAU,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,SAAS,CAAC,OAAO,GAAG,CAAC;QAC9F,UAAU,CAAC,IAAI,CAAC,WAAW,OAAO,kBAAkB,SAAS,MAAM,WAAW,EAAE,CAAC,CAAC;QAClF,IAAI,SAAS,KAAK,CAAC,IAAI,eAAe,KAAK,WAAW;YAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;QAC7H,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,WAAW,oDAAoD,CAAC,CAAC,CAAC;IAClG,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;AAC3E,CAAC;AAED,SAAS,WAAW,CAClB,IAAY,EACZ,SAAiB;IAEjB,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC5C,IAAI,GAAG,EAAE,CAAC;YACR,OAAO;gBACL,OAAO,EAAE;oBACP,EAAE,EAAE,GAAG,CAAC,EAAE;oBACV,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,WAAW,EAAE,GAAG,CAAC,WAAW;oBAC5B,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,GAAG,EAAG,GAAG,CAAC,IAA8B,EAAE,GAAG;oBAC7C,QAAQ,EAAG,GAAG,CAAC,IAA8B,EAAE,QAAQ;iBACxD;gBACD,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,kCAAkC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,6BAA6B;aACjG,CAAC;QACJ,CAAC;IACH,CAAC;IACD,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,EAAE,GAAG,iBAAiB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAC7C,IAAI,EAAE,EAAE,CAAC;YACP,OAAO;gBACL,OAAO,EAAE;oBACP,EAAE,EAAE,EAAE,CAAC,EAAE;oBACT,MAAM,EAAE,EAAE,CAAC,MAAM;oBACjB,QAAQ,EAAE,EAAE,CAAC,QAAQ;oBACrB,IAAI,EAAE,EAAE,CAAC,IAAI;oBACb,WAAW,EAAE,EAAE,CAAC,KAAK;oBACrB,IAAI,EAAE,EAAE,CAAC,IAAI;oBACb,IAAI,EAAE,EAAE,CAAC,IAAI;iBACd;gBACD,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,EAAE,CAAC,MAAM;oBAClB,CAAC,CAAC,gCAAgC,EAAE,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;oBACtE,CAAC,CAAC,8GAA8G;aACnH,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,IAAY,EAAE,IAAc;IACpD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EAAE;YACtD,GAAG,EAAE,IAAI;YACT,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;YACvB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,iCAAkC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAClF,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,aAAa,CAAC,IAAY,EAAE,QAAgB,EAAE,WAAmB,EAAE,MAAmB;IACnG,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,KAAK,GAAG,CAAC,EAAW,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9D,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,UAAU,EAAE,KAAK,EAAE,EAAE,CAAC;QAChD,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;YAAC,OAAO,KAAK,CAAC;QAAC,CAAC;QAC7F,MAAM,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,aAAa,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAC9B,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC;YACrC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC;YACnC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAC3C,CAAC;QACF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,8EAA8E;YAC9E,+DAA+D;YAC/D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,KAAK,GAAG,CAAC,yEAAyE,CAAC,CAAC,CAAC;YACxH,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;YACvC,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,EAAE,CAAC,UAAU,EAAE,CAAC;gBAClB,MAAM,aAAa,EAAE,CAAC;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,UAAU,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAC9B,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC;gBACtC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC;gBACpC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAC5C,CAAC;YACF,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,8EAA8E,CAAC,CAAC,CAAC;gBAC1G,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;gBACzC,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;gBAC1B,OAAO,KAAK,CAAC;YACf,CAAC;YACD,SAAS;QACX,CAAC;QAED,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAC3B,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YAC7C,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1D,IAAI,CAAC,EAAE;gBAAE,SAAS;YAClB,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACvC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,2BAA2B,CAAC,CAAC,CAAC;gBACrE,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACrB,SAAS;YACX,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;YAChI,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YACtB,OAAO,CAAC,GAAG,CACT,KAAK,CACH,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM;gBACpF,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC9C,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oCAAoC,QAAQ,CAAC,OAAO,CAAC,EAAE,oBAAoB,CAAC,EACzF;gBACE,KAAK,EAAE,oBAAoB,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG;gBACjD,cAAc,EAAE,QAAQ;gBACxB,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,CAAC;gBACV,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK;aAClC,CACF,CACF,CAAC;YACF,IAAI,CAAC,EAAE,EAAE,CAAC;gBACR,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;gBACrB,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,KAAK,GAAG,CAAC,KAAK,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;YACpE,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QACjD,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,KAAK,GAAG,CAAC,KAAK,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;YACpE,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,+EAA+E,CAAC,CAAC,CAAC;IAC3G,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;IAC1B,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC;KACtC,WAAW,CACV,kHAAkH;IAChH,2FAA2F,CAC9F;KACA,QAAQ,CAAC,cAAc,EAAE,oFAAoF,CAAC;KAC9G,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,CAAC;KAC3C,MAAM,CAAC,eAAe,EAAE,gEAAgE,CAAC;KACzF,MAAM,CAAC,oBAAoB,EAAE,4DAA4D,EAAE,GAAG,CAAC;KAC/F,MAAM,CAAC,uBAAuB,EAAE,0CAA0C,EAAE,GAAG,CAAC;KAChF,MAAM,CAAC,mBAAmB,EAAE,0CAA0C,EAAE,KAAK,CAAC;KAC9E,MAAM,CAAC,wBAAwB,EAAE,+CAA+C,EAAE,OAAO,CAAC;KAC1F,MAAM,CAAC,yBAAyB,EAAE,mFAAmF,CAAC;KACtH,MAAM,CACL,KAAK,EACH,SAA6B,EAC7B,OAAe,EACf,OAA4I,EAC5I,EAAE;IACF,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,WAAmB,CAAC;IACxB,IAAI,MAAmB,CAAC;IACxB,IAAI,CAAC;QACH,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,EAAE,cAAc,CAAC,CAAC;QACtE,MAAM,GAAG,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,GAAG,oBAAoB;YACtD,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC,aAAa,IAAI,CAAC,EAAE,iBAAiB,CAAC;YACtE,UAAU,EAAE,aAAa,CAAC,OAAO,CAAC,UAAU,IAAI,GAAG,EAAE,aAAa,CAAC;YACnE,cAAc,EAAE,aAAa,CAAC,OAAO,CAAC,cAAc,IAAI,KAAK,EAAE,kBAAkB,CAAC;YAClF,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,aAAa,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtH,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAAC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QAAC,OAAO;IAAC,CAAC;IAC/E,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC;IAE3B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CACT,KAAK,CACH,gBAAgB,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM;YACpD,GAAG,KAAK,CAAC,MAAM,CAAC,6BAA6B,CAAC,MAAM;YACpD,uGAAuG;YACvG,sFAAsF;YACtF,aAAa;YACb,oCAAoC;YACpC,wCAAwC;YACxC,qCAAqC,EACvC;YACE,KAAK,EAAE,mBAAmB;YAC1B,cAAc,EAAE,QAAQ;YACxB,WAAW,EAAE,OAAO;YACpB,OAAO,EAAE,CAAC;YACV,WAAW,EAAE,QAAQ;SACtB,CACF,CACF,CAAC;QACF,OAAO;IACT,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ;QAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAyB,KAAK,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC;IAEzF,IAAI,CAAC;QAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAAC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QAAC,OAAO;IAAC,CAAC;IACvG,IAAI,CAAC;QACL,+CAA+C;QAC/C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;YACpE,OAAO,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC9C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,SAAS,sDAAsD,CAAC,CAAC,CAAC;YACzG,OAAO;QACT,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAChC,IAAI,EACJ,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,SAAS,EAClB,QAAQ,EACR,WAAW,EACX,MAAM,CACP,CAAC;QACF,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QACtB,MAAM,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;QAC3C,OAAO,CAAC,GAAG,CACT,KAAK,CACH,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,mCAAmC,CAAC,MAAM;YACpF,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YAC9C,CAAC,EAAE;gBACD,CAAC,CAAC,gEAAgE;gBAClE,CAAC,CAAC,oCAAoC,SAAS,+BAA+B,CAAC,EACnF;YACE,KAAK,EAAE,oBAAoB,SAAS,GAAG;YACvC,cAAc,EAAE,QAAQ;YACxB,WAAW,EAAE,OAAO;YACpB,OAAO,EAAE,CAAC;YACV,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK;SAClC,CACF,CACF,CAAC;QACF,OAAO,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;YAAS,CAAC;QAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AACjC,CAAC,CACF,CAAC;AAEJ,eAAe,KAAK,CAAC"}
|
package/dist/commands/fix.d.ts
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
1
|
import { Command } from "commander";
|
|
2
|
+
import { type PenFixOutcome } from "../pen/fix.js";
|
|
3
|
+
/** Only apply patches returned by THIS run, never old files in pen-patches/. */
|
|
4
|
+
export declare function applyCurrentPatches(repo: string, patches: PenFixOutcome["patches"]): {
|
|
5
|
+
applied: number;
|
|
6
|
+
refused: string[];
|
|
7
|
+
};
|
|
8
|
+
export declare function fixExitCode(gateExit: number, securityExit: number, refused: number): number;
|
|
2
9
|
export declare const fix: Command;
|
|
3
10
|
export default fix;
|
package/dist/commands/fix.js
CHANGED
|
@@ -4,129 +4,111 @@ import path from "node:path";
|
|
|
4
4
|
import fs from "node:fs";
|
|
5
5
|
import { execFileSync } from "node:child_process";
|
|
6
6
|
import { runScan } from "./scan.js";
|
|
7
|
-
import { runPen } from "./pen.js";
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
* asserted. If the gate passes clean, it finishes with the celebration card.
|
|
20
|
-
*/
|
|
21
|
-
function applyPatches(repo) {
|
|
22
|
-
const dir = path.join(repo, ".pitstop", "pen-patches");
|
|
23
|
-
if (!fs.existsSync(dir))
|
|
24
|
-
return 0;
|
|
25
|
-
const diffs = fs.readdirSync(dir).filter((f) => f.endsWith(".diff"));
|
|
7
|
+
import { runPen, penExitCode } from "./pen.js";
|
|
8
|
+
import { persistPen } from "../pen/store.js";
|
|
9
|
+
import { runFixes } from "../pen/fix.js";
|
|
10
|
+
import { buildUnderstanding, sealUnderstanding, globMatches } from "../understand/index.js";
|
|
11
|
+
import { createPlan, loadLatestPlan, checkPlanScope } from "../verify/plan.js";
|
|
12
|
+
import { runFlow, renderFlowStages } from "../verify/flow.js";
|
|
13
|
+
import { renderGateMatrix } from "../verify/gateMatrix.js";
|
|
14
|
+
import { printNextCard } from "./next.js";
|
|
15
|
+
/** Only apply patches returned by THIS run, never old files in pen-patches/. */
|
|
16
|
+
export function applyCurrentPatches(repo, patches) {
|
|
17
|
+
const understanding = buildUnderstanding(repo);
|
|
18
|
+
const plan = loadLatestPlan(repo);
|
|
26
19
|
let applied = 0;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
20
|
+
const refused = [];
|
|
21
|
+
for (const patch of patches) {
|
|
22
|
+
const absolute = path.resolve(repo, patch.file);
|
|
23
|
+
const relative = path.relative(repo, absolute).replace(/\\/g, "/");
|
|
24
|
+
const sensitive = /(^|\/)(auth|authentication|deploy|infra|\.github)(\/|\.)|(^|\/)\.env|(^|\/)(package(-lock)?\.json|.*lock.*)$/i;
|
|
25
|
+
const declared = [...(understanding.architecture.protected ?? []), ...(understanding.architecture.forbidden ?? [])];
|
|
26
|
+
if (!relative || relative.startsWith("../") || path.isAbsolute(relative) || sensitive.test(relative) || declared.some((r) => globMatches(r.path, relative))) {
|
|
27
|
+
refused.push(`${patch.file}: protected, forbidden or outside the repository; review the patch manually`);
|
|
28
|
+
continue;
|
|
34
29
|
}
|
|
35
|
-
|
|
36
|
-
|
|
30
|
+
if (!plan || plan.check.status !== "verified" || checkPlanScope(plan.plan, [relative]).unplanned.length) {
|
|
31
|
+
refused.push(`${patch.file}: no trusted plan authorizes this path`);
|
|
32
|
+
continue;
|
|
33
|
+
}
|
|
34
|
+
const diff = path.resolve(repo, patch.diffPath);
|
|
35
|
+
const patchRoot = path.join(repo, ".pitstop", "pen-patches") + path.sep;
|
|
36
|
+
if (!diff.startsWith(patchRoot)) {
|
|
37
|
+
refused.push(`${patch.file}: patch outside generated patch directory`);
|
|
38
|
+
continue;
|
|
37
39
|
}
|
|
38
|
-
}
|
|
39
|
-
return applied;
|
|
40
|
-
}
|
|
41
|
-
const SKIP = new Set(["node_modules", ".git", ".pitstop", "dist", "coverage", "build", ".next"]);
|
|
42
|
-
function countRepros(repo) {
|
|
43
|
-
let n = 0;
|
|
44
|
-
const stack = [repo];
|
|
45
|
-
while (stack.length) {
|
|
46
|
-
const dir = stack.pop();
|
|
47
|
-
let ents;
|
|
48
40
|
try {
|
|
49
|
-
|
|
41
|
+
execFileSync("git", ["apply", "--check", "--", diff], { cwd: repo, stdio: "pipe", windowsHide: true });
|
|
42
|
+
execFileSync("git", ["apply", "--whitespace=nowarn", "--", diff], { cwd: repo, stdio: "pipe", windowsHide: true });
|
|
43
|
+
applied++;
|
|
50
44
|
}
|
|
51
45
|
catch {
|
|
52
|
-
|
|
53
|
-
}
|
|
54
|
-
for (const e of ents) {
|
|
55
|
-
if (e.name === ".git" || SKIP.has(e.name))
|
|
56
|
-
continue;
|
|
57
|
-
if (e.isDirectory())
|
|
58
|
-
stack.push(path.join(dir, e.name));
|
|
59
|
-
else if (/pitstop-repro-.*\.test\./.test(e.name))
|
|
60
|
-
n++;
|
|
46
|
+
refused.push(`${patch.file}: patch did not apply; left for manual review`);
|
|
61
47
|
}
|
|
62
48
|
}
|
|
63
|
-
return
|
|
49
|
+
return { applied, refused };
|
|
50
|
+
}
|
|
51
|
+
export function fixExitCode(gateExit, securityExit, refused) {
|
|
52
|
+
return gateExit === 2 ? 2 : gateExit !== 0 || securityExit !== 0 || refused > 0 ? 1 : 0;
|
|
64
53
|
}
|
|
65
54
|
export const fix = new Command("fix")
|
|
66
|
-
.description("
|
|
67
|
-
"each hop. Fully evidenced — every step writes a sealed .pitstop/ artifact.")
|
|
55
|
+
.description("Understand → scan → generate supported fixes → plan → apply → recheck security → verification stack and gate. No LLM calls.")
|
|
68
56
|
.argument("[repo]", "path to the repo", ".")
|
|
69
|
-
.option("--score <n>", "gate threshold
|
|
70
|
-
.option("--no-apply", "write repro tests
|
|
57
|
+
.option("--score <n>", "gate threshold from 0 to 100", "60")
|
|
58
|
+
.option("--no-apply", "write repro tests and patches for review without applying source patches")
|
|
71
59
|
.action(async (repoArg, options) => {
|
|
72
60
|
const repo = path.resolve(repoArg);
|
|
73
|
-
const threshold =
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
if (apply) {
|
|
92
|
-
applied = applyPatches(repo);
|
|
93
|
-
console.log(` wrote ${reproCount} repro test(s), ${patchCount} patch(es)` +
|
|
94
|
-
(patchCount ? ` · git-applied ${applied}/${patchCount}` : ""));
|
|
95
|
-
}
|
|
96
|
-
else {
|
|
97
|
-
console.log(` wrote ${reproCount} repro test(s), ${patchCount} patch(es) (--no-apply)`);
|
|
98
|
-
}
|
|
99
|
-
// 3/4 verify
|
|
100
|
-
console.log(chalk.bold.cyan("\n3/4 Verifying the fix…"));
|
|
101
|
-
const v = await runVerify(repo);
|
|
102
|
-
if (v.missingBaseline) {
|
|
103
|
-
console.log(chalk.yellow(" no baseline to verify against — run `pitstop scan` first."));
|
|
104
|
-
}
|
|
105
|
-
else {
|
|
106
|
-
console.log(` risk ${v.risk} · score ${v.currentScore.score}/100 (${v.currentScore.grade}) · integrity ${v.integrity.verdict}`);
|
|
107
|
-
}
|
|
108
|
-
// 4/4 gate
|
|
109
|
-
console.log(chalk.bold.cyan("\n4/4 Gating (score >= " + threshold + "/100)…"));
|
|
110
|
-
if (v.missingBaseline) {
|
|
111
|
-
console.log(chalk.yellow(" skipped — no baseline."));
|
|
112
|
-
}
|
|
113
|
-
else {
|
|
114
|
-
const g = gateOutcome(v, threshold);
|
|
115
|
-
console.log(renderGateBox(v, g, threshold));
|
|
116
|
-
}
|
|
117
|
-
// Finish: celebrate if clean, else hand off with the next card.
|
|
118
|
-
const clean = !v.missingBaseline &&
|
|
119
|
-
gateOutcome(v, threshold).pass &&
|
|
120
|
-
(v.currentScore.score ?? 0) >= threshold &&
|
|
121
|
-
v.risk !== "High";
|
|
122
|
-
console.log("");
|
|
123
|
-
if (clean) {
|
|
124
|
-
await celebrateCard();
|
|
61
|
+
const threshold = Number(options.score);
|
|
62
|
+
if (!Number.isFinite(threshold) || threshold < 0 || threshold > 100)
|
|
63
|
+
throw new Error("--score must be a number from 0 to 100");
|
|
64
|
+
// Refuse to mix automatic edits into an existing change. No reset/stash/commit.
|
|
65
|
+
if (options.apply) {
|
|
66
|
+
let status;
|
|
67
|
+
try {
|
|
68
|
+
status = execFileSync("git", ["status", "--porcelain", "--untracked-files=normal"], { cwd: repo, encoding: "utf8", stdio: "pipe", windowsHide: true });
|
|
69
|
+
}
|
|
70
|
+
catch {
|
|
71
|
+
throw new Error("Automatic patching needs a git repository. Use --no-apply to generate patches for review.");
|
|
72
|
+
}
|
|
73
|
+
if (status.trim())
|
|
74
|
+
throw new Error("Automatic patching needs a clean working tree. Commit or stash your changes yourself, or use --no-apply.");
|
|
75
|
+
// Isolate patches from the current branch; never commit or push automatically.
|
|
76
|
+
const branch = `pitstop/fix-${Date.now()}`;
|
|
77
|
+
execFileSync("git", ["switch", "-c", branch], { cwd: repo, stdio: "pipe", windowsHide: true });
|
|
78
|
+
console.log(chalk.dim(`Working on ${branch}`));
|
|
125
79
|
}
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
80
|
+
console.log(chalk.cyan("1/5 Understanding the repository and measuring the baseline…"));
|
|
81
|
+
sealUnderstanding(repo, buildUnderstanding(repo));
|
|
82
|
+
await runScan(repo, { reliabilityRuns: 1 });
|
|
83
|
+
console.log(chalk.cyan("2/5 Testing security and generating supported repros and patches…"));
|
|
84
|
+
const before = await runPen(repo, {});
|
|
85
|
+
persistPen(repo, before);
|
|
86
|
+
const fixes = runFixes(repo, before, before.packages);
|
|
87
|
+
fs.writeFileSync(path.join(repo, "PITSTOP_PEN_FIXES.md"), fixes.fixesMd);
|
|
88
|
+
const expected = [...new Set([...fixes.patches.map((p) => p.file), ...fixes.repros.map((r) => path.isAbsolute(r.file) ? path.relative(repo, r.file).replace(/\\/g, "/") : r.file), "PITSTOP_*.md", ".pitstop/**"])];
|
|
89
|
+
if (!loadLatestPlan(repo)) {
|
|
90
|
+
const plan = createPlan(repo, { id: `fix-${Date.now()}`, goal: "Apply supported security patches and independently recheck the result",
|
|
91
|
+
steps: ["Generate repros and review patch scope", "Apply supported patches", "Re-run security and the verification stack"],
|
|
92
|
+
expectedPaths: expected, verification: { commands: ["pitstop pen", "pitstop flow --require stack,architecture,security"] } });
|
|
93
|
+
if ("error" in plan)
|
|
94
|
+
throw new Error(plan.error);
|
|
129
95
|
}
|
|
96
|
+
console.log(chalk.cyan(`3/5 ${options.apply ? "Applying planned patches" : "Keeping patches for review"}…`));
|
|
97
|
+
const applied = options.apply ? applyCurrentPatches(repo, fixes.patches) : { applied: 0, refused: [] };
|
|
98
|
+
console.log(`${fixes.repros.length} repro(s), ${fixes.patches.length} patch(es), ${applied.applied} applied.`);
|
|
99
|
+
for (const refusal of applied.refused)
|
|
100
|
+
console.log(chalk.yellow(refusal));
|
|
101
|
+
console.log(chalk.cyan("4/5 Rechecking security after the change…"));
|
|
102
|
+
const after = applied.applied > 0 ? await runPen(repo, {}) : before;
|
|
103
|
+
if (after !== before)
|
|
104
|
+
persistPen(repo, after);
|
|
105
|
+
console.log(chalk.cyan("5/5 Running tests, types, lint, build, architecture and the evidence gate…"));
|
|
106
|
+
const flow = await runFlow({ repo, threshold, planScope: true, require: ["stack", "architecture", "security"] });
|
|
107
|
+
console.log(renderFlowStages(flow.stages));
|
|
108
|
+
console.log(renderGateMatrix(flow.decision));
|
|
109
|
+
process.exitCode = fixExitCode(flow.gateExit, penExitCode(after), applied.refused.length);
|
|
110
|
+
console.log(chalk.bold(`Result: ${flow.verdict}. ${process.exitCode === 0 ? "Configured checks passed; review the evidence and remaining findings." : "Open issues remain; do not ship this state."}`));
|
|
111
|
+
await printNextCard(repo);
|
|
130
112
|
});
|
|
131
113
|
export default fix;
|
|
132
114
|
//# sourceMappingURL=fix.js.map
|
package/dist/commands/fix.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix.js","sourceRoot":"","sources":["../../src/commands/fix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"fix.js","sourceRoot":"","sources":["../../src/commands/fix.ts"],"names":[],"mappings":"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"}
|