specdojo 0.2.1 → 0.3.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 (242) hide show
  1. package/.github/agents/specdojo-orchestrator.md +165 -0
  2. package/CHANGELOG.md +298 -0
  3. package/README.md +92 -42
  4. package/dist/agent-response.js +20 -0
  5. package/dist/agent.js +4 -4
  6. package/dist/build-command.js +28 -8
  7. package/dist/catalog-build-references.js +144 -0
  8. package/dist/catalog-build-render.js +144 -0
  9. package/dist/catalog-build.js +13 -290
  10. package/dist/catalog-generate.js +6 -9
  11. package/dist/catalog-plan-generate.js +2 -2
  12. package/dist/catalog-plan.js +6 -6
  13. package/dist/catalog-scaffold.js +4 -4
  14. package/dist/catalog.js +2 -2
  15. package/dist/dashboard-exec-records.js +105 -0
  16. package/dist/dashboard-routines.js +255 -0
  17. package/dist/dashboard-shared.js +14 -0
  18. package/dist/dashboard-timeline.js +175 -0
  19. package/dist/dashboard.js +31 -444
  20. package/dist/deliverable-trash.js +3 -3
  21. package/dist/devcontainer-command.js +43 -0
  22. package/dist/devcontainer-scaffold.js +165 -0
  23. package/dist/doc-index.js +3 -3
  24. package/dist/exec-agent-config.js +107 -9
  25. package/dist/exec-agent-git-state.js +18 -0
  26. package/dist/exec-agent-protected-config.js +46 -8
  27. package/dist/exec-commands.js +557 -0
  28. package/dist/exec-core.js +457 -0
  29. package/dist/exec-evidence.js +254 -11
  30. package/dist/exec-handoff.js +336 -0
  31. package/dist/exec-parent-validation.js +317 -43
  32. package/dist/exec-pipeline-state.js +74 -9
  33. package/dist/exec-plans-core.js +693 -0
  34. package/dist/exec-plans-generation.js +206 -0
  35. package/dist/exec-plans-storage.js +131 -0
  36. package/dist/exec-plans.js +3 -1016
  37. package/dist/exec-protection-handoff.js +43 -2
  38. package/dist/exec-provider-scaffold.js +247 -15
  39. package/dist/exec-register-resume.js +65 -19
  40. package/dist/exec-register.js +9 -3
  41. package/dist/exec-repo-integration-git.js +23 -0
  42. package/dist/exec-repo-integration-sync.js +264 -0
  43. package/dist/exec-repo-integration.js +534 -0
  44. package/dist/exec-repo-trace.js +182 -0
  45. package/dist/exec-reporter-output.js +206 -0
  46. package/dist/exec-reporter.js +525 -248
  47. package/dist/exec-results.js +103 -71
  48. package/dist/exec-run-agent-pipeline.js +256 -0
  49. package/dist/exec-run-agent.js +531 -0
  50. package/dist/exec-run-in-place.js +541 -0
  51. package/dist/exec-run-job.js +717 -0
  52. package/dist/exec-run-lifecycle-commands.js +522 -0
  53. package/dist/exec-run-lock.js +110 -107
  54. package/dist/exec-run-mode-shared.js +140 -0
  55. package/dist/exec-run-register-command.js +244 -0
  56. package/dist/exec-run-register-core.js +386 -0
  57. package/dist/exec-run-register-mode.js +206 -0
  58. package/dist/exec-run-register-resume.js +393 -0
  59. package/dist/exec-run-register-state.js +322 -0
  60. package/dist/exec-run-register-worktree.js +509 -0
  61. package/dist/exec-run-schedule-mode.js +294 -0
  62. package/dist/exec-run-schedule-prepare.js +353 -0
  63. package/dist/exec-run-schedule-task.js +572 -0
  64. package/dist/exec-run-shared.js +399 -0
  65. package/dist/exec-run.js +11 -4953
  66. package/dist/exec-shared.js +9 -2
  67. package/dist/exec-slot-lock.js +242 -0
  68. package/dist/exec-task-repos.js +415 -0
  69. package/dist/exec-trial-commands.js +558 -0
  70. package/dist/exec-trial-core.js +371 -0
  71. package/dist/exec-trial.js +2 -895
  72. package/dist/exec-worktree-command.js +87 -43
  73. package/dist/exec-worktree-ops-commit.js +707 -0
  74. package/dist/exec-worktree-ops-lifecycle.js +292 -0
  75. package/dist/exec-worktree-ops-merge.js +303 -0
  76. package/dist/exec-worktree-ops.js +3 -847
  77. package/dist/exec-worktree.js +146 -31
  78. package/dist/exec.js +2 -999
  79. package/dist/frontmatter-namespace.js +2 -2
  80. package/dist/grade-apply.js +734 -0
  81. package/dist/grade-command-apply.js +250 -0
  82. package/dist/grade-command-inspect.js +138 -0
  83. package/dist/grade-command-plan.js +101 -0
  84. package/dist/grade-command-shared.js +68 -0
  85. package/dist/grade-core.js +307 -0
  86. package/dist/grade-markdown.js +274 -0
  87. package/dist/grade-pipeline-state.js +184 -0
  88. package/dist/grade-plan.js +507 -0
  89. package/dist/grade-result.js +133 -5
  90. package/dist/grade-target-discovery.js +265 -0
  91. package/dist/grade-targets.js +432 -0
  92. package/dist/grade.js +14 -2451
  93. package/dist/init-command.js +443 -0
  94. package/dist/job-definition.js +670 -0
  95. package/dist/job.js +64 -578
  96. package/dist/kata-command.js +2 -2
  97. package/dist/orchestrator.js +213 -0
  98. package/dist/register-command-types.js +1 -0
  99. package/dist/register-core.js +363 -0
  100. package/dist/register-create-commands.js +245 -0
  101. package/dist/register-event-merge.js +169 -0
  102. package/dist/register-events.js +4 -4
  103. package/dist/register-item.js +13 -7
  104. package/dist/register-maintenance-commands.js +187 -0
  105. package/dist/register-migration.js +268 -0
  106. package/dist/register-renumber.js +314 -0
  107. package/dist/register-transition-commands.js +248 -0
  108. package/dist/register-update.js +230 -0
  109. package/dist/register-views.js +256 -0
  110. package/dist/register.js +175 -1975
  111. package/dist/review-grade.js +252 -0
  112. package/dist/review-plan.js +114 -4
  113. package/dist/review-types.js +40 -1
  114. package/dist/routine-definition.js +401 -0
  115. package/dist/routine.js +73 -402
  116. package/dist/schedule-approach.js +2 -2
  117. package/dist/schedule-build.js +2 -2
  118. package/dist/schedule-strategy-generate-document.js +273 -0
  119. package/dist/schedule-strategy-generate-scope.js +199 -0
  120. package/dist/schedule-strategy-generate.js +9 -473
  121. package/dist/schedule.js +19 -6
  122. package/dist/specdojo-config.js +465 -20
  123. package/dist/specdojo-gitignore.js +135 -0
  124. package/dist/specdojo.js +6 -0
  125. package/dist/viewpoint-document-kinds-check.js +128 -0
  126. package/dist/yaml-pages.js +4 -4
  127. package/dist/yaml.js +28 -0
  128. package/docs/ja/specdojo/defaults/pm-review-viewpoints.yaml +348 -90
  129. package/docs/ja/specdojo/exec-templates/xep-common-conventions-template.md +51 -17
  130. package/docs/ja/specdojo/exec-templates/xep-fully-guided-template.md +7 -5
  131. package/docs/ja/specdojo/exec-templates/xrp-freeform-template.md +29 -31
  132. package/docs/ja/specdojo/exec-templates/xrp-fully-guided-template.md +34 -55
  133. package/docs/ja/specdojo/exec-templates/xrp-job-template.md +54 -0
  134. package/docs/ja/specdojo/exec-templates/xrp-recipe-guided-template.md +28 -37
  135. package/docs/ja/specdojo/exec-templates/xrp-recipe-maintenance-template.md +29 -34
  136. package/docs/ja/specdojo/exec-templates/xrp-retrofit-template.md +30 -30
  137. package/docs/ja/specdojo/exec-templates/xrp-rulebook-maintenance-template.md +29 -34
  138. package/docs/ja/specdojo/exec-templates/xrp-sample-maintenance-template.md +29 -34
  139. package/docs/ja/specdojo/exec-templates/xrp-template-maintenance-template.md +29 -34
  140. package/docs/ja/specdojo/exec-templates/xrp-template.md +29 -28
  141. package/docs/ja/specdojo/exec-templates/xrr-template.md +11 -9
  142. package/docs/ja/specdojo/guides/docs-editing-guide.md +20 -0
  143. package/docs/ja/specdojo/guides/docs-structure-guide.md +103 -70
  144. package/docs/ja/specdojo/guides/exec-config-guide.md +93 -49
  145. package/docs/ja/specdojo/guides/exec-operation-guide.md +124 -27
  146. package/docs/ja/specdojo/guides/exec-worktree-guide.md +40 -11
  147. package/docs/ja/specdojo/guides/kata-guide.md +4 -4
  148. package/docs/ja/specdojo/guides/orchestrator-operation-guide.md +45 -22
  149. package/docs/ja/specdojo/guides/plan-result-lifecycle-guide.md +1 -1
  150. package/docs/ja/specdojo/guides/practice-system-composition-guide.md +13 -13
  151. package/docs/ja/specdojo/guides/quick-start-guide.md +260 -30
  152. package/docs/ja/specdojo/guides/register-operation-guide.md +31 -14
  153. package/docs/ja/specdojo/guides/release-v0-3-0-migration-guide.md +264 -0
  154. package/docs/ja/specdojo/guides/remote-host-development-guide.md +22 -1
  155. package/docs/ja/specdojo/guides/review-guide.md +195 -158
  156. package/docs/ja/specdojo/guides/routine-operation-guide.md +75 -10
  157. package/docs/ja/specdojo/guides/ryu-guide.md +32 -30
  158. package/docs/ja/specdojo/guides/schedule-design-guide.md +10 -10
  159. package/docs/ja/specdojo/guides/schedule-operation-guide.md +1 -1
  160. package/docs/ja/specdojo/guides/specdojo-overview-guide.md +58 -33
  161. package/docs/ja/specdojo/guides/use-case-guide.md +3 -3
  162. package/docs/ja/specdojo/guides/waza-guide.md +15 -2
  163. package/docs/ja/specdojo/index.md +2 -2
  164. package/docs/ja/specdojo/philosophy/specdojo-philosophy.md +5 -5
  165. package/docs/ja/specdojo/recipes/bps-recipe.md +213 -0
  166. package/docs/ja/specdojo/recipes/pm-members-recipe.md +52 -117
  167. package/docs/ja/specdojo/references/command-reference.md +335 -92
  168. package/docs/ja/specdojo/references/deliverables-reference.md +1 -1
  169. package/docs/ja/specdojo/references/directory-layout-reference.md +13 -9
  170. package/docs/ja/specdojo/references/specdojo-config-reference.md +107 -24
  171. package/docs/ja/specdojo/rulebooks/bps-rulebook.md +132 -220
  172. package/docs/ja/specdojo/rulebooks/br-rulebook.md +6 -44
  173. package/docs/ja/specdojo/rulebooks/cdfd-rulebook.md +2 -0
  174. package/docs/ja/specdojo/rulebooks/dmd-rulebook.md +0 -87
  175. package/docs/ja/specdojo/rulebooks/gl-rulebook.md +61 -39
  176. package/docs/ja/specdojo/rulebooks/ifx-cmd-rulebook.md +0 -87
  177. package/docs/ja/specdojo/rulebooks/ifx-index-rulebook.md +1 -33
  178. package/docs/ja/specdojo/rulebooks/opd-rulebook.md +0 -137
  179. package/docs/ja/specdojo/rulebooks/opr-rulebook.md +0 -247
  180. package/docs/ja/specdojo/rulebooks/otp-rulebook.md +0 -83
  181. package/docs/ja/specdojo/rulebooks/pjr-rulebook.md +4 -2
  182. package/docs/ja/specdojo/rulebooks/pm-members-rulebook.md +78 -150
  183. package/docs/ja/specdojo/rulebooks/pm-roles-rulebook.md +5 -4
  184. package/docs/ja/specdojo/rulebooks/sch-rulebook.md +1 -1
  185. package/docs/ja/specdojo/rulebooks/stsd-mermaid-rulebook.md +0 -11
  186. package/docs/ja/specdojo/rulebooks/stsd-rulebook.md +0 -61
  187. package/docs/ja/specdojo/rulebooks/tml-rulebook.md +2 -47
  188. package/docs/ja/specdojo/samples/bps-sample.md +74 -21
  189. package/docs/ja/specdojo/samples/gl-sample.yaml +17 -1
  190. package/docs/ja/specdojo/samples/ifx-index-sample.yaml +28 -0
  191. package/docs/ja/specdojo/samples/pm-members-sample.yaml +2 -67
  192. package/docs/ja/specdojo/samples/pm-organization-sample.md +8 -7
  193. package/docs/ja/specdojo/samples/pm-raci-sample.md +1 -1
  194. package/docs/ja/specdojo/samples/tml-sample.yaml +40 -0
  195. package/docs/ja/specdojo/standards/document-metadata-standard.md +21 -16
  196. package/docs/ja/specdojo/standards/id-and-file-naming-standard.md +14 -14
  197. package/docs/ja/specdojo/standards/job-definition-standard.md +37 -17
  198. package/docs/ja/specdojo/standards/people-and-organization-definition-standard.md +37 -32
  199. package/docs/ja/specdojo/standards/philosophy-authoring-standard.md +1 -1
  200. package/docs/ja/specdojo/standards/rulebook-authoring-standard.md +21 -11
  201. package/docs/ja/specdojo/templates/agent-members-template.yaml +25 -0
  202. package/docs/ja/specdojo/templates/bps-template.md +91 -0
  203. package/docs/ja/specdojo/templates/pm-members-template.yaml +2 -59
  204. package/docs/specdojo/schemas/v1/agent-members.schema.yaml +76 -0
  205. package/docs/specdojo/schemas/v1/exec-common.schema.yaml +4 -2
  206. package/docs/specdojo/schemas/v1/exec-defaults.schema.yaml +55 -2
  207. package/docs/specdojo/schemas/v1/exec-evidence.schema.yaml +93 -6
  208. package/docs/specdojo/schemas/v1/exec-reporter-output.schema.yaml +27 -78
  209. package/docs/specdojo/schemas/v1/gl.schema.yaml +87 -0
  210. package/docs/specdojo/schemas/v1/grade-result.schema.yaml +33 -0
  211. package/docs/specdojo/schemas/v1/job-run.schema.yaml +27 -0
  212. package/docs/specdojo/schemas/v1/job.schema.yaml +25 -0
  213. package/docs/specdojo/schemas/v1/pipeline-state.schema.yaml +49 -1
  214. package/docs/specdojo/schemas/v1/pm-members.schema.yaml +9 -169
  215. package/docs/specdojo/schemas/v1/pm-review-viewpoints.schema.yaml +100 -10
  216. package/docs/specdojo/schemas/v1/register-item-frontmatter.schema.yaml +13 -0
  217. package/docs/specdojo/schemas/v1/routine-run.schema.yaml +3 -0
  218. package/docs/specdojo/schemas/v1/routine.schema.yaml +7 -0
  219. package/docs/specdojo/schemas/v1/specdojo-config.schema.yaml +110 -0
  220. package/package.json +17 -12
  221. package/templates/antigravity/README.md +29 -4
  222. package/templates/antigravity/{pm-members-snippet.yaml → agent-members-snippet.yaml} +8 -2
  223. package/templates/antigravity/exec-defaults-snippet.yaml +10 -7
  224. package/templates/antigravity/orchestrator.md +18 -7
  225. package/templates/antigravity/settings.global.json +55 -0
  226. package/templates/claude/agents/claude-executor.md +14 -0
  227. package/templates/claude/agents/claude-reporter.md +16 -0
  228. package/templates/claude/agents/specdojo-orchestrator.md +18 -7
  229. package/templates/claude/settings.edit.json +27 -1
  230. package/templates/codex/README.md +5 -4
  231. package/templates/codex/agents/specdojo-orchestrator.toml +18 -7
  232. package/templates/codex/orchestrator.md +18 -7
  233. package/templates/copilot/README.md +7 -5
  234. package/templates/copilot/{pm-members-snippet.yaml → agent-members-snippet.yaml} +4 -2
  235. package/templates/devcontainer/devcontainer.json +27 -0
  236. package/templates/devcontainer/emacs/init.el +88 -0
  237. package/templates/devcontainer/post-create.sh +62 -0
  238. package/templates/init-agent-members.yaml +200 -0
  239. package/templates/init-exec-defaults.yaml +74 -0
  240. package/templates/opencode/agents/specdojo-orchestrator.md +18 -7
  241. package/docs/ja/specdojo/exec-templates/xrp-viewpoint-detail-template.md +0 -7
  242. package/docs/ja/specdojo/exec-templates/xrr-viewpoint-detail-template.md +0 -7
