@on-par/factory-core 0.9.28-next.8 → 0.9.28

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 (285) hide show
  1. package/dist/blockers/declared-prerequisites.d.ts +4 -1
  2. package/dist/blockers/declared-prerequisites.d.ts.map +1 -1
  3. package/dist/blockers/declared-prerequisites.js +10 -5
  4. package/dist/blockers/declared-prerequisites.js.map +1 -1
  5. package/dist/checkers/app-smoke.d.ts.map +1 -1
  6. package/dist/checkers/app-smoke.js +4 -1
  7. package/dist/checkers/app-smoke.js.map +1 -1
  8. package/dist/checkers/evidence-plan.d.ts +2 -0
  9. package/dist/checkers/evidence-plan.d.ts.map +1 -1
  10. package/dist/checkers/evidence-plan.js +13 -6
  11. package/dist/checkers/evidence-plan.js.map +1 -1
  12. package/dist/checkers/evidence-selector.d.ts +2 -0
  13. package/dist/checkers/evidence-selector.d.ts.map +1 -1
  14. package/dist/checkers/evidence-selector.js +13 -10
  15. package/dist/checkers/evidence-selector.js.map +1 -1
  16. package/dist/checkers/evidence-workspace.d.ts +21 -0
  17. package/dist/checkers/evidence-workspace.d.ts.map +1 -0
  18. package/dist/checkers/evidence-workspace.js +118 -0
  19. package/dist/checkers/evidence-workspace.js.map +1 -0
  20. package/dist/checkers/index.js +1 -1
  21. package/dist/checkers/index.js.map +1 -1
  22. package/dist/checkers/internal-exports.d.ts +3 -1
  23. package/dist/checkers/internal-exports.d.ts.map +1 -1
  24. package/dist/checkers/internal-exports.js +3 -1
  25. package/dist/checkers/internal-exports.js.map +1 -1
  26. package/dist/checkers/resolve-commands.d.ts.map +1 -1
  27. package/dist/checkers/resolve-commands.js +5 -1
  28. package/dist/checkers/resolve-commands.js.map +1 -1
  29. package/dist/config/example.d.ts.map +1 -1
  30. package/dist/config/example.js +5 -2
  31. package/dist/config/example.js.map +1 -1
  32. package/dist/config/index.d.ts +6 -32
  33. package/dist/config/index.d.ts.map +1 -1
  34. package/dist/config/index.js +17 -32
  35. package/dist/config/index.js.map +1 -1
  36. package/dist/config/merge-policy.d.ts +36 -0
  37. package/dist/config/merge-policy.d.ts.map +1 -0
  38. package/dist/config/merge-policy.js +31 -0
  39. package/dist/config/merge-policy.js.map +1 -0
  40. package/dist/config/repo.js +1 -1
  41. package/dist/config/repo.js.map +1 -1
  42. package/dist/config/run-config-env.d.ts +5 -0
  43. package/dist/config/run-config-env.d.ts.map +1 -0
  44. package/dist/config/run-config-env.js +11 -0
  45. package/dist/config/run-config-env.js.map +1 -0
  46. package/dist/config/run-config-ladder.d.ts +18 -0
  47. package/dist/config/run-config-ladder.d.ts.map +1 -0
  48. package/dist/config/run-config-ladder.js +110 -0
  49. package/dist/config/run-config-ladder.js.map +1 -0
  50. package/dist/config/run-config-source.d.ts +6 -6
  51. package/dist/config/run-config-source.d.ts.map +1 -1
  52. package/dist/config/run-config-source.js +16 -15
  53. package/dist/config/run-config-source.js.map +1 -1
  54. package/dist/constitutions/index.d.ts.map +1 -1
  55. package/dist/constitutions/index.js +8 -0
  56. package/dist/constitutions/index.js.map +1 -1
  57. package/dist/environment/process-groups.d.ts +5 -0
  58. package/dist/environment/process-groups.d.ts.map +1 -1
  59. package/dist/environment/process-groups.js +19 -0
  60. package/dist/environment/process-groups.js.map +1 -1
  61. package/dist/events/config-traits.d.ts +1 -1
  62. package/dist/events/config-traits.d.ts.map +1 -1
  63. package/dist/events/config-traits.js +2 -0
  64. package/dist/events/config-traits.js.map +1 -1
  65. package/dist/events/queue-traits.d.ts +1 -1
  66. package/dist/events/queue-traits.d.ts.map +1 -1
  67. package/dist/events/queue-traits.js +8 -1
  68. package/dist/events/queue-traits.js.map +1 -1
  69. package/dist/events/rotation.js +1 -1
  70. package/dist/events/rotation.js.map +1 -1
  71. package/dist/fakes/octokit.d.ts +13 -1
  72. package/dist/fakes/octokit.d.ts.map +1 -1
  73. package/dist/fakes/octokit.js +13 -0
  74. package/dist/fakes/octokit.js.map +1 -1
  75. package/dist/filing/redact.d.ts +1 -0
  76. package/dist/filing/redact.d.ts.map +1 -1
  77. package/dist/filing/redact.js +1 -1
  78. package/dist/filing/redact.js.map +1 -1
  79. package/dist/harness/opencode-version.d.ts +2 -2
  80. package/dist/harness/opencode-version.d.ts.map +1 -1
  81. package/dist/harness/opencode-version.js +3 -3
  82. package/dist/harness/opencode-version.js.map +1 -1
  83. package/dist/internal.d.ts +13 -1
  84. package/dist/internal.d.ts.map +1 -1
  85. package/dist/internal.js +14 -0
  86. package/dist/internal.js.map +1 -1
  87. package/dist/kpis/index.d.ts.map +1 -1
  88. package/dist/kpis/index.js +2 -1
  89. package/dist/kpis/index.js.map +1 -1
  90. package/dist/kpis/park.d.ts.map +1 -1
  91. package/dist/kpis/park.js +2 -1
  92. package/dist/kpis/park.js.map +1 -1
  93. package/dist/kpis/phase.d.ts.map +1 -1
  94. package/dist/kpis/phase.js +1 -0
  95. package/dist/kpis/phase.js.map +1 -1
  96. package/dist/land/changelog.d.ts +8 -0
  97. package/dist/land/changelog.d.ts.map +1 -0
  98. package/dist/land/changelog.js +90 -0
  99. package/dist/land/changelog.js.map +1 -0
  100. package/dist/land/sync.d.ts.map +1 -1
  101. package/dist/land/sync.js +93 -32
  102. package/dist/land/sync.js.map +1 -1
  103. package/dist/phases/check-evidence.d.ts.map +1 -1
  104. package/dist/phases/check-evidence.js +5 -1
  105. package/dist/phases/check-evidence.js.map +1 -1
  106. package/dist/phases/ship-approval.d.ts +17 -0
  107. package/dist/phases/ship-approval.d.ts.map +1 -0
  108. package/dist/phases/ship-approval.js +21 -0
  109. package/dist/phases/ship-approval.js.map +1 -0
  110. package/dist/phases/ship-branch-push.d.ts +17 -0
  111. package/dist/phases/ship-branch-push.d.ts.map +1 -0
  112. package/dist/phases/ship-branch-push.js +77 -0
  113. package/dist/phases/ship-branch-push.js.map +1 -0
  114. package/dist/phases/ship-ci-watch.d.ts +25 -0
  115. package/dist/phases/ship-ci-watch.d.ts.map +1 -0
  116. package/dist/phases/ship-ci-watch.js +53 -0
  117. package/dist/phases/ship-ci-watch.js.map +1 -0
  118. package/dist/phases/ship-evidence-comment.d.ts +14 -0
  119. package/dist/phases/ship-evidence-comment.d.ts.map +1 -0
  120. package/dist/phases/ship-evidence-comment.js +31 -0
  121. package/dist/phases/ship-evidence-comment.js.map +1 -0
  122. package/dist/phases/ship-existing-pr.d.ts +11 -0
  123. package/dist/phases/ship-existing-pr.d.ts.map +1 -0
  124. package/dist/phases/ship-existing-pr.js +36 -0
  125. package/dist/phases/ship-existing-pr.js.map +1 -0
  126. package/dist/phases/ship-finish.d.ts +15 -0
  127. package/dist/phases/ship-finish.d.ts.map +1 -0
  128. package/dist/phases/ship-finish.js +69 -0
  129. package/dist/phases/ship-finish.js.map +1 -0
  130. package/dist/phases/ship-git-detail.d.ts +31 -0
  131. package/dist/phases/ship-git-detail.d.ts.map +1 -0
  132. package/dist/phases/ship-git-detail.js +71 -0
  133. package/dist/phases/ship-git-detail.js.map +1 -0
  134. package/dist/phases/ship-git-remote.d.ts +51 -0
  135. package/dist/phases/ship-git-remote.d.ts.map +1 -0
  136. package/dist/phases/ship-git-remote.js +70 -0
  137. package/dist/phases/ship-git-remote.js.map +1 -0
  138. package/dist/phases/ship-git.d.ts +4 -79
  139. package/dist/phases/ship-git.d.ts.map +1 -1
  140. package/dist/phases/ship-git.js +2 -135
  141. package/dist/phases/ship-git.js.map +1 -1
  142. package/dist/phases/ship-main-sync.d.ts +18 -0
  143. package/dist/phases/ship-main-sync.d.ts.map +1 -0
  144. package/dist/phases/ship-main-sync.js +34 -0
  145. package/dist/phases/ship-main-sync.js.map +1 -0
  146. package/dist/phases/ship-open-pr.d.ts +24 -0
  147. package/dist/phases/ship-open-pr.d.ts.map +1 -0
  148. package/dist/phases/ship-open-pr.js +75 -0
  149. package/dist/phases/ship-open-pr.js.map +1 -0
  150. package/dist/phases/ship-options.d.ts +81 -0
  151. package/dist/phases/ship-options.d.ts.map +1 -0
  152. package/dist/phases/ship-options.js +4 -0
  153. package/dist/phases/ship-options.js.map +1 -0
  154. package/dist/phases/ship-recovery.d.ts +16 -0
  155. package/dist/phases/ship-recovery.d.ts.map +1 -0
  156. package/dist/phases/ship-recovery.js +81 -0
  157. package/dist/phases/ship-recovery.js.map +1 -0
  158. package/dist/phases/ship-reentry.d.ts +20 -0
  159. package/dist/phases/ship-reentry.d.ts.map +1 -0
  160. package/dist/phases/ship-reentry.js +47 -0
  161. package/dist/phases/ship-reentry.js.map +1 -0
  162. package/dist/phases/ship.d.ts +4 -76
  163. package/dist/phases/ship.d.ts.map +1 -1
  164. package/dist/phases/ship.js +67 -425
  165. package/dist/phases/ship.js.map +1 -1
  166. package/dist/phases/stack-order.d.ts +9 -0
  167. package/dist/phases/stack-order.d.ts.map +1 -1
  168. package/dist/phases/stack-order.js +13 -0
  169. package/dist/phases/stack-order.js.map +1 -1
  170. package/dist/queue/comment-rework-trigger.d.ts +24 -0
  171. package/dist/queue/comment-rework-trigger.d.ts.map +1 -0
  172. package/dist/queue/comment-rework-trigger.js +128 -0
  173. package/dist/queue/comment-rework-trigger.js.map +1 -0
  174. package/dist/queue/github-queue.d.ts +4 -2
  175. package/dist/queue/github-queue.d.ts.map +1 -1
  176. package/dist/queue/github-queue.js.map +1 -1
  177. package/dist/queue/internal-exports.d.ts +3 -0
  178. package/dist/queue/internal-exports.d.ts.map +1 -1
  179. package/dist/queue/internal-exports.js +2 -0
  180. package/dist/queue/internal-exports.js.map +1 -1
  181. package/dist/queue/lane-discovery-interval.d.ts +6 -0
  182. package/dist/queue/lane-discovery-interval.d.ts.map +1 -0
  183. package/dist/queue/lane-discovery-interval.js +9 -0
  184. package/dist/queue/lane-discovery-interval.js.map +1 -0
  185. package/dist/queue/linear-queue-backend.d.ts +17 -0
  186. package/dist/queue/linear-queue-backend.d.ts.map +1 -0
  187. package/dist/queue/linear-queue-backend.js +42 -0
  188. package/dist/queue/linear-queue-backend.js.map +1 -0
  189. package/dist/queue/linear-queue.d.ts +4 -2
  190. package/dist/queue/linear-queue.d.ts.map +1 -1
  191. package/dist/queue/linear-queue.js +79 -2
  192. package/dist/queue/linear-queue.js.map +1 -1
  193. package/dist/queue/prerequisite-stack.d.ts +47 -0
  194. package/dist/queue/prerequisite-stack.d.ts.map +1 -0
  195. package/dist/queue/prerequisite-stack.js +41 -0
  196. package/dist/queue/prerequisite-stack.js.map +1 -0
  197. package/dist/queue/queue-backend.d.ts +11 -5
  198. package/dist/queue/queue-backend.d.ts.map +1 -1
  199. package/dist/queue/queue-backend.js +8 -3
  200. package/dist/queue/queue-backend.js.map +1 -1
  201. package/dist/queue/review-rework-trigger.d.ts +7 -2
  202. package/dist/queue/review-rework-trigger.d.ts.map +1 -1
  203. package/dist/queue/review-rework-trigger.js +16 -8
  204. package/dist/queue/review-rework-trigger.js.map +1 -1
  205. package/dist/reports/pr-body.d.ts +5 -2
  206. package/dist/reports/pr-body.d.ts.map +1 -1
  207. package/dist/reports/pr-body.js +21 -10
  208. package/dist/reports/pr-body.js.map +1 -1
  209. package/dist/run/ci-rework-loop.d.ts.map +1 -1
  210. package/dist/run/ci-rework-loop.js +5 -1
  211. package/dist/run/ci-rework-loop.js.map +1 -1
  212. package/dist/run/feedback-github.d.ts +50 -0
  213. package/dist/run/feedback-github.d.ts.map +1 -0
  214. package/dist/run/feedback-github.js +87 -0
  215. package/dist/run/feedback-github.js.map +1 -0
  216. package/dist/run/feedback-round-hooks.d.ts +19 -0
  217. package/dist/run/feedback-round-hooks.d.ts.map +1 -0
  218. package/dist/run/feedback-round-hooks.js +106 -0
  219. package/dist/run/feedback-round-hooks.js.map +1 -0
  220. package/dist/run/feedback-round.d.ts +97 -0
  221. package/dist/run/feedback-round.d.ts.map +1 -0
  222. package/dist/run/feedback-round.js +275 -0
  223. package/dist/run/feedback-round.js.map +1 -0
  224. package/dist/run/linear-run.d.ts +23 -0
  225. package/dist/run/linear-run.d.ts.map +1 -0
  226. package/dist/run/linear-run.js +18 -0
  227. package/dist/run/linear-run.js.map +1 -0
  228. package/dist/run/park-comment.d.ts +9 -0
  229. package/dist/run/park-comment.d.ts.map +1 -1
  230. package/dist/run/park-comment.js +12 -0
  231. package/dist/run/park-comment.js.map +1 -1
  232. package/dist/run/ports.d.ts +10 -0
  233. package/dist/run/ports.d.ts.map +1 -1
  234. package/dist/run/ports.js +12 -0
  235. package/dist/run/ports.js.map +1 -1
  236. package/dist/run/pr-run-state.d.ts +99 -0
  237. package/dist/run/pr-run-state.d.ts.map +1 -0
  238. package/dist/run/pr-run-state.js +235 -0
  239. package/dist/run/pr-run-state.js.map +1 -0
  240. package/dist/run/prerequisite-restack.d.ts +39 -0
  241. package/dist/run/prerequisite-restack.d.ts.map +1 -0
  242. package/dist/run/prerequisite-restack.js +79 -0
  243. package/dist/run/prerequisite-restack.js.map +1 -0
  244. package/dist/run/review-rework-cap.d.ts +3 -1
  245. package/dist/run/review-rework-cap.d.ts.map +1 -1
  246. package/dist/run/review-rework-cap.js +2 -1
  247. package/dist/run/review-rework-cap.js.map +1 -1
  248. package/dist/run/review-rework.d.ts +17 -2
  249. package/dist/run/review-rework.d.ts.map +1 -1
  250. package/dist/run/review-rework.js +99 -33
  251. package/dist/run/review-rework.js.map +1 -1
  252. package/dist/run/run-issue.d.ts +5 -1
  253. package/dist/run/run-issue.d.ts.map +1 -1
  254. package/dist/run/run-issue.js +35 -28
  255. package/dist/run/run-issue.js.map +1 -1
  256. package/dist/run/stack-rebase.d.ts +28 -0
  257. package/dist/run/stack-rebase.d.ts.map +1 -0
  258. package/dist/run/stack-rebase.js +79 -0
  259. package/dist/run/stack-rebase.js.map +1 -0
  260. package/dist/run/stack-restack.d.ts.map +1 -1
  261. package/dist/run/stack-restack.js +21 -49
  262. package/dist/run/stack-restack.js.map +1 -1
  263. package/dist/utils/command-runner.d.ts.map +1 -1
  264. package/dist/utils/command-runner.js +4 -1
  265. package/dist/utils/command-runner.js.map +1 -1
  266. package/dist/utils/exec.d.ts.map +1 -1
  267. package/dist/utils/exec.js +4 -1
  268. package/dist/utils/exec.js.map +1 -1
  269. package/dist/utils/in-place.d.ts +24 -0
  270. package/dist/utils/in-place.d.ts.map +1 -0
  271. package/dist/utils/in-place.js +105 -0
  272. package/dist/utils/in-place.js.map +1 -0
  273. package/dist/work/internal-exports.d.ts +3 -0
  274. package/dist/work/internal-exports.d.ts.map +1 -0
  275. package/dist/work/internal-exports.js +4 -0
  276. package/dist/work/internal-exports.js.map +1 -0
  277. package/dist/work/ticket-writeback.d.ts +22 -0
  278. package/dist/work/ticket-writeback.d.ts.map +1 -0
  279. package/dist/work/ticket-writeback.js +73 -0
  280. package/dist/work/ticket-writeback.js.map +1 -0
  281. package/dist/work/work-key.d.ts +2 -0
  282. package/dist/work/work-key.d.ts.map +1 -1
  283. package/dist/work/work-key.js +4 -0
  284. package/dist/work/work-key.js.map +1 -1
  285. package/package.json +5 -5
