looply-cli 0.5.52 → 0.5.54
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/autonomy-controller.d.ts.map +1 -1
- package/dist/autonomy-controller.js +19 -0
- package/dist/autonomy-controller.js.map +1 -1
- package/dist/branch-delivery-wiring.d.ts +23 -0
- package/dist/branch-delivery-wiring.d.ts.map +1 -1
- package/dist/branch-delivery-wiring.js +189 -38
- package/dist/branch-delivery-wiring.js.map +1 -1
- package/dist/branch-delivery.d.ts +58 -1
- package/dist/branch-delivery.d.ts.map +1 -1
- package/dist/branch-delivery.js +242 -9
- package/dist/branch-delivery.js.map +1 -1
- package/dist/bug-repro.d.ts +99 -11
- package/dist/bug-repro.d.ts.map +1 -1
- package/dist/bug-repro.js +236 -15
- package/dist/bug-repro.js.map +1 -1
- package/dist/daemon-cmd.d.ts.map +1 -1
- package/dist/daemon-cmd.js +53 -2
- package/dist/daemon-cmd.js.map +1 -1
- package/dist/earlier-answers-cache.d.ts +71 -0
- package/dist/earlier-answers-cache.d.ts.map +1 -0
- package/dist/earlier-answers-cache.js +253 -0
- package/dist/earlier-answers-cache.js.map +1 -0
- package/dist/failing-checks-tick.d.ts +158 -0
- package/dist/failing-checks-tick.d.ts.map +1 -0
- package/dist/failing-checks-tick.js +313 -0
- package/dist/failing-checks-tick.js.map +1 -0
- package/dist/feature-report.d.ts +2 -0
- package/dist/feature-report.d.ts.map +1 -1
- package/dist/feature-report.js +19 -5
- package/dist/feature-report.js.map +1 -1
- package/dist/gate-health.d.ts +8 -0
- package/dist/gate-health.d.ts.map +1 -1
- package/dist/gate-health.js +13 -0
- package/dist/gate-health.js.map +1 -1
- package/dist/goal-adaptive.d.ts +56 -3
- package/dist/goal-adaptive.d.ts.map +1 -1
- package/dist/goal-adaptive.js +126 -12
- package/dist/goal-adaptive.js.map +1 -1
- package/dist/goal-already-met.d.ts +62 -0
- package/dist/goal-already-met.d.ts.map +1 -0
- package/dist/goal-already-met.js +95 -0
- package/dist/goal-already-met.js.map +1 -0
- package/dist/goal-execution-evidence.d.ts +7 -1
- package/dist/goal-execution-evidence.d.ts.map +1 -1
- package/dist/goal-execution-evidence.js +12 -1
- package/dist/goal-execution-evidence.js.map +1 -1
- package/dist/goal-gap.d.ts +63 -7
- package/dist/goal-gap.d.ts.map +1 -1
- package/dist/goal-gap.js +126 -18
- package/dist/goal-gap.js.map +1 -1
- package/dist/project-memory-store.d.ts +7 -0
- package/dist/project-memory-store.d.ts.map +1 -1
- package/dist/project-memory-store.js +31 -1
- package/dist/project-memory-store.js.map +1 -1
- package/dist/project-terminal.d.ts +1 -0
- package/dist/project-terminal.d.ts.map +1 -1
- package/dist/project-terminal.js +14 -2
- package/dist/project-terminal.js.map +1 -1
- package/dist/pursuit-ending.d.ts.map +1 -1
- package/dist/pursuit-ending.js +11 -0
- package/dist/pursuit-ending.js.map +1 -1
- package/dist/run-cmd.d.ts.map +1 -1
- package/dist/run-cmd.js +92 -6
- package/dist/run-cmd.js.map +1 -1
- package/dist/run-refusal-marks.d.ts +12 -0
- package/dist/run-refusal-marks.d.ts.map +1 -1
- package/dist/run-refusal-marks.js +22 -3
- package/dist/run-refusal-marks.js.map +1 -1
- package/dist/server-client.d.ts +32 -0
- package/dist/server-client.d.ts.map +1 -1
- package/dist/server-client.js +38 -0
- package/dist/server-client.js.map +1 -1
- package/dist/setup-check-wiring.d.ts +8 -0
- package/dist/setup-check-wiring.d.ts.map +1 -1
- package/dist/setup-check-wiring.js +61 -9
- package/dist/setup-check-wiring.js.map +1 -1
- package/dist/setup-check.d.ts +43 -1
- package/dist/setup-check.d.ts.map +1 -1
- package/dist/setup-check.js +125 -3
- package/dist/setup-check.js.map +1 -1
- package/dist/visual-proof-browser.d.ts +6 -0
- package/dist/visual-proof-browser.d.ts.map +1 -1
- package/dist/visual-proof-browser.js +16 -0
- package/dist/visual-proof-browser.js.map +1 -1
- package/dist/visual-proof-config.d.ts +10 -1
- package/dist/visual-proof-config.d.ts.map +1 -1
- package/dist/visual-proof-config.js +20 -2
- package/dist/visual-proof-config.js.map +1 -1
- package/dist/visual-proof-detect.d.ts +45 -3
- package/dist/visual-proof-detect.d.ts.map +1 -1
- package/dist/visual-proof-detect.js +60 -3
- package/dist/visual-proof-detect.js.map +1 -1
- package/dist/visual-proof-run.d.ts +8 -0
- package/dist/visual-proof-run.d.ts.map +1 -1
- package/dist/visual-proof-run.js +16 -6
- package/dist/visual-proof-run.js.map +1 -1
- package/package.json +2 -2
- package/win/contained-node.cjs +110 -1
- package/dist/.src-hash +0 -1
|
@@ -5,7 +5,7 @@ import type { LiveCommitReader } from './live-commit';
|
|
|
5
5
|
import { type GitExec } from './git-driver';
|
|
6
6
|
import type { FreshGates } from './fresh-gates';
|
|
7
7
|
import type { CheckResult, GitHubApi, PullInfo } from './github-api';
|
|
8
|
-
import type { CiBaseReport, DeliveryChanges } from '@looply/core';
|
|
8
|
+
import type { CiBaseReport, DeliveryChanges, DeliveryConflict } from '@looply/core';
|
|
9
9
|
import { type StallDiagnosis, type StallKind } from '@looply/core';
|
|
10
10
|
import { type ForeignWork } from './commit-ownership';
|
|
11
11
|
import type { LaneClaimRecord } from './lane-claims';
|
|
@@ -240,6 +240,12 @@ export interface DeliveryEntry {
|
|
|
240
240
|
} | null;
|
|
241
241
|
/** What the pull request changes, recorded once when it is opened (LOO-B-5). */
|
|
242
242
|
changes?: DeliveryChanges | null;
|
|
243
|
+
/**
|
|
244
|
+
* A bug goal's reproduction as it stood when the pull request was opened (`bug-repro.ts`): the test that failed on
|
|
245
|
+
* the base tree and passed on the delivered one. Kept so every report of this delivery carries it — it was written
|
|
246
|
+
* into the pull request's description and nowhere else, so the ticket never said it.
|
|
247
|
+
*/
|
|
248
|
+
reproduction?: ReproductionReport | null;
|
|
243
249
|
/** Where the merged commit is, per environment; set at the merge, then followed (see `followDeploys`). */
|
|
244
250
|
environments?: EnvStatus[];
|
|
245
251
|
/** When Looply first saw it merged — the start of the 14 days deploys are followed for. */
|
|
@@ -252,6 +258,8 @@ export interface DeliveryEntry {
|
|
|
252
258
|
noAutoMerge?: boolean;
|
|
253
259
|
/** A bundle met in part: its parts, kept so a retried delivery is held the same way (`deliverOnce`). */
|
|
254
260
|
parts?: DeliveredPart[];
|
|
261
|
+
/** A split goal's part: the release order as project ids (core `BranchDeliveryReport.releaseOrder`), kept for every report. */
|
|
262
|
+
releaseOrder?: string[];
|
|
255
263
|
/**
|
|
256
264
|
* Looply's own gate outcomes for the delivered commit (`typecheck: passed`, …), as key 2 recorded
|
|
257
265
|
* them. Under ship to test, when the repository reports no CI at all, these are the checks.
|
|
@@ -273,6 +281,18 @@ export interface DeliveryEntry {
|
|
|
273
281
|
head: string;
|
|
274
282
|
baseSha: string;
|
|
275
283
|
because: string;
|
|
284
|
+
at: string; /** The base branch's name; absent on an entry held before it was kept. */
|
|
285
|
+
base?: string;
|
|
286
|
+
} | null;
|
|
287
|
+
/**
|
|
288
|
+
* 🔴 A NEWER PULL REQUEST WAS OPENED IN ITS PLACE (RBB-T-14, 2026-11-16): AutoRyn sent the conflicted change back
|
|
289
|
+
* as a fix-up goal that makes it again on the current base, and that goal's pull request is open (or merged).
|
|
290
|
+
* Final from then on: never rebuilt on the base again, never re-judged or merged; only a person's own merge or
|
|
291
|
+
* close of it on GitHub is still recorded. Null/absent: nothing replaced it.
|
|
292
|
+
*/
|
|
293
|
+
replacedBy?: {
|
|
294
|
+
goalId: string;
|
|
295
|
+
url: string;
|
|
276
296
|
at: string;
|
|
277
297
|
} | null;
|
|
278
298
|
/** The goal's `clientRef` when it was delivered — which ticket, and which attempt at it (`ticketAttemptOf`). */
|
|
@@ -386,6 +406,8 @@ export interface DeliverInput {
|
|
|
386
406
|
readonly clientRef?: string | null;
|
|
387
407
|
/** A bundle met in part (core `goal-parts.ts`): which tickets this pull request delivers, and which it does not. */
|
|
388
408
|
readonly parts?: readonly DeliveredPart[] | null;
|
|
409
|
+
/** A split goal's part: the order its repositories are released in, as project ids (core `releaseOrderIds`). */
|
|
410
|
+
readonly releaseOrder?: readonly string[];
|
|
389
411
|
}
|
|
390
412
|
/** The pull request's line for a bundle met in part, or null. */
|
|
391
413
|
export declare function partsLine(parts: readonly DeliveredPart[] | null | undefined): string | null;
|
|
@@ -409,9 +431,28 @@ export interface DeliverDeps {
|
|
|
409
431
|
* `ownerOfBranch` still answers for a `-solo` branch through its original's claim.
|
|
410
432
|
*/
|
|
411
433
|
recordClaim?(record: LaneClaimRecord): void;
|
|
434
|
+
/**
|
|
435
|
+
* True when the server, told of this goal's pull request, answered that nobody wants it (`unwanted`: the goal was
|
|
436
|
+
* given up before it heard of it). Absent: never (an older wiring, or a test).
|
|
437
|
+
*/
|
|
438
|
+
unwanted?(goalId: string): boolean;
|
|
412
439
|
}
|
|
413
440
|
/** `git diff --numstat` and `git log --format=%h%x09%s` as a bounded summary (no file content). */
|
|
414
441
|
export declare function summarizeChanges(numstat: string, log: string): DeliveryChanges;
|
|
442
|
+
/**
|
|
443
|
+
* The files a conflict rebuild's refusal names, in its own words (`branch-replay.ts`: "… (it conflicts in a.ts,
|
|
444
|
+
* b.ts)", git's "patch failed: package.json:19"). Read from the words so an entry held before the files were
|
|
445
|
+
* reported (RBB-T-14's, on the owner's machine now) reports them too. At most six, as the refusal itself lists.
|
|
446
|
+
*/
|
|
447
|
+
export declare function conflictFilesOf(because: string | null | undefined): string[];
|
|
448
|
+
/**
|
|
449
|
+
* 🔴 THE CONFLICT AS DATA, FOR AutoRyn (RBB-T-14, 2026-11-16: it was in the note only, and AutoRyn read it from the
|
|
450
|
+
* wording). Set only while the pull request is held because it conflicts with its base and Looply could not bring
|
|
451
|
+
* it up to date by itself; null once it no longer conflicts, once it was rebuilt, once a replacement is open in its
|
|
452
|
+
* place, and once nothing is left to do on it.
|
|
453
|
+
*/
|
|
454
|
+
export declare function deliveryConflictOf(e: Pick<DeliveryEntry, 'conflict' | 'state' | 'done' | 'replacedBy' | 'projectBase' | 'base'>): DeliveryConflict | null;
|
|
455
|
+
export declare function reportOf(e: DeliveryEntry): BranchDeliveryReport;
|
|
415
456
|
/**
|
|
416
457
|
* The entry's wait, diagnosed (core `stall.ts`), counting from when this same kind of wait began on
|
|
417
458
|
* the entry as it stood before (`prior`), or from now.
|
|
@@ -659,6 +700,22 @@ export declare function ticketAttemptOfMember(clientRef: string | null | undefin
|
|
|
659
700
|
ticket: string;
|
|
660
701
|
attempt: number;
|
|
661
702
|
} | null;
|
|
703
|
+
/**
|
|
704
|
+
* 🔴 WHICH DELIVERY REPLACES THIS ONE — the newest that does, or null. Pure (RBB-T-14, 2026-11-16).
|
|
705
|
+
*
|
|
706
|
+
* A pull request that conflicts with its base, and that Looply could not bring up to date by itself, goes back to
|
|
707
|
+
* Looply as a NEW goal on the same ticket: AutoRyn's fix-up, cut from the current base with no `dependsOn`, whose
|
|
708
|
+
* words end "… This replaces <the old pull request's address>." Its pull request does not contain the old head and
|
|
709
|
+
* asks for different words, so neither rule in `closeSuperseded` fires, and `replacing` in `deliverOnce` takes only a
|
|
710
|
+
* `checks-failed` predecessor. A newer delivery replaces `old` when it has its own pull request in the same
|
|
711
|
+
* repository, not built on `old`'s branch, and either
|
|
712
|
+
* - its goal says "replaces <old's address>" (what AutoRyn's fix-up says), or
|
|
713
|
+
* - it is a later attempt at the same ticket (`clientRef`), `old` is held on a conflict, and its goal names old's
|
|
714
|
+
* address or branch — the same lineage without the last sentence (AutoRyn caps a goal's words at 2000
|
|
715
|
+
* characters, and that sentence comes last).
|
|
716
|
+
* `old` must be Looply's own run branch's pull request, still open to Looply, and not already replaced.
|
|
717
|
+
*/
|
|
718
|
+
export declare function replacementOf(old: DeliveryEntry, all: readonly DeliveryEntry[], refOf?: (e: DeliveryEntry) => string | null): DeliveryEntry | null;
|
|
662
719
|
/** How long a merged commit's deploys are followed for, so one done outside Looply is still seen. */
|
|
663
720
|
export declare const FOLLOW_DEPLOYS_MS: number;
|
|
664
721
|
/** How long after the merge a `merge-deploys` site may take to serve the commit before the row says it is not live. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch-delivery.d.ts","sourceRoot":"","sources":["../src/branch-delivery.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"branch-delivery.d.ts","sourceRoot":"","sources":["../src/branch-delivery.ts"],"names":[],"mappings":"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"}
|
package/dist/branch-delivery.js
CHANGED
|
@@ -11,6 +11,9 @@ exports.findGoalBranch = findGoalBranch;
|
|
|
11
11
|
exports.stackedOn = stackedOn;
|
|
12
12
|
exports.partsLine = partsLine;
|
|
13
13
|
exports.summarizeChanges = summarizeChanges;
|
|
14
|
+
exports.conflictFilesOf = conflictFilesOf;
|
|
15
|
+
exports.deliveryConflictOf = deliveryConflictOf;
|
|
16
|
+
exports.reportOf = reportOf;
|
|
14
17
|
exports.deliveryStall = deliveryStall;
|
|
15
18
|
exports.pullTitle = pullTitle;
|
|
16
19
|
exports.maintenanceSection = maintenanceSection;
|
|
@@ -29,6 +32,7 @@ exports.noNewCommits = noNewCommits;
|
|
|
29
32
|
exports.conflictMoved = conflictMoved;
|
|
30
33
|
exports.ticketAttemptOf = ticketAttemptOf;
|
|
31
34
|
exports.ticketAttemptOfMember = ticketAttemptOfMember;
|
|
35
|
+
exports.replacementOf = replacementOf;
|
|
32
36
|
exports.herokuLoginSentence = herokuLoginSentence;
|
|
33
37
|
exports.herokuAuthRefusal = herokuAuthRefusal;
|
|
34
38
|
exports.makeReleaseRunner = makeReleaseRunner;
|
|
@@ -397,7 +401,50 @@ function summarizeChanges(numstat, log) {
|
|
|
397
401
|
truncated: files.length > core_3.MAX_CHANGED_FILES || commits.length > core_3.MAX_CHANGED_COMMITS,
|
|
398
402
|
};
|
|
399
403
|
}
|
|
404
|
+
/**
|
|
405
|
+
* The files a conflict rebuild's refusal names, in its own words (`branch-replay.ts`: "… (it conflicts in a.ts,
|
|
406
|
+
* b.ts)", git's "patch failed: package.json:19"). Read from the words so an entry held before the files were
|
|
407
|
+
* reported (RBB-T-14's, on the owner's machine now) reports them too. At most six, as the refusal itself lists.
|
|
408
|
+
*/
|
|
409
|
+
function conflictFilesOf(because) {
|
|
410
|
+
const s = (because ?? '').replace(/\s+/g, ' ');
|
|
411
|
+
const files = [];
|
|
412
|
+
const add = (p) => {
|
|
413
|
+
const f = p.trim().replace(/:\d+$/, '');
|
|
414
|
+
if (f !== '' && f !== '…' && /^[\w@./+-]+$/.test(f) && !files.includes(f))
|
|
415
|
+
files.push(f);
|
|
416
|
+
};
|
|
417
|
+
// The closing bracket may be cut off: the reason is kept to 300 characters.
|
|
418
|
+
const named = /\bit conflicts in ([^)]+)\)?/.exec(s);
|
|
419
|
+
if (named !== null) {
|
|
420
|
+
const listed = named[1].split(/,\s*/);
|
|
421
|
+
// The reason is kept to 300 characters with nothing to mark the cut: a list with no closing bracket may end in
|
|
422
|
+
// half a path ("src/routes/que"), which is not a file. Its last name is left out.
|
|
423
|
+
if (!/\bit conflicts in [^)]+\)/.test(s))
|
|
424
|
+
listed.pop();
|
|
425
|
+
for (const p of listed)
|
|
426
|
+
add(p);
|
|
427
|
+
}
|
|
428
|
+
for (const m of s.matchAll(/\bpatch failed: ([^\s:;)]+):\d+/g))
|
|
429
|
+
add(m[1]);
|
|
430
|
+
return files.slice(0, 6);
|
|
431
|
+
}
|
|
432
|
+
/**
|
|
433
|
+
* 🔴 THE CONFLICT AS DATA, FOR AutoRyn (RBB-T-14, 2026-11-16: it was in the note only, and AutoRyn read it from the
|
|
434
|
+
* wording). Set only while the pull request is held because it conflicts with its base and Looply could not bring
|
|
435
|
+
* it up to date by itself; null once it no longer conflicts, once it was rebuilt, once a replacement is open in its
|
|
436
|
+
* place, and once nothing is left to do on it.
|
|
437
|
+
*/
|
|
438
|
+
function deliveryConflictOf(e) {
|
|
439
|
+
if (!e.conflict || e.state !== 'pr-open' || e.done === true || e.replacedBy)
|
|
440
|
+
return null;
|
|
441
|
+
const base = e.conflict.base ?? e.projectBase ?? e.base;
|
|
442
|
+
if (!base)
|
|
443
|
+
return null;
|
|
444
|
+
return { base, files: conflictFilesOf(e.conflict.because) };
|
|
445
|
+
}
|
|
400
446
|
function reportOf(e) {
|
|
447
|
+
const conflict = deliveryConflictOf(e);
|
|
401
448
|
return {
|
|
402
449
|
state: e.state,
|
|
403
450
|
branch: e.branch,
|
|
@@ -410,6 +457,10 @@ function reportOf(e) {
|
|
|
410
457
|
deploy: e.deploy ?? null,
|
|
411
458
|
...(e.environments === undefined ? {} : { environments: e.environments }),
|
|
412
459
|
...(e.changes ? { changes: e.changes } : {}),
|
|
460
|
+
...(e.reproduction ? { reproduction: e.reproduction } : {}),
|
|
461
|
+
...(conflict === null ? {} : { conflict }),
|
|
462
|
+
// A split part's release order, as data: AutoRyn ships the repositories in it, one after another.
|
|
463
|
+
...(e.releaseOrder && e.releaseOrder.length > 1 ? { releaseOrder: [...e.releaseOrder] } : {}),
|
|
413
464
|
};
|
|
414
465
|
}
|
|
415
466
|
/**
|
|
@@ -462,6 +513,20 @@ function pullTitle(goalText) {
|
|
|
462
513
|
* changelog and advisory links, the build note, and why Looply will not merge it.
|
|
463
514
|
*/
|
|
464
515
|
function maintenanceSection(m) {
|
|
516
|
+
if (m.kind === 'failing-checks' && m.failingChecks) {
|
|
517
|
+
const f = m.failingChecks;
|
|
518
|
+
const on = f.branch ?? 'the base branch';
|
|
519
|
+
const out = [`### Checks failing on ${on}: "${f.step}" (since ${f.since.slice(0, 10)}, last seen on ${f.baseSha.slice(0, 7)})`];
|
|
520
|
+
if (f.tests.length > 0) {
|
|
521
|
+
out.push('', 'Failing test files on the unchanged base:');
|
|
522
|
+
for (const t of f.tests)
|
|
523
|
+
out.push(`- \`${t}\``);
|
|
524
|
+
if (f.testCount > f.tests.length)
|
|
525
|
+
out.push(`- and ${f.testCount - f.tests.length} more`);
|
|
526
|
+
}
|
|
527
|
+
out.push('', `🔒 Looply opened this itself after ${f.checks} base checks in a row found these failures. A person reviews and merges the fix.`);
|
|
528
|
+
return out;
|
|
529
|
+
}
|
|
465
530
|
const kind = m.kind === 'upgrade' ? 'dependency upgrade' : m.kind === 'security' ? 'security fixes' : 'unused dependencies and dead code';
|
|
466
531
|
const out = [`### Scheduled maintenance: ${kind} (${m.week}, ${m.root === '.' ? 'repository root' : m.root}, ${m.packageManager})`];
|
|
467
532
|
if (m.packages.length > 0) {
|
|
@@ -580,6 +645,7 @@ async function deliverOnce(deps, input) {
|
|
|
580
645
|
...(input.clientRef ? { clientRef: input.clientRef } : {}),
|
|
581
646
|
...(input.late === true ? { late: true } : {}),
|
|
582
647
|
...(input.parts ? { parts: input.parts.map((p) => ({ ...p })) } : {}),
|
|
648
|
+
...(input.releaseOrder && input.releaseOrder.length > 0 ? { releaseOrder: [...input.releaseOrder] } : {}),
|
|
583
649
|
state: 'not-pushed',
|
|
584
650
|
note: null,
|
|
585
651
|
dependsOn: null,
|
|
@@ -675,6 +741,7 @@ async function deliverOnce(deps, input) {
|
|
|
675
741
|
dependsOn: stack?.branch ?? null,
|
|
676
742
|
state: 'pushed',
|
|
677
743
|
...(rebuilt === null ? {} : { rebuiltFrom: { branch: original.name, sha: original.sha, without: rebuilt.without } }),
|
|
744
|
+
...(input.reproduction ? { reproduction: input.reproduction } : {}),
|
|
678
745
|
};
|
|
679
746
|
if (gh === null) {
|
|
680
747
|
return save(deps, { ...entry, note: `pushed to origin (${remoteUrl === null ? 'no URL' : (0, delivery_rules_1.redactUrl)(remoteUrl)}); origin is not on github.com, so no pull request was opened` });
|
|
@@ -709,6 +776,8 @@ async function deliverOnce(deps, input) {
|
|
|
709
776
|
const couldNot = plan.kind === 'stacked' && plan.because !== null ? `Looply could not rebuild it without that work (${plan.because})` : null;
|
|
710
777
|
let pull = await api.findPull(branch);
|
|
711
778
|
let replacedOwn = null;
|
|
779
|
+
// The red pull request this fix-up replaces, closed only once the server has accepted the fix-up (below).
|
|
780
|
+
let toReplace = null;
|
|
712
781
|
if (pull === null || (pull.state === 'closed' && !pull.merged)) {
|
|
713
782
|
const stackedPull = stack !== null && stack.onOrigin ? await api.findPull(stack.branch).catch(() => null) : null;
|
|
714
783
|
try {
|
|
@@ -734,10 +803,8 @@ async function deliverOnce(deps, input) {
|
|
|
734
803
|
}),
|
|
735
804
|
});
|
|
736
805
|
deps.log(`deliver : opened ${pull.url} (${branch} → ${prBase})`);
|
|
737
|
-
if (replacing !== null)
|
|
738
|
-
|
|
739
|
-
await save(deps, { ...replacing, done: true, note: `replaced by ${pull.url}`, updatedAt: at });
|
|
740
|
-
}
|
|
806
|
+
if (replacing !== null)
|
|
807
|
+
toReplace = replacing;
|
|
741
808
|
// `--rebuild`: the old pull request of this goal's stacked branch is closed, pointing here.
|
|
742
809
|
if (input.replace === true && rebuilt !== null && prior !== null && prior.pullNumber !== null && prior.branch === original.name && prior.pullRequestUrl !== pull.url) {
|
|
743
810
|
const old = await api.getPull(prior.pullNumber).catch(() => null);
|
|
@@ -782,7 +849,7 @@ async function deliverOnce(deps, input) {
|
|
|
782
849
|
const changes = deps.git.changeSummary === undefined
|
|
783
850
|
? null
|
|
784
851
|
: await deps.git.freshBase(pull.base || prBase).then((b) => deps.git.changeSummary(b, entry.sha)).catch(() => null);
|
|
785
|
-
|
|
852
|
+
const saved = await save(deps, {
|
|
786
853
|
...entry,
|
|
787
854
|
...(changes === null ? {} : { changes }),
|
|
788
855
|
...(inheritsHold ? { mode: 'pr', noAutoMerge: true } : {}),
|
|
@@ -793,6 +860,22 @@ async function deliverOnce(deps, input) {
|
|
|
793
860
|
note: modeNote === null ? note : note === null ? modeNote : `${note}; ${modeNote}`.slice(0, 600),
|
|
794
861
|
...(absorbs.length > 0 ? { absorbs } : {}),
|
|
795
862
|
});
|
|
863
|
+
/**
|
|
864
|
+
* 🔴 THE RED ONE IS CLOSED ONLY AFTER THE SERVER ACCEPTED ITS REPLACEMENT (review, 2026-11-17). Closed as the fix-up
|
|
865
|
+
* opened, a fix-up the server then answered `unwanted` (its goal given up meanwhile) was closed as a stray right
|
|
866
|
+
* after — and neither pull request was open: the dependency's work went down with it. So the save above reports the
|
|
867
|
+
* fix-up first; only when nobody refused it is the red one closed, pointing at it.
|
|
868
|
+
*/
|
|
869
|
+
if (toReplace !== null) {
|
|
870
|
+
if (deps.unwanted?.(input.goalId) === true) {
|
|
871
|
+
deps.log(`deliver : ${input.goalId}: ${pull.url} is not wanted, so ${toReplace.pullRequestUrl} is left open (not replaced)`);
|
|
872
|
+
}
|
|
873
|
+
else {
|
|
874
|
+
await api.closePull(toReplace.pullNumber, `Replaced by ${pull.url}, which contains this work and its fix.`).catch(() => undefined);
|
|
875
|
+
await save(deps, { ...toReplace, done: true, note: `replaced by ${pull.url}`, updatedAt: at });
|
|
876
|
+
}
|
|
877
|
+
}
|
|
878
|
+
return saved;
|
|
796
879
|
}
|
|
797
880
|
/**
|
|
798
881
|
* Decide — and, when it is the answer, do — the rebuild of a branch that carries other goals'
|
|
@@ -1174,6 +1257,13 @@ async function advanceDeliveries(deps) {
|
|
|
1174
1257
|
catch (err) {
|
|
1175
1258
|
deps.log(`deliver : superseded pull requests: ${err.message}`);
|
|
1176
1259
|
}
|
|
1260
|
+
// Before the pass below, so a conflicted pull request whose replacement is open is never rebuilt again.
|
|
1261
|
+
try {
|
|
1262
|
+
await closeReplaced(deps);
|
|
1263
|
+
}
|
|
1264
|
+
catch (err) {
|
|
1265
|
+
deps.log(`deliver : replaced pull requests: ${err.message}`);
|
|
1266
|
+
}
|
|
1177
1267
|
for (const e of deps.store.all()) {
|
|
1178
1268
|
if (!ADVANCING.includes(e.state))
|
|
1179
1269
|
continue;
|
|
@@ -1197,8 +1287,8 @@ async function advanceOne(deps, e) {
|
|
|
1197
1287
|
// 🔴 SHIP TO TEST'S SAFETY, asked again on every pass: settings that changed since the delivery count.
|
|
1198
1288
|
const safe = effectiveMode(asked, { deploy: deps.deploy(), environments: deps.environments?.() ?? [] });
|
|
1199
1289
|
const mode = safe.mode;
|
|
1200
|
-
// A person's approval, read from the goal mirror.
|
|
1201
|
-
if (!e.approvedAt && APPROVABLE.includes(e.state) && e.pullNumber !== null) {
|
|
1290
|
+
// A person's approval, read from the goal mirror. A replaced one is final: its replacement is what ships.
|
|
1291
|
+
if (!e.approvedAt && !e.replacedBy && APPROVABLE.includes(e.state) && e.pullNumber !== null) {
|
|
1202
1292
|
const approved = deps.shipRequested(e.goalId);
|
|
1203
1293
|
if (approved !== null && approved !== e.voidedApproval) {
|
|
1204
1294
|
// 🔴 A BLOCKED ONE STAYS BLOCKED: the approval is kept, and acted on once it unblocks.
|
|
@@ -1241,7 +1331,16 @@ async function advanceOne(deps, e) {
|
|
|
1241
1331
|
await followDeploys(deps, api, e, wantsDeploy, mode);
|
|
1242
1332
|
}
|
|
1243
1333
|
else if (pull.state === 'closed') {
|
|
1244
|
-
await save(deps, { ...e, done: true, note: 'the pull request was closed without merging; Looply leaves it', updatedAt: at });
|
|
1334
|
+
await save(deps, { ...e, done: true, note: e.replacedBy ? e.note : 'the pull request was closed without merging; Looply leaves it', updatedAt: at });
|
|
1335
|
+
}
|
|
1336
|
+
else if (e.replacedBy) {
|
|
1337
|
+
/**
|
|
1338
|
+
* 🔴 REPLACED: NEVER REBUILT, RE-JUDGED OR MERGED AGAIN (RBB-T-14, 2026-11-16). Its replacement makes the same
|
|
1339
|
+
* change on the current base; rebuilding this one too whenever the base moved was wasted work, noise on the
|
|
1340
|
+
* ticket, and — had a rebuild ever worked — a second pull request with the same change. Only a person's own
|
|
1341
|
+
* merge or close of it (above) is still recorded.
|
|
1342
|
+
*/
|
|
1343
|
+
return;
|
|
1245
1344
|
}
|
|
1246
1345
|
else if (
|
|
1247
1346
|
/**
|
|
@@ -1359,6 +1458,12 @@ async function advanceOne(deps, e) {
|
|
|
1359
1458
|
await save(deps, { ...e, mode, state: 'waiting-checks', conflict: null, waitingSince: at, note: `it no longer conflicts with ${base}; merging once the checks allow`, updatedAt: at });
|
|
1360
1459
|
return;
|
|
1361
1460
|
}
|
|
1461
|
+
else if (e.state === 'pr-open' && e.conflict && pull.conflicted === false && !wantsMerge && pull.state === 'open') {
|
|
1462
|
+
// The same, after the project went back to "pr": it is a person's to merge, and the report no longer says it conflicts.
|
|
1463
|
+
const base = e.projectBase ?? pull.base;
|
|
1464
|
+
await save(deps, { ...e, mode, conflict: null, note: `it no longer conflicts with ${base}; a person merges`, updatedAt: at });
|
|
1465
|
+
return;
|
|
1466
|
+
}
|
|
1362
1467
|
else if (
|
|
1363
1468
|
/**
|
|
1364
1469
|
* PARKED ONLY FOR WANT OF CI, AND THAT NO LONGER HOLDS: under ship to test, a pull request
|
|
@@ -1710,7 +1815,7 @@ async function rebuildOnBase(deps, api, e, pull, at, mode) {
|
|
|
1710
1815
|
const note = `not merged: it conflicts with ${base}, and Looply could not rebuild it on the current ${base} (${because}); a person resolves the conflict`.slice(0, 600);
|
|
1711
1816
|
if (e.state !== 'pr-open' || e.note !== note)
|
|
1712
1817
|
deps.log(`deliver : ${e.goalId}: ${note}`);
|
|
1713
|
-
await save(deps, { ...e, mode, state: 'pr-open', conflict: { head, baseSha: pull.baseSha ?? '', because: because.slice(0, 300), at }, note, updatedAt: at });
|
|
1818
|
+
await save(deps, { ...e, mode, state: 'pr-open', conflict: { head, baseSha: pull.baseSha ?? '', because: because.slice(0, 300), at, base }, note, updatedAt: at });
|
|
1714
1819
|
};
|
|
1715
1820
|
if (pull.draft === true)
|
|
1716
1821
|
return held('it is a draft, so a person is still working on it');
|
|
@@ -2044,6 +2149,134 @@ async function supersede(deps, old, newer) {
|
|
|
2044
2149
|
}
|
|
2045
2150
|
return true;
|
|
2046
2151
|
}
|
|
2152
|
+
/* ───────────────────────────── a fix-up that makes the change again ── */
|
|
2153
|
+
/** `url` named as itself in `text`: not as the start of a longer one (`/pull/1` is not `/pull/19`). */
|
|
2154
|
+
function mentions(text, needle) {
|
|
2155
|
+
return new RegExp(`(?<![\\w/.-])${escapeRe(needle)}(?![\\w/#-])`).test(text);
|
|
2156
|
+
}
|
|
2157
|
+
/** "replaces <url>", the way AutoRyn's fix-up ends ("This replaces https://github.com/o/r/pull/19."). */
|
|
2158
|
+
function saysReplaces(text, url) {
|
|
2159
|
+
return new RegExp(`\\breplaces\\s+${escapeRe(url)}(?![\\w/#-])`, 'i').test(text);
|
|
2160
|
+
}
|
|
2161
|
+
const escapeRe = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
2162
|
+
/**
|
|
2163
|
+
* States in which a delivery has its own pull request that can take the old one's place, on Looply's last read: open
|
|
2164
|
+
* and not failing, or merged. 🔴 NOT `checks-failed` or `blocked` (review of 0.5.53): closing the old one for a
|
|
2165
|
+
* replacement that cannot merge either would leave the ticket with nothing but a red pull request. It is closed on a
|
|
2166
|
+
* later pass, once the replacement's checks pass.
|
|
2167
|
+
*/
|
|
2168
|
+
const WITH_PULL = ['pr-open', 'waiting-checks', 'merged', 'deployed', 'deploy-failed'];
|
|
2169
|
+
/** AutoRyn's fix-up for a conflict, in its own words (followThrough: "… make the same change again — the commits on <branch> show what it was …"). */
|
|
2170
|
+
const MAKES_IT_AGAIN = /\bmake the same change again\b|\bbring this change up to date\b/i;
|
|
2171
|
+
/**
|
|
2172
|
+
* 🔴 WHICH DELIVERY REPLACES THIS ONE — the newest that does, or null. Pure (RBB-T-14, 2026-11-16).
|
|
2173
|
+
*
|
|
2174
|
+
* A pull request that conflicts with its base, and that Looply could not bring up to date by itself, goes back to
|
|
2175
|
+
* Looply as a NEW goal on the same ticket: AutoRyn's fix-up, cut from the current base with no `dependsOn`, whose
|
|
2176
|
+
* words end "… This replaces <the old pull request's address>." Its pull request does not contain the old head and
|
|
2177
|
+
* asks for different words, so neither rule in `closeSuperseded` fires, and `replacing` in `deliverOnce` takes only a
|
|
2178
|
+
* `checks-failed` predecessor. A newer delivery replaces `old` when it has its own pull request in the same
|
|
2179
|
+
* repository, not built on `old`'s branch, and either
|
|
2180
|
+
* - its goal says "replaces <old's address>" (what AutoRyn's fix-up says), or
|
|
2181
|
+
* - it is a later attempt at the same ticket (`clientRef`), `old` is held on a conflict, and its goal names old's
|
|
2182
|
+
* address or branch — the same lineage without the last sentence (AutoRyn caps a goal's words at 2000
|
|
2183
|
+
* characters, and that sentence comes last).
|
|
2184
|
+
* `old` must be Looply's own run branch's pull request, still open to Looply, and not already replaced.
|
|
2185
|
+
*/
|
|
2186
|
+
function replacementOf(old, all, refOf = (e) => e.clientRef ?? null) {
|
|
2187
|
+
const url = old.pullRequestUrl;
|
|
2188
|
+
if (url === null || old.pullNumber === null || old.owner === null || old.repo === null)
|
|
2189
|
+
return null;
|
|
2190
|
+
if (old.done === true || old.replacedBy || !OPEN_STATES.includes(old.state) || !old.branch.startsWith(integrator_1.RUN_BRANCH_PREFIX))
|
|
2191
|
+
return null;
|
|
2192
|
+
// 🔴 ONLY A PULL REQUEST THAT CANNOT GO IN AS IT IS (review of 0.5.53): held on a conflict, or failing its checks.
|
|
2193
|
+
// A healthy one is never closed because a later goal's words name it — whatever they say.
|
|
2194
|
+
if (!old.conflict && old.state !== 'checks-failed')
|
|
2195
|
+
return null;
|
|
2196
|
+
const mine = ticketAttemptOfMember(refOf(old));
|
|
2197
|
+
const oldBranches = [old.branch, old.rebuiltFrom?.branch].filter((b) => typeof b === 'string');
|
|
2198
|
+
const found = all.filter((n) => {
|
|
2199
|
+
if (n.goalId === old.goalId || n.owner !== old.owner || n.repo !== old.repo)
|
|
2200
|
+
return false;
|
|
2201
|
+
if (n.pullNumber === null || n.pullNumber === old.pullNumber || n.pullRequestUrl === null || n.pullRequestUrl === url)
|
|
2202
|
+
return false;
|
|
2203
|
+
if (!WITH_PULL.includes(n.state) || (n.done === true && !MERGED.includes(n.state)) || n.replacedBy)
|
|
2204
|
+
return false;
|
|
2205
|
+
if ((n.base !== null && oldBranches.includes(n.base)) || (n.dependsOn !== null && oldBranches.includes(n.dependsOn)))
|
|
2206
|
+
return false;
|
|
2207
|
+
if (saysReplaces(n.goalText, url))
|
|
2208
|
+
return true;
|
|
2209
|
+
const theirs = ticketAttemptOfMember(refOf(n));
|
|
2210
|
+
return (!!old.conflict &&
|
|
2211
|
+
mine !== null &&
|
|
2212
|
+
theirs !== null &&
|
|
2213
|
+
theirs.ticket === mine.ticket &&
|
|
2214
|
+
theirs.attempt > mine.attempt &&
|
|
2215
|
+
// 🔴 NOT A MERE MENTION (review of 0.5.53): a QA send-back that quotes the old address ("on top of #19, also
|
|
2216
|
+
// fix the label") does not contain the old change. The later attempt must be told to MAKE THE CHANGE AGAIN.
|
|
2217
|
+
MAKES_IT_AGAIN.test(n.goalText) &&
|
|
2218
|
+
(mentions(n.goalText, url) || mentions(n.goalText, old.branch)));
|
|
2219
|
+
});
|
|
2220
|
+
return [...found].sort((a, b) => Date.parse(b.openedAt) - Date.parse(a.openedAt))[0] ?? null;
|
|
2221
|
+
}
|
|
2222
|
+
/**
|
|
2223
|
+
* 🔴 THE OLD PULL REQUEST IS CLOSED ONCE ITS REPLACEMENT IS OPEN (RBB-T-14, ButtKick3r/RobinBet#19, 2026-11-16: the
|
|
2224
|
+
* conflicted pull request would have stayed open for ever beside the fix-up's).
|
|
2225
|
+
*
|
|
2226
|
+
* Never before: GitHub, read now, must say the replacement is merged, or open and not a draft — never close the old
|
|
2227
|
+
* one while nothing replaces it. Never when the old one is merged or closed already (the normal pass records that).
|
|
2228
|
+
* Closed with one comment that names the replacement; its branch is left where it is. Kept open — final all the
|
|
2229
|
+
* same, never rebuilt again, saying why on the ticket once — when closing it could lose somebody's work: a draft,
|
|
2230
|
+
* a head somebody else pushed, or pull requests built on its branch.
|
|
2231
|
+
*/
|
|
2232
|
+
async function closeReplaced(deps) {
|
|
2233
|
+
const all = deps.store.all();
|
|
2234
|
+
const refOf = (e) => e.clientRef ?? deps.clientRefOf?.(e.goalId) ?? null;
|
|
2235
|
+
for (const old of all) {
|
|
2236
|
+
const newer = replacementOf(old, all, refOf);
|
|
2237
|
+
if (newer === null)
|
|
2238
|
+
continue;
|
|
2239
|
+
try {
|
|
2240
|
+
await replaceWith(deps, deps.store.get(old.goalId) ?? old, newer);
|
|
2241
|
+
}
|
|
2242
|
+
catch (err) {
|
|
2243
|
+
deps.log(`deliver : ${old.goalId}: could not close it as replaced by ${newer.pullRequestUrl} (${err.message}); tried again next pass`);
|
|
2244
|
+
}
|
|
2245
|
+
}
|
|
2246
|
+
}
|
|
2247
|
+
async function replaceWith(deps, old, newer) {
|
|
2248
|
+
const client = await deps.github(old.owner, old.repo);
|
|
2249
|
+
if (client.api === null)
|
|
2250
|
+
return; // no credentials right now: next pass
|
|
2251
|
+
const api = client.api;
|
|
2252
|
+
const theirs = await api.getPull(newer.pullNumber);
|
|
2253
|
+
if (!theirs.merged && (theirs.state !== 'open' || theirs.draft === true))
|
|
2254
|
+
return; // nothing replaces it yet
|
|
2255
|
+
const pull = await api.getPull(old.pullNumber);
|
|
2256
|
+
if (pull.merged || pull.state !== 'open')
|
|
2257
|
+
return; // the normal pass records what happened to it
|
|
2258
|
+
const at = new Date(deps.now()).toISOString();
|
|
2259
|
+
const base = old.conflict?.base ?? old.projectBase ?? pull.base;
|
|
2260
|
+
const url = newer.pullRequestUrl;
|
|
2261
|
+
const replacedBy = { goalId: newer.goalId, url, at };
|
|
2262
|
+
const built = dependents(deps.store, old);
|
|
2263
|
+
const keep = pull.draft === true
|
|
2264
|
+
? 'it is a draft, so a person is working on it'
|
|
2265
|
+
: pull.headSha !== '' && pull.headSha !== old.sha
|
|
2266
|
+
? 'somebody pushed to it since Looply opened it'
|
|
2267
|
+
: built.length > 0
|
|
2268
|
+
? `${built.map((d) => d.pullRequestUrl ?? `#${d.pullNumber}`).join(', ')} ${built.length === 1 ? 'builds' : 'build'} on its branch`
|
|
2269
|
+
: null;
|
|
2270
|
+
if (keep !== null) {
|
|
2271
|
+
const note = `replaced by ${url}, which makes this change again on the current ${base}; Looply does not rebuild it again, and leaves it open because ${keep}; a person closes it`;
|
|
2272
|
+
deps.log(`deliver : ${old.goalId}: ${note}`);
|
|
2273
|
+
await save(deps, { ...old, state: 'pr-open', replacedBy, note, updatedAt: at });
|
|
2274
|
+
return;
|
|
2275
|
+
}
|
|
2276
|
+
await api.closePull(old.pullNumber, `Replaced by #${newer.pullNumber}, which rebuilds this change on the current ${base}.`);
|
|
2277
|
+
deps.log(`deliver : ${old.goalId}: closed ${old.pullRequestUrl}, replaced by ${url}, which rebuilds it on the current ${base}`);
|
|
2278
|
+
await save(deps, { ...old, state: 'pr-open', done: true, replacedBy, note: `replaced by ${url}, which makes this change again on the current ${base}; closed`, updatedAt: at });
|
|
2279
|
+
}
|
|
2047
2280
|
/* ────────────────────────────────────────── where the merge got to ── */
|
|
2048
2281
|
/** How long a merged commit's deploys are followed for, so one done outside Looply is still seen. */
|
|
2049
2282
|
exports.FOLLOW_DEPLOYS_MS = 14 * 24 * 60 * 60_000;
|