@telora/daemon 0.23.12 → 0.23.15
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 +4 -3
- package/dist/backends/claude/one-shot-model.d.ts +11 -0
- package/dist/backends/claude/one-shot-model.d.ts.map +1 -1
- package/dist/backends/claude/one-shot-model.js +7 -4
- package/dist/backends/claude/one-shot-model.js.map +1 -1
- package/dist/backends/claude/one-shot-session.d.ts +15 -0
- package/dist/backends/claude/one-shot-session.d.ts.map +1 -0
- package/dist/backends/claude/one-shot-session.js +120 -0
- package/dist/backends/claude/one-shot-session.js.map +1 -0
- package/dist/ci/candidate-ref.d.ts +28 -0
- package/dist/ci/candidate-ref.d.ts.map +1 -0
- package/dist/ci/candidate-ref.js +81 -0
- package/dist/ci/candidate-ref.js.map +1 -0
- package/dist/ci/ci-sensor-loop.d.ts.map +1 -1
- package/dist/ci/ci-sensor-loop.js +2 -1
- package/dist/ci/ci-sensor-loop.js.map +1 -1
- package/dist/ci/ci-status-git.d.ts +9 -0
- package/dist/ci/ci-status-git.d.ts.map +1 -1
- package/dist/ci/ci-status-git.js +16 -2
- package/dist/ci/ci-status-git.js.map +1 -1
- package/dist/ci/ci-status.d.ts.map +1 -1
- package/dist/ci/ci-status.js +5 -1
- package/dist/ci/ci-status.js.map +1 -1
- package/dist/completion/state-cascade/state-cascade.d.ts +14 -1
- package/dist/completion/state-cascade/state-cascade.d.ts.map +1 -1
- package/dist/completion/state-cascade/state-cascade.js +26 -1
- package/dist/completion/state-cascade/state-cascade.js.map +1 -1
- package/dist/completion/team-exit/merge-phase.d.ts +11 -10
- package/dist/completion/team-exit/merge-phase.d.ts.map +1 -1
- package/dist/completion/team-exit/merge-phase.js +10 -10
- package/dist/completion/team-exit/merge-phase.js.map +1 -1
- package/dist/completion/team-teardown/team-lifecycle.d.ts +4 -3
- package/dist/completion/team-teardown/team-lifecycle.d.ts.map +1 -1
- package/dist/completion/team-teardown/team-lifecycle.js +8 -8
- package/dist/completion/team-teardown/team-lifecycle.js.map +1 -1
- package/dist/composition/attribution-base-git.d.ts.map +1 -1
- package/dist/composition/attribution-base-git.js +3 -1
- package/dist/composition/attribution-base-git.js.map +1 -1
- package/dist/composition/execution-git-context.d.ts.map +1 -1
- package/dist/composition/execution-git-context.js +2 -0
- package/dist/composition/execution-git-context.js.map +1 -1
- package/dist/composition/execution-merge-context.d.ts +11 -3
- package/dist/composition/execution-merge-context.d.ts.map +1 -1
- package/dist/composition/execution-merge-context.js +60 -12
- package/dist/composition/execution-merge-context.js.map +1 -1
- package/dist/composition/process-close-context.js +3 -3
- package/dist/composition/process-close-context.js.map +1 -1
- package/dist/composition/state-cascade-context.d.ts.map +1 -1
- package/dist/composition/state-cascade-context.js +10 -2
- package/dist/composition/state-cascade-context.js.map +1 -1
- package/dist/composition/team-lifecycle-context.js +3 -3
- package/dist/composition/team-lifecycle-context.js.map +1 -1
- package/dist/composition/verification-context.d.ts.map +1 -1
- package/dist/composition/verification-context.js +25 -27
- package/dist/composition/verification-context.js.map +1 -1
- package/dist/delivery/delivery-merge-ops.d.ts +2 -0
- package/dist/delivery/delivery-merge-ops.d.ts.map +1 -1
- package/dist/delivery/delivery-merge-ops.js +2 -2
- package/dist/delivery/delivery-merge-ops.js.map +1 -1
- package/dist/delivery/delivery-reconciler.d.ts +9 -0
- package/dist/delivery/delivery-reconciler.d.ts.map +1 -1
- package/dist/delivery/delivery-reconciler.js +42 -31
- package/dist/delivery/delivery-reconciler.js.map +1 -1
- package/dist/focus/focus-spawn-decision.d.ts.map +1 -1
- package/dist/focus/focus-spawn-decision.js +1 -0
- package/dist/focus/focus-spawn-decision.js.map +1 -1
- package/dist/git/index.d.ts.map +1 -1
- package/dist/git/index.js +2 -1
- package/dist/git/index.js.map +1 -1
- package/dist/git/merge.d.ts +12 -2
- package/dist/git/merge.d.ts.map +1 -1
- package/dist/git/merge.js +32 -33
- package/dist/git/merge.js.map +1 -1
- package/dist/merge/approval-gate-state.d.ts.map +1 -1
- package/dist/merge/approval-gate-state.js +8 -7
- package/dist/merge/approval-gate-state.js.map +1 -1
- package/dist/merge/candidate-rework.d.ts +44 -0
- package/dist/merge/candidate-rework.d.ts.map +1 -0
- package/dist/merge/candidate-rework.js +152 -0
- package/dist/merge/candidate-rework.js.map +1 -0
- package/dist/merge/completion-hold-record.d.ts +20 -0
- package/dist/merge/completion-hold-record.d.ts.map +1 -0
- package/dist/merge/completion-hold-record.js +130 -0
- package/dist/merge/completion-hold-record.js.map +1 -0
- package/dist/merge/completion-merge-driver.d.ts +96 -0
- package/dist/merge/completion-merge-driver.d.ts.map +1 -0
- package/dist/merge/completion-merge-driver.js +94 -0
- package/dist/merge/completion-merge-driver.js.map +1 -0
- package/dist/merge/completion-merge-gate.d.ts +71 -0
- package/dist/merge/completion-merge-gate.d.ts.map +1 -0
- package/dist/merge/completion-merge-gate.js +185 -0
- package/dist/merge/completion-merge-gate.js.map +1 -0
- package/dist/merge/completion-merge-pending.d.ts +30 -0
- package/dist/merge/completion-merge-pending.d.ts.map +1 -0
- package/dist/merge/completion-merge-pending.js +75 -0
- package/dist/merge/completion-merge-pending.js.map +1 -0
- package/dist/merge/focus-merge.d.ts +21 -6
- package/dist/merge/focus-merge.d.ts.map +1 -1
- package/dist/merge/focus-merge.js +65 -45
- package/dist/merge/focus-merge.js.map +1 -1
- package/dist/merge/focus-worktree-removal.d.ts +6 -6
- package/dist/merge/focus-worktree-removal.d.ts.map +1 -1
- package/dist/merge/focus-worktree-removal.js +10 -6
- package/dist/merge/focus-worktree-removal.js.map +1 -1
- package/dist/merge/merge-back-conflict.d.ts.map +1 -1
- package/dist/merge/merge-back-conflict.js +2 -0
- package/dist/merge/merge-back-conflict.js.map +1 -1
- package/dist/merge/merge-back-followup.d.ts.map +1 -1
- package/dist/merge/merge-back-followup.js +7 -0
- package/dist/merge/merge-back-followup.js.map +1 -1
- package/dist/merge/merge-back-loop.d.ts +36 -14
- package/dist/merge/merge-back-loop.d.ts.map +1 -1
- package/dist/merge/merge-back-loop.js +109 -66
- package/dist/merge/merge-back-loop.js.map +1 -1
- package/dist/merge/merge-gate-coverage.d.ts +9 -61
- package/dist/merge/merge-gate-coverage.d.ts.map +1 -1
- package/dist/merge/merge-gate-coverage.js +33 -167
- package/dist/merge/merge-gate-coverage.js.map +1 -1
- package/dist/nexus/escalation-bridge.d.ts.map +1 -1
- package/dist/nexus/escalation-bridge.js +2 -1
- package/dist/nexus/escalation-bridge.js.map +1 -1
- package/dist/nexus/file-escalation.d.ts.map +1 -1
- package/dist/nexus/file-escalation.js +5 -1
- package/dist/nexus/file-escalation.js.map +1 -1
- package/dist/queries/api-client/shared.js +1 -1
- package/dist/queries/deliveries/deliveries.d.ts.map +1 -1
- package/dist/queries/deliveries/deliveries.js +1 -0
- package/dist/queries/deliveries/deliveries.js.map +1 -1
- package/dist/queries/delivery-gate-state/delivery-gate-state.js +1 -1
- package/dist/queries/delivery-gate-state/verify-own-holds.d.ts +10 -3
- package/dist/queries/delivery-gate-state/verify-own-holds.d.ts.map +1 -1
- package/dist/queries/delivery-gate-state/verify-own-holds.js +2 -0
- package/dist/queries/delivery-gate-state/verify-own-holds.js.map +1 -1
- package/dist/queries/escalations/cause-key.d.ts.map +1 -1
- package/dist/queries/escalations/cause-key.js +1 -0
- package/dist/queries/escalations/cause-key.js.map +1 -1
- package/dist/queries/escalations/escalations.d.ts.map +1 -1
- package/dist/queries/escalations/escalations.js +2 -1
- package/dist/queries/escalations/escalations.js.map +1 -1
- package/dist/queries/focuses/focuses.d.ts +12 -2
- package/dist/queries/focuses/focuses.d.ts.map +1 -1
- package/dist/queries/focuses/focuses.js +24 -3
- package/dist/queries/focuses/focuses.js.map +1 -1
- package/dist/queries/verification/verification.js +1 -1
- package/dist/spawn/review-hold-park.d.ts.map +1 -1
- package/dist/spawn/review-hold-park.js +1 -0
- package/dist/spawn/review-hold-park.js.map +1 -1
- package/dist/supervision/agent-resolvable-retirement.d.ts +1 -1
- package/dist/supervision/agent-resolvable-retirement.d.ts.map +1 -1
- package/dist/supervision/agent-resolvable-retirement.js +2 -1
- package/dist/supervision/agent-resolvable-retirement.js.map +1 -1
- package/dist/supervision/escalation-filing.js +1 -1
- package/dist/supervision/incident-correlation.d.ts +3 -0
- package/dist/supervision/incident-correlation.d.ts.map +1 -1
- package/dist/supervision/incident-correlation.js +4 -0
- package/dist/supervision/incident-correlation.js.map +1 -1
- package/dist/supervision/null-role-spawn.d.ts.map +1 -1
- package/dist/supervision/null-role-spawn.js +1 -0
- package/dist/supervision/null-role-spawn.js.map +1 -1
- package/dist/supervision/spawn-cooldown.js +1 -1
- package/dist/supervision/stop-rows-work-holds.d.ts +4 -4
- package/dist/supervision/stop-rows-work-holds.d.ts.map +1 -1
- package/dist/supervision/stop-rows-work-holds.js +17 -15
- package/dist/supervision/stop-rows-work-holds.js.map +1 -1
- package/dist/testing/fixtures/api-client.js +1 -1
- package/dist/testing/fixtures/index.js +1 -1
- package/dist/testing/fixtures/judge-session.d.ts +14 -0
- package/dist/testing/fixtures/judge-session.d.ts.map +1 -0
- package/dist/testing/fixtures/judge-session.js +10 -0
- package/dist/testing/fixtures/judge-session.js.map +1 -0
- package/dist/testing/fixtures/verification-deps.d.ts +2 -1
- package/dist/testing/fixtures/verification-deps.d.ts.map +1 -1
- package/dist/testing/fixtures/verification-deps.js +4 -1
- package/dist/testing/fixtures/verification-deps.js.map +1 -1
- package/dist/testing/fixtures/vitest-failure-log.d.ts +10 -0
- package/dist/testing/fixtures/vitest-failure-log.d.ts.map +1 -0
- package/dist/testing/fixtures/vitest-failure-log.js +27 -0
- package/dist/testing/fixtures/vitest-failure-log.js.map +1 -0
- package/dist/types/index.js +1 -1
- package/dist/verify/attribution/verification-attribution.d.ts.map +1 -1
- package/dist/verify/attribution/verification-attribution.js +2 -1
- package/dist/verify/attribution/verification-attribution.js.map +1 -1
- package/dist/verify/attribution/verification-baseline-files.d.ts +29 -0
- package/dist/verify/attribution/verification-baseline-files.d.ts.map +1 -0
- package/dist/verify/attribution/verification-baseline-files.js +125 -0
- package/dist/verify/attribution/verification-baseline-files.js.map +1 -0
- package/dist/verify/attribution/verification-baseline-run.d.ts.map +1 -1
- package/dist/verify/attribution/verification-baseline-run.js +1 -0
- package/dist/verify/attribution/verification-baseline-run.js.map +1 -1
- package/dist/verify/attribution/verification-baseline.d.ts +15 -0
- package/dist/verify/attribution/verification-baseline.d.ts.map +1 -1
- package/dist/verify/attribution/verification-baseline.js +28 -3
- package/dist/verify/attribution/verification-baseline.js.map +1 -1
- package/dist/verify/deterministic-gate/verification-checkout.d.ts.map +1 -1
- package/dist/verify/deterministic-gate/verification-checkout.js +1 -0
- package/dist/verify/deterministic-gate/verification-checkout.js.map +1 -1
- package/dist/verify/deterministic-gate/verification-deterministic.d.ts +30 -0
- package/dist/verify/deterministic-gate/verification-deterministic.d.ts.map +1 -1
- package/dist/verify/deterministic-gate/verification-deterministic.js +2 -0
- package/dist/verify/deterministic-gate/verification-deterministic.js.map +1 -1
- package/dist/verify/deterministic-gate/verification-gate-stages.d.ts.map +1 -1
- package/dist/verify/deterministic-gate/verification-gate-stages.js +1 -0
- package/dist/verify/deterministic-gate/verification-gate-stages.js.map +1 -1
- package/dist/verify/effect-reconciliation/judge-invoker.d.ts +14 -4
- package/dist/verify/effect-reconciliation/judge-invoker.d.ts.map +1 -1
- package/dist/verify/effect-reconciliation/judge-invoker.js +30 -12
- package/dist/verify/effect-reconciliation/judge-invoker.js.map +1 -1
- package/dist/verify/effect-reconciliation/verify-reconciliation.d.ts +18 -5
- package/dist/verify/effect-reconciliation/verify-reconciliation.d.ts.map +1 -1
- package/dist/verify/effect-reconciliation/verify-reconciliation.js +75 -18
- package/dist/verify/effect-reconciliation/verify-reconciliation.js.map +1 -1
- package/dist/verify/effect-reconciliation/verify-restatement.js +1 -1
- package/dist/verify/engine/verification-commit-sharing.d.ts.map +1 -1
- package/dist/verify/engine/verification-commit-sharing.js +14 -2
- package/dist/verify/engine/verification-commit-sharing.js.map +1 -1
- package/dist/verify/engine/verification-deps.d.ts +23 -0
- package/dist/verify/engine/verification-deps.d.ts.map +1 -1
- package/dist/verify/engine/verification-deps.js +1 -1
- package/dist/verify/engine/verification-engine.js +1 -1
- package/dist/verify/failing-test-rerun/failing-test-rerunner.d.ts +34 -0
- package/dist/verify/failing-test-rerun/failing-test-rerunner.d.ts.map +1 -0
- package/dist/verify/failing-test-rerun/failing-test-rerunner.js +34 -0
- package/dist/verify/failing-test-rerun/failing-test-rerunner.js.map +1 -0
- package/dist/verify/failing-test-rerun/failing-test-retry.d.ts +80 -0
- package/dist/verify/failing-test-rerun/failing-test-retry.d.ts.map +1 -0
- package/dist/verify/failing-test-rerun/failing-test-retry.js +102 -0
- package/dist/verify/failing-test-rerun/failing-test-retry.js.map +1 -0
- package/dist/verify/failing-test-rerun/flaky-test-finding.d.ts +11 -0
- package/dist/verify/failing-test-rerun/flaky-test-finding.d.ts.map +1 -0
- package/dist/verify/failing-test-rerun/flaky-test-finding.js +63 -0
- package/dist/verify/failing-test-rerun/flaky-test-finding.js.map +1 -0
- package/dist/verify/failing-test-rerun/rerun-command.d.ts +45 -0
- package/dist/verify/failing-test-rerun/rerun-command.d.ts.map +1 -0
- package/dist/verify/failing-test-rerun/rerun-command.js +132 -0
- package/dist/verify/failing-test-rerun/rerun-command.js.map +1 -0
- package/dist/verify/failing-test-rerun/rework-recheck.d.ts +41 -0
- package/dist/verify/failing-test-rerun/rework-recheck.d.ts.map +1 -0
- package/dist/verify/failing-test-rerun/rework-recheck.js +169 -0
- package/dist/verify/failing-test-rerun/rework-recheck.js.map +1 -0
- package/dist/verify/gate-config/verification-config.d.ts.map +1 -1
- package/dist/verify/gate-config/verification-config.js +16 -2
- package/dist/verify/gate-config/verification-config.js.map +1 -1
- package/dist/verify/gate-config/verification-manifest.d.ts +26 -1
- package/dist/verify/gate-config/verification-manifest.d.ts.map +1 -1
- package/dist/verify/gate-config/verification-manifest.js +31 -1
- package/dist/verify/gate-config/verification-manifest.js.map +1 -1
- package/dist/verify/inspection-strategies/verification-strategies.js +1 -1
- package/dist/verify/inspection-strategies/verification-strategies.js.map +1 -1
- package/dist/verify/outcome-routing/incurable-model-hold.d.ts +9 -3
- package/dist/verify/outcome-routing/incurable-model-hold.d.ts.map +1 -1
- package/dist/verify/outcome-routing/incurable-model-hold.js +18 -5
- package/dist/verify/outcome-routing/incurable-model-hold.js.map +1 -1
- package/dist/verify/outcome-routing/repeating-model-hold.d.ts +30 -0
- package/dist/verify/outcome-routing/repeating-model-hold.d.ts.map +1 -0
- package/dist/verify/outcome-routing/repeating-model-hold.js +135 -0
- package/dist/verify/outcome-routing/repeating-model-hold.js.map +1 -0
- package/dist/verify/outcome-routing/verification-history-reset.d.ts.map +1 -1
- package/dist/verify/outcome-routing/verification-history-reset.js +1 -0
- package/dist/verify/outcome-routing/verification-history-reset.js.map +1 -1
- package/dist/verify/outcome-routing/verification-model-unavailable-hold.d.ts +10 -4
- package/dist/verify/outcome-routing/verification-model-unavailable-hold.d.ts.map +1 -1
- package/dist/verify/outcome-routing/verification-model-unavailable-hold.js +24 -6
- package/dist/verify/outcome-routing/verification-model-unavailable-hold.js.map +1 -1
- package/dist/verify/run-selection/default-on-guards.js +1 -1
- package/dist/verify/run-selection/pre-review-gate-dispatch.d.ts +4 -3
- package/dist/verify/run-selection/pre-review-gate-dispatch.d.ts.map +1 -1
- package/dist/verify/run-selection/pre-review-gate-dispatch.js +23 -7
- package/dist/verify/run-selection/pre-review-gate-dispatch.js.map +1 -1
- package/dist/verify/run-selection/verification-default-on.js +1 -1
- package/dist/verify/run-selection/verification-default-on.js.map +1 -1
- package/dist/worktree/provision.d.ts.map +1 -1
- package/dist/worktree/provision.js +1 -0
- package/dist/worktree/provision.js.map +1 -1
- package/dist/worktree/safety.d.ts.map +1 -1
- package/dist/worktree/safety.js +1 -0
- package/dist/worktree/safety.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import { type WorktreeStateDeps } from '../worktree/index.js';
|
|
2
2
|
import { type AbandonedMergeRecoveryDeps } from '../merge/abandoned-merge-recovery.js';
|
|
3
3
|
import { type DirtyWorktreeGuardDeps, type MergeFocusBranch, type MergeFocusBranchDeps, type ResolvedConflictRetryDeps } from '../merge/focus-merge.js';
|
|
4
|
-
import { type
|
|
4
|
+
import { type CompletionMergeGateDeps } from '../merge/completion-merge-gate.js';
|
|
5
|
+
import type { CompletionMergeDriverDeps } from '../merge/completion-merge-driver.js';
|
|
6
|
+
import { type CandidateReworkDeps } from '../merge/candidate-rework.js';
|
|
7
|
+
import type { DaemonConfig } from '../types/index.js';
|
|
8
|
+
import type { MergeBackFocusInfo } from '../merge/merge-back-loop.js';
|
|
5
9
|
import { type ApprovalGateStateDeps } from '../merge/approval-gate-state.js';
|
|
6
10
|
import { type MergeBackConflictDeps } from '../merge/merge-back-conflict.js';
|
|
7
11
|
import { type MergeConflictEscalationDeps, type MergeConflictParams } from '../merge/merge-conflict-escalation.js';
|
|
@@ -16,8 +20,8 @@ export declare function buildDirtyWorktreeGuardDeps(): DirtyWorktreeGuardDeps;
|
|
|
16
20
|
export declare function buildMergeConflictEscalationDeps(): MergeConflictEscalationDeps;
|
|
17
21
|
/** The merge-conflict escalation bound to its production collaborators. */
|
|
18
22
|
export declare function buildMergeConflictEscalation(): (params: MergeConflictParams) => Promise<void>;
|
|
19
|
-
/** The merge
|
|
20
|
-
export declare function
|
|
23
|
+
/** The completion merge gate's reads: the focus's deliveries, git, the approving review and the candidate's CI status. */
|
|
24
|
+
export declare function buildMergeGateDeps(): CompletionMergeGateDeps;
|
|
21
25
|
/** The merge-back conflict handler's collaborators: the team-lead resolution request, the fallback resolver and git. */
|
|
22
26
|
export declare function buildMergeBackConflictDeps(): MergeBackConflictDeps;
|
|
23
27
|
/** The focus-branch merge's collaborators: the merge-back conflict handler's plus the dirty-worktree guard. */
|
|
@@ -28,6 +32,10 @@ export declare function bindMergeFocusBranch(conflict: MergeBackConflictDeps): M
|
|
|
28
32
|
export declare function buildAbandonedMergeRecoveryDeps(worktreeState: WorktreeStateDeps): AbandonedMergeRecoveryDeps;
|
|
29
33
|
/** The merge-back follow-up: one contained completion attempt per held branch. */
|
|
30
34
|
export declare function buildMergeBackFollowUpDeps(): MergeBackFollowUpDeps;
|
|
35
|
+
/** A red integration candidate's re-work: the focus's deliveries and issues, the branch trailers, and the re-open write. */
|
|
36
|
+
export declare function buildCandidateReworkDeps(organizationId: string, integrationBranch: string): CandidateReworkDeps;
|
|
37
|
+
/** The completion merge driver's effects for one branch: the clean-or-abort merge-out, the candidate push and the re-work. */
|
|
38
|
+
export declare function buildCompletionMergeDriverDeps(conflict: MergeBackConflictDeps, productConfig: DaemonConfig, info: MergeBackFocusInfo): CompletionMergeDriverDeps;
|
|
31
39
|
/** The continuous merge-back loop's collaborators. */
|
|
32
40
|
export declare function buildMergeBackLoopDeps(worktreeState: WorktreeStateDeps): MergeBackLoopDeps;
|
|
33
41
|
/** The resolved-conflict retry's collaborators. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-merge-context.d.ts","sourceRoot":"","sources":["../../src/composition/execution-merge-context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execution-merge-context.d.ts","sourceRoot":"","sources":["../../src/composition/execution-merge-context.ts"],"names":[],"mappings":"AAsCA,OAAO,EAAyD,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGrH,OAAO,EAGL,KAAK,0BAA0B,EAChC,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAOL,KAAK,sBAAsB,EAC3B,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,yBAAyB,EAC/B,MAAM,yBAAyB,CAAC;AASjC,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,mCAAmC,CAAC;AAE3C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AACrF,OAAO,EAAwB,KAAK,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAM9F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAGtE,OAAO,EAA0B,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAIrG,OAAO,EAAoB,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAG/F,OAAO,EAEL,KAAK,2BAA2B,EAChC,KAAK,mBAAmB,EACzB,MAAM,uCAAuC,CAAC;AAK/C,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAwB,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAGnG,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,6BAA6B,CAAC;AAcrC,qIAAqI;AACrI,wBAAgB,0BAA0B,IAAI,qBAAqB,CAOlE;AAED,2GAA2G;AAC3G,wBAAgB,2BAA2B,IAAI,sBAAsB,CAMpE;AAED,oHAAoH;AACpH,wBAAgB,gCAAgC,IAAI,2BAA2B,CAM9E;AAED,2EAA2E;AAC3E,wBAAgB,4BAA4B,IAAI,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAG7F;AAED,0HAA0H;AAC1H,wBAAgB,kBAAkB,IAAI,uBAAuB,CAe5D;AAED,wHAAwH;AACxH,wBAAgB,0BAA0B,IAAI,qBAAqB,CAiBlE;AAED,+GAA+G;AAC/G,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,oBAAoB,CAE/F;AAED,2GAA2G;AAC3G,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,gBAAgB,CAItF;AAED,2EAA2E;AAC3E,wBAAgB,+BAA+B,CAAC,aAAa,EAAE,iBAAiB,GAAG,0BAA0B,CAoB5G;AAED,kFAAkF;AAClF,wBAAgB,0BAA0B,IAAI,qBAAqB,CAalE;AAED,4HAA4H;AAC5H,wBAAgB,wBAAwB,CAAC,cAAc,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,mBAAmB,CAmB/G;AAED,8HAA8H;AAC9H,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,YAAY,EAC3B,IAAI,EAAE,kBAAkB,GACvB,yBAAyB,CAS3B;AAED,sDAAsD;AACtD,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,iBAAiB,GAAG,iBAAiB,CAsB1F;AAED,mDAAmD;AACnD,wBAAgB,8BAA8B,CAAC,aAAa,EAAE,iBAAiB,GAAG,yBAAyB,CAQ1G;AAED,0DAA0D;AAC1D,wBAAgB,gCAAgC,IAAI,2BAA2B,CAK9E"}
|
|
@@ -1,6 +1,7 @@
|
|
|
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/completion/team-exit/teardown-merge-gate.test.ts,
|
|
3
3
|
// packages/daemon/src/completion/team-teardown/mid-flight-merge-gate.test.ts,
|
|
4
|
+
// packages/daemon/src/git/merge-admitted-sha-guard.test.ts,
|
|
4
5
|
// packages/daemon/src/integration/agent-owned-scoping-integration.test.ts,
|
|
5
6
|
// packages/daemon/src/merge/abandoned-merge-recovery.test.ts,
|
|
6
7
|
// packages/daemon/src/merge/focus-merge-empty-deliveries.test.ts,
|
|
@@ -20,7 +21,8 @@
|
|
|
20
21
|
*
|
|
21
22
|
* The merge-back conflict handler's collaborators (MergeBackConflictDeps,
|
|
22
23
|
* merge/merge-back-conflict.ts), the merge-gate coverage reads
|
|
23
|
-
* (
|
|
24
|
+
* (CompletionMergeGateDeps, merge/completion-merge-gate.ts), the completion merge
|
|
25
|
+
* driver (merge/completion-merge-driver.ts) and the focus-branch
|
|
24
26
|
* merge bound over them (MergeFocusBranch, merge/focus-merge.ts) are built here
|
|
25
27
|
* too, and reused by the team-exit and mid-flight merge contexts. So are the
|
|
26
28
|
* leaf collaborators those paths reach: the approval gate-state reads
|
|
@@ -36,9 +38,17 @@ import { isWorktreeBeingWritten, worktreeHasUncommittedChanges } from '../worktr
|
|
|
36
38
|
import { listTrackedWorkers } from '../daemon-state/worker-registry.js';
|
|
37
39
|
import { isMergeBackInFlight, msSinceMergeBackStarted } from '../merge/merge-back-activity.js';
|
|
38
40
|
import { isWorktreeBeingWrittenAfterMergeRecovery, recoverAbandonedMergeBack, } from '../merge/abandoned-merge-recovery.js';
|
|
39
|
-
import { attemptMergeBackCompletion, isResolverStillAlive, mergeFocusBranch, MERGE_CONFLICT_RESOLUTION_TIMEOUT_MS, requestTeamLeadResolution, } from '../merge/focus-merge.js';
|
|
41
|
+
import { attemptCompletionMergeOut, attemptMergeBackCompletion, isResolverStillAlive, mergeFocusBranch, MERGE_CONFLICT_RESOLUTION_TIMEOUT_MS, requestTeamLeadResolution, } from '../merge/focus-merge.js';
|
|
40
42
|
import { isProcessAlive } from '../daemon-state/process-liveness.js';
|
|
41
|
-
import { listUnmergedCommits,
|
|
43
|
+
import { isAncestorCommit, listUnmergedCommits, resolveBranchHead, resolveGateIntegrationTip, resolveGatedAnchor, } from '../merge/merge-gate-coverage.js';
|
|
44
|
+
import { readMergeGateDecision, readMergeGateDecisionForBranch, } from '../merge/completion-merge-gate.js';
|
|
45
|
+
import { pushCandidate, readPushedCandidateSha } from '../ci/candidate-ref.js';
|
|
46
|
+
import { routeCandidateRework } from '../merge/candidate-rework.js';
|
|
47
|
+
import { clearCompletionHold, stampCandidateWait, stampCompletionHold } from '../merge/completion-hold-record.js';
|
|
48
|
+
import { createIssue, getDeliveryIssues } from '../queries/deliveries/issues.js';
|
|
49
|
+
import { fetchEffectiveWorkflow } from '../queries/workflow-transitions/workflows.js';
|
|
50
|
+
import { DELIVERY_TRAILER_KEY } from '../git/delivery-trailer.js';
|
|
51
|
+
import { readRemoteCandidateCiStatus } from '../ci/ci-status-git.js';
|
|
42
52
|
import { listReviewAutoApprovals } from '../merge/review-auto-approval-record.js';
|
|
43
53
|
import { judgeApprovalGateState } from '../merge/approval-gate-state.js';
|
|
44
54
|
import { commitGateSeams } from './commit-gate-context.js';
|
|
@@ -49,12 +59,13 @@ import { spawnResolutionAgent } from '../merge/resolution-agent.js';
|
|
|
49
59
|
import { resolutionAgentEffects } from './resolution-agent-effects.js';
|
|
50
60
|
import { escalateMergeConflict, } from '../merge/merge-conflict-escalation.js';
|
|
51
61
|
import { reportGitState } from '../queries/deliveries/deliveries.js';
|
|
62
|
+
import { DELIVERY_ADVANCERS } from './delivery-advancers-context.js';
|
|
52
63
|
import { createEscalation } from '../supervision/escalation-filing.js';
|
|
53
64
|
import { readFocusOwnDeltaWithGit } from './execution-git-context.js';
|
|
54
65
|
import { runMergeBackFollowUp } from '../merge/merge-back-followup.js';
|
|
55
66
|
import { integrationMergedIntoHead } from '../merge/merge-back-conflict.js';
|
|
56
67
|
import { fileResolverExhaustedObservation } from '../merge/merge-conflict-escalation.js';
|
|
57
|
-
import { defaultEnumerateFocusBranchesAhead,
|
|
68
|
+
import { defaultEnumerateFocusBranchesAhead, } from '../merge/merge-back-loop.js';
|
|
58
69
|
import { getMergeConflictDeliveries } from '../queries/deliveries/deliveries.js';
|
|
59
70
|
import { getFocusDeliveries } from '../queries/focuses/focuses.js';
|
|
60
71
|
import { hasOpenWorktreeDirtyEscalation, listPendingEscalations, markEscalationResolved, MERGE_CONFLICT_ESCALATION_KIND, } from '../queries/escalations/escalations.js';
|
|
@@ -92,16 +103,21 @@ export function buildMergeConflictEscalation() {
|
|
|
92
103
|
const deps = buildMergeConflictEscalationDeps();
|
|
93
104
|
return (params) => escalateMergeConflict(params, deps);
|
|
94
105
|
}
|
|
95
|
-
/** The merge
|
|
96
|
-
export function
|
|
106
|
+
/** The completion merge gate's reads: the focus's deliveries, git, the approving review and the candidate's CI status. */
|
|
107
|
+
export function buildMergeGateDeps() {
|
|
97
108
|
return {
|
|
109
|
+
getFocusDeliveries,
|
|
98
110
|
listUnmergedCommits,
|
|
99
111
|
resolveAnchor: resolveGatedAnchor,
|
|
100
112
|
readApprovedReviewSha: (target) => readLatestApprovedReviewSha(target.focusId, {
|
|
101
113
|
autoApprovals: listReviewAutoApprovals(target.productId, target.focusId),
|
|
102
114
|
}),
|
|
103
|
-
hasPassingVerdict: (target, sha) => readCommitVerdict(target.productId, target.focusId, sha)?.outcome === 'passed',
|
|
104
115
|
judgeApprovalGate: (target, sha) => judgeApprovalGateState(target, sha, buildApprovalGateStateDeps()),
|
|
116
|
+
resolveBranchHead,
|
|
117
|
+
resolveIntegrationTip: (target) => resolveGateIntegrationTip(target.repoPath, target.integrationBranch),
|
|
118
|
+
isAncestor: isAncestorCommit,
|
|
119
|
+
readCandidateStatus: (target, sha) => readRemoteCandidateCiStatus(target.repoPath, sha),
|
|
120
|
+
readPushedCandidateSha: (target) => readPushedCandidateSha(target.repoPath, target.focusId),
|
|
105
121
|
};
|
|
106
122
|
}
|
|
107
123
|
/** The merge-back conflict handler's collaborators: the team-lead resolution request, the fallback resolver and git. */
|
|
@@ -127,7 +143,7 @@ export function buildMergeFocusBranchDeps(conflict) {
|
|
|
127
143
|
/** The focus-branch merge, bound to the merge-back conflict collaborators and the dirty-worktree guard. */
|
|
128
144
|
export function bindMergeFocusBranch(conflict) {
|
|
129
145
|
const deps = buildMergeFocusBranchDeps(conflict);
|
|
130
|
-
return (config, teamState, sessionId, branchName, workedDeliveryIds, dirtyWorktreePolicy) => mergeFocusBranch(deps, config, teamState, sessionId, branchName, workedDeliveryIds, dirtyWorktreePolicy);
|
|
146
|
+
return (config, teamState, sessionId, branchName, workedDeliveryIds, admittedSha, dirtyWorktreePolicy) => mergeFocusBranch(deps, config, teamState, sessionId, branchName, workedDeliveryIds, admittedSha, dirtyWorktreePolicy);
|
|
131
147
|
}
|
|
132
148
|
/** Abandoned merge recovery's reads and its preserve-and-restore write. */
|
|
133
149
|
export function buildAbandonedMergeRecoveryDeps(worktreeState) {
|
|
@@ -162,6 +178,34 @@ export function buildMergeBackFollowUpDeps() {
|
|
|
162
178
|
now: () => Date.now(),
|
|
163
179
|
};
|
|
164
180
|
}
|
|
181
|
+
/** A red integration candidate's re-work: the focus's deliveries and issues, the branch trailers, and the re-open write. */
|
|
182
|
+
export function buildCandidateReworkDeps(organizationId, integrationBranch) {
|
|
183
|
+
return {
|
|
184
|
+
organizationId,
|
|
185
|
+
getFocusDeliveries,
|
|
186
|
+
listBranchDeliveryTrailers: (repoPath, branchName) => {
|
|
187
|
+
const r = runGitSync(['log', '--no-merges', `--format=%(trailers:key=${DELIVERY_TRAILER_KEY},valueonly)`, `${integrationBranch}..${branchName}`, '--'], repoPath);
|
|
188
|
+
return r.success ? r.output.split('\n').map((l) => l.trim()).filter(Boolean) : [];
|
|
189
|
+
},
|
|
190
|
+
getDeliveryIssues: async (deliveryId) => (await getDeliveryIssues(deliveryId))
|
|
191
|
+
.map((i) => ({ title: i.title, status: i.status, issueType: i.issueType })),
|
|
192
|
+
createIssue,
|
|
193
|
+
resolveStageId: async (deliveryId, statusName) => (await fetchEffectiveWorkflow(deliveryId)).stages.find((st) => st.name === statusName)?.id,
|
|
194
|
+
// The applier's advancer writer, as every poll-side advancer takes it.
|
|
195
|
+
updateDeliveryStatus: DELIVERY_ADVANCERS.advanceDeliveryStatus,
|
|
196
|
+
};
|
|
197
|
+
}
|
|
198
|
+
/** The completion merge driver's effects for one branch: the clean-or-abort merge-out, the candidate push and the re-work. */
|
|
199
|
+
export function buildCompletionMergeDriverDeps(conflict, productConfig, info) {
|
|
200
|
+
const rework = buildCandidateReworkDeps(productConfig.organizationId, productConfig.integrationBranch);
|
|
201
|
+
return {
|
|
202
|
+
mergeOut: () => attemptCompletionMergeOut(productConfig, info, conflict),
|
|
203
|
+
pushCandidate,
|
|
204
|
+
candidateWaitSince: (sha, now) => stampCandidateWait(info.productId, info.focusId, sha, now),
|
|
205
|
+
routeRework: (subject, sha, cause, merge) => routeCandidateRework(subject, sha, cause, merge, rework),
|
|
206
|
+
now: () => Date.now(),
|
|
207
|
+
};
|
|
208
|
+
}
|
|
165
209
|
/** The continuous merge-back loop's collaborators. */
|
|
166
210
|
export function buildMergeBackLoopDeps(worktreeState) {
|
|
167
211
|
const recovery = buildAbandonedMergeRecoveryDeps(worktreeState);
|
|
@@ -175,9 +219,13 @@ export function buildMergeBackLoopDeps(worktreeState) {
|
|
|
175
219
|
retireAbsorbedSymptoms,
|
|
176
220
|
fileEscalation: fileEscalationIdempotent,
|
|
177
221
|
mergeFocusBranch: bindMergeFocusBranch(buildMergeBackConflictDeps()),
|
|
178
|
-
readMergeGate: (target) => readMergeGateDecision(target,
|
|
222
|
+
readMergeGate: (target) => readMergeGateDecision(target, buildMergeGateDeps()),
|
|
223
|
+
completionHold: {
|
|
224
|
+
stamp: (productId, focusId, now) => stampCompletionHold(productId, focusId, now),
|
|
225
|
+
clear: (productId, focusId) => clearCompletionHold(productId, focusId),
|
|
226
|
+
},
|
|
227
|
+
completionMergeDriver: (productConfig, info) => buildCompletionMergeDriverDeps(buildMergeBackConflictDeps(), productConfig, info),
|
|
179
228
|
getFocusDeliveries,
|
|
180
|
-
getOldestUnmergedCommitMs,
|
|
181
229
|
followUpMergeBackConflict: (productConfig, info) => runMergeBackFollowUp(productConfig, info, followUp),
|
|
182
230
|
now: () => Date.now(),
|
|
183
231
|
};
|
|
@@ -187,7 +235,7 @@ export function buildResolvedConflictRetryDeps(worktreeState) {
|
|
|
187
235
|
const recovery = buildAbandonedMergeRecoveryDeps(worktreeState);
|
|
188
236
|
return {
|
|
189
237
|
getMergeConflictDeliveries,
|
|
190
|
-
readMergeGate: (target) => readMergeGateDecisionForBranch(target,
|
|
238
|
+
readMergeGate: (target) => readMergeGateDecisionForBranch(target, buildMergeGateDeps()),
|
|
191
239
|
recoverAbandonedMergeBack: (focusId) => recoverAbandonedMergeBack(focusId, recovery),
|
|
192
240
|
mergeBackConflict: buildMergeBackConflictDeps(),
|
|
193
241
|
};
|
|
@@ -195,7 +243,7 @@ export function buildResolvedConflictRetryDeps(worktreeState) {
|
|
|
195
243
|
/** Canonical focus worktree removal's merge-gate read. */
|
|
196
244
|
export function buildSafeRemoveFocusWorktreeDeps() {
|
|
197
245
|
return {
|
|
198
|
-
readMergeGate: (target) => readMergeGateDecisionForBranch(target,
|
|
246
|
+
readMergeGate: (target) => readMergeGateDecisionForBranch(target, buildMergeGateDeps()),
|
|
199
247
|
worktreeCapture: buildWorktreeCaptureDeps(),
|
|
200
248
|
};
|
|
201
249
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-merge-context.js","sourceRoot":"","sources":["../../src/composition/execution-merge-context.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,mFAAmF;AACnF,gFAAgF;AAChF,6EAA6E;AAC7E,gEAAgE;AAChE,oEAAoE;AACpE,oEAAoE;AACpE,6DAA6D;AAC7D,gBAAgB;AAEhB
|
|
1
|
+
{"version":3,"file":"execution-merge-context.js","sourceRoot":"","sources":["../../src/composition/execution-merge-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,8 +25,8 @@ import { hasOpenEscalationForDelivery } from '../queries/escalations/escalations
|
|
|
25
25
|
import { createEscalation } from '../supervision/escalation-filing.js';
|
|
26
26
|
import { worktreeHasNonDaemonAuthoredChanges } from '../worktree/index.js';
|
|
27
27
|
import { branchHasUnmergedCommits } from '../worktree/safety.js';
|
|
28
|
-
import { readMergeGateDecision } from '../merge/merge-gate
|
|
29
|
-
import { bindMergeFocusBranch, buildMergeBackConflictDeps, buildMergeConflictEscalation,
|
|
28
|
+
import { readMergeGateDecision } from '../merge/completion-merge-gate.js';
|
|
29
|
+
import { bindMergeFocusBranch, buildMergeBackConflictDeps, buildMergeConflictEscalation, buildMergeGateDeps, } from './execution-merge-context.js';
|
|
30
30
|
import { buildWorktreeCaptureDeps } from './execution-worktree-context.js';
|
|
31
31
|
import { runReviewExitHandler } from '../completion/review-exit/review-exit-phase.js';
|
|
32
32
|
import { buildLeadOwnershipDeps, buildProcessGroupKillDeps } from './execution-process-context.js';
|
|
@@ -40,7 +40,7 @@ export function buildRealityPoleCaptureDeps() {
|
|
|
40
40
|
}
|
|
41
41
|
/** The team-exit merge: real branch state, the bound focus-branch merge and the real merge-gate coverage read. */
|
|
42
42
|
export function buildFocusMergeAttemptDeps() {
|
|
43
|
-
const coverage =
|
|
43
|
+
const coverage = buildMergeGateDeps();
|
|
44
44
|
return {
|
|
45
45
|
branchHasUnmergedCommits,
|
|
46
46
|
mergeFocusBranch: bindMergeFocusBranch(buildMergeBackConflictDeps()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-close-context.js","sourceRoot":"","sources":["../../src/composition/process-close-context.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,wEAAwE;AACxE,gBAAgB;AAEhB;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACtF,OAAO,EAAE,yBAAyB,EAAgC,MAAM,oCAAoC,CAAC;AAG7G,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,mCAAmC,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"process-close-context.js","sourceRoot":"","sources":["../../src/composition/process-close-context.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,wEAAwE;AACxE,gBAAgB;AAEhB;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACtF,OAAO,EAAE,yBAAyB,EAAgC,MAAM,oCAAoC,CAAC;AAG7G,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,mCAAmC,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,4BAA4B,EAC5B,kBAAkB,GACnB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAEnG,sEAAsE;AACtE,MAAM,UAAU,2BAA2B;IACzC,OAAO;QACL,YAAY,EAAE,oBAAoB;QAClC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC;QACnE,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;KAC7D,CAAC;AACJ,CAAC;AAED,kHAAkH;AAClH,MAAM,UAAU,0BAA0B;IACxC,MAAM,QAAQ,GAAG,kBAAkB,EAAE,CAAC;IACtC,OAAO;QACL,wBAAwB;QACxB,gBAAgB,EAAE,oBAAoB,CAAC,0BAA0B,EAAE,CAAC;QACpE,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC;QAClE,qBAAqB,EAAE,4BAA4B,EAAE;KACtD,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB;IACpC,OAAO;QACL,qBAAqB,EAAE,GAAG,EAAE,CAAC,qBAAqB,EAAE;QACpD,WAAW,EAAE,sBAAsB;QACnC,cAAc;QACd,0BAA0B;QAC1B,oBAAoB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,EAAE,EAAE,gBAAgB,EAAE,CAAC;KACrF,CAAC;AACJ,CAAC;AAED,+GAA+G;AAC/G,MAAM,UAAU,yBAAyB;IACvC,OAAO,EAAE,mCAAmC,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,CAAC;AACjG,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,wBAAwB;IACtC,OAAO;QACL,YAAY,EAAE,2BAA2B,EAAE;QAC3C,KAAK,EAAE,0BAA0B,EAAE;QACnC,eAAe,EAAE,wBAAwB,EAAE;QAC3C,SAAS,EAAE,sBAAsB,CAAC,yBAAyB,EAAE,CAAC;QAC9D,OAAO,EAAE,sBAAsB,EAAE;QACjC,gBAAgB,EAAE,yBAAyB,EAAE;QAC7C,eAAe,EAAE,oBAAoB;KACtC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-cascade-context.d.ts","sourceRoot":"","sources":["../../src/composition/state-cascade-context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"state-cascade-context.d.ts","sourceRoot":"","sources":["../../src/composition/state-cascade-context.ts"],"names":[],"mappings":"AAqDA,OAAO,KAAK,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AAClH,OAAO,KAAK,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAGzG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAIxF,OAAO,EAA6C,KAAK,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAUpI,mGAAmG;AACnG,wBAAgB,wBAAwB,IAAI,mBAAmB,CAO9D;AAED,qHAAqH;AACrH,wBAAgB,8BAA8B,IAAI,yBAAyB,CAS1E;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,IAAI,uBAAuB,CAEtE;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,sBAAsB,GAAG,oBAAoB,CAY/F;AAED,0DAA0D;AAC1D,wBAAgB,wBAAwB,IAAI,mBAAmB,CA2D9D"}
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
*/
|
|
21
21
|
import { getActiveFocuses } from '../queries/focuses/focus-discovery.js';
|
|
22
22
|
import { closeReviewWindowWith } from '../directive/directive-queue.js';
|
|
23
|
-
import { clearReviewRequestedAt, getFocusDeliveries, getFocusIssues, recordReviewSkip, releaseFocusArm, setReviewRequestedAt, } from '../queries/focuses/focuses.js';
|
|
23
|
+
import { clearCompletionMergePending, clearReviewRequestedAt, getFocusDeliveries, markCompletionMergePending, getFocusIssues, recordReviewSkip, releaseFocusArm, setReviewRequestedAt, } from '../queries/focuses/focuses.js';
|
|
24
24
|
import { listOpenFocusEscalationsOfKind, markEscalationResolved } from '../queries/escalations/escalations.js';
|
|
25
25
|
import { readLatestApprovedReviewSha } from '../queries/focus-review/focus-review-approval.js';
|
|
26
26
|
import { callApi } from '../queries/api-client/shared.js';
|
|
@@ -33,6 +33,7 @@ import { resolveOpenFocusEscalationsOfKind } from '../supervision/escalation-cle
|
|
|
33
33
|
import { activeReviewFocusIds, isTeamRecoverable } from '../supervision/stall-detectors.js';
|
|
34
34
|
import { resolveIdleTeamStallHours, resolveReviewCycleCap, resolveReviewLivenessWindowMinutes, resolveReviewSilenceDeadlineMinutes, resolveReviewWindowStaleHours, resolveStalledTeamBackstopMinutes, resolveVerifyFailedCap, } from '../supervision/stall-detector-config.js';
|
|
35
35
|
import { commitGateSeams } from './commit-gate-context.js';
|
|
36
|
+
import { readBranchAhead } from '../merge/completion-merge-pending.js';
|
|
36
37
|
import { makeHeadAddsNoOwnWork } from '../completion/state-cascade/review-approved-head-gate.js';
|
|
37
38
|
import { resolveInjectionSnapshot } from '../completion/state-cascade/settle-injection-sweep.js';
|
|
38
39
|
import { REVIEW_HANDOFF_EXHAUSTED_ESCALATION_KIND } from '../completion/review-cycle-budget/review-breaker-hold.js';
|
|
@@ -96,7 +97,9 @@ export function buildStateCascadeContext() {
|
|
|
96
97
|
cascade: {
|
|
97
98
|
getFocusDeliveries,
|
|
98
99
|
getFocusIssues,
|
|
99
|
-
|
|
100
|
+
// The cascade pass overrides this with the focus row's own branch read (openWindowMarkingPending);
|
|
101
|
+
// a caller without one marks the completion merge pending -- fail closed.
|
|
102
|
+
setReviewRequestedAt: (focusId, iso, pending) => setReviewRequestedAt(focusId, iso, pending ?? true),
|
|
100
103
|
// Closing the window also ends the review directive queued for it (directive-queue.ts closeReviewWindowWith).
|
|
101
104
|
clearReviewRequestedAt: closeReviewWindowWith(clearReviewRequestedAt),
|
|
102
105
|
isReviewSessionActive,
|
|
@@ -140,6 +143,11 @@ export function buildStateCascadeContext() {
|
|
|
140
143
|
coverageStabilized: { listOpen: listOpenFocusEscalationsOfKind, resolveRef, markEscalationResolved },
|
|
141
144
|
reviewCycleCapHold: { resolveReviewCycleCap },
|
|
142
145
|
reviewRequestGate: commitGateSeams,
|
|
146
|
+
completionMergePending: {
|
|
147
|
+
readBranchAhead,
|
|
148
|
+
mark: markCompletionMergePending,
|
|
149
|
+
clear: clearCompletionMergePending,
|
|
150
|
+
},
|
|
143
151
|
};
|
|
144
152
|
}
|
|
145
153
|
//# sourceMappingURL=state-cascade-context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-cascade-context.js","sourceRoot":"","sources":["../../src/composition/state-cascade-context.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,wEAAwE;AACxE,6EAA6E;AAC7E,0EAA0E;AAC1E,4EAA4E;AAC5E,+DAA+D;AAC/D,gBAAgB;AAEhB;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EACL,sBAAsB,EACtB,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,oBAAoB,GACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,8BAA8B,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/G,OAAO,EAAE,2BAA2B,EAAE,MAAM,kDAAkD,CAAC;AAC/F,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3F,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,iCAAiC,EAAE,MAAM,uCAAuC,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC5F,OAAO,EACL,yBAAyB,EACzB,qBAAqB,EACrB,kCAAkC,EAClC,mCAAmC,EACnC,6BAA6B,EAC7B,iCAAiC,EACjC,sBAAsB,GACvB,MAAM,yCAAyC,CAAC;AAGjD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"state-cascade-context.js","sourceRoot":"","sources":["../../src/composition/state-cascade-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,8 +19,8 @@
|
|
|
19
19
|
* @module composition/team-lifecycle-context
|
|
20
20
|
*/
|
|
21
21
|
import { getFocusDeliveries } from '../queries/focuses/focuses.js';
|
|
22
|
-
import { readMergeGateDecision } from '../merge/merge-gate
|
|
23
|
-
import { bindMergeFocusBranch, buildMergeBackConflictDeps, buildMergeConflictEscalation,
|
|
22
|
+
import { readMergeGateDecision } from '../merge/completion-merge-gate.js';
|
|
23
|
+
import { bindMergeFocusBranch, buildMergeBackConflictDeps, buildMergeConflictEscalation, buildMergeGateDeps, } from './execution-merge-context.js';
|
|
24
24
|
import { createTeamTermination, } from '../completion/team-teardown/team-lifecycle.js';
|
|
25
25
|
import { buildProcessGroupKillDeps } from './execution-process-context.js';
|
|
26
26
|
import { buildCiMergeToMainDeps } from './process-close-context.js';
|
|
@@ -33,7 +33,7 @@ export function buildMidFlightMergeDeps() {
|
|
|
33
33
|
return {
|
|
34
34
|
getFocusDeliveries,
|
|
35
35
|
mergeFocusBranch: bindMergeFocusBranch(buildMergeBackConflictDeps()),
|
|
36
|
-
readMergeGate: (target) => readMergeGateDecision(target,
|
|
36
|
+
readMergeGate: (target) => readMergeGateDecision(target, buildMergeGateDeps()),
|
|
37
37
|
ciMerge: buildCiMergeToMainDeps(),
|
|
38
38
|
escalateMergeConflict: buildMergeConflictEscalation(),
|
|
39
39
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"team-lifecycle-context.js","sourceRoot":"","sources":["../../src/composition/team-lifecycle-context.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,+EAA+E;AAC/E,kDAAkD;AAClD,4EAA4E;AAC5E,6DAA6D;AAC7D,oEAAoE;AACpE,4EAA4E;AAC5E,+DAA+D;AAC/D,gBAAgB;AAEhB;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"team-lifecycle-context.js","sourceRoot":"","sources":["../../src/composition/team-lifecycle-context.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,+EAA+E;AAC/E,kDAAkD;AAClD,4EAA4E;AAC5E,6DAA6D;AAC7D,oEAAoE;AACpE,4EAA4E;AAC5E,+DAA+D;AAC/D,gBAAgB;AAEhB;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,4BAA4B,EAC5B,kBAAkB,GACnB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,qBAAqB,GAGtB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,mEAAmE;AACnE,MAAM,UAAU,oBAAoB;IAClC,OAAO,qBAAqB,CAAC,yBAAyB,EAAE,CAAC,CAAC;AAC5D,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,uBAAuB;IACrC,OAAO;QACL,kBAAkB;QAClB,gBAAgB,EAAE,oBAAoB,CAAC,0BAA0B,EAAE,CAAC;QACpE,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC;QAC9E,OAAO,EAAE,sBAAsB,EAAE;QACjC,qBAAqB,EAAE,4BAA4B,EAAE;KACtD,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verification-context.d.ts","sourceRoot":"","sources":["../../src/composition/verification-context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"verification-context.d.ts","sourceRoot":"","sources":["../../src/composition/verification-context.ts"],"names":[],"mappings":"AAoDA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAKhG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAuBtD,OAAO,EAAmC,KAAK,SAAS,EAAE,MAAM,6CAA6C,CAAC;AAqD9G,OAAO,KAAK,EAA8B,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAkC1G,0HAA0H;AAC1H,eAAO,MAAM,yBAAyB,EAAE,yBAOvC,CAAC;AAkBF,sHAAsH;AACtH,eAAO,MAAM,aAAa,EAAE,SAO1B,CAAC;AA6IH;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAAI,QAAQ,YAAY,KAAG,gBAkG5D,CAAC"}
|
|
@@ -1,24 +1,5 @@
|
|
|
1
1
|
// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
|
|
2
|
-
// Pinned by: packages/daemon/src/composition/
|
|
3
|
-
// packages/daemon/src/composition/subsystem-contexts.test.ts,
|
|
4
|
-
// packages/daemon/src/composition/verification-context.test.ts,
|
|
5
|
-
// packages/daemon/src/focus/focus-activity-record.test.ts,
|
|
6
|
-
// packages/daemon/src/integration/explicit-gate-outcome-restart.test.ts,
|
|
7
|
-
// packages/daemon/src/integration/explicit-verdict-departure-during-removal.test.ts,
|
|
8
|
-
// packages/daemon/src/integration/explicit-verdict-invalidation-restart.test.ts,
|
|
9
|
-
// packages/daemon/src/integration/explicit-verdict-reuse.test.ts,
|
|
10
|
-
// packages/daemon/src/integration/focus-commit-verdict-scenario.test.ts,
|
|
11
|
-
// packages/daemon/src/integration/held-route-pull-dispatch.test.ts,
|
|
12
|
-
// packages/daemon/src/integration/review-verdict-ruling-release.test.ts,
|
|
13
|
-
// packages/daemon/src/integration/shortfall-ruling-disposes-proposals-regression.test.ts,
|
|
14
|
-
// packages/daemon/src/integration/shortfall-ruling-release.test.ts,
|
|
15
|
-
// packages/daemon/src/verify/engine/verification-commit-sharing.test.ts,
|
|
16
|
-
// packages/daemon/src/verify/gate-config/verification-run-config-source.test.ts,
|
|
17
|
-
// packages/daemon/src/verify/gate-verdicts/gate-run-activity.test.ts,
|
|
18
|
-
// packages/daemon/src/verify/run-selection/commit-verdict-pull.test.ts,
|
|
19
|
-
// packages/daemon/src/verify/run-selection/verification-default-on.test.ts,
|
|
20
|
-
// packages/daemon/src/verify/run-selection/verification-tick-product-scoping.test.ts,
|
|
21
|
-
// packages/daemon/src/verify/shortfalls/delivery-commit-set.test.ts
|
|
2
|
+
// Pinned by: 21 tests -- run: npm run gen:pinned-by -- --list packages/daemon/src/composition/verification-context.ts
|
|
22
3
|
// PINNED-BY-END
|
|
23
4
|
/**
|
|
24
5
|
* The production binding of the verification context (VerificationDeps).
|
|
@@ -60,7 +41,7 @@ import { getActiveFocuses } from '../queries/focuses/focus-discovery.js';
|
|
|
60
41
|
import { bindDefaultVerificationResolver } from '../verify/gate-config/verification-config.js';
|
|
61
42
|
import { readVerifyManifest } from '../verify/gate-config/verification-manifest.js';
|
|
62
43
|
import { judgedCommitGate } from '../verify/gate-config/judged-commit-gate.js';
|
|
63
|
-
import {
|
|
44
|
+
import { claudeJudgeSession, readCliVersion } from '../verify/effect-reconciliation/judge-invoker.js';
|
|
64
45
|
import { createJudgeWorkspace, resolveJudgeCitations } from '../verify/effect-reconciliation/judge-workspace.js';
|
|
65
46
|
import { verifyCheckoutRoot } from '../verify/deterministic-gate/verification-checkout.js';
|
|
66
47
|
import { oneShotModelProcess } from './one-shot-model-process.js';
|
|
@@ -86,6 +67,9 @@ import { buildRunVerificationConfigResolver, createVerifyCheckout, } from '../ve
|
|
|
86
67
|
import { readWorktreeProvisioning } from '../worktree/worktree-package-provisioning.js';
|
|
87
68
|
import { worktreeProvisioningDeps } from './execution-worktree-context.js';
|
|
88
69
|
import { buildDefaultStageContinuation } from '../verify/attribution/verification-attribution.js';
|
|
70
|
+
import { buildDefaultFailingTestRerun } from '../verify/failing-test-rerun/failing-test-rerunner.js';
|
|
71
|
+
import { buildFlakyTestFindingFiler } from '../verify/failing-test-rerun/flaky-test-finding.js';
|
|
72
|
+
import { fileReworkRecheckStore } from '../verify/failing-test-rerun/rework-recheck.js';
|
|
89
73
|
import { requeueEvidenceUnavailableAsRework } from '../verify/outcome-routing/verification-evidence-unavailable-feedback.js';
|
|
90
74
|
import { holdForModelUnavailable } from '../verify/outcome-routing/verification-model-unavailable-hold.js';
|
|
91
75
|
import { buildDefaultAttributeFailures, buildResolveVerificationCwd, resolveHeadSha } from '../verify/attribution/verification-baseline.js';
|
|
@@ -116,8 +100,8 @@ async function defaultEmitDriftProposal(payload) {
|
|
|
116
100
|
const targetRestatementDeps = {
|
|
117
101
|
callApi,
|
|
118
102
|
// The judge runs in the workspace's pinned checkout (verify/effect-reconciliation/judge-invoker.ts);
|
|
119
|
-
// an
|
|
120
|
-
reconcile: (inputs) => reconcileAchievedEffect(inputs,
|
|
103
|
+
// an opener that ignored the workspace would typecheck and hand the judge no checkout.
|
|
104
|
+
reconcile: (inputs) => reconcileAchievedEffect(inputs, claudeJudgeSession('verify-reconciliation', oneShotModelProcess, readCliVersion), (checkout, refs) => resolveJudgeCitations(checkout.sourceRepo, checkout.sha, refs)),
|
|
121
105
|
readArmCoveredTargets,
|
|
122
106
|
};
|
|
123
107
|
/** The wall clock the durable verify writers stamp, as ISO-8601. */
|
|
@@ -263,6 +247,8 @@ function commitVerdictSeams(integrationBranch) {
|
|
|
263
247
|
}),
|
|
264
248
|
};
|
|
265
249
|
}
|
|
250
|
+
/** The escalation transport every verification filing goes through. */
|
|
251
|
+
const fileEscalation = (input) => defaultFileEscalation(input, buildNexusEscalationBridgeDeps(PRODUCT_API), buildFileEscalationDeps());
|
|
266
252
|
/**
|
|
267
253
|
* Build the production verification context. Every VerificationDeps member is
|
|
268
254
|
* bound here -- the engine reads each one without a fallback -- so this is the
|
|
@@ -306,13 +292,14 @@ export const buildVerificationDeps = (config) => {
|
|
|
306
292
|
holdForModelUnavailable: async (v, detail) => {
|
|
307
293
|
await holdForModelUnavailable(v, detail, {
|
|
308
294
|
...deliveryGateRowIo,
|
|
309
|
-
fileEscalation
|
|
295
|
+
fileEscalation,
|
|
310
296
|
organizationId: config.organizationId,
|
|
311
297
|
hasOpenEscalationForDelivery,
|
|
312
298
|
});
|
|
313
299
|
},
|
|
314
|
-
fileEscalation
|
|
300
|
+
fileEscalation,
|
|
315
301
|
organizationId: config.organizationId,
|
|
302
|
+
...failingTestRerunRecords(fileEscalation, config.organizationId),
|
|
316
303
|
emitDriftProposal: defaultEmitDriftProposal,
|
|
317
304
|
emitInwardDrift: emitInwardDriftProposals,
|
|
318
305
|
runDeterministic: runDeterministicStrategy,
|
|
@@ -357,7 +344,18 @@ export const buildVerificationDeps = (config) => {
|
|
|
357
344
|
commitVerdictPull: commitVerdictPullRegistry,
|
|
358
345
|
installProbe: buildInstallProbeTickDeps(),
|
|
359
346
|
};
|
|
360
|
-
|
|
361
|
-
return { ...context, runStageContinuation: buildDefaultStageContinuation(context, buildStageContinuationSeams(checkout)) };
|
|
347
|
+
return withFixedCommitRunners(context, buildStageContinuationSeams(checkout));
|
|
362
348
|
};
|
|
349
|
+
/** The stage continuation and the failing-test re-run, run through the context's own fixed-commit seams. */
|
|
350
|
+
function withFixedCommitRunners(context, fixedCommit) {
|
|
351
|
+
return { ...context, runStageContinuation: buildDefaultStageContinuation(context, fixedCommit), runFailingTestRerun: buildDefaultFailingTestRerun(context, fixedCommit) };
|
|
352
|
+
}
|
|
353
|
+
/**
|
|
354
|
+
* What the declared per-file re-run records (verify/failing-test-rerun/): a flaky
|
|
355
|
+
* test filed against the product -- a pass on retry is legitimate only because
|
|
356
|
+
* the flake is filed -- and the per-delivery re-check of a rework commit.
|
|
357
|
+
*/
|
|
358
|
+
function failingTestRerunRecords(fileEscalation, organizationId) {
|
|
359
|
+
return { fileFlakyTestFinding: buildFlakyTestFindingFiler(fileEscalation, organizationId), reworkRecheck: fileReworkRecheckStore };
|
|
360
|
+
}
|
|
363
361
|
//# sourceMappingURL=verification-context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verification-context.js","sourceRoot":"","sources":["../../src/composition/verification-context.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"verification-context.js","sourceRoot":"","sources":["../../src/composition/verification-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,8 @@ export interface DeliveryBranchMergeParams {
|
|
|
32
32
|
workflow: Workflow;
|
|
33
33
|
/** Focus ID for recording the merge in focus_merges. Optional for legacy per-delivery path. */
|
|
34
34
|
focusId?: string;
|
|
35
|
+
/** The candidate the merge gate admitted; integration fast-forwards to exactly this commit. */
|
|
36
|
+
sourceSha: string;
|
|
35
37
|
}
|
|
36
38
|
/**
|
|
37
39
|
* Merge a delivery's branch to the integration branch.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-merge-ops.d.ts","sourceRoot":"","sources":["../../src/delivery/delivery-merge-ops.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAehE,MAAM,WAAW,YAAY;IAC3B,kDAAkD;IAClD,cAAc,EAAE,OAAO,CAAC;IACxB,kCAAkC;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,+EAA+E;IAC/E,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,8CAA8C;IAC9C,uBAAuB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,6DAA6D;IAC7D,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAID,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,QAAQ,CAAC;IACnB,+FAA+F;IAC/F,OAAO,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"delivery-merge-ops.d.ts","sourceRoot":"","sources":["../../src/delivery/delivery-merge-ops.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAehE,MAAM,WAAW,YAAY;IAC3B,kDAAkD;IAClD,cAAc,EAAE,OAAO,CAAC;IACxB,kCAAkC;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,+EAA+E;IAC/E,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,8CAA8C;IAC9C,uBAAuB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,6DAA6D;IAC7D,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAID,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,QAAQ,CAAC;IACnB,+FAA+F;IAC/F,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+FAA+F;IAC/F,SAAS,EAAE,MAAM,CAAC;CACnB;AA0DD;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,yBAAyB,GAChC,OAAO,CAAC,YAAY,CAAC,CAqGvB"}
|
|
@@ -53,10 +53,10 @@ function escalateRollbackFailure(ctx, details) {
|
|
|
53
53
|
* - Git state reporting
|
|
54
54
|
*/
|
|
55
55
|
export async function mergeDeliveryBranch(params) {
|
|
56
|
-
const { config, branchName, deliveryId, deliveryName, organizationId, sessionId, workflow, focusId } = params;
|
|
56
|
+
const { config, branchName, deliveryId, deliveryName, organizationId, sessionId, workflow, focusId, sourceSha } = params;
|
|
57
57
|
log.info(`Attempting to merge ${branchName} into ${config.integrationBranch}...`);
|
|
58
58
|
const onRollbackFailure = (details) => escalateRollbackFailure({ organizationId, sessionId, deliveryId, deliveryName, focusId, branchName }, details);
|
|
59
|
-
const mergeResult = await mergeToIntegration({ config, branchName, deliveryName, deliveryId, onRollbackFailure });
|
|
59
|
+
const mergeResult = await mergeToIntegration({ config, branchName, deliveryName, deliveryId, sourceSha, onRollbackFailure });
|
|
60
60
|
if (mergeResult.success) {
|
|
61
61
|
const exitReason = `Merged to ${config.integrationBranch}.`;
|
|
62
62
|
log.info(`Successfully merged ${branchName} to ${config.integrationBranch}`);
|