@@ -1,27 +1,22 @@
1
1
  // src/phases/ship.ts — SHIP phase: create/verify PR, mark ready for review
2
- import { issueNumberOf } from '../work/work-key.js';
3
2
  import { exec as execCb } from 'node:child_process';
4
3
  import { promisify } from 'node:util';
5
4
  import { withLifecycle } from '../bus/index.js';
6
- import { gatherEvidencePack } from '../reports/evidence-pack.js';
7
- import { briefSummaryLine, renderPrBody, stripBriefIds } from '../reports/pr-body.js';
8
- import { computeDiffStat } from './ship-diff-stat.js';
9
- import { lazyWalkthrough } from './ship-walkthrough.js';
10
- import { renderStackOrderLine } from './stack-order.js';
11
- import { checkRemoteIsAncestor, describePushFailure, pushAndVerifyRemoteHead, readRemoteBranchSha, shortDetail, verifyRemoteHead, } from './ship-git.js';
12
- import { publishPreviewReceipt } from '../checkers/preview-receipt.js';
13
- import { previewFailureReason, runPreviewGate } from './ship-preview.js';
14
- import { commitLeftoverBuildOutput } from './ship-leftover.js';
15
- import { markPrReadyWithRetry } from './ship-ready.js';
16
- import { readRisk, readSpecBody } from './ship-spec.js';
17
- import { collectCiFailureEvidence } from '../utils/ci-evidence.js';
18
- import { DEFAULT_CI_DEADLINE_MS, watchChecksWithInfraRerun } from '../utils/ci-watch.js';
19
- import { shellEscape } from '../utils/index.js';
20
5
  import { GITHUB_ISSUE_SOURCE } from '../work/github-issue.js';
