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.
- package/.github/agents/specdojo-orchestrator.md +7 -3
- package/CHANGELOG.md +217 -0
- package/dist/catalog/build.js +24 -1
- package/dist/catalog/catalog.js +16 -14
- package/dist/catalog/plan.js +1 -1
- package/dist/catalog/scaffold.js +4 -1
- package/dist/commands/agent.js +5 -3
- package/dist/commands/build.js +69 -10
- package/dist/commands/git.js +206 -0
- package/dist/commands/init.js +9 -3
- package/dist/commands/night-orchestrator.js +6 -4
- package/dist/commands/where.js +25 -0
- package/dist/dashboard/dashboard-timeline.js +18 -16
- package/dist/dashboard/dashboard.js +616 -261
- package/dist/dashboard/epic-plan.js +81 -0
- package/dist/dashboard/exec-records.js +16 -20
- package/dist/dashboard/routines.js +11 -12
- package/dist/dashboard/timeline-build.js +5 -9
- package/dist/dashboard/timeline.js +23 -18
- package/dist/devcontainer/scaffold.js +18 -0
- package/dist/docs/frontmatter-namespace.js +1 -48
- package/dist/docs/index-command.js +2 -2
- package/dist/docs/yaml-business-tables.js +243 -0
- package/dist/docs/yaml-interface-tables.js +106 -0
- package/dist/docs/yaml-pages-command.js +5 -3
- package/dist/docs/yaml-pages.js +268 -3
- package/dist/docs/yaml-table-shared.js +70 -0
- package/dist/docs/yaml-tables.js +39 -0
- package/dist/exec/agent-config.js +31 -0
- package/dist/exec/agent-plan.js +3 -2
- package/dist/exec/agent-protected-config.js +2 -0
- package/dist/exec/commands.js +100 -39
- package/dist/exec/commit-hook-skips.js +78 -0
- package/dist/exec/core.js +19 -7
- package/dist/exec/events.js +179 -8
- package/dist/exec/evidence.js +77 -19
- package/dist/exec/handoff.js +9 -13
- package/dist/exec/limit.js +1 -1
- package/dist/exec/mechanical-result.js +45 -0
- package/dist/exec/migrate-records.js +249 -0
- package/dist/exec/parent-validation.js +209 -15
- package/dist/exec/pipeline-state.js +27 -5
- package/dist/exec/plans-condense-findings.js +89 -0
- package/dist/exec/plans-core.js +45 -19
- package/dist/exec/plans-generation.js +52 -30
- package/dist/exec/plans-grade-findings.js +8 -3
- package/dist/exec/plans-kata-findings.js +61 -0
- package/dist/exec/plans-planning.js +3 -3
- package/dist/exec/plans-storage.js +12 -24
- package/dist/exec/post-integration.js +162 -0
- package/dist/exec/queue-command.js +166 -0
- package/dist/exec/queue.js +285 -0
- package/dist/exec/register-foreign-wait.js +84 -0
- package/dist/exec/register-resume.js +55 -56
- package/dist/exec/register.js +26 -22
- package/dist/exec/repo-integration-sync.js +21 -5
- package/dist/exec/repo-integration.js +21 -1
- package/dist/exec/reporter.js +121 -23
- package/dist/exec/results.js +106 -25
- package/dist/exec/review-completion.js +47 -0
- package/dist/exec/review-kata.js +112 -0
- package/dist/exec/run/agent-pipeline.js +78 -8
- package/dist/exec/run/agent.js +32 -13
- package/dist/exec/run/change-scope.js +365 -0
- package/dist/exec/run/deferred-cleanup.js +31 -0
- package/dist/exec/run/in-place.js +73 -33
- package/dist/exec/run/job-lock.js +66 -0
- package/dist/exec/run/job-sequence.js +137 -0
- package/dist/exec/run/job.js +135 -41
- package/dist/exec/run/lifecycle-commands.js +189 -37
- package/dist/exec/run/lock.js +22 -1
- package/dist/exec/run/mode-shared.js +11 -3
- package/dist/exec/run/register-command.js +14 -15
- package/dist/exec/run/register-core.js +20 -13
- package/dist/exec/run/register-mode.js +77 -17
- package/dist/exec/run/register-post-review.js +21 -9
- package/dist/exec/run/register-resume.js +95 -31
- package/dist/exec/run/register-state.js +23 -15
- package/dist/exec/run/register-worktree.js +184 -139
- package/dist/exec/run/schedule-mode.js +79 -18
- package/dist/exec/run/schedule-prepare.js +204 -59
- package/dist/exec/run/schedule-task.js +203 -49
- package/dist/exec/run/shared.js +9 -3
- package/dist/exec/run/trailing-records.js +35 -0
- package/dist/exec/run-records.js +2 -0
- package/dist/exec/schedule/schedule.js +116 -4
- package/dist/exec/shared.js +1 -1
- package/dist/exec/smoke.js +190 -0
- package/dist/exec/strategy.js +14 -3
- package/dist/exec/task-view.js +6 -4
- package/dist/exec/trailing-records.js +242 -0
- package/dist/exec/trial-commands.js +8 -4
- package/dist/exec/trial-core.js +6 -1
- package/dist/exec/validate-records-commit.js +110 -0
- package/dist/exec/validate-records.js +148 -0
- package/dist/exec/validation-metrics.js +181 -0
- package/dist/exec/worktree-cleanup-lock.js +26 -0
- package/dist/exec/worktree-command.js +38 -17
- package/dist/exec/worktree-ops-commit.js +119 -48
- package/dist/exec/worktree-ops-lifecycle.js +77 -48
- package/dist/exec/worktree-ops-merge.js +13 -2
- package/dist/exec/worktree-ops.js +2 -2
- package/dist/exec/worktree.js +32 -4
- package/dist/grade/apply.js +32 -6
- package/dist/grade/command-apply.js +3 -3
- package/dist/grade/command-inspect.js +7 -5
- package/dist/grade/command-plan.js +1 -1
- package/dist/grade/command-run.js +7 -1
- package/dist/grade/command-shared.js +1 -1
- package/dist/grade/core.js +18 -5
- package/dist/grade/markdown.js +3 -3
- package/dist/grade/pipeline-state.js +15 -11
- package/dist/grade/plan.js +37 -17
- package/dist/grade/result.js +3 -3
- package/dist/grade/run.js +87 -11
- package/dist/grade/target-discovery.js +17 -4
- package/dist/grade/targets.js +12 -11
- package/dist/job/definition.js +84 -8
- package/dist/job/job.js +109 -39
- package/dist/job/noop.js +104 -0
- package/dist/register/authoring-sources.js +22 -16
- package/dist/register/core.js +2 -0
- package/dist/register/create-commands.js +28 -3
- package/dist/register/deliverable-target.js +9 -1
- package/dist/register/epic.js +104 -26
- package/dist/register/event-merge.js +3 -0
- package/dist/register/events.js +4 -0
- package/dist/register/external-project.js +3 -0
- package/dist/register/item.js +6 -0
- package/dist/register/maintenance-commands.js +6 -3
- package/dist/register/planning.js +7 -14
- package/dist/register/register.js +74 -16
- package/dist/register/track-domains.js +34 -0
- package/dist/register/track-plan.js +78 -0
- package/dist/register/transition-commands.js +8 -0
- package/dist/register/work-table.js +64 -0
- package/dist/review/grade.js +35 -13
- package/dist/routine/definition.js +13 -3
- package/dist/routine/failure.js +30 -0
- package/dist/routine/routine.js +189 -71
- package/dist/routine/status.js +62 -0
- package/dist/routine/storage.js +33 -0
- package/dist/schedule/schedule.js +39 -39
- package/dist/schedule/strategy-generate-document.js +26 -14
- package/dist/schedule/strategy-generate-scope.js +17 -45
- package/dist/schedule/strategy-generate.js +33 -3
- package/dist/schedule/strategy-profiles.js +86 -12
- package/dist/shared/agent-types.js +7 -0
- package/dist/shared/condense-records.js +25 -0
- package/dist/shared/cross-process-lock.js +9 -1
- package/dist/shared/deprecation.js +8 -0
- package/dist/shared/dist-freshness.js +8 -2
- package/dist/shared/document-metadata.js +20 -0
- package/dist/shared/finding-cause.js +20 -0
- package/dist/shared/frontmatter-namespace.js +48 -0
- package/dist/shared/git-environment.js +2 -1
- package/dist/shared/git.js +186 -16
- package/dist/shared/grade-result.js +17 -1
- package/dist/shared/lefthook-scaffold.js +3 -0
- package/dist/shared/local-config.js +244 -0
- package/dist/shared/local-state.js +20 -0
- package/dist/shared/markdownlint-config.js +8 -3
- package/dist/shared/plan-conventions.js +129 -0
- package/dist/shared/plan-templates.js +57 -41
- package/dist/shared/run-records.js +224 -0
- package/dist/shared/specdojo-config.js +73 -41
- package/dist/shared/specdojo-gitignore.js +1 -0
- package/dist/shared/text.js +74 -6
- package/dist/shared/timeline-index.js +2 -0
- package/dist/shared/where-alias.js +13 -0
- package/dist/specdojo.js +4 -0
- package/docs/ja/specdojo/defaults/pm-review-viewpoints.yaml +11 -2
- package/docs/ja/specdojo/exec-templates/xep-common-conventions-template.md +4 -74
- package/docs/ja/specdojo/exec-templates/xep-condense-template.md +50 -0
- package/docs/ja/specdojo/exec-templates/xep-draft-template.md +17 -5
- package/docs/ja/specdojo/exec-templates/xep-fully-guided-template.md +16 -3
- package/docs/ja/specdojo/exec-templates/xep-recipe-guided-template.md +15 -5
- package/docs/ja/specdojo/exec-templates/xep-recipe-maintenance-template.md +6 -0
- package/docs/ja/specdojo/exec-templates/xep-register-template.md +1 -1
- package/docs/ja/specdojo/exec-templates/xep-rulebook-maintenance-template.md +6 -0
- package/docs/ja/specdojo/exec-templates/xep-sample-maintenance-template.md +6 -0
- package/docs/ja/specdojo/exec-templates/xep-template-maintenance-template.md +6 -0
- package/docs/ja/specdojo/exec-templates/xer-condense-template.md +25 -0
- package/docs/ja/specdojo/exec-templates/xp-common-conventions-template.md +50 -0
- package/docs/ja/specdojo/exec-templates/xrp-common-conventions-template.md +30 -0
- package/docs/ja/specdojo/guides/branch-workflow-guide.md +1 -1
- package/docs/ja/specdojo/guides/docs-editing-guide.md +12 -0
- package/docs/ja/specdojo/guides/docs-structure-guide.md +48 -15
- package/docs/ja/specdojo/guides/exec-config-guide.md +69 -19
- package/docs/ja/specdojo/guides/exec-operation-guide.md +97 -18
- package/docs/ja/specdojo/guides/exec-worktree-guide.md +20 -11
- package/docs/ja/specdojo/guides/job-sequence-guide.md +77 -0
- package/docs/ja/specdojo/guides/plan-result-lifecycle-guide.md +92 -55
- package/docs/ja/specdojo/guides/project-move-guide.md +381 -0
- package/docs/ja/specdojo/guides/quick-start-guide.md +73 -17
- package/docs/ja/specdojo/guides/register-operation-guide.md +26 -6
- package/docs/ja/specdojo/guides/remote-host-development-guide.md +2 -0
- package/docs/ja/specdojo/guides/review-guide.md +22 -19
- package/docs/ja/specdojo/guides/routine-operation-guide.md +23 -12
- package/docs/ja/specdojo/guides/ryu-guide.md +23 -13
- package/docs/ja/specdojo/guides/schedule-design-guide.md +27 -21
- package/docs/ja/specdojo/guides/schedule-operation-guide.md +27 -3
- package/docs/ja/specdojo/guides/specdojo-overview-guide.md +5 -4
- package/docs/ja/specdojo/guides/timeline-design-guide.md +27 -144
- package/docs/ja/specdojo/guides/use-case-guide.md +92 -155
- package/docs/ja/specdojo/guides/waza-guide.md +12 -8
- package/docs/ja/specdojo/recipes/bac-recipe.md +111 -0
- package/docs/ja/specdojo/recipes/bes-recipe.md +141 -0
- package/docs/ja/specdojo/recipes/bps-recipe.md +88 -139
- package/docs/ja/specdojo/recipes/br-recipe.md +77 -0
- package/docs/ja/specdojo/recipes/cdfd-overview-recipe.md +97 -109
- package/docs/ja/specdojo/recipes/cdfd-recipe.md +85 -146
- package/docs/ja/specdojo/recipes/cdfd-uc-recipe.md +92 -99
- package/docs/ja/specdojo/recipes/cnd-recipe.md +135 -0
- package/docs/ja/specdojo/recipes/cpd-recipe.md +140 -0
- package/docs/ja/specdojo/recipes/cxd-recipe.md +162 -0
- package/docs/ja/specdojo/recipes/ifd-recipe.md +145 -0
- package/docs/ja/specdojo/recipes/ifx-cmd-recipe.md +112 -90
- package/docs/ja/specdojo/recipes/ifx-index-recipe.md +164 -0
- package/docs/ja/specdojo/recipes/pm-communication-plan-recipe.md +60 -49
- package/docs/ja/specdojo/recipes/pm-members-recipe.md +50 -51
- package/docs/ja/specdojo/recipes/pm-organization-recipe.md +59 -48
- package/docs/ja/specdojo/recipes/pm-plan-recipe.md +72 -50
- package/docs/ja/specdojo/recipes/pm-quality-management-plan-recipe.md +40 -49
- package/docs/ja/specdojo/recipes/pm-raci-recipe.md +42 -48
- package/docs/ja/specdojo/recipes/pm-roles-recipe.md +52 -81
- package/docs/ja/specdojo/recipes/prj-assumptions-constraints-dependencies-recipe.md +64 -91
- package/docs/ja/specdojo/recipes/prj-charter-recipe.md +71 -106
- package/docs/ja/specdojo/recipes/prj-comparison-of-alternatives-recipe.md +78 -156
- package/docs/ja/specdojo/recipes/prj-issues-and-approach-recipe.md +62 -111
- package/docs/ja/specdojo/recipes/prj-scope-recipe.md +67 -123
- package/docs/ja/specdojo/recipes/prj-stakeholder-register-recipe.md +60 -96
- package/docs/ja/specdojo/recipes/prj-success-criteria-and-acceptance-criteria-recipe.md +61 -105
- package/docs/ja/specdojo/recipes/stsd-recipe.md +88 -80
- package/docs/ja/specdojo/recipes/sysd-critical-flows-recipe.md +129 -0
- package/docs/ja/specdojo/recipes/sysd-cross-cutting-policy-recipe.md +146 -0
- package/docs/ja/specdojo/recipes/sysd-index-recipe.md +141 -0
- package/docs/ja/specdojo/recipes/tsd-recipe.md +149 -129
- package/docs/ja/specdojo/references/command-reference.md +303 -148
- package/docs/ja/specdojo/references/deliverables-reference.md +30 -16
- package/docs/ja/specdojo/references/directory-layout-reference.md +3 -2
- package/docs/ja/specdojo/references/specdojo-config-reference.md +54 -18
- package/docs/ja/specdojo/rulebooks/atc-index-rulebook.md +101 -257
- package/docs/ja/specdojo/rulebooks/atc-rulebook.md +102 -228
- package/docs/ja/specdojo/rulebooks/bac-rulebook.md +63 -290
- package/docs/ja/specdojo/rulebooks/bdd-rulebook.md +162 -80
- package/docs/ja/specdojo/rulebooks/bds-rulebook.md +118 -155
- package/docs/ja/specdojo/rulebooks/bes-index-rulebook.md +128 -60
- package/docs/ja/specdojo/rulebooks/bes-rulebook.md +70 -94
- package/docs/ja/specdojo/rulebooks/bps-rulebook.md +24 -56
- package/docs/ja/specdojo/rulebooks/br-rulebook.md +58 -103
- package/docs/ja/specdojo/rulebooks/ccd-mermaid-rulebook.md +103 -223
- package/docs/ja/specdojo/rulebooks/cdfd-d2-rulebook.md +18 -93
- package/docs/ja/specdojo/rulebooks/cdfd-mermaid-rulebook.md +18 -52
- package/docs/ja/specdojo/rulebooks/cdfd-overview-rulebook.md +109 -147
- package/docs/ja/specdojo/rulebooks/cdfd-rulebook.md +80 -108
- package/docs/ja/specdojo/rulebooks/cdfd-uc-rulebook.md +51 -55
- package/docs/ja/specdojo/rulebooks/cdr-rulebook.md +144 -0
- package/docs/ja/specdojo/rulebooks/cdsd-rulebook.md +81 -68
- package/docs/ja/specdojo/rulebooks/cdt-rulebook.md +139 -0
- package/docs/ja/specdojo/rulebooks/cld-rulebook.md +9 -184
- package/docs/ja/specdojo/rulebooks/clis-rulebook.md +170 -0
- package/docs/ja/specdojo/rulebooks/cnd-mermaid-rulebook.md +33 -86
- package/docs/ja/specdojo/rulebooks/cnd-rulebook.md +79 -249
- package/docs/ja/specdojo/rulebooks/cop-index-rulebook.md +45 -131
- package/docs/ja/specdojo/rulebooks/cop-rulebook.md +69 -275
- package/docs/ja/specdojo/rulebooks/cpd-mermaid-rulebook.md +20 -112
- package/docs/ja/specdojo/rulebooks/cpd-rulebook.md +79 -249
- package/docs/ja/specdojo/rulebooks/cxd-mermaid-rulebook.md +12 -145
- package/docs/ja/specdojo/rulebooks/cxd-rulebook.md +115 -256
- package/docs/ja/specdojo/rulebooks/dct-index-rulebook.md +79 -109
- package/docs/ja/specdojo/rulebooks/dct-rulebook.md +119 -174
- package/docs/ja/specdojo/rulebooks/dec-rulebook.md +6 -14
- package/docs/ja/specdojo/rulebooks/dmd-index-rulebook.md +22 -66
- package/docs/ja/specdojo/rulebooks/dmd-rulebook.md +36 -94
- package/docs/ja/specdojo/rulebooks/dss-rulebook.md +171 -0
- package/docs/ja/specdojo/rulebooks/etc-index-rulebook.md +31 -131
- package/docs/ja/specdojo/rulebooks/etc-rulebook.md +50 -104
- package/docs/ja/specdojo/rulebooks/gl-rulebook.md +93 -57
- package/docs/ja/specdojo/rulebooks/ifd-mermaid-rulebook.md +63 -253
- package/docs/ja/specdojo/rulebooks/ifx-api-rulebook.md +14 -20
- package/docs/ja/specdojo/rulebooks/ifx-cmd-rulebook.md +79 -76
- package/docs/ja/specdojo/rulebooks/ifx-file-rulebook.md +182 -237
- package/docs/ja/specdojo/rulebooks/ifx-index-rulebook.md +111 -40
- package/docs/ja/specdojo/rulebooks/ifx-msg-rulebook.md +14 -22
- package/docs/ja/specdojo/rulebooks/imp-business-rulebook.md +23 -46
- package/docs/ja/specdojo/rulebooks/imp-data-rulebook.md +41 -64
- package/docs/ja/specdojo/rulebooks/imp-interface-rulebook.md +16 -40
- package/docs/ja/specdojo/rulebooks/imp-operations-rulebook.md +34 -61
- package/docs/ja/specdojo/rulebooks/imp-test-rulebook.md +27 -50
- package/docs/ja/specdojo/rulebooks/itc-index-rulebook.md +70 -199
- package/docs/ja/specdojo/rulebooks/itc-rulebook.md +65 -153
- package/docs/ja/specdojo/rulebooks/mip-index-rulebook.md +74 -150
- package/docs/ja/specdojo/rulebooks/mm-rulebook.md +12 -23
- package/docs/ja/specdojo/rulebooks/mtp-rulebook.md +99 -176
- package/docs/ja/specdojo/rulebooks/nfr-availability-rulebook.md +35 -61
- package/docs/ja/specdojo/rulebooks/nfr-index-rulebook.md +75 -117
- package/docs/ja/specdojo/rulebooks/nfr-integrity-rulebook.md +31 -60
- package/docs/ja/specdojo/rulebooks/nfr-maintainability-rulebook.md +26 -81
- package/docs/ja/specdojo/rulebooks/nfr-operations-rulebook.md +32 -70
- package/docs/ja/specdojo/rulebooks/nfr-performance-rulebook.md +45 -87
- package/docs/ja/specdojo/rulebooks/nfr-reliability-rulebook.md +48 -101
- package/docs/ja/specdojo/rulebooks/nfr-security-safety-rulebook.md +44 -80
- package/docs/ja/specdojo/rulebooks/nfr-usability-rulebook.md +59 -127
- package/docs/ja/specdojo/rulebooks/opd-index-rulebook.md +31 -50
- package/docs/ja/specdojo/rulebooks/opd-rulebook.md +42 -109
- package/docs/ja/specdojo/rulebooks/opr-index-rulebook.md +29 -42
- package/docs/ja/specdojo/rulebooks/opr-rulebook.md +29 -87
- package/docs/ja/specdojo/rulebooks/otp-index-rulebook.md +62 -84
- package/docs/ja/specdojo/rulebooks/otp-rulebook.md +11 -61
- package/docs/ja/specdojo/rulebooks/pjr-rulebook.md +92 -102
- package/docs/ja/specdojo/rulebooks/pm-change-request-log-rulebook.md +25 -34
- package/docs/ja/specdojo/rulebooks/pm-communication-plan-rulebook.md +30 -53
- package/docs/ja/specdojo/rulebooks/pm-issue-log-rulebook.md +23 -35
- package/docs/ja/specdojo/rulebooks/pm-members-rulebook.md +27 -45
- package/docs/ja/specdojo/rulebooks/pm-organization-rulebook.md +45 -59
- package/docs/ja/specdojo/rulebooks/pm-plan-rulebook.md +56 -66
- package/docs/ja/specdojo/rulebooks/pm-quality-management-plan-rulebook.md +54 -62
- package/docs/ja/specdojo/rulebooks/pm-raci-rulebook.md +46 -65
- package/docs/ja/specdojo/rulebooks/pm-risk-register-rulebook.md +28 -35
- package/docs/ja/specdojo/rulebooks/pm-roles-rulebook.md +65 -97
- package/docs/ja/specdojo/rulebooks/pr-rulebook.md +6 -18
- package/docs/ja/specdojo/rulebooks/prj-assumptions-constraints-dependencies-rulebook.md +48 -78
- package/docs/ja/specdojo/rulebooks/prj-charter-rulebook.md +23 -97
- package/docs/ja/specdojo/rulebooks/prj-comparison-of-alternatives-rulebook.md +61 -153
- package/docs/ja/specdojo/rulebooks/prj-issues-and-approach-rulebook.md +43 -116
- package/docs/ja/specdojo/rulebooks/prj-scope-rulebook.md +16 -51
- package/docs/ja/specdojo/rulebooks/prj-stakeholder-register-rulebook.md +47 -92
- package/docs/ja/specdojo/rulebooks/prj-success-criteria-and-acceptance-criteria-rulebook.md +25 -84
- package/docs/ja/specdojo/rulebooks/sac-rulebook.md +44 -107
- package/docs/ja/specdojo/rulebooks/sf-index-rulebook.md +106 -32
- package/docs/ja/specdojo/rulebooks/sf-rulebook.md +111 -61
- package/docs/ja/specdojo/rulebooks/sld-rulebook.md +129 -59
- package/docs/ja/specdojo/rulebooks/stc-index-rulebook.md +90 -189
- package/docs/ja/specdojo/rulebooks/stc-rulebook.md +45 -105
- package/docs/ja/specdojo/rulebooks/stsd-mermaid-rulebook.md +46 -40
- package/docs/ja/specdojo/rulebooks/stsd-rulebook.md +104 -68
- package/docs/ja/specdojo/rulebooks/sysd-critical-flows-rulebook.md +64 -330
- package/docs/ja/specdojo/rulebooks/sysd-cross-cutting-policy-rulebook.md +70 -263
- package/docs/ja/specdojo/rulebooks/sysd-index-rulebook.md +58 -200
- package/docs/ja/specdojo/rulebooks/sysd-rulebook.md +47 -60
- package/docs/ja/specdojo/rulebooks/tml-rulebook.md +4 -9
- package/docs/ja/specdojo/rulebooks/trc-requirements-to-specs-rulebook.md +69 -71
- package/docs/ja/specdojo/rulebooks/trc-requirements-to-tests-rulebook.md +65 -72
- package/docs/ja/specdojo/rulebooks/tsd-index-rulebook.md +35 -46
- package/docs/ja/specdojo/rulebooks/tsd-rulebook.md +49 -66
- package/docs/ja/specdojo/rulebooks/tsp-index-rulebook.md +64 -139
- package/docs/ja/specdojo/rulebooks/uis-rulebook.md +91 -161
- package/docs/ja/specdojo/rulebooks/utc-index-rulebook.md +49 -144
- package/docs/ja/specdojo/rulebooks/utc-rulebook.md +67 -155
- package/docs/ja/specdojo/samples/bac-sample.md +106 -21
- package/docs/ja/specdojo/samples/bdd-sample.yaml +143 -35
- package/docs/ja/specdojo/samples/bds-sample.md +87 -21
- package/docs/ja/specdojo/samples/bes-index-sample.md +42 -20
- package/docs/ja/specdojo/samples/bes-sample.md +70 -21
- package/docs/ja/specdojo/samples/bps-sample.md +42 -54
- package/docs/ja/specdojo/samples/br-sample.md +57 -15
- package/docs/ja/specdojo/samples/ccd-sample.md +80 -19
- package/docs/ja/specdojo/samples/cdfd-sample.md +172 -99
- package/docs/ja/specdojo/samples/cdfd-uc-sample.md +9 -7
- package/docs/ja/specdojo/samples/cdr-sample.md +78 -0
- package/docs/ja/specdojo/samples/cdsd-sample.md +73 -20
- package/docs/ja/specdojo/samples/cdt-sample.md +116 -0
- package/docs/ja/specdojo/samples/cld-sample.md +3 -30
- package/docs/ja/specdojo/samples/clis-sample.md +125 -0
- package/docs/ja/specdojo/samples/cnd-sample.md +127 -21
- package/docs/ja/specdojo/samples/cpd-sample.md +136 -22
- package/docs/ja/specdojo/samples/cxd-sample.md +108 -22
- package/docs/ja/specdojo/samples/dct-index-sample.yaml +63 -17
- package/docs/ja/specdojo/samples/dec-sample.md +2 -3
- package/docs/ja/specdojo/samples/dss-sample.md +175 -0
- package/docs/ja/specdojo/samples/gl-sample.yaml +50 -14
- package/docs/ja/specdojo/samples/ifd-sample.md +105 -21
- package/docs/ja/specdojo/samples/ifx-api-sample.yaml +0 -2
- package/docs/ja/specdojo/samples/ifx-cmd-sample.yaml +91 -60
- package/docs/ja/specdojo/samples/ifx-file-sample.md +462 -21
- package/docs/ja/specdojo/samples/ifx-index-sample.yaml +87 -19
- package/docs/ja/specdojo/samples/ifx-msg-sample.yaml +0 -2
- package/docs/ja/specdojo/samples/job-sequence.yaml +67 -0
- package/docs/ja/specdojo/samples/mip-index-sample.md +98 -20
- package/docs/ja/specdojo/samples/pm-communication-plan-sample.md +26 -19
- package/docs/ja/specdojo/samples/pm-members-sample.yaml +37 -13
- package/docs/ja/specdojo/samples/pm-organization-sample.md +42 -21
- package/docs/ja/specdojo/samples/pm-plan-sample.md +78 -26
- package/docs/ja/specdojo/samples/pm-quality-management-plan-sample.md +41 -22
- package/docs/ja/specdojo/samples/pm-raci-sample.md +63 -28
- package/docs/ja/specdojo/samples/pm-roles-sample.yaml +13 -12
- package/docs/ja/specdojo/samples/prj-assumptions-constraints-dependencies-sample.md +33 -25
- package/docs/ja/specdojo/samples/prj-charter-sample.md +42 -59
- package/docs/ja/specdojo/samples/prj-comparison-of-alternatives-sample.md +83 -62
- package/docs/ja/specdojo/samples/prj-success-criteria-and-acceptance-criteria-sample.md +30 -33
- package/docs/ja/specdojo/samples/sf-index-sample.md +47 -20
- package/docs/ja/specdojo/samples/sf-sample.md +109 -21
- package/docs/ja/specdojo/samples/sld-sample.md +88 -21
- package/docs/ja/specdojo/samples/stsd-sample.md +54 -26
- package/docs/ja/specdojo/samples/sysd-critical-flows-sample.md +166 -21
- package/docs/ja/specdojo/samples/sysd-cross-cutting-policy-sample.md +178 -21
- package/docs/ja/specdojo/samples/sysd-index-sample.md +82 -21
- package/docs/ja/specdojo/samples/tml-sample.yaml +4 -1
- package/docs/ja/specdojo/samples/uis-sample.md +141 -20
- package/docs/ja/specdojo/standards/document-metadata-standard.md +33 -4
- package/docs/ja/specdojo/standards/id-and-file-naming-standard.md +3 -1
- package/docs/ja/specdojo/standards/job-definition-standard.md +24 -9
- package/docs/ja/specdojo/standards/rulebook-authoring-standard.md +1 -0
- package/docs/ja/specdojo/templates/bac-template.md +76 -0
- package/docs/ja/specdojo/templates/bes-template.md +56 -0
- package/docs/ja/specdojo/templates/br-template.md +64 -0
- package/docs/ja/specdojo/templates/cdfd-template.md +81 -54
- package/docs/ja/specdojo/templates/cdfd-uc-template.md +9 -5
- package/docs/ja/specdojo/templates/cdr-template.md +58 -0
- package/docs/ja/specdojo/templates/cnd-template.md +137 -0
- package/docs/ja/specdojo/templates/cpd-template.md +129 -0
- package/docs/ja/specdojo/templates/cxd-template.md +105 -0
- package/docs/ja/specdojo/templates/dct-data-model-cdt-template.yaml +40 -0
- package/docs/ja/specdojo/templates/dct-data-model-cld-template.yaml +7 -14
- package/docs/ja/specdojo/templates/dct-index-template.md +9 -20
- package/docs/ja/specdojo/templates/dct-project-management-template.yaml +5 -1
- package/docs/ja/specdojo/templates/ifd-template.md +86 -0
- package/docs/ja/specdojo/templates/ifx-cmd-template.yaml +44 -28
- package/docs/ja/specdojo/templates/ifx-index-template.yaml +40 -0
- package/docs/ja/specdojo/templates/opr-template.md +2 -4
- package/docs/ja/specdojo/templates/pm-organization-template.md +9 -3
- package/docs/ja/specdojo/templates/pm-plan-template.md +4 -4
- package/docs/ja/specdojo/templates/pm-quality-management-plan-template.md +17 -9
- package/docs/ja/specdojo/templates/pm-raci-template.md +24 -13
- package/docs/ja/specdojo/templates/pm-roles-template.yaml +3 -2
- package/docs/ja/specdojo/templates/prj-assumptions-constraints-dependencies-template.md +6 -3
- package/docs/ja/specdojo/templates/prj-comparison-of-alternatives-template.md +22 -19
- package/docs/ja/specdojo/templates/stsd-template.md +46 -21
- package/docs/ja/specdojo/templates/sysd-critical-flows-template.md +94 -0
- package/docs/ja/specdojo/templates/sysd-cross-cutting-policy-template.md +122 -0
- package/docs/ja/specdojo/templates/sysd-index-template.md +89 -0
- package/docs/specdojo/lib/yaml-metadata.cjs +7 -0
- package/docs/specdojo/schemas/v1/bdd.schema.yaml +25 -57
- package/docs/specdojo/schemas/v1/condense-records.schema.yaml +26 -0
- package/docs/specdojo/schemas/v1/dct.schema.yaml +10 -0
- package/docs/specdojo/schemas/v1/deliverable-frontmatter.schema.yaml +3 -0
- package/docs/specdojo/schemas/v1/esil.schema.yaml +7 -141
- package/docs/specdojo/schemas/v1/exec-common.schema.yaml +5 -1
- package/docs/specdojo/schemas/v1/exec-defaults.schema.yaml +95 -8
- package/docs/specdojo/schemas/v1/exec-evidence.schema.yaml +38 -0
- package/docs/specdojo/schemas/v1/exec-plan-frontmatter.schema.yaml +14 -0
- package/docs/specdojo/schemas/v1/exec-result-frontmatter.schema.yaml +18 -0
- package/docs/specdojo/schemas/v1/finding-cause.schema.yaml +22 -0
- package/docs/specdojo/schemas/v1/grade-pipeline-state.schema.yaml +1 -1
- package/docs/specdojo/schemas/v1/grade-result.schema.yaml +2 -0
- package/docs/specdojo/schemas/v1/ifx-cmd.schema.yaml +65 -5
- package/docs/specdojo/schemas/v1/ifx-index.schema.yaml +142 -0
- package/docs/specdojo/schemas/v1/job-run.schema.yaml +23 -0
- package/docs/specdojo/schemas/v1/job.schema.yaml +63 -2
- package/docs/specdojo/schemas/v1/register-events.schema.yaml +2 -0
- package/docs/specdojo/schemas/v1/register-item-frontmatter.schema.yaml +17 -1
- package/docs/specdojo/schemas/v1/sch-strategy.schema.yaml +2 -2
- package/package.json +10 -7
- package/templates/antigravity/orchestrator.md +7 -3
- package/templates/claude/agents/specdojo-orchestrator.md +7 -3
- package/templates/codex/agents/specdojo-orchestrator.toml +7 -3
- package/templates/codex/orchestrator.md +7 -3
- package/templates/devcontainer/tmux.conf +6 -0
- package/templates/init-exec-defaults.yaml +13 -0
- package/templates/lefthook/tools/specdojo-pre-commit.mjs +8 -0
- package/templates/opencode/agents/specdojo-orchestrator.md +8 -4
|
@@ -1,30 +1,38 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { existsSync
|
|
1
|
+
import { readPlanFile } from "../../shared/plan-conventions.js";
|
|
2
|
+
import { executorStageResumeHint } from "../evidence.js";
|
|
3
|
+
import { existsSync } from "node:fs";
|
|
4
4
|
import { resolve } from "node:path";
|
|
5
|
-
import {
|
|
5
|
+
import { isAuthoringApproach } from "../../kata/authoring.js";
|
|
6
|
+
import { registerDependencyBlockReason } from "../../register/dependency.js";
|
|
6
7
|
import { loadConfig, resolveAgentMember, } from "../../shared/specdojo-config.js";
|
|
8
|
+
import { integrationCommitSkipHooks } from "../commit-hook-skips.js";
|
|
9
|
+
import { gradeCheckpointPaths } from "../grade-checkpoint.js";
|
|
10
|
+
import { pipelineStateLocation, readPipelineState } from "../pipeline-state.js";
|
|
11
|
+
import { integratedCommitRange, runPostIntegration } from "../post-integration.js";
|
|
12
|
+
import { buildInPlaceStem } from "../plans.js";
|
|
7
13
|
import { resolveProductBranches } from "../product-branches.js";
|
|
8
14
|
import { registerProductMessage } from "../register-product-message.js";
|
|
9
|
-
import {
|
|
15
|
+
import { findResumableRegisterRun } from "../register-resume.js";
|
|
10
16
|
import { generateRegisterPlan, requireRunnableRegisterItem, resolveRegisterRunTarget, sanitizeRegisterConclusion, ticketPathFromItem, } from "../register.js";
|
|
17
|
+
import { commitProductWorktrees, integrateTaskRepositories, PROJECT_REPO_NAME, projectMergeBlockers, RepoIntegrationError, } from "../repo-integration.js";
|
|
18
|
+
import { productIntegrationTrace, recordResultTrace, registerProjectMergeMessage, traceKey, } from "../repo-trace.js";
|
|
11
19
|
import { readResultFrontmatterSnapshot, scaffoldResult, updateResultStatus } from "../results.js";
|
|
12
|
-
import {
|
|
20
|
+
import { recordPathForRead, recordRef, runLogPath, taskRecordPaths } from "../run-records.js";
|
|
21
|
+
import { qualifyTaskId } from "../shared.js";
|
|
13
22
|
import { configuredProductRepos, integrationBranchOverrideRecord, reserveProductBranches, withProductRepoPrompt, } from "../task-repos.js";
|
|
14
|
-
import { checkpointAndEnsureWorktree, commitTargetPaths, commitWorktreeChanges, discardStaleExecWorktree, isExecBranchMergedIntoCurrent, mergeWorktreeIntoCurrent, removeWorktree, taskTargetsAtHead, WorktreeRemovedBranchDeletionError, worktreeStatusPaths, } from "../worktree-ops.js";
|
|
15
|
-
import {
|
|
16
|
-
import {
|
|
17
|
-
import { pipelineStateLocation, readPipelineState } from "../pipeline-state.js";
|
|
18
|
-
import { findResumableRegisterRun } from "../register-resume.js";
|
|
19
|
-
import { isAuthoringApproach } from "../../kata/authoring.js";
|
|
20
|
-
import { resolvePinnedRateLimitRunOptions, rateLimitRecoveryReason, } from "./shared.js";
|
|
21
|
-
import { agentEnvironment, expandPromptRefs, extractBlockReason, pathInsideWorktree, reportProductWorktrees, runWithRetry, } from "./agent.js";
|
|
23
|
+
import { checkpointAndEnsureWorktree, assertCommitScope, commitTargetPaths, commitWorktreeChanges, discardStaleExecWorktree, isExecBranchMergedIntoCurrent, mergeWorktreeIntoCurrent, removeWorktree, taskTargetsAtHead, WorktreeRemovedBranchDeletionError, UncommittedChangesError, worktreeStatusPaths, } from "../worktree-ops.js";
|
|
24
|
+
import { findExecWorktree, gitOutput, } from "../worktree.js";
|
|
25
|
+
import { isWorktreeCleanupInProgress, releaseWorktreeCleanupLock, tryAcquireWorktreeCleanupLock, worktreeCleanupInProgressReason, } from "../worktree-cleanup-lock.js";
|
|
22
26
|
import { runAgentPipeline } from "./agent-pipeline.js";
|
|
23
|
-
import {
|
|
27
|
+
import { DeferredCleanup, runWithDeferredCleanup } from "./deferred-cleanup.js";
|
|
28
|
+
import { agentEnvironment, expandPromptRefs, extractBlockReason, pathInsideWorktree, reportProductWorktrees, runWithRetry, } from "./agent.js";
|
|
24
29
|
import { commitSubject, integrateLogPath, recordIntegrateStage, recordRepoIntegration, repoRelativePath, } from "./mode-shared.js";
|
|
25
|
-
import {
|
|
26
|
-
import { commitRegisterState, registerPathsInsideWorktree, rebuildRootRegisterViews, registerWaitSummary, } from "./register-state.js";
|
|
30
|
+
import { isRegisterPipelineRequested, registerReporterManagedPaths, registerRunnerManagedPaths, resolveRegisterCommand, resolveRegisterPipelineCommand, spawnRegisterTransition, } from "./register-core.js";
|
|
27
31
|
import { runRegisterPostReview } from "./register-post-review.js";
|
|
32
|
+
import { commitRegisterState, rebuildRootRegisterViews, registerPathsInsideWorktree, registerWaitSummary, } from "./register-state.js";
|
|
33
|
+
import { downgradeUnfilledResult } from "./schedule-prepare.js";
|
|
34
|
+
import { appendScopeWaitNotes } from "./change-scope.js";
|
|
35
|
+
import { rateLimitRecoveryReason, resolvePinnedRateLimitRunOptions, } from "./shared.js";
|
|
28
36
|
// 全体再実行が既存 run の未統合成果を破棄しないための保護。既存 worktree に再開可能な run
|
|
29
37
|
// (executor 成功済みで reporter か統合が未完了)が残っている場合だけ理由を返し、呼び出し側が
|
|
30
38
|
// 破壊的操作(discardStaleExecWorktree)の手前で中断できるようにする。--force-restart で無効化できる。
|
|
@@ -52,49 +60,45 @@ export function protectResumableRegisterWorktree(context, opts, taskId, worktree
|
|
|
52
60
|
`its changes are still unintegrated in ${worktree.path}. ` +
|
|
53
61
|
`Resume the ${stage} stage with --resume, or discard the worktree with --force-restart.`);
|
|
54
62
|
}
|
|
55
|
-
// cleanup の再開までに別項目の commit が積まれても、対象 exec branch を最初に取り込んだ
|
|
56
|
-
// first-parent commit(runner が作った merge commit)だけを post-review の差分範囲にする。
|
|
57
|
-
function integratedRegisterCommitRange(repoRoot, branch) {
|
|
58
|
-
const tip = gitOutput(repoRoot, ["rev-parse", "--verify", `${branch}^{commit}`]).trim();
|
|
59
|
-
const outputCommit = gitOutput(repoRoot, [
|
|
60
|
-
"rev-list",
|
|
61
|
-
"--first-parent",
|
|
62
|
-
"--ancestry-path",
|
|
63
|
-
`${tip}..HEAD`,
|
|
64
|
-
])
|
|
65
|
-
.split("\n")
|
|
66
|
-
.map((line) => line.trim())
|
|
67
|
-
.filter(Boolean)
|
|
68
|
-
.at(-1);
|
|
69
|
-
if (!outputCommit) {
|
|
70
|
-
throw new Error(`could not locate integrated commit for register branch: ${branch}`);
|
|
71
|
-
}
|
|
72
|
-
const baseCommit = gitOutput(repoRoot, ["rev-parse", `${outputCommit}^1`]).trim();
|
|
73
|
-
return { baseCommit, outputCommit };
|
|
74
|
-
}
|
|
75
63
|
// register worktree 実行の Phase 3(成果物統合と状態遷移)。成功なら worktree の成果物を
|
|
76
64
|
// commit → worktree 側で register review → 統合ブランチへ merge commit 1件 → worktree 撤去、
|
|
77
65
|
// 失敗なら worktree を保持したまま waiting へ戻す(wait commit 1件)。通常実行・reporter 再開・
|
|
78
66
|
// 統合再開で同じ後処理を通す。統合ブランチの first-parent に増えるのは、成功時の merge commit
|
|
79
67
|
// (start → review の遷移事象、plan / result、成果物を含む)か失敗時の wait commit だけになる。
|
|
80
|
-
|
|
68
|
+
// 撤去は lifecycleLock の外で行い、その後の派生ビューの再生成と post-review はロックを取り直して
|
|
69
|
+
// 行う(PJR-NHT7)。
|
|
70
|
+
export function finalizeRegisterWorktreeRun(params) {
|
|
71
|
+
return runWithDeferredCleanup(params.lifecycleLock, () => integrateRegisterWorktreeRun(params));
|
|
72
|
+
}
|
|
73
|
+
async function integrateRegisterWorktreeRun(params) {
|
|
81
74
|
const { context, registerPaths, item, ticketPath, worktree, stem, agentResult, actor } = params;
|
|
82
75
|
const { projectId, schedulePath, executionPath, repoRoot } = context;
|
|
83
76
|
const wtContext = { repoRoot, schedulePath, executionPath };
|
|
77
|
+
const postIntegration = (baseCommit, outputCommit) => runPostIntegration({
|
|
78
|
+
entries: context.execDefaults.pipeline?.post_integration,
|
|
79
|
+
repoRoot,
|
|
80
|
+
baseCommit,
|
|
81
|
+
outputCommit,
|
|
82
|
+
logPath: runLogPath(resolve(repoRoot, repoRelativePath(worktree.path, params.worktreeResultPath)), "post-integration.log"),
|
|
83
|
+
});
|
|
84
|
+
const bookkeepingPaths = typeof params.bookkeepingPaths === "function"
|
|
85
|
+
? params.bookkeepingPaths()
|
|
86
|
+
: params.bookkeepingPaths;
|
|
84
87
|
const worktreeRegisterPaths = registerPathsInsideWorktree(repoRoot, worktree.path, registerPaths);
|
|
85
88
|
const worktreeTicketPath = ticketPath
|
|
86
89
|
? pathInsideWorktree(repoRoot, worktree.path, ticketPath)
|
|
87
90
|
: null;
|
|
88
|
-
const waitSummary = (reason) => registerWaitSummary({
|
|
91
|
+
const waitSummary = (reason, reasonMaxLength) => registerWaitSummary({
|
|
89
92
|
repoRoot,
|
|
90
93
|
projectId,
|
|
91
94
|
registerPaths,
|
|
92
95
|
item,
|
|
93
96
|
ticketPath,
|
|
94
97
|
reason,
|
|
98
|
+
reasonMaxLength,
|
|
95
99
|
actor,
|
|
96
100
|
worktree,
|
|
97
|
-
bookkeepingPaths
|
|
101
|
+
bookkeepingPaths,
|
|
98
102
|
});
|
|
99
103
|
const postReview = async (baseCommit, outputCommit) => {
|
|
100
104
|
if (!context.postReview)
|
|
@@ -109,7 +113,7 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
109
113
|
item,
|
|
110
114
|
ticketPath,
|
|
111
115
|
stem,
|
|
112
|
-
editPlanPath:
|
|
116
|
+
editPlanPath: recordPathForRead(context.executionPath, "plan", stem),
|
|
113
117
|
editResultPath: resolve(repoRoot, repoRelativePath(worktree.path, params.worktreeResultPath)),
|
|
114
118
|
baseCommit,
|
|
115
119
|
outputCommit,
|
|
@@ -126,8 +130,70 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
126
130
|
reason: reviewed.reason,
|
|
127
131
|
};
|
|
128
132
|
};
|
|
133
|
+
const blockedInReview = (error, prefix) => {
|
|
134
|
+
const reason = sanitizeRegisterConclusion(`${prefix}: ${error instanceof Error ? error.message : String(error)}`, error instanceof UncommittedChangesError ? 4000 : undefined);
|
|
135
|
+
const integrateFailedAt = new Date().toISOString();
|
|
136
|
+
recordIntegrateStage(params.pipelineStatePath, integrateFailedAt, () => ({
|
|
137
|
+
status: "failed",
|
|
138
|
+
completed_at: integrateFailedAt,
|
|
139
|
+
}));
|
|
140
|
+
process.stdout.write(` Blocked: ${item.id} (worktree kept: ${worktree.path})\n`);
|
|
141
|
+
return {
|
|
142
|
+
id: item.id,
|
|
143
|
+
title: item.title,
|
|
144
|
+
outcome: "failure",
|
|
145
|
+
transition: "review",
|
|
146
|
+
commit: "incomplete",
|
|
147
|
+
reason,
|
|
148
|
+
...(error instanceof UncommittedChangesError ? { uncommittedFiles: error.files.length } : {}),
|
|
149
|
+
};
|
|
150
|
+
};
|
|
151
|
+
// merge の後の撤去をロックの外へ回す。root はすでに review で、撤去だけが失敗した場合は
|
|
152
|
+
// review を維持して `--resume` で cleanup だけをやり直す。撤去後の branch 削除だけが失敗した
|
|
153
|
+
// 場合は、成果の統合を取り消さず cleanup 警告として扱う。worktree ごとのロックは
|
|
154
|
+
// exec-lifecycle のロックの中で取り、同じ項目の再実行・再開が撤去と重ならないようにする。
|
|
155
|
+
const deferCleanup = (baseCommit, outputCommit) => {
|
|
156
|
+
const worktreeTaskId = qualifyTaskId(projectId, item.id);
|
|
157
|
+
const cleanupLock = tryAcquireWorktreeCleanupLock(executionPath, worktreeTaskId, actor);
|
|
158
|
+
if (!cleanupLock) {
|
|
159
|
+
rebuildRootRegisterViews(projectId, item.id);
|
|
160
|
+
return blockedInReview(new Error(worktreeCleanupInProgressReason(worktreeTaskId)), "integrate cleanup failed");
|
|
161
|
+
}
|
|
162
|
+
return new DeferredCleanup(() => {
|
|
163
|
+
try {
|
|
164
|
+
removeWorktree({ context: wtContext, worktree, taskId: stem, deleteBranch: true });
|
|
165
|
+
}
|
|
166
|
+
finally {
|
|
167
|
+
releaseWorktreeCleanupLock(cleanupLock);
|
|
168
|
+
}
|
|
169
|
+
}, async (outcome) => {
|
|
170
|
+
if (!outcome.ok) {
|
|
171
|
+
if (!(outcome.error instanceof WorktreeRemovedBranchDeletionError)) {
|
|
172
|
+
rebuildRootRegisterViews(projectId, item.id);
|
|
173
|
+
return blockedInReview(outcome.error, "integrate cleanup failed");
|
|
174
|
+
}
|
|
175
|
+
process.stderr.write(`Warning: ${outcome.error.message}; run exec worktree prune.\n`);
|
|
176
|
+
}
|
|
177
|
+
// review は merge で root の個票に入る。非追跡の派生ビューだけ root で作り直す。
|
|
178
|
+
rebuildRootRegisterViews(projectId, item.id);
|
|
179
|
+
const reviewed = await postReview(baseCommit, outputCommit);
|
|
180
|
+
if (reviewed)
|
|
181
|
+
return reviewed;
|
|
182
|
+
const sha = gitOutput(repoRoot, ["rev-parse", "--short", "HEAD"]).trim();
|
|
183
|
+
process.stdout.write(`run done: ${item.id} (status: review — confirm and close with "register close")\n`);
|
|
184
|
+
return {
|
|
185
|
+
id: item.id,
|
|
186
|
+
title: item.title,
|
|
187
|
+
outcome: "success",
|
|
188
|
+
transition: "review",
|
|
189
|
+
commit: `committed ${sha}`,
|
|
190
|
+
};
|
|
191
|
+
});
|
|
192
|
+
};
|
|
129
193
|
const completedAt = new Date().toISOString();
|
|
130
194
|
const worktreeResultPath = params.worktreeResultPath;
|
|
195
|
+
const scopeLogPath = integrateLogPath(params.pipelineStatePath) ??
|
|
196
|
+
taskRecordPaths(resolve(worktree.path, repoRelativePath(repoRoot, executionPath)), item.id, stem).log("integrate.log");
|
|
131
197
|
const { result: effectiveResult, unfilledBlock } = downgradeUnfilledResult(agentResult, worktreeResultPath, "edit", params.resultScaffold);
|
|
132
198
|
if (effectiveResult === "success") {
|
|
133
199
|
// A prior integration attempt may have completed the merge and failed only while removing the
|
|
@@ -136,8 +202,14 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
136
202
|
// exec branch here would force a second merge commit for the same task.
|
|
137
203
|
if (params.resumedIntegration &&
|
|
138
204
|
isExecBranchMergedIntoCurrent({ context: wtContext, worktree })) {
|
|
139
|
-
|
|
205
|
+
await params.opts.onScopeIntegrated?.();
|
|
206
|
+
const worktreeTaskId = qualifyTaskId(projectId, item.id);
|
|
207
|
+
if (isWorktreeCleanupInProgress(executionPath, worktreeTaskId)) {
|
|
208
|
+
return blockedInReview(new Error(worktreeCleanupInProgressReason(worktreeTaskId)), "integrate cleanup failed");
|
|
209
|
+
}
|
|
210
|
+
const { baseCommit, outputCommit } = integratedCommitRange(repoRoot, worktree.branch);
|
|
140
211
|
try {
|
|
212
|
+
assertCommitScope(wtContext, worktree, stem, { scopeLogPath });
|
|
141
213
|
const lifecyclePaths = new Set([worktreeResultPath, params.pipelineStatePath]
|
|
142
214
|
.filter((path) => !!path)
|
|
143
215
|
.map((path) => repoRelativePath(worktree.path, path)));
|
|
@@ -157,43 +229,12 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
157
229
|
]);
|
|
158
230
|
}
|
|
159
231
|
process.stdout.write(` [integrate] already merged: ${worktree.branch} (skipping transitions, commit, and merge)\n`);
|
|
160
|
-
removeWorktree({ context: wtContext, worktree, taskId: stem, deleteBranch: true });
|
|
161
232
|
}
|
|
162
233
|
catch (error) {
|
|
163
|
-
|
|
164
|
-
process.stderr.write(`Warning: ${error.message}; run exec worktree prune.\n`);
|
|
165
|
-
}
|
|
166
|
-
else {
|
|
167
|
-
const reason = sanitizeRegisterConclusion(`integrate cleanup failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
168
|
-
const integrateFailedAt = new Date().toISOString();
|
|
169
|
-
recordIntegrateStage(params.pipelineStatePath, integrateFailedAt, () => ({
|
|
170
|
-
status: "failed",
|
|
171
|
-
completed_at: integrateFailedAt,
|
|
172
|
-
}));
|
|
173
|
-
process.stdout.write(` Blocked: ${item.id} (worktree kept: ${worktree.path})\n`);
|
|
174
|
-
return {
|
|
175
|
-
id: item.id,
|
|
176
|
-
title: item.title,
|
|
177
|
-
outcome: "failure",
|
|
178
|
-
transition: "review",
|
|
179
|
-
commit: "incomplete",
|
|
180
|
-
reason,
|
|
181
|
-
};
|
|
182
|
-
}
|
|
234
|
+
return blockedInReview(error, "integrate cleanup failed");
|
|
183
235
|
}
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
if (reviewed)
|
|
187
|
-
return reviewed;
|
|
188
|
-
const sha = gitOutput(repoRoot, ["rev-parse", "--short", "HEAD"]).trim();
|
|
189
|
-
process.stdout.write(`run done: ${item.id} (status: review — confirm and close with "register close")\n`);
|
|
190
|
-
return {
|
|
191
|
-
id: item.id,
|
|
192
|
-
title: item.title,
|
|
193
|
-
outcome: "success",
|
|
194
|
-
transition: "review",
|
|
195
|
-
commit: `committed ${sha}`,
|
|
196
|
-
};
|
|
236
|
+
await postIntegration(baseCommit, outputCommit);
|
|
237
|
+
return deferCleanup(baseCommit, outputCommit);
|
|
197
238
|
}
|
|
198
239
|
await updateResultStatus(worktreeResultPath, "complete", completedAt);
|
|
199
240
|
const baseCommit = gitOutput(repoRoot, ["rev-parse", "HEAD"]).trim();
|
|
@@ -224,11 +265,15 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
224
265
|
try {
|
|
225
266
|
const productNames = (worktree.repos ?? []).map((product) => product.name);
|
|
226
267
|
try {
|
|
268
|
+
assertCommitScope(wtContext, worktree, stem, {
|
|
269
|
+
scopeLogPath,
|
|
270
|
+
allowEditedPlan: params.resumedExecutor === true,
|
|
271
|
+
});
|
|
227
272
|
const productOutcomes = commitProductWorktrees({
|
|
228
273
|
worktree,
|
|
229
274
|
message: (product) => productMessage(product, "commit"),
|
|
230
275
|
targets: taskTargetsAtHead(wtContext, worktree, stem),
|
|
231
|
-
scopeLogPath
|
|
276
|
+
scopeLogPath,
|
|
232
277
|
failureLogPath: integrateLogPath(params.pipelineStatePath),
|
|
233
278
|
resultPath: worktreeResultPath,
|
|
234
279
|
});
|
|
@@ -238,10 +283,16 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
238
283
|
worktree,
|
|
239
284
|
taskId: stem,
|
|
240
285
|
message: subject,
|
|
241
|
-
scopeLogPath
|
|
286
|
+
scopeLogPath,
|
|
242
287
|
failureLogPath: integrateLogPath(params.pipelineStatePath),
|
|
243
288
|
productsIntegratedByCaller: true,
|
|
244
289
|
productRootNewFiles,
|
|
290
|
+
allowEditedPlan: params.resumedExecutor === true,
|
|
291
|
+
skipHooks: integrationCommitSkipHooks({
|
|
292
|
+
pipeline: context.execDefaults.pipeline,
|
|
293
|
+
worktreePath: worktree.path,
|
|
294
|
+
pipelineStatePath: params.pipelineStatePath,
|
|
295
|
+
}),
|
|
245
296
|
});
|
|
246
297
|
}
|
|
247
298
|
catch (error) {
|
|
@@ -251,6 +302,8 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
251
302
|
status: "failed",
|
|
252
303
|
error: message,
|
|
253
304
|
});
|
|
305
|
+
if (error instanceof UncommittedChangesError)
|
|
306
|
+
throw error;
|
|
254
307
|
throw new RepoIntegrationError({
|
|
255
308
|
repo,
|
|
256
309
|
cause: message,
|
|
@@ -280,8 +333,8 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
280
333
|
context: wtContext,
|
|
281
334
|
worktree,
|
|
282
335
|
taskId: stem,
|
|
283
|
-
releasePaths:
|
|
284
|
-
ownedPaths:
|
|
336
|
+
releasePaths: bookkeepingPaths,
|
|
337
|
+
ownedPaths: bookkeepingPaths,
|
|
285
338
|
}),
|
|
286
339
|
beforeProjectMerge: () => {
|
|
287
340
|
// review は exec branch 側(worktree)で記録し、最後の project merge commit に
|
|
@@ -321,71 +374,49 @@ export async function finalizeRegisterWorktreeRun(params) {
|
|
|
321
374
|
worktree,
|
|
322
375
|
taskId: stem,
|
|
323
376
|
message: mergeMessage,
|
|
324
|
-
releaseRootPaths: [...
|
|
377
|
+
releaseRootPaths: [...bookkeepingPaths],
|
|
325
378
|
// waiting を複数回経た項目では、wait 時の同期後も統合先と exec branch の双方で
|
|
326
379
|
// 記帳ファイルが変わる。項目自身の記帳ファイルだけの競合は exec branch 側で解決する。
|
|
327
|
-
resolveConflictsWithBranchPaths: [...
|
|
380
|
+
resolveConflictsWithBranchPaths: [...bookkeepingPaths],
|
|
328
381
|
failureLogPath: integrateLogPath(params.pipelineStatePath),
|
|
329
382
|
}),
|
|
330
383
|
record: (repo, patch) => recordRepoIntegration(params.pipelineStatePath, repo, patch),
|
|
331
384
|
failureLogPath: integrateLogPath(params.pipelineStatePath),
|
|
332
385
|
lockPath: schedulePath,
|
|
333
386
|
});
|
|
334
|
-
// 撤去も統合の一部として扱う。merge 前に失敗した場合は waiting へ戻し、merge 後の撤去
|
|
335
|
-
// だけが失敗した場合は review を維持して `--resume` で cleanup だけをやり直す。撤去後の
|
|
336
|
-
// branch 削除だけが失敗した場合は、成果の統合を取り消さず cleanup 警告として扱う。
|
|
337
|
-
removeWorktree({ context: wtContext, worktree, taskId: stem, deleteBranch: true });
|
|
338
387
|
}
|
|
339
388
|
catch (error) {
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
}
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
recordIntegrateStage(params.pipelineStatePath, integrateFailedAt, () => ({
|
|
349
|
-
status: "failed",
|
|
350
|
-
completed_at: integrateFailedAt,
|
|
351
|
-
}));
|
|
352
|
-
// The merge may already have succeeded and only worktree removal failed. Root now contains
|
|
353
|
-
// the complete result and review transition; adding a wait commit would create a second
|
|
354
|
-
// first-parent entry and a resume would create a third. Keep review intact and let
|
|
355
|
-
// integration resume perform cleanup only.
|
|
356
|
-
if (isExecBranchMergedIntoCurrent({ context: wtContext, worktree })) {
|
|
357
|
-
rebuildRootRegisterViews(projectId, item.id);
|
|
358
|
-
process.stdout.write(` Blocked: ${item.id} (worktree kept: ${worktree.path})\n`);
|
|
359
|
-
return {
|
|
360
|
-
id: item.id,
|
|
361
|
-
title: item.title,
|
|
362
|
-
outcome: "failure",
|
|
363
|
-
transition: "review",
|
|
364
|
-
commit: "incomplete",
|
|
365
|
-
reason,
|
|
366
|
-
};
|
|
367
|
-
}
|
|
368
|
-
await updateResultStatus(worktreeResultPath, "blocked", completedAt, reason);
|
|
369
|
-
process.stdout.write(` Blocked: ${item.id} (worktree kept: ${worktree.path})\n`);
|
|
370
|
-
const summary = waitSummary(reason);
|
|
371
|
-
return { ...summary, commit: "incomplete" };
|
|
389
|
+
// The merge may already have succeeded and only a later step failed. Root now contains the
|
|
390
|
+
// complete result and review transition; adding a wait commit would create a second
|
|
391
|
+
// first-parent entry and a resume would create a third. Keep review intact and let
|
|
392
|
+
// integration resume perform cleanup only.
|
|
393
|
+
if (isExecBranchMergedIntoCurrent({ context: wtContext, worktree })) {
|
|
394
|
+
await params.opts.onScopeIntegrated?.();
|
|
395
|
+
rebuildRootRegisterViews(projectId, item.id);
|
|
396
|
+
return blockedInReview(error, "integrate failed");
|
|
372
397
|
}
|
|
398
|
+
const reason = sanitizeRegisterConclusion(`integrate failed: ${error instanceof Error ? error.message : String(error)}`, error instanceof UncommittedChangesError ? 4000 : undefined);
|
|
399
|
+
const integrateFailedAt = new Date().toISOString();
|
|
400
|
+
recordIntegrateStage(params.pipelineStatePath, integrateFailedAt, () => ({
|
|
401
|
+
status: "failed",
|
|
402
|
+
completed_at: integrateFailedAt,
|
|
403
|
+
}));
|
|
404
|
+
await updateResultStatus(worktreeResultPath, "blocked", completedAt, reason);
|
|
405
|
+
process.stdout.write(` Blocked: ${item.id} (worktree kept: ${worktree.path})\n`);
|
|
406
|
+
const scopeError = error instanceof UncommittedChangesError;
|
|
407
|
+
const summary = waitSummary(reason, scopeError ? 4000 : undefined);
|
|
408
|
+
return {
|
|
409
|
+
...summary,
|
|
410
|
+
commit: "incomplete",
|
|
411
|
+
...(scopeError ? { uncommittedFiles: error.files.length } : {}),
|
|
412
|
+
};
|
|
373
413
|
}
|
|
374
|
-
// review は merge で root の個票に入る。非追跡の派生ビューだけ root で作り直す。
|
|
375
|
-
rebuildRootRegisterViews(projectId, item.id);
|
|
376
414
|
const outputCommit = gitOutput(repoRoot, ["rev-parse", "HEAD"]).trim();
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
return {
|
|
383
|
-
id: item.id,
|
|
384
|
-
title: item.title,
|
|
385
|
-
outcome: "success",
|
|
386
|
-
transition: "review",
|
|
387
|
-
commit: `committed ${sha}`,
|
|
388
|
-
};
|
|
415
|
+
await postIntegration(baseCommit, outputCommit);
|
|
416
|
+
await params.opts.onScopeIntegrated?.();
|
|
417
|
+
// post-review の差分範囲は、撤去を待つ間に別項目の commit が積まれても変わらないよう、
|
|
418
|
+
// merge の直後の HEAD で固定する。
|
|
419
|
+
return deferCleanup(baseCommit, outputCommit);
|
|
389
420
|
}
|
|
390
421
|
// 失敗 / rate limit: worktree は保持し(調査・再開のため)、waiting へ遷移する。
|
|
391
422
|
const baseReason = params.runnerBlockReason
|
|
@@ -440,9 +471,7 @@ export async function runSingleRegisterItemWorktree(context, opts, pjrId, lifecy
|
|
|
440
471
|
const resolvedProvider = provider ?? resolveAgentMember(context.roster, actor)?.provider;
|
|
441
472
|
const stem = buildInPlaceStem(pjrId.toLowerCase());
|
|
442
473
|
const worktreeTaskId = qualifyTaskId(projectId, item.id);
|
|
443
|
-
const pipelineRunId = pipelineAgents
|
|
444
|
-
? `${new Date().toISOString().replace(/[-:.]/g, "")}-${randomHex(4)}`
|
|
445
|
-
: undefined;
|
|
474
|
+
const pipelineRunId = pipelineAgents ? stem : undefined;
|
|
446
475
|
// PJR-98G4: repos を宣言した project では、プロダクトの worktree も同じタスクの下に作る。
|
|
447
476
|
// PJR-XRAB: --integration-branch は設定の integration_branch より優先する。
|
|
448
477
|
const products = resolveProductBranches(configuredProductRepos(schedulePath, opts.integrationBranch), {
|
|
@@ -468,6 +497,19 @@ export async function runSingleRegisterItemWorktree(context, opts, pjrId, lifecy
|
|
|
468
497
|
commit: "skipped",
|
|
469
498
|
reason,
|
|
470
499
|
};
|
|
500
|
+
// 前の run の統合の後の撤去がロックの外で進んでいる間は、同じ worktree を破棄しない。
|
|
501
|
+
if (isWorktreeCleanupInProgress(executionPath, worktreeTaskId)) {
|
|
502
|
+
const busy = worktreeCleanupInProgressReason(worktreeTaskId);
|
|
503
|
+
process.stderr.write(`${busy}\n`);
|
|
504
|
+
return {
|
|
505
|
+
id: item.id,
|
|
506
|
+
title: item.title,
|
|
507
|
+
outcome: "failure",
|
|
508
|
+
transition: "none",
|
|
509
|
+
commit: "off",
|
|
510
|
+
reason: sanitizeRegisterConclusion(busy),
|
|
511
|
+
};
|
|
512
|
+
}
|
|
471
513
|
// executor が成功した run の worktree を、全体再実行が破棄しないよう保護する。
|
|
472
514
|
// discardStaleExecWorktree は worktree と exec ブランチを強制削除するため、未コミットの
|
|
473
515
|
// executor 成果が失われる。この場合は何も壊さずに中断し、再開か明示的な破棄を促す。
|
|
@@ -498,14 +540,15 @@ export async function runSingleRegisterItemWorktree(context, opts, pjrId, lifecy
|
|
|
498
540
|
item,
|
|
499
541
|
stem,
|
|
500
542
|
});
|
|
501
|
-
|
|
543
|
+
appendScopeWaitNotes(planPath, opts.changeScopeWaits);
|
|
544
|
+
const prompt = expandPromptRefs(readPlanFile(planPath));
|
|
502
545
|
const { resultPath, supersededPaths } = await scaffoldResult({
|
|
503
546
|
executionPath,
|
|
504
547
|
taskId: item.id,
|
|
505
548
|
mode: "edit",
|
|
506
549
|
projectId,
|
|
507
550
|
origin: "register",
|
|
508
|
-
planRef:
|
|
551
|
+
planRef: recordRef(executionPath, planPath),
|
|
509
552
|
agent: actor,
|
|
510
553
|
startedAt: new Date().toISOString(),
|
|
511
554
|
stem,
|
|
@@ -605,6 +648,7 @@ export async function runSingleRegisterItemWorktree(context, opts, pjrId, lifecy
|
|
|
605
648
|
planPrompt: prompt,
|
|
606
649
|
resultPath: worktreeResultPathForPipeline,
|
|
607
650
|
registerPaths: registerReporterManagedPaths(registerPaths),
|
|
651
|
+
executorResumeHint: executorStageResumeHint({ kind: "register", itemId: item.id }),
|
|
608
652
|
execDefaults: context.execDefaults,
|
|
609
653
|
providerConcurrencyGate: context.providerConcurrencyGate,
|
|
610
654
|
productWorktrees: worktree.repos,
|
|
@@ -636,7 +680,8 @@ export async function runSingleRegisterItemWorktree(context, opts, pjrId, lifecy
|
|
|
636
680
|
transitionReason = rateLimitRecoveryReason(outcome.rateLimitEvents) || undefined;
|
|
637
681
|
}
|
|
638
682
|
// Phase 3: 成果物統合と状態遷移(root で直列化)。通常実行と再開経路で共通化する。
|
|
639
|
-
|
|
683
|
+
// worktree の撤去は finalize がロックの外で行う。
|
|
684
|
+
return finalizeRegisterWorktreeRun({
|
|
640
685
|
context,
|
|
641
686
|
opts,
|
|
642
687
|
registerPaths,
|
|
@@ -653,6 +698,6 @@ export async function runSingleRegisterItemWorktree(context, opts, pjrId, lifecy
|
|
|
653
698
|
pipelineStatePath,
|
|
654
699
|
runnerBlockReason: pipelineBlockReason,
|
|
655
700
|
transitionReason,
|
|
701
|
+
lifecycleLock,
|
|
656
702
|
});
|
|
657
|
-
return lifecycleLock ? lifecycleLock.runExclusive(finalize) : finalize();
|
|
658
703
|
}
|