* fix(#816): mirror install command-prefix handling in _syncGsdDir applySurface() via _syncGsdDir handled command artifacts differently from a fresh install. For flat command dirs (cursor/augment/opencode/kilo) install's _copyStaged adds kind.prefix (gsd-<stem>.md) and _removeGsdEntries prunes prefix-scoped, but _syncGsdDir copied staged files verbatim (unprefixed) and pruned by exact name. So every /gsd:surface toggle wrote wrong filenames, orphaned the installed gsd-*.md, and deleted user-authored command files. _syncGsdDir's commands/agents branch now mirrors install: - flat command dirs get the gsd- prefix on copy; namespaced dirs (commands/gsd) and agents keep staged names, using install's namespacedByDir rule - prune is prefix-scoped so user files in shared flat dirs are preserved; namespaced commands/gsd stays membership-pruned so superseded commands are still removed on profile shrink The naming rule is intentionally re-implemented (not via require('bin/install.js') to avoid its module-load banner side-effect); a strict parity test asserts applySurface and installRuntimeArtifacts produce identical command filenames for opencode/kilo/cursor/augment/gemini, guarding against drift. Closes #816 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * chore(#816): add changeset fragment for PR #822 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Tom Boucher
@@ -303,6 +303,144 @@ describe('applySurface', () => {
|
||||
assert.ok(fs.existsSync(path.join(destDir, stem1, 'SKILL.md')), 'GSD help/SKILL.md must be copied');
|
||||
});
|
||||
|
||||
// Regression guard for #816: applySurface must write gsd-prefixed command files
|
||||
// (matching installRuntimeArtifacts/_copyStaged behaviour) and must NOT prune
|
||||
// user-created command files that install would preserve.
|
||||
//
|
||||
// Affected runtimes have a FLAT command dir (opencode `command/`, cursor
|
||||
// `commands/`, augment `commands/`, kilo `command/`) with kind.prefix='gsd-'.
|
||||
// _copyStaged names files `gsd-<stem>.md` but the buggy _syncGsdDir copies
|
||||
// them as `<stem>.md` (unprefixed) and also deletes ALL .md files not in the
|
||||
// staged set, including user files.
|
||||
test('applySurface writes gsd-prefixed command files matching install and preserves user commands (#816)', (t) => {
|
||||
const configDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gsd-surface-816-'));
|
||||
t.after(() => cleanup(configDir));
|
||||
|
||||
writeActiveProfile(configDir, 'standard');
|
||||
writeSurface(configDir, {
|
||||
baseProfile: 'standard',
|
||||
disabledClusters: [],
|
||||
explicitAdds: [],
|
||||
explicitRemoves: [],
|
||||
});
|
||||
|
||||
// Determine the command dest dir for opencode: commandsKind destSubpath='command'
|
||||
const layout = resolveRuntimeArtifactLayout('opencode', configDir, 'global');
|
||||
const commandsKind = layout.kinds.find(k => k.kind === 'commands');
|
||||
assert.ok(commandsKind, 'opencode layout must have a commands kind');
|
||||
const commandDir = path.join(configDir, commandsKind.destSubpath);
|
||||
|
||||
// Pre-seed a user command file BEFORE applySurface — install would preserve it
|
||||
fs.mkdirSync(commandDir, { recursive: true });
|
||||
fs.writeFileSync(path.join(commandDir, 'my-user-cmd.md'), '# user custom command\n', 'utf8');
|
||||
|
||||
const manifest = loadSkillsManifest(REAL_COMMANDS_DIR);
|
||||
applySurface(configDir, layout, manifest, CLUSTERS);
|
||||
|
||||
const files = fs.readdirSync(commandDir).filter(f => f.endsWith('.md'));
|
||||
|
||||
// (a) At least one gsd-prefixed command file must exist — on buggy code only
|
||||
// unprefixed files like 'help.md' are written, so this assertion fails.
|
||||
assert.ok(
|
||||
files.some(f => f.startsWith('gsd-') && f.endsWith('.md')),
|
||||
'#816: applySurface must write at least one gsd-prefixed command file ' +
|
||||
'(e.g. gsd-help.md) to match installRuntimeArtifacts/_copyStaged behaviour. ' +
|
||||
`Actual files: [${files.join(', ')}]`
|
||||
);
|
||||
|
||||
// (b) Every GSD-owned command file must be prefixed — no bare <stem>.md files
|
||||
// allowed among GSD-owned output (excluding the user file).
|
||||
const gsdFiles = files.filter(f => f !== 'my-user-cmd.md');
|
||||
const unprefixed = gsdFiles.filter(f => !f.startsWith('gsd-'));
|
||||
assert.deepStrictEqual(
|
||||
unprefixed,
|
||||
[],
|
||||
'#816: all GSD-owned command files must start with gsd- to match install. ' +
|
||||
`Found unprefixed: [${unprefixed.join(', ')}]`
|
||||
);
|
||||
|
||||
// (c) The pre-seeded user file must survive applySurface — on buggy code the
|
||||
// commands-kind pruning loop deletes ALL .md files not in the staged set,
|
||||
// which wipes user files that installRuntimeArtifacts would never touch.
|
||||
assert.ok(
|
||||
files.includes('my-user-cmd.md'),
|
||||
'#816: applySurface must preserve user command file my-user-cmd.md that was ' +
|
||||
'present before sync — _syncGsdDir must not prune files not owned by GSD. ' +
|
||||
`Actual files: [${files.join(', ')}]`
|
||||
);
|
||||
});
|
||||
|
||||
// Parity regression guard for #816: applySurface command-dir filenames must
|
||||
// match a fresh installRuntimeArtifacts for every command runtime. Guards
|
||||
// against future drift between _syncGsdDir (surface) and _copyStaged (install)
|
||||
// command-naming logic.
|
||||
//
|
||||
// Matrix: opencode/kilo = flat command/ + prefix gsd-;
|
||||
// cursor/augment = flat commands/ + prefix gsd-;
|
||||
// gemini = namespaced commands/gsd/ (no file prefix — dir is namespace).
|
||||
// For each runtime we: run install into installDir, run applySurface into
|
||||
// surfaceDir (same 'standard' profile both sides), then compare sorted .md
|
||||
// filename sets in the commands dest dir. On a fresh dir (no superseded files)
|
||||
// both paths must produce identical sets.
|
||||
test('applySurface command-dir filenames match a fresh install for every command runtime (#816 parity)', async (t) => {
|
||||
process.env.GSD_TEST_MODE = '1';
|
||||
const { installRuntimeArtifacts } = require('../bin/install.js');
|
||||
|
||||
const manifest = loadSkillsManifest(REAL_COMMANDS_DIR);
|
||||
// Build the resolved profile once. Both install and surface sides must use
|
||||
// the same skill set so any filename difference is purely a naming bug.
|
||||
const resolvedProfile = resolveProfile({ modes: ['standard'], manifest });
|
||||
|
||||
const PARITY_RUNTIMES = ['opencode', 'cursor', 'augment', 'kilo', 'gemini'];
|
||||
|
||||
for (const runtime of PARITY_RUNTIMES) {
|
||||
// Create two independent temp dirs — one for install, one for surface.
|
||||
const installDir = fs.mkdtempSync(path.join(os.tmpdir(), `gsd-816-install-${runtime}-`));
|
||||
const surfaceDir = fs.mkdtempSync(path.join(os.tmpdir(), `gsd-816-surface-${runtime}-`));
|
||||
t.after(() => { cleanup(installDir); cleanup(surfaceDir); });
|
||||
|
||||
// --- Install path ---
|
||||
installRuntimeArtifacts(runtime, installDir, 'global', resolvedProfile);
|
||||
|
||||
// --- Surface path ---
|
||||
writeActiveProfile(surfaceDir, 'standard');
|
||||
writeSurface(surfaceDir, {
|
||||
baseProfile: 'standard',
|
||||
disabledClusters: [],
|
||||
explicitAdds: [],
|
||||
explicitRemoves: [],
|
||||
});
|
||||
const layout = resolveRuntimeArtifactLayout(runtime, surfaceDir, 'global');
|
||||
applySurface(surfaceDir, layout, manifest, CLUSTERS);
|
||||
|
||||
// --- Find commands kind ---
|
||||
const cmdKind = layout.kinds.find(k => k.kind === 'commands');
|
||||
if (!cmdKind) {
|
||||
// Runtime has no commands kind at global scope — skip gracefully.
|
||||
continue;
|
||||
}
|
||||
|
||||
// --- Compare sorted .md filename sets ---
|
||||
const installCmdDir = path.join(installDir, cmdKind.destSubpath);
|
||||
const surfaceCmdDir = path.join(surfaceDir, cmdKind.destSubpath);
|
||||
|
||||
const installFiles = fs.existsSync(installCmdDir)
|
||||
? fs.readdirSync(installCmdDir).filter(f => f.endsWith('.md')).sort()
|
||||
: [];
|
||||
const surfaceFiles = fs.existsSync(surfaceCmdDir)
|
||||
? fs.readdirSync(surfaceCmdDir).filter(f => f.endsWith('.md')).sort()
|
||||
: [];
|
||||
|
||||
assert.deepStrictEqual(
|
||||
surfaceFiles,
|
||||
installFiles,
|
||||
`#816 parity: command filenames for ${runtime} (${cmdKind.destSubpath}) must match a fresh install.\n` +
|
||||
` install: [${installFiles.slice(0, 5).join(', ')}${installFiles.length > 5 ? '...' : ''}]\n` +
|
||||
` surface: [${surfaceFiles.slice(0, 5).join(', ')}${surfaceFiles.length > 5 ? '...' : ''}]`
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
// Regression test for #813: applySurface must apply per-runtime path rewrites
|
||||
// (applyRuntimeContentRewritesInPlace) just as installRuntimeArtifacts does.
|
||||
// Without the fix, skill bodies retain the converter's default ~/.claude/ paths
|
||||
|
||||
Reference in New Issue
Block a user