skiller 0.7.21 → 0.7.23

package/dist/core/ClaudePluginSync.js

@@ -143,6 +143,50 @@ async function resolvePluginMarketplaceRoot(pluginId, claudeDir) {
     }
     return null;
 }
+async function hasPluginContent(root) {
+    const candidates = [
+        path.join(root, 'skills'),
+        path.join(root, 'commands'),
+        path.join(root, 'agents'),
+    ];
+    for (const candidate of candidates) {
+        if (await dirExists(candidate))
+            return true;
+    }
+    return false;
+}
+async function readPluginPackageManifestEntries(installPath) {
+    const packageJsonPath = path.join(installPath, 'package.json');
+    try {
+        const raw = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
+        if (!Array.isArray(raw.plugins))
+            return [];
+        return raw.plugins.filter((entry) => Boolean(entry) && typeof entry === 'object');
+    }
+    catch {
+        return [];
+    }
+}
+async function resolveInstalledPluginSourceRoot(pluginId, installPath) {
+    const manifestEntries = await readPluginPackageManifestEntries(installPath);
+    const parsedPluginId = parsePluginId(pluginId);
+    const matchingEntry = manifestEntries.find((entry) => entry.name === parsedPluginId?.pluginName) ?? (manifestEntries.length === 1 ? manifestEntries[0] : null);
+    const rawSource = typeof matchingEntry?.source === 'string' &&
+        matchingEntry.source.trim() !== ''
+        ? matchingEntry.source
+        : '.';
+    const sourceRoot = path.resolve(installPath, rawSource);
+    const normalizedInstallPath = path.resolve(installPath);
+    const isWithinInstallPath = sourceRoot === normalizedInstallPath ||
+        sourceRoot.startsWith(normalizedInstallPath + path.sep);
+    if (isWithinInstallPath && (await hasPluginContent(sourceRoot))) {
+        return sourceRoot;
+    }
+    if (await hasPluginContent(installPath)) {
+        return installPath;
+    }
+    return null;
+}
 function resolvePluginInstall(pluginId, projectRoot, index) {
     const entries = index.plugins?.[pluginId];
     if (!entries || !Array.isArray(entries) || entries.length === 0)
@@ -622,21 +666,27 @@ async function syncClaudePluginsToSkillsDirs(args) {
     const resolvedSources = [];
     const unresolvedEnabled = new Set();
     for (const pluginId of enabledPlugins) {
-        const pluginRoot = await resolvePluginMarketplaceRoot(pluginId, claudeDir);
+        const resolved = index
+            ? resolvePluginInstall(pluginId, projectRoot, index)
+            : null;
+        const marketplaceRoot = await resolvePluginMarketplaceRoot(pluginId, claudeDir);
+        const pluginRoot = (marketplaceRoot && (await hasPluginContent(marketplaceRoot))
+            ? marketplaceRoot
+            : null) ??
+            (resolved
+                ? await resolveInstalledPluginSourceRoot(pluginId, resolved.installPath)
+                : null);
         if (!pluginRoot) {
             unresolvedEnabled.add(pluginId);
             const hasIndexEntry = Boolean(index?.plugins?.[pluginId]?.length);
             if (hasIndexEntry) {
-                (0, constants_1.logVerboseInfo)(`[plugins] Enabled plugin has no marketplace content, skipping: ${pluginId}`, verbose, dryRun);
+                (0, constants_1.logVerboseInfo)(`[plugins] Enabled plugin has no syncable content, skipping: ${pluginId}`, verbose, dryRun);
             }
             else {
                 (0, constants_1.logWarn)(`[plugins] Enabled plugin not installed: ${pluginId}`, dryRun);
             }
             continue;
         }
-        const resolved = index
-            ? resolvePluginInstall(pluginId, projectRoot, index)
-            : null;
         resolvedSources.push({
             pluginId,
             pluginRoot,
@@ -742,6 +792,7 @@ async function syncClaudePluginsToSkillsDirs(args) {
                 continue;
             const desiredPrefix = pluginNamespacePrefixByPluginId.get(item.pluginId) ??
                 sanitizeId(item.pluginId);
+            const currentNamespacedBase = `${desiredPrefix}-${item.baseName}`;
             // Migration: previous versions used `${pluginId}__${name}`, then
             // `${pluginId}-${name}`. If we changed the namespace prefix (for example
             // to omit marketplace), don't preserve the old destination so the item
@@ -751,6 +802,13 @@ async function syncClaudePluginsToSkillsDirs(args) {
             if (prev.startsWith(`${sanitizeId(item.pluginId)}-`) &&
                 desiredPrefix !== sanitizeId(item.pluginId))
                 continue;
+            // If the item was previously namespaced only because its base name was
+            // unavailable, drop that sticky destination once the base name is free.
+            if ((prev === currentNamespacedBase ||
+                prev.startsWith(`${currentNamespacedBase}-`)) &&
+                !taken.has(item.baseName)) {
+                continue;
+            }
             if (taken.has(prev))
                 continue;
             assignedDestByItemKey.set(item.itemKey, prev);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "skiller",
-	"version": "0.7.21",
+	"version": "0.7.23",
 	"description": "Skiller — apply the same rules to all coding agents",
 	"main": "dist/lib.js",
 	"publishConfig": {