Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/sync.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ interface PackageJson {
version?: string;
dependencies?: Record<string, string>;
devDependencies?: Record<string, string>;
optionalDependencies?: Record<string, string>;
peerDependencies?: Record<string, string>;
/** Validated by parseSkillsField. */
skills?: unknown;
}
Expand Down Expand Up @@ -155,6 +157,16 @@ function findInstalledPackage(from: string, name: string): string | undefined {
}
}

type FieldRemoteRequest = RemoteSkillsRequest & { via: string };

/** Every package the project declares; a missing one (e.g. an omitted optional) is skipped. */
const DEPENDENCY_FIELDS = [
'dependencies',
'devDependencies',
'optionalDependencies',
'peerDependencies',
] as const;

/**
* Find skills shipped by the project's direct dependencies, plus the skills
* that `npm:` entries in `skills` fields point at. Fields are read from the
Expand All @@ -164,8 +176,6 @@ function findInstalledPackage(from: string, name: string): string | undefined {
* reaches the agent only when a direct dependency names it, and the package
* manager's version resolution decides which copy of a package is seen.
*/
type FieldRemoteRequest = RemoteSkillsRequest & { via: string };

async function discoverNodeModuleSkills(cwd: string): Promise<{
skills: PackageSkill[];
remote: FieldRemoteRequest[];
Expand All @@ -190,9 +200,7 @@ async function discoverNodeModuleSkills(cwd: string): Promise<{
}
};

const deps = [
...new Set([...Object.keys(pkg.dependencies ?? {}), ...Object.keys(pkg.devDependencies ?? {})]),
];
const deps = [...new Set(DEPENDENCY_FIELDS.flatMap((field) => Object.keys(pkg[field] ?? {})))];
const shipped = await Promise.all(
deps.map((name) => discoverPackageSkills(join(cwd, 'node_modules', name), name, 0))
);
Expand Down
18 changes: 18 additions & 0 deletions tests/sync.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,24 @@ describe('experimental_sync command', () => {
expect(result.stdout).toContain('dev-skill');
});

it('reads optionalDependencies and peerDependencies', () => {
writeFileSync(
join(testDir, 'package.json'),
JSON.stringify({
optionalDependencies: { 'opt-tool': '*', 'not-installed': '*' },
peerDependencies: { 'peer-tool': '*' },
})
);
writeSkill(createPackage('opt-tool'), 'opt-skill');
writeSkill(createPackage('peer-tool'), 'peer-skill');

const result = runCli(['experimental_sync', '-y', '-a', 'claude-code'], testDir);

expect(result.exitCode).toBe(0);
expect(existsSync(join(testDir, '.agents', 'skills', 'opt-skill'))).toBe(true);
expect(existsSync(join(testDir, '.agents', 'skills', 'peer-skill'))).toBe(true);
});

it('ignores packages that are not direct dependencies', () => {
declareDeps(['direct-pkg']);
writeSkill(createPackage('direct-pkg'), 'direct-skill');
Expand Down
Loading