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.
- package/.github/agents/specdojo-orchestrator.md +165 -0
- package/CHANGELOG.md +298 -0
- package/README.md +92 -42
- package/dist/agent-response.js +20 -0
- package/dist/agent.js +4 -4
- package/dist/build-command.js +28 -8
- package/dist/catalog-build-references.js +144 -0
- package/dist/catalog-build-render.js +144 -0
- package/dist/catalog-build.js +13 -290
- package/dist/catalog-generate.js +6 -9
- package/dist/catalog-plan-generate.js +2 -2
- package/dist/catalog-plan.js +6 -6
- package/dist/catalog-scaffold.js +4 -4
- package/dist/catalog.js +2 -2
- package/dist/dashboard-exec-records.js +105 -0
- package/dist/dashboard-routines.js +255 -0
- package/dist/dashboard-shared.js +14 -0
- package/dist/dashboard-timeline.js +175 -0
- package/dist/dashboard.js +31 -444
- package/dist/deliverable-trash.js +3 -3
- package/dist/devcontainer-command.js +43 -0
- package/dist/devcontainer-scaffold.js +165 -0
- package/dist/doc-index.js +3 -3
- package/dist/exec-agent-config.js +107 -9
- package/dist/exec-agent-git-state.js +18 -0
- package/dist/exec-agent-protected-config.js +46 -8
- package/dist/exec-commands.js +557 -0
- package/dist/exec-core.js +457 -0
- package/dist/exec-evidence.js +254 -11
- package/dist/exec-handoff.js +336 -0
- package/dist/exec-parent-validation.js +317 -43
- package/dist/exec-pipeline-state.js +74 -9
- package/dist/exec-plans-core.js +693 -0
- package/dist/exec-plans-generation.js +206 -0
- package/dist/exec-plans-storage.js +131 -0
- package/dist/exec-plans.js +3 -1016
- package/dist/exec-protection-handoff.js +43 -2
- package/dist/exec-provider-scaffold.js +247 -15
- package/dist/exec-register-resume.js +65 -19
- package/dist/exec-register.js +9 -3
- package/dist/exec-repo-integration-git.js +23 -0
- package/dist/exec-repo-integration-sync.js +264 -0
- package/dist/exec-repo-integration.js +534 -0
- package/dist/exec-repo-trace.js +182 -0
- package/dist/exec-reporter-output.js +206 -0
- package/dist/exec-reporter.js +525 -248
- package/dist/exec-results.js +103 -71
- package/dist/exec-run-agent-pipeline.js +256 -0
- package/dist/exec-run-agent.js +531 -0
- package/dist/exec-run-in-place.js +541 -0
- package/dist/exec-run-job.js +717 -0
- package/dist/exec-run-lifecycle-commands.js +522 -0
- package/dist/exec-run-lock.js +110 -107
- package/dist/exec-run-mode-shared.js +140 -0
- package/dist/exec-run-register-command.js +244 -0
- package/dist/exec-run-register-core.js +386 -0
- package/dist/exec-run-register-mode.js +206 -0
- package/dist/exec-run-register-resume.js +393 -0
- package/dist/exec-run-register-state.js +322 -0
- package/dist/exec-run-register-worktree.js +509 -0
- package/dist/exec-run-schedule-mode.js +294 -0
- package/dist/exec-run-schedule-prepare.js +353 -0
- package/dist/exec-run-schedule-task.js +572 -0
- package/dist/exec-run-shared.js +399 -0
- package/dist/exec-run.js +11 -4953
- package/dist/exec-shared.js +9 -2
- package/dist/exec-slot-lock.js +242 -0
- package/dist/exec-task-repos.js +415 -0
- package/dist/exec-trial-commands.js +558 -0
- package/dist/exec-trial-core.js +371 -0
- package/dist/exec-trial.js +2 -895
- package/dist/exec-worktree-command.js +87 -43
- package/dist/exec-worktree-ops-commit.js +707 -0
- package/dist/exec-worktree-ops-lifecycle.js +292 -0
- package/dist/exec-worktree-ops-merge.js +303 -0
- package/dist/exec-worktree-ops.js +3 -847
- package/dist/exec-worktree.js +146 -31
- package/dist/exec.js +2 -999
- package/dist/frontmatter-namespace.js +2 -2
- package/dist/grade-apply.js +734 -0
- package/dist/grade-command-apply.js +250 -0
- package/dist/grade-command-inspect.js +138 -0
- package/dist/grade-command-plan.js +101 -0
- package/dist/grade-command-shared.js +68 -0
- package/dist/grade-core.js +307 -0
- package/dist/grade-markdown.js +274 -0
- package/dist/grade-pipeline-state.js +184 -0
- package/dist/grade-plan.js +507 -0
- package/dist/grade-result.js +133 -5
- package/dist/grade-target-discovery.js +265 -0
- package/dist/grade-targets.js +432 -0
- package/dist/grade.js +14 -2451
- package/dist/init-command.js +443 -0
- package/dist/job-definition.js +670 -0
- package/dist/job.js +64 -578
- package/dist/kata-command.js +2 -2
- package/dist/orchestrator.js +213 -0
- package/dist/register-command-types.js +1 -0
- package/dist/register-core.js +363 -0
- package/dist/register-create-commands.js +245 -0
- package/dist/register-event-merge.js +169 -0
- package/dist/register-events.js +4 -4
- package/dist/register-item.js +13 -7
- package/dist/register-maintenance-commands.js +187 -0
- package/dist/register-migration.js +268 -0
- package/dist/register-renumber.js +314 -0
- package/dist/register-transition-commands.js +248 -0
- package/dist/register-update.js +230 -0
- package/dist/register-views.js +256 -0
- package/dist/register.js +175 -1975
- package/dist/review-grade.js +252 -0
- package/dist/review-plan.js +114 -4
- package/dist/review-types.js +40 -1
- package/dist/routine-definition.js +401 -0
- package/dist/routine.js +73 -402
- package/dist/schedule-approach.js +2 -2
- package/dist/schedule-build.js +2 -2
- package/dist/schedule-strategy-generate-document.js +273 -0
- package/dist/schedule-strategy-generate-scope.js +199 -0
- package/dist/schedule-strategy-generate.js +9 -473
- package/dist/schedule.js +19 -6
- package/dist/specdojo-config.js +465 -20
- package/dist/specdojo-gitignore.js +135 -0
- package/dist/specdojo.js +6 -0
- package/dist/viewpoint-document-kinds-check.js +128 -0
- package/dist/yaml-pages.js +4 -4
- package/dist/yaml.js +28 -0
- package/docs/ja/specdojo/defaults/pm-review-viewpoints.yaml +348 -90
- package/docs/ja/specdojo/exec-templates/xep-common-conventions-template.md +51 -17
- package/docs/ja/specdojo/exec-templates/xep-fully-guided-template.md +7 -5
- package/docs/ja/specdojo/exec-templates/xrp-freeform-template.md +29 -31
- package/docs/ja/specdojo/exec-templates/xrp-fully-guided-template.md +34 -55
- package/docs/ja/specdojo/exec-templates/xrp-job-template.md +54 -0
- package/docs/ja/specdojo/exec-templates/xrp-recipe-guided-template.md +28 -37
- package/docs/ja/specdojo/exec-templates/xrp-recipe-maintenance-template.md +29 -34
- package/docs/ja/specdojo/exec-templates/xrp-retrofit-template.md +30 -30
- package/docs/ja/specdojo/exec-templates/xrp-rulebook-maintenance-template.md +29 -34
- package/docs/ja/specdojo/exec-templates/xrp-sample-maintenance-template.md +29 -34
- package/docs/ja/specdojo/exec-templates/xrp-template-maintenance-template.md +29 -34
- package/docs/ja/specdojo/exec-templates/xrp-template.md +29 -28
- package/docs/ja/specdojo/exec-templates/xrr-template.md +11 -9
- package/docs/ja/specdojo/guides/docs-editing-guide.md +20 -0
- package/docs/ja/specdojo/guides/docs-structure-guide.md +103 -70
- package/docs/ja/specdojo/guides/exec-config-guide.md +93 -49
- package/docs/ja/specdojo/guides/exec-operation-guide.md +124 -27
- package/docs/ja/specdojo/guides/exec-worktree-guide.md +40 -11
- package/docs/ja/specdojo/guides/kata-guide.md +4 -4
- package/docs/ja/specdojo/guides/orchestrator-operation-guide.md +45 -22
- package/docs/ja/specdojo/guides/plan-result-lifecycle-guide.md +1 -1
- package/docs/ja/specdojo/guides/practice-system-composition-guide.md +13 -13
- package/docs/ja/specdojo/guides/quick-start-guide.md +260 -30
- package/docs/ja/specdojo/guides/register-operation-guide.md +31 -14
- package/docs/ja/specdojo/guides/release-v0-3-0-migration-guide.md +264 -0
- package/docs/ja/specdojo/guides/remote-host-development-guide.md +22 -1
- package/docs/ja/specdojo/guides/review-guide.md +195 -158
- package/docs/ja/specdojo/guides/routine-operation-guide.md +75 -10
- package/docs/ja/specdojo/guides/ryu-guide.md +32 -30
- package/docs/ja/specdojo/guides/schedule-design-guide.md +10 -10
- package/docs/ja/specdojo/guides/schedule-operation-guide.md +1 -1
- package/docs/ja/specdojo/guides/specdojo-overview-guide.md +58 -33
- package/docs/ja/specdojo/guides/use-case-guide.md +3 -3
- package/docs/ja/specdojo/guides/waza-guide.md +15 -2
- package/docs/ja/specdojo/index.md +2 -2
- package/docs/ja/specdojo/philosophy/specdojo-philosophy.md +5 -5
- package/docs/ja/specdojo/recipes/bps-recipe.md +213 -0
- package/docs/ja/specdojo/recipes/pm-members-recipe.md +52 -117
- package/docs/ja/specdojo/references/command-reference.md +335 -92
- package/docs/ja/specdojo/references/deliverables-reference.md +1 -1
- package/docs/ja/specdojo/references/directory-layout-reference.md +13 -9
- package/docs/ja/specdojo/references/specdojo-config-reference.md +107 -24
- package/docs/ja/specdojo/rulebooks/bps-rulebook.md +132 -220
- package/docs/ja/specdojo/rulebooks/br-rulebook.md +6 -44
- package/docs/ja/specdojo/rulebooks/cdfd-rulebook.md +2 -0
- package/docs/ja/specdojo/rulebooks/dmd-rulebook.md +0 -87
- package/docs/ja/specdojo/rulebooks/gl-rulebook.md +61 -39
- package/docs/ja/specdojo/rulebooks/ifx-cmd-rulebook.md +0 -87
- package/docs/ja/specdojo/rulebooks/ifx-index-rulebook.md +1 -33
- package/docs/ja/specdojo/rulebooks/opd-rulebook.md +0 -137
- package/docs/ja/specdojo/rulebooks/opr-rulebook.md +0 -247
- package/docs/ja/specdojo/rulebooks/otp-rulebook.md +0 -83
- package/docs/ja/specdojo/rulebooks/pjr-rulebook.md +4 -2
- package/docs/ja/specdojo/rulebooks/pm-members-rulebook.md +78 -150
- package/docs/ja/specdojo/rulebooks/pm-roles-rulebook.md +5 -4
- package/docs/ja/specdojo/rulebooks/sch-rulebook.md +1 -1
- package/docs/ja/specdojo/rulebooks/stsd-mermaid-rulebook.md +0 -11
- package/docs/ja/specdojo/rulebooks/stsd-rulebook.md +0 -61
- package/docs/ja/specdojo/rulebooks/tml-rulebook.md +2 -47
- package/docs/ja/specdojo/samples/bps-sample.md +74 -21
- package/docs/ja/specdojo/samples/gl-sample.yaml +17 -1
- package/docs/ja/specdojo/samples/ifx-index-sample.yaml +28 -0
- package/docs/ja/specdojo/samples/pm-members-sample.yaml +2 -67
- package/docs/ja/specdojo/samples/pm-organization-sample.md +8 -7
- package/docs/ja/specdojo/samples/pm-raci-sample.md +1 -1
- package/docs/ja/specdojo/samples/tml-sample.yaml +40 -0
- package/docs/ja/specdojo/standards/document-metadata-standard.md +21 -16
- package/docs/ja/specdojo/standards/id-and-file-naming-standard.md +14 -14
- package/docs/ja/specdojo/standards/job-definition-standard.md +37 -17
- package/docs/ja/specdojo/standards/people-and-organization-definition-standard.md +37 -32
- package/docs/ja/specdojo/standards/philosophy-authoring-standard.md +1 -1
- package/docs/ja/specdojo/standards/rulebook-authoring-standard.md +21 -11
- package/docs/ja/specdojo/templates/agent-members-template.yaml +25 -0
- package/docs/ja/specdojo/templates/bps-template.md +91 -0
- package/docs/ja/specdojo/templates/pm-members-template.yaml +2 -59
- package/docs/specdojo/schemas/v1/agent-members.schema.yaml +76 -0
- package/docs/specdojo/schemas/v1/exec-common.schema.yaml +4 -2
- package/docs/specdojo/schemas/v1/exec-defaults.schema.yaml +55 -2
- package/docs/specdojo/schemas/v1/exec-evidence.schema.yaml +93 -6
- package/docs/specdojo/schemas/v1/exec-reporter-output.schema.yaml +27 -78
- package/docs/specdojo/schemas/v1/gl.schema.yaml +87 -0
- package/docs/specdojo/schemas/v1/grade-result.schema.yaml +33 -0
- package/docs/specdojo/schemas/v1/job-run.schema.yaml +27 -0
- package/docs/specdojo/schemas/v1/job.schema.yaml +25 -0
- package/docs/specdojo/schemas/v1/pipeline-state.schema.yaml +49 -1
- package/docs/specdojo/schemas/v1/pm-members.schema.yaml +9 -169
- package/docs/specdojo/schemas/v1/pm-review-viewpoints.schema.yaml +100 -10
- package/docs/specdojo/schemas/v1/register-item-frontmatter.schema.yaml +13 -0
- package/docs/specdojo/schemas/v1/routine-run.schema.yaml +3 -0
- package/docs/specdojo/schemas/v1/routine.schema.yaml +7 -0
- package/docs/specdojo/schemas/v1/specdojo-config.schema.yaml +110 -0
- package/package.json +17 -12
- package/templates/antigravity/README.md +29 -4
- package/templates/antigravity/{pm-members-snippet.yaml → agent-members-snippet.yaml} +8 -2
- package/templates/antigravity/exec-defaults-snippet.yaml +10 -7
- package/templates/antigravity/orchestrator.md +18 -7
- package/templates/antigravity/settings.global.json +55 -0
- package/templates/claude/agents/claude-executor.md +14 -0
- package/templates/claude/agents/claude-reporter.md +16 -0
- package/templates/claude/agents/specdojo-orchestrator.md +18 -7
- package/templates/claude/settings.edit.json +27 -1
- package/templates/codex/README.md +5 -4
- package/templates/codex/agents/specdojo-orchestrator.toml +18 -7
- package/templates/codex/orchestrator.md +18 -7
- package/templates/copilot/README.md +7 -5
- package/templates/copilot/{pm-members-snippet.yaml → agent-members-snippet.yaml} +4 -2
- package/templates/devcontainer/devcontainer.json +27 -0
- package/templates/devcontainer/emacs/init.el +88 -0
- package/templates/devcontainer/post-create.sh +62 -0
- package/templates/init-agent-members.yaml +200 -0
- package/templates/init-exec-defaults.yaml +74 -0
- package/templates/opencode/agents/specdojo-orchestrator.md +18 -7
- package/docs/ja/specdojo/exec-templates/xrp-viewpoint-detail-template.md +0 -7
- package/docs/ja/specdojo/exec-templates/xrr-viewpoint-detail-template.md +0 -7
package/dist/exec-worktree.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { spawnSync } from "node:child_process";
|
|
2
|
-
import { existsSync, lstatSync, mkdirSync, unlinkSync } from "node:fs";
|
|
3
|
-
import { isAbsolute, join, relative, resolve, sep } from "node:path";
|
|
4
|
-
import { stripTerminalControlSequences } from "./exec-shared.js";
|
|
2
|
+
import { appendFileSync, existsSync, lstatSync, mkdirSync, unlinkSync } from "node:fs";
|
|
3
|
+
import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
|
|
4
|
+
import { redactSensitiveText, stripTerminalControlSequences } from "./exec-shared.js";
|
|
5
5
|
import { gitEnvironment } from "./git-environment.js";
|
|
6
6
|
export { GIT_LOCAL_ENV_VARS, gitEnvironment } from "./git-environment.js";
|
|
7
7
|
// git serializes index access through .git/index.lock and fails immediately (no wait) when it
|
|
@@ -11,32 +11,90 @@ export { GIT_LOCAL_ENV_VARS, gitEnvironment } from "./git-environment.js";
|
|
|
11
11
|
// happens before git mutates anything, so retrying the same command is safe and idempotent.
|
|
12
12
|
const INDEX_LOCK_RETRY_ATTEMPTS = 5;
|
|
13
13
|
const INDEX_LOCK_RETRY_BASE_MS = 50;
|
|
14
|
+
// dubious ownership と、`.git` がある cwd での not-a-repository は一時的に起き、すぐの
|
|
15
|
+
// 再試行では収まらないことがある(並行実行中の統合段で確認した)。両方で上限を共有する。
|
|
16
|
+
const TRANSIENT_GIT_RETRY_DELAYS_MS = [2000, 5000, 10000];
|
|
14
17
|
export function isGitIndexLockContention(stderr) {
|
|
15
18
|
return (/Unable to create '[^']*index\.lock'/.test(stderr) ||
|
|
16
19
|
/Another git process seems to be running/.test(stderr));
|
|
17
20
|
}
|
|
21
|
+
export function isGitDubiousOwnership(stderr) {
|
|
22
|
+
return /fatal:\s+detected dubious ownership in repository\b/i.test(stderr);
|
|
23
|
+
}
|
|
24
|
+
export function isGitNotRepositoryWithGitMetadata(stderr, repoRoot) {
|
|
25
|
+
if (!/\bnot a git repository\b/i.test(stderr))
|
|
26
|
+
return false;
|
|
27
|
+
try {
|
|
28
|
+
const metadata = lstatSync(join(resolve(repoRoot), ".git"));
|
|
29
|
+
return metadata.isFile() || metadata.isDirectory();
|
|
30
|
+
}
|
|
31
|
+
catch {
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
18
35
|
// Synchronously block the thread. gitResult is intentionally spawnSync-based (blocking), and we
|
|
19
36
|
// want to wait for a contended index.lock to be released before retrying rather than busy-loop.
|
|
20
37
|
function sleepSync(milliseconds) {
|
|
21
38
|
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, milliseconds);
|
|
22
39
|
}
|
|
40
|
+
export function transientGitFailureReason(stderr, repoRoot) {
|
|
41
|
+
if (isGitDubiousOwnership(stderr))
|
|
42
|
+
return "dubious ownership";
|
|
43
|
+
if (repoRoot !== undefined && isGitNotRepositoryWithGitMetadata(stderr, repoRoot)) {
|
|
44
|
+
return "not a git repository";
|
|
45
|
+
}
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
48
|
+
export function runGitWithTransientRetry(run, onTransientFailureRetry = () => undefined, sleep = sleepSync, repoRoot) {
|
|
49
|
+
let indexLockRetries = 0;
|
|
50
|
+
let transientFailureRetries = 0;
|
|
51
|
+
let result = run();
|
|
52
|
+
while (result.status !== 0) {
|
|
53
|
+
const stderr = typeof result.stderr === "string" ? result.stderr : "";
|
|
54
|
+
const transientFailure = transientGitFailureReason(stderr, repoRoot);
|
|
55
|
+
if (transientFailureRetries < TRANSIENT_GIT_RETRY_DELAYS_MS.length &&
|
|
56
|
+
transientFailure !== undefined) {
|
|
57
|
+
const waitMilliseconds = TRANSIENT_GIT_RETRY_DELAYS_MS[transientFailureRetries];
|
|
58
|
+
transientFailureRetries += 1;
|
|
59
|
+
onTransientFailureRetry({
|
|
60
|
+
attempt: transientFailureRetries,
|
|
61
|
+
maxAttempts: TRANSIENT_GIT_RETRY_DELAYS_MS.length,
|
|
62
|
+
waitMilliseconds,
|
|
63
|
+
reason: transientFailure,
|
|
64
|
+
});
|
|
65
|
+
sleep(waitMilliseconds);
|
|
66
|
+
result = run();
|
|
67
|
+
continue;
|
|
68
|
+
}
|
|
69
|
+
if (indexLockRetries < INDEX_LOCK_RETRY_ATTEMPTS && isGitIndexLockContention(stderr)) {
|
|
70
|
+
indexLockRetries += 1;
|
|
71
|
+
sleep(INDEX_LOCK_RETRY_BASE_MS * indexLockRetries); // 50, 100, 150, 200, 250 ms
|
|
72
|
+
result = run();
|
|
73
|
+
continue;
|
|
74
|
+
}
|
|
75
|
+
break;
|
|
76
|
+
}
|
|
77
|
+
return result;
|
|
78
|
+
}
|
|
79
|
+
// spawnSync の既定の maxBuffer(1 MiB)では、未追跡のファイルが多い作業場所の
|
|
80
|
+
// `git status --porcelain` などが打ち切られ、子プロセスが SIGTERM で止められる。
|
|
81
|
+
export const GIT_OUTPUT_MAX_BUFFER = 256 * 1024 * 1024;
|
|
23
82
|
export function gitResult(repoRoot, args) {
|
|
24
|
-
const
|
|
83
|
+
const cwd = resolve(repoRoot);
|
|
84
|
+
const run = () => spawnSync("git", ["-C", cwd, ...args], {
|
|
85
|
+
// `-C` だけに依存せず、子プロセス自体も対象 repository から起動する。linked worktree の
|
|
86
|
+
// `.git` が相対 gitdir の場合も、resume 中の diff を runner の cwd から切り離す。
|
|
87
|
+
cwd,
|
|
25
88
|
encoding: "utf8",
|
|
26
89
|
env: gitEnvironment(),
|
|
90
|
+
maxBuffer: GIT_OUTPUT_MAX_BUFFER,
|
|
27
91
|
stdio: ["ignore", "pipe", "pipe"],
|
|
28
92
|
});
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
if (!isGitIndexLockContention(stderr))
|
|
35
|
-
break;
|
|
36
|
-
sleepSync(INDEX_LOCK_RETRY_BASE_MS * attempt); // 50, 100, 150, 200, 250 ms
|
|
37
|
-
result = run();
|
|
38
|
-
}
|
|
39
|
-
return result;
|
|
93
|
+
return runGitWithTransientRetry(run, ({ attempt, maxAttempts, waitMilliseconds, reason }) => {
|
|
94
|
+
const summary = summarizeGitArguments(args);
|
|
95
|
+
process.stderr.write(`warning: git command failed with ${reason}; retrying in ${waitMilliseconds / 1000}s` +
|
|
96
|
+
` (attempt ${attempt}/${maxAttempts}, cwd: ${repoRoot}${summary ? `, args: ${summary}` : ""})\n`);
|
|
97
|
+
}, sleepSync, cwd);
|
|
40
98
|
}
|
|
41
99
|
// git 失敗メッセージは register イベントの reason、result の block_reason、実行ログの一覧行の
|
|
42
100
|
// いずれでも長さ上限で切り詰められて記録される。commit のように pathspec が全件並ぶコマンドでは、
|
|
@@ -81,18 +139,43 @@ export function summarizeGitStderr(stderr, maxLength = GIT_FAILURE_REASON_MAX_LE
|
|
|
81
139
|
const joined = selected.join(" / ");
|
|
82
140
|
return joined.length <= maxLength ? joined : `${joined.slice(0, maxLength - 1)}…`;
|
|
83
141
|
}
|
|
84
|
-
|
|
142
|
+
// 起動の失敗や出力の上限超過(ENOBUFS)では stderr が空になるため、spawnSync の
|
|
143
|
+
// error と signal から原因を組み立てる。git 自身が終了コードを返した場合は空文字を返す。
|
|
144
|
+
export function describeGitProcessFailure(outcome) {
|
|
145
|
+
const parts = [];
|
|
146
|
+
const error = outcome.error;
|
|
147
|
+
if (error) {
|
|
148
|
+
const code = "code" in error && typeof error.code === "string" ? error.code : undefined;
|
|
149
|
+
const message = error.message.trim();
|
|
150
|
+
if (code === "ENOBUFS") {
|
|
151
|
+
parts.push(`output exceeded maxBuffer (ENOBUFS): ${message}`);
|
|
152
|
+
}
|
|
153
|
+
else if (code && !message.includes(code)) {
|
|
154
|
+
parts.push(`${code}: ${message}`);
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
parts.push(message || "spawn error");
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
if (outcome.signal)
|
|
161
|
+
parts.push(`terminated by signal ${outcome.signal}`);
|
|
162
|
+
return parts.join("; ");
|
|
163
|
+
}
|
|
164
|
+
export function formatGitCommandFailure(args, stderr, processFailure = "") {
|
|
85
165
|
const subcommandIndex = args.findIndex((arg) => !arg.startsWith("-"));
|
|
86
166
|
const label = subcommandIndex === -1 ? "git" : `git ${args[subcommandIndex]}`;
|
|
87
167
|
const summary = summarizeGitArguments(subcommandIndex === -1
|
|
88
168
|
? args
|
|
89
169
|
: [...args.slice(0, subcommandIndex), ...args.slice(subcommandIndex + 1)]);
|
|
90
170
|
const detail = summary ? ` (args: ${summary})` : "";
|
|
91
|
-
const cause = summarizeGitStderr(stderr)
|
|
171
|
+
const cause = [processFailure.trim(), summarizeGitStderr(stderr)]
|
|
172
|
+
.filter((part) => part !== "")
|
|
173
|
+
.join(" / ");
|
|
92
174
|
return cause ? `${label} failed: ${cause}${detail}` : `${label} failed${detail}`;
|
|
93
175
|
}
|
|
94
|
-
// lefthook などの hook 出力から、block reason
|
|
95
|
-
//
|
|
176
|
+
// lefthook などの hook 出力から、block reason に載せる失敗ステップ名と最初のエラー行を
|
|
177
|
+
// 取り出し、Vitest の失敗テスト名・集計があれば末尾から補う。罫線や ANSI 制御は監査ログには
|
|
178
|
+
// 残す一方、短い理由には混ぜない。
|
|
96
179
|
export function summarizeGitHookFailure(output) {
|
|
97
180
|
const lines = stripTerminalControlSequences(output)
|
|
98
181
|
.split(/\r?\n/)
|
|
@@ -119,13 +202,30 @@ export function summarizeGitHookFailure(output) {
|
|
|
119
202
|
const errorLine = lines
|
|
120
203
|
.slice(stepIndex >= 0 ? stepIndex + 1 : 0)
|
|
121
204
|
.find((line) => line !== step && !isDecoration(line) && !/[❯▶]\s*$/u.test(line));
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
205
|
+
const primary = step && errorLine
|
|
206
|
+
? `${step}: ${errorLine}`
|
|
207
|
+
: step ||
|
|
208
|
+
(lines.find((line) => /(?:\bCONFLICT\b|\bfatal:|\berror:|\bfailed\b)/i.test(line)) ??
|
|
209
|
+
lines.find((line) => !isDecoration(line)) ??
|
|
210
|
+
lines[0]);
|
|
211
|
+
const tail = lines
|
|
212
|
+
.filter((line) => /^(?:FAIL\b|Test Files\b|Tests\b)/iu.test(line))
|
|
213
|
+
.filter((line) => line !== errorLine && !primary.includes(line))
|
|
214
|
+
.slice(-3);
|
|
215
|
+
const summary = [primary, ...tail].join("; ");
|
|
216
|
+
const limit = 400;
|
|
217
|
+
if (summary.length <= limit)
|
|
218
|
+
return summary;
|
|
219
|
+
const marker = " … ";
|
|
220
|
+
const retained = limit - marker.length;
|
|
221
|
+
return `${summary.slice(0, Math.ceil(retained / 2))}${marker}${summary.slice(-Math.floor(retained / 2))}`;
|
|
222
|
+
}
|
|
223
|
+
/** Appends redacted Git/hook diagnostics to a run-scoped evidence log. */
|
|
224
|
+
export function appendGitFailureLog(path, lines) {
|
|
225
|
+
if (!path)
|
|
226
|
+
return;
|
|
227
|
+
mkdirSync(dirname(path), { recursive: true });
|
|
228
|
+
appendFileSync(path, redactSensitiveText(`${lines.join("\n")}\n`), "utf8");
|
|
129
229
|
}
|
|
130
230
|
// message は block reason 向けに要約する一方、調査に必要な stderr 全文は失わない。
|
|
131
231
|
export class GitCommandError extends Error {
|
|
@@ -140,9 +240,9 @@ export class GitCommandError extends Error {
|
|
|
140
240
|
}
|
|
141
241
|
export function gitOutput(repoRoot, args) {
|
|
142
242
|
const result = gitResult(repoRoot, args);
|
|
143
|
-
if (result.status !== 0) {
|
|
243
|
+
if (result.status !== 0 || result.error) {
|
|
144
244
|
const stderr = typeof result.stderr === "string" ? result.stderr : "";
|
|
145
|
-
throw new GitCommandError(formatGitCommandFailure(args, stderr), args, stderr);
|
|
245
|
+
throw new GitCommandError(formatGitCommandFailure(args, stderr, describeGitProcessFailure(result)), args, stderr);
|
|
146
246
|
}
|
|
147
247
|
return typeof result.stdout === "string" ? result.stdout : "";
|
|
148
248
|
}
|
|
@@ -246,8 +346,15 @@ function removeLegacyNodeModulesLink(packageDir) {
|
|
|
246
346
|
// Git worktree は独自の作業ツリーを持つだけで node_modules は引き継がないため、
|
|
247
347
|
// tracked package-lock.json ごとに npm ci を実行し、worktree 内へ独立して依存を配置する。
|
|
248
348
|
// 旧方式の共有 symlink は npm に辿らせず、先に link 自体だけを削除する。
|
|
349
|
+
// lock が無い worktree は導入しない。依存が無いまま検証が失敗したときに原因を追えるよう、
|
|
350
|
+
// 導入しなかったことをログに残す(PJR-86Q5)。
|
|
249
351
|
export function installWorktreeDependencies(worktreePath, npmCi = runNpmCi) {
|
|
250
|
-
|
|
352
|
+
const packageDirs = trackedPackageLockDirs(resolve(worktreePath));
|
|
353
|
+
if (packageDirs.length === 0) {
|
|
354
|
+
process.stdout.write(`Skipping worktree dependencies: no tracked package-lock.json in ${worktreePath}\n`);
|
|
355
|
+
return;
|
|
356
|
+
}
|
|
357
|
+
for (const packageDir of packageDirs) {
|
|
251
358
|
if (!existsSync(join(packageDir, "package.json"))) {
|
|
252
359
|
throw new Error(`package.json is missing next to package-lock.json: ${packageDir}`);
|
|
253
360
|
}
|
|
@@ -315,6 +422,14 @@ export function generateWorktreeArtifacts(worktreePath, build = runWorktreeBuild
|
|
|
315
422
|
return;
|
|
316
423
|
build(root);
|
|
317
424
|
}
|
|
425
|
+
/**
|
|
426
|
+
* Path of a task worktree. Without `repoDirName` (projects without `repos`) the worktree is
|
|
427
|
+
* `<base>/<task-name>/`; with it, each repository gets `<base>/<task-name>/<repoDirName>/`.
|
|
428
|
+
*/
|
|
429
|
+
export function execWorktreePath(worktreeBase, taskId, repoDirName) {
|
|
430
|
+
const name = worktreeNameFromTaskId(taskId);
|
|
431
|
+
return resolve(repoDirName ? join(worktreeBase, name, repoDirName) : join(worktreeBase, name));
|
|
432
|
+
}
|
|
318
433
|
export function ensureExecWorktree(opts) {
|
|
319
434
|
const repoRoot = resolve(opts.repoRoot);
|
|
320
435
|
const baseRelative = relative(repoRoot, resolve(opts.worktreeBase));
|
|
@@ -323,7 +438,7 @@ export function ensureExecWorktree(opts) {
|
|
|
323
438
|
}
|
|
324
439
|
const name = worktreeNameFromTaskId(opts.taskId);
|
|
325
440
|
const branch = `exec/${name}`;
|
|
326
|
-
const worktreePath =
|
|
441
|
+
const worktreePath = execWorktreePath(opts.worktreeBase, opts.taskId, opts.repoDirName);
|
|
327
442
|
const registered = listRegisteredWorktrees(repoRoot);
|
|
328
443
|
const registeredAtPath = registered.find((item) => item.path === worktreePath);
|
|
329
444
|
if (registeredAtPath) {
|
|
@@ -340,7 +455,7 @@ export function ensureExecWorktree(opts) {
|
|
|
340
455
|
if (existsSync(worktreePath)) {
|
|
341
456
|
throw new Error(`Worktree path already exists but is not registered: ${worktreePath}`);
|
|
342
457
|
}
|
|
343
|
-
mkdirSync(
|
|
458
|
+
mkdirSync(dirname(worktreePath), { recursive: true });
|
|
344
459
|
const branchExists = gitResult(repoRoot, ["show-ref", "--verify", "--quiet", `refs/heads/${branch}`]).status === 0;
|
|
345
460
|
const args = branchExists
|
|
346
461
|
? ["worktree", "add", worktreePath, branch]
|