@telora/daemon 0.23.14 → 0.23.16

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.
Files changed (250) hide show
  1. package/build-info.json +5 -3
  2. package/dist/backends/agent-backend.d.ts +8 -1
  3. package/dist/backends/agent-backend.d.ts.map +1 -1
  4. package/dist/backends/claude/claude-backend.d.ts.map +1 -1
  5. package/dist/backends/claude/claude-backend.js +4 -0
  6. package/dist/backends/claude/claude-backend.js.map +1 -1
  7. package/dist/backends/claude/one-shot-model.d.ts +11 -0
  8. package/dist/backends/claude/one-shot-model.d.ts.map +1 -1
  9. package/dist/backends/claude/one-shot-model.js +7 -4
  10. package/dist/backends/claude/one-shot-model.js.map +1 -1
  11. package/dist/backends/claude/one-shot-session.d.ts +15 -0
  12. package/dist/backends/claude/one-shot-session.d.ts.map +1 -0
  13. package/dist/backends/claude/one-shot-session.js +120 -0
  14. package/dist/backends/claude/one-shot-session.js.map +1 -0
  15. package/dist/backends/codex/codex-backend.d.ts.map +1 -1
  16. package/dist/backends/codex/codex-backend.js +10 -0
  17. package/dist/backends/codex/codex-backend.js.map +1 -1
  18. package/dist/ci/candidate-ref.d.ts +28 -0
  19. package/dist/ci/candidate-ref.d.ts.map +1 -0
  20. package/dist/ci/candidate-ref.js +81 -0
  21. package/dist/ci/candidate-ref.js.map +1 -0
  22. package/dist/ci/ci-sensor-loop.d.ts.map +1 -1
  23. package/dist/ci/ci-sensor-loop.js +2 -1
  24. package/dist/ci/ci-sensor-loop.js.map +1 -1
  25. package/dist/ci/ci-status-git.d.ts +9 -0
  26. package/dist/ci/ci-status-git.d.ts.map +1 -1
  27. package/dist/ci/ci-status-git.js +16 -2
  28. package/dist/ci/ci-status-git.js.map +1 -1
  29. package/dist/ci/ci-status.d.ts.map +1 -1
  30. package/dist/ci/ci-status.js +5 -1
  31. package/dist/ci/ci-status.js.map +1 -1
  32. package/dist/completion/state-cascade/state-cascade.d.ts +14 -1
  33. package/dist/completion/state-cascade/state-cascade.d.ts.map +1 -1
  34. package/dist/completion/state-cascade/state-cascade.js +26 -1
  35. package/dist/completion/state-cascade/state-cascade.js.map +1 -1
  36. package/dist/completion/team-exit/merge-phase.d.ts +11 -10
  37. package/dist/completion/team-exit/merge-phase.d.ts.map +1 -1
  38. package/dist/completion/team-exit/merge-phase.js +10 -10
  39. package/dist/completion/team-exit/merge-phase.js.map +1 -1
  40. package/dist/completion/team-teardown/team-lifecycle.d.ts +4 -3
  41. package/dist/completion/team-teardown/team-lifecycle.d.ts.map +1 -1
  42. package/dist/completion/team-teardown/team-lifecycle.js +8 -8
  43. package/dist/completion/team-teardown/team-lifecycle.js.map +1 -1
  44. package/dist/composition/execution-git-context.d.ts.map +1 -1
  45. package/dist/composition/execution-git-context.js +2 -0
  46. package/dist/composition/execution-git-context.js.map +1 -1
  47. package/dist/composition/execution-merge-context.d.ts +11 -3
  48. package/dist/composition/execution-merge-context.d.ts.map +1 -1
  49. package/dist/composition/execution-merge-context.js +60 -12
  50. package/dist/composition/execution-merge-context.js.map +1 -1
  51. package/dist/composition/process-close-context.js +3 -3
  52. package/dist/composition/process-close-context.js.map +1 -1
  53. package/dist/composition/state-cascade-context.d.ts.map +1 -1
  54. package/dist/composition/state-cascade-context.js +10 -2
  55. package/dist/composition/state-cascade-context.js.map +1 -1
  56. package/dist/composition/team-lifecycle-context.js +3 -3
  57. package/dist/composition/team-lifecycle-context.js.map +1 -1
  58. package/dist/composition/verification-context.d.ts.map +1 -1
  59. package/dist/composition/verification-context.js +4 -23
  60. package/dist/composition/verification-context.js.map +1 -1
  61. package/dist/config/model-resolution.d.ts +25 -1
  62. package/dist/config/model-resolution.d.ts.map +1 -1
  63. package/dist/config/model-resolution.js +26 -1
  64. package/dist/config/model-resolution.js.map +1 -1
  65. package/dist/delivery/delivery-merge-ops.d.ts +2 -0
  66. package/dist/delivery/delivery-merge-ops.d.ts.map +1 -1
  67. package/dist/delivery/delivery-merge-ops.js +2 -2
  68. package/dist/delivery/delivery-merge-ops.js.map +1 -1
  69. package/dist/delivery/delivery-reconciler.d.ts +9 -0
  70. package/dist/delivery/delivery-reconciler.d.ts.map +1 -1
  71. package/dist/delivery/delivery-reconciler.js +42 -31
  72. package/dist/delivery/delivery-reconciler.js.map +1 -1
  73. package/dist/focus/focus-executor.d.ts.map +1 -1
  74. package/dist/focus/focus-executor.js +1 -0
  75. package/dist/focus/focus-executor.js.map +1 -1
  76. package/dist/focus/focus-poller-spawn.d.ts.map +1 -1
  77. package/dist/focus/focus-poller-spawn.js +3 -1
  78. package/dist/focus/focus-poller-spawn.js.map +1 -1
  79. package/dist/focus/focus-spawn-decision.d.ts.map +1 -1
  80. package/dist/focus/focus-spawn-decision.js +1 -0
  81. package/dist/focus/focus-spawn-decision.js.map +1 -1
  82. package/dist/git/index.d.ts.map +1 -1
  83. package/dist/git/index.js +2 -1
  84. package/dist/git/index.js.map +1 -1
  85. package/dist/git/merge.d.ts +12 -2
  86. package/dist/git/merge.d.ts.map +1 -1
  87. package/dist/git/merge.js +32 -33
  88. package/dist/git/merge.js.map +1 -1
  89. package/dist/merge/approval-gate-state.d.ts.map +1 -1
  90. package/dist/merge/approval-gate-state.js +8 -7
  91. package/dist/merge/approval-gate-state.js.map +1 -1
  92. package/dist/merge/candidate-rework.d.ts +44 -0
  93. package/dist/merge/candidate-rework.d.ts.map +1 -0
  94. package/dist/merge/candidate-rework.js +152 -0
  95. package/dist/merge/candidate-rework.js.map +1 -0
  96. package/dist/merge/completion-hold-record.d.ts +20 -0
  97. package/dist/merge/completion-hold-record.d.ts.map +1 -0
  98. package/dist/merge/completion-hold-record.js +130 -0
  99. package/dist/merge/completion-hold-record.js.map +1 -0
  100. package/dist/merge/completion-merge-driver.d.ts +96 -0
  101. package/dist/merge/completion-merge-driver.d.ts.map +1 -0
  102. package/dist/merge/completion-merge-driver.js +94 -0
  103. package/dist/merge/completion-merge-driver.js.map +1 -0
  104. package/dist/merge/completion-merge-gate.d.ts +71 -0
  105. package/dist/merge/completion-merge-gate.d.ts.map +1 -0
  106. package/dist/merge/completion-merge-gate.js +185 -0
  107. package/dist/merge/completion-merge-gate.js.map +1 -0
  108. package/dist/merge/completion-merge-pending.d.ts +30 -0
  109. package/dist/merge/completion-merge-pending.d.ts.map +1 -0
  110. package/dist/merge/completion-merge-pending.js +75 -0
  111. package/dist/merge/completion-merge-pending.js.map +1 -0
  112. package/dist/merge/focus-merge.d.ts +21 -6
  113. package/dist/merge/focus-merge.d.ts.map +1 -1
  114. package/dist/merge/focus-merge.js +65 -45
  115. package/dist/merge/focus-merge.js.map +1 -1
  116. package/dist/merge/focus-worktree-removal.d.ts +6 -6
  117. package/dist/merge/focus-worktree-removal.d.ts.map +1 -1
  118. package/dist/merge/focus-worktree-removal.js +10 -6
  119. package/dist/merge/focus-worktree-removal.js.map +1 -1
  120. package/dist/merge/merge-back-conflict.d.ts.map +1 -1
  121. package/dist/merge/merge-back-conflict.js +2 -0
  122. package/dist/merge/merge-back-conflict.js.map +1 -1
  123. package/dist/merge/merge-back-followup.d.ts.map +1 -1
  124. package/dist/merge/merge-back-followup.js +7 -0
  125. package/dist/merge/merge-back-followup.js.map +1 -1
  126. package/dist/merge/merge-back-loop.d.ts +36 -14
  127. package/dist/merge/merge-back-loop.d.ts.map +1 -1
  128. package/dist/merge/merge-back-loop.js +109 -66
  129. package/dist/merge/merge-back-loop.js.map +1 -1
  130. package/dist/merge/merge-gate-coverage.d.ts +9 -61
  131. package/dist/merge/merge-gate-coverage.d.ts.map +1 -1
  132. package/dist/merge/merge-gate-coverage.js +33 -167
  133. package/dist/merge/merge-gate-coverage.js.map +1 -1
  134. package/dist/nexus/escalation-bridge.d.ts.map +1 -1
  135. package/dist/nexus/escalation-bridge.js +2 -1
  136. package/dist/nexus/escalation-bridge.js.map +1 -1
  137. package/dist/nexus/file-escalation.d.ts.map +1 -1
  138. package/dist/nexus/file-escalation.js +5 -1
  139. package/dist/nexus/file-escalation.js.map +1 -1
  140. package/dist/queries/api-client/shared.js +1 -1
  141. package/dist/queries/deliveries/deliveries.d.ts.map +1 -1
  142. package/dist/queries/deliveries/deliveries.js +1 -0
  143. package/dist/queries/deliveries/deliveries.js.map +1 -1
  144. package/dist/queries/delivery-gate-state/delivery-gate-state.js +1 -1
  145. package/dist/queries/delivery-gate-state/verify-own-holds.d.ts +10 -3
  146. package/dist/queries/delivery-gate-state/verify-own-holds.d.ts.map +1 -1
  147. package/dist/queries/delivery-gate-state/verify-own-holds.js +2 -0
  148. package/dist/queries/delivery-gate-state/verify-own-holds.js.map +1 -1
  149. package/dist/queries/escalations/cause-key.d.ts.map +1 -1
  150. package/dist/queries/escalations/cause-key.js +1 -0
  151. package/dist/queries/escalations/cause-key.js.map +1 -1
  152. package/dist/queries/escalations/escalations.d.ts.map +1 -1
  153. package/dist/queries/escalations/escalations.js +2 -1
  154. package/dist/queries/escalations/escalations.js.map +1 -1
  155. package/dist/queries/focuses/focus-discovery.d.ts +14 -0
  156. package/dist/queries/focuses/focus-discovery.d.ts.map +1 -1
  157. package/dist/queries/focuses/focus-discovery.js +4 -0
  158. package/dist/queries/focuses/focus-discovery.js.map +1 -1
  159. package/dist/queries/focuses/focuses.d.ts +12 -2
  160. package/dist/queries/focuses/focuses.d.ts.map +1 -1
  161. package/dist/queries/focuses/focuses.js +24 -3
  162. package/dist/queries/focuses/focuses.js.map +1 -1
  163. package/dist/queries/org-config/local-models.d.ts.map +1 -1
  164. package/dist/queries/org-config/local-models.js +2 -1
  165. package/dist/queries/org-config/local-models.js.map +1 -1
  166. package/dist/queries/wire-schemas/schemas.d.ts +48 -0
  167. package/dist/queries/wire-schemas/schemas.d.ts.map +1 -1
  168. package/dist/queries/wire-schemas/schemas.js +15 -0
  169. package/dist/queries/wire-schemas/schemas.js.map +1 -1
  170. package/dist/spawn/model-routing.d.ts +13 -8
  171. package/dist/spawn/model-routing.d.ts.map +1 -1
  172. package/dist/spawn/model-routing.js +14 -8
  173. package/dist/spawn/model-routing.js.map +1 -1
  174. package/dist/spawn/review-hold-park.d.ts.map +1 -1
  175. package/dist/spawn/review-hold-park.js +1 -0
  176. package/dist/spawn/review-hold-park.js.map +1 -1
  177. package/dist/spawn/spawn-decision.d.ts +7 -0
  178. package/dist/spawn/spawn-decision.d.ts.map +1 -1
  179. package/dist/spawn/spawn-decision.js.map +1 -1
  180. package/dist/supervision/agent-resolvable-retirement.d.ts +1 -1
  181. package/dist/supervision/agent-resolvable-retirement.d.ts.map +1 -1
  182. package/dist/supervision/agent-resolvable-retirement.js +2 -1
  183. package/dist/supervision/agent-resolvable-retirement.js.map +1 -1
  184. package/dist/supervision/escalation-filing.js +1 -1
  185. package/dist/supervision/incident-correlation.d.ts +3 -0
  186. package/dist/supervision/incident-correlation.d.ts.map +1 -1
  187. package/dist/supervision/incident-correlation.js +4 -0
  188. package/dist/supervision/incident-correlation.js.map +1 -1
  189. package/dist/supervision/null-role-spawn.d.ts.map +1 -1
  190. package/dist/supervision/null-role-spawn.js +1 -0
  191. package/dist/supervision/null-role-spawn.js.map +1 -1
  192. package/dist/supervision/spawn-cooldown.js +1 -1
  193. package/dist/supervision/stop-rows-work-holds.d.ts +4 -4
  194. package/dist/supervision/stop-rows-work-holds.d.ts.map +1 -1
  195. package/dist/supervision/stop-rows-work-holds.js +17 -15
  196. package/dist/supervision/stop-rows-work-holds.js.map +1 -1
  197. package/dist/testing/fixtures/api-client.js +1 -1
  198. package/dist/testing/fixtures/index.d.ts.map +1 -1
  199. package/dist/testing/fixtures/index.js +3 -1
  200. package/dist/testing/fixtures/index.js.map +1 -1
  201. package/dist/testing/fixtures/judge-session.d.ts +14 -0
  202. package/dist/testing/fixtures/judge-session.d.ts.map +1 -0
  203. package/dist/testing/fixtures/judge-session.js +10 -0
  204. package/dist/testing/fixtures/judge-session.js.map +1 -0
  205. package/dist/types/focus.d.ts +9 -0
  206. package/dist/types/focus.d.ts.map +1 -1
  207. package/dist/types/index.js +1 -1
  208. package/dist/verify/effect-reconciliation/judge-invoker.d.ts +14 -4
  209. package/dist/verify/effect-reconciliation/judge-invoker.d.ts.map +1 -1
  210. package/dist/verify/effect-reconciliation/judge-invoker.js +30 -12
  211. package/dist/verify/effect-reconciliation/judge-invoker.js.map +1 -1
  212. package/dist/verify/effect-reconciliation/verify-reconciliation.d.ts +18 -5
  213. package/dist/verify/effect-reconciliation/verify-reconciliation.d.ts.map +1 -1
  214. package/dist/verify/effect-reconciliation/verify-reconciliation.js +75 -18
  215. package/dist/verify/effect-reconciliation/verify-reconciliation.js.map +1 -1
  216. package/dist/verify/effect-reconciliation/verify-restatement.js +1 -1
  217. package/dist/verify/engine/verification-deps.js +1 -1
  218. package/dist/verify/engine/verification-engine.js +1 -1
  219. package/dist/verify/gate-config/verification-config.js +1 -1
  220. package/dist/verify/inspection-strategies/verification-strategies.js +1 -1
  221. package/dist/verify/inspection-strategies/verification-strategies.js.map +1 -1
  222. package/dist/verify/outcome-routing/incurable-model-hold.d.ts +9 -3
  223. package/dist/verify/outcome-routing/incurable-model-hold.d.ts.map +1 -1
  224. package/dist/verify/outcome-routing/incurable-model-hold.js +18 -5
  225. package/dist/verify/outcome-routing/incurable-model-hold.js.map +1 -1
  226. package/dist/verify/outcome-routing/repeating-model-hold.d.ts +30 -0
  227. package/dist/verify/outcome-routing/repeating-model-hold.d.ts.map +1 -0
  228. package/dist/verify/outcome-routing/repeating-model-hold.js +135 -0
  229. package/dist/verify/outcome-routing/repeating-model-hold.js.map +1 -0
  230. package/dist/verify/outcome-routing/verification-history-reset.d.ts.map +1 -1
  231. package/dist/verify/outcome-routing/verification-history-reset.js +1 -0
  232. package/dist/verify/outcome-routing/verification-history-reset.js.map +1 -1
  233. package/dist/verify/outcome-routing/verification-model-unavailable-hold.d.ts +10 -4
  234. package/dist/verify/outcome-routing/verification-model-unavailable-hold.d.ts.map +1 -1
  235. package/dist/verify/outcome-routing/verification-model-unavailable-hold.js +24 -6
  236. package/dist/verify/outcome-routing/verification-model-unavailable-hold.js.map +1 -1
  237. package/dist/verify/run-selection/default-on-guards.js +1 -1
  238. package/dist/verify/run-selection/pre-review-gate-dispatch.d.ts +4 -3
  239. package/dist/verify/run-selection/pre-review-gate-dispatch.d.ts.map +1 -1
  240. package/dist/verify/run-selection/pre-review-gate-dispatch.js +23 -7
  241. package/dist/verify/run-selection/pre-review-gate-dispatch.js.map +1 -1
  242. package/dist/verify/run-selection/verification-default-on.js +1 -1
  243. package/dist/verify/run-selection/verification-default-on.js.map +1 -1
  244. package/dist/worktree/provision.d.ts.map +1 -1
  245. package/dist/worktree/provision.js +1 -0
  246. package/dist/worktree/provision.js.map +1 -1
  247. package/dist/worktree/safety.d.ts.map +1 -1
  248. package/dist/worktree/safety.js +1 -0
  249. package/dist/worktree/safety.js.map +1 -1
  250. package/package.json +3 -3
