specdojo 0.7.0 → 0.9.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 (462) hide show
  1. package/.github/agents/specdojo-orchestrator.md +7 -3
  2. package/CHANGELOG.md +217 -0
  3. package/dist/catalog/build.js +24 -1
  4. package/dist/catalog/catalog.js +16 -14
  5. package/dist/catalog/plan.js +1 -1
  6. package/dist/catalog/scaffold.js +4 -1
  7. package/dist/commands/agent.js +5 -3
  8. package/dist/commands/build.js +69 -10
  9. package/dist/commands/git.js +206 -0
  10. package/dist/commands/init.js +9 -3
  11. package/dist/commands/night-orchestrator.js +6 -4
  12. package/dist/commands/where.js +25 -0
  13. package/dist/dashboard/dashboard-timeline.js +18 -16
  14. package/dist/dashboard/dashboard.js +616 -261
  15. package/dist/dashboard/epic-plan.js +81 -0
  16. package/dist/dashboard/exec-records.js +16 -20
  17. package/dist/dashboard/routines.js +11 -12
  18. package/dist/dashboard/timeline-build.js +5 -9
  19. package/dist/dashboard/timeline.js +23 -18
  20. package/dist/devcontainer/scaffold.js +18 -0
  21. package/dist/docs/frontmatter-namespace.js +1 -48
  22. package/dist/docs/index-command.js +2 -2
  23. package/dist/docs/yaml-business-tables.js +243 -0
  24. package/dist/docs/yaml-interface-tables.js +106 -0
  25. package/dist/docs/yaml-pages-command.js +5 -3
  26. package/dist/docs/yaml-pages.js +268 -3
  27. package/dist/docs/yaml-table-shared.js +70 -0
  28. package/dist/docs/yaml-tables.js +39 -0
  29. package/dist/exec/agent-config.js +31 -0
  30. package/dist/exec/agent-plan.js +3 -2
  31. package/dist/exec/agent-protected-config.js +2 -0
  32. package/dist/exec/commands.js +100 -39
  33. package/dist/exec/commit-hook-skips.js +78 -0
  34. package/dist/exec/core.js +19 -7
  35. package/dist/exec/events.js +179 -8
  36. package/dist/exec/evidence.js +77 -19
  37. package/dist/exec/handoff.js +9 -13
  38. package/dist/exec/limit.js +1 -1
  39. package/dist/exec/mechanical-result.js +45 -0
  40. package/dist/exec/migrate-records.js +249 -0
  41. package/dist/exec/parent-validation.js +209 -15
  42. package/dist/exec/pipeline-state.js +27 -5
  43. package/dist/exec/plans-condense-findings.js +89 -0
  44. package/dist/exec/plans-core.js +45 -19
  45. package/dist/exec/plans-generation.js +52 -30
  46. package/dist/exec/plans-grade-findings.js +8 -3
  47. package/dist/exec/plans-kata-findings.js +61 -0
  48. package/dist/exec/plans-planning.js +3 -3
  49. package/dist/exec/plans-storage.js +12 -24
  50. package/dist/exec/post-integration.js +162 -0
  51. package/dist/exec/queue-command.js +166 -0
  52. package/dist/exec/queue.js +285 -0
  53. package/dist/exec/register-foreign-wait.js +84 -0
  54. package/dist/exec/register-resume.js +55 -56
  55. package/dist/exec/register.js +26 -22
  56. package/dist/exec/repo-integration-sync.js +21 -5
  57. package/dist/exec/repo-integration.js +21 -1
  58. package/dist/exec/reporter.js +121 -23
  59. package/dist/exec/results.js +106 -25
  60. package/dist/exec/review-completion.js +47 -0
  61. package/dist/exec/review-kata.js +112 -0
  62. package/dist/exec/run/agent-pipeline.js +78 -8
  63. package/dist/exec/run/agent.js +32 -13
  64. package/dist/exec/run/change-scope.js +365 -0
  65. package/dist/exec/run/deferred-cleanup.js +31 -0
  66. package/dist/exec/run/in-place.js +73 -33
  67. package/dist/exec/run/job-lock.js +66 -0
  68. package/dist/exec/run/job-sequence.js +137 -0
  69. package/dist/exec/run/job.js +135 -41
  70. package/dist/exec/run/lifecycle-commands.js +189 -37
  71. package/dist/exec/run/lock.js +22 -1
  72. package/dist/exec/run/mode-shared.js +11 -3
  73. package/dist/exec/run/register-command.js +14 -15
  74. package/dist/exec/run/register-core.js +20 -13
  75. package/dist/exec/run/register-mode.js +77 -17
  76. package/dist/exec/run/register-post-review.js +21 -9
  77. package/dist/exec/run/register-resume.js +95 -31
  78. package/dist/exec/run/register-state.js +23 -15
  79. package/dist/exec/run/register-worktree.js +184 -139
  80. package/dist/exec/run/schedule-mode.js +79 -18
  81. package/dist/exec/run/schedule-prepare.js +204 -59
  82. package/dist/exec/run/schedule-task.js +203 -49
  83. package/dist/exec/run/shared.js +9 -3
  84. package/dist/exec/run/trailing-records.js +35 -0
  85. package/dist/exec/run-records.js +2 -0
  86. package/dist/exec/schedule/schedule.js +116 -4
  87. package/dist/exec/shared.js +1 -1
  88. package/dist/exec/smoke.js +190 -0
  89. package/dist/exec/strategy.js +14 -3
  90. package/dist/exec/task-view.js +6 -4
  91. package/dist/exec/trailing-records.js +242 -0
  92. package/dist/exec/trial-commands.js +8 -4
  93. package/dist/exec/trial-core.js +6 -1
  94. package/dist/exec/validate-records-commit.js +110 -0
  95. package/dist/exec/validate-records.js +148 -0
  96. package/dist/exec/validation-metrics.js +181 -0
  97. package/dist/exec/worktree-cleanup-lock.js +26 -0
  98. package/dist/exec/worktree-command.js +38 -17
  99. package/dist/exec/worktree-ops-commit.js +119 -48
  100. package/dist/exec/worktree-ops-lifecycle.js +77 -48
  101. package/dist/exec/worktree-ops-merge.js +13 -2
  102. package/dist/exec/worktree-ops.js +2 -2
  103. package/dist/exec/worktree.js +32 -4
  104. package/dist/grade/apply.js +32 -6
  105. package/dist/grade/command-apply.js +3 -3
  106. package/dist/grade/command-inspect.js +7 -5
  107. package/dist/grade/command-plan.js +1 -1
  108. package/dist/grade/command-run.js +7 -1
  109. package/dist/grade/command-shared.js +1 -1
  110. package/dist/grade/core.js +18 -5
  111. package/dist/grade/markdown.js +3 -3
  112. package/dist/grade/pipeline-state.js +15 -11
  113. package/dist/grade/plan.js +37 -17
  114. package/dist/grade/result.js +3 -3
  115. package/dist/grade/run.js +87 -11
  116. package/dist/grade/target-discovery.js +17 -4
  117. package/dist/grade/targets.js +12 -11
  118. package/dist/job/definition.js +84 -8
  119. package/dist/job/job.js +109 -39
  120. package/dist/job/noop.js +104 -0
  121. package/dist/register/authoring-sources.js +22 -16
  122. package/dist/register/core.js +2 -0
  123. package/dist/register/create-commands.js +28 -3
  124. package/dist/register/deliverable-target.js +9 -1
  125. package/dist/register/epic.js +104 -26
  126. package/dist/register/event-merge.js +3 -0
  127. package/dist/register/events.js +4 -0
  128. package/dist/register/external-project.js +3 -0
  129. package/dist/register/item.js +6 -0
  130. package/dist/register/maintenance-commands.js +6 -3
  131. package/dist/register/planning.js +7 -14
  132. package/dist/register/register.js +74 -16
  133. package/dist/register/track-domains.js +34 -0
  134. package/dist/register/track-plan.js +78 -0
  135. package/dist/register/transition-commands.js +8 -0
  136. package/dist/register/work-table.js +64 -0
  137. package/dist/review/grade.js +35 -13
  138. package/dist/routine/definition.js +13 -3
  139. package/dist/routine/failure.js +30 -0
  140. package/dist/routine/routine.js +189 -71
  141. package/dist/routine/status.js +62 -0
  142. package/dist/routine/storage.js +33 -0
  143. package/dist/schedule/schedule.js +39 -39
  144. package/dist/schedule/strategy-generate-document.js +26 -14
  145. package/dist/schedule/strategy-generate-scope.js +17 -45
  146. package/dist/schedule/strategy-generate.js +33 -3
  147. package/dist/schedule/strategy-profiles.js +86 -12
  148. package/dist/shared/agent-types.js +7 -0
  149. package/dist/shared/condense-records.js +25 -0
  150. package/dist/shared/cross-process-lock.js +9 -1
  151. package/dist/shared/deprecation.js +8 -0
  152. package/dist/shared/dist-freshness.js +8 -2
  153. package/dist/shared/document-metadata.js +20 -0
  154. package/dist/shared/finding-cause.js +20 -0
  155. package/dist/shared/frontmatter-namespace.js +48 -0
  156. package/dist/shared/git-environment.js +2 -1
  157. package/dist/shared/git.js +186 -16
  158. package/dist/shared/grade-result.js +17 -1
  159. package/dist/shared/lefthook-scaffold.js +3 -0
  160. package/dist/shared/local-config.js +244 -0
  161. package/dist/shared/local-state.js +20 -0
  162. package/dist/shared/markdownlint-config.js +8 -3
  163. package/dist/shared/plan-conventions.js +129 -0
  164. package/dist/shared/plan-templates.js +57 -41
  165. package/dist/shared/run-records.js +224 -0
  166. package/dist/shared/specdojo-config.js +73 -41
  167. package/dist/shared/specdojo-gitignore.js +1 -0
  168. package/dist/shared/text.js +74 -6
  169. package/dist/shared/timeline-index.js +2 -0
  170. package/dist/shared/where-alias.js +13 -0
  171. package/dist/specdojo.js +4 -0
  172. package/docs/ja/specdojo/defaults/pm-review-viewpoints.yaml +11 -2
  173. package/docs/ja/specdojo/exec-templates/xep-common-conventions-template.md +4 -74
  174. package/docs/ja/specdojo/exec-templates/xep-condense-template.md +50 -0
  175. package/docs/ja/specdojo/exec-templates/xep-draft-template.md +17 -5
  176. package/docs/ja/specdojo/exec-templates/xep-fully-guided-template.md +16 -3
  177. package/docs/ja/specdojo/exec-templates/xep-recipe-guided-template.md +15 -5
  178. package/docs/ja/specdojo/exec-templates/xep-recipe-maintenance-template.md +6 -0
  179. package/docs/ja/specdojo/exec-templates/xep-register-template.md +1 -1
  180. package/docs/ja/specdojo/exec-templates/xep-rulebook-maintenance-template.md +6 -0
  181. package/docs/ja/specdojo/exec-templates/xep-sample-maintenance-template.md +6 -0
  182. package/docs/ja/specdojo/exec-templates/xep-template-maintenance-template.md +6 -0
  183. package/docs/ja/specdojo/exec-templates/xer-condense-template.md +25 -0
  184. package/docs/ja/specdojo/exec-templates/xp-common-conventions-template.md +50 -0
  185. package/docs/ja/specdojo/exec-templates/xrp-common-conventions-template.md +30 -0
  186. package/docs/ja/specdojo/guides/branch-workflow-guide.md +1 -1
  187. package/docs/ja/specdojo/guides/docs-editing-guide.md +12 -0
  188. package/docs/ja/specdojo/guides/docs-structure-guide.md +48 -15
  189. package/docs/ja/specdojo/guides/exec-config-guide.md +69 -19
  190. package/docs/ja/specdojo/guides/exec-operation-guide.md +97 -18
  191. package/docs/ja/specdojo/guides/exec-worktree-guide.md +20 -11
  192. package/docs/ja/specdojo/guides/job-sequence-guide.md +77 -0
  193. package/docs/ja/specdojo/guides/plan-result-lifecycle-guide.md +92 -55
  194. package/docs/ja/specdojo/guides/project-move-guide.md +381 -0
  195. package/docs/ja/specdojo/guides/quick-start-guide.md +73 -17
  196. package/docs/ja/specdojo/guides/register-operation-guide.md +26 -6
  197. package/docs/ja/specdojo/guides/remote-host-development-guide.md +2 -0
  198. package/docs/ja/specdojo/guides/review-guide.md +22 -19
  199. package/docs/ja/specdojo/guides/routine-operation-guide.md +23 -12
  200. package/docs/ja/specdojo/guides/ryu-guide.md +23 -13
  201. package/docs/ja/specdojo/guides/schedule-design-guide.md +27 -21
  202. package/docs/ja/specdojo/guides/schedule-operation-guide.md +27 -3
  203. package/docs/ja/specdojo/guides/specdojo-overview-guide.md +5 -4
  204. package/docs/ja/specdojo/guides/timeline-design-guide.md +27 -144
  205. package/docs/ja/specdojo/guides/use-case-guide.md +92 -155
  206. package/docs/ja/specdojo/guides/waza-guide.md +12 -8
  207. package/docs/ja/specdojo/recipes/bac-recipe.md +111 -0
  208. package/docs/ja/specdojo/recipes/bes-recipe.md +141 -0
  209. package/docs/ja/specdojo/recipes/bps-recipe.md +88 -139
  210. package/docs/ja/specdojo/recipes/br-recipe.md +77 -0
  211. package/docs/ja/specdojo/recipes/cdfd-overview-recipe.md +97 -109
  212. package/docs/ja/specdojo/recipes/cdfd-recipe.md +85 -146
  213. package/docs/ja/specdojo/recipes/cdfd-uc-recipe.md +92 -99
  214. package/docs/ja/specdojo/recipes/cnd-recipe.md +135 -0
  215. package/docs/ja/specdojo/recipes/cpd-recipe.md +140 -0
  216. package/docs/ja/specdojo/recipes/cxd-recipe.md +162 -0
  217. package/docs/ja/specdojo/recipes/ifd-recipe.md +145 -0
  218. package/docs/ja/specdojo/recipes/ifx-cmd-recipe.md +112 -90
  219. package/docs/ja/specdojo/recipes/ifx-index-recipe.md +164 -0
  220. package/docs/ja/specdojo/recipes/pm-communication-plan-recipe.md +60 -49
  221. package/docs/ja/specdojo/recipes/pm-members-recipe.md +50 -51
  222. package/docs/ja/specdojo/recipes/pm-organization-recipe.md +59 -48
  223. package/docs/ja/specdojo/recipes/pm-plan-recipe.md +72 -50
  224. package/docs/ja/specdojo/recipes/pm-quality-management-plan-recipe.md +40 -49
  225. package/docs/ja/specdojo/recipes/pm-raci-recipe.md +42 -48
  226. package/docs/ja/specdojo/recipes/pm-roles-recipe.md +52 -81
  227. package/docs/ja/specdojo/recipes/prj-assumptions-constraints-dependencies-recipe.md +64 -91
  228. package/docs/ja/specdojo/recipes/prj-charter-recipe.md +71 -106
  229. package/docs/ja/specdojo/recipes/prj-comparison-of-alternatives-recipe.md +78 -156
  230. package/docs/ja/specdojo/recipes/prj-issues-and-approach-recipe.md +62 -111
  231. package/docs/ja/specdojo/recipes/prj-scope-recipe.md +67 -123
  232. package/docs/ja/specdojo/recipes/prj-stakeholder-register-recipe.md +60 -96
  233. package/docs/ja/specdojo/recipes/prj-success-criteria-and-acceptance-criteria-recipe.md +61 -105
  234. package/docs/ja/specdojo/recipes/stsd-recipe.md +88 -80
  235. package/docs/ja/specdojo/recipes/sysd-critical-flows-recipe.md +129 -0
  236. package/docs/ja/specdojo/recipes/sysd-cross-cutting-policy-recipe.md +146 -0
  237. package/docs/ja/specdojo/recipes/sysd-index-recipe.md +141 -0
  238. package/docs/ja/specdojo/recipes/tsd-recipe.md +149 -129
  239. package/docs/ja/specdojo/references/command-reference.md +303 -148
  240. package/docs/ja/specdojo/references/deliverables-reference.md +30 -16
  241. package/docs/ja/specdojo/references/directory-layout-reference.md +3 -2
  242. package/docs/ja/specdojo/references/specdojo-config-reference.md +54 -18
  243. package/docs/ja/specdojo/rulebooks/atc-index-rulebook.md +101 -257
  244. package/docs/ja/specdojo/rulebooks/atc-rulebook.md +102 -228
  245. package/docs/ja/specdojo/rulebooks/bac-rulebook.md +63 -290
  246. package/docs/ja/specdojo/rulebooks/bdd-rulebook.md +162 -80
  247. package/docs/ja/specdojo/rulebooks/bds-rulebook.md +118 -155
  248. package/docs/ja/specdojo/rulebooks/bes-index-rulebook.md +128 -60
  249. package/docs/ja/specdojo/rulebooks/bes-rulebook.md +70 -94
  250. package/docs/ja/specdojo/rulebooks/bps-rulebook.md +24 -56
  251. package/docs/ja/specdojo/rulebooks/br-rulebook.md +58 -103
  252. package/docs/ja/specdojo/rulebooks/ccd-mermaid-rulebook.md +103 -223
  253. package/docs/ja/specdojo/rulebooks/cdfd-d2-rulebook.md +18 -93
  254. package/docs/ja/specdojo/rulebooks/cdfd-mermaid-rulebook.md +18 -52
  255. package/docs/ja/specdojo/rulebooks/cdfd-overview-rulebook.md +109 -147
  256. package/docs/ja/specdojo/rulebooks/cdfd-rulebook.md +80 -108
  257. package/docs/ja/specdojo/rulebooks/cdfd-uc-rulebook.md +51 -55
  258. package/docs/ja/specdojo/rulebooks/cdr-rulebook.md +144 -0
  259. package/docs/ja/specdojo/rulebooks/cdsd-rulebook.md +81 -68
  260. package/docs/ja/specdojo/rulebooks/cdt-rulebook.md +139 -0
  261. package/docs/ja/specdojo/rulebooks/cld-rulebook.md +9 -184
  262. package/docs/ja/specdojo/rulebooks/clis-rulebook.md +170 -0
  263. package/docs/ja/specdojo/rulebooks/cnd-mermaid-rulebook.md +33 -86
  264. package/docs/ja/specdojo/rulebooks/cnd-rulebook.md +79 -249
  265. package/docs/ja/specdojo/rulebooks/cop-index-rulebook.md +45 -131
  266. package/docs/ja/specdojo/rulebooks/cop-rulebook.md +69 -275
  267. package/docs/ja/specdojo/rulebooks/cpd-mermaid-rulebook.md +20 -112
  268. package/docs/ja/specdojo/rulebooks/cpd-rulebook.md +79 -249
  269. package/docs/ja/specdojo/rulebooks/cxd-mermaid-rulebook.md +12 -145
  270. package/docs/ja/specdojo/rulebooks/cxd-rulebook.md +115 -256
  271. package/docs/ja/specdojo/rulebooks/dct-index-rulebook.md +79 -109
  272. package/docs/ja/specdojo/rulebooks/dct-rulebook.md +119 -174
  273. package/docs/ja/specdojo/rulebooks/dec-rulebook.md +6 -14
  274. package/docs/ja/specdojo/rulebooks/dmd-index-rulebook.md +22 -66
  275. package/docs/ja/specdojo/rulebooks/dmd-rulebook.md +36 -94
  276. package/docs/ja/specdojo/rulebooks/dss-rulebook.md +171 -0
  277. package/docs/ja/specdojo/rulebooks/etc-index-rulebook.md +31 -131
  278. package/docs/ja/specdojo/rulebooks/etc-rulebook.md +50 -104
  279. package/docs/ja/specdojo/rulebooks/gl-rulebook.md +93 -57
  280. package/docs/ja/specdojo/rulebooks/ifd-mermaid-rulebook.md +63 -253
  281. package/docs/ja/specdojo/rulebooks/ifx-api-rulebook.md +14 -20
  282. package/docs/ja/specdojo/rulebooks/ifx-cmd-rulebook.md +79 -76
  283. package/docs/ja/specdojo/rulebooks/ifx-file-rulebook.md +182 -237
  284. package/docs/ja/specdojo/rulebooks/ifx-index-rulebook.md +111 -40
  285. package/docs/ja/specdojo/rulebooks/ifx-msg-rulebook.md +14 -22
  286. package/docs/ja/specdojo/rulebooks/imp-business-rulebook.md +23 -46
  287. package/docs/ja/specdojo/rulebooks/imp-data-rulebook.md +41 -64
  288. package/docs/ja/specdojo/rulebooks/imp-interface-rulebook.md +16 -40
  289. package/docs/ja/specdojo/rulebooks/imp-operations-rulebook.md +34 -61
  290. package/docs/ja/specdojo/rulebooks/imp-test-rulebook.md +27 -50
  291. package/docs/ja/specdojo/rulebooks/itc-index-rulebook.md +70 -199
  292. package/docs/ja/specdojo/rulebooks/itc-rulebook.md +65 -153
  293. package/docs/ja/specdojo/rulebooks/mip-index-rulebook.md +74 -150
  294. package/docs/ja/specdojo/rulebooks/mm-rulebook.md +12 -23
  295. package/docs/ja/specdojo/rulebooks/mtp-rulebook.md +99 -176
  296. package/docs/ja/specdojo/rulebooks/nfr-availability-rulebook.md +35 -61
  297. package/docs/ja/specdojo/rulebooks/nfr-index-rulebook.md +75 -117
  298. package/docs/ja/specdojo/rulebooks/nfr-integrity-rulebook.md +31 -60
  299. package/docs/ja/specdojo/rulebooks/nfr-maintainability-rulebook.md +26 -81
  300. package/docs/ja/specdojo/rulebooks/nfr-operations-rulebook.md +32 -70
  301. package/docs/ja/specdojo/rulebooks/nfr-performance-rulebook.md +45 -87
  302. package/docs/ja/specdojo/rulebooks/nfr-reliability-rulebook.md +48 -101
  303. package/docs/ja/specdojo/rulebooks/nfr-security-safety-rulebook.md +44 -80
  304. package/docs/ja/specdojo/rulebooks/nfr-usability-rulebook.md +59 -127
  305. package/docs/ja/specdojo/rulebooks/opd-index-rulebook.md +31 -50
  306. package/docs/ja/specdojo/rulebooks/opd-rulebook.md +42 -109
  307. package/docs/ja/specdojo/rulebooks/opr-index-rulebook.md +29 -42
  308. package/docs/ja/specdojo/rulebooks/opr-rulebook.md +29 -87
  309. package/docs/ja/specdojo/rulebooks/otp-index-rulebook.md +62 -84
  310. package/docs/ja/specdojo/rulebooks/otp-rulebook.md +11 -61
  311. package/docs/ja/specdojo/rulebooks/pjr-rulebook.md +92 -102
  312. package/docs/ja/specdojo/rulebooks/pm-change-request-log-rulebook.md +25 -34
  313. package/docs/ja/specdojo/rulebooks/pm-communication-plan-rulebook.md +30 -53
  314. package/docs/ja/specdojo/rulebooks/pm-issue-log-rulebook.md +23 -35
  315. package/docs/ja/specdojo/rulebooks/pm-members-rulebook.md +27 -45
  316. package/docs/ja/specdojo/rulebooks/pm-organization-rulebook.md +45 -59
  317. package/docs/ja/specdojo/rulebooks/pm-plan-rulebook.md +56 -66
  318. package/docs/ja/specdojo/rulebooks/pm-quality-management-plan-rulebook.md +54 -62
  319. package/docs/ja/specdojo/rulebooks/pm-raci-rulebook.md +46 -65
  320. package/docs/ja/specdojo/rulebooks/pm-risk-register-rulebook.md +28 -35
  321. package/docs/ja/specdojo/rulebooks/pm-roles-rulebook.md +65 -97
  322. package/docs/ja/specdojo/rulebooks/pr-rulebook.md +6 -18
  323. package/docs/ja/specdojo/rulebooks/prj-assumptions-constraints-dependencies-rulebook.md +48 -78
  324. package/docs/ja/specdojo/rulebooks/prj-charter-rulebook.md +23 -97
  325. package/docs/ja/specdojo/rulebooks/prj-comparison-of-alternatives-rulebook.md +61 -153
  326. package/docs/ja/specdojo/rulebooks/prj-issues-and-approach-rulebook.md +43 -116
  327. package/docs/ja/specdojo/rulebooks/prj-scope-rulebook.md +16 -51
  328. package/docs/ja/specdojo/rulebooks/prj-stakeholder-register-rulebook.md +47 -92
  329. package/docs/ja/specdojo/rulebooks/prj-success-criteria-and-acceptance-criteria-rulebook.md +25 -84
  330. package/docs/ja/specdojo/rulebooks/sac-rulebook.md +44 -107
  331. package/docs/ja/specdojo/rulebooks/sf-index-rulebook.md +106 -32
  332. package/docs/ja/specdojo/rulebooks/sf-rulebook.md +111 -61
  333. package/docs/ja/specdojo/rulebooks/sld-rulebook.md +129 -59
  334. package/docs/ja/specdojo/rulebooks/stc-index-rulebook.md +90 -189
  335. package/docs/ja/specdojo/rulebooks/stc-rulebook.md +45 -105
  336. package/docs/ja/specdojo/rulebooks/stsd-mermaid-rulebook.md +46 -40
  337. package/docs/ja/specdojo/rulebooks/stsd-rulebook.md +104 -68
  338. package/docs/ja/specdojo/rulebooks/sysd-critical-flows-rulebook.md +64 -330
  339. package/docs/ja/specdojo/rulebooks/sysd-cross-cutting-policy-rulebook.md +70 -263
  340. package/docs/ja/specdojo/rulebooks/sysd-index-rulebook.md +58 -200
  341. package/docs/ja/specdojo/rulebooks/sysd-rulebook.md +47 -60
  342. package/docs/ja/specdojo/rulebooks/tml-rulebook.md +4 -9
  343. package/docs/ja/specdojo/rulebooks/trc-requirements-to-specs-rulebook.md +69 -71
  344. package/docs/ja/specdojo/rulebooks/trc-requirements-to-tests-rulebook.md +65 -72
  345. package/docs/ja/specdojo/rulebooks/tsd-index-rulebook.md +35 -46
  346. package/docs/ja/specdojo/rulebooks/tsd-rulebook.md +49 -66
  347. package/docs/ja/specdojo/rulebooks/tsp-index-rulebook.md +64 -139
  348. package/docs/ja/specdojo/rulebooks/uis-rulebook.md +91 -161
  349. package/docs/ja/specdojo/rulebooks/utc-index-rulebook.md +49 -144
  350. package/docs/ja/specdojo/rulebooks/utc-rulebook.md +67 -155
  351. package/docs/ja/specdojo/samples/bac-sample.md +106 -21
  352. package/docs/ja/specdojo/samples/bdd-sample.yaml +143 -35
  353. package/docs/ja/specdojo/samples/bds-sample.md +87 -21
  354. package/docs/ja/specdojo/samples/bes-index-sample.md +42 -20
  355. package/docs/ja/specdojo/samples/bes-sample.md +70 -21
  356. package/docs/ja/specdojo/samples/bps-sample.md +42 -54
  357. package/docs/ja/specdojo/samples/br-sample.md +57 -15
  358. package/docs/ja/specdojo/samples/ccd-sample.md +80 -19
  359. package/docs/ja/specdojo/samples/cdfd-sample.md +172 -99
  360. package/docs/ja/specdojo/samples/cdfd-uc-sample.md +9 -7
  361. package/docs/ja/specdojo/samples/cdr-sample.md +78 -0
  362. package/docs/ja/specdojo/samples/cdsd-sample.md +73 -20
  363. package/docs/ja/specdojo/samples/cdt-sample.md +116 -0
  364. package/docs/ja/specdojo/samples/cld-sample.md +3 -30
  365. package/docs/ja/specdojo/samples/clis-sample.md +125 -0
  366. package/docs/ja/specdojo/samples/cnd-sample.md +127 -21
  367. package/docs/ja/specdojo/samples/cpd-sample.md +136 -22
  368. package/docs/ja/specdojo/samples/cxd-sample.md +108 -22
  369. package/docs/ja/specdojo/samples/dct-index-sample.yaml +63 -17
  370. package/docs/ja/specdojo/samples/dec-sample.md +2 -3
  371. package/docs/ja/specdojo/samples/dss-sample.md +175 -0
  372. package/docs/ja/specdojo/samples/gl-sample.yaml +50 -14
  373. package/docs/ja/specdojo/samples/ifd-sample.md +105 -21
  374. package/docs/ja/specdojo/samples/ifx-api-sample.yaml +0 -2
  375. package/docs/ja/specdojo/samples/ifx-cmd-sample.yaml +91 -60
  376. package/docs/ja/specdojo/samples/ifx-file-sample.md +462 -21
  377. package/docs/ja/specdojo/samples/ifx-index-sample.yaml +87 -19
  378. package/docs/ja/specdojo/samples/ifx-msg-sample.yaml +0 -2
  379. package/docs/ja/specdojo/samples/job-sequence.yaml +67 -0
  380. package/docs/ja/specdojo/samples/mip-index-sample.md +98 -20
  381. package/docs/ja/specdojo/samples/pm-communication-plan-sample.md +26 -19
  382. package/docs/ja/specdojo/samples/pm-members-sample.yaml +37 -13
  383. package/docs/ja/specdojo/samples/pm-organization-sample.md +42 -21
  384. package/docs/ja/specdojo/samples/pm-plan-sample.md +78 -26
  385. package/docs/ja/specdojo/samples/pm-quality-management-plan-sample.md +41 -22
  386. package/docs/ja/specdojo/samples/pm-raci-sample.md +63 -28
  387. package/docs/ja/specdojo/samples/pm-roles-sample.yaml +13 -12
  388. package/docs/ja/specdojo/samples/prj-assumptions-constraints-dependencies-sample.md +33 -25
  389. package/docs/ja/specdojo/samples/prj-charter-sample.md +42 -59
  390. package/docs/ja/specdojo/samples/prj-comparison-of-alternatives-sample.md +83 -62
  391. package/docs/ja/specdojo/samples/prj-success-criteria-and-acceptance-criteria-sample.md +30 -33
  392. package/docs/ja/specdojo/samples/sf-index-sample.md +47 -20
  393. package/docs/ja/specdojo/samples/sf-sample.md +109 -21
  394. package/docs/ja/specdojo/samples/sld-sample.md +88 -21
  395. package/docs/ja/specdojo/samples/stsd-sample.md +54 -26
  396. package/docs/ja/specdojo/samples/sysd-critical-flows-sample.md +166 -21
  397. package/docs/ja/specdojo/samples/sysd-cross-cutting-policy-sample.md +178 -21
  398. package/docs/ja/specdojo/samples/sysd-index-sample.md +82 -21
  399. package/docs/ja/specdojo/samples/tml-sample.yaml +4 -1
  400. package/docs/ja/specdojo/samples/uis-sample.md +141 -20
  401. package/docs/ja/specdojo/standards/document-metadata-standard.md +33 -4
  402. package/docs/ja/specdojo/standards/id-and-file-naming-standard.md +3 -1
  403. package/docs/ja/specdojo/standards/job-definition-standard.md +24 -9
  404. package/docs/ja/specdojo/standards/rulebook-authoring-standard.md +1 -0
  405. package/docs/ja/specdojo/templates/bac-template.md +76 -0
  406. package/docs/ja/specdojo/templates/bes-template.md +56 -0
  407. package/docs/ja/specdojo/templates/br-template.md +64 -0
  408. package/docs/ja/specdojo/templates/cdfd-template.md +81 -54
  409. package/docs/ja/specdojo/templates/cdfd-uc-template.md +9 -5
  410. package/docs/ja/specdojo/templates/cdr-template.md +58 -0
  411. package/docs/ja/specdojo/templates/cnd-template.md +137 -0
  412. package/docs/ja/specdojo/templates/cpd-template.md +129 -0
  413. package/docs/ja/specdojo/templates/cxd-template.md +105 -0
  414. package/docs/ja/specdojo/templates/dct-data-model-cdt-template.yaml +40 -0
  415. package/docs/ja/specdojo/templates/dct-data-model-cld-template.yaml +7 -14
  416. package/docs/ja/specdojo/templates/dct-index-template.md +9 -20
  417. package/docs/ja/specdojo/templates/dct-project-management-template.yaml +5 -1
  418. package/docs/ja/specdojo/templates/ifd-template.md +86 -0
  419. package/docs/ja/specdojo/templates/ifx-cmd-template.yaml +44 -28
  420. package/docs/ja/specdojo/templates/ifx-index-template.yaml +40 -0
  421. package/docs/ja/specdojo/templates/opr-template.md +2 -4
  422. package/docs/ja/specdojo/templates/pm-organization-template.md +9 -3
  423. package/docs/ja/specdojo/templates/pm-plan-template.md +4 -4
  424. package/docs/ja/specdojo/templates/pm-quality-management-plan-template.md +17 -9
  425. package/docs/ja/specdojo/templates/pm-raci-template.md +24 -13
  426. package/docs/ja/specdojo/templates/pm-roles-template.yaml +3 -2
  427. package/docs/ja/specdojo/templates/prj-assumptions-constraints-dependencies-template.md +6 -3
  428. package/docs/ja/specdojo/templates/prj-comparison-of-alternatives-template.md +22 -19
  429. package/docs/ja/specdojo/templates/stsd-template.md +46 -21
  430. package/docs/ja/specdojo/templates/sysd-critical-flows-template.md +94 -0
  431. package/docs/ja/specdojo/templates/sysd-cross-cutting-policy-template.md +122 -0
  432. package/docs/ja/specdojo/templates/sysd-index-template.md +89 -0
  433. package/docs/specdojo/lib/yaml-metadata.cjs +7 -0
  434. package/docs/specdojo/schemas/v1/bdd.schema.yaml +25 -57
  435. package/docs/specdojo/schemas/v1/condense-records.schema.yaml +26 -0
  436. package/docs/specdojo/schemas/v1/dct.schema.yaml +10 -0
  437. package/docs/specdojo/schemas/v1/deliverable-frontmatter.schema.yaml +3 -0
  438. package/docs/specdojo/schemas/v1/esil.schema.yaml +7 -141
  439. package/docs/specdojo/schemas/v1/exec-common.schema.yaml +5 -1
  440. package/docs/specdojo/schemas/v1/exec-defaults.schema.yaml +95 -8
  441. package/docs/specdojo/schemas/v1/exec-evidence.schema.yaml +38 -0
  442. package/docs/specdojo/schemas/v1/exec-plan-frontmatter.schema.yaml +14 -0
  443. package/docs/specdojo/schemas/v1/exec-result-frontmatter.schema.yaml +18 -0
  444. package/docs/specdojo/schemas/v1/finding-cause.schema.yaml +22 -0
  445. package/docs/specdojo/schemas/v1/grade-pipeline-state.schema.yaml +1 -1
  446. package/docs/specdojo/schemas/v1/grade-result.schema.yaml +2 -0
  447. package/docs/specdojo/schemas/v1/ifx-cmd.schema.yaml +65 -5
  448. package/docs/specdojo/schemas/v1/ifx-index.schema.yaml +142 -0
  449. package/docs/specdojo/schemas/v1/job-run.schema.yaml +23 -0
  450. package/docs/specdojo/schemas/v1/job.schema.yaml +63 -2
  451. package/docs/specdojo/schemas/v1/register-events.schema.yaml +2 -0
  452. package/docs/specdojo/schemas/v1/register-item-frontmatter.schema.yaml +17 -1
  453. package/docs/specdojo/schemas/v1/sch-strategy.schema.yaml +2 -2
  454. package/package.json +10 -7
  455. package/templates/antigravity/orchestrator.md +7 -3
  456. package/templates/claude/agents/specdojo-orchestrator.md +7 -3
  457. package/templates/codex/agents/specdojo-orchestrator.toml +7 -3
  458. package/templates/codex/orchestrator.md +7 -3
  459. package/templates/devcontainer/tmux.conf +6 -0
  460. package/templates/init-exec-defaults.yaml +13 -0
  461. package/templates/lefthook/tools/specdojo-pre-commit.mjs +8 -0
  462. package/templates/opencode/agents/specdojo-orchestrator.md +8 -4