21
- import { findMergedPR, findOpenPR, isPullAlreadyExistsError } from './ship-pr-lookup.js';
22
- export { findMergedPR, findOpenPR, isPullAlreadyExistsError };
23
- /** Ship opens PRs against, and watches required checks of, this branch. */
24
- const SHIP_BASE_BRANCH = 'main';
6
+ import { ticketKeyOf } from '../work/ticket-writeback.js';
7
+ import { requestShipApproval } from './ship-approval.js';
8
+ import { pushNewBranch } from './ship-branch-push.js';
9
+ import { watchShipCi } from './ship-ci-watch.js';
10
+ import { syncExistingPr } from './ship-existing-pr.js';
11
+ import { postEvidenceComment } from './ship-evidence-comment.js';
12
+ import { finishShip } from './ship-finish.js';
13
+ import { openOrFindPr } from './ship-open-pr.js';
14
+ import { SHIP_BASE_BRANCH } from './ship-options.js';
15
+ import { findMergedPR, findOpenPR } from './ship-pr-lookup.js';
16
+ import { pushReentry } from './ship-reentry.js';
17
+ import { lazyWalkthrough } from './ship-walkthrough.js';
18
+ import { syncShipBranchWithMain } from './ship-main-sync.js';
19
+ export { findMergedPR, findOpenPR };
25
20
  const exec = promisify(execCb);
