skills/pbakaus_impeccable
1
0
Fork 0
mirror of https://github.com/pbakaus/impeccable.git synced 2026-09-20 10:06:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix: preserve external ~/.claude/skills symlink on first install (#295) (#308)

Browse Source 
* Fix: preserve external skills symlink on first install (#295)

* Fix review comments: target-based in-project link detection (#295, #308)

- isInProjectProviderLink now inspects the symlink TARGET lexically instead of comparing shared realpaths, so two providers pointing at the same external dir are no longer misflagged as in-project (cursor High / greptile P1).
- A dangling in-project cross-provider link is now correctly replaced with a real per-provider dir (cursor Medium).
- Adds regression tests for both scenarios.
This commit is contained in:
Abdul Wahab
2026-06-25 17:21:02 -07:00
committed by GitHub
parent 2520317f94
commit 467efe4632
2 changed files with 113 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/bin/commands/skills.mjs
+35 -3
View File
@@ -1010,6 +1010,36 @@ async function chooseInstallPlan(projectRoot, flags, { yes } = {}) {
return { targets, scope, installRoot, hookRoot: projectRoot, detections };
}
/**
* Whether `localSkillsDir` is a symlink that points at ANOTHER in-project
* provider's skills dir (e.g. `.claude/skills -> ../.agents/skills`, the shape a
* prior `npx skills` install can leave behind). Only these get dropped so each
* provider can receive its own compiled variant. A symlink to anywhere else -
* notably a user's external shared skills dir (`~/.claude/skills ->
* ~/.config/agents/skills`) - is preserved and written through. See issue #295.
*/
function isInProjectProviderLink(localSkillsDir, root, provider) {
let target;
try {
if (!lstatSync(localSkillsDir).isSymbolicLink()) return false;
target = readlinkSync(localSkillsDir);
} catch {
return false; // not a symlink, or unreadable
}
// Resolve the link's TARGET lexically against the link's own directory. We
// deliberately do NOT realpathSync the target:
// * it lets a not-yet-created in-project target still match, so a dangling
// `.claude/skills -> ../.agents/skills` is still dropped;
// * it compares the ACTUAL target, not a shared realpath, so two providers
// pointing at the SAME external dir are never misread as in-project.
const resolvedTarget = resolve(dirname(localSkillsDir), target);
for (const other of PROVIDER_DIRS) {
if (other === provider) continue;
if (resolvedTarget === join(root, other, 'skills')) return true;
}
return false;
}
/**
* Copy each target provider's compiled skill variant from an extracted bundle
* into the project. Writes real directories (copy, never symlink) so every
@@ -1022,10 +1052,12 @@ function copyProviderSkills(bundleDir, root, targets) {
if (existsSync(srcDir)) {
const localSkillsDir = join(root, provider, 'skills');
// A previous `npx skills` install may have left this provider's skills dir
// as a symlink to another provider's canonical copy. Drop the link so we
// write a real, provider-specific directory instead of writing through it.
// as a symlink to ANOTHER in-project provider's canonical copy. Drop only
// that link so we write a real, provider-specific directory. A user's
// external shared-skills symlink (e.g. ~/.claude/skills ->
// ~/.config/agents/skills) is preserved and written through. See #295.
try {
if (lstatSync(localSkillsDir).isSymbolicLink()) unlinkSync(localSkillsDir);
if (isInProjectProviderLink(localSkillsDir, root, provider)) unlinkSync(localSkillsDir);
} catch {}
for (const skill of readdirSync(srcDir, { withFileTypes: true })) {
if (!skill.isDirectory()) continue;