specdojo 0.3.1 → 0.4.1

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 (260) hide show
  1. package/.github/agents/specdojo-orchestrator.md +61 -2
  2. package/CHANGELOG.md +90 -0
  3. package/README.md +85 -25
  4. package/dist/{catalog-build-references.js → catalog/build-references.js} +4 -4
  5. package/dist/catalog/build-render.js +32 -0
  6. package/dist/{catalog-build.js → catalog/build.js} +9 -9
  7. package/dist/{catalog.js → catalog/catalog.js} +10 -10
  8. package/dist/{catalog-generate.js → catalog/generate.js} +8 -8
  9. package/dist/catalog/paths.js +1 -0
  10. package/dist/{catalog-plan-generate.js → catalog/plan-generate.js} +4 -4
  11. package/dist/{catalog-plan.js → catalog/plan.js} +4 -4
  12. package/dist/{catalog-scaffold.js → catalog/scaffold.js} +3 -3
  13. package/dist/{agent.js → commands/agent.js} +11 -11
  14. package/dist/{build-command.js → commands/build.js} +2 -2
  15. package/dist/{init-command.js → commands/init.js} +168 -45
  16. package/dist/commands/night-orchestrator.js +287 -0
  17. package/dist/{orchestrator.js → commands/orchestrator.js} +12 -5
  18. package/dist/{watch.js → commands/watch.js} +3 -3
  19. package/dist/{dashboard-timeline.js → dashboard/dashboard-timeline.js} +2 -2
  20. package/dist/{dashboard.js → dashboard/dashboard.js} +11 -10
  21. package/dist/{dashboard-exec-records.js → dashboard/exec-records.js} +2 -2
  22. package/dist/{dashboard-routines.js → dashboard/routines.js} +6 -5
  23. package/dist/{dashboard-shared.js → dashboard/shared.js} +1 -1
  24. package/dist/{timeline-build.js → dashboard/timeline-build.js} +2 -1
  25. package/dist/{timeline.js → dashboard/timeline.js} +1 -1
  26. package/dist/{deliverable.js → deliverable/deliverable.js} +5 -5
  27. package/dist/{deliverable-trash.js → deliverable/trash.js} +5 -5
  28. package/dist/{devcontainer-command.js → devcontainer/command.js} +8 -4
  29. package/dist/devcontainer/scaffold.js +418 -0
  30. package/dist/{doc-index.js → docs/doc-index.js} +1 -1
  31. package/dist/{frontmatter-namespace.js → docs/frontmatter-namespace.js} +1 -1
  32. package/dist/{index-command.js → docs/index-command.js} +1 -1
  33. package/dist/docs/template-resolution.js +1 -0
  34. package/dist/{viewpoint-document-kinds-check.js → docs/viewpoint-document-kinds-check.js} +1 -1
  35. package/dist/{yaml-pages-command.js → docs/yaml-pages-command.js} +1 -1
  36. package/dist/{yaml-pages.js → docs/yaml-pages.js} +2 -2
  37. package/dist/{exec-agent-config.js → exec/agent-config.js} +92 -5
  38. package/dist/{exec-agent-git-state.js → exec/agent-git-state.js} +1 -1
  39. package/dist/{exec-agent-protected-config.js → exec/agent-protected-config.js} +1 -1
  40. package/dist/{exec-commands.js → exec/commands.js} +22 -18
  41. package/dist/{exec-core.js → exec/core.js} +11 -11
  42. package/dist/{exec-events.js → exec/events.js} +2 -2
  43. package/dist/{exec-evidence.js → exec/evidence.js} +11 -6
  44. package/dist/exec/exec.js +2 -0
  45. package/dist/exec/format.js +1 -0
  46. package/dist/{exec-handoff.js → exec/handoff.js} +13 -12
  47. package/dist/{exec-limit.js → exec/limit.js} +93 -12
  48. package/dist/{exec-parent-validation.js → exec/parent-validation.js} +18 -4
  49. package/dist/{exec-pipeline-state.js → exec/pipeline-state.js} +29 -2
  50. package/dist/{exec-plans-core.js → exec/plans-core.js} +68 -114
  51. package/dist/{exec-plans-generation.js → exec/plans-generation.js} +53 -10
  52. package/dist/{exec-plans-storage.js → exec/plans-storage.js} +5 -5
  53. package/dist/{exec-plans.js → exec/plans.js} +3 -3
  54. package/dist/{exec-project.js → exec/project.js} +1 -1
  55. package/dist/{exec-protection-handoff.js → exec/protection-handoff.js} +3 -3
  56. package/dist/{exec-register-resume.js → exec/register-resume.js} +2 -2
  57. package/dist/{exec-register.js → exec/register.js} +114 -9
  58. package/dist/{exec-repo-integration-git.js → exec/repo-integration-git.js} +2 -2
  59. package/dist/{exec-repo-integration-sync.js → exec/repo-integration-sync.js} +4 -4
  60. package/dist/{exec-repo-integration.js → exec/repo-integration.js} +14 -11
  61. package/dist/{exec-repo-trace.js → exec/repo-trace.js} +3 -3
  62. package/dist/{exec-reporter-output.js → exec/reporter-output.js} +2 -2
  63. package/dist/{exec-reporter.js → exec/reporter.js} +142 -25
  64. package/dist/{exec-results.js → exec/results.js} +287 -31
  65. package/dist/{exec-run-agent-pipeline.js → exec/run/agent-pipeline.js} +35 -12
  66. package/dist/{exec-run-agent.js → exec/run/agent.js} +115 -28
  67. package/dist/{exec-run-in-place.js → exec/run/in-place.js} +56 -27
  68. package/dist/{exec-run-job.js → exec/run/job.js} +65 -36
  69. package/dist/{exec-run-lifecycle-commands.js → exec/run/lifecycle-commands.js} +30 -22
  70. package/dist/{exec-run-lock.js → exec/run/lock.js} +4 -3
  71. package/dist/{exec-run-mode-shared.js → exec/run/mode-shared.js} +3 -3
  72. package/dist/{exec-run-register-command.js → exec/run/register-command.js} +38 -11
  73. package/dist/{exec-run-register-core.js → exec/run/register-core.js} +63 -21
  74. package/dist/{exec-run-register-mode.js → exec/run/register-mode.js} +58 -31
  75. package/dist/exec/run/register-post-review.js +420 -0
  76. package/dist/{exec-run-register-resume.js → exec/run/register-resume.js} +48 -27
  77. package/dist/{exec-run-register-state.js → exec/run/register-state.js} +13 -10
  78. package/dist/{exec-run-register-worktree.js → exec/run/register-worktree.js} +119 -24
  79. package/dist/{exec-run.js → exec/run/run.js} +11 -11
  80. package/dist/{exec-run-schedule-mode.js → exec/run/schedule-mode.js} +17 -17
  81. package/dist/{exec-run-schedule-prepare.js → exec/run/schedule-prepare.js} +31 -18
  82. package/dist/{exec-run-schedule-task.js → exec/run/schedule-task.js} +45 -18
  83. package/dist/{exec-run-shared.js → exec/run/shared.js} +78 -30
  84. package/dist/{exec-schedule-calendar.js → exec/schedule/calendar.js} +1 -1
  85. package/dist/{exec-schedule-cpm.js → exec/schedule/cpm.js} +2 -2
  86. package/dist/{exec-schedule-gantt-chart-render.js → exec/schedule/gantt-chart-render.js} +2 -2
  87. package/dist/exec/schedule/gantt-chart.js +2 -0
  88. package/dist/{exec-schedule-hash.js → exec/schedule/hash.js} +2 -2
  89. package/dist/exec/schedule/index.js +1 -0
  90. package/dist/{exec-schedule-initial.js → exec/schedule/initial.js} +2 -2
  91. package/dist/{exec-schedule-progress.js → exec/schedule/progress.js} +2 -2
  92. package/dist/{exec-schedule-ready.js → exec/schedule/ready.js} +2 -2
  93. package/dist/{exec-schedule.js → exec/schedule/schedule.js} +11 -11
  94. package/dist/exec/shared.js +63 -0
  95. package/dist/exec/slot-lock.js +1 -0
  96. package/dist/{exec-strategy.js → exec/strategy.js} +2 -2
  97. package/dist/{exec-task-repos.js → exec/task-repos.js} +104 -17
  98. package/dist/{exec-task-view.js → exec/task-view.js} +4 -4
  99. package/dist/{exec-trial-commands.js → exec/trial-commands.js} +20 -22
  100. package/dist/{exec-trial-core.js → exec/trial-core.js} +6 -6
  101. package/dist/{exec-trial.js → exec/trial.js} +2 -2
  102. package/dist/{exec-worktree-command.js → exec/worktree-command.js} +25 -23
  103. package/dist/{exec-worktree-ops-commit.js → exec/worktree-ops-commit.js} +25 -60
  104. package/dist/{exec-worktree-ops-lifecycle.js → exec/worktree-ops-lifecycle.js} +13 -8
  105. package/dist/{exec-worktree-ops-merge.js → exec/worktree-ops-merge.js} +48 -7
  106. package/dist/{exec-worktree-ops.js → exec/worktree-ops.js} +3 -3
  107. package/dist/exec/worktree.js +305 -0
  108. package/dist/{grade-apply.js → grade/apply.js} +9 -9
  109. package/dist/{grade-command-apply.js → grade/command-apply.js} +7 -7
  110. package/dist/{grade-command-inspect.js → grade/command-inspect.js} +6 -6
  111. package/dist/{grade-command-plan.js → grade/command-plan.js} +5 -5
  112. package/dist/{grade-core.js → grade/core.js} +3 -3
  113. package/dist/grade/grade.js +19 -0
  114. package/dist/{grade-markdown.js → grade/markdown.js} +6 -6
  115. package/dist/{grade-pipeline-state.js → grade/pipeline-state.js} +4 -4
  116. package/dist/{grade-plan.js → grade/plan.js} +5 -5
  117. package/dist/{grade-result.js → grade/result.js} +5 -94
  118. package/dist/{grade-target-discovery.js → grade/target-discovery.js} +7 -7
  119. package/dist/{grade-targets.js → grade/targets.js} +11 -8
  120. package/dist/{job-definition.js → job/definition.js} +25 -6
  121. package/dist/{job.js → job/job.js} +12 -11
  122. package/dist/{kata-command.js → kata/command.js} +3 -3
  123. package/dist/{kata.js → kata/kata.js} +5 -5
  124. package/dist/register/approach.js +134 -0
  125. package/dist/{register-core.js → register/core.js} +26 -8
  126. package/dist/{register-create-commands.js → register/create-commands.js} +171 -8
  127. package/dist/{register-date.js → register/date.js} +1 -1
  128. package/dist/register/derivation.js +163 -0
  129. package/dist/{register-event-merge.js → register/event-merge.js} +44 -3
  130. package/dist/{register-events.js → register/events.js} +13 -3
  131. package/dist/{register-history.js → register/history.js} +7 -6
  132. package/dist/{register-item.js → register/item.js} +32 -5
  133. package/dist/register/lifecycle-lock.js +5 -0
  134. package/dist/{register-maintenance-commands.js → register/maintenance-commands.js} +13 -7
  135. package/dist/{register-migrate-timestamps.js → register/migrate-timestamps.js} +3 -3
  136. package/dist/{register-migration.js → register/migration.js} +5 -4
  137. package/dist/{register.js → register/register.js} +32 -27
  138. package/dist/{register-renumber.js → register/renumber.js} +38 -11
  139. package/dist/{register-transition-commands.js → register/transition-commands.js} +3 -3
  140. package/dist/{register-update.js → register/update.js} +5 -5
  141. package/dist/{register-views.js → register/views.js} +47 -7
  142. package/dist/{review-grade.js → review/grade.js} +2 -2
  143. package/dist/{review-plan.js → review/plan.js} +3 -3
  144. package/dist/{routine-definition.js → routine/definition.js} +2 -2
  145. package/dist/{routine.js → routine/routine.js} +49 -22
  146. package/dist/{schedule-approach.js → schedule/approach.js} +8 -8
  147. package/dist/{schedule-build.js → schedule/build.js} +7 -4
  148. package/dist/{schedule.js → schedule/schedule.js} +6 -6
  149. package/dist/{schedule-strategy-generate-document.js → schedule/strategy-generate-document.js} +2 -2
  150. package/dist/{schedule-strategy-generate-scope.js → schedule/strategy-generate-scope.js} +4 -4
  151. package/dist/{schedule-strategy-generate.js → schedule/strategy-generate.js} +10 -10
  152. package/dist/shared/agent-types.js +23 -0
  153. package/dist/shared/artifact-path.js +9 -0
  154. package/dist/{build-if-stale.js → shared/build-if-stale.js} +1 -1
  155. package/dist/{catalog-build-render.js → shared/catalog-render.js} +3 -32
  156. package/dist/{exec-slot-lock.js → shared/cross-process-lock.js} +3 -1
  157. package/dist/shared/fs.js +30 -0
  158. package/dist/shared/git.js +346 -0
  159. package/dist/shared/grade-result.js +94 -0
  160. package/dist/{package-paths.js → shared/package-paths.js} +3 -3
  161. package/dist/shared/plan-templates.js +114 -0
  162. package/dist/{exec-provider-scaffold.js → shared/provider-scaffold.js} +6 -3
  163. package/dist/shared/random.js +4 -0
  164. package/dist/{exec-schedule-index.js → shared/schedule-index.js} +3 -1
  165. package/dist/shared/schedule-paths.js +9 -0
  166. package/dist/{specdojo-config.js → shared/specdojo-config.js} +162 -21
  167. package/dist/{exec-shared.js → shared/text.js} +4 -135
  168. package/dist/shared/time.js +28 -0
  169. package/dist/shared/workspace-scaffold.js +69 -0
  170. package/dist/specdojo.js +22 -22
  171. package/docs/ja/specdojo/exec-templates/xep-common-conventions-template.md +31 -18
  172. package/docs/ja/specdojo/exec-templates/xep-register-investigate-template.md +1 -2
  173. package/docs/ja/specdojo/exec-templates/xep-register-template.md +3 -2
  174. package/docs/ja/specdojo/exec-templates/xer-template.md +1 -3
  175. package/docs/ja/specdojo/exec-templates/xrp-job-template.md +6 -4
  176. package/docs/ja/specdojo/exec-templates/xrp-register-post-run-template.md +46 -0
  177. package/docs/ja/specdojo/guides/branch-workflow-guide.md +34 -1
  178. package/docs/ja/specdojo/guides/docs-structure-guide.md +2 -0
  179. package/docs/ja/specdojo/guides/exec-config-guide.md +169 -26
  180. package/docs/ja/specdojo/guides/exec-operation-guide.md +184 -13
  181. package/docs/ja/specdojo/guides/exec-worktree-guide.md +2 -0
  182. package/docs/ja/specdojo/guides/orchestrator-operation-guide.md +40 -3
  183. package/docs/ja/specdojo/guides/quick-start-guide.md +89 -21
  184. package/docs/ja/specdojo/guides/register-operation-guide.md +44 -1
  185. package/docs/ja/specdojo/guides/remote-host-development-guide.md +61 -6
  186. package/docs/ja/specdojo/guides/review-guide.md +1 -1
  187. package/docs/ja/specdojo/guides/routine-operation-guide.md +5 -5
  188. package/docs/ja/specdojo/guides/specdojo-overview-guide.md +1 -1
  189. package/docs/ja/specdojo/guides/use-case-guide.md +1 -1
  190. package/docs/ja/specdojo/guides/waza-guide.md +1 -1
  191. package/docs/ja/specdojo/references/command-reference.md +124 -55
  192. package/docs/ja/specdojo/references/specdojo-config-reference.md +33 -7
  193. package/docs/ja/specdojo/rulebooks/pjr-rulebook.md +22 -13
  194. package/docs/ja/specdojo/standards/job-definition-standard.md +20 -18
  195. package/docs/ja/specdojo/standards/rulebook-authoring-standard.md +2 -2
  196. package/docs/ja/specdojo/templates/pjr-derived-items-template.md +22 -0
  197. package/docs/ja/specdojo/templates/pjr-index-template.md +1 -0
  198. package/docs/specdojo/schemas/v1/agent-members.schema.yaml +29 -2
  199. package/docs/specdojo/schemas/v1/exec-defaults.schema.yaml +111 -17
  200. package/docs/specdojo/schemas/v1/exec-evidence.schema.yaml +28 -0
  201. package/docs/specdojo/schemas/v1/job-run.schema.yaml +2 -2
  202. package/docs/specdojo/schemas/v1/job.schema.yaml +7 -0
  203. package/docs/specdojo/schemas/v1/pipeline-state.schema.yaml +38 -0
  204. package/docs/specdojo/schemas/v1/register-events.schema.yaml +5 -0
  205. package/docs/specdojo/schemas/v1/register-item-frontmatter.schema.yaml +91 -7
  206. package/docs/specdojo/schemas/v1/routine-run.schema.yaml +1 -1
  207. package/docs/specdojo/schemas/v1/specdojo-config.schema.yaml +36 -1
  208. package/package.json +17 -17
  209. package/templates/antigravity/README.md +6 -2
  210. package/templates/antigravity/agent-members-snippet.yaml +108 -12
  211. package/templates/antigravity/exec-defaults-snippet.yaml +8 -13
  212. package/templates/antigravity/orchestrator.md +61 -2
  213. package/templates/claude/README.md +27 -3
  214. package/templates/claude/agents/claude-executor.md +0 -1
  215. package/templates/claude/agents/claude-reporter.md +2 -1
  216. package/templates/claude/agents/claude-review-executor.md +0 -1
  217. package/templates/claude/agents/specdojo-orchestrator.md +61 -2
  218. package/templates/codex/README.md +40 -4
  219. package/templates/codex/agents/specdojo-orchestrator.toml +61 -2
  220. package/templates/codex/orchestrator.md +61 -2
  221. package/templates/devcontainer/devcontainer.json +5 -2
  222. package/templates/devcontainer/post-create.sh +15 -7
  223. package/templates/devcontainer/remote-host/specdojo-tmux.sh.sample +102 -0
  224. package/templates/devcontainer/remote-host/ssh-config.sample +19 -0
  225. package/templates/devcontainer/vim/vimrc +37 -0
  226. package/templates/init-agent-members.yaml +75 -25
  227. package/templates/init-exec-defaults.yaml +44 -9
  228. package/templates/opencode/README.md +17 -3
  229. package/templates/opencode/agents/opencode-executor.md +0 -1
  230. package/templates/opencode/agents/opencode-reporter.md +2 -1
  231. package/templates/opencode/agents/opencode-review-executor.md +0 -1
  232. package/templates/opencode/agents/specdojo-orchestrator.md +61 -2
  233. package/dist/devcontainer-scaffold.js +0 -165
  234. package/dist/exec-schedule-gantt-chart.js +0 -2
  235. package/dist/exec-worktree.js +0 -474
  236. package/dist/exec.js +0 -2
  237. package/dist/grade.js +0 -19
  238. package/templates/claude/agents/claude-expert-review-executor.md +0 -14
  239. /package/dist/{catalog-plan-prompt.js → catalog/plan-prompt.js} +0 -0
  240. /package/dist/{catalog-types.js → catalog/types.js} +0 -0
  241. /package/dist/{template-frontmatter.js → docs/template-frontmatter.js} +0 -0
  242. /package/dist/{role-types.js → exec/role-types.js} +0 -0
  243. /package/dist/{exec-schedule-gantt-chart-scope.js → exec/schedule/gantt-chart-scope.js} +0 -0
  244. /package/dist/{exec-types.js → exec/types.js} +0 -0
  245. /package/dist/{grade-command-shared.js → grade/command-shared.js} +0 -0
  246. /package/dist/{register-command-types.js → register/command-types.js} +0 -0
  247. /package/dist/{review-types.js → review/types.js} +0 -0
  248. /package/dist/{schedule-phase-sets.js → schedule/phase-sets.js} +0 -0
  249. /package/dist/{schedule-strategy-profiles.js → schedule/strategy-profiles.js} +0 -0
  250. /package/dist/{agent-response.js → shared/agent-response.js} +0 -0
  251. /package/dist/{catalog-paths.js → shared/catalog-paths.js} +0 -0
  252. /package/dist/{dist-freshness.js → shared/dist-freshness.js} +0 -0
  253. /package/dist/{git-environment.js → shared/git-environment.js} +0 -0
  254. /package/dist/{exec-format.js → shared/markdown-format.js} +0 -0
  255. /package/dist/{practice-id.js → shared/practice-id.js} +0 -0
  256. /package/dist/{spawn-self.js → shared/spawn-self.js} +0 -0
  257. /package/dist/{specdojo-gitignore.js → shared/specdojo-gitignore.js} +0 -0
  258. /package/dist/{template-resolution.js → shared/template-resolution.js} +0 -0
  259. /package/dist/{yaml-schema-modeline.js → shared/yaml-schema-modeline.js} +0 -0
  260. /package/dist/{yaml.js → shared/yaml.js} +0 -0
