@on-par/factory-cli 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/cli/run-rework-poll.d.ts +15 -0
- package/dist/cli/run-rework-poll.d.ts.map +1 -0
- package/dist/cli/run-rework-poll.js +79 -0
- package/dist/cli/run-rework-poll.js.map +1 -0
- package/dist/cli/run.d.ts.map +1 -1
- package/dist/cli/run.js +3 -55
- package/dist/cli/run.js.map +1 -1
- package/dist/cli/ship-review-rework.d.ts +2 -0
- package/dist/cli/ship-review-rework.d.ts.map +1 -1
- package/dist/cli/ship-review-rework.js +10 -2
- package/dist/cli/ship-review-rework.js.map +1 -1
- package/package.json +4 -4
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { Octokit } from '@octokit/rest';
|
|
2
|
+
import type { FactoryConfig } from '@on-par/factory-core';
|
|
3
|
+
export interface ReworkPollDeps {
|
|
4
|
+
octokit: Octokit;
|
|
5
|
+
ghRepo: string;
|
|
6
|
+
branchPrefix: string;
|
|
7
|
+
factoryConfig: FactoryConfig;
|
|
8
|
+
paths: {
|
|
9
|
+
events: string;
|
|
10
|
+
reviewRework: string;
|
|
11
|
+
iterate: string;
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
export declare function runReworkPolls(deps: ReworkPollDeps): Promise<void>;
|
|
15
|
+
//# sourceMappingURL=run-rework-poll.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-rework-poll.d.ts","sourceRoot":"","sources":["../../src/cli/run-rework-poll.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAkB1D,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,aAAa,CAAC;IAC7B,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAClE;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA6FxE"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
// packages/cli/src/cli/run-rework-poll.ts — one pass of the review-rework, `/factory rework` and `/factory iterate` polls a run's lanes share (#3563, #3625, #3882)
|
|
2
|
+
import { createFileIterateStore, createFileReviewReworkStore, createOctokitCollaboratorPermissionClient, createOctokitIterateGitHub, createOctokitQueueClient, createOctokitReviewReworkGitHub, logEvent, parkPayload, pollCommentRework, pollIterateCommands, pollReviewRework, publishParkComment, resolveMaxReviewReworkRuns, } from '@on-par/factory-core/internal';
|
|
3
|
+
import { workKeyFromIssue } from '@on-par/factory-core';
|
|
4
|
+
export async function runReworkPolls(deps) {
|
|
5
|
+
const { octokit, ghRepo, branchPrefix, factoryConfig, paths } = deps;
|
|
6
|
+
const [owner = '', repo = ''] = ghRepo.split('/');
|
|
7
|
+
const results = await pollReviewRework({
|
|
8
|
+
github: createOctokitReviewReworkGitHub(octokit, owner, repo),
|
|
9
|
+
queue: createOctokitQueueClient(octokit),
|
|
10
|
+
owner,
|
|
11
|
+
repo,
|
|
12
|
+
branchPrefix,
|
|
13
|
+
trustedApprovers: factoryConfig.intake?.trustedApprovers,
|
|
14
|
+
permissions: createOctokitCollaboratorPermissionClient(octokit),
|
|
15
|
+
store: createFileReviewReworkStore(paths.reviewRework),
|
|
16
|
+
maxRuns: resolveMaxReviewReworkRuns(factoryConfig),
|
|
17
|
+
publishParkComment: (input) => publishParkComment({ octokit, repo: ghRepo, input }),
|
|
18
|
+
});
|
|
19
|
+
const logReworkResults = (list) => {
|
|
20
|
+
for (const r of list) {
|
|
21
|
+
if (r.outcome === 'queued') {
|
|
22
|
+
logEvent(paths.events, 'review_rework_queued', r.issue, `#${r.issue} queued for review rework on lane '${r.lane}' — PR #${r.pr} review ${r.reviewIds.join(', ')} by ${r.reviewer}`, { lane: r.lane });
|
|
23
|
+
}
|
|
24
|
+
else if (r.outcome === 'capped') {
|
|
25
|
+
logEvent(paths.events, 'escalate', r.issue, `#${r.issue} parked: review rework cap ${r.cap} reached (${r.count} runs) — PR #${r.pr} review ${r.reviewIds.join(', ')}`, parkPayload('escalate', workKeyFromIssue(r.issue), r.lane, []));
|
|
26
|
+
}
|
|
27
|
+
else if (r.outcome === 'error') {
|
|
28
|
+
logEvent(paths.events, 'warn', r.issue, `review-rework poll for PR #${r.pr} failed: ${r.detail}`);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
logReworkResults(results);
|
|
33
|
+
// #3882: `/factory rework` comments; a failure only warns so the review results above stand.
|
|
34
|
+
try {
|
|
35
|
+
logReworkResults(await pollCommentRework({
|
|
36
|
+
github: createOctokitIterateGitHub(octokit, owner, repo),
|
|
37
|
+
queue: createOctokitQueueClient(octokit),
|
|
38
|
+
owner,
|
|
39
|
+
repo,
|
|
40
|
+
branchPrefix,
|
|
41
|
+
trustedApprovers: factoryConfig.intake?.trustedApprovers,
|
|
42
|
+
permissions: createOctokitCollaboratorPermissionClient(octokit),
|
|
43
|
+
store: createFileReviewReworkStore(paths.reviewRework),
|
|
44
|
+
maxRuns: resolveMaxReviewReworkRuns(factoryConfig),
|
|
45
|
+
publishParkComment: (input) => publishParkComment({ octokit, repo: ghRepo, input }),
|
|
46
|
+
}));
|
|
47
|
+
}
|
|
48
|
+
catch (err) {
|
|
49
|
+
logEvent(paths.events, 'warn', 0, `comment-rework poll failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
50
|
+
}
|
|
51
|
+
// #3625: `/factory iterate` comments; a failure only warns so the review-rework results above stand.
|
|
52
|
+
try {
|
|
53
|
+
const iterated = await pollIterateCommands({
|
|
54
|
+
github: createOctokitIterateGitHub(octokit, owner, repo),
|
|
55
|
+
queue: createOctokitQueueClient(octokit),
|
|
56
|
+
owner,
|
|
57
|
+
repo,
|
|
58
|
+
branchPrefix,
|
|
59
|
+
trustedApprovers: factoryConfig.intake?.trustedApprovers,
|
|
60
|
+
permissions: createOctokitCollaboratorPermissionClient(octokit),
|
|
61
|
+
store: createFileIterateStore(paths.iterate),
|
|
62
|
+
});
|
|
63
|
+
for (const r of iterated) {
|
|
64
|
+
if (r.outcome === 'queued' || r.outcome === 'already-queued') {
|
|
65
|
+
logEvent(paths.events, 'iterate_queued', r.issue, `#${r.issue} queued for iterate on lane '${r.lane}' — PR #${r.pr} comment ${r.commentId} by ${r.actor}`, { lane: r.lane });
|
|
66
|
+
}
|
|
67
|
+
else if (r.outcome === 'rejected') {
|
|
68
|
+
logEvent(paths.events, 'iterate_rejected', r.issue, `iterate on PR #${r.pr} rejected: ${r.detail}`);
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
logEvent(paths.events, 'warn', r.issue, `iterate poll for PR #${r.pr} failed: ${r.detail}`);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
catch (err) {
|
|
76
|
+
logEvent(paths.events, 'warn', 0, `iterate poll failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
//# sourceMappingURL=run-rework-poll.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-rework-poll.js","sourceRoot":"","sources":["../../src/cli/run-rework-poll.ts"],"names":[],"mappings":"AAAA,oKAAoK;AAIpK,OAAO,EACL,sBAAsB,EACtB,2BAA2B,EAC3B,yCAAyC,EACzC,0BAA0B,EAC1B,wBAAwB,EACxB,+BAA+B,EAC/B,QAAQ,EACR,WAAW,EACX,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,EAClB,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAUxD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAoB;IACvD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACrE,MAAM,CAAC,KAAK,GAAG,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC;QACrC,MAAM,EAAE,+BAA+B,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC;QAC7D,KAAK,EAAE,wBAAwB,CAAC,OAAO,CAAC;QACxC,KAAK;QACL,IAAI;QACJ,YAAY;QACZ,gBAAgB,EAAE,aAAa,CAAC,MAAM,EAAE,gBAAgB;QACxD,WAAW,EAAE,yCAAyC,CAAC,OAAO,CAAC;QAC/D,KAAK,EAAE,2BAA2B,CAAC,KAAK,CAAC,YAAY,CAAC;QACtD,OAAO,EAAE,0BAA0B,CAAC,aAAa,CAAC;QAClD,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,kBAAkB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;KACpF,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,CAAC,IAAkD,EAAQ,EAAE;QACpF,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,CAAC,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC3B,QAAQ,CACN,KAAK,CAAC,MAAM,EACZ,sBAAsB,EACtB,CAAC,CAAC,KAAK,EACP,IAAI,CAAC,CAAC,KAAK,sCAAsC,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAC1H,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CACjB,CAAC;YACJ,CAAC;iBAAM,IAAI,CAAC,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAClC,QAAQ,CACN,KAAK,CAAC,MAAM,EACZ,UAAU,EACV,CAAC,CAAC,KAAK,EACP,IAAI,CAAC,CAAC,KAAK,8BAA8B,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,KAAK,gBAAgB,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EACzH,WAAW,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAC/D,CAAC;YACJ,CAAC;iBAAM,IAAI,CAAC,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;gBACjC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,EAAE,8BAA8B,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;YACpG,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IACF,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC1B,6FAA6F;IAC7F,IAAI,CAAC;QACH,gBAAgB,CACd,MAAM,iBAAiB,CAAC;YACtB,MAAM,EAAE,0BAA0B,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC;YACxD,KAAK,EAAE,wBAAwB,CAAC,OAAO,CAAC;YACxC,KAAK;YACL,IAAI;YACJ,YAAY;YACZ,gBAAgB,EAAE,aAAa,CAAC,MAAM,EAAE,gBAAgB;YACxD,WAAW,EAAE,yCAAyC,CAAC,OAAO,CAAC;YAC/D,KAAK,EAAE,2BAA2B,CAAC,KAAK,CAAC,YAAY,CAAC;YACtD,OAAO,EAAE,0BAA0B,CAAC,aAAa,CAAC;YAClD,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,kBAAkB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;SACpF,CAAC,CACH,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,QAAQ,CACN,KAAK,CAAC,MAAM,EACZ,MAAM,EACN,CAAC,EACD,+BAA+B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAClF,CAAC;IACJ,CAAC;IACD,qGAAqG;IACrG,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC;YACzC,MAAM,EAAE,0BAA0B,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC;YACxD,KAAK,EAAE,wBAAwB,CAAC,OAAO,CAAC;YACxC,KAAK;YACL,IAAI;YACJ,YAAY;YACZ,gBAAgB,EAAE,aAAa,CAAC,MAAM,EAAE,gBAAgB;YACxD,WAAW,EAAE,yCAAyC,CAAC,OAAO,CAAC;YAC/D,KAAK,EAAE,sBAAsB,CAAC,KAAK,CAAC,OAAO,CAAC;SAC7C,CAAC,CAAC;QACH,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,IAAI,CAAC,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,KAAK,gBAAgB,EAAE,CAAC;gBAC7D,QAAQ,CACN,KAAK,CAAC,MAAM,EACZ,gBAAgB,EAChB,CAAC,CAAC,KAAK,EACP,IAAI,CAAC,CAAC,KAAK,gCAAgC,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,SAAS,OAAO,CAAC,CAAC,KAAK,EAAE,EACvG,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CACjB,CAAC;YACJ,CAAC;iBAAM,IAAI,CAAC,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;gBACpC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;YACtG,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,EAAE,wBAAwB,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;YAC9F,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,wBAAwB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChH,CAAC;AACH,CAAC"}
|
package/dist/cli/run.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAGL,eAAe,EAShB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/run.js
CHANGED
|
@@ -3,7 +3,7 @@ import { randomUUID } from 'node:crypto';
|
|
|
3
3
|
import { existsSync, readFileSync } from 'node:fs';
|
|
4
4
|
import { styleText } from 'node:util';
|
|
5
5
|
import { applyRepoConfig, clearProxyState, getFactoryPaths, provisionLaneContainer, resolveCodexDisabled, resolveEffectiveBuildRoute, resolveEnvironmentProxy, resolveLaneBreakerThreshold, resolveMergePolicy, resolveSizeGateMode, workKeyFromIssue, } from '@on-par/factory-core';
|
|
6
|
-
import { createDockerEngine, createQueueBackend,
|
|
6
|
+
import { createDockerEngine, createQueueBackend, createOctokitQueueClient, logEvent, recordSliceMerged, resolveBaseHealthChecks, resolveLocalOnly, resolveQueueClaimSettleMs, resolveRunUsageHarness, settleParkedPullRequest, slugify, withAdmissionGuard, } from '@on-par/factory-core/internal';
|
|
7
7
|
import { admissionStateReaderFor } from './admission.js';
|
|
8
8
|
import { baseChecksVerdict } from './base-health-ci.js';
|
|
9
9
|
import { createBaseHoldGate, formatBaseHoldCleared } from './base-hold.js';
|
|
@@ -17,6 +17,7 @@ import { hostClaimGuards } from './host-claim-guards.js';
|
|
|
17
17
|
import { DRAIN_MESSAGE, createNotifier, resolveNotifyCommand, withDiskLowNotify, withParkNotify } from './notify.js';
|
|
18
18
|
import { createDeferralTracker, settleDeferredOnly } from './queue-startup.js';
|
|
19
19
|
import { runLane } from './run-lane.js';
|
|
20
|
+
import { runReworkPolls } from './run-rework-poll.js';
|
|
20
21
|
import { restackFromSlicePlan } from './run-restack.js';
|
|
21
22
|
import { writeRunFlagOverrides } from './run-flags.js';
|
|
22
23
|
import { shipIssue } from './ship.js';
|
|
@@ -162,60 +163,7 @@ export async function cmdRun(opts, rt) {
|
|
|
162
163
|
// Issues in flight on any lane of this run; every lane's between-issues sweep protects them (#2964).
|
|
163
164
|
const inFlightIssues = new Set();
|
|
164
165
|
// #3563: one shared, coalesced review-rework poll for every lane's pre-claim step (GitHub queue only).
|
|
165
|
-
const runReviewReworkPoll =
|
|
166
|
-
const [owner = '', repo = ''] = ghRepo.split('/');
|
|
167
|
-
const octokit = rt.getOctokit();
|
|
168
|
-
const results = await pollReviewRework({
|
|
169
|
-
github: createOctokitReviewReworkGitHub(octokit, owner, repo),
|
|
170
|
-
queue: createOctokitQueueClient(octokit),
|
|
171
|
-
owner,
|
|
172
|
-
repo,
|
|
173
|
-
branchPrefix,
|
|
174
|
-
trustedApprovers: factoryConfig.intake?.trustedApprovers,
|
|
175
|
-
permissions: createOctokitCollaboratorPermissionClient(octokit),
|
|
176
|
-
store: createFileReviewReworkStore(paths.reviewRework),
|
|
177
|
-
maxRuns: resolveMaxReviewReworkRuns(factoryConfig),
|
|
178
|
-
publishParkComment: (input) => publishParkComment({ octokit, repo: ghRepo, input }),
|
|
179
|
-
});
|
|
180
|
-
for (const r of results) {
|
|
181
|
-
if (r.outcome === 'queued') {
|
|
182
|
-
logEvent(paths.events, 'review_rework_queued', r.issue, `#${r.issue} queued for review rework on lane '${r.lane}' — PR #${r.pr} review ${r.reviewIds.join(', ')} by ${r.reviewer}`, { lane: r.lane });
|
|
183
|
-
}
|
|
184
|
-
else if (r.outcome === 'capped') {
|
|
185
|
-
logEvent(paths.events, 'escalate', r.issue, `#${r.issue} parked: review rework cap ${r.cap} reached (${r.count} runs) — PR #${r.pr} review ${r.reviewIds.join(', ')}`, parkPayload('escalate', workKeyFromIssue(r.issue), r.lane, []));
|
|
186
|
-
}
|
|
187
|
-
else if (r.outcome === 'error') {
|
|
188
|
-
logEvent(paths.events, 'warn', r.issue, `review-rework poll for PR #${r.pr} failed: ${r.detail}`);
|
|
189
|
-
}
|
|
190
|
-
}
|
|
191
|
-
// #3625: `/factory iterate` comments; a failure only warns so the review-rework results above stand.
|
|
192
|
-
try {
|
|
193
|
-
const iterated = await pollIterateCommands({
|
|
194
|
-
github: createOctokitIterateGitHub(octokit, owner, repo),
|
|
195
|
-
queue: createOctokitQueueClient(octokit),
|
|
196
|
-
owner,
|
|
197
|
-
repo,
|
|
198
|
-
branchPrefix,
|
|
199
|
-
trustedApprovers: factoryConfig.intake?.trustedApprovers,
|
|
200
|
-
permissions: createOctokitCollaboratorPermissionClient(octokit),
|
|
201
|
-
store: createFileIterateStore(paths.iterate),
|
|
202
|
-
});
|
|
203
|
-
for (const r of iterated) {
|
|
204
|
-
if (r.outcome === 'queued' || r.outcome === 'already-queued') {
|
|
205
|
-
logEvent(paths.events, 'iterate_queued', r.issue, `#${r.issue} queued for iterate on lane '${r.lane}' — PR #${r.pr} comment ${r.commentId} by ${r.actor}`, { lane: r.lane });
|
|
206
|
-
}
|
|
207
|
-
else if (r.outcome === 'rejected') {
|
|
208
|
-
logEvent(paths.events, 'iterate_rejected', r.issue, `iterate on PR #${r.pr} rejected: ${r.detail}`);
|
|
209
|
-
}
|
|
210
|
-
else {
|
|
211
|
-
logEvent(paths.events, 'warn', r.issue, `iterate poll for PR #${r.pr} failed: ${r.detail}`);
|
|
212
|
-
}
|
|
213
|
-
}
|
|
214
|
-
}
|
|
215
|
-
catch (err) {
|
|
216
|
-
logEvent(paths.events, 'warn', 0, `iterate poll failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
217
|
-
}
|
|
218
|
-
};
|
|
166
|
+
const runReviewReworkPoll = () => runReworkPolls({ octokit: rt.getOctokit(), ghRepo, branchPrefix, factoryConfig, paths });
|
|
219
167
|
let reviewPoll = null;
|
|
220
168
|
const pollReviewReworkOnce = () => (reviewPoll ??= runReviewReworkPoll().finally(() => {
|
|
221
169
|
reviewPoll = null;
|
package/dist/cli/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { ReviewReworkSource } from '@on-par/factory-core/internal';
|
|
1
2
|
type Log = (type: 'rework', message: string) => void;
|
|
2
3
|
/** Claim a queued review rework for the issue; returns the request fragment to spread into the run request (#3564). */
|
|
3
4
|
export declare function claimReviewReworkRequest(reviewReworkFile: string, issueNum: number, skip: unknown, log: Log): {
|
|
@@ -5,6 +6,7 @@ export declare function claimReviewReworkRequest(reviewReworkFile: string, issue
|
|
|
5
6
|
prNumber: number;
|
|
6
7
|
reviewId: number;
|
|
7
8
|
reviewer: string;
|
|
9
|
+
source?: Extract<ReviewReworkSource, 'comment'>;
|
|
8
10
|
};
|
|
9
11
|
};
|
|
10
12
|
/** Claim a queued `/factory iterate` for the issue; returns the request fragment to spread into the run request (#3625). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ship-review-rework.d.ts","sourceRoot":"","sources":["../../src/cli/ship-review-rework.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ship-review-rework.d.ts","sourceRoot":"","sources":["../../src/cli/ship-review-rework.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAExE,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;AAErD,uHAAuH;AACvH,wBAAgB,wBAAwB,CACtC,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,GAAG,GACP;IACD,YAAY,CAAC,EAAE;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,OAAO,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;KACjD,CAAC;CACH,CAgBA;AAED,4HAA4H;AAC5H,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,GAAG,GACP;IAAE,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAQtE;AAED,0HAA0H;AAC1H,wBAAgB,mBAAmB,CACjC,KAAK,EAAE;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAChD,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,GAAG,GACP,UAAU,CAAC,OAAO,wBAAwB,CAAC,GAAG,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAGtF"}
|
|
@@ -4,8 +4,16 @@ export function claimReviewReworkRequest(reviewReworkFile, issueNum, skip, log)
|
|
|
4
4
|
const record = skip ? undefined : claimReviewRework(createFileReviewReworkStore(reviewReworkFile), issueNum);
|
|
5
5
|
if (!record)
|
|
6
6
|
return {};
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
const comment = record.source === 'comment';
|
|
8
|
+
log('rework', `review rework of PR #${record.pr} ${comment ? 'comment' : 'review'} ${record.reviewId} by @${record.reviewer} — PLAN and BUILD skipped (#3564)`);
|
|
9
|
+
return {
|
|
10
|
+
reviewRework: {
|
|
11
|
+
prNumber: record.pr,
|
|
12
|
+
reviewId: record.reviewId,
|
|
13
|
+
reviewer: record.reviewer,
|
|
14
|
+
...(comment ? { source: 'comment' } : {}),
|
|
15
|
+
},
|
|
16
|
+
};
|
|
9
17
|
}
|
|
10
18
|
/** Claim a queued `/factory iterate` for the issue; returns the request fragment to spread into the run request (#3625). */
|
|
11
19
|
export function claimIterateRequest(iterateFile, issueNum, skip, log) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ship-review-rework.js","sourceRoot":"","sources":["../../src/cli/ship-review-rework.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,sBAAsB,EACtB,2BAA2B,GAC5B,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"ship-review-rework.js","sourceRoot":"","sources":["../../src/cli/ship-review-rework.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,sBAAsB,EACtB,2BAA2B,GAC5B,MAAM,+BAA+B,CAAC;AAKvC,uHAAuH;AACvH,MAAM,UAAU,wBAAwB,CACtC,gBAAwB,EACxB,QAAgB,EAChB,IAAa,EACb,GAAQ;IASR,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC7G,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IACvB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC;IAC5C,GAAG,CACD,QAAQ,EACR,wBAAwB,MAAM,CAAC,EAAE,IAAI,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,QAAQ,MAAM,CAAC,QAAQ,mCAAmC,CACjJ,CAAC;IACF,OAAO;QACL,YAAY,EAAE;YACZ,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnD;KACF,CAAC;AACJ,CAAC;AAED,4HAA4H;AAC5H,MAAM,UAAU,mBAAmB,CACjC,WAAmB,EACnB,QAAgB,EAChB,IAAa,EACb,GAAQ;IAER,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,sBAAsB,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,CAAC;IACrG,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IACvB,GAAG,CACD,QAAQ,EACR,kBAAkB,MAAM,CAAC,EAAE,QAAQ,MAAM,CAAC,KAAK,aAAa,MAAM,CAAC,SAAS,oCAAoC,CACjH,CAAC;IACF,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;AAChG,CAAC;AAED,0HAA0H;AAC1H,MAAM,UAAU,mBAAmB,CACjC,KAAgD,EAChD,QAAgB,EAChB,IAAa,EACb,GAAQ;IAER,MAAM,YAAY,GAAG,wBAAwB,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACvF,OAAO,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;AAC5G,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@on-par/factory-cli",
|
|
3
|
-
"version": "0.9.28-next.
|
|
3
|
+
"version": "0.9.28-next.11",
|
|
4
4
|
"description": "On PAR Dev's Software Factory CLI: takes a GitHub issue through plan, build and check with AI agents, then opens a ready-for-review PR.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ai-agents",
|
|
@@ -48,9 +48,9 @@
|
|
|
48
48
|
"@octokit/plugin-retry": "^8.1.1",
|
|
49
49
|
"@octokit/plugin-throttling": "^11.0.5",
|
|
50
50
|
"@octokit/rest": "^22.0.0",
|
|
51
|
-
"@on-par/factory-config": "0.9.28-next.
|
|
52
|
-
"@on-par/factory-core": "0.9.28-next.
|
|
53
|
-
"@on-par/factory-tui": "0.9.28-next.
|
|
51
|
+
"@on-par/factory-config": "0.9.28-next.11",
|
|
52
|
+
"@on-par/factory-core": "0.9.28-next.11",
|
|
53
|
+
"@on-par/factory-tui": "0.9.28-next.11",
|
|
54
54
|
"commander": "^15.0.0",
|
|
55
55
|
"zod": "^4.6.5"
|
|
56
56
|
},
|