agentinit 1.16.0 → 1.16.2

package/dist/core/pluginManager.d.ts

@@ -42,8 +42,18 @@ export declare class PluginManager {
     private getClaudeNativeInstallTarget;
     private readClaudeInstalledPlugins;
     private saveClaudeInstalledPlugins;
+    private readClaudeKnownMarketplaces;
+    private saveClaudeKnownMarketplaces;
     private readClaudeSettings;
     private saveClaudeSettings;
+    private findClaudeMarketplaceRoot;
+    private readClaudeMarketplaceManifest;
+    private saveClaudeMarketplaceManifest;
+    private resolveMarketplaceSourcePath;
+    private readClaudePluginMetadata;
+    private copyClaudeMarketplacePlugin;
+    private getClaudeMarketplaceSource;
+    private materializeClaudeMarketplace;
     private installNativeClaudePlugin;
     private toNativePluginPreview;
     private removeNativeClaudePlugin;
@@ -125,6 +135,7 @@ export declare class PluginManager {
      * Install skills from a plugin, deduplicating by shared directory
      */
     private installPluginSkills;
+    private getPortableSkillAgents;
     /**
      * Apply MCP servers from a plugin to each target agent
      */

package/dist/core/pluginManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pluginManager.d.ts","sourceRoot":"","sources":["../../src/core/pluginManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pluginManager.d.ts","sourceRoot":"","sources":["../../src/core/pluginManager.ts"],"names":[],"mappings":"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"}

package/dist/core/pluginManager.js

@@ -38,6 +38,12 @@ function getRegistryPath(projectPath, global) {
 function getClaudeInstalledPluginsPath() {
     return join(homedir(), '.claude', 'plugins', 'installed_plugins.json');
 }
+function getClaudeKnownMarketplacesPath() {
+    return join(homedir(), '.claude', 'plugins', 'known_marketplaces.json');
+}
+function getClaudeMarketplaceInstallPath(namespace) {
+    return join(homedir(), '.claude', 'plugins', 'marketplaces', namespace);
+}
 function getClaudeSettingsPath() {
     return join(homedir(), '.claude', 'settings.json');
 }
@@ -292,6 +298,8 @@ export class PluginManager {
             (async () => !!manifest.commands || await isDirectory(join(pluginDir, 'commands')))(),
             (async () => !!manifest.hooks || await isDirectory(join(pluginDir, 'hooks')))(),
             (async () => !!manifest.agents || await isDirectory(join(pluginDir, 'agents')))(),
+            isDirectory(join(pluginDir, 'skills')),
+            (async () => !!manifest.mcpServers || await fileExists(join(pluginDir, '.mcp.json')))(),
             isDirectory(join(pluginDir, 'prompts')),
             isDirectory(join(pluginDir, 'schemas')),
             isDirectory(join(pluginDir, 'scripts')),
@@ -301,10 +309,12 @@ export class PluginManager {
             ...(featureChecks[0] ? ['commands'] : []),
             ...(featureChecks[1] ? ['hooks'] : []),
             ...(featureChecks[2] ? ['agents'] : []),
-            ...(featureChecks[3] ? ['prompts'] : []),
-            ...(featureChecks[4] ? ['schemas'] : []),
-            ...(featureChecks[5] ? ['scripts'] : []),
-            ...(featureChecks[6] ? ['templates'] : []),
+            ...(featureChecks[3] ? ['skills'] : []),
+            ...(featureChecks[4] ? ['mcp servers'] : []),
+            ...(featureChecks[5] ? ['prompts'] : []),
+            ...(featureChecks[6] ? ['schemas'] : []),
+            ...(featureChecks[7] ? ['scripts'] : []),
+            ...(featureChecks[8] ? ['templates'] : []),
         ];
     }
     async getClaudeNativeInstallTarget(plugin, pluginDir) {
@@ -329,12 +339,13 @@ export class PluginManager {
         const baseNamespace = plugin.nativeClaudeBundle?.bundleName
             || plugin.source.marketplace
             || (plugin.source.owner && plugin.source.repo ? `${plugin.source.owner}-${plugin.source.repo}` : plugin.name);
-        const namespace = `agentinit-${this.slugifyPluginNamespace(baseNamespace)}`;
+        const namespace = this.slugifyPluginNamespace(baseNamespace);
         const versionDir = this.slugifyPluginNamespace(plugin.version || '0.0.0');
         return {
             namespace,
             pluginKey: `${plugin.name}@${namespace}`,
             installPath: join(homedir(), '.claude', 'plugins', 'cache', namespace, plugin.name, versionDir),
+            marketplacePath: getClaudeMarketplaceInstallPath(namespace),
             features,
         };
     }
@@ -358,6 +369,25 @@ export class PluginManager {
     async saveClaudeInstalledPlugins(state) {
         await writeFile(getClaudeInstalledPluginsPath(), JSON.stringify(state, null, 2));
     }
+    async readClaudeKnownMarketplaces() {
+        const content = await readFileIfExists(getClaudeKnownMarketplacesPath());
+        if (!content) {
+            return {};
+        }
+        try {
+            const parsed = JSON.parse(content);
+            if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+                return {};
+            }
+            return parsed;
+        }
+        catch {
+            return {};
+        }
+    }
+    async saveClaudeKnownMarketplaces(state) {
+        await writeFile(getClaudeKnownMarketplacesPath(), JSON.stringify(state, null, 2));
+    }
     async readClaudeSettings() {
         const content = await readFileIfExists(getClaudeSettingsPath());
         if (!content) {
@@ -380,6 +410,154 @@ export class PluginManager {
     async saveClaudeSettings(state) {
         await writeFile(getClaudeSettingsPath(), JSON.stringify(state, null, 2));
     }
+    async findClaudeMarketplaceRoot(pluginDir) {
+        let currentDir = resolve(pluginDir);
+        while (true) {
+            if (await fileExists(join(currentDir, '.claude-plugin', 'marketplace.json'))) {
+                return currentDir;
+            }
+            const parentDir = dirname(currentDir);
+            if (parentDir === currentDir) {
+                return null;
+            }
+            currentDir = parentDir;
+        }
+    }
+    async readClaudeMarketplaceManifest(marketplaceDir) {
+        const manifestContent = await readFileIfExists(join(marketplaceDir, '.claude-plugin', 'marketplace.json'));
+        if (!manifestContent) {
+            return null;
+        }
+        try {
+            const parsed = JSON.parse(manifestContent);
+            if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+                return null;
+            }
+            const plugins = Array.isArray(parsed.plugins)
+                ? parsed.plugins.filter((entry) => !!entry && typeof entry === 'object' && !Array.isArray(entry))
+                : [];
+            return {
+                ...parsed,
+                plugins,
+            };
+        }
+        catch {
+            return null;
+        }
+    }
+    async saveClaudeMarketplaceManifest(marketplaceDir, manifest) {
+        await fs.mkdir(join(marketplaceDir, '.claude-plugin'), { recursive: true });
+        await writeFile(join(marketplaceDir, '.claude-plugin', 'marketplace.json'), JSON.stringify(manifest, null, 2));
+    }
+    resolveMarketplaceSourcePath(baseDir, relativePath) {
+        const resolvedPath = resolve(baseDir, relativePath);
+        const relativePathFromBase = relative(resolve(baseDir), resolvedPath);
+        if (relativePathFromBase.startsWith('..')
+            || relativePathFromBase.includes('/../')
+            || relativePathFromBase.includes('\\..\\')) {
+            throw new Error(`Invalid marketplace source path "${relativePath}" in ${baseDir}`);
+        }
+        return resolvedPath;
+    }
+    async readClaudePluginMetadata(pluginDir) {
+        const manifestContent = await readFileIfExists(join(pluginDir, '.claude-plugin', 'plugin.json'));
+        if (!manifestContent) {
+            return {};
+        }
+        try {
+            const manifest = JSON.parse(manifestContent);
+            return {
+                ...(typeof manifest.description === 'string' ? { description: manifest.description } : {}),
+                ...(typeof manifest.version === 'string' ? { version: manifest.version } : {}),
+                ...(manifest.author ? { author: manifest.author } : {}),
+            };
+        }
+        catch {
+            return {};
+        }
+    }
+    async copyClaudeMarketplacePlugin(sourcePluginDir, marketplacePath, pluginName) {
+        const marketplacePluginPath = join(marketplacePath, 'plugins', pluginName);
+        await fs.mkdir(dirname(marketplacePluginPath), { recursive: true });
+        await fs.rm(marketplacePluginPath, { recursive: true, force: true }).catch(() => { });
+        await fs.cp(sourcePluginDir, marketplacePluginPath, { recursive: true, dereference: true });
+        return marketplacePluginPath;
+    }
+    getClaudeMarketplaceSource(plugin, marketplaceRoot, marketplacePath) {
+        if (plugin.source.type === 'github') {
+            if (plugin.source.owner && plugin.source.repo) {
+                return {
+                    source: 'github',
+                    repo: `${plugin.source.owner}/${plugin.source.repo}`,
+                };
+            }
+            if (plugin.source.url) {
+                return {
+                    source: 'git',
+                    url: plugin.source.url,
+                };
+            }
+        }
+        if (plugin.source.type === 'local') {
+            return {
+                source: 'directory',
+                path: resolve(marketplaceRoot || plugin.source.path || marketplacePath),
+            };
+        }
+        return {
+            source: 'directory',
+            path: marketplacePath,
+        };
+    }
+    async materializeClaudeMarketplace(plugin, pluginDir, target) {
+        const marketplaceRoot = await this.findClaudeMarketplaceRoot(pluginDir);
+        const marketplaceSource = this.getClaudeMarketplaceSource(plugin, marketplaceRoot, target.marketplacePath);
+        await fs.mkdir(target.marketplacePath, { recursive: true });
+        const existingManifest = await this.readClaudeMarketplaceManifest(target.marketplacePath);
+        const sourceManifest = marketplaceRoot
+            ? await this.readClaudeMarketplaceManifest(marketplaceRoot)
+            : null;
+        const mergedManifest = {
+            ...(sourceManifest || {}),
+            ...(existingManifest || {}),
+            name: target.namespace,
+        };
+        const mergedEntries = new Map();
+        for (const entry of existingManifest?.plugins || []) {
+            if (typeof entry.name === 'string' && entry.name) {
+                mergedEntries.set(entry.name, entry);
+            }
+        }
+        if (marketplaceRoot && sourceManifest) {
+            for (const entry of sourceManifest.plugins || []) {
+                if (typeof entry.name !== 'string' || !entry.name || typeof entry.source !== 'string' || !entry.source) {
+                    continue;
+                }
+                const sourcePluginDir = this.resolveMarketplaceSourcePath(marketplaceRoot, entry.source);
+                await this.copyClaudeMarketplacePlugin(sourcePluginDir, target.marketplacePath, entry.name);
+                mergedEntries.set(entry.name, {
+                    ...entry,
+                    source: `./plugins/${entry.name}`,
+                });
+            }
+        }
+        else {
+            await this.copyClaudeMarketplacePlugin(pluginDir, target.marketplacePath, plugin.name);
+            const pluginMetadata = await this.readClaudePluginMetadata(pluginDir);
+            mergedEntries.set(plugin.name, {
+                ...(mergedEntries.get(plugin.name) || {}),
+                name: plugin.name,
+                source: `./plugins/${plugin.name}`,
+                ...(plugin.description ? { description: plugin.description } : {}),
+                ...(plugin.version ? { version: plugin.version } : {}),
+                ...pluginMetadata,
+            });
+        }
+        mergedManifest.plugins = [...mergedEntries.values()]
+            .sort((left, right) => (left.name || '').localeCompare(right.name || ''));
+        await this.saveClaudeMarketplaceManifest(target.marketplacePath, mergedManifest);
+        return { source: marketplaceSource };
+    }
     async installNativeClaudePlugin(plugin, pluginDir, agents) {
         const installed = [];
         const skipped = [];
@@ -400,7 +578,10 @@ export class PluginManager {
         }
         warnings.push(`Claude Code-native plugin components detected (${featureLabel}); they will only work in Claude Code and install into ~/.claude/plugins.`);
         const claudeInstalled = await this.readClaudeInstalledPlugins();
-        const conflictingKey = Object.keys(claudeInstalled.plugins).find(key => key !== nativeTarget.pluginKey && key.startsWith(`${plugin.name}@`));
+        const legacyKeys = Object.keys(claudeInstalled.plugins).filter(key => key !== nativeTarget.pluginKey && key.startsWith(`${plugin.name}@agentinit-`));
+        const conflictingKey = Object.keys(claudeInstalled.plugins).find(key => key !== nativeTarget.pluginKey
+            && !legacyKeys.includes(key)
+            && key.startsWith(`${plugin.name}@`));
         if (conflictingKey) {
             skipped.push({
                 agent: 'claude',
@@ -412,6 +593,7 @@ export class PluginManager {
         await fs.rm(nativeTarget.installPath, { recursive: true, force: true }).catch(() => { });
         await fs.mkdir(dirname(nativeTarget.installPath), { recursive: true });
         await fs.cp(pluginDir, nativeTarget.installPath, { recursive: true, dereference: true });
+        const marketplace = await this.materializeClaudeMarketplace(plugin, pluginDir, nativeTarget);
         const now = new Date().toISOString();
         claudeInstalled.plugins[nativeTarget.pluginKey] = [{
                 scope: 'user',
@@ -420,13 +602,41 @@ export class PluginManager {
                 installedAt: now,
                 lastUpdated: now,
             }];
+        const legacyEntries = legacyKeys.flatMap(key => claudeInstalled.plugins[key] || []);
+        for (const legacyKey of legacyKeys) {
+            delete claudeInstalled.plugins[legacyKey];
+        }
         await this.saveClaudeInstalledPlugins(claudeInstalled);
         const claudeSettings = await this.readClaudeSettings();
         claudeSettings.enabledPlugins = {
             ...(claudeSettings.enabledPlugins || {}),
             [nativeTarget.pluginKey]: true,
         };
+        claudeSettings.extraKnownMarketplaces = {
+            ...(claudeSettings.extraKnownMarketplaces || {}),
+            [nativeTarget.namespace]: {
+                source: marketplace.source,
+            },
+        };
+        for (const legacyKey of legacyKeys) {
+            if (claudeSettings.enabledPlugins && legacyKey in claudeSettings.enabledPlugins) {
+                delete claudeSettings.enabledPlugins[legacyKey];
+            }
+        }
         await this.saveClaudeSettings(claudeSettings);
+        const knownMarketplaces = await this.readClaudeKnownMarketplaces();
+        knownMarketplaces[nativeTarget.namespace] = {
+            source: marketplace.source,
+            installLocation: nativeTarget.marketplacePath,
+            lastUpdated: now,
+        };
+        await this.saveClaudeKnownMarketplaces(knownMarketplaces);
+        for (const entry of legacyEntries) {
+            await fs.rm(entry.installPath, { recursive: true, force: true }).catch(() => { });
+        }
+        for (const legacyKey of legacyKeys) {
+            warnings.push(`Replaced legacy AgentInit Claude plugin install ${legacyKey} with ${nativeTarget.pluginKey}.`);
+        }
         installed.push({
             agent: 'claude',
             pluginKey: nativeTarget.pluginKey,
@@ -447,6 +657,9 @@ export class PluginManager {
         const claudeInstalled = await this.readClaudeInstalledPlugins();
         const entries = claudeInstalled.plugins[component.pluginKey] || [];
         const remainingEntries = entries.filter(entry => entry.installPath !== component.installPath);
+        const marketplaceNamespace = component.pluginKey.includes('@')
+            ? component.pluginKey.split('@').slice(1).join('@')
+            : '';
         if (remainingEntries.length > 0) {
             claudeInstalled.plugins[component.pluginKey] = remainingEntries;
         }
@@ -458,8 +671,34 @@ export class PluginManager {
         if (claudeSettings.enabledPlugins && component.pluginKey in claudeSettings.enabledPlugins) {
             const { [component.pluginKey]: _removed, ...remainingEnabledPlugins } = claudeSettings.enabledPlugins;
             claudeSettings.enabledPlugins = remainingEnabledPlugins;
-            await this.saveClaudeSettings(claudeSettings);
         }
+        const namespaceStillInstalled = marketplaceNamespace
+            ? Object.keys(claudeInstalled.plugins).some(pluginKey => pluginKey.endsWith(`@${marketplaceNamespace}`))
+            : false;
+        if (!namespaceStillInstalled && marketplaceNamespace) {
+            if (claudeSettings.extraKnownMarketplaces && marketplaceNamespace in claudeSettings.extraKnownMarketplaces) {
+                delete claudeSettings.extraKnownMarketplaces[marketplaceNamespace];
+            }
+            const knownMarketplaces = await this.readClaudeKnownMarketplaces();
+            if (marketplaceNamespace in knownMarketplaces) {
+                delete knownMarketplaces[marketplaceNamespace];
+                await this.saveClaudeKnownMarketplaces(knownMarketplaces);
+            }
+            await fs.rm(getClaudeMarketplaceInstallPath(marketplaceNamespace), { recursive: true, force: true }).catch(() => { });
+        }
+        else if (marketplaceNamespace) {
+            const pluginName = component.pluginKey.split('@')[0] || '';
+            const marketplacePath = getClaudeMarketplaceInstallPath(marketplaceNamespace);
+            const manifest = await this.readClaudeMarketplaceManifest(marketplacePath);
+            if (pluginName && manifest) {
+                manifest.plugins = (manifest.plugins || [])
+                    .filter(entry => entry.name !== pluginName);
+                const marketplacePluginPath = join(marketplacePath, 'plugins', pluginName);
+                await fs.rm(marketplacePluginPath, { recursive: true, force: true }).catch(() => { });
+                await this.saveClaudeMarketplaceManifest(marketplacePath, manifest);
+            }
+        }
+        await this.saveClaudeSettings(claudeSettings);
         await fs.rm(component.installPath, { recursive: true, force: true }).catch(() => { });
         return true;
     }
@@ -1000,10 +1239,17 @@ ${body.trim()}
                     warnings: plugin.warnings,
                 };
             }
+            const nativeClaudeTarget = await this.getClaudeNativeInstallTarget(plugin, plugin.resolvedPluginDir);
+            const portableSkillAgents = nativeClaudeTarget
+                ? this.getPortableSkillAgents(agents, projectPath, options.global)
+                : agents;
+            const portableMcpAgents = nativeClaudeTarget
+                ? agents.filter(agent => agent.id !== 'claude')
+                : agents;
             // 5. Install skills (deduplicated by shared directory)
-            const skillResult = await this.installPluginSkills(plugin, projectPath, agents, options);
+            const skillResult = await this.installPluginSkills(plugin, projectPath, portableSkillAgents, options);
             // 6. Apply MCP servers per agent
-            const mcpResult = await this.applyPluginMcpServers(plugin, projectPath, agents, options.global);
+            const mcpResult = await this.applyPluginMcpServers(plugin, projectPath, portableMcpAgents, options.global);
             // 7. Install agent-native plugin payloads when supported.
             const nativePluginResult = await this.installNativeClaudePlugin(plugin, plugin.resolvedPluginDir, agents);
             const installWarnings = [...plugin.warnings, ...nativePluginResult.warnings];
@@ -1077,6 +1323,25 @@ ${body.trim()}
         }
         return { installed, skipped };
     }
+    getPortableSkillAgents(agents, projectPath, global) {
+        const claudeAgent = agents.find(agent => agent.id === 'claude');
+        if (!claudeAgent || !claudeAgent.supportsSkills()) {
+            return agents;
+        }
+        const claudeSkillsDir = claudeAgent.getSkillsDir(projectPath, global);
+        if (!claudeSkillsDir) {
+            return agents.filter(agent => agent.id !== 'claude');
+        }
+        return agents.filter(agent => {
+            if (agent.id === 'claude') {
+                return false;
+            }
+            if (!agent.supportsSkills()) {
+                return true;
+            }
+            return agent.getSkillsDir(projectPath, global) !== claudeSkillsDir;
+        });
+    }
     /**
      * Apply MCP servers from a plugin to each target agent
      */