During uninstalltaion step, also remove the CC plugin and marketplace

Author: chance-wnb

src/cli.ts

@@ -15,8 +15,10 @@ import {
   VERSION,
   MarketplaceStatus,
   PluginStatus,
+  RemovalStatus,
   createConfig,
   registerPlugin,
+  unregisterPlugin,
   loadSettings,
   saveSettings,
   type Settings,
@@ -391,30 +393,49 @@ async function cmdUninstall(keepLogs: boolean): Promise<void> {
     return;
   }
 
+  let settings: Settings | null = null;
+
   if (fs.existsSync(SETTINGS_FILE)) {
-    let settings: Settings | null = null;
     try {
       settings = loadSettings();
     } catch {
       // Settings may be corrupt — continue with cleanup
     }
+  }
 
-    const socketPath = settings?.daemon_socket ?? path.join(CONFIG_DIR, 'daemon.sock');
+  const socketPath = settings?.daemon_socket ?? path.join(CONFIG_DIR, 'daemon.sock');
+  if (fs.existsSync(socketPath)) {
+    try {
+      await sendToSocket(socketPath, JSON.stringify({ command: 'shutdown' }));
+      console.log('✓ Stopped daemon');
+    } catch {
+      console.warn('⚠ Could not stop daemon (may already be stopped)');
+    }
+  }
 
-    if (fs.existsSync(socketPath)) {
-      try {
-        await sendToSocket(socketPath, JSON.stringify({ command: 'shutdown' }));
-        console.log('✓ Stopped daemon');
-      } catch {
-        console.warn('⚠ Could not stop daemon (may already be stopped)');
-      }
-      try {
-        fs.unlinkSync(socketPath);
-      } catch {
-        // May have been removed by daemon itself
-      }
+  if (fs.existsSync(socketPath)) {
+    try {
+      fs.unlinkSync(socketPath);
+      console.log('✓ Removed daemon socket');
+    } catch {
+      console.warn('⚠ Could not remove daemon socket');
     }
+  }
+
+  const pluginResult = unregisterPlugin();
+  if (pluginResult.pluginStatus === RemovalStatus.Failed) {
+    console.warn(`⚠ ${pluginResult.pluginError}`);
+  } else {
+    console.log(`✓ Claude plugin ${pluginResult.pluginStatus === RemovalStatus.AlreadyAbsent ? 'already removed' : 'removed'}`);
+  }
 
+  if (pluginResult.marketplaceStatus === RemovalStatus.Failed) {
+    console.warn(`⚠ ${pluginResult.marketplaceError}`);
+  } else {
+    console.log(`✓ Claude marketplace ${pluginResult.marketplaceStatus === RemovalStatus.AlreadyAbsent ? 'already removed' : 'removed'}`);
+  }
+
+  if (fs.existsSync(SETTINGS_FILE)) {
     fs.unlinkSync(SETTINGS_FILE);
     console.log('✓ Removed configuration');
   } else {
@@ -437,10 +458,7 @@ async function cmdUninstall(keepLogs: boolean): Promise<void> {
     // Non-empty (e.g., logs kept) — leave it
   }
 
-  console.log(`\n✓ Uninstall complete!`);
-  console.log(`\nNote: The Claude Code plugin is still installed.`);
-  console.log(`To remove it, run in Claude Code:`);
-  console.log(`  /plugin uninstall ${PLUGIN_NAME}@${MARKETPLACE_NAME}`);
+  console.log('\n✓ Uninstall complete!');
 }
 
 // ---------------------------------------------------------------------------

src/setup.ts

@@ -42,6 +42,19 @@ export interface PluginResult {
   pluginStatus: PluginStatus;
 }
 
+export enum RemovalStatus {
+  Removed = 'removed',
+  AlreadyAbsent = 'already_absent',
+  Failed = 'failed',
+}
+
+export interface UninstallResult {
+  marketplaceStatus: RemovalStatus;
+  pluginStatus: RemovalStatus;
+  marketplaceError?: string;
+  pluginError?: string;
+}
+
 export const CONFIG_DIR = path.join(os.homedir(), '.weave_claude_plugin');
 export const SETTINGS_FILE = path.join(CONFIG_DIR, 'settings.json');
 export const VERSION = '0.1.0';
@@ -137,6 +150,76 @@ export function registerPlugin(logFile: string): PluginResult {
   };
 }
 
+/**
+ * Uninstall the plugin from Claude Code and remove its marketplace.
+ *
+ * Requires the `claude` CLI to be in PATH. Idempotent — already-removed
+ * plugins or marketplaces are treated as success.
+ */
+export function unregisterPlugin(): UninstallResult {
+  const claudePath = findClaudeCLI();
+  if (!claudePath) {
+    const msg = "'claude' CLI not found in PATH. Skipping Claude plugin and marketplace removal.";
+    return {
+      pluginStatus: RemovalStatus.Failed,
+      marketplaceStatus: RemovalStatus.Failed,
+      pluginError: msg,
+      marketplaceError: msg,
+    };
+  }
+
+  let pluginStatus: RemovalStatus = RemovalStatus.Removed;
+  let pluginError: string | undefined;
+
+  const pluginResult = spawnSync(
+    claudePath,
+    ['plugin', 'uninstall', `${PLUGIN_NAME}@${MARKETPLACE_NAME}`, '--scope', 'user'],
+    { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] },
+  );
+  const pluginAlreadyAbsent = /not installed|not found|unknown plugin|no installed plugin/i
+    .test((pluginResult.stderr ?? '') + (pluginResult.stdout ?? ''));
+  if (pluginResult.status !== 0) {
+    if (pluginAlreadyAbsent) {
+      pluginStatus = RemovalStatus.AlreadyAbsent;
+    } else {
+      const output = ((pluginResult.stderr ?? '') + (pluginResult.stdout ?? '')).trim();
+      pluginStatus = RemovalStatus.Failed;
+      pluginError = `Failed to uninstall plugin '${PLUGIN_NAME}': ${output}`;
+    }
+  } else if (pluginAlreadyAbsent) {
+    pluginStatus = RemovalStatus.AlreadyAbsent;
+  }
+
+  let marketplaceStatus: RemovalStatus = RemovalStatus.Removed;
+  let marketplaceError: string | undefined;
+
+  const mktResult = spawnSync(
+    claudePath,
+    ['plugin', 'marketplace', 'remove', MARKETPLACE_NAME],
+    { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] },
+  );
+  const marketplaceAlreadyAbsent = /not found|unknown marketplace|no configured marketplace/i
+    .test((mktResult.stderr ?? '') + (mktResult.stdout ?? ''));
+  if (mktResult.status !== 0) {
+    if (marketplaceAlreadyAbsent) {
+      marketplaceStatus = RemovalStatus.AlreadyAbsent;
+    } else {
+      const output = ((mktResult.stderr ?? '') + (mktResult.stdout ?? '')).trim();
+      marketplaceStatus = RemovalStatus.Failed;
+      marketplaceError = `Failed to remove marketplace '${MARKETPLACE_NAME}': ${output}`;
+    }
+  } else if (marketplaceAlreadyAbsent) {
+    marketplaceStatus = RemovalStatus.AlreadyAbsent;
+  }
+
+  return {
+    pluginStatus,
+    marketplaceStatus,
+    pluginError,
+    marketplaceError,
+  };
+}
+
 export function loadSettings(): Settings {
   if (!fs.existsSync(SETTINGS_FILE)) {
     throw new Error(`Settings not found at ${SETTINGS_FILE}\nRun: weave-claude-plugin install`);