@on-par/factory-core 0.9.28-next.22 → 0.9.28-next.24
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/checkers/internal-exports.d.ts +2 -1
- package/dist/checkers/internal-exports.d.ts.map +1 -1
- package/dist/checkers/internal-exports.js +2 -1
- package/dist/checkers/internal-exports.js.map +1 -1
- package/dist/config/index.d.ts +3 -0
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +2 -2
- package/dist/config/index.js.map +1 -1
- package/dist/config/repo.js +1 -1
- package/dist/config/repo.js.map +1 -1
- package/dist/config/run-config-env.d.ts +5 -0
- package/dist/config/run-config-env.d.ts.map +1 -0
- package/dist/config/run-config-env.js +11 -0
- package/dist/config/run-config-env.js.map +1 -0
- package/dist/config/run-config-ladder.d.ts +18 -0
- package/dist/config/run-config-ladder.d.ts.map +1 -0
- package/dist/config/run-config-ladder.js +110 -0
- package/dist/config/run-config-ladder.js.map +1 -0
- package/dist/config/run-config-source.d.ts +6 -6
- package/dist/config/run-config-source.d.ts.map +1 -1
- package/dist/config/run-config-source.js +16 -15
- package/dist/config/run-config-source.js.map +1 -1
- package/dist/constitutions/index.d.ts.map +1 -1
- package/dist/constitutions/index.js +8 -0
- package/dist/constitutions/index.js.map +1 -1
- package/dist/events/config-traits.d.ts +1 -1
- package/dist/events/config-traits.d.ts.map +1 -1
- package/dist/events/config-traits.js +2 -0
- package/dist/events/config-traits.js.map +1 -1
- package/dist/events/queue-traits.d.ts +1 -1
- package/dist/events/queue-traits.d.ts.map +1 -1
- package/dist/events/queue-traits.js +4 -1
- package/dist/events/queue-traits.js.map +1 -1
- package/dist/events/rotation.js +1 -1
- package/dist/events/rotation.js.map +1 -1
- package/dist/fakes/octokit.d.ts +13 -1
- package/dist/fakes/octokit.d.ts.map +1 -1
- package/dist/fakes/octokit.js +13 -0
- package/dist/fakes/octokit.js.map +1 -1
- package/dist/internal.d.ts +2 -0
- package/dist/internal.d.ts.map +1 -1
- package/dist/internal.js +3 -0
- package/dist/internal.js.map +1 -1
- package/dist/kpis/phase.d.ts.map +1 -1
- package/dist/kpis/phase.js +1 -0
- package/dist/kpis/phase.js.map +1 -1
- package/dist/queue/review-rework-trigger.d.ts +2 -2
- package/dist/queue/review-rework-trigger.d.ts.map +1 -1
- package/dist/queue/review-rework-trigger.js +6 -2
- package/dist/queue/review-rework-trigger.js.map +1 -1
- package/dist/run/feedback-github.d.ts +50 -0
- package/dist/run/feedback-github.d.ts.map +1 -0
- package/dist/run/feedback-github.js +87 -0
- package/dist/run/feedback-github.js.map +1 -0
- package/dist/run/feedback-round-hooks.d.ts +19 -0
- package/dist/run/feedback-round-hooks.d.ts.map +1 -0
- package/dist/run/feedback-round-hooks.js +106 -0
- package/dist/run/feedback-round-hooks.js.map +1 -0
- package/dist/run/feedback-round.d.ts +97 -0
- package/dist/run/feedback-round.d.ts.map +1 -0
- package/dist/run/feedback-round.js +275 -0
- package/dist/run/feedback-round.js.map +1 -0
- package/dist/run/review-rework-cap.js +1 -1
- package/dist/run/review-rework-cap.js.map +1 -1
- package/dist/run/review-rework.d.ts +7 -2
- package/dist/run/review-rework.d.ts.map +1 -1
- package/dist/run/review-rework.js +66 -30
- package/dist/run/review-rework.js.map +1 -1
- package/dist/run/run-issue.d.ts.map +1 -1
- package/dist/run/run-issue.js +12 -4
- package/dist/run/run-issue.js.map +1 -1
- package/package.json +5 -5
|
@@ -0,0 +1,275 @@
|
|
|
1
|
+
// packages/core/src/run/feedback-round.ts — a feedback round on a factory PR: collect unhandled trusted feedback, triage it, rework or re-plan, then answer each item and resolve what was fixed (#3910)
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
import { parseReworkCommand } from '../queue/comment-rework-trigger.js';
|
|
4
|
+
import { extractJsonObject } from '../readiness/decompose.js';
|
|
5
|
+
import { UNTRUSTED_REVIEW_FEEDBACK_NOTICE, wrapUntrustedReviewFeedback } from '../utils/untrusted-input.js';
|
|
6
|
+
import { ReviewReworkError } from './review-rework.js';
|
|
7
|
+
const DispositionSchema = z.object({
|
|
8
|
+
id: z.number(),
|
|
9
|
+
kind: z.enum(['review', 'inline', 'comment']),
|
|
10
|
+
verdict: z.enum(['actionable', 'question', 'out-of-scope']),
|
|
11
|
+
changesSpec: z.boolean().default(false),
|
|
12
|
+
summary: z.string().default(''),
|
|
13
|
+
answer: z.string().optional(),
|
|
14
|
+
reason: z.string().optional(),
|
|
15
|
+
followUpIssue: z.number().optional(),
|
|
16
|
+
});
|
|
17
|
+
const MARKER_RE = /<!-- factory:feedback-handled (review|inline|comment):(\d+) -->/g;
|
|
18
|
+
const FEEDBACK_MAX_CHARS = 20_000;
|
|
19
|
+
const REVISED_SPEC_OPEN = '<!-- factory:revised-spec -->';
|
|
20
|
+
const REVISED_SPEC_CLOSE = '<!-- /factory:revised-spec -->';
|
|
21
|
+
const errorMessage = (err) => (err instanceof Error ? err.message : String(err));
|
|
22
|
+
const itemKey = (item) => `${item.kind}:${item.id}`;
|
|
23
|
+
export function feedbackHandledMarker(item) {
|
|
24
|
+
return `<!-- factory:feedback-handled ${itemKey(item)} -->`;
|
|
25
|
+
}
|
|
26
|
+
function handledKeys(bodies) {
|
|
27
|
+
const handled = new Set();
|
|
28
|
+
for (const body of bodies) {
|
|
29
|
+
for (const m of body.matchAll(MARKER_RE))
|
|
30
|
+
handled.add(`${m[1]}:${m[2]}`);
|
|
31
|
+
}
|
|
32
|
+
return handled;
|
|
33
|
+
}
|
|
34
|
+
/** Trusted, unhandled feedback on the PR, oldest id first. Factory-authored, empty and marker-handled items are dropped. */
|
|
35
|
+
export async function collectFeedbackItems(opts) {
|
|
36
|
+
const { github, prNumber, isTrusted } = opts;
|
|
37
|
+
const viewer = (await github.viewerLogin()).toLowerCase();
|
|
38
|
+
const [reviews, inline, comments, threads] = await Promise.all([
|
|
39
|
+
github.listReviews(prNumber),
|
|
40
|
+
github.listReviewComments(prNumber),
|
|
41
|
+
github.listIssueComments(prNumber),
|
|
42
|
+
github.listReviewThreads(prNumber),
|
|
43
|
+
]);
|
|
44
|
+
const isViewer = (login) => login.toLowerCase() === viewer;
|
|
45
|
+
const handled = handledKeys([
|
|
46
|
+
...comments.filter((c) => isViewer(c.login)).map((c) => c.body),
|
|
47
|
+
...inline.filter((c) => isViewer(c.login)).map((c) => c.body),
|
|
48
|
+
]);
|
|
49
|
+
const threadOf = (commentId) => threads.find((t) => t.commentIds.includes(commentId))?.threadId;
|
|
50
|
+
const candidates = [
|
|
51
|
+
...reviews.map((r) => ({ kind: 'review', id: r.id, author: r.login, body: r.body, url: r.htmlUrl })),
|
|
52
|
+
...inline.map((c) => ({
|
|
53
|
+
kind: 'inline',
|
|
54
|
+
id: c.id,
|
|
55
|
+
author: c.login,
|
|
56
|
+
body: c.body,
|
|
57
|
+
url: c.htmlUrl,
|
|
58
|
+
path: c.path,
|
|
59
|
+
...(c.line === undefined ? {} : { line: c.line }),
|
|
60
|
+
...(threadOf(c.id) === undefined ? {} : { threadId: threadOf(c.id) }),
|
|
61
|
+
...(c.inReplyTo === undefined ? {} : { inReplyTo: c.inReplyTo }),
|
|
62
|
+
})),
|
|
63
|
+
...comments.map((c) => {
|
|
64
|
+
const command = parseReworkCommand(c.body);
|
|
65
|
+
return { kind: 'comment', id: c.id, author: c.login, body: command ?? c.body, url: c.htmlUrl };
|
|
66
|
+
}),
|
|
67
|
+
];
|
|
68
|
+
const trust = new Map();
|
|
69
|
+
const items = [];
|
|
70
|
+
for (const item of candidates) {
|
|
71
|
+
if (isViewer(item.author) || item.body.trim() === '' || handled.has(itemKey(item)))
|
|
72
|
+
continue;
|
|
73
|
+
let trusted = trust.get(item.author);
|
|
74
|
+
if (trusted === undefined) {
|
|
75
|
+
trusted = await isTrusted(item.author);
|
|
76
|
+
trust.set(item.author, trusted);
|
|
77
|
+
}
|
|
78
|
+
if (trusted)
|
|
79
|
+
items.push(item);
|
|
80
|
+
}
|
|
81
|
+
return items.sort((a, b) => a.id - b.id);
|
|
82
|
+
}
|
|
83
|
+
const failClosed = (item) => ({
|
|
84
|
+
id: item.id,
|
|
85
|
+
kind: item.kind,
|
|
86
|
+
verdict: 'actionable',
|
|
87
|
+
changesSpec: false,
|
|
88
|
+
summary: '',
|
|
89
|
+
});
|
|
90
|
+
function renderItem(item) {
|
|
91
|
+
const where = item.path === undefined ? '' : `${item.path}${item.line === undefined ? '' : `:${item.line}`} `;
|
|
92
|
+
return `- ${item.kind} ${item.id} ${where}(@${item.author}):\n ${item.body}`;
|
|
93
|
+
}
|
|
94
|
+
/** One model call over every item; any parse failure, or a missing or unknown id, falls back to actionable. */
|
|
95
|
+
export async function triageFeedback(opts) {
|
|
96
|
+
const { items, spec, run } = opts;
|
|
97
|
+
if (items.length === 0)
|
|
98
|
+
return [];
|
|
99
|
+
const prompt = [
|
|
100
|
+
'You triage review feedback on a pull request the factory opened. Judge each item against the frozen spec below.',
|
|
101
|
+
'For every item answer with a verdict:',
|
|
102
|
+
'- "actionable": it asks for a code or doc change in scope of this PR.',
|
|
103
|
+
'- "question": it asks something to answer; put the reply in "answer".',
|
|
104
|
+
'- "out-of-scope": it asks for work outside this PR; put the reason in "reason".',
|
|
105
|
+
'Set "changesSpec" to true only when an actionable item changes the PR\'s goal, scope or acceptance criteria.',
|
|
106
|
+
'Put a one-line description of the change (actionable) in "summary".',
|
|
107
|
+
'Reply with one JSON object: {"items":[{"id":<number>,"kind":"review"|"inline"|"comment","verdict":...,"changesSpec":<boolean>,"summary":"...","answer":"...","reason":"..."}]} and nothing else.',
|
|
108
|
+
'',
|
|
109
|
+
'## Frozen spec',
|
|
110
|
+
spec,
|
|
111
|
+
'',
|
|
112
|
+
'## Feedback items',
|
|
113
|
+
UNTRUSTED_REVIEW_FEEDBACK_NOTICE,
|
|
114
|
+
...items.map((item) => wrapUntrustedReviewFeedback(renderItem(item))),
|
|
115
|
+
].join('\n');
|
|
116
|
+
const byKey = new Map();
|
|
117
|
+
try {
|
|
118
|
+
const { output } = await run(prompt);
|
|
119
|
+
const json = extractJsonObject(output);
|
|
120
|
+
const parsed = json === undefined ? undefined : JSON.parse(json);
|
|
121
|
+
const raw = typeof parsed === 'object' && parsed !== null && 'items' in parsed ? parsed.items : undefined;
|
|
122
|
+
for (const entry of Array.isArray(raw) ? raw : []) {
|
|
123
|
+
const d = DispositionSchema.safeParse(entry);
|
|
124
|
+
if (d.success)
|
|
125
|
+
byKey.set(itemKey(d.data), d.data);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
catch {
|
|
129
|
+
// unparsable or failed triage reads as no dispositions, so every item fails closed
|
|
130
|
+
}
|
|
131
|
+
return items.map((item) => byKey.get(itemKey(item)) ?? failClosed(item));
|
|
132
|
+
}
|
|
133
|
+
const dispositionFor = (dispositions, item) => dispositions.find((d) => d.kind === item.kind && d.id === item.id);
|
|
134
|
+
/** The actionable items as a one-result CheckSummary for the rework worker; undefined when nothing is actionable. */
|
|
135
|
+
export function feedbackReworkSummary(items, dispositions) {
|
|
136
|
+
const actionable = items.filter((i) => dispositionFor(dispositions, i)?.verdict === 'actionable');
|
|
137
|
+
if (actionable.length === 0)
|
|
138
|
+
return undefined;
|
|
139
|
+
let inner = ['Feedback to address on the open PR:', ...actionable.map(renderItem)].join('\n');
|
|
140
|
+
if (inner.length > FEEDBACK_MAX_CHARS)
|
|
141
|
+
inner = `${inner.slice(0, FEEDBACK_MAX_CHARS)}\n… (feedback truncated)`;
|
|
142
|
+
return {
|
|
143
|
+
failures: 1,
|
|
144
|
+
passes: 0,
|
|
145
|
+
skips: 0,
|
|
146
|
+
total: 1,
|
|
147
|
+
results: [
|
|
148
|
+
{
|
|
149
|
+
checker: 'review_feedback',
|
|
150
|
+
result: 'FAIL',
|
|
151
|
+
details: `${UNTRUSTED_REVIEW_FEEDBACK_NOTICE}\n${wrapUntrustedReviewFeedback(inner)}`,
|
|
152
|
+
},
|
|
153
|
+
],
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
/** Reads, triages and plans one round; throws ReviewReworkError unless the PR is open. */
|
|
157
|
+
export async function prepareFeedbackRound(opts) {
|
|
158
|
+
const { github, target, spec, isTrusted, run, log } = opts;
|
|
159
|
+
const pull = await github.getPull(target.prNumber);
|
|
160
|
+
if (pull.state !== 'open') {
|
|
161
|
+
throw new ReviewReworkError(`PR #${target.prNumber} must be open for a feedback round; found ${pull.state}`);
|
|
162
|
+
}
|
|
163
|
+
const items = await collectFeedbackItems({ github, prNumber: target.prNumber, isTrusted });
|
|
164
|
+
const dispositions = await triageFeedback({ items, spec, run });
|
|
165
|
+
const count = (verdict) => dispositions.filter((d) => d.verdict === verdict).length;
|
|
166
|
+
log('feedback_round_triaged', `PR #${target.prNumber}: ${items.length} feedback item(s) — ${count('actionable')} actionable, ${count('question')} question, ${count('out-of-scope')} out-of-scope`);
|
|
167
|
+
const excluded = new Set([pull.author.toLowerCase(), (await github.viewerLogin()).toLowerCase()]);
|
|
168
|
+
const reviewers = [...new Set(items.map((i) => i.author))].filter((a) => !excluded.has(a.toLowerCase()));
|
|
169
|
+
return {
|
|
170
|
+
prNumber: target.prNumber,
|
|
171
|
+
items,
|
|
172
|
+
dispositions,
|
|
173
|
+
replan: dispositions.some((d) => d.verdict === 'actionable' && d.changesSpec),
|
|
174
|
+
reviewers,
|
|
175
|
+
summary: feedbackReworkSummary(items, dispositions),
|
|
176
|
+
};
|
|
177
|
+
}
|
|
178
|
+
/** The reply posted where the item was left, ending in the handled marker. */
|
|
179
|
+
export function renderFeedbackReply(item, disposition, ctx) {
|
|
180
|
+
let text;
|
|
181
|
+
if (disposition.verdict === 'actionable') {
|
|
182
|
+
const fixed = ctx.headSha === undefined
|
|
183
|
+
? 'Fixed in the latest push'
|
|
184
|
+
: `Fixed in [\`${ctx.headSha.slice(0, 7)}\`](https://github.com/${ctx.repo}/commit/${ctx.headSha})`;
|
|
185
|
+
text = disposition.summary === '' ? fixed : `${fixed}: ${disposition.summary}`;
|
|
186
|
+
}
|
|
187
|
+
else if (disposition.verdict === 'question') {
|
|
188
|
+
text =
|
|
189
|
+
disposition.answer ?? 'Thanks for the question; see the PR description for the reasoning behind this change.';
|
|
190
|
+
}
|
|
191
|
+
else {
|
|
192
|
+
text = `Not changed: ${disposition.reason ?? 'this is outside the scope of this PR.'}`;
|
|
193
|
+
if (disposition.followUpIssue !== undefined)
|
|
194
|
+
text += `\n\nFollow-up: #${disposition.followUpIssue}`;
|
|
195
|
+
}
|
|
196
|
+
const quote = item.kind === 'inline' ? [] : [`> [@${item.author}](${item.url})`, ''];
|
|
197
|
+
return [...quote, text, '', feedbackHandledMarker(item)].join('\n');
|
|
198
|
+
}
|
|
199
|
+
function withRevisedSpec(body, summary) {
|
|
200
|
+
const block = `${REVISED_SPEC_OPEN}\n## Revised spec\n\n${summary}\n${REVISED_SPEC_CLOSE}`;
|
|
201
|
+
const start = body.indexOf(REVISED_SPEC_OPEN);
|
|
202
|
+
const end = body.indexOf(REVISED_SPEC_CLOSE);
|
|
203
|
+
if (start >= 0 && end > start)
|
|
204
|
+
return `${body.slice(0, start)}${block}${body.slice(end + REVISED_SPEC_CLOSE.length)}`;
|
|
205
|
+
return body === '' ? block : `${body}\n\n${block}`;
|
|
206
|
+
}
|
|
207
|
+
/** Replies to every item, records a revised spec, resolves fixed threads and re-requests review; GitHub errors warn and continue. */
|
|
208
|
+
export async function publishFeedbackRound(opts) {
|
|
209
|
+
const { github, plan, repo, headSha, revisedSpecSummary, log } = opts;
|
|
210
|
+
const warn = (what, err) => log('rework', `feedback round: ${what} failed — ${errorMessage(err)}`);
|
|
211
|
+
const replied = new Set();
|
|
212
|
+
for (const item of plan.items) {
|
|
213
|
+
const disposition = dispositionFor(plan.dispositions, item) ?? failClosed(item);
|
|
214
|
+
const body = renderFeedbackReply(item, disposition, { repo, headSha });
|
|
215
|
+
try {
|
|
216
|
+
if (item.kind === 'inline')
|
|
217
|
+
await github.replyToReviewComment(plan.prNumber, item.inReplyTo ?? item.id, body);
|
|
218
|
+
else
|
|
219
|
+
await github.postIssueComment(plan.prNumber, body);
|
|
220
|
+
replied.add(itemKey(item));
|
|
221
|
+
}
|
|
222
|
+
catch (err) {
|
|
223
|
+
warn(`reply to ${itemKey(item)}`, err);
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
if (revisedSpecSummary !== undefined) {
|
|
227
|
+
try {
|
|
228
|
+
const pull = await github.getPull(plan.prNumber);
|
|
229
|
+
await github.updatePullBody(plan.prNumber, withRevisedSpec(pull.body, revisedSpecSummary));
|
|
230
|
+
}
|
|
231
|
+
catch (err) {
|
|
232
|
+
warn('revised-spec update of the PR body', err);
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
const toResolve = new Set();
|
|
236
|
+
for (const item of plan.items) {
|
|
237
|
+
const verdict = dispositionFor(plan.dispositions, item)?.verdict ?? 'actionable';
|
|
238
|
+
if (item.kind === 'inline' && verdict === 'actionable' && item.threadId && replied.has(itemKey(item))) {
|
|
239
|
+
toResolve.add(item.threadId);
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
let resolved = 0;
|
|
243
|
+
if (toResolve.size > 0) {
|
|
244
|
+
try {
|
|
245
|
+
const open = new Set((await github.listReviewThreads(plan.prNumber)).filter((t) => !t.isResolved).map((t) => t.threadId));
|
|
246
|
+
for (const threadId of toResolve) {
|
|
247
|
+
if (!open.has(threadId))
|
|
248
|
+
continue;
|
|
249
|
+
try {
|
|
250
|
+
await github.resolveThread(threadId);
|
|
251
|
+
resolved++;
|
|
252
|
+
}
|
|
253
|
+
catch (err) {
|
|
254
|
+
warn(`resolving thread ${threadId}`, err);
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
catch (err) {
|
|
259
|
+
warn('listing review threads', err);
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
let reviewersRequested = [];
|
|
263
|
+
if (plan.reviewers.length > 0) {
|
|
264
|
+
try {
|
|
265
|
+
await github.requestReviewers(plan.prNumber, plan.reviewers);
|
|
266
|
+
reviewersRequested = [...plan.reviewers];
|
|
267
|
+
}
|
|
268
|
+
catch (err) {
|
|
269
|
+
warn('re-requesting review', err);
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
log('feedback_round_replied', `PR #${plan.prNumber}: replied to ${replied.size}/${plan.items.length} item(s), resolved ${resolved} thread(s), re-requested review from ${reviewersRequested.length} reviewer(s)`);
|
|
273
|
+
return { replied: replied.size, resolved, reviewersRequested };
|
|
274
|
+
}
|
|
275
|
+
//# sourceMappingURL=feedback-round.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"feedback-round.js","sourceRoot":"","sources":["../../src/run/feedback-round.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export function countReviewReworkRuns(store, issue) {
|
|
|
12
12
|
}
|
|
13
13
|
export function reviewReworkCapMessage(input) {
|
|
14
14
|
const { issue, pr, cap, count, reviewIds } = input;
|
|
15
|
-
const what = input.source === 'comment' ? 'comment' : 'review';
|
|
15
|
+
const what = input.source === 'comment' ? 'comment' : input.source === 'feedback' ? 'feedback round' : 'review';
|
|
16
16
|
return `#${issue} has had ${count} review-rework runs (cap ${cap}, queue.max_review_rework_runs); PR #${pr} ${what} ${reviewIds.join(', ')} started no new run. Resolve the review by hand, then run \`factory unpark ${issue}\`.`;
|
|
17
17
|
}
|
|
18
18
|
export async function parkAtReviewReworkCap(deps) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-rework-cap.js","sourceRoot":"","sources":["../../src/run/review-rework-cap.ts"],"names":[],"mappings":"AAAA,iIAAiI;AACjI,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,EAAE,YAAY,EAAE,eAAe,EAA0B,MAAM,0BAA0B,CAAC;AAEjG,OAAO,EAAE,iBAAiB,EAAyB,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAElE,MAAM,UAAU,0BAA0B,CAAC,MAAoC;IAC7E,OAAO,MAAM,CAAC,KAAK,EAAE,sBAAsB,IAAI,oBAAoB,CAAC,KAAK,CAAC,sBAAsB,CAAC;AACnG,CAAC;AAED,qGAAqG;AACrG,MAAM,UAAU,qBAAqB,CAAC,KAAsC,EAAE,KAAc;IAC1F,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;AACrF,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAOtC;IACC,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACnD,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"review-rework-cap.js","sourceRoot":"","sources":["../../src/run/review-rework-cap.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { Octokit } from '@octokit/rest';
|
|
2
2
|
import { reworkWorker, type checkPhase } from '../phases/check.js';
|
|
3
3
|
import type { CheckSummary } from '../types/index.js';
|
|
4
|
+
import type { FeedbackRoundPlan, FeedbackRoundTarget } from './feedback-round.js';
|
|
4
5
|
import type { RunPorts, RunRequest } from './run-issue.js';
|
|
5
6
|
export interface ReviewReworkTarget {
|
|
6
7
|
prNumber: number;
|
|
@@ -21,6 +22,10 @@ export interface ReworkRequestFields {
|
|
|
21
22
|
reviewRework?: ReviewReworkTarget;
|
|
22
23
|
/** #3625: a /factory iterate comment — skip PLAN/BUILD and re-run CHECK/rework on the PR branch. */
|
|
23
24
|
iterate?: IterateTarget;
|
|
25
|
+
/** #3910: a feedback round — read every unhandled trusted PR feedback item, triage, then rework or re-plan. */
|
|
26
|
+
feedbackRound?: FeedbackRoundTarget;
|
|
27
|
+
/** Logins trusted to give feedback (intake.trustedApprovers); absent falls back to repo permission (ADR-0128). */
|
|
28
|
+
trustedApprovers?: readonly string[];
|
|
24
29
|
}
|
|
25
30
|
export interface ReviewFeedback {
|
|
26
31
|
prNumber: number;
|
|
@@ -58,7 +63,7 @@ export declare function renderReviewFeedback(feedback: ReviewFeedback): string;
|
|
|
58
63
|
/** The review as a one-result CheckSummary, the same shape ciReworkSummary gives the rework worker. */
|
|
59
64
|
export declare function reviewReworkSummary(feedback: ReviewFeedback): CheckSummary;
|
|
60
65
|
/** A synthetic CHECK resume: skips PLAN and BUILD for a review-rework run. */
|
|
61
|
-
export declare function reviewReworkResume(request: Pick<RunRequest, 'reviewRework' | 'iterate' | 'preferredRoute' | 'modelPins'>): NonNullable<RunRequest['resumeFrom']> | undefined;
|
|
66
|
+
export declare function reviewReworkResume(request: Pick<RunRequest, 'reviewRework' | 'iterate' | 'feedbackRound' | 'preferredRoute' | 'modelPins'>, feedbackPlan?: Pick<FeedbackRoundPlan, 'replan'>): NonNullable<RunRequest['resumeFrom']> | undefined;
|
|
62
67
|
export declare function runReviewReworkBuild(opts: {
|
|
63
68
|
target: ReviewReworkTarget;
|
|
64
69
|
repo: string;
|
|
@@ -70,5 +75,5 @@ export declare function runReviewReworkBuild(opts: {
|
|
|
70
75
|
feedback: ReviewFeedback;
|
|
71
76
|
}>;
|
|
72
77
|
/** runIssue's hook before the first CHECK: reworks the requested review unless a CHECK resume was asked for. */
|
|
73
|
-
export declare function runRequestedReviewRework(request: Pick<RunRequest, 'reviewRework' | 'iterate' | 'resumeFrom' | 'repo' | 'branch'>, ports: Pick<RunPorts, 'octokit' | 'reworkWorker'>, checkOpts: Parameters<typeof checkPhase>[0]): Promise<void>;
|
|
78
|
+
export declare function runRequestedReviewRework(request: Pick<RunRequest, 'reviewRework' | 'iterate' | 'feedbackRound' | 'resumeFrom' | 'repo' | 'branch'>, ports: Pick<RunPorts, 'octokit' | 'reworkWorker'>, checkOpts: Parameters<typeof checkPhase>[0], feedbackPlan?: Pick<FeedbackRoundPlan, 'prNumber' | 'summary'>): Promise<void>;
|
|
74
79
|
//# sourceMappingURL=review-rework.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-rework.d.ts","sourceRoot":"","sources":["../../src/run/review-rework.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGtD,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE3D,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB;AAED,kGAAkG;AAClG,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,8FAA8F;AAC9F,MAAM,WAAW,mBAAmB;IAClC,uGAAuG;IACvG,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,oGAAoG;IACpG,OAAO,CAAC,EAAE,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"review-rework.d.ts","sourceRoot":"","sources":["../../src/run/review-rework.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,8 +86,10 @@ export function reviewReworkSummary(feedback) {
|
|
|
86
86
|
};
|
|
87
87
|
}
|
|
88
88
|
/** A synthetic CHECK resume: skips PLAN and BUILD for a review-rework run. */
|
|
89
|
-
export function reviewReworkResume(request) {
|
|
90
|
-
if (
|
|
89
|
+
export function reviewReworkResume(request, feedbackPlan) {
|
|
90
|
+
if (feedbackPlan?.replan)
|
|
91
|
+
return undefined;
|
|
92
|
+
if (!request.reviewRework && !request.iterate && !request.feedbackRound)
|
|
91
93
|
return undefined;
|
|
92
94
|
return {
|
|
93
95
|
phase: 'check',
|
|
@@ -96,6 +98,43 @@ export function reviewReworkResume(request) {
|
|
|
96
98
|
buildMinutes: 0,
|
|
97
99
|
};
|
|
98
100
|
}
|
|
101
|
+
/** Fails closed unless the PR is open with `branch` as head, so a rework can never ship to a different PR. */
|
|
102
|
+
async function assertOpenPrHead(octokit, opts) {
|
|
103
|
+
const { data: pull } = await octokit.rest.pulls.get({
|
|
104
|
+
owner: opts.owner,
|
|
105
|
+
repo: opts.repo,
|
|
106
|
+
pull_number: opts.prNumber,
|
|
107
|
+
});
|
|
108
|
+
if (pull.state !== 'open' || pull.head.ref !== opts.branch) {
|
|
109
|
+
throw new ReviewReworkError(`PR #${opts.prNumber} must be open with head ${opts.branch}; found ${pull.state} with head ${pull.head.ref}`);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
/** One rework worker call on the PR branch for `summary`; throws when the worker never ran. */
|
|
113
|
+
async function runReworkWorker(checkOpts, summary, where, rework) {
|
|
114
|
+
const worked = await rework({
|
|
115
|
+
issue: checkOpts.issue,
|
|
116
|
+
worktree: checkOpts.worktree,
|
|
117
|
+
specPath: checkOpts.specPath,
|
|
118
|
+
summary,
|
|
119
|
+
constitution: checkOpts.constitution,
|
|
120
|
+
router: checkOpts.router,
|
|
121
|
+
log: checkOpts.log,
|
|
122
|
+
buildTimeoutSeconds: checkOpts.buildTimeoutSeconds,
|
|
123
|
+
sandbox: checkOpts.sandbox,
|
|
124
|
+
appPort: checkOpts.appPort,
|
|
125
|
+
appBaseUrl: checkOpts.appBaseUrl,
|
|
126
|
+
onPgid: checkOpts.onPgid,
|
|
127
|
+
budgetGuard: checkOpts.budgetGuard,
|
|
128
|
+
reworkRoute: checkOpts.reworkRoute,
|
|
129
|
+
reworkModel: checkOpts.reworkModel,
|
|
130
|
+
runId: checkOpts.runId,
|
|
131
|
+
onWorkerResult: checkOpts.onWorkerResult,
|
|
132
|
+
extraInstructions: REVIEW_REWORK_INSTRUCTIONS,
|
|
133
|
+
});
|
|
134
|
+
if (!worked.modelCompleted) {
|
|
135
|
+
throw new ReviewReworkError(`review rework worker never ran for ${where}${worked.failureReason ? `: ${worked.failureReason}` : ''}`);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
99
138
|
export async function runReviewReworkBuild(opts) {
|
|
100
139
|
const { target, repo, branch, octokit, checkOpts, rework = reworkWorker } = opts;
|
|
101
140
|
const [owner = '', name = ''] = repo.split('/');
|
|
@@ -103,10 +142,7 @@ export async function runReviewReworkBuild(opts) {
|
|
|
103
142
|
const where = `PR #${target.prNumber} / ${kind} ${target.reviewId}`;
|
|
104
143
|
let feedback;
|
|
105
144
|
try {
|
|
106
|
-
|
|
107
|
-
if (pull.state !== 'open' || pull.head.ref !== branch) {
|
|
108
|
-
throw new ReviewReworkError(`PR #${target.prNumber} must be open with head ${branch}; found ${pull.state} with head ${pull.head.ref}`);
|
|
109
|
-
}
|
|
145
|
+
await assertOpenPrHead(octokit, { owner, repo: name, prNumber: target.prNumber, branch });
|
|
110
146
|
feedback =
|
|
111
147
|
target.source === 'comment'
|
|
112
148
|
? await fetchCommentFeedback(octokit, {
|
|
@@ -128,29 +164,7 @@ export async function runReviewReworkBuild(opts) {
|
|
|
128
164
|
throw new ReviewReworkError(`could not read ${where}: ${errorMessage(err)}`, { cause: err });
|
|
129
165
|
}
|
|
130
166
|
checkOpts.log('rework', `review rework: PR #${target.prNumber} ${kind} ${target.reviewId} by @${target.reviewer} — ${feedback.comments.length} inline comment(s) on ${branch}`);
|
|
131
|
-
|
|
132
|
-
issue: checkOpts.issue,
|
|
133
|
-
worktree: checkOpts.worktree,
|
|
134
|
-
specPath: checkOpts.specPath,
|
|
135
|
-
summary: reviewReworkSummary(feedback),
|
|
136
|
-
constitution: checkOpts.constitution,
|
|
137
|
-
router: checkOpts.router,
|
|
138
|
-
log: checkOpts.log,
|
|
139
|
-
buildTimeoutSeconds: checkOpts.buildTimeoutSeconds,
|
|
140
|
-
sandbox: checkOpts.sandbox,
|
|
141
|
-
appPort: checkOpts.appPort,
|
|
142
|
-
appBaseUrl: checkOpts.appBaseUrl,
|
|
143
|
-
onPgid: checkOpts.onPgid,
|
|
144
|
-
budgetGuard: checkOpts.budgetGuard,
|
|
145
|
-
reworkRoute: checkOpts.reworkRoute,
|
|
146
|
-
reworkModel: checkOpts.reworkModel,
|
|
147
|
-
runId: checkOpts.runId,
|
|
148
|
-
onWorkerResult: checkOpts.onWorkerResult,
|
|
149
|
-
extraInstructions: REVIEW_REWORK_INSTRUCTIONS,
|
|
150
|
-
});
|
|
151
|
-
if (!worked.modelCompleted) {
|
|
152
|
-
throw new ReviewReworkError(`review rework worker never ran for ${where}${worked.failureReason ? `: ${worked.failureReason}` : ''}`);
|
|
153
|
-
}
|
|
167
|
+
await runReworkWorker(checkOpts, reviewReworkSummary(feedback), where, rework);
|
|
154
168
|
return { feedback };
|
|
155
169
|
}
|
|
156
170
|
/** Iterate fails closed unless the PR is still open with the run branch as head, so SHIP can never open a new PR. */
|
|
@@ -170,9 +184,31 @@ async function guardIterateTarget(target, request, octokit, checkOpts) {
|
|
|
170
184
|
checkOpts.log('rework', `iterate: PR #${target.prNumber} by @${target.actor} (comment ${target.commentId}) — re-running CHECK on ${request.branch}`);
|
|
171
185
|
}
|
|
172
186
|
/** runIssue's hook before the first CHECK: reworks the requested review unless a CHECK resume was asked for. */
|
|
173
|
-
export async function runRequestedReviewRework(request, ports, checkOpts) {
|
|
187
|
+
export async function runRequestedReviewRework(request, ports, checkOpts, feedbackPlan) {
|
|
174
188
|
if (request.resumeFrom)
|
|
175
189
|
return;
|
|
190
|
+
if (feedbackPlan) {
|
|
191
|
+
if (feedbackPlan.summary === undefined)
|
|
192
|
+
return;
|
|
193
|
+
const where = `PR #${feedbackPlan.prNumber} / feedback round`;
|
|
194
|
+
const [owner = '', name = ''] = request.repo.split('/');
|
|
195
|
+
try {
|
|
196
|
+
await assertOpenPrHead(ports.octokit, {
|
|
197
|
+
owner,
|
|
198
|
+
repo: name,
|
|
199
|
+
prNumber: feedbackPlan.prNumber,
|
|
200
|
+
branch: request.branch,
|
|
201
|
+
});
|
|
202
|
+
}
|
|
203
|
+
catch (err) {
|
|
204
|
+
if (err instanceof ReviewReworkError)
|
|
205
|
+
throw err;
|
|
206
|
+
throw new ReviewReworkError(`could not read ${where}: ${errorMessage(err)}`, { cause: err });
|
|
207
|
+
}
|
|
208
|
+
checkOpts.log('rework', `feedback round: reworking PR #${feedbackPlan.prNumber} on ${request.branch}`);
|
|
209
|
+
await runReworkWorker(checkOpts, feedbackPlan.summary, where, ports.reworkWorker ?? reworkWorker);
|
|
210
|
+
return;
|
|
211
|
+
}
|
|
176
212
|
if (!request.reviewRework) {
|
|
177
213
|
if (request.iterate)
|
|
178
214
|
await guardIterateTarget(request.iterate, request, ports.octokit, checkOpts);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-rework.js","sourceRoot":"","sources":["../../src/run/review-rework.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAmB,MAAM,oBAAoB,CAAC;AAEnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,gCAAgC,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"review-rework.js","sourceRoot":"","sources":["../../src/run/review-rework.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-issue.d.ts","sourceRoot":"","sources":["../../src/run/run-issue.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,OAAO,EAAE,UAAU,IAAI,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,uBAAuB,IAAI,8BAA8B,EAAE,MAAM,mBAAmB,CAAC;AAC9F,OAAO,EAAE,UAAU,IAAI,iBAAiB,EAAyB,MAAM,oBAAoB,CAAC;AAE5F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAQvD,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAmB,MAAM,mBAAmB,CAAC;AAEnF,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAKlE,OAAO,EAAsB,KAAK,QAAQ,IAAI,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAyB9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAEvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACpF,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,eAAe,EACrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAA6D,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAiB,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAoB,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAoB,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,KAAK,EAAmC,YAAY,EAAkB,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACrH,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,qBAAqB,EAAoB,MAAM,kBAAkB,CAAC;AAElG,OAAO,EAIL,KAAK,uBAAuB,EAC5B,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAkC,UAAU,EAAE,MAAM,cAAc,CAAC;AAC3F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAKL,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEzD,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"run-issue.d.ts","sourceRoot":"","sources":["../../src/run/run-issue.ts"],"names":[],"mappings":"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"}
|