397c34142a
* Deepen SDK package seam and converge runtime skills policy * fix(sdk): unified install-root resolution for workflows and agents (CR finding 1) Use the already-resolved gsdInstallDir constant instead of calling resolveLegacyInstallDir() again when computing agentsDir, ensuring workflowsDir and agentsDir share the same install root. * fix(sdk): tilde shortening requires path-boundary match (CR finding 2) Both renderGlobalSkillsBaseDisplayPath and renderGlobalSkillDisplayPath used startsWith(home) which could incorrectly shorten unrelated paths sharing the same prefix. Now checks for home === base or base.startsWith(home + sep) to ensure a real directory boundary. * fix(sdk): validate loadConfig export before invocation (CR finding 3) After requiring core.cjs, check typeof mod.loadConfig === 'function' before calling it. Throws a classified GSDError with the module path if the export is missing, rather than a generic TypeError. * fix(test): guard root lookup before .path dereference (CR finding 4) Added assert.ok() guards for claudeRoot and codexRoot after the .find() calls so that a missing root produces an explicit assertion failure rather than a TypeError on .path dereference. * fix(ci): fail-safe on transient API errors in approval dismissal (CR finding 6) resolveRole() returns 'unknown' for non-404 errors (rate limits, 5xx, network blips). shouldDismissReviewer() now treats 'unknown' as unresolvable and skips dismissal, preventing legitimate approvals from being dismissed due to a transient API failure. Only 'none' (true 404) is treated as a confirmed non-collaborator. * changeset: pr=3238 SDK package seam and runtime skills convergence * fix(sdk): harden resolveGlobalSkillDir against path traversal (CR finding 1) Use resolve+relative to validate that skillName cannot escape the global skills base directory. Values like "../../foo" or absolute paths now return null instead of joining directly. All imports (resolve, relative, isAbsolute) were already present in helpers.ts. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(sdk): split skill-dir-resolution and skill-not-found warnings (CR finding 2) After resolveGlobalSkillDir's hardening can return null for traversal attempts, the old single-branch warning "Global skill not found at ..." was misleading. Split into two distinct cases: - skillDir === null → "Could not resolve global skill directory for ..." - skillMd missing → "Global skill not found at ..." Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * test: lock skill path-traversal rejection in resolveGlobalSkillDir Regression test verifying that traversal segments (../../foo, ../escape), empty string, and absolute paths are all rejected (return null), while a legitimate skill name resolves correctly. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * test(sdk): align display-path contract + traversal coverage for resolveGlobalSkillMarkdownPath (CR nitpicks) - renderGlobalSkillsBaseDisplayPath now returns a non-null string for unsupported runtimes (e.g. cline → "(cline does not use a skills directory)") matching the existing renderGlobalSkillDisplayPath contract; callers of both helpers no longer need null-checks for unsupported runtimes. - Remove now-redundant ! non-null assertion on renderGlobalSkillsBaseDisplayPath calls in skill-manifest.ts (return type is string, not string | null). - Extend the path-traversal test block to assert resolveGlobalSkillMarkdownPath also propagates null for ../../foo, ../escape, empty, and /abs/path inputs, locking the null-propagation contract against future refactors. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
63 lines
2.7 KiB
TypeScript
63 lines
2.7 KiB
TypeScript
import { describe, expect, it } from 'vitest';
|
|
import { mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises';
|
|
import { tmpdir, homedir } from 'node:os';
|
|
import { join } from 'node:path';
|
|
|
|
import { buildSkillManifest } from './skill-manifest.js';
|
|
import { resolveGlobalSkillsBase, renderGlobalSkillsBaseDisplayPath } from './helpers.js';
|
|
import { resolveLegacySkillsDir } from '../sdk-package-compatibility.js';
|
|
|
|
describe('skill-manifest', () => {
|
|
it('resolves runtime-global skills roots through shared runtime policy', () => {
|
|
const manifest = buildSkillManifest('/tmp/project-that-does-not-exist');
|
|
const claudeRoot = manifest.roots.find(root => root.root === renderGlobalSkillsBaseDisplayPath('claude'));
|
|
const codexRoot = manifest.roots.find(root => root.root === renderGlobalSkillsBaseDisplayPath('codex'));
|
|
|
|
expect(claudeRoot?.path).toBe(resolveGlobalSkillsBase('claude'));
|
|
expect(claudeRoot?.scope).toBe('global');
|
|
expect(codexRoot?.path).toBe(resolveGlobalSkillsBase('codex'));
|
|
expect(codexRoot?.scope).toBe('global');
|
|
});
|
|
|
|
it('resolves legacy import-only skills root through SDK Package Seam Module', () => {
|
|
const manifest = buildSkillManifest('/tmp/project-that-does-not-exist');
|
|
const legacyRoot = manifest.roots.find(root => root.root === '.claude/get-shit-done/skills');
|
|
|
|
expect(legacyRoot).toBeDefined();
|
|
expect(legacyRoot?.path).toBe(resolveLegacySkillsDir());
|
|
expect(legacyRoot?.scope).toBe('import-only');
|
|
expect(legacyRoot?.deprecated).toBe(true);
|
|
});
|
|
|
|
it('discovers skills from explicit --skills-dir without scanning global roots', async () => {
|
|
const tmpDir = await mkdtemp(join(tmpdir(), 'gsd-skill-manifest-'));
|
|
try {
|
|
const skillsDir = join(tmpDir, 'custom-skills');
|
|
const alphaDir = join(skillsDir, 'alpha-skill');
|
|
await mkdir(alphaDir, { recursive: true });
|
|
await writeFile(
|
|
join(alphaDir, 'SKILL.md'),
|
|
'---\nname: alpha-skill\ndescription: alpha desc\n---\n\nTRIGGER when: need alpha\n',
|
|
);
|
|
|
|
const manifest = buildSkillManifest(tmpDir, skillsDir);
|
|
expect(manifest.counts.roots).toBe(1);
|
|
expect(manifest.roots[0]?.path).toBe(skillsDir);
|
|
expect(manifest.skills).toHaveLength(1);
|
|
expect(manifest.skills[0]).toMatchObject({
|
|
name: 'alpha-skill',
|
|
description: 'alpha desc',
|
|
triggers: ['need alpha'],
|
|
root: skillsDir,
|
|
scope: 'custom',
|
|
});
|
|
} finally {
|
|
await rm(tmpDir, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
it('legacy skills dir helper points at ~/.claude/get-shit-done/skills', () => {
|
|
expect(resolveLegacySkillsDir()).toBe(join(homedir(), '.claude', 'get-shit-done', 'skills'));
|
|
});
|
|
});
|