eliott/get-shit-done
1
0
Fork 0
mirror of https://github.com/glittercowboy/get-shit-done synced 2026-04-26 01:35:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: detect files_modified overlap and enforce wave ordering for dependent plans (#1587) (#1600)

Browse Source 
* fix: correct STATE.md progress counter fields during plan/phase completion (#1589)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* ci: re-run CI with Windows pointer lifecycle fix in main

* fix: orchestrator owns STATE.md/ROADMAP.md writes in parallel worktree mode (#1571)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: detect files_modified overlap and enforce wave ordering for dependent plans (#1587)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: trim gsd-planner.md below 50000-char prompt-injection limit

The assign_waves section added in this branch pushed agents/gsd-planner.md
to 50271 chars, triggering the security scanner's prompt-stuffing check on
all CI platforms. Condense prose while preserving all logic and validation
rules; file is now 49754 chars.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Tom Boucher
2026-04-03 12:19:41 -04:00
committed by GitHub
parent 40fc681b28
commit 0b43cfd303
4 changed files with 384 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
tests/execute-phase-worktree-artifacts.test.cjs Normal file
View File

@@ -0,0 +1,134 @@
/**
* Execute-phase worktree shared artifact ownership tests
*
* Guards against bug #1571: worktree executor agents independently writing
* STATE.md and ROADMAP.md, causing last-merge-wins overwrites.
*
* Fix: In parallel worktree mode, remove STATE.md/ROADMAP.md update requirements
* from the executor agent success_criteria. The orchestrator owns those writes
* after each wave via single-writer post-wave commands.
*/
const { test, describe } = require('node:test');
const assert = require('node:assert');
const fs = require('fs');
const path = require('path');
const WORKFLOW_PATH = path.join(__dirname, '..', 'get-shit-done', 'workflows', 'execute-phase.md');
describe('execute-phase worktree: shared artifact ownership (#1571)', () => {
test('workflow file exists', () => {
assert.ok(fs.existsSync(WORKFLOW_PATH), 'workflows/execute-phase.md should exist');
});
test('worktree executor agent success_criteria does NOT include STATE.md update', () => {
const content = fs.readFileSync(WORKFLOW_PATH, 'utf-8');
// Extract the worktree Task() block (between "Worktree mode" and "Sequential mode")
const worktreeMatch = content.match(
/\*\*Worktree mode\*\*[\s\S]*?<success_criteria>([\s\S]*?)<\/success_criteria>/
);
assert.ok(worktreeMatch, 'should find success_criteria inside the worktree mode Task block');
const criteria = worktreeMatch[1];
assert.ok(
!criteria.includes('STATE.md'),
'worktree executor success_criteria must NOT reference STATE.md (orchestrator owns this write)'
);
});
test('worktree executor agent success_criteria does NOT include ROADMAP.md update', () => {
const content = fs.readFileSync(WORKFLOW_PATH, 'utf-8');
// Extract the worktree Task() block
const worktreeMatch = content.match(
/\*\*Worktree mode\*\*[\s\S]*?<success_criteria>([\s\S]*?)<\/success_criteria>/
);
assert.ok(worktreeMatch, 'should find success_criteria inside the worktree mode Task block');
const criteria = worktreeMatch[1];
assert.ok(
!criteria.includes('ROADMAP.md'),
'worktree executor success_criteria must NOT reference ROADMAP.md (orchestrator owns this write)'
);
});
test('worktree executor agent success_criteria includes SUMMARY.md creation', () => {
const content = fs.readFileSync(WORKFLOW_PATH, 'utf-8');
// SUMMARY.md is plan-local and safe for worktree agents to create
const worktreeMatch = content.match(
/\*\*Worktree mode\*\*[\s\S]*?<success_criteria>([\s\S]*?)<\/success_criteria>/
);
assert.ok(worktreeMatch, 'should find success_criteria inside the worktree mode Task block');
const criteria = worktreeMatch[1];
assert.ok(
criteria.includes('SUMMARY.md'),
'worktree executor success_criteria should still require SUMMARY.md creation'
);
});
test('post-wave orchestrator runs roadmap update-plan-progress for each completed plan', () => {
const content = fs.readFileSync(WORKFLOW_PATH, 'utf-8');
assert.ok(
content.includes('roadmap update-plan-progress'),
'post-wave section should contain orchestrator-owned roadmap update-plan-progress command'
);
// Confirm it is in a post-wave context, not only inside an agent prompt
const postWaveIdx = content.indexOf('roadmap update-plan-progress');
const worktreeAgentStart = content.indexOf('isolation="worktree"');
const worktreeAgentEnd = content.indexOf('**Sequential mode**');
assert.ok(
postWaveIdx < worktreeAgentStart || postWaveIdx > worktreeAgentEnd,
'roadmap update-plan-progress must appear outside the worktree agent prompt (orchestrator-owned)'
);
});
test('post-wave orchestrator runs state update-position after completing a wave in worktree mode', () => {
const content = fs.readFileSync(WORKFLOW_PATH, 'utf-8');
assert.ok(
content.includes('state update-position'),
'post-wave section should contain orchestrator-owned state update-position command'
);
// Confirm it appears after the worktree agent block
const stateUpdateIdx = content.lastIndexOf('state update-position');
const worktreeAgentEnd = content.indexOf('**Sequential mode**');
assert.ok(
stateUpdateIdx > worktreeAgentEnd,
'state update-position must appear after the worktree agent block (orchestrator-owned, post-wave)'
);
});
test('sequential mode executor agent success_criteria still includes STATE.md update', () => {
const content = fs.readFileSync(WORKFLOW_PATH, 'utf-8');
// Extract the sequential mode Task() block
const seqMatch = content.match(
/\*\*Sequential mode\*\*[\s\S]*?<success_criteria>([\s\S]*?)<\/success_criteria>/
);
assert.ok(seqMatch, 'should find success_criteria inside the sequential mode Task block');
const criteria = seqMatch[1];
assert.ok(
criteria.includes('STATE.md'),
'sequential executor success_criteria should still require STATE.md update (no conflict risk)'
);
});
test('sequential mode executor agent success_criteria still includes ROADMAP.md update', () => {
const content = fs.readFileSync(WORKFLOW_PATH, 'utf-8');
// Extract the sequential mode Task() block
const seqMatch = content.match(
/\*\*Sequential mode\*\*[\s\S]*?<success_criteria>([\s\S]*?)<\/success_criteria>/
);
assert.ok(seqMatch, 'should find success_criteria inside the sequential mode Task block');
const criteria = seqMatch[1];
assert.ok(
criteria.includes('ROADMAP.md'),
'sequential executor success_criteria should still require ROADMAP.md update (no conflict risk)'
);
});
});