@cleocode/core 2026.10.11 → 2026.10.12
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/build-provenance.json +2 -2
- package/dist/cloud/nexus-cloud-conflicts.d.ts +17 -4
- package/dist/cloud/nexus-cloud-conflicts.d.ts.map +1 -1
- package/dist/cloud/nexus-cloud-conflicts.js +43 -8
- package/dist/cloud/nexus-cloud-conflicts.js.map +1 -1
- package/dist/cloud/secret-seal.d.ts.map +1 -1
- package/dist/cloud/secret-seal.js +7 -3
- package/dist/cloud/secret-seal.js.map +1 -1
- package/dist/release/ci-evidence.d.ts +11 -0
- package/dist/release/ci-evidence.d.ts.map +1 -1
- package/dist/release/ci-evidence.js +19 -1
- package/dist/release/ci-evidence.js.map +1 -1
- package/dist/session/engine-ops.d.ts.map +1 -1
- package/dist/session/engine-ops.js +4 -1
- package/dist/session/engine-ops.js.map +1 -1
- package/dist/sessions/index.d.ts.map +1 -1
- package/dist/sessions/index.js +4 -1
- package/dist/sessions/index.js.map +1 -1
- package/dist/sessions/session-switch.d.ts.map +1 -1
- package/dist/sessions/session-switch.js +4 -1
- package/dist/sessions/session-switch.js.map +1 -1
- package/dist/sessions/snapshot.d.ts.map +1 -1
- package/dist/sessions/snapshot.js +4 -2
- package/dist/sessions/snapshot.js.map +1 -1
- package/dist/store/portable-bundle-import.d.ts.map +1 -1
- package/dist/store/portable-bundle-import.js +3 -0
- package/dist/store/portable-bundle-import.js.map +1 -1
- package/dist/store/sync/apply/applier.d.ts +16 -0
- package/dist/store/sync/apply/applier.d.ts.map +1 -1
- package/dist/store/sync/apply/applier.js +17 -3
- package/dist/store/sync/apply/applier.js.map +1 -1
- package/dist/store/sync/apply/resolve-conflict.d.ts +60 -0
- package/dist/store/sync/apply/resolve-conflict.d.ts.map +1 -0
- package/dist/store/sync/apply/resolve-conflict.js +198 -0
- package/dist/store/sync/apply/resolve-conflict.js.map +1 -0
- package/dist/store/sync/conflicts.d.ts +22 -2
- package/dist/store/sync/conflicts.d.ts.map +1 -1
- package/dist/store/sync/conflicts.js +41 -15
- package/dist/store/sync/conflicts.js.map +1 -1
- package/dist/store/sync/merge/rules.d.ts +10 -1
- package/dist/store/sync/merge/rules.d.ts.map +1 -1
- package/dist/store/sync/merge/rules.js +58 -2
- package/dist/store/sync/merge/rules.js.map +1 -1
- package/dist/store/sync/merge/types.d.ts +5 -5
- package/dist/store/sync/merge/types.d.ts.map +1 -1
- package/dist/store/sync/sealer.d.ts +5 -0
- package/dist/store/sync/sealer.d.ts.map +1 -1
- package/dist/store/sync/sealer.js +5 -1
- package/dist/store/sync/sealer.js.map +1 -1
- package/dist/store/vault-manifest.d.ts +14 -0
- package/dist/store/vault-manifest.d.ts.map +1 -1
- package/dist/store/vault-manifest.js +30 -0
- package/dist/store/vault-manifest.js.map +1 -1
- package/dist/tasks/affected-scope.d.ts +51 -1
- package/dist/tasks/affected-scope.d.ts.map +1 -1
- package/dist/tasks/affected-scope.js +177 -7
- package/dist/tasks/affected-scope.js.map +1 -1
- package/dist/tasks/complete-ci.d.ts +6 -3
- package/dist/tasks/complete-ci.d.ts.map +1 -1
- package/dist/tasks/complete-ci.js +32 -6
- package/dist/tasks/complete-ci.js.map +1 -1
- package/dist/tasks/complete.d.ts +11 -0
- package/dist/tasks/complete.d.ts.map +1 -1
- package/dist/tasks/complete.js +12 -2
- package/dist/tasks/complete.js.map +1 -1
- package/dist/tasks/test-run-binding.d.ts +14 -0
- package/dist/tasks/test-run-binding.d.ts.map +1 -1
- package/dist/tasks/test-run-binding.js +21 -0
- package/dist/tasks/test-run-binding.js.map +1 -1
- package/migrations/sync-journal/20261012120000_t13624-conflict-local/migration.sql +13 -0
- package/package.json +13 -13
- package/templates/CLEO-REFERENCE.md +1 -1
|
@@ -151,6 +151,39 @@ export declare function scopedRunCarriedAcrossMerge(atoms: ReadonlyArray<Evidenc
|
|
|
151
151
|
ok: false;
|
|
152
152
|
why: string;
|
|
153
153
|
};
|
|
154
|
+
/**
|
|
155
|
+
* Whether a targeted `test-run:` recorded on the default branch after the
|
|
156
|
+
* change merged stands in for merged CI that concluded without proving the
|
|
157
|
+
* change — red, or its required jobs skipped (T13623). The run tested the
|
|
158
|
+
* merged code as it is now, so it speaks for the change when CI on the merge
|
|
159
|
+
* commit cannot. Fails closed, and only `test-run:` reports qualify, because
|
|
160
|
+
* only they name the test files they ran:
|
|
161
|
+
* - the merge commit is known, and the change lists files;
|
|
162
|
+
* - every report carries the HEAD and tree it was bound to, that HEAD
|
|
163
|
+
* descends from the merge commit AND has landed on origin's default
|
|
164
|
+
* branch (a branch that merged main and added its own fix proves nothing
|
|
165
|
+
* about main, T13627), and the tree is still the current one (a report
|
|
166
|
+
* that predates a later edit of any file is refused);
|
|
167
|
+
* - the reports together cover the change's own files the way a
|
|
168
|
+
* pre-merge report must cover a branch ({@link testRunCoversChange}), and
|
|
169
|
+
* ran every test file the change added or edited that still exists.
|
|
170
|
+
*
|
|
171
|
+
* @param atoms - Recorded `testsPassed` atoms.
|
|
172
|
+
* @param changeSet - The merged change set (its merge commit, files and root).
|
|
173
|
+
* @param current - The current tree hash of that root, or null.
|
|
174
|
+
* @param landed - Whether a commit has landed on origin's default branch
|
|
175
|
+
* (`isLandedOnOriginDefault`; passed in so this module keeps loading
|
|
176
|
+
* change-set lazily).
|
|
177
|
+
* @returns `ok`, or why the recorded run does not stand in.
|
|
178
|
+
* @task T13623
|
|
179
|
+
* @task T13627
|
|
180
|
+
*/
|
|
181
|
+
export declare function scopedRunStandsAfterRedCi(atoms: ReadonlyArray<EvidenceAtom>, changeSet: Pick<TaskChangeSet, 'mergeCommitSha' | 'files' | 'executionRoot'> | null, current: string | null, landed: (root: string, sha: string) => boolean): {
|
|
182
|
+
ok: true;
|
|
183
|
+
} | {
|
|
184
|
+
ok: false;
|
|
185
|
+
why: string;
|
|
186
|
+
};
|
|
154
187
|
/**
|
|
155
188
|
* A merge verdict, with the merged change set when the caller derived one
|
|
156
189
|
* ({@link TaskMergeInfo} carries it), so a scoped result can be compared with
|
|
@@ -222,9 +255,26 @@ export interface TaskMergeInfo extends MergeVerdict {
|
|
|
222
255
|
* merged PR is named — every lookup answered, and none carries the change.
|
|
223
256
|
*/
|
|
224
257
|
unproven?: string;
|
|
225
|
-
/**
|
|
258
|
+
/**
|
|
259
|
+
* The carry target when no derived change set gives one: the commits landed
|
|
260
|
+
* with no merge commit (T13608), or a recorded `pr:` atom named the merge
|
|
261
|
+
* (T13634).
|
|
262
|
+
*/
|
|
226
263
|
landing?: LandedCarryTarget | null;
|
|
227
264
|
}
|
|
265
|
+
/**
|
|
266
|
+
* The carry target of a merge commit: the commit and every file it changed
|
|
267
|
+
* against its first parent, which for a squash or merge commit is exactly the
|
|
268
|
+
* PR's change (T13636). Fails closed: an unknown commit, a root commit, a git
|
|
269
|
+
* failure or an empty diff gives null.
|
|
270
|
+
*
|
|
271
|
+
* @param root - Repository the merge commit lives in.
|
|
272
|
+
* @param merge - The merge (or squash) commit.
|
|
273
|
+
* @returns The commit and the files it changed and deleted, or null.
|
|
274
|
+
* @task T13636
|
|
275
|
+
* @task T13637
|
|
276
|
+
*/
|
|
277
|
+
export declare function mergeCarryTarget(root: string, merge: string | null | undefined): LandedCarryTarget | null;
|
|
228
278
|
/**
|
|
229
279
|
* Whether a task's LATEST implementation has merged, and through which PR —
|
|
230
280
|
* the one function `cleo done` planning, `cleo complete` and a scope-aware
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"affected-scope.d.ts","sourceRoot":"","sources":["../../src/tasks/affected-scope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC5F,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EAEb,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"affected-scope.d.ts","sourceRoot":"","sources":["../../src/tasks/affected-scope.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
* @task T12965
|
|
20
20
|
*/
|
|
21
21
|
import { execFileSync } from 'node:child_process';
|
|
22
|
+
import { changedTestFiles, testRunCoversChange } from './test-run-binding.js';
|
|
22
23
|
/** What a failed `gh` lookup means for the caller, and the first thing to check. */
|
|
23
24
|
const GH_UNREACHABLE = 'gh unreachable — check `gh auth status`';
|
|
24
25
|
/** A full (unscoped) tool run that actually executed. */
|
|
@@ -224,14 +225,107 @@ export function scopedRunCarriedAcrossMerge(atoms, changeSet) {
|
|
|
224
225
|
};
|
|
225
226
|
identical = false;
|
|
226
227
|
}
|
|
227
|
-
if (!identical)
|
|
228
|
+
if (!identical) {
|
|
229
|
+
const differing = differingPaths(changeSet.executionRoot, tree, merge, paths);
|
|
228
230
|
return {
|
|
229
231
|
ok: false,
|
|
230
|
-
why: `the change's files at merge commit ${merge.slice(0, 12)} differ from the tree the scoped run tested (${tree.slice(0, 12)})`,
|
|
232
|
+
why: `the change's files at merge commit ${merge.slice(0, 12)} differ from the tree the scoped run tested (${tree.slice(0, 12)})${differing}`,
|
|
231
233
|
};
|
|
234
|
+
}
|
|
232
235
|
}
|
|
233
236
|
return { ok: true };
|
|
234
237
|
}
|
|
238
|
+
/** `: a, b, …` naming the compared paths that differ, or '' when git cannot say (T13637). */
|
|
239
|
+
function differingPaths(root, tree, merge, paths) {
|
|
240
|
+
try {
|
|
241
|
+
const out = execFileSync('git', ['diff', '--name-only', '--no-renames', tree, merge, '--', ...paths], { cwd: root, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'] });
|
|
242
|
+
const names = out.split('\n').filter(Boolean);
|
|
243
|
+
return names.length === 0
|
|
244
|
+
? ''
|
|
245
|
+
: `: ${names.slice(0, 5).join(', ')}${names.length > 5 ? ', …' : ''}`;
|
|
246
|
+
}
|
|
247
|
+
catch {
|
|
248
|
+
return '';
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
/**
|
|
252
|
+
* Whether a targeted `test-run:` recorded on the default branch after the
|
|
253
|
+
* change merged stands in for merged CI that concluded without proving the
|
|
254
|
+
* change — red, or its required jobs skipped (T13623). The run tested the
|
|
255
|
+
* merged code as it is now, so it speaks for the change when CI on the merge
|
|
256
|
+
* commit cannot. Fails closed, and only `test-run:` reports qualify, because
|
|
257
|
+
* only they name the test files they ran:
|
|
258
|
+
* - the merge commit is known, and the change lists files;
|
|
259
|
+
* - every report carries the HEAD and tree it was bound to, that HEAD
|
|
260
|
+
* descends from the merge commit AND has landed on origin's default
|
|
261
|
+
* branch (a branch that merged main and added its own fix proves nothing
|
|
262
|
+
* about main, T13627), and the tree is still the current one (a report
|
|
263
|
+
* that predates a later edit of any file is refused);
|
|
264
|
+
* - the reports together cover the change's own files the way a
|
|
265
|
+
* pre-merge report must cover a branch ({@link testRunCoversChange}), and
|
|
266
|
+
* ran every test file the change added or edited that still exists.
|
|
267
|
+
*
|
|
268
|
+
* @param atoms - Recorded `testsPassed` atoms.
|
|
269
|
+
* @param changeSet - The merged change set (its merge commit, files and root).
|
|
270
|
+
* @param current - The current tree hash of that root, or null.
|
|
271
|
+
* @param landed - Whether a commit has landed on origin's default branch
|
|
272
|
+
* (`isLandedOnOriginDefault`; passed in so this module keeps loading
|
|
273
|
+
* change-set lazily).
|
|
274
|
+
* @returns `ok`, or why the recorded run does not stand in.
|
|
275
|
+
* @task T13623
|
|
276
|
+
* @task T13627
|
|
277
|
+
*/
|
|
278
|
+
export function scopedRunStandsAfterRedCi(atoms, changeSet, current, landed) {
|
|
279
|
+
const merge = changeSet?.mergeCommitSha;
|
|
280
|
+
if (!changeSet || !merge)
|
|
281
|
+
return { ok: false, why: 'the merge commit is not known here' };
|
|
282
|
+
if (changeSet.files.length === 0)
|
|
283
|
+
return { ok: false, why: 'the merged change lists no files to cover' };
|
|
284
|
+
const runs = atoms.filter((a) => a.kind === 'test-run');
|
|
285
|
+
if (runs.length === 0 || atoms.some((a) => a.kind === 'tool' && a.scope === 'affected'))
|
|
286
|
+
return {
|
|
287
|
+
ok: false,
|
|
288
|
+
why: 'only test-run reports, which name the test files they ran, can stand in',
|
|
289
|
+
};
|
|
290
|
+
const root = changeSet.executionRoot;
|
|
291
|
+
for (const run of runs) {
|
|
292
|
+
if (!run.headSha || !run.treeHash)
|
|
293
|
+
return { ok: false, why: `test-run:${run.path} records no HEAD and tree to judge` };
|
|
294
|
+
if (run.treeHash !== current)
|
|
295
|
+
return {
|
|
296
|
+
ok: false,
|
|
297
|
+
why: `test-run:${run.path} ran on tree ${run.treeHash.slice(0, 12)}, but the tree is now ${current?.slice(0, 12) ?? 'unknown'}`,
|
|
298
|
+
};
|
|
299
|
+
try {
|
|
300
|
+
execFileSync('git', ['merge-base', '--is-ancestor', merge, run.headSha], {
|
|
301
|
+
cwd: root,
|
|
302
|
+
stdio: 'ignore',
|
|
303
|
+
});
|
|
304
|
+
}
|
|
305
|
+
catch {
|
|
306
|
+
return {
|
|
307
|
+
ok: false,
|
|
308
|
+
why: `test-run:${run.path} was recorded at ${run.headSha.slice(0, 12)}, which does not descend from merge commit ${merge.slice(0, 12)}`,
|
|
309
|
+
};
|
|
310
|
+
}
|
|
311
|
+
if (!landed(root, run.headSha))
|
|
312
|
+
return {
|
|
313
|
+
ok: false,
|
|
314
|
+
why: `test-run:${run.path} was recorded at ${run.headSha.slice(0, 12)}, which is not on origin's default branch; run it on the default branch`,
|
|
315
|
+
};
|
|
316
|
+
}
|
|
317
|
+
const ran = [...new Set(runs.flatMap((r) => r.testFiles ?? []))];
|
|
318
|
+
const covered = testRunCoversChange(root, changeSet.files, ran);
|
|
319
|
+
if (!covered.ok)
|
|
320
|
+
return { ok: false, why: covered.reason };
|
|
321
|
+
const unrun = changedTestFiles(root, changeSet.files).filter((f) => !ran.includes(f));
|
|
322
|
+
if (unrun.length > 0)
|
|
323
|
+
return {
|
|
324
|
+
ok: false,
|
|
325
|
+
why: `the test-run did not run the change's test file(s) ${unrun.slice(0, 5).join(', ')}${unrun.length > 5 ? ', …' : ''}`,
|
|
326
|
+
};
|
|
327
|
+
return { ok: true };
|
|
328
|
+
}
|
|
235
329
|
/**
|
|
236
330
|
* The carry target of commits that reached the default branch themselves.
|
|
237
331
|
* Fails closed: no single newest commit, or a git failure, gives `null`.
|
|
@@ -260,6 +354,65 @@ export function landedCarryTarget(root, commits, contains) {
|
|
|
260
354
|
}
|
|
261
355
|
return { mergeCommitSha: newest, files: [...files], deletedFiles: [], executionRoot: root };
|
|
262
356
|
}
|
|
357
|
+
/**
|
|
358
|
+
* The carry target of a merge commit: the commit and every file it changed
|
|
359
|
+
* against its first parent, which for a squash or merge commit is exactly the
|
|
360
|
+
* PR's change (T13636). Fails closed: an unknown commit, a root commit, a git
|
|
361
|
+
* failure or an empty diff gives null.
|
|
362
|
+
*
|
|
363
|
+
* @param root - Repository the merge commit lives in.
|
|
364
|
+
* @param merge - The merge (or squash) commit.
|
|
365
|
+
* @returns The commit and the files it changed and deleted, or null.
|
|
366
|
+
* @task T13636
|
|
367
|
+
* @task T13637
|
|
368
|
+
*/
|
|
369
|
+
export function mergeCarryTarget(root, merge) {
|
|
370
|
+
if (!merge)
|
|
371
|
+
return null;
|
|
372
|
+
let out;
|
|
373
|
+
try {
|
|
374
|
+
out = execFileSync('git', ['diff', '--name-status', '--no-renames', `${merge}^1`, merge], {
|
|
375
|
+
cwd: root,
|
|
376
|
+
encoding: 'utf-8',
|
|
377
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
378
|
+
});
|
|
379
|
+
}
|
|
380
|
+
catch {
|
|
381
|
+
return null;
|
|
382
|
+
}
|
|
383
|
+
const files = [];
|
|
384
|
+
const deletedFiles = [];
|
|
385
|
+
for (const line of out.split('\n')) {
|
|
386
|
+
const [status, path] = line.split('\t');
|
|
387
|
+
if (!status || !path)
|
|
388
|
+
continue;
|
|
389
|
+
(status === 'D' ? deletedFiles : files).push(path);
|
|
390
|
+
}
|
|
391
|
+
if (files.length + deletedFiles.length === 0)
|
|
392
|
+
return null;
|
|
393
|
+
return { mergeCommitSha: merge, files, deletedFiles, executionRoot: root };
|
|
394
|
+
}
|
|
395
|
+
/**
|
|
396
|
+
* The carry target a recorded `pr:` atom names: its merge commit and the files
|
|
397
|
+
* the PR changed — its own inventory, else the merge commit's real diff (never
|
|
398
|
+
* the task's `files:` atoms, which may list fewer files, T13636). Without a
|
|
399
|
+
* merge commit or any file there is nothing to compare, so null (T13634).
|
|
400
|
+
*/
|
|
401
|
+
function prCarryTarget(pr, root) {
|
|
402
|
+
if (!pr.mergeCommitSha)
|
|
403
|
+
return null;
|
|
404
|
+
if (!pr.changedPaths)
|
|
405
|
+
return mergeCarryTarget(root, pr.mergeCommitSha);
|
|
406
|
+
const deletedFiles = pr.deletedPaths ?? [];
|
|
407
|
+
if (pr.changedPaths.length + deletedFiles.length === 0)
|
|
408
|
+
return null;
|
|
409
|
+
return {
|
|
410
|
+
mergeCommitSha: pr.mergeCommitSha,
|
|
411
|
+
files: pr.changedPaths,
|
|
412
|
+
deletedFiles,
|
|
413
|
+
executionRoot: root,
|
|
414
|
+
};
|
|
415
|
+
}
|
|
263
416
|
function prRefOf(pr) {
|
|
264
417
|
return pr.componentPrNumber !== undefined
|
|
265
418
|
? `${pr.componentPrNumber}@${pr.prNumber}`
|
|
@@ -410,10 +563,17 @@ export async function taskChangeMergeState(task, storeRoot, deps = {}) {
|
|
|
410
563
|
}
|
|
411
564
|
};
|
|
412
565
|
const lookupFailed = () => failures.length > 0 ? { lookupFailed: [...new Set(failures)].join('; ') } : {};
|
|
566
|
+
// T12965 review M2: the same root `cleo done` reads the change set from.
|
|
567
|
+
const at = deps.executionRoot ?? cs.resolveChangeSetRoot(storeRoot, task.id).root;
|
|
413
568
|
if (commits.length === 0) {
|
|
414
569
|
const newest = prs[0];
|
|
415
570
|
if (newest)
|
|
416
|
-
return {
|
|
571
|
+
return {
|
|
572
|
+
state: 'merged',
|
|
573
|
+
changeSet: null,
|
|
574
|
+
prRef: prRefOf(newest),
|
|
575
|
+
landing: prCarryTarget(newest, at),
|
|
576
|
+
};
|
|
417
577
|
const changeSet = await derive();
|
|
418
578
|
derivedFailure(changeSet);
|
|
419
579
|
return {
|
|
@@ -423,8 +583,6 @@ export async function taskChangeMergeState(task, storeRoot, deps = {}) {
|
|
|
423
583
|
...lookupFailed(),
|
|
424
584
|
};
|
|
425
585
|
}
|
|
426
|
-
// T12965 review M2: the same root `cleo done` reads the change set from.
|
|
427
|
-
const at = deps.executionRoot ?? cs.resolveChangeSetRoot(storeRoot, task.id).root;
|
|
428
586
|
const probes = {
|
|
429
587
|
contains: deps.contains ?? cs.isAncestorCommit,
|
|
430
588
|
equivalent: deps.equivalent ?? cs.hasPatchEquivalent,
|
|
@@ -438,7 +596,12 @@ export async function taskChangeMergeState(task, storeRoot, deps = {}) {
|
|
|
438
596
|
};
|
|
439
597
|
for (const pr of prs) {
|
|
440
598
|
if (await carries(pr))
|
|
441
|
-
return {
|
|
599
|
+
return {
|
|
600
|
+
state: 'merged',
|
|
601
|
+
changeSet: null,
|
|
602
|
+
prRef: prRefOf(pr),
|
|
603
|
+
landing: prCarryTarget(pr, at),
|
|
604
|
+
};
|
|
442
605
|
}
|
|
443
606
|
const changeSet = await derive();
|
|
444
607
|
derivedFailure(changeSet);
|
|
@@ -467,8 +630,15 @@ export async function taskChangeMergeState(task, storeRoot, deps = {}) {
|
|
|
467
630
|
if (github.failed !== null)
|
|
468
631
|
failures.push(github.failed);
|
|
469
632
|
for (const pr of github.prs) {
|
|
633
|
+
// T13637: a commit-backed GitHub carrier names its merge commit, so a
|
|
634
|
+
// scoped run can be compared with the change that merged.
|
|
470
635
|
if (await carries(pr))
|
|
471
|
-
return {
|
|
636
|
+
return {
|
|
637
|
+
state: 'merged',
|
|
638
|
+
changeSet,
|
|
639
|
+
prRef: prRefOf(pr),
|
|
640
|
+
landing: mergeCarryTarget(at, pr.mergeCommitSha),
|
|
641
|
+
};
|
|
472
642
|
}
|
|
473
643
|
const isLanded = deps.isLanded ?? cs.isLandedOnOriginDefault;
|
|
474
644
|
if (commits.every((sha) => isLanded(at, sha))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"affected-scope.js","sourceRoot":"","sources":["../../src/tasks/affected-scope.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"affected-scope.js","sourceRoot":"","sources":["../../src/tasks/affected-scope.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,9 @@
|
|
|
11
11
|
*
|
|
12
12
|
* When CI does not hold, the refusal names the remedy that can work: still
|
|
13
13
|
* pending → wait for CI and retry; a final red, a skipped or missing required
|
|
14
|
-
* job, or a PR the `pr:` check refuses → fix CI, or record a
|
|
15
|
-
*
|
|
14
|
+
* job, or a PR the `pr:` check refuses → fix CI, or record a targeted
|
|
15
|
+
* `test-run:` on the default branch after the merge that covers the change
|
|
16
|
+
* (T13623), which then stands in for testsPassed. Never an open-ended wait on CI that has
|
|
16
17
|
* already concluded. When a lookup failed (`gh` unreachable, commits missing
|
|
17
18
|
* locally), which PR carries the change is unknown: nothing is recorded and
|
|
18
19
|
* the agent is told to retry or record `tool:test`, never to fix CI.
|
|
@@ -42,6 +43,8 @@ export interface MergedCiDeps {
|
|
|
42
43
|
* and the `test-run:` binding use (T12965 review M2).
|
|
43
44
|
*/
|
|
44
45
|
currentTree?: (storeRoot: string, taskId: string) => Promise<string | null> | string | null;
|
|
46
|
+
/** Whether a commit has landed on origin's default branch; defaults to `isLandedOnOriginDefault` (T13627). */
|
|
47
|
+
landed?: (root: string, sha: string) => boolean;
|
|
45
48
|
/** Canonical acceptance criteria of the task; defaults to the task store. */
|
|
46
49
|
acRows?: (storeRoot: string, taskId: string) => Promise<readonly AcRow[]>;
|
|
47
50
|
/** The gate write; defaults to `validateGateVerify`. */
|
|
@@ -64,7 +67,7 @@ export type MergedCiOutcome = {
|
|
|
64
67
|
/**
|
|
65
68
|
* The change merged and its required CI concluded without proving the
|
|
66
69
|
* gates (red, skipped or missing required jobs, or the PR is refused):
|
|
67
|
-
* fix CI, or record a
|
|
70
|
+
* fix CI, or record a covering test-run on the default branch (T13623).
|
|
68
71
|
*/
|
|
69
72
|
kind: 'ci-red';
|
|
70
73
|
/** Why the CI does not hold. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-ci.d.ts","sourceRoot":"","sources":["../../src/tasks/complete-ci.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"complete-ci.d.ts","sourceRoot":"","sources":["../../src/tasks/complete-ci.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACtF,OAAO,EAEL,KAAK,cAAc,EAMpB,MAAM,qBAAqB,CAAC;AAO7B,2DAA2D;AAC3D,MAAM,WAAW,YAAY;IAC3B,iEAAiE;IACjE,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB,0FAA0F;IAC1F,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;IAC7C;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IAC5F,8GAA8G;IAC9G,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IAChD,6EAA6E;IAC7E,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,KAAK,EAAE,CAAC,CAAC;IAC1E,wDAAwD;IACxD,WAAW,CAAC,EAAE,CACZ,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,gBAAgB,KACrB,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC;CAC9C;AAED,iDAAiD;AACjD,MAAM,MAAM,eAAe,GACvB;IACE,gEAAgE;IAChE,IAAI,EAAE,UAAU,CAAC;IACjB,8EAA8E;IAC9E,EAAE,EAAE,MAAM,CAAC;IACX,mCAAmC;IACnC,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B,GACD;IACE,8EAA8E;IAC9E,IAAI,EAAE,aAAa,CAAC;IACpB,oCAAoC;IACpC,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE;;;;OAIG;IACH,IAAI,EAAE,QAAQ,CAAC;IACf,gCAAgC;IAChC,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,yDAAyD;IACzD,IAAI,EAAE,SAAS,CAAC;IAChB,uEAAuE;IACvE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,sFAAsF;IACtF,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEN;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAQzD;AAqCD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,SAAS,gBAAgB,EAAE,EAC1C,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC,eAAe,CAAC,CA4I1B"}
|
|
@@ -11,8 +11,9 @@
|
|
|
11
11
|
*
|
|
12
12
|
* When CI does not hold, the refusal names the remedy that can work: still
|
|
13
13
|
* pending → wait for CI and retry; a final red, a skipped or missing required
|
|
14
|
-
* job, or a PR the `pr:` check refuses → fix CI, or record a
|
|
15
|
-
*
|
|
14
|
+
* job, or a PR the `pr:` check refuses → fix CI, or record a targeted
|
|
15
|
+
* `test-run:` on the default branch after the merge that covers the change
|
|
16
|
+
* (T13623), which then stands in for testsPassed. Never an open-ended wait on CI that has
|
|
16
17
|
* already concluded. When a lookup failed (`gh` unreachable, commits missing
|
|
17
18
|
* locally), which PR carries the change is unknown: nothing is recorded and
|
|
18
19
|
* the agent is told to retry or record `tool:test`, never to fix CI.
|
|
@@ -27,8 +28,8 @@
|
|
|
27
28
|
* @task T12965
|
|
28
29
|
*/
|
|
29
30
|
import { readCiSatisfies } from '../release/ci-evidence.js';
|
|
30
|
-
import { hasTreeBoundQaRun, qaRunTreeMismatchReason, taskChangeMergeState, testsPassedSupersededReason, } from './affected-scope.js';
|
|
31
|
-
import { resolveChangeSetRoot } from './change-set.js';
|
|
31
|
+
import { hasTreeBoundQaRun, qaRunTreeMismatchReason, scopedRunStandsAfterRedCi, taskChangeMergeState, testsPassedSupersededReason, } from './affected-scope.js';
|
|
32
|
+
import { isLandedOnOriginDefault, resolveChangeSetRoot } from './change-set.js';
|
|
32
33
|
import { captureTreeHash } from './tool-cache.js';
|
|
33
34
|
/** Gates merged CI can attest (D11149). */
|
|
34
35
|
const CI_GATES = ['testsPassed', 'qaPassed'];
|
|
@@ -125,6 +126,31 @@ export async function satisfyGatesFromMergedCi(task, storeRoot, requiredGates, d
|
|
|
125
126
|
return { kind: 'skipped', testsPassedReason, qaPassedReason };
|
|
126
127
|
}
|
|
127
128
|
const { state, prRef, changeSet, unproven, lookupFailed } = await mergeInfo();
|
|
129
|
+
// T13623: merged CI concluded without proving the change. A targeted
|
|
130
|
+
// test-run recorded on the default branch after the merge, covering the
|
|
131
|
+
// change, stands in for testsPassed; the refusal says why one did not.
|
|
132
|
+
const afterRedCi = async (refusal) => {
|
|
133
|
+
if (refusal.kind !== 'ci-red')
|
|
134
|
+
return refusal;
|
|
135
|
+
let why = 'no testsPassed is on record';
|
|
136
|
+
if (needs.includes('testsPassed') && task.verification?.gates?.testsPassed === true) {
|
|
137
|
+
const stands = scopedRunStandsAfterRedCi(task.verification?.evidence?.testsPassed?.atoms ?? [], changeSet ?? null, await (deps.currentTree ?? defaultCurrentTree)(storeRoot, task.id), deps.landed ?? isLandedOnOriginDefault);
|
|
138
|
+
const rest = needs.filter((g) => g !== 'testsPassed');
|
|
139
|
+
if (stands.ok && rest.length === 0)
|
|
140
|
+
return { kind: 'skipped', testsPassedReason: null, qaPassedReason: null };
|
|
141
|
+
why = stands.ok
|
|
142
|
+
? `${rest.join(', ')} still needs evidence (a qa-run of this tree)`
|
|
143
|
+
: stands.why;
|
|
144
|
+
}
|
|
145
|
+
else if (!needs.includes('testsPassed')) {
|
|
146
|
+
why = `${needs.join(', ')} still needs evidence (a qa-run of this tree)`;
|
|
147
|
+
}
|
|
148
|
+
return {
|
|
149
|
+
kind: 'ci-red',
|
|
150
|
+
reason: `${refusal.reason}. A targeted test-run recorded on the default branch after the merge, ` +
|
|
151
|
+
`covering every file of the change, can stand in for testsPassed (T13623), but ${why}`,
|
|
152
|
+
};
|
|
153
|
+
};
|
|
128
154
|
if (state !== 'merged')
|
|
129
155
|
return { kind: 'skipped', testsPassedReason, qaPassedReason };
|
|
130
156
|
if (prRef === null && lookupFailed !== undefined) {
|
|
@@ -148,7 +174,7 @@ export async function satisfyGatesFromMergedCi(task, storeRoot, requiredGates, d
|
|
|
148
174
|
...(changeSet?.warnings ?? []),
|
|
149
175
|
...(changeSet?.blockers.map((b) => b.message) ?? []),
|
|
150
176
|
].join(' ');
|
|
151
|
-
return ciRefusal(`the change has merged but no merged PR's required CI proves it${why ? ` (${why})` : ''}`);
|
|
177
|
+
return afterRedCi(ciRefusal(`the change has merged but no merged PR's required CI proves it${why ? ` (${why})` : ''}`));
|
|
152
178
|
}
|
|
153
179
|
const rows = await (deps.acRows ?? defaultAcRows)(storeRoot, task.id);
|
|
154
180
|
const note = `note:recorded by cleo complete from the required CI of merged PR #${prRef} (T12960)`;
|
|
@@ -179,7 +205,7 @@ export async function satisfyGatesFromMergedCi(task, storeRoot, requiredGates, d
|
|
|
179
205
|
const code = written.error?.code ?? 'E_INTERNAL';
|
|
180
206
|
const message = written.error?.message ?? 'unknown error';
|
|
181
207
|
if (code === 'E_EVIDENCE_TESTS_FAILED')
|
|
182
|
-
return ciRefusal(`ci:${prRef} does not hold: ${message}`);
|
|
208
|
+
return afterRedCi(ciRefusal(`ci:${prRef} does not hold: ${message}`));
|
|
183
209
|
// T13516: complete's write is cache-only (T13515), so a typed-gate cache
|
|
184
210
|
// refusal means the gates were never run here, not that the user passed
|
|
185
211
|
// --no-run: name the command that runs them.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-ci.js","sourceRoot":"","sources":["../../src/tasks/complete-ci.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"complete-ci.js","sourceRoot":"","sources":["../../src/tasks/complete-ci.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAIH,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EACL,iBAAiB,EAEjB,uBAAuB,EACvB,yBAAyB,EAEzB,oBAAoB,EACpB,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,2CAA2C;AAC3C,MAAM,QAAQ,GAAgC,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;AA8D1E;;;;;;;;;GASG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC9C,OAAO,CACL,yCAAyC,CAAC,IAAI,CAAC,MAAM,CAAC;QACtD,2EAA2E;QAC3E,CAAC,4GAA4G,CAAC,IAAI,CAChH,MAAM,CACP,CACF,CAAC;AACJ,CAAC;AAED,wFAAwF;AACxF,SAAS,cAAc,CAAC,IAAU,EAAE,IAAsB,EAAE,IAAsB;IAChF,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC;IAC7C,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,IAAI,EAAE,CAAC;IACtD,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CACzF,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAC3B,CAAC;IACF,OAAO,IAAI;SACR,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SACrC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;SACrC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;AAC3D,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,SAAiB,EACjB,MAAwB;IAExB,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;IAC3E,OAAO,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,kBAAkB,CAAC,SAAiB,EAAE,MAAc;IAC3D,OAAO,eAAe,CAAC,oBAAoB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;AACvE,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,SAAiB,EAAE,MAAc;IAC5D,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACtE,OAAO,CAAC,MAAM,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC9D,CAAC;AAED,iFAAiF;AACjF,SAAS,SAAS,CAAC,MAAc;IAC/B,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAClG,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,IAAU,EACV,SAAiB,EACjB,aAA0C,EAC1C,OAAqB,EAAE;IAEvB,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QACtB,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;IAE5E,IAAI,KAAgC,CAAC;IACrC,MAAM,SAAS,GAAG,KAAK,IAA4B,EAAE;QACnD,KAAK,KAAK,MAAM,oBAAoB,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAClE,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,MAAM,iBAAiB,GACrB,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,WAAW,KAAK,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;QAC/E,CAAC,CAAC,MAAM,2BAA2B,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,IAAI,EAAE,EAAE;YACvF,UAAU,EAAE,SAAS;YACrB,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,IAAI,kBAAkB,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC;SAChF,CAAC;QACJ,CAAC,CAAC,IAAI,CAAC;IACX,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC;IACnE,MAAM,cAAc,GAClB,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,KAAK,IAAI;QAC3C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC5B,iBAAiB,CAAC,OAAO,CAAC;QACxB,CAAC,CAAC,uBAAuB,CACrB,OAAO,EACP,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,kBAAkB,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CACnE;QACH,CAAC,CAAC,IAAI,CAAC;IACX,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAC1B,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI;QACtC,CAAC,CAAC,KAAK,aAAa,IAAI,iBAAiB,KAAK,IAAI,CAAC;QACnD,CAAC,CAAC,KAAK,UAAU,IAAI,cAAc,KAAK,IAAI,CAAC,CAChD,CAAC;IACF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;IAClG,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,IAAI,eAAe,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;QACtD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,iBAAiB,EAAE,cAAc,EAAE,CAAC;IAChE,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,SAAS,EAAE,CAAC;IAC9E,qEAAqE;IACrE,wEAAwE;IACxE,uEAAuE;IACvE,MAAM,UAAU,GAAG,KAAK,EAAE,OAAwB,EAA4B,EAAE;QAC9E,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,OAAO,CAAC;QAC9C,IAAI,GAAG,GAAG,6BAA6B,CAAC;QACxC,IAAI,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,WAAW,KAAK,IAAI,EAAE,CAAC;YACpF,MAAM,MAAM,GAAG,yBAAyB,CACtC,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,IAAI,EAAE,EACrD,SAAS,IAAI,IAAI,EACjB,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,kBAAkB,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,EAClE,IAAI,CAAC,MAAM,IAAI,uBAAuB,CACvC,CAAC;YACF,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC;YACtD,IAAI,MAAM,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;gBAChC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;YAC5E,GAAG,GAAG,MAAM,CAAC,EAAE;gBACb,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,+CAA+C;gBACnE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QACjB,CAAC;aAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YAC1C,GAAG,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,+CAA+C,CAAC;QAC3E,CAAC;QACD,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,MAAM,EACJ,GAAG,OAAO,CAAC,MAAM,wEAAwE;gBACzF,iFAAiF,GAAG,EAAE;SACzF,CAAC;IACJ,CAAC,CAAC;IACF,IAAI,KAAK,KAAK,QAAQ;QAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,iBAAiB,EAAE,cAAc,EAAE,CAAC;IACtF,IAAI,KAAK,KAAK,IAAI,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QACjD,oEAAoE;QACpE,2EAA2E;QAC3E,8BAA8B;QAC9B,OAAO;YACL,IAAI,EAAE,SAAS;YACf,iBAAiB;YACjB,cAAc;YACd,aAAa,EAAE,+EAA+E,YAAY,+BAA+B;SAC1I,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,sEAAsE;QACtE,uEAAuE;QACvE,yEAAyE;QACzE,oEAAoE;QACpE,MAAM,GAAG,GAAG;YACV,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/B,GAAG,CAAC,SAAS,EAAE,QAAQ,IAAI,EAAE,CAAC;YAC9B,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;SACrD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACZ,OAAO,UAAU,CACf,SAAS,CACP,iEAAiE,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1F,CACF,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,aAAa,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACtE,MAAM,IAAI,GAAG,qEAAqE,KAAK,WAAW,CAAC;IACnG,MAAM,YAAY,GAA8C,EAAE,CAAC;IACnE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1C,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,iBAAiB;gBACjB,cAAc;gBACd,aAAa,EAAE,0BAA0B,IAAI,mEAAmE,IAAI,CAAC,EAAE,WAAW,IAAI,mBAAmB,KAAK,cAAc,IAAI,CAAC,EAAE,SAAS;aAC7L,CAAC;QACJ,CAAC;QACD,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,kBAAkB,CAAC,CAAC,SAAS,EAAE;QACxE,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,YAAY;QACZ,KAAK,EAAE,eAAe;QACtB,sEAAsE;QACtE,0EAA0E;QAC1E,6EAA6E;QAC7E,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,OAAO;QAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC1E,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,EAAE,IAAI,IAAI,YAAY,CAAC;IACjD,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,EAAE,OAAO,IAAI,eAAe,CAAC;IAC1D,IAAI,IAAI,KAAK,yBAAyB;QACpC,OAAO,UAAU,CAAC,SAAS,CAAC,MAAM,KAAK,mBAAmB,OAAO,EAAE,CAAC,CAAC,CAAC;IACxE,yEAAyE;IACzE,wEAAwE;IACxE,6CAA6C;IAC7C,MAAM,UAAU,GAAG,IAAI,KAAK,uBAAuB,IAAI,IAAI,KAAK,mBAAmB,CAAC;IACpF,OAAO;QACL,IAAI,EAAE,SAAS;QACf,iBAAiB;QACjB,cAAc;QACd,aAAa,EAAE,UAAU;YACvB,CAAC,CAAC,MAAM,KAAK,uHAAuH,IAAI,sBAAsB,IAAI,CAAC,EAAE,8BAA8B,IAAI,CAAC,EAAE,EAAE;YAC5M,CAAC,CAAC,MAAM,KAAK,KAAK,IAAI,MAAM,OAAO,EAAE;KACxC,CAAC;AACJ,CAAC"}
|
package/dist/tasks/complete.d.ts
CHANGED
|
@@ -68,6 +68,11 @@ export interface CompleteTaskOptions {
|
|
|
68
68
|
* @task T11954 (DHQ-071)
|
|
69
69
|
*/
|
|
70
70
|
waiveDependsReason?: string;
|
|
71
|
+
/**
|
|
72
|
+
* The PR `cleo done --pr <n>` named: the merged-CI check derives the change
|
|
73
|
+
* set through it, as the plan did, so both judge the same carrier (T13637).
|
|
74
|
+
*/
|
|
75
|
+
prNumber?: number;
|
|
71
76
|
/**
|
|
72
77
|
* Optimistic-concurrency guard: the task version (`updatedAt`) the caller
|
|
73
78
|
* read. It is compared with the stored row inside the completion's write
|
|
@@ -251,6 +256,12 @@ export interface TaskCompleteEngineOptions {
|
|
|
251
256
|
* @task T11954 (DHQ-071)
|
|
252
257
|
*/
|
|
253
258
|
waiveDependsReason?: string;
|
|
259
|
+
/**
|
|
260
|
+
* The PR `cleo done --pr <n>` named.
|
|
261
|
+
* @see CompleteTaskOptions.prNumber
|
|
262
|
+
* @task T13637
|
|
263
|
+
*/
|
|
264
|
+
prNumber?: number;
|
|
254
265
|
/**
|
|
255
266
|
* Optimistic-concurrency guard (`--if-match`).
|
|
256
267
|
* @see CompleteTaskOptions.expectedUpdatedAt
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete.d.ts","sourceRoot":"","sources":["../../src/tasks/complete.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAGV,iBAAiB,EACjB,IAAI,EACJ,UAAU,EACV,OAAO,EAGR,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,KAAK,YAAY,EAA8B,MAAM,qBAAqB,CAAC;AAOpF,OAAO,EACL,KAAK,0BAA0B,EAEhC,MAAM,qCAAqC,CAAC;AAW7C,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAyCnF,qCAAqC;AACrC,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iFAAiF;IACjF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;OAWG;IACH,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;;;;OAQG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;GAKG;AACH,MAAM,WAAW,4BAA4B;IAC3C,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,mCAAmC;AACnC,MAAM,WAAW,kBAAkB;IACjC,0FAA0F;IAC1F,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,IAAI,EAAE,IAAI,CAAC;IACX,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC;IACtD;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;OAIG;IACH,OAAO,CAAC,EAAE,4BAA4B,CAAC;CACxC;AAsCD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAqB3F;AA4KD;;;;;;;;;GASG;AACH,wBAAsB,wBAAwB,CAAC,CAAC,EAC9C,QAAQ,EAAE,YAAY,EACtB,EAAE,EAAE,CAAC,EAAE,EAAE,mBAAmB,KAAK,OAAO,CAAC,CAAC,CAAC,GAC1C,OAAO,CAAC,CAAC,CAAC,CAEZ;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,mBAAmB,EAC5B,GAAG,CAAC,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,YAAY,GACtB,OAAO,CAAC,kBAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"complete.d.ts","sourceRoot":"","sources":["../../src/tasks/complete.ts"],"names":[],"mappings":"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"}
|