From 8788ab2381dba6d3156602bb4490e7b2f3c7829a Mon Sep 17 00:00:00 2001 From: Tom Boucher Date: Sun, 26 Apr 2026 13:33:50 -0400 Subject: [PATCH] =?UTF-8?q?feat:=20post-merge=20build=20&=20test=20gate=20?= =?UTF-8?q?=E2=80=94=20Build=20step,=20iOS/Xcode,=20serial=20mode=20(#2751?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: post-merge build & test gate — Build step, iOS/Xcode, serial mode Step 5.6 of execute-phase is extended per #2720: - Renamed from "Post-merge test gate (parallel mode only)" to "Post-merge build & test gate" - Gate now runs in both parallel mode (after worktree merge) and serial mode (after last plan) - Added Step A: Build gate resolving BUILD_CMD from workflow.build_command config key, then auto-detecting via priority: config override → Xcode (.xcodeproj) → Makefile build: → Justfile → Cargo/Go/Python/npm. Xcode uses xcodebuild -list -json to get first scheme, then xcodebuild build -scheme ... -destination 'platform=iOS Simulator,name=iPhone 16'. Build failure increments WAVE_FAILURE_COUNT. - Added Xcode/iOS detection to Step B (Test gate): when *.xcodeproj present and no workflow.test_command configured, uses xcodebuild test instead of the previous "no test runner detected" skip. Scheme reused from Step A when available. - Documented workflow.build_command and workflow.test_command in docs/CONFIGURATION.md (table + JSON schema) Closes #2720 Co-Authored-By: Claude Sonnet 4.6 * refactor(execute-phase): extract Step 5.6 body to post-merge-gate.md sub-file Moves the build-detection logic and xcodebuild commands from the inline Step 5.6 body into execute-phase/steps/post-merge-gate.md, replacing it with a single Read() reference. Reduces execute-phase.md from 1755 to 1647 lines, satisfying the ≤1700 XL-tier budget enforced by tests/workflow-size-budget.test.cjs. Co-Authored-By: Claude Sonnet 4.6 --------- Co-authored-by: Claude Sonnet 4.6 --- docs/CONFIGURATION.md | 6 +- get-shit-done/workflows/execute-phase.md | 52 +------- .../execute-phase/steps/post-merge-gate.md | 116 ++++++++++++++++++ 3 files changed, 127 insertions(+), 47 deletions(-) create mode 100644 get-shit-done/workflows/execute-phase/steps/post-merge-gate.md diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md index 858ca6b13..375a9b471 100644 --- a/docs/CONFIGURATION.md +++ b/docs/CONFIGURATION.md @@ -53,7 +53,9 @@ GSD stores project settings in `.planning/config.json`. Created during `/gsd-new "security_enforcement": true, "security_asvs_level": 1, "security_block_on": "high", - "post_planning_gaps": true + "post_planning_gaps": true, + "build_command": null, + "test_command": null }, "hooks": { "context_warnings": true, @@ -209,6 +211,8 @@ All workflow toggles follow the **absent = enabled** pattern. If a key is missin | `workflow.inline_plan_threshold` | number | `3` | Maximum number of tasks in a phase before the planner generates a separate PLAN.md file instead of inlining tasks in the prompt | | `workflow.drift_threshold` | number | `3` | Minimum number of new structural elements (new directories, barrel exports, migrations, route modules) introduced during a phase before the post-execute codebase-drift gate takes action. See [#2003](https://github.com/gsd-build/get-shit-done/issues/2003). Added in v1.39 | | `workflow.drift_action` | string | `warn` | What to do when `workflow.drift_threshold` is exceeded after `/gsd-execute-phase`. `warn` prints a message suggesting `/gsd-map-codebase --paths …`; `auto-remap` spawns `gsd-codebase-mapper` scoped to the affected paths. Added in v1.39 | +| `workflow.build_command` | string | (none) | Shell command to build the project in the post-merge build gate (Step A of step 5.6 in execute-phase). When unset, the gate auto-detects: Xcode (`.xcodeproj` present) → `xcodebuild build`, `Makefile` with `build:` target → `make build`, Justfile → `just build`, `Cargo.toml` → `cargo build`, `go.mod` → `go build ./...`, Python → `python -m py_compile`, `package.json` with `build` script → `npm run build`. Runs with a 5-minute timeout; failure increments `WAVE_FAILURE_COUNT`. Added in v1.39 | +| `workflow.test_command` | string | (none) | Shell command to run the project's test suite in the post-merge test gate (Step B of step 5.6 in execute-phase) and the regression gate. When unset, the gate auto-detects: Xcode (`.xcodeproj` present) → `xcodebuild test`, `Makefile` with `test:` target → `make test`, Justfile → `just test`, `package.json` → `npm test`, `Cargo.toml` → `cargo test`, `go.mod` → `go test ./...`, Python → `python -m pytest`. Runs with a 5-minute timeout; failure increments `WAVE_FAILURE_COUNT`. Added in v1.39 | ### Recommended Presets diff --git a/get-shit-done/workflows/execute-phase.md b/get-shit-done/workflows/execute-phase.md index c92a08141..7fecfe760 100644 --- a/get-shit-done/workflows/execute-phase.md +++ b/get-shit-done/workflows/execute-phase.md @@ -761,58 +761,18 @@ increases monotonically across waves. `{status}` is `complete` (success), **If no worktrees found:** Skip silently — agents may have been spawned without worktree isolation. -5.6. **Post-merge test gate (parallel mode only):** +5.6. **Post-merge build & test gate:** - After merging all worktrees in a wave, run the project's test suite to catch - cross-plan integration issues that individual worktree self-checks cannot detect - (e.g., conflicting type definitions, removed exports, import changes). + After merging all worktrees in a wave (parallel mode), or after the last plan completes + (serial mode), run a build and then the project's test suite to catch cross-plan + integration issues that individual worktree self-checks cannot detect (e.g., conflicting + type definitions, removed exports, import changes, link errors). This addresses the Generator self-evaluation blind spot identified in Anthropic's harness engineering research: agents reliably report Self-Check: PASSED even when merging their work creates failures. - ```bash - # Resolve test command: project config > Makefile > language sniff - TEST_CMD=$(gsd-sdk query config-get workflow.test_command --default "" 2>/dev/null || true) - if [ -z "$TEST_CMD" ]; then - if [ -f "Makefile" ] && grep -q "^test:" Makefile; then - TEST_CMD="make test" - elif [ -f "Justfile" ] || [ -f "justfile" ]; then - TEST_CMD="just test" - elif [ -f "package.json" ]; then - TEST_CMD="npm test" - elif [ -f "Cargo.toml" ]; then - TEST_CMD="cargo test" - elif [ -f "go.mod" ]; then - TEST_CMD="go test ./..." - elif [ -f "pyproject.toml" ] || [ -f "requirements.txt" ]; then - TEST_CMD="python -m pytest -x -q --tb=short 2>&1 || uv run python -m pytest -x -q --tb=short" - else - TEST_CMD="true" - echo "⚠ No test runner detected — skipping post-merge test gate" - fi - fi - # Detect test runner and run quick smoke test (timeout: 5 minutes) - TEST_EXIT=0 - timeout 300 bash -c "$TEST_CMD" 2>&1 - TEST_EXIT=$? - if [ "${TEST_EXIT}" -eq 0 ]; then - echo "✓ Post-merge test gate passed — no cross-plan conflicts" - elif [ "${TEST_EXIT}" -eq 124 ]; then - echo "⚠ Post-merge test gate timed out after 5 minutes" - else - echo "✗ Post-merge test gate failed (exit code ${TEST_EXIT})" - WAVE_FAILURE_COUNT=$((WAVE_FAILURE_COUNT + 1)) - fi - ``` - - **If `TEST_EXIT` is 0 (pass):** `✓ Post-merge test gate: {N} tests passed — no cross-plan conflicts` → continue to orchestrator tracking update. - - **If `TEST_EXIT` is 124 (timeout):** Log warning, treat as non-blocking, continue. Tests may need a longer budget or manual run. - - **If `TEST_EXIT` is non-zero (test failure):** Increment `WAVE_FAILURE_COUNT` to track - cumulative failures across waves. Subsequent waves should report: - `⚠ Note: ${WAVE_FAILURE_COUNT} prior wave(s) had test failures` + Read and execute `get-shit-done/workflows/execute-phase/steps/post-merge-gate.md`. 5.7. **Post-wave shared artifact update (worktree mode only, skip if tests failed):** diff --git a/get-shit-done/workflows/execute-phase/steps/post-merge-gate.md b/get-shit-done/workflows/execute-phase/steps/post-merge-gate.md new file mode 100644 index 000000000..af64b8390 --- /dev/null +++ b/get-shit-done/workflows/execute-phase/steps/post-merge-gate.md @@ -0,0 +1,116 @@ +# Step: post_merge_gate + +Post-merge build & test gate. Runs after all worktrees in a wave are merged +(parallel mode), or after the last plan completes (serial mode). Catches +cross-plan integration failures that individual worktree self-checks cannot +detect. + +**Step A — Build gate:** + +```bash +# Resolve build command: project config > Xcode > Makefile > language sniff +BUILD_CMD=$(gsd-sdk query config-get workflow.build_command --default "" 2>/dev/null || true) +if [ -z "$BUILD_CMD" ]; then + XCODEPROJ=$(find . -maxdepth 2 -name "*.xcodeproj" -not -path "*/node_modules/*" 2>/dev/null | head -1) + if [ -n "$XCODEPROJ" ]; then + # Xcode project: get first scheme from xcodebuild -list -json + XCODE_SCHEME=$(xcodebuild -list -json -project "$XCODEPROJ" 2>/dev/null | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('project',{}).get('schemes',[None])[0] or '')" 2>/dev/null || true) + if [ -n "$XCODE_SCHEME" ]; then + BUILD_CMD="xcodebuild build -scheme '$XCODE_SCHEME' -destination 'platform=iOS Simulator,name=iPhone 16'" + else + BUILD_CMD="xcodebuild build -destination 'platform=iOS Simulator,name=iPhone 16'" + fi + elif [ -f "Makefile" ] && grep -q "^build:" Makefile; then + BUILD_CMD="make build" + elif [ -f "Justfile" ] || [ -f "justfile" ]; then + BUILD_CMD="just build" + elif [ -f "Cargo.toml" ]; then + BUILD_CMD="cargo build" + elif [ -f "go.mod" ]; then + BUILD_CMD="go build ./..." + elif [ -f "pyproject.toml" ] || [ -f "requirements.txt" ]; then + BUILD_CMD="python -m py_compile $(find . -name '*.py' -not -path './.planning/*' -not -path './node_modules/*' | head -20 | tr '\n' ' ')" + elif [ -f "package.json" ] && grep -q '"build"' package.json; then + BUILD_CMD="npm run build" + else + BUILD_CMD="" + echo "⚠ No build command detected — skipping build gate" + fi +fi +# Run build with 5-minute timeout +BUILD_EXIT=0 +if [ -n "$BUILD_CMD" ]; then + timeout 300 bash -c "$BUILD_CMD" 2>&1 + BUILD_EXIT=$? + if [ "${BUILD_EXIT}" -eq 0 ]; then + echo "✓ Post-merge build gate passed" + elif [ "${BUILD_EXIT}" -eq 124 ]; then + echo "⚠ Post-merge build gate timed out after 5 minutes" + else + echo "✗ Post-merge build gate failed (exit code ${BUILD_EXIT})" + WAVE_FAILURE_COUNT=$((WAVE_FAILURE_COUNT + 1)) + fi +fi +``` + +**If `BUILD_EXIT` is 0 (pass):** `✓ Build gate passed` → proceed to Test gate. + +**If `BUILD_EXIT` is 124 (timeout):** Log warning, treat as non-blocking, continue to Test gate. + +**If `BUILD_EXIT` is non-zero (build failure):** Increment `WAVE_FAILURE_COUNT` (same semantics as test failures). Present failure output and offer "Fix now" or "Continue" options (same as step 5.8). + +**Step B — Test gate:** + +```bash +# Resolve test command: project config > Xcode > Makefile > language sniff +TEST_CMD=$(gsd-sdk query config-get workflow.test_command --default "" 2>/dev/null || true) +if [ -z "$TEST_CMD" ]; then + XCODEPROJ=$(find . -maxdepth 2 -name "*.xcodeproj" -not -path "*/node_modules/*" 2>/dev/null | head -1) + if [ -n "$XCODEPROJ" ]; then + # Xcode project: reuse scheme detected above (or re-detect) + if [ -z "${XCODE_SCHEME:-}" ]; then + XCODE_SCHEME=$(xcodebuild -list -json -project "$XCODEPROJ" 2>/dev/null | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('project',{}).get('schemes',[None])[0] or '')" 2>/dev/null || true) + fi + if [ -n "$XCODE_SCHEME" ]; then + TEST_CMD="xcodebuild test -scheme '$XCODE_SCHEME' -destination 'platform=iOS Simulator,name=iPhone 16'" + else + TEST_CMD="xcodebuild test -destination 'platform=iOS Simulator,name=iPhone 16'" + fi + elif [ -f "Makefile" ] && grep -q "^test:" Makefile; then + TEST_CMD="make test" + elif [ -f "Justfile" ] || [ -f "justfile" ]; then + TEST_CMD="just test" + elif [ -f "package.json" ]; then + TEST_CMD="npm test" + elif [ -f "Cargo.toml" ]; then + TEST_CMD="cargo test" + elif [ -f "go.mod" ]; then + TEST_CMD="go test ./..." + elif [ -f "pyproject.toml" ] || [ -f "requirements.txt" ]; then + TEST_CMD="python -m pytest -x -q --tb=short 2>&1 || uv run python -m pytest -x -q --tb=short" + else + TEST_CMD="true" + echo "⚠ No test runner detected — skipping post-merge test gate" + fi +fi +# Run test suite with 5-minute timeout +TEST_EXIT=0 +timeout 300 bash -c "$TEST_CMD" 2>&1 +TEST_EXIT=$? +if [ "${TEST_EXIT}" -eq 0 ]; then + echo "✓ Post-merge test gate passed — no cross-plan conflicts" +elif [ "${TEST_EXIT}" -eq 124 ]; then + echo "⚠ Post-merge test gate timed out after 5 minutes" +else + echo "✗ Post-merge test gate failed (exit code ${TEST_EXIT})" + WAVE_FAILURE_COUNT=$((WAVE_FAILURE_COUNT + 1)) +fi +``` + +**If `TEST_EXIT` is 0 (pass):** `✓ Post-merge test gate: {N} tests passed — no cross-plan conflicts` → continue to orchestrator tracking update. + +**If `TEST_EXIT` is 124 (timeout):** Log warning, treat as non-blocking, continue. Tests may need a longer budget or manual run. + +**If `TEST_EXIT` is non-zero (test failure):** Increment `WAVE_FAILURE_COUNT` to track +cumulative failures across waves. Subsequent waves should report: +`⚠ Note: ${WAVE_FAILURE_COUNT} prior wave(s) had test failures`