codex-orchestrator 0.1.19 → 0.1.20
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/README.md +132 -33
- package/dist/src/codex/command-adapter.d.ts +3 -0
- package/dist/src/codex/command-adapter.d.ts.map +1 -1
- package/dist/src/codex/command-adapter.js +18 -7
- package/dist/src/codex/command-adapter.js.map +1 -1
- package/dist/src/config/schema.d.ts +3 -0
- package/dist/src/config/schema.d.ts.map +1 -1
- package/dist/src/config/schema.js +3 -0
- package/dist/src/config/schema.js.map +1 -1
- package/dist/src/git/worktree.d.ts +17 -0
- package/dist/src/git/worktree.d.ts.map +1 -1
- package/dist/src/git/worktree.js +38 -0
- package/dist/src/git/worktree.js.map +1 -1
- package/dist/src/github/gh-issue-adapter.js +6 -3
- package/dist/src/github/gh-issue-adapter.js.map +1 -1
- package/dist/src/github/issues.d.ts +1 -1
- package/dist/src/github/issues.d.ts.map +1 -1
- package/dist/src/index.d.ts +6 -2
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +3 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/process/command.d.ts +3 -0
- package/dist/src/process/command.d.ts.map +1 -1
- package/dist/src/process/command.js +59 -9
- package/dist/src/process/command.js.map +1 -1
- package/dist/src/runner/command-utils.d.ts +4 -0
- package/dist/src/runner/command-utils.d.ts.map +1 -1
- package/dist/src/runner/command-utils.js +40 -1
- package/dist/src/runner/command-utils.js.map +1 -1
- package/dist/src/runner/completion-report.d.ts +54 -0
- package/dist/src/runner/completion-report.d.ts.map +1 -0
- package/dist/src/runner/completion-report.js +220 -0
- package/dist/src/runner/completion-report.js.map +1 -0
- package/dist/src/runner/local-execution-session.d.ts +34 -0
- package/dist/src/runner/local-execution-session.d.ts.map +1 -0
- package/dist/src/runner/local-execution-session.js +25 -0
- package/dist/src/runner/local-execution-session.js.map +1 -0
- package/dist/src/runner/local-state.d.ts +1 -0
- package/dist/src/runner/local-state.d.ts.map +1 -1
- package/dist/src/runner/local-state.js +2 -1
- package/dist/src/runner/local-state.js.map +1 -1
- package/dist/src/runner/plan-auto-command.d.ts +1 -0
- package/dist/src/runner/plan-auto-command.d.ts.map +1 -1
- package/dist/src/runner/plan-auto-command.js +55 -29
- package/dist/src/runner/plan-auto-command.js.map +1 -1
- package/dist/src/runner/prompt.d.ts +2 -53
- package/dist/src/runner/prompt.d.ts.map +1 -1
- package/dist/src/runner/prompt.js +15 -220
- package/dist/src/runner/prompt.js.map +1 -1
- package/dist/src/runner/review-gates.d.ts +1 -1
- package/dist/src/runner/review-gates.d.ts.map +1 -1
- package/dist/src/runner/review-gates.js +20 -1
- package/dist/src/runner/review-gates.js.map +1 -1
- package/dist/src/runner/run-log.d.ts +18 -0
- package/dist/src/runner/run-log.d.ts.map +1 -0
- package/dist/src/runner/run-log.js +53 -0
- package/dist/src/runner/run-log.js.map +1 -0
- package/dist/src/runner/safety.d.ts +1 -1
- package/dist/src/runner/safety.d.ts.map +1 -1
- package/dist/src/runner/scoped-auto-command.d.ts +4 -0
- package/dist/src/runner/scoped-auto-command.d.ts.map +1 -1
- package/dist/src/runner/scoped-auto-command.js +118 -35
- package/dist/src/runner/scoped-auto-command.js.map +1 -1
- package/dist/src/runner/visual-proof-runner.d.ts +1 -1
- package/dist/src/runner/visual-proof-runner.d.ts.map +1 -1
- package/dist/src/runner/visual-proof-runner.js +64 -9
- package/dist/src/runner/visual-proof-runner.js.map +1 -1
- package/dist/src/setup/project-config.d.ts.map +1 -1
- package/dist/src/setup/project-config.js +5 -0
- package/dist/src/setup/project-config.js.map +1 -1
- package/package.json +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scoped-auto-command.d.ts","sourceRoot":"","sources":["../../../src/runner/scoped-auto-command.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,KAAK,oBAAoB,EAAE,KAAK,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAIzH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"scoped-auto-command.d.ts","sourceRoot":"","sources":["../../../src/runner/scoped-auto-command.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,KAAK,oBAAoB,EAAE,KAAK,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAIzH,OAAO,KAAK,EAAe,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAgD,MAAM,oBAAoB,CAAC;AACtG,OAAO,EAA+B,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAI/F,OAAO,EAA4B,KAAK,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAkB1G,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,kBAAkB,CAAC,EAAE,wBAAwB,CAAC;IAC9C,GAAG,CAAC,EAAE,kBAAkB,CAAC;IACzB,YAAY,CAAC,EAAE;QAAE,GAAG,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;KAAE,CAAC;IACpF,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,kBAAkB,CAAC,EAAE,2BAA2B,CAAC;IACjD,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ;AAED,MAAM,WAAW,uBAAuB;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,MAAM,EAAE,cAAc,GAAG,SAAS,GAAG,qBAAqB,CAAC;IAC3D,aAAa,EAAE,MAAM,CAAC;CACvB;AAQD,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAyP9G"}
|
|
@@ -5,11 +5,14 @@ import { GhCliIssueAdapter } from '../github/gh-issue-adapter.js';
|
|
|
5
5
|
import { GhCliPullRequestAdapter } from '../github/gh-pull-request-adapter.js';
|
|
6
6
|
import { GitWorktreeManager, renderBranchTemplate } from '../git/worktree.js';
|
|
7
7
|
import { defaultShellCommandExecutor } from '../process/command.js';
|
|
8
|
-
import { bulletList, formatSessionTimestamp, readRunnerConfig } from './command-utils.js';
|
|
8
|
+
import { bulletList, formatSessionTimestamp, mergeArtifacts, readRunnerConfig, renderCommitEvidence } from './command-utils.js';
|
|
9
9
|
import { claimIssue, discoverIssueWork } from './issue-state-machine.js';
|
|
10
|
+
import { readScopedCompletionReport } from './completion-report.js';
|
|
11
|
+
import { runLocalExecutionSession } from './local-execution-session.js';
|
|
10
12
|
import { RunnerStateStore } from './local-state.js';
|
|
11
|
-
import { buildScopedImplementationPrompt,
|
|
13
|
+
import { buildScopedImplementationPrompt, sessionPromptPath, sessionReportPath, writeDurablePrompt, } from './prompt.js';
|
|
12
14
|
import { evaluateReviewGates } from './review-gates.js';
|
|
15
|
+
import { sessionLogPath } from './run-log.js';
|
|
13
16
|
import { validateChangedPaths, validateCompletionReportSafety, validateNoAgentOwnedGitPublication, } from './safety.js';
|
|
14
17
|
import { cleanupSessionCodexHome, sessionCodexHomePath } from './session-home.js';
|
|
15
18
|
import { runRunnerVisualProof } from './visual-proof-runner.js';
|
|
@@ -39,8 +42,10 @@ export async function runScopedAutoCommand(options) {
|
|
|
39
42
|
const workflowPromptText = await readWorkflowPrompt(workflowPromptPath);
|
|
40
43
|
const branchName = renderBranchTemplate(config.branches.scopedIssue, { issueNumber: options.issueNumber });
|
|
41
44
|
const worktreePath = join(targetRoot, config.runner.workspaceRoot, `issue-${options.issueNumber}`);
|
|
45
|
+
const codexTimeoutMs = selectCodexTimeoutMs(config, issue);
|
|
42
46
|
let promptPath = '';
|
|
43
47
|
let reportPath = '';
|
|
48
|
+
let logPath = '';
|
|
44
49
|
let pullRequest;
|
|
45
50
|
await claimIssue(issueAdapter, config, options.issueNumber, 'scoped-issue', now);
|
|
46
51
|
try {
|
|
@@ -54,6 +59,7 @@ export async function runScopedAutoCommand(options) {
|
|
|
54
59
|
const sessionId = `issue-${options.issueNumber}-${formatSessionTimestamp(now)}`;
|
|
55
60
|
promptPath = sessionPromptPath({ targetRoot, config, issueNumber: options.issueNumber, sessionId });
|
|
56
61
|
reportPath = sessionReportPath({ targetRoot, config, issueNumber: options.issueNumber, sessionId });
|
|
62
|
+
logPath = sessionLogPath({ targetRoot, config, issueNumber: options.issueNumber, sessionId });
|
|
57
63
|
const isolatedHomePath = sessionCodexHomePath({ targetRoot, sessionId });
|
|
58
64
|
await mkdir(dirname(reportPath), { recursive: true });
|
|
59
65
|
await mkdir(isolatedHomePath, { recursive: true });
|
|
@@ -82,6 +88,7 @@ export async function runScopedAutoCommand(options) {
|
|
|
82
88
|
branchName,
|
|
83
89
|
promptPath,
|
|
84
90
|
reportPath,
|
|
91
|
+
logPath,
|
|
85
92
|
retryCount: 0,
|
|
86
93
|
createdAt: now.toISOString(),
|
|
87
94
|
updatedAt: now.toISOString(),
|
|
@@ -100,44 +107,64 @@ export async function runScopedAutoCommand(options) {
|
|
|
100
107
|
issueNumber: options.issueNumber,
|
|
101
108
|
sessionId,
|
|
102
109
|
branchName,
|
|
110
|
+
timeoutMs: codexTimeoutMs,
|
|
111
|
+
logPath,
|
|
103
112
|
});
|
|
104
113
|
}
|
|
105
114
|
finally {
|
|
106
115
|
await cleanupSessionCodexHome(isolatedHomePath);
|
|
107
116
|
}
|
|
108
117
|
const afterHead = await git.getHead(worktreePath);
|
|
109
|
-
const publicationViolations =
|
|
118
|
+
const publicationViolations = config.runner.allowAgentLocalCommits
|
|
119
|
+
? []
|
|
120
|
+
: validateNoAgentOwnedGitPublication(beforeHead, afterHead);
|
|
110
121
|
if (publicationViolations.length > 0) {
|
|
111
|
-
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath), issueAdapter, config, publicationViolations.map((violation) => violation.message), [], [], []);
|
|
122
|
+
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath, logPath), issueAdapter, config, publicationViolations.map((violation) => violation.message), [], [], []);
|
|
112
123
|
}
|
|
113
124
|
if (codexResult.exitCode !== 0) {
|
|
114
|
-
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath), issueAdapter, config, [
|
|
125
|
+
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath, logPath), issueAdapter, config, [formatCodexExitReason(codexResult)], [], [], []);
|
|
115
126
|
}
|
|
116
127
|
let report;
|
|
117
128
|
try {
|
|
118
129
|
const reportResult = await readScopedCompletionReport(reportPath);
|
|
119
130
|
if (reportResult.kind === 'missing') {
|
|
120
|
-
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath), issueAdapter, config, ['Codex did not write CODEX_ORCHESTRATOR_REPORT_FILE; runner cannot prove safety contract.'], [], [], []);
|
|
131
|
+
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath, logPath), issueAdapter, config, ['Codex did not write CODEX_ORCHESTRATOR_REPORT_FILE; runner cannot prove safety contract.'], [], [], []);
|
|
121
132
|
}
|
|
122
133
|
report = reportResult.report;
|
|
123
134
|
}
|
|
124
135
|
catch (error) {
|
|
125
136
|
const message = error instanceof Error ? error.message : 'Invalid scoped completion report';
|
|
126
|
-
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath), issueAdapter, config, [message], [], [], []);
|
|
137
|
+
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath, logPath), issueAdapter, config, [message], [], [], []);
|
|
127
138
|
}
|
|
128
139
|
if (report.status === 'needs-promotion') {
|
|
129
|
-
return finishPromotionRequested(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath), issueAdapter, config, report);
|
|
140
|
+
return finishPromotionRequested(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath, logPath), issueAdapter, config, report);
|
|
130
141
|
}
|
|
131
|
-
|
|
142
|
+
const localSession = await runLocalExecutionSession({
|
|
143
|
+
worktreePath,
|
|
144
|
+
phases: options.localPhases ?? [],
|
|
145
|
+
executePhase: options.localPhaseExecutor ?? defaultPassingLocalPhaseExecutor,
|
|
146
|
+
});
|
|
147
|
+
if (!localSession.publishReady) {
|
|
148
|
+
const blockedChangeSet = await git.collectSessionChangeSet({ worktreePath, baseHead: beforeHead });
|
|
149
|
+
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath, logPath), issueAdapter, config, localSessionBlockReasons(localSession.phaseResults), blockedChangeSet.changedPaths, report.skippedChecks, [...report.residualRisks, ...localSession.phaseResults.flatMap((phase) => phase.residualRisks)]);
|
|
150
|
+
}
|
|
151
|
+
report = {
|
|
152
|
+
...report,
|
|
153
|
+
validation: [...report.validation, ...localSession.phaseResults.flatMap((phase) => phase.validation)],
|
|
154
|
+
artifacts: mergeArtifacts(report.artifacts, localSession.phaseResults.flatMap((phase) => phase.artifacts)),
|
|
155
|
+
residualRisks: [...report.residualRisks, ...localSession.phaseResults.flatMap((phase) => phase.residualRisks)],
|
|
156
|
+
};
|
|
157
|
+
let changeSet = await git.collectSessionChangeSet({ worktreePath, baseHead: beforeHead });
|
|
158
|
+
let changedFiles = changeSet.changedPaths;
|
|
132
159
|
if (changedFiles.length === 0) {
|
|
133
|
-
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath), issueAdapter, config, ['Codex completed without file changes'], [], report.skippedChecks, report.residualRisks);
|
|
160
|
+
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath, logPath), issueAdapter, config, ['Codex completed without file changes'], [], report.skippedChecks, report.residualRisks);
|
|
134
161
|
}
|
|
135
162
|
const violations = [
|
|
136
163
|
...validateChangedPaths(changedFiles, config),
|
|
137
164
|
...validateCompletionReportSafety(report),
|
|
138
165
|
];
|
|
139
166
|
if (violations.length > 0) {
|
|
140
|
-
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath), issueAdapter, config, violations.map((violation) => violation.message), changedFiles, report.skippedChecks, report.residualRisks);
|
|
167
|
+
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath, logPath), issueAdapter, config, violations.map((violation) => violation.message), changedFiles, report.skippedChecks, report.residualRisks);
|
|
141
168
|
}
|
|
142
169
|
let validation = await runConfiguredChecks(config, worktreePath, shellExecutor, report.validation);
|
|
143
170
|
const runnerVisualProof = await runRunnerVisualProof({
|
|
@@ -155,7 +182,8 @@ export async function runScopedAutoCommand(options) {
|
|
|
155
182
|
artifacts: mergeArtifacts(report.artifacts, runnerVisualProof.artifacts),
|
|
156
183
|
};
|
|
157
184
|
if (runnerVisualProof.artifacts.length > 0) {
|
|
158
|
-
|
|
185
|
+
changeSet = await git.collectSessionChangeSet({ worktreePath, baseHead: beforeHead });
|
|
186
|
+
changedFiles = changeSet.changedPaths;
|
|
159
187
|
}
|
|
160
188
|
const residualRisks = [...report.residualRisks];
|
|
161
189
|
if (validation.some((line) => line.status === 'failed')) {
|
|
@@ -171,23 +199,26 @@ export async function runScopedAutoCommand(options) {
|
|
|
171
199
|
worktreePath,
|
|
172
200
|
});
|
|
173
201
|
if (!reviewGate.ok) {
|
|
174
|
-
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath), issueAdapter, config, reviewGate.reasons, changedFiles, report.skippedChecks, residualRisks);
|
|
202
|
+
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath, logPath), issueAdapter, config, reviewGate.reasons, changedFiles, report.skippedChecks, residualRisks);
|
|
203
|
+
}
|
|
204
|
+
if (!(await git.isWorktreeClean(worktreePath))) {
|
|
205
|
+
await git.commitAll({ worktreePath, message: `Codex: implement issue #${options.issueNumber}` });
|
|
206
|
+
changeSet = await git.collectSessionChangeSet({ worktreePath, baseHead: beforeHead });
|
|
175
207
|
}
|
|
176
|
-
await git.commitAll({ worktreePath, message: `Codex: implement issue #${options.issueNumber}` });
|
|
177
208
|
await git.pushBranch({ worktreePath, branchName });
|
|
178
209
|
pullRequest = await pullRequestAdapter.createDraftPullRequest({
|
|
179
210
|
title: renderTemplate(config.pullRequests.scopedIssueTitle, options.issueNumber),
|
|
180
|
-
body: buildPullRequestBody(config, branchName, options.issueNumber, changedFiles, validation, report.artifacts, report.skippedChecks, residualRisks),
|
|
211
|
+
body: buildPullRequestBody(config, branchName, options.issueNumber, changedFiles, validation, report.artifacts, report.skippedChecks, residualRisks, logPath, changeSet.commits),
|
|
181
212
|
headBranch: branchName,
|
|
182
213
|
baseBranch: config.branches.base,
|
|
183
214
|
});
|
|
184
|
-
const reportComment = buildReviewReport(config, branchName, options.issueNumber, pullRequest, changedFiles, validation, report.artifacts, report.skippedChecks, residualRisks);
|
|
215
|
+
const reportComment = buildReviewReport(config, branchName, options.issueNumber, pullRequest, changedFiles, validation, report.artifacts, report.skippedChecks, residualRisks, logPath, changeSet.commits);
|
|
185
216
|
await issueAdapter.removeLabels(options.issueNumber, [config.github.labels.running.name]);
|
|
186
217
|
await issueAdapter.addLabels(options.issueNumber, [config.github.labels.review.name]);
|
|
187
218
|
await issueAdapter.postComment(options.issueNumber, reportComment);
|
|
188
219
|
await store.removeRun(options.issueNumber);
|
|
189
220
|
return {
|
|
190
|
-
...baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath),
|
|
221
|
+
...baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath, logPath),
|
|
191
222
|
status: 'review-ready',
|
|
192
223
|
pullRequest,
|
|
193
224
|
reportComment,
|
|
@@ -198,7 +229,7 @@ export async function runScopedAutoCommand(options) {
|
|
|
198
229
|
if (pullRequest) {
|
|
199
230
|
throw new Error(`Scoped execution failed after draft PR creation (${pullRequest.url}); not marking issue blocked: ${message}`);
|
|
200
231
|
}
|
|
201
|
-
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath), issueAdapter, config, [message], [], [], []);
|
|
232
|
+
return finishBlocked(baseResult(options.issueNumber, branchName, worktreePath, promptPath, reportPath, logPath), issueAdapter, config, [message], [], [], []);
|
|
202
233
|
}
|
|
203
234
|
}
|
|
204
235
|
async function readWorkflowPrompt(path) {
|
|
@@ -224,6 +255,27 @@ async function runConfiguredChecks(config, worktreePath, shellExecutor, reportVa
|
|
|
224
255
|
}
|
|
225
256
|
return lines;
|
|
226
257
|
}
|
|
258
|
+
async function defaultPassingLocalPhaseExecutor(input) {
|
|
259
|
+
return {
|
|
260
|
+
phaseId: input.phaseId,
|
|
261
|
+
status: 'passed',
|
|
262
|
+
validation: [],
|
|
263
|
+
artifacts: [],
|
|
264
|
+
residualRisks: [],
|
|
265
|
+
};
|
|
266
|
+
}
|
|
267
|
+
function localSessionBlockReasons(phaseResults) {
|
|
268
|
+
return phaseResults.flatMap((phase) => {
|
|
269
|
+
if (phase.status !== 'failed') {
|
|
270
|
+
return [];
|
|
271
|
+
}
|
|
272
|
+
return [
|
|
273
|
+
`Local phase ${phase.phaseId} failed`,
|
|
274
|
+
...phase.validation.map((line) => `${line.command}: ${line.status} - ${line.summary}`),
|
|
275
|
+
...phase.artifacts.map((artifact) => `${artifact.description}: ${artifact.url ?? artifact.path ?? 'missing-target'}`),
|
|
276
|
+
];
|
|
277
|
+
});
|
|
278
|
+
}
|
|
227
279
|
async function finishBlocked(result, issueAdapter, config, reasons, changedFiles, skippedChecks, residualRisks) {
|
|
228
280
|
const reportComment = [
|
|
229
281
|
`codex-orchestrator blocked scoped execution for #${result.issueNumber}`,
|
|
@@ -231,6 +283,8 @@ async function finishBlocked(result, issueAdapter, config, reasons, changedFiles
|
|
|
231
283
|
...bulletList(reasons),
|
|
232
284
|
'Changed Files',
|
|
233
285
|
...bulletList(changedFiles),
|
|
286
|
+
'Log',
|
|
287
|
+
...bulletList([result.logPath]),
|
|
234
288
|
'Skipped Checks',
|
|
235
289
|
...bulletList(skippedChecks),
|
|
236
290
|
'Residual Risks',
|
|
@@ -260,7 +314,7 @@ async function finishPromotionRequested(result, issueAdapter, config, report) {
|
|
|
260
314
|
await issueAdapter.postComment(result.issueNumber, reportComment);
|
|
261
315
|
return { ...result, status: 'promotion-requested', reportComment };
|
|
262
316
|
}
|
|
263
|
-
function buildReviewReport(config, branchName, issueNumber, pullRequest, changedFiles, validation, artifacts, skippedChecks, residualRisks) {
|
|
317
|
+
function buildReviewReport(config, branchName, issueNumber, pullRequest, changedFiles, validation, artifacts, skippedChecks, residualRisks, logPath, commits) {
|
|
264
318
|
return [
|
|
265
319
|
`codex-orchestrator review report for #${issueNumber}`,
|
|
266
320
|
'Pull Request',
|
|
@@ -271,13 +325,17 @@ function buildReviewReport(config, branchName, issueNumber, pullRequest, changed
|
|
|
271
325
|
...validation.map((line) => `- ${line.command}: ${line.status} - ${line.summary}`),
|
|
272
326
|
'Proof Artifacts',
|
|
273
327
|
...renderProofArtifacts(config, branchName, artifacts),
|
|
328
|
+
'Log',
|
|
329
|
+
...bulletList([logPath]),
|
|
330
|
+
'Local Commits',
|
|
331
|
+
...renderCommitEvidence(commits),
|
|
274
332
|
'Skipped Checks',
|
|
275
333
|
...bulletList(skippedChecks),
|
|
276
334
|
'Residual Risks',
|
|
277
335
|
...bulletList(residualRisks),
|
|
278
336
|
].join('\n');
|
|
279
337
|
}
|
|
280
|
-
function buildPullRequestBody(config, branchName, issueNumber, changedFiles, validation, artifacts, skippedChecks, residualRisks) {
|
|
338
|
+
function buildPullRequestBody(config, branchName, issueNumber, changedFiles, validation, artifacts, skippedChecks, residualRisks, logPath, commits) {
|
|
281
339
|
return [
|
|
282
340
|
`Closes #${issueNumber}`,
|
|
283
341
|
'',
|
|
@@ -290,6 +348,12 @@ function buildPullRequestBody(config, branchName, issueNumber, changedFiles, val
|
|
|
290
348
|
'Proof artifacts:',
|
|
291
349
|
...renderProofArtifacts(config, branchName, artifacts),
|
|
292
350
|
'',
|
|
351
|
+
'Log:',
|
|
352
|
+
...bulletList([logPath]),
|
|
353
|
+
'',
|
|
354
|
+
'Local commits:',
|
|
355
|
+
...renderCommitEvidence(commits),
|
|
356
|
+
'',
|
|
293
357
|
'Skipped checks:',
|
|
294
358
|
...bulletList(skippedChecks),
|
|
295
359
|
'',
|
|
@@ -297,12 +361,44 @@ function buildPullRequestBody(config, branchName, issueNumber, changedFiles, val
|
|
|
297
361
|
...bulletList(residualRisks),
|
|
298
362
|
].join('\n');
|
|
299
363
|
}
|
|
300
|
-
function baseResult(issueNumber, branchName, worktreePath, promptPath, reportPath) {
|
|
301
|
-
return { issueNumber, branchName, worktreePath, promptPath, reportPath };
|
|
364
|
+
function baseResult(issueNumber, branchName, worktreePath, promptPath, reportPath, logPath) {
|
|
365
|
+
return { issueNumber, branchName, worktreePath, promptPath, reportPath, logPath };
|
|
302
366
|
}
|
|
303
367
|
function renderTemplate(template, issueNumber) {
|
|
304
368
|
return template.replaceAll('${issueNumber}', String(issueNumber));
|
|
305
369
|
}
|
|
370
|
+
function selectCodexTimeoutMs(config, issue) {
|
|
371
|
+
if (!config.codex.mobileTimeoutMs || !isMobileIssue(issue)) {
|
|
372
|
+
return undefined;
|
|
373
|
+
}
|
|
374
|
+
return config.codex.mobileTimeoutMs;
|
|
375
|
+
}
|
|
376
|
+
function isMobileIssue(issue) {
|
|
377
|
+
const labels = issue.labels.map((label) => label.name).join('\n');
|
|
378
|
+
const text = `${issue.title}\n${issue.body}\n${labels}`;
|
|
379
|
+
return /\b(?:android|flutter|ios|iphone|ipad|mobile|emulator|apk|aab|dart)\b/iu.test(text);
|
|
380
|
+
}
|
|
381
|
+
function formatCodexExitReason(result) {
|
|
382
|
+
const output = [result.stderr, result.stdout]
|
|
383
|
+
.map((value) => value.trim())
|
|
384
|
+
.filter((value) => value.length > 0)
|
|
385
|
+
.join('\n');
|
|
386
|
+
const timeoutLine = output
|
|
387
|
+
.split(/\r?\n/u)
|
|
388
|
+
.map((line) => line.trim())
|
|
389
|
+
.reverse()
|
|
390
|
+
.find((line) => /timed out|timeout/iu.test(line));
|
|
391
|
+
const detail = timeoutLine ?? truncate(output, 600);
|
|
392
|
+
return detail
|
|
393
|
+
? `Codex exited with code ${result.exitCode}: ${truncate(detail, 600)}`
|
|
394
|
+
: `Codex exited with code ${result.exitCode}`;
|
|
395
|
+
}
|
|
396
|
+
function truncate(value, maxLength) {
|
|
397
|
+
if (value.length <= maxLength) {
|
|
398
|
+
return value;
|
|
399
|
+
}
|
|
400
|
+
return `${value.slice(0, maxLength - 3)}...`;
|
|
401
|
+
}
|
|
306
402
|
function renderProofArtifacts(config, branchName, artifacts) {
|
|
307
403
|
if (artifacts.length === 0) {
|
|
308
404
|
return ['- none'];
|
|
@@ -313,19 +409,6 @@ function renderProofArtifacts(config, branchName, artifacts) {
|
|
|
313
409
|
return artifact.type === 'screenshot' ? `- ` : `- ${label}: ${target}`;
|
|
314
410
|
});
|
|
315
411
|
}
|
|
316
|
-
function mergeArtifacts(existing, additions) {
|
|
317
|
-
const seen = new Set(existing.map((artifact) => artifact.url ?? artifact.path ?? artifact.description));
|
|
318
|
-
const merged = [...existing];
|
|
319
|
-
for (const artifact of additions) {
|
|
320
|
-
const key = artifact.url ?? artifact.path ?? artifact.description;
|
|
321
|
-
if (seen.has(key)) {
|
|
322
|
-
continue;
|
|
323
|
-
}
|
|
324
|
-
seen.add(key);
|
|
325
|
-
merged.push(artifact);
|
|
326
|
-
}
|
|
327
|
-
return merged;
|
|
328
|
-
}
|
|
329
412
|
function rawGitHubUrl(config, branchName, path) {
|
|
330
413
|
const encodedPath = path.split('/').map(encodeURIComponent).join('/');
|
|
331
414
|
return `https://raw.githubusercontent.com/${encodeURIComponent(config.github.owner)}/${encodeURIComponent(config.github.repo)}/${encodeURIComponent(branchName)}/${encodedPath}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scoped-auto-command.js","sourceRoot":"","sources":["../../../src/runner/scoped-auto-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEnD,OAAO,EAAE,mBAAmB,EAAyD,MAAM,6BAA6B,CAAC;AAEzH,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAG/E,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,2BAA2B,EAA6B,MAAM,uBAAuB,CAAC;AAC/F,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EACL,+BAA+B,EAC/B,0BAA0B,EAC1B,iBAAiB,EACjB,iBAAiB,EAEjB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EACL,oBAAoB,EACpB,8BAA8B,EAC9B,kCAAkC,GACnC,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AA8BhE,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAAiC;IAC1E,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,IAAI,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5G,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,IAAI,uBAAuB,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC9H,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,kBAAkB,EAAE,CAAC;IACpD,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,2BAA2B,CAAC;IAC3E,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC7E,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE/D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,UAAU,OAAO,CAAC,WAAW,gBAAgB,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,QAAQ,GAAG,iBAAiB,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QAClF,MAAM,MAAM,GAAG,QAAQ,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,uBAAuB,CAAC;QACxF,MAAM,IAAI,KAAK,CAAC,UAAU,OAAO,CAAC,WAAW,qDAAqD,MAAM,EAAE,CAAC,CAAC;IAC9G,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC,UAAU,CAAC;IACtE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;IAClF,CAAC;IACD,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC1D,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAC3G,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IACnG,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAI,WAA0C,CAAC;IAE/C,MAAM,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,CAAC,CAAC;IAEjF,IAAI,CAAC;QACH,MAAM,GAAG,CAAC,mBAAmB,CAAC;YAC5B,UAAU;YACV,aAAa,EAAE,YAAY;YAC3B,UAAU;YACV,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;YAChC,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,SAAS,OAAO,CAAC,WAAW,IAAI,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC;QAChF,UAAU,GAAG,iBAAiB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;QACpG,UAAU,GAAG,iBAAiB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;QACpG,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC;QACzE,MAAM,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtD,MAAM,KAAK,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,MAAM,UAAU,GAAG,+BAA+B,CAAC;YACjD,KAAK;YACL,MAAM;YACN,kBAAkB;YAClB,UAAU;YACV,UAAU;YACV,UAAU;YACV,YAAY;SACb,CAAC,CAAC;QACH,MAAM,kBAAkB,CAAC;YACvB,UAAU;YACV,MAAM;YACN,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,SAAS;YACT,UAAU;SACX,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,gBAAgB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACvD,MAAM,KAAK,CAAC,SAAS,CAAC;YACpB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,IAAI,EAAE,cAAc;YACpB,aAAa,EAAE,YAAY;YAC3B,SAAS;YACT,UAAU;YACV,UAAU;YACV,UAAU;YACV,UAAU,EAAE,CAAC;YACb,SAAS,EAAE,GAAG,CAAC,WAAW,EAAE;YAC5B,SAAS,EAAE,GAAG,CAAC,WAAW,EAAE;SAC7B,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACnD,IAAI,WAAkC,CAAC;QACvC,IAAI,CAAC;YACH,WAAW,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC;gBACnC,UAAU;gBACV,MAAM;gBACN,YAAY;gBACZ,UAAU;gBACV,UAAU;gBACV,UAAU;gBACV,gBAAgB;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,SAAS;gBACT,UAAU;aACX,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,MAAM,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAClD,MAAM,qBAAqB,GAAG,kCAAkC,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACxF,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrC,OAAO,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,qBAAqB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACzM,CAAC;QACD,IAAI,WAAW,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,0BAA0B,WAAW,CAAC,QAAQ,KAAK,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7O,CAAC;QAED,IAAI,MAA8B,CAAC;QACnC,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,0BAA0B,CAAC,UAAU,CAAC,CAAC;YAClE,IAAI,YAAY,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACpC,OAAO,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,0FAA0F,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1O,CAAC;YACD,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;QAC/B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,kCAAkC,CAAC;YAC5F,OAAO,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACvJ,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,KAAK,iBAAiB,EAAE,CAAC;YACxC,OAAO,wBAAwB,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACnJ,CAAC;QAED,IAAI,YAAY,GAAG,MAAM,GAAG,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAC5D,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,sCAAsC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;QAC1N,CAAC;QAED,MAAM,UAAU,GAAG;YACjB,GAAG,oBAAoB,CAAC,YAAY,EAAE,MAAM,CAAC;YAC7C,GAAG,8BAA8B,CAAC,MAAM,CAAC;SAC1C,CAAC;QACF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;QAC5O,CAAC;QAED,IAAI,UAAU,GAAG,MAAM,mBAAmB,CAAC,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACnG,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC;YACnD,MAAM;YACN,KAAK;YACL,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,YAAY;YACZ,YAAY;YACZ,MAAM;YACN,aAAa;SACd,CAAC,CAAC;QACH,UAAU,GAAG,CAAC,GAAG,UAAU,EAAE,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,GAAG;YACP,GAAG,MAAM;YACT,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;SACzE,CAAC;QACF,IAAI,iBAAiB,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3C,YAAY,GAAG,MAAM,GAAG,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,aAAa,GAAG,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;QAChD,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,EAAE,CAAC;YACxD,aAAa,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QAC9D,CAAC;QACD,MAAM,UAAU,GAAG,mBAAmB,CAAC;YACrC,MAAM;YACN,KAAK;YACL,YAAY;YACZ,UAAU;YACV,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,MAAM;YACN,YAAY;SACb,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YACnB,OAAO,aAAa,CAClB,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,EACjF,YAAY,EACZ,MAAM,EACN,UAAU,CAAC,OAAO,EAClB,YAAY,EACZ,MAAM,CAAC,aAAa,EACpB,aAAa,CACd,CAAC;QACJ,CAAC;QACD,MAAM,GAAG,CAAC,SAAS,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,2BAA2B,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACjG,MAAM,GAAG,CAAC,UAAU,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC;QACnD,WAAW,GAAG,MAAM,kBAAkB,CAAC,sBAAsB,CAAC;YAC5D,KAAK,EAAE,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,OAAO,CAAC,WAAW,CAAC;YAChF,IAAI,EAAE,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC;YACpJ,UAAU,EAAE,UAAU;YACtB,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;SACjC,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QAC/K,MAAM,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1F,MAAM,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QACtF,MAAM,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACnE,MAAM,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE3C,OAAO;YACL,GAAG,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC;YACpF,MAAM,EAAE,cAAc;YACtB,WAAW;YACX,aAAa;SACd,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,yBAAyB,CAAC;QACnF,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,oDAAoD,WAAW,CAAC,GAAG,iCAAiC,OAAO,EAAE,CAAC,CAAC;QACjI,CAAC;QACD,OAAO,aAAa,CAClB,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,EACjF,YAAY,EACZ,MAAM,EACN,CAAC,OAAO,CAAC,EACT,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,IAAY;IAC5C,IAAI,CAAC;QACH,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACzE,MAAM,IAAI,KAAK,CAAC,sDAAsD,IAAI,EAAE,CAAC,CAAC;QAChF,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,MAA+B,EAC/B,YAAoB,EACpB,aAAmC,EACnC,gBAAkC;IAElC,MAAM,KAAK,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC;IACpC,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5D,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;QACnE,KAAK,CAAC,IAAI,CAAC;YACT,OAAO;YACP,MAAM,EAAE,MAAM,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ;YACnD,OAAO,EAAE,GAAG,IAAI,KAAK,MAAM,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,QAAQ,MAAM,CAAC,QAAQ,EAAE,EAAE;SACtH,CAAC,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,MAAiE,EACjE,YAAgC,EAChC,MAA+B,EAC/B,OAAiB,EACjB,YAAsB,EACtB,aAAuB,EACvB,aAAuB;IAEvB,MAAM,aAAa,GAAG;QACpB,oDAAoD,MAAM,CAAC,WAAW,EAAE;QACxE,SAAS;QACT,GAAG,UAAU,CAAC,OAAO,CAAC;QACtB,eAAe;QACf,GAAG,UAAU,CAAC,YAAY,CAAC;QAC3B,gBAAgB;QAChB,GAAG,UAAU,CAAC,aAAa,CAAC;QAC5B,gBAAgB;QAChB,GAAG,UAAU,CAAC,aAAa,CAAC;KAC7B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACb,MAAM,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACzF,MAAM,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACtF,MAAM,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAClE,OAAO,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC;AACzD,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,MAAiE,EACjE,YAAgC,EAChC,MAA+B,EAC/B,MAA8B;IAE9B,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IACnC,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IACD,MAAM,aAAa,GAAG;QACpB,+CAA+C,MAAM,CAAC,WAAW,EAAE;QACnE,WAAW,SAAS,CAAC,MAAM,EAAE;QAC7B,UAAU;QACV,GAAG,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC;QACjC,UAAU;QACV,GAAG,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC;QACjC,mHAAmH;KACpH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACb,MAAM,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACzF,MAAM,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACtF,MAAM,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAClE,OAAO,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,aAAa,EAAE,CAAC;AACrE,CAAC;AAED,SAAS,iBAAiB,CACxB,MAA+B,EAC/B,UAAkB,EAClB,WAAmB,EACnB,WAA8B,EAC9B,YAAsB,EACtB,UAA4B,EAC5B,SAA8C,EAC9C,aAAuB,EACvB,aAAuB;IAEvB,OAAO;QACL,yCAAyC,WAAW,EAAE;QACtD,cAAc;QACd,KAAK,WAAW,CAAC,GAAG,EAAE;QACtB,SAAS;QACT,GAAG,UAAU,CAAC,YAAY,CAAC;QAC3B,YAAY;QACZ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,MAAM,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAClF,iBAAiB;QACjB,GAAG,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC;QACtD,gBAAgB;QAChB,GAAG,UAAU,CAAC,aAAa,CAAC;QAC5B,gBAAgB;QAChB,GAAG,UAAU,CAAC,aAAa,CAAC;KAC7B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAS,oBAAoB,CAC3B,MAA+B,EAC/B,UAAkB,EAClB,WAAmB,EACnB,YAAsB,EACtB,UAA4B,EAC5B,SAA8C,EAC9C,aAAuB,EACvB,aAAuB;IAEvB,OAAO;QACL,WAAW,WAAW,EAAE;QACxB,EAAE;QACF,gBAAgB;QAChB,GAAG,UAAU,CAAC,YAAY,CAAC;QAC3B,EAAE;QACF,aAAa;QACb,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,MAAM,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAClF,EAAE;QACF,kBAAkB;QAClB,GAAG,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC;QACtD,EAAE;QACF,iBAAiB;QACjB,GAAG,UAAU,CAAC,aAAa,CAAC;QAC5B,EAAE;QACF,iBAAiB;QACjB,GAAG,UAAU,CAAC,aAAa,CAAC;KAC7B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAS,UAAU,CACjB,WAAmB,EACnB,UAAkB,EAClB,YAAoB,EACpB,UAAkB,EAClB,UAAkB;IAElB,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;AAC3E,CAAC;AAED,SAAS,cAAc,CAAC,QAAgB,EAAE,WAAmB;IAC3D,OAAO,QAAQ,CAAC,UAAU,CAAC,gBAAgB,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,oBAAoB,CAC3B,MAA+B,EAC/B,UAAkB,EAClB,SAA8C;IAE9C,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IACD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAChC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,IAAI,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACrF,MAAM,KAAK,GAAG,GAAG,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC1D,OAAO,QAAQ,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,OAAO,iBAAiB,CAAC,KAAK,CAAC,KAAK,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,MAAM,EAAE,CAAC;IAClH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CACrB,QAA6C,EAC7C,SAA8C;IAE9C,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IACxG,MAAM,MAAM,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;IAC7B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,WAAW,CAAC;QAClE,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAClB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,YAAY,CAAC,MAA+B,EAAE,UAAkB,EAAE,IAAY;IACrF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtE,OAAO,qCAAqC,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,UAAU,CAAC,IAAI,WAAW,EAAE,CAAC;AACnL,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAa;IACtC,OAAO,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AACtC,CAAC"}
|
|
1
|
+
{"version":3,"file":"scoped-auto-command.js","sourceRoot":"","sources":["../../../src/runner/scoped-auto-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { CodexOrchestratorConfig } from '../config/schema.js';
|
|
2
2
|
import type { GitHubIssue } from '../github/issues.js';
|
|
3
3
|
import type { ShellCommandExecutor } from '../process/command.js';
|
|
4
|
-
import type { ScopedCompletionReport } from './
|
|
4
|
+
import type { ScopedCompletionReport } from './completion-report.js';
|
|
5
5
|
interface ValidationLine {
|
|
6
6
|
command: string;
|
|
7
7
|
status: 'passed' | 'failed' | 'skipped';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visual-proof-runner.d.ts","sourceRoot":"","sources":["../../../src/runner/visual-proof-runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"visual-proof-runner.d.ts","sourceRoot":"","sources":["../../../src/runner/visual-proof-runner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAGrE,UAAU,cAAc;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC;CACjB;AASD,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,uBAAuB,CAAC;IAChC,KAAK,EAAE,WAAW,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,MAAM,EAAE,sBAAsB,CAAC;IAC/B,aAAa,EAAE,oBAAoB,CAAC;CACrC;AAED,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,SAAS,EAAE,sBAAsB,CAAC,WAAW,CAAC,CAAC;CAChD;AAED,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAgF1G"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import { mkdir, readdir, stat } from 'node:fs/promises';
|
|
2
|
-
import {
|
|
1
|
+
import { mkdir, readFile, readdir, stat } from 'node:fs/promises';
|
|
2
|
+
import { createHash } from 'node:crypto';
|
|
3
|
+
import { tmpdir } from 'node:os';
|
|
4
|
+
import { dirname, isAbsolute, join, relative } from 'node:path';
|
|
3
5
|
import { shouldApplyVisualProofGate } from './review-gates.js';
|
|
4
6
|
export async function runRunnerVisualProof(input) {
|
|
5
7
|
const commandTemplate = input.config.reviewGates.visualProof.runnerValidationCommand?.trim();
|
|
@@ -7,10 +9,14 @@ export async function runRunnerVisualProof(input) {
|
|
|
7
9
|
return { validation: [], artifacts: [] };
|
|
8
10
|
}
|
|
9
11
|
const proofDir = join(input.worktreePath, input.config.reviewGates.visualProof.artifactDir, `issue-${input.issueNumber}`);
|
|
10
|
-
const
|
|
12
|
+
const runtimeDir = runnerVisualProofRuntimeDir(input.worktreePath, input.issueNumber);
|
|
13
|
+
const playwrightProfileDir = join(runtimeDir, 'playwright-profile');
|
|
14
|
+
const playwrightBrowsersDir = join(runtimeDir, 'ms-playwright');
|
|
11
15
|
await mkdir(proofDir, { recursive: true });
|
|
12
16
|
await mkdir(playwrightProfileDir, { recursive: true });
|
|
17
|
+
await mkdir(playwrightBrowsersDir, { recursive: true });
|
|
13
18
|
const command = renderVisualProofCommand(commandTemplate, input, proofDir);
|
|
19
|
+
const before = new Map((await listScreenshotArtifacts(input.worktreePath, proofDir)).map((artifact) => [artifact.path, artifact]));
|
|
14
20
|
const result = await input.shellExecutor(command, {
|
|
15
21
|
cwd: input.worktreePath,
|
|
16
22
|
env: {
|
|
@@ -22,12 +28,19 @@ export async function runRunnerVisualProof(input) {
|
|
|
22
28
|
CODEX_ORCHESTRATOR_PLAYWRIGHT_PROFILE_DIR: playwrightProfileDir,
|
|
23
29
|
CODEX_ORCHESTRATOR_WORKTREE_PATH: input.worktreePath,
|
|
24
30
|
CODEX_ORCHESTRATOR_CHANGED_FILES: input.changedFiles.join('\n'),
|
|
25
|
-
PLAYWRIGHT_BROWSERS_PATH:
|
|
31
|
+
PLAYWRIGHT_BROWSERS_PATH: playwrightBrowsersDir,
|
|
26
32
|
},
|
|
27
33
|
timeoutMs: input.config.reviewGates.visualProof.runnerTimeoutMs,
|
|
28
34
|
});
|
|
29
35
|
const after = await listScreenshotArtifacts(input.worktreePath, proofDir);
|
|
30
|
-
const
|
|
36
|
+
const produced = after.filter((artifact) => {
|
|
37
|
+
const previous = before.get(artifact.path);
|
|
38
|
+
return !previous
|
|
39
|
+
|| previous.size !== artifact.size
|
|
40
|
+
|| previous.mtimeMs !== artifact.mtimeMs
|
|
41
|
+
|| previous.hash !== artifact.hash;
|
|
42
|
+
});
|
|
43
|
+
const artifacts = produced.map(({ path }) => ({
|
|
31
44
|
type: 'screenshot',
|
|
32
45
|
path,
|
|
33
46
|
description: `runner visual proof ${path.split('/').at(-1) ?? path}`,
|
|
@@ -42,6 +55,17 @@ export async function runRunnerVisualProof(input) {
|
|
|
42
55
|
artifacts,
|
|
43
56
|
};
|
|
44
57
|
}
|
|
58
|
+
const requiredArtifactCount = input.config.reviewGates.visualProof.minScreenshotArtifacts;
|
|
59
|
+
if (artifacts.length < requiredArtifactCount) {
|
|
60
|
+
return {
|
|
61
|
+
validation: [{
|
|
62
|
+
command,
|
|
63
|
+
status: 'failed',
|
|
64
|
+
summary: `runner visual proof failed: command completed but did not produce a screenshot artifact under ${input.config.reviewGates.visualProof.artifactDir}/issue-${input.issueNumber}; ${requiredArtifactCount} required.`,
|
|
65
|
+
}],
|
|
66
|
+
artifacts,
|
|
67
|
+
};
|
|
68
|
+
}
|
|
45
69
|
return {
|
|
46
70
|
validation: [{
|
|
47
71
|
command,
|
|
@@ -79,12 +103,39 @@ function renderVisualProofCommand(command, input, proofDir) {
|
|
|
79
103
|
.replaceAll('${proofDir}', proofDir)
|
|
80
104
|
.replaceAll('${worktreePath}', input.worktreePath);
|
|
81
105
|
}
|
|
106
|
+
function runnerVisualProofRuntimeDir(worktreePath, issueNumber) {
|
|
107
|
+
const key = createHash('sha256')
|
|
108
|
+
.update(`${worktreePath}\0${issueNumber}`)
|
|
109
|
+
.digest('hex')
|
|
110
|
+
.slice(0, 16);
|
|
111
|
+
const tempRoot = join(tmpdir(), 'codex-orchestrator-visual-proof-runtime');
|
|
112
|
+
const runtimeRoot = isPathInside(worktreePath, tempRoot)
|
|
113
|
+
? join(dirname(worktreePath), '.codex-orchestrator-visual-proof-runtime')
|
|
114
|
+
: tempRoot;
|
|
115
|
+
return join(runtimeRoot, `issue-${issueNumber}-${key}`);
|
|
116
|
+
}
|
|
82
117
|
async function listScreenshotArtifacts(worktreePath, proofDir) {
|
|
83
118
|
const paths = await listFiles(proofDir);
|
|
84
|
-
|
|
85
|
-
.filter((path) =>
|
|
86
|
-
.map((path) =>
|
|
87
|
-
.
|
|
119
|
+
const artifacts = await Promise.all(paths
|
|
120
|
+
.filter((path) => isCollectableScreenshotPath(path, proofDir))
|
|
121
|
+
.map(async (path) => {
|
|
122
|
+
const [info, contents] = await Promise.all([stat(path), readFile(path)]);
|
|
123
|
+
return {
|
|
124
|
+
path: normalizePath(relative(worktreePath, path)),
|
|
125
|
+
size: info.size,
|
|
126
|
+
mtimeMs: info.mtimeMs,
|
|
127
|
+
hash: createHash('sha256').update(contents).digest('hex'),
|
|
128
|
+
};
|
|
129
|
+
}));
|
|
130
|
+
return artifacts.sort((left, right) => left.path.localeCompare(right.path));
|
|
131
|
+
}
|
|
132
|
+
function isCollectableScreenshotPath(path, proofDir) {
|
|
133
|
+
if (!/\.(png|jpe?g|webp)$/iu.test(path)) {
|
|
134
|
+
return false;
|
|
135
|
+
}
|
|
136
|
+
const pathWithinProofDir = normalizePath(relative(proofDir, path));
|
|
137
|
+
const topLevelDirectory = pathWithinProofDir.split('/')[0];
|
|
138
|
+
return topLevelDirectory !== 'playwright-profile' && topLevelDirectory !== 'ms-playwright';
|
|
88
139
|
}
|
|
89
140
|
async function listFiles(root) {
|
|
90
141
|
let entries;
|
|
@@ -114,4 +165,8 @@ async function listFiles(root) {
|
|
|
114
165
|
function normalizePath(path) {
|
|
115
166
|
return path.replaceAll('\\', '/').replace(/^\.\//, '');
|
|
116
167
|
}
|
|
168
|
+
function isPathInside(parent, child) {
|
|
169
|
+
const path = relative(parent, child);
|
|
170
|
+
return path.length === 0 || (!path.startsWith('..') && !isAbsolute(path));
|
|
171
|
+
}
|
|
117
172
|
//# sourceMappingURL=visual-proof-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visual-proof-runner.js","sourceRoot":"","sources":["../../../src/runner/visual-proof-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"visual-proof-runner.js","sourceRoot":"","sources":["../../../src/runner/visual-proof-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-config.d.ts","sourceRoot":"","sources":["../../../src/setup/project-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,uBAAuB,EAAmB,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE5G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,sBAAsB,CAAC;IACtC,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAED,eAAO,MAAM,aAAa,EAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAQrE,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,GAAG,uBAAuB,
|
|
1
|
+
{"version":3,"file":"project-config.d.ts","sourceRoot":"","sources":["../../../src/setup/project-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,uBAAuB,EAAmB,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE5G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,sBAAsB,CAAC;IACtC,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAED,eAAO,MAAM,aAAa,EAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAQrE,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,GAAG,uBAAuB,CAiL1F;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,uBAAuB,EACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAC5C,uBAAuB,CAiGzB;AAED,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,CAWzG;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAAG,IAAI,CASrF;AAED,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC,CAW7G;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D"}
|
|
@@ -24,6 +24,7 @@ export function buildProjectConfig(input) {
|
|
|
24
24
|
workspaceRoot: '.codex-orchestrator/workspaces',
|
|
25
25
|
maxParallelChildren: 3,
|
|
26
26
|
stateDir: '.codex-orchestrator/state',
|
|
27
|
+
allowAgentLocalCommits: false,
|
|
27
28
|
worktreeCleanup: {
|
|
28
29
|
enabled: true,
|
|
29
30
|
},
|
|
@@ -46,6 +47,8 @@ export function buildProjectConfig(input) {
|
|
|
46
47
|
'-',
|
|
47
48
|
],
|
|
48
49
|
timeoutMs: 1_800_000,
|
|
50
|
+
mobileTimeoutMs: 3_600_000,
|
|
51
|
+
idleTimeoutMs: 300_000,
|
|
49
52
|
promptFileEnv: 'CODEX_ORCHESTRATOR_PROMPT_FILE',
|
|
50
53
|
reportFileEnv: 'CODEX_ORCHESTRATOR_REPORT_FILE',
|
|
51
54
|
},
|
|
@@ -225,6 +228,8 @@ export function mergeExistingProjectConfig(defaults, existing) {
|
|
|
225
228
|
...existingCodex,
|
|
226
229
|
args: migrateCodexArgs(readStringArray(existingCodex?.args), defaults.codex.args),
|
|
227
230
|
timeoutMs: migrateCodexTimeout(readPositiveInteger(existingCodex?.timeoutMs), defaults.codex.timeoutMs ?? 1_800_000),
|
|
231
|
+
mobileTimeoutMs: readPositiveInteger(existingCodex?.mobileTimeoutMs) ?? defaults.codex.mobileTimeoutMs,
|
|
232
|
+
idleTimeoutMs: readPositiveInteger(existingCodex?.idleTimeoutMs) ?? defaults.codex.idleTimeoutMs,
|
|
228
233
|
promptFileEnv: defaults.codex.promptFileEnv,
|
|
229
234
|
reportFileEnv: defaults.codex.reportFileEnv,
|
|
230
235
|
adapter: defaults.codex.adapter,
|