@@ -1 +1 @@
1
- {"version":3,"file":"focus-poller-spawn.js","sourceRoot":"","sources":["../../src/focus/focus-poller-spawn.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"focus-poller-spawn.js","sourceRoot":"","sources":["../../src/focus/focus-poller-spawn.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"focus-spawn-decision.d.ts","sourceRoot":"","sources":["../../src/focus/focus-spawn-decision.ts"],"names":[],"mappings":"AAkBA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,MAAM,gBAAgB,GACxB,OAAO,GACP,mBAAmB,GACnB,kBAAkB,GAClB,eAAe,GACf,WAAW,GACX,cAAc,GACd,eAAe,GACf,iBAAiB,GACjB,eAAe,CAAC;AAEpB,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;;;;OAMG;IACH,eAAe,EAAE,OAAO,CAAC;IACzB;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mGAAmG;IACnG,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,0DAA0D;IAC1D,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,gBAAgB,CAqBvE"}
1
+ {"version":3,"file":"focus-spawn-decision.d.ts","sourceRoot":"","sources":["../../src/focus/focus-spawn-decision.ts"],"names":[],"mappings":"AAmBA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,MAAM,gBAAgB,GACxB,OAAO,GACP,mBAAmB,GACnB,kBAAkB,GAClB,eAAe,GACf,WAAW,GACX,cAAc,GACd,eAAe,GACf,iBAAiB,GACjB,eAAe,CAAC;AAEpB,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;;;;OAMG;IACH,eAAe,EAAE,OAAO,CAAC;IACzB;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mGAAmG;IACnG,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,0DAA0D;IAC1D,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,gBAAgB,CAqBvE"}
@@ -2,6 +2,7 @@
2
2
  // Pinned by: packages/daemon/src/completion/review-cycle-budget/review-cycle-cap-regression.test.ts,
3
3
  // packages/daemon/src/focus/focus-poller.test.ts,
4
4
  // packages/daemon/src/integration/verify-failure-rework-route.test.ts,
5
+ // packages/daemon/src/merge/completion-rework-armed.test.ts,
5
6
  // packages/daemon/src/nexus/nexus-return-path-e2e.test.ts,
6
7
  // packages/daemon/src/supervision/review-cycle-cap-hold.test.ts,
7
8
  // packages/daemon/src/tower/tower-pass.test.ts, packages/daemon/src/worktree/verify-hold-facts.test.ts
@@ -1 +1 @@
1
- {"version":3,"file":"focus-spawn-decision.js","sourceRoot":"","sources":["../../src/focus/focus-spawn-decision.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,qGAAqG;AACrG,oDAAoD;AACpD,yEAAyE;AACzE,6DAA6D;AAC7D,mEAAmE;AACnE,yGAAyG;AACzG,gBAAgB;AAEhB;;;;;GAKG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AA8FzE,MAAM,UAAU,gBAAgB,CAAC,IAAoB;IACnD,IAAI,CAAC,IAAI,CAAC,OAAO;QAAE,OAAO,mBAAmB,CAAC;IAC9C,IAAI,IAAI,CAAC,aAAa;QAAE,OAAO,kBAAkB,CAAC;IAClD,gFAAgF;IAChF,IAAI,IAAI,CAAC,kBAAkB;QAAE,OAAO,eAAe,CAAC;IACpD,yEAAyE;IACzE,0EAA0E;IAC1E,+EAA+E;IAC/E,mEAAmE;IACnE,MAAM,uBAAuB,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC;IACnF,IAAI,CAAC,0BAA0B,CAAC;QAC9B,uBAAuB;QACvB,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;KAClD,CAAC,EAAE,CAAC;QACH,OAAO,uBAAuB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC;IAChE,CAAC;IACD,IAAI,IAAI,CAAC,eAAe;QAAE,OAAO,eAAe,CAAC;IACjD,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI;QAAE,OAAO,iBAAiB,CAAC;IACvD,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,gBAAgB;QAAE,OAAO,eAAe,CAAC;IAC1E,OAAO,OAAO,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"focus-spawn-decision.js","sourceRoot":"","sources":["../../src/focus/focus-spawn-decision.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,qGAAqG;AACrG,oDAAoD;AACpD,yEAAyE;AACzE,+DAA+D;AAC/D,6DAA6D;AAC7D,mEAAmE;AACnE,yGAAyG;AACzG,gBAAgB;AAEhB;;;;;GAKG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AA8FzE,MAAM,UAAU,gBAAgB,CAAC,IAAoB;IACnD,IAAI,CAAC,IAAI,CAAC,OAAO;QAAE,OAAO,mBAAmB,CAAC;IAC9C,IAAI,IAAI,CAAC,aAAa;QAAE,OAAO,kBAAkB,CAAC;IAClD,gFAAgF;IAChF,IAAI,IAAI,CAAC,kBAAkB;QAAE,OAAO,eAAe,CAAC;IACpD,yEAAyE;IACzE,0EAA0E;IAC1E,+EAA+E;IAC/E,mEAAmE;IACnE,MAAM,uBAAuB,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC;IACnF,IAAI,CAAC,0BAA0B,CAAC;QAC9B,uBAAuB;QACvB,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;KAClD,CAAC,EAAE,CAAC;QACH,OAAO,uBAAuB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC;IAChE,CAAC;IACD,IAAI,IAAI,CAAC,eAAe;QAAE,OAAO,eAAe,CAAC;IACjD,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI;QAAE,OAAO,iBAAiB,CAAC;IACvD,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,gBAAgB;QAAE,OAAO,eAAe,CAAC;IAC1E,OAAO,OAAO,CAAC;AACjB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/git/index.ts"],"names":[],"mappings":"AAgBA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/git/index.ts"],"names":[],"mappings":"AAiBA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC"}
package/dist/git/index.js CHANGED
@@ -3,7 +3,8 @@
3
3
  // packages/daemon/src/completion/team-teardown/mid-flight-merge-gate.test.ts,
4
4
  // packages/daemon/src/git/genesis-aurora-shell-smoke.test.ts, packages/daemon/src/git/git-fetch.test.ts,
5
5
  // packages/daemon/src/git/git-genesis.test.ts, packages/daemon/src/git/git-state-detector.test.ts,
6
- // packages/daemon/src/git/git-utils-output.test.ts, packages/daemon/src/git/merge-back.test.ts,
6
+ // packages/daemon/src/git/git-utils-output.test.ts,
7
+ // packages/daemon/src/git/merge-admitted-sha-guard.test.ts, packages/daemon/src/git/merge-back.test.ts,
7
8
  // packages/daemon/src/git/merge-confirm-clean-refusal.test.ts,
8
9
  // packages/daemon/src/git/merge-worktree-recovery.test.ts, packages/daemon/src/git/squash-merge.test.ts,
9
10
  // packages/daemon/src/integration/fully-merged-focus-sibling-red-scenario.test.ts,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/git/index.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,mFAAmF;AACnF,gFAAgF;AAChF,2GAA2G;AAC3G,qGAAqG;AACrG,kGAAkG;AAClG,iEAAiE;AACjE,2GAA2G;AAC3G,qFAAqF;AACrF,oFAAoF;AACpF,iEAAiE;AACjE,oEAAoE;AACpE,8DAA8D;AAC9D,yEAAyE;AACzE,gBAAgB;AAEhB;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/git/index.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,mFAAmF;AACnF,gFAAgF;AAChF,2GAA2G;AAC3G,qGAAqG;AACrG,sDAAsD;AACtD,0GAA0G;AAC1G,iEAAiE;AACjE,2GAA2G;AAC3G,qFAAqF;AACrF,oFAAoF;AACpF,iEAAiE;AACjE,oEAAoE;AACpE,8DAA8D;AAC9D,yEAAyE;AACzE,gBAAgB;AAEhB;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC"}
@@ -4,7 +4,7 @@ import { type CorruptionDetails } from './merge-lock.js';
4
4
  import { type ReadFocusOwnDelta } from './focus-integration-sync.js';
5
5
  /**
6
6
  * Classify the post-merge sha observation for a merge that already succeeded.
7
- * Given whether a commit sha was already captured (e.g. from a --no-ff merge),
7
+ * Given whether a commit sha was already captured by the merge strategy,
8
8
  * the result of `git rev-parse HEAD`, and the pre-merge boundary, decide the
9
9
  * merge's recorded-sha outcome. Pure -- exported for testing.
10
10
  *
@@ -102,6 +102,13 @@ export interface MergeToIntegrationParams {
102
102
  branchName: string;
103
103
  deliveryName: string;
104
104
  deliveryId: string;
105
+ /**
106
+ * The exact commit the merge gate admitted (merge/completion-merge-gate.ts): a
107
+ * candidate CI judged green, containing the integration tip. Integration
108
+ * fast-forwards to THIS commit or not at all -- a branch that moved since the
109
+ * gate read it, or an integration that advanced past the candidate, refuses.
110
+ */
111
+ sourceSha: string;
105
112
  onRollbackFailure?: (details: {
106
113
  branch: string;
107
114
  attemptedRollbackRef: string;
@@ -109,7 +116,10 @@ export interface MergeToIntegrationParams {
109
116
  }) => void;
110
117
  }
111
118
  /**
112
- * Merge an agent branch into the integration branch.
119
+ * Advance the integration branch to an admitted focus candidate: FAST-FORWARD
120
+ * ONLY. A merge commit made here would be a tree no CI run judged, so there is
121
+ * no merge-commit fallback; a candidate integration has moved past is refused,
122
+ * and the completion merge re-merges and re-runs CI.
113
123
  *
114
124
  * Operates entirely within the persistent merge worktree -- the main
115
125
  * repo working tree is never touched (no stash, no branch switch).
@@ -1 +1 @@
1
- {"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/git/merge.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAc,KAAK,WAAW,EAAwB,MAAM,YAAY,CAAC;AAChF,OAAO,EAAyC,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGhG,OAAO,EAA8B,KAAK,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAWjG;;;;;;;;;;;;;GAaG;AACH,wBAAgB,2BAA2B,CACzC,mBAAmB,EAAE,OAAO,EAC5B,SAAS,EAAE;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC/C,WAAW,EAAE;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAChD;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAOjD;AAID;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,MAAM,EAAE,CAoBV;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAI/D;AAYD,UAAU,yBAAyB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC1D;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,yBAAyB,GAAG,WAAW,CAoD5F;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,OAAO,CAmCT;AAKD,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAC9G;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC,WAAW,CAAC,CAyKtB;AAKD,MAAM,WAAW,8BAA8B;IAC7C,2CAA2C;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,4DAA4D;IAC5D,iBAAiB,EAAE,MAAM,CAAC;IAC1B,yGAAyG;IACzG,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,eAAe,CAAC,CA2E1B"}
1
+ {"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/git/merge.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAc,KAAK,WAAW,EAAwB,MAAM,YAAY,CAAC;AAChF,OAAO,EAAyC,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGhG,OAAO,EAA8B,KAAK,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAUjG;;;;;;;;;;;;;GAaG;AACH,wBAAgB,2BAA2B,CACzC,mBAAmB,EAAE,OAAO,EAC5B,SAAS,EAAE;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC/C,WAAW,EAAE;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAChD;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAOjD;AAID;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,MAAM,EAAE,CAoBV;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAI/D;AAYD,UAAU,yBAAyB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC1D;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,yBAAyB,GAAG,WAAW,CAoD5F;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,OAAO,CAmCT;AAKD,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAC9G;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC,WAAW,CAAC,CAsKtB;AAKD,MAAM,WAAW,8BAA8B;IAC7C,2CAA2C;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,4DAA4D;IAC5D,iBAAiB,EAAE,MAAM,CAAC;IAC1B,yGAAyG;IACzG,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,eAAe,CAAC,CA2E1B"}
package/dist/git/merge.js CHANGED
@@ -17,11 +17,11 @@ import { withMergeLock, markIntegrationCorrupt } from './merge-lock.js';
17
17
  import { withRetry, healthEvents } from '@telora/daemon-core';
18
18
  import { createLogger } from '../log/daemon-log.js';
19
19
  import { decideFocusIntegrationSync } from './focus-integration-sync.js';
20
- import { extractConflictedFiles, recoverDirtyMergeWorktree, tryFastForwardMerge, tryMergeCommit, } from './merge-strategies.js';
20
+ import { extractConflictedFiles, recoverDirtyMergeWorktree, tryFastForwardMerge, } from './merge-strategies.js';
21
21
  const log = createLogger({ module: 'CI' });
22
22
  /**
23
23
  * Classify the post-merge sha observation for a merge that already succeeded.
24
- * Given whether a commit sha was already captured (e.g. from a --no-ff merge),
24
+ * Given whether a commit sha was already captured by the merge strategy,
25
25
  * the result of `git rev-parse HEAD`, and the pre-merge boundary, decide the
26
26
  * merge's recorded-sha outcome. Pure -- exported for testing.
27
27
  *
@@ -214,7 +214,10 @@ export function handleUntrackedFilesBlockingMerge(repoPath, errorOutput) {
214
214
  return true;
215
215
  }
216
216
  /**
217
- * Merge an agent branch into the integration branch.
217
+ * Advance the integration branch to an admitted focus candidate: FAST-FORWARD
218
+ * ONLY. A merge commit made here would be a tree no CI run judged, so there is
219
+ * no merge-commit fallback; a candidate integration has moved past is refused,
220
+ * and the completion merge re-merges and re-runs CI.
218
221
  *
219
222
  * Operates entirely within the persistent merge worktree -- the main
220
223
  * repo working tree is never touched (no stash, no branch switch).
@@ -223,7 +226,7 @@ export function handleUntrackedFilesBlockingMerge(repoPath, errorOutput) {
223
226
  * Serialized via the merge lock to prevent concurrent checkout races.
224
227
  */
225
228
  export function mergeToIntegration(params) {
226
- const { config, branchName, deliveryName, deliveryId, onRollbackFailure } = params;
229
+ const { config, branchName, deliveryName, deliveryId, sourceSha, onRollbackFailure } = params;
227
230
  return withMergeLock(async () => {
228
231
  const mwt = getMergeWorktreePath(config);
229
232
  // Self-heal an already-wedged merge worktree before doing anything: an
@@ -262,23 +265,24 @@ export function mergeToIntegration(params) {
262
265
  }
263
266
  // Save pre-merge state so we can rollback if push fails
264
267
  const preMergeRef = runGitSync(['rev-parse', 'HEAD'], mwt);
265
- // No bracketed delivery id in the subject: nothing in the repo parses it,
266
- // and its presence made the merge path look attributed when a merge carries
267
- // no single delivery. Per-delivery attribution lives in the merged commits'
268
- // Telora-Delivery trailers; the CI sensor's owning-focus resolution walks the
269
- // merge parents to reach them (see ci/ci-sensor-loop.ts). deliveryId is still
270
- // used below for logging/bookkeeping, just not stamped into the subject.
271
- const commitMessage = `Merge agent work: ${deliveryName}`;
272
- // Try fast-forward first, fall back to merge commit.
273
- // We use real merges (not squash) so git preserves the ancestry
274
- // relationship -- this is critical for worktree cleanup, which uses
275
- // `git log integration..<branch>` to detect unmerged commits.
276
- let result = tryFastForwardMerge(mwt, branchName);
277
- if (!result.success) {
278
- result = tryMergeCommit(mwt, branchName, commitMessage);
268
+ // The branch must still be at the admitted candidate: a commit landed after
269
+ // the gate read it is a tree CI never judged.
270
+ const branchTip = runGitSync(['rev-parse', '--verify', '--quiet', `${branchName}^{commit}`], mwt);
271
+ if (!branchTip.success || branchTip.output.trim() !== sourceSha) {
272
+ return {
273
+ success: false,
274
+ error: `${branchName} is at ${branchTip.output.trim().slice(0, 9) || 'an unreadable head'}, not the admitted candidate ` +
275
+ `${sourceSha.slice(0, 9)}; integration only fast-forwards to the commit CI judged`,
276
+ sourceBranch: branchName,
277
+ targetBranch: config.integrationBranch,
278
+ };
279
279
  }
280
+ // Fast-forward ONLY (no merge-commit fallback: that tree would be untested).
281
+ // A fast-forward keeps the ancestry worktree cleanup reads through
282
+ // `git log integration..<branch>`.
283
+ let result = tryFastForwardMerge(mwt, sourceSha);
280
284
  if (!result.success && result.error && handleUntrackedFilesBlockingMerge(mwt, result.error)) {
281
- result = tryMergeCommit(mwt, branchName, commitMessage);
285
+ result = tryFastForwardMerge(mwt, sourceSha);
282
286
  }
283
287
  if (!result.success) {
284
288
  return {
@@ -288,7 +292,7 @@ export function mergeToIntegration(params) {
288
292
  targetBranch: config.integrationBranch,
289
293
  };
290
294
  }
291
- // Capture the merge commit SHA (from --no-ff merge or ff HEAD).
295
+ // Capture the fast-forwarded HEAD (the admitted candidate).
292
296
  // `git merge --ff-only` exits 0 in two cases: a real fast-forward (HEAD
293
297
  // advances) and "Already up to date" (HEAD does not move). The latter
294
298
  // is a no-op — there was nothing on the source branch to integrate, so
@@ -297,19 +301,14 @@ export function mergeToIntegration(params) {
297
301
  //
298
302
  // READER CONTRACT (what a recorded sha may be, and who consumes each form):
299
303
  // this `commitSha` is recorded as focus_merges.merge_commit_sha, and it is
300
- // NOT always a merge commit. Two shapes reach the verify evidence resolver
301
- // (resolvers/shared/git-diff.ts):
302
- // - --no-ff merge -> a real >= 2-parent MERGE commit. Consumed by source 2
303
- // (resolveRecordedMergeRange -> `<sha>^1...<sha>`), which REQUIRES >= 2
304
- // parents and correctly refuses anything else.
305
- // - --ff-only merge -> the fast-forwarded HEAD, an ORDINARY (single-parent)
306
- // commit, NOT a merge. Source 2 refuses it by design. It is instead
307
- // consumed by the fast-forward-safe source (resolveRecordedFastForwardRange
308
- // -> `<pre_merge_ref>...<sha>`), which is why `preMergeRef` (captured above)
309
- // is persisted alongside this sha via recordFocusMerge. Without the
310
- // pre-merge boundary a fast-forward merge-back leaves the resolver blind.
311
- // So: a recorded sha being a non-merge commit is EXPECTED (the ff case), and
312
- // the reader routes it by parent count -- it never assumes "recorded == merge".
304
+ // the fast-forwarded candidate: an ordinary commit, or the focus-side merge of
305
+ // the integration tip (merge-out) when that was the candidate. Either way the
306
+ // integration-side merge commit no longer exists. The verify evidence resolver
307
+ // (resolvers/shared/git-diff.ts) reads it through the fast-forward-safe source
308
+ // (resolveRecordedFastForwardRange -> `<pre_merge_ref>...<sha>`), which is why
309
+ // `preMergeRef` (captured above) is persisted alongside this sha via
310
+ // recordFocusMerge; the reader routes by parent count and never assumes
311
+ // "recorded == integration merge".
313
312
  const shaResult = runGitSync(['rev-parse', 'HEAD'], mwt);
314
313
  const observation = classifyMergeShaObservation(Boolean(result.commitSha), { success: shaResult.success, output: shaResult.output }, { success: preMergeRef.success, output: preMergeRef.output });
315
314
  if (observation.commitSha) {
@@ -1 +1 @@
1
- {"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/git/merge.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/git/merge.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"approval-gate-state.d.ts","sourceRoot":"","sources":["../../src/merge/approval-gate-state.ts"],"names":[],"mappings":"AAyCA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iDAAiD,CAAC;AAEzF,yGAAyG;AACzG,MAAM,MAAM,iBAAiB,GAAG,eAAe,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,cAAc,CAAC;AAEnG,0DAA0D;AAC1D,UAAU,oBAAoB;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,oEAAoE;AACpE,MAAM,WAAW,qBAAqB;IACpC,gGAAgG;IAChG,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACvE,oFAAoF;IACpF,kBAAkB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAAC;IACpG,kBAAkB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACtF,kHAAkH;IAClH,gBAAgB,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACpE;AAED,gFAAgF;AAChF,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAC9C,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CAiB5B"}
1
+ {"version":3,"file":"approval-gate-state.d.ts","sourceRoot":"","sources":["../../src/merge/approval-gate-state.ts"],"names":[],"mappings":"AA0CA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iDAAiD,CAAC;AAEzF,yGAAyG;AACzG,MAAM,MAAM,iBAAiB,GAAG,eAAe,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,cAAc,CAAC;AAEnG,0DAA0D;AAC1D,UAAU,oBAAoB;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,oEAAoE;AACpE,MAAM,WAAW,qBAAqB;IACpC,gGAAgG;IAChG,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACvE,oFAAoF;IACpF,kBAAkB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAAC;IACpG,kBAAkB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACtF,kHAAkH;IAClH,gBAAgB,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACpE;AAED,gFAAgF;AAChF,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAC9C,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CAiB5B"}
@@ -2,24 +2,25 @@
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
4
  // packages/daemon/src/merge/approval-gate-state.test.ts,
5
- // packages/daemon/src/merge/merge-gate-coverage.test.ts
5
+ // packages/daemon/src/merge/merge-gate-coverage.test.ts,
6
+ // packages/daemon/src/merge/resolved-conflict-merge-gate.test.ts
6
7
  // PINNED-BY-END
7
8
  /**
8
9
  * What the focus's deterministic gate says at the commit an approval judged --
9
- * the read that decides whether the approval may anchor merge coverage
10
- * (merge/merge-gate-coverage.ts).
10
+ * the read that decides whether the approval may admit a completion merge
11
+ * (merge/completion-merge-gate.ts).
11
12
  *
12
13
  * review_complete cannot see verdicts (they are host-local files), and nothing
13
14
  * revokes an approval when the gate at its commit is red, so an approval alone
14
- * would carry a gate-failed commit to integration. The either-or (passing
15
- * verdict OR approved review) holds -- a product with no configured gate merges
16
- * on review -- but an approval anchors only where the gate did not fail:
15
+ * would carry a gate-failed commit to integration. A product with no configured
16
+ * gate still merges on review, but an approval anchors only where the gate did
17
+ * not fail:
17
18
  * - 'auto_approval': the commit carries a recorded auto-approval
18
19
  * (merge/review-auto-approval-record.ts). One is written only after the
19
20
  * review exit's done-route passed the verdict gate
20
21
  * (completion/review-exit-holds/review-exit-verdict-gate.ts), so it anchors;
21
22
  * - 'failed' / 'passed': the newest verdict recorded for the commit under any
22
- * gate (verify/gate-verdicts/commit-verdict-record.ts), the record hasPassingVerdict reads;
23
+ * gate (verify/gate-verdicts/commit-verdict-record.ts);
23
24
  * - with no verdict recorded: 'pending' when a gate is configured for any live
24
25
  * delivery of the focus (verify/gate-config/commit-gate-configured.ts, the predicate the
25
26
  * review exit's done-route reads), else 'unconfigured'.
@@ -1 +1 @@
1
- {"version":3,"file":"approval-gate-state.js","sourceRoot":"","sources":["../../src/merge/approval-gate-state.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,mFAAmF;AACnF,gFAAgF;AAChF,2DAA2D;AAC3D,0DAA0D;AAC1D,gBAAgB;AAEhB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAyB9E,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,MAA8C,EAC9C,GAAW,EACX,IAA2B;IAE3B,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/D,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAAE,OAAO,eAAe,CAAC;IAErE,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACjE,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,OAAO,CAAC;IAErC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC1D,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,CAAC,eAAe,KAAK,eAAe,CAAC,SAAS;YAAE,SAAS;QAC9D,MAAM,OAAO,GAAsB;YACjC,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS;SAC/G,CAAC;QACF,IAAI,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAAE,OAAO,SAAS,CAAC;IAC7D,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC"}
1
+ {"version":3,"file":"approval-gate-state.js","sourceRoot":"","sources":["../../src/merge/approval-gate-state.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,mFAAmF;AACnF,gFAAgF;AAChF,2DAA2D;AAC3D,2DAA2D;AAC3D,mEAAmE;AACnE,gBAAgB;AAEhB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAyB9E,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,MAA8C,EAC9C,GAAW,EACX,IAA2B;IAE3B,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/D,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAAE,OAAO,eAAe,CAAC;IAErE,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACjE,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,OAAO,CAAC;IAErC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC1D,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,CAAC,eAAe,KAAK,eAAe,CAAC,SAAS;YAAE,SAAS;QAC9D,MAAM,OAAO,GAAsB;YACjC,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS;SAC/G,CAAC;QACF,IAAI,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAAE,OAAO,SAAS,CAAC;IAC7D,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC"}
@@ -0,0 +1,44 @@
1
+ import type { ReconcilerIssue } from '../delivery/delivery-reconciler.js';
2
+ import type { CandidateReworkCause, CandidateReworkOutcome, CompletionMergeConflict, CompletionMergeSubject } from './completion-merge-driver.js';
3
+ /** A focus delivery, as the owner choice reads it. */
4
+ export interface CandidateReworkDelivery {
5
+ id: string;
6
+ name: string;
7
+ executionStatus: string | null;
8
+ updatedAt: string | null;
9
+ }
10
+ /** An issue on the owning delivery. */
11
+ export interface CandidateReworkIssue extends ReconcilerIssue {
12
+ title: string;
13
+ }
14
+ /** The status write the re-open runs through: (id, status, stageId, gateState, completionArtifacts, transition). */
15
+ export type CandidateReworkStatusWrite = (deliveryId: string, executionStatus: string, currentWorkflowStageId?: string | null, gateState?: undefined, completionArtifacts?: undefined, transition?: {
16
+ organizationId: string;
17
+ fromStatus: string;
18
+ }) => Promise<void>;
19
+ /** The re-work's collaborators; bound at the composition root (composition/execution-merge-context.ts). */
20
+ export interface CandidateReworkDeps {
21
+ organizationId: string;
22
+ getFocusDeliveries: (focusId: string) => Promise<CandidateReworkDelivery[]>;
23
+ /** `Telora-Delivery` trailer values of the branch's non-merge commits not on integration, newest first. */
24
+ listBranchDeliveryTrailers: (repoPath: string, branchName: string) => string[];
25
+ getDeliveryIssues: (deliveryId: string) => Promise<CandidateReworkIssue[]>;
26
+ createIssue: (deliveryId: string, title: string, description: string | null, issueType: string, priority: string | null) => Promise<string>;
27
+ resolveStageId: (deliveryId: string, statusName: string) => Promise<string | undefined>;
28
+ /** The applier's advancer status writer (composition/delivery-advancers-context.ts), bound at the root. */
29
+ updateDeliveryStatus: CandidateReworkStatusWrite;
30
+ }
31
+ /** The Bug's title; carries the commit so one failure files one Bug. Pure. */
32
+ export declare function candidateReworkTitle(sha: string, cause: CandidateReworkCause): string;
33
+ /** The Bug's description. Pure. */
34
+ export declare function candidateReworkDescription(subject: CompletionMergeSubject, sha: string, cause: CandidateReworkCause, conflict: CompletionMergeConflict | null): string;
35
+ /** Which done delivery owns the re-work. Pure. */
36
+ export declare function chooseReworkOwner(deliveries: readonly CandidateReworkDelivery[], trailers: readonly string[]): CandidateReworkDelivery | null;
37
+ /** The Bug to file for this candidate, or null when one is still open. Pure. */
38
+ export declare function nextReworkTitle(issues: readonly CandidateReworkIssue[], base: string): string | null;
39
+ /**
40
+ * File the candidate's Bug on its owner and re-open that delivery; say what was
41
+ * applied. Throws on a failed read or write (the driver retries).
42
+ */
43
+ export declare function routeCandidateRework(subject: CompletionMergeSubject, sha: string, cause: CandidateReworkCause, conflict: CompletionMergeConflict | null, deps: CandidateReworkDeps): Promise<CandidateReworkOutcome>;
44
+ //# sourceMappingURL=candidate-rework.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"candidate-rework.d.ts","sourceRoot":"","sources":["../../src/merge/candidate-rework.ts"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAMlJ,sDAAsD;AACtD,MAAM,WAAW,uBAAuB;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,uCAAuC;AACvC,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,KAAK,EAAE,MAAM,CAAC;CACf;AAED,oHAAoH;AACpH,MAAM,MAAM,0BAA0B,GAAG,CACvC,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,EACtC,SAAS,CAAC,EAAE,SAAS,EACrB,mBAAmB,CAAC,EAAE,SAAS,EAC/B,UAAU,CAAC,EAAE;IAAE,cAAc,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,KACxD,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,2GAA2G;AAC3G,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAC5E,2GAA2G;IAC3G,0BAA0B,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IAC/E,iBAAiB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC3E,WAAW,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5I,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACxF,2GAA2G;IAC3G,oBAAoB,EAAE,0BAA0B,CAAC;CAClD;AAED,8EAA8E;AAC9E,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,GAAG,MAAM,CAKrF;AAwBD,mCAAmC;AACnC,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,sBAAsB,EAC/B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,oBAAoB,EAC3B,QAAQ,EAAE,uBAAuB,GAAG,IAAI,GACvC,MAAM,CAqBR;AAED,kDAAkD;AAClD,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,SAAS,uBAAuB,EAAE,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,uBAAuB,GAAG,IAAI,CAO7I;AAID,gFAAgF;AAChF,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,oBAAoB,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIpG;AAuBD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,sBAAsB,EAC/B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,oBAAoB,EAC3B,QAAQ,EAAE,uBAAuB,GAAG,IAAI,EACxC,IAAI,EAAE,mBAAmB,GACxB,OAAO,CAAC,sBAAsB,CAAC,CAoBjC"}