@@ -1,23 +1,24 @@
1
1
  import { spawn } from "node:child_process";
2
2
  import { existsSync } from "node:fs";
3
3
  import { join, resolve } from "node:path";
4
- import { acquireSchedulerLock, foldEventsToState, readAllEventFiles, releaseSchedulerLock, } from "./exec-events.js";
5
- import { hasMemberCommandSource, loadExecDefaultsConfig, resolveMemberCommand, } from "./exec-agent-config.js";
6
- import { activateResolvedProjectPaths, resolveProjectPaths } from "./exec-project.js";
7
- import { agentGitStateViolation, captureAgentGitStateAcrossRepos, changedAgentGitStateAcrossRepos, qualifiedGitStateFields, } from "./exec-agent-git-state.js";
8
- import { agentProtectedConfigViolation, captureAgentProtectedConfigAcrossRepos, changedAgentProtectedConfigAcrossRepos, qualifiedRepoPaths, } from "./exec-agent-protected-config.js";
9
- import { recordGitStateBlockAcrossRepos, recordProtectedConfigBlockAcrossRepos, } from "./exec-protection-handoff.js";
10
- import { configuredProductRepos, missingProductWorktrees, plannedProjectWorktreePath, pruneOrphanedProductExecBranches, productRepoEnvironment, withAgentExtraRoots, withoutInheritedRepoEnvironment, withProductRepoPrompt, withProductWorktrees, } from "./exec-task-repos.js";
11
- import { buildTaskPhaseMap, loadPrompt, loadRosterForExecutionPath, resolveTaskPhaseContext, selectCandidates, } from "./exec-run.js";
12
- import { buildScheduleIndex } from "./exec-schedule.js";
13
- import { buildInitialStateFromStrategy } from "./exec-schedule-initial.js";
14
- import { generateSinglePlan } from "./exec-plans.js";
15
- import { qualifyTaskId } from "./exec-shared.js";
16
- import { buildTaskView } from "./exec-task-view.js";
17
- import { findExecWorktree, gitEnvironment, gitOutput, gitResult, resolveWorktreeBase, worktreeNameFromTaskId, } from "./exec-worktree.js";
18
- import { checkpointAndEnsureWorktree, commitWorktreeChanges, mergeWorktreeIntoCurrent, pruneOrphanedExecBranches, removeWorktree, taskPaths, worktreeStatusPaths, } from "./exec-worktree-ops.js";
19
- import { getProjectSchedulePath, loadConfig, specdojoRootDir } from "./specdojo-config.js";
20
- export { isCommitTargetPath, stabilizeCommitTargets } from "./exec-worktree-ops.js";
4
+ import { acquireSchedulerLock, foldEventsToState, readAllEventFiles, releaseSchedulerLock, } from "./events.js";
5
+ import { hasMemberCommandSource, loadExecDefaultsConfig, resolveMemberCommand, } from "./agent-config.js";
6
+ import { activateResolvedProjectPaths, resolveProjectPaths } from "./project.js";
7
+ import { agentGitStateViolation, captureAgentGitStateAcrossRepos, changedAgentGitStateAcrossRepos, qualifiedGitStateFields, } from "./agent-git-state.js";
8
+ import { agentProtectedConfigViolation, captureAgentProtectedConfigAcrossRepos, changedAgentProtectedConfigAcrossRepos, qualifiedRepoPaths, } from "./agent-protected-config.js";
9
+ import { recordGitStateBlockAcrossRepos, recordProtectedConfigBlockAcrossRepos, } from "./protection-handoff.js";
10
+ import { configuredProductRepos, missingProductWorktrees, plannedProjectWorktreePath, pruneOrphanedProductExecBranches, productRepoEnvironment, withAgentExtraRoots, withoutInheritedRepoEnvironment, withProductRepoPrompt, withProductWorktrees, } from "./task-repos.js";
11
+ import { resolveAgentMember } from "../shared/specdojo-config.js";
12
+ import { buildTaskPhaseMap, loadPrompt, loadRosterForExecutionPath, resolveTaskPhaseContext, selectCandidates, } from "./run/run.js";
13
+ import { buildScheduleIndex } from "./schedule/schedule.js";
14
+ import { buildInitialStateFromStrategy } from "./schedule/initial.js";
15
+ import { generateSinglePlan } from "./plans.js";
16
+ import { qualifyTaskId } from "./shared.js";
17
+ import { buildTaskView } from "./task-view.js";
18
+ import { findExecWorktree, gitEnvironment, gitOutput, gitResult, resolveWorktreeBase, worktreeNameFromTaskId, } from "./worktree.js";
19
+ import { checkpointAndEnsureWorktree, commitWorktreeChanges, mergeWorktreeIntoCurrent, pruneOrphanedExecBranches, removeWorktree, taskPaths, worktreeStatusPaths, } from "./worktree-ops.js";
20
+ import { getProjectSchedulePath, loadConfig, specdojoRootDir } from "../shared/specdojo-config.js";
21
+ export { isCommitTargetPath, stabilizeCommitTargets } from "./worktree-ops.js";
21
22
  const DEFAULT_LOCK_TIMEOUT_MS = 10_000;
