@on-par/factory-core 0.9.7-next.13 → 0.9.7-next.15
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/phases/build.d.ts +3 -0
- package/dist/phases/build.d.ts.map +1 -1
- package/dist/phases/build.js +39 -12
- package/dist/phases/build.js.map +1 -1
- package/dist/run/ci-rework-loop.d.ts +7 -0
- package/dist/run/ci-rework-loop.d.ts.map +1 -1
- package/dist/run/ci-rework-loop.js +36 -0
- package/dist/run/ci-rework-loop.js.map +1 -1
- package/dist/run/ci-suppression-guard.d.ts +11 -0
- package/dist/run/ci-suppression-guard.d.ts.map +1 -0
- package/dist/run/ci-suppression-guard.js +143 -0
- package/dist/run/ci-suppression-guard.js.map +1 -0
- package/dist/types/index.d.ts +14 -0
- package/dist/types/index.d.ts.map +1 -1
- package/package.json +5 -5
package/dist/phases/build.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type LifecycleBus } from '../bus/index.js';
|
|
2
2
|
import { captureDiffBase, collectDesignDiff } from '../checkers/design-smells.js';
|
|
3
|
+
import { type LintCommand } from '../checkers/index.js';
|
|
3
4
|
import type { EventKind } from '../events/kinds.js';
|
|
4
5
|
import type { ModelRouter } from '../router/index.js';
|
|
5
6
|
import type { SandboxPolicy } from '../sandbox/index.js';
|
|
@@ -102,6 +103,7 @@ export declare function buildCommitOnlyPrompt(opts: {
|
|
|
102
103
|
appPort?: number;
|
|
103
104
|
appBaseUrl?: string;
|
|
104
105
|
designGrounding?: string;
|
|
106
|
+
lintCommands?: readonly LintCommand[];
|
|
105
107
|
}): string;
|
|
106
108
|
export declare function buildClaudePrompt(opts: {
|
|
107
109
|
issue: number;
|
|
@@ -112,6 +114,7 @@ export declare function buildClaudePrompt(opts: {
|
|
|
112
114
|
appPort?: number;
|
|
113
115
|
appBaseUrl?: string;
|
|
114
116
|
designGrounding?: string;
|
|
117
|
+
lintCommands?: readonly LintCommand[];
|
|
115
118
|
}): string;
|
|
116
119
|
export {};
|
|
117
120
|
//# sourceMappingURL=build.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/phases/build.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/phases/build.ts"],"names":[],"mappings":"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"}
|
package/dist/phases/build.js
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
// src/phases/build.ts — BUILD phase: worker model implements the frozen spec
|
|
2
2
|
import { readFile } from 'node:fs/promises';
|
|
3
|
+
import { join } from 'node:path';
|
|
3
4
|
import { withLifecycle } from '../bus/index.js';
|
|
4
5
|
import { captureDiffBase, collectDesignDiff } from '../checkers/design-smells.js';
|
|
6
|
+
import { resolveLintCommands } from '../checkers/index.js';
|
|
7
|
+
import { fileExists } from '../checkers/probe.js';
|
|
5
8
|
import { buildConstitutionContext } from '../constitutions/index.js';
|
|
6
9
|
import { readDesignArtifact, renderDesignGrounding } from '../design/index.js';
|
|
7
10
|
import { laneEnv } from '../environment/index.js';
|
|
@@ -33,6 +36,11 @@ async function buildPhaseImpl(opts) {
|
|
|
33
36
|
const spec = await readFile(specPath, 'utf-8').catch(() => '');
|
|
34
37
|
const designArtifact = await readDesignArtifact(specPath);
|
|
35
38
|
const designGrounding = designArtifact ? renderDesignGrounding(designArtifact) : '';
|
|
39
|
+
// BUILD names the lint checker's commands only when verify.sh does not already cover them (#2829).
|
|
40
|
+
const lintCommands = (await fileExists(join(worktree, 'scripts/verify.sh')))
|
|
41
|
+
? []
|
|
42
|
+
: await resolveLintCommands({ worktree }).catch(() => []);
|
|
43
|
+
const promptOpts = { issue, specPath, constitutionCtx, spec, appPort, appBaseUrl, designGrounding, lintCommands };
|
|
36
44
|
if (designArtifact) {
|
|
37
45
|
log('design_artifact_received', `design artifact received (open questions: ${designArtifact.openQuestions.length}, ` +
|
|
38
46
|
`target types: ${designArtifact.targetTypes.length}, ` +
|
|
@@ -43,8 +51,18 @@ async function buildPhaseImpl(opts) {
|
|
|
43
51
|
const isCodexDisabled = opts.codexDisabled ?? false;
|
|
44
52
|
// Commit-only unless the repo opts in (#1867); local-only always stays commit-only (#508).
|
|
45
53
|
const claudeRoutePrompt = () => publishFromBuild && !disablePublish
|
|
46
|
-
? buildClaudePrompt({
|
|
47
|
-
|
|
54
|
+
? buildClaudePrompt({
|
|
55
|
+
issue,
|
|
56
|
+
branch,
|
|
57
|
+
specPath,
|
|
58
|
+
constitutionCtx,
|
|
59
|
+
skipCI,
|
|
60
|
+
appPort,
|
|
61
|
+
appBaseUrl,
|
|
62
|
+
designGrounding,
|
|
63
|
+
lintCommands,
|
|
64
|
+
})
|
|
65
|
+
: buildCommitOnlyPrompt(promptOpts);
|
|
48
66
|
let prompt;
|
|
49
67
|
let taskType;
|
|
50
68
|
let modelOverride = modelOverrideOpt;
|
|
@@ -61,13 +79,11 @@ async function buildPhaseImpl(opts) {
|
|
|
61
79
|
}
|
|
62
80
|
if (route === 'codex') {
|
|
63
81
|
taskType = 'build_codex';
|
|
64
|
-
prompt = localOnly
|
|
65
|
-
? buildLocalSmallPrompt({ issue, branch, spec })
|
|
66
|
-
: buildCommitOnlyPrompt({ issue, specPath, constitutionCtx, spec, appPort, appBaseUrl, designGrounding });
|
|
82
|
+
prompt = localOnly ? buildLocalSmallPrompt({ issue, branch, spec }) : buildCommitOnlyPrompt(promptOpts);
|
|
67
83
|
}
|
|
68
84
|
else if (route === 'opencode') {
|
|
69
85
|
taskType = 'build_opencode';
|
|
70
|
-
prompt = buildOpencodePrompt(
|
|
86
|
+
prompt = buildOpencodePrompt(promptOpts);
|
|
71
87
|
}
|
|
72
88
|
else {
|
|
73
89
|
taskType = 'build_claude';
|
|
@@ -127,7 +143,11 @@ async function buildPhaseImpl(opts) {
|
|
|
127
143
|
});
|
|
128
144
|
route = 'codex';
|
|
129
145
|
crossHarnessReason = reason;
|
|
130
|
-
result = await router.run('build_codex', buildCommitOnlyPrompt(
|
|
146
|
+
result = await router.run('build_codex', buildCommitOnlyPrompt(promptOpts), {
|
|
147
|
+
...runOpts,
|
|
148
|
+
retryCause: 'failover',
|
|
149
|
+
modelOverride: fallback,
|
|
150
|
+
});
|
|
131
151
|
}
|
|
132
152
|
else if (taskType !== 'build_codex' || !crossHarnessOk || reason === undefined)
|
|
133
153
|
throw err;
|
|
@@ -227,7 +247,7 @@ export function buildOpencodePrompt(opts) {
|
|
|
227
247
|
return buildCommitOnlyPrompt(opts);
|
|
228
248
|
}
|
|
229
249
|
export function buildCommitOnlyPrompt(opts) {
|
|
230
|
-
const { issue, specPath, constitutionCtx, spec, appPort, appBaseUrl, designGrounding } = opts;
|
|
250
|
+
const { issue, specPath, constitutionCtx, spec, appPort, appBaseUrl, designGrounding, lintCommands } = opts;
|
|
231
251
|
return `Implement issue #${issue} from the frozen spec below (also saved at ${specPath}). It is the approved plan: follow it and stay within its scope, with no unrelated refactors or drive-by changes.
|
|
232
252
|
|
|
233
253
|
${constitutionCtx}
|
|
@@ -239,7 +259,7 @@ ${spec}
|
|
|
239
259
|
|
|
240
260
|
## Rules
|
|
241
261
|
- Match the surrounding code style. Add or update the tests in the spec's Tests section.
|
|
242
|
-
- ${
|
|
262
|
+
- ${verifyRule(lintCommands)}
|
|
243
263
|
- Commit atomically: one commit per independently testable functional change, with a clear conventional message. Never mix unrelated functional changes in one commit. A single-slice task yields exactly ONE commit.
|
|
244
264
|
- Do NOT push, do NOT open a pull request, do NOT merge. CHECK and SHIP run next.
|
|
245
265
|
- If something is genuinely ambiguous, print a line starting exactly with "ESCALATE:" followed by the question, then stop. If you are stuck, commit what safely builds and passes, say what is blocked in the commit message, and stop.
|
|
@@ -248,7 +268,7 @@ ${spec}
|
|
|
248
268
|
${promptTail(appPort, appBaseUrl, designGrounding)}`;
|
|
249
269
|
}
|
|
250
270
|
export function buildClaudePrompt(opts) {
|
|
251
|
-
const { issue, branch, specPath, constitutionCtx, skipCI, appPort, appBaseUrl, designGrounding } = opts;
|
|
271
|
+
const { issue, branch, specPath, constitutionCtx, skipCI, appPort, appBaseUrl, designGrounding, lintCommands } = opts;
|
|
252
272
|
return `Run fully autonomously in headless mode for issue #${issue}, BUILD phase.
|
|
253
273
|
You are ALREADY inside the isolated git worktree for branch ${branch} (cwd). Nobody is watching: never pause for permission or input.
|
|
254
274
|
|
|
@@ -258,7 +278,7 @@ The frozen, approved spec is at ${specPath}. Read it and follow it as the plan.
|
|
|
258
278
|
|
|
259
279
|
${UNTRUSTED_ISSUE_BODY_NOTICE}
|
|
260
280
|
|
|
261
|
-
- ${
|
|
281
|
+
- ${verifyRule(lintCommands)}
|
|
262
282
|
- Commit atomically: one commit per independently testable functional change, with a clear conventional message. Never mix unrelated functional changes in one commit.
|
|
263
283
|
- Do NOT merge (the factory merges). Your session ends when you end your turn, so do not stop until: (1) branch ${branch} is pushed, (2) an open PR exists with 'Closes #${issue}' in its body, ${skipCI ? '(3) local verify passes (CI is intentionally skipped: do not block on GitHub Actions CI or escalate if CI cannot run), (4) the PR is ready.' : '(3) CI is green, (4) the PR is ready.'}
|
|
264
284
|
- If and only if something is genuinely ambiguous, print a line starting exactly with "ESCALATE:" followed by the question, then stop.
|
|
@@ -266,9 +286,16 @@ ${UNTRUSTED_ISSUE_BODY_NOTICE}
|
|
|
266
286
|
${promptTail(appPort, appBaseUrl, designGrounding)}`;
|
|
267
287
|
}
|
|
268
288
|
// Mirrors testsChecker's command order so BUILD verifies with what CHECK runs (#1976).
|
|
269
|
-
const
|
|
289
|
+
const VERIFY_RULE_BASE = 'Verify with the command CHECK runs: `bash scripts/verify.sh --no-e2e` if scripts/verify.sh exists, ' +
|
|
270
290
|
'otherwise the test script (`npm test`) or pytest, plus any verify command the constitution names. ' +
|
|
271
291
|
'Fix failures before finishing and report the exact command and its output.';
|
|
292
|
+
// Names the lint checker's commands (resolveLintCommands) when the repo has no verify.sh (#2829).
|
|
293
|
+
function verifyRule(lintCommands = []) {
|
|
294
|
+
if (lintCommands.length === 0)
|
|
295
|
+
return VERIFY_RULE_BASE;
|
|
296
|
+
const cmds = lintCommands.map((c) => `\`${c.argv.join(' ')}\``).join(' and ');
|
|
297
|
+
return `${VERIFY_RULE_BASE} Also run ${cmds} (CHECK's lint checker runs them) and fix their failures before finishing.`;
|
|
298
|
+
}
|
|
272
299
|
function promptTail(appPort, appBaseUrl, designGrounding) {
|
|
273
300
|
return `${headlessNote()}${appPort ? `\n\n${appPortNote(appPort, appBaseUrl)}` : ''}${designGrounding ? `\n\n${designGrounding}` : ''}`;
|
|
274
301
|
}
|
package/dist/phases/build.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/phases/build.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/phases/build.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import type { shipPhase as shipPhaseDefault, ShipResult } from '../phases/ship.j
|
|
|
4
4
|
import type { ReviewRouting } from '../review/routing.js';
|
|
5
5
|
import type { CiFailureEvidence, Constitution } from '../types/index.js';
|
|
6
6
|
import { listBaseFailingChecks as listBaseFailingChecksDefault, listPrChangedFiles as listPrChangedFilesDefault } from './ci-rework.js';
|
|
7
|
+
import { readReworkDiff as readReworkDiffDefault, readWorktreeHead as readWorktreeHeadDefault } from './ci-suppression-guard.js';
|
|
7
8
|
import type { BuildRoute, ParkReason } from './outcome.js';
|
|
8
9
|
import type { RunPorts, RunRequest } from './run-issue.js';
|
|
9
10
|
/** Injectable seams for the CI rework loop; RunPorts extends this. */
|
|
@@ -14,6 +15,10 @@ export interface CiReworkPorts {
|
|
|
14
15
|
listPrChangedFiles?: typeof listPrChangedFilesDefault;
|
|
15
16
|
/** Lists failing check names on the PR base branch's latest commit (#2817); defaults to the GitHub REST lister. */
|
|
16
17
|
listBaseFailingChecks?: typeof listBaseFailingChecksDefault;
|
|
18
|
+
/** Reads the worktree HEAD before a CI rework round (#2818); defaults to git rev-parse. */
|
|
19
|
+
readWorktreeHead?: typeof readWorktreeHeadDefault;
|
|
20
|
+
/** Reads the diff a CI rework round produced (#2818); defaults to git diff <before> HEAD. */
|
|
21
|
+
readReworkDiff?: typeof readReworkDiffDefault;
|
|
17
22
|
}
|
|
18
23
|
export interface CiReworkLoopContext {
|
|
19
24
|
request: RunRequest;
|
|
@@ -53,6 +58,8 @@ export interface ShipWithCiReworkResult {
|
|
|
53
58
|
* Runs SHIP. When the CI watch fails on CodeQL alerts in files the PR changed, feeds them to the
|
|
54
59
|
* BUILD rework worker, re-runs CHECK and re-enters SHIP on the same PR, up to
|
|
55
60
|
* resolveMaxCiReworkRounds() rounds — a counter separate from CHECK's own rework rounds.
|
|
61
|
+
* After each rework round the committed diff is scanned for suppression attempts (#2818); any hit,
|
|
62
|
+
* or an unreadable diff, parks ci-failed before the re-CHECK, push or re-watch.
|
|
56
63
|
*/
|
|
57
64
|
export declare function shipWithCiRework(ctx: CiReworkLoopContext, inputs: CiReworkShipInputs): Promise<ShipWithCiReworkResult>;
|
|
58
65
|
//# sourceMappingURL=ci-rework-loop.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ci-rework-loop.d.ts","sourceRoot":"","sources":["../../src/run/ci-rework-loop.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,IAAI,iBAAiB,EAAE,YAAY,IAAI,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC/G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,IAAI,gBAAgB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACnF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"ci-rework-loop.d.ts","sourceRoot":"","sources":["../../src/run/ci-rework-loop.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,IAAI,iBAAiB,EAAE,YAAY,IAAI,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC/G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,IAAI,gBAAgB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACnF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,iBAAiB,EAAwB,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC/F,OAAO,EAML,qBAAqB,IAAI,4BAA4B,EACrD,kBAAkB,IAAI,yBAAyB,EAGhD,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,cAAc,IAAI,qBAAqB,EACvC,gBAAgB,IAAI,uBAAuB,EAE5C,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAG3D,sEAAsE;AACtE,MAAM,WAAW,aAAa;IAC5B,0FAA0F;IAC1F,YAAY,CAAC,EAAE,OAAO,mBAAmB,CAAC;IAC1C,+FAA+F;IAC/F,kBAAkB,CAAC,EAAE,OAAO,yBAAyB,CAAC;IACtD,mHAAmH;IACnH,qBAAqB,CAAC,EAAE,OAAO,4BAA4B,CAAC;IAC5D,2FAA2F;IAC3F,gBAAgB,CAAC,EAAE,OAAO,uBAAuB,CAAC;IAClD,6FAA6F;IAC7F,cAAc,CAAC,EAAE,OAAO,qBAAqB,CAAC;CAC/C;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,UAAU,CAAC;IACpB,KAAK,EAAE,QAAQ,CAAC;IAChB,SAAS,EAAE,OAAO,gBAAgB,CAAC;IACnC,UAAU,EAAE,OAAO,iBAAiB,CAAC;IACrC,+EAA+E;IAC/E,SAAS,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC;IACrD,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IACzC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,UAAU,CAAC;IACjB,oFAAoF;IACpF,MAAM,CAAC,EAAE;QACP,MAAM,EAAE,UAAU,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,CAAC,EAAE;YAAE,gBAAgB,EAAE,MAAM,CAAC;YAAC,aAAa,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC;QACrE,SAAS,CAAC,EAAE,iBAAiB,CAAC;KAC/B,CAAC;CACH;AAWD;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,mBAAmB,EACxB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,sBAAsB,CAAC,CAkJjC"}
|
|
@@ -1,18 +1,29 @@
|
|
|
1
1
|
// packages/core/src/run/ci-rework-loop.ts — SHIP with a bounded CI rework loop (#2816)
|
|
2
2
|
import { reworkWorker as reworkWorkerDefault } from '../phases/check.js';
|
|
3
3
|
import { attributableCodeqlAlerts, attributeCiFailure, CI_REWORK_INSTRUCTIONS, ciReworkSummary, listBaseFailingChecks as listBaseFailingChecksDefault, listPrChangedFiles as listPrChangedFilesDefault, needsBaseChecks, resolveMaxCiReworkRounds, } from './ci-rework.js';
|
|
4
|
+
import { describeSuppression, readReworkDiff as readReworkDiffDefault, readWorktreeHead as readWorktreeHeadDefault, scanReworkDiff, } from './ci-suppression-guard.js';
|
|
4
5
|
import { shipParkReason } from './ship-park.js';
|
|
5
6
|
const errorMessage = (err) => (err instanceof Error ? err.message : String(err));
|
|
7
|
+
const guardError = (match) => ({
|
|
8
|
+
kind: 'path',
|
|
9
|
+
rule: 'guard-error',
|
|
10
|
+
file: '(unknown)',
|
|
11
|
+
match,
|
|
12
|
+
});
|
|
6
13
|
/**
|
|
7
14
|
* Runs SHIP. When the CI watch fails on CodeQL alerts in files the PR changed, feeds them to the
|
|
8
15
|
* BUILD rework worker, re-runs CHECK and re-enters SHIP on the same PR, up to
|
|
9
16
|
* resolveMaxCiReworkRounds() rounds — a counter separate from CHECK's own rework rounds.
|
|
17
|
+
* After each rework round the committed diff is scanned for suppression attempts (#2818); any hit,
|
|
18
|
+
* or an unreadable diff, parks ci-failed before the re-CHECK, push or re-watch.
|
|
10
19
|
*/
|
|
11
20
|
export async function shipWithCiRework(ctx, inputs) {
|
|
12
21
|
const { request, ports, shipPhase, checkPhase, check } = ctx;
|
|
13
22
|
const rework = ports.reworkWorker ?? reworkWorkerDefault;
|
|
14
23
|
const listChanged = ports.listPrChangedFiles ?? listPrChangedFilesDefault;
|
|
15
24
|
const listBase = ports.listBaseFailingChecks ?? listBaseFailingChecksDefault;
|
|
25
|
+
const readHead = ports.readWorktreeHead ?? readWorktreeHeadDefault;
|
|
26
|
+
const readDiff = ports.readReworkDiff ?? readReworkDiffDefault;
|
|
16
27
|
const { builtRoute, builtModel, planSlice } = inputs;
|
|
17
28
|
const log = ports.events();
|
|
18
29
|
const shipOpts = {
|
|
@@ -81,6 +92,22 @@ export async function shipWithCiRework(ctx, inputs) {
|
|
|
81
92
|
const skipped = attribution.items.filter((i) => !i.attributable).map((i) => i.ref);
|
|
82
93
|
log('rework', `CI rework round ${rounds}/${maxRounds}: ${attributable.length} attributable CodeQL alert(s) on PR #${ship.prNumber}` +
|
|
83
94
|
(skipped.length > 0 ? `; non-attributable: ${skipped.join(', ')}` : ''), lastCiFailure ? { ciFailure: lastCiFailure } : undefined);
|
|
95
|
+
const suppressionPark = (findings) => {
|
|
96
|
+
const described = describeSuppression(findings);
|
|
97
|
+
ports.events('ship')('ship', `${described} after CI rework round ${rounds} (PR #${ship.prNumber})`);
|
|
98
|
+
const message = ship.reason
|
|
99
|
+
? `ship phase failed: ${ship.reason} — ${described}`
|
|
100
|
+
: `ship phase failed — ${described}`;
|
|
101
|
+
const base = lastCiFailure ?? { failingChecks: [], alerts: [], truncated: false };
|
|
102
|
+
return { ship, parked: { reason: 'ci-failed', message, ciFailure: { ...base, suppressionAttempt: findings } } };
|
|
103
|
+
};
|
|
104
|
+
let beforeSha;
|
|
105
|
+
try {
|
|
106
|
+
beforeSha = await readHead(ports.workspace.path);
|
|
107
|
+
}
|
|
108
|
+
catch (err) {
|
|
109
|
+
return suppressionPark([guardError(`could not read the worktree HEAD: ${errorMessage(err)}`)]);
|
|
110
|
+
}
|
|
84
111
|
const worked = await rework({
|
|
85
112
|
issue: request.issue,
|
|
86
113
|
worktree: ports.workspace.path,
|
|
@@ -103,6 +130,15 @@ export async function shipWithCiRework(ctx, inputs) {
|
|
|
103
130
|
suffix = ' — CI rework worker never ran';
|
|
104
131
|
break;
|
|
105
132
|
}
|
|
133
|
+
let findings;
|
|
134
|
+
try {
|
|
135
|
+
findings = scanReworkDiff(await readDiff(ports.workspace.path, beforeSha));
|
|
136
|
+
}
|
|
137
|
+
catch (err) {
|
|
138
|
+
findings = [guardError(`could not read the CI rework diff: ${errorMessage(err)}`)];
|
|
139
|
+
}
|
|
140
|
+
if (findings.length > 0)
|
|
141
|
+
return suppressionPark(findings);
|
|
106
142
|
const recheck = await checkPhase(ctx.checkOpts);
|
|
107
143
|
if (!recheck.passed) {
|
|
108
144
|
const checkFailure = recheck.failureSignature !== undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ci-rework-loop.js","sourceRoot":"","sources":["../../src/run/ci-rework-loop.ts"],"names":[],"mappings":"AAAA,uFAAuF;AAEvF,OAAO,EAAwC,YAAY,IAAI,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAK/G,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAElB,sBAAsB,EACtB,eAAe,EACf,qBAAqB,IAAI,4BAA4B,EACrD,kBAAkB,IAAI,yBAAyB,EAC/C,eAAe,EACf,wBAAwB,GACzB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"ci-rework-loop.js","sourceRoot":"","sources":["../../src/run/ci-rework-loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { CiSuppressionFinding } from '../types/index.js';
|
|
2
|
+
export declare const SUPPRESSION_ATTEMPT = "suppression-attempt";
|
|
3
|
+
/** Scans a unified git diff for suppression comments (added lines) and protected paths (any file header). */
|
|
4
|
+
export declare function scanReworkDiff(diff: string): CiSuppressionFinding[];
|
|
5
|
+
/** Reads the worktree's current HEAD SHA. */
|
|
6
|
+
export declare function readWorktreeHead(worktree: string): Promise<string>;
|
|
7
|
+
/** Reads the committed diff from `fromSha` to HEAD (SHIP re-entry pushes HEAD, not the working tree). */
|
|
8
|
+
export declare function readReworkDiff(worktree: string, fromSha: string): Promise<string>;
|
|
9
|
+
/** One-line summary of guard findings for park messages and logs. */
|
|
10
|
+
export declare function describeSuppression(findings: readonly CiSuppressionFinding[]): string;
|
|
11
|
+
//# sourceMappingURL=ci-suppression-guard.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ci-suppression-guard.d.ts","sourceRoot":"","sources":["../../src/run/ci-suppression-guard.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAG9D,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AA2CzD,6GAA6G;AAC7G,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,EAAE,CAsEnE;AAED,6CAA6C;AAC7C,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAKxE;AAED,yGAAyG;AACzG,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAKvF;AAED,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,SAAS,oBAAoB,EAAE,GAAG,MAAM,CAOrF"}
|
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
// packages/core/src/run/ci-suppression-guard.ts — mechanical suppression guard for SHIP CI rework diffs (#2818)
|
|
2
|
+
import { execGit } from '../utils/git-exec.js';
|
|
3
|
+
export const SUPPRESSION_ATTEMPT = 'suppression-attempt';
|
|
4
|
+
const MAX_MATCH = 200;
|
|
5
|
+
const MAX_LISTED = 5;
|
|
6
|
+
/** True when an eslint-disable directive in `line` is blanket or names a security rule. */
|
|
7
|
+
function eslintDisablesSecurity(line) {
|
|
8
|
+
const m = /eslint-disable(?:-next-line|-line)?(?![\w-])([^\n]*)/.exec(line);
|
|
9
|
+
if (!m)
|
|
10
|
+
return false;
|
|
11
|
+
let list = m[1];
|
|
12
|
+
const dash = list.indexOf('--');
|
|
13
|
+
if (dash >= 0)
|
|
14
|
+
list = list.slice(0, dash);
|
|
15
|
+
const end = list.indexOf('*/');
|
|
16
|
+
if (end >= 0)
|
|
17
|
+
list = list.slice(0, end);
|
|
18
|
+
const rules = list.split(/[,\s]+/).filter(Boolean);
|
|
19
|
+
return rules.length === 0 || rules.some((r) => /security/i.test(r));
|
|
20
|
+
}
|
|
21
|
+
/** Added-line rules; the single owner of the known suppression comment forms. */
|
|
22
|
+
const SUPPRESSION_COMMENT_RULES = [
|
|
23
|
+
{ rule: 'codeql-comment', test: (l) => /\bcodeql\[/i.test(l) },
|
|
24
|
+
{ rule: 'lgtm-comment', test: (l) => /(?:\/\/|#|\/\*|\*|<!--|--).*\blgtm\b/i.test(l) },
|
|
25
|
+
{ rule: 'nosec-comment', test: (l) => /#\s*nosec\b/i.test(l) || /\/\/\s*#?nosec\b/i.test(l) },
|
|
26
|
+
{ rule: 'eslint-disable-security', test: eslintDisablesSecurity },
|
|
27
|
+
];
|
|
28
|
+
function pathRules(path) {
|
|
29
|
+
const segments = path.split('/');
|
|
30
|
+
const base = segments[segments.length - 1];
|
|
31
|
+
const rules = [];
|
|
32
|
+
if (path.startsWith('.github/workflows/'))
|
|
33
|
+
rules.push('workflow-path');
|
|
34
|
+
if (segments.slice(0, -1).some((s) => /^\.?codeql$/i.test(s)) || /codeql.*\.(ya?ml|json)$/i.test(base)) {
|
|
35
|
+
rules.push('codeql-path');
|
|
36
|
+
}
|
|
37
|
+
if (/\.sarif(\.json)?$/i.test(base))
|
|
38
|
+
rules.push('sarif-path');
|
|
39
|
+
return rules;
|
|
40
|
+
}
|
|
41
|
+
/** Scans a unified git diff for suppression comments (added lines) and protected paths (any file header). */
|
|
42
|
+
export function scanReworkDiff(diff) {
|
|
43
|
+
const findings = [];
|
|
44
|
+
const seen = new Set();
|
|
45
|
+
const add = (f) => {
|
|
46
|
+
const key = `${f.kind}|${f.rule}|${f.file}|${f.line ?? ''}|${f.kind === 'path' ? f.match : ''}`;
|
|
47
|
+
if (seen.has(key))
|
|
48
|
+
return;
|
|
49
|
+
seen.add(key);
|
|
50
|
+
findings.push(f);
|
|
51
|
+
};
|
|
52
|
+
const checkPath = (path) => {
|
|
53
|
+
if (!path || path === '/dev/null')
|
|
54
|
+
return;
|
|
55
|
+
for (const rule of pathRules(path))
|
|
56
|
+
add({ kind: 'path', rule, file: path, match: path });
|
|
57
|
+
};
|
|
58
|
+
let file = '(unknown)';
|
|
59
|
+
let line;
|
|
60
|
+
let inHunk = false;
|
|
61
|
+
for (const raw of diff.split('\n')) {
|
|
62
|
+
const header = /^diff --git a\/(.+) b\/(.+)$/.exec(raw);
|
|
63
|
+
if (header) {
|
|
64
|
+
inHunk = false;
|
|
65
|
+
line = undefined;
|
|
66
|
+
file = header[2];
|
|
67
|
+
checkPath(header[1]);
|
|
68
|
+
checkPath(header[2]);
|
|
69
|
+
continue;
|
|
70
|
+
}
|
|
71
|
+
if (!inHunk) {
|
|
72
|
+
const rename = /^rename (?:from|to) (.+)$/.exec(raw);
|
|
73
|
+
if (rename) {
|
|
74
|
+
checkPath(rename[1]);
|
|
75
|
+
continue;
|
|
76
|
+
}
|
|
77
|
+
const oldPath = /^--- (?:a\/)?(.+)$/.exec(raw);
|
|
78
|
+
if (oldPath) {
|
|
79
|
+
checkPath(oldPath[1]);
|
|
80
|
+
continue;
|
|
81
|
+
}
|
|
82
|
+
const newPath = /^\+\+\+ (?:b\/)?(.+)$/.exec(raw);
|
|
83
|
+
if (newPath) {
|
|
84
|
+
if (newPath[1] !== '/dev/null')
|
|
85
|
+
file = newPath[1];
|
|
86
|
+
checkPath(newPath[1]);
|
|
87
|
+
continue;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
const hunk = /^@@ -\d+(?:,\d+)? \+(\d+)(?:,\d+)? @@/.exec(raw);
|
|
91
|
+
if (hunk) {
|
|
92
|
+
inHunk = true;
|
|
93
|
+
line = Number(hunk[1]);
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
96
|
+
if (raw.startsWith('+')) {
|
|
97
|
+
const text = raw.slice(1);
|
|
98
|
+
for (const { rule, test } of SUPPRESSION_COMMENT_RULES) {
|
|
99
|
+
if (test(text)) {
|
|
100
|
+
add({
|
|
101
|
+
kind: 'comment',
|
|
102
|
+
rule,
|
|
103
|
+
file,
|
|
104
|
+
...(line !== undefined ? { line } : {}),
|
|
105
|
+
match: text.trim().slice(0, MAX_MATCH),
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
if (line !== undefined)
|
|
110
|
+
line++;
|
|
111
|
+
}
|
|
112
|
+
else if (raw.startsWith(' ') && line !== undefined) {
|
|
113
|
+
line++;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return findings;
|
|
117
|
+
}
|
|
118
|
+
/** Reads the worktree's current HEAD SHA. */
|
|
119
|
+
export async function readWorktreeHead(worktree) {
|
|
120
|
+
const { stdout } = await execGit(['rev-parse', 'HEAD'], { cwd: worktree });
|
|
121
|
+
const sha = stdout.trim();
|
|
122
|
+
if (!sha)
|
|
123
|
+
throw new Error('git rev-parse HEAD returned nothing');
|
|
124
|
+
return sha;
|
|
125
|
+
}
|
|
126
|
+
/** Reads the committed diff from `fromSha` to HEAD (SHIP re-entry pushes HEAD, not the working tree). */
|
|
127
|
+
export async function readReworkDiff(worktree, fromSha) {
|
|
128
|
+
const { stdout } = await execGit(['diff', '--no-color', '--no-ext-diff', '--unified=0', fromSha, 'HEAD'], {
|
|
129
|
+
cwd: worktree,
|
|
130
|
+
});
|
|
131
|
+
return stdout;
|
|
132
|
+
}
|
|
133
|
+
/** One-line summary of guard findings for park messages and logs. */
|
|
134
|
+
export function describeSuppression(findings) {
|
|
135
|
+
const items = findings.slice(0, MAX_LISTED).map((f) => {
|
|
136
|
+
if (f.kind === 'comment')
|
|
137
|
+
return `${f.rule} at ${f.file}${f.line !== undefined ? `:${f.line}` : ''}`;
|
|
138
|
+
return `${f.rule} ${f.match}`;
|
|
139
|
+
});
|
|
140
|
+
const more = findings.length > MAX_LISTED ? `, +${findings.length - MAX_LISTED} more` : '';
|
|
141
|
+
return `${SUPPRESSION_ATTEMPT}: ${findings.length} finding(s): ${items.join(', ')}${more}`;
|
|
142
|
+
}
|
|
143
|
+
//# sourceMappingURL=ci-suppression-guard.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ci-suppression-guard.js","sourceRoot":"","sources":["../../src/run/ci-suppression-guard.ts"],"names":[],"mappings":"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"}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -180,6 +180,18 @@ export interface CiAttribution {
|
|
|
180
180
|
baseSha?: string;
|
|
181
181
|
items: CiAttributionItem[];
|
|
182
182
|
}
|
|
183
|
+
/** One suppression-guard hit in a SHIP CI rework diff (#2818). */
|
|
184
|
+
export interface CiSuppressionFinding {
|
|
185
|
+
kind: 'comment' | 'path';
|
|
186
|
+
/** e.g. 'codeql-comment', 'lgtm-comment', 'nosec-comment', 'eslint-disable-security', 'workflow-path', 'codeql-path', 'sarif-path', 'guard-error'. */
|
|
187
|
+
rule: string;
|
|
188
|
+
/** Repo-relative path, '(unknown)' when the diff had no file header. */
|
|
189
|
+
file: string;
|
|
190
|
+
/** New-file line number for comment hits, when the hunk header gave one. */
|
|
191
|
+
line?: number;
|
|
192
|
+
/** The offending added line (trimmed, max 200 chars) or the touched path. */
|
|
193
|
+
match: string;
|
|
194
|
+
}
|
|
183
195
|
/** Bounded CI-failure evidence carried on a SHIP ci-failed park event (#2814). */
|
|
184
196
|
export interface CiFailureEvidence {
|
|
185
197
|
failingChecks: CiFailingCheck[];
|
|
@@ -190,6 +202,8 @@ export interface CiFailureEvidence {
|
|
|
190
202
|
errors?: string[];
|
|
191
203
|
/** Which failing items the PR caused versus baseline failures (#2817). */
|
|
192
204
|
attribution?: CiAttribution;
|
|
205
|
+
/** Suppression-guard hits that parked a CI rework round (#2818). */
|
|
206
|
+
suppressionAttempt?: CiSuppressionFinding[];
|
|
193
207
|
}
|
|
194
208
|
export interface CheckFailureInfo {
|
|
195
209
|
/** `stuckSignature()` of the final CHECK, the same string as RunOutcome.failureSignature. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@on-par/factory-core",
|
|
3
|
-
"version": "0.9.7-next.
|
|
3
|
+
"version": "0.9.7-next.15",
|
|
4
4
|
"description": "Core engine: model router, constitutions, checkers, and pipeline phases for the Software Factory.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -54,10 +54,10 @@
|
|
|
54
54
|
"prepack": "node ../../scripts/pack-hygiene-cli.ts prepack"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@on-par/adr-kit": "0.9.7-next.
|
|
58
|
-
"@on-par/contracts": "0.9.7-next.
|
|
59
|
-
"@on-par/factory-config": "0.9.7-next.
|
|
60
|
-
"@on-par/repo-context": "0.9.7-next.
|
|
57
|
+
"@on-par/adr-kit": "0.9.7-next.15",
|
|
58
|
+
"@on-par/contracts": "0.9.7-next.15",
|
|
59
|
+
"@on-par/factory-config": "0.9.7-next.15",
|
|
60
|
+
"@on-par/repo-context": "0.9.7-next.15",
|
|
61
61
|
"@octokit/rest": "^22.0.0",
|
|
62
62
|
"execa": "^10.1.0",
|
|
63
63
|
"gray-matter": "^4.0.3",
|