Harden plugin remove against cwd and missing-path holes

Runner glue now goes through executePluginRemove so ownership
and settings policy are tested with session cwd, not process.cwd().
Missing paths outside the origin plugins root are refused instead
of treated as already gone.

Author: TheGreatAxios

src/plugins/uninstall.test.ts

@@ -1,13 +1,16 @@
 import { afterEach, describe, expect, test } from "bun:test";
-import { mkdir, mkdtemp, rm, stat, writeFile } from "node:fs/promises";
+import { mkdir, mkdtemp, rm, stat, symlink, lstat, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 
+import { SETTINGS_DIR_NAME } from "../branding.js";
+
 import type { PluginConfig } from "../config/settings.js";
 import {
   classifyPluginRemove,
   deleteOwnedPluginDir,
   disablePluginSettings,
+  executePluginRemove,
   isOwnedDiskInstall,
   nextPluginPathsAfterRemove,
   ownedDiskOriginRoot,
@@ -47,6 +50,7 @@ describe("deleteOwnedPluginDir", () => {
       pluginPath: plugin,
       originRoot: root,
       claudeRoot: join(home, ".claude"),
+      cwd: home,
     });
     expect(result).toEqual({ ok: true });
     expect(await exists(plugin)).toBe(false);
@@ -63,6 +67,7 @@ describe("deleteOwnedPluginDir", () => {
       pluginPath: outside,
       originRoot: root,
       claudeRoot: join(home, ".claude"),
+      cwd: home,
     });
     expect(result.ok).toBe(false);
     expect(await exists(outside)).toBe(true);
@@ -76,6 +81,7 @@ describe("deleteOwnedPluginDir", () => {
       pluginPath: root,
       originRoot: root,
       claudeRoot: join(home, ".claude"),
+      cwd: home,
     });
     expect(result.ok).toBe(false);
     expect(await exists(root)).toBe(true);
@@ -92,6 +98,7 @@ describe("deleteOwnedPluginDir", () => {
       pluginPath: plugin,
       originRoot: root,
       claudeRoot,
+      cwd: home,
     });
     expect(result.ok).toBe(false);
     if (!result.ok) expect(result.message).toContain("~/.claude");
@@ -107,13 +114,14 @@ describe("deleteOwnedPluginDir", () => {
     await mkdir(outside, { recursive: true });
     const claudeRoot = join(cwd, "home", ".claude");
     expect(
-      await deleteOwnedPluginDir({ pluginPath: inside, originRoot: root, claudeRoot }),
+      await deleteOwnedPluginDir({ pluginPath: inside, originRoot: root, claudeRoot, cwd }),
     ).toEqual({ ok: true });
     expect(await exists(inside)).toBe(false);
     const refused = await deleteOwnedPluginDir({
       pluginPath: outside,
       originRoot: root,
       claudeRoot,
+      cwd,
     });
     expect(refused.ok).toBe(false);
     expect(await exists(outside)).toBe(true);
@@ -128,10 +136,42 @@ describe("deleteOwnedPluginDir", () => {
       pluginPath: missing,
       originRoot: root,
       claudeRoot: join(home, ".claude"),
+      cwd: home,
     });
     expect(result).toEqual({ ok: true });
     expect(await exists(missing)).toBe(false);
   });
+
+  test("missing path outside origin root is refused", async () => {
+    const home = await tempDir("uninstall-missing-out-");
+    const root = userPluginsRoot(home);
+    await mkdir(root, { recursive: true });
+    const missing = join(home, "elsewhere", "gone");
+    const result = await deleteOwnedPluginDir({
+      pluginPath: missing,
+      originRoot: root,
+      claudeRoot: join(home, ".claude"),
+      cwd: home,
+    });
+    expect(result.ok).toBe(false);
+    if (!result.ok) expect(result.message).toContain("outside the origin plugins root");
+  });
+
+  test("dangling symlink inside origin root is removed", async () => {
+    const home = await tempDir("uninstall-dangle-");
+    const root = userPluginsRoot(home);
+    await mkdir(root, { recursive: true });
+    const plugin = join(root, "exa");
+    await symlink(join(root, "missing-target"), plugin);
+    const result = await deleteOwnedPluginDir({
+      pluginPath: plugin,
+      originRoot: root,
+      claudeRoot: join(home, ".claude"),
+      cwd: home,
+    });
+    expect(result).toEqual({ ok: true });
+    await expect(lstat(plugin)).rejects.toMatchObject({ code: "ENOENT" });
+  });
 });
 
 describe("isOwnedDiskInstall", () => {
@@ -174,6 +214,20 @@ describe("isOwnedDiskInstall", () => {
     expect(isOwnedDiskInstall({ origin: "path", pluginPath, home, cwd })).toBe(false);
     expect(ownedDiskOriginRoot({ pluginPath, home, cwd })).toBeUndefined();
   });
+
+  test("path origin under projectPluginsRoot is owned for that cwd", () => {
+    const cwd = "/tmp/project-a";
+    const pluginPath = join(projectPluginsRoot(cwd), "from-path");
+    expect(isOwnedDiskInstall({ origin: "path", pluginPath, home: "/tmp/home", cwd })).toBe(true);
+    expect(
+      isOwnedDiskInstall({
+        origin: "path",
+        pluginPath,
+        home: "/tmp/home",
+        cwd: "/tmp/other",
+      }),
+    ).toBe(false);
+  });
 });
 
 describe("classifyPluginRemove", () => {
@@ -239,3 +293,130 @@ describe("plugin remove settings policy", () => {
     expect(shared.keptSharedRoot).toBe(true);
   });
 });
