@vellumai/assistant 0.12.2 → 0.12.3-staging.1

package/src/cli/lib/__tests__/local-plugin-upgrade.test.ts

@@ -6,7 +6,7 @@ import { afterEach, describe, expect, test } from "bun:test";
 import type { FetchLike } from "../fetch-like.js";
 import { installPlugin, readInstallMeta } from "../install-from-github.js";
 import type { PluginCatalog } from "../search-plugins.js";
-import { upgradePlugin } from "../upgrade-plugin.js";
+import { PluginMergeBaselineError, upgradePlugin } from "../upgrade-plugin.js";
 
 const roots: string[] = [];
 
@@ -82,81 +82,65 @@ function localCatalog(version: string): PluginCatalog {
   };
 }
 
+async function installBundledPlugin(version = "1.0.0") {
+  const root = mkdtempSync(join(tmpdir(), "local-plugin-upgrade-"));
+  roots.push(root);
+  const pluginsDir = join(root, "plugins");
+  const calls: string[] = [];
+  const materializeLocalPackage = packageMaterializer(calls);
+  const installed = await installPlugin(
+    {
+      name: "fathom",
+      trustedSource: {
+        kind: "local",
+        path: "plugins/mcp-catalog/fathom",
+        version,
+      },
+    },
+    {
+      fetch: marketplaceFetch(version),
+      workspacePluginsDir: pluginsDir,
+      materializeLocalPackage,
+    },
+  );
+  return { calls, installed, materializeLocalPackage, pluginsDir };
+}
+
 describe("bundled plugin upgrades", () => {
   test("ignores a newer live manifest version the current binary cannot materialize", async () => {
-    const root = mkdtempSync(join(tmpdir(), "local-plugin-upgrade-"));
-    roots.push(root);
-    const pluginsDir = join(root, "plugins");
-    const calls: string[] = [];
-    const materializeLocalPackage = packageMaterializer(calls);
-
-    await installPlugin(
-      {
-        name: "fathom",
-        trustedSource: {
-          kind: "local",
-          path: "plugins/mcp-catalog/fathom",
-          version: "1.0.0",
-        },
-      },
-      {
-        fetch: marketplaceFetch("1.0.0"),
-        workspacePluginsDir: pluginsDir,
-        materializeLocalPackage,
-      },
-    );
+    const fixture = await installBundledPlugin();
 
     const result = await upgradePlugin(
-      { name: "fathom" },
+      { name: "fathom", strategy: "theirs" },
       {
         fetch: marketplaceFetch("9.0.0"),
-        workspacePluginsDir: pluginsDir,
-        materializeLocalPackage,
+        workspacePluginsDir: fixture.pluginsDir,
+        materializeLocalPackage: fixture.materializeLocalPackage,
         localCatalog: localCatalog("1.0.0"),
         beforeSwap: async () => {},
       },
     );
 
     expect(result.outcome).toBe("already-up-to-date");
-    expect(calls).toEqual(["plugins/mcp-catalog/fathom@1.0.0"]);
+    expect(fixture.calls).toEqual(["plugins/mcp-catalog/fathom@1.0.0"]);
   });
 
   test("materializes the exact inspected path and version", async () => {
-    const root = mkdtempSync(join(tmpdir(), "local-plugin-upgrade-"));
-    roots.push(root);
-    const pluginsDir = join(root, "plugins");
-    const calls: string[] = [];
-    const materializeLocalPackage = packageMaterializer(calls);
-
-    await installPlugin(
-      {
-        name: "fathom",
-        trustedSource: {
-          kind: "local",
-          path: "plugins/mcp-catalog/fathom",
-          version: "1.0.0",
-        },
-      },
-      {
-        fetch: marketplaceFetch("1.0.0"),
-        workspacePluginsDir: pluginsDir,
-        materializeLocalPackage,
-      },
-    );
+    const fixture = await installBundledPlugin();
 
     const result = await upgradePlugin(
-      { name: "fathom" },
+      { name: "fathom", strategy: "theirs" },
       {
         fetch: marketplaceFetch("1.1.0"),
-        workspacePluginsDir: pluginsDir,
-        materializeLocalPackage,
+        workspacePluginsDir: fixture.pluginsDir,
+        materializeLocalPackage: fixture.materializeLocalPackage,
         localCatalog: localCatalog("1.1.0"),
         beforeSwap: async () => {},
       },
     );
 
     expect(result.outcome).toBe("upgraded");
-    expect(calls).toEqual([
+    expect(fixture.calls).toEqual([
       "plugins/mcp-catalog/fathom@1.0.0",
       "plugins/mcp-catalog/fathom@1.1.0",
     ]);
@@ -165,5 +149,103 @@ describe("bundled plugin upgrades", () => {
       path: "plugins/mcp-catalog/fathom",
       version: "1.1.0",
     });
+    expect(result.strategy).toBe("theirs");
+  });
+
+  test("refuses a theirs upgrade when the installed package has local edits", async () => {
+    const fixture = await installBundledPlugin();
+    writeFileSync(
+      join(fixture.installed.target, "mcp.json"),
+      '{"edited":true}',
+    );
+
+    for (const dryRun of [false, true]) {
+      await expect(
+        upgradePlugin(
+          { name: "fathom", strategy: "theirs", dryRun },
+          {
+            fetch: marketplaceFetch("1.1.0"),
+            workspacePluginsDir: fixture.pluginsDir,
+            materializeLocalPackage: fixture.materializeLocalPackage,
+            localCatalog: localCatalog("1.1.0"),
+            beforeSwap: async () => {},
+          },
+        ),
+      ).rejects.toBeInstanceOf(PluginMergeBaselineError);
+    }
+
+    expect(fixture.calls).toEqual(["plugins/mcp-catalog/fathom@1.0.0"]);
+  });
+
+  test("refuses a theirs upgrade when a clean install cannot be proven", async () => {
+    const fixture = await installBundledPlugin();
+    const meta = readInstallMeta(fixture.installed.target);
+    expect(meta).not.toBeNull();
+    writeFileSync(
+      join(fixture.installed.target, "install-meta.json"),
+      `${JSON.stringify({ ...meta, fingerprint: null }, null, 2)}\n`,
+    );
+
+    await expect(
+      upgradePlugin(
+        { name: "fathom", strategy: "theirs" },
+        {
+          fetch: marketplaceFetch("1.1.0"),
+          workspacePluginsDir: fixture.pluginsDir,
+          materializeLocalPackage: fixture.materializeLocalPackage,
+          localCatalog: localCatalog("1.1.0"),
+          beforeSwap: async () => {},
+        },
+      ),
+    ).rejects.toBeInstanceOf(PluginMergeBaselineError);
+
+    expect(fixture.calls).toEqual(["plugins/mcp-catalog/fathom@1.0.0"]);
+  });
+
+  test("preserves explicit overwrite behavior for edited bundled packages", async () => {
+    const fixture = await installBundledPlugin();
+    writeFileSync(
+      join(fixture.installed.target, "mcp.json"),
+      '{"edited":true}',
+    );
+
+    const result = await upgradePlugin(
+      { name: "fathom", strategy: "overwrite" },
+      {
+        fetch: marketplaceFetch("1.1.0"),
+        workspacePluginsDir: fixture.pluginsDir,
+        materializeLocalPackage: fixture.materializeLocalPackage,
+        localCatalog: localCatalog("1.1.0"),
+        beforeSwap: async () => {},
+      },
+    );
+
+    expect(result.outcome).toBe("upgraded");
+    expect(result.strategy).toBe("overwrite");
+    expect(fixture.calls).toEqual([
+      "plugins/mcp-catalog/fathom@1.0.0",
+      "plugins/mcp-catalog/fathom@1.1.0",
+    ]);
+  });
+
+  test("keeps explicit ours and assistant strategies unavailable for bundled packages", async () => {
+    const fixture = await installBundledPlugin();
+
+    for (const strategy of ["ours", "assistant"] as const) {
+      await expect(
+        upgradePlugin(
+          { name: "fathom", strategy },
+          {
+            fetch: marketplaceFetch("1.1.0"),
+            workspacePluginsDir: fixture.pluginsDir,
+            materializeLocalPackage: fixture.materializeLocalPackage,
+            localCatalog: localCatalog("1.1.0"),
+            beforeSwap: async () => {},
+          },
+        ),
+      ).rejects.toBeInstanceOf(PluginMergeBaselineError);
+    }
+
+    expect(fixture.calls).toEqual(["plugins/mcp-catalog/fathom@1.0.0"]);
   });
 });

package/src/cli/lib/__tests__/plugin-catalog-cache.test.ts

@@ -31,6 +31,12 @@ import type { PluginCatalog } from "../search-plugins.js";
 // the real clock", so the fake clock must start from a positive epoch.
 const BASE_TIME_MS = 1_700_000_000_000;
 
+function githubNames(catalog: PluginCatalog): string[] {
+  return catalog.matches
+    .filter((match) => match.source.kind === "github")
+    .map((match) => match.name);
+}
+
 /** A `deps.fetch` that serves a `/v1/plugins/` payload and counts its calls. */
 function platformFetch(names: string[]): {
   fetch: FetchLike;
@@ -97,7 +103,7 @@ describe("getPluginCatalog", () => {
     // THEN the platform is fetched exactly once — the second call is cached
     expect(calls()).toBe(1);
     expect(first).toBe(second);
-    expect(first.matches.map((m) => m.name)).toEqual(["a"]);
+    expect(githubNames(first)).toEqual(["a"]);
     expect(first.ref).toBe("main");
   });
 
@@ -135,7 +141,7 @@ describe("getPluginCatalog", () => {
     setSystemTime(new Date(BASE_TIME_MS));
     const good = platformFetch(["good"]);
     const cached = await getPluginCatalog("main", { fetch: good.fetch });
-    expect(cached.matches.map((m) => m.name)).toEqual(["good"]);
+    expect(githubNames(cached)).toEqual(["good"]);
 
     // WHEN the TTL has elapsed and the refresh fails
     setSystemTime(new Date(BASE_TIME_MS + PLUGIN_CATALOG_CACHE_TTL_MS + 1));