specdojo 0.3.0 → 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 (104) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/catalog-build-references.js +144 -0
  3. package/dist/catalog-build-render.js +144 -0
  4. package/dist/catalog-build.js +13 -290
  5. package/dist/catalog-generate.js +6 -9
  6. package/dist/catalog-plan-generate.js +2 -2
  7. package/dist/catalog-plan.js +6 -6
  8. package/dist/catalog-scaffold.js +4 -4
  9. package/dist/catalog.js +2 -2
  10. package/dist/dashboard-exec-records.js +105 -0
  11. package/dist/dashboard-routines.js +255 -0
  12. package/dist/dashboard-shared.js +14 -0
  13. package/dist/dashboard-timeline.js +175 -0
  14. package/dist/dashboard.js +10 -544
  15. package/dist/deliverable-trash.js +3 -3
  16. package/dist/doc-index.js +3 -3
  17. package/dist/exec-commands.js +557 -0
  18. package/dist/exec-core.js +457 -0
  19. package/dist/exec-plans-core.js +693 -0
  20. package/dist/exec-plans-generation.js +206 -0
  21. package/dist/exec-plans-storage.js +131 -0
  22. package/dist/exec-plans.js +3 -1018
  23. package/dist/exec-repo-integration-git.js +23 -0
  24. package/dist/exec-repo-integration-sync.js +264 -0
  25. package/dist/exec-repo-integration.js +4 -281
  26. package/dist/exec-reporter-output.js +206 -0
  27. package/dist/exec-reporter.js +2 -206
  28. package/dist/exec-results.js +22 -15
  29. package/dist/exec-run-agent-pipeline.js +256 -0
  30. package/dist/exec-run-agent.js +531 -0
  31. package/dist/exec-run-in-place.js +541 -0
  32. package/dist/exec-run-job.js +717 -0
  33. package/dist/exec-run-lifecycle-commands.js +522 -0
  34. package/dist/exec-run-mode-shared.js +140 -0
  35. package/dist/exec-run-register-command.js +244 -0
  36. package/dist/exec-run-register-core.js +386 -0
  37. package/dist/exec-run-register-mode.js +206 -0
  38. package/dist/exec-run-register-resume.js +393 -0
  39. package/dist/exec-run-register-state.js +322 -0
  40. package/dist/exec-run-register-worktree.js +509 -0
  41. package/dist/exec-run-schedule-mode.js +294 -0
  42. package/dist/exec-run-schedule-prepare.js +353 -0
  43. package/dist/exec-run-schedule-task.js +572 -0
  44. package/dist/exec-run-shared.js +399 -0
  45. package/dist/exec-run.js +11 -6182
  46. package/dist/exec-shared.js +2 -2
  47. package/dist/exec-trial-commands.js +558 -0
  48. package/dist/exec-trial-core.js +371 -0
  49. package/dist/exec-trial.js +2 -921
  50. package/dist/exec-worktree-ops-commit.js +707 -0
  51. package/dist/exec-worktree-ops-lifecycle.js +292 -0
  52. package/dist/exec-worktree-ops-merge.js +303 -0
  53. package/dist/exec-worktree-ops.js +3 -1292
  54. package/dist/exec-worktree.js +32 -4
  55. package/dist/exec.js +2 -1006
  56. package/dist/frontmatter-namespace.js +2 -2
  57. package/dist/grade-apply.js +734 -0
  58. package/dist/grade-command-apply.js +250 -0
  59. package/dist/grade-command-inspect.js +138 -0
  60. package/dist/grade-command-plan.js +101 -0
  61. package/dist/grade-command-shared.js +68 -0
  62. package/dist/grade-core.js +307 -0
  63. package/dist/grade-markdown.js +274 -0
  64. package/dist/grade-pipeline-state.js +184 -0
  65. package/dist/grade-plan.js +507 -0
  66. package/dist/grade-result.js +5 -5
  67. package/dist/grade-target-discovery.js +265 -0
  68. package/dist/grade-targets.js +432 -0
  69. package/dist/grade.js +14 -3188
  70. package/dist/init-command.js +7 -7
  71. package/dist/job-definition.js +670 -0
  72. package/dist/job.js +9 -673
  73. package/dist/kata-command.js +2 -2
  74. package/dist/register-command-types.js +1 -0
  75. package/dist/register-core.js +363 -0
  76. package/dist/register-create-commands.js +245 -0
  77. package/dist/register-events.js +4 -4
  78. package/dist/register-item.js +6 -6
  79. package/dist/register-maintenance-commands.js +187 -0
  80. package/dist/register-migration.js +268 -0
  81. package/dist/register-renumber.js +314 -0
  82. package/dist/register-transition-commands.js +248 -0
  83. package/dist/register-update.js +230 -0
  84. package/dist/register-views.js +256 -0
  85. package/dist/register.js +61 -2069
  86. package/dist/review-plan.js +3 -3
  87. package/dist/routine-definition.js +401 -0
  88. package/dist/routine.js +6 -402
  89. package/dist/schedule-approach.js +2 -2
  90. package/dist/schedule-strategy-generate-document.js +273 -0
  91. package/dist/schedule-strategy-generate-scope.js +199 -0
  92. package/dist/schedule-strategy-generate.js +9 -473
  93. package/dist/schedule.js +4 -4
  94. package/dist/specdojo-config.js +3 -4
  95. package/dist/viewpoint-document-kinds-check.js +3 -3
  96. package/dist/yaml-pages.js +4 -4
  97. package/dist/yaml.js +28 -0
  98. package/docs/ja/specdojo/guides/exec-config-guide.md +6 -6
  99. package/docs/ja/specdojo/guides/orchestrator-operation-guide.md +20 -18
  100. package/docs/ja/specdojo/guides/routine-operation-guide.md +1 -1
  101. package/package.json +4 -5
  102. package/templates/antigravity/README.md +3 -3
  103. package/templates/antigravity/exec-defaults-snippet.yaml +6 -4
  104. package/templates/init-exec-defaults.yaml +3 -1