+
+describe("executePluginRemove", () => {
+  const expand = async (abs: string): Promise<readonly string[]> => [abs];
+
+  test("project plugin under session cwd is deleted; process.cwd() does not own it", async () => {
+    const sessionCwd = await tempDir("remove-session-");
+    const home = await tempDir("remove-home-");
+    expect(sessionCwd).not.toBe(process.cwd());
+    const plugin = join(projectPluginsRoot(sessionCwd), "local");
+    await mkdir(plugin, { recursive: true });
+    await writeFile(join(plugin, "manifest.json"), "{}");
+    const ok = await executePluginRemove({
+      id: "local",
+      name: "local",
+      origin: "project",
+      pluginPath: plugin,
+      hadTools: false,
+      home,
+      cwd: sessionCwd,
+      plugins: { local: { enabled: true } },
+      pluginPaths: [],
+      otherLivePluginPaths: [],
+      expandMembers: expand,
+    });
+    expect(ok.ok).toBe(true);
+    if (ok.ok) {
+      expect(ok.spliceLive).toBe(true);
+      expect(ok.plugins.local?.enabled).toBe(false);
+      expect("local" in ok.plugins).toBe(true);
+    }
+    expect(await exists(plugin)).toBe(false);
+
+    const other = join(projectPluginsRoot(sessionCwd), "other");
+    await mkdir(other, { recursive: true });
+    const refused = await executePluginRemove({
+      id: "other",
+      name: "other",
+      origin: "project",
+      pluginPath: other,
+      hadTools: false,
+      home,
+      cwd: process.cwd(),
+      plugins: { other: { enabled: true } },
+      pluginPaths: [],
+      otherLivePluginPaths: [],
+      expandMembers: expand,
+    });
+    expect(refused.ok).toBe(false);
+    expect(await exists(other)).toBe(true);
+  });
+
+  test("relative pluginPath resolves against session cwd not process.cwd()", async () => {
+    const sessionCwd = await tempDir("remove-rel-");
+    const home = await tempDir("remove-rel-home-");
+    expect(sessionCwd).not.toBe(process.cwd());
+    const plugin = join(projectPluginsRoot(sessionCwd), "local");
+    await mkdir(plugin, { recursive: true });
+    await writeFile(join(plugin, "manifest.json"), "{}");
+    const ok = await executePluginRemove({
+      id: "local",
+      name: "local",
+      origin: "project",
+      pluginPath: join(SETTINGS_DIR_NAME, "plugins", "local"),
+      hadTools: false,
+      home,
+      cwd: sessionCwd,
+      plugins: { local: { enabled: true } },
+      pluginPaths: [],
+      otherLivePluginPaths: [],
+      expandMembers: expand,
+    });
+    expect(ok.ok).toBe(true);
+    expect(await exists(plugin)).toBe(false);
+  });
+
+  test("Claude marketplace disable keeps disk and writes enabled:false", async () => {
+    const home = await tempDir("remove-claude-");
+    const cwd = await tempDir("remove-claude-cwd-");
+    const plugin = join(home, ".claude", "plugins", "exa");
+    await mkdir(plugin, { recursive: true });
+    await writeFile(join(plugin, "manifest.json"), "{}");
+    const result = await executePluginRemove({
+      id: "exa",
+      name: "exa-search",
+      origin: "user",
+      pluginPath: plugin,
+      hadTools: true,
+      home,
+      cwd,
+      plugins: { exa: { enabled: true, credentials: { apiKey: "k" } } },
+      pluginPaths: [],
+      otherLivePluginPaths: [],
+      expandMembers: expand,
+    });
+    expect(result.ok).toBe(true);
+    if (result.ok) {
+      expect(result.spliceLive).toBe(false);
+      expect(result.plugins.exa?.enabled).toBe(false);
+      expect(result.plugins.exa?.credentials).toEqual({ apiKey: "k" });
+      expect("exa" in result.plugins).toBe(true);
+      expect(result.message).toContain("Claude marketplace files were not removed");
+      expect(result.message).toContain("Tools from this plugin stay until you restart");
+    }
+    expect(await exists(plugin)).toBe(true);
+  });
+
+  test("bundled disable stays listed with enabled:false", async () => {
+    const result = await executePluginRemove({
+      id: "corbits-skills",
+      name: "corbits-skills",
+      origin: "repo",
+      hadTools: false,
+      home: "/tmp/home",
+      cwd: "/tmp/cwd",
+      plugins: { "corbits-skills": { enabled: true } },
+      pluginPaths: [],
+      otherLivePluginPaths: [],
+      expandMembers: expand,
+    });
+    expect(result.ok).toBe(true);
+    if (result.ok) {
+      expect(result.spliceLive).toBe(false);
+      expect(result.plugins["corbits-skills"]?.enabled).toBe(false);
+      expect(result.message).toContain("cannot be uninstalled");
+    }
+  });
+});