convex 1.48.0 → 1.49.0-alpha.0

package/dist/esm/cli/lib/plugins/codex.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../src/cli/lib/plugins/codex.ts"],
+  "sourcesContent": ["import os from \"os\";\nimport path from \"path\";\nimport { z } from \"zod\";\nimport { nodeFs } from \"../../../bundler/fs.js\";\nimport type { Cli, Places } from \"./harness.js\";\nimport {\n  convexMarketplaces,\n  type Marketplace,\n  type Plugin,\n} from \"./marketplaces.js\";\nimport {\n  fetchGitHubJson,\n  onPath,\n  parseList,\n  subfolders,\n  versionOf,\n} from \"./utils.js\";\n\n/** Builds `getCodexLocations` for the given places, so tests can point it at fixtures. */\nexport const createGetCodexLocations =\n  (places: Places) => async (): Promise<Cli[]> => {\n    // The ChatGPT app also has `codex-cli/bin/codex`, a script that runs this\n    // binary. Running that script from another app sets off macOS's App\n    // Management prompt, and running the binary doesn't.\n    const desktop = path.join(\n      places.applications,\n      \"ChatGPT.app\",\n      \"Contents\",\n      \"Resources\",\n      \"codex-cli\",\n      \"CodexCLI.app\",\n      \"Contents\",\n      \"MacOS\",\n      \"codex\",\n    );\n    const found: Omit<Cli, \"version\">[] = [\n      ...onPath(\"codex\", places.path).map((p) => ({\n        source: \"terminal\" as const,\n        path: p,\n      })),\n      ...(nodeFs.exists(desktop)\n        ? [{ source: \"desktop\" as const, path: desktop }]\n        : []),\n      // The extension keeps its binary in a folder named for the platform, like\n      // `bin/macos-aarch64`.\n      ...subfolders(path.join(places.home, \".vscode\", \"extensions\"))\n        .filter((dir) => path.basename(dir).startsWith(\"openai.chatgpt-\"))\n        .flatMap((dir) => subfolders(path.join(dir, \"bin\")))\n        .map((dir) => ({\n          source: \"vscode\" as const,\n          path: path.join(dir, \"codex\"),\n        })),\n    ];\n    return Promise.all(\n      found.map(async (cli) => ({\n        ...cli,\n        version: await versionOf(cli.path),\n      })),\n    );\n  };\n\n/** Every copy of Codex on this machine: the terminal CLI, the ChatGPT app's copy and the VS Code extension's copies. */\nexport const getCodexLocations = createGetCodexLocations({\n  home: os.homedir(),\n  path: process.env.PATH ?? \"\",\n  applications: \"/Applications\",\n});\n\n/** The newest Convex plugin a Codex user can install, which is main of our repo. */\nasync function codexLatest(): Promise<Record<string, string>> {\n  const plugin = await fetchGitHubJson<{ version: string }>(\n    \"convex/convex-codex-plugin/main/plugins/convex/.codex-plugin/plugin.json\",\n  );\n  return plugin === null ? {} : { convex: plugin.version };\n}\n\n/** `codex plugin marketplace list --json` */\nconst codexMarketplaceList = z.object({\n  marketplaces: z.array(\n    z.object({\n      name: z.string(),\n      root: z.string(),\n      marketplaceSource: z\n        .object({ sourceType: z.string(), source: z.string() })\n        .optional(),\n    }),\n  ),\n});\n\n/** `codex plugin list --json` */\nconst codexPluginList = z.object({\n  installed: z.array(\n    z.object({\n      name: z.string(),\n      marketplaceName: z.string(),\n      version: z.string(),\n      enabled: z.boolean(),\n    }),\n  ),\n});\n\n/** Reads the plugins in `codex plugin list --json`, or returns null when it doesn't match. */\nfunction codexPlugins(pluginList: string): Plugin[] | null {\n  const plugins = parseList(\n    codexPluginList,\n    pluginList,\n    \"codex plugin list --json\",\n  );\n  if (plugins === null) return null;\n  return plugins.installed.map((p) => ({\n    name: p.name,\n    marketplace: p.marketplaceName,\n    version: p.version,\n    enabled: p.enabled,\n  }));\n}\n\n/** Reads Codex's Convex marketplaces from `codex plugin marketplace list --json` and `codex plugin list --json`, or returns null when either doesn't match. */\nexport function codexMarketplaces(\n  marketplaceList: string,\n  pluginList: string,\n): Marketplace[] | null {\n  const marketplaces = parseList(\n    codexMarketplaceList,\n    marketplaceList,\n    \"codex plugin marketplace list --json\",\n  );\n  const plugins = codexPlugins(pluginList);\n  if (marketplaces === null || plugins === null) return null;\n  return convexMarketplaces(\n    marketplaces.marketplaces.map((m) => ({\n      name: m.name,\n      // Anything that isn't a git marketplace is shown by its folder.\n      source:\n        m.marketplaceSource?.sourceType === \"git\"\n          ? { kind: \"git\", url: m.marketplaceSource.source }\n          : { kind: \"folder\", path: m.root },\n    })),\n    plugins,\n  );\n}\n\nconst pluginId = \"convex@convex-codex-plugin\";\n/** The install step that brings an installed plugin to the latest version. When it fails, the user keeps an old version. */\nconst upgradeStep = [\"plugin\", \"marketplace\", \"upgrade\", \"convex-codex-plugin\"];\n\n/** Codex as `npx convex plugins` installs and reads it. */\nexport const codex = {\n  id: \"codex\" as const,\n  name: \"Codex\",\n  plugin: pluginId,\n  upgradeStep,\n  installSteps: [\n    // Notes:\n    //\n    // 1. The marketplace is added from the `get-convex` org, the org's name\n    //    before the rename to `convex`. Codex refuses to re-add a marketplace\n    //    from a different source, so switching would make install fail for\n    //    anyone who installed before. Switch once install handles an existing\n    //    marketplace.\n    //\n    // 2. Codex installs plugins from its own local copy of each marketplace, so\n    //    it doesn't see the new plugin versions we publish until that copy is\n    //    updated.\n\n    // Add the marketplace\n    [\"plugin\", \"marketplace\", \"add\", \"get-convex/convex-codex-plugin\"],\n    // Update the local copy from GitHub, so the latest plugin version is\n    // available to install - this is important\n    upgradeStep,\n    // Install the latest plugin from the updated marketplace\n    [\"plugin\", \"add\", pluginId],\n  ],\n  plugins: codexPlugins,\n  marketplaces: codexMarketplaces,\n  latest: codexLatest,\n};\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/esm/cli/lib/plugins/harness.js

@@ -0,0 +1,17 @@
+"use strict";
+import * as semver from "semver";
+import { getClaudeCodeLocations } from "./claudeCode.js";
+import { getCodexLocations } from "./codex.js";
+function newest(clis) {
+  const version = (cli) => semver.coerce(cli.version, { includePrerelease: true });
+  return [...clis].sort((a, b) => semver.rcompare(version(a), version(b)))[0];
+}
+export const createGetNewestHarnessLocations = (getters) => async () => ({
+  codex: newest(await getters.getCodexLocations()),
+  claudeCode: newest(await getters.getClaudeCodeLocations())
+});
+export const getNewestHarnessLocations = createGetNewestHarnessLocations({
+  getCodexLocations,
+  getClaudeCodeLocations
+});
+//# sourceMappingURL=harness.js.map

package/dist/esm/cli/lib/plugins/harness.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../src/cli/lib/plugins/harness.ts"],
+  "sourcesContent": ["/**\n * The Claude Code and Codex CLIs found on the user's machine. Users of the\n * desktop apps or the VS Code extensions often have no CLI on PATH, but each\n * app ships its own copy, which takes the same commands and shares the same\n * plugin state as the terminal CLI.\n */\nimport * as semver from \"semver\";\nimport { getClaudeCodeLocations } from \"./claudeCode.js\";\nimport { getCodexLocations } from \"./codex.js\";\n\n/** Where a copy of a harness CLI was found. */\ntype CliSource = \"terminal\" | \"desktop\" | \"vscode\";\n\n/** A copy of a harness CLI and the first line it prints for `--version`. */\nexport type Cli = { source: CliSource; path: string; version: string };\n\n/** Where to look for harness CLIs. */\nexport type Places = {\n  home: string;\n  /** Directories separated like `$PATH`. */\n  path: string;\n  /** Where macOS apps are installed, `/Applications`. */\n  applications: string;\n};\n\n/** The copy with the highest version. Versions compare as semver, where a release beats its prereleases. */\nfunction newest(clis: Cli[]): Cli | undefined {\n  // Every copy printed its version when the finder ran it.\n  const version = (cli: Cli) =>\n    semver.coerce(cli.version, { includePrerelease: true })!;\n  return [...clis].sort((a, b) => semver.rcompare(version(a), version(b)))[0];\n}\n\n/** Builds `getNewestHarnessLocations` from the given location getters, so tests can pass fixed locations. */\nexport const createGetNewestHarnessLocations =\n  (getters: {\n    getCodexLocations: () => Promise<Cli[]>;\n    getClaudeCodeLocations: () => Promise<Cli[]>;\n  }) =>\n  async () => ({\n    codex: newest(await getters.getCodexLocations()),\n    claudeCode: newest(await getters.getClaudeCodeLocations()),\n  });\n\n/** The newest copy of each harness's CLI on this machine, or `undefined` for a harness that isn't installed. */\nexport const getNewestHarnessLocations = createGetNewestHarnessLocations({\n  getCodexLocations,\n  getClaudeCodeLocations,\n});\n"],
+  "mappings": ";AAMA,YAAY,YAAY;AACxB,SAAS,8BAA8B;AACvC,SAAS,yBAAyB;AAkBlC,SAAS,OAAO,MAA8B;AAE5C,QAAM,UAAU,CAAC,QACf,OAAO,OAAO,IAAI,SAAS,EAAE,mBAAmB,KAAK,CAAC;AACxD,SAAO,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,SAAS,QAAQ,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5E;AAGO,aAAM,kCACX,CAAC,YAID,aAAa;AAAA,EACX,OAAO,OAAO,MAAM,QAAQ,kBAAkB,CAAC;AAAA,EAC/C,YAAY,OAAO,MAAM,QAAQ,uBAAuB,CAAC;AAC3D;AAGK,aAAM,4BAA4B,gCAAgC;AAAA,EACvE;AAAA,EACA;AACF,CAAC;",
+  "names": []
+}