26
21
  export async function shipPhase(opts) {
27
22
  return withLifecycle({
@@ -38,24 +33,16 @@ export async function shipPhase(opts) {
38
33
  async function shipPhaseImpl(opts) {
39
34
  const { issue, repo, worktree, branch, octokit, watchCI = true, log, run = exec, rerun, approvalGate, checkSummary, } = opts;
40
35
  const [owner, repoName] = repo.split('/');
41
- const inlineWork = opts.work && opts.work.kind !== GITHUB_ISSUE_SOURCE ? opts.work : undefined;
36
+ const ticketKey = ticketKeyOf(opts.work);
37
+ const ticket = ticketKey !== undefined && opts.work ? { key: ticketKey, title: opts.work.title } : undefined;
38
+ const inlineWork = opts.work && opts.work.kind !== GITHUB_ISSUE_SOURCE && !ticket ? opts.work : undefined;
42
39
  const stack = inlineWork ? undefined : opts.stack;
43
40
  const base = stack?.base ?? opts.baseBranch ?? SHIP_BASE_BRANCH;
44
41
  const walkthrough = lazyWalkthrough(run, worktree, { ...opts, base }, log);
45
42
  if (approvalGate) {
46
- // Log a 'ship'-typed event before anything else so the TUI's activePhase
47
- // advances to SHIP first — otherwise a denial reports failedPhase as
48
- // whichever phase (CHECK/BUILD) last logged, which is misleading.
49
- log('ship', `Starting ship phase for ${branch}`);
50
- const diffStat = await computeDiffStat(run, worktree, base);
51
- log('approval_requested', `awaiting approval to ship ${branch}${checkSummary ? ` (checks: ${checkSummary.passes} pass, ${checkSummary.failures} fail, ${checkSummary.skips} skip)` : ''}`);
52
- const response = await approvalGate({ issue: issueNumberOf(issue), branch, worktree, diffStat, checkSummary });
53
- if (!response.approved) {
54
- const reason = response.reason ?? 'denied';
55
- log('ship_denied', `ship denied for ${branch}: ${reason}`);
56
- return { ok: false, denied: true, deniedReason: reason };
57
- }
58
- log('approval_granted', `approval granted for ${branch}`);
43
+ const denied = await requestShipApproval({ approvalGate, issue, branch, worktree, base, run, checkSummary, log });
44
+ if (denied)
45
+ return denied;
59
46
  }
60
47
  // Check if a PR already exists (claude route may have created one)
61
48
  const openLookup = await findOpenPR(octokit, owner, repoName, branch);
@@ -68,249 +55,39 @@ async function shipPhaseImpl(opts) {
68
55
  const reentry = opts.reentry;
69
56
  let watchRef = branch;
70
57
  let headSha;
58
+ // #3945: open the PR mergeable with main (CHANGELOG/ADR index auto-resolved), or GitHub runs no CI on it.
59
+ const synced = opts.syncMain && !reentry && base === SHIP_BASE_BRANCH
60
+ ? await syncShipBranchWithMain({ run, worktree, branch, log })
61
+ : undefined;
71
62
  if (reentry) {
72
- if (prNumber !== reentry.prNumber) {
73
- const reason = `re-entry expected open PR #${reentry.prNumber} for ${branch} but found ${prNumber === undefined ? 'none' : `#${prNumber}`}`;
74
- log('ship', reason);
75
- return { ok: false, reason };
76
- }
77
- let localSha;
78
- try {
79
- localSha = (await run('git rev-parse HEAD', { cwd: worktree })).stdout.trim();
80
- }
81
- catch (err) {
82
- const reason = `could not read local HEAD on re-entry (${shortDetail(err)})`;
83
- log('ship', reason);
84
- return { ok: false, prNumber, reason };
85
- }
86
- if (localSha && localSha === reentry.previousHeadSha) {
87
- const reason = `CI rework produced no new commit on ${branch}`;
88
- log('ship', reason);
89
- return { ok: false, prNumber, ciOutcome: 'failure', reason, headSha: localSha };
90
- }
91
- try {
92
- await run(`git push origin ${shellEscape(branch)}`, { cwd: worktree });
93
- }
94
- catch (err) {
95
- const { kind, detail } = describePushFailure(err);
96
- const reason = `re-entry push of ${branch} failed (${kind}): ${detail}`;
97
- log('ship', reason);
98
- return { ok: false, prNumber, reason };
99
- }
100
- const remoteHead = await verifyRemoteHead(run, worktree, branch);
101
- if (remoteHead.status !== 'match') {
102
- const reason = remoteHead.status === 'mismatch'
103
- ? `remote head ${remoteHead.remoteSha} does not match local HEAD ${remoteHead.localSha} for ${branch} after re-entry push`
104
- : `could not verify the remote head for ${branch} after re-entry push (${remoteHead.detail})`;
105
- log('ship', reason);
106
- return { ok: false, prNumber, reason };
107
- }
108
- watchRef = remoteHead.remoteSha;
109
- headSha = remoteHead.remoteSha;
110
- log('ship', `re-entry pushed ${branch} @ ${headSha}`);
63
+ const pushed = await pushReentry({ run, worktree, branch, prNumber, reentry, log });
64
+ if ('stop' in pushed)
65
+ return pushed.stop;
66
+ ({ watchRef, headSha } = pushed);
111
67
  }
112
68
  else if (prNumber) {
113
- // Rework commits made after BUILD's push must reach the open PR before evidence or ready (#1813).
114
- const current = await verifyRemoteHead(run, worktree, branch);
115
- if (current.status === 'match') {
116
- log('ship', `remote head ${current.remoteSha} matches local HEAD ${current.localSha} for ${branch} — already in sync, not pushing`);
117
- }
118
- else {
119
- if (current.status === 'mismatch') {
120
- const ancestry = await checkRemoteIsAncestor(run, worktree, current.remoteSha, current.localSha);
121
- if (ancestry.status !== 'ancestor') {
122
- const reason = ancestry.status === 'diverged'
123
- ? `origin/${branch} @ ${current.remoteSha} has diverged from local HEAD ${current.localSha} (remote has commits local HEAD lacks) on open PR #${prNumber} — not force-pushing`
124
- : `could not confirm origin/${branch} @ ${current.remoteSha} is an ancestor of local HEAD ${current.localSha} on open PR #${prNumber} (${ancestry.detail})`;
125
- log('ship', `${reason} — aborting before evidence`);
126
- return { ok: false, prNumber, reason };
127
- }
128
- }
129
- const pushed = await pushAndVerifyRemoteHead(run, worktree, branch, `git push -u origin ${shellEscape(branch)}`);
130
- if (pushed.status !== 'pushed') {
131
- const reason = pushed.status === 'push-failed'
132
- ? `push of ${branch} to open PR #${prNumber} failed (${pushed.kind}): ${pushed.detail}`
133
- : pushed.status === 'mismatch'
134
- ? `remote head ${pushed.remoteSha} does not match local HEAD ${pushed.localSha} for ${branch} after push to open PR #${prNumber}`
135
- : `could not verify the remote head for ${branch} after push to open PR #${prNumber} (${pushed.detail})`;
136
- log('ship', `${reason} — aborting before evidence`);
137
- return { ok: false, prNumber, reason };
138
- }
139
- log('ship', `remote head ${pushed.remoteSha} matches local HEAD ${pushed.localSha} for ${branch}`);
140
- }
69
+ const stop = await syncExistingPr({ run, worktree, branch, prNumber, log });
70
+ if (stop)
71
+ return stop;
141
72
  }
142
73
  if (!prNumber) {
143
- // Recovery decisions must compare against the *current* remote — a stale
144
- // remote-tracking ref makes already-delivered work look like recovery work (#520).
145
- try {
146
- await run('git fetch origin main', { cwd: worktree });
147
- }
148
- catch {
149
- log('ship', 'git fetch origin main failed — recovery may compare against a stale origin/main');
150
- }
151
- let recoveryState = await inspectRecoveryState(worktree, run);
152
- if (!recoveryState.clean) {
153
- const conflicts = conflictedPaths(recoveryState.statusLines);
154
- if (conflicts.length > 0) {
155
- // Committing an unmerged index would put conflict markers on the PR branch —
156
- // park with the concrete paths and leave the worktree for a human (#1172).
157
- const listed = conflicts.slice(0, 5).join(', ') + (conflicts.length > 5 ? ` (+${conflicts.length - 5} more)` : '');
158
- const reason = `worktree has merge conflicts in ${listed}`;
159
- log('ship', `not recovering ${branch}: ${reason} — worktree preserved`);
160
- return { ok: false, reason };
161
- }
162
- // CHECK verified this exact working tree, so the dirt IS the green artifact —
163
- // commit it and ship rather than parking verified work (#1164/#1172).
164
- const committed = await commitLeftoverBuildOutput({
165
- run,
166
- worktree,
167
- branch,
168
- issue: inlineWork ? undefined : issue,
169
- statusLines: recoveryState.statusLines,
170
- log,
171
- });
172
- if (!committed.ok) {
173
- log('ship', `not recovering ${branch}: ${committed.reason} — worktree preserved`);
174
- return { ok: false, reason: committed.reason };
175
- }
176
- recoveryState = await inspectRecoveryState(worktree, run);
177
- if (!recoveryState.clean) {
178
- const reason = 'worktree still dirty after committing leftover build output';
179
- log('ship', `not recovering ${branch}: ${reason} — worktree preserved`);
180
- return { ok: false, reason };
181
- }
182
- }
183
- if (recoveryState.landed || !recoveryState.ahead) {
184
- // The branch's content is already on main: identical trees (squash merge) or an
185
- // empty ahead-count (merge commit / fast-forward). That is delivery, not recovery.
186
- const mergedLookup = await findMergedPR(octokit, owner, repoName, branch);
187
- if (mergedLookup.status === 'error' && !recoveryState.landed) {
188
- const reason = `could not determine whether ${branch} was already merged (${mergedLookup.detail})`;
189
- log('ship', `not recovering ${branch}: ${reason}`);
190
- return { ok: false, reason };
191
- }
192
- const mergedPr = mergedLookup.status === 'found' ? mergedLookup.prNumber : undefined;
193
- if (mergedPr !== undefined || recoveryState.landed) {
194
- log('ship', `not recovering ${branch}: already delivered${mergedPr !== undefined ? ` by merged PR #${mergedPr}` : ' (HEAD tree matches origin/main)'}`);
195
- return { ok: true, prNumber: mergedPr, alreadyDelivered: true };
196
- }
197
- const reason = 'no commits ahead of origin/main';
198
- log('ship', `not recovering ${branch}: ${reason}`);
199
- return { ok: false, reason };
200
- }
201
- // Push branch. A rejected push means the remote head does not contain this run's
202
- // commits — opening a PR against it would advertise work that is not there, so the
203
- // ship fails closed here rather than continuing to PR creation (#734).
204
- let pushCmd = `git push -u origin ${shellEscape(branch)}`;
205
- const recorded = opts.recordedRemoteSha;
206
- let leased = false;
207
- if (recorded) {
208
- // A retry rebuilds the branch from origin/main, so an earlier run's push is stale. Replace it
209
- // only while the remote is still exactly what was recorded at worktree creation (#1869).
210
- const current = await readRemoteBranchSha(run, worktree, branch);
211
- if (current.status === 'unreadable') {
212
- const reason = `could not read origin/${branch} to check recorded SHA ${recorded} (${current.detail})`;
213
- log('ship', `${reason} — aborting before push`);
214
- return { ok: false, reason };
215
- }
216
- if (current.sha === null) {
217
- log('ship', `origin/${branch} recorded @ ${recorded} no longer exists — nothing to replace, plain push`);
218
- }
219
- else if (current.sha !== recorded) {
220
- const reason = `origin/${branch} moved since it was recorded: recorded ${recorded}, current ${current.sha}`;
221
- log('ship', `${reason} — aborting before push`);
222
- return { ok: false, reason };
223
- }
224
- else {
225
- pushCmd = `git push ${shellEscape(`--force-with-lease=${branch}:${recorded}`)} -u origin ${shellEscape(branch)}`;
226
- leased = true;
227
- log('ship', `replacing stale origin/${branch} @ ${recorded} with a leased push`);
228
- }
229
- }
230
- // A zero-exit push is not proof the remote branch actually carries this run's commits — a
231
- // concurrent push or an update that silently applied nothing leaves the remote head elsewhere,
232
- // and a PR opened against it advertises work that is not there (#735). Fail closed, like the
233
- // push-failure abort (#734).
234
- const pushed = await pushAndVerifyRemoteHead(run, worktree, branch, pushCmd);
235
- if (pushed.status === 'push-failed') {
236
- const pushReason = `git push failed (${pushed.kind}): ${pushed.detail}`;
237
- log('ship', `${pushReason} — aborting before PR creation`);
238
- if (leased) {
239
- return {
240
- ok: false,
241
- reason: `leased push of ${branch} over recorded ${recorded} was rejected (${pushed.kind})`,
242
- };
243
- }
244
- return { ok: false, reason: pushReason };
245
- }
246
- if (pushed.status === 'mismatch') {
247
- const reason = `remote head ${pushed.remoteSha} does not match local HEAD ${pushed.localSha} for ${branch}`;
248
- log('ship', `${reason} — aborting before PR creation`);
249
- return { ok: false, reason };
250
- }
251
- if (pushed.status === 'unreadable') {
252
- const reason = `could not verify the remote head for ${branch} (${pushed.detail}); local HEAD ${pushed.localSha ?? 'unknown'}`;
253
- log('ship', `${reason} — aborting before PR creation`);
254
- return { ok: false, reason };
255
- }
256
- log('ship', `remote head ${pushed.remoteSha} matches local HEAD ${pushed.localSha} for ${branch}`);
257
- // Get title from issue (skipped for a non-github work source — no such issue exists)
258
- const title = inlineWork
259
- ? inlineWork.title
260
- : (await octokit.rest.issues.get({ owner, repo: repoName, issue_number: issueNumberOf(issue) })).data.title;
261
- const slice = inlineWork ? undefined : opts.slice;
262
- const finalSlice = !slice || slice.index >= slice.count;
263
- // A brief is a local file reviewers cannot open, so the body describes it by its title and links the
264
- // open PR it builds on (a --stack or --base-branch base), never its id, digest or path.
265
- const basePr = inlineWork && base !== SHIP_BASE_BRANCH ? await findOpenPR(octokit, owner, repoName, base) : undefined;
266
- const summaryLine = inlineWork
267
- ? briefSummaryLine(title, basePr?.status === 'found' ? basePr.prNumber : undefined)
268
- : slice
269
- ? `Implements slice ${slice.index}/${slice.count} of #${issue}.`
270
- : `Implements #${issue}.`;
271
- const prTitle = inlineWork
272
- ? stripBriefIds(title)
273
- : slice
274
- ? `${title} — slice ${slice.index}/${slice.count} (#${issue})`
275
- : `${title} (#${issue})`;
276
- // Create PR
277
- try {
278
- const { data: pr } = await octokit.rest.pulls.create({
279
- owner,
280
- repo: repoName,
281
- head: branch,
282
- base,
283
- title: prTitle,
284
- draft: true,
285
- body: renderPrBody({
286
- summaryLine,
287
- footer: opts.footer,
288
- stackOrder: stack ? renderStackOrderLine(stack) : undefined,
289
- specBody: await readSpecBody(opts.specPath),
290
- checkSummary,
291
- reworkRounds: opts.reworkRounds,
292
- risk: await readRisk(opts.specPath),
293
- walkthrough: await walkthrough.walkthrough(),
294
- typescriptLines: await walkthrough.counts(),
295
- closes: inlineWork || !finalSlice ? undefined : issue,
296
- partOf: !inlineWork && !finalSlice ? issue : undefined,
297
- }),
298
- });
299
- prNumber = pr.number;
300
- log('pr_opened', `opened PR #${prNumber} for committed work on ${branch} (base ${base})`);
301
- }
302
- catch (err) {
303
- if (!isPullAlreadyExistsError(err))
304
- throw err;
305
- const existing = await findOpenPR(octokit, owner, repoName, branch);
306
- if (existing.status !== 'found') {
307
- const reason = `pulls.create reported an existing PR for ${branch} but re-querying did not find it (${existing.status === 'error' ? existing.detail : 'no open PR listed'})`;
308
- log('ship', `${reason} — aborting`);
309
- return { ok: false, reason };
310
- }
311
- prNumber = existing.prNumber;
312
- log('recovered', `PR #${prNumber} already existed for ${branch}; reusing it`);
313
- }
74
+ const stop = await pushNewBranch({
75
+ run,
76
+ worktree,
77
+ branch,
78
+ issue: inlineWork || ticket ? undefined : issue,
79
+ octokit,
80
+ owner,
81
+ repoName,
82
+ recordedRemoteSha: opts.recordedRemoteSha,
83
+ log,
84
+ });
85
+ if (stop)
86
+ return stop;
87
+ const opened = await openOrFindPr({ opts, inlineWork, ticket, stack, base, owner, repoName, walkthrough });
88
+ if ('stop' in opened)
89
+ return opened.stop;
90
+ prNumber = opened.prNumber;
314
91
  }
315
92
  if (!prNumber) {
316
93
  const reason = `Could not create or find PR for ${branch}`;
@@ -318,163 +95,28 @@ async function shipPhaseImpl(opts) {
318
95
  return { ok: false, reason };
319
96
  }
320
97
  if (!reentry && opts.evidenceComment)
321
- try {
322
- let checkedSha;
323
- try {
324
- checkedSha = (await run('git rev-parse HEAD', { cwd: worktree })).stdout.trim() || undefined;
325
- }
326
- catch { }
327
- const body = gatherEvidencePack({
328
- issue,
329
- checkSummary,
330
- reworkRounds: opts.reworkRounds,
331
- specPath: opts.specPath,
332
- eventsFile: opts.eventsFile,
333
- startedAt: opts.startedAt,
334
- logsDir: opts.logsDir,
335
- reviewRouting: opts.reviewRouting,
336
- pinNotes: opts.pinNotes,
337
- headSha: checkedSha,
338
- walkthrough: await walkthrough.walkthrough(),
339
- });
340
- await octokit.rest.issues.createComment({ owner, repo: repoName, issue_number: prNumber, body });
341
- log('evidence', `posted evidence pack to PR #${prNumber}`);
342
- }
343
- catch { }
98
+ await postEvidenceComment({ opts, run, owner, repoName, prNumber, walkthrough, checkedSha: synced?.checkedSha });
344
99
  let ciOutcome;
345
100
  let ciWatchError;
346
- const ciDeadlineMs = opts.ciDeadlineMs ?? DEFAULT_CI_DEADLINE_MS;
347
101
  if (watchCI) {
348
- log('ship', `Watching CI for PR #${prNumber}`);
349
- try {
350
- ciOutcome = await (opts.ciWatch ?? watchChecksWithInfraRerun)({
351
- octokit,
352
- owner,
353
- repo: repoName,
354
- ref: watchRef,
355
- rerun,
356
- deadlineMs: ciDeadlineMs,
357
- probeNoCi: true,
358
- requiredChecks: { branch: SHIP_BASE_BRANCH },
359
- onProgress: ({ total, completed, pending, remainingMs, waitingFor }) => log('ship', waitingFor?.length
360
- ? `CI for PR #${prNumber}: waiting for required check${waitingFor.length > 1 ? 's' : ''} ${waitingFor.map((w) => `${w.name} (${w.state})`).join(', ')}, ${Math.ceil(remainingMs / 60_000)} min left`
361
- : `CI for PR #${prNumber}: ${pending} pending, ${completed}/${total} completed, ${Math.ceil(remainingMs / 60_000)} min left before the CI timeout`),
362
- onNoChecks: ({ sha, defaultBranch }) => log('ship', `no CI configured on ${repo} (no workflow files on ${sha} and no checks or statuses on recent ${defaultBranch} commits); skipping CI wait`),
363
- onRescued: ({ headSha, runIds }) => log('ci-rescued', `CI rescued for PR #${prNumber}: reran infra-failed run(s) ${runIds.join(', ')} on ${headSha.slice(0, 12)} once and the re-watch is green`),
364
- onRescueFailed: ({ headSha, runIds, outcome }) => log('ci-rescue-failed', `CI rescue failed for PR #${prNumber}: reran infra-failed run(s) ${runIds.join(', ')} on ${headSha.slice(0, 12)} once and the re-watch ended ${outcome}`),
365
- });
366
- if (ciOutcome === 'success')
367
- log('ship', `CI green for PR #${prNumber}`);
368
- else if (ciOutcome === 'failure') {
369
- const reason = `CI failed for PR #${prNumber}`;
370
- log('ship', reason);
371
- const ciFailure = await collectCiFailureEvidence({ octokit, owner, repo: repoName, ref: watchRef, prNumber });
372
- return { ok: false, prNumber, reason, ciOutcome, ciFailure, ...(headSha ? { headSha } : {}) };
373
- }
374
- else if (ciOutcome === 'infra-failure') {
375
- const reason = `CI failed again for infrastructure reasons for PR #${prNumber} after one rerun`;
376
- log('ship', reason);
377
- return { ok: false, prNumber, reason, ciOutcome };
378
- }
379
- else if (ciOutcome === 'timeout') {
380
- // Log type must stay 'ship': 'timeout' is a terminal event kind in the CLI.
381
- log('ship', `CI pending for PR #${prNumber}: CI did not finish within ${ciDeadlineMs / 60_000} min; leaving PR as draft`);
382
- }
383
- }
384
- catch (err) {
385
- ciWatchError = shortDetail(err);
386
- log('warn', `CI watch for PR #${prNumber} failed: ${ciWatchError}; treating CI as pending`);
387
- }
388
- }
389
- const ciPending = ciOutcome === 'timeout' || ciWatchError !== undefined;
390
- let previewCheck;
391
- if (opts.previewGate) {
392
- const sha = headSha ?? (await run('git rev-parse HEAD', { cwd: worktree })).stdout.trim();
393
- const publish = (n, r) => publishPreviewReceipt(octokit, owner, repoName, n, r);
394
- const gateCtx = { log, ciPending, publish, ...(opts.logsDir ? { logsDir: opts.logsDir } : {}) };
395
- previewCheck = await runPreviewGate(opts.previewGate, { prNumber, headSha: sha }, gateCtx);
396
- if (previewCheck.status !== 'pass') {
397
- return {
398
- ok: false,
399
- prNumber,
400
- reason: previewFailureReason(prNumber, previewCheck),
401
- previewCheck,
402
- headSha: sha,
403
- ...(ciOutcome ? { ciOutcome } : {}),
404
- ...(ciPending ? { ciPending: true, draft: true } : {}),
405
- };
406
- }
407
- }
408
- if (ciWatchError !== undefined) {
409
- const reason = `CI unknown for PR #${prNumber}: the CI watch failed (${ciWatchError}); leaving PR as draft`;
410
- log('ship', reason);
411
- return { ok: false, prNumber, reason, ciPending: true, draft: true, ...(headSha ? { headSha } : {}) };
102
+ const ci = await watchShipCi({
103
+ octokit,
104
+ owner,
105
+ repo,
106
+ repoName,
107
+ prNumber,
108
+ watchRef,
109
+ headSha,
110
+ rerun,
111
+ deadlineMs: opts.ciDeadlineMs,
112
+ baseBranch: SHIP_BASE_BRANCH,
113
+ ciWatch: opts.ciWatch,
114
+ log,
115
+ });
116
+ if (ci.result)
117
+ return ci.result;
118
+ ({ ciOutcome, ciWatchError } = ci);
412
119
  }
413
- // Mark ready for review (if draft). REST pulls.update ignores `draft`;
414
- // undrafting requires the markPullRequestReadyForReview GraphQL mutation.
415
- if (opts.draft || ciPending) {
416
- try {
417
- const { data: pr } = await octokit.rest.pulls.get({ owner, repo: repoName, pull_number: prNumber });
418
- if (!pr.draft)
419
- log('ship', `PR #${prNumber} is already open and not a draft; draft mode leaves it as is`);
420
- }
421
- catch { }
422
- }
423
- else {
424
- const flip = await markPrReadyWithRetry(octokit, owner, repoName, prNumber);
425
- if (!flip.ok) {
426
- const reason = `could not mark PR #${prNumber} ready for review after one retry: ${flip.detail}`;
427
- log('warn', reason);
428
- return {
429
- ok: false,
430
- prNumber,
431
- reason,
432
- ...(ciOutcome === undefined ? {} : { ciOutcome }),
433
- ...(headSha ? { headSha } : {}),
434
- };
435
- }
436
- }
437
- const noChecks = ciOutcome === 'no-checks' ? ' (CI skipped: no checks found)' : '';
438
- const readyLabel = opts.draft || ciPending ? `left as draft${ciPending ? ' (CI pending)' : ''}` : 'ready for review';
439
- log('ready', `PR #${prNumber} ${readyLabel}${noChecks}`);
440
- return {
441
- ok: true,
442
- prNumber,
443
- ...(ciOutcome === undefined ? {} : { ciOutcome }),
444
- ...(headSha ? { headSha } : {}),
445
- ...(opts.draft || ciPending ? { draft: true } : {}),
446
- ...(ciPending ? { ciPending: true } : {}),
447
- ...(previewCheck ? { previewCheck } : {}),
448
- };
449
- }
450
- async function inspectRecoveryState(worktree, run) {
451
- const [{ stdout: status }, { stdout: ahead }, landed] = await Promise.all([
452
- run('git status --porcelain', { cwd: worktree }),
453
- run('git rev-list --count origin/main..HEAD', { cwd: worktree }),
454
- // A squash merge leaves origin/main..HEAD nonzero forever even though the branch's
455
- // tree is byte-identical to main — exit 0 here is the reliable "already landed" signal.
456
- run('git diff --quiet origin/main..HEAD', { cwd: worktree }).then(() => true, () => false),
457
- ]);
458
- return {
459
- clean: status.trim() === '',
460
- ahead: Number.parseInt(ahead.trim(), 10) > 0,
461
- landed,
462
- // Porcelain's first two characters are positional XY columns — trim only the right edge.
463
- statusLines: status
464
- .split('\n')
465
- .map((l) => l.trimEnd())
466
- .filter((l) => l.trim() !== ''),
467
- };
468
- }
469
- /** Paths of porcelain lines that are unmerged (conflict) entries: `U` in either XY column,
470
- * or the both-added/both-deleted codes `AA`/`DD`. Untracked (`??`) and every ordinary code
471
- * are not conflicts. */
472
- function conflictedPaths(statusLines) {
473
- return statusLines
474
- .filter((line) => {
475
- const xy = line.slice(0, 2);
476
- return xy.includes('U') || xy === 'AA' || xy === 'DD';
477
- })
478
- .map((line) => line.slice(3));
120
+ return finishShip({ opts, run, owner, repoName, prNumber, headSha, ciOutcome, ciWatchError });
479
121
  }
480
122
  //# sourceMappingURL=ship.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ship.js","sourceRoot":"","sources":["../../src/phases/ship.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ship.js","sourceRoot":"","sources":["../../src/phases/ship.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import type { Octokit } from '@octokit/rest';
2
2
  import type { EventKind } from '../events/kinds.js';
3
+ import { type PrerequisiteStackTarget } from '../queue/prerequisite-stack.js';
3
4
  import { type SlicePlan } from '../readiness/slice-plan.js';
4
5
  export declare const STACK_ORDER_MARKER = "<!-- factory:stack-order -->";
5
6
  export interface StackPosition {
@@ -19,6 +20,14 @@ export declare function stackPositionFor(plan: SlicePlan, index: number, parentB
19
20
  /** The position of slice `index` once its parent is squash-merged: stacked on `main` with no parent PR (#3368). */
20
21
  export declare function retargetedStackPosition(plan: SlicePlan, index: number): StackPosition;
21
22
  export declare function renderStackOrderLine(p: StackPosition): string;
23
+ /** Stack-order line for an issue stacked on its prerequisite's PR (#3916); `base` is `main` once the prerequisite merged. */
24
+ export declare function renderPrerequisiteStackLine(p: {
25
+ prerequisite: PrerequisiteStackTarget;
26
+ issue: number;
27
+ base: string;
28
+ }): string;
29
+ /** The PR-body stack section for a prerequisite stack: the order line plus the recovery marker (#3916). */
30
+ export declare function prerequisiteStackOrder(prerequisite: PrerequisiteStackTarget | undefined, issue: number | string, base: string): string | undefined;
22
31
  /** Replaces the marker line and the line after it; without a marker, inserts after the Summary paragraph or appends. */
23
32
  export declare function replaceStackOrderLine(body: string, line: string): string;
24
33
  /** Rewrites slice k-1's PR so it names slice k's PR as next. Best-effort: never throws. */
@@ -1 +1 @@
1
- {"version":3,"file":"stack-order.d.ts","sourceRoot":"","sources":["../../src/phases/stack-order.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAE9E,eAAO,MAAM,kBAAkB,iCAAiC,CAAC;AAIjE,MAAM,WAAW,aAAa;IAC5B,2BAA2B;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,6HAA6H;IAC7H,IAAI,EAAE,MAAM,CAAC;IACb,sEAAsE;IACtE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9C;AAMD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,CAWjH;AAED,mHAAmH;AACnH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAMrF;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,aAAa,GAAG,MAAM,CAM7D;AAED,wHAAwH;AACxH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAexE;AAED,2FAA2F;AAC3F,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7C,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBhB"}
1
+ {"version":3,"file":"stack-order.d.ts","sourceRoot":"","sources":["../../src/phases/stack-order.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAiC,KAAK,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC7G,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAE9E,eAAO,MAAM,kBAAkB,iCAAiC,CAAC;AAIjE,MAAM,WAAW,aAAa;IAC5B,2BAA2B;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,6HAA6H;IAC7H,IAAI,EAAE,MAAM,CAAC;IACb,sEAAsE;IACtE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9C;AAMD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,CAWjH;AAED,mHAAmH;AACnH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAMrF;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,aAAa,GAAG,MAAM,CAM7D;AAED,6HAA6H;AAC7H,wBAAgB,2BAA2B,CAAC,CAAC,EAAE;IAC7C,YAAY,EAAE,uBAAuB,CAAC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,MAAM,CAIT;AAED,2GAA2G;AAC3G,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,uBAAuB,GAAG,SAAS,EACjD,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,SAAS,CAGpB;AAED,wHAAwH;AACxH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAexE;AAED,2FAA2F;AAC3F,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7C,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBhB"}