* feat(#2790): consolidate 86 gsd-* skills to 59 — zero functional loss Closes #2790 - `capture.md` — absorbs add-todo (default), note (--note), add-backlog (--backlog), plant-seed (--seed), check-todos (--list) - `phase.md` — absorbs add-phase (default), insert-phase (--insert), remove-phase (--remove), edit-phase (--edit) - `config.md` — absorbs settings-advanced (--advanced), settings-integrations (--integrations), set-profile (--profile); settings.md retained as-is - `workspace.md` — absorbs new-workspace (--new), list-workspaces (--list), remove-workspace (--remove) - `update.md` — adds --sync (absorbs sync-skills) and --reapply (absorbs reapply-patches) - `sketch.md` — adds --wrap-up (absorbs sketch-wrap-up) - `spike.md` — adds --wrap-up (absorbs spike-wrap-up) - `map-codebase.md` — adds --fast (absorbs scan) and --query (absorbs intel) - `code-review.md` — adds --fix (absorbs code-review-fix) - `progress.md` — adds --next (absorbs next) and --do (absorbs do) join-discord, research-phase, session-report, from-gsd2, analyze-dependencies, list-phase-assumptions, plan-milestone-gaps autonomous.md: updated Skill(skill="gsd:code-review-fix") → Skill(skill="gsd:code-review", args="--fix --auto") to match the consolidated skill name - New: tests/enh-2790-skill-consolidation.test.cjs (48 tests) - Updated: 14 existing test files redirected from deleted command paths to their consolidated equivalents - docs/INVENTORY.md: Commands count 86→59, ghost rows removed, new consolidated rows added - docs/INVENTORY-MANIFEST.json: regenerated to match filesystem Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs(#2790): add CHANGELOG entry for skill consolidation * docs(#2790): update COMMANDS.md for 86→59 skill consolidation Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(#2790): address CodeRabbit review findings - CHANGELOG.md: add --next alongside --do in progress flag list - config.md: remove trailing space from --profile code span (MD038) - COMMANDS.md: add required descriptions to /gsd-phase examples; /gsd-phase without args errors, not interactive - COMMANDS.md: add --next and --do to /gsd-progress flags table + examples - test: convert content.includes('--reapply') to structural frontmatter parse; add allow-test-rule comment for workflow content assertions - test: replace redundant existsSync duplicate with assertion that verifies the full consolidated flag surface (--sync | --reapply) in argument-hint Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(#2790): restore reapply-patches workflow and strengthen test assertions - Create get-shit-done/workflows/reapply-patches.md: the #2790 consolidation deleted the 14K combined command+workflow file (reapply-patches.md) but update.md already referenced the workflow via execution_context_extended. Restoring it fixes a silent behavioral gap where --reapply had no workflow to load. Includes full three-way merge logic, hunk verification table (Step 4), and the Hunk Verification Gate (Step 5) that blocks cleanup until all user-added hunks are confirmed present in the merged output. - Fix update.md: /gsd-reapply-patches → /gsd-update --reapply (stale ref) - Fix reapply-verify-hunks.test.cjs: was checking existsSync(update.md) 8×; now points to the workflow file and asserts real behavioral content (Post-merge verification, Hunk presence check, Line-count check, backup reference, per-file tracking, structural ordering) - Fix reapply-patches.test.cjs: replace content.includes() stubs with frontmatter-parsed argument-hint assertions; replace 4 existsSync(update.md) no-ops with real assertions against the workflow content - Fix edit-phase.test.cjs: /gsd-edit-phase → /gsd-phase (COMMANDS.md now documents the consolidated command with --edit flag) - Fix next-safety-gates.test.cjs: split OR predicates into independent assertions — --next in progress.md and --force in next.md workflow - Fix workspace.test.cjs: add allow-test-rule comment for routing content checks (command routing text IS the deployed behavioral contract) - Fix bug-2439 test: strengthen pre-flight assertion to verify gsd-sdk is referenced (not just --profile) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: address CodeRabbit review findings (CR round 2) - INVENTORY.md: update sync-skills.md row to reference /gsd-update --sync instead of stale /gsd-sync-skills (absorbed in #2790) - enh-2380-sync-skills.test.cjs: align INVENTORY.md assertion with the corrected reference; was asserting the old /gsd-sync-skills name while the manifest test correctly asserted /gsd-update, creating conflicting expectations in the same suite - reapply-verify-hunks.test.cjs: add explicit notEqual(-1) assertions for all three anchors before the ordering check so a missing anchor produces a clear failure instead of a false positive (writeIdx=-1 < verifyIdx=5 is true) - bug-2439-set-profile-gsd-sdk-preflight.test.cjs: defer fs.readFileSync until after the existence assertion; eager describe-level read caused the suite to crash before the existence test could run, making it effectively dead code Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(#2790): address CR — INVENTORY routing + reapply test contract wording Two unresolved CodeRabbit findings (Major): - docs/INVENTORY.md: workflow-file table still pointed at obsolete /gsd-do, /gsd-next, /gsd-note, /gsd-add-todo, /gsd-add-backlog, /gsd-check-todos, /gsd-plant-seed slash commands. Re-route to the consolidated /gsd-progress (--next, --do) and /gsd-capture (--note, --backlog, --seed, --list) so the inventory is internally consistent. - tests/reapply-verify-hunks.test.cjs: 'verification tracks per-file status' asserted on phrasing that doesn't appear in reapply-patches.md (the 'per-file' substring only matched accidentally via 'sequential integer per file'). Switch to the actual contract text — Hunk Verification Table, one row per hunk per file, verified column. * test(#2790): update CR-INTEGRATION tests for consolidated --fix invocation After the merge of main (which carries #2843's hyphen-form fix), the consolidation in this branch absorbs gsd-code-review-fix into gsd-code-review as the --fix flag. Update the two CR-INTEGRATION tests that previously asserted on the standalone gsd-code-review-fix skill name to instead assert on a gsd-code-review invocation carrying --fix in its arg tokens. Tests still parse Skill() invocations structurally; only the asserted skill-name + arg-token shape changed. * test(#2790): scope success_criteria check to the <success_criteria> block CodeRabbit nitpick: 'success criteria includes verification' did a whole-file substring check, which can false-pass if the phrase appears elsewhere in the document. Extract the <success_criteria>...</success_criteria> block first via extractTagBlock() and assert against that scope only. * fix(#2790): post-rebase reconciliation with main - INVENTORY.md/JSON: add reapply-patches workflow row + bump count to 85 - autonomous.md: switch consolidated --fix invocation to hyphen Skill name - analyze-dependencies test: assert COMMANDS.md does NOT document the consolidated-away /gsd-analyze-dependencies entry (was: bare .includes()) * fix(#2790): address remaining CR findings — strengthen contract tests Doc-fixes: - INVENTORY.md: route transition.md & edit-phase.md rows to consolidated /gsd-progress --next and /gsd-phase --edit (was: deleted /gsd-next, /gsd-edit-phase) - config.md --profile branch: document #2439 pre-flight `command -v gsd-sdk` guard + install hint BEFORE the gsd-sdk invocation (closes opaque "command not found: gsd-sdk" regression path) Test discipline (no-source-grep contract): - bug-2439: replace bare `content.includes('gsd-sdk')` with structured parse of <context> block + --profile branch; assert pre-flight token, install hint, #2439 citation, and ordering vs gsd-sdk invocation - edit-phase: parse INVENTORY.md edit-phase.md row's "Invoked by" column and assert `/gsd-phase --edit` (not the deleted /gsd-edit-phase) - next-safety-gates: tighten `--next` documentation contract — require --next AND --force AND completeness routing (was OR-based, passed when only --next present) - reapply-patches: parse argument-hint flag list structurally; scan ALL <execution_context*> blocks for the @-include of reapply-patches.md; parse Hunk Verification Table header columns directly; locate Step 5 via heading parsing then assert (i) table reference, (ii) verified=no gate, (iii) STOP/halt directive, (iv) explicit absent-table halt path - workspace: parse frontmatter, tokenize argument-hint across multiple bracketed segments, parse @-include targets from <execution_context> rather than substring-matching the file body --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Tom Boucher
@@ -269,12 +269,11 @@ describe('CR-CMD: code review command structure', () => {
|
||||
'code-review.md missing correct name in frontmatter');
|
||||
});
|
||||
|
||||
test('code-review-fix.md has correct frontmatter name: gsd:code-review-fix', () => {
|
||||
const content = fs.readFileSync(path.join(COMMANDS_DIR, 'code-review-fix.md'), 'utf-8');
|
||||
const frontmatter = content.split('---')[1] || '';
|
||||
|
||||
assert.ok(frontmatter.includes('name: gsd:code-review-fix'),
|
||||
'code-review-fix.md missing correct name in frontmatter');
|
||||
// #2790: code-review-fix.md was consolidated into code-review.md as the --fix flag.
|
||||
test('code-review.md has --fix flag absorbing code-review-fix (#2790)', () => {
|
||||
const content = fs.readFileSync(path.join(COMMANDS_DIR, 'code-review.md'), 'utf-8');
|
||||
assert.ok(content.includes('--fix'),
|
||||
'code-review.md must document --fix flag (absorbed code-review-fix)');
|
||||
});
|
||||
|
||||
test('code-review.md references workflow: code-review.md', () => {
|
||||
@@ -284,11 +283,10 @@ describe('CR-CMD: code review command structure', () => {
|
||||
'code-review.md does not reference its workflow');
|
||||
});
|
||||
|
||||
test('code-review-fix.md references workflow: code-review-fix.md', () => {
|
||||
const content = fs.readFileSync(path.join(COMMANDS_DIR, 'code-review-fix.md'), 'utf-8');
|
||||
|
||||
assert.ok(content.includes('code-review-fix.md'),
|
||||
'code-review-fix.md does not reference its workflow');
|
||||
test('code-review.md references code-review-fix workflow via --fix (#2790)', () => {
|
||||
const content = fs.readFileSync(path.join(COMMANDS_DIR, 'code-review.md'), 'utf-8');
|
||||
assert.ok(content.includes('code-review-fix') || content.includes('--fix'),
|
||||
'code-review.md must reference code-review-fix workflow or --fix flag');
|
||||
});
|
||||
|
||||
test('code-review.md has argument-hint in frontmatter', () => {
|
||||
@@ -299,12 +297,11 @@ describe('CR-CMD: code review command structure', () => {
|
||||
'code-review.md missing argument-hint');
|
||||
});
|
||||
|
||||
test('code-review-fix.md has argument-hint in frontmatter', () => {
|
||||
const content = fs.readFileSync(path.join(COMMANDS_DIR, 'code-review-fix.md'), 'utf-8');
|
||||
test('code-review.md argument-hint includes --fix flag (#2790: absorbed code-review-fix)', () => {
|
||||
const content = fs.readFileSync(path.join(COMMANDS_DIR, 'code-review.md'), 'utf-8');
|
||||
const frontmatter = content.split('---')[1] || '';
|
||||
|
||||
assert.ok(frontmatter.includes('argument-hint:'),
|
||||
'code-review-fix.md missing argument-hint');
|
||||
assert.ok(frontmatter.includes('argument-hint:') && content.includes('--fix'),
|
||||
'code-review.md must have argument-hint with --fix');
|
||||
});
|
||||
|
||||
test('code-review.md has allowed-tools in frontmatter', () => {
|
||||
@@ -315,12 +312,11 @@ describe('CR-CMD: code review command structure', () => {
|
||||
'code-review.md missing allowed-tools');
|
||||
});
|
||||
|
||||
test('code-review-fix.md has allowed-tools in frontmatter', () => {
|
||||
const content = fs.readFileSync(path.join(COMMANDS_DIR, 'code-review-fix.md'), 'utf-8');
|
||||
test('code-review.md has allowed-tools in frontmatter (covers fix too, #2790)', () => {
|
||||
const content = fs.readFileSync(path.join(COMMANDS_DIR, 'code-review.md'), 'utf-8');
|
||||
const frontmatter = content.split('---')[1] || '';
|
||||
|
||||
assert.ok(frontmatter.includes('allowed-tools:'),
|
||||
'code-review-fix.md missing allowed-tools');
|
||||
'code-review.md missing allowed-tools');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -514,26 +510,44 @@ describe('CR-INTEGRATION: workflow integration points', () => {
|
||||
'autonomous.md must not use legacy colon form gsd:code-review (canonical is hyphen form)');
|
||||
});
|
||||
|
||||
test('autonomous.md contains gsd-code-review-fix skill invocation', () => {
|
||||
test('autonomous.md auto-fix uses consolidated gsd-code-review --fix invocation (#2790)', () => {
|
||||
// After #2790, gsd-code-review-fix was absorbed into gsd-code-review as
|
||||
// the --fix flag. The autonomous workflow must invoke the consolidated
|
||||
// form, not the deleted gsd-code-review-fix skill.
|
||||
const content = fs.readFileSync(path.join(WORKFLOWS_DIR, 'autonomous.md'), 'utf-8');
|
||||
|
||||
const invocations = parseWorkflowSkillInvocations(content);
|
||||
const skillNames = invocations.map(inv => inv.skill);
|
||||
assert.ok(skillNames.includes('gsd-code-review-fix'),
|
||||
`autonomous.md must invoke Skill(skill="gsd-code-review-fix", ...); found skills: ${JSON.stringify(skillNames)}`);
|
||||
assert.ok(!skillNames.includes('gsd-code-review-fix'),
|
||||
`autonomous.md must not invoke deleted gsd-code-review-fix skill (consolidated into --fix); found: ${JSON.stringify(skillNames)}`);
|
||||
assert.ok(!skillNames.includes('gsd:code-review-fix'),
|
||||
'autonomous.md must not use legacy colon form gsd:code-review-fix (canonical is hyphen form)');
|
||||
'autonomous.md must not use legacy colon form gsd:code-review-fix');
|
||||
|
||||
// Find a gsd-code-review invocation that carries the --fix flag (the
|
||||
// consolidated auto-fix entry point).
|
||||
const fixInvocation = invocations.find(inv => {
|
||||
if (inv.skill !== 'gsd-code-review') return false;
|
||||
const tokens = new Set((inv.args ?? '').split(/\s+/).filter(Boolean));
|
||||
return tokens.has('--fix');
|
||||
});
|
||||
assert.ok(fixInvocation,
|
||||
`autonomous.md must invoke Skill(skill="gsd-code-review", args="... --fix ...") for auto-fix; found: ${JSON.stringify(invocations)}`);
|
||||
});
|
||||
|
||||
test('autonomous.md contains --auto flag for code-review-fix', () => {
|
||||
test('autonomous.md contains --auto flag on consolidated --fix invocation (#2790)', () => {
|
||||
const content = fs.readFileSync(path.join(WORKFLOWS_DIR, 'autonomous.md'), 'utf-8');
|
||||
|
||||
// Find the gsd-code-review-fix Skill invocation, then tokenize its args
|
||||
// (whitespace-split) and assert --auto is one of the tokens. This avoids
|
||||
// substring matches that could conflate --auto with --auto-foo.
|
||||
// Find the gsd-code-review invocation that carries --fix (the consolidated
|
||||
// auto-fix entry point), then assert --auto is one of its arg tokens.
|
||||
// Tokenize via whitespace-split to avoid substring matches that could
|
||||
// conflate --auto with --auto-foo.
|
||||
const invocations = parseWorkflowSkillInvocations(content);
|
||||
const fixInvocation = invocations.find(inv => inv.skill === 'gsd-code-review-fix');
|
||||
assert.ok(fixInvocation, 'autonomous.md missing Skill(skill="gsd-code-review-fix", ...) invocation');
|
||||
const fixInvocation = invocations.find(inv => {
|
||||
if (inv.skill !== 'gsd-code-review') return false;
|
||||
const tokens = new Set((inv.args ?? '').split(/\s+/).filter(Boolean));
|
||||
return tokens.has('--fix');
|
||||
});
|
||||
assert.ok(fixInvocation, 'autonomous.md missing Skill(skill="gsd-code-review", args="... --fix ...") invocation');
|
||||
const argTokens = new Set((fixInvocation.args ?? '').split(/\s+/).filter(Boolean));
|
||||
assert.ok(argTokens.has('--auto'),
|
||||
`autonomous.md gsd-code-review-fix args missing --auto flag; got args="${fixInvocation.args}"`);
|
||||
|
||||
Reference in New Issue
Block a user