tumwater 0.2.0 → 0.3.0

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 (446) hide show
  1. package/README.md +27 -13
  2. package/dist/build-info.json +2 -2
  3. package/dist/src/agent/agent-args.js +8 -9
  4. package/dist/src/agent/agent-backend.js +8 -6
  5. package/dist/src/agent/backend-traits.js +42 -25
  6. package/dist/src/agent/claude/claude-account.js +71 -204
  7. package/dist/src/agent/claude/claude-args.js +9 -6
  8. package/dist/src/agent/claude/claude-backend.js +10 -10
  9. package/dist/src/agent/claude/claude-env.js +1 -1
  10. package/dist/src/agent/claude/claude-stream.js +4 -3
  11. package/dist/src/agent/claude/claude-write-guard.js +49 -0
  12. package/dist/src/agent/claude/write-guard-hook.js +13 -0
  13. package/dist/src/agent/codex/codex-account.js +119 -0
  14. package/dist/src/agent/codex/codex-args.js +181 -0
  15. package/dist/src/agent/codex/codex-backend.js +279 -0
  16. package/dist/src/agent/codex/codex-catalog.js +97 -0
  17. package/dist/src/agent/codex/codex-env.js +18 -0
  18. package/dist/src/agent/codex/codex-hook-trust.js +246 -0
  19. package/dist/src/agent/codex/codex-patch-paths.js +36 -0
  20. package/dist/src/agent/codex/codex-rollout.js +179 -0
  21. package/dist/src/agent/codex/codex-stream.js +402 -0
  22. package/dist/src/agent/codex/codex-write-guard.js +86 -0
  23. package/dist/src/agent/codex/write-guard-hook.js +12 -0
  24. package/dist/src/agent/image-input.js +29 -24
  25. package/dist/src/agent/notes-shim.js +11 -12
  26. package/dist/src/agent/opencode/opencode-args.js +0 -1
  27. package/dist/src/agent/opencode/opencode-backend.js +12 -9
  28. package/dist/src/agent/opencode/opencode-catalog.js +55 -29
  29. package/dist/src/agent/opencode/opencode-config.js +19 -14
  30. package/dist/src/agent/opencode/opencode-env.js +0 -1
  31. package/dist/src/agent/opencode/opencode-session-id.js +1 -2
  32. package/dist/src/agent/opencode/opencode-stream.js +1 -1
  33. package/dist/src/agent/opencode/write-guard-plugin/index.js +48 -0
  34. package/dist/src/agent/role-notes-write.js +5 -6
  35. package/dist/src/agent/run-agent.js +465 -448
  36. package/dist/src/agent/run-settle.js +214 -0
  37. package/dist/src/agent/session-ledger.js +86 -16
  38. package/dist/src/agent/subscription-account.js +220 -0
  39. package/dist/src/agent/write-guard.js +148 -0
  40. package/dist/src/backlog/backlog-archive.js +246 -55
  41. package/dist/src/backlog/backlog-cli-view.js +280 -0
  42. package/dist/src/backlog/backlog-cli.js +85 -274
  43. package/dist/src/backlog/backlog-commit.js +4 -5
  44. package/dist/src/backlog/backlog-eligibility.js +175 -242
  45. package/dist/src/backlog/backlog-index.js +149 -0
  46. package/dist/src/backlog/backlog-md.js +54 -6
  47. package/dist/src/backlog/backlog-parts.js +254 -0
  48. package/dist/src/backlog/backlog-release.js +117 -0
  49. package/dist/src/backlog/backlog-render.js +27 -0
  50. package/dist/src/backlog/backlog-structure.js +99 -156
  51. package/dist/src/backlog/backlog-write.js +40 -127
  52. package/dist/src/backlog/backlog.js +21 -6
  53. package/dist/src/backlog/question-answer.js +21 -15
  54. package/dist/src/baseline/main-baseline.js +89 -20
  55. package/dist/src/baseline/main-culprit.js +94 -0
  56. package/dist/src/baseline/main-guardrails.js +209 -0
  57. package/dist/src/baseline/main-red.js +139 -32
  58. package/dist/src/baseline/main-revert.js +133 -0
  59. package/dist/src/baseline/main-watch.js +184 -0
  60. package/dist/src/brief/brief-edit.js +9 -11
  61. package/dist/src/brief/brief.js +31 -51
  62. package/dist/src/budget/budget.js +30 -20
  63. package/dist/src/budget/fallback-breaker.js +26 -27
  64. package/dist/src/build/build-check-detect.js +23 -15
  65. package/dist/src/build/build-check-events.js +25 -6
  66. package/dist/src/build/build-check-report.js +49 -9
  67. package/dist/src/build/build-check-scoped.js +18 -11
  68. package/dist/src/build/build-check.js +2 -1
  69. package/dist/src/build/build-info.js +2 -3
  70. package/dist/src/build/build-stage.js +9 -14
  71. package/dist/src/build/dep-install.js +1 -2
  72. package/dist/src/change/change-data.js +123 -31
  73. package/dist/src/change/change-render.js +46 -5
  74. package/dist/src/cli/brief-command.js +3 -4
  75. package/dist/src/cli/cli-args.js +118 -33
  76. package/dist/src/cli/cli-command-args.js +46 -18
  77. package/dist/src/cli/cli-editor.js +2 -1
  78. package/dist/src/cli/cli-flag-specs.js +150 -45
  79. package/dist/src/cli/cli-init.js +51 -0
  80. package/dist/src/cli/cli-marker-commands.js +4 -4
  81. package/dist/src/cli/cli-query-commands.js +308 -590
  82. package/dist/src/cli/cli-repo-gate.js +11 -1
  83. package/dist/src/cli/cli-role-command.js +420 -0
  84. package/dist/src/cli/cli-start-summary.js +160 -0
  85. package/dist/src/cli/{cli-run.js → cli-start.js} +165 -237
  86. package/dist/src/cli/completion.js +149 -22
  87. package/dist/src/cli/config-commands.js +41 -18
  88. package/dist/src/cli/follow-view.js +75 -0
  89. package/dist/src/cli/help.js +189 -73
  90. package/dist/src/cli/log-commands.js +148 -82
  91. package/dist/src/cli/question-commands.js +205 -10
  92. package/dist/src/cli.js +106 -43
  93. package/dist/src/collections.js +26 -10
  94. package/dist/src/concurrency/check-permit.js +20 -3
  95. package/dist/src/concurrency/lock.js +17 -13
  96. package/dist/src/concurrency/provider-lease.js +44 -8
  97. package/dist/src/concurrency/semaphore.js +102 -26
  98. package/dist/src/config/config-aliases.js +0 -1
  99. package/dist/src/config/config-editable-keys.js +13 -1
  100. package/dist/src/config/config-fallbacks.js +93 -56
  101. package/dist/src/config/config-field-checks.js +40 -10
  102. package/dist/src/config/config-keys.js +30 -8
  103. package/dist/src/config/config-live.js +63 -24
  104. package/dist/src/config/config-request.js +137 -0
  105. package/dist/src/config/config-schema.js +31 -24
  106. package/dist/src/config/config-selector-checks.js +123 -0
  107. package/dist/src/config/config-validation-agents.js +80 -0
  108. package/dist/src/config/config-validation-model.js +116 -0
  109. package/dist/src/config/config-validation.js +141 -199
  110. package/dist/src/config/config-views.js +127 -53
  111. package/dist/src/config/config-write-core.js +135 -0
  112. package/dist/src/config/config-write.js +131 -264
  113. package/dist/src/config/config.js +48 -38
  114. package/dist/src/config/model-selector.js +34 -34
  115. package/dist/src/doctor/doctor-backlog-bugs.js +287 -0
  116. package/dist/src/doctor/doctor-backlog-plans.js +263 -0
  117. package/dist/src/doctor/doctor-backlog.js +100 -496
  118. package/dist/src/doctor/doctor-check-names.js +81 -0
  119. package/dist/src/doctor/doctor-checks.js +52 -579
  120. package/dist/src/doctor/doctor-claude-checks.js +145 -0
  121. package/dist/src/doctor/doctor-codex-checks.js +279 -0
  122. package/dist/src/doctor/doctor-contention-checks.js +380 -0
  123. package/dist/src/doctor/doctor-holds.js +82 -66
  124. package/dist/src/doctor/doctor-install.js +2 -1
  125. package/dist/src/doctor/doctor-model-checks.js +236 -402
  126. package/dist/src/doctor/doctor-notify.js +3 -4
  127. package/dist/src/doctor/doctor-opencode-checks.js +162 -0
  128. package/dist/src/doctor/doctor-orphans.js +182 -63
  129. package/dist/src/doctor/doctor-project-checks.js +303 -0
  130. package/dist/src/doctor/doctor.js +121 -77
  131. package/dist/src/doctor/image-probe.js +21 -8
  132. package/dist/src/doctor/outcome.js +3 -2
  133. package/dist/src/doctor/probe.js +7 -11
  134. package/dist/src/events/event-format.js +181 -86
  135. package/dist/src/events/event-labels.js +12 -5
  136. package/dist/src/events/event-legacy.js +39 -15
  137. package/dist/src/events/event-read.js +39 -39
  138. package/dist/src/events/event-tally.js +16 -0
  139. package/dist/src/events/event-window.js +60 -24
  140. package/dist/src/events/events.js +30 -13
  141. package/dist/src/events/notify.js +7 -7
  142. package/dist/src/failure/failure-cluster.js +12 -12
  143. package/dist/src/failure/failure-data.js +56 -56
  144. package/dist/src/failure/failure-render.js +31 -23
  145. package/dist/src/failure/failure-state-change.js +17 -12
  146. package/dist/src/failure/time-spend.js +99 -35
  147. package/dist/src/files/files.js +111 -35
  148. package/dist/src/files/json-files.js +3 -3
  149. package/dist/src/files/json-object.js +28 -7
  150. package/dist/src/files/stat-cache.js +2 -2
  151. package/dist/src/files/tail.js +1 -1
  152. package/dist/src/gates/bootstrap-gates.js +4 -5
  153. package/dist/src/gates/budget-gates.js +177 -84
  154. package/dist/src/gates/disk-gate.js +1 -1
  155. package/dist/src/gates/gate-polls.js +108 -58
  156. package/dist/src/gates/maintenance-quota.js +10 -13
  157. package/dist/src/gates/pause-gates.js +28 -10
  158. package/dist/src/gates/readiness.js +7 -3
  159. package/dist/src/gates/role-cap-gates.js +8 -8
  160. package/dist/src/gates/startup-gate.js +94 -32
  161. package/dist/src/gates/streak-gate.js +54 -30
  162. package/dist/src/git/commit-message.js +77 -46
  163. package/dist/src/git/git-diff.js +16 -10
  164. package/dist/src/git/git-run.js +79 -38
  165. package/dist/src/git/git.js +36 -34
  166. package/dist/src/git/slot-salvage.js +253 -0
  167. package/dist/src/git/slots-state.js +6 -6
  168. package/dist/src/git/worktree-pool.js +132 -38
  169. package/dist/src/git/worktree-use.js +4 -11
  170. package/dist/src/git/worktree.js +94 -37
  171. package/dist/src/gui/gui-admin-endpoints.js +96 -0
  172. package/dist/src/gui/gui-args.js +79 -8
  173. package/dist/src/gui/gui-backlog-commands.js +42 -18
  174. package/dist/src/gui/gui-backlog-endpoints.js +155 -0
  175. package/dist/src/gui/gui-command.js +8 -13
  176. package/dist/src/gui/gui-config-commands.js +94 -72
  177. package/dist/src/gui/gui-endpoint-commands.js +4 -3
  178. package/dist/src/gui/gui-endpoint-common.js +4 -4
  179. package/dist/src/gui/gui-endpoints.js +11 -380
  180. package/dist/src/gui/gui-history-endpoints.js +301 -0
  181. package/dist/src/gui/gui-operator-commands.js +108 -13
  182. package/dist/src/gui/gui-prompt-commands.js +11 -14
  183. package/dist/src/gui/gui-report-endpoints.js +90 -0
  184. package/dist/src/gui/gui-server.js +11 -4
  185. package/dist/src/gui/gui-team-commands.js +7 -7
  186. package/dist/src/gui/http-body.js +1 -1
  187. package/dist/src/history/history-data.js +122 -234
  188. package/dist/src/history/history-queued.js +147 -0
  189. package/dist/src/history/history-render.js +42 -22
  190. package/dist/src/history/history.js +193 -49
  191. package/dist/src/inbox/inbox-attachments.js +29 -30
  192. package/dist/src/inbox/inbox-cancel.js +10 -11
  193. package/dist/src/inbox/inbox-edit.js +9 -9
  194. package/dist/src/inbox/inbox-submit.js +18 -18
  195. package/dist/src/inbox/inbox-top.js +25 -9
  196. package/dist/src/inbox/inbox.js +42 -43
  197. package/dist/src/inbox/pending-prompt.js +26 -26
  198. package/dist/src/inbox/prompt-commands.js +62 -49
  199. package/dist/src/inbox/prompt-not-before.js +2 -2
  200. package/dist/src/init/init-templates.js +1 -2
  201. package/dist/src/init/init.js +28 -23
  202. package/dist/src/merge/backlog-conflicts.js +215 -35
  203. package/dist/src/merge/merge-batch.js +14 -8
  204. package/dist/src/merge/merge-cancel.js +53 -0
  205. package/dist/src/merge/merge-check-failures.js +44 -22
  206. package/dist/src/merge/merge-core.js +81 -32
  207. package/dist/src/merge/merge-diff.js +5 -4
  208. package/dist/src/merge/merge-drain.js +150 -11
  209. package/dist/src/merge/merge-git.js +177 -38
  210. package/dist/src/merge/merge-pipeline.js +15 -3
  211. package/dist/src/merge/merge-post-review.js +90 -0
  212. package/dist/src/merge/merge-queue-render.js +49 -11
  213. package/dist/src/merge/merge-queue.js +31 -15
  214. package/dist/src/merge/merge-requeue.js +102 -0
  215. package/dist/src/merge/merge-slot.js +61 -16
  216. package/dist/src/merge/merge-stack.js +33 -11
  217. package/dist/src/merge/merge-to-main.js +86 -27
  218. package/dist/src/merge/merge-top.js +69 -0
  219. package/dist/src/merge/merge-verify.js +12 -10
  220. package/dist/src/notes-cli.js +30 -15
  221. package/dist/src/operator/operator-commands.js +192 -81
  222. package/dist/src/operator/operator-intent.js +69 -42
  223. package/dist/src/operator/operator-requests.js +35 -40
  224. package/dist/src/operator/retire.js +5 -6
  225. package/dist/src/operator/revert.js +142 -34
  226. package/dist/src/orchestrator/orchestrator-launch.js +60 -52
  227. package/dist/src/orchestrator/orchestrator-poll.js +320 -0
  228. package/dist/src/orchestrator/orchestrator-scheduling.js +68 -369
  229. package/dist/src/orchestrator/orchestrator.js +128 -369
  230. package/dist/src/orchestrator/retention.js +42 -8
  231. package/dist/src/orchestrator/scheduling-admit.js +116 -0
  232. package/dist/src/orchestrator/scheduling-scope.js +201 -0
  233. package/dist/src/orchestrator/scheduling-skip.js +185 -0
  234. package/dist/src/orchestrator/startup-migration-steps.js +8 -7
  235. package/dist/src/orchestrator/startup-migrations.js +11 -7
  236. package/dist/src/paths.js +116 -49
  237. package/dist/src/pi/command-shape.js +12 -1
  238. package/dist/src/pi/pi-args.js +6 -4
  239. package/dist/src/pi/pi-backend.js +6 -6
  240. package/dist/src/pi/pi-bin.js +54 -63
  241. package/dist/src/pi/pi-listed-models.js +53 -0
  242. package/dist/src/pi/pi-models.js +63 -30
  243. package/dist/src/pi/pi-run-result.js +1 -1
  244. package/dist/src/pi/pi-settings.js +1 -1
  245. package/dist/src/pi/pi-stream.js +6 -6
  246. package/dist/src/pi/pi-watchdogs.js +18 -19
  247. package/dist/src/pi-extension/bounded-output.js +5 -3
  248. package/dist/src/pi-extension/context-budget.js +2 -2
  249. package/dist/src/pi-extension/context-shake.js +1 -1
  250. package/dist/src/pi-extension/context-window.js +0 -1
  251. package/dist/src/pi-extension/full-output.js +3 -10
  252. package/dist/src/pi-extension/strip-thinking.js +0 -1
  253. package/dist/src/pi-extension/trim-system-prompt.js +3 -4
  254. package/dist/src/pi-extension/write-guard.js +37 -0
  255. package/dist/src/process/launch-services.js +1 -2
  256. package/dist/src/process/node-bin.js +16 -0
  257. package/dist/src/process/process-group.js +8 -18
  258. package/dist/src/process/process.js +41 -2
  259. package/dist/src/process/run-marker.js +18 -6
  260. package/dist/src/process/supervisor.js +22 -21
  261. package/dist/src/prompt/dialect.js +17 -2
  262. package/dist/src/prompt/gate-notes.js +203 -0
  263. package/dist/src/prompt/gate-prompts.js +121 -211
  264. package/dist/src/prompt/notes-backlog.js +181 -0
  265. package/dist/src/prompt/principles.js +1 -2
  266. package/dist/src/prompt/prompt-followup.js +19 -14
  267. package/dist/src/prompt/prompt.js +129 -204
  268. package/dist/src/redeploy/redeploy-policy.js +24 -19
  269. package/dist/src/redeploy/redeploy-probes.js +1 -1
  270. package/dist/src/redeploy/redeploy.js +2 -3
  271. package/dist/src/redeploy/redeployer.js +20 -20
  272. package/dist/src/redeploy/self-reload.js +2 -1
  273. package/dist/src/report/report-data.js +161 -77
  274. package/dist/src/report/report-fold.js +129 -52
  275. package/dist/src/report/report-main-red.js +55 -0
  276. package/dist/src/report/report-render.js +133 -64
  277. package/dist/src/report/report-types.js +1 -0
  278. package/dist/src/report/report.js +26 -9
  279. package/dist/src/request-timeouts.js +2 -2
  280. package/dist/src/review/known-flakes.js +100 -1
  281. package/dist/src/review/post-merge-review.js +106 -0
  282. package/dist/src/review/protected-edits.js +4 -5
  283. package/dist/src/review/review-followup.js +8 -8
  284. package/dist/src/review/review-precheck.js +66 -23
  285. package/dist/src/review/review-run.js +395 -0
  286. package/dist/src/review/review-verdict.js +2 -2
  287. package/dist/src/review/review.js +155 -360
  288. package/dist/src/review/secret-leaks.js +36 -16
  289. package/dist/src/review/suite-rerun.js +0 -1
  290. package/dist/src/roles/legacy-role-migration.js +80 -7
  291. package/dist/src/roles/role-catalog.js +69 -12
  292. package/dist/src/roles/role-guidance.js +55 -20
  293. package/dist/src/roles/role-labels.js +1 -2
  294. package/dist/src/roles/role-render.js +67 -50
  295. package/dist/src/roles/role-view.js +59 -47
  296. package/dist/src/roles/roles.js +31 -31
  297. package/dist/src/roles/runner-ids.js +97 -0
  298. package/dist/src/run/acceptance-greps.js +119 -0
  299. package/dist/src/run/feedback-filings.js +51 -0
  300. package/dist/src/{tick → run}/qa-coverage.js +9 -27
  301. package/dist/src/{tick/tick-apply.js → run/run-apply.js} +95 -94
  302. package/dist/src/run/run-detail-data.js +179 -0
  303. package/dist/src/run/run-detail-render.js +98 -0
  304. package/dist/src/run/run-detail.js +168 -0
  305. package/dist/src/{tick/tick-finalize.js → run/run-finalize.js} +72 -60
  306. package/dist/src/{tick/tick-outcome.js → run/run-outcome.js} +6 -7
  307. package/dist/src/{tick/tick-prompt.js → run/run-prompt.js} +108 -73
  308. package/dist/src/{tick/tick-resume.js → run/run-resume.js} +55 -26
  309. package/dist/src/{tick/tick-stage.js → run/run-stage.js} +108 -50
  310. package/dist/src/{tick/tick-timing.js → run/run-timing.js} +43 -41
  311. package/dist/src/{tick/tick-usage.js → run/run-usage.js} +45 -37
  312. package/dist/src/{tick/tick-verdict.js → run/run-verdict.js} +91 -56
  313. package/dist/src/run/selfcheck-digest.js +40 -0
  314. package/dist/src/run/stage-backlog-checks.js +249 -0
  315. package/dist/src/run/stage-check.js +172 -0
  316. package/dist/src/run/stage-path-checks.js +730 -0
  317. package/dist/src/{loop → runner}/leftover.js +80 -25
  318. package/dist/src/{loop → runner}/model-fallback.js +12 -12
  319. package/dist/src/runner/revision.js +202 -0
  320. package/dist/src/{loop/loop-fallback.js → runner/runner-fallback.js} +8 -8
  321. package/dist/src/runner/runner-outcome.js +107 -0
  322. package/dist/src/{loop/loop-pi.js → runner/runner-pi.js} +140 -131
  323. package/dist/src/{loop/loop-recovery.js → runner/runner-recovery.js} +21 -15
  324. package/dist/src/{loop/loop-tick.js → runner/runner-run.js} +218 -240
  325. package/dist/src/{loop/loop-state.js → runner/runner-state-load.js} +61 -114
  326. package/dist/src/runner/runner-state.js +102 -0
  327. package/dist/src/{loop/loop.js → runner/runner.js} +123 -120
  328. package/dist/src/scheduling/backoff.js +38 -38
  329. package/dist/src/scheduling/claims.js +35 -22
  330. package/dist/src/scheduling/once-round.js +22 -22
  331. package/dist/src/scheduling/quiet-hours.js +5 -6
  332. package/dist/src/scheduling/scheduling.js +74 -64
  333. package/dist/src/scheduling/work-merged-cache.js +2 -2
  334. package/dist/src/status/status-budget.js +55 -47
  335. package/dist/src/status/status-data.js +43 -16
  336. package/dist/src/status/status-inbox.js +2 -2
  337. package/dist/src/status/status-install.js +0 -1
  338. package/dist/src/status/status-polls.js +28 -28
  339. package/dist/src/status/status-roles.js +39 -13
  340. package/dist/src/team/error-storm.js +8 -8
  341. package/dist/src/team/failure-spread.js +2 -2
  342. package/dist/src/team/orchestrator-info.js +15 -9
  343. package/dist/src/team/reclaim.js +5 -6
  344. package/dist/src/team/team-hold.js +7 -7
  345. package/dist/src/team/team-polls.js +91 -50
  346. package/dist/src/team/team-state.js +8 -2
  347. package/dist/src/text/datetime.js +63 -17
  348. package/dist/src/text/format.js +48 -11
  349. package/dist/src/text/markdown.js +8 -5
  350. package/dist/src/text/phrases.js +57 -23
  351. package/dist/src/text/suggest.js +1 -1
  352. package/dist/src/text/text.js +67 -13
  353. package/dist/src/ui/badges.js +65 -37
  354. package/dist/src/ui/gui/gui-client-backlog.js +292 -0
  355. package/dist/src/ui/gui/gui-client-boot.js +32 -26
  356. package/dist/src/ui/gui/gui-client-composer.js +8 -9
  357. package/dist/src/ui/gui/gui-client-drawer-config.js +212 -0
  358. package/dist/src/ui/gui/gui-client-drawer.js +126 -285
  359. package/dist/src/ui/gui/gui-client-feed.js +271 -0
  360. package/dist/src/ui/gui/gui-client-history.js +434 -67
  361. package/dist/src/ui/gui/gui-client-labels.js +1 -2
  362. package/dist/src/ui/gui/gui-client-markdown.js +1 -2
  363. package/dist/src/ui/gui/gui-client-model.js +27 -36
  364. package/dist/src/ui/gui/gui-client-operator.js +55 -51
  365. package/dist/src/ui/gui/gui-client-pending.js +227 -23
  366. package/dist/src/ui/gui/gui-client-report-chart.js +464 -0
  367. package/dist/src/ui/gui/gui-client-report.js +87 -427
  368. package/dist/src/ui/gui/{gui-client-loops.js → gui-client-roles.js} +43 -44
  369. package/dist/src/ui/gui/gui-client-settings.js +56 -4
  370. package/dist/src/ui/gui/gui-client-team.js +25 -465
  371. package/dist/src/ui/gui/gui-client.js +27 -25
  372. package/dist/src/ui/gui/gui-icons.js +0 -2
  373. package/dist/src/ui/gui/gui-page.js +9 -7
  374. package/dist/src/ui/gui/gui-styles.js +34 -34
  375. package/dist/src/ui/progress-data.js +9 -11
  376. package/dist/src/ui/{tick-progress-model.js → run-progress-model.js} +31 -31
  377. package/dist/src/ui/status-model.js +133 -125
  378. package/dist/src/ui/status-payload.js +136 -49
  379. package/dist/src/ui/status-render.js +101 -82
  380. package/dist/src/ui/team-alerts.js +248 -57
  381. package/dist/src/ui/tone.js +5 -6
  382. package/dist/src/ui/transcript-run.js +58 -0
  383. package/dist/src/ui/transcript-tail.js +28 -20
  384. package/dist/src/ui/transcript.js +63 -23
  385. package/dist/src/ui/tui/tui-app.js +0 -1
  386. package/dist/src/ui/tui/tui-backlog.js +51 -14
  387. package/dist/src/ui/tui/tui-editor-answer.js +27 -31
  388. package/dist/src/ui/tui/tui-editor-attach.js +3 -5
  389. package/dist/src/ui/tui/tui-editor-backends.js +132 -0
  390. package/dist/src/ui/tui/tui-editor-brief.js +10 -12
  391. package/dist/src/ui/tui/tui-editor-budget.js +35 -31
  392. package/dist/src/ui/tui/tui-editor-claude-reserve.js +24 -0
  393. package/dist/src/ui/tui/tui-editor-concurrency.js +24 -0
  394. package/dist/src/ui/tui/tui-editor-config.js +86 -0
  395. package/dist/src/ui/tui/tui-editor-entry.js +36 -47
  396. package/dist/src/ui/tui/tui-editor-fallback.js +31 -0
  397. package/dist/src/ui/tui/tui-editor-instances.js +37 -0
  398. package/dist/src/ui/tui/tui-editor-instructions.js +136 -0
  399. package/dist/src/ui/tui/tui-editor-interval.js +11 -9
  400. package/dist/src/ui/tui/tui-editor-model.js +29 -0
  401. package/dist/src/ui/tui/tui-editor-notes.js +3 -5
  402. package/dist/src/ui/tui/tui-editor-notify.js +25 -0
  403. package/dist/src/ui/tui/tui-editor-pause.js +48 -59
  404. package/dist/src/ui/tui/tui-editor-prompt.js +11 -16
  405. package/dist/src/ui/tui/tui-editor-provider-caps.js +27 -0
  406. package/dist/src/ui/tui/tui-editor-queued.js +5 -9
  407. package/dist/src/ui/tui/tui-editor-quiet.js +99 -35
  408. package/dist/src/ui/tui/tui-editor-retire.js +4 -6
  409. package/dist/src/ui/tui/tui-editor-role-key.js +76 -0
  410. package/dist/src/ui/tui/tui-editor-role-model.js +28 -0
  411. package/dist/src/ui/tui/tui-editor-search.js +45 -33
  412. package/dist/src/ui/tui/tui-editor-session.js +60 -34
  413. package/dist/src/ui/tui/tui-editor-slots.js +23 -0
  414. package/dist/src/ui/tui/tui-editors.js +35 -2
  415. package/dist/src/ui/tui/tui-frame.js +56 -11
  416. package/dist/src/ui/tui/tui-history.js +8 -9
  417. package/dist/src/ui/tui/tui-input.js +13 -11
  418. package/dist/src/ui/tui/tui-keymap.js +0 -1
  419. package/dist/src/ui/tui/tui-keys.js +24 -9
  420. package/dist/src/ui/tui/tui-pane-activity.js +14 -11
  421. package/dist/src/ui/tui/tui-pane-backlog.js +171 -126
  422. package/dist/src/ui/tui/tui-pane-brief.js +0 -1
  423. package/dist/src/ui/tui/tui-pane-ctx.js +2 -2
  424. package/dist/src/ui/tui/tui-pane-health.js +58 -8
  425. package/dist/src/ui/tui/tui-pane-history.js +402 -82
  426. package/dist/src/ui/tui/tui-pane-pending.js +308 -13
  427. package/dist/src/ui/tui/tui-pane-queued.js +71 -55
  428. package/dist/src/ui/tui/tui-pane-report.js +46 -14
  429. package/dist/src/ui/tui/tui-pane-session.js +25 -6
  430. package/dist/src/ui/tui/tui-pane-transcript.js +111 -37
  431. package/dist/src/ui/tui/tui-pane.js +80 -23
  432. package/dist/src/ui/tui/tui-panes.js +100 -30
  433. package/dist/src/ui/tui/tui.js +14 -14
  434. package/dist/src/verdict/fix-claim.js +82 -32
  435. package/dist/src/verdict/no-change.js +4 -4
  436. package/dist/src/verdict/refusal.js +40 -16
  437. package/dist/src/verdict/reply-contract.js +42 -31
  438. package/dist/src/version.js +0 -1
  439. package/package.json +2 -1
  440. package/dist/src/loop/revision.js +0 -70
  441. package/dist/src/roles/loop-ids.js +0 -77
  442. package/dist/src/tick/stage-check.js +0 -419
  443. package/dist/src/tick/telemetry-digest.js +0 -25
  444. package/dist/src/tick/tick-detail-data.js +0 -108
  445. package/dist/src/tick/tick-detail.js +0 -163
  446. package/dist/src/ui/gui/gui-client-sound.js +0 -53