22
23
  const DEFAULT_LOCK_STALE_MS = 300_000;
23
24
  function commandError(error) {
@@ -97,11 +98,12 @@ function resolveAgent(context, taskId, opts) {
97
98
  if ((task.execution ?? "agent") === "human" && !opts.by) {
98
99
  throw new Error(`Task requires human execution. Use --by <nickname> to override: ${taskId}`);
99
100
  }
100
- const member = roster?.members.find((item) => item.nickname === nickname &&
101
- item.type === "agent" &&
102
- hasMemberCommandSource(execDefaults, item));
101
+ const resolvedMember = resolveAgentMember(roster, nickname);
102
+ const member = resolvedMember && hasMemberCommandSource(execDefaults, resolvedMember)
103
+ ? resolvedMember
104
+ : undefined;
103
105
  const command = member ? resolveMemberCommand(execDefaults, member) : undefined;
104
- if (!command) {
106
+ if (!member || !command) {
105
107
  throw new Error(`Agent command not found for actor: ${nickname}`);
106
108
  }
107
109
  if (!opts.by) {
@@ -110,14 +112,14 @@ function resolveAgent(context, taskId, opts) {
110
112
  throw new Error(`Cannot resolve phase context for task: ${taskId}`);
111
113
  }
112
114
  const candidates = selectCandidates({ capabilities: task.capabilities ?? [], proficiency: task.proficiency }, roster, task.mode ?? "edit", undefined, execDefaults);
113
- if (!candidates.some((candidate) => candidate.nickname === nickname)) {
115
+ if (!candidates.some((candidate) => candidate.nickname === member.nickname)) {
114
116
  throw new Error(`Claim actor does not satisfy task agent requirements: ${nickname}`);
115
117
  }
116
118
  }
117
119
  const prompt = loadPrompt(context.executionPath, taskId);
118
120
  if (!prompt)
119
121
  throw new Error(`Plan not found for task: ${taskId}`);
120
- return { actor: nickname, command, provider: member?.provider, prompt };
122
+ return { actor: member.nickname, command, provider: member.provider, prompt };
121
123
  }
122
124
  function printWorktree(worktree) {
123
125
  process.stdout.write(`worktree: ${worktree.path}\nbranch: ${worktree.branch}\n`);
@@ -1,48 +1,24 @@
1
1
  import { spawnSync } from "node:child_process";
2
- import { appendFileSync, existsSync, lstatSync, mkdirSync, readFileSync, writeFileSync, } from "node:fs";
3
- import { join, relative, resolve, sep } from "node:path";
4
- import { load } from "./yaml.js";
5
- import { deliverableDocPath, parsePlanTaskIdentity, targetReferenceDirsForApproach, } from "./exec-plans.js";
6
- import { parseResultTaskIdentity } from "./exec-results.js";
7
- import { stripTerminalControlSequences } from "./exec-shared.js";
8
- import { agentProtectedConfigPaths, agentProtectedConfigViolation, qualifiedRepoPaths, } from "./exec-agent-protected-config.js";
9
- import { recordProtectedConfigBlockAcrossRepos } from "./exec-protection-handoff.js";
10
- import { assertNoPendingProductChanges, productIntegrationTarget } from "./exec-task-repos.js";
11
- import { specdojoPackageRootDir } from "./package-paths.js";
12
- import { appendGitFailureLog, gitEnvironment, gitOutput, gitResult, summarizeGitHookFailure, worktreeNameFromTaskId, } from "./exec-worktree.js";
2
+ import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
3
+ import { join, resolve } from "node:path";
4
+ import { load } from "../shared/yaml.js";
5
+ import { deliverableDocPath, parsePlanTaskIdentity, targetReferenceDirsForApproach, } from "./plans.js";
6
+ import { parseResultTaskIdentity } from "./results.js";
7
+ import { stripTerminalControlSequences } from "./shared.js";
8
+ import { agentProtectedConfigPaths, agentProtectedConfigViolation, qualifiedRepoPaths, } from "./agent-protected-config.js";
9
+ import { recordProtectedConfigBlockAcrossRepos } from "./protection-handoff.js";
10
+ import { assertNoPendingProductChanges, productIntegrationTarget } from "./task-repos.js";
11
+ import { specdojoPackageRootDir } from "../shared/package-paths.js";
12
+ import { repoRelative, stageCommitTargets, worktreeStatusPaths as statusPaths, } from "../shared/git.js";
13
+ export { repoRelative, selectStageablePaths, stageCommitTargets, worktreeStatusPaths, } from "../shared/git.js";
14
+ import { appendGitFailureLog, appendGitResultFailureLog, formatGitResultFailure, gitEnvironment, gitOutput, gitResult, summarizeGitHookFailure, worktreeNameFromTaskId, } from "./worktree.js";
13
15
  const MAX_COMMIT_STABILIZATION_ATTEMPTS = 3;
14
- export function repoRelative(repoRoot, path) {
15
- const value = relative(repoRoot, path);
16
- if (!value || value === ".." || value.startsWith(`..${sep}`)) {
17
- throw new Error(`Path is outside repository root: ${path}`);
18
- }
19
- return value.split(sep).join("/");
20
- }
21
16
  export function currentBranch(repoRoot) {
22
17
  const branch = gitOutput(repoRoot, ["branch", "--show-current"]).trim();
23
18
  if (!branch)
24
19
  throw new Error("Detached HEAD is not supported for exec worktree commands.");
25
20
  return branch;
26
21
  }
27
- function statusPaths(repoRoot) {
28
- const output = gitOutput(repoRoot, ["status", "--porcelain=v1", "-z", "--untracked-files=all"]);
29
- const records = output.split("\0").filter(Boolean);
30
- const paths = [];
31
- for (let index = 0; index < records.length; index++) {
32
- const record = records[index];
33
- if (record.length < 4)
34
- continue;
35
- const status = record.slice(0, 2);
36
- paths.push(record.slice(3));
37
- if ((status.includes("R") || status.includes("C")) && records[index + 1]) {
38
- paths.push(records[++index]);
39
- }
40
- }
41
- return paths;
42
- }
43
- export function worktreeStatusPaths(repoRoot) {
44
- return statusPaths(repoRoot);
45
- }
46
22
  export function taskPaths(context, taskId) {
47
23
  const executionRel = repoRelative(context.repoRoot, context.executionPath);
48
24
  return {
@@ -419,23 +395,6 @@ export function commitTargetPaths(context, worktree, taskId) {
419
395
  // パスはそのどちらにも存在しないため、`-A` を付けても「pathspec did not match any files」で
420
396
  // fatal になる。このようなパスは追加で stage する内容が無いので、add の対象から除外する。
421
397
  // commit / commit --amend の pathspec は HEAD も照合するため、対象から外さずに削除を記録できる。
422
- export function selectStageablePaths(repoRoot, paths) {
423
- if (paths.length === 0)
424
- return [];
425
- const indexed = new Set(zeroSeparatedPaths(repoRoot, ["ls-files", "--full-name", "-z", "--", ...paths]));
426
- // 作業ツリー側の存在確認は lstat で行う。git は symlink 自体を追跡するため、リンク先が
427
- // 無い symlink も add の対象になる(existsSync はリンク先を辿るため false になる)。
428
- const existsInWorktree = (path) => lstatSync(resolve(repoRoot, path), { throwIfNoEntry: false }) !== undefined;
429
- return paths.filter((path) => indexed.has(path) || existsInWorktree(path));
430
- }
431
- // commit 対象を stage する。stage できる対象が無い場合(staged 済みの削除だけが残る場合)は
432
- // git add を実行しない。commit 対象の限定は呼び出し側の paths が担うため、範囲は変わらない。
433
- export function stageCommitTargets(repoRoot, paths) {
434
- const stageable = selectStageablePaths(repoRoot, paths);
435
- if (stageable.length === 0)
436
- return;
437
- gitOutput(repoRoot, ["add", "-A", "--", ...stageable]);
438
- }
439
398
  // runner が stage した対象だけを index から戻す。利用者や別処理が stage 済みの無関係な
440
399
  // パスは保持し、commit / hook の失敗を後続の exec run へ持ち越さない。
441
400
  export function unstageCommitTargets(repoRoot, paths) {
@@ -506,7 +465,8 @@ export function stabilizeCommitTargets(repoRoot, listRemainingPaths, maxAttempts
506
465
  if (paths.length === 0)
507
466
  return;
508
467
  stageCommitTargets(repoRoot, paths);
509
- const staged = gitResult(repoRoot, ["diff", "--cached", "--quiet", "--", ...paths]);
468
+ const stagedArgs = ["diff", "--cached", "--quiet", "--", ...paths];
469
+ const staged = gitResult(repoRoot, stagedArgs);
510
470
  if (staged.status === 0) {
511
471
  // pathspec commit は hook が再stageした内容を commit した後、元の index を復元して
512
472
  // HEAD と逆向きの差分を残す場合がある。この場合は add が index を HEAD へ揃えて
@@ -516,8 +476,10 @@ export function stabilizeCommitTargets(repoRoot, listRemainingPaths, maxAttempts
516
476
  return;
517
477
  throw new Error(`Failed to stage post-hook commit-target changes: ${remaining.join(", ")}`);
518
478
  }
519
- if (staged.status !== 1)
520
- throw new Error("Failed to inspect post-hook worktree changes.");
479
+ if (staged.status !== 1) {
480
+ appendGitResultFailureLog(failureLogPath, "git diff post-hook worktree inspection", staged);
481
+ throw new Error(`Failed to inspect post-hook worktree changes: ${formatGitResultFailure(stagedArgs, staged)}`);
482
+ }
521
483
  const commitArgs = ["commit", "--amend", "--no-edit", "--", ...paths];
522
484
  const commit = gitResult(repoRoot, commitArgs);
523
485
  if (commit.status !== 0) {
@@ -672,13 +634,16 @@ export function commitWorktreeChanges(params) {
672
634
  return { targets: paths, committed: false };
673
635
  assertResultMarkdownlint(context, worktree, taskId);
674
636
  stageCommitTargets(worktree.path, paths);
675
- const staged = gitResult(worktree.path, ["diff", "--cached", "--quiet", "--", ...paths]);
637
+ const stagedArgs = ["diff", "--cached", "--quiet", "--", ...paths];
638
+ const staged = gitResult(worktree.path, stagedArgs);
676
639
  if (staged.status === 0) {
677
640
  process.stdout.write("No staged commit-target changes.\n");
678
641
  return { targets: paths, committed: false };
679
642
  }
680
- if (staged.status !== 1)
681
- throw new Error("Failed to inspect staged worktree changes.");
643
+ if (staged.status !== 1) {
644
+ appendGitResultFailureLog(params.failureLogPath, "git diff staged worktree inspection", staged);
645
+ throw new Error(`Failed to inspect staged worktree changes: ${formatGitResultFailure(stagedArgs, staged)}`);
646
+ }
682
647
  const commitArgs = [
683
648
  "commit",
684
649
  "-m",
@@ -1,9 +1,9 @@
1
1
  import { copyFileSync, existsSync, lstatSync, mkdirSync, rmSync } from "node:fs";
2
2
  import { resolve } from "node:path";
3
- import { stripTerminalControlSequences } from "./exec-shared.js";
4
- import { discardStaleProductWorktrees, ensureProductWorktrees, projectRepoDirName, productWorktreeRemovalBlockers, removeEmptyTaskDirectory, removeProductWorktrees, } from "./exec-task-repos.js";
5
- import { appendGitFailureLog, ensureExecWorktree, execBranchExists, findExecWorktree, generateWorktreeArtifacts, gitOutput, gitResult, listRegisteredWorktrees, summarizeGitHookFailure, worktreeNameFromTaskId, } from "./exec-worktree.js";
6
- import { commitTargetPaths, currentBranch, repoRelative, stageCommitTargets, unstageCommitTargets, worktreeStatusPaths, zeroSeparatedPaths, } from "./exec-worktree-ops-commit.js";
3
+ import { stripTerminalControlSequences } from "./shared.js";
4
+ import { discardStaleProductWorktrees, ensureProductWorktrees, projectRepoDirName, productWorktreeRemovalBlockers, removeEmptyTaskDirectory, removeProductWorktrees, } from "./task-repos.js";
5
+ import { appendGitFailureLog, appendGitResultFailureLog, ensureExecWorktree, execBranchExists, findExecWorktree, formatGitResultFailure, generateWorktreeArtifacts, gitOutput, gitResult, listRegisteredWorktrees, summarizeGitHookFailure, worktreeNameFromTaskId, } from "./worktree.js";
6
+ import { commitTargetPaths, currentBranch, repoRelative, stageCommitTargets, unstageCommitTargets, worktreeStatusPaths, zeroSeparatedPaths, } from "./worktree-ops-commit.js";
7
7
  // Remove a task worktree once its commit-target changes are committed and merged.
8
8
  export function removeWorktree(params) {
9
9
  const { context, worktree, taskId } = params;
@@ -167,6 +167,12 @@ function copyCheckpointPath(sourceRoot, targetRoot, relPath) {
167
167
  mkdirSync(resolve(target, ".."), { recursive: true });
168
168
  copyFileSync(source, target);
169
169
  }
170
+ export function assertCheckpointInspection(args, result, failureLogPath) {
171
+ if (result.status === 0 || result.status === 1)
172
+ return;
173
+ appendGitResultFailureLog(failureLogPath, "git diff checkpoint inspection", result);
174
+ throw new Error(`Failed to inspect execution checkpoint changes: ${formatGitResultFailure(args, result)}`);
175
+ }
170
176
  // Create the task worktree from the current integration HEAD, then commit the execution
171
177
  // checkpoint (plan / result / claim or register-start bookkeeping) on the exec branch only. The
172
178
  // root keeps its uncommitted copies so the task state stays visible there while the agent runs;
@@ -249,7 +255,9 @@ function checkpointAndEnsureProjectWorktree(params, repoDirName, ensureSiblingWo
249
255
  for (const path of paths)
250
256
  copyCheckpointPath(context.repoRoot, worktree.path, path);
251
257
  stageCommitTargets(worktree.path, paths);
252
- const checkpoint = gitResult(worktree.path, ["diff", "--cached", "--quiet", "--", ...paths]);
258
+ const checkpointArgs = ["diff", "--cached", "--quiet", "--", ...paths];
259
+ const checkpoint = gitResult(worktree.path, checkpointArgs);
260
+ assertCheckpointInspection(checkpointArgs, checkpoint, params.failureLogPath);
253
261
  if (checkpoint.status === 1) {
254
262
  const committed = gitResult(worktree.path, [
255
263
  "commit",
@@ -283,9 +291,6 @@ function checkpointAndEnsureProjectWorktree(params, repoDirName, ensureSiblingWo
283
291
  `(likely a failing git hook): ${summarizeGitHookFailure(output)}`);
284
292
  }
285
293
  }
286
- else if (checkpoint.status !== 0) {
287
- throw new Error("Failed to inspect execution checkpoint changes.");
288
- }
289
294
  return worktree;
290
295
  }
291
296
  return ensureProjectWorktree();
@@ -1,13 +1,52 @@
1
- import { lstatSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
1
+ import { spawnSync } from "node:child_process";
2
+ import { existsSync, lstatSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
2
3
  import { basename, dirname, resolve } from "node:path";
3
- import { acquireSchedulerLock, releaseSchedulerLock } from "./exec-events.js";
4
- import { rebuildRegisterTicketFromEvents, unionRegisterEventLogs } from "./register-event-merge.js";
5
- import { displayIdFromRegisterEventFilename, REGISTER_EVENTS_DIRNAME } from "./register-events.js";
6
- import { displayIdFromTicketFilename } from "./register-item.js";
7
- import { appendGitFailureLog, gitOutput, gitResult, summarizeGitHookFailure, } from "./exec-worktree.js";
8
- import { commitTargetPaths, currentBranch, repoRelative, rootDirtyPaths, zeroSeparatedPaths, } from "./exec-worktree-ops-commit.js";
4
+ import { acquireSchedulerLock, releaseSchedulerLock } from "./events.js";
5
+ import { rebuildRegisterTicketFromEvents, unionRegisterEventLogs, } from "../register/event-merge.js";
6
+ import { displayIdFromRegisterEventFilename, REGISTER_EVENTS_DIRNAME } from "../register/events.js";
7
+ import { displayIdFromTicketFilename } from "../register/item.js";
8
+ import { appendGitFailureLog, gitOutput, gitResult, summarizeGitHookFailure, } from "./worktree.js";
9
+ import { commitTargetPaths, currentBranch, repoRelative, rootDirtyPaths, zeroSeparatedPaths, } from "./worktree-ops-commit.js";
9
10
  const DEFAULT_LOCK_TIMEOUT_MS = 10_000;
10
11
  const DEFAULT_LOCK_STALE_MS = 300_000;
12
+ // A successful `git merge` runs post-merge, but a merge completed by the bookkeeping-conflict
13
+ // resolver below uses `git commit --no-verify` and therefore skips that hook. Invoke the same
14
+ // repository-local entry point explicitly after either path. Only a SpecDojo development checkout
15
+ // whose local bin points at dist is eligible; repositories consuming SpecDojo from node_modules
16
+ // remain unaffected. The script and this launcher are both best-effort so a dist rebuild failure
17
+ // never turns a completed merge into an integration failure.
18
+ function usesLocalSpecdojoDistBin(repoRoot) {
19
+ try {
20
+ const packageJson = JSON.parse(readFileSync(resolve(repoRoot, "package.json"), "utf8"));
21
+ if (packageJson.name !== "specdojo" || typeof packageJson.bin !== "object")
22
+ return false;
23
+ return packageJson.bin?.specdojo === "dist/specdojo.js";
24
+ }
25
+ catch {
26
+ return false;
27
+ }
28
+ }
29
+ function runBuildIfStaleAfterMerge(repoRoot) {
30
+ try {
31
+ const scriptPath = resolve(repoRoot, "tools", "build-if-stale.mjs");
32
+ if (!existsSync(scriptPath) || !usesLocalSpecdojoDistBin(repoRoot))
33
+ return;
34
+ const result = spawnSync(process.execPath, [scriptPath], {
35
+ cwd: repoRoot,
36
+ stdio: "inherit",
37
+ shell: false,
38
+ });
39
+ if (result.error) {
40
+ process.stderr.write(` [integrate] warning: build-if-stale could not start: ${result.error.message}\n`);
41
+ }
42
+ else if (result.status !== 0) {
43
+ process.stderr.write(` [integrate] warning: build-if-stale failed with exit code ${result.status ?? "unknown"}\n`);
44
+ }
45
+ }
46
+ catch (error) {
47
+ process.stderr.write(` [integrate] warning: build-if-stale failed: ${error instanceof Error ? error.message : String(error)}\n`);
48
+ }
49
+ }
11
50
  // The checkpoint commit lives on the exec branch only, so the root keeps its own uncommitted copy
12
51
  // of the bookkeeping files while the task runs (the schedule/register state must stay visible at
13
52
  // root). Before the exec branch is merged those copies must yield to the committed versions,
@@ -261,6 +300,8 @@ export function mergeWorktreeIntoCurrent(params) {
261
300
  }
262
301
  }
263
302
  finally {
303
+ if (merged)
304
+ runBuildIfStaleAfterMerge(context.repoRoot);
264
305
  if (!merged && released.length > 0)
265
306
  restoreRootWorkingCopies(context.repoRoot, released);
266
307
  if (lockDir)
@@ -1,3 +1,3 @@
1
- export { REGISTER_NEW_FILE_DIR_PREFIXES, ROOT_NEW_FILES_HANDOFF_LABEL, applyRootNewFilesHandoff, assertResultMarkdownlint, commitTargetPaths, commitWorktreeChanges, currentBranch, deliverableStatus, isCommitTargetPath, normalizeResultWhitespace, partitionCommitTargets, recordRootNewFilesHandoff, repoRelative, resolveCommitScope, selectStageablePaths, stabilizeCommitTargets, stageCommitTargets, taskPaths, taskTargetsAtHead, unstageCommitTargets, worktreeStatusPaths, } from "./exec-worktree-ops-commit.js";
2
- export { abortMerge, isExecBranchMergedIntoCurrent, mergeWorktreeIntoCurrent, releaseRootWorkingCopies, restoreRootWorkingCopies, } from "./exec-worktree-ops-merge.js";
3
- export { WorktreeRemovedBranchDeletionError, checkpointAndEnsureWorktree, discardStaleExecWorktree, listOrphanedExecBranches, pruneOrphanedExecBranches, removeWorktree, } from "./exec-worktree-ops-lifecycle.js";
1
+ export { REGISTER_NEW_FILE_DIR_PREFIXES, ROOT_NEW_FILES_HANDOFF_LABEL, applyRootNewFilesHandoff, assertResultMarkdownlint, commitTargetPaths, commitWorktreeChanges, currentBranch, deliverableStatus, isCommitTargetPath, normalizeResultWhitespace, partitionCommitTargets, recordRootNewFilesHandoff, repoRelative, resolveCommitScope, selectStageablePaths, stabilizeCommitTargets, stageCommitTargets, taskPaths, taskTargetsAtHead, unstageCommitTargets, worktreeStatusPaths, } from "./worktree-ops-commit.js";
2
+ export { abortMerge, isExecBranchMergedIntoCurrent, mergeWorktreeIntoCurrent, releaseRootWorkingCopies, restoreRootWorkingCopies, } from "./worktree-ops-merge.js";
3
+ export { WorktreeRemovedBranchDeletionError, checkpointAndEnsureWorktree, discardStaleExecWorktree, listOrphanedExecBranches, pruneOrphanedExecBranches, removeWorktree, } from "./worktree-ops-lifecycle.js";
@@ -0,0 +1,305 @@
1
+ import { spawnSync } from "node:child_process";
2
+ import { existsSync, lstatSync, mkdirSync, rmSync, unlinkSync } from "node:fs";
3
+ import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
4
+ import { describeGitProcessFailure, formatGitCommandFailure, GitCommandError, gitEnvironment, gitOutput, gitResult, } from "../shared/git.js";
5
+ export { appendGitFailureLog, appendGitResultFailureLog, describeGitProcessFailure, formatGitCommandFailure, formatGitResultFailure, GIT_LOCAL_ENV_VARS, GIT_OUTPUT_MAX_BUFFER, GitCommandError, gitEnvironment, gitOutput, gitResult, isGitDubiousOwnership, isGitIndexLockContention, isGitNotRepositoryWithGitMetadata, runGitWithTransientRetry, summarizeGitArguments, summarizeGitHookFailure, summarizeGitStderr, transientGitFailureReason, } from "../shared/git.js";
6
+ export function worktreeNameFromTaskId(value) {
7
+ const slug = value
8
+ .trim()
9
+ .replace(/[^A-Za-z0-9._-]+/g, "-")
10
+ .replace(/-+/g, "-")
11
+ .replace(/^-+|-+$/g, "");
12
+ if (!slug)
13
+ throw new Error(`Task ID cannot be used as a worktree name: ${value}`);
14
+ return slug;
15
+ }
16
+ export function resolveWorktreeBase(repoRoot, override, configured) {
17
+ const value = override?.trim() || configured?.trim() || "../worktrees";
18
+ return isAbsolute(value) ? resolve(value) : resolve(repoRoot, value);
19
+ }
20
+ export function listRegisteredWorktrees(repoRoot) {
21
+ const output = gitOutput(repoRoot, ["worktree", "list", "--porcelain"]);
22
+ const result = [];
23
+ let currentPath;
24
+ let currentBranch;
25
+ function pushCurrent() {
26
+ if (currentPath)
27
+ result.push({ path: currentPath, branch: currentBranch });
28
+ currentPath = undefined;
29
+ currentBranch = undefined;
30
+ }
31
+ for (const line of output.split(/\r?\n/)) {
32
+ if (line.startsWith("worktree ")) {
33
+ pushCurrent();
34
+ currentPath = resolve(line.slice("worktree ".length));
35
+ }
36
+ else if (currentPath && line.startsWith("branch refs/heads/")) {
37
+ currentBranch = line.slice("branch refs/heads/".length);
38
+ }
39
+ else if (line === "") {
40
+ pushCurrent();
41
+ }
42
+ }
43
+ pushCurrent();
44
+ return result;
45
+ }
46
+ export function findExecWorktree(repoRoot, taskId) {
47
+ const name = worktreeNameFromTaskId(taskId);
48
+ const branch = `exec/${name}`;
49
+ const registered = listRegisteredWorktrees(repoRoot).find((item) => item.branch === branch);
50
+ if (!registered)
51
+ return null;
52
+ return { path: registered.path, branch, name, created: false };
53
+ }
54
+ export function execBranchExists(repoRoot, taskId) {
55
+ const branch = `exec/${worktreeNameFromTaskId(taskId)}`;
56
+ return (gitResult(repoRoot, ["show-ref", "--verify", "--quiet", `refs/heads/${branch}`]).status === 0);
57
+ }
58
+ function pathEntryExists(target) {
59
+ try {
60
+ lstatSync(target);
61
+ return true;
62
+ }
63
+ catch {
64
+ return false;
65
+ }
66
+ }
67
+ function trackedPackageLockDirs(worktreePath) {
68
+ const output = gitOutput(worktreePath, [
69
+ "ls-files",
70
+ "-z",
71
+ "--",
72
+ "package-lock.json",
73
+ "*/package-lock.json",
74
+ ]);
75
+ const dirs = new Set();
76
+ for (const entry of output.split("\0")) {
77
+ if (!entry)
78
+ continue;
79
+ dirs.add(resolve(worktreePath, entry.slice(0, -"package-lock.json".length) || "."));
80
+ }
81
+ return [...dirs].sort();
82
+ }
83
+ function runNpmCi(packageDir) {
84
+ const command = process.platform === "win32" ? "npm.cmd" : "npm";
85
+ const result = spawnSync(command, ["ci", "--include=dev"], {
86
+ cwd: packageDir,
87
+ env: { ...gitEnvironment(), CI: "true", LEFTHOOK: "0" },
88
+ stdio: "inherit",
89
+ });
90
+ if (result.error) {
91
+ throw new Error(`npm ci could not start in ${packageDir}: ${result.error.message}`);
92
+ }
93
+ if (result.status !== 0) {
94
+ throw new Error(`npm ci failed in ${packageDir} (exit ${result.status ?? "unknown"})`);
95
+ }
96
+ }
97
+ function removeLegacyNodeModulesLink(packageDir) {
98
+ const target = join(packageDir, "node_modules");
99
+ if (!pathEntryExists(target) || !lstatSync(target).isSymbolicLink())
100
+ return;
101
+ unlinkSync(target);
102
+ }
103
+ // Git worktree は独自の作業ツリーを持つだけで node_modules は引き継がないため、
104
+ // tracked package-lock.json ごとに npm ci を実行し、worktree 内へ独立して依存を配置する。
105
+ // 旧方式の共有 symlink は npm に辿らせず、先に link 自体だけを削除する。
106
+ // lock が無い worktree は導入しない。依存が無いまま検証が失敗したときに原因を追えるよう、
107
+ // 導入しなかったことをログに残す(PJR-86Q5)。
108
+ export function installWorktreeDependencies(worktreePath, npmCi = runNpmCi) {
109
+ const packageDirs = trackedPackageLockDirs(resolve(worktreePath));
110
+ if (packageDirs.length === 0) {
111
+ process.stdout.write(`Skipping worktree dependencies: no tracked package-lock.json in ${worktreePath}\n`);
112
+ return;
113
+ }
114
+ for (const packageDir of packageDirs) {
115
+ if (!existsSync(join(packageDir, "package.json"))) {
116
+ throw new Error(`package.json is missing next to package-lock.json: ${packageDir}`);
117
+ }
118
+ removeLegacyNodeModulesLink(packageDir);
119
+ process.stdout.write(`Installing worktree dependencies: ${relative(worktreePath, packageDir) || "."}\n`);
120
+ npmCi(packageDir);
121
+ }
122
+ }
123
+ const SPECDOJO_CONFIG_REL = join(".specdojo", "specdojo.config.json");
124
+ // 生成物の失敗は成果物の失敗と混同されやすい。準備段階であることと、生成物が worktree ごとに
125
+ // 作り直しになる理由をメッセージ本体へ含める。
126
+ export function formatWorktreeBuildFailure(worktreePath, detail) {
127
+ return (`Worktree preparation failed: specdojo build ${detail} in ${worktreePath}. ` +
128
+ `Generated docs are gitignored and must be rebuilt per worktree, so this is a ` +
129
+ `preparation failure, not a task deliverable failure.`);
130
+ }
131
+ // build は worktree 内で完結させる。依存と同じく、worktree の checkout にある CLI を使うため、
132
+ // 実行元プロセスの entry(テストランナー等)へは依存しない。SpecDojo 自身のリポジトリでは
133
+ // src の entry を worktree の tsx で、CLI を依存として使うリポジトリでは
134
+ // node_modules/.bin/specdojo を使う。
135
+ export function resolveWorktreeBuildCommand(worktreePath) {
136
+ const root = resolve(worktreePath);
137
+ const sourceEntry = join(root, "src", "specdojo.ts");
138
+ const localTsx = join(root, "node_modules", ".bin", "tsx");
139
+ if (existsSync(sourceEntry) && existsSync(localTsx)) {
140
+ return { command: process.execPath, args: [localTsx, sourceEntry, "build"] };
141
+ }
142
+ const installedCli = join(root, "node_modules", ".bin", process.platform === "win32" ? "specdojo.cmd" : "specdojo");
143
+ if (existsSync(installedCli))
144
+ return { command: installedCli, args: ["build"] };
145
+ const builtEntry = join(root, "dist", "specdojo.js");
146
+ if (existsSync(builtEntry))
147
+ return { command: process.execPath, args: [builtEntry, "build"] };
148
+ return null;
149
+ }
150
+ // worktree を cwd にして build を実行する。child は cwd から .specdojo/specdojo.config.json を
151
+ // 辿るため、生成先は worktree 側になる。
152
+ function runWorktreeBuild(worktreePath) {
153
+ const resolved = resolveWorktreeBuildCommand(worktreePath);
154
+ if (!resolved) {
155
+ process.stdout.write(`Skipping worktree artifact generation: no SpecDojo CLI in ${worktreePath}\n`);
156
+ return;
157
+ }
158
+ process.stdout.write("Generating worktree artifacts: specdojo build\n");
159
+ const result = spawnSync(resolved.command, resolved.args, {
160
+ cwd: worktreePath,
161
+ env: { ...gitEnvironment(), CI: "true", LEFTHOOK: "0" },
162
+ stdio: "inherit",
163
+ });
164
+ if (result.error) {
165
+ throw new Error(formatWorktreeBuildFailure(worktreePath, `could not start: ${result.error.message}`));
166
+ }
167
+ if (result.status !== 0) {
168
+ throw new Error(formatWorktreeBuildFailure(worktreePath, `exited with ${result.status ?? "unknown"}`));
169
+ }
170
+ }
171
+ // 生成物(docs/**/generated と .specdojo/doc-index.json)は .gitignore 済みで worktree へ
172
+ // 複製されない。生成物の存在を前提とする検証は、成果物と無関係に失敗するため、依存の install
173
+ // 直後にまとめて生成する。生成対象が増えても追従が要らないよう、scope を絞らず build を通しで
174
+ // 実行する(全 scope で数秒。npm ci に対して無視できる)。
175
+ export function generateWorktreeArtifacts(worktreePath, build = runWorktreeBuild) {
176
+ const root = resolve(worktreePath);
177
+ // SpecDojo の設定を持たないリポジトリには生成物が無い。build は失敗するだけなので実行しない。
178
+ if (!existsSync(join(root, SPECDOJO_CONFIG_REL)))
179
+ return;
180
+ build(root);
181
+ }
182
+ /**
183
+ * Path of a task worktree. Without `repoDirName` (projects without `repos`) the worktree is
184
+ * `<base>/<task-name>/`; with it, each repository gets `<base>/<task-name>/<repoDirName>/`.
185
+ */
186
+ export function execWorktreePath(worktreeBase, taskId, repoDirName) {
187
+ const name = worktreeNameFromTaskId(taskId);
188
+ return resolve(repoDirName ? join(worktreeBase, name, repoDirName) : join(worktreeBase, name));
189
+ }
190
+ function branchTip(repoRoot, branch) {
191
+ const args = ["rev-parse", "--verify", "--quiet", `refs/heads/${branch}^{commit}`];
192
+ const result = gitResult(repoRoot, args);
193
+ if (result.status === 1 && !result.error)
194
+ return undefined;
195
+ if (result.status !== 0 || result.error) {
196
+ const stderr = typeof result.stderr === "string" ? result.stderr : "";
197
+ throw new GitCommandError(formatGitCommandFailure(args, stderr, describeGitProcessFailure(result)), args, stderr);
198
+ }
199
+ if (typeof result.stdout !== "string")
200
+ return undefined;
201
+ return result.stdout.trim();
202
+ }
203
+ function assertExpectedBranchTip(repoRoot, branch, expectedCommit) {
204
+ const actualCommit = branchTip(repoRoot, branch);
205
+ if (actualCommit === expectedCommit)
206
+ return;
207
+ throw new Error(`Existing branch ${branch} points to ${actualCommit ?? "an unreadable commit"}; ` +
208
+ `expected ${expectedCommit}. Refusing to delete or reuse it.`);
209
+ }
210
+ function recoverWorktreeAddAfterTransientFailure(params) {
211
+ const { repoRoot, worktreePath, branch, expectedCommit, branchWasCreatedByAdd } = params;
212
+ let registered = listRegisteredWorktrees(repoRoot);
213
+ const registeredAtPath = registered.find((item) => item.path === worktreePath);
214
+ if (registeredAtPath) {
215
+ if (registeredAtPath.branch !== branch) {
216
+ throw new Error(`Worktree ${worktreePath} uses branch ${registeredAtPath.branch ?? "(detached)"}; ` +
217
+ `expected ${branch}. Refusing to remove it after a transient Git failure.`);
218
+ }
219
+ assertExpectedBranchTip(repoRoot, branch, expectedCommit);
220
+ if (existsSync(worktreePath))
221
+ return true;
222
+ // The add registered the worktree but did not leave its directory behind. Prune only the
223
+ // missing registration; a live worktree at another path is never removed by this recovery.
224
+ gitOutput(repoRoot, ["worktree", "prune", "--expire=now"]);
225
+ registered = listRegisteredWorktrees(repoRoot);
226
+ if (registered.some((item) => item.path === worktreePath)) {
227
+ throw new Error(`Failed to prune incomplete worktree registration: ${worktreePath}`);
228
+ }
229
+ }
230
+ const registeredForBranch = registered.find((item) => item.branch === branch);
231
+ if (registeredForBranch) {
232
+ throw new Error(`Branch ${branch} is already checked out at ${registeredForBranch.path}; ` +
233
+ `refusing to alter it after a transient Git failure.`);
234
+ }
235
+ // ensureExecWorktree rejected a pre-existing unregistered path before starting `worktree add`,
236
+ // so an unregistered entry appearing here belongs to the failed attempt and is safe to remove.
237
+ if (existsSync(worktreePath))
238
+ rmSync(worktreePath, { recursive: true, force: true });
239
+ const actualCommit = branchTip(repoRoot, branch);
240
+ if (actualCommit === undefined)
241
+ return false;
242
+ assertExpectedBranchTip(repoRoot, branch, expectedCommit);
243
+ if (branchWasCreatedByAdd)
244
+ gitOutput(repoRoot, ["branch", "-D", branch]);
245
+ return false;
246
+ }
247
+ export function ensureExecWorktree(opts) {
248
+ const repoRoot = resolve(opts.repoRoot);
249
+ const baseRelative = relative(repoRoot, resolve(opts.worktreeBase));
250
+ if (baseRelative === "" || (!baseRelative.startsWith(`..${sep}`) && baseRelative !== "..")) {
251
+ throw new Error(`Worktree base must be outside the repository: ${opts.worktreeBase}`);
252
+ }
253
+ const name = worktreeNameFromTaskId(opts.taskId);
254
+ const branch = `exec/${name}`;
255
+ const worktreePath = execWorktreePath(opts.worktreeBase, opts.taskId, opts.repoDirName);
256
+ const registered = listRegisteredWorktrees(repoRoot);
257
+ const registeredAtPath = registered.find((item) => item.path === worktreePath);
258
+ if (registeredAtPath) {
259
+ if (!existsSync(worktreePath)) {
260
+ throw new Error(`Registered worktree path does not exist: ${worktreePath}`);
261
+ }
262
+ if (registeredAtPath.branch !== branch) {
263
+ throw new Error(`Worktree ${worktreePath} uses branch ${registeredAtPath.branch ?? "(detached)"}; expected ${branch}`);
264
+ }
265
+ (opts.installDependencies ?? installWorktreeDependencies)(worktreePath);
266
+ (opts.generateArtifacts ?? generateWorktreeArtifacts)(worktreePath);
267
+ return { path: worktreePath, branch, name, created: false };
268
+ }
269
+ if (existsSync(worktreePath)) {
270
+ throw new Error(`Worktree path already exists but is not registered: ${worktreePath}`);
271
+ }
272
+ mkdirSync(dirname(worktreePath), { recursive: true });
273
+ const expectedCommit = gitOutput(repoRoot, [
274
+ "rev-parse",
275
+ "--verify",
276
+ `${opts.startPoint ?? "HEAD"}^{commit}`,
277
+ ]).trim();
278
+ const branchExists = branchTip(repoRoot, branch) !== undefined;
279
+ const registeredForBranch = registered.find((item) => item.branch === branch);
280
+ if (registeredForBranch) {
281
+ throw new Error(`Branch ${branch} is already checked out at ${registeredForBranch.path}`);
282
+ }
283
+ if (branchExists)
284
+ assertExpectedBranchTip(repoRoot, branch, expectedCommit);
285
+ const args = branchExists
286
+ ? ["worktree", "add", worktreePath, branch]
287
+ : [
288
+ "worktree",
289
+ "add",
290
+ worktreePath,
291
+ "-b",
292
+ branch,
293
+ ...(opts.startPoint ? [opts.startPoint] : []),
294
+ ];
295
+ gitOutput(repoRoot, args, () => recoverWorktreeAddAfterTransientFailure({
296
+ repoRoot,
297
+ worktreePath,
298
+ branch,
299
+ expectedCommit,
300
+ branchWasCreatedByAdd: !branchExists,
301
+ }));
302
+ (opts.installDependencies ?? installWorktreeDependencies)(worktreePath);
303
+ (opts.generateArtifacts ?? generateWorktreeArtifacts)(worktreePath);
304
+ return { path: worktreePath, branch, name, created: true };
305
+ }