wave-code 0.6.4 → 0.7.0

package/dist/hooks/usePluginManager.js

@@ -1,5 +1,5 @@
 import { useState, useCallback, useEffect, useMemo } from "react";
-import { MarketplaceService, PluginScopeManager, ConfigurationService, PluginManager, } from "wave-agent-sdk";
+import { PluginCore, } from "wave-agent-sdk";
 export function usePluginManager() {
     const [state, setState] = useState({
         currentView: "DISCOVER",
@@ -11,17 +11,7 @@ export function usePluginManager() {
     const [marketplaces, setMarketplaces] = useState([]);
     const [installedPlugins, setInstalledPlugins] = useState([]);
     const [discoverablePlugins, setDiscoverablePlugins] = useState([]);
-    const marketplaceService = useMemo(() => new MarketplaceService(), []);
-    const configurationService = useMemo(() => new ConfigurationService(), []);
-    const pluginManager = useMemo(() => new PluginManager({
-        workdir: process.cwd(),
-        configurationService,
-    }), [configurationService]);
-    const pluginScopeManager = useMemo(() => new PluginScopeManager({
-        workdir: process.cwd(),
-        configurationService,
-        pluginManager,
-    }), [configurationService, pluginManager]);
+    const pluginCore = useMemo(() => new PluginCore(), []);
     const refresh = useCallback(async () => {
         setState((prev) => ({
             ...prev,
@@ -30,9 +20,9 @@ export function usePluginManager() {
         }));
         try {
             const [mks, installed, enabledMap] = await Promise.all([
-                marketplaceService.listMarketplaces(),
-                marketplaceService.getInstalledPlugins(),
-                Promise.resolve(pluginScopeManager.getMergedEnabledPlugins()),
+                pluginCore.listMarketplaces(),
+                pluginCore.getInstalledPlugins(),
+                Promise.resolve(pluginCore.getMergedEnabledPlugins()),
             ]);
             setMarketplaces(mks);
             const allInstalledWithEnabled = installed.plugins.map((p) => {
@@ -40,7 +30,7 @@ export function usePluginManager() {
                 return {
                     ...p,
                     enabled: !!enabledMap[pluginId],
-                    scope: pluginScopeManager.findPluginScope(pluginId) || undefined,
+                    scope: pluginCore.findPluginScope(pluginId) || undefined,
                 };
             });
             // Only show enabled plugins in the "Installed" view
@@ -48,7 +38,7 @@ export function usePluginManager() {
             const allDiscoverable = [];
             for (const mk of mks) {
                 try {
-                    const manifest = await marketplaceService.loadMarketplaceManifest(marketplaceService.getMarketplacePath(mk));
+                    const manifest = await pluginCore.loadMarketplaceManifest(pluginCore.getMarketplacePath(mk));
                     manifest.plugins.forEach((p) => {
                         const pluginId = `${p.name}@${mk.name}`;
                         const isInstalled = installed.plugins.find((ip) => ip.name === p.name && ip.marketplace === mk.name);
@@ -77,7 +67,7 @@ export function usePluginManager() {
                 error: error instanceof Error ? error.message : String(error),
             }));
         }
-    }, [marketplaceService, pluginScopeManager]);
+    }, [pluginCore]);
     useEffect(() => {
         refresh();
     }, [refresh]);
@@ -94,7 +84,7 @@ export function usePluginManager() {
             error: null,
         }));
         try {
-            await marketplaceService.addMarketplace(source);
+            await pluginCore.addMarketplace(source);
             await refresh();
         }
         catch (error) {
@@ -104,7 +94,7 @@ export function usePluginManager() {
                 error: error instanceof Error ? error.message : String(error),
             }));
         }
-    }, [marketplaceService, refresh]);
+    }, [pluginCore, refresh]);
     const removeMarketplace = useCallback(async (name) => {
         setState((prev) => ({
             ...prev,
@@ -112,7 +102,7 @@ export function usePluginManager() {
             error: null,
         }));
         try {
-            await marketplaceService.removeMarketplace(name);
+            await pluginCore.removeMarketplace(name);
             await refresh();
         }
         catch (error) {
@@ -122,7 +112,7 @@ export function usePluginManager() {
                 error: error instanceof Error ? error.message : String(error),
             }));
         }
-    }, [marketplaceService, refresh]);
+    }, [pluginCore, refresh]);
     const updateMarketplace = useCallback(async (name) => {
         setState((prev) => ({
             ...prev,
@@ -130,7 +120,7 @@ export function usePluginManager() {
             error: null,
         }));
         try {
-            await marketplaceService.updateMarketplace(name);
+            await pluginCore.updateMarketplace(name);
             await refresh();
         }
         catch (error) {
@@ -140,7 +130,7 @@ export function usePluginManager() {
                 error: error instanceof Error ? error.message : String(error),
             }));
         }
-    }, [marketplaceService, refresh]);
+    }, [pluginCore, refresh]);
     const installPlugin = useCallback(async (name, marketplace, scope = "project") => {
         setState((prev) => ({
             ...prev,
@@ -149,9 +139,7 @@ export function usePluginManager() {
         }));
         try {
             const pluginId = `${name}@${marketplace}`;
-            const workdir = process.cwd();
-            await marketplaceService.installPlugin(pluginId, workdir);
-            await pluginScopeManager.enablePlugin(scope, pluginId);
+            await pluginCore.installPlugin(pluginId, scope);
             await refresh();
         }
         catch (error) {
@@ -161,7 +149,7 @@ export function usePluginManager() {
                 error: error instanceof Error ? error.message : String(error),
             }));
         }
-    }, [marketplaceService, pluginScopeManager, refresh]);
+    }, [pluginCore, refresh]);
     const uninstallPlugin = useCallback(async (name, marketplace) => {
         setState((prev) => ({
             ...prev,
@@ -170,14 +158,7 @@ export function usePluginManager() {
         }));
         try {
             const pluginId = `${name}@${marketplace}`;
-            const workdir = process.cwd();
-            // 1. Remove from global registry and potentially clean up cache
-            await marketplaceService.uninstallPlugin(pluginId, workdir);
-            // 2. Find the scope where it's currently enabled and remove it from there
-            const scope = pluginScopeManager.findPluginScope(pluginId);
-            if (scope) {
-                await configurationService.removeEnabledPlugin(workdir, scope, pluginId);
-            }
+            await pluginCore.uninstallPlugin(pluginId);
             await refresh();
         }
         catch (error) {
@@ -187,7 +168,7 @@ export function usePluginManager() {
                 error: error instanceof Error ? error.message : String(error),
             }));
         }
-    }, [configurationService, marketplaceService, pluginScopeManager, refresh]);
+    }, [pluginCore, refresh]);
     const updatePlugin = useCallback(async (name, marketplace) => {
         setState((prev) => ({
             ...prev,
@@ -196,7 +177,7 @@ export function usePluginManager() {
         }));
         try {
             const pluginId = `${name}@${marketplace}`;
-            await marketplaceService.updatePlugin(pluginId);
+            await pluginCore.updatePlugin(pluginId);
             await refresh();
         }
         catch (error) {
@@ -206,7 +187,7 @@ export function usePluginManager() {
                 error: error instanceof Error ? error.message : String(error),
             }));
         }
-    }, [marketplaceService, refresh]);
+    }, [pluginCore, refresh]);
     return {
         state,
         marketplaces,

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,wBAAsB,IAAI,kBAkQzB;AAGD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,wBAAsB,IAAI,kBAmRzB;AAGD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAC"}

package/dist/index.js

@@ -39,6 +39,11 @@ export async function main() {
             type: "array",
             string: true,
             global: false,
+        })
+            .option("tools", {
+            description: 'Specify a comma-separated list of tools to enable (e.g., \'Bash,Read,Write\'). Use "" to disable all, "default" for all.',
+            type: "string",
+            global: false,
         })
             .command("plugin", "Manage plugins and marketplaces", (yargs) => {
             return yargs
@@ -136,6 +141,14 @@ export async function main() {
             .recommendCommands()
             .strict()
             .parseAsync();
+        const parseTools = (tools) => {
+            if (tools === undefined || tools === "default")
+                return undefined;
+            if (tools === "")
+                return [];
+            return tools.split(",").map((t) => t.trim());
+        };
+        const tools = parseTools(argv.tools);
         // Handle restore session command
         if (argv.restore === "" ||
             (process.argv.includes("-r") && argv.restore === undefined) ||
@@ -151,6 +164,7 @@ export async function main() {
                 restoreSessionId: selectedSessionId,
                 bypassPermissions: argv.dangerouslySkipPermissions,
                 pluginDirs: argv.pluginDir,
+                tools,
             });
         }
         // Handle print mode directly
@@ -163,6 +177,7 @@ export async function main() {
                 showStats: argv.showStats,
                 bypassPermissions: argv.dangerouslySkipPermissions,
                 pluginDirs: argv.pluginDir,
+                tools,
             });
         }
         await startCli({
@@ -170,6 +185,7 @@ export async function main() {
             continueLastSession: argv.continue,
             bypassPermissions: argv.dangerouslySkipPermissions,
             pluginDirs: argv.pluginDir,
+            tools,
         });
     }
     catch (error) {

package/dist/print-cli.d.ts

@@ -5,6 +5,7 @@ export interface PrintCliOptions {
     showStats?: boolean;
     bypassPermissions?: boolean;
     pluginDirs?: string[];
+    tools?: string[];
 }
 export declare function startPrintCli(options: PrintCliOptions): Promise<void>;
 //# sourceMappingURL=print-cli.d.ts.map

package/dist/print-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"print-cli.d.ts","sourceRoot":"","sources":["../src/print-cli.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAgBD,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA8J3E"}
+{"version":3,"file":"print-cli.d.ts","sourceRoot":"","sources":["../src/print-cli.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAgBD,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAgK3E"}

package/dist/print-cli.js

@@ -13,7 +13,7 @@ function displayTimingInfo(startTime, showStats) {
 }
 export async function startPrintCli(options) {
     const startTime = new Date();
-    const { restoreSessionId, continueLastSession, message, showStats = false, bypassPermissions, pluginDirs, } = options;
+    const { restoreSessionId, continueLastSession, message, showStats = false, bypassPermissions, pluginDirs, tools, } = options;
     if ((!message || message.trim() === "") &&
         !continueLastSession &&
         !restoreSessionId) {
@@ -97,6 +97,7 @@ export async function startPrintCli(options) {
             continueLastSession,
             permissionMode: bypassPermissions ? "bypassPermissions" : undefined,
             plugins: pluginDirs?.map((path) => ({ type: "local", path })),
+            tools,
             // 保持流式模式以获得更好的命令行用户体验
         });
         // Send message if provided and not empty

package/dist/utils/toolParameterTransforms.d.ts

@@ -2,7 +2,7 @@
  * Tool parameter transformation utilities for UI rendering
  * Forces type judgment based on tool name using type assertions
  */
-import { type Change, type WriteToolParameters, type EditToolParameters, type MultiEditToolParameters } from "wave-agent-sdk";
+import { type Change, type WriteToolParameters, type EditToolParameters } from "wave-agent-sdk";
 /**
  * Transform Write tool parameters to changes
  */
@@ -11,10 +11,6 @@ export declare function transformWriteParameters(parameters: WriteToolParameters
  * Transform Edit tool parameters to changes
  */
 export declare function transformEditParameters(parameters: EditToolParameters): Change[];
-/**
- * Transform MultiEdit tool parameters to changes
- */
-export declare function transformMultiEditParameters(parameters: MultiEditToolParameters): Change[];
 /**
  * Transform tool block parameters into standardized Change[] array for diff display
  * Forces type judgment based on tool name using type assertions

package/dist/utils/toolParameterTransforms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolParameterTransforms.d.ts","sourceRoot":"","sources":["../../src/utils/toolParameterTransforms.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,KAAK,MAAM,EACX,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAC7B,MAAM,gBAAgB,CAAC;AAmBxB;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,mBAAmB,GAC9B,MAAM,EAAE,CAOV;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,kBAAkB,GAC7B,MAAM,EAAE,CAOV;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,uBAAuB,GAClC,MAAM,EAAE,CAKV;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,MAAM,EAAE,CA2BV"}
+{"version":3,"file":"toolParameterTransforms.d.ts","sourceRoot":"","sources":["../../src/utils/toolParameterTransforms.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,KAAK,MAAM,EACX,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACxB,MAAM,gBAAgB,CAAC;AAmBxB;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,mBAAmB,GAC9B,MAAM,EAAE,CAOV;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,kBAAkB,GAC7B,MAAM,EAAE,CAOV;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,MAAM,EAAE,CAsBV"}

package/dist/utils/toolParameterTransforms.js

@@ -40,15 +40,6 @@ export function transformEditParameters(parameters) {
         },
     ];
 }
-/**
- * Transform MultiEdit tool parameters to changes
- */
-export function transformMultiEditParameters(parameters) {
-    return parameters.edits.map((edit) => ({
-        oldContent: edit.old_string,
-        newContent: edit.new_string,
-    }));
-}
 /**
  * Transform tool block parameters into standardized Change[] array for diff display
  * Forces type judgment based on tool name using type assertions
@@ -64,8 +55,6 @@ export function transformToolBlockToChanges(toolName, parameters) {
                 return transformWriteParameters(parsedParams);
             case "Edit":
                 return transformEditParameters(parsedParams);
-            case "MultiEdit":
-                return transformMultiEditParameters(parsedParams);
             default:
                 return [];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.6.4",
+  "version": "0.7.0",
   "description": "CLI-based code assistant powered by AI, built with React and Ink",
   "repository": {
     "type": "git",
@@ -37,7 +37,7 @@
     "react": "^19.2.4",
     "react-dom": "19.2.4",
     "yargs": "^17.7.2",
-    "wave-agent-sdk": "0.6.4"
+    "wave-agent-sdk": "0.7.0"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",

package/src/cli.tsx

@@ -8,6 +8,7 @@ export interface CliOptions {
   continueLastSession?: boolean;
   bypassPermissions?: boolean;
   pluginDirs?: string[];
+  tools?: string[];
 }
 
 export async function startCli(options: CliOptions): Promise<void> {
@@ -16,6 +17,7 @@ export async function startCli(options: CliOptions): Promise<void> {
     continueLastSession,
     bypassPermissions,
     pluginDirs,
+    tools,
   } = options;
 
   // Continue with ink-based UI for normal mode
@@ -72,6 +74,7 @@ export async function startCli(options: CliOptions): Promise<void> {
       continueLastSession={continueLastSession}
       bypassPermissions={bypassPermissions}
       pluginDirs={pluginDirs}
+      tools={tools}
     />,
   );
 

package/src/commands/plugin/disable.ts

@@ -1,28 +1,14 @@
-import {
-  ConfigurationService,
-  PluginManager,
-  PluginScopeManager,
-  Scope,
-} from "wave-agent-sdk";
+import { PluginCore, Scope } from "wave-agent-sdk";
 
 export async function disablePluginCommand(argv: {
   plugin: string;
   scope?: Scope;
 }) {
   const workdir = process.cwd();
-  const configurationService = new ConfigurationService();
-  const pluginManager = new PluginManager({ workdir });
-  const scopeManager = new PluginScopeManager({
-    workdir,
-    configurationService,
-    pluginManager,
-  });
-
-  const scope =
-    argv.scope || scopeManager.findPluginScope(argv.plugin) || "user";
+  const pluginCore = new PluginCore(workdir);
 
   try {
-    await scopeManager.disablePlugin(scope, argv.plugin);
+    const scope = await pluginCore.disablePlugin(argv.plugin, argv.scope);
     console.log(
       `Successfully disabled plugin: ${argv.plugin} in ${scope} scope`,
     );

package/src/commands/plugin/enable.ts

@@ -1,28 +1,14 @@
-import {
-  ConfigurationService,
-  PluginManager,
-  PluginScopeManager,
-  Scope,
-} from "wave-agent-sdk";
+import { PluginCore, Scope } from "wave-agent-sdk";
 
 export async function enablePluginCommand(argv: {
   plugin: string;
   scope?: Scope;
 }) {
   const workdir = process.cwd();
-  const configurationService = new ConfigurationService();
-  const pluginManager = new PluginManager({ workdir });
-  const scopeManager = new PluginScopeManager({
-    workdir,
-    configurationService,
-    pluginManager,
-  });
-
-  const scope =
-    argv.scope || scopeManager.findPluginScope(argv.plugin) || "user";
+  const pluginCore = new PluginCore(workdir);
 
   try {
-    await scopeManager.enablePlugin(scope, argv.plugin);
+    const scope = await pluginCore.enablePlugin(argv.plugin, argv.scope);
     console.log(
       `Successfully enabled plugin: ${argv.plugin} in ${scope} scope`,
     );

package/src/commands/plugin/install.ts

@@ -1,36 +1,22 @@
-import {
-  MarketplaceService,
-  ConfigurationService,
-  PluginManager,
-  PluginScopeManager,
-  Scope,
-} from "wave-agent-sdk";
+import { PluginCore, Scope } from "wave-agent-sdk";
 
 export async function installPluginCommand(argv: {
   plugin: string;
   scope?: Scope;
 }) {
-  const marketplaceService = new MarketplaceService();
   const workdir = process.cwd();
+  const pluginCore = new PluginCore(workdir);
 
   try {
-    const installed = await marketplaceService.installPlugin(argv.plugin);
+    const installed = await pluginCore.installPlugin(argv.plugin);
     console.log(
       `Successfully installed plugin: ${installed.name} v${installed.version} from ${installed.marketplace}`,
     );
     console.log(`Cache path: ${installed.cachePath}`);
 
     if (argv.scope) {
-      const configurationService = new ConfigurationService();
-      const pluginManager = new PluginManager({ workdir });
-      const scopeManager = new PluginScopeManager({
-        workdir,
-        configurationService,
-        pluginManager,
-      });
-
       const pluginId = `${installed.name}@${installed.marketplace}`;
-      await scopeManager.enablePlugin(argv.scope, pluginId);
+      await pluginCore.enablePlugin(pluginId, argv.scope);
       console.log(`Plugin ${pluginId} enabled in ${argv.scope} scope`);
     }
 

package/src/commands/plugin/list.ts

@@ -1,66 +1,16 @@
-import {
-  MarketplaceService,
-  ConfigurationService,
-  PluginScopeManager,
-  PluginManager,
-} from "wave-agent-sdk";
+import { PluginCore } from "wave-agent-sdk";
 
 export async function listPluginsCommand() {
-  const configurationService = new ConfigurationService();
-  const marketplaceService = new MarketplaceService();
-  const workdir = process.cwd();
-  const pluginManager = new PluginManager({
-    workdir,
-    configurationService,
-  });
-  const pluginScopeManager = new PluginScopeManager({
-    workdir,
-    configurationService,
-    pluginManager,
-  });
+  const pluginCore = new PluginCore(process.cwd());
 
   try {
-    const installedPlugins = await marketplaceService.getInstalledPlugins();
-    const marketplaces = await marketplaceService.listMarketplaces();
-    const mergedEnabled = configurationService.getMergedEnabledPlugins(workdir);
+    const { plugins, mergedEnabled } = await pluginCore.listPlugins();
 
-    // Collect all plugins from all marketplaces
-    const allMarketplacePlugins: {
-      name: string;
-      marketplace: string;
-      installed: boolean;
-      version?: string;
-      scope?: string;
-    }[] = [];
-
-    for (const m of marketplaces) {
-      try {
-        const manifest = await marketplaceService.loadMarketplaceManifest(
-          marketplaceService.getMarketplacePath(m),
-        );
-        manifest.plugins.forEach((p) => {
-          const pluginId = `${p.name}@${m.name}`;
-          const installed = installedPlugins.plugins.find(
-            (ip) => ip.name === p.name && ip.marketplace === m.name,
-          );
-          allMarketplacePlugins.push({
-            name: p.name,
-            marketplace: m.name,
-            installed: !!installed,
-            version: installed?.version,
-            scope: pluginScopeManager.findPluginScope(pluginId) || undefined,
-          });
-        });
-      } catch {
-        // Skip marketplaces that fail to load
-      }
-    }
-
-    if (allMarketplacePlugins.length === 0) {
+    if (plugins.length === 0) {
       console.log("No plugins found in registered marketplaces.");
     } else {
       console.log("Plugins:");
-      allMarketplacePlugins.forEach((p) => {
+      plugins.forEach((p) => {
         const pluginId = `${p.name}@${p.marketplace}`;
         const isEnabled = mergedEnabled[pluginId] !== false;
         const status = p.installed

package/src/commands/plugin/marketplace.ts

@@ -1,9 +1,9 @@
-import { MarketplaceService } from "wave-agent-sdk";
+import { PluginCore } from "wave-agent-sdk";
 
 export async function addMarketplaceCommand(argv: { input: string }) {
-  const service = new MarketplaceService();
+  const pluginCore = new PluginCore(process.cwd());
   try {
-    const marketplace = await service.addMarketplace(argv.input);
+    const marketplace = await pluginCore.addMarketplace(argv.input);
     const source = marketplace.source;
     let sourceInfo = "";
     if (source.source === "directory") {
@@ -25,9 +25,9 @@ export async function addMarketplaceCommand(argv: { input: string }) {
 }
 
 export async function listMarketplacesCommand() {
-  const service = new MarketplaceService();
+  const pluginCore = new PluginCore(process.cwd());
   try {
-    const marketplaces = await service.listMarketplaces();
+    const marketplaces = await pluginCore.listMarketplaces();
     if (marketplaces.length === 0) {
       console.log("No marketplaces registered.");
     } else {
@@ -57,9 +57,9 @@ export async function listMarketplacesCommand() {
 }
 
 export async function removeMarketplaceCommand(argv: { name: string }) {
-  const service = new MarketplaceService();
+  const pluginCore = new PluginCore(process.cwd());
   try {
-    await service.removeMarketplace(argv.name);
+    await pluginCore.removeMarketplace(argv.name);
     console.log(`Successfully removed marketplace: ${argv.name}`);
     process.exit(0);
   } catch (error) {
@@ -70,14 +70,14 @@ export async function removeMarketplaceCommand(argv: { name: string }) {
 }
 
 export async function updateMarketplaceCommand(argv: { name?: string }) {
-  const service = new MarketplaceService();
+  const pluginCore = new PluginCore(process.cwd());
   try {
     console.log(
       argv.name
         ? `Updating marketplace: ${argv.name}...`
         : "Updating all marketplaces...",
     );
-    await service.updateMarketplace(argv.name);
+    await pluginCore.updateMarketplace(argv.name);
     console.log("Successfully updated.");
     process.exit(0);
   } catch (error) {

package/src/commands/plugin/uninstall.ts

@@ -1,35 +1,13 @@
-import {
-  MarketplaceService,
-  ConfigurationService,
-  PluginManager,
-  PluginScopeManager,
-} from "wave-agent-sdk";
+import { PluginCore } from "wave-agent-sdk";
 
 export async function uninstallPluginCommand(argv: { plugin: string }) {
-  const marketplaceService = new MarketplaceService();
   const workdir = process.cwd();
+  const pluginCore = new PluginCore(workdir);
 
   try {
-    await marketplaceService.uninstallPlugin(argv.plugin, workdir);
+    await pluginCore.uninstallPlugin(argv.plugin);
     console.log(`Successfully uninstalled plugin: ${argv.plugin}`);
-
-    const configurationService = new ConfigurationService();
-    const pluginManager = new PluginManager({ workdir });
-    const scopeManager = new PluginScopeManager({
-      workdir,
-      configurationService,
-      pluginManager,
-    });
-
-    try {
-      await scopeManager.removePluginFromAllScopes(argv.plugin);
-      console.log(`Cleaned up plugin configuration from all scopes`);
-    } catch (error) {
-      console.warn(
-        `Warning: Could not clean up all plugin configurations: ${error instanceof Error ? error.message : String(error)}`,
-      );
-    }
-
+    console.log(`Cleaned up plugin configuration from all scopes`);
     process.exit(0);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);

package/src/commands/plugin/update.ts

@@ -1,10 +1,10 @@
-import { MarketplaceService } from "wave-agent-sdk";
+import { PluginCore } from "wave-agent-sdk";
 
 export async function updatePluginCommand(argv: { plugin: string }) {
-  const marketplaceService = new MarketplaceService();
+  const pluginCore = new PluginCore(process.cwd());
 
   try {
-    const updated = await marketplaceService.updatePlugin(argv.plugin);
+    const updated = await pluginCore.updatePlugin(argv.plugin);
     console.log(
       `Successfully updated plugin: ${updated.name} v${updated.version} from ${updated.marketplace}`,
     );