fix: prevent Claude marketplaces from leaking into project config

docs/how-to/create-marketplace.md

@@ -238,7 +238,7 @@ See [Working with Monorepos](./monorepo-marketplace.md) for details.
 Check access:
 
 ```bash
-git clone <repository-url>
+git clone {repository-url}
 ```
 
 ### "Permission denied"

docs/how-to/debug-plugins.md

@@ -50,7 +50,7 @@ aipm sync
 
    ```bash
    # For git marketplaces, clone and inspect
-   git clone <marketplace-url> /tmp/check-marketplace
+   git clone {marketplace-url} /tmp/check-marketplace
    cat /tmp/check-marketplace/marketplace.json
    ```
 
@@ -89,8 +89,9 @@ aipm sync
 4. **Check plugin files**:
 
    ```bash
-   # Files should exist in .cursor/marketplace/
-   ls -la .cursor/marketplace/my-marketplace/my-plugin/
+   # Files should exist in .cursor/{type}/aipm/
+   ls -la .cursor/commands/aipm/my-marketplace/my-plugin/
+   ls -la .cursor/rules/aipm/my-marketplace/my-plugin/
    ```
 
 5. **Restart Claude Code** (if using with Claude Code)
@@ -106,7 +107,7 @@ aipm sync
 1. **Test git access**:
 
    ```bash
-   git clone <repository-url> /tmp/test-clone
+   git clone {repository-url} /tmp/test-clone
    ```
 
 2. **Check SSH keys** (for SSH URLs):
@@ -125,7 +126,7 @@ aipm sync
 
 4. **Check branch exists**:
    ```bash
-   git ls-remote <repository-url>
+   git ls-remote {repository-url}
    ```
 
 ---
@@ -189,7 +190,7 @@ aipm sync
 
 3. **Check git repository is accessible**:
    ```bash
-   git ls-remote <repository-url>
+   git ls-remote {repository-url}
    ```
 
 ---
@@ -218,10 +219,10 @@ aipm sync
 3. **Don't use sudo**:
 
    ```bash
-   # ? Don't do this
+   # BAD - Don't do this
    sudo aipm install ...
 
-   # ? Do this
+   # GOOD - Do this
    aipm install ...
    ```
 
@@ -278,19 +279,17 @@ dir "%LOCALAPPDATA%\aipm\cache\my-marketplace"
 ### Check Synced Files
 
 ```bash
-# Project-level
-ls -la .cursor/marketplace/
+# Project-level (plugin files are split by type)
+ls -la .cursor/commands/aipm/
+ls -la .cursor/rules/aipm/
 
 # Check specific plugin files
-find .cursor/marketplace/ -name "*.md"
+find .cursor/*/aipm/ -name "*.md"
 ```
 
 ### Manual Validation
 
 ```bash
-# Check plugin.json is valid
-cat .cursor/marketplace/my-marketplace/my-plugin/.claude-plugin/plugin.json | jq .
-
 # Check marketplace.json is valid
 # Linux/macOS
 cat ~/.cache/aipm/my-marketplace/marketplace.json | jq .

docs/how-to/installation.md

@@ -114,7 +114,7 @@ cd aipm
 bun install
 
 # Run directly without building
-bun run src/cli.ts <command>
+bun run src/cli.ts {command}
 
 # Or use watch mode
 bun run dev

docs/reference/cli-commands.md

@@ -67,7 +67,7 @@ aipm init --global
 
 ### `sync`
 
-Sync all enabled plugins from marketplaces to `.cursor/marketplace/`.
+Sync all enabled plugins from marketplaces to `.cursor/` (commands, rules, agents, skills, hooks).
 
 **Usage**:
 
@@ -95,7 +95,7 @@ aipm sync --dry-run
 1. Loads configuration (three-way merge)
 2. For each enabled plugin:
    - Resolves marketplace path (clones/pulls git repos)
-   - Copies plugin files to `.cursor/marketplace/{marketplace}/{plugin}/`
+   - Copies plugin files to `.cursor/{type}/aipm/{marketplace}/{plugin}/` (where type is commands, rules, agents, skills, or hooks)
 3. Reports success/failures
 
 **Exit codes**:
@@ -528,11 +528,11 @@ aipm list
 **Example output**:
 
 ```