package/dist/esm/cli/lib/plugins/marketplaces.js

@@ -0,0 +1,53 @@
+"use strict";
+import { logOutput } from "../../../bundler/log.js";
+import { formatRows } from "./utils.js";
+const pluginNames = ["convex", "convex-beta"];
+export function convexMarketplaces(marketplaces, plugins) {
+  const convex = plugins.filter((p) => pluginNames.includes(p.name));
+  return marketplaces.map((m) => ({
+    ...m,
+    plugins: convex.filter((p) => p.marketplace === m.name)
+  })).filter((m) => m.name.startsWith("convex") || m.plugins.length > 0);
+}
+function sourceText(source) {
+  switch (source.kind) {
+    case "github":
+      return `github.com/${source.repo}`;
+    case "git":
+      return source.url.replace(/^https?:\/\//, "").replace(/\.git$/, "");
+    case "folder":
+      return source.path;
+    case "other":
+      return source.type;
+  }
+}
+export function logMarketplaces(title, marketplaces, latest) {
+  logOutput(title);
+  if (marketplaces.length === 0) {
+    logOutput("  No Convex plugin installed");
+    return;
+  }
+  const marketplaceLines = formatRows(
+    marketplaces.map((m) => [m.name, sourceText(m.source)])
+  );
+  const pluginLines = formatRows(
+    marketplaces.flatMap((m) => m.plugins).map((p) => [
+      p.name,
+      p.version,
+      latest[p.name] === void 0 ? "" : `latest ${latest[p.name]}`,
+      p.scope ?? "-",
+      p.enabled ? "enabled" : "disabled",
+      p.cachedVersion === void 0 ? "" : `cached copy ${p.cachedVersion}`
+    ]),
+    "    "
+  );
+  let next = 0;
+  marketplaces.forEach((m, i) => {
+    logOutput(marketplaceLines[i]);
+    for (const line of pluginLines.slice(next, next + m.plugins.length)) {
+      logOutput(line);
+    }
+    next += m.plugins.length;
+  });
+}
+//# sourceMappingURL=marketplaces.js.map

package/dist/esm/cli/lib/plugins/marketplaces.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../src/cli/lib/plugins/marketplaces.ts"],
+  "sourcesContent": ["import { logOutput } from \"../../../bundler/log.js\";\nimport { formatRows } from \"./utils.js\";\n\n/** Names of the Convex plugins, including the old internal beta. */\nconst pluginNames = [\"convex\", \"convex-beta\"];\n\n/** A Convex plugin as its harness reports it. */\nexport type Plugin = {\n  name: string;\n  marketplace: string;\n  /** The version that runs. */\n  version: string;\n  /** Claude Code only. */\n  scope?: string;\n  enabled: boolean;\n  /** Claude Code folder installs only. The copy cached at install time, when it differs from the folder. */\n  cachedVersion?: string | undefined;\n};\n\n/** Where a marketplace comes from. `other` is a source type we haven't seen, by its type name. */\nexport type Source =\n  | { kind: \"github\"; repo: string }\n  | { kind: \"git\"; url: string }\n  | { kind: \"folder\"; path: string }\n  | { kind: \"other\"; type: string };\n\n/** A marketplace named after Convex or holding a Convex plugin, with the Convex plugins installed from it. */\nexport type Marketplace = { name: string; source: Source; plugins: Plugin[] };\n\n/** Keeps the marketplaces named after Convex or holding a Convex plugin, each with its Convex plugins. */\nexport function convexMarketplaces(\n  marketplaces: { name: string; source: Source }[],\n  plugins: Plugin[],\n): Marketplace[] {\n  const convex = plugins.filter((p) => pluginNames.includes(p.name));\n  return marketplaces\n    .map((m) => ({\n      ...m,\n      plugins: convex.filter((p) => p.marketplace === m.name),\n    }))\n    .filter((m) => m.name.startsWith(\"convex\") || m.plugins.length > 0);\n}\n\n/** Describes a marketplace's source for people. */\nfunction sourceText(source: Source): string {\n  switch (source.kind) {\n    case \"github\":\n      return `github.com/${source.repo}`;\n    case \"git\":\n      return source.url.replace(/^https?:\\/\\//, \"\").replace(/\\.git$/, \"\");\n    case \"folder\":\n      return source.path;\n    case \"other\":\n      return source.type;\n  }\n}\n\n/** Prints each Convex marketplace with its Convex plugins indented under it. */\nexport function logMarketplaces(\n  title: string,\n  marketplaces: Marketplace[],\n  latest: Record<string, string>,\n) {\n  logOutput(title);\n  if (marketplaces.length === 0) {\n    logOutput(\"  No Convex plugin installed\");\n    return;\n  }\n  const marketplaceLines = formatRows(\n    marketplaces.map((m) => [m.name, sourceText(m.source)]),\n  );\n  // Plugin rows are formatted together so their columns line up across marketplaces.\n  const pluginLines = formatRows(\n    marketplaces\n      .flatMap((m) => m.plugins)\n      .map((p) => [\n        p.name,\n        p.version,\n        latest[p.name] === undefined ? \"\" : `latest ${latest[p.name]}`,\n        p.scope ?? \"-\",\n        p.enabled ? \"enabled\" : \"disabled\",\n        p.cachedVersion === undefined ? \"\" : `cached copy ${p.cachedVersion}`,\n      ]),\n    \"    \",\n  );\n  let next = 0;\n  marketplaces.forEach((m, i) => {\n    logOutput(marketplaceLines[i]);\n    for (const line of pluginLines.slice(next, next + m.plugins.length)) {\n      logOutput(line);\n    }\n    next += m.plugins.length;\n  });\n}\n"],
+  "mappings": ";AAAA,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAG3B,MAAM,cAAc,CAAC,UAAU,aAAa;AA0BrC,gBAAS,mBACd,cACA,SACe;AACf,QAAM,SAAS,QAAQ,OAAO,CAAC,MAAM,YAAY,SAAS,EAAE,IAAI,CAAC;AACjE,SAAO,aACJ,IAAI,CAAC,OAAO;AAAA,IACX,GAAG;AAAA,IACH,SAAS,OAAO,OAAO,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAI;AAAA,EACxD,EAAE,EACD,OAAO,CAAC,MAAM,EAAE,KAAK,WAAW,QAAQ,KAAK,EAAE,QAAQ,SAAS,CAAC;AACtE;AAGA,SAAS,WAAW,QAAwB;AAC1C,UAAQ,OAAO,MAAM;AAAA,IACnB,KAAK;AACH,aAAO,cAAc,OAAO,IAAI;AAAA,IAClC,KAAK;AACH,aAAO,OAAO,IAAI,QAAQ,gBAAgB,EAAE,EAAE,QAAQ,UAAU,EAAE;AAAA,IACpE,KAAK;AACH,aAAO,OAAO;AAAA,IAChB,KAAK;AACH,aAAO,OAAO;AAAA,EAClB;AACF;AAGO,gBAAS,gBACd,OACA,cACA,QACA;AACA,YAAU,KAAK;AACf,MAAI,aAAa,WAAW,GAAG;AAC7B,cAAU,8BAA8B;AACxC;AAAA,EACF;AACA,QAAM,mBAAmB;AAAA,IACvB,aAAa,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,WAAW,EAAE,MAAM,CAAC,CAAC;AAAA,EACxD;AAEA,QAAM,cAAc;AAAA,IAClB,aACG,QAAQ,CAAC,MAAM,EAAE,OAAO,EACxB,IAAI,CAAC,MAAM;AAAA,MACV,EAAE;AAAA,MACF,EAAE;AAAA,MACF,OAAO,EAAE,IAAI,MAAM,SAAY,KAAK,UAAU,OAAO,EAAE,IAAI,CAAC;AAAA,MAC5D,EAAE,SAAS;AAAA,MACX,EAAE,UAAU,YAAY;AAAA,MACxB,EAAE,kBAAkB,SAAY,KAAK,eAAe,EAAE,aAAa;AAAA,IACrE,CAAC;AAAA,IACH;AAAA,EACF;AACA,MAAI,OAAO;AACX,eAAa,QAAQ,CAAC,GAAG,MAAM;AAC7B,cAAU,iBAAiB,CAAC,CAAC;AAC7B,eAAW,QAAQ,YAAY,MAAM,MAAM,OAAO,EAAE,QAAQ,MAAM,GAAG;AACnE,gBAAU,IAAI;AAAA,IAChB;AACA,YAAQ,EAAE,QAAQ;AAAA,EACpB,CAAC;AACH;",
+  "names": []
+}

