looply-cli 0.5.39 → 0.5.48
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/.src-hash +1 -1
- package/dist/account-standing.d.ts +23 -0
- package/dist/account-standing.d.ts.map +1 -0
- package/dist/account-standing.js +41 -0
- package/dist/account-standing.js.map +1 -0
- package/dist/autonomy-controller.d.ts.map +1 -1
- package/dist/autonomy-controller.js +6 -0
- package/dist/autonomy-controller.js.map +1 -1
- package/dist/autonomy-tick.d.ts.map +1 -1
- package/dist/autonomy-tick.js +20 -2
- package/dist/autonomy-tick.js.map +1 -1
- package/dist/bin.d.ts.map +1 -1
- package/dist/bin.js +5 -0
- package/dist/bin.js.map +1 -1
- package/dist/branch-delivery-wiring.d.ts +56 -1
- package/dist/branch-delivery-wiring.d.ts.map +1 -1
- package/dist/branch-delivery-wiring.js +135 -26
- package/dist/branch-delivery-wiring.js.map +1 -1
- package/dist/branch-delivery.d.ts +20 -0
- package/dist/branch-delivery.d.ts.map +1 -1
- package/dist/branch-delivery.js +78 -6
- package/dist/branch-delivery.js.map +1 -1
- package/dist/canary-cmd.d.ts +42 -0
- package/dist/canary-cmd.d.ts.map +1 -0
- package/dist/canary-cmd.js +242 -0
- package/dist/canary-cmd.js.map +1 -0
- package/dist/canary-wiring.d.ts +31 -0
- package/dist/canary-wiring.d.ts.map +1 -0
- package/dist/canary-wiring.js +139 -0
- package/dist/canary-wiring.js.map +1 -0
- package/dist/canary.d.ts +123 -0
- package/dist/canary.d.ts.map +1 -0
- package/dist/canary.js +259 -0
- package/dist/canary.js.map +1 -0
- package/dist/checkout-deps.d.ts +6 -0
- package/dist/checkout-deps.d.ts.map +1 -1
- package/dist/checkout-deps.js +11 -0
- package/dist/checkout-deps.js.map +1 -1
- package/dist/checkout-leftovers.d.ts.map +1 -1
- package/dist/checkout-leftovers.js +28 -21
- package/dist/checkout-leftovers.js.map +1 -1
- package/dist/coordinator-state.d.ts.map +1 -1
- package/dist/coordinator-state.js +6 -4
- package/dist/coordinator-state.js.map +1 -1
- package/dist/daemon-cmd.d.ts.map +1 -1
- package/dist/daemon-cmd.js +76 -1
- package/dist/daemon-cmd.js.map +1 -1
- package/dist/deliver-cmd.d.ts +11 -0
- package/dist/deliver-cmd.d.ts.map +1 -1
- package/dist/deliver-cmd.js +23 -0
- package/dist/deliver-cmd.js.map +1 -1
- package/dist/environment-hold.d.ts +32 -1
- package/dist/environment-hold.d.ts.map +1 -1
- package/dist/environment-hold.js +52 -5
- package/dist/environment-hold.js.map +1 -1
- package/dist/feature-report.d.ts +4 -2
- package/dist/feature-report.d.ts.map +1 -1
- package/dist/feature-report.js +47 -6
- package/dist/feature-report.js.map +1 -1
- package/dist/gate-health.d.ts +7 -0
- package/dist/gate-health.d.ts.map +1 -1
- package/dist/gate-health.js +11 -1
- package/dist/gate-health.js.map +1 -1
- package/dist/git-driver.d.ts +5 -0
- package/dist/git-driver.d.ts.map +1 -1
- package/dist/git-driver.js +8 -0
- package/dist/git-driver.js.map +1 -1
- package/dist/goal-adaptive.d.ts +25 -1
- package/dist/goal-adaptive.d.ts.map +1 -1
- package/dist/goal-adaptive.js +42 -1
- package/dist/goal-adaptive.js.map +1 -1
- package/dist/goal-compile.d.ts.map +1 -1
- package/dist/goal-compile.js +16 -0
- package/dist/goal-compile.js.map +1 -1
- package/dist/goal-gap.d.ts +35 -3
- package/dist/goal-gap.d.ts.map +1 -1
- package/dist/goal-gap.js +110 -11
- package/dist/goal-gap.js.map +1 -1
- package/dist/grant-waiting-wiring.d.ts +17 -1
- package/dist/grant-waiting-wiring.d.ts.map +1 -1
- package/dist/grant-waiting-wiring.js +29 -2
- package/dist/grant-waiting-wiring.js.map +1 -1
- package/dist/heroku-cli.d.ts +13 -1
- package/dist/heroku-cli.d.ts.map +1 -1
- package/dist/heroku-cli.js +15 -0
- package/dist/heroku-cli.js.map +1 -1
- package/dist/machine-settings.d.ts +11 -0
- package/dist/machine-settings.d.ts.map +1 -1
- package/dist/machine-settings.js +41 -0
- package/dist/machine-settings.js.map +1 -1
- package/dist/outcome-audit.d.ts +150 -0
- package/dist/outcome-audit.d.ts.map +1 -0
- package/dist/outcome-audit.js +310 -0
- package/dist/outcome-audit.js.map +1 -0
- package/dist/parts-attribution.d.ts +38 -0
- package/dist/parts-attribution.d.ts.map +1 -0
- package/dist/parts-attribution.js +61 -0
- package/dist/parts-attribution.js.map +1 -0
- package/dist/project-terminal.d.ts +3 -1
- package/dist/project-terminal.d.ts.map +1 -1
- package/dist/project-terminal.js +37 -5
- package/dist/project-terminal.js.map +1 -1
- package/dist/provider-accounts.d.ts +5 -1
- package/dist/provider-accounts.d.ts.map +1 -1
- package/dist/provider-accounts.js +1 -0
- package/dist/provider-accounts.js.map +1 -1
- package/dist/pursuit-delivery.d.ts +5 -20
- package/dist/pursuit-delivery.d.ts.map +1 -1
- package/dist/pursuit-delivery.js +30 -2
- package/dist/pursuit-delivery.js.map +1 -1
- package/dist/pursuit-ending.d.ts.map +1 -1
- package/dist/pursuit-ending.js +10 -0
- package/dist/pursuit-ending.js.map +1 -1
- package/dist/qa-feedback.d.ts +110 -0
- package/dist/qa-feedback.d.ts.map +1 -0
- package/dist/qa-feedback.js +353 -0
- package/dist/qa-feedback.js.map +1 -0
- package/dist/run-cmd.d.ts.map +1 -1
- package/dist/run-cmd.js +90 -7
- package/dist/run-cmd.js.map +1 -1
- package/dist/run-refusal-marks.d.ts +8 -1
- package/dist/run-refusal-marks.d.ts.map +1 -1
- package/dist/run-refusal-marks.js +14 -1
- package/dist/run-refusal-marks.js.map +1 -1
- package/dist/self-update.d.ts +440 -0
- package/dist/self-update.d.ts.map +1 -0
- package/dist/self-update.js +1006 -0
- package/dist/self-update.js.map +1 -0
- package/dist/serve-cmd.d.ts +32 -1
- package/dist/serve-cmd.d.ts.map +1 -1
- package/dist/serve-cmd.js +162 -7
- package/dist/serve-cmd.js.map +1 -1
- package/dist/serve.d.ts.map +1 -1
- package/dist/serve.js +3 -0
- package/dist/serve.js.map +1 -1
- package/dist/server-client.d.ts +32 -1
- package/dist/server-client.d.ts.map +1 -1
- package/dist/server-client.js +28 -0
- package/dist/server-client.js.map +1 -1
- package/dist/setup-check-wiring.d.ts +31 -0
- package/dist/setup-check-wiring.d.ts.map +1 -0
- package/dist/setup-check-wiring.js +195 -0
- package/dist/setup-check-wiring.js.map +1 -0
- package/dist/setup-check.d.ts +228 -0
- package/dist/setup-check.d.ts.map +1 -0
- package/dist/setup-check.js +632 -0
- package/dist/setup-check.js.map +1 -0
- package/dist/signals.d.ts +13 -0
- package/dist/signals.d.ts.map +1 -1
- package/dist/signals.js +26 -1
- package/dist/signals.js.map +1 -1
- package/dist/ticket-attachments.d.ts +31 -1
- package/dist/ticket-attachments.d.ts.map +1 -1
- package/dist/ticket-attachments.js +232 -9
- package/dist/ticket-attachments.js.map +1 -1
- package/dist/watchdog-wiring.d.ts +151 -0
- package/dist/watchdog-wiring.d.ts.map +1 -0
- package/dist/watchdog-wiring.js +406 -0
- package/dist/watchdog-wiring.js.map +1 -0
- package/dist/watchdog.d.ts +124 -0
- package/dist/watchdog.d.ts.map +1 -0
- package/dist/watchdog.js +444 -0
- package/dist/watchdog.js.map +1 -0
- package/package.json +4 -4
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.makeBranchDeliverer = makeBranchDeliverer;
|
|
4
|
+
exports.serverGoalWanted = serverGoalWanted;
|
|
4
5
|
exports.mirrored = mirrored;
|
|
5
6
|
exports.goalTextFrom = goalTextFrom;
|
|
6
7
|
exports.maintenanceOf = maintenanceOf;
|
|
@@ -18,6 +19,8 @@ const live_commit_1 = require("./live-commit");
|
|
|
18
19
|
const machine_secrets_1 = require("./machine-secrets");
|
|
19
20
|
const lane_claims_1 = require("./lane-claims");
|
|
20
21
|
const git_driver_1 = require("./git-driver");
|
|
22
|
+
const project_terminal_1 = require("./project-terminal");
|
|
23
|
+
const delivery_rules_1 = require("./delivery-rules");
|
|
21
24
|
const visual_proof_run_1 = require("./visual-proof-run");
|
|
22
25
|
const visual_proof_publish_1 = require("./visual-proof-publish");
|
|
23
26
|
function makeBranchDeliverer(opts) {
|
|
@@ -100,38 +103,114 @@ function makeBranchDeliverer(opts) {
|
|
|
100
103
|
git,
|
|
101
104
|
recordClaim: (record) => void (0, lane_claims_1.recordLaneClaim)(opts.cwd, record),
|
|
102
105
|
};
|
|
106
|
+
/** What one delivery of a goal's commit is asked to do: the same for the first delivery and a retry. */
|
|
107
|
+
const inputFor = (goalId, delivery, hold) => {
|
|
108
|
+
const m = modeFor(goalId);
|
|
109
|
+
if (m.capped !== null)
|
|
110
|
+
opts.log(`deliver : ${goalId}: ${m.capped}`);
|
|
111
|
+
// 🔴 Ship to test only with a test environment and nothing else deployed by the merge; else `pr`, saying why.
|
|
112
|
+
const safe = (0, branch_delivery_1.effectiveMode)(m.mode, { deploy: deploy(), environments: environments() });
|
|
113
|
+
if (safe.refused !== null)
|
|
114
|
+
opts.log(`deliver : ${goalId}: ${safe.refused}`);
|
|
115
|
+
return {
|
|
116
|
+
goalId,
|
|
117
|
+
goalText: goalTextFrom(opts.stateDir, goalId),
|
|
118
|
+
runId: delivery.runId,
|
|
119
|
+
sha: delivery.sha,
|
|
120
|
+
...(delivery.checks === undefined ? {} : { checks: delivery.checks }),
|
|
121
|
+
// A split goal's part opens for review and is never merged on its own (RBB-B-209).
|
|
122
|
+
mode: hold?.holdMerge ? 'pr' : safe.mode,
|
|
123
|
+
...(hold?.holdMerge ? { noAutoMerge: true } : {}),
|
|
124
|
+
maintenance: mirrored(opts.stateDir, goalId)?.maintenance ?? null,
|
|
125
|
+
modeCapped: m.capped,
|
|
126
|
+
modeNote: hold?.holdMerge ? `not merged automatically: ${hold.holdMerge}` : safe.refused,
|
|
127
|
+
claims: (0, lane_claims_1.readLaneClaims)(opts.cwd),
|
|
128
|
+
protectedBranches: opts.config.deliver?.protected ?? [],
|
|
129
|
+
dependsOn: mirrored(opts.stateDir, goalId)?.dependsOn ?? [],
|
|
130
|
+
reproduction: (0, bug_repro_1.reproductionReport)(new bug_repro_1.ReproStore(opts.stateDir).latest(goalId)),
|
|
131
|
+
clientRef: mirrored(opts.stateDir, goalId)?.clientRef ?? null,
|
|
132
|
+
// A bundle met in part: the pull request says which tickets it delivers.
|
|
133
|
+
...(delivery.parts === undefined ? {} : { parts: delivery.parts }),
|
|
134
|
+
};
|
|
135
|
+
};
|
|
136
|
+
const heroku = opts.heroku ?? (0, heroku_cli_1.nodeHerokuCli)();
|
|
103
137
|
return {
|
|
104
138
|
mode,
|
|
105
139
|
deliver: async (goalId, delivery, hold) => {
|
|
106
|
-
const
|
|
107
|
-
if (m.capped !== null)
|
|
108
|
-
opts.log(`deliver : ${goalId}: ${m.capped}`);
|
|
109
|
-
// 🔴 Ship to test only with a test environment and nothing else deployed by the merge; else `pr`, saying why.
|
|
110
|
-
const safe = (0, branch_delivery_1.effectiveMode)(m.mode, { deploy: deploy(), environments: environments() });
|
|
111
|
-
if (safe.refused !== null)
|
|
112
|
-
opts.log(`deliver : ${goalId}: ${safe.refused}`);
|
|
113
|
-
const report = await (0, branch_delivery_1.deliverBranch)(common, {
|
|
114
|
-
goalId,
|
|
115
|
-
goalText: goalTextFrom(opts.stateDir, goalId),
|
|
116
|
-
runId: delivery.runId,
|
|
117
|
-
sha: delivery.sha,
|
|
118
|
-
checks: delivery.checks,
|
|
119
|
-
// A split goal's part opens for review and is never merged on its own (RBB-B-209).
|
|
120
|
-
mode: hold?.holdMerge ? 'pr' : safe.mode,
|
|
121
|
-
...(hold?.holdMerge ? { noAutoMerge: true } : {}),
|
|
122
|
-
maintenance: mirrored(opts.stateDir, goalId)?.maintenance ?? null,
|
|
123
|
-
modeCapped: m.capped,
|
|
124
|
-
modeNote: hold?.holdMerge ? `not merged automatically: ${hold.holdMerge}` : safe.refused,
|
|
125
|
-
claims: (0, lane_claims_1.readLaneClaims)(opts.cwd),
|
|
126
|
-
protectedBranches: opts.config.deliver?.protected ?? [],
|
|
127
|
-
dependsOn: mirrored(opts.stateDir, goalId)?.dependsOn ?? [],
|
|
128
|
-
reproduction: (0, bug_repro_1.reproductionReport)(new bug_repro_1.ReproStore(opts.stateDir).latest(goalId)),
|
|
129
|
-
clientRef: mirrored(opts.stateDir, goalId)?.clientRef ?? null,
|
|
130
|
-
});
|
|
140
|
+
const report = await (0, branch_delivery_1.deliverBranch)(common, inputFor(goalId, delivery, hold));
|
|
131
141
|
// The screenshots go with the pull request and the ticket. Never fails the delivery.
|
|
132
142
|
await (opts.showScreens ?? showScreens)(goalId, delivery, report).catch((e) => opts.log(`visual : ${goalId}: ${e.message}`));
|
|
133
143
|
return report;
|
|
134
144
|
},
|
|
145
|
+
retry: async (goalId) => {
|
|
146
|
+
const e = store.get(goalId);
|
|
147
|
+
// The commit key 2 confirmed: a rebuild's original tip, so the rebuild already made is found, not made again.
|
|
148
|
+
const sha = e?.rebuiltFrom?.sha ?? e?.sha ?? '';
|
|
149
|
+
if (e === null || e.done === true || !/^[0-9a-f]{40}$/.test(sha))
|
|
150
|
+
return null;
|
|
151
|
+
const input = inputFor(goalId, { runId: null, sha, ...(e.checks === undefined ? {} : { checks: e.checks }), ...(e.parts === undefined ? {} : { parts: e.parts }) });
|
|
152
|
+
return (0, branch_delivery_1.deliverBranch)(common, e.noAutoMerge === true ? { ...input, noAutoMerge: true } : input);
|
|
153
|
+
},
|
|
154
|
+
backfill: (goalId, delivery, split) => (0, branch_delivery_1.deliverBranch)(common, { ...inputFor(goalId, delivery, split ? { holdMerge: project_terminal_1.SPLIT_HOLD_MERGE } : undefined), mode: 'pr' }),
|
|
155
|
+
landed: async (sha) => {
|
|
156
|
+
try {
|
|
157
|
+
const base = await git.baseRef();
|
|
158
|
+
if (base === null)
|
|
159
|
+
return null;
|
|
160
|
+
const exec = opts.exec ?? (0, git_driver_1.nodeGitExec)(opts.cwd);
|
|
161
|
+
// 🔴 Origin's base, fetched NOW: a stale copy would call new work "not landed" and deliver it again. No fetch, no answer.
|
|
162
|
+
const name = (0, delivery_rules_1.shortBranch)(base);
|
|
163
|
+
if ((await exec(['fetch', '--quiet', delivery_rules_1.DELIVERY_REMOTE, name])).code !== 0)
|
|
164
|
+
return null;
|
|
165
|
+
const ref = `refs/remotes/${delivery_rules_1.DELIVERY_REMOTE}/${name}`;
|
|
166
|
+
// Any git error is "cannot tell" (wait), never "not landed".
|
|
167
|
+
const ancestor = await exec(['merge-base', '--is-ancestor', sha, ref]);
|
|
168
|
+
if (ancestor.code === 0)
|
|
169
|
+
return true;
|
|
170
|
+
if (ancestor.code !== 1)
|
|
171
|
+
return null;
|
|
172
|
+
// Every commit not on the base has an equivalent patch there ("-"), none is new ("+").
|
|
173
|
+
const cherry = await exec(['cherry', ref, sha]);
|
|
174
|
+
if (cherry.code !== 0)
|
|
175
|
+
return null;
|
|
176
|
+
const lines = cherry.stdout.split(/\r?\n/).filter((l) => l.trim() !== '');
|
|
177
|
+
if (lines.length > 0 && lines.every((l) => l.startsWith('-')))
|
|
178
|
+
return true;
|
|
179
|
+
// A squash merge: merging the commit into the base would change nothing (no worktree, no index touched).
|
|
180
|
+
const merged = await exec(['merge-tree', '--write-tree', ref, sha]);
|
|
181
|
+
if (merged.code === 1)
|
|
182
|
+
return false; // it conflicts with the base: not in it
|
|
183
|
+
// A git older than 2.38 has no `merge-tree --write-tree` (usage error, 129): a squash cannot be seen, and cherry said it is new.
|
|
184
|
+
if (merged.code === 129)
|
|
185
|
+
return false;
|
|
186
|
+
const baseTree = await exec(['rev-parse', `${ref}^{tree}`]);
|
|
187
|
+
if (merged.code !== 0 || baseTree.code !== 0)
|
|
188
|
+
return null;
|
|
189
|
+
return merged.stdout.split(/\r?\n/)[0].trim() === baseTree.stdout.trim();
|
|
190
|
+
}
|
|
191
|
+
catch {
|
|
192
|
+
return null;
|
|
193
|
+
}
|
|
194
|
+
},
|
|
195
|
+
openUnder: async (goalId, sha) => {
|
|
196
|
+
const under = [];
|
|
197
|
+
for (const e of store.all()) {
|
|
198
|
+
if (e.goalId === goalId || e.done === true || e.state === 'merged' || e.state === 'deployed' || !/^[0-9a-f]{40}$/.test(e.sha))
|
|
199
|
+
continue;
|
|
200
|
+
if (e.sha === sha || (await git.isAncestor(e.sha, sha).catch(() => false)))
|
|
201
|
+
under.push({ goalId: e.goalId, pullRequestUrl: e.pullRequestUrl });
|
|
202
|
+
}
|
|
203
|
+
return under;
|
|
204
|
+
},
|
|
205
|
+
herokuLogins: async () => {
|
|
206
|
+
const wanted = environments().flatMap((env) => env.deploy.kind === 'push' && env.deploy.herokuAccount !== undefined
|
|
207
|
+
? [{ environment: env.name, app: env.deploy.herokuApp ?? env.deploy.remote, needs: env.deploy.herokuAccount }]
|
|
208
|
+
: []);
|
|
209
|
+
if (wanted.length === 0)
|
|
210
|
+
return [];
|
|
211
|
+
const who = await heroku.whoami().catch((err) => ({ ok: false, because: err.message }));
|
|
212
|
+
return wanted.map((w) => ({ ...w, signedInAs: who.ok ? who.account : null, because: who.ok ? null : who.because.slice(0, 200) }));
|
|
213
|
+
},
|
|
135
214
|
advance: () => (0, branch_delivery_1.advanceDeliveries)({
|
|
136
215
|
...common,
|
|
137
216
|
// The merge guard reads them fresh each pass: a run that started since is named too.
|
|
@@ -145,7 +224,7 @@ function makeBranchDeliverer(opts) {
|
|
|
145
224
|
runRelease: (command, env) => (opts.config.deliver?.release ? hostRelease(command, env) : containedRelease(command, env, 30 * 60_000).then((r) => ({ code: r.code, tail: r.stdout.slice(-2000) }))),
|
|
146
225
|
deployPush: opts.deployPush ?? (0, branch_delivery_1.makeDeployPush)(opts.cwd),
|
|
147
226
|
deployTip: (0, branch_delivery_1.makeDeployTip)(opts.cwd),
|
|
148
|
-
heroku
|
|
227
|
+
heroku,
|
|
149
228
|
liveCommit,
|
|
150
229
|
shipRequested: (goalId) => mirrored(opts.stateDir, goalId)?.shipRequestedAt ?? null,
|
|
151
230
|
// AutoRyn's per-component switch: merge when CI was already red on the base and Looply's checks pass (default off).
|
|
@@ -154,9 +233,39 @@ function makeBranchDeliverer(opts) {
|
|
|
154
233
|
// A conflict rebuild pushes under the same rules as a delivery; a newer attempt at a ticket supersedes an older one.
|
|
155
234
|
protectedBranches: () => opts.config.deliver?.protected ?? [],
|
|
156
235
|
clientRefOf: (goalId) => mirrored(opts.stateDir, goalId)?.clientRef ?? null,
|
|
236
|
+
// Just before each merge: the server's word on the goal, read now (a ticket closed since abandons it).
|
|
237
|
+
...(opts.client.goalAutonomy === undefined
|
|
238
|
+
? {}
|
|
239
|
+
: { goalStillWanted: (goalId) => serverGoalWanted(opts.stateDir, goalId, (g) => opts.client.goalAutonomy(opts.projectId, g)) }),
|
|
157
240
|
}),
|
|
158
241
|
};
|
|
159
242
|
}
|
|
243
|
+
/**
|
|
244
|
+
* DOES THE SERVER, READ NOW, STILL HAVE THIS GOAL WANTED? Active, and at the version this machine's newest grant for it
|
|
245
|
+
* answered (`autonomy.json`). Rejects when the server cannot be read: the caller waits, never guesses.
|
|
246
|
+
*/
|
|
247
|
+
async function serverGoalWanted(stateDir, goalId, read) {
|
|
248
|
+
const r = await read(goalId);
|
|
249
|
+
if (r.goal === null)
|
|
250
|
+
return { wanted: false, because: 'the goal no longer exists on the server' };
|
|
251
|
+
if (r.goal.state !== 'active')
|
|
252
|
+
return { wanted: false, because: `the goal is ${r.goal.state} on the server (its ticket was closed or withdrawn)` };
|
|
253
|
+
let answered = null;
|
|
254
|
+
try {
|
|
255
|
+
const raw = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(stateDir, 'autonomy.json'), 'utf8'));
|
|
256
|
+
for (const p of raw.progress ?? [])
|
|
257
|
+
if (p.goalId === goalId && typeof p.goalVersion === 'number')
|
|
258
|
+
answered = p.goalVersion;
|
|
259
|
+
}
|
|
260
|
+
catch {
|
|
261
|
+
answered = null;
|
|
262
|
+
}
|
|
263
|
+
if (answered !== null && r.goal.version !== answered) {
|
|
264
|
+
// A comment amended the goal: its new version is being worked. Wait for it, never hold (a same-commit answer merges).
|
|
265
|
+
return { wanted: false, because: `the goal was changed on the server since (version ${r.goal.version}; this work answered version ${answered})`, wait: true };
|
|
266
|
+
}
|
|
267
|
+
return { wanted: true };
|
|
268
|
+
}
|
|
160
269
|
/** One goal as the daemon's mirror (`goals.json`) holds it, or null. */
|
|
161
270
|
function mirrored(stateDir, goalId) {
|
|
162
271
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch-delivery-wiring.js","sourceRoot":"","sources":["../src/branch-delivery-wiring.ts"],"names":[],"mappings":";;AAuDA,kDA+JC;AAGD,4BA0BC;AAGD,oCAIC;AAGD,sCAIC;AAjQD,qEAAoE;AACpE,qDAA8D;AAC9D,qCAAuC;AACvC,yCAA2C;AAC3C,uCAQsB;AACtB,uDAW2B;AAC3B,2CAA6D;AAE7D,uEAAmG;AACnG,6CAA0E;AAC1E,6CAA6D;AAC7D,+CAAkG;AAClG,uDAAsD;AACtD,+CAAsF;AAGtF,6CAA2C;AAC3C,yDAAmD;AACnD,iEAAwE;AAkBxE,SAAgB,mBAAmB,CAAC,IAgBnC;IACC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,IAAA,iCAAe,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC9E,MAAM,KAAK,GAAG,IAAA,mCAAiB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,GAAgB,EAAE,CAAC,IAAA,4CAAkB,EAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;IAClG;;;OAGG;IACH,MAAM,OAAO,GAAG,CAAC,MAAc,EAAgD,EAAE,CAC/E,IAAA,6BAAsB,EAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,WAAW,IAAI,IAAI,CAAC,CAAC;IACvF,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,IAAA,uCAAa,EAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC/E,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,IAAA,iDAAwB,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,cAAc,IAAI,IAAI,CAAC;IACtG,MAAM,WAAW,GAAG,IAAA,mCAAiB,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC/D,MAAM,gBAAgB,GAAG,IAAA,2CAA0B,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;IAC3G,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,IAAA,6CAAmB,EAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3F,sFAAsF;IACtF,MAAM,UAAU,GACd,IAAI,CAAC,UAAU,IAAI,IAAA,kCAAoB,EAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,kCAAoB,CAAC,EAAE,IAAI,EAAE,IAAI,IAAA,mCAAiB,EAAC,kCAAoB,CAAC,EAAE,CAAC,CAAC;IACjJ,MAAM,MAAM,GACV,IAAI,CAAC,MAAM;QACX,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACrB,MAAM,CAAC,GAAG,MAAM,IAAA,wBAAW,GAAE,CAAC;YAC9B,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBACf,OAAO;oBACL,GAAG,EAAE,IAAI;oBACT,OAAO,EACL,+JAA+J;iBAClK,CAAC;YACJ,CAAC;YACD,MAAM,GAAG,GAAc,IAAA,0BAAa,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;YACtE,OAAO,EAAE,GAAG,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL;;;;;OAKG;IACH,MAAM,WAAW,GAAG,KAAK,EAAE,MAAc,EAAE,QAAqB,EAAE,MAAmC,EAAiB,EAAE;QACtH,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAa,EAAC;YAClC,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,WAAW,EAAE,IAAA,oBAAQ,EAAC,IAAI,CAAC,GAAG,CAAC;YAC/B,MAAM;YACN,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC;YAC7C,OAAO,EAAE,QAAQ,CAAC,GAAG;YACrB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YACnG,GAAG,EAAE,IAAI,CAAC,GAAG;SACd,CAAC,CAAC;QACH,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO;QAC7B,MAAM,EAAE,GAAG,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,uDAAuD,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC/H,MAAM,MAAM,GAAG,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,EAAE,CAAC,CAAC,CAAE,EAAE,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC;QACjE,MAAM,GAAG,GAAG,MAAM,IAAA,yCAAkB,EAClC;YACE,MAAM;YACN,OAAO;YACP,IAAI,EAAE,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAO,CAAC,cAAe,EAAE;YAClF,MAAM,EAAE,EAAE,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAE,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE;SACxH,EACD;YACE,GAAG,EAAE,IAAA,wBAAW,EAAC,IAAI,CAAC,GAAG,CAAC;YAC1B,MAAM,EAAE,IAAA,iCAAU,EAAC,IAAI,CAAC,GAAG,CAAC;YAC5B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;gBACnC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE;oBAClB,MAAO,IAAI,CAAC,MAAkD,CAAC,iBAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;gBAC9G,CAAC;gBACH,CAAC,CAAC,IAAI;YACR,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACrB,GAAG,EAAE,IAAI,CAAC,GAAG;SACd,CACF,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK;YAAE,IAAI,CAAC,GAAG,CAAC,aAAa,MAAM,KAAK,CAAC,EAAE,CAAC,CAAC;IACnE,CAAC,CAAC;IACF,MAAM,MAAM,GAAG;QACb,MAAM;QACN,KAAK;QACL,MAAM,EAAE,KAAK,EAAE,MAAc,EAAE,MAA4B,EAAE,EAAE;YAC7D,qFAAqF;YACrF,MAAM,YAAY,GAAG,IAAA,8BAAkB,EAAC,IAAI,sBAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;YACtF,MAAM,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;QAC/H,CAAC;QACD,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;QACrB,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,GAAG;QACH,WAAW,EAAE,CAAC,MAAuB,EAAE,EAAE,CAAC,KAAK,IAAA,6BAAe,EAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;KACjF,CAAC;IACF,OAAO;QACL,IAAI;QACJ,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAA6B,EAAE,EAAE;YACjE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YAC1B,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI;gBAAE,IAAI,CAAC,GAAG,CAAC,aAAa,MAAM,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;YACpE,8GAA8G;YAC9G,MAAM,IAAI,GAAG,IAAA,+BAAa,EAAC,CAAC,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;YACvF,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI;gBAAE,IAAI,CAAC,GAAG,CAAC,aAAa,MAAM,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5E,MAAM,MAAM,GAAG,MAAM,IAAA,+BAAa,EAChC,MAAM,EACN;gBACE,MAAM;gBACN,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAC7C,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,GAAG,EAAE,QAAQ,CAAC,GAAG;gBACjB,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,mFAAmF;gBACnF,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI;gBACxC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjD,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,WAAW,IAAI,IAAI;gBACjE,UAAU,EAAE,CAAC,CAAC,MAAM;gBACpB,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,6BAA6B,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO;gBACxF,MAAM,EAAE,IAAA,4BAAc,EAAC,IAAI,CAAC,GAAG,CAAC;gBAChC,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,IAAI,EAAE;gBACvD,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,SAAS,IAAI,EAAE;gBAC3D,YAAY,EAAE,IAAA,8BAAkB,EAAC,IAAI,sBAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC9E,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,SAAS,IAAI,IAAI;aAC9D,CACF,CAAC;YACF,qFAAqF;YACrF,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,MAAM,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YACrI,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,EAAE,GAAG,EAAE,CACZ,IAAA,mCAAiB,EAAC;YAChB,GAAG,MAAM;YACT,qFAAqF;YACrF,MAAM,EAAE,GAAG,EAAE,CAAC,IAAA,4BAAc,EAAC,IAAI,CAAC,GAAG,CAAC;YACtC,IAAI,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;YACjF,MAAM;YACN,YAAY;YACZ,wGAAwG;YACxG,4GAA4G;YAC5G,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,EAAE,OAAO,IAAI,IAAI;YAC/E,UAAU,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YACnM,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,IAAA,gCAAc,EAAC,IAAI,CAAC,GAAG,CAAC;YACvD,SAAS,EAAE,IAAA,+BAAa,EAAC,IAAI,CAAC,GAAG,CAAC;YAClC,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,IAAA,0BAAa,GAAE;YACtC,UAAU;YACV,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,eAAe,IAAI,IAAI;YACnF,oHAAoH;YACpH,cAAc,EAAE,GAAG,EAAE,CAAC,IAAA,iDAAwB,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,KAAK,IAAI;YACvG,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,eAAe,IAAI,EAAE;YACnF,qHAAqH;YACrH,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,IAAI,EAAE;YAC7D,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,SAAS,IAAI,IAAI;SAC5E,CAAC;KACL,CAAC;AACJ,CAAC;AAED,wEAAwE;AACxE,SAAgB,QAAQ,CACtB,QAAgB,EAChB,MAAc;IASd,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAA,gBAAI,EAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,CAA+C,CAAC;QACzH,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,CAAC;QAC5D,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QACjC,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI;YACtD,SAAS,EAAE,OAAO,CAAC,CAAC,WAAW,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI;YACrE,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,WAAW,CAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;YAC/H,eAAe,EAAE,OAAO,CAAC,CAAC,iBAAiB,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI;YACvF,eAAe,EAAE,IAAA,wBAAiB,EAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;YACxD,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;SAC7C,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,sGAAsG;AACtG,SAAgB,YAAY,CAAC,QAAgB,EAAE,MAAc;IAC3D,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,IAAI,IAAI,IAAI,CAAC;IACtD,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACnF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,sHAAsH;AACtH,SAAgB,aAAa,CAAC,CAAU;IACtC,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC/C,MAAM,CAAC,GAAG,IAAA,8BAAuB,EAAC,CAAC,CAAC,CAAC;IACrC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;AACrC,CAAC"}
|
|
1
|
+
{"version":3,"file":"branch-delivery-wiring.js","sourceRoot":"","sources":["../src/branch-delivery-wiring.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type ReproductionReport, type BranchDeliveryReport, type BranchDeliveryState, type DeliverMode, type DeployConfig, type DeployEnvironment, type DeployKind, type EnvStatus, type GoalMaintenance, type PromoteRequest } from '@looply/core';
|
|
2
|
+
import { type DeliveredPart } from '@looply/core';
|
|
2
3
|
import { type HerokuCli } from './heroku-cli';
|
|
3
4
|
import type { LiveCommitReader } from './live-commit';
|
|
4
5
|
import { type GitExec } from './git-driver';
|
|
@@ -228,6 +229,8 @@ export interface DeliveryEntry {
|
|
|
228
229
|
* "Approve and ship" merges it.
|
|
229
230
|
*/
|
|
230
231
|
noAutoMerge?: boolean;
|
|
232
|
+
/** A bundle met in part: its parts, kept so a retried delivery is held the same way (`deliverOnce`). */
|
|
233
|
+
parts?: DeliveredPart[];
|
|
231
234
|
/**
|
|
232
235
|
* Looply's own gate outcomes for the delivered commit (`typecheck: passed`, …), as key 2 recorded
|
|
233
236
|
* them. Under ship to test, when the repository reports no CI at all, these are the checks.
|
|
@@ -358,7 +361,11 @@ export interface DeliverInput {
|
|
|
358
361
|
readonly modeNote?: string | null;
|
|
359
362
|
/** The goal's `clientRef`, kept on the delivery so a later attempt at the same ticket can supersede it. */
|
|
360
363
|
readonly clientRef?: string | null;
|
|
364
|
+
/** A bundle met in part (core `goal-parts.ts`): which tickets this pull request delivers, and which it does not. */
|
|
365
|
+
readonly parts?: readonly DeliveredPart[] | null;
|
|
361
366
|
}
|
|
367
|
+
/** The pull request's line for a bundle met in part, or null. */
|
|
368
|
+
export declare function partsLine(parts: readonly DeliveredPart[] | null | undefined): string | null;
|
|
362
369
|
export interface DeliverDeps {
|
|
363
370
|
readonly git: DeliveryGit;
|
|
364
371
|
/** A client for owner/repo, or the plain reason there is none (no credentials). */
|
|
@@ -421,6 +428,7 @@ export declare function pullBody(input: {
|
|
|
421
428
|
maintenance?: GoalMaintenance | null;
|
|
422
429
|
modeCapped?: string | null;
|
|
423
430
|
reproduction?: ReproductionReport | null;
|
|
431
|
+
parts?: readonly DeliveredPart[] | null;
|
|
424
432
|
}): string;
|
|
425
433
|
/**
|
|
426
434
|
* Push a satisfied goal's branch and open its pull request. Idempotent: a goal
|
|
@@ -482,6 +490,18 @@ export interface ReleaseOutcome {
|
|
|
482
490
|
readonly tail: string;
|
|
483
491
|
}
|
|
484
492
|
export interface AdvanceDeps extends DeliverDeps {
|
|
493
|
+
/**
|
|
494
|
+
* Does the goal still want its change merged — the server, read now (active, at the version the work answered)?
|
|
495
|
+
* Asked just before every merge. `wait`: not now, ask again next pass (the goal changed and its new version is still
|
|
496
|
+
* being worked) — never a hold. Throws (or rejects) when it cannot tell: nothing is merged that pass. Absent: not asked.
|
|
497
|
+
*/
|
|
498
|
+
goalStillWanted?(goalId: string): Promise<{
|
|
499
|
+
wanted: true;
|
|
500
|
+
} | {
|
|
501
|
+
wanted: false;
|
|
502
|
+
because: string;
|
|
503
|
+
wait?: boolean;
|
|
504
|
+
}>;
|
|
485
505
|
/**
|
|
486
506
|
* The lane claims as they are NOW (re-read each pass), for the merge guard's "whose commits
|
|
487
507
|
* are these". Absent: no claims — only origin then says a branch is another goal's.
|
|
@@ -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
|
@@ -9,6 +9,7 @@ exports.fileDeliveryStore = fileDeliveryStore;
|
|
|
9
9
|
exports.memoryDeliveryStore = memoryDeliveryStore;
|
|
10
10
|
exports.findGoalBranch = findGoalBranch;
|
|
11
11
|
exports.stackedOn = stackedOn;
|
|
12
|
+
exports.partsLine = partsLine;
|
|
12
13
|
exports.summarizeChanges = summarizeChanges;
|
|
13
14
|
exports.deliveryStall = deliveryStall;
|
|
14
15
|
exports.pullTitle = pullTitle;
|
|
@@ -34,7 +35,7 @@ const node_child_process_1 = require("node:child_process");
|
|
|
34
35
|
const node_fs_1 = require("node:fs");
|
|
35
36
|
const node_path_1 = require("node:path");
|
|
36
37
|
const core_1 = require("@looply/core");
|
|
37
|
-
const core_2 = require("@looply/core"); //
|
|
38
|
+
const core_2 = require("@looply/core"); // values, beside the types above
|
|
38
39
|
const heroku_cli_1 = require("./heroku-cli");
|
|
39
40
|
const delivery_rules_1 = require("./delivery-rules");
|
|
40
41
|
const git_driver_1 = require("./git-driver");
|
|
@@ -364,6 +365,17 @@ async function stackedOn(git, input) {
|
|
|
364
365
|
return null;
|
|
365
366
|
return { branch: pick.name, onOrigin: input.onOrigin.has(pick.name), goalId: goalOfBranch(input.claims, pick.name) };
|
|
366
367
|
}
|
|
368
|
+
/** The pull request's line for a bundle met in part, or null. */
|
|
369
|
+
function partsLine(parts) {
|
|
370
|
+
if (!parts || parts.length === 0)
|
|
371
|
+
return null;
|
|
372
|
+
const met = parts.filter((p) => p.met).map((p) => p.ref);
|
|
373
|
+
const open = parts.filter((p) => !p.met).map((p) => p.ref);
|
|
374
|
+
if (met.length === 0)
|
|
375
|
+
return null;
|
|
376
|
+
return (`- Delivers ${(0, core_2.partList)(met)}.` +
|
|
377
|
+
(open.length === 0 ? '' : ` Not ${(0, core_2.partList)(open)}: ${open.length === 1 ? 'it waits' : 'they wait'} for a person's answer on ${open.length === 1 ? 'its ticket' : 'their tickets'}, and any of ${open.length === 1 ? 'its' : 'their'} work in this branch is not claimed as done.`));
|
|
378
|
+
}
|
|
367
379
|
/** `git diff --numstat` and `git log --format=%h%x09%s` as a bounded summary (no file content). */
|
|
368
380
|
function summarizeChanges(numstat, log) {
|
|
369
381
|
const rows = numstat.split(/\r?\n/).filter((l) => l.trim() !== '');
|
|
@@ -476,6 +488,7 @@ function maintenanceSection(m) {
|
|
|
476
488
|
return out;
|
|
477
489
|
}
|
|
478
490
|
function pullBody(input) {
|
|
491
|
+
const partsNote = partsLine(input.parts);
|
|
479
492
|
const r = input.reproduction ?? null;
|
|
480
493
|
const quoted = input.goalText.trim().slice(0, 3000).split(/\r?\n/).map((l) => `> ${l}`).join('\n');
|
|
481
494
|
const checks = Object.entries(input.checks ?? {}).map(([k, v]) => `${k} ${v}`).join(', ');
|
|
@@ -485,6 +498,7 @@ function pullBody(input) {
|
|
|
485
498
|
quoted,
|
|
486
499
|
'',
|
|
487
500
|
`- Branch: \`${input.branch}\` at ${input.sha.slice(0, 12)}`,
|
|
501
|
+
...(partsNote === null ? [] : [partsNote]),
|
|
488
502
|
...(checks === '' ? [] : [`- Checks Looply ran before keeping the work: ${checks}`]),
|
|
489
503
|
...(r === null
|
|
490
504
|
? []
|
|
@@ -563,6 +577,7 @@ async function deliverOnce(deps, input) {
|
|
|
563
577
|
...((input.maintenance && !input.maintenance.autoMerge) || input.noAutoMerge === true ? { noAutoMerge: true } : {}),
|
|
564
578
|
...(input.checks ? { checks: { ...input.checks } } : {}),
|
|
565
579
|
...(input.clientRef ? { clientRef: input.clientRef } : {}),
|
|
580
|
+
...(input.parts ? { parts: input.parts.map((p) => ({ ...p })) } : {}),
|
|
566
581
|
state: 'not-pushed',
|
|
567
582
|
note: null,
|
|
568
583
|
dependsOn: null,
|
|
@@ -583,6 +598,13 @@ async function deliverOnce(deps, input) {
|
|
|
583
598
|
: `no ${integrator_1.RUN_BRANCH_PREFIX}* branch on this machine holds commit ${input.sha.slice(0, 12)}`);
|
|
584
599
|
}
|
|
585
600
|
const original = { name: found.name, sha: found.sha };
|
|
601
|
+
// 🔴 A BUNDLE MET IN PART was attributed at the commit key 2 confirmed (`input.sha`). The branch that goes out holds
|
|
602
|
+
// more than that when its tip moved on (and a rebuild replays up to that tip): those commits were never attributed
|
|
603
|
+
// to a ticket, so it opens for review and is never merged on its own.
|
|
604
|
+
if (input.parts?.some((p) => !p.met) === true && found.sha !== input.sha && input.noAutoMerge !== true) {
|
|
605
|
+
const note = `not merged automatically: ${found.name} has commits after ${input.sha.slice(0, 12)}, the commit whose tickets were checked, and an open ticket's work may be among them`;
|
|
606
|
+
input = { ...input, mode: 'pr', noAutoMerge: true, modeNote: input.modeNote ? `${input.modeNote}; ${note}` : note };
|
|
607
|
+
}
|
|
586
608
|
let branch = found.name;
|
|
587
609
|
let tip = found.sha;
|
|
588
610
|
// Already done at this tip — as it is, or as its rebuild: say it again (the server may have missed it), do nothing else.
|
|
@@ -668,6 +690,13 @@ async function deliverOnce(deps, input) {
|
|
|
668
690
|
? deps.store.get(stack.goalId)
|
|
669
691
|
: null;
|
|
670
692
|
const replacing = repairs !== null && repairs.pullNumber !== null && repairs.state === 'checks-failed' ? repairs : null;
|
|
693
|
+
// A fix-up holds everything the red one held: one a person had to merge (a held bundle, a split part, a maintenance
|
|
694
|
+
// upgrade Looply may not merge) is still a person's to merge once it carries the fix.
|
|
695
|
+
const inheritsHold = replacing?.noAutoMerge === true && entry.noAutoMerge !== true;
|
|
696
|
+
if (inheritsHold) {
|
|
697
|
+
const why = `not merged automatically: it replaces ${replacing.pullRequestUrl ?? 'a pull request'}, which Looply was not to merge on its own`;
|
|
698
|
+
input = { ...input, mode: 'pr', noAutoMerge: true, modeNote: input.modeNote ? `${input.modeNote}; ${why}` : why };
|
|
699
|
+
}
|
|
671
700
|
const prBase = replacing === null && stack !== null && stack.onOrigin ? stack.branch : projectBase;
|
|
672
701
|
if (prBase === null) {
|
|
673
702
|
return save(deps, { ...entry, note: `pushed ${branch} to origin, but no pull request was opened: the project's base branch could not be found (set run.base_branch)` });
|
|
@@ -699,6 +728,7 @@ async function deliverOnce(deps, input) {
|
|
|
699
728
|
maintenance: input.maintenance ?? null,
|
|
700
729
|
modeCapped: input.modeCapped ?? null,
|
|
701
730
|
reproduction: input.reproduction ?? null,
|
|
731
|
+
parts: input.parts ?? null,
|
|
702
732
|
}),
|
|
703
733
|
});
|
|
704
734
|
deps.log(`deliver : opened ${pull.url} (${branch} → ${prBase})`);
|
|
@@ -753,6 +783,7 @@ async function deliverOnce(deps, input) {
|
|
|
753
783
|
return save(deps, {
|
|
754
784
|
...entry,
|
|
755
785
|
...(changes === null ? {} : { changes }),
|
|
786
|
+
...(inheritsHold ? { mode: 'pr', noAutoMerge: true } : {}),
|
|
756
787
|
pullNumber: pull.number,
|
|
757
788
|
pullRequestUrl: pull.url,
|
|
758
789
|
base: pull.base || prBase,
|
|
@@ -968,6 +999,8 @@ function decideChecks(required, checks) {
|
|
|
968
999
|
const waiting = checks.filter((c) => c.state === 'pending').map((c) => c.name);
|
|
969
1000
|
return waiting.length > 0 ? { kind: 'pending', waiting } : { kind: 'green' };
|
|
970
1001
|
}
|
|
1002
|
+
/** The last merge wait said per goal (`goalStillWanted`): each reason is logged once, not every pass. */
|
|
1003
|
+
const mergeWaitSaid = new Map();
|
|
971
1004
|
/**
|
|
972
1005
|
* THE MODE IN FORCE, WITH SHIP TO TEST'S SAFETY APPLIED: `test` whose settings `shipToTestRefusal`
|
|
973
1006
|
* refuses is `pr`, and the reason comes with it. Every other mode is as asked.
|
|
@@ -1408,6 +1441,31 @@ async function advanceOne(deps, e) {
|
|
|
1408
1441
|
}
|
|
1409
1442
|
return;
|
|
1410
1443
|
}
|
|
1444
|
+
/**
|
|
1445
|
+
* 🔴 THE TICKET STILL WANTS IT, READ NOW. A person can close a ticket between the delivery and the merge (AutoRyn then
|
|
1446
|
+
* abandons its goal); the server, asked just before merging, has the last word. Abandoned or gone: held for a
|
|
1447
|
+
* person, never merged. Changed since (a comment amended the goal) or unreadable: NOT A HOLD — not merged this pass,
|
|
1448
|
+
* asked again on the next, so the change merges as soon as the goal wants it again (a same-commit re-delivery keeps
|
|
1449
|
+
* this entry). Each wait is logged once per change of reason, so a rotated token never stalls merges silently.
|
|
1450
|
+
*/
|
|
1451
|
+
if (deps.goalStillWanted !== undefined) {
|
|
1452
|
+
const w = await deps.goalStillWanted(e.goalId).catch((err) => ({ wanted: false, because: `the server could not be asked whether the goal still wants it (${err.message.slice(0, 160)})`, wait: true }));
|
|
1453
|
+
if (!w.wanted && w.wait === true) {
|
|
1454
|
+
if (mergeWaitSaid.get(e.goalId) !== w.because) {
|
|
1455
|
+
mergeWaitSaid.set(e.goalId, w.because);
|
|
1456
|
+
deps.log(`deliver : ${e.goalId}: not merged this pass — ${w.because}; asked again on the next`);
|
|
1457
|
+
}
|
|
1458
|
+
return;
|
|
1459
|
+
}
|
|
1460
|
+
mergeWaitSaid.delete(e.goalId);
|
|
1461
|
+
if (!w.wanted) {
|
|
1462
|
+
const note = `not merged: ${w.because}; a person decides`;
|
|
1463
|
+
deps.log(`deliver : ${e.goalId}: ${note}`);
|
|
1464
|
+
if (e.state !== 'pr-open' || e.note !== note)
|
|
1465
|
+
await save(deps, { ...e, state: 'pr-open', note, updatedAt: at });
|
|
1466
|
+
return;
|
|
1467
|
+
}
|
|
1468
|
+
}
|
|
1411
1469
|
const merged = await api.merge(pull.number, pull.headSha, pullTitle(e.goalText));
|
|
1412
1470
|
if (!merged.merged) {
|
|
1413
1471
|
await save(deps, { ...e, state: 'checks-failed', failedHead: pull.headSha || e.sha, note: `checks allow it but GitHub would not merge: ${merged.message}`, updatedAt: at });
|
|
@@ -1710,11 +1768,25 @@ function sameRequest(a, b) {
|
|
|
1710
1768
|
}
|
|
1711
1769
|
/** Close `old` as superseded by `newer` when every rule above holds; true when it was closed. */
|
|
1712
1770
|
async function supersede(deps, old, newer) {
|
|
1713
|
-
|
|
1714
|
-
|
|
1715
|
-
|
|
1716
|
-
|
|
1717
|
-
|
|
1771
|
+
/**
|
|
1772
|
+
* 🔴 ONLY WHAT LANDS COUNTS: the delivered tip (`sha`), never the original a rebuild was made from.
|
|
1773
|
+
* A `-solo` rebuild drops the commits it was stacked on, so its original contains the older head
|
|
1774
|
+
* while the pull request does not (RBB-B-214 attempt 2 on PR #3, 2026-10-23): closing #3 as
|
|
1775
|
+
* "carried" would drop that work and merge the rest under the ticket.
|
|
1776
|
+
*/
|
|
1777
|
+
const contains = newer.sha === old.sha || (await deps.git.isAncestor(old.sha, newer.sha).catch(() => false));
|
|
1778
|
+
/**
|
|
1779
|
+
* 🔴 AND NEVER WHEN THE NEWER ONE WAS BUILT ON THE OLDER WORK AND LEFT IT OUT — not even as "the same
|
|
1780
|
+
* request again": a retry or a reassignment reuses the wording, and closing the older pull request
|
|
1781
|
+
* then drops its commits from the ticket for good (the likely real RBB-B-214 path).
|
|
1782
|
+
*/
|
|
1783
|
+
if (!contains) {
|
|
1784
|
+
if ((newer.rebuiltFrom?.without ?? []).some((w) => w.goalId === old.goalId || w.branch === old.branch))
|
|
1785
|
+
return false;
|
|
1786
|
+
const original = newer.rebuiltFrom?.sha;
|
|
1787
|
+
if (original !== undefined && (original === old.sha || (await deps.git.isAncestor(old.sha, original).catch(() => true))))
|
|
1788
|
+
return false;
|
|
1789
|
+
}
|
|
1718
1790
|
if (!contains && !sameRequest(old.goalText, newer.goalText))
|
|
1719
1791
|
return false;
|
|
1720
1792
|
const client = await deps.github(old.owner, old.repo);
|