@@ -1,17 +1,17 @@
1
- // vocabulary: plain
2
1
  /** The CLI shells of `tumwater bug` and `tumwater plan` — flag classification, the preflights,
3
2
  * and the confirmation each case prints — over the entry-writing primitives in
4
3
  * backlog-write.ts (the read half's mirror, backlog.ts). cli.ts reaches the file, cancel,
5
- * release, edit, list, and show cases only through the `*AndAnnounce` shells here; the markdown
6
- * surgery and the locked read-modify-write live in backlog-write.ts. The wake of the loop that
4
+ * release, top, and edit cases only through the `*AndAnnounce` shells here (the read-only list
5
+ * and show shells live in backlog-cli-view.ts); the markdown
6
+ * surgery and the locked read-modify-write live in backlog-write.ts. The wake of the role that
7
7
  * should act stays in cli.ts beside the other command bodies. */
8
8
  import { fail, say, sayJson, warnIfUncommitted } from "../cli/cli-output.js";
9
- import { parseCountFlag, parsePositionFlag, rejectRepeatFlag } from "../cli/cli-args.js";
9
+ import { parsePositionFlag, rejectRepeatFlag } from "../cli/cli-args.js";
10
10
  import { promptFileValue, readPromptFileArg } from "../cli/cli-command-args.js";