package/dist/esm/cli/lib/plugins/skills.js

@@ -0,0 +1,65 @@
+"use strict";
+import os from "os";
+import path from "path";
+import { nodeFs } from "../../../bundler/fs.js";
+import { logOutput } from "../../../bundler/log.js";
+import { fetchAgentSkillsCatalog } from "../versionApi.js";
+function skillsFolders(dir, depth) {
+  let entries;
+  try {
+    entries = nodeFs.listDir(dir);
+  } catch {
+    return [];
+  }
+  return entries.filter((entry) => entry.isDirectory()).flatMap((entry) => {
+    const child = path.join(dir, entry.name);
+    if (entry.name === "skills") return [child];
+    return depth > 1 ? skillsFolders(child, depth - 1) : [];
+  });
+}
+export function convexSkillsFolders(root, names) {
+  return nodeFs.listDir(root).filter((entry) => entry.isDirectory() && entry.name.startsWith(".")).flatMap((entry) => skillsFolders(path.join(root, entry.name), 2)).map((folder) => {
+    const entries = nodeFs.listDir(folder).map((entry) => entry.name);
+    const current = entries.filter((name) => names.current.has(name));
+    const deleted = entries.filter((name) => names.deleted.has(name));
+    const brokenLinks = [...current, ...deleted].filter(
+      (name) => !nodeFs.exists(path.join(folder, name))
+    ).length;
+    return {
+      path: folder,
+      current: current.length,
+      deleted: deleted.length,
+      brokenLinks
+    };
+  }).filter((folder) => folder.current + folder.deleted > 0);
+}
+function logSkills(title, root, label, names) {
+  const folders = convexSkillsFolders(root, names);
+  logOutput(title);
+  if (folders.length === 0) {
+    logOutput("  No Convex skills found");
+    return;
+  }
+  for (const folder of folders) {
+    logOutput(
+      `  ${folder.path.replace(root, label)}  ${folder.current} Convex skills, ${folder.deleted} deleted, ${folder.brokenLinks} broken links`
+    );
+  }
+}
+export async function logConvexSkills() {
+  const catalog = await fetchAgentSkillsCatalog();
+  if (catalog.kind === "error") {
+    logOutput("Skills: couldn't fetch the list of Convex skills");
+  } else {
+    const names = (kind) => new Set(
+      catalog.data.skills.filter((skill) => skill.status.kind === kind).map((skill) => skill.skillName)
+    );
+    const skillNames = {
+      current: names("active"),
+      deleted: names("deleted")
+    };
+    logSkills("Global skills", os.homedir(), "~", skillNames);
+    logSkills("Project skills", process.cwd(), ".", skillNames);
+  }
+}
+//# sourceMappingURL=skills.js.map

