@cleocode/core 2026.9.21 → 2026.9.22
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/agents/scaffold.d.ts.map +1 -1
- package/dist/agents/scaffold.js +0 -1
- package/dist/agents/scaffold.js.map +1 -1
- package/dist/bootstrap.d.ts.map +1 -1
- package/dist/bootstrap.js +4 -0
- package/dist/bootstrap.js.map +1 -1
- package/dist/dispatch/mutate-projection.d.ts.map +1 -1
- package/dist/dispatch/mutate-projection.js +5 -0
- package/dist/dispatch/mutate-projection.js.map +1 -1
- package/dist/docs/docs-update.d.ts.map +1 -1
- package/dist/docs/docs-update.js +25 -9
- package/dist/docs/docs-update.js.map +1 -1
- package/dist/docs/export-document.js +323 -238
- package/dist/docs/export-document.js.map +3 -3
- package/dist/doctor/knowledge.d.ts +16 -1
- package/dist/doctor/knowledge.d.ts.map +1 -1
- package/dist/doctor/knowledge.js +53 -17
- package/dist/doctor/knowledge.js.map +1 -1
- package/dist/engine/engine-ops.d.ts +36 -6
- package/dist/engine/engine-ops.d.ts.map +1 -1
- package/dist/engine/engine-ops.js +115 -14
- package/dist/engine/engine-ops.js.map +1 -1
- package/dist/gateway-client/generated/types.gen.d.ts +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/init.d.ts.map +1 -1
- package/dist/init.js +51 -11
- package/dist/init.js.map +1 -1
- package/dist/inject/index.d.ts.map +1 -1
- package/dist/inject/index.js +8 -3
- package/dist/inject/index.js.map +1 -1
- package/dist/internal.d.ts +2 -2
- package/dist/internal.d.ts.map +1 -1
- package/dist/internal.js +1 -1
- package/dist/internal.js.map +1 -1
- package/dist/llm/plugin-facade.js +323 -238
- package/dist/llm/plugin-facade.js.map +3 -3
- package/dist/memory/attention.d.ts.map +1 -1
- package/dist/memory/attention.js +2 -2
- package/dist/memory/attention.js.map +1 -1
- package/dist/nexus/analyze-orchestrator.d.ts +38 -0
- package/dist/nexus/analyze-orchestrator.d.ts.map +1 -1
- package/dist/nexus/analyze-orchestrator.js +96 -21
- package/dist/nexus/analyze-orchestrator.js.map +1 -1
- package/dist/nexus/knowledge.d.ts.map +1 -1
- package/dist/nexus/knowledge.js +15 -4
- package/dist/nexus/knowledge.js.map +1 -1
- package/dist/nexus/stored-roots.d.ts +65 -0
- package/dist/nexus/stored-roots.d.ts.map +1 -1
- package/dist/nexus/stored-roots.js +73 -0
- package/dist/nexus/stored-roots.js.map +1 -1
- package/dist/orchestrate/lifecycle-ops.d.ts.map +1 -1
- package/dist/orchestrate/lifecycle-ops.js +4 -1
- package/dist/orchestrate/lifecycle-ops.js.map +1 -1
- package/dist/orchestrate/plan.d.ts.map +1 -1
- package/dist/orchestrate/plan.js +5 -2
- package/dist/orchestrate/plan.js.map +1 -1
- package/dist/orchestrate/query-ops.d.ts +7 -2
- package/dist/orchestrate/query-ops.d.ts.map +1 -1
- package/dist/orchestrate/query-ops.js +17 -6
- package/dist/orchestrate/query-ops.js.map +1 -1
- package/dist/orchestrate/spawn-ops.d.ts.map +1 -1
- package/dist/orchestrate/spawn-ops.js +5 -14
- package/dist/orchestrate/spawn-ops.js.map +1 -1
- package/dist/orchestration/bootstrap.d.ts.map +1 -1
- package/dist/orchestration/bootstrap.js +4 -2
- package/dist/orchestration/bootstrap.js.map +1 -1
- package/dist/orchestration/index.d.ts +1 -0
- package/dist/orchestration/index.d.ts.map +1 -1
- package/dist/orchestration/index.js +4 -3
- package/dist/orchestration/index.js.map +1 -1
- package/dist/orchestration/lead-rollup.d.ts +8 -5
- package/dist/orchestration/lead-rollup.d.ts.map +1 -1
- package/dist/orchestration/lead-rollup.js +32 -15
- package/dist/orchestration/lead-rollup.js.map +1 -1
- package/dist/orchestration/parallel.d.ts.map +1 -1
- package/dist/orchestration/parallel.js +10 -17
- package/dist/orchestration/parallel.js.map +1 -1
- package/dist/orchestration/spawn-prompt.d.ts +4 -1
- package/dist/orchestration/spawn-prompt.d.ts.map +1 -1
- package/dist/orchestration/spawn-prompt.js +3 -2
- package/dist/orchestration/spawn-prompt.js.map +1 -1
- package/dist/orchestration/status.d.ts +8 -3
- package/dist/orchestration/status.d.ts.map +1 -1
- package/dist/orchestration/status.js +9 -6
- package/dist/orchestration/status.js.map +1 -1
- package/dist/orchestration/wave-topic.d.ts +54 -0
- package/dist/orchestration/wave-topic.d.ts.map +1 -0
- package/dist/orchestration/wave-topic.js +68 -0
- package/dist/orchestration/wave-topic.js.map +1 -0
- package/dist/orchestration/waves.d.ts +47 -8
- package/dist/orchestration/waves.d.ts.map +1 -1
- package/dist/orchestration/waves.js +152 -43
- package/dist/orchestration/waves.js.map +1 -1
- package/dist/phases/index.d.ts.map +1 -1
- package/dist/phases/index.js +6 -2
- package/dist/phases/index.js.map +1 -1
- package/dist/project-scope.d.ts +18 -0
- package/dist/project-scope.d.ts.map +1 -1
- package/dist/project-scope.js +37 -0
- package/dist/project-scope.js.map +1 -1
- package/dist/release/ci-evidence.d.ts +10 -0
- package/dist/release/ci-evidence.d.ts.map +1 -1
- package/dist/release/ci-evidence.js +23 -7
- package/dist/release/ci-evidence.js.map +1 -1
- package/dist/release/github-pr.d.ts +30 -0
- package/dist/release/github-pr.d.ts.map +1 -1
- package/dist/release/github-pr.js +40 -0
- package/dist/release/github-pr.js.map +1 -1
- package/dist/release/plan.d.ts.map +1 -1
- package/dist/release/plan.js +6 -3
- package/dist/release/plan.js.map +1 -1
- package/dist/release/pr-evidence.d.ts.map +1 -1
- package/dist/release/pr-evidence.js +12 -4
- package/dist/release/pr-evidence.js.map +1 -1
- package/dist/security/input-sanitization.d.ts.map +1 -1
- package/dist/security/input-sanitization.js +9 -2
- package/dist/security/input-sanitization.js.map +1 -1
- package/dist/selfimprove/fix-gen.js +323 -238
- package/dist/selfimprove/fix-gen.js.map +3 -3
- package/dist/session/engine-ops.d.ts +6 -0
- package/dist/session/engine-ops.d.ts.map +1 -1
- package/dist/session/engine-ops.js +36 -4
- package/dist/session/engine-ops.js.map +1 -1
- package/dist/sessions/briefing.d.ts +17 -0
- package/dist/sessions/briefing.d.ts.map +1 -1
- package/dist/sessions/briefing.js +47 -8
- package/dist/sessions/briefing.js.map +1 -1
- package/dist/sessions/drift-watchdog.d.ts.map +1 -1
- package/dist/sessions/drift-watchdog.js +4 -3
- package/dist/sessions/drift-watchdog.js.map +1 -1
- package/dist/sessions/focus-state-store.d.ts +89 -1
- package/dist/sessions/focus-state-store.d.ts.map +1 -1
- package/dist/sessions/focus-state-store.js +97 -1
- package/dist/sessions/focus-state-store.js.map +1 -1
- package/dist/sessions/index.d.ts +2 -2
- package/dist/sessions/index.d.ts.map +1 -1
- package/dist/sessions/index.js +1 -1
- package/dist/sessions/index.js.map +1 -1
- package/dist/sessions/session-drift.d.ts.map +1 -1
- package/dist/sessions/session-drift.js +4 -3
- package/dist/sessions/session-drift.js.map +1 -1
- package/dist/skills/discovery.d.ts +12 -1
- package/dist/skills/discovery.d.ts.map +1 -1
- package/dist/skills/discovery.js +27 -2
- package/dist/skills/discovery.js.map +1 -1
- package/dist/skills/orchestrator/startup.d.ts.map +1 -1
- package/dist/skills/orchestrator/startup.js +10 -5
- package/dist/skills/orchestrator/startup.js.map +1 -1
- package/dist/skills/prune-bundled.d.ts +267 -0
- package/dist/skills/prune-bundled.d.ts.map +1 -0
- package/dist/skills/prune-bundled.js +536 -0
- package/dist/skills/prune-bundled.js.map +1 -0
- package/dist/skills/types.d.ts +9 -1
- package/dist/skills/types.d.ts.map +1 -1
- package/dist/skills/types.js +17 -34
- package/dist/skills/types.js.map +1 -1
- package/dist/spawn/branch-lock.d.ts.map +1 -1
- package/dist/spawn/branch-lock.js +26 -2
- package/dist/spawn/branch-lock.js.map +1 -1
- package/dist/stats/index.d.ts.map +1 -1
- package/dist/stats/index.js +4 -2
- package/dist/stats/index.js.map +1 -1
- package/dist/store/skills-db.d.ts +17 -0
- package/dist/store/skills-db.d.ts.map +1 -1
- package/dist/store/skills-db.js +30 -0
- package/dist/store/skills-db.js.map +1 -1
- package/dist/store/snapshot-gate.d.ts.map +1 -1
- package/dist/store/snapshot-gate.js +3 -0
- package/dist/store/snapshot-gate.js.map +1 -1
- package/dist/store/sqlite-data-accessor.d.ts.map +1 -1
- package/dist/store/sqlite-data-accessor.js +12 -2
- package/dist/store/sqlite-data-accessor.js.map +1 -1
- package/dist/store/sqlite.d.ts +14 -0
- package/dist/store/sqlite.d.ts.map +1 -1
- package/dist/store/sqlite.js +26 -4
- package/dist/store/sqlite.js.map +1 -1
- package/dist/store/twin-collapse.d.ts +46 -1
- package/dist/store/twin-collapse.d.ts.map +1 -1
- package/dist/store/twin-collapse.js +131 -5
- package/dist/store/twin-collapse.js.map +1 -1
- package/dist/store/worktree-isolation-guard.d.ts.map +1 -1
- package/dist/store/worktree-isolation-guard.js +4 -2
- package/dist/store/worktree-isolation-guard.js.map +1 -1
- package/dist/system/inject-generate.d.ts.map +1 -1
- package/dist/system/inject-generate.js +4 -4
- package/dist/system/inject-generate.js.map +1 -1
- package/dist/task-work/index.d.ts +6 -0
- package/dist/task-work/index.d.ts.map +1 -1
- package/dist/task-work/index.js +6 -3
- package/dist/task-work/index.js.map +1 -1
- package/dist/tasks/affected-packages.d.ts +57 -12
- package/dist/tasks/affected-packages.d.ts.map +1 -1
- package/dist/tasks/affected-packages.js +138 -31
- package/dist/tasks/affected-packages.js.map +1 -1
- package/dist/tasks/affected-scope.d.ts +59 -0
- package/dist/tasks/affected-scope.d.ts.map +1 -0
- package/dist/tasks/affected-scope.js +81 -0
- package/dist/tasks/affected-scope.js.map +1 -0
- package/dist/tasks/analyze.d.ts.map +1 -1
- package/dist/tasks/analyze.js +7 -2
- package/dist/tasks/analyze.js.map +1 -1
- package/dist/tasks/change-set.d.ts +24 -0
- package/dist/tasks/change-set.d.ts.map +1 -1
- package/dist/tasks/change-set.js +130 -11
- package/dist/tasks/change-set.js.map +1 -1
- package/dist/tasks/complete.d.ts +10 -0
- package/dist/tasks/complete.d.ts.map +1 -1
- package/dist/tasks/complete.js +49 -0
- package/dist/tasks/complete.js.map +1 -1
- package/dist/tasks/component-pr.d.ts +106 -0
- package/dist/tasks/component-pr.d.ts.map +1 -0
- package/dist/tasks/component-pr.js +190 -0
- package/dist/tasks/component-pr.js.map +1 -0
- package/dist/tasks/done-plan.d.ts +21 -1
- package/dist/tasks/done-plan.d.ts.map +1 -1
- package/dist/tasks/done-plan.js +170 -15
- package/dist/tasks/done-plan.js.map +1 -1
- package/dist/tasks/done-record.d.ts.map +1 -1
- package/dist/tasks/done-record.js +9 -80
- package/dist/tasks/done-record.js.map +1 -1
- package/dist/tasks/evidence.d.ts +47 -2
- package/dist/tasks/evidence.d.ts.map +1 -1
- package/dist/tasks/evidence.js +57 -7
- package/dist/tasks/evidence.js.map +1 -1
- package/dist/tasks/task-next.d.ts +4 -0
- package/dist/tasks/task-next.d.ts.map +1 -1
- package/dist/tasks/task-next.js +32 -28
- package/dist/tasks/task-next.js.map +1 -1
- package/dist/validation/engine-ops.d.ts +9 -1
- package/dist/validation/engine-ops.d.ts.map +1 -1
- package/dist/validation/engine-ops.js +24 -1
- package/dist/validation/engine-ops.js.map +1 -1
- package/dist/validation/validate-ops.d.ts.map +1 -1
- package/dist/validation/validate-ops.js +9 -3
- package/dist/validation/validate-ops.js.map +1 -1
- package/dist/worktree/worktree-adopt.d.ts.map +1 -1
- package/dist/worktree/worktree-adopt.js +5 -2
- package/dist/worktree/worktree-adopt.js.map +1 -1
- package/package.json +13 -13
- package/templates/CLEO-INJECTION.md +1 -1
- package/templates/CLEO-REFERENCE.md +1 -1
package/dist/tasks/change-set.js
CHANGED
|
@@ -32,7 +32,9 @@ import { execFileSync } from 'node:child_process';
|
|
|
32
32
|
import { existsSync, readdirSync, realpathSync } from 'node:fs';
|
|
33
33
|
import { join, resolve as resolvePath } from 'node:path';
|
|
34
34
|
import { gitToplevel, resolveDeclaredEvidenceGitRoot } from '../git/work-tree.js';
|
|
35
|
+
import { ghQueryTimeoutMs } from '../release/github-pr.js';
|
|
35
36
|
import { enumerateWorktrees } from '../worktree/list.js';
|
|
37
|
+
import { componentLandedChanges } from './component-pr.js';
|
|
36
38
|
import { classifyEvidenceTask, diffIntersectsAc, resolveEvidenceExecutionRoot, } from './evidence.js';
|
|
37
39
|
/** Run git read-only in `cwd`; `null` on any failure. */
|
|
38
40
|
function git(cwd, args) {
|
|
@@ -132,8 +134,22 @@ function resolveOriginDefault(root) {
|
|
|
132
134
|
}
|
|
133
135
|
return null;
|
|
134
136
|
}
|
|
135
|
-
/**
|
|
136
|
-
|
|
137
|
+
/**
|
|
138
|
+
* Deadline for one read-only `gh` query (T12656 review): discovery sits on the
|
|
139
|
+
* `cleo complete` path, so a hung `gh` must fail — as an unknown merge state —
|
|
140
|
+
* rather than hang the completion. One value for every evidence `gh` call.
|
|
141
|
+
*/
|
|
142
|
+
export { GH_QUERY_TIMEOUT_MS } from '../release/github-pr.js';
|
|
143
|
+
/**
|
|
144
|
+
* Default merged-PR discovery: `gh pr list` by search text and by task branch.
|
|
145
|
+
*
|
|
146
|
+
* @param taskId - Task whose PRs to find.
|
|
147
|
+
* @param executionRoot - Repository `gh` runs in.
|
|
148
|
+
* @param opts - `timeoutMs` per query (default `ghQueryTimeoutMs()`).
|
|
149
|
+
* @returns The merged PRs, or why discovery failed (a timeout included).
|
|
150
|
+
* @task T12624
|
|
151
|
+
*/
|
|
152
|
+
export async function defaultListMergedPrs(taskId, executionRoot, opts = {}) {
|
|
137
153
|
const { isGhCliAvailable } = await import('../release/github-pr.js');
|
|
138
154
|
if (!isGhCliAvailable())
|
|
139
155
|
return { ok: false, reason: 'gh CLI is not available on PATH' };
|
|
@@ -145,7 +161,12 @@ async function defaultListMergedPrs(taskId, executionRoot) {
|
|
|
145
161
|
const byNumber = new Map();
|
|
146
162
|
for (const query of queries) {
|
|
147
163
|
try {
|
|
148
|
-
const out = execFileSync('gh', ['pr', 'list', '--state', 'merged', ...query, '--json', fields, '--limit', '30'], {
|
|
164
|
+
const out = execFileSync('gh', ['pr', 'list', '--state', 'merged', ...query, '--json', fields, '--limit', '30'], {
|
|
165
|
+
cwd: executionRoot,
|
|
166
|
+
encoding: 'utf-8',
|
|
167
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
168
|
+
timeout: opts.timeoutMs ?? ghQueryTimeoutMs(),
|
|
169
|
+
});
|
|
149
170
|
const parsed = JSON.parse(out);
|
|
150
171
|
if (!Array.isArray(parsed))
|
|
151
172
|
continue;
|
|
@@ -187,7 +208,12 @@ function toPrDetails(row) {
|
|
|
187
208
|
/** Run a read-only `gh` query; `null` on any failure. */
|
|
188
209
|
function ghJson(args, cwd) {
|
|
189
210
|
try {
|
|
190
|
-
return JSON.parse(execFileSync('gh', args, {
|
|
211
|
+
return JSON.parse(execFileSync('gh', args, {
|
|
212
|
+
cwd,
|
|
213
|
+
encoding: 'utf-8',
|
|
214
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
215
|
+
timeout: ghQueryTimeoutMs(),
|
|
216
|
+
}));
|
|
191
217
|
}
|
|
192
218
|
catch {
|
|
193
219
|
return null;
|
|
@@ -319,7 +345,6 @@ function isRevertTitle(title) {
|
|
|
319
345
|
async function deriveStackedChangeSet(cs, taskId, root, pr, defaultBranch, findPrByHead) {
|
|
320
346
|
const baseRef = pr.baseRefName;
|
|
321
347
|
const basePr = await findPrByHead(baseRef, root);
|
|
322
|
-
cs.stackedOn = { baseRef, ...(basePr ? { basePrNumber: basePr.number } : {}) };
|
|
323
348
|
const baseLanded = basePr !== null && basePr.state === 'MERGED' && basePr.baseRefName === defaultBranch;
|
|
324
349
|
if (baseLanded && hasCommit(root, pr.mergeCommitSha) && hasCommit(root, basePr.headRefOid)) {
|
|
325
350
|
const contained = git(root, [
|
|
@@ -330,18 +355,27 @@ async function deriveStackedChangeSet(cs, taskId, root, pr, defaultBranch, findP
|
|
|
330
355
|
]) !== null;
|
|
331
356
|
const baseMerge = basePr.mergeCommitSha;
|
|
332
357
|
if (contained && baseMerge !== null && hasCommit(root, baseMerge)) {
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
358
|
+
// T12671/T12672: a component PR its integration PR landed is NOT
|
|
359
|
+
// stacked — the integration PR is the provenance and CI, the component
|
|
360
|
+
// PR the task link and the change (only its surviving files).
|
|
361
|
+
const { files, deleted } = componentLandedChanges(root, pr.mergeCommitSha, baseMerge);
|
|
362
|
+
if (files.length > 0) {
|
|
363
|
+
cs.mergeState = 'merged';
|
|
336
364
|
cs.source = 'pr';
|
|
365
|
+
cs.prNumber = basePr.number;
|
|
366
|
+
cs.componentPrNumber = pr.number;
|
|
337
367
|
cs.mergeCommitSha = baseMerge;
|
|
338
|
-
cs.files =
|
|
368
|
+
cs.files = files;
|
|
339
369
|
cs.deletedFiles = deleted;
|
|
340
|
-
cs.implementedEvidence = `
|
|
370
|
+
cs.implementedEvidence = `pr:${pr.number}@${basePr.number};files:${files.join(',')}`;
|
|
341
371
|
return true;
|
|
342
372
|
}
|
|
343
373
|
}
|
|
344
374
|
}
|
|
375
|
+
cs.stackedOn = { baseRef, ...(basePr ? { basePrNumber: basePr.number } : {}) };
|
|
376
|
+
// Merged into another branch is not merged to the default branch until that
|
|
377
|
+
// branch's own PR lands it (the component path above).
|
|
378
|
+
cs.mergeState = 'unmerged';
|
|
345
379
|
const baseState = basePr === null
|
|
346
380
|
? `no PR has ${baseRef} as its head`
|
|
347
381
|
: `its PR #${basePr.number} is ${basePr.state.toLowerCase()} into ${basePr.baseRefName || 'unknown'}`;
|
|
@@ -390,8 +424,11 @@ async function derivePrChangeSet(cs, input, roots, deps) {
|
|
|
390
424
|
const { task } = input;
|
|
391
425
|
const root = roots.executionRoot;
|
|
392
426
|
const listed = await deps.listMergedPrs(task.id, root);
|
|
393
|
-
if (!listed.ok)
|
|
427
|
+
if (!listed.ok) {
|
|
394
428
|
cs.warnings.push(`Merged-PR discovery skipped: ${listed.reason}`);
|
|
429
|
+
cs.prDiscoveryFailed = true;
|
|
430
|
+
cs.mergeState = 'unknown';
|
|
431
|
+
}
|
|
395
432
|
const citing = (listed.ok ? listed.prs : []).filter((pr) => citesTask(`${pr.title}\n${pr.body}\n${pr.headRefName}`, task.id));
|
|
396
433
|
const reverts = citing.filter((pr) => isRevertTitle(pr.title));
|
|
397
434
|
const originals = citing.filter((pr) => !isRevertTitle(pr.title));
|
|
@@ -451,6 +488,74 @@ async function deriveMultiPrChangeSet(cs, numbers, discovery, input, roots, deps
|
|
|
451
488
|
}));
|
|
452
489
|
return true;
|
|
453
490
|
}
|
|
491
|
+
/** A PR merged from the task's own branch (`task/<id>` or `task/<id>-…`). */
|
|
492
|
+
function isOwnBranch(headRefName, taskId) {
|
|
493
|
+
return headRefName === `task/${taskId}` || headRefName.startsWith(`task/${taskId}-`);
|
|
494
|
+
}
|
|
495
|
+
/**
|
|
496
|
+
* The component PRs an integration PR landed for this task (T12672): merged
|
|
497
|
+
* PRs citing the task whose base is the integration PR's head branch and
|
|
498
|
+
* whose merge commit its final head contains. Own-branch components win over
|
|
499
|
+
* ones that merely mention the id; newest first.
|
|
500
|
+
*/
|
|
501
|
+
async function landedComponents(integration, discovery, taskId, root, viewPr) {
|
|
502
|
+
const found = [];
|
|
503
|
+
for (const candidate of discovery.originals) {
|
|
504
|
+
if (candidate.number === integration.number)
|
|
505
|
+
continue;
|
|
506
|
+
const view = await viewPr(candidate.number, root);
|
|
507
|
+
if (view?.state === 'MERGED' &&
|
|
508
|
+
view.baseRefName === integration.headRefName &&
|
|
509
|
+
hasCommit(root, view.mergeCommitSha) &&
|
|
510
|
+
hasCommit(root, integration.headRefOid) &&
|
|
511
|
+
git(root, [
|
|
512
|
+
'merge-base',
|
|
513
|
+
'--is-ancestor',
|
|
514
|
+
view.mergeCommitSha,
|
|
515
|
+
integration.headRefOid,
|
|
516
|
+
]) !== null) {
|
|
517
|
+
found.push(view);
|
|
518
|
+
}
|
|
519
|
+
}
|
|
520
|
+
const own = found.filter((c) => isOwnBranch(c.headRefName, taskId));
|
|
521
|
+
return (own.length > 0 ? own : found).sort((a, b) => b.number - a.number);
|
|
522
|
+
}
|
|
523
|
+
/**
|
|
524
|
+
* Change set for an integration PR through its component PR(s): the newest
|
|
525
|
+
* is primary, each earlier one its own implemented attempt (D11151). Files
|
|
526
|
+
* are the component's surviving files, narrowed to declared task files.
|
|
527
|
+
*/
|
|
528
|
+
function deriveComponentChangeSet(cs, components, integrationMerge, task) {
|
|
529
|
+
const root = cs.executionRoot;
|
|
530
|
+
const integration = cs.prNumber;
|
|
531
|
+
const declared = task.files ?? [];
|
|
532
|
+
const attempts = components.map((c) => {
|
|
533
|
+
const { files, deleted } = componentLandedChanges(root, c.mergeCommitSha, integrationMerge);
|
|
534
|
+
const own = declared.length > 0 ? files.filter((f) => diffIntersectsAc([f], declared)) : [];
|
|
535
|
+
const kept = own.length > 0 ? own : files;
|
|
536
|
+
return {
|
|
537
|
+
prNumber: c.number,
|
|
538
|
+
mergeCommitSha: integrationMerge,
|
|
539
|
+
files: kept,
|
|
540
|
+
deletedFiles: deleted,
|
|
541
|
+
implementedEvidence: kept.length > 0 ? `pr:${c.number}@${integration};files:${kept.join(',')}` : null,
|
|
542
|
+
};
|
|
543
|
+
});
|
|
544
|
+
const [primary, ...earlier] = attempts;
|
|
545
|
+
if (!primary)
|
|
546
|
+
return true;
|
|
547
|
+
cs.componentPrNumber = primary.prNumber;
|
|
548
|
+
cs.files = primary.files;
|
|
549
|
+
cs.deletedFiles = primary.deletedFiles;
|
|
550
|
+
cs.implementedEvidence = primary.implementedEvidence;
|
|
551
|
+
const extra = earlier.filter((a) => a.implementedEvidence !== null).reverse();
|
|
552
|
+
if (extra.length > 0)
|
|
553
|
+
cs.additionalPrs = extra;
|
|
554
|
+
if (primary.implementedEvidence === null) {
|
|
555
|
+
cs.blockers.push(blocker('no-change-set', `Component PR #${primary.prNumber}'s change leaves no surviving file in PR #${integration}'s merge commit.`, `cleo verify ${task.id} --gate implemented --evidence "pr:${primary.prNumber}@${integration};files:<a file it changed>"`, 'The implemented gate needs files evidence for an artifact the component PR changed.'));
|
|
556
|
+
}
|
|
557
|
+
return true;
|
|
558
|
+
}
|
|
454
559
|
/** Derive the change set of one chosen PR (revert, stacked, provenance, merge files). */
|
|
455
560
|
async function deriveOnePr(cs, prNumber, discovery, input, roots, deps) {
|
|
456
561
|
const { task } = input;
|
|
@@ -458,6 +563,10 @@ async function deriveOnePr(cs, prNumber, discovery, input, roots, deps) {
|
|
|
458
563
|
const { originals, reverts, resolved } = discovery;
|
|
459
564
|
cs.prNumber = prNumber;
|
|
460
565
|
const original = originals.find((pr) => pr.number === prNumber);
|
|
566
|
+
// T12656 review: a PR discovery listed is merged (the query is --state
|
|
567
|
+
// merged) — whatever the pr: check later says about its CI.
|
|
568
|
+
if (original)
|
|
569
|
+
cs.mergeState = 'merged';
|
|
461
570
|
const revert = reverts.find((r) => r.number !== prNumber &&
|
|
462
571
|
(r.mergedAt && original?.mergedAt ? r.mergedAt > original.mergedAt : r.number > prNumber));
|
|
463
572
|
if (revert) {
|
|
@@ -468,6 +577,9 @@ async function deriveOnePr(cs, prNumber, discovery, input, roots, deps) {
|
|
|
468
577
|
const defaultRef = resolveOriginDefault(root);
|
|
469
578
|
const defaultBranch = defaultRef?.replace(/^origin\//, '') ?? null;
|
|
470
579
|
const detail = await deps.viewPr(prNumber, root);
|
|
580
|
+
if (!original) {
|
|
581
|
+
cs.mergeState = detail ? (detail.state === 'MERGED' ? 'merged' : 'unmerged') : 'unknown';
|
|
582
|
+
}
|
|
471
583
|
if (detail && defaultBranch && detail.baseRefName && detail.baseRefName !== defaultBranch) {
|
|
472
584
|
return deriveStackedChangeSet(cs, task.id, root, detail, defaultBranch, deps.findPrByHead);
|
|
473
585
|
}
|
|
@@ -486,6 +598,13 @@ async function deriveOnePr(cs, prNumber, discovery, input, roots, deps) {
|
|
|
486
598
|
}
|
|
487
599
|
cs.source = 'pr';
|
|
488
600
|
cs.mergeCommitSha = pr.mergeCommitSha;
|
|
601
|
+
if (hasCommit(root, pr.mergeCommitSha) && detail && !isOwnBranch(detail.headRefName, task.id)) {
|
|
602
|
+
// T12672: an integration PR records its component's files, not its own.
|
|
603
|
+
const components = await landedComponents(detail, discovery, task.id, root, deps.viewPr);
|
|
604
|
+
if (components.length > 0) {
|
|
605
|
+
return deriveComponentChangeSet(cs, components, pr.mergeCommitSha, task);
|
|
606
|
+
}
|
|
607
|
+
}
|
|
489
608
|
if (!hasCommit(root, pr.mergeCommitSha)) {
|
|
490
609
|
cs.blockers.push(blocker('merge-commit-missing', `Merge commit ${pr.mergeCommitSha.slice(0, 12)} of PR #${prNumber} is not in the local object store, so its files cannot be read.`, `git -C '${root}' fetch origin`, 'Evidence bytes are read from the merge commit, never from the working tree.'));
|
|
491
610
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-set.js","sourceRoot":"","sources":["../../src/tasks/change-set.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"change-set.js","sourceRoot":"","sources":["../../src/tasks/change-set.ts"],"names":[],"mappings":"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"}
|
package/dist/tasks/complete.d.ts
CHANGED
|
@@ -183,6 +183,16 @@ interface CompleteEngineSuccess {
|
|
|
183
183
|
* @task T9548
|
|
184
184
|
*/
|
|
185
185
|
worktreeAutoComplete?: AutoCompleteWorktreeResult;
|
|
186
|
+
/**
|
|
187
|
+
* `true` when the completed task was a focus pointer (the caller's session
|
|
188
|
+
* key or the legacy global key) and that pointer was cleared (T12660).
|
|
189
|
+
*/
|
|
190
|
+
focusCleared?: boolean;
|
|
191
|
+
/** Next ready task, reported alongside a cleared focus (null when none). */
|
|
192
|
+
nextSuggested?: {
|
|
193
|
+
id: string;
|
|
194
|
+
title: string;
|
|
195
|
+
} | null;
|
|
186
196
|
}
|
|
187
197
|
type CompleteEngineResult = EngineResult<CompleteEngineSuccess>;
|
|
188
198
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete.d.ts","sourceRoot":"","sources":["../../src/tasks/complete.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAEV,iBAAiB,EACjB,IAAI,EACJ,UAAU,EACV,OAAO,EAER,MAAM,qBAAqB,CAAC;AAK7B,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;AAoCnF,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;CAC7B;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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"}
|
package/dist/tasks/complete.js
CHANGED
|
@@ -353,6 +353,18 @@ export async function completeTask(options, cwd, accessor) {
|
|
|
353
353
|
fix: `Set required verification gates before completion: ${enforcement.verificationRequiredGates.join(', ')}`,
|
|
354
354
|
});
|
|
355
355
|
}
|
|
356
|
+
// T12656 (D11150): an affected-scope testsPassed counts before merge only.
|
|
357
|
+
if (enforcement.verificationRequiredGates.includes('testsPassed')) {
|
|
358
|
+
const { taskAffectedScopeSupersededReason } = await import('./affected-scope.js');
|
|
359
|
+
const superseded = await taskAffectedScopeSupersededReason(task, completionRoot);
|
|
360
|
+
if (superseded) {
|
|
361
|
+
throw new CleoError(enforcement.lifecycleMode === 'strict'
|
|
362
|
+
? ExitCode.LIFECYCLE_GATE_FAILED
|
|
363
|
+
: ExitCode.GATE_DEPENDENCY, `Task ${options.taskId} failed verification gates: testsPassed (${superseded})`, {
|
|
364
|
+
fix: `cleo done ${options.taskId} --plan # plans ci:<pr> or tool:test for testsPassed`,
|
|
365
|
+
});
|
|
366
|
+
}
|
|
367
|
+
}
|
|
356
368
|
}
|
|
357
369
|
// ---- T1404 / P1-4: Epic closure requires direct evidence or verified children ----
|
|
358
370
|
// Epics with no evidence atoms and no verified children cannot silently complete.
|
|
@@ -980,6 +992,40 @@ export async function completeTask(options, cwd, accessor) {
|
|
|
980
992
|
...(receiptSummary ? { receipt: receiptSummary } : {}),
|
|
981
993
|
};
|
|
982
994
|
}
|
|
995
|
+
/**
|
|
996
|
+
* Clear every focus pointer to a task that is now done — the bound session's
|
|
997
|
+
* key, the env session's key and the legacy global key — and suggest the next
|
|
998
|
+
* ready task when one was cleared (T12660). Before this, only `cleo stop` and
|
|
999
|
+
* session end cleared focus, so `cleo current` reported long-finished tasks.
|
|
1000
|
+
*
|
|
1001
|
+
* Best-effort: a failure here never undoes the completion.
|
|
1002
|
+
*
|
|
1003
|
+
* @param projectRoot - Project root.
|
|
1004
|
+
* @param taskIds - The completed task and any parents auto-completed with it.
|
|
1005
|
+
* @returns `focusCleared`, plus `nextSuggested` when it was.
|
|
1006
|
+
*/
|
|
1007
|
+
async function clearFinishedFocus(projectRoot, taskIds) {
|
|
1008
|
+
try {
|
|
1009
|
+
const [{ clearFocusForFinishedTask }, { resolveSessionIdFromEnv }] = await Promise.all([
|
|
1010
|
+
import('../sessions/focus-state-store.js'),
|
|
1011
|
+
import('../sessions/session-id.js'),
|
|
1012
|
+
]);
|
|
1013
|
+
const accessor = await getTaskAccessor(projectRoot);
|
|
1014
|
+
const sessions = [await resolveBoundSessionId(projectRoot), resolveSessionIdFromEnv()];
|
|
1015
|
+
let cleared = 0;
|
|
1016
|
+
for (const taskId of taskIds)
|
|
1017
|
+
cleared += (await clearFocusForFinishedTask(accessor, sessions, taskId)).length;
|
|
1018
|
+
if (cleared === 0)
|
|
1019
|
+
return { focusCleared: false };
|
|
1020
|
+
const { coreTaskNext } = await import('./task-next.js');
|
|
1021
|
+
const top = (await coreTaskNext(projectRoot, { count: 1, brain: false })).suggestions[0];
|
|
1022
|
+
return { focusCleared: true, nextSuggested: top ? { id: top.id, title: top.title } : null };
|
|
1023
|
+
}
|
|
1024
|
+
catch (err) {
|
|
1025
|
+
getLogger('tasks:complete').warn({ taskIds, err: err instanceof Error ? err.message : String(err) }, '[T12660] could not clear the focus pointer to the completed task');
|
|
1026
|
+
return {};
|
|
1027
|
+
}
|
|
1028
|
+
}
|
|
983
1029
|
/**
|
|
984
1030
|
* Complete a task (set status to done), wrapped in EngineResult.
|
|
985
1031
|
*
|
|
@@ -1020,6 +1066,8 @@ export async function taskComplete(projectRoot, taskId, notesOrOptions) {
|
|
|
1020
1066
|
knowledgeCoverage: result.knowledgeCoverage,
|
|
1021
1067
|
alreadyDone: true,
|
|
1022
1068
|
note: `Task ${taskId} is already done — complete was a no-op (idempotent).`,
|
|
1069
|
+
// A retry still clears a pointer the timed-out run left behind.
|
|
1070
|
+
...(await clearFinishedFocus(projectRoot, [taskId])),
|
|
1023
1071
|
});
|
|
1024
1072
|
}
|
|
1025
1073
|
// T1222 / CLEO-VALID-27: stamp modified_by + session_id on every successful completion.
|
|
@@ -1058,6 +1106,7 @@ export async function taskComplete(projectRoot, taskId, notesOrOptions) {
|
|
|
1058
1106
|
...(result.autoCompleted && { autoCompleted: result.autoCompleted }),
|
|
1059
1107
|
...(result.unblockedTasks && { unblockedTasks: result.unblockedTasks }),
|
|
1060
1108
|
worktreeAutoComplete,
|
|
1109
|
+
...(await clearFinishedFocus(projectRoot, [taskId, ...(result.autoCompleted ?? [])])),
|
|
1061
1110
|
});
|
|
1062
1111
|
}
|
|
1063
1112
|
catch (err) {
|