@@ -0,0 +1,84 @@
1
+ import { stagedMergeBlocker } from "../shared/git.js";
2
+ import { acquireSchedulerLock, releaseSchedulerLock } from "./events.js";
3
+ import { currentBranch } from "./worktree-ops-commit.js";
4
+ import { abortMerge } from "./worktree-ops-merge.js";
5
+ import { gitOutput, gitResult, summarizeGitHookFailure } from "./worktree.js";
6
+ // PJR-97KE: job の worktree の中で作られた子の run は、wait の commit が job の branch に入り、
7
+ // 本体の作業ツリー(日中の再開の起点)には plan も waiting の記録も無い。wait の後に exec branch
8
+ // へ統合先を取り込む merge(`merge <target> after wait`)の第2親が、その記録を持つ統合先の
9
+ // commit である。本体の HEAD がこの commit を含まないとき、再開の前に本体へ merge する。
10
+ // exec branch の先端ではなくこの commit を取り込むのは、exec branch を本体の祖先にすると
11
+ // 統合の段が「merge 済み」と誤認するためである。記録を複製せず履歴として取り込むので、
12
+ // 後で job の branch を本体へ統合しても、同じ commit を共有して衝突しない。
13
+ const LOCK_TIMEOUT_MS = 10_000;
14
+ const LOCK_STALE_MS = 300_000;
15
+ function escapeRegExp(value) {
16
+ return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
17
+ }
18
+ // exec branch の first-parent 履歴から最新の wait 後の同期 merge を探し、その統合先の commit が
19
+ // 本体の HEAD に含まれていなければ返す。同期 merge が無い、または含まれている場合は null。
20
+ export function findForeignWaitRecords(params) {
21
+ const { repoRoot, worktree, itemId } = params;
22
+ const subject = new RegExp(`^exec\\(register ${escapeRegExp(itemId)}\\): merge (.+) after wait$`);
23
+ const log = gitResult(repoRoot, [
24
+ "log",
25
+ "--first-parent",
26
+ "--merges",
27
+ "--format=%P%x09%s",
28
+ worktree.branch,
29
+ "--",
30
+ ]);
31
+ if (log.status !== 0 || typeof log.stdout !== "string")
32
+ return null;
33
+ for (const line of log.stdout.split("\n")) {
34
+ const tab = line.indexOf("\t");
35
+ if (tab < 0)
36
+ continue;
37
+ const match = subject.exec(line.slice(tab + 1));
38
+ if (!match)
39
+ continue;
40
+ const parents = line.slice(0, tab).trim().split(/\s+/);
41
+ const commit = parents[1];
42
+ if (!commit)
43
+ return null;
44
+ const contained = gitResult(repoRoot, ["merge-base", "--is-ancestor", commit, "HEAD"]).status === 0;
45
+ return contained ? null : { commit, target: match[1] };
46
+ }
47
+ return null;
48
+ }
49
+ // 統合先の wait の記録を本体の現在の branch へ merge commit 1件で取り込む。取り込めない場合は
50
+ // merge を中止して本体を元に戻し、理由を例外で返す。
51
+ export function adoptForeignWaitRecords(params) {
52
+ const { repoRoot, schedulePath, itemId, records } = params;
53
+ const targetBranch = currentBranch(repoRoot);
54
+ const lockDir = acquireSchedulerLock(schedulePath, {
55
+ actor: `register-adopt:${itemId}`,
56
+ lockTimeoutMs: LOCK_TIMEOUT_MS,
57
+ lockStaleMs: LOCK_STALE_MS,
58
+ });
59
+ try {
60
+ const staged = stagedMergeBlocker(repoRoot);
61
+ if (staged)
62
+ throw new Error(staged);
63
+ const message = `exec(register ${itemId}): merge ${records.target} records before resume`;
64
+ const merge = gitResult(repoRoot, ["merge", "--no-ff", "-m", message, records.commit]);
65
+ if (merge.status === 0)
66
+ return;
67
+ const output = [merge.stdout, merge.stderr]
68
+ .filter((part) => typeof part === "string" && part.length > 0)
69
+ .join("\n");
70
+ if (gitResult(repoRoot, ["rev-parse", "--verify", "--quiet", "MERGE_HEAD"]).status === 0) {
71
+ abortMerge(repoRoot);
72
+ }
73
+ throw new Error(`git merge of ${records.target} (${records.commit.slice(0, 12)}) into ${targetBranch} failed: ` +
74
+ summarizeGitHookFailure(output));
75
+ }
76
+ finally {
77
+ releaseSchedulerLock(lockDir);
78
+ }
79
+ }
80
+ // 取り込んだ commit のうち、本体に無かったものの数(利用者への表示用)。
81
+ export function countForeignCommits(repoRoot, records) {
82
+ const count = Number.parseInt(gitOutput(repoRoot, ["rev-list", "--count", `HEAD..${records.commit}`]).trim(), 10);
83
+ return Number.isFinite(count) ? count : 0;
84
+ }
@@ -1,7 +1,21 @@
1
- import { existsSync, readdirSync } from "node:fs";
2
- import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
3
- import { loadPipelineResumeCheckpoint } from "./pipeline-state.js";
4
- import { safeSlug } from "./shared.js";
1
+ import { existsSync } from "node:fs";
2
+ import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
3
+ import { integratedRepoNames, loadPipelineResumeCheckpoint, } from "./pipeline-state.js";
4
+ import { recordStem, resumeStatePaths, runEvidencePath, taskRecordPaths } from "./run-records.js";
5
+ // 統合の段が止まった run を executor へ戻せない理由を返す。統合が成功済み、または一部の
6
+ // リポジトリを統合済みの run を戻すと、統合済みの成果と食い違うため止める。
7
+ function integratedRunBlocker(state) {
8
+ const integrate = state.stages.integrate;
9
+ if (integrate?.status === "succeeded") {
10
+ return `cannot resume the executor after the integration of run ${state.run_id} succeeded`;
11
+ }
12
+ const integrated = [...integratedRepoNames(state)].sort();
13
+ if (integrated.length > 0) {
14
+ return (`cannot resume the executor from the integrate stage of run ${state.run_id}: ` +
15
+ `already integrated repositories: ${integrated.join(", ")}`);
16
+ }
17
+ return undefined;
18
+ }
5
19
  function executorResumeHandoff(evidence) {
6
20
  if (!evidence)
7
21
  return [];
@@ -23,22 +37,16 @@ function executorResumeHandoff(evidence) {
23
37
  }
24
38
  export function registerEvidenceDir(input) {
25
39
  const executionRel = relative(input.repoRoot, input.executionPath);
26
- return join(input.worktreePath, executionRel, "exec", "evidence", safeSlug(input.taskId));
40
+ return dirname(taskRecordPaths(join(input.worktreePath, executionRel), input.taskId).directory);
27
41
  }
28
42
  // worktree に残っている run ディレクトリを読み、pipeline-state.json を持つものを候補にする。
29
43
  // 壊れた state・別 task の state は loadPipelineResumeCheckpoint が弾くため、ここでは黙って
30
44
  // 候補から外す(再開可否の判定は selectResumableRegisterRun が理由つきで行う)。
31
45
  export function loadRegisterResumeCandidates(input) {
32
- const evidenceDir = registerEvidenceDir(input);
33
- if (!existsSync(evidenceDir))
34
- return [];
35
- const runIds = readdirSync(evidenceDir, { withFileTypes: true })
36
- .filter((entry) => entry.isDirectory())
37
- .map((entry) => entry.name)
38
- .sort();
46
+ const executionPath = join(input.worktreePath, relative(input.repoRoot, input.executionPath));
39
47
  const candidates = [];
40
- for (const runId of runIds) {
41
- const statePath = join(evidenceDir, runId, "pipeline-state.json");
48
+ for (const statePath of resumeStatePaths(executionPath, input.taskId)) {
49
+ const runId = basename(dirname(statePath));
42
50
  if (!existsSync(statePath))
43
51
  continue;
44
52
  const stateRef = relative(input.worktreePath, statePath).split(sep).join("/");
@@ -59,9 +67,7 @@ export function loadRegisterResumeCandidates(input) {
59
67
  ...(checkpoint.evidence
60
68
  ? {
61
69
  evidenceRef: checkpoint.state.stages.executor.artifact_ref ??
62
- relative(input.worktreePath, join(dirname(statePath), "evidence.json"))
63
- .split(sep)
64
- .join("/"),
70
+ relative(input.worktreePath, runEvidencePath(statePath)).split(sep).join("/"),
65
71
  }
66
72
  : {}),
67
73
  });
@@ -170,9 +176,18 @@ export function selectResumableRegisterRun(candidates, options = {}) {
170
176
  const inferredStage = latest.state.stages.reporter.status === "succeeded" ? "integrate" : "reporter";
171
177
  if (options.resumeFrom === "executor") {
172
178
  if (inferredStage !== "reporter") {
179
+ const blocker = options.allowFailedIntegration
180
+ ? integratedRunBlocker(latest.state)
181
+ : `cannot resume the executor from the ${inferredStage} stage of run ${latest.runId}`;
182
+ if (!blocker) {
183
+ const forcedChanges = initialChanges.length > 0
184
+ ? initialChanges
185
+ : (latest.evidence.attempt_changes ?? latest.evidence.changes).map((change) => change.path);
186
+ return { kind: "resumable", target: executorTarget(latest, forcedChanges) };
187
+ }
173
188
  return {
174
189
  kind: "not-resumable",
175
- reason: `cannot resume the executor from the ${inferredStage} stage of run ${latest.runId}`,
190
+ reason: blocker,
176
191
  };
177
192
  }
178
193
  const forcedChanges = initialChanges.length > 0
@@ -197,48 +212,39 @@ export function selectResumableRegisterRun(candidates, options = {}) {
197
212
  export function findResumableRegisterRun(input) {
198
213
  return selectResumableRegisterRun(loadRegisterResumeCandidates(input), input.resumeFrom ? { resumeFrom: input.resumeFrom } : {});
199
214
  }
200
- // Schedule の明示的な executor 再開は、成功済み executor から reporter へ進んだ run に限る。
201
- // run の選択・変更一覧・申し送りの復元は register と同じ規則を使う。
215
+ // Schedule の明示的な executor 再開は、成功済み executor から reporter または統合の段へ進んだ run と、
216
+ // executor の報告が approach の必須項目を欠いて executor の段で止めた run(PJR-1GCD)に限る。
217
+ // 統合の段(commit・検査・merge)で止まった run も、どのリポジトリも統合していなければ
218
+ // worktree の成果を保ったまま executor へ戻す(PJR-ED0K)。run の選択・変更一覧・申し送りの
219
+ // 復元は register と同じ規則を使う。
202
220
  export function selectScheduleExecutorResume(candidates) {
203
- const lookup = selectResumableRegisterRun(candidates, { resumeFrom: "executor" });
221
+ const lookup = selectResumableRegisterRun(candidates, {
222
+ resumeFrom: "executor",
223
+ allowFailedIntegration: true,
224
+ });
204
225
  if (lookup.kind !== "resumable")
205
226
  return lookup;
206
227
  const { state } = lookup.target;
207
- if (state.stages.executor.status !== "succeeded") {
228
+ const candidate = candidates.find((entry) => entry.runId === lookup.target.runId && entry.stateRef === lookup.target.stateRef);
229
+ const evidence = candidate?.executorEvidence ?? candidate?.evidence;
230
+ const rejectedReport = state.stages.executor.status === "blocked" && evidence?.completion_status === "incomplete";
231
+ if (state.stages.executor.status !== "succeeded" && !rejectedReport) {
208
232
  return {
209
233
  kind: "not-resumable",
210
234
  reason: `--resume-from executor requires a succeeded executor stage for run ${state.run_id} (status: ${state.stages.executor.status})`,
211
235
  };
212
236
  }
213
- const candidate = candidates.find((entry) => entry.runId === lookup.target.runId && entry.stateRef === lookup.target.stateRef);
214
- if ((candidate?.executorEvidence ?? candidate?.evidence)?.stage.status !== "succeeded") {
237
+ if (evidence?.stage.status !== "succeeded") {
215
238
  return {
216
239
  kind: "not-resumable",
217
240
  reason: `succeeded executor evidence is missing or invalid for run ${state.run_id}`,
218
241
  };
219
242
  }
220
- if (state.stages.reporter.status === "succeeded" || (state.stages.integrate?.attempts ?? 0) > 0) {
221
- return {
222
- kind: "not-resumable",
223
- reason: `cannot resume the executor from the integrate stage of run ${state.run_id}`,
224
- };
225
- }
243
+ const blocker = integratedRunBlocker(state);
244
+ if (blocker)
245
+ return { kind: "not-resumable", reason: blocker };
226
246
  return lookup;
227
247
  }
228
- // plan / result のファイル名は `<pjr-id>-<UTC>-<rand>-(plan|result).md`(buildInPlaceStem)。
229
- // state に artifacts が無い旧 run のために、worktree の result 一覧から最新の stem を復元する。
230
- export function selectLatestRegisterResultStem(fileNames, pjrId) {
231
- const pattern = new RegExp(`^(${pjrId.toLowerCase()}-\\d{8}T\\d{6}Z-[0-9a-f]+)-result\\.md$`, "i");
232
- const stems = [];
233
- for (const name of fileNames) {
234
- const match = name.match(pattern);
235
- if (match)
236
- stems.push(match[1]);
237
- }
238
- if (stems.length === 0)
239
- return null;
240
- return stems.sort()[stems.length - 1];
241
- }
242
248
  // state はエージェントが書き込める worktree 内のファイルのため、参照が root の外へ出ないことを
243
249
  // 確認してから使う(絶対パスや `..` を含む参照は受け付けない)。
244
250
  function isContainedRef(root, ref) {
@@ -248,7 +254,7 @@ function isContainedRef(root, ref) {
248
254
  return rel !== "" && rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute(rel);
249
255
  }
250
256
  // reporter 段の入力(plan と result)を state から復元する。state に artifacts がある場合は
251
- // それを正本とし、無い旧 run では worktree の result ファイル名から stem を復元する。
257
+ // それを正本とし、無い run では同じ run ディレクトリを参照する。
252
258
  export function resolveRegisterResumeArtifacts(input) {
253
259
  const executionRel = relative(input.repoRoot, input.executionPath).split(sep).join("/");
254
260
  const artifacts = input.state.artifacts;
@@ -257,18 +263,11 @@ export function resolveRegisterResumeArtifacts(input) {
257
263
  !isContainedRef(input.worktreePath, artifacts.result_ref)) {
258
264
  return null;
259
265
  }
260
- const stem = artifacts.result_ref.replace(/^.*\//, "").replace(/-result\.md$/, "");
266
+ const stem = recordStem(artifacts.result_ref);
261
267
  return { planRef: artifacts.plan_ref, resultRef: artifacts.result_ref, stem };
262
268
  }
263
- const resultsDir = join(input.worktreePath, executionRel, "exec", "results");
264
- if (!existsSync(resultsDir))
265
- return null;
266
- const stem = selectLatestRegisterResultStem(readdirSync(resultsDir), input.taskId);
267
- if (!stem)
269
+ const records = taskRecordPaths(executionRel, input.taskId, input.state.run_id);
270
+ if (!existsSync(join(input.worktreePath, records.result)))
268
271
  return null;
269
- return {
270
- planRef: `${executionRel}/exec/plans/${stem}-plan.md`,
271
- resultRef: `${executionRel}/exec/results/${stem}-result.md`,
272
- stem,
273
- };
272
+ return { planRef: records.plan, resultRef: records.result, stem: input.state.run_id };
274
273
  }
@@ -1,23 +1,24 @@
1
- import { readRegisterInput, registerInputSection } from "../register/input.js";
2
- import { resolveRegisterDeliverableTarget, } from "../register/deliverable-target.js";
3
1
  import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
4
- import { basename, extname, join, relative, resolve } from "node:path";
5
- import { findRegisterItem, loadRegisterItems, PJR_ID_RE, resolveRegisterPaths, TERMINAL_STATUSES_SET, VALID_PRIORITIES, VALID_STATUSES, VALID_TYPES, } from "../register/register.js";
6
- import { execTemplatePath, injectCommonConventions, MISSING, registerGradeFindingsText, } from "./plans.js";
7
- import { generateRegisterApproachPlan } from "./plans-generation.js";
8
- import { findUniqueDeliverableForKataTarget, findDeliverableByPath, resolveDeliverableByDocId, } from "./plans-core.js";
2
+ import { basename, dirname, extname, join, relative, resolve } from "node:path";
9
3
  import { collectDocIndexEntries } from "../docs/doc-index.js";
10
- import { loadRulebookRefs, resolveKataRefs } from "../kata/kata.js";
4
+ import { buildSpecdojoFrontmatter } from "../docs/frontmatter-namespace.js";
11
5
  import { authoredKataPath, authoringKind, authoringStandardId, authoringStandardPath, } from "../kata/authoring.js";
6
+ import { loadRulebookRefs, resolveKataRefs } from "../kata/kata.js";
12
7
  import { validateRegisterApproachTargets } from "../register/approach.js";
13
- import { buildSpecdojoFrontmatter } from "../docs/frontmatter-namespace.js";
14
- import { escapeMarkdownInline, expandTemplate, inlineCodeAnglePlaceholders, stripTerminalControlSequences, } from "./shared.js";
15
- import { formatMarkdownFile } from "./format.js";
16
- import { loadConfig, specdojoRootDir } from "../shared/specdojo-config.js";
17
8
  import { resolveAuthoringSources, } from "../register/authoring-sources.js";
18
- import { repoEnvironmentVariableName } from "./task-repos.js";
9
+ import { resolveRegisterDeliverableTarget, } from "../register/deliverable-target.js";
10
+ import { readRegisterInput, registerInputSection } from "../register/input.js";
19
11
  import { isPlanningApproach } from "../register/planning.js";
12
+ import { findRegisterItem, loadRegisterItems, PJR_ID_RE, resolveRegisterPaths, TERMINAL_STATUSES_SET, VALID_PRIORITIES, VALID_STATUSES, VALID_TYPES, } from "../register/register.js";
13
+ import { loadConfig, specdojoRootDir } from "../shared/specdojo-config.js";
14
+ import { formatMarkdownFile } from "./format.js";
15
+ import { findDeliverableByPath, findUniqueDeliverableForKataTarget, resolveDeliverableByDocId, } from "./plans-core.js";
16
+ import { generateRegisterApproachPlan } from "./plans-generation.js";
20
17
  import { planningPlanFields } from "./plans-planning.js";
18
+ import { execTemplatePath, injectCommonConventions, MISSING, registerGradeFindingsText, } from "./plans.js";
19
+ import { taskRecordPaths } from "./run-records.js";
20
+ import { escapeMarkdownInline, expandTemplate, inlineCodeAnglePlaceholders, stripTerminalControlSequences, } from "./shared.js";
21
+ import { repoEnvironmentVariableName } from "./task-repos.js";
21
22
  const EDIT_TYPES = new Set(["todo", "issue", "change-request"]);
22
23
  const INVESTIGATE_TYPES = new Set(["question", "risk"]);
23
24
  export function registerItemCategory(itemType) {
@@ -99,6 +100,8 @@ export function formatRegisterRunSummary(summaries) {
99
100
  `transition=${summary.transition}`,
100
101
  `commit=${summary.commit}`,
101
102
  ];
103
+ if (summary.uncommittedFiles)
104
+ parts.push(`uncommitted=${summary.uncommittedFiles}`);
102
105
  if (summary.reason)
103
106
  parts.push(`reason=${summary.reason}`);
104
107
  lines.push(parts.join(" "));
@@ -206,14 +209,12 @@ export function ticketPathFromItem(item, projectRegisterPath) {
206
209
  // 制御文字を除去する(lefthook 等の色付き出力が結論列を破壊するのを防ぐ)。そのうえで
207
210
  // セル内の `|` と改行は表を壊すため置換し、読みやすさのため長さも制限する。
208
211
  const MAX_CONCLUSION_LENGTH = 200;
209
- export function sanitizeRegisterConclusion(reason) {
212
+ export function sanitizeRegisterConclusion(reason, maxLength = MAX_CONCLUSION_LENGTH) {
210
213
  const singleLine = stripTerminalControlSequences(reason)
211
214
  .replace(/\r?\n/g, " ")
212
215
  .replace(/\|/g, "/")
213
216
  .trim();
214
- const truncated = singleLine.length <= MAX_CONCLUSION_LENGTH
215
- ? singleLine
216
- : `${singleLine.slice(0, MAX_CONCLUSION_LENGTH)}…`;
217
+ const truncated = singleLine.length <= maxLength ? singleLine : `${singleLine.slice(0, maxLength)}…`;
217
218
  return inlineCodeAnglePlaceholders(truncated);
218
219
  }
219
220
  // ---------------------------------------------------------------------------
@@ -530,10 +531,10 @@ export async function generateRegisterPlan(opts) {
530
531
  throw new Error(`Template not found: ${templatePath}`);
531
532
  }
532
533
  const template = readFileSync(templatePath, "utf8");
533
- const plansDir = join(opts.executionPath, "exec", "plans");
534
- mkdirSync(plansDir, { recursive: true });
535
- const planPath = opts.outPath ?? join(plansDir, `${opts.stem}-plan.md`);
536
- const resultRef = `${repoRelativePath(opts.executionPath)}/exec/results/${opts.stem}-result.md`;
534
+ const records = taskRecordPaths(opts.executionPath, item.id, opts.stem, "register");
535
+ const planPath = opts.outPath ?? records.plan;
536
+ mkdirSync(dirname(planPath), { recursive: true });
537
+ const resultRef = repoRelativePath(records.result);
537
538
  const values = {
538
539
  _FRONTMATTER_: registerPlanFrontmatter(opts.projectId, opts.stem, item),
539
540
  _PJR_ID_: item.id,
@@ -558,7 +559,10 @@ export async function generateRegisterPlan(opts) {
558
559
  // expandTemplate がまとめる(PJR-283N)。
559
560
  const body = expandTemplate(template, values);
560
561
  // register 項目は対象成果物の schema を特定できないため、schema 検査の項目は落とす。
561
- const content = injectCommonConventions(body, MISSING, new Map());
562
+ const content = injectCommonConventions(body, MISSING, new Map(), "edit", {
563
+ executionPath: opts.executionPath,
564
+ planPath,
565
+ });
562
566
  writeFileSync(planPath, content, "utf8");
563
567
  await formatMarkdownFile(planPath);
564
568
  return { planPath, category };
@@ -1,4 +1,5 @@
1
- import { existsSync } from "node:fs";
1
+ import { existsSync, writeFileSync } from "node:fs";
2
+ import { resolve } from "node:path";
2
3
  import { productIntegrationTarget } from "./task-repos.js";
3
4
  import { abortMerge } from "./worktree-ops.js";
4
5
  import { gitOutput, gitResult } from "./worktree.js";
@@ -95,7 +96,9 @@ function restoreOriginalWorktree(params) {
95
96
  * Merge `target` into the branch checked out at `cwd` (an exec worktree) with a merge commit.
96
97
  * Uncommitted changes (including untracked files) are stashed before the merge and restored
97
98
  * without restoring the old index. Conflicts on `theirsPaths` (repository-relative) take the
98
- * target side. Any other committed conflict aborts the merge. If restoring the stash conflicts,
99
+ * target side and conflicts on `oursPaths` keep the exec branch side. Conflicts on `resolvedPaths`
100
+ * write the resolver's combination of both sides (when either side deleted the file, the target
101
+ * side is taken). Any other committed conflict aborts the merge. If restoring the stash conflicts,
99
102
  * the merge commit is rolled back and the executor changes are restored on the original HEAD.
100
103
  */
101
104
  export function syncWorktreeWithIntegrationTarget(params) {
@@ -124,13 +127,24 @@ export function syncWorktreeWithIntegrationTarget(params) {
124
127
  try {
125
128
  const conflicted = zeroSeparated(cwd, ["diff", "--name-only", "--diff-filter=U", "-z"]);
126
129
  const theirs = new Set(params.theirsPaths ?? []);
127
- const unexpected = conflicted.filter((path) => !theirs.has(path));
130
+ const ours = new Set(params.oursPaths ?? []);
131
+ const resolvers = params.resolvedPaths ?? new Map();
132
+ const unexpected = conflicted.filter((path) => !theirs.has(path) && !ours.has(path) && !resolvers.has(path));
128
133
  if (unexpected.length > 0) {
129
134
  throw new Error(`${repo}: merge conflicts with ${target}: ${unexpected.join(", ")}`);
130
135
  }
131
136
  for (const path of conflicted) {
132
- if (hasPathAt(cwd, target, path)) {
133
- gitOutput(cwd, ["checkout", target, "--", path]);
137
+ const resolver = resolvers.get(path);
138
+ if (resolver && hasPathAt(cwd, "HEAD", path) && hasPathAt(cwd, target, path)) {
139
+ const execContent = gitOutput(cwd, ["show", `HEAD:${path}`]);
140
+ const targetContent = gitOutput(cwd, ["show", `${target}:${path}`]);
141
+ writeFileSync(resolve(cwd, path), resolver(execContent, targetContent), "utf8");
142
+ gitOutput(cwd, ["add", "--", path]);
143
+ continue;
144
+ }
145
+ const side = theirs.has(path) || resolver ? target : "HEAD";
146
+ if (hasPathAt(cwd, side, path)) {
147
+ gitOutput(cwd, ["checkout", side, "--", path]);
134
148
  gitOutput(cwd, ["add", "--", path]);
135
149
  }
136
150
  else {
@@ -270,6 +284,8 @@ export function syncTaskWorktreesWithIntegrationTargets(params) {
270
284
  target: params.projectTarget,
271
285
  message: params.message,
272
286
  theirsPaths: params.projectTheirsPaths,
287
+ oursPaths: params.projectOursPaths,
288
+ resolvedPaths: params.projectResolvedPaths,
273
289
  }));
274
290
  return synced;
275
291
  }
@@ -3,9 +3,10 @@ import { appendFileSync, existsSync, mkdirSync } from "node:fs";
3
3
  import { dirname, resolve } from "node:path";
4
4
  import { acquireSchedulerLock, releaseSchedulerLock } from "./events.js";
5
5
  import { productIntegrationTarget } from "./task-repos.js";
6
- import { abortMerge, commitTargetPaths, isExecBranchMergedIntoCurrent, recordRootNewFilesHandoff, REGISTER_NEW_FILE_DIR_PREFIXES, repoRelative, stabilizeCommitTargets, stageCommitTargets, worktreeStatusPaths, } from "./worktree-ops.js";
6
+ import { abortMerge, assertCommitScope, UncommittedChangesError, commitTargetPaths, isExecBranchMergedIntoCurrent, recordRootNewFilesHandoff, REGISTER_NEW_FILE_DIR_PREFIXES, repoRelative, stabilizeCommitTargets, stageCommitTargets, worktreeStatusPaths, } from "./worktree-ops.js";
7
7
  import { appendGitFailureLog, appendGitResultFailureLog, formatGitResultFailure, gitOutput, gitResult, listRegisteredWorktrees, summarizeGitHookFailure, } from "./worktree.js";
8
8
  import { resolveRepoQualifiedRef } from "../shared/specdojo-config.js";
9
+ import { stagedMergeBlocker } from "../shared/git.js";
9
10
  import { PROJECT_REPO_NAME, branchExists, dirtyPaths, gitText, mergeInProgress, zeroSeparated, } from "./repo-integration-git.js";
10
11
  export { PROJECT_REPO_NAME } from "./repo-integration-git.js";
11
12
  // PJR-0WAA: 1 つのタスクがプロジェクトリポジトリと宣言済みのプロダクトリポジトリ(`repos`)を
@@ -282,6 +283,9 @@ export function productMergeBlockers(product) {
282
283
  }
283
284
  const checkout = checkoutOfBranch(product.repoRoot, target);
284
285
  if (checkout) {
286
+ const stagedBlocker = stagedMergeBlocker(checkout);
287
+ if (stagedBlocker)
288
+ blockers.push(block(stagedBlocker));
285
289
  if (mergeInProgress(checkout)) {
286
290
  blockers.push(block(`a merge is in progress in ${checkout}`));
287
291
  }
@@ -304,6 +308,14 @@ export function projectMergeBlockers(params) {
304
308
  const { context, worktree } = params;
305
309
  const repoRoot = context.repoRoot;
306
310
  const block = (message) => ({ repo: PROJECT_REPO_NAME, message });
311
+ try {
312
+ assertCommitScope(context, worktree, params.taskId);
313
+ }
314
+ catch (error) {
315
+ if (error instanceof UncommittedChangesError)
316
+ return [block(error.message)];
317
+ throw error;
318
+ }
307
319
  if (isExecBranchMergedIntoCurrent({ context, worktree }))
308
320
  return [];
309
321
  const target = gitText(gitResult(repoRoot, ["branch", "--show-current"]).stdout).trim();
@@ -315,6 +327,9 @@ export function projectMergeBlockers(params) {
315
327
  if (mergeInProgress(repoRoot))
316
328
  return [block(`a merge is in progress in ${repoRoot}`)];
317
329
  const blockers = [];
330
+ const stagedBlocker = stagedMergeBlocker(repoRoot);
331
+ if (stagedBlocker)
332
+ blockers.push(block(stagedBlocker));
318
333
  const uncommitted = commitTargetPaths(context, worktree, params.taskId);
319
334
  if (uncommitted.length > 0) {
320
335
  blockers.push(block(`uncommitted commit-target changes: ${uncommitted.join(", ")}`));
@@ -351,6 +366,11 @@ export function mergeProductIntoTarget(params) {
351
366
  const { product, message } = params;
352
367
  const target = productIntegrationTarget(product);
353
368
  const checkout = checkoutOfBranch(product.repoRoot, target);
369
+ if (checkout) {
370
+ const stagedBlocker = stagedMergeBlocker(checkout);
371
+ if (stagedBlocker)
372
+ throw new Error(stagedBlocker);
373
+ }
354
374
  const header = `=== ${new Date().toISOString()} ${product.name}: merge ${product.branch} into ${target} ===`;
355
375
  if (product.integrationStrategy === "ff") {
356
376
  const parent = gitOutput(product.repoRoot, ["rev-parse", `refs/heads/${target}`]).trim();