* 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
@@ -311,29 +311,106 @@ describe('workspace worktree integration', () => {
|
||||
});
|
||||
|
||||
// ─── Command and workflow file existence ────────────────────────────────────
|
||||
// #2790: new-workspace.md, list-workspaces.md, remove-workspace.md were
|
||||
// consolidated into a single workspace.md command with --new/--list/--remove flags.
|
||||
|
||||
// allow-test-rule: source-text-is-the-product
|
||||
// workspace.md routing text and workflow content IS the deployed behavioral contract for the agent.
|
||||
|
||||
describe('workspace command files', () => {
|
||||
const baseDir = path.join(__dirname, '..');
|
||||
|
||||
test('new-workspace command exists with correct frontmatter', () => {
|
||||
const content = fs.readFileSync(path.join(baseDir, 'commands/gsd/new-workspace.md'), 'utf8');
|
||||
assert.ok(content.includes('name: gsd:new-workspace'));
|
||||
assert.ok(content.includes('--name'));
|
||||
assert.ok(content.includes('--repos'));
|
||||
assert.ok(content.includes('--strategy'));
|
||||
assert.ok(content.includes('workflows/new-workspace.md'));
|
||||
/**
|
||||
* Split frontmatter / body and parse simple YAML-ish key:value pairs.
|
||||
* Returns { fm: { name, argument-hint, ... }, body }. Avoids raw
|
||||
* substring matching on the file as a whole.
|
||||
*/
|
||||
function parseCommandFile(filePath) {
|
||||
const raw = fs.readFileSync(filePath, 'utf8');
|
||||
const fmMatch = raw.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n([\s\S]*)$/);
|
||||
assert.ok(fmMatch, `${path.basename(filePath)} must start with a YAML frontmatter block`);
|
||||
const fm = {};
|
||||
for (const line of fmMatch[1].split('\n')) {
|
||||
const kv = line.match(/^([a-zA-Z_-]+):\s*(.*)$/);
|
||||
if (!kv) continue;
|
||||
const key = kv[1];
|
||||
let val = kv[2].trim();
|
||||
if (val.startsWith('"') && val.endsWith('"')) val = val.slice(1, -1);
|
||||
fm[key] = val;
|
||||
}
|
||||
return { fm, body: fmMatch[2] };
|
||||
}
|
||||
|
||||
/**
|
||||
* Extract `@`-include targets from any of the <execution_context*> blocks.
|
||||
* Each line of the form `@~/.claude/get-shit-done/workflows/foo.md` becomes
|
||||
* a relative target like `workflows/foo.md`. Used to assert workflow
|
||||
* routing structurally instead of substring-matching prose.
|
||||
*/
|
||||
function executionContextIncludes(body) {
|
||||
const blocks = [...body.matchAll(/<execution_context(?:_extended)?>([\s\S]*?)<\/execution_context(?:_extended)?>/g)]
|
||||
.map((m) => m[1]);
|
||||
const targets = [];
|
||||
for (const blk of blocks) {
|
||||
for (const line of blk.split('\n')) {
|
||||
const t = line.trim();
|
||||
if (!t.startsWith('@')) continue;
|
||||
// Normalize away the home-prefix and the `.claude/get-shit-done/` root
|
||||
// so the test only cares about the workflow path tail.
|
||||
const rel = t.replace(/^@~?\/?(?:\.claude\/)?(?:get-shit-done\/)?/, '');
|
||||
targets.push(rel);
|
||||
}
|
||||
}
|
||||
return targets;
|
||||
}
|
||||
|
||||
test('consolidated workspace.md command declares correct frontmatter contract (#2790)', () => {
|
||||
// Structural: parse frontmatter, then split argument-hint into the
|
||||
// tokenized flag list. Each consolidated flag must appear there.
|
||||
const { fm } = parseCommandFile(path.join(baseDir, 'commands/gsd/workspace.md'));
|
||||
assert.equal(fm.name, 'gsd:workspace', `workspace.md frontmatter name must be "gsd:workspace"; got "${fm.name}"`);
|
||||
assert.ok(fm['argument-hint'], 'workspace.md frontmatter must declare argument-hint');
|
||||
// argument-hint can include multiple bracketed segments and free tokens,
|
||||
// e.g. "[--new | --list | --remove] [name]". Pull every `--flag` token
|
||||
// out of any bracketed segment so the test asserts on a parsed flag set,
|
||||
// not the punctuation around it.
|
||||
const bracketed = [...fm['argument-hint'].matchAll(/\[([^\]]*)\]/g)].map((m) => m[1]);
|
||||
const flagList = bracketed
|
||||
.flatMap((seg) => seg.split('|').map((s) => s.trim().split(/\s+/)[0]))
|
||||
.filter((tok) => tok.startsWith('--'));
|
||||
for (const flag of ['--new', '--list', '--remove']) {
|
||||
assert.ok(
|
||||
flagList.includes(flag),
|
||||
`workspace.md argument-hint must declare ${flag}; got: ${JSON.stringify(flagList)}`
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
test('list-workspaces command exists with correct frontmatter', () => {
|
||||
const content = fs.readFileSync(path.join(baseDir, 'commands/gsd/list-workspaces.md'), 'utf8');
|
||||
assert.ok(content.includes('name: gsd:list-workspaces'));
|
||||
assert.ok(content.includes('workflows/list-workspaces.md'));
|
||||
test('workspace.md @-includes the new-workspace workflow', () => {
|
||||
const { body } = parseCommandFile(path.join(baseDir, 'commands/gsd/workspace.md'));
|
||||
const targets = executionContextIncludes(body);
|
||||
assert.ok(
|
||||
targets.some((t) => /(^|\/)workflows\/new-workspace\.md$/.test(t)),
|
||||
`workspace.md execution_context must @-include workflows/new-workspace.md; got: ${JSON.stringify(targets)}`
|
||||
);
|
||||
});
|
||||
|
||||
test('remove-workspace command exists with correct frontmatter', () => {
|
||||
const content = fs.readFileSync(path.join(baseDir, 'commands/gsd/remove-workspace.md'), 'utf8');
|
||||
assert.ok(content.includes('name: gsd:remove-workspace'));
|
||||
assert.ok(content.includes('workflows/remove-workspace.md'));
|
||||
test('workspace.md @-includes the list-workspaces workflow', () => {
|
||||
const { body } = parseCommandFile(path.join(baseDir, 'commands/gsd/workspace.md'));
|
||||
const targets = executionContextIncludes(body);
|
||||
assert.ok(
|
||||
targets.some((t) => /(^|\/)workflows\/list-workspaces\.md$/.test(t)),
|
||||
`workspace.md execution_context must @-include workflows/list-workspaces.md; got: ${JSON.stringify(targets)}`
|
||||
);
|
||||
});
|
||||
|
||||
test('workspace.md @-includes the remove-workspace workflow', () => {
|
||||
const { body } = parseCommandFile(path.join(baseDir, 'commands/gsd/workspace.md'));
|
||||
const targets = executionContextIncludes(body);
|
||||
assert.ok(
|
||||
targets.some((t) => /(^|\/)workflows\/remove-workspace\.md$/.test(t)),
|
||||
`workspace.md execution_context must @-include workflows/remove-workspace.md; got: ${JSON.stringify(targets)}`
|
||||
);
|
||||
});
|
||||
|
||||
test('new-workspace workflow exists', () => {
|
||||
|
||||
Reference in New Issue
Block a user