@mycadet/assistant 0.12.9 → 0.12.11

package/src/cli/lib/__tests__/install-from-github.test.ts

@@ -39,7 +39,11 @@ import {
   resolveTreeRefPath,
   sanitizePluginName,
 } from "../install-from-github.js";
-import { readValidatedPluginIcon } from "../plugin-icon-file.js";
+import { invalidatePluginCatalogCache } from "../plugin-catalog-cache.js";
+
+beforeEach(() => {
+  invalidatePluginCatalogCache();
+});
 
 const CANON_REPO = "vargasjr-dev/mycadet";
 /** Synthetic host the fixtures use for Contents API `download_url`s. */
@@ -54,21 +58,21 @@ const DOWNLOAD_HOST = "https://files.test/";
  * Directory listings are derived from the key set; file `download_url`s point
  * at {@link DOWNLOAD_HOST} and are served with the stored bytes.
  *
- * The marketplace manifest lookup is answered with `manifest` (or a 404 when
- * omitted, so the name resolves to no installable source).
+ * The plugin catalog lookup is answered with `manifest` flattened into cloud
+ * rows (or a 404 when omitted, so the name resolves to no installable source).
  */
 function makeContentsFetch(opts: {
   tree: Record<string, Uint8Array | string | null>;
   manifest?: unknown;
   /**
-   * HTTP status to answer the manifest fetch with. Defaults to 200 (when
+   * HTTP status to answer the catalog fetch with. Defaults to 200 (when
    * `manifest` is provided) or 404 (when omitted). Set to a transient status
-   * (e.g. 500) to simulate a marketplace lookup that fails rather than being
+   * (e.g. 500) to simulate a catalog lookup that fails rather than being
    * absent.
    */
   manifestStatus?: number;
 }): FetchLike {
-  const MANIFEST_URL = `https://api.github.com/repos/${CANON_REPO}/contents/plugins/marketplace.json`;
+  const CATALOG_URL = "https://test-cloud.mycadet.ai/v1/plugins/";
   const CONTENTS = `https://api.github.com/repos/${CANON_REPO}/contents/`;
   const { tree } = opts;
 
@@ -108,16 +112,43 @@ function makeContentsFetch(opts: {
   return (async (input: RequestInfo | URL) => {
     const url = typeof input === "string" ? input : input.toString();
 
-    if (url.startsWith(MANIFEST_URL)) {
+    if (url.startsWith(CATALOG_URL)) {
       if (opts.manifestStatus !== undefined && opts.manifestStatus !== 200) {
-        return new Response("manifest unavailable", {
+        return new Response("catalog unavailable", {
           status: opts.manifestStatus,
         });
       }
       if (opts.manifest === undefined) {
         return new Response("not found", { status: 404 });
       }
-      return new Response(JSON.stringify(opts.manifest), { status: 200 });
+      const manifest = opts.manifest as {
+        plugins?: Array<{
+          name: string;
+          source?: {
+            source: string;
+            repo?: string;
+            ref?: string;
+            path?: string;
+          };
+          description?: string;
+          category?: string;
+          homepage?: string;
+          license?: string;
+          icon?: string;
+        }>;
+      };
+      const rows = (manifest.plugins ?? []).map((entry) => ({
+        name: entry.name,
+        ...(entry.source?.repo ? { repo: entry.source.repo } : {}),
+        ...(entry.source?.ref ? { ref: entry.source.ref } : {}),
+        ...(entry.source?.path ? { path: entry.source.path } : {}),
+        description: entry.description,
+        category: entry.category,
+        homepage: entry.homepage,
+        license: entry.license,
+        icon: entry.icon,
+      }));
+      return new Response(JSON.stringify({ plugins: rows }), { status: 200 });
     }
 
     if (url.startsWith(DOWNLOAD_HOST)) {
@@ -254,113 +285,6 @@ describe("installPlugin — install lifecycle", () => {
     rmSync(ws, { recursive: true, force: true });
   });
 
-  test("installs a bundled standard package and discovers its MCP server", async () => {
-    const result = await installPlugin(
-      {
-        name: "fathom",
-        trustedSource: {
-          kind: "local",
-          path: "plugins/mcp-catalog/fathom",
-          version: "1.0.0",
-        },
-      },
-      {
-        fetch: (async () => {
-          throw new Error("local package install must not fetch");
-        }) as FetchLike,
-        runGit: unusedGitRunner,
-        workspacePluginsDir: pluginsDir,
-        materializeLocalPackage: (path, version, destination) => {
-          expect(path).toBe("plugins/mcp-catalog/fathom");
-          expect(version).toBe("1.0.0");
-          writeFileSync(
-            join(destination, "plugin.json"),
-            JSON.stringify({
-              $schema:
-                "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json",
-              name: "fathom",
-              version: "1.0.0",
-            }),
-          );
-          writeFileSync(
-            join(destination, "mcp.json"),
-            JSON.stringify({
-              $schema:
-                "https://agent-plugins.org/schemas/1.0.0/mcp.schema.json",
-              mcpServers: {
-                fathom: {
-                  type: "streamable-http",
-                  url: "https://api.fathom.ai/mcp",
-                },
-              },
-            }),
-          );
-          return 2;
-        },
-      },
-    );
-
-    expect(result).toMatchObject({
-      name: "fathom",
-      fileCount: 2,
-      ref: "1.0.0",
-      commit: null,
-    });
-    expect(readInstallMeta(result.target)?.source).toEqual({
-      kind: "local",
-      path: "plugins/mcp-catalog/fathom",
-      version: "1.0.0",
-    });
-    expect(
-      readPluginMcpServers({ workspacePluginsDir: pluginsDir }).servers,
-    ).toEqual([
-      expect.objectContaining({
-        pluginName: "fathom",
-        serverKey: "fathom",
-      }),
-    ]);
-  });
-
-  test("installs the reviewed Fathom package from the generated bundle", async () => {
-    const result = await installPlugin(
-      {
-        name: "fathom",
-        trustedSource: {
-          kind: "local",
-          path: "plugins/mcp-catalog/fathom",
-          version: "1.0.2",
-        },
-      },
-      {
-        fetch: (async () => {
-          throw new Error("local package install must not fetch");
-        }) as FetchLike,
-        runGit: unusedGitRunner,
-        workspacePluginsDir: pluginsDir,
-      },
-    );
-
-    expect(result).toMatchObject({
-      name: "fathom",
-      ref: "1.0.2",
-      commit: null,
-    });
-    expect(readValidatedPluginIcon(result.target).hasIcon).toBe(true);
-    expect(
-      readPluginMcpServers({ workspacePluginsDir: pluginsDir }).servers,
-    ).toEqual([
-      expect.objectContaining({
-        pluginName: "fathom",
-        serverKey: "fathom",
-        config: expect.objectContaining({
-          transport: expect.objectContaining({
-            url: "https://api.fathom.ai/mcp",
-          }),
-        }),
-      }),
-    ]);
-  });
-
   test("refuses to overwrite an existing install without --force", async () => {
     // GIVEN a plugin already installed at <pluginsDir>/caveman
     const target = join(pluginsDir, "caveman");
@@ -845,7 +769,7 @@ describe("installPlugin — marketplace resolution", () => {
       ),
     ).rejects.toMatchObject({
       constructor: PluginNotFoundError,
-      message: expect.stringContaining("plugins/marketplace.json"),
+      message: expect.stringContaining("the plugin catalog"),
     });
   });
 

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

@@ -1,10 +1,8 @@
 /**
  * Tests for {@link getPluginCatalog}.
  *
- * Exercises the gate between the cloud fetcher and the bundled reader plus
- * the per-ref TTL cache. Platform paths drive a fake `deps.fetch` returning a
- * `/v1/plugins/` payload (no real network); the offline path reads the bundled
- * manifest and must touch the network zero times.
+ * Exercises the cloud fetcher wiring and the per-ref TTL cache via a fake
+ * `deps.fetch` returning a `/v1/plugins/` payload (no real network).
  */
 
 import {
@@ -19,12 +17,9 @@ import {
 import type { FetchLike } from "../fetch-like.js";
 import {
   getPluginCatalog,
-  getPluginCatalogForInstalledMetadata,
   invalidatePluginCatalogCache,
-  mergePlatformCatalogWithBundledLocals,
   PLUGIN_CATALOG_CACHE_TTL_MS,
 } from "../plugin-catalog-cache.js";
-import { readBundledPluginCatalog } from "../plugin-catalog-local.js";
 import type { SearchPluginsDeps } from "../search-plugins.js";
 import type { PluginCatalog } from "../search-plugins.js";
 
@@ -68,28 +63,13 @@ function failingFetch(): { fetch: FetchLike; calls: () => number } {
   return { fetch, calls: () => calls };
 }
 
-const ORIGINAL_ENV = {
-  IS_CLOUD: process.env.IS_CLOUD,
-  CADET_DISABLE_CLOUD: process.env.CADET_DISABLE_CLOUD,
-};
-
 describe("getPluginCatalog", () => {
   beforeEach(() => {
     invalidatePluginCatalogCache();
-    // Default: platform features enabled (neither flag set).
-    delete process.env.IS_CLOUD;
-    delete process.env.CADET_DISABLE_CLOUD;
   });
 
   afterEach(() => {
     setSystemTime();
-    for (const [key, value] of Object.entries(ORIGINAL_ENV)) {
-      if (value === undefined) {
-        delete process.env[key];
-      } else {
-        process.env[key] = value;
-      }
-    }
   });
 
   test("fetches from the cloud once, then serves cache within the TTL", async () => {
@@ -155,167 +135,4 @@ describe("getPluginCatalog", () => {
     expect(err).toBeInstanceOf(Error);
     expect(failing.calls()).toBe(1);
   });
-
-  test("reads the bundled catalog with zero network when platform is disabled", async () => {
-    // GIVEN platform features disabled (offline / self-hosted)
-    process.env.CADET_DISABLE_CLOUD = "true";
-    delete process.env.IS_CLOUD;
-
-    const { fetch, calls } = platformFetch(["ignored"]);
-    const deps: SearchPluginsDeps = {
-      fetch,
-      featureFlagEnabled: () => true,
-    };
-
-    // WHEN we request the catalog
-    const result = await getPluginCatalog("main", deps);
-
-    // THEN it comes from the bundled manifest and no fetch is made
-    expect(calls()).toBe(0);
-    const bundled = readBundledPluginCatalog();
-    expect(result.matches).toEqual(bundled.matches);
-    // The requested ref is echoed onto the wire contract.
-    expect(result.ref).toBe("main");
-  });
-
-  test("applies feature-flag visibility to bundled catalog entries", async () => {
-    process.env.CADET_DISABLE_CLOUD = "true";
-    delete process.env.IS_CLOUD;
-
-    const { fetch } = platformFetch(["ignored"]);
-    const result = await getPluginCatalog("main", {
-      fetch,
-      featureFlagEnabled: () => false,
-    });
-
-    expect(result.matches.map((match) => match.name)).not.toContain("gamma");
-    expect(result.matches.map((match) => match.name)).toContain("fathom");
-  });
-
-  test("preserves hidden entries for installed-plugin metadata", async () => {
-    process.env.CADET_DISABLE_CLOUD = "true";
-    delete process.env.IS_CLOUD;
-
-    const { fetch } = platformFetch(["ignored"]);
-    const result = await getPluginCatalogForInstalledMetadata("main", {
-      fetch,
-    });
-
-    expect(result.matches.map((match) => match.name)).toContain("gamma");
-  });
-});
-
-describe("mergePlatformCatalogWithBundledLocals", () => {
-  test("adds local packages while keeping a cloud row on name collision", () => {
-    const platform: PluginCatalog = {
-      ref: "main",
-      matches: [
-        {
-          name: "fathom",
-          path: "github:provider/fathom@pin",
-          category: null,
-          source: {
-            kind: "github",
-            repo: "provider/fathom",
-            ref: "0".repeat(40),
-          },
-        },
-      ],
-    };
-    const bundled: PluginCatalog = {
-      ref: "bundled",
-      matches: [
-        {
-          name: "fathom",
-          path: "local:plugins/mcp-catalog/fathom@1.0.0",
-          category: null,
-          source: {
-            kind: "local",
-            path: "plugins/mcp-catalog/fathom",
-            version: "1.0.0",
-          },
-        },
-        {
-          name: "notion",
-          path: "local:plugins/mcp-catalog/notion@1.0.0",
-          category: null,
-          source: {
-            kind: "local",
-            path: "plugins/mcp-catalog/notion",
-            version: "1.0.0",
-          },
-        },
-      ],
-    };
-
-    const merged = mergePlatformCatalogWithBundledLocals(platform, bundled);
-
-    expect(merged.matches.map((match) => match.name)).toEqual([
-      "fathom",
-      "notion",
-    ]);
-    expect(merged.matches[0]?.source.kind).toBe("github");
-    expect(merged.matches[1]?.source.kind).toBe("local");
-    expect(merged.ref).toBe("main");
-  });
-  test("keeps the bundled integration when a cloud row without one shadows it", () => {
-    const integration = {
-      kind: "mcp",
-      displayName: "Fathom",
-      documentationUrl: "https://example.com/docs",
-      verifiedAt: "2026-09-10",
-      verification: "documentation-only",
-      setup: { mode: "oauth", instructions: "Sign in." },
-      logo: "fathom.png",
-    } as const;
-    const platformIntegration = { ...integration, displayName: "Platform" };
-    const platform: PluginCatalog = {
-      ref: "main",
-      matches: [
-        {
-          name: "fathom",
-          path: "github:provider/fathom@pin",
-          category: null,
-          source: {
-            kind: "github",
-            repo: "provider/fathom",
-            ref: "0".repeat(40),
-          },
-        },
-        {
-          name: "linear",
-          path: "github:provider/linear@pin",
-          category: null,
-          integration: platformIntegration,
-          source: {
-            kind: "github",
-            repo: "provider/linear",
-            ref: "0".repeat(40),
-          },
-        },
-      ],
-    };
-    const bundled: PluginCatalog = {
-      ref: "bundled",
-      matches: ["fathom", "linear"].map((name) => ({
-        name,
-        path: `local:plugins/mcp-catalog/${name}@1.0.0`,
-        category: null,
-        integration,
-        source: {
-          kind: "local",
-          path: `plugins/mcp-catalog/${name}`,
-          version: "1.0.0",
-        },
-      })),
-    };
-
-    const merged = mergePlatformCatalogWithBundledLocals(platform, bundled);
-
-    const [fathom, linear] = merged.matches;
-    expect(fathom?.source.kind).toBe("github");
-    expect(fathom?.integration).toEqual(integration);
-    expect(linear?.source.kind).toBe("github");
-    expect(linear?.integration).toEqual(platformIntegration);
-  });
 });

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

@@ -2,9 +2,9 @@
  * Tests for the gated catalog resolvers.
  *
  * `resolveSourceFromMatch` is exercised as a pure function. The catalog-backed
- * resolvers run against the bundled manifest with platform features disabled
- * (`CADET_DISABLE_CLOUD`, zero network), plus a cloud-enabled case that
- * asserts a rejecting catalog fetch propagates rather than resolving to `null`.
+ * resolvers run against a mocked cloud catalog (zero real network), plus a
+ * case that asserts a rejecting catalog fetch propagates rather than
+ * resolving to `null`.
  */
 
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
@@ -39,25 +39,6 @@ function match(
 }
 
 describe("resolveSourceFromMatch", () => {
-  test("returns an exact bundled package path and version", () => {
-    expect(
-      resolveSourceFromMatch({
-        name: "fathom",
-        path: "local:plugins/mcp-catalog/fathom@1.0.0",
-        category: null,
-        source: {
-          kind: "local",
-          path: "plugins/mcp-catalog/fathom",
-          version: "1.0.0",
-        },
-      }),
-    ).toEqual({
-      kind: "local",
-      path: "plugins/mcp-catalog/fathom",
-      version: "1.0.0",
-    });
-  });
-
   test("returns owner/repo/path/ref for a full-SHA match", () => {
     expect(
       resolveSourceFromMatch(
@@ -138,37 +119,39 @@ describe("resolveSourceFromMatch", () => {
   });
 });
 
-describe("catalog-backed resolvers (bundled, offline)", () => {
-  const ORIGINAL_ENV = {
-    IS_CLOUD: process.env.IS_CLOUD,
-    CADET_DISABLE_CLOUD: process.env.CADET_DISABLE_CLOUD,
-  };
-
+describe("catalog-backed resolvers (cloud catalog)", () => {
   beforeEach(() => {
     invalidatePluginCatalogCache();
-    process.env.CADET_DISABLE_CLOUD = "true";
-    delete process.env.IS_CLOUD;
   });
 
   afterEach(() => {
-    for (const [key, value] of Object.entries(ORIGINAL_ENV)) {
-      if (value === undefined) {
-        delete process.env[key];
-      } else {
-        process.env[key] = value;
-      }
-    }
-  });
-
-  // A rejecting fetch proves the bundled path never touches the network.
-  const rejectingDeps: SearchPluginsDeps = {
-    fetch: (async () => {
-      throw new Error("network must not be used");
-    }) as FetchLike,
+    invalidatePluginCatalogCache();
+  });
+
+  /** A `deps.fetch` serving a small `/v1/plugins/` payload. */
+  const catalogDeps: SearchPluginsDeps = {
+    fetch: (async () =>
+      new Response(
+        JSON.stringify({
+          plugins: [
+            {
+              name: "caveman",
+              repo: "JuliusBrussee/caveman",
+              ref: FULL_SHA,
+            },
+            {
+              name: "gamma",
+              repo: "acme/gamma",
+              ref: FULL_SHA,
+            },
+          ],
+        }),
+        { status: 200 },
+      )) as FetchLike,
   };
 
-  test("findCatalogEntry returns the bundled entry for a known name", async () => {
-    const entry = await findCatalogEntry("caveman", rejectingDeps);
+  test("findCatalogEntry returns the catalog entry for a known name", async () => {
+    const entry = await findCatalogEntry("caveman", catalogDeps);
     expect(entry?.name).toBe("caveman");
     expect(entry?.source).toEqual({
       kind: "github",
@@ -180,7 +163,7 @@ describe("catalog-backed resolvers (bundled, offline)", () => {
 
   test("resolvePluginSourceFromCatalog resolves a known name to its pinned source", async () => {
     expect(
-      await resolvePluginSourceFromCatalog("caveman", rejectingDeps),
+      await resolvePluginSourceFromCatalog("caveman", catalogDeps),
     ).toEqual({
       kind: "github",
       owner: "JuliusBrussee",
@@ -192,14 +175,14 @@ describe("catalog-backed resolvers (bundled, offline)", () => {
 
   test("resolvePluginSourceFromCatalog returns null for an unknown name", async () => {
     expect(
-      await resolvePluginSourceFromCatalog("no-such-plugin", rejectingDeps),
+      await resolvePluginSourceFromCatalog("no-such-plugin", catalogDeps),
     ).toBeNull();
   });
 
   test("does not resolve a QA integration while its feature flag is off", async () => {
     expect(
       await resolvePluginSourceFromCatalog("gamma", {
-        ...rejectingDeps,
+        ...catalogDeps,
         featureFlagEnabled: () => false,
       }),
     ).toBeNull();
@@ -208,37 +191,24 @@ describe("catalog-backed resolvers (bundled, offline)", () => {
   test("resolves a QA integration while its feature flag is on", async () => {
     expect(
       await resolvePluginSourceFromCatalog("gamma", {
-        ...rejectingDeps,
+        ...catalogDeps,
         featureFlagEnabled: () => true,
       }),
     ).toMatchObject({
-      kind: "local",
-      path: "plugins/mcp-catalog/gamma",
+      kind: "github",
+      owner: "acme",
+      repo: "gamma",
     });
   });
 });
 
 describe("catalog-backed resolvers (platform enabled)", () => {
-  const ORIGINAL_ENV = {
-    IS_CLOUD: process.env.IS_CLOUD,
-    CADET_DISABLE_CLOUD: process.env.CADET_DISABLE_CLOUD,
-  };
-
   beforeEach(() => {
     invalidatePluginCatalogCache();
-    delete process.env.IS_CLOUD;
-    delete process.env.CADET_DISABLE_CLOUD;
   });
 
   afterEach(() => {
     invalidatePluginCatalogCache();
-    for (const [key, value] of Object.entries(ORIGINAL_ENV)) {
-      if (value === undefined) {
-        delete process.env[key];
-      } else {
-        process.env[key] = value;
-      }
-    }
   });
 
   test("propagates PluginCatalogUnavailableError instead of resolving to null", async () => {

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

@@ -6,16 +6,14 @@ import {
 } from "../plugin-catalog-visibility.js";
 import type { PluginCatalog, PluginSearchMatch } from "../search-plugins.js";
 
+const SHA = "0".repeat(40);
+
 function match(name: string): PluginSearchMatch {
   return {
     name,
-    path: `local:plugins/mcp-catalog/${name}@1.0.0`,
+    path: `github:acme/${name}@${SHA}`,
     category: null,
-    source: {
-      kind: "local",
-      path: `plugins/mcp-catalog/${name}`,
-      version: "1.0.0",
-    },
+    source: { kind: "github", repo: `acme/${name}`, ref: SHA },
   };
 }