@@ -0,0 +1,264 @@
1
+ import { existsSync } from "node:fs";
2
+ import { productIntegrationTarget } from "./exec-task-repos.js";
3
+ import { abortMerge } from "./exec-worktree-ops.js";
4
+ import { gitOutput, gitResult } from "./exec-worktree.js";
5
+ import { PROJECT_REPO_NAME, branchExists, dirtyPaths, gitText, mergeInProgress, zeroSeparated, } from "./exec-repo-integration-git.js";
6
+ function isAncestor(cwd, ancestor, descendant) {
7
+ return gitResult(cwd, ["merge-base", "--is-ancestor", ancestor, descendant]).status === 0;
8
+ }
9
+ function hasPathAt(cwd, ref, path) {
10
+ return gitResult(cwd, ["cat-file", "-e", `${ref}:${path}`]).status === 0;
11
+ }
12
+ function gitFailure(result) {
13
+ return [gitText(result.stdout), gitText(result.stderr)]
14
+ .join("\n")
15
+ .split("\n")
16
+ .map((line) => line.trim())
17
+ .filter(Boolean)
18
+ .join(" ");
19
+ }
20
+ function stashWorktreeChanges(cwd, repo) {
21
+ if (dirtyPaths(cwd).size === 0)
22
+ return undefined;
23
+ const untrackedPaths = zeroSeparated(cwd, ["ls-files", "--others", "--exclude-standard", "-z"]);
24
+ const stash = gitResult(cwd, [
25
+ "stash",
26
+ "push",
27
+ "--include-untracked",
28
+ "--message",
29
+ `specdojo: ${repo} integration-target sync`,
30
+ ]);
31
+ if (stash.status !== 0) {
32
+ const detail = gitFailure(stash) || `exit ${stash.status ?? "unknown"}`;
33
+ throw new Error(`${repo}: cannot preserve uncommitted changes before sync: ${detail}`);
34
+ }
35
+ return {
36
+ oid: gitOutput(cwd, ["rev-parse", "--verify", "refs/stash"]).trim(),
37
+ untrackedPaths,
38
+ };
39
+ }
40
+ function dropStash(cwd, stashOid) {
41
+ const stashes = gitOutput(cwd, ["stash", "list", "--format=%H"])
42
+ .split("\n")
43
+ .map((line) => line.trim());
44
+ const index = stashes.indexOf(stashOid);
45
+ if (index >= 0)
46
+ gitOutput(cwd, ["stash", "drop", `stash@{${index}}`]);
47
+ }
48
+ function applyStashedWorktree(cwd, stashOid) {
49
+ // `--index` は merge commit 側の index と衝突し、同一ファイルの非競合 hunk も戻せないため使わない。
50
+ return gitResult(cwd, ["stash", "apply", "--quiet", stashOid]);
51
+ }
52
+ function treeObjectAt(cwd, ref, path) {
53
+ const entry = gitResult(cwd, ["ls-tree", "-z", ref, "--", path]);
54
+ if (entry.status !== 0)
55
+ return undefined;
56
+ const output = gitText(entry.stdout);
57
+ const separator = output.indexOf("\t");
58
+ if (separator < 0)
59
+ return undefined;
60
+ return output.slice(0, separator).split(" ").at(-1);
61
+ }
62
+ function classifyTrackedStashedUntrackedPaths(cwd, stash) {
63
+ const identical = [];
64
+ const conflicting = [];
65
+ const untrackedRef = `${stash.oid}^3`;
66
+ for (const path of stash.untrackedPaths) {
67
+ const mergedObject = treeObjectAt(cwd, "HEAD", path);
68
+ if (!mergedObject)
69
+ continue;
70
+ const stashedObject = treeObjectAt(cwd, untrackedRef, path);
71
+ (stashedObject === mergedObject ? identical : conflicting).push(path);
72
+ }
73
+ return { identical, conflicting };
74
+ }
75
+ function restoreOriginalWorktree(params) {
76
+ const reset = gitResult(params.cwd, ["reset", "--hard", params.originalHead]);
77
+ if (reset.status === 0 && params.stash.untrackedPaths.length > 0) {
78
+ gitResult(params.cwd, ["clean", "-d", "-f", "--", ...params.stash.untrackedPaths]);
79
+ }
80
+ if (reset.status !== 0) {
81
+ const detail = gitFailure(reset) || `exit ${reset.status ?? "unknown"}`;
82
+ throw new Error(`${params.repo}: ${params.reason}; failed to restore the original HEAD: ${detail}; ` +
83
+ `executor changes remain preserved in stash ${params.stash.oid}`);
84
+ }
85
+ const restored = applyStashedWorktree(params.cwd, params.stash.oid);
86
+ if (restored.status !== 0) {
87
+ const detail = gitFailure(restored) || `exit ${restored.status ?? "unknown"}`;
88
+ throw new Error(`${params.repo}: ${params.reason}; failed to restore executor changes: ${detail}; ` +
89
+ `executor changes remain preserved in stash ${params.stash.oid}`);
90
+ }
91
+ dropStash(params.cwd, params.stash.oid);
92
+ throw new Error(`${params.repo}: ${params.reason}`);
93
+ }
94
+ /**
95
+ * Merge `target` into the branch checked out at `cwd` (an exec worktree) with a merge commit.
96
+ * Uncommitted changes (including untracked files) are stashed before the merge and restored
97
+ * without restoring the old index. Conflicts on `theirsPaths` (repository-relative) take the
98
+ * target side. Any other committed conflict aborts the merge. If restoring the stash conflicts,
99
+ * the merge commit is rolled back and the executor changes are restored on the original HEAD.
100
+ */
101
+ export function syncWorktreeWithIntegrationTarget(params) {
102
+ const { repo, cwd, target, message } = params;
103
+ if (isAncestor(cwd, target, "HEAD"))
104
+ return { repo, target, status: "up-to-date" };
105
+ const originalHead = gitOutput(cwd, ["rev-parse", "HEAD"]).trim();
106
+ const stash = stashWorktreeChanges(cwd, repo);
107
+ const merge = gitResult(cwd, [
108
+ "merge",
109
+ "--no-commit",
110
+ "--no-ff",
111
+ "--no-verify",
112
+ "-m",
113
+ message,
114
+ target,
115
+ ]);
116
+ if (merge.status !== 0 && !mergeInProgress(cwd)) {
117
+ const output = gitFailure(merge);
118
+ const reason = `cannot merge ${target} into the exec branch` + (output ? `: ${output}` : "");
119
+ if (stash) {
120
+ restoreOriginalWorktree({ cwd, repo, originalHead, stash, reason });
121
+ }
122
+ throw new Error(`${repo}: ${reason}`);
123
+ }
124
+ try {
125
+ const conflicted = zeroSeparated(cwd, ["diff", "--name-only", "--diff-filter=U", "-z"]);
126
+ const theirs = new Set(params.theirsPaths ?? []);
127
+ const unexpected = conflicted.filter((path) => !theirs.has(path));
128
+ if (unexpected.length > 0) {
129
+ throw new Error(`${repo}: merge conflicts with ${target}: ${unexpected.join(", ")}`);
130
+ }
131
+ for (const path of conflicted) {
132
+ if (hasPathAt(cwd, target, path)) {
133
+ gitOutput(cwd, ["checkout", target, "--", path]);
134
+ gitOutput(cwd, ["add", "--", path]);
135
+ }
136
+ else {
137
+ gitOutput(cwd, ["rm", "--quiet", "--force", "--", path]);
138
+ }
139
+ }
140
+ const unresolved = zeroSeparated(cwd, ["diff", "--name-only", "--diff-filter=U", "-z"]);
141
+ if (unresolved.length > 0) {
142
+ throw new Error(`${repo}: unresolved conflicts with ${target}: ${unresolved.join(", ")}`);
143
+ }
144
+ // The merge is runner-internal; hooks would re-run the very checks the resume is about to run.
145
+ gitOutput(cwd, ["commit", "--no-verify", "-m", message]);
146
+ }
147
+ catch (error) {
148
+ if (mergeInProgress(cwd))
149
+ abortMerge(cwd);
150
+ if (stash) {
151
+ restoreOriginalWorktree({
152
+ cwd,
153
+ repo,
154
+ originalHead,
155
+ stash,
156
+ reason: error instanceof Error ? error.message.replace(`${repo}: `, "") : String(error),
157
+ });
158
+ }
159
+ throw error;
160
+ }
161
+ if (stash) {
162
+ const trackedUntracked = classifyTrackedStashedUntrackedPaths(cwd, stash);
163
+ if (trackedUntracked.conflicting.length > 0) {
164
+ restoreOriginalWorktree({
165
+ cwd,
166
+ repo,
167
+ originalHead,
168
+ stash,
169
+ reason: `uncommitted executor changes conflict with ${target}: ` +
170
+ `untracked files differ from tracked integration files: ${trackedUntracked.conflicting.join(", ")}`,
171
+ });
172
+ }
173
+ if (trackedUntracked.identical.length > 0) {
174
+ const removed = gitResult(cwd, [
175
+ "rm",
176
+ "--quiet",
177
+ "--force",
178
+ "--",
179
+ ...trackedUntracked.identical,
180
+ ]);
181
+ if (removed.status !== 0) {
182
+ const detail = gitFailure(removed) || `exit ${removed.status ?? "unknown"}`;
183
+ restoreOriginalWorktree({
184
+ cwd,
185
+ repo,
186
+ originalHead,
187
+ stash,
188
+ reason: `cannot prepare identical untracked files for restore: ${detail}`,
189
+ });
190
+ }
191
+ }
192
+ const restored = applyStashedWorktree(cwd, stash.oid);
193
+ if (restored.status !== 0) {
194
+ const detail = gitFailure(restored) || `exit ${restored.status ?? "unknown"}`;
195
+ restoreOriginalWorktree({
196
+ cwd,
197
+ repo,
198
+ originalHead,
199
+ stash,
200
+ reason: `uncommitted executor changes conflict with ${target}: ${detail}`,
201
+ });
202
+ }
203
+ if (trackedUntracked.identical.length > 0) {
204
+ const resolved = gitResult(cwd, ["checkout", "HEAD", "--", ...trackedUntracked.identical]);
205
+ if (resolved.status !== 0) {
206
+ const detail = gitFailure(resolved) || `exit ${resolved.status ?? "unknown"}`;
207
+ restoreOriginalWorktree({
208
+ cwd,
209
+ repo,
210
+ originalHead,
211
+ stash,
212
+ reason: `cannot finish restoring identical untracked files: ${detail}`,
213
+ });
214
+ }
215
+ }
216
+ dropStash(cwd, stash.oid);
217
+ }
218
+ return { repo, target, status: "merged" };
219
+ }
220
+ /**
221
+ * Bring every repository of a task up to date with its integration target before a resumed stage
222
+ * re-runs parent validations: products in declaration order, then the project. A product whose
223
+ * integration target is not a local branch is skipped (the integration preflight reports it).
224
+ * Products named in `integratedProducts` are skipped too: merging into an already integrated exec
225
+ * branch would make the integration stage merge it again.
226
+ * Throws on the first repository that cannot be synced; earlier repositories keep their merge.
227
+ */
228
+ export function syncTaskWorktreesWithIntegrationTargets(params) {
229
+ const synced = [];
230
+ for (const product of params.worktree.repos ?? []) {
231
+ const target = productIntegrationTarget(product);
232
+ if (params.integratedProducts?.has(product.name)) {
233
+ synced.push({ repo: product.name, target, status: "skipped", detail: "already integrated" });
234
+ continue;
235
+ }
236
+ if (!existsSync(product.path)) {
237
+ synced.push({ repo: product.name, target, status: "skipped", detail: "worktree missing" });
238
+ continue;
239
+ }
240
+ if (target === "HEAD" || target === product.branch || !branchExists(product.repoRoot, target)) {
241
+ synced.push({
242
+ repo: product.name,
243
+ target,
244
+ status: "skipped",
245
+ detail: "integration branch is not a local branch",
246
+ });
247
+ continue;
248
+ }
249
+ synced.push(syncWorktreeWithIntegrationTarget({
250
+ repo: product.name,
251
+ cwd: product.path,
252
+ target,
253
+ message: params.message,
254
+ }));
255
+ }
256
+ synced.push(syncWorktreeWithIntegrationTarget({
257
+ repo: PROJECT_REPO_NAME,
258
+ cwd: params.worktree.path,
259
+ target: params.projectTarget,
260
+ message: params.message,
261
+ theirsPaths: params.projectTheirsPaths,
262
+ }));
263
+ return synced;
264
+ }