11
- import { DONE_DATE_RE, FIXED_DATE_RE, completionDate, donePlanEntries, fixedBugEntries, openBugEntries, plannedPlanEntries, ageInDays, entryAgeSuffix, entryMatches, filingDate, } from "./backlog.js";
12
- import { backlogHolds, backlogInProgress, holdMark, inProgressMark } from "./backlog-eligibility.js";
13
- import { groupBlockedSeries, partsLabel } from "./backlog-structure.js";
14
- import { numberedList } from "../text/markdown.js";
11
+ import { plannedPlanEntries } from "./backlog.js";
12
+ import { allLiveClaims } from "../runner/runner-state-load.js";
13
+ import { backlogHolds, cancelledClaimNote, stillHeldNote } from "./backlog-eligibility.js";
14
+ import { entryKey, plansReleasedBy, releasedPartsNote } from "./backlog-parts.js";
15
15
  import { collapseWhitespace } from "../text/text.js";
16
16
  import { JSON_FLAG, rejectUnknownArgs } from "../cli/cli-flag-specs.js";
17
17
  import { requireReadyRepo } from "../cli/cli-repo-gate.js";
@@ -20,9 +20,11 @@ import { requestWake, submitRolePromptAndWake } from "../operator/operator-inten
20
20
  import { promptLengthProblem } from "../inbox/inbox-submit.js";
