@telora/daemon 0.24.2 → 0.24.5
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/build-info.json +8 -3
- package/dist/backends/claude/one-shot-model.d.ts.map +1 -1
- package/dist/backends/claude/one-shot-model.js +2 -0
- package/dist/backends/claude/one-shot-model.js.map +1 -1
- package/dist/ci/ci-status.d.ts.map +1 -1
- package/dist/ci/ci-status.js +1 -0
- package/dist/ci/ci-status.js.map +1 -1
- package/dist/ci/product-ci-repo.d.ts.map +1 -1
- package/dist/ci/product-ci-repo.js +3 -1
- package/dist/ci/product-ci-repo.js.map +1 -1
- package/dist/completion/state-cascade/review-approved-head-gate.d.ts.map +1 -1
- package/dist/completion/state-cascade/review-approved-head-gate.js +2 -0
- package/dist/completion/state-cascade/review-approved-head-gate.js.map +1 -1
- package/dist/completion/state-cascade/review-capture-head-gate.d.ts +28 -0
- package/dist/completion/state-cascade/review-capture-head-gate.d.ts.map +1 -0
- package/dist/completion/state-cascade/review-capture-head-gate.js +48 -0
- package/dist/completion/state-cascade/review-capture-head-gate.js.map +1 -0
- package/dist/completion/state-cascade/state-cascade.d.ts +12 -0
- package/dist/completion/state-cascade/state-cascade.d.ts.map +1 -1
- package/dist/completion/state-cascade/state-cascade.js +19 -10
- package/dist/completion/state-cascade/state-cascade.js.map +1 -1
- package/dist/composition/daemon-contexts.d.ts.map +1 -1
- package/dist/composition/daemon-contexts.js +3 -1
- package/dist/composition/daemon-contexts.js.map +1 -1
- package/dist/composition/execution-git-context.d.ts.map +1 -1
- package/dist/composition/execution-git-context.js +1 -0
- package/dist/composition/execution-git-context.js.map +1 -1
- package/dist/composition/execution-worktree-context.js +1 -1
- package/dist/composition/release-note-pass-context.d.ts +7 -0
- package/dist/composition/release-note-pass-context.d.ts.map +1 -0
- package/dist/composition/release-note-pass-context.js +64 -0
- package/dist/composition/release-note-pass-context.js.map +1 -0
- package/dist/composition/runtime-contexts.d.ts.map +1 -1
- package/dist/composition/runtime-contexts.js +2 -0
- package/dist/composition/runtime-contexts.js.map +1 -1
- package/dist/composition/spawn-pass-deps.d.ts +2 -2
- package/dist/composition/spawn-pass-deps.d.ts.map +1 -1
- package/dist/composition/spawn-pass-deps.js +3 -1
- package/dist/composition/spawn-pass-deps.js.map +1 -1
- package/dist/composition/state-cascade-context.d.ts.map +1 -1
- package/dist/composition/state-cascade-context.js +2 -0
- package/dist/composition/state-cascade-context.js.map +1 -1
- package/dist/config/live-daemon-config.js +1 -1
- package/dist/daemon-state/provider-window.d.ts.map +1 -1
- package/dist/daemon-state/provider-window.js +1 -0
- package/dist/daemon-state/provider-window.js.map +1 -1
- package/dist/directive/directive-queue.js +1 -1
- package/dist/focus/daemon-contexts.d.ts +3 -0
- package/dist/focus/daemon-contexts.d.ts.map +1 -1
- package/dist/focus/daemon-contexts.js.map +1 -1
- package/dist/focus/focus-loop-registry.d.ts.map +1 -1
- package/dist/focus/focus-loop-registry.js +21 -0
- package/dist/focus/focus-loop-registry.js.map +1 -1
- package/dist/focus/pending-review-approved-head.d.ts +5 -1
- package/dist/focus/pending-review-approved-head.d.ts.map +1 -1
- package/dist/focus/pending-review-approved-head.js +35 -1
- package/dist/focus/pending-review-approved-head.js.map +1 -1
- package/dist/focus/review-spawn-coverage.d.ts +11 -0
- package/dist/focus/review-spawn-coverage.d.ts.map +1 -1
- package/dist/focus/review-spawn-coverage.js +14 -0
- package/dist/focus/review-spawn-coverage.js.map +1 -1
- package/dist/git/delivery-trailer.d.ts.map +1 -1
- package/dist/git/delivery-trailer.js +2 -0
- package/dist/git/delivery-trailer.js.map +1 -1
- package/dist/git/utils.d.ts.map +1 -1
- package/dist/git/utils.js +2 -1
- package/dist/git/utils.js.map +1 -1
- package/dist/merge/candidate-rework.d.ts.map +1 -1
- package/dist/merge/candidate-rework.js +24 -2
- package/dist/merge/candidate-rework.js.map +1 -1
- package/dist/merge/completion-merge-activity.d.ts.map +1 -1
- package/dist/merge/completion-merge-activity.js +7 -1
- package/dist/merge/completion-merge-activity.js.map +1 -1
- package/dist/merge/completion-merge-driver.d.ts +15 -5
- package/dist/merge/completion-merge-driver.d.ts.map +1 -1
- package/dist/merge/completion-merge-driver.js +7 -2
- package/dist/merge/completion-merge-driver.js.map +1 -1
- package/dist/merge/completion-merge-gate.d.ts +5 -1
- package/dist/merge/completion-merge-gate.d.ts.map +1 -1
- package/dist/merge/completion-merge-gate.js +23 -7
- package/dist/merge/completion-merge-gate.js.map +1 -1
- package/dist/merge/merge-back-loop.d.ts.map +1 -1
- package/dist/merge/merge-back-loop.js +2 -1
- package/dist/merge/merge-back-loop.js.map +1 -1
- package/dist/merge/merge-gate-coverage.d.ts +0 -2
- package/dist/merge/merge-gate-coverage.d.ts.map +1 -1
- package/dist/merge/merge-gate-coverage.js +11 -9
- package/dist/merge/merge-gate-coverage.js.map +1 -1
- package/dist/prompt-sections/release-note-faithfulness-section.d.ts +28 -0
- package/dist/prompt-sections/release-note-faithfulness-section.d.ts.map +1 -0
- package/dist/prompt-sections/release-note-faithfulness-section.js +99 -0
- package/dist/prompt-sections/release-note-faithfulness-section.js.map +1 -0
- package/dist/prompt-sections/release-note-section.d.ts +58 -0
- package/dist/prompt-sections/release-note-section.d.ts.map +1 -0
- package/dist/prompt-sections/release-note-section.js +285 -0
- package/dist/prompt-sections/release-note-section.js.map +1 -0
- package/dist/queries/api-client/shared.d.ts +1 -0
- package/dist/queries/api-client/shared.d.ts.map +1 -1
- package/dist/queries/api-client/shared.js +16 -1
- package/dist/queries/api-client/shared.js.map +1 -1
- package/dist/queries/release-notes/release-notes.d.ts +242 -0
- package/dist/queries/release-notes/release-notes.d.ts.map +1 -0
- package/dist/queries/release-notes/release-notes.js +148 -0
- package/dist/queries/release-notes/release-notes.js.map +1 -0
- package/dist/release-notes/release-note-author.d.ts +56 -0
- package/dist/release-notes/release-note-author.d.ts.map +1 -0
- package/dist/release-notes/release-note-author.js +107 -0
- package/dist/release-notes/release-note-author.js.map +1 -0
- package/dist/release-notes/release-note-faithfulness.d.ts +40 -0
- package/dist/release-notes/release-note-faithfulness.d.ts.map +1 -0
- package/dist/release-notes/release-note-faithfulness.js +107 -0
- package/dist/release-notes/release-note-faithfulness.js.map +1 -0
- package/dist/release-notes/release-note-pass.d.ts +77 -0
- package/dist/release-notes/release-note-pass.d.ts.map +1 -0
- package/dist/release-notes/release-note-pass.js +201 -0
- package/dist/release-notes/release-note-pass.js.map +1 -0
- package/dist/testing/fixtures/api-client.js +1 -1
- package/dist/testing/fixtures/approved-head-inert-deps.d.ts +4 -3
- package/dist/testing/fixtures/approved-head-inert-deps.d.ts.map +1 -1
- package/dist/testing/fixtures/approved-head-inert-deps.js +3 -0
- package/dist/testing/fixtures/approved-head-inert-deps.js.map +1 -1
- package/dist/testing/fixtures/completion-judge-stubs.d.ts.map +1 -1
- package/dist/testing/fixtures/completion-judge-stubs.js +2 -0
- package/dist/testing/fixtures/completion-judge-stubs.js.map +1 -1
- package/dist/testing/fixtures/index.js +1 -1
- package/dist/testing/fixtures/pending-spawn-world.d.ts.map +1 -1
- package/dist/testing/fixtures/pending-spawn-world.js +1 -0
- package/dist/testing/fixtures/pending-spawn-world.js.map +1 -1
- package/dist/types/index.js +1 -1
- package/dist/worktree/capture-head-adoption.d.ts +44 -0
- package/dist/worktree/capture-head-adoption.d.ts.map +1 -0
- package/dist/worktree/capture-head-adoption.js +96 -0
- package/dist/worktree/capture-head-adoption.js.map +1 -0
- package/dist/worktree/safety.d.ts +12 -3
- package/dist/worktree/safety.d.ts.map +1 -1
- package/dist/worktree/safety.js +15 -3
- package/dist/worktree/safety.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pending-review-approved-head.js","sourceRoot":"","sources":["../../src/focus/pending-review-approved-head.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,6FAA6F;AAC7F,kEAAkE;AAClE,uEAAuE;AACvE,oEAAoE;AACpE,+DAA+D;AAC/D,2FAA2F;AAC3F,gGAAgG;AAChG,mFAAmF;AACnF,2FAA2F;AAC3F,mFAAmF;AACnF,8EAA8E;AAC9E,gBAAgB;AAEhB
|
|
1
|
+
{"version":3,"file":"pending-review-approved-head.js","sourceRoot":"","sources":["../../src/focus/pending-review-approved-head.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,15 @@
|
|
|
18
18
|
* already judged opens no session, so it cannot stamp another approval of that
|
|
19
19
|
* commit.
|
|
20
20
|
*
|
|
21
|
+
* A daemon WIP capture is never a review's spawn-tip: a capture head is first
|
|
22
|
+
* adopted as the team's own commit (worktree/capture-head-adoption.ts), so the
|
|
23
|
+
* tip pinned is the adopted commit -- the same adoption the window and directive
|
|
24
|
+
* gates read, repeated here for the directive-less route.
|
|
25
|
+
*
|
|
21
26
|
* Aborts (returns true, no session opened) when:
|
|
27
|
+
* - the head is a daemon WIP capture that could not be adopted: a review of a
|
|
28
|
+
* capture approves a head the completion merge gate never accepts as its
|
|
29
|
+
* anchor. Retried next poll, like an unreadable approval;
|
|
22
30
|
* - the coverage anchor is unresolvable: a review over it would run to a
|
|
23
31
|
* succeeded exit with coverageComplete=false, auto-approve withheld as apparent
|
|
24
32
|
* drift, and a full-pass re-review armed every cycle -- structurally forever;
|
|
@@ -53,6 +61,7 @@
|
|
|
53
61
|
*/
|
|
54
62
|
import type { DaemonConfig, FocusTeamState } from '../types/index.js';
|
|
55
63
|
import { type FocusOwnDeltaGit } from '../git/focus-own-delta.js';
|
|
64
|
+
import type { CaptureHeadAdoption, CaptureHeadTarget } from '../worktree/capture-head-adoption.js';
|
|
56
65
|
/** The focus a review spawn is for, and where its branch resolves. */
|
|
57
66
|
export interface ReviewSpawnCoverageTarget {
|
|
58
67
|
worktreePath: string;
|
|
@@ -75,6 +84,8 @@ export interface ReviewSpawnCoverageDeps {
|
|
|
75
84
|
* Throws when unreadable (then the review is not declined on it).
|
|
76
85
|
*/
|
|
77
86
|
addsNoOwnWork: (target: ReviewSpawnCoverageTarget, integrationBranch: string, anchor: string, tip: string) => Promise<boolean>;
|
|
87
|
+
/** Adopt the focus head as the team's own commit when it is a daemon WIP capture (worktree/capture-head-adoption.ts). */
|
|
88
|
+
adoptCaptureHead: (target: CaptureHeadTarget) => CaptureHeadAdoption;
|
|
78
89
|
}
|
|
79
90
|
/**
|
|
80
91
|
* The production ownership proof: provenance is read from the NAMED focus branch
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-spawn-coverage.d.ts","sourceRoot":"","sources":["../../src/focus/review-spawn-coverage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"review-spawn-coverage.d.ts","sourceRoot":"","sources":["../../src/focus/review-spawn-coverage.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4DG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAsB,MAAM,mBAAmB,CAAC;AAI1F,OAAO,EAA0B,KAAK,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC1F,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAKnG,sEAAsE;AACtE,MAAM,WAAW,yBAAyB;IACxC,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC,CAAC;CAC/G;AAED,kFAAkF;AAClF,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAC7D,8FAA8F;IAC9F,qBAAqB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACtF,iFAAiF;IACjF,kBAAkB,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC3G,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE;;;;OAIG;IACH,aAAa,EAAE,CAAC,MAAM,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/H,yHAAyH;IACzH,gBAAgB,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,mBAAmB,CAAC;CACtE;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,EAChE,GAAG,EAAE,gBAAgB,GACpB,uBAAuB,CAAC,eAAe,CAAC,CAK1C;AA8CD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,cAAc,EACzB,MAAM,EAAE,yBAAyB,EACjC,IAAI,EAAE,uBAAuB,GAC5B,OAAO,CAAC,OAAO,CAAC,CAoClB;AAED;;;;;GAKG;AACH,wBAAsB,kCAAkC,CAAC,CAAC,EACxD,SAAS,EAAE,cAAc,EACzB,MAAM,EAAE,yBAAyB,EACjC,WAAW,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,EACpC,IAAI,EAAE,uBAAuB,GAC5B,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAGnB"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
|
|
2
2
|
// Pinned by: packages/daemon/src/focus/review-spawn-coverage.test.ts,
|
|
3
3
|
// packages/daemon/src/integration/approved-head-gate-failure-respawn-regression.test.ts,
|
|
4
|
+
// packages/daemon/src/integration/commits-after-approval-review-regression.test.ts,
|
|
4
5
|
// packages/daemon/src/integration/fully-merged-focus-sibling-red-scenario.test.ts
|
|
5
6
|
// PINNED-BY-END
|
|
6
7
|
import { shouldAbortReviewSpawnForUnresolvableCoverage } from '../completion/review-coverage/review-spawn-coverage-guard.js';
|
|
7
8
|
import { isHeadAlreadyApproved } from '../completion/state-cascade/review-approved-head-gate.js';
|
|
9
|
+
import { describeCaptureHeadDecline } from '../completion/state-cascade/review-capture-head-gate.js';
|
|
8
10
|
import { isForeignOnlyExtension } from '../git/focus-own-delta.js';
|
|
9
11
|
import { createLogger } from '../log/daemon-log.js';
|
|
10
12
|
const log = createLogger({ module: 'focus-executor' });
|
|
@@ -46,6 +48,16 @@ async function reviewSpawnDeclined(target, spawnTip, deps) {
|
|
|
46
48
|
`current approval already judged -- review runs once per distinct focus head. No session opened.`);
|
|
47
49
|
return true;
|
|
48
50
|
}
|
|
51
|
+
/** Adopt a capture head before the tip is pinned; true (abort) when the head is a capture that could not be adopted. */
|
|
52
|
+
function reviewSpawnAtUnadoptedCapture(target, deps) {
|
|
53
|
+
const adoption = deps.adoptCaptureHead({ repoPath: target.worktreePath, branchName: target.branchName });
|
|
54
|
+
if (adoption.kind === 'adopted')
|
|
55
|
+
log.info(`[focus-executor] Review spawn for "${target.focusName}": ${describeCaptureHeadDecline(adoption)}.`);
|
|
56
|
+
if (adoption.kind !== 'failed')
|
|
57
|
+
return false;
|
|
58
|
+
log.warn(`[focus-executor] Review spawn DEFERRED for "${target.focusName}": ${describeCaptureHeadDecline(adoption)}. No session opened.`);
|
|
59
|
+
return true;
|
|
60
|
+
}
|
|
49
61
|
/**
|
|
50
62
|
* Pin a review spawn's coverage anchor, or report that the spawn must abort
|
|
51
63
|
* (true: no session may open). Only a 'review' session type is governed by the
|
|
@@ -53,6 +65,8 @@ async function reviewSpawnDeclined(target, spawnTip, deps) {
|
|
|
53
65
|
*/
|
|
54
66
|
export async function captureReviewSpawnCoverage(teamState, target, deps) {
|
|
55
67
|
const { worktreePath, branchName, focusId, focusName, config } = target;
|
|
68
|
+
if (teamState.sessionType === 'review' && reviewSpawnAtUnadoptedCapture(target, deps))
|
|
69
|
+
return true;
|
|
56
70
|
const spawnTip = deps.resolveRef(worktreePath, branchName);
|
|
57
71
|
if (shouldAbortReviewSpawnForUnresolvableCoverage(teamState.sessionType, spawnTip)) {
|
|
58
72
|
log.error(`[focus-executor] Review spawn ABORTED for "${focusName}": coverage ref ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-spawn-coverage.js","sourceRoot":"","sources":["../../src/focus/review-spawn-coverage.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,sEAAsE;AACtE,2FAA2F;AAC3F,oFAAoF;AACpF,gBAAgB;
|
|
1
|
+
{"version":3,"file":"review-spawn-coverage.js","sourceRoot":"","sources":["../../src/focus/review-spawn-coverage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-trailer.d.ts","sourceRoot":"","sources":["../../src/git/delivery-trailer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"delivery-trailer.d.ts","sourceRoot":"","sources":["../../src/git/delivery-trailer.ts"],"names":[],"mappings":"AA2BA;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,oBAAoB,CAAC;AAEtD;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,qBAAqB,SAAS,CAAC;AAE5C;;;;;;;;;GASG;AACH,eAAO,MAAM,6BAA6B,iBAAiB,CAAC;AAE5D;;;;;;;;;;;;;GAaG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAe7E;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,MAAM,kBAAkB,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAC1D;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;CAAE,GAC7B;IAAE,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAA;CAAE,GACzC;IAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;AAEtC;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAE7F;AAED,6GAA6G;AAC7G,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAKpE"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// Pinned by: packages/daemon/src/ci/ci-owning-focus-resolve.test.ts,
|
|
3
3
|
// packages/daemon/src/focus/safety-capture-entry-points.test.ts,
|
|
4
4
|
// packages/daemon/src/git/review-window-commits.test.ts,
|
|
5
|
+
// packages/daemon/src/integration/capture-head-review-regression.test.ts,
|
|
5
6
|
// packages/daemon/src/merge/attributed-capture-merge-gate.test.ts,
|
|
6
7
|
// packages/daemon/src/prompt-sections/commit-attribution-trailer.test.ts,
|
|
7
8
|
// packages/daemon/src/resolvers/confirm-delivery-trailer.test.ts,
|
|
@@ -9,6 +10,7 @@
|
|
|
9
10
|
// packages/daemon/src/resolvers/git-diff-delivery-attribution.test.ts,
|
|
10
11
|
// packages/daemon/src/resolvers/verify-evidence-git-trailer-source.test.ts,
|
|
11
12
|
// packages/daemon/src/worktree/capture-attribution-commit.test.ts,
|
|
13
|
+
// packages/daemon/src/worktree/capture-head-adoption.test.ts,
|
|
12
14
|
// packages/daemon/src/worktree/commit-msg-trailer-hook.test.ts,
|
|
13
15
|
// packages/daemon/src/worktree/safety-commit-under-guard.test.ts
|
|
14
16
|
// PINNED-BY-END
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-trailer.js","sourceRoot":"","sources":["../../src/git/delivery-trailer.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,qEAAqE;AACrE,mEAAmE;AACnE,2DAA2D;AAC3D,qEAAqE;AACrE,4EAA4E;AAC5E,oEAAoE;AACpE,yEAAyE;AACzE,yEAAyE;AACzE,8EAA8E;AAC9E,qEAAqE;AACrE,kEAAkE;AAClE,mEAAmE;AACnE,gBAAgB;AAEhB;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AAEtD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC;AAE5C;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,cAAc,CAAC;AAE5D;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,mBAAmB,CAAC,YAAoB,EAAE,GAAW;IACnE,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACjC,IAAI,KAAK,KAAK,EAAE;QAAE,OAAO,EAAE,CAAC;IAC5B,IAAI,CAAC;QACH,8EAA8E;QAC9E,MAAM,GAAG,GAAG,QAAQ,CAClB,wCAAwC,oBAAoB,gBAAgB,KAAK,WAAW,EAC5F,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CACjE,CAAC;QACF,wEAAwE;QACxE,qEAAqE;QACrE,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;IAC1E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAiCD;;;;;;;;GAQG;AACH,MAAM,UAAU,uBAAuB,CAAC,YAAoB,EAAE,GAAW;IACvE,OAAO,oBAAoB,CAAC,mBAAmB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,6GAA6G;AAC7G,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;IAChD,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,qBAAqB,CAAC,WAAW,EAAE;QAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC3F,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,6BAA6B,CAAC,WAAW,EAAE;QAAE,OAAO,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;IAC/G,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC;AAC/C,CAAC"}
|
|
1
|
+
{"version":3,"file":"delivery-trailer.js","sourceRoot":"","sources":["../../src/git/delivery-trailer.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,qEAAqE;AACrE,mEAAmE;AACnE,2DAA2D;AAC3D,4EAA4E;AAC5E,qEAAqE;AACrE,4EAA4E;AAC5E,oEAAoE;AACpE,yEAAyE;AACzE,yEAAyE;AACzE,8EAA8E;AAC9E,qEAAqE;AACrE,gEAAgE;AAChE,kEAAkE;AAClE,mEAAmE;AACnE,gBAAgB;AAEhB;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AAEtD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC;AAE5C;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,cAAc,CAAC;AAE5D;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,mBAAmB,CAAC,YAAoB,EAAE,GAAW;IACnE,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACjC,IAAI,KAAK,KAAK,EAAE;QAAE,OAAO,EAAE,CAAC;IAC5B,IAAI,CAAC;QACH,8EAA8E;QAC9E,MAAM,GAAG,GAAG,QAAQ,CAClB,wCAAwC,oBAAoB,gBAAgB,KAAK,WAAW,EAC5F,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CACjE,CAAC;QACF,wEAAwE;QACxE,qEAAqE;QACrE,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;IAC1E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAiCD;;;;;;;;GAQG;AACH,MAAM,UAAU,uBAAuB,CAAC,YAAoB,EAAE,GAAW;IACvE,OAAO,oBAAoB,CAAC,mBAAmB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,6GAA6G;AAC7G,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;IAChD,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,qBAAqB,CAAC,WAAW,EAAE;QAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC3F,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,6BAA6B,CAAC,WAAW,EAAE;QAAE,OAAO,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;IAC/G,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC;AAC/C,CAAC"}
|
package/dist/git/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/git/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/git/utils.ts"],"names":[],"mappings":"AAmBA;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,SAAK,GAAG,MAAM,CAOnE;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYvE;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAc7E;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAc3E;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CA6B9C"}
|
package/dist/git/utils.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
|
|
2
|
-
// Pinned by:
|
|
2
|
+
// Pinned by: packages/daemon/src/integration/capture-head-review-regression.test.ts,
|
|
3
|
+
// packages/daemon/src/integration/commits-after-approval-review-regression.test.ts
|
|
3
4
|
// PINNED-BY-END
|
|
4
5
|
/**
|
|
5
6
|
* Shared git utility functions for the daemon.
|
package/dist/git/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/git/utils.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/git/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"candidate-rework.d.ts","sourceRoot":"","sources":["../../src/merge/candidate-rework.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"candidate-rework.d.ts","sourceRoot":"","sources":["../../src/merge/candidate-rework.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
|
|
2
2
|
// Pinned by: packages/daemon/src/ci/ci-log-instruction-bindings.test.ts,
|
|
3
|
+
// packages/daemon/src/integration/commits-after-approval-review-regression.test.ts,
|
|
3
4
|
// packages/daemon/src/merge/candidate-rework.test.ts,
|
|
4
5
|
// packages/daemon/src/merge/completion-conflict-rework.test.ts,
|
|
5
6
|
// packages/daemon/src/merge/completion-rework-armed.test.ts
|
|
@@ -7,8 +8,9 @@
|
|
|
7
8
|
/**
|
|
8
9
|
* A completion merge that cannot proceed returns its focus to coding as re-work:
|
|
9
10
|
* a red integration candidate (CI's, or the daemon's local completion run's), a final merge of the
|
|
10
|
-
* integration tip that conflicts (aborted, never resolved by the daemon),
|
|
11
|
-
* conflict-deciding merge after the approved head
|
|
11
|
+
* integration tip that conflicts (aborted, never resolved by the daemon), a
|
|
12
|
+
* conflict-deciding merge after the approved head, or authored commits after the
|
|
13
|
+
* approved head (a fix captured at agent exit, an operator's commit). ONE Bug on the delivery that
|
|
12
14
|
* owns the work, and that done delivery re-opened through the single-writer
|
|
13
15
|
* reconciler (done -> verify_failed, the `integrationCandidateRed` fact). No
|
|
14
16
|
* escalation is filed: the failure is the focus's own work, read by its next
|
|
@@ -47,6 +49,8 @@ export function candidateReworkTitle(sha, cause) {
|
|
|
47
49
|
return `Final merge of integration into ${short} conflicts`;
|
|
48
50
|
if (cause === 'unreviewed_merge')
|
|
49
51
|
return `Merge at ${short} decided a conflict no review judged`;
|
|
52
|
+
if (cause === 'unreviewed_commits')
|
|
53
|
+
return `Head ${short} carries commits after the approved head no review judged`;
|
|
50
54
|
if (cause === 'local_red')
|
|
51
55
|
return `Integration candidate ${short} failed the completion suite`;
|
|
52
56
|
return `Integration candidate ${short} failed CI`;
|
|
@@ -105,6 +109,22 @@ function isConflict(detail) {
|
|
|
105
109
|
function isLocalFailure(detail) {
|
|
106
110
|
return detail !== null && 'command' in detail;
|
|
107
111
|
}
|
|
112
|
+
function isUnreviewedCommits(detail) {
|
|
113
|
+
return detail !== null && 'approvedSha' in detail;
|
|
114
|
+
}
|
|
115
|
+
function unreviewedCommitsDescription(subject, sha, detail) {
|
|
116
|
+
const approved = detail ? field(detail.approvedSha) : null;
|
|
117
|
+
return [
|
|
118
|
+
`The focus head ${field(sha)} carries commit(s) after the commit the focus's newest review approved` +
|
|
119
|
+
`${approved ? ` (${approved})` : ''} -- a fix captured at agent exit, or a commit added after the approval -- and ` +
|
|
120
|
+
'no review judged them, so the completion merge gate does not let it reach integration.',
|
|
121
|
+
'',
|
|
122
|
+
`Read the commits after the approval on ${field(subject.branchName)}` +
|
|
123
|
+
`${approved ? ` (\`git log ${approved}..${field(sha)}\`)` : ''}, confirm they are the focus's intended work (fix ` +
|
|
124
|
+
'and commit if not), then close this Bug; the head then passes the gate and review before the completion merge ' +
|
|
125
|
+
'is tried again.',
|
|
126
|
+
];
|
|
127
|
+
}
|
|
108
128
|
function localFailureDescription(subject, sha, failure) {
|
|
109
129
|
return [
|
|
110
130
|
`The daemon ran the product's completion suite${failure ? ` (\`${field(failure.command)}\`)` : ''} on the focus's integration ` +
|
|
@@ -127,6 +147,8 @@ export function candidateReworkDescription(subject, sha, cause, detail, ciRepo)
|
|
|
127
147
|
return conflictDescription(subject, sha, isConflict(detail) ? detail : null).join('\n');
|
|
128
148
|
if (cause === 'local_red')
|
|
129
149
|
return localFailureDescription(subject, sha, isLocalFailure(detail) ? detail : null).join('\n');
|
|
150
|
+
if (cause === 'unreviewed_commits')
|
|
151
|
+
return unreviewedCommitsDescription(subject, sha, isUnreviewedCommits(detail) ? detail : null).join('\n');
|
|
130
152
|
if (cause === 'unreviewed_merge') {
|
|
131
153
|
return [
|
|
132
154
|
`The focus head ${field(sha)} carries a merge after the approved head that decided a conflict (git's re-merge of it is ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"candidate-rework.js","sourceRoot":"","sources":["../../src/merge/candidate-rework.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,yEAAyE;AACzE,wDAAwD;AACxD,kEAAkE;AAClE,8DAA8D;AAC9D,gBAAgB;AAEhB
|
|
1
|
+
{"version":3,"file":"candidate-rework.js","sourceRoot":"","sources":["../../src/merge/candidate-rework.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion-merge-activity.d.ts","sourceRoot":"","sources":["../../src/merge/completion-merge-activity.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,KAAK,EAAE,2BAA2B,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC7F,OAAO,KAAK,EAAuB,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAEzF,gFAAgF;AAChF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,2BAA2B,CAAC;IAClC,4FAA4F;IAC5F,KAAK,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACnC;;;;;;;OAOG;IACH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,4HAA4H;IAC5H,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;
|
|
1
|
+
{"version":3,"file":"completion-merge-activity.d.ts","sourceRoot":"","sources":["../../src/merge/completion-merge-activity.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,KAAK,EAAE,2BAA2B,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC7F,OAAO,KAAK,EAAuB,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAEzF,gFAAgF;AAChF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,2BAA2B,CAAC;IAClC,4FAA4F;IAC5F,KAAK,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACnC;;;;;;;OAOG;IACH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,4HAA4H;IAC5H,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AA8BD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAC,mBAAmB,EAAE,MAAM,GAAG,OAAO,CAAC,CAM9G;AAID;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAC/C,QAAQ,EAAE,iBAAiB,EAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,GACzB,IAAI,CAaN;AAED,yGAAyG;AACzG,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAAE,IAAI,EAAE,mBAAmB,GAAG,IAAI,CAGnH;AAED,6EAA6E;AAC7E,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAE1E;AAED,kDAAkD;AAClD,wBAAgB,uBAAuB,IAAI,mBAAmB,EAAE,CAE/D;AAED,0DAA0D;AAC1D,wBAAgB,sCAAsC,IAAI,IAAI,CAE7D"}
|
|
@@ -3,10 +3,15 @@
|
|
|
3
3
|
// packages/daemon/src/focus/heartbeat-completion-merge.test.ts,
|
|
4
4
|
// packages/daemon/src/merge/completion-merge-activity.test.ts
|
|
5
5
|
// PINNED-BY-END
|
|
6
|
-
/**
|
|
6
|
+
/**
|
|
7
|
+
* The activity step each driven step publishes as. review_head publishes as
|
|
8
|
+
* `approval`: what the merge waits on is a review approving the head, and the
|
|
9
|
+
* gate's reason says the focus went back to its team for it.
|
|
10
|
+
*/
|
|
7
11
|
const STEP_OF_NEXT = {
|
|
8
12
|
merge_out: 'merge_out',
|
|
9
13
|
review_merge: 'review_merge',
|
|
14
|
+
review_head: 'approval',
|
|
10
15
|
push_candidate: 'push_candidate',
|
|
11
16
|
wait_ci: 'judge_running',
|
|
12
17
|
rework: 'rework',
|
|
@@ -17,6 +22,7 @@ const STEP_OF_NEXT = {
|
|
|
17
22
|
const JUDGE_OF_NEXT = {
|
|
18
23
|
merge_out: null,
|
|
19
24
|
review_merge: null,
|
|
25
|
+
review_head: null,
|
|
20
26
|
push_candidate: 'ci',
|
|
21
27
|
wait_ci: 'ci',
|
|
22
28
|
rework: 'ci',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion-merge-activity.js","sourceRoot":"","sources":["../../src/merge/completion-merge-activity.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,gFAAgF;AAChF,kEAAkE;AAClE,gEAAgE;AAChE,gBAAgB;AA0DhB
|
|
1
|
+
{"version":3,"file":"completion-merge-activity.js","sourceRoot":"","sources":["../../src/merge/completion-merge-activity.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,11 @@
|
|
|
12
12
|
* team resolves it and its head passes the gate and review.
|
|
13
13
|
* review_merge -> a merge after the approved head already decided a conflict:
|
|
14
14
|
* re-work, so review judges that head.
|
|
15
|
+
* review_head -> authored commits after the approved head (a fix captured at
|
|
16
|
+
* agent exit, an operator's commit): re-work, so the focus is
|
|
17
|
+
* handed back to its team and review judges that head. It is
|
|
18
|
+
* taken with every delivery done -- re-work re-opens the done
|
|
19
|
+
* owner -- which is what no window or spawn path would do.
|
|
15
20
|
* push_candidate -> push the head to the focus's candidate branch so CI runs the
|
|
16
21
|
* full suite on exactly that commit (ci/candidate-ref.ts).
|
|
17
22
|
* wait_ci -> nothing, until CANDIDATE_CI_VERDICT_WAIT_MS has passed with
|
|
@@ -51,9 +56,13 @@ export interface CompletionMergeSubject {
|
|
|
51
56
|
branchName: string;
|
|
52
57
|
}
|
|
53
58
|
/** Why a candidate is returned to the focus as re-work. */
|
|
54
|
-
export type CandidateReworkCause = 'red' | 'local_red' | 'conflict' | 'unreviewed_merge';
|
|
55
|
-
/** What a re-work Bug is told beyond its cause: a conflict's paths,
|
|
56
|
-
export type CandidateReworkDetail = CompletionMergeConflict | LocalSuiteFailure;
|
|
59
|
+
export type CandidateReworkCause = 'red' | 'local_red' | 'conflict' | 'unreviewed_merge' | 'unreviewed_commits';
|
|
60
|
+
/** What a re-work Bug is told beyond its cause: a conflict's paths, a failed local run, or the approval commits landed after. */
|
|
61
|
+
export type CandidateReworkDetail = CompletionMergeConflict | LocalSuiteFailure | UnreviewedCommits;
|
|
62
|
+
/** Commits after the approved head: the commit the focus's newest approval judged. */
|
|
63
|
+
export interface UnreviewedCommits {
|
|
64
|
+
approvedSha: string;
|
|
65
|
+
}
|
|
57
66
|
/** What a conflicting final merge left for the team: the paths, and the integration commits the branch lacks. */
|
|
58
67
|
export interface CompletionMergeConflict {
|
|
59
68
|
integrationBranch: string;
|
|
@@ -113,8 +122,9 @@ export interface CompletionMergeStepResult {
|
|
|
113
122
|
}
|
|
114
123
|
/**
|
|
115
124
|
* Take the step a held completion merge names, and say whether it returned the
|
|
116
|
-
* focus to coding.
|
|
125
|
+
* focus to coding. `approvedSha` is the gate's (review_head names the commits
|
|
126
|
+
* after it). Never throws: a failed step is retried next tick (and did not
|
|
117
127
|
* return the focus).
|
|
118
128
|
*/
|
|
119
|
-
export declare function driveCompletionMergeStep(subject: CompletionMergeSubject, step: CompletionMergeStep, headSha: string, deps: CompletionMergeDriverDeps): Promise<CompletionMergeStepResult>;
|
|
129
|
+
export declare function driveCompletionMergeStep(subject: CompletionMergeSubject, step: CompletionMergeStep, headSha: string, deps: CompletionMergeDriverDeps, approvedSha?: string): Promise<CompletionMergeStepResult>;
|
|
120
130
|
//# sourceMappingURL=completion-merge-driver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion-merge-driver.d.ts","sourceRoot":"","sources":["../../src/merge/completion-merge-driver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"completion-merge-driver.d.ts","sourceRoot":"","sources":["../../src/merge/completion-merge-driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
// packages/daemon/src/focus/focus-activity-completion-merge.test.ts,
|
|
5
5
|
// packages/daemon/src/focus/heartbeat-completion-merge.test.ts,
|
|
6
6
|
// packages/daemon/src/integration/approved-head-hold-release-completion-regression.test.ts,
|
|
7
|
+
// packages/daemon/src/integration/commits-after-approval-review-regression.test.ts,
|
|
7
8
|
// packages/daemon/src/merge/candidate-rework.test.ts,
|
|
8
9
|
// packages/daemon/src/merge/completion-conflict-rework.test.ts,
|
|
9
10
|
// packages/daemon/src/merge/completion-merge-driver.test.ts,
|
|
@@ -33,6 +34,7 @@ const CAUSE_TEXT = {
|
|
|
33
34
|
local_red: 'FAILED the local completion run',
|
|
34
35
|
conflict: 'conflicts with the integration tip',
|
|
35
36
|
unreviewed_merge: 'carries a conflict-deciding merge no review judged',
|
|
37
|
+
unreviewed_commits: 'carries commits after the approved head no review judged',
|
|
36
38
|
};
|
|
37
39
|
async function rework(subject, sha, cause, detail, deps) {
|
|
38
40
|
const outcome = await deps.routeRework(subject, sha, cause, detail);
|
|
@@ -94,15 +96,18 @@ function runLocal(subject, headSha, deps) {
|
|
|
94
96
|
}
|
|
95
97
|
/**
|
|
96
98
|
* Take the step a held completion merge names, and say whether it returned the
|
|
97
|
-
* focus to coding.
|
|
99
|
+
* focus to coding. `approvedSha` is the gate's (review_head names the commits
|
|
100
|
+
* after it). Never throws: a failed step is retried next tick (and did not
|
|
98
101
|
* return the focus).
|
|
99
102
|
*/
|
|
100
|
-
export async function driveCompletionMergeStep(subject, step, headSha, deps) {
|
|
103
|
+
export async function driveCompletionMergeStep(subject, step, headSha, deps, approvedSha) {
|
|
101
104
|
try {
|
|
102
105
|
if (step === 'merge_out')
|
|
103
106
|
return await mergeOut(subject, headSha, deps);
|
|
104
107
|
if (step === 'review_merge')
|
|
105
108
|
return await rework(subject, headSha, 'unreviewed_merge', null, deps);
|
|
109
|
+
if (step === 'review_head')
|
|
110
|
+
return await rework(subject, headSha, 'unreviewed_commits', approvedSha ? { approvedSha } : null, deps);
|
|
106
111
|
if (step === 'rework')
|
|
107
112
|
return await rework(subject, headSha, 'red', null, deps);
|
|
108
113
|
if (step === 'rework_local')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion-merge-driver.js","sourceRoot":"","sources":["../../src/merge/completion-merge-driver.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,yEAAyE;AACzE,0EAA0E;AAC1E,uEAAuE;AACvE,kEAAkE;AAClE,8FAA8F;AAC9F,wDAAwD;AACxD,kEAAkE;AAClE,+DAA+D;AAC/D,+DAA+D;AAC/D,sDAAsD;AACtD,gBAAgB;
|
|
1
|
+
{"version":3,"file":"completion-merge-driver.js","sourceRoot":"","sources":["../../src/merge/completion-merge-driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import type { LocalCandidateStatus } from './completion-local-judge.js';
|
|
|
4
4
|
import type { ApprovalGateState } from './approval-gate-state.js';
|
|
5
5
|
import { type BranchMergeGateTarget, type GatedAnchor, type MergeGateTarget, type UnmergedCommit } from './merge-gate-coverage.js';
|
|
6
6
|
/** The step that advances a held completion merge; driven by the merge-back loop only. */
|
|
7
|
-
export type CompletionMergeStep = 'merge_out' | 'review_merge' | 'push_candidate' | 'wait_ci' | 'rework' | 'run_local' | 'rework_local';
|
|
7
|
+
export type CompletionMergeStep = 'merge_out' | 'review_merge' | 'review_head' | 'push_candidate' | 'wait_ci' | 'rework' | 'run_local' | 'rework_local';
|
|
8
8
|
/** A merge the gate holds (with why, and the step that advances it), or one it admits at an exact commit. */
|
|
9
9
|
export type MergeGateDecision = {
|
|
10
10
|
hold: string;
|
|
@@ -12,6 +12,8 @@ export type MergeGateDecision = {
|
|
|
12
12
|
/** What a hold no step advances awaits: an approval covering the head, or the local judge's run in flight. */
|
|
13
13
|
awaiting?: 'approval' | 'local_run';
|
|
14
14
|
headSha?: string;
|
|
15
|
+
/** The commit the focus's newest approval judged, when the step concerns the commits after it (review_head). */
|
|
16
|
+
approvedSha?: string;
|
|
15
17
|
/** The gate's OWN delivery read found the focus incomplete: there is no completion hold to age. */
|
|
16
18
|
incomplete?: true;
|
|
17
19
|
} | {
|
|
@@ -61,6 +63,8 @@ export declare function deliveryHoldsCompletion(executionStatus: string | null):
|
|
|
61
63
|
export declare function focusCompletionHold(deliveries: readonly CompletionDeliveryFact[]): string | null;
|
|
62
64
|
/** The merges after the approved commit that git cannot prove clean (they decided a conflict, or edited). Pure. */
|
|
63
65
|
export declare function unreviewedMergesAfter(commits: readonly UnmergedCommit[], approval: GatedAnchor): UnmergedCommit[];
|
|
66
|
+
/** The authored (non-merge) commits after the approved commit: no review judged them. Pure. */
|
|
67
|
+
export declare function authoredCommitsAfter(commits: readonly UnmergedCommit[], approval: GatedAnchor): UnmergedCommit[];
|
|
64
68
|
/**
|
|
65
69
|
* Step 2 over listed commits: everything after the approved commit must be a
|
|
66
70
|
* merge (an integration sync; one that is not clean is unreviewedMergesAfter's),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion-merge-gate.d.ts","sourceRoot":"","sources":["../../src/merge/completion-merge-gate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"completion-merge-gate.d.ts","sourceRoot":"","sources":["../../src/merge/completion-merge-gate.ts"],"names":[],"mappings":"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"}
|