@mycadet/assistant 0.12.9 → 0.12.11

package/src/cli/lib/plugin-marketplace.ts

@@ -1,59 +1,33 @@
 /**
- * Read the curated plugin marketplace manifest from the canonical repo.
+ * Shared plugin source schemas and types for catalog-backed installs.
  *
- * The manifest at `plugins/marketplace.json` whitelists reviewed plugins so
- * they appear in `assistant plugins search` / the web catalog and become
- * installable by name. Its shape extends the Claude Code marketplace manifest
- * (https://code.claude.com/docs/en/plugin-marketplaces) with packages embedded
- * in the assistant distribution.
+ * The old local marketplace manifest (`plugins/marketplace.json`) and its
+ * GitHub fetcher are gone: the installable catalog is Cadet Cloud's
+ * (`GET /v1/plugins`, see {@link ./plugin-catalog-cloud}). What remains here
+ * is the contract every catalog source must satisfy when a name resolves to
+ * install coordinates.
  *
- * The manifest is both fetched from the repo at a git ref and bundled into the
- * assistant build. GitHub entries may grow without a new release. Local entries
- * can only resolve when their exact path and version are embedded in that
- * release.
- * Every external source pins an explicit `ref` that MUST be a full commit SHA:
- * the fetched code is locked to an immutable revision. Tags and branches are
- * rejected because they are mutable — an upstream owner could retag/repoint
+ * Every external source pins an explicit `ref` that MUST be a full commit
+ * SHA: the fetched code is locked to an immutable revision. Tags and branches
+ * are rejected because they are mutable — an upstream owner could retag/repoint
  * them to attacker code that the daemon would then `import()` (the install
- * tree is dynamically loaded). A SHA cannot be repointed, so the reviewed
- * manifest fully determines what gets executed.
- *
- * Designed for direct programmatic use with an injected `fetch`, mirroring
- * {@link ./search-plugins} and {@link ./install-from-github}.
+ * tree is dynamically loaded). A SHA cannot be repointed, so a reviewed
+ * catalog fully determines what gets executed.
  */
 
 import { z } from "zod";
 
-import type { FetchLike } from "./fetch-like.js";
-import { USER_AGENT } from "./user-agent.js";
-
-/** Canonical location of the marketplace manifest. */
-const MARKETPLACE_SOURCE_OWNER = "vargasjr-dev";
-const MARKETPLACE_SOURCE_REPO = "mycadet";
-const MARKETPLACE_FILE_PATH = "plugins/marketplace.json";
-
-/**
- * Canonical GitHub coordinates of the marketplace manifest, exported so
- * sibling readers (e.g. {@link ./plugin-pin-history}) resolve the same
- * `owner/repo:path` rather than re-declaring it.
- */
-export const MARKETPLACE_MANIFEST_LOCATION = {
-  owner: MARKETPLACE_SOURCE_OWNER,
-  repo: MARKETPLACE_SOURCE_REPO,
-  path: MARKETPLACE_FILE_PATH,
-} as const;
-
 // ---------------------------------------------------------------------------
-// Manifest schema (subset of the Claude Code marketplace schema)
+// Source schemas (subset of the Claude Code marketplace schema)
 // ---------------------------------------------------------------------------
 
 /** `owner/repo`, kebab/underscore/dot segments — matches GitHub's slug rules. */
 const REPO_SLUG_RE = /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/;
 /** Install name: a single kebab-case path segment (same rule as the CLI). */
-const PLUGIN_NAME_RE = /^[a-z0-9][a-z0-9_-]*$/;
+export const PLUGIN_NAME_RE = /^[a-z0-9][a-z0-9_-]*$/;
 /**
  * Full Git commit SHA — 40 hex chars (SHA-1) or 64 (SHA-256). External
- * marketplace refs must be a complete object name so the install is pinned to
+ * catalog refs must be a complete object name so the install is pinned to
  * an immutable revision; abbreviated SHAs, tags, and branches are all mutable
  * or ambiguous and are rejected.
  */