21
21
  import { commitOperatorBacklogEdit } from "./backlog-commit.js";
22
22
  import { stampedSubject } from "../git/commit-message.js";
23
- import { sectionNoun, showEntry, splitEntryFile } from "./backlog-write.js";
24
- import { archiveFinishedOnMain } from "./backlog-archive.js";
25
- import { plural } from "../text/phrases.js";
23
+ import { showEntry, splitEntryFile } from "./backlog-write.js";
24
+ import { renderShownEntry } from "./backlog-cli-view.js";
25
+ import { archiveFinishedOnMain, describeArchivedFile } from "./backlog-archive.js";
26
+ import { MERGE_LOCK_WAIT_MS } from "../paths.js";
27
+ import { shortSha } from "../text/format.js";
26
28
  /** The title each file command derives from the CLI positionals, exported so the CLI case
27
29
  * can hand fileAndAnnounce the same derivation the write will carry: fileAndAnnounce
28
30
  * preflights the composed wake prompt (wakeText(title)) against the submission cap BEFORE
@@ -85,14 +87,14 @@ function scanProseFlags(args, command, positionFlag) {
85
87
  * sequence both commands run in cli.ts: peel the free-form positionals (the questions
86
88
  * command's prose-token pattern), reject anything flag-shaped that is not `--json`, run the
87
89
  * ready-repo gate the other backlog commands run, write the entry via `file`, wake the
88
- * `role` loop that should act so it picks the entry up within one poll, then announce — the
90
+ * role that should act so it picks the entry up within one poll, then announce — the
89
91
  * wake always fires, its confirmation line rides the prose output only, in `--json` mode
90
92
  * stdout is the payload document alone (the prompt --json precedent) so a script can parse
91
93
  * it. The command name and usage string ride in for the reject/confirmation/empty-arg
92
- * wordings (fileBug/filePlan's empty-arg usage lines); `wakeText` builds the loop prompt
94
+ * wordings (fileBug/filePlan's empty-arg usage lines); `wakeText` builds the role prompt
93
95
  * from the filed entry's title and `titleOf` derives that title from the positionals (the
94
96
  * exported bugTitleOf/planTitleOf, so the preflight and the write see one derivation).
95
- * The wake prompt rides into the target tick's prefill under the same submission cap every
97
+ * The wake prompt rides into the target run's prefill under the same submission cap every
96
98
  * prompt answers to, so fileAndAnnounce checks it (promptLengthProblem) BEFORE calling
97
99
  * `file` — otherwise an over-long operator text would write its entry and only then throw
98
100
  * inside submitRolePromptAndWake, half-applying the command with the backlog file already
@@ -129,7 +131,7 @@ export async function fileAndAnnounce(root, args, command, file, role, wakeText,
129
131
  await announceFiled(root, command, file(positionals), role, wakeText, json);
130
132
  }
131
133
  /** The tail both fileAndAnnounce forms share: commit the entry on main, wake the `role`
132
- * loop with the filed entry's title, then print the confirmation (the wake line rides the
134
+ * role with the filed entry's title, then print the confirmation (the wake line rides the
133
135
  * prose output only). */