@@ -0,0 +1,322 @@
1
+ import { copyFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
2
+ import { basename, dirname, resolve } from "node:path";
3
+ import { sanitizeRegisterConclusion, } from "./exec-register.js";
4
+ import { applyRegisterItemFields, CELL_NONE, readRegisterItemContent, registerItemFieldsFromItem, } from "./register-item.js";
5
+ import { appendGitFailureLog, gitOutput, gitResult, summarizeGitHookFailure, } from "./exec-worktree.js";
6
+ import { abortMerge, currentBranch, normalizeResultWhitespace, releaseRootWorkingCopies, stabilizeCommitTargets, stageCommitTargets, unstageCommitTargets, worktreeStatusPaths, } from "./exec-worktree-ops.js";
7
+ import { pathInsideWorktree } from "./exec-run-agent.js";
8
+ import { repoRelativePath } from "./exec-run-mode-shared.js";
9
+ import { spawnRegisterTransition, registerEventPathForTicket, registerRunnerManagedPaths, } from "./exec-run-register-core.js";
10
+ // register の状態遷移(start/review/wait)が変更した調整状態(pjr-index と派生ビュー)だけを
11
+ // 抽出する。worktree モードでは成功時の遷移を exec branch、失敗時の wait を root で commit
12
+ // する。plan/result は checkpoint と worktree merge が扱うため、ここでは含めない。
13
+ export function registerStatePaths(repoRoot, registerPaths, ticketPath) {
14
+ const changed = worktreeStatusPaths(repoRoot);
15
+ const exact = new Set([repoRelativePath(repoRoot, registerPaths.pjrIndexPath)]);
16
+ if (ticketPath)
17
+ exact.add(repoRelativePath(repoRoot, ticketPath));
18
+ const eventPath = registerEventPathForTicket(registerPaths, ticketPath);
19
+ if (eventPath)
20
+ exact.add(repoRelativePath(repoRoot, eventPath));
21
+ const prefixes = [registerPaths.generatedPath, registerPaths.controlsGeneratedPath].map((path) => `${repoRelativePath(repoRoot, path)}/`);
22
+ const selected = new Set();
23
+ for (const path of changed) {
24
+ const normalized = path.replaceAll("\\", "/");
25
+ if (exact.has(normalized) || prefixes.some((prefix) => normalized.startsWith(prefix))) {
26
+ selected.add(path);
27
+ }
28
+ }
29
+ return [...selected].sort();
30
+ }
31
+ // register 状態遷移の pjr-index / 派生ビュー変更を root へ 1 コミットする。hook が対象を
32
+ // 整形した場合は同じ commit へ収束するまで amend する。commit 対象が無ければ何もしない。
33
+ export function commitRegisterState(repoRoot, registerPaths, message, ticketPath, additionalPaths = [], failureLogPath) {
34
+ const paths = [
35
+ ...new Set([
36
+ ...registerStatePaths(repoRoot, registerPaths, ticketPath),
37
+ ...additionalPaths.map((path) => repoRelativePath(repoRoot, path)),
38
+ ]),
39
+ ];
40
+ if (paths.length === 0)
41
+ return;
42
+ const remainingPaths = () => registerStatePaths(repoRoot, registerPaths, ticketPath);
43
+ try {
44
+ stageCommitTargets(repoRoot, paths);
45
+ const staged = gitResult(repoRoot, ["diff", "--cached", "--quiet", "--", ...paths]);
46
+ if (staged.status === 0)
47
+ return;
48
+ if (staged.status !== 1)
49
+ throw new Error("Failed to inspect staged register-state changes.");
50
+ const commit = gitResult(repoRoot, ["commit", "-m", message, "--", ...paths]);
51
+ if (commit.status !== 0) {
52
+ const output = [commit.stdout, commit.stderr]
53
+ .filter((part) => typeof part === "string" && part.length > 0)
54
+ .join("\n");
55
+ appendGitFailureLog(failureLogPath, [
56
+ `=== ${new Date().toISOString()} git commit register state ===`,
57
+ `exit: ${commit.status ?? "unknown"}`,
58
+ "--- stdout ---",
59
+ typeof commit.stdout === "string" ? commit.stdout : "",
60
+ "--- stderr ---",
61
+ typeof commit.stderr === "string" ? commit.stderr : "",
62
+ "",
63
+ ]);
64
+ throw new Error(`git commit failed: ${summarizeGitHookFailure(output)}`);
65
+ }
66
+ stabilizeCommitTargets(repoRoot, remainingPaths, undefined, failureLogPath);
67
+ }
68
+ catch (error) {
69
+ unstageCommitTargets(repoRoot, [...paths, ...remainingPaths()]);
70
+ throw error;
71
+ }
72
+ }
73
+ export function registerPathsInsideWorktree(repoRoot, worktreePath, paths) {
74
+ return {
75
+ ...paths,
76
+ projectRegisterPath: pathInsideWorktree(repoRoot, worktreePath, paths.projectRegisterPath),
77
+ pjrIndexPath: pathInsideWorktree(repoRoot, worktreePath, paths.pjrIndexPath),
78
+ generatedPath: pathInsideWorktree(repoRoot, worktreePath, paths.generatedPath),
79
+ controlsGeneratedPath: pathInsideWorktree(repoRoot, worktreePath, paths.controlsGeneratedPath),
80
+ };
81
+ }
82
+ // root と task worktree の間で、同じ repo 相対パスのファイルを複製する。複製元に無いパスは
83
+ // 複製先からも消す(superseded result のような削除も追従させる)。
84
+ export function copyRepoPaths(sourceRoot, targetRoot, repoRoot, paths) {
85
+ for (const path of paths) {
86
+ const rel = repoRelativePath(repoRoot, path);
87
+ const source = resolve(sourceRoot, rel);
88
+ const target = resolve(targetRoot, rel);
89
+ if (!existsSync(source)) {
90
+ rmSync(target, { recursive: true, force: true });
91
+ continue;
92
+ }
93
+ mkdirSync(dirname(target), { recursive: true });
94
+ copyFileSync(source, target);
95
+ }
96
+ }
97
+ // 失敗時に root へ戻すのは runner が生成・更新した plan / result だけに限定する。個票と
98
+ // event は agent が編集した未検証の本文を含みうるため、root に残してある checkpoint 版を
99
+ // wait 遷移の入力にする。派生ビューは遷移後に root で再生成する。
100
+ export function registerFailureArtifactPaths(repoRoot, paths) {
101
+ return paths.filter((path) => /(?:^|\/)exec\/(?:plans|results)\//.test(repoRelativePath(repoRoot, path)));
102
+ }
103
+ // wait commit の個票は検証済みの root 本文を使う一方、exec branch には agent が編集した本文を
104
+ // 残す。root の frontmatter から lifecycle フィールドだけを重ね、resume 後も waiting 状態と
105
+ // 未統合の作業内容の両方を保持する。
106
+ export function restorePreservedRegisterTicket(worktreePath, repoRoot, preserved) {
107
+ if (!preserved)
108
+ return;
109
+ const rel = repoRelativePath(repoRoot, preserved.path);
110
+ const rootTicketPath = resolve(repoRoot, rel);
111
+ const worktreeTicketPath = resolve(worktreePath, rel);
112
+ if (!existsSync(rootTicketPath)) {
113
+ mkdirSync(dirname(worktreeTicketPath), { recursive: true });
114
+ writeFileSync(worktreeTicketPath, preserved.content, "utf8");
115
+ return;
116
+ }
117
+ try {
118
+ const rootContent = readFileSync(rootTicketPath, "utf8");
119
+ const parsed = readRegisterItemContent(rootContent, basename(rel));
120
+ if (!parsed)
121
+ throw new Error(`could not parse register item: ${rel}`);
122
+ const content = applyRegisterItemFields(preserved.content, {
123
+ ...registerItemFieldsFromItem(parsed.item),
124
+ block_reason: parsed.blockReason === CELL_NONE ? null : parsed.blockReason,
125
+ });
126
+ mkdirSync(dirname(worktreeTicketPath), { recursive: true });
127
+ writeFileSync(worktreeTicketPath, content, "utf8");
128
+ }
129
+ catch (error) {
130
+ // frontmatter 自体が壊れている場合も agent の作業を失わない。root の wait commit はすでに
131
+ // clean な checkpoint 版で確定しているため、worktree 側だけ元の内容へ戻して警告する。
132
+ mkdirSync(dirname(worktreeTicketPath), { recursive: true });
133
+ writeFileSync(worktreeTicketPath, preserved.content, "utf8");
134
+ process.stderr.write(`warning: could not apply the waiting lifecycle to ${rel} in the exec branch: ` +
135
+ `${error instanceof Error ? error.message : String(error)}\n`);
136
+ }
137
+ }
138
+ // register の状態遷移(start / wait / review)が書き換える追跡ファイル(root 側の絶対パス):
139
+ // 個票、append-only のイベント、存在する場合は登録簿本体(移行前のレイアウト)。gitignore 済みの
140
+ // 派生ビューは含めない。
141
+ export function registerTransitionPaths(registerPaths, ticketPath) {
142
+ const paths = [];
143
+ if (ticketPath)
144
+ paths.push(ticketPath);
145
+ const eventPath = registerEventPathForTicket(registerPaths, ticketPath);
146
+ if (eventPath)
147
+ paths.push(eventPath);
148
+ if (existsSync(registerPaths.pjrIndexPath))
149
+ paths.push(registerPaths.pjrIndexPath);
150
+ return paths;
151
+ }
152
+ // register 項目の実行管理ファイル(root 側の絶対パス)。再開時は plan / result /
153
+ // 遷移ファイルに加え、start 遷移で再生成された派生ビューも、初回 checkpoint と同じ基準で
154
+ // runner 管理パスとして扱う。この集合を失敗時の wait commit、merge 前の root 解放で使う。
155
+ export function registerBookkeepingPaths(params) {
156
+ const { repoRoot, registerPaths, planPath, resultPath, ticketPath } = params;
157
+ return registerRunnerManagedPaths(repoRoot, registerPaths, planPath, resultPath, worktreeStatusPaths(repoRoot), ticketPath).map((path) => resolve(repoRoot, path));
158
+ }
159
+ // root の登録簿派生ビュー(pjr-index / generated)は非追跡の生成物で、merge や複製では更新され
160
+ // ない。個票の状態を root 側へ反映したあとに再生成して、root の表示を個票と揃える。失敗しても
161
+ // 実行結果には影響しないため警告に留める。
162
+ export function rebuildRootRegisterViews(projectId, itemId) {
163
+ if (!spawnRegisterTransition(projectId, ["build"])) {
164
+ process.stderr.write(`warning: could not rebuild register views at root for ${itemId}\n`);
165
+ }
166
+ }
167
+ // register worktree 実行の失敗確定。worktree 側の plan / blocked result だけを root へ写し、
168
+ // 個票・event は root に残る検証済み checkpoint 版を基準に waiting へ遷移する。統合ブランチには
169
+ // `exec(register X): wait` commit 1件だけを作り、未検証の個票本文は exec branch に保持する。
170
+ // worktree が無い(checkpoint 前の失敗)場合は root の実行管理ファイルをそのまま commit する。
171
+ export function registerWaitSummary(params) {
172
+ const { repoRoot, projectId, registerPaths, item, ticketPath, actor, worktree } = params;
173
+ const blockReason = sanitizeRegisterConclusion(params.reason);
174
+ const bookkeepingPaths = [...params.bookkeepingPaths];
175
+ const preservedTicketPath = worktree && ticketPath ? pathInsideWorktree(repoRoot, worktree.path, ticketPath) : undefined;
176
+ const preservedTicket = ticketPath && preservedTicketPath && existsSync(preservedTicketPath)
177
+ ? { path: ticketPath, content: readFileSync(preservedTicketPath, "utf8") }
178
+ : undefined;
179
+ if (worktree) {
180
+ copyRepoPaths(worktree.path, repoRoot, repoRoot, registerFailureArtifactPaths(repoRoot, bookkeepingPaths));
181
+ }
182
+ let transition = "waiting";
183
+ if (!spawnRegisterTransition(projectId, [
184
+ "wait",
185
+ "--id",
186
+ item.id,
187
+ "--reason",
188
+ blockReason,
189
+ "--by",
190
+ actor,
191
+ ])) {
192
+ process.stderr.write(`register wait transition failed: ${item.id}\n`);
193
+ transition = "none";
194
+ }
195
+ else {
196
+ const message = `exec(register ${item.id}): wait`;
197
+ const committedPaths = commitRegisterWaitState({
198
+ repoRoot,
199
+ registerPaths,
200
+ item,
201
+ ticketPath,
202
+ bookkeepingPaths,
203
+ message,
204
+ });
205
+ if (worktree)
206
+ syncExecBranchAfterWait({
207
+ repoRoot,
208
+ worktree,
209
+ item,
210
+ bookkeepingPaths: committedPaths,
211
+ preservedTicket,
212
+ });
213
+ }
214
+ return {
215
+ id: item.id,
216
+ title: item.title,
217
+ outcome: "failure",
218
+ transition,
219
+ commit: "off",
220
+ reason: blockReason,
221
+ };
222
+ }
223
+ // waiting 遷移と実行管理ファイルを root へ 1 commit する。result は commit hook の markdownlint
224
+ // 対象で、失敗した run の result(scaffold のまま、または reporter の出力)が記法違反を含むと
225
+ // commit ごと失敗する。その場合は result を外して遷移だけを commit し(result は root に未 commit
226
+ // のまま残り、merge 前の解放で退避される)、実際に commit した集合を返す。
227
+ export function commitRegisterWaitState(params) {
228
+ const { repoRoot, registerPaths, item, ticketPath, message } = params;
229
+ const paths = [...params.bookkeepingPaths];
230
+ const resultPaths = paths.filter((path) => isRegisterResultPath(repoRoot, path));
231
+ for (const path of resultPaths) {
232
+ if (existsSync(path))
233
+ normalizeResultWhitespace(path);
234
+ }
235
+ try {
236
+ commitRegisterState(repoRoot, registerPaths, message, ticketPath, paths);
237
+ return paths;
238
+ }
239
+ catch (error) {
240
+ if (resultPaths.length === 0)
241
+ throw error;
242
+ const withoutResult = paths.filter((path) => !resultPaths.includes(path));
243
+ process.stderr.write(`warning: wait commit of ${item.id} failed with the result included; retrying without it: ` +
244
+ `${error instanceof Error ? error.message : String(error)}\n`);
245
+ gitResult(repoRoot, [
246
+ "reset",
247
+ "--quiet",
248
+ "--",
249
+ ...resultPaths.map((path) => repoRelativePath(repoRoot, path)),
250
+ ]);
251
+ commitRegisterState(repoRoot, registerPaths, message, ticketPath, withoutResult);
252
+ return withoutResult;
253
+ }
254
+ }
255
+ export function isRegisterResultPath(repoRoot, path) {
256
+ return /\/exec\/results\/[^/]+-result\.md$/.test(repoRelativePath(repoRoot, path));
257
+ }
258
+ // wait commit と、その時点までに統合先へ入った変更を exec branch へ通常 merge する。
259
+ // worktree の記帳パスには、root へ複製した blocked result などが未 commit のまま残っている。
260
+ // そのままでは root の wait commit に上書きされるとして merge 開始前に拒否されるため、root に
261
+ // commit 済みの記帳パスだけを先に exec branch の HEAD へ戻す。checkpoint と wait commit は
262
+ // 共通祖先に存在しないイベントファイルなどを双方で追加するため、記帳パスの競合だけは root 側の
263
+ // 内容で解決する。それ以外の競合は自動解決せず、merge を abort する。
264
+ // merge commit は runner 内部の同期であり、失敗原因となった統合 hook を再実行しないよう
265
+ // --no-verify を指定する。同期に失敗した場合は root の記帳内容を worktree へ戻して保持する。
266
+ export function syncExecBranchAfterWait(params) {
267
+ const { repoRoot, worktree, item } = params;
268
+ const bookkeepingPaths = params.bookkeepingPaths.map((path) => repoRelativePath(repoRoot, path));
269
+ try {
270
+ const targetBranch = currentBranch(repoRoot);
271
+ // The same content is already durable in the root wait commit. Releasing these working copies
272
+ // is what lets a normal merge start; all other dirty paths remain untouched.
273
+ releaseRootWorkingCopies(worktree.path, bookkeepingPaths);
274
+ const mergeMessage = `exec(register ${item.id}): merge ${targetBranch} after wait`;
275
+ const mergeResult = gitResult(worktree.path, [
276
+ "merge",
277
+ "--no-commit",
278
+ "--no-ff",
279
+ "--no-verify",
280
+ "-m",
281
+ mergeMessage,
282
+ targetBranch,
283
+ ]);
284
+ if (mergeResult.status !== 0) {
285
+ const mergeHead = gitResult(worktree.path, [
286
+ "rev-parse",
287
+ "--verify",
288
+ "--quiet",
289
+ "MERGE_HEAD",
290
+ ]);
291
+ if (mergeHead.status !== 0) {
292
+ const stderr = typeof mergeResult.stderr === "string" ? mergeResult.stderr.trim() : "";
293
+ throw new Error(`git merge failed before conflict resolution${stderr ? `: ${stderr}` : ""}`);
294
+ }
295
+ const conflicted = gitOutput(worktree.path, ["diff", "--name-only", "--diff-filter=U", "-z"])
296
+ .split("\0")
297
+ .filter((path) => path.length > 0);
298
+ const allowed = new Set(bookkeepingPaths);
299
+ const unexpected = conflicted.filter((path) => !allowed.has(path));
300
+ if (unexpected.length > 0) {
301
+ throw new Error(`wait sync conflicts outside register bookkeeping: ${unexpected.join(", ")}`);
302
+ }
303
+ }
304
+ copyRepoPaths(repoRoot, worktree.path, repoRoot, params.bookkeepingPaths);
305
+ restorePreservedRegisterTicket(worktree.path, repoRoot, params.preservedTicket);
306
+ stageCommitTargets(worktree.path, bookkeepingPaths);
307
+ const unresolved = gitOutput(worktree.path, ["diff", "--name-only", "--diff-filter=U"]).trim();
308
+ if (unresolved)
309
+ throw new Error(`wait sync has unresolved conflicts: ${unresolved}`);
310
+ gitOutput(worktree.path, ["commit", "--no-verify", "-m", mergeMessage]);
311
+ }
312
+ catch (error) {
313
+ abortMerge(worktree.path);
314
+ // The pre-merge release is safe to repeat from root and restores the visible waiting state even
315
+ // when the merge was rejected before MERGE_HEAD was created.
316
+ copyRepoPaths(repoRoot, worktree.path, repoRoot, params.bookkeepingPaths);
317
+ restorePreservedRegisterTicket(worktree.path, repoRoot, params.preservedTicket);
318
+ process.stderr.write(`warning: could not sync the exec branch of ${item.id} with the wait commit; ` +
319
+ `the resumed merge may still conflict: ` +
320
+ `${error instanceof Error ? error.message : String(error)}\n`);
321
+ }
322
+ }