@@ -78,7 +52,7 @@ export const githubSourceSchema = z.object({
   /**
    * Immutable revision to fetch the plugin from. Must be a full commit SHA:
    * tags and branches are mutable, so allowing them would let an upstream
-   * owner retarget a curated entry at code the daemon later `import()`s (RCE).
+   * owner retarget a curated entry at code the daemon later `import()` (RCE).
    * A full SHA pins the install to exactly the reviewed bytes.
    */
   ref: z
@@ -89,32 +63,7 @@ export const githubSourceSchema = z.object({
     ),
 });
 
-/**
- * A plugin package shipped inside the assistant distribution. The path is a
- * key into the generated bundled-package map, never a path resolved from the
- * current working directory.
- */
-export const localSourceSchema = z.object({
-  source: z.literal("local"),
-  path: z
-    .string()
-    .regex(/^plugins\/[A-Za-z0-9_.-]+(?:\/[A-Za-z0-9_.-]+)+$/)
-    .refine(
-      (path) =>
-        !path
-          .split(/[/\\]/)
-          .some((segment) => segment === "." || segment === ".."),
-      "path must be a clean bundled-package path",
-    ),
-  version: z.string().min(1),
-  repo: z.never().optional(),
-  ref: z.never().optional(),
-});
-
-export const marketplaceSourceSchema = z.discriminatedUnion("source", [
-  githubSourceSchema,
-  localSourceSchema,
-]);
+export const marketplaceSourceSchema = githubSourceSchema;
 
 export const mcpIntegrationSchema = z.object({
   kind: z.literal("mcp"),
@@ -140,7 +89,7 @@ export const mcpIntegrationSchema = z.object({
   oauthProvider: z.string().regex(PLUGIN_NAME_RE).optional(),
 });
 
-const marketplaceEntrySchema = z.object({
+export const marketplaceEntrySchema = z.object({
   /** Install name. `assistant plugins install <name>` resolves to this entry. */
   name: z.string().regex(PLUGIN_NAME_RE, "expected a kebab-case install name"),
   source: marketplaceSourceSchema,
@@ -165,34 +114,6 @@ const marketplaceEntrySchema = z.object({
   integration: mcpIntegrationSchema.optional(),
 });
 
-const marketplaceManifestBaseSchema = z.object({
-  name: z.string(),
-  owner: z
-    .object({
-      name: z.string(),
-      url: z.string().optional(),
-      email: z.string().optional(),
-    })
-    .optional(),
-});
-
-export const marketplaceManifestSchema = marketplaceManifestBaseSchema.extend({
-  plugins: z.array(marketplaceEntrySchema),
-});
-
-const fetchedMarketplaceManifestSchema = marketplaceManifestBaseSchema.extend({
-  plugins: z.array(z.unknown()),
-});
-
-const marketplaceSourceDiscriminatorSchema = z.object({
-  source: z.object({ source: z.unknown() }),
-});
-
-function readSourceDiscriminator(entry: unknown): unknown {
-  const parsed = marketplaceSourceDiscriminatorSchema.safeParse(entry);
-  return parsed.success ? parsed.data.source.source : null;
-}
-
 /** A single reviewed plugin entry. */
 export type MarketplaceEntry = z.infer<typeof marketplaceEntrySchema>;
 
@@ -207,173 +128,4 @@ export interface ResolvedGitHubPluginSource {
   readonly ref: string;
 }
 
-/** Concrete bundled-package coordinates an entry resolves to for install. */
-export interface ResolvedLocalPluginSource {
-  readonly kind: "local";
-  readonly path: string;
-  readonly version: string;
-}
-
-export type ResolvedPluginSource =
-  | ResolvedGitHubPluginSource
-  | ResolvedLocalPluginSource;
-
-/** Options controlling which marketplace revision to read. */
-export interface FetchMarketplaceOptions {
-  /** Ref of the canonical repo to read the manifest from. */
-  readonly ref: string;
-}
-
-/** Dependencies injected by the caller. */
-export interface FetchMarketplaceDeps {
-  /** HTTP client. Production callers pass `globalThis.fetch.bind(globalThis)`. */
-  readonly fetch: FetchLike;
-}
-
-/**
- * The manifest could not be read or did not validate. Distinct from "no
- * manifest at this ref" (a missing file is a normal, empty result) — this
- * signals an upstream/parse problem the caller must surface.
- *
- * `transient` distinguishes a retryable upstream hiccup (GitHub rate-limited
- * us or returned a 5xx) from a hard failure (a malformed or invalid manifest).
- * The catalog is the source of truth for installable plugins, so a transient
- * fetch failure should map to a retryable 503 and serve a stale cache, while a
- * hard failure surfaces as a real error.
- */
-export class MarketplaceFetchError extends Error {
-  /** Whether the failure is a retryable upstream hiccup vs a hard error. */
-  readonly transient: boolean;
-  /** Upstream HTTP status, when the failure originated from a response. */
-  readonly status?: number;
-  constructor(
-    message: string,
-    opts?: { transient?: boolean; status?: number },
-  ) {
-    super(message);
-    this.name = "MarketplaceFetchError";
-    this.transient = opts?.transient ?? false;
-    if (opts?.status !== undefined) {
-      this.status = opts.status;
-    }
-  }
-}
-
-/**
- * Classify an upstream GitHub status as transient (worth retrying) vs hard.
- * A 429 or 5xx is always transient. A 403 is GitHub's unauthenticated
- * rate-limit signal only when the remaining-quota header is exhausted — a 403
- * without it is a genuine authorization failure and stays hard.
- */
-function isTransientUpstreamStatus(res: Response): boolean {
-  if (res.status === 429 || res.status >= 500) {
-    return true;
-  }
-  if (res.status === 403) {
-    return res.headers.get("x-ratelimit-remaining") === "0";
-  }
-  return false;
-}
-
-/**
- * Fetch and validate the marketplace manifest, returning its plugin entries.
- *
- * A missing manifest (HTTP 404) is treated as an empty whitelist — an empty
- * catalog is a valid state, not an error. Any other HTTP failure, a non-JSON
- * body, or a schema violation throws {@link MarketplaceFetchError}; a
- * rate-limit or 5xx is flagged `transient` so the caller can retry.
- */
-export async function fetchMarketplaceEntries(
-  deps: FetchMarketplaceDeps,
-  opts: FetchMarketplaceOptions,
-): Promise<readonly MarketplaceEntry[]> {
-  const { ref } = opts;
-  const url =
-    `https://api.github.com/repos/${MARKETPLACE_SOURCE_OWNER}/${MARKETPLACE_SOURCE_REPO}` +
-    `/contents/${MARKETPLACE_FILE_PATH}?ref=${encodeURIComponent(ref)}`;
-
-  const res = await deps.fetch(url, {
-    headers: {
-      // Ask for the raw file body rather than the base64-wrapped Contents
-      // envelope, so the response text is the manifest JSON directly.
-      Accept: "application/vnd.github.raw",
-      "User-Agent": USER_AGENT,
-    },
-  });
-
-  if (res.status === 404) {
-    return [];
-  }
-  if (!res.ok) {
-    throw new MarketplaceFetchError(
-      `Marketplace manifest fetch failed for ${MARKETPLACE_FILE_PATH} @ ${ref}: HTTP ${res.status}`,
-      { transient: isTransientUpstreamStatus(res), status: res.status },
-    );
-  }
-
-  let json: unknown;
-  try {
-    json = JSON.parse(await res.text());
-  } catch (err) {
-    throw new MarketplaceFetchError(
-      `Marketplace manifest is not valid JSON: ${
-        err instanceof Error ? err.message : String(err)
-      }`,
-    );
-  }
-
-  const parsed = fetchedMarketplaceManifestSchema.safeParse(json);
-  if (!parsed.success) {
-    throw new MarketplaceFetchError(
-      `Marketplace manifest failed validation: ${parsed.error.message}`,
-    );
-  }
-  const entries: MarketplaceEntry[] = [];
-  for (const rawEntry of parsed.data.plugins) {
-    const sourceKind = readSourceDiscriminator(rawEntry);
-    if (
-      typeof sourceKind === "string" &&
-      sourceKind !== "github" &&
-      sourceKind !== "local"
-    ) {
-      continue;
-    }
-    const entry = marketplaceEntrySchema.safeParse(rawEntry);
-    if (!entry.success) {
-      throw new MarketplaceFetchError(
-        `Marketplace manifest failed validation: ${entry.error.message}`,
-      );
-    }
-    entries.push(entry.data);
-  }
-  return entries;
-}
-
-/**
- * Resolve a plugin name to its exact source using the supplied marketplace
- * entries. Returns `null` when no entry claims the name.
- */
-export function resolveMarketplaceSource(
-  name: string,
-  entries: readonly MarketplaceEntry[],
-): ResolvedPluginSource | null {
-  const entry = entries.find((e) => e.name === name);
-  if (!entry) {
-    return null;
-  }
-  if (entry.source.source === "local") {
-    return {
-      kind: "local",
-      path: entry.source.path,
-      version: entry.source.version,
-    };
-  }
-  const [owner, repo] = entry.source.repo.split("/", 2) as [string, string];
-  return {
-    kind: "github",
-    owner,
-    repo,
-    path: entry.source.path ?? "",
-    ref: entry.source.ref,
-  };
-}
+export type ResolvedPluginSource = ResolvedGitHubPluginSource;

package/src/cli/lib/search-plugins.ts

@@ -2,8 +2,8 @@
  * Filtering and projection helpers for the installable plugin catalog.
  *
  * The catalog itself is resolved by {@link ./plugin-catalog-cache}
- * (`getPluginCatalog`), which is platform-first with a bundled offline
- * fallback. This module owns the query semantics on top of a resolved
+ * (`getPluginCatalog`), which fetches it from Cadet Cloud. This module owns
+ * the query semantics on top of a resolved
  * catalog: compile a pattern, filter entries by name, and project a raw
  * marketplace entry onto the catalog match shape.
  *
@@ -24,24 +24,15 @@ export interface SearchPluginsDeps {
 }
 
 /** Where a catalog match comes from. */
-export type PluginMatchSource =
-  | {
-      readonly kind: "github";
-      /** `owner/repo` of the external plugin repository. */
-      readonly repo: string;
-      /** Directory within the repo, when the plugin is not at the root. */
-      readonly path?: string;
-      /** Pinned git ref the plugin is fetched from. */
-      readonly ref: string;
-    }
-  | {
-      readonly kind: "local";
-      /** Exact package key in the assistant's embedded plugin bundle. */
-      readonly path: string;
-      readonly version: string;
-      readonly repo?: undefined;
-      readonly ref?: undefined;
-    };
+export type PluginMatchSource = {
+  readonly kind: "github";
+  /** `owner/repo` of the external plugin repository. */
+  readonly repo: string;
+  /** Directory within the repo, when the plugin is not at the root. */
+  readonly path?: string;
+  /** Pinned git ref the plugin is fetched from. */
+  readonly ref: string;
+};
 
 export interface McpPluginIntegration {
   readonly kind: "mcp";
@@ -149,29 +140,18 @@ export interface PluginCatalog {
  * Project a marketplace entry onto the catalog match shape, building a
  * a source-specific locator for display.
  *
- * Shared by the cloud fetcher and bundled reader so all catalog sources
- * project entries identically.
+ * Shared by the cloud fetcher so all catalog entries project identically.
  */
 export function marketplaceMatch(entry: MarketplaceEntry): PluginSearchMatch {
-  const source: PluginMatchSource =
-    entry.source.source === "github"
-      ? {
-          kind: "github",
-          repo: entry.source.repo,
-          path: entry.source.path,
-          ref: entry.source.ref,
-        }
-      : {
-          kind: "local",
-          path: entry.source.path,
-          version: entry.source.version,
-        };
-  const locator =
-    source.kind === "github"
-      ? `github:${source.repo}${source.path ? `/${source.path}` : ""}@${
-          source.ref
-        }`
-      : `local:${source.path}@${source.version}`;
+  const source: PluginMatchSource = {
+    kind: "github",
+    repo: entry.source.repo,
+    path: entry.source.path,
+    ref: entry.source.ref,
+  };
+  const locator = `github:${source.repo}${
+    source.path ? `/${source.path}` : ""
+  }@${source.ref}`;
   return {
     name: entry.name,
     path: locator,
@@ -190,8 +170,8 @@ export function marketplaceMatch(entry: MarketplaceEntry): PluginSearchMatch {
  * (first occurrence wins), map via {@link marketplaceMatch}, and return
  * sorted alphabetically by name.
  *
- * Shared by every catalog source (platform fetcher, bundled reader) so they
- * dedupe, project, and order entries identically.
+ * Shared by the cloud fetcher so entries dedupe, project, and order
+ * identically.
  */
 export function projectMarketplaceEntries(
   entries: Iterable<MarketplaceEntry>,

package/src/cli/lib/toggle-plugin.ts

@@ -26,7 +26,7 @@ import {
 } from "node:fs";
 import { join } from "node:path";
 
-import { getWorkspacePluginsDir } from "../../util/platform.js";
+import { getWorkspacePluginsDir } from "../../util/layout.js";
 
 const DISABLED_FILE = ".disabled";
 

package/src/cli/lib/uninstall-plugin.ts

@@ -18,7 +18,7 @@ import { runShutdownHook } from "../../hooks/hook-loader.js";
 import { MESSAGE_KEYS, t } from "../../i18n/index.js";
 import { isPluginDisabled } from "../../plugins/disabled-state.js";
 import { PLUGIN_MCP_MANIFEST } from "../../plugins/mcp-servers.js";
-import { getWorkspacePluginsDir } from "../../util/platform.js";
+import { getWorkspacePluginsDir } from "../../util/layout.js";
 import {
   InvalidPluginNameError,
   readInstallMeta,

package/src/cli/lib/upgrade-plugin.ts

@@ -49,7 +49,7 @@ import { dirname, join } from "node:path";
 
 import { runShutdownHook } from "../../hooks/hook-loader.js";
 import { PRESERVED_ENTRIES } from "../../plugins/plugin-tree-walk.js";
-import { getWorkspacePluginsDir } from "../../util/platform.js";
+import { getWorkspacePluginsDir } from "../../util/layout.js";
 import type { FetchLike } from "./fetch-like.js";
 import {
   fetchCommitDate,
@@ -64,7 +64,6 @@ import {
   finalizeStagedInstall,
   type GitRunner,
   installPlugin,
-  type InstallPluginDeps,
   isFullCommitSha,
   materializePluginTree,
   type PluginFetchSource,
@@ -95,7 +94,6 @@ import {
   type PluginUpgradeStrategy,
 } from "./plugin-constants.js";
 import { computeFingerprint, fingerprintsEqual } from "./plugin-fingerprint.js";
-import type { PluginCatalog } from "./search-plugins.js";
 import { PluginNotInstalledError } from "./uninstall-plugin.js";
 
 /**
@@ -169,8 +167,6 @@ export interface UpgradePluginDeps {
    * upgrades alike; dry runs and no-ops never stage, so it is not invoked.
    */
   readonly confirmStaged?: ConfirmStagedInstall;
-  readonly materializeLocalPackage?: InstallPluginDeps["materializeLocalPackage"];
-  readonly localCatalog?: PluginCatalog;
 }
 
 /** Result of an upgrade attempt. */
@@ -324,7 +320,6 @@ export async function upgradePlugin(
       {
         fetch: deps.fetch,
         workspacePluginsDir: deps.workspacePluginsDir,
-        localCatalog: deps.localCatalog,
       },
     );
   } catch (err) {
@@ -381,19 +376,6 @@ export async function upgradePlugin(
   const toTimestamp = remote.committedAt;
   const provenanceWasUnknown = inspection.status === "unknown-provenance";
 
-  const localSource = local.source;
-  const sourceChanged =
-    remote.kind === "local"
-      ? localSource?.kind !== "local" || localSource.path !== remote.path
-      : localSource?.kind === "local";
-  if (sourceChanged) {
-    throw new PluginNotUpgradableError(
-      name,
-      "its marketplace source changed; reinstall explicitly with 'plugins install " +
-        `${name} --force' to accept the new source`,
-    );
-  }
-
   if (inspection.status === "up-to-date") {
     return {
       name,
@@ -414,21 +396,6 @@ export async function upgradePlugin(
 
   const usesMergeStrategy =
     strategy === "ours" || strategy === "theirs" || strategy === "assistant";
-  const canOverwriteCleanBundledInstall =
-    remote.kind === "local" &&
-    strategy === "theirs" &&
-    local.localChanges?.clean === true;
-
-  if (
-    remote.kind === "local" &&
-    usesMergeStrategy &&
-    !canOverwriteCleanBundledInstall
-  ) {
-    throw new PluginMergeBaselineError(
-      name,
-      "bundled packages do not retain the previous package version needed for a three-way merge",
-    );
-  }
 
   if (dryRun) {
     return {
@@ -451,7 +418,7 @@ export async function upgradePlugin(
   // `ours`/`theirs`/`assistant` carry local edits forward via a three-way
   // merge; the default `overwrite` discards them and re-installs the pin
   // wholesale.
-  if (usesMergeStrategy && remote.kind !== "local") {
+  if (usesMergeStrategy) {
     const [remoteOwner, remoteRepo] = remote.repo.split("/");
     return mergeUpgrade(
       {
@@ -480,19 +447,7 @@ export async function upgradePlugin(
   }
 
   const result = await installPlugin(
-    {
-      name,
-      force: true,
-      ...(remote.kind === "local"
-        ? {
-            trustedSource: {
-              kind: "local" as const,
-              path: remote.path,
-              version: remote.version ?? remote.commit,
-            },
-          }
-        : {}),
-    },
+    { name, force: true },
     {
       fetch: deps.fetch,
       workspacePluginsDir: deps.workspacePluginsDir,
@@ -501,7 +456,6 @@ export async function upgradePlugin(
       runInstallDeps: deps.runInstallDeps,
       beforeSwap: deps.beforeSwap,
       confirmStaged: deps.confirmStaged,
-      materializeLocalPackage: deps.materializeLocalPackage,
     },
   );
 

package/src/cli/program.ts

@@ -3,7 +3,7 @@ import { existsSync } from "node:fs";
 import { Command } from "commander";
 
 import { initFeatureFlagOverrides } from "../config/assistant-feature-flags.js";
-import { getWorkspaceDir } from "../util/platform.js";
+import { getWorkspaceDir } from "../util/layout.js";
 import { APP_VERSION } from "../version.js";
 import { registerAppsCommand } from "./commands/apps.js";
 import { registerAttachmentCommand } from "./commands/attachment.js";
@@ -47,7 +47,6 @@ import { registerSequenceCommand } from "./commands/sequence.js";
 import { registerSkillsCommand } from "./commands/skills.js";
 import { registerStatusCommand } from "./commands/status.js";
 import { registerSttCommand } from "./commands/stt.js";
-import { registerTelemetryCommand } from "./commands/telemetry.js";
 import { registerToolsCommand } from "./commands/tools.js";
 import { registerTrustCommand } from "./commands/trust.js";
 import { registerTtsCommand } from "./commands/tts.js";
@@ -145,7 +144,6 @@ Examples:
   registerStatusCommand(program);
   registerSkillsCommand(program);
   registerSttCommand(program);
-  registerTelemetryCommand(program);
   registerToolsCommand(program);
   registerTrustCommand(program);
   registerTtsCommand(program);

package/src/cli.ts

@@ -34,7 +34,7 @@ import {
   watchEventStream,
 } from "./signals/event-stream.js";
 import { formatDiff, formatNewFileDiff } from "./util/diff.js";
-import { getHistoryPath, getSignalsDir } from "./util/platform.js";
+import { getHistoryPath, getSignalsDir } from "./util/layout.js";
 import { Spinner } from "./util/spinner.js";
 import { timeAgo } from "./util/time.js";
 import { truncate } from "./util/truncate.js";

package/src/cloud/client.ts

@@ -12,7 +12,6 @@ import { resolveCloudProxyContext } from "../providers/cloud-proxy/context.js";
 import { credentialKey } from "../security/credential-key.js";
 import { getSecureKeyAsync } from "../security/secure-keys.js";
 import { getLogger } from "../util/logger.js";
-import { areCloudFeaturesEnabled } from "./feature-gate.js";
 
 const log = getLogger("cloud-client");
 
@@ -54,11 +53,6 @@ interface CloudClientConfig {
  * key). The assistant ID is resolved but not required.
  */
 async function resolveCloudClientConfig(): Promise<CloudClientConfig | null> {
-  if (!areCloudFeaturesEnabled()) {
-    log.debug("platform features disabled -- returning null");
-    return null;
-  }
-
   const ctx = await resolveCloudProxyContext();
 
   const baseUrl = ctx.enabled ? ctx.cloudBaseUrl : "";