134
136
  async function announceFiled(root, command, filed, role, wakeText, json) {
135
137
  warnIfUncommitted(await commitOperatorBacklogEdit(root, filed.file, stampedSubject("operator", `File ${command}: ${filed.title}`)), filed.file); // vocabulary-ok: the tumwater(operator): commit prefix is a machine string
@@ -144,7 +146,7 @@ async function announceFiled(root, command, filed, role, wakeText, json) {
144
146
  * through rejectUnknownArgs. The position parses through the plain-decimal rule every position
145
147
  * flag shares (parsePositionFlag, cli-args.ts), not Number(). After requireReadyRepo it prints
146
148
  * `cancelled <command> in <file>: <title>` or the `--json` payload {file, title}. Unlike
147
- * fileAndAnnounce there is no wake: removing work must not wake a loop. */
149
+ * fileAndAnnounce there is no wake: removing work must not wake a role. */
148
150
  export async function cancelAndAnnounce(root, args, command, cancel) {
149
151
  let position = null;
150
152
  let json = false;
@@ -173,18 +175,29 @@ export async function cancelAndAnnounce(root, args, command, cancel) {
173
175
  if (position === null)
174
176
  fail(`--cancel needs a position (usage: tumwater ${command} --cancel <n>)`);
175
177
  await requireReadyRepo(root);
178
+ // Snapshot the claims first: the orchestrator may release the claim once the heading leaves.
179
+ const claims = allLiveClaims(root);
176
180
  const removed = cancel(position);
181
+ const workingOn = claims.get(entryKey(removed.title)) ?? null;
177
182
  warnIfUncommitted(await commitOperatorBacklogEdit(root, removed.file, stampedSubject("operator", `Cancel ${command}: ${removed.title}`)), removed.file); // vocabulary-ok: the tumwater(operator): commit prefix is a machine string
183
+ const released = command === "plan" ? plansReleasedBy(plannedPlanEntries(root), removed.title) : [];
178
184
  if (json)
179
- sayJson({ file: removed.file, title: removed.title });
180
- else
185
+ sayJson({ file: removed.file, title: removed.title, ...(workingOn === null ? {} : { workingOn }), ...(released.length === 0 ? {} : { released }) });
186
+ else {
181
187
  say(`cancelled ${command} in ${removed.file}: ${removed.title}`);
188
+ if (workingOn !== null)
189
+ say(cancelledClaimNote(workingOn));
190
+ if (released.length > 0)
191
+ say(releasedPartsNote(released));
192
+ }
182
193
  }
183
194
  /** The shell of the `bug --release` and `plan --release` CLI cases, parsed as cancelAndAnnounce
184
195
  * parses `--cancel`: `--release <n>`, an optional `--json`, anything else refused. After
185
196
  * requireReadyRepo it releases the entry, commits the file on main, and wakes `role` (the
186
- * released entry is eligible now, and that loop may be backed off) with no queued prompt. Prints
187
- * `released <command> in <file>: <title>` plus the wake line, or only the `--json` payload. */
197
+ * released entry is eligible now, and that role may be backed off) with no queued prompt. An
198
+ * entry still held after the release (another note, an unmerged prerequisite) wakes no one and
199
+ * gets stillHeldNote instead of the wake line. Prints `released <command> in <file>: <title>`
200
+ * plus that line, or only the `--json` payload (with `hold` when still held). */
188
201
  export async function releaseAndAnnounce(root, args, command, release, role) {
189
202
  let position = null;
190
203
  let json = false;
@@ -212,19 +225,22 @@ export async function releaseAndAnnounce(root, args, command, release, role) {
212
225
  await requireReadyRepo(root);
213
226
  const released = release(position);
214
227
  warnIfUncommitted(await commitOperatorBacklogEdit(root, released.file, stampedSubject("operator", `Release ${command}: ${released.title}`)), released.file); // vocabulary-ok: the tumwater(operator): commit prefix is a machine string
215
- const wake = requestWake(root, [role]);
228
+ const holds = backlogHolds(root);
229
+ const hold = (command === "bug" ? holds.bugs : holds.plans)[position - 1] ?? null;
230
+ const wake = hold === null ? requestWake(root, [role]) : "";
216
231
  if (json)
217
- sayJson({ file: released.file, title: released.title });
232
+ sayJson({ file: released.file, title: released.title, ...(hold === null ? {} : { hold }) });
218
233
  else {
219
234
  say(`released ${command} in ${released.file}: ${released.title}`);
220
- say(wake);
235
+ say(hold === null ? wake : stillHeldNote(hold));
221
236
  }
222
237
  }
223
238
  /** The shell of the `bug --top` and `plan --top` CLI cases, parsed as releaseAndAnnounce parses
224
239
  * `--release`: `--top <n>`, an optional `--json`, anything else refused. After requireReadyRepo
225
240
  * it moves the entry to the head of its section and commits the file on main. No wake: a
226
241
  * reorder makes no entry newly eligible. Prints `moved <command> to the top of <file>: <title>`
227
- * or only the `--json` payload. */
242
+ * (then stillHeldNote when the entry is held) or only the `--json` payload (with `hold` when
243
+ * held). */
228
244
  export async function topAndAnnounce(root, args, command, top) {
229
245
  let position = null;
230
246
  let json = false;
@@ -252,242 +268,15 @@ export async function topAndAnnounce(root, args, command, top) {
252
268
  await requireReadyRepo(root);
253
269
  const moved = top(position);
254
270
  warnIfUncommitted(await commitOperatorBacklogEdit(root, moved.file, stampedSubject("operator", `Prioritize ${command}: ${moved.title}`)), moved.file); // vocabulary-ok: the tumwater(operator): commit prefix is a machine string
271
+ const holds = backlogHolds(root);
272
+ const hold = (command === "bug" ? holds.bugs : holds.plans)[0] ?? null;
255
273
  if (json)
256
- sayJson({ file: moved.file, title: moved.title });
257
- else
274
+ sayJson({ file: moved.file, title: moved.title, ...(hold === null ? {} : { hold }) });
275
+ else {
258
276
  say(`moved ${command} to the top of ${moved.file}: ${moved.title}`);
259
- }
260
- /** Ascending positions as runs: consecutive ones join with an en dash (`13–17`), runs separate
261
- * with commas (`13–15, 18`). */
262
- function positionRuns(positions) {
263
- const runs = [];
264
- for (let i = 0; i < positions.length;) {
265
- let j = i;
266
- while (j + 1 < positions.length && positions[j + 1] === positions[j] + 1)
267
- j++;
268
- runs.push(j > i ? `${positions[i]}–${positions[j]}` : `${positions[i]}`);
269
- i = j + 1;
270
- }
271
- return runs.join(", ");
272
- }
273
- /** The shared shell of the `bug --list` and `plan --list` CLI cases — the read half of the
274
- * operator queue whose `--edit`/`--cancel` flags address entries by position. Reads the same
275
- * entries, in the same file order, that locateEntry numbers for `--edit`/`--cancel`, pairs
276
- * each with its eligibility hold (backlogHolds), and prints them numbered from 1, or the
277
- * command's `no …` line on an empty or missing file. Like `tumwater backlog` and `tumwater
278
- * questions` it is read-only: no requireReadyRepo gate and no wake. `--list` and `--json` are
279
- * the two booleans this shell consumes (repeats refused), `--help`/`-h` is tolerated, and any
280
- * positional or other flag is refused through rejectUnknownArgs.
281
- *
282
- * `--done [-n <count>] [--grep <text>]` (each once; `-n` and `--grep` need `--done`) lists the
283
- * newest finished entries instead (BUGS.md ## Fixed or PLANS.md ## Done, numbered, default 10)
284
- * with `older` counting those left out; --json carries each entry's `position` and
285
- * `completedOn` heading date. `--grep` keeps the entries whose heading or body contains the
286
- * text (case-insensitive); each keeps its unfiltered number, so it is the `--show <n> --done`
287
- * number, and `older` counts matches left out. `plan --list` prose
288
- * groups a series' blocked parts into one line (groupBlockedSeries). */
289
- export function listAndAnnounce(root, args, command, fileName, sectionTitle) {
290
- let json = false;
291
- let list = false;
292
- let done = false;
293
- let count = null;
294
- let grep = null;
295
- const rest = [];
296
- for (let i = 0; i < args.length; i++) {
297
- const arg = args[i];
298
- if (arg === "--grep") {
299
- rejectRepeatFlag(grep !== null, "--grep");
300
- const text = args[++i];
301
- if (text === undefined || text === "") {
302
- fail(`--grep needs text (usage: tumwater ${command} --list --done --grep <text>)`);
303
- }
304
- grep = text;
305
- continue;
306
- }
307
- if (arg === "--done") {
308
- rejectRepeatFlag(done, "--done");
309
- done = true;
310
- continue;
311
- }
312
- if (arg === "-n") {
313
- rejectRepeatFlag(count !== null, "-n");
314
- count = parseCountFlag("-n", args[++i]);
315
- continue;
316
- }
317
- if (arg === "--list") {
318
- rejectRepeatFlag(list, "--list");
319
- list = true;
320
- continue;
321
- }
322
- if (arg === "--json") {
323
- rejectRepeatFlag(json, "--json");
324
- json = true;
325
- continue;
326
- }
327
- if (arg === "--help" || arg === "-h")
328
- continue;
329
- rest.push(arg);
330
- }
331
- // rejectUnknownArgs names a stray positional and an unknown flag with this command's (empty)
332
- // valid-flag list: the vocabulary a list invocation accepts is exactly --list and --json,
333
- // both consumed above.
334
- rejectUnknownArgs(command, rest, []);
335
- if (count !== null && !done)
336
- fail("-n needs --done (it limits the finished entries listed)");
337
- if (grep !== null && !done)
338
- fail("--grep needs --done (it searches the finished entries)");
339
- // BUGS.md's `## Open` is the one section whose noun is "bug"; every other caller is a plan.
340
- const bugSection = sectionTitle === "Open";
341
- if (done) {
342
- const numbered = (bugSection ? fixedBugEntries(root) : donePlanEntries(root)).map((entry, i) => ({
343
- entry,
344
- position: i + 1,
345
- }));
346
- const pattern = grep;
347
- const matches = pattern === null ? numbered : numbered.filter((m) => entryMatches(m.entry, pattern));
348
- const limit = count ?? 10;
349
- const shown = matches.slice(0, limit);
350
- const older = matches.length - shown.length;
351
- if (json) {
352
- const dateRe = bugSection ? FIXED_DATE_RE : DONE_DATE_RE;
353
- sayJson({
354
- entries: shown.map(({ entry: e, position }) => ({
355
- position,
356
- title: e.title,
357
- body: e.body,
358
- completedOn: completionDate(e.title, dateRe),
359
- })),
360
- older,
361
- });
362
- return;
363
- }
364
- const what = bugSection ? "fixed bugs" : "done plans";
365
- if (shown.length === 0) {
366
- say(pattern === null ? `no ${what}` : `no ${what} match "${pattern}"`);
367
- return;
368
- }
369
- const lines = shown.map((m) => `${m.position}. ${m.entry.title}`);
370
- if (older > 0)
371
- lines.push(`(${older} older; -n ${matches.length} shows more)`);
372
- const header = pattern === null ? `${what} in ${fileName}, newest first:` : `${what} in ${fileName} matching "${pattern}", newest first:`;
373
- say(`${header}\n${lines.join("\n")}`);
374
- return;
375
- }
376
- const entries = bugSection ? openBugEntries(root) : plannedPlanEntries(root);
377
- const holds = backlogHolds(root);
378
- const entryHolds = bugSection ? holds.bugs : holds.plans;
379
- const inProgress = backlogInProgress(root);
380
- const entryRunners = bugSection ? inProgress.bugs : inProgress.plans;
381
- if (json) {
382
- sayJson({
383
- entries: entries.map((entry, i) => {
384
- const since = filingDate(entry.title);
385
- return {
386
- position: i + 1,
387
- title: entry.title,
388
- body: entry.body,
389
- hold: entryHolds[i] ?? null,
390
- inProgress: entryRunners[i] ?? null,
391
- // The filing stamp the entry's own heading carries, and how many days it has waited
392
- // since then (both present only when the heading names a stamp — an undated entry
393
- // keeps the pre-existing shape with neither key).
394
- ...(since === null ? {} : { since, ageDays: ageInDays(since) }),
395
- };
396
- }),
397
- });
398
- return;
399
- }
400
- const noun = sectionNoun(sectionTitle);
401
- if (entries.length === 0) {
402
- say(`no ${noun}s`);
403
- return;
404
- }
405
- const line = (entry, i) => `${entry.title}${holdMark(entryHolds[i] ?? null)}${inProgressMark(entryRunners[i] ?? null)}${entryAgeSuffix(entry.title)}`;
406
- if (bugSection) {
407
- say(`${noun}s in ${fileName}:\n${numberedList(entries.map(line))}`);
408
- return;
409
- }
410
- // Plans: a series' blocked parts show as one line naming their positions, as the prompt's
411
- // backlog index does; numbering is unchanged so --show/--edit/--cancel <n> reach every part.
412
- const rows = entries.map((entry, i) => ({
413
- position: i + 1,
414
- title: entry.title,
415
- hold: entryHolds[i] ?? null,
416
- claimer: entryRunners[i] ?? undefined,
417
- }));
418
- let grouped = false;
419
- const lines = groupBlockedSeries(rows).map((g) => {
420
- if (g.kind === "row")
421
- return `${g.row.position}. ${line(g.row, g.row.position - 1)}`;
422
- grouped = true;
423
- return `${positionRuns(g.rows.map((r) => r.position))}. ${g.series}, ${g.rows.length} blocked parts (${partsLabel(g.rows)}) [blocked: each waits on an earlier part]`;
424
- });
425
- if (grouped)
426
- lines.push("(each blocked series is one line; --show <n> prints a part, --json lists every entry)");
427
- say(`${noun}s in ${fileName}:\n${lines.join("\n")}`);
428
- }
429
- /** The shell of `bug --show` and `plan --show`: `--show <n>` (once), an optional `--json`
430
- * and `--done` (each once; `--done` shows the Nth newest finished entry, as `--list --done`
431
- * numbers them, with its heading stamp kept and `completedOn` in --json),
432
- * `--help`/`-h` tolerated, anything else refused through rejectUnknownArgs. Read-only like
433
- * `--list`: no repo gate, commit, or wake. Prose is the title, a blank line, then the body, so
434
- * stdout is the file `--edit <n> --file` takes back. */
435
- export function showAndAnnounce(root, args, command) {
436
- let position = null;
437
- let json = false;
438
- let done = false;
439
- const rest = [];
440
- for (let i = 0; i < args.length; i++) {
441
- const arg = args[i];
442
- if (arg === "--done") {
443
- rejectRepeatFlag(done, "--done");
444
- done = true;
445
- continue;
446
- }
447
- if (arg === "--json") {
448
- rejectRepeatFlag(json, "--json");
449
- json = true;
450
- continue;
451
- }
452
- if (arg === "--show") {
453
- rejectRepeatFlag(position !== null, "--show");
454
- position = parsePositionFlag("--show", args[i + 1], "--show 2");
455
- i++;
456
- continue;
457
- }
458
- if (arg === "--help" || arg === "-h")
459
- continue;
460
- rest.push(arg);
461
- }
462
- rejectUnknownArgs(command, rest, []);
463
- if (position === null)
464
- fail(`--show needs a position (usage: tumwater ${command} --show <n>)`);
465
- if (done) {
466
- const bug = command === "bug";
467
- const all = bug ? fixedBugEntries(root) : donePlanEntries(root);
468
- const entry = all[position - 1];
469
- if (entry === undefined) {
470
- const range = all.length > 0 ? ` — valid: 1-${all.length}` : "";
471
- fail(`no ${bug ? "fixed bug" : "done plan"} at position ${position} (${all.length} in ${bug ? "BUGS.md" : "PLANS.md"})${range}`);
472
- }
473
- if (json) {
474
- const dateRe = bug ? FIXED_DATE_RE : DONE_DATE_RE;
475
- sayJson({ position, title: entry.title, body: entry.body, completedOn: completionDate(entry.title, dateRe) });
476
- }
477
- else
478
- say(renderShownEntry({ title: entry.title, body: entry.body }));
479
- return;
277
+ if (hold !== null)
278
+ say(stillHeldNote(hold));
480
279
  }
481
- const shown = showEntry(root, command, position);
482
- if (json)
483
- sayJson(shown);
484
- else
485
- say(renderShownEntry(shown));
486
- }
487
- /** The prose `--show` prints: the title, a blank line, then the body (the title alone when the
488
- * body is empty). */
489
- function renderShownEntry(shown) {
490
- return shown.body === "" ? shown.title : `${shown.title}\n\n${shown.body}`;
491
280
  }
492
281
  /** The shared shell of the `bug --edit` and `plan --edit` CLI cases, mirroring
493
282
  * fileAndAnnounce's prose classification and cancelAndAnnounce's flag handling: `--edit <n>` is
@@ -496,12 +285,14 @@ function renderShownEntry(shown) {
496
285
  * what remains after the flags is the new text the callback folds to one line (so a `## `/`### `
497
286
  * line quoted in it can never grow a phantom section). After requireReadyRepo it prints
498
287
  * `edited <command> in <file>: <title>` or the `--json` payload {file, title}. Unlike
499
- * fileAndAnnounce there is no wake: an edit adds no work for a loop to pick up. With
288
+ * fileAndAnnounce there is no wake: an edit adds no work for a role to pick up. An entry still
289
+ * held afterwards gets stillHeldNote, and `--json` carries `hold`. With
500
290
  * `--file <path>` (`-` reads stdin) the new entry comes from a markdown file instead of
501
291
  * positionals: `editText` receives its text, and any positional alongside --file is refused.
502
292
  * With neither positionals nor --file the entry, rendered as `--show` prints it, opens in
503
- * $VISUAL/$EDITOR and the saved buffer goes through `editText`; an unchanged buffer writes and
504
- * commits nothing (`unchanged <command> <n>: <title>`), and an out-of-range position fails
293
+ * $VISUAL/$EDITOR and the saved buffer goes through `editText`. A saved buffer, positional or
294
+ * `--file` text that rebuilds the entry byte-for-byte writes and commits nothing (`unchanged
295
+ * <command> <n>: <title>`), and an out-of-range position fails
505
296
  * before the editor launches. */
506
297
  export async function editAndAnnounce(root, args, command, edit, editText) {
507
298
  const fileFlag = args.indexOf("--file");
@@ -518,6 +309,12 @@ export async function editAndAnnounce(root, args, command, edit, editText) {
518
309
  if (position === null)
519
310
  fail(`--edit needs a position (usage: tumwater ${command} --edit <n>)`);
520
311
  await requireReadyRepo(root);
312
+ const sayUnchanged = (file, title) => {
313
+ if (json)
314
+ sayJson({ file, title, changed: false });
315
+ else
316
+ say(`unchanged ${command} ${position}: ${title}`);
317
+ };
521
318
  let text = null;
522
319
  if (path === null && positionals.length === 0) {
523
320
  const shown = showEntry(root, command, position);
@@ -525,10 +322,7 @@ export async function editAndAnnounce(root, args, command, edit, editText) {
525
322
  const after = editInEditor(before, `${command}-${position}.md`);
526
323
  if (after.trim() === before.trim()) {
527
324
  const file = command === "bug" ? "BUGS.md" : "PLANS.md";
528
- if (json)
529
- sayJson({ file, title: shown.title, changed: false });
530
- else
531
- say(`unchanged ${command} ${position}: ${shown.title}`);
325
+ sayUnchanged(file, shown.title);
532
326
  return;
533
327
  }
534
328
  text = after;
@@ -536,11 +330,20 @@ export async function editAndAnnounce(root, args, command, edit, editText) {
536
330
  else if (path !== null)
537
331
  text = readPromptFileArg(path);
538
332
  const edited = text === null ? edit(position, positionals) : editText(position, text);
333
+ if (edited.unchanged) {
334
+ sayUnchanged(edited.file, edited.title);
335
+ return;
336
+ }
539
337
  warnIfUncommitted(await commitOperatorBacklogEdit(root, edited.file, stampedSubject("operator", `Edit ${command}: ${edited.title}`)), edited.file); // vocabulary-ok: the tumwater(operator): commit prefix is a machine string
338
+ const holds = backlogHolds(root);
339
+ const hold = (command === "bug" ? holds.bugs : holds.plans)[position - 1] ?? null;
540
340
  if (json)
541
- sayJson({ file: edited.file, title: edited.title });
542
- else
341
+ sayJson({ file: edited.file, title: edited.title, ...(hold === null ? {} : { hold }) });
342
+ else {
543
343
  say(`edited ${command} in ${edited.file}: ${edited.title}`);
344
+ if (hold !== null)
345
+ say(stillHeldNote(hold));
346
+ }
544
347
  }
545
348
  /** One confirmation for both file commands, prose or `--json`: the JSON branch prints the
546
349
  * {file, title, stamp} payload as data, the prose branch one line naming the command, the
@@ -552,22 +355,30 @@ function sayFiled(command, filed, json) {
552
355
  else
553
356
  say(`filed ${command} in ${filed.file}: ${filed.title}`);
554
357
  }
555
- /** How long `tumwater archive` waits for a merge in progress to release the merge lock: a merge
556
- * holds it through its in-lock check, which can run several minutes. */
557
- const ARCHIVE_LOCK_WAIT_MS = 15 * 60_000;
558
358
  /** `tumwater archive`: move the finished entries still under PLANS.md's `## Done` and BUGS.md's
559
359
  * `## Fixed` to PLANS-DONE.md and BUGS-FIXED.md and commit them on the base branch
560
360
  * (plans/backlog-archive.md) — the hand-run twin of the archive a starting team makes. Prints
561
- * what moved and the commit, or why nothing was written (a refusal fails the command). */
562
- export async function cmdArchive(root) {
563
- const outcome = await archiveFinishedOnMain(root, { lockTimeoutMs: ARCHIVE_LOCK_WAIT_MS });
361
+ * what moved and the commit, or why nothing was written (a refusal fails the command). `--json`
362
+ * prints `{ archived, commit, moved }` instead: `commit` is the full sha (`null` when nothing was
363
+ * archived) and `moved` the files' `{ file, archive, titles, dropped }`; a refusal still fails. */
364
+ export async function cmdArchive(root, args = []) {
365
+ const json = args.includes("--json");
366
+ const outcome = await archiveFinishedOnMain(root, { lockTimeoutMs: MERGE_LOCK_WAIT_MS });
564
367
  if (outcome.status === "nothing") {
368
+ if (json) {
369
+ sayJson({ archived: false, commit: null, moved: [] });
370
+ return;
371
+ }
565
372
  say("nothing to archive: PLANS.md ## Done and BUGS.md ## Fixed hold no finished entries");
566
373
  return;
567
374
  }
568
375
  if (outcome.status === "skipped")
569
376
  fail(`nothing archived: ${outcome.reason}`);
377
+ if (json) {
378
+ sayJson({ archived: true, commit: outcome.commit, moved: outcome.moved });
379
+ return;
380
+ }
570
381
  for (const f of outcome.moved)
571
- say(`${f.file} → ${f.archive}: ${plural(f.titles.length, "entry", "entries")}`);
572
- say(`committed ${outcome.commit.slice(0, 8)}`);
382
+ say(describeArchivedFile(f));
383
+ say(`committed ${shortSha(outcome.commit)}`);
573
384
  }
@@ -1,8 +1,7 @@
1
1
  import { loadConfigSafe } from "../config/config.js";
2
- import { withStateLockAsync } from "../concurrency/lock.js";
2
+ import { withPrimaryWorktreeLockAsync } from "../concurrency/lock.js";
3
3
  import { currentBranch, targetBranch } from "../git/git.js";
4
- import { COMMIT_IDENT, gitTry } from "../git/git-run.js";
5
- import { primaryWorktreeLockPath } from "../paths.js";
4
+ import { commitAuthorArgs, committerIdentArgs, gitTry } from "../git/git-run.js";
6
5
  /** Commit one operator-written backlog file on main, so the entry reaches the worktrees that
7
6
  * branch from main and the primary checkout stays clean for the next fast-forward. Runs under
8
7
  * the primary-worktree lock `ffMainTo`'s working-tree arm takes, so the commit and a
@@ -16,13 +15,13 @@ export async function commitOperatorBacklogEdit(root, file, subject) {
16
15
  // call, and that write takes the same lock synchronously — a lock already held across our
17
16
  // awaits would block its event loop until the lock times out.
18
17
  await new Promise((resolve) => setImmediate(resolve));
19
- return await withStateLockAsync(primaryWorktreeLockPath(root), async () => {
18
+ return await withPrimaryWorktreeLockAsync(root, async () => {
20
19
  const primary = await currentBranch(root);
21
20
  if (primary === null)
22
21
  return false;
23
22
  if (targetBranch(loadConfigSafe(root).config?.baseBranch, primary) !== primary)
24
23
  return false;
25
- return (await gitTry(root, ...COMMIT_IDENT, "commit", "--only", "-m", subject, "--", file)) !== null;
24
+ return (await gitTry(root, ...(await committerIdentArgs(root)), "commit", ...commitAuthorArgs(), "--only", "-m", subject, "--", file)) !== null;
26
25
  });
27
26
  }
28
27
  catch {