package/dist/esm/cli/lib/plugins/skills.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../src/cli/lib/plugins/skills.ts"],
+  "sourcesContent": ["import os from \"os\";\nimport path from \"path\";\nimport { nodeFs } from \"../../../bundler/fs.js\";\nimport { logOutput } from \"../../../bundler/log.js\";\nimport { fetchAgentSkillsCatalog } from \"../versionApi.js\";\n\n/** Finds folders named `skills` in a folder's children and grandchildren, without following links. */\nfunction skillsFolders(dir: string, depth: number): string[] {\n  let entries;\n  try {\n    entries = nodeFs.listDir(dir);\n  } catch {\n    return [];\n  }\n  return entries\n    .filter((entry) => entry.isDirectory())\n    .flatMap((entry) => {\n      const child = path.join(dir, entry.name);\n      if (entry.name === \"skills\") return [child];\n      return depth > 1 ? skillsFolders(child, depth - 1) : [];\n    });\n}\n\n/** Convex skill names from the catalog on version.convex.dev, split into current and deleted ones. */\ntype SkillNames = { current: Set<string>; deleted: Set<string> };\n\n/** A skills folder holding Convex skills. */\ntype SkillsFolder = {\n  path: string;\n  current: number;\n  deleted: number;\n  brokenLinks: number;\n};\n\n/** Finds the skills folders in a root's hidden folders that hold Convex skills, counting deleted skills and broken links. */\nexport function convexSkillsFolders(\n  root: string,\n  names: SkillNames,\n): SkillsFolder[] {\n  return nodeFs\n    .listDir(root)\n    .filter((entry) => entry.isDirectory() && entry.name.startsWith(\".\"))\n    .flatMap((entry) => skillsFolders(path.join(root, entry.name), 2))\n    .map((folder) => {\n      const entries = nodeFs.listDir(folder).map((entry) => entry.name);\n      const current = entries.filter((name) => names.current.has(name));\n      const deleted = entries.filter((name) => names.deleted.has(name));\n      // exists follows links, so it's false for a link whose target is gone.\n      const brokenLinks = [...current, ...deleted].filter(\n        (name) => !nodeFs.exists(path.join(folder, name)),\n      ).length;\n      return {\n        path: folder,\n        current: current.length,\n        deleted: deleted.length,\n        brokenLinks,\n      };\n    })\n    .filter((folder) => folder.current + folder.deleted > 0);\n}\n\n/** Prints each skills folder in a root's hidden folders that holds Convex skills, counting deleted skills and broken links. */\nfunction logSkills(\n  title: string,\n  root: string,\n  label: string,\n  names: SkillNames,\n) {\n  const folders = convexSkillsFolders(root, names);\n  logOutput(title);\n  if (folders.length === 0) {\n    logOutput(\"  No Convex skills found\");\n    return;\n  }\n  for (const folder of folders) {\n    logOutput(\n      `  ${folder.path.replace(root, label)}  ${folder.current} Convex skills, ${folder.deleted} deleted, ${folder.brokenLinks} broken links`,\n    );\n  }\n}\n\n/** Prints the Convex skills in the hidden folders of the home folder and the current folder. */\nexport async function logConvexSkills() {\n  const catalog = await fetchAgentSkillsCatalog();\n  if (catalog.kind === \"error\") {\n    logOutput(\"Skills: couldn't fetch the list of Convex skills\");\n  } else {\n    const names = (kind: \"active\" | \"deleted\") =>\n      new Set(\n        catalog.data.skills\n          .filter((skill) => skill.status.kind === kind)\n          .map((skill) => skill.skillName),\n      );\n    const skillNames = {\n      current: names(\"active\"),\n      deleted: names(\"deleted\"),\n    };\n    logSkills(\"Global skills\", os.homedir(), \"~\", skillNames);\n    logSkills(\"Project skills\", process.cwd(), \".\", skillNames);\n  }\n}\n"],
+  "mappings": ";AAAA,OAAO,QAAQ;AACf,OAAO,UAAU;AACjB,SAAS,cAAc;AACvB,SAAS,iBAAiB;AAC1B,SAAS,+BAA+B;AAGxC,SAAS,cAAc,KAAa,OAAyB;AAC3D,MAAI;AACJ,MAAI;AACF,cAAU,OAAO,QAAQ,GAAG;AAAA,EAC9B,QAAQ;AACN,WAAO,CAAC;AAAA,EACV;AACA,SAAO,QACJ,OAAO,CAAC,UAAU,MAAM,YAAY,CAAC,EACrC,QAAQ,CAAC,UAAU;AAClB,UAAM,QAAQ,KAAK,KAAK,KAAK,MAAM,IAAI;AACvC,QAAI,MAAM,SAAS,SAAU,QAAO,CAAC,KAAK;AAC1C,WAAO,QAAQ,IAAI,cAAc,OAAO,QAAQ,CAAC,IAAI,CAAC;AAAA,EACxD,CAAC;AACL;AAcO,gBAAS,oBACd,MACA,OACgB;AAChB,SAAO,OACJ,QAAQ,IAAI,EACZ,OAAO,CAAC,UAAU,MAAM,YAAY,KAAK,MAAM,KAAK,WAAW,GAAG,CAAC,EACnE,QAAQ,CAAC,UAAU,cAAc,KAAK,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,EAChE,IAAI,CAAC,WAAW;AACf,UAAM,UAAU,OAAO,QAAQ,MAAM,EAAE,IAAI,CAAC,UAAU,MAAM,IAAI;AAChE,UAAM,UAAU,QAAQ,OAAO,CAAC,SAAS,MAAM,QAAQ,IAAI,IAAI,CAAC;AAChE,UAAM,UAAU,QAAQ,OAAO,CAAC,SAAS,MAAM,QAAQ,IAAI,IAAI,CAAC;AAEhE,UAAM,cAAc,CAAC,GAAG,SAAS,GAAG,OAAO,EAAE;AAAA,MAC3C,CAAC,SAAS,CAAC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC;AAAA,IAClD,EAAE;AACF,WAAO;AAAA,MACL,MAAM;AAAA,MACN,SAAS,QAAQ;AAAA,MACjB,SAAS,QAAQ;AAAA,MACjB;AAAA,IACF;AAAA,EACF,CAAC,EACA,OAAO,CAAC,WAAW,OAAO,UAAU,OAAO,UAAU,CAAC;AAC3D;AAGA,SAAS,UACP,OACA,MACA,OACA,OACA;AACA,QAAM,UAAU,oBAAoB,MAAM,KAAK;AAC/C,YAAU,KAAK;AACf,MAAI,QAAQ,WAAW,GAAG;AACxB,cAAU,0BAA0B;AACpC;AAAA,EACF;AACA,aAAW,UAAU,SAAS;AAC5B;AAAA,MACE,KAAK,OAAO,KAAK,QAAQ,MAAM,KAAK,CAAC,KAAK,OAAO,OAAO,mBAAmB,OAAO,OAAO,aAAa,OAAO,WAAW;AAAA,IAC1H;AAAA,EACF;AACF;AAGA,sBAAsB,kBAAkB;AACtC,QAAM,UAAU,MAAM,wBAAwB;AAC9C,MAAI,QAAQ,SAAS,SAAS;AAC5B,cAAU,kDAAkD;AAAA,EAC9D,OAAO;AACL,UAAM,QAAQ,CAAC,SACb,IAAI;AAAA,MACF,QAAQ,KAAK,OACV,OAAO,CAAC,UAAU,MAAM,OAAO,SAAS,IAAI,EAC5C,IAAI,CAAC,UAAU,MAAM,SAAS;AAAA,IACnC;AACF,UAAM,aAAa;AAAA,MACjB,SAAS,MAAM,QAAQ;AAAA,MACvB,SAAS,MAAM,SAAS;AAAA,IAC1B;AACA,cAAU,iBAAiB,GAAG,QAAQ,GAAG,KAAK,UAAU;AACxD,cAAU,kBAAkB,QAAQ,IAAI,GAAG,KAAK,UAAU;AAAA,EAC5D;AACF;",
+  "names": []
+}

package/dist/esm/cli/lib/plugins/utils.js

@@ -0,0 +1,86 @@
+"use strict";
+import child_process from "child_process";
+import path from "path";
+import { promisify } from "util";
+import * as Sentry from "@sentry/node";
+import { nodeFs } from "../../../bundler/fs.js";
+export function onPath(name, pathDirs) {
+  const dir = pathDirs.split(path.delimiter).find((d) => nodeFs.exists(path.join(d, name)));
+  return dir === void 0 ? [] : [path.join(dir, name)];
+}
+export function subfolders(dir) {
+  let entries;
+  try {
+    entries = nodeFs.listDir(dir);
+  } catch {
+    return [];
+  }
+  return entries.filter((entry) => entry.isDirectory()).map((entry) => path.join(dir, entry.name)).sort();
+}
+export async function versionOf(cli) {
+  const { stdout } = await promisify(child_process.execFile)(cli, [
+    "--version"
+  ]);
+  return stdout.split("\n")[0];
+}
+export function run(command, args) {
+  return new Promise((resolve) => {
+    let output = "";
+    const proc = child_process.spawn(command, args, {
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    proc.stdout.on("data", (chunk) => output += chunk);
+    proc.stderr.on("data", (chunk) => output += chunk);
+    proc.on("error", () => resolve({ ok: false, output }));
+    proc.on("close", (code) => resolve({ ok: code === 0, output }));
+  });
+}
+export function capture(command, args) {
+  return new Promise((resolve) => {
+    let stdout = "";
+    const proc = child_process.spawn(command, args, {
+      stdio: ["ignore", "pipe", "inherit"]
+    });
+    proc.stdout.on("data", (chunk) => stdout += chunk);
+    proc.on("error", () => resolve(null));
+    proc.on("close", () => resolve(stdout));
+  });
+}
+export async function fetchGitHubJson(path2) {
+  try {
+    const response = await fetch(`https://raw.githubusercontent.com/${path2}`);
+    if (!response.ok) {
+      Sentry.captureException(
+        new Error(`Failed to fetch ${path2}: status = ${response.status}`)
+      );
+      return null;
+    }
+    return await response.json();
+  } catch (error) {
+    Sentry.captureException(error);
+    return null;
+  }
+}
+export function parseList(schema, list, command) {
+  let result;
+  try {
+    result = schema.safeParse(JSON.parse(list));
+  } catch {
+    result = void 0;
+  }
+  if (!result?.success) {
+    Sentry.captureMessage(`Unexpected output from \`${command}\``, "error");
+    return null;
+  }
+  return result.data;
+}
+export function formatRows(rows, indent = "  ") {
+  if (rows.length === 0) return [];
+  const widths = rows[0].map(
+    (_, i) => Math.max(...rows.map((row) => row[i].length))
+  );
+  return rows.map(
+    (row) => `${indent}${row.map((cell, i) => cell.padEnd(widths[i])).join("  ")}`.trimEnd()
+  );
+}
+//# sourceMappingURL=utils.js.map

package/dist/esm/cli/lib/plugins/utils.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../src/cli/lib/plugins/utils.ts"],
+  "sourcesContent": ["import child_process from \"child_process\";\nimport path from \"path\";\nimport { promisify } from \"util\";\nimport * as Sentry from \"@sentry/node\";\nimport { z } from \"zod\";\nimport { nodeFs } from \"../../../bundler/fs.js\";\n\n/** The file the shell runs for `name`, like `which`. */\nexport function onPath(name: string, pathDirs: string): string[] {\n  const dir = pathDirs\n    .split(path.delimiter)\n    .find((d) => nodeFs.exists(path.join(d, name)));\n  return dir === undefined ? [] : [path.join(dir, name)];\n}\n\n/** The folders directly inside `dir`, sorted by name, or none when `dir` doesn't exist. */\nexport function subfolders(dir: string): string[] {\n  let entries;\n  try {\n    entries = nodeFs.listDir(dir);\n  } catch {\n    return [];\n  }\n  return entries\n    .filter((entry) => entry.isDirectory())\n    .map((entry) => path.join(dir, entry.name))\n    .sort();\n}\n\n/** The first line a CLI prints for `--version`. */\nexport async function versionOf(cli: string): Promise<string> {\n  const { stdout } = await promisify(child_process.execFile)(cli, [\n    \"--version\",\n  ]);\n  return stdout.split(\"\\n\")[0];\n}\n\n/** Runs a command and resolves to whether it succeeded and everything it printed. */\nexport function run(\n  command: string,\n  args: string[],\n): Promise<{ ok: boolean; output: string }> {\n  return new Promise((resolve) => {\n    let output = \"\";\n\n    const proc = child_process.spawn(command, args, {\n      stdio: [\"ignore\", \"pipe\", \"pipe\"],\n    });\n\n    proc.stdout.on(\"data\", (chunk) => (output += chunk));\n    proc.stderr.on(\"data\", (chunk) => (output += chunk));\n    proc.on(\"error\", () => resolve({ ok: false, output }));\n    proc.on(\"close\", (code) => resolve({ ok: code === 0, output }));\n  });\n}\n\n/** Runs a command and resolves to its stdout, or null when it can't be started. */\nexport function capture(\n  command: string,\n  args: string[],\n): Promise<string | null> {\n  return new Promise((resolve) => {\n    let stdout = \"\";\n\n    const proc = child_process.spawn(command, args, {\n      stdio: [\"ignore\", \"pipe\", \"inherit\"],\n    });\n\n    proc.stdout.on(\"data\", (chunk) => (stdout += chunk));\n    proc.on(\"error\", () => resolve(null));\n    proc.on(\"close\", () => resolve(stdout));\n  });\n}\n\n/** Fetches a JSON file from GitHub, or resolves to null when it can't, reporting why to Sentry. */\nexport async function fetchGitHubJson<T>(path: string): Promise<T | null> {\n  try {\n    const response = await fetch(`https://raw.githubusercontent.com/${path}`);\n    if (!response.ok) {\n      Sentry.captureException(\n        new Error(`Failed to fetch ${path}: status = ${response.status}`),\n      );\n      return null;\n    }\n    return (await response.json()) as T;\n  } catch (error) {\n    Sentry.captureException(error);\n    return null;\n  }\n}\n\n/** Parses a JSON list from a harness CLI, or returns null and reports to Sentry when it isn't JSON or doesn't match. */\nexport function parseList<T>(\n  schema: z.ZodType<T, z.ZodTypeDef, unknown>,\n  list: string,\n  command: string,\n): T | null {\n  let result;\n  try {\n    result = schema.safeParse(JSON.parse(list));\n  } catch {\n    // A failing CLI can print nothing, which isn't JSON.\n    result = undefined;\n  }\n  if (!result?.success) {\n    Sentry.captureMessage(`Unexpected output from \\`${command}\\``, \"error\");\n    return null;\n  }\n  return result.data;\n}\n\n/** Pads each column to its widest cell and indents every row. */\nexport function formatRows(rows: string[][], indent = \"  \"): string[] {\n  if (rows.length === 0) return [];\n  const widths = rows[0].map((_, i) =>\n    Math.max(...rows.map((row) => row[i].length)),\n  );\n  return rows.map((row) =>\n    `${indent}${row.map((cell, i) => cell.padEnd(widths[i])).join(\"  \")}`.trimEnd(),\n  );\n}\n"],
+  "mappings": "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",
+  "names": ["path"]
+}

package/dist/esm/cli/lib/utils/utils.js

@@ -32,13 +32,14 @@ export const CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME = "CONVEX_DEPLOYMENT_TOKEN";
 export const CONVEX_DEPLOYMENT_ENV_VAR_NAME = "CONVEX_DEPLOYMENT";
 export const CONVEX_SELF_HOSTED_URL_VAR_NAME = "CONVEX_SELF_HOSTED_URL";
 export const CONVEX_SELF_HOSTED_ADMIN_KEY_VAR_NAME = "CONVEX_SELF_HOSTED_ADMIN_KEY";
+export const IGNORED_DEPLOY_KEY = "<ignore_deploy_key>";
 const MAX_RETRIES = 6;
 const RETRY_LOG_THRESHOLD = 3;
 export async function processDeployKeyValue(ctx, deployKey) {
   if (deployKey === void 0) {
     return void 0;
   }
-  if (deployKey === "<ignore_deploy_key>") {
+  if (deployKey === IGNORED_DEPLOY_KEY) {
     return void 0;
   }
   const missingKeyPattern = /^<missing_deploy_key:(.+)>$/;
@@ -54,17 +55,23 @@ export async function processDeployKeyValue(ctx, deployKey) {
   return deployKey;
 }
 export function readDeployKeyFromEnv(getEnv) {
-  const fromDeployKey = getEnv(CONVEX_DEPLOY_KEY_ENV_VAR_NAME);
-  const fromToken = getEnv(CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME);
-  return fromDeployKey || fromToken || void 0;
+  return readDeployKeyEnvVar(getEnv)?.value;
+}
+export function readDeployKeyEnvVar(getEnv) {
+  for (const name of [
+    CONVEX_DEPLOY_KEY_ENV_VAR_NAME,
+    CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME
+  ]) {
+    const value = getEnv(name);
+    if (value) return { name, value };
+  }
+  return void 0;
 }
 const PERMISSION_DENIED_MESSAGE_PREFIX = "You do not have permission to perform this operation";
 function deployKeyPermissionAdvice() {
-  const envVarName = process.env[CONVEX_DEPLOY_KEY_ENV_VAR_NAME] ? CONVEX_DEPLOY_KEY_ENV_VAR_NAME : process.env[CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME] ? CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME : null;
-  if (envVarName === null) {
-    return null;
-  }
-  return `This is determined by the permissions granted to ${envVarName}.`;
+  const envVar = readDeployKeyEnvVar((name) => process.env[name]);
+  if (envVar === void 0 || envVar.value === IGNORED_DEPLOY_KEY) return null;
+  return `This is determined by the permissions granted to ${envVar.name}.`;
 }
 export function permissionDeniedErrorMessage(errorMessage) {
   const index = errorMessage.indexOf(PERMISSION_DENIED_MESSAGE_PREFIX);