-? Marketplaces:
+Marketplaces:
   - team-plugins: git@github.com:acme/plugins.git
   - local: ./my-plugins
 
-? Installed Plugins:
+Installed Plugins:
   - code-reviewer@team-plugins (enabled, v1.2.0)
   - test-gen@local (disabled, v1.0.0)
 ```

src/commands/list.ts

@@ -34,7 +34,7 @@ export async function list(options: ListOptions = {}): Promise<void> {
     if (marketplaceCount > 0) {
       console.log('\n📦 Marketplaces:');
       for (const [name, marketplace] of Object.entries(config.marketplaces)) {
-        const isClaudeMarketplace = name.startsWith('claude:');
+        const isClaudeMarketplace = name.startsWith('claude/');
         const sourceLabel = isClaudeMarketplace ? '🤖 Claude Code (auto-discovered)' : marketplace.source;
 
         console.log(`  • ${name}`);

src/commands/plugin-disable.ts

@@ -1,7 +1,8 @@
+import merge from 'lodash.merge';
 import { z } from 'zod';
 import { getConfigPath, getNotInitializedMessage, loadPluginsConfig } from '../config/loader';
 import { FILE_AIPM_CONFIG, FILE_AIPM_CONFIG_LOCAL } from '../constants';
-import { saveConfig } from '../helpers/aipm-config';
+import { loadTargetConfig, saveConfig } from '../helpers/aipm-config';
 import { defaultIO } from '../helpers/io';
 
 const PluginDisableOptionsSchema = z.object({
@@ -37,23 +38,18 @@ export async function pluginDisable(options: unknown): Promise<void> {
       return;
     }
 
-    const updatedConfig = {
-      ...config,
-      plugins: {
-        ...config.plugins,
-        [cmd.pluginId]: {
-          ...config.plugins[cmd.pluginId],
-          enabled: false,
-        },
-      },
-    };
-
     if (cmd.dryRun) {
       defaultIO.logInfo(`[DRY RUN] Would disable plugin '${cmd.pluginId}' in ${configName}`);
-    } else {
-      await saveConfig(cwd, updatedConfig, cmd.local);
-      defaultIO.logSuccess(`Disabled plugin '${cmd.pluginId}' in ${configName}`);
+      return;
     }
+
+    const targetConfig = await loadTargetConfig(cwd, cmd.local);
+    const updatedConfig = merge({}, targetConfig, {
+      plugins: { [cmd.pluginId]: { enabled: false } },
+    });
+
+    await saveConfig(cwd, updatedConfig, cmd.local);
+    defaultIO.logSuccess(`Disabled plugin '${cmd.pluginId}' in ${configName}`);
   } catch (error: unknown) {
     const message = error instanceof Error ? error.message : String(error);
     defaultIO.logError(`Failed to disable plugin: ${message}`);

src/commands/plugin-enable.ts

@@ -1,7 +1,8 @@
+import merge from 'lodash.merge';
 import { z } from 'zod';
 import { getConfigPath, getNotInitializedMessage, loadPluginsConfig } from '../config/loader';
 import { FILE_AIPM_CONFIG, FILE_AIPM_CONFIG_LOCAL } from '../constants';
-import { saveConfig } from '../helpers/aipm-config';
+import { loadTargetConfig, saveConfig } from '../helpers/aipm-config';
 import { defaultIO } from '../helpers/io';
 
 const PluginEnableOptionsSchema = z.object({
@@ -27,24 +28,6 @@ export async function pluginEnable(options: unknown): Promise<void> {
 
     if (!config.plugins[cmd.pluginId]) {
       defaultIO.logInfo(`Plugin '${cmd.pluginId}' not found, adding it as enabled`);
-
-      const updatedConfig = {
-        ...config,
-        plugins: {
-          ...config.plugins,
-          [cmd.pluginId]: {
-            enabled: true,
-          },
-        },
-      };
-
-      if (cmd.dryRun) {
-        defaultIO.logInfo(`[DRY RUN] Would enable plugin '${cmd.pluginId}' in ${configName}`);
-      } else {
-        await saveConfig(cwd, updatedConfig, cmd.local);
-        defaultIO.logSuccess(`Enabled plugin '${cmd.pluginId}' in ${configName}`);
-      }
-      return;
     }
 
     const plugin = config.plugins[cmd.pluginId];
@@ -54,23 +37,18 @@ export async function pluginEnable(options: unknown): Promise<void> {
       return;
     }
 
-    const updatedConfig = {
-      ...config,
-      plugins: {
-        ...config.plugins,
-        [cmd.pluginId]: {
-          ...config.plugins[cmd.pluginId],
-          enabled: true,
-        },
-      },
-    };
-
     if (cmd.dryRun) {
       defaultIO.logInfo(`[DRY RUN] Would enable plugin '${cmd.pluginId}' in ${configName}`);
-    } else {
-      await saveConfig(cwd, updatedConfig, cmd.local);
-      defaultIO.logSuccess(`Enabled plugin '${cmd.pluginId}' in ${configName}`);
+      return;
     }
+
+    const targetConfig = await loadTargetConfig(cwd, cmd.local);
+    const updatedConfig = merge({}, targetConfig, {
+      plugins: { [cmd.pluginId]: { enabled: true } },
+    });
+
+    await saveConfig(cwd, updatedConfig, cmd.local);
+    defaultIO.logSuccess(`Enabled plugin '${cmd.pluginId}' in ${configName}`);
   } catch (error: unknown) {
     const message = error instanceof Error ? error.message : String(error);
     defaultIO.logError(`Failed to enable plugin: ${message}`);

src/commands/plugin-install.ts

@@ -1,8 +1,9 @@
+import merge from 'lodash.merge';
 import { join } from 'node:path';
 import { z } from 'zod';
 import { getConfigPath, getNotInitializedMessage, loadPluginsConfig } from '../config/loader';
 import { DIR_CURSOR, FILE_AIPM_CONFIG, FILE_AIPM_CONFIG_LOCAL } from '../constants';
-import { saveConfig } from '../helpers/aipm-config';
+import { loadTargetConfig, saveConfig } from '../helpers/aipm-config';
 import { fileExists } from '../helpers/fs';
 import { resolveMarketplacePath } from '../helpers/git';
 import { defaultIO } from '../helpers/io';
@@ -100,22 +101,17 @@ export async function pluginInstall(options: unknown): Promise<void> {
       return;
     }
 
-    const updatedConfig = {
-      ...config,
-      plugins: {
-        ...config.plugins,
-        [cmd.pluginId]: {
-          enabled: true,
-        },
-      },
-    };
-
     if (cmd.dryRun) {
       defaultIO.logInfo(`[DRY RUN] Would enable plugin '${cmd.pluginId}' in ${configName}`);
       defaultIO.logInfo(`[DRY RUN] Would sync ${cmd.pluginId} to .cursor/`);
       return;
     }
 
+    const targetConfig = await loadTargetConfig(cwd, cmd.local);
+    const updatedConfig = merge({}, targetConfig, {
+      plugins: { [cmd.pluginId]: { enabled: true } },
+    });
+
     await saveConfig(cwd, updatedConfig, cmd.local);
     defaultIO.logSuccess(`Enabled plugin '${cmd.pluginId}' in ${configName}`);
 

src/commands/plugin-uninstall.ts

@@ -2,8 +2,8 @@ import { rm } from 'node:fs/promises';
 import { join } from 'node:path';
 import { z } from 'zod';
 import { getConfigPath, getNotInitializedMessage, loadPluginsConfig } from '../config/loader';
-import { DIR_CURSOR, DIR_MARKETPLACE, FILE_AIPM_CONFIG, FILE_AIPM_CONFIG_LOCAL } from '../constants';
-import { saveConfig } from '../helpers/aipm-config';
+import { DIR_AIPM_NAMESPACE, DIR_CURSOR, FILE_AIPM_CONFIG, FILE_AIPM_CONFIG_LOCAL, PLUGIN_SUBDIRS } from '../constants';
+import { loadTargetConfig, saveConfig } from '../helpers/aipm-config';
 import { fileExists } from '../helpers/fs';
 import { defaultIO } from '../helpers/io';
 
@@ -29,38 +29,54 @@ export async function pluginUninstall(options: unknown): Promise<void> {
       throw error;
     }
     const configName = cmd.local ? getConfigPath(FILE_AIPM_CONFIG_LOCAL) : getConfigPath(FILE_AIPM_CONFIG);
+    const targetConfig = await loadTargetConfig(cwd, cmd.local);
 
-    if (!config.plugins[cmd.pluginId]) {
+    if (!targetConfig.plugins[cmd.pluginId]) {
+      if (config.plugins[cmd.pluginId]) {
+        const error = new Error(
+          `Plugin '${cmd.pluginId}' is not in ${configName} (exists in merged config from another source)`,
+        );
+        defaultIO.logError(error.message);
+        throw error;
+      }
       const error = new Error(`Plugin '${cmd.pluginId}' is not installed`);
       defaultIO.logError(error.message);
       throw error;
     }
 
-    const { [cmd.pluginId]: _removed, ...remainingPlugins } = config.plugins;
-
-    const updatedConfig = {
-      ...config,
-      plugins: remainingPlugins,
-    };
-
     if (cmd.dryRun) {
       defaultIO.logInfo(`[DRY RUN] Would remove plugin '${cmd.pluginId}' from ${configName}`);
       if (cmd.removeFiles) {
-        defaultIO.logInfo('[DRY RUN] Would delete files from .cursor/marketplace/');
+        defaultIO.logInfo('[DRY RUN] Would delete plugin files from .cursor/');
       }
     } else {
+      const { [cmd.pluginId]: _removed, ...remainingPlugins } = targetConfig.plugins;
+
+      const updatedConfig = {
+        ...targetConfig,
+        plugins: remainingPlugins,
+      };
+
       await saveConfig(cwd, updatedConfig, cmd.local);
       defaultIO.logSuccess(`Removed plugin '${cmd.pluginId}' from ${configName}`);
 
       if (cmd.removeFiles) {
         const [pluginName, marketplaceName] = cmd.pluginId.split('@');
 
         if (pluginName && marketplaceName) {
-          const installedPath = join(cwd, DIR_CURSOR, DIR_MARKETPLACE, marketplaceName, pluginName);
+          let deletedCount = 0;
+
+          for (const subdir of PLUGIN_SUBDIRS) {
+            const installedPath = join(cwd, DIR_CURSOR, subdir, DIR_AIPM_NAMESPACE, marketplaceName, pluginName);
+
+            if (await fileExists(installedPath)) {
+              await rm(installedPath, { recursive: true, force: true });
+              deletedCount++;
+            }
+          }
 
-          if (await fileExists(installedPath)) {
-            await rm(installedPath, { recursive: true, force: true });
-            defaultIO.logSuccess(`Deleted plugin files from .cursor/marketplace/${marketplaceName}/${pluginName}`);
+          if (deletedCount > 0) {
+            defaultIO.logSuccess(`Deleted plugin files from ${deletedCount} location(s) in .cursor/`);
           }
         }
       }