@mycadet/assistant 0.12.9 → 0.12.11

package/src/cli/commands/plugins.ts

@@ -13,7 +13,7 @@ import type { Command } from "commander";
 
 import { cliIpcCall } from "../../ipc/cli-client.js";
 import { stripAnsiAndControlChars } from "../../util/ansi.js";
-import { getWorkspacePluginsDir } from "../../util/platform.js";
+import { getWorkspacePluginsDir } from "../../util/layout.js";
 import { truncate } from "../../util/truncate.js";
 import { resolveBundledCliModule } from "../bundled-modules.js";
 import { yellow } from "../lib/cli-colors.js";
@@ -36,13 +36,13 @@ import {
   looksLikeGitHubSpec,
   parseGitHubPluginSpec,
 } from "../lib/parse-github-plugin-spec.js";
+import { isPluginCatalogEntryVisible } from "../lib/plugin-catalog-visibility.js";
 import {
   DEFAULT_PLUGIN_REF,
   PLUGIN_UPGRADE_STRATEGIES,
   type PluginUpgradeStrategy,
 } from "../lib/plugin-constants.js";
 import type { FingerprintComparison } from "../lib/plugin-fingerprint.js";
-import type { PluginPinHistoryEntry } from "../lib/plugin-pin-history.js";
 import type { PluginScheduleSurface } from "../lib/plugin-surfaces.js";
 import { runPublish } from "../lib/publish-plugin.js";
 import { registerCommand } from "../lib/register-command.js";
@@ -71,15 +71,6 @@ const libs = {
         ) as typeof import("../lib/plugin-catalog-cache.js"),
     );
   },
-  get catalogLocal() {
-    return resolveBundledCliModule(
-      "pluginCatalogLocal",
-      () =>
-        loadModule(
-          "../lib/plugin-catalog-local.js",
-        ) as typeof import("../lib/plugin-catalog-local.js"),
-    );
-  },
   get diff() {
     return resolveBundledCliModule(
       "pluginDiff",
@@ -125,15 +116,6 @@ const libs = {
         ) as typeof import("../lib/list-installed-plugins.js"),
     );
   },
-  get pinHistory() {
-    return resolveBundledCliModule(
-      "pluginPinHistory",
-      () =>
-        loadModule(
-          "../lib/plugin-pin-history.js",
-        ) as typeof import("../lib/plugin-pin-history.js"),
-    );
-  },
   get search() {
     return resolveBundledCliModule(
       "pluginSearch",
@@ -232,90 +214,38 @@ export function registerPluginsCommand(program: Command): void {
             let untrusted = false;
             if (!direct && !usesMarketplaceGit) {
               // Platform-managed install serves a verified tarball from the
-              // pinned commit. With platform features disabled (air-gapped /
-              // self-hosted) there is no platform to call, so resolve the pin
-              // from the bundled catalog and install through the GitHub path.
-              const platformEnabled =
-                libs.catalogLocal.areCloudFeaturesEnabled();
-              if (platformEnabled) {
-                if (!libs.catalogLocal.isPluginCatalogEntryVisible(nameOrUrl)) {
-                  console.error(
-                    `Plugin "${nameOrUrl}" is not in the marketplace catalog.`,
-                  );
-                  process.exitCode = 1;
-                  return;
-                }
-                let match;
-                let catalogResolved = false;
-                try {
-                  match = (
-                    await libs.catalogCache.getPluginCatalog(
-                      DEFAULT_PLUGIN_REF,
-                      { fetch: globalThis.fetch.bind(globalThis) },
-                    )
-                  ).matches.find((candidate) => candidate.name === nameOrUrl);
-                  catalogResolved = true;
-                } catch {
-                  // The install endpoint remains authoritative and can succeed
-                  // independently when catalog discovery is unavailable.
-                }
-                if (!match && catalogResolved) {
-                  console.error(
-                    `Plugin "${nameOrUrl}" is not in the marketplace catalog.`,
-                  );
-                  process.exitCode = 1;
-                  return;
-                }
-                if (match?.source.kind === "local") {
-                  result = await libs.installGitHub.installPlugin(
-                    {
-                      name: nameOrUrl,
-                      force: opts.force,
-                      trustedSource: match.source,
-                    },
-                    { fetch: globalThis.fetch.bind(globalThis), confirmStaged },
-                  );
-                } else {
-                  result = await libs.installPlatform.installPluginViaPlatform(
-                    { name: nameOrUrl, force: opts.force },
-                    { fetch: globalThis.fetch.bind(globalThis), confirmStaged },
-                  );
-                }
-              } else {
-                const source =
-                  libs.catalogLocal.resolveBundledPluginSource(nameOrUrl);
-                if (!source) {
-                  console.error(
-                    `Plugin "${nameOrUrl}" is not in the bundled marketplace catalog.`,
-                  );
-                  process.exitCode = 1;
-                  return;
-                }
-                if (source.kind === "local") {
-                  result = await libs.installGitHub.installPlugin(
-                    {
-                      name: nameOrUrl,
-                      force: opts.force,
-                      trustedSource: source,
-                    },
-                    { fetch: globalThis.fetch.bind(globalThis), confirmStaged },
-                  );
-                } else {
-                  result = await libs.installGitHub.installPlugin(
-                    {
-                      name: nameOrUrl,
-                      force: opts.force,
-                      trustedSource: {
-                        owner: source.owner,
-                        repo: source.repo,
-                        rootPath: source.path,
-                        ref: source.ref,
-                      },
-                    },
-                    { fetch: globalThis.fetch.bind(globalThis), confirmStaged },
-                  );
-                }
+              // pinned commit.
+              if (!isPluginCatalogEntryVisible(nameOrUrl)) {
+                console.error(
+                  `Plugin "${nameOrUrl}" is not in the marketplace catalog.`,
+                );
+                process.exitCode = 1;
+                return;
+              }
+              let match;
+              let catalogResolved = false;
+              try {
+                match = (
+                  await libs.catalogCache.getPluginCatalog(DEFAULT_PLUGIN_REF, {
+                    fetch: globalThis.fetch.bind(globalThis),
+                  })
+                ).matches.find((candidate) => candidate.name === nameOrUrl);
+                catalogResolved = true;
+              } catch {
+                // The install endpoint remains authoritative and can succeed
+                // independently when catalog discovery is unavailable.
+              }
+              if (!match && catalogResolved) {
+                console.error(
+                  `Plugin "${nameOrUrl}" is not in the marketplace catalog.`,
+                );
+                process.exitCode = 1;
+                return;
               }
+              result = await libs.installPlatform.installPluginViaPlatform(
+                { name: nameOrUrl, force: opts.force },
+                { fetch: globalThis.fetch.bind(globalThis), confirmStaged },
+              );
             } else {
               const installOpts = direct
                 ? await resolveDirectInstallOptions(nameOrUrl, opts)
@@ -380,10 +310,7 @@ export function registerPluginsCommand(program: Command): void {
               process.exitCode = 1;
               return;
             }
-            if (
-              err instanceof libs.installGitHub.InvalidPluginNameError ||
-              err instanceof libs.pinHistory.PluginPinHistoryError
-            ) {
+            if (err instanceof libs.installGitHub.InvalidPluginNameError) {
               console.error(err.message);
               process.exitCode = 1;
               return;
@@ -395,51 +322,6 @@ export function registerPluginsCommand(program: Command): void {
         },
       );
 
-      subcommand(plugins, "versions").action(
-        async (name: string, opts: { json?: boolean; limit?: string }) => {
-          let limit: number | undefined;
-          if (opts.limit !== undefined) {
-            limit = Number.parseInt(opts.limit, 10);
-            if (!Number.isInteger(limit) || limit < 1) {
-              console.error("--limit must be a positive integer.");
-              process.exitCode = 1;
-              return;
-            }
-          }
-          try {
-            const history = await libs.pinHistory.listPinHistory(
-              name,
-              { fetch: globalThis.fetch.bind(globalThis) },
-              limit !== undefined ? { limit } : {},
-            );
-
-            if (opts.json) {
-              process.stdout.write(JSON.stringify(history, null, 2) + "\n");
-              return;
-            }
-
-            // Logged after the JSON early-return so the logger's stdout
-            // writes never corrupt --json output.
-            log.info({ name, count: history.length }, "plugin versions");
-            for (const line of formatVersions(name, history)) {
-              console.log(line);
-            }
-          } catch (err) {
-            if (
-              err instanceof libs.installGitHub.InvalidPluginNameError ||
-              err instanceof libs.pinHistory.PluginPinHistoryError
-            ) {
-              console.error(err.message);
-              process.exitCode = 1;
-              return;
-            }
-            const message = err instanceof Error ? err.message : String(err);
-            console.error(`Plugin versions failed: ${message}`);
-            process.exitCode = 1;
-          }
-        },
-      );
-
       subcommand(plugins, "list").action(
         (opts: { json?: boolean; all?: boolean }) => {
           if (opts.all) {
@@ -976,12 +858,19 @@ async function resolveInstallOptions(
 ): Promise<InstallPluginOptions | null> {
   const force = opts.force ?? false;
 
+  if (opts.ref) {
+    console.error(
+      "--ref named a revision of the retired local marketplace manifest; the catalog now lives in Cadet Cloud. Install by GitHub URL instead.",
+    );
+    return null;
+  }
+
   if (!opts.pin) {
     if (opts.allowUnreviewed) {
       console.error("--allow-unreviewed only applies together with --pin.");
       return null;
     }
-    return { name, force, ref: opts.ref ?? DEFAULT_PLUGIN_REF };
+    return { name, force, ref: DEFAULT_PLUGIN_REF };
   }
 
   const pin = opts.pin.trim();
@@ -991,32 +880,29 @@ async function resolveInstallOptions(
     );
     return null;
   }
-  if (opts.ref) {
-    console.error(
-      "--ref and --pin cannot be combined; --pin already selects the revision.",
-    );
-    return null;
-  }
 
   if (opts.allowUnreviewed) {
-    // Materialize the exact SHA from the plugin's current-manifest repo,
-    // bypassing the reviewed-history check. The adapter stub still comes from
+    // Materialize the exact SHA from the plugin's current-catalog repo,
+    // bypassing the reviewed-pin check. The adapter stub still comes from
     // the default ref, so an adapted plugin may not reproduce faithfully.
     return { name, force, ref: DEFAULT_PLUGIN_REF, commitOverride: pin };
   }
 
-  const entry = await libs.pinHistory.resolvePinToMarketplaceCommit(name, pin, {
+  // Without the old manifest's git history there is no rollback surface: the
+  // only reviewed revision of a plugin is the one the live catalog pins now.
+  const catalog = await libs.catalogCache.getPluginCatalog(DEFAULT_PLUGIN_REF, {
     fetch: globalThis.fetch.bind(globalThis),
   });
-  if (!entry) {
+  const match = catalog.matches.find((candidate) => candidate.name === name);
+  if (!match || match.source.kind !== "github" || match.source.ref !== pin) {
     console.error(
-      `"${pin}" is not a reviewed marketplace pin for "${name}".\n` +
-        `Run \`assistant plugins versions ${name}\` to see available pins, ` +
-        "or pass --allow-unreviewed to install it anyway.",
+      `"${pin}" is not the pin the catalog currently holds for "${name}".\n` +
+        "Rolling back to older reviewed pins is no longer supported; " +
+        "pass --allow-unreviewed to install it anyway.",
     );
     return null;
   }
-  return { name, force, ref: entry.marketplaceCommit };
+  return { name, force, ref: DEFAULT_PLUGIN_REF, commitOverride: pin };
 }
 
 /**
@@ -1330,40 +1216,6 @@ async function printDeclaredSchedulesAfterUpgrade(
   }
 }
 
-/**
- * Render a plugin's marketplace-pin history as a table: the pinned commit (short
- * SHA), when it was promoted, and a marker for the pin currently active. An
- * empty history reports that none was found.
- */
-function formatVersions(
-  name: string,
-  history: readonly PluginPinHistoryEntry[],
-): string[] {
-  if (history.length === 0) {
-    return [`No marketplace pin history found for "${name}".`];
-  }
-  const rows = history.map((entry) => ({
-    pin: shortSha(entry.pin),
-    promoted: formatTimestamp(entry.promotedAt),
-    marker: entry.current ? "(current)" : "",
-  }));
-  const pinW = Math.max(3, ...rows.map((r) => r.pin.length));
-  const promotedW = Math.max(8, ...rows.map((r) => r.promoted.length));
-  const pad = (s: string, w: number) => s + " ".repeat(w - s.length);
-  const lines = [
-    `${pad("PIN", pinW)}  ${pad("PROMOTED", promotedW)}  `.trimEnd(),
-  ];
-  for (const r of rows) {
-    lines.push(
-      `${pad(r.pin, pinW)}  ${pad(r.promoted, promotedW)}  ${r.marker}`.trimEnd(),
-    );
-  }
-  lines.push("");
-  lines.push("Install an older pin with:");
-  lines.push(`  assistant plugins install ${name} --pin <sha> --force`);
-  return lines;
-}
-
 function shortSha(sha: string | null): string {
   return sha ? sha.slice(0, 7) : "—";
 }
@@ -1442,11 +1294,8 @@ function driftLine(changes: FingerprintComparison | null): string {
   return parts.join(", ");
 }
 
-/** Build the display location for a bundled package or GitHub pin. */
+/** Build the display location for a plugin's GitHub pin. */
 function remoteLocation(remote: PluginRemoteInfo): string {
-  if (remote.kind === "local") {
-    return `bundled:${remote.path}`;
-  }
   const base = `https://github.com/${remote.repo}`;
   return remote.path ? `${base}/tree/${remote.commit}/${remote.path}` : base;
 }

package/src/cli/commands/ps.ts

@@ -10,6 +10,7 @@
 import type { Command } from "commander";
 
 import { cliIpcCall, exitFromIpcResult } from "../../ipc/cli-client.js";
+import { truncateCommandLabel } from "../../util/process-tree.js";
 import { applyCommandHelp } from "../lib/cli-command-help.js";
 import { registerCommand } from "../lib/register-command.js";
 import { log } from "../logger.js";
@@ -43,9 +44,11 @@ interface Row {
 /** Flatten the tree into rows, indenting each name to reflect tree depth. */
 function flattenEntries(entry: ProcessEntry, depth: number, rows: Row[]): void {
   rows.push({
-    name: "  ".repeat(depth) + entry.name,
+    // Command-derived labels (and the `pid N` info line) are capped at
+    // render time: a long label pads every row and stretches the table.
+    name: "  ".repeat(depth) + truncateCommandLabel(entry.name),
     origin: entry.origin,
-    info: entry.info ?? "",
+    info: entry.info ? truncateCommandLabel(entry.info) : "",
   });
   for (const child of entry.children ?? []) {
     flattenEntries(child, depth + 1, rows);

package/src/cli/commands/status.ts

@@ -4,7 +4,7 @@ import type { Command } from "commander";
 
 import { cliIpcCall } from "../../ipc/cli-client.js";
 import { getAssistantSocketPath } from "../../ipc/socket-path.js";
-import { getWorkspaceDirDisplay } from "../../util/platform.js";
+import { getWorkspaceDirDisplay } from "../../util/layout.js";
 import { APP_VERSION } from "../../version.js";
 import { applyCommandHelp } from "../lib/cli-command-help.js";
 import { registerCommand } from "../lib/register-command.js";

package/src/cli/index.help.ts

@@ -52,7 +52,6 @@ import { sequenceHelp } from "./commands/sequence.help.js";
 import { skillsHelp } from "./commands/skills.help.js";
 import { statusHelp } from "./commands/status.help.js";
 import { sttHelp } from "./commands/stt.help.js";
-import { telemetryHelp } from "./commands/telemetry.help.js";
 import { toolsHelp } from "./commands/tools.help.js";
 import { trustHelp } from "./commands/trust.help.js";
 import { ttsHelp } from "./commands/tts.help.js";
@@ -105,7 +104,6 @@ export const CLI_COMMAND_HELP: readonly CliCommandHelp[] = [
   skillsHelp,
   statusHelp,
   sttHelp,
-  telemetryHelp,
   toolsHelp,
   trustHelp,
   ttsHelp,

package/src/cli/lib/__tests__/inspect-plugin.test.ts

@@ -18,8 +18,8 @@ import {
   inspectPlugin,
   PluginInspectNotFoundError,
 } from "../inspect-plugin.js";
+import { invalidatePluginCatalogCache } from "../plugin-catalog-cache.js";
 import { computeFingerprint } from "../plugin-fingerprint.js";
-import type { PluginCatalog } from "../search-plugins.js";
 
 const SHA_A = "a".repeat(40);
 const SHA_B = "b".repeat(40);
@@ -42,12 +42,12 @@ function manifestWith(name: string, ref: string): unknown {
 }
 
 /**
- * Build a `fetch` that serves the marketplace manifest and the GitHub commit
- * API. `marketplace: undefined` answers 404 (empty catalog); `fail: true`
- * rejects the marketplace request with a network error. `remoteCommitDate`
- * seeds the committer date the GitHub commit endpoint returns (its absence
- * 404s, so the remote timestamp degrades to `null`). Anything else surfaces a
- * 500 so test bugs are loud.
+ * Build a `fetch` that serves the plugin catalog (a manifest flattened into
+ * cloud rows) and the GitHub commit API. `marketplace: undefined` answers 404
+ * (empty catalog); `fail: true` rejects the catalog request with a network
+ * error. `remoteCommitDate` is unused by the catalog-backed reader (the cloud
+ * catalog carries no commit dates). Anything else surfaces a 500 so test bugs
+ * are loud.
  */
 function makeFetch(opts: {
   marketplace?: unknown;
@@ -56,14 +56,33 @@ function makeFetch(opts: {
 }): FetchLike {
   return (async (input: RequestInfo | URL) => {
     const url = typeof input === "string" ? input : input.toString();
-    if (url.includes("marketplace.json")) {
+    if (url.includes("/v1/plugins")) {
       if (opts.fail) {
         throw new Error("network down");
       }
       if (opts.marketplace === undefined) {
-        return new Response("not found", { status: 404 });
+        return new Response(JSON.stringify({ plugins: [] }), { status: 200 });
       }
-      return new Response(JSON.stringify(opts.marketplace), { status: 200 });
+      const manifest = opts.marketplace as {
+        plugins?: Array<{
+          name: string;
+          source?: { source: string; repo?: string; ref?: string };
+          description?: string;
+          category?: string;
+          homepage?: string;
+          license?: string;
+        }>;
+      };
+      const rows = (manifest.plugins ?? []).map((entry) => ({
+        name: entry.name,
+        ...(entry.source?.repo ? { repo: entry.source.repo } : {}),
+        ...(entry.source?.ref ? { ref: entry.source.ref } : {}),
+        description: entry.description,
+        category: entry.category,
+        homepage: entry.homepage,
+        license: entry.license,
+      }));
+      return new Response(JSON.stringify({ plugins: rows }), { status: 200 });
     }
     if (url.includes("api.github.com") && url.includes("/commits/")) {
       if (opts.remoteCommitDate === undefined) {
@@ -150,6 +169,9 @@ let workspace: string;
 
 beforeEach(() => {
   workspace = mkdtempSync(join(tmpdir(), "inspect-plugin-"));
+  invalidatePluginCatalogCache();
+  delete process.env.CADET_DISABLE_CLOUD;
+  delete process.env.IS_CLOUD;
 });
 
 afterEach(() => {
@@ -196,10 +218,11 @@ describe("inspectPlugin", () => {
       { fetch, workspacePluginsDir: workspace },
     );
 
-    // THEN the installed timestamp comes from the sidecar and the remote one
-    // is resolved from GitHub — both as ISO-8601 UTC strings
+    // THEN the installed timestamp comes from the sidecar; the cloud catalog
+    // carries no commit dates, so the remote side reports the bare SHA
     expect(result.local?.committedAt).toBe("2026-06-01T12:34:56.000Z");
-    expect(result.remote?.committedAt).toBe("2026-06-05T08:12:24.000Z");
+    expect(result.remote?.committedAt).toBeNull();
+    expect(result.remote?.commit).toBe(SHA_B);
   });
 
   test("leaves the remote timestamp null when the commit date cannot be fetched", async () => {
@@ -335,59 +358,6 @@ describe("inspectPlugin", () => {
     expect(result.local?.description).toBe("Installed copy.");
   });
 
-  test("previews an uninstalled bundled provider offline without fetching GitHub", async () => {
-    const savedDisablePlatform = process.env.CADET_DISABLE_CLOUD;
-    const savedIsPlatform = process.env.IS_CLOUD;
-    process.env.CADET_DISABLE_CLOUD = "true";
-    delete process.env.IS_CLOUD;
-    let fetchCalls = 0;
-    const fetch = (async () => {
-      fetchCalls += 1;
-      throw new Error("offline");
-    }) as FetchLike;
-    const localCatalog: PluginCatalog = {
-      ref: "bundled",
-      matches: [
-        {
-          name: "fathom",
-          path: "local:plugins/mcp-catalog/fathom@1.0.0",
-          category: "productivity",
-          source: {
-            kind: "local",
-            path: "plugins/mcp-catalog/fathom",
-            version: "1.0.0",
-          },
-        },
-      ],
-    };
-
-    try {
-      const result = await inspectPlugin(
-        { name: "fathom" },
-        { fetch, workspacePluginsDir: workspace, localCatalog },
-      );
-
-      expect(result.status).toBe("not-installed");
-      expect(result.remote).toMatchObject({
-        kind: "local",
-        path: "plugins/mcp-catalog/fathom",
-        version: "1.0.0",
-      });
-      expect(fetchCalls).toBe(0);
-    } finally {
-      if (savedDisablePlatform === undefined) {
-        delete process.env.CADET_DISABLE_CLOUD;
-      } else {
-        process.env.CADET_DISABLE_CLOUD = savedDisablePlatform;
-      }
-      if (savedIsPlatform === undefined) {
-        delete process.env.IS_CLOUD;
-      } else {
-        process.env.IS_CLOUD = savedIsPlatform;
-      }
-    }
-  });
-
   test("reports remote-unavailable when the marketplace cannot be reached", async () => {
     // GIVEN an installed plugin and a failing marketplace fetch
     installPlugin(workspace, "level-up", { sidecar: { commit: SHA_A } });

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

@@ -30,7 +30,7 @@ import {
   readInstallMeta,
 } from "../install-from-github.js";
 
-const PLATFORM = "https://platform.test";
+const PLATFORM = "https://test-cloud.mycadet.ai";
 
 // ─── Tar/gzip fixtures ───────────────────────────────────────────────────────