@on-par/factory-core 0.9.28-next.10 → 0.9.28-next.11
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/queue/comment-rework-trigger.d.ts +24 -0
- package/dist/queue/comment-rework-trigger.d.ts.map +1 -0
- package/dist/queue/comment-rework-trigger.js +128 -0
- package/dist/queue/comment-rework-trigger.js.map +1 -0
- package/dist/queue/internal-exports.d.ts +2 -0
- package/dist/queue/internal-exports.d.ts.map +1 -1
- package/dist/queue/internal-exports.js +1 -0
- package/dist/queue/internal-exports.js.map +1 -1
- package/dist/queue/review-rework-trigger.d.ts +7 -2
- package/dist/queue/review-rework-trigger.d.ts.map +1 -1
- package/dist/queue/review-rework-trigger.js +12 -8
- package/dist/queue/review-rework-trigger.js.map +1 -1
- package/dist/run/review-rework-cap.d.ts +3 -1
- package/dist/run/review-rework-cap.d.ts.map +1 -1
- package/dist/run/review-rework-cap.js +2 -1
- package/dist/run/review-rework-cap.js.map +1 -1
- package/dist/run/review-rework.d.ts +10 -0
- package/dist/run/review-rework.d.ts.map +1 -1
- package/dist/run/review-rework.js +45 -15
- package/dist/run/review-rework.js.map +1 -1
- package/package.json +5 -5
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { ParkCommentInput } from '../run/park-comment.js';
|
|
2
|
+
import { type CollaboratorPermissionClient } from './approval.js';
|
|
3
|
+
import { type QueueGitHubClient } from './github-queue.js';
|
|
4
|
+
import type { IterateCommandGitHub } from './iterate-command.js';
|
|
5
|
+
import type { ReviewReworkPollResult, ReviewReworkStore } from './review-rework-trigger.js';
|
|
6
|
+
/** The feedback after `/factory rework` (rest of the first non-blank line plus later lines); null when the comment is not the command. */
|
|
7
|
+
export declare function parseReworkCommand(body: string): string | null;
|
|
8
|
+
export interface PollCommentReworkOptions {
|
|
9
|
+
github: IterateCommandGitHub;
|
|
10
|
+
queue: QueueGitHubClient;
|
|
11
|
+
owner: string;
|
|
12
|
+
repo: string;
|
|
13
|
+
branchPrefix?: string;
|
|
14
|
+
trustedApprovers?: readonly string[];
|
|
15
|
+
permissions: CollaboratorPermissionClient;
|
|
16
|
+
store: ReviewReworkStore;
|
|
17
|
+
now?: () => Date;
|
|
18
|
+
/** Review-rework runs allowed per issue (#3565); defaults to the shipped default. */
|
|
19
|
+
maxRuns?: number;
|
|
20
|
+
/** Upserting park-comment publisher; without it the cap comment is a plain issue comment. */
|
|
21
|
+
publishParkComment?: (input: Omit<ParkCommentInput, 'parkSha' | 'order'>) => Promise<unknown>;
|
|
22
|
+
}
|
|
23
|
+
export declare function pollCommentRework(opts: PollCommentReworkOptions): Promise<ReviewReworkPollResult[]>;
|
|
24
|
+
//# sourceMappingURL=comment-rework-trigger.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"comment-rework-trigger.d.ts","sourceRoot":"","sources":["../../src/queue/comment-rework-trigger.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI/D,OAAO,EAAqB,KAAK,4BAA4B,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAsD,KAAK,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE/G,OAAO,KAAK,EAAkB,oBAAoB,EAAe,MAAM,sBAAsB,CAAC;AAC9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE5F,0IAA0I;AAC1I,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQ9D;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,oBAAoB,CAAC;IAC7B,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,WAAW,EAAE,4BAA4B,CAAC;IAC1C,KAAK,EAAE,iBAAiB,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;IACjB,qFAAqF;IACrF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6FAA6F;IAC7F,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/F;AA6GD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAczG"}
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
// packages/core/src/queue/comment-rework-trigger.ts — a trusted `/factory rework <feedback>` PR comment queues a review rework on the same PR branch, once per comment id, counted against the review-rework cap (#3882, ADR-0128 trust).
|
|
2
|
+
import { defaultFactoryConfig } from '@on-par/factory-config';
|
|
3
|
+
import { countReviewReworkRuns, parkAtReviewReworkCap } from '../run/review-rework-cap.js';
|
|
4
|
+
import { factoryBranchIssue } from '../utils/index.js';
|
|
5
|
+
import { workKeyFromIssue } from '../work/work-key.js';
|
|
6
|
+
import { isTrustedApprover } from './approval.js';
|
|
7
|
+
import { IN_PROGRESS_LABEL, LANE_LABEL_PREFIX, PARKED_LABEL } from './github-queue.js';
|
|
8
|
+
import { createEnqueuers } from './github-queue-enqueue.js';
|
|
9
|
+
/** The feedback after `/factory rework` (rest of the first non-blank line plus later lines); null when the comment is not the command. */
|
|
10
|
+
export function parseReworkCommand(body) {
|
|
11
|
+
const lines = body.split(/\r?\n/);
|
|
12
|
+
const at = lines.findIndex((line) => line.trim() !== '');
|
|
13
|
+
if (at < 0)
|
|
14
|
+
return null;
|
|
15
|
+
const match = /^\/factory rework(?:\s+|$)/i.exec((lines[at] ?? '').trim());
|
|
16
|
+
if (!match)
|
|
17
|
+
return null;
|
|
18
|
+
const first = (lines[at] ?? '').trim().slice(match[0].length);
|
|
19
|
+
return [first, ...lines.slice(at + 1)].join('\n').trim();
|
|
20
|
+
}
|
|
21
|
+
const errorMessage = (err) => (err instanceof Error ? err.message : String(err));
|
|
22
|
+
async function pollPull(opts, pull, issue) {
|
|
23
|
+
const { github, queue, owner, repo, store } = opts;
|
|
24
|
+
const pending = (await github.listComments(pull.number)).filter((c) => parseReworkCommand(c.body) !== null && !store.has(c.id, 'comment'));
|
|
25
|
+
const trusted = [];
|
|
26
|
+
for (const comment of pending) {
|
|
27
|
+
const ok = await isTrustedApprover(comment.login, {
|
|
28
|
+
owner,
|
|
29
|
+
repo,
|
|
30
|
+
trustedApprovers: opts.trustedApprovers,
|
|
31
|
+
client: opts.permissions,
|
|
32
|
+
});
|
|
33
|
+
if (ok)
|
|
34
|
+
trusted.push(comment);
|
|
35
|
+
}
|
|
36
|
+
const newest = trusted.reduce((a, c) => (a === undefined || c.id > a.id ? c : a), undefined);
|
|
37
|
+
if (newest === undefined)
|
|
38
|
+
return null;
|
|
39
|
+
const reviewIds = trusted.map((c) => c.id);
|
|
40
|
+
const now = (opts.now ?? (() => new Date()))().toISOString();
|
|
41
|
+
const recordAll = (lane, extra) => {
|
|
42
|
+
for (const c of trusted) {
|
|
43
|
+
store.record({
|
|
44
|
+
reviewId: c.id,
|
|
45
|
+
source: 'comment',
|
|
46
|
+
pr: pull.number,
|
|
47
|
+
issue,
|
|
48
|
+
lane,
|
|
49
|
+
reviewer: c.login,
|
|
50
|
+
queuedAt: now,
|
|
51
|
+
...extra,
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
const result = (outcome, extra = {}) => ({
|
|
56
|
+
pr: pull.number,
|
|
57
|
+
issue,
|
|
58
|
+
outcome,
|
|
59
|
+
reviewIds,
|
|
60
|
+
reviewer: newest.login,
|
|
61
|
+
...extra,
|
|
62
|
+
});
|
|
63
|
+
if ((parseReworkCommand(newest.body) ?? '') === '') {
|
|
64
|
+
await github.postComment(pull.number, 'Factory rework: rejected — add the feedback after `/factory rework`.');
|
|
65
|
+
recordAll('', { cappedAt: now });
|
|
66
|
+
return result('skipped', { detail: 'no feedback' });
|
|
67
|
+
}
|
|
68
|
+
const labels = await queue.getIssueLabels({ owner, repo, issue_number: issue });
|
|
69
|
+
if (labels.includes(IN_PROGRESS_LABEL))
|
|
70
|
+
return result('skipped', { detail: 'claimed' });
|
|
71
|
+
if (labels.includes(PARKED_LABEL))
|
|
72
|
+
return result('skipped', { detail: 'parked' });
|
|
73
|
+
const lanes = labels.filter((l) => l.startsWith(LANE_LABEL_PREFIX)).map((l) => l.slice(LANE_LABEL_PREFIX.length));
|
|
74
|
+
if (lanes.length === 0)
|
|
75
|
+
return result('skipped', { detail: 'no lane label' });
|
|
76
|
+
if (lanes.length > 1)
|
|
77
|
+
return result('skipped', { detail: `several lane labels: ${lanes.join(', ')}` });
|
|
78
|
+
const lane = lanes[0] ?? '';
|
|
79
|
+
const cap = opts.maxRuns ?? defaultFactoryConfig.queue.max_review_rework_runs;
|
|
80
|
+
const key = workKeyFromIssue(issue);
|
|
81
|
+
const count = countReviewReworkRuns(store, key);
|
|
82
|
+
if (count >= cap) {
|
|
83
|
+
// Record first so a park that fails part-way is not commented on again by the next poll.
|
|
84
|
+
recordAll(lane, { cappedAt: now });
|
|
85
|
+
await parkAtReviewReworkCap({
|
|
86
|
+
queue,
|
|
87
|
+
owner,
|
|
88
|
+
repo,
|
|
89
|
+
issue: key,
|
|
90
|
+
pr: pull.number,
|
|
91
|
+
lane,
|
|
92
|
+
branch: pull.headRef,
|
|
93
|
+
cap,
|
|
94
|
+
count,
|
|
95
|
+
reviewIds,
|
|
96
|
+
source: 'comment',
|
|
97
|
+
publishComment: opts.publishParkComment,
|
|
98
|
+
});
|
|
99
|
+
await github.postComment(pull.number, `Factory rework: not queued — #${issue} has used its review-rework limit (${count}/${cap}, queue.max_review_rework_runs). The issue is parked.`);
|
|
100
|
+
return result('capped', { lane, cap, count });
|
|
101
|
+
}
|
|
102
|
+
const [res] = await createEnqueuers(queue, owner, repo).enqueue(lane, [issue]);
|
|
103
|
+
if (res === undefined || res.outcome === 'failed') {
|
|
104
|
+
return result('error', { lane, detail: res?.detail ?? 'enqueue returned nothing' });
|
|
105
|
+
}
|
|
106
|
+
recordAll(lane, {});
|
|
107
|
+
await github.postComment(pull.number, `Factory rework: queued #${issue} on lane '${lane}'. The next run reworks this comment's feedback on \`${pull.headRef}\` and pushes to this PR. No new PR is opened.`);
|
|
108
|
+
return result(res.outcome, { lane });
|
|
109
|
+
}
|
|
110
|
+
export async function pollCommentRework(opts) {
|
|
111
|
+
const results = [];
|
|
112
|
+
const pulls = await opts.github.listOpenPulls();
|
|
113
|
+
for (const pull of pulls) {
|
|
114
|
+
const issue = factoryBranchIssue(pull.headRef, opts.branchPrefix);
|
|
115
|
+
if (issue === null || pull.headRepo !== `${opts.owner}/${opts.repo}`)
|
|
116
|
+
continue;
|
|
117
|
+
try {
|
|
118
|
+
const result = await pollPull(opts, pull, issue);
|
|
119
|
+
if (result)
|
|
120
|
+
results.push(result);
|
|
121
|
+
}
|
|
122
|
+
catch (err) {
|
|
123
|
+
results.push({ pr: pull.number, issue, outcome: 'error', reviewIds: [], detail: errorMessage(err) });
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
return results;
|
|
127
|
+
}
|
|
128
|
+
//# sourceMappingURL=comment-rework-trigger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"comment-rework-trigger.js","sourceRoot":"","sources":["../../src/queue/comment-rework-trigger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
export { createOctokitCollaboratorPermissionClient } from './approval.js';
|
|
2
2
|
export { claimIterateCommand, createFileIterateStore, createOctokitIterateGitHub, pollIterateCommands, } from './iterate-command.js';
|
|
3
|
+
export { parseReworkCommand, pollCommentRework } from './comment-rework-trigger.js';
|
|
4
|
+
export type { ReviewReworkSource } from './review-rework-trigger.js';
|
|
3
5
|
export { claimReviewRework, createFileReviewReworkStore, createOctokitReviewReworkGitHub, pollReviewRework, } from './review-rework-trigger.js';
|
|
4
6
|
export * from '../run/review-rework-cap.js';
|
|
5
7
|
export { allProvidersDown, allProvidersDownReleasePayload, PROVIDER_LEVEL_REASONS, stageBlocked, TIMED_BREAKER_REASONS, } from '../run/stage-blocked.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-exports.d.ts","sourceRoot":"","sources":["../../src/queue/internal-exports.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yCAAyC,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,0BAA0B,EAC1B,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,iBAAiB,EACjB,2BAA2B,EAC3B,+BAA+B,EAC/B,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAChB,8BAA8B,EAC9B,sBAAsB,EACtB,YAAY,EACZ,qBAAqB,GACtB,MAAM,yBAAyB,CAAC;AACjC,YAAY,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACpF,YAAY,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7E,cAAc,0BAA0B,CAAC"}
|
|
1
|
+
{"version":3,"file":"internal-exports.d.ts","sourceRoot":"","sources":["../../src/queue/internal-exports.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yCAAyC,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,0BAA0B,EAC1B,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACpF,YAAY,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EACL,iBAAiB,EACjB,2BAA2B,EAC3B,+BAA+B,EAC/B,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAChB,8BAA8B,EAC9B,sBAAsB,EACtB,YAAY,EACZ,qBAAqB,GACtB,MAAM,yBAAyB,CAAC;AACjC,YAAY,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACpF,YAAY,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7E,cAAc,0BAA0B,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Review/approval queue exports re-exported from internal.ts (keeps that file under its max-lines ceiling)
|
|
2
2
|
export { createOctokitCollaboratorPermissionClient } from './approval.js';
|
|
3
3
|
export { claimIterateCommand, createFileIterateStore, createOctokitIterateGitHub, pollIterateCommands, } from './iterate-command.js';
|
|
4
|
+
export { parseReworkCommand, pollCommentRework } from './comment-rework-trigger.js';
|
|
4
5
|
export { claimReviewRework, createFileReviewReworkStore, createOctokitReviewReworkGitHub, pollReviewRework, } from './review-rework-trigger.js';
|
|
5
6
|
export * from '../run/review-rework-cap.js';
|
|
6
7
|
export { allProvidersDown, allProvidersDownReleasePayload, PROVIDER_LEVEL_REASONS, stageBlocked, TIMED_BREAKER_REASONS, } from '../run/stage-blocked.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-exports.js","sourceRoot":"","sources":["../../src/queue/internal-exports.ts"],"names":[],"mappings":"AAAA,2GAA2G;AAC3G,OAAO,EAAE,yCAAyC,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,0BAA0B,EAC1B,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,iBAAiB,EACjB,2BAA2B,EAC3B,+BAA+B,EAC/B,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAChB,8BAA8B,EAC9B,sBAAsB,EACtB,YAAY,EACZ,qBAAqB,GACtB,MAAM,yBAAyB,CAAC;AAGjC,cAAc,0BAA0B,CAAC,CAAC,wCAAwC"}
|
|
1
|
+
{"version":3,"file":"internal-exports.js","sourceRoot":"","sources":["../../src/queue/internal-exports.ts"],"names":[],"mappings":"AAAA,2GAA2G;AAC3G,OAAO,EAAE,yCAAyC,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,0BAA0B,EAC1B,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEpF,OAAO,EACL,iBAAiB,EACjB,2BAA2B,EAC3B,+BAA+B,EAC/B,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAChB,8BAA8B,EAC9B,sBAAsB,EACtB,YAAY,EACZ,qBAAqB,GACtB,MAAM,yBAAyB,CAAC;AAGjC,cAAc,0BAA0B,CAAC,CAAC,wCAAwC"}
|
|
@@ -19,8 +19,13 @@ export interface ReviewReworkGitHub {
|
|
|
19
19
|
/** Reviews in GitHub's chronological order. */
|
|
20
20
|
listReviews(pr: number): Promise<ReviewReworkReview[]>;
|
|
21
21
|
}
|
|
22
|
+
/** What triggered a rework: a formal review, or a `/factory rework` PR comment (#3882). */
|
|
23
|
+
export type ReviewReworkSource = 'review' | 'comment';
|
|
22
24
|
export interface ReviewReworkRecord {
|
|
25
|
+
/** The GitHub review id, or the issue-comment id when `source` is `'comment'`. */
|
|
23
26
|
reviewId: number;
|
|
27
|
+
/** Absent or `'review'` is a formal review (legacy files have no source). */
|
|
28
|
+
source?: ReviewReworkSource;
|
|
24
29
|
pr: number;
|
|
25
30
|
issue: number;
|
|
26
31
|
lane: string;
|
|
@@ -32,11 +37,11 @@ export interface ReviewReworkRecord {
|
|
|
32
37
|
cappedAt?: string;
|
|
33
38
|
}
|
|
34
39
|
export interface ReviewReworkStore {
|
|
35
|
-
has(reviewId: number): boolean;
|
|
40
|
+
has(reviewId: number, source?: ReviewReworkSource): boolean;
|
|
36
41
|
record(entry: ReviewReworkRecord): void;
|
|
37
42
|
list(): ReviewReworkRecord[];
|
|
38
43
|
/** Stamp `startedAt` on a record; an unknown id does nothing. */
|
|
39
|
-
markStarted(reviewId: number, at: string): void;
|
|
44
|
+
markStarted(reviewId: number, at: string, source?: ReviewReworkSource): void;
|
|
40
45
|
}
|
|
41
46
|
export type ReviewReworkOutcome = 'queued' | 'already-queued' | 'capped' | 'skipped' | 'error';
|
|
42
47
|
export interface ReviewReworkPollResult {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-rework-trigger.d.ts","sourceRoot":"","sources":["../../src/queue/review-rework-trigger.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI/D,OAAO,EAAqB,KAAK,4BAA4B,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAsD,KAAK,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAG/G,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,aAAa,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC7C,+CAA+C;IAC/C,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;CACxD;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yGAAyG;IACzG,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"review-rework-trigger.d.ts","sourceRoot":"","sources":["../../src/queue/review-rework-trigger.ts"],"names":[],"mappings":"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"}
|
|
@@ -145,6 +145,8 @@ export function createOctokitReviewReworkGitHub(octokit, owner, repo) {
|
|
|
145
145
|
},
|
|
146
146
|
};
|
|
147
147
|
}
|
|
148
|
+
/** Map key: a comment id can never collide with a review id. */
|
|
149
|
+
const recordKey = (id, source) => source === 'comment' ? `comment:${id}` : String(id);
|
|
148
150
|
export function createFileReviewReworkStore(file) {
|
|
149
151
|
let entries = null;
|
|
150
152
|
const load = () => {
|
|
@@ -157,7 +159,7 @@ export function createFileReviewReworkStore(file) {
|
|
|
157
159
|
if (Array.isArray(list)) {
|
|
158
160
|
for (const item of list) {
|
|
159
161
|
if (isRecord(item))
|
|
160
|
-
entries.set(item.reviewId, item);
|
|
162
|
+
entries.set(recordKey(item.reviewId, item.source), item);
|
|
161
163
|
}
|
|
162
164
|
}
|
|
163
165
|
}
|
|
@@ -172,19 +174,20 @@ export function createFileReviewReworkStore(file) {
|
|
|
172
174
|
renameSync(`${file}.tmp`, file);
|
|
173
175
|
};
|
|
174
176
|
return {
|
|
175
|
-
has: (reviewId) => load().has(reviewId),
|
|
177
|
+
has: (reviewId, source) => load().has(recordKey(reviewId, source)),
|
|
176
178
|
list: () => [...load().values()],
|
|
177
179
|
record(entry) {
|
|
178
180
|
const map = load();
|
|
179
|
-
map.set(entry.reviewId, entry);
|
|
181
|
+
map.set(recordKey(entry.reviewId, entry.source), entry);
|
|
180
182
|
persist(map);
|
|
181
183
|
},
|
|
182
|
-
markStarted(reviewId, at) {
|
|
184
|
+
markStarted(reviewId, at, source) {
|
|
183
185
|
const map = load();
|
|
184
|
-
const
|
|
186
|
+
const key = recordKey(reviewId, source);
|
|
187
|
+
const entry = map.get(key);
|
|
185
188
|
if (!entry)
|
|
186
189
|
return;
|
|
187
|
-
map.set(
|
|
190
|
+
map.set(key, { ...entry, startedAt: at });
|
|
188
191
|
persist(map);
|
|
189
192
|
},
|
|
190
193
|
};
|
|
@@ -197,7 +200,7 @@ export function claimReviewRework(store, issue, now = () => new Date()) {
|
|
|
197
200
|
if (!picked)
|
|
198
201
|
return undefined;
|
|
199
202
|
const startedAt = now().toISOString();
|
|
200
|
-
store.markStarted(picked.reviewId, startedAt);
|
|
203
|
+
store.markStarted(picked.reviewId, startedAt, picked.source);
|
|
201
204
|
return { ...picked, startedAt };
|
|
202
205
|
}
|
|
203
206
|
function isRecord(value) {
|
|
@@ -214,6 +217,7 @@ function isRecord(value) {
|
|
|
214
217
|
'reviewer' in value &&
|
|
215
218
|
typeof value.reviewer === 'string' &&
|
|
216
219
|
'queuedAt' in value &&
|
|
217
|
-
typeof value.queuedAt === 'string'
|
|
220
|
+
typeof value.queuedAt === 'string' &&
|
|
221
|
+
(!('source' in value) || value.source === undefined || value.source === 'review' || value.source === 'comment'));
|
|
218
222
|
}
|
|
219
223
|
//# sourceMappingURL=review-rework-trigger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-rework-trigger.js","sourceRoot":"","sources":["../../src/queue/review-rework-trigger.ts"],"names":[],"mappings":"AAAA,wLAAwL;AACxL,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAqC,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,YAAY,EAA0B,MAAM,mBAAmB,CAAC;AAC/G,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"review-rework-trigger.js","sourceRoot":"","sources":["../../src/queue/review-rework-trigger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { FactoryConfig } from '../config/index.js';
|
|
2
2
|
import { type QueueGitHubClient } from '../queue/github-queue.js';
|
|
3
|
-
import type { ReviewReworkStore } from '../queue/review-rework-trigger.js';
|
|
3
|
+
import type { ReviewReworkSource, ReviewReworkStore } from '../queue/review-rework-trigger.js';
|
|
4
4
|
import { type ParkCommentInput } from './park-comment.js';
|
|
5
5
|
import { type WorkKey } from '../work/work-key.js';
|
|
6
6
|
export declare function resolveMaxReviewReworkRuns(config: Pick<FactoryConfig, 'queue'>): number;
|
|
@@ -12,6 +12,7 @@ export declare function reviewReworkCapMessage(input: {
|
|
|
12
12
|
cap: number;
|
|
13
13
|
count: number;
|
|
14
14
|
reviewIds: readonly number[];
|
|
15
|
+
source?: ReviewReworkSource;
|
|
15
16
|
}): string;
|
|
16
17
|
export declare function parkAtReviewReworkCap(deps: {
|
|
17
18
|
queue: QueueGitHubClient;
|
|
@@ -24,6 +25,7 @@ export declare function parkAtReviewReworkCap(deps: {
|
|
|
24
25
|
cap: number;
|
|
25
26
|
count: number;
|
|
26
27
|
reviewIds: readonly number[];
|
|
28
|
+
source?: ReviewReworkSource;
|
|
27
29
|
publishComment?: (input: Omit<ParkCommentInput, 'parkSha' | 'order'>) => Promise<unknown>;
|
|
28
30
|
}): Promise<void>;
|
|
29
31
|
//# sourceMappingURL=review-rework-cap.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-rework-cap.d.ts","sourceRoot":"","sources":["../../src/run/review-rework-cap.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAiC,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACjG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"review-rework-cap.d.ts","sourceRoot":"","sources":["../../src/run/review-rework-cap.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAiC,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACjG,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC/F,OAAO,EAAqB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAElE,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,MAAM,CAEvF;AAED,qGAAqG;AACrG,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAEpG;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC5C,KAAK,EAAE,OAAO,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,kBAAkB,CAAC;CAC7B,GAAG,MAAM,CAIT;AAED,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3F,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBhB"}
|
|
@@ -12,7 +12,8 @@ export function countReviewReworkRuns(store, issue) {
|
|
|
12
12
|
}
|
|
13
13
|
export function reviewReworkCapMessage(input) {
|
|
14
14
|
const { issue, pr, cap, count, reviewIds } = input;
|
|
15
|
-
|
|
15
|
+
const what = input.source === 'comment' ? 'comment' : 'review';
|
|
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}\`.`;
|
|
16
17
|
}
|
|
17
18
|
export async function parkAtReviewReworkCap(deps) {
|
|
18
19
|
const { queue, owner, repo, issue } = 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,
|
|
1
|
+
{"version":3,"file":"review-rework-cap.js","sourceRoot":"","sources":["../../src/run/review-rework-cap.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@ export interface ReviewReworkTarget {
|
|
|
6
6
|
prNumber: number;
|
|
7
7
|
reviewId: number;
|
|
8
8
|
reviewer: string;
|
|
9
|
+
/** `'comment'`: `reviewId` is a `/factory rework` issue-comment id (#3882). */
|
|
10
|
+
source?: 'comment';
|
|
9
11
|
}
|
|
10
12
|
/** #3625: a trusted `/factory iterate` comment; the run re-runs CHECK/rework on the PR branch. */
|
|
11
13
|
export interface IterateTarget {
|
|
@@ -32,6 +34,7 @@ export interface ReviewFeedback {
|
|
|
32
34
|
body: string;
|
|
33
35
|
author: string;
|
|
34
36
|
}[];
|
|
37
|
+
source?: 'comment';
|
|
35
38
|
}
|
|
36
39
|
export declare class ReviewReworkError extends Error {
|
|
37
40
|
name: string;
|
|
@@ -44,6 +47,13 @@ export declare function fetchReviewFeedback(octokit: Pick<Octokit, 'rest' | 'pag
|
|
|
44
47
|
prNumber: number;
|
|
45
48
|
reviewId: number;
|
|
46
49
|
}): Promise<ReviewFeedback>;
|
|
50
|
+
/** The feedback of one `/factory rework` comment, re-read from GitHub so only the text after the command is used. */
|
|
51
|
+
export declare function fetchCommentFeedback(octokit: Pick<Octokit, 'rest'>, opts: {
|
|
52
|
+
owner: string;
|
|
53
|
+
repo: string;
|
|
54
|
+
prNumber: number;
|
|
55
|
+
commentId: number;
|
|
56
|
+
}): Promise<ReviewFeedback>;
|
|
47
57
|
export declare function renderReviewFeedback(feedback: ReviewFeedback): string;
|
|
48
58
|
/** The review as a one-result CheckSummary, the same shape ciReworkSummary gives the rework worker. */
|
|
49
59
|
export declare function reviewReworkSummary(feedback: ReviewFeedback): CheckSummary;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"review-rework.d.ts","sourceRoot":"","sources":["../../src/run/review-rework.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { reworkWorker } from '../phases/check.js';
|
|
2
|
+
import { parseReworkCommand } from '../queue/comment-rework-trigger.js';
|
|
2
3
|
import { UNTRUSTED_REVIEW_FEEDBACK_NOTICE, wrapUntrustedReviewFeedback } from '../utils/untrusted-input.js';
|
|
3
4
|
export class ReviewReworkError extends Error {
|
|
4
5
|
name = 'ReviewReworkError';
|
|
5
6
|
}
|
|
6
7
|
const REVIEW_FEEDBACK_MAX_CHARS = 20_000;
|
|
7
|
-
export const REVIEW_REWORK_INSTRUCTIONS = "This round addresses a reviewer's change request on the open PR, not a checker failure. " +
|
|
8
|
+
export const REVIEW_REWORK_INSTRUCTIONS = "This round addresses a reviewer's change request or feedback comment on the open PR, not a checker failure. " +
|
|
8
9
|
'Make the changes each review comment asks for, scoped to the files and lines it names. ' +
|
|
9
10
|
'Do not change code the review does not ask about. If a comment conflicts with the spec, follow the spec and say so in the commit message.';
|
|
10
11
|
const errorMessage = (err) => (err instanceof Error ? err.message : String(err));
|
|
@@ -39,16 +40,36 @@ export async function fetchReviewFeedback(octokit, opts) {
|
|
|
39
40
|
})),
|
|
40
41
|
};
|
|
41
42
|
}
|
|
43
|
+
/** The feedback of one `/factory rework` comment, re-read from GitHub so only the text after the command is used. */
|
|
44
|
+
export async function fetchCommentFeedback(octokit, opts) {
|
|
45
|
+
const { owner, repo, prNumber, commentId } = opts;
|
|
46
|
+
const { data: comment } = await octokit.rest.issues.getComment({ owner, repo, comment_id: commentId });
|
|
47
|
+
const feedback = parseReworkCommand(comment.body ?? '');
|
|
48
|
+
if (feedback === null || feedback === '') {
|
|
49
|
+
throw new ReviewReworkError(`comment ${commentId} on PR #${prNumber} is no longer a /factory rework command`);
|
|
50
|
+
}
|
|
51
|
+
return {
|
|
52
|
+
prNumber,
|
|
53
|
+
reviewId: commentId,
|
|
54
|
+
reviewer: comment.user?.login ?? '',
|
|
55
|
+
state: 'COMMENTED',
|
|
56
|
+
body: feedback,
|
|
57
|
+
comments: [],
|
|
58
|
+
source: 'comment',
|
|
59
|
+
};
|
|
60
|
+
}
|
|
42
61
|
export function renderReviewFeedback(feedback) {
|
|
43
62
|
const comments = feedback.comments.length === 0
|
|
44
63
|
? ['(no inline comments)']
|
|
45
64
|
: feedback.comments.map((c) => `- ${c.path}${c.line === undefined ? '' : `:${c.line}`} (@${c.author}):\n ${c.body}`);
|
|
46
|
-
let inner =
|
|
47
|
-
`
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
65
|
+
let inner = feedback.source === 'comment'
|
|
66
|
+
? [`Comment ${feedback.reviewId} by @${feedback.reviewer} on PR #${feedback.prNumber}:`, feedback.body].join('\n')
|
|
67
|
+
: [
|
|
68
|
+
`Review ${feedback.reviewId} by @${feedback.reviewer} (${feedback.state}) on PR #${feedback.prNumber}:`,
|
|
69
|
+
feedback.body === '' ? '(no review body)' : feedback.body,
|
|
70
|
+
'Inline comments:',
|
|
71
|
+
...comments,
|
|
72
|
+
].join('\n');
|
|
52
73
|
if (inner.length > REVIEW_FEEDBACK_MAX_CHARS) {
|
|
53
74
|
inner = `${inner.slice(0, REVIEW_FEEDBACK_MAX_CHARS)}\n… (review truncated)`;
|
|
54
75
|
}
|
|
@@ -78,26 +99,35 @@ export function reviewReworkResume(request) {
|
|
|
78
99
|
export async function runReviewReworkBuild(opts) {
|
|
79
100
|
const { target, repo, branch, octokit, checkOpts, rework = reworkWorker } = opts;
|
|
80
101
|
const [owner = '', name = ''] = repo.split('/');
|
|
81
|
-
const
|
|
102
|
+
const kind = target.source === 'comment' ? 'comment' : 'review';
|
|
103
|
+
const where = `PR #${target.prNumber} / ${kind} ${target.reviewId}`;
|
|
82
104
|
let feedback;
|
|
83
105
|
try {
|
|
84
106
|
const { data: pull } = await octokit.rest.pulls.get({ owner, repo: name, pull_number: target.prNumber });
|
|
85
107
|
if (pull.state !== 'open' || pull.head.ref !== branch) {
|
|
86
108
|
throw new ReviewReworkError(`PR #${target.prNumber} must be open with head ${branch}; found ${pull.state} with head ${pull.head.ref}`);
|
|
87
109
|
}
|
|
88
|
-
feedback =
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
110
|
+
feedback =
|
|
111
|
+
target.source === 'comment'
|
|
112
|
+
? await fetchCommentFeedback(octokit, {
|
|
113
|
+
owner,
|
|
114
|
+
repo: name,
|
|
115
|
+
prNumber: target.prNumber,
|
|
116
|
+
commentId: target.reviewId,
|
|
117
|
+
})
|
|
118
|
+
: await fetchReviewFeedback(octokit, {
|
|
119
|
+
owner,
|
|
120
|
+
repo: name,
|
|
121
|
+
prNumber: target.prNumber,
|
|
122
|
+
reviewId: target.reviewId,
|
|
123
|
+
});
|
|
94
124
|
}
|
|
95
125
|
catch (err) {
|
|
96
126
|
if (err instanceof ReviewReworkError)
|
|
97
127
|
throw err;
|
|
98
128
|
throw new ReviewReworkError(`could not read ${where}: ${errorMessage(err)}`, { cause: err });
|
|
99
129
|
}
|
|
100
|
-
checkOpts.log('rework', `review rework: PR #${target.prNumber}
|
|
130
|
+
checkOpts.log('rework', `review rework: PR #${target.prNumber} ${kind} ${target.reviewId} by @${target.reviewer} — ${feedback.comments.length} inline comment(s) on ${branch}`);
|
|
101
131
|
const worked = await rework({
|
|
102
132
|
issue: checkOpts.issue,
|
|
103
133
|
worktree: checkOpts.worktree,
|
|
@@ -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,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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@on-par/factory-core",
|
|
3
|
-
"version": "0.9.28-next.
|
|
3
|
+
"version": "0.9.28-next.11",
|
|
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.28-next.
|
|
58
|
-
"@on-par/contracts": "0.9.28-next.
|
|
59
|
-
"@on-par/factory-config": "0.9.28-next.
|
|
60
|
-
"@on-par/repo-context": "0.9.28-next.
|
|
57
|
+
"@on-par/adr-kit": "0.9.28-next.11",
|
|
58
|
+
"@on-par/contracts": "0.9.28-next.11",
|
|
59
|
+
"@on-par/factory-config": "0.9.28-next.11",
|
|
60
|
+
"@on-par/repo-context": "0.9.28-next.11",
|
|
61
61
|
"@octokit/rest": "^22.0.0",
|
|
62
62
|
"execa": "^10.2.1",
|
|
63
63
|
"gray-matter": "^4.0.3",
|