allagents 0.24.1 → 0.25.0-next.1

package/dist/index.js

@@ -11459,7 +11459,25 @@ function getPluginSource(plugin) {
 function getPluginClients(plugin) {
   return typeof plugin === "string" ? undefined : plugin.clients;
 }
-var RepositorySchema, WorkspaceFileSchema, WorkspaceSchema, PluginSourceSchema, ClientTypeSchema, PluginEntrySchema, VscodeConfigSchema, SyncModeSchema, WorkspaceConfigSchema;
+function getPluginInstallMode(plugin) {
+  return typeof plugin === "string" ? undefined : plugin.install;
+}
+function normalizeClientEntry(entry) {
+  if (typeof entry === "string") {
+    return { name: entry, install: "file" };
+  }
+  return { name: entry.name, install: entry.install ?? "file" };
+}
+function getClientTypes(entries) {
+  return entries.map((e) => typeof e === "string" ? e : e.name);
+}
+function resolveInstallMode(pluginEntry, clientEntry) {
+  const pluginMode = getPluginInstallMode(pluginEntry);
+  if (pluginMode)
+    return pluginMode;
+  return clientEntry.install;
+}
+var RepositorySchema, WorkspaceFileSchema, WorkspaceSchema, PluginSourceSchema, ClientTypeSchema, InstallModeSchema, ClientEntrySchema, PluginEntrySchema, VscodeConfigSchema, SyncModeSchema, WorkspaceConfigSchema;
 var init_workspace_config = __esm(() => {
   init_zod();
   RepositorySchema = exports_external.object({
@@ -11481,6 +11499,7 @@ var init_workspace_config = __esm(() => {
   });
   PluginSourceSchema = exports_external.string();
   ClientTypeSchema = exports_external.enum([
+    "universal",
     "claude",
     "copilot",
     "codex",
@@ -11503,14 +11522,22 @@ var init_workspace_config = __esm(() => {
     "openhands",
     "kiro",
     "replit",
-    "kimi",
-    "universal"
+    "kimi"
+  ]);
+  InstallModeSchema = exports_external.enum(["file", "native"]);
+  ClientEntrySchema = exports_external.union([
+    ClientTypeSchema,
+    exports_external.object({
+      name: ClientTypeSchema,
+      install: InstallModeSchema.default("file")
+    })
   ]);
   PluginEntrySchema = exports_external.union([
     PluginSourceSchema,
     exports_external.object({
       source: PluginSourceSchema,
-      clients: exports_external.array(ClientTypeSchema).optional()
+      clients: exports_external.array(ClientTypeSchema).optional(),
+      install: InstallModeSchema.optional()
     })
   ]);
   VscodeConfigSchema = exports_external.object({
@@ -11521,7 +11548,7 @@ var init_workspace_config = __esm(() => {
     workspace: WorkspaceSchema.optional(),
     repositories: exports_external.array(RepositorySchema),
     plugins: exports_external.array(PluginEntrySchema),
-    clients: exports_external.array(ClientTypeSchema),
+    clients: exports_external.array(ClientEntrySchema),
     vscode: VscodeConfigSchema.optional(),
     syncMode: SyncModeSchema.optional(),
     disabledSkills: exports_external.array(exports_external.string()).optional()
@@ -26411,16 +26438,14 @@ function findBySourceLocation(registry, sourceLocation) {
 }
 function parseMarketplaceSource(source) {
   if (source.startsWith("https://github.com/")) {
-    const match = source.match(/^https:\/\/github\.com\/([^/]+)\/([^/]+?)(?:\.git)?(?:\/tree\/(.+))?$/);
-    if (match) {
-      const [, owner, repo, branch] = match;
-      if (!repo)
-        return null;
-      const location = branch ? `${owner}/${repo}/${branch}` : `${owner}/${repo}`;
+    const parsed = parseGitHubUrl(source);
+    if (parsed) {
+      const branch = parsed.branch && parsed.subpath ? `${parsed.branch}/${parsed.subpath}` : parsed.branch;
+      const location = branch ? `${parsed.owner}/${parsed.repo}/${branch}` : `${parsed.owner}/${parsed.repo}`;
       return {
         type: "github",
         location,
-        name: repo,
+        name: parsed.repo,
         ...branch && { branch }
       };
     }
@@ -26564,7 +26589,7 @@ async function addMarketplace(source, customName, branch) {
     marketplace: entry
   };
 }
-async function removeMarketplace(name) {
+async function removeMarketplace(name, options2 = {}) {
   const registry = await loadRegistry();
   if (!registry.marketplaces[name]) {
     return {
@@ -26578,12 +26603,21 @@ async function removeMarketplace(name) {
   if (entry.source.type !== "local" && existsSync7(entry.path)) {
     await rm3(entry.path, { recursive: true, force: true });
   }
-  const { removeUserPluginsForMarketplace: removeUserPluginsForMarketplace2 } = await Promise.resolve().then(() => (init_user_workspace(), exports_user_workspace));
-  const removedUserPlugins = await removeUserPluginsForMarketplace2(name);
+  if (options2.cascade) {
+    const { removeUserPluginsForMarketplace: removeUserPluginsForMarketplace2 } = await Promise.resolve().then(() => (init_user_workspace(), exports_user_workspace));
+    const removedUserPlugins = await removeUserPluginsForMarketplace2(name);
+    return {
+      success: true,
+      marketplace: entry,
+      removedUserPlugins
+    };
+  }
+  const { getUserPluginsForMarketplace: getUserPluginsForMarketplace2 } = await Promise.resolve().then(() => (init_user_workspace(), exports_user_workspace));
+  const retainedUserPlugins = await getUserPluginsForMarketplace2(name);
   return {
     success: true,
     marketplace: entry,
-    removedUserPlugins
+    retainedUserPlugins
   };
 }
 async function listMarketplaces() {
@@ -26948,18 +26982,6 @@ async function ensureMarketplacesRegistered(plugins) {
   }
   return results;
 }
-async function getMarketplaceVersion(marketplacePath) {
-  if (!existsSync7(marketplacePath)) {
-    return null;
-  }
-  try {
-    const git = esm_default(marketplacePath);
-    const log = await git.log({ maxCount: 1, format: { hash: "%h" } });
-    return log.latest?.hash || null;
-  } catch {
-    return null;
-  }
-}
 var registeredSourceCache;
 var init_marketplace = __esm(() => {
   init_esm();
@@ -27508,7 +27530,8 @@ var init_sync_state = __esm(() => {
     version: exports_external.literal(1),
     lastSync: exports_external.string(),
     files: exports_external.record(ClientTypeSchema, exports_external.array(exports_external.string())),
-    mcpServers: exports_external.record(exports_external.string(), exports_external.array(exports_external.string())).optional()
+    mcpServers: exports_external.record(exports_external.string(), exports_external.array(exports_external.string())).optional(),
+    nativePlugins: exports_external.record(ClientTypeSchema, exports_external.array(exports_external.string())).optional()
   });
 });
 
@@ -27543,7 +27566,8 @@ async function saveSyncState(workspacePath, data) {
     version: 1,
     lastSync: new Date().toISOString(),
     files: normalizedData.files,
-    ...normalizedData.mcpServers && { mcpServers: normalizedData.mcpServers }
+    ...normalizedData.mcpServers && { mcpServers: normalizedData.mcpServers },
+    ...normalizedData.nativePlugins && { nativePlugins: normalizedData.nativePlugins }
   };
   await mkdir7(dirname5(statePath), { recursive: true });
   await writeFile6(statePath, JSON.stringify(state, null, 2), "utf-8");
@@ -27560,6 +27584,11 @@ function getPreviouslySyncedMcpServers(state, scope) {
   }
   return state.mcpServers[scope] ?? [];
 }
+function getPreviouslySyncedNativePlugins(state, client) {
+  if (!state?.nativePlugins)
+    return [];
+  return state.nativePlugins[client] ?? [];
+}
 var init_sync_state2 = __esm(() => {
   init_constants();
   init_sync_state();
@@ -27836,6 +27865,272 @@ var init_vscode_mcp = __esm(() => {
   import_json5 = __toESM(require_lib(), 1);
 });
 
+// src/core/native/types.ts
+import { spawn as spawn2 } from "node:child_process";
+function executeCommand(binary2, args, options2 = {}) {
+  return new Promise((resolve9) => {
+    const proc = spawn2(binary2, args, {
+      cwd: options2.cwd,
+      stdio: ["ignore", "pipe", "pipe"],
+      env: { ...process.env }
+    });
+    let stdout = "";
+    let stderr = "";
+    proc.stdout.on("data", (data) => {
+      stdout += data.toString();
+    });
+    proc.stderr.on("data", (data) => {
+      stderr += data.toString();
+    });
+    let resolved = false;
+    proc.on("close", (code) => {
+      if (resolved)
+        return;
+      resolved = true;
+      const trimmedStderr = stderr.trim();
+      resolve9({
+        success: code === 0,
+        output: stdout.trim(),
+        ...trimmedStderr && { error: trimmedStderr }
+      });
+    });
+    proc.on("error", (err) => {
+      if (resolved)
+        return;
+      resolved = true;
+      resolve9({
+        success: false,
+        output: "",
+        error: `Failed to execute ${binary2} CLI: ${err.message}`
+      });
+    });
+  });
+}
+function mergeNativeSyncResults(results) {
+  return results.reduce((acc, r) => ({
+    marketplacesAdded: [...acc.marketplacesAdded, ...r.marketplacesAdded],
+    pluginsInstalled: [...acc.pluginsInstalled, ...r.pluginsInstalled],
+    pluginsFailed: [...acc.pluginsFailed, ...r.pluginsFailed],
+    skipped: [...acc.skipped, ...r.skipped]
+  }), { marketplacesAdded: [], pluginsInstalled: [], pluginsFailed: [], skipped: [] });
+}
+var init_types2 = () => {};
+
+// src/core/native/claude.ts
+class ClaudeNativeClient {
+  async isAvailable() {
+    const result = await executeCommand("claude", ["--version"]);
+    return result.success;
+  }
+  supportsScope(_scope) {
+    return true;
+  }
+  toPluginSpec(allagentsSource) {
+    const atIndex = allagentsSource.lastIndexOf("@");
+    if (atIndex <= 0 || atIndex === allagentsSource.length - 1)
+      return null;
+    const pluginName = allagentsSource.slice(0, atIndex);
+    const marketplacePart = allagentsSource.slice(atIndex + 1);
+    if (marketplacePart.includes("/") && !marketplacePart.includes("://")) {
+      const parts = marketplacePart.split("/");
+      const repoName = parts[1];
+      if (!repoName)
+        return null;
+      return `${pluginName}@${repoName}`;
+    }
+    return allagentsSource;
+  }
+  extractMarketplaceSource(pluginSpec) {
+    const atIndex = pluginSpec.lastIndexOf("@");
+    if (atIndex <= 0 || atIndex === pluginSpec.length - 1)
+      return null;
+    const marketplacePart = pluginSpec.slice(atIndex + 1);
+    if (marketplacePart.includes("/") && !marketplacePart.includes("://")) {
+      return marketplacePart;
+    }
+    return null;
+  }
+  addMarketplace(source, options2) {
+    return executeCommand("claude", ["plugin", "marketplace", "add", source], options2);
+  }
+  installPlugin(spec, scope, options2) {
+    return executeCommand("claude", ["plugin", "install", spec, "--scope", scope], options2);
+  }
+  uninstallPlugin(spec, scope, options2) {
+    return executeCommand("claude", ["plugin", "uninstall", spec, "--scope", scope], options2);
+  }
+  async syncPlugins(plugins, scope = "project", options2 = {}) {
+    const result = {
+      marketplacesAdded: [],
+      pluginsInstalled: [],
+      pluginsFailed: [],
+      skipped: []
+    };
+    if (options2.dryRun) {
+      for (const plugin of plugins) {
+        const spec = this.toPluginSpec(plugin);
+        if (spec) {
+          result.pluginsInstalled.push(spec);
+        } else {
+          result.skipped.push(plugin);
+        }
+      }
+      return result;
+    }
+    const marketplaceSources = new Set;
+    for (const plugin of plugins) {
+      const source = this.extractMarketplaceSource(plugin);
+      if (source)
+        marketplaceSources.add(source);
+    }
+    for (const source of marketplaceSources) {
+      const addResult = await this.addMarketplace(source, options2);
+      if (addResult.success) {
+        result.marketplacesAdded.push(source);
+      }
+    }
+    for (const plugin of plugins) {
+      const spec = this.toPluginSpec(plugin);
+      if (!spec) {
+        result.skipped.push(plugin);
+        continue;
+      }
+      const installResult = await this.installPlugin(spec, scope, options2);
+      if (installResult.success) {
+        result.pluginsInstalled.push(spec);
+      } else {
+        result.pluginsFailed.push({
+          plugin: spec,
+          error: installResult.error ?? "Unknown error"
+        });
+      }
+    }
+    return result;
+  }
+}
+var init_claude = __esm(() => {
+  init_types2();
+});
+
+// src/core/native/copilot.ts
+class CopilotNativeClient {
+  async isAvailable() {
+    const result = await executeCommand("copilot", ["--version"]);
+    return result.success;
+  }
+  supportsScope(scope) {
+    return scope === "user";
+  }
+  toPluginSpec(allagentsSource) {
+    const atIndex = allagentsSource.lastIndexOf("@");
+    if (atIndex <= 0 || atIndex === allagentsSource.length - 1)
+      return null;
+    const marketplacePart = allagentsSource.slice(atIndex + 1);
+    if (marketplacePart.includes("://"))
+      return null;
+    if (marketplacePart.includes("/")) {
+      const parts = marketplacePart.split("/");
+      if (!parts[1])
+        return null;
+    }
+    return allagentsSource;
+  }
+  extractMarketplaceSource(pluginSpec) {
+    const atIndex = pluginSpec.lastIndexOf("@");
+    if (atIndex <= 0 || atIndex === pluginSpec.length - 1)
+      return null;
+    const marketplacePart = pluginSpec.slice(atIndex + 1);
+    if (marketplacePart.includes("/") && !marketplacePart.includes("://")) {
+      return marketplacePart;
+    }
+    return null;
+  }
+  addMarketplace(source, options2) {
+    return executeCommand("copilot", ["plugin", "marketplace", "add", source], options2);
+  }
+  installPlugin(spec, _scope, options2) {
+    return executeCommand("copilot", ["plugin", "install", spec], options2);
+  }
+  uninstallPlugin(spec, _scope, options2) {
+    return executeCommand("copilot", ["plugin", "uninstall", spec], options2);
+  }
+  async syncPlugins(plugins, scope = "user", options2 = {}) {
+    const result = {
+      marketplacesAdded: [],
+      pluginsInstalled: [],
+      pluginsFailed: [],
+      skipped: []
+    };
+    if (options2.dryRun) {
+      for (const plugin of plugins) {
+        const spec = this.toPluginSpec(plugin);
+        if (spec) {
+          result.pluginsInstalled.push(spec);
+        } else {
+          result.skipped.push(plugin);
+        }
+      }
+      return result;
+    }
+    const marketplaceSources = new Set;
+    for (const plugin of plugins) {
+      const source = this.extractMarketplaceSource(plugin);
+      if (source)
+        marketplaceSources.add(source);
+    }
+    for (const source of marketplaceSources) {
+      const addResult = await this.addMarketplace(source, options2);
+      if (addResult.success) {
+        result.marketplacesAdded.push(source);
+      }
+    }
+    for (const plugin of plugins) {
+      const spec = this.toPluginSpec(plugin);
+      if (!spec) {
+        result.skipped.push(plugin);
+        continue;
+      }
+      const installResult = await this.installPlugin(spec, scope, options2);
+      if (installResult.success) {
+        result.pluginsInstalled.push(spec);
+      } else {
+        result.pluginsFailed.push({
+          plugin: spec,
+          error: installResult.error ?? "Unknown error"
+        });
+      }
+    }
+    return result;
+  }
+}
+var init_copilot = __esm(() => {
+  init_types2();
+});
+
+// src/core/native/registry.ts
+function getNativeClient(client) {
+  switch (client) {
+    case "claude":
+      return new ClaudeNativeClient;
+    case "copilot":
+      return new CopilotNativeClient;
+    default:
+      return null;
+  }
+}
+var init_registry = __esm(() => {
+  init_claude();
+  init_copilot();
+});
+
+// src/core/native/index.ts
+var init_native = __esm(() => {
+  init_types2();
+  init_claude();
+  init_copilot();
+  init_registry();
+});
+
 // src/core/sync.ts
 import { existsSync as existsSync12, readFileSync as readFileSync2, writeFileSync as writeFileSync2, lstatSync } from "node:fs";
 import { rm as rm4, unlink as unlink2, rmdir, copyFile } from "node:fs/promises";
@@ -27864,6 +28159,12 @@ function mergeSyncResults(a, b) {
   const warnings = [...a.warnings || [], ...b.warnings || []];
   const purgedPaths = [...a.purgedPaths || [], ...b.purgedPaths || []];
   const mcpResult = a.mcpResult ?? b.mcpResult;
+  const nativeResult = a.nativeResult && b.nativeResult ? {
+    marketplacesAdded: [...a.nativeResult.marketplacesAdded, ...b.nativeResult.marketplacesAdded],
+    pluginsInstalled: [...a.nativeResult.pluginsInstalled, ...b.nativeResult.pluginsInstalled],
+    pluginsFailed: [...a.nativeResult.pluginsFailed, ...b.nativeResult.pluginsFailed],
+    skipped: [...a.nativeResult.skipped, ...b.nativeResult.skipped]
+  } : a.nativeResult ?? b.nativeResult;
   return {
     success: a.success && b.success,
     pluginResults: [...a.pluginResults, ...b.pluginResults],
@@ -27873,11 +28174,13 @@ function mergeSyncResults(a, b) {
     totalGenerated: a.totalGenerated + b.totalGenerated,
     ...warnings.length > 0 && { warnings },
     ...purgedPaths.length > 0 && { purgedPaths },
-    ...mcpResult && { mcpResult }
+    ...mcpResult && { mcpResult },
+    ...nativeResult && { nativeResult }
   };
 }
-function collectSyncClients(workspaceClients, plans) {
-  return [...new Set([...workspaceClients, ...plans.flatMap((plan) => plan.clients)])];
+function collectSyncClients(clientEntries, plans) {
+  const workspaceClientTypes = getClientTypes(clientEntries);
+  return [...new Set([...workspaceClientTypes, ...plans.flatMap((plan) => [...plan.clients, ...plan.nativeClients])])];
 }
 async function selectivePurgeWorkspace(workspacePath, state, clients, options2) {
   if (!state) {
@@ -28091,6 +28394,7 @@ async function validatePlugin(pluginSource, workspacePath, offline) {
         resolved: "",
         success: false,
         clients: [],
+        nativeClients: [],
         error: resolved.error || "Unknown error"
       };
     }
@@ -28099,6 +28403,7 @@ async function validatePlugin(pluginSource, workspacePath, offline) {
       resolved: resolved.path ?? "",
       success: true,
       clients: [],
+      nativeClients: [],
       ...resolved.pluginName && { pluginName: resolved.pluginName }
     };
   }
@@ -28114,6 +28419,7 @@ async function validatePlugin(pluginSource, workspacePath, offline) {
         resolved: "",
         success: false,
         clients: [],
+        nativeClients: [],
         ...fetchResult.error && { error: fetchResult.error }
       };
     }
@@ -28122,7 +28428,8 @@ async function validatePlugin(pluginSource, workspacePath, offline) {
       plugin: pluginSource,
       resolved: resolvedPath2,
       success: true,
-      clients: []
+      clients: [],
+      nativeClients: []
     };
   }
   const resolvedPath = resolve9(workspacePath, pluginSource);
@@ -28132,6 +28439,7 @@ async function validatePlugin(pluginSource, workspacePath, offline) {
       resolved: resolvedPath,
       success: false,
       clients: [],
+      nativeClients: [],
       error: `Plugin not found at ${resolvedPath}`
     };
   }
@@ -28139,22 +28447,43 @@ async function validatePlugin(pluginSource, workspacePath, offline) {
     plugin: pluginSource,
     resolved: resolvedPath,
     success: true,
-    clients: []
+    clients: [],
+    nativeClients: []
   };
 }
-function buildPluginSyncPlans(plugins, workspaceClients, selectedClients) {
+function buildPluginSyncPlans(plugins, clientEntries, scope, selectedClients) {
+  const warnings = [];
   const selected = selectedClients ? new Set(selectedClients) : null;
-  return plugins.map((plugin) => {
+  const workspaceClientTypes = getClientTypes(clientEntries);
+  const plans = plugins.map((plugin) => {
     const source = getPluginSource(plugin);
-    const configuredClients = getPluginClients(plugin) ?? workspaceClients;
-    const clients = selected ? configuredClients.filter((client) => selected.has(client)) : configuredClients;
-    return { source, clients };
+    const pluginClientTypes = getPluginClients(plugin) ?? workspaceClientTypes;
+    const effectiveClients = selected ? pluginClientTypes.filter((c) => selected.has(c)) : pluginClientTypes;
+    const fileClients = [];
+    const nativeClients = [];
+    for (const client of effectiveClients) {
+      const clientEntry = normalizeClientEntry(clientEntries.find((e) => (typeof e === "string" ? e : e.name) === client) ?? client);
+      const mode = resolveInstallMode(plugin, clientEntry);
+      const nativeClient = mode === "native" ? getNativeClient(client) : null;
+      if (nativeClient && nativeClient.toPluginSpec(source) !== null) {
+        if (nativeClient.supportsScope(scope)) {
+          nativeClients.push(client);
+        } else {
+          fileClients.push(client);
+          warnings.push(`${client} native install only supports user scope, falling back to file copy`);
+        }
+      } else {
+        fileClients.push(client);
+      }
+    }
+    return { source, clients: fileClients, nativeClients };
   });
+  return { plans, warnings };
 }
 async function validateAllPlugins(plans, workspacePath, offline) {
-  return Promise.all(plans.map(async ({ source, clients }) => {
+  return Promise.all(plans.map(async ({ source, clients, nativeClients }) => {
     const validated = await validatePlugin(source, workspacePath, offline);
-    return { ...validated, clients };
+    return { ...validated, clients, nativeClients };
   }));
 }
 async function copyValidatedPlugin(validatedPlugin, workspacePath, clients, dryRun, skillNameMap, clientMappings, syncMode = "symlink") {
@@ -28296,9 +28625,13 @@ async function syncWorkspace(workspacePath = process.cwd(), options2 = {}) {
     };
   }
   const hasRepositories = (config.repositories?.length ?? 0) > 0;
-  const workspaceClients = options2.clients ? config.clients.filter((c) => options2.clients?.includes(c)) : config.clients;
+  const configClientTypes = getClientTypes(config.clients);
+  const workspaceClients = options2.clients ? config.clients.filter((c) => {
+    const name = typeof c === "string" ? c : c.name;
+    return options2.clients?.includes(name);
+  }) : config.clients;
   if (options2.clients) {
-    const availableClients = new Set(config.clients);
+    const availableClients = new Set(configClientTypes);
     for (const plugin of config.plugins) {
       for (const client of getPluginClients(plugin) ?? []) {
         availableClients.add(client);
@@ -28319,10 +28652,11 @@ async function syncWorkspace(workspacePath = process.cwd(), options2 = {}) {
     }
   }
   const selectedClients = options2.clients;
-  const pluginPlans = buildPluginSyncPlans(config.plugins, config.clients, selectedClients).filter((plan) => plan.clients.length > 0);
-  const syncClients = collectSyncClients(workspaceClients, pluginPlans);
-  await ensureMarketplacesRegistered(pluginPlans.map((plan) => plan.source));
-  const validatedPlugins = await validateAllPlugins(pluginPlans, workspacePath, offline);
+  const { plans: pluginPlans, warnings: planWarnings } = buildPluginSyncPlans(config.plugins, config.clients, "project", selectedClients);
+  const filteredPlans = pluginPlans.filter((plan) => plan.clients.length > 0 || plan.nativeClients.length > 0);
+  const syncClients = collectSyncClients(workspaceClients, filteredPlans);
+  await ensureMarketplacesRegistered(filteredPlans.map((plan) => plan.source));
+  const validatedPlugins = await validateAllPlugins(filteredPlans, workspacePath, offline);
   let validatedWorkspaceSource = null;
   if (config.workspace?.source) {
     const sourceBasePath = workspaceSourceBase ?? workspacePath;
@@ -28341,8 +28675,11 @@ async function syncWorkspace(workspacePath = process.cwd(), options2 = {}) {
   }
   const failedValidations = validatedPlugins.filter((v) => !v.success);
   const validPlugins = validatedPlugins.filter((v) => v.success);
-  const warnings = failedValidations.map((v) => `${v.plugin}: ${v.error} (skipped)`);
-  if (validPlugins.length === 0 && pluginPlans.length > 0) {
+  const warnings = [
+    ...planWarnings,
+    ...failedValidations.map((v) => `${v.plugin}: ${v.error} (skipped)`)
+  ];
+  if (validPlugins.length === 0 && filteredPlans.length > 0) {
     return {
       success: false,
       pluginResults: [],
@@ -28374,6 +28711,67 @@ ${failedValidations.map((v) => `  - ${v.plugin}: ${v.error}`).join(`
     const skillNameMap = pluginSkillMaps.get(validatedPlugin.resolved);
     return copyValidatedPlugin(validatedPlugin, workspacePath, validatedPlugin.clients, dryRun, skillNameMap, undefined, syncMode);
   }));
+  let nativeResult;
+  const nativePluginsByClient = new Map;
+  for (const vp of validPlugins) {
+    for (const client of vp.nativeClients) {
+      const existing = nativePluginsByClient.get(client) ?? [];
+      existing.push(vp.plugin);
+      nativePluginsByClient.set(client, existing);
+    }
+  }
+  const previousNativeClients = previousState?.nativePlugins ? Object.keys(previousState.nativePlugins).filter((c) => (previousState.nativePlugins?.[c]?.length ?? 0) > 0) : [];
+  const hasNativeWork = nativePluginsByClient.size > 0 || previousNativeClients.length > 0;
+  if (hasNativeWork && !dryRun) {
+    const allClients = new Set([...nativePluginsByClient.keys(), ...previousNativeClients]);
+    const perClientResults = [];
+    for (const clientType of allClients) {
+      const nativeClient = getNativeClient(clientType);
+      if (!nativeClient) {
+        const sources = nativePluginsByClient.get(clientType);
+        if (sources && sources.length > 0) {
+          warnings.push(`Native install: no native client for ${clientType}, skipping`);
+        }
+        continue;
+      }
+      const cliAvailable = await nativeClient.isAvailable();
+      if (!cliAvailable) {
+        const sources = nativePluginsByClient.get(clientType);
+        if (sources && sources.length > 0) {
+          warnings.push(`Native install: ${clientType} CLI not found, skipping native plugin installation`);
+        }
+        continue;
+      }
+      const currentSources = nativePluginsByClient.get(clientType) ?? [];
+      const currentSpecs = currentSources.map((s) => nativeClient.toPluginSpec(s)).filter((s) => s !== null);
+      const previousPlugins = getPreviouslySyncedNativePlugins(previousState, clientType);
+      const removed = previousPlugins.filter((p) => !currentSpecs.includes(p));
+      for (const plugin of removed) {
+        try {
+          await nativeClient.uninstallPlugin(plugin, "project", { cwd: workspacePath });
+        } catch (err) {
+          warnings.push(`Native uninstall failed for ${plugin}: ${err instanceof Error ? err.message : String(err)}`);
+        }
+      }
+      if (currentSources.length > 0) {
+        perClientResults.push(await nativeClient.syncPlugins(currentSources, "project", { cwd: workspacePath }));
+      }
+    }
+    if (perClientResults.length > 0) {
+      nativeResult = mergeNativeSyncResults(perClientResults);
+    }
+  } else if (nativePluginsByClient.size > 0 && dryRun) {
+    const perClientResults = [];
+    for (const [clientType, sources] of nativePluginsByClient) {
+      const nativeClient = getNativeClient(clientType);
+      if (nativeClient && sources.length > 0) {
+        perClientResults.push(await nativeClient.syncPlugins(sources, "project", { cwd: workspacePath, dryRun: true }));
+      }
+    }
+    if (perClientResults.length > 0) {
+      nativeResult = mergeNativeSyncResults(perClientResults);
+    }
+  }
   let workspaceFileResults = [];
   if (config.workspace) {
     const sourcePath = validatedWorkspaceSource?.resolved;
@@ -28484,7 +28882,28 @@ ${fileValidationErrors.map((e) => `  - ${e}`).join(`
         }
       }
     }
-    await saveSyncState(workspacePath, syncedFiles);
+    const nativePluginsState = {};
+    const installedSet = new Set(nativeResult?.pluginsInstalled ?? []);
+    for (const [client, sources] of nativePluginsByClient) {
+      const nativeClient = getNativeClient(client);
+      if (!nativeClient)
+        continue;
+      const clientSpecs = sources.map((s) => nativeClient.toPluginSpec(s)).filter((s) => s !== null && installedSet.has(s));
+      if (clientSpecs.length > 0) {
+        nativePluginsState[client] = clientSpecs;
+      }
+    }
+    if (options2.clients && previousState?.nativePlugins) {
+      for (const [client, plugins] of Object.entries(previousState.nativePlugins)) {
+        if (!syncClients.includes(client)) {
+          nativePluginsState[client] = plugins;
+        }
+      }
+    }
+    await saveSyncState(workspacePath, {
+      files: syncedFiles,
+      ...Object.keys(nativePluginsState).length > 0 && { nativePlugins: nativePluginsState }
+    });
   }
   return {
     success: !hasFailures,
@@ -28494,7 +28913,8 @@ ${fileValidationErrors.map((e) => `  - ${e}`).join(`
     totalSkipped,
     totalGenerated,
     purgedPaths,
-    ...warnings.length > 0 && { warnings }
+    ...warnings.length > 0 && { warnings },
+    ...nativeResult && { nativeResult }
   };
 }
 async function syncUserWorkspace(options2 = {}) {
@@ -28512,13 +28932,17 @@ async function syncUserWorkspace(options2 = {}) {
   }
   const workspaceClients = config.clients;
   const { offline = false, dryRun = false, force = false } = options2;
-  const pluginPlans = buildPluginSyncPlans(config.plugins, workspaceClients).filter((plan) => plan.clients.length > 0);
+  const { plans: allPluginPlans, warnings: planWarnings } = buildPluginSyncPlans(config.plugins, workspaceClients, "user");
+  const pluginPlans = allPluginPlans.filter((plan) => plan.clients.length > 0 || plan.nativeClients.length > 0);
   const syncClients = collectSyncClients(workspaceClients, pluginPlans);
   await ensureMarketplacesRegistered(pluginPlans.map((plan) => plan.source));
   const validatedPlugins = await validateAllPlugins(pluginPlans, homeDir, offline);
   const failedValidations = validatedPlugins.filter((v) => !v.success);
   const validPlugins = validatedPlugins.filter((v) => v.success);
-  const warnings = failedValidations.map((v) => `${v.plugin}: ${v.error} (skipped)`);
+  const warnings = [
+    ...planWarnings,
+    ...failedValidations.map((v) => `${v.plugin}: ${v.error} (skipped)`)
+  ];
   if (validPlugins.length === 0 && pluginPlans.length > 0) {
     return {
       success: false,
@@ -28575,12 +28999,85 @@ ${failedValidations.map((v) => `  - ${v.plugin}: ${v.error}`).join(`
       warnings.push(...mcpResult.warnings);
     }
   }
+  let nativeResult;
+  const nativePluginsByClient = new Map;
+  for (const vp of validPlugins) {
+    for (const client of vp.nativeClients) {
+      const existing = nativePluginsByClient.get(client) ?? [];
+      existing.push(vp.plugin);
+      nativePluginsByClient.set(client, existing);
+    }
+  }
+  const previousNativeClients = previousState?.nativePlugins ? Object.keys(previousState.nativePlugins).filter((c) => (previousState.nativePlugins?.[c]?.length ?? 0) > 0) : [];
+  const hasNativeWork = nativePluginsByClient.size > 0 || previousNativeClients.length > 0;
+  if (hasNativeWork && !dryRun) {
+    const allClients = new Set([...nativePluginsByClient.keys(), ...previousNativeClients]);
+    const perClientResults = [];
+    for (const clientType of allClients) {
+      const nativeClient = getNativeClient(clientType);
+      if (!nativeClient) {
+        const sources = nativePluginsByClient.get(clientType);
+        if (sources && sources.length > 0) {
+          warnings.push(`Native install: no native client for ${clientType}, skipping`);
+        }
+        continue;
+      }
+      const cliAvailable = await nativeClient.isAvailable();
+      if (!cliAvailable) {
+        const sources = nativePluginsByClient.get(clientType);
+        if (sources && sources.length > 0) {
+          warnings.push(`Native install: ${clientType} CLI not found, skipping native plugin installation`);
+        }
+        continue;
+      }
+      const currentSources = nativePluginsByClient.get(clientType) ?? [];
+      const currentSpecs = currentSources.map((s) => nativeClient.toPluginSpec(s)).filter((s) => s !== null);
+      const previousPlugins = getPreviouslySyncedNativePlugins(previousState, clientType);
+      const removed = previousPlugins.filter((p) => !currentSpecs.includes(p));
+      for (const plugin of removed) {
+        try {
+          await nativeClient.uninstallPlugin(plugin, "user");
+        } catch (err) {
+          warnings.push(`Native uninstall failed for ${plugin}: ${err instanceof Error ? err.message : String(err)}`);
+        }
+      }
+      if (currentSources.length > 0) {
+        perClientResults.push(await nativeClient.syncPlugins(currentSources, "user"));
+      }
+    }
+    if (perClientResults.length > 0) {
+      nativeResult = mergeNativeSyncResults(perClientResults);
+    }
+  } else if (nativePluginsByClient.size > 0 && dryRun) {
+    const perClientResults = [];
+    for (const [clientType, sources] of nativePluginsByClient) {
+      const nativeClient = getNativeClient(clientType);
+      if (nativeClient && sources.length > 0) {
+        perClientResults.push(await nativeClient.syncPlugins(sources, "user", { dryRun: true }));
+      }
+    }
+    if (perClientResults.length > 0) {
+      nativeResult = mergeNativeSyncResults(perClientResults);
+    }
+  }
   if (!dryRun) {
     const allCopyResults = pluginResults.flatMap((r) => r.copyResults);
     const syncedFiles = collectSyncedPaths(allCopyResults, homeDir, syncClients, USER_CLIENT_MAPPINGS);
+    const nativePluginsState = {};
+    const installedSet = new Set(nativeResult?.pluginsInstalled ?? []);
+    for (const [client, sources] of nativePluginsByClient) {
+      const nativeClient = getNativeClient(client);
+      if (!nativeClient)
+        continue;
+      const clientSpecs = sources.map((s) => nativeClient.toPluginSpec(s)).filter((s) => s !== null && installedSet.has(s));
+      if (clientSpecs.length > 0) {
+        nativePluginsState[client] = clientSpecs;
+      }
+    }
     await saveSyncState(homeDir, {
       files: syncedFiles,
-      ...mcpResult && { mcpServers: { vscode: mcpResult.trackedServers } }
+      ...mcpResult && { mcpServers: { vscode: mcpResult.trackedServers } },
+      ...Object.keys(nativePluginsState).length > 0 && { nativePlugins: nativePluginsState }
     });
   }
   return {
@@ -28591,7 +29088,8 @@ ${failedValidations.map((v) => `  - ${v.plugin}: ${v.error}`).join(`
     totalSkipped,
     totalGenerated,
     ...warnings.length > 0 && { warnings },
-    ...mcpResult && { mcpResult }
+    ...mcpResult && { mcpResult },
+    ...nativeResult && { nativeResult }
   };
 }
 var import_json52, VSCODE_TEMPLATE_FILE = "template.code-workspace";
@@ -28610,6 +29108,7 @@ var init_sync = __esm(() => {
   init_user_workspace();
   init_vscode_workspace();
   init_vscode_mcp();
+  init_native();
   import_json52 = __toESM(require_lib(), 1);
 });
 
@@ -28973,7 +29472,7 @@ async function getWorkspaceStatus(workspacePath = process.cwd()) {
       success: true,
       plugins,
       userPlugins,
-      clients: config.clients
+      clients: getClientTypes(config.clients)
     };
   } catch (error) {
     return {
@@ -29068,6 +29567,22 @@ function formatMcpResult(mcpResult) {
   }
   return lines;
 }
+function formatNativeResult(nativeResult) {
+  const lines = [];
+  if (nativeResult.marketplacesAdded.length > 0) {
+    lines.push(`Marketplaces registered: ${nativeResult.marketplacesAdded.join(", ")}`);
+  }
+  for (const plugin of nativeResult.pluginsInstalled) {
+    lines.push(`  + ${plugin} (installed via native CLI)`);
+  }
+  for (const { plugin, error } of nativeResult.pluginsFailed) {
+    lines.push(`  ✗ ${plugin}: ${error}`);
+  }
+  for (const plugin of nativeResult.skipped) {
+    lines.push(`  ⊘ ${plugin} (skipped — not a marketplace plugin)`);
+  }
+  return lines;
+}
 function buildSyncData(result) {
   return {
     copied: result.totalCopied,
@@ -29096,6 +29611,14 @@ function buildSyncData(result) {
         removedServers: result.mcpResult.removedServers,
         ...result.mcpResult.configPath && { configPath: result.mcpResult.configPath }
       }
+    },
+    ...result.nativeResult && {
+      nativePlugins: {
+        installed: result.nativeResult.pluginsInstalled,
+        failed: result.nativeResult.pluginsFailed,
+        skipped: result.nativeResult.skipped,
+        marketplacesAdded: result.nativeResult.marketplacesAdded
+      }
     }
   };
 }
@@ -29607,7 +30130,7 @@ var require_cross_spawn = __commonJS((exports, module) => {
   var cp2 = __require("child_process");
   var parse2 = require_parse5();
   var enoent = require_enoent();
-  function spawn2(command4, args, options2) {
+  function spawn3(command4, args, options2) {
     const parsed = parse2(command4, args, options2);
     const spawned = cp2.spawn(parsed.command, parsed.args, parsed.options);
     enoent.hookChildProcess(spawned, parsed);
@@ -29619,8 +30142,8 @@ var require_cross_spawn = __commonJS((exports, module) => {
     result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
     return result;
   }
-  module.exports = spawn2;
-  module.exports.spawn = spawn2;
+  module.exports = spawn3;
+  module.exports.spawn = spawn3;
   module.exports.sync = spawnSync;
   module.exports._parse = parse2;
   module.exports._enoent = enoent;
@@ -29668,7 +30191,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "allagents",
-    version: "0.24.1",
+    version: "0.25.0-next.1",
     description: "CLI tool for managing multi-repo AI agent workspaces with plugin synchronization",
     type: "module",
     bin: {
@@ -29694,6 +30217,7 @@ var init_package = __esm(() => {
       "check:fix": "biome check --write src",
       prepare: "bun run build && (test -d .git && bunx prek install -t pre-push || true)",
       release: "bun run scripts/release.ts",
+      "release:next": "bun run scripts/release.ts next",
       "publish:next": "bun run build && bun publish --tag next"
     },
     keywords: [
@@ -29740,7 +30264,7 @@ var init_package = __esm(() => {
 // src/cli/update-check.ts
 import { readFile as readFile14 } from "node:fs/promises";
 import { join as join23 } from "node:path";
-import { spawn as spawn2 } from "node:child_process";
+import { spawn as spawn3 } from "node:child_process";
 async function getCachedUpdateInfo(path3) {
   const filePath = path3 ?? join23(getHomeDir(), CONFIG_DIR, CACHE_FILE);
   try {
@@ -29804,7 +30328,7 @@ function backgroundUpdateCheck() {
     }).on('error', () => process.exit()).on('timeout', function() { this.destroy(); process.exit(); });
   `;
   try {
-    const child = spawn2(process.execPath, ["-e", script], {
+    const child = spawn3(process.execPath, ["-e", script], {
       detached: true,
       stdio: "ignore",
       windowsHide: true
@@ -31704,6 +32228,9 @@ async function runSync(context) {
         const lines = result.pluginResults.map((pr) => `${pr.success ? "✓" : "✗"} ${pr.plugin}`);
         lines.push("");
         lines.push(`Copied: ${result.totalCopied}  Failed: ${result.totalFailed}  Skipped: ${result.totalSkipped}`);
+        if (result.nativeResult) {
+          lines.push(...formatNativeResult(result.nativeResult));
+        }
         kt2(lines.join(`
 `), "Project Sync");
       }
@@ -31721,6 +32248,9 @@ async function runSync(context) {
         if (userResult.mcpResult) {
           lines.push(...formatMcpResult(userResult.mcpResult));
         }
+        if (userResult.nativeResult) {
+          lines.push(...formatNativeResult(userResult.nativeResult));
+        }
         kt2(lines.join(`
 `), "User Sync");
       }
@@ -32309,10 +32839,29 @@ async function runMarketplaceDetail(marketplaceName, context, cache2) {
       if (Ct(confirmed) || !confirmed) {
         continue;
       }
+      const linkedPlugins = await getUserPluginsForMarketplace(marketplaceName);
+      let cascade = false;
+      if (linkedPlugins.length > 0) {
+        const pluginAction = await select({
+          message: `${linkedPlugins.length} plugin(s) still reference this marketplace:
+${linkedPlugins.map((pl) => `  - ${pl}`).join(`
+`)}
+
+What would you like to do with them?`,
+          options: [
+            { value: "keep", label: "Keep plugins (can be removed later)" },
+            { value: "remove", label: "Remove plugins from config" }
+          ]
+        });
+        if (Ct(pluginAction)) {
+          continue;
+        }
+        cascade = pluginAction === "remove";
+      }
       try {
         const s = Ie();
         s.start("Removing marketplace...");
-        const result = await removeMarketplace(marketplaceName);
+        const result = await removeMarketplace(marketplaceName, { cascade });
         s.stop(result.success ? "Marketplace removed" : "Failed to remove marketplace");
         if (!result.success) {
           kt2(result.error ?? "Unknown error", "Error");
@@ -32452,7 +33001,7 @@ async function runManageClients(context, cache2) {
       currentClients = status.clients ?? [];
     } else {
       const userConfig = await getUserWorkspaceConfig();
-      currentClients = userConfig?.clients ?? [];
+      currentClients = userConfig?.clients ? getClientTypes(userConfig.clients) : [];
     }
     const allClients = ClientTypeSchema.options;
     const selectedClients = await multiselect3({
@@ -33183,6 +33732,16 @@ Warnings:`);
           }
         }
       }
+      if (result.nativeResult) {
+        const nativeLines = formatNativeResult(result.nativeResult);
+        if (nativeLines.length > 0) {
+          console.log(`
+native:`);
+          for (const line of nativeLines) {
+            console.log(line);
+          }
+        }
+      }
       console.log(`
 Sync complete${dryRun ? " (dry run)" : ""}:`);
       console.log(`  Total ${dryRun ? "would copy" : "copied"}: ${result.totalCopied}`);
@@ -33576,20 +34135,35 @@ var marketplaceUpdateMeta = {
     failed: "number"
   }
 };
-var pluginListMeta = {
-  command: "plugin list",
-  description: "List available plugins from registered marketplaces",
-  whenToUse: "To browse available plugins before installing one into your workspace",
+var marketplaceBrowseMeta = {
+  command: "plugin marketplace browse",
+  description: "Browse available plugins in a marketplace",
+  whenToUse: "To discover and browse available plugins in a specific marketplace before installing",
   examples: [
-    "allagents plugin list",
-    "allagents plugin list official"
+    "allagents plugin marketplace browse official",
+    "allagents plugin marketplace browse superpowers"
   ],
-  expectedOutput: "Lists plugins grouped by marketplace with install-ready names (plugin@marketplace). Shows total count.",
+  expectedOutput: "Lists all plugins in the marketplace with descriptions and install status. Shows total count.",
   positionals: [
-    { name: "marketplace", type: "string", required: false, description: "Filter plugins by marketplace name" }
+    { name: "name", type: "string", required: true, description: "Name of the marketplace to browse" }
+  ],
+  outputSchema: {
+    marketplace: "string",
+    plugins: [{ name: "string", description: "string | null", installed: "boolean", scope: "string | null" }],
+    total: "number",
+    installed: "number"
+  }
+};
+var pluginListMeta = {
+  command: "plugin list",
+  description: "List installed plugins",
+  whenToUse: "To see which plugins are currently installed in your workspace",
+  examples: [
+    "allagents plugin list"
   ],
+  expectedOutput: "Lists installed plugins with their marketplace and scope. If none installed, suggests using marketplace browse.",
   outputSchema: {
-    plugins: [{ name: "string", marketplace: "string" }],
+    plugins: [{ name: "string", marketplace: "string", scope: "string" }],
     total: "number"
   }
 };
@@ -34179,6 +34753,16 @@ Syncing workspace...
         }
       }
     }
+    if (result.nativeResult) {
+      const nativeLines = formatNativeResult(result.nativeResult);
+      if (nativeLines.length > 0) {
+        console.log(`
+native:`);
+        for (const line of nativeLines) {
+          console.log(line);
+        }
+      }
+    }
     console.log(`
 Sync complete:`);
     console.log(`  Total copied: ${result.totalCopied}`);
@@ -34238,6 +34822,16 @@ Syncing user workspace...
         }
       }
     }
+    if (result.nativeResult) {
+      const nativeLines = formatNativeResult(result.nativeResult);
+      if (nativeLines.length > 0) {
+        console.log(`
+native:`);
+        for (const line of nativeLines) {
+          console.log(line);
+        }
+      }
+    }
     console.log(`
 User sync complete:`);
     console.log(`  Total copied: ${result.totalCopied}`);
@@ -34378,17 +34972,21 @@ var marketplaceRemoveCmd = import_cmd_ts4.command({
           command: "plugin marketplace remove",
           data: {
             name,
-            path: result.marketplace?.path
+            path: result.marketplace?.path,
+            retainedUserPlugins: result.retainedUserPlugins ?? []
           }
         });
         return;
       }
       console.log(`✓ Marketplace '${name}' removed`);
-      if (result.removedUserPlugins && result.removedUserPlugins.length > 0) {
-        console.log(`  Removed ${result.removedUserPlugins.length} user plugin(s):`);
-        for (const p of result.removedUserPlugins) {
+      if (result.retainedUserPlugins && result.retainedUserPlugins.length > 0) {
+        console.log(`
+  ⚠ ${result.retainedUserPlugins.length} plugin(s) still reference this marketplace:`);
+        for (const p of result.retainedUserPlugins) {
           console.log(`    - ${p}`);
         }
+        console.log(`
+  To remove them: allagents plugin remove <name>`);
       }
     } catch (error) {
       if (error instanceof Error) {
@@ -34463,52 +35061,31 @@ var marketplaceUpdateCmd = import_cmd_ts4.command({
     }
   }
 });
-var marketplaceCmd = conciseSubcommands({
-  name: "marketplace",
-  description: "Manage plugin marketplaces",
-  cmds: {
-    list: marketplaceListCmd,
-    add: marketplaceAddCmd,
-    remove: marketplaceRemoveCmd,
-    update: marketplaceUpdateCmd
-  }
-});
-var pluginListCmd = import_cmd_ts4.command({
-  name: "list",
-  description: buildDescription(pluginListMeta),
+var marketplaceBrowseCmd = import_cmd_ts4.command({
+  name: "browse",
+  description: buildDescription(marketplaceBrowseMeta),
   args: {
-    marketplace: import_cmd_ts4.positional({ type: import_cmd_ts4.optional(import_cmd_ts4.string), displayName: "marketplace" })
+    name: import_cmd_ts4.positional({ type: import_cmd_ts4.string, displayName: "name" })
   },
-  handler: async ({ marketplace }) => {
+  handler: async ({ name }) => {
     try {
-      const marketplaces = await listMarketplaces();
-      if (marketplaces.length === 0) {
-        if (isJsonMode()) {
-          jsonOutput({
-            success: true,
-            command: "plugin list",
-            data: { plugins: [], total: 0 }
-          });
-          return;
-        }
-        console.log(`No marketplaces registered.
-`);
-        console.log("Add a marketplace first:");
-        console.log("  allagents plugin marketplace add <source>");
-        return;
-      }
-      const toList = marketplace ? marketplaces.filter((m) => m.name === marketplace) : marketplaces;
-      if (marketplace && toList.length === 0) {
+      if (!await findMarketplace(name)) {
+        const error = `Marketplace '${name}' not found`;
         if (isJsonMode()) {
-          jsonOutput({ success: false, command: "plugin list", error: `Marketplace '${marketplace}' not found` });
+          jsonOutput({ success: false, command: "plugin marketplace browse", error });
           process.exit(1);
         }
-        console.error(`Marketplace '${marketplace}' not found`);
+        console.error(`Error: ${error}`);
+        console.log(`
+To see registered marketplaces:`);
+        console.log("  allagents plugin marketplace list");
         process.exit(1);
       }
+      const result = await listMarketplacePlugins(name);
       const userPlugins = await getInstalledUserPlugins();
       const projectPlugins = await getInstalledProjectPlugins(process.cwd());
       const installedMap = new Map;
+      const marketplaces = await listMarketplaces();
       const repoToMarketplace = new Map;
       for (const mp of marketplaces) {
         if (mp.source.type === "github") {
@@ -34518,8 +35095,8 @@ var pluginListCmd = import_cmd_ts4.command({
           }
         }
       }
-      const resolveMarketplaceName = (name) => {
-        return repoToMarketplace.get(name) ?? name;
+      const resolveMarketplaceName = (mpName) => {
+        return repoToMarketplace.get(mpName) ?? mpName;
       };
       for (const p of userPlugins) {
         const mpName = resolveMarketplaceName(p.marketplace);
@@ -34529,98 +35106,115 @@ var pluginListCmd = import_cmd_ts4.command({
         const mpName = resolveMarketplaceName(p.marketplace);
         installedMap.set(`${p.name}@${mpName}`, p);
       }
-      const versionMap = new Map;
-      for (const mp of toList) {
-        const version = await getMarketplaceVersion(mp.path);
-        versionMap.set(mp.name, version);
-      }
+      const plugins = result.plugins.map((plugin) => {
+        const key = `${plugin.name}@${name}`;
+        const installed = installedMap.get(key);
+        return {
+          name: plugin.name,
+          description: plugin.description ?? null,
+          installed: !!installed,
+          scope: installed?.scope ?? null
+        };
+      });
+      const installedCount = plugins.filter((p) => p.installed).length;
       if (isJsonMode()) {
-        const allPlugins = [];
-        const allWarnings = [];
-        for (const mp of toList) {
-          const result = await listMarketplacePlugins(mp.name);
-          const version = versionMap.get(mp.name) ?? null;
-          for (const plugin of result.plugins) {
-            const key = `${plugin.name}@${mp.name}`;
-            const installed = installedMap.get(key);
-            allPlugins.push({
-              name: plugin.name,
-              marketplace: mp.name,
-              version,
-              scope: installed?.scope ?? null,
-              enabled: !!installed
-            });
-          }
-          for (const warning of result.warnings) {
-            allWarnings.push(`${mp.name}: ${warning}`);
-          }
-        }
         jsonOutput({
           success: true,
-          command: "plugin list",
+          command: "plugin marketplace browse",
           data: {
-            plugins: allPlugins,
-            total: allPlugins.length,
-            ...allWarnings.length > 0 && { warnings: allWarnings }
+            marketplace: name,
+            plugins,
+            total: plugins.length,
+            installed: installedCount,
+            ...result.warnings.length > 0 && { warnings: result.warnings }
           }
         });
         return;
       }
-      let totalPlugins = 0;
-      const allPluginEntries = [];
-      for (const mp of toList) {
-        const result = await listMarketplacePlugins(mp.name);
-        const version = versionMap.get(mp.name) ?? null;
-        for (const warning of result.warnings) {
-          allPluginEntries.push({
-            name: "",
-            marketplace: mp.name,
-            version,
-            installed: undefined,
-            warning
-          });
+      for (const warning of result.warnings) {
+        console.log(`  Warning: ${warning}`);
+      }
+      if (plugins.length === 0) {
+        console.log(`No plugins found in "${name}" marketplace.`);
+        return;
+      }
+      console.log(`Plugins in "${name}" marketplace:
+`);
+      for (const plugin of plugins) {
+        const status = plugin.installed ? ` (installed - ${plugin.scope})` : "";
+        console.log(`  ❯ ${plugin.name}${status}`);
+        if (plugin.description) {
+          console.log(`    ${plugin.description}`);
         }
-        for (const plugin of result.plugins) {
-          const key = `${plugin.name}@${mp.name}`;
-          const installed = installedMap.get(key);
-          allPluginEntries.push({
-            name: plugin.name,
-            marketplace: mp.name,
-            version,
-            installed
-          });
-          totalPlugins++;
+        console.log();
+      }
+      console.log(`Total: ${plugins.length} plugins (${installedCount} installed)`);
+    } catch (error) {
+      if (error instanceof Error) {
+        if (isJsonMode()) {
+          jsonOutput({ success: false, command: "plugin marketplace browse", error: error.message });
+          process.exit(1);
         }
+        console.error(`Error: ${error.message}`);
+        process.exit(1);
       }
-      if (totalPlugins === 0) {
-        console.log("No plugins found in registered marketplaces.");
+      throw error;
+    }
+  }
+});
+var marketplaceCmd = conciseSubcommands({
+  name: "marketplace",
+  description: "Manage plugin marketplaces",
+  cmds: {
+    list: marketplaceListCmd,
+    browse: marketplaceBrowseCmd,
+    add: marketplaceAddCmd,
+    remove: marketplaceRemoveCmd,
+    update: marketplaceUpdateCmd
+  }
+});
+var pluginListCmd = import_cmd_ts4.command({
+  name: "list",
+  description: buildDescription(pluginListMeta),
+  args: {},
+  handler: async () => {
+    try {
+      const userPlugins = await getInstalledUserPlugins();
+      const projectPlugins = await getInstalledProjectPlugins(process.cwd());
+      const allInstalled = [...userPlugins, ...projectPlugins];
+      if (isJsonMode()) {
+        jsonOutput({
+          success: true,
+          command: "plugin list",
+          data: {
+            plugins: allInstalled.map((p) => ({
+              name: p.name,
+              marketplace: p.marketplace,
+              scope: p.scope
+            })),
+            total: allInstalled.length
+          }
+        });
         return;
       }
-      const installedPlugins = allPluginEntries.filter((e) => e.installed && !e.warning);
-      const availablePlugins = allPluginEntries.filter((e) => !e.installed && !e.warning);
-      const warnings = allPluginEntries.filter((e) => e.warning);
-      for (const entry of warnings) {
-        console.log(`  Warning: ${entry.warning}`);
-      }
-      if (installedPlugins.length > 0) {
-        console.log(`Installed plugins:
+      if (allInstalled.length === 0) {
+        console.log(`No plugins installed.
 `);
-        for (const entry of installedPlugins) {
-          console.log(`  ❯ ${entry.name}@${entry.marketplace}`);
-          console.log(`    Version: ${entry.version ?? "unknown"}`);
-          console.log(`    Scope: ${entry.installed?.scope}
+        console.log("To discover available plugins:");
+        console.log(`  allagents plugin marketplace browse <name>
 `);
-        }
+        console.log("To see registered marketplaces:");
+        console.log("  allagents plugin marketplace list");
+        return;
       }
-      if (availablePlugins.length > 0) {
-        console.log(`Available plugins:
+      console.log(`Installed plugins:
 `);
-        for (const entry of availablePlugins) {
-          console.log(`  ❯ ${entry.name}@${entry.marketplace}`);
-          console.log(`    Version: ${entry.version ?? "unknown"}
+      for (const p of allInstalled) {
+        console.log(`  ❯ ${p.spec}`);
+        console.log(`    Scope: ${p.scope}
 `);
-        }
       }
+      console.log(`Total: ${allInstalled.length} installed`);
     } catch (error) {
       if (error instanceof Error) {
         if (isJsonMode()) {
@@ -36722,6 +37316,7 @@ var allCommands = [
   marketplaceAddMeta,
   marketplaceRemoveMeta,
   marketplaceUpdateMeta,
+  marketplaceBrowseMeta,
   pluginListMeta,
   pluginValidateMeta,
   updateMeta