@myvillage/cli 1.83.0 → 1.85.0

package/src/utils/recipes.js

@@ -1,277 +1,20 @@
-// ── MCP Recipes ─────────────────────────────────────────
+// ── Back-compat shim: recipes → connectors ──────────────
 //
-// A "recipe" is a small declarative YAML file describing how to plug an
-// MCP server into an agent. Recipes are NOT bundled with the CLI — they
-// live in the MyVillage recipe registry (auth-gated) and any other URL a
-// developer points at via `--from`.
+// "Recipes" were renamed to "Connectors" (see connectors.js and the
+// Agent Recipes & Connectors spec). The published `@myvillage/cli` package is
+// imported by sibling repos (notably myvillage-studio) under the OLD names,
+// so this module stays as a thin re-export that maps the new symbol names
+// back to the old ones. Do NOT add logic here — edit connectors.js instead.
 //
-// `loadRecipe(source)` accepts:
-//   - a bare name like "gmail" → fetches from the MyVillage registry,
-//     attaches the developer's bearer token, requires `myvillage login`
-//   - a local file path (./recipe.yaml or absolute) → reads from disk
-//   - a remote URL (http(s)://...) → fetches; bearer token attached only
-//     when the host is a MyVillage host (never leaked to third parties)
-//
-// Recipe format — same two shapes the daemon's `tools.yaml` already
-// supports:
-//
-//   Local subprocess MCP:
-//     name: string
-//     description: string (optional)
-//     command: string                 # e.g. "npx"
-//     args: [string, string, ...]     # passed to command; ${VAR} ok
-//     env:                             # optional schema for the wizard
-//       NAME:
-//         description: string
-//         required: bool
-//     setup_help: string (optional URL)
-//
-//   Remote URL MCP:
-//     name: string
-//     description: string (optional)
-//     url: string
-//     transport: "http" | "sse" (optional, default "http")
-//     headers:                         # optional; values may use ${ENV}
-//       Authorization: "Bearer ${MY_TOKEN}"
-//     env:                             # optional schema for the wizard
-//       MY_TOKEN:
-//         description: string
-//         required: bool
-//     setup_help: string (optional URL)
-
-import { readFileSync, existsSync } from 'fs';
-import { join, isAbsolute } from 'path';
-import { parse as parseYaml } from 'yaml';
-import { getConfig } from './config.js';
-import { getAccessToken } from './auth.js';
-
-// ── Deprecated registry recipes ─────────────────────────
-//
-// Curated recipes retired in favor of one-click OAuth provider connect
-// (`myvillage agent grant <agent> <provider>`). We hide them from the registry
-// listing and block a direct fetch so there's a single, obvious path — even if
-// the backend registry still serves the old entry. Keyed by registry recipe
-// name → the provider slug that replaces it. Only affects bare-name registry
-// loads; a developer's own `--from ./slack.yaml` is untouched.
-const DEPRECATED_REGISTRY_RECIPES = {
-  slack: 'slack', // bot-token Slack MCP → "Sign in with Slack" (acts as you)
-};
-
-function deprecationMessage(name, providerSlug) {
-  const label = name.charAt(0).toUpperCase() + name.slice(1);
-  return (
-    `The "${name}" bot-token tool has been replaced by one-click ${label} sign-in. ` +
-    `Connect ${label} in MyVillage Studio (or at myvillageproject.ai), then run ` +
-    `\`myvillage agent grant <agent> ${providerSlug}\` — no token to copy.`
-  );
-}
-
-// ── Public API ──────────────────────────────────────────
-
-/**
- * Resolve any recipe source (bare name | local path | URL) to a parsed,
- * validated recipe object. Throws with a friendly message if the source
- * can't be read, the request fails, or the YAML is invalid.
- */
-export async function loadRecipe(source) {
-  if (!source) throw new Error('No recipe source provided');
-
-  // URL — fetch (auth attached if MyVillage host)
-  if (/^https?:\/\//i.test(source)) {
-    return loadRecipeFromUrl(source);
-  }
-
-  // Looks like a path — read from disk
-  if (source.includes('/') || source.includes('\\') || /\.(yaml|yml)$/i.test(source)) {
-    return loadRecipeFromFile(source);
-  }
-
-  // Bare name — pull from the MyVillage curated registry
-  return loadRecipeFromRegistry(source);
-}
-
-/**
- * List curated recipes available in the MyVillage registry. Requires
- * `myvillage login`. Returns an array of summaries:
- *   { name, description, kind, envVars, setup_help? }
- */
-export async function listRegistryRecipes() {
-  const url = `${getConfig().apiBaseUrl}/recipes`;
-  const res = await authedFetch(url);
-  if (!res.ok) {
-    throw await registryError(res, 'list recipes');
-  }
-  const body = await res.json();
-  // Hide retired recipes (e.g. the bot-token Slack MCP) so they never show up
-  // as an option — the OAuth provider path supersedes them.
-  return (body.recipes || []).filter(
-    (r) => !Object.hasOwn(DEPRECATED_REGISTRY_RECIPES, String(r?.name || '').toLowerCase()),
-  );
-}
-
-// ── Loaders ─────────────────────────────────────────────
-
-async function loadRecipeFromRegistry(name) {
-  const slug = String(name || '').toLowerCase();
-  if (Object.hasOwn(DEPRECATED_REGISTRY_RECIPES, slug)) {
-    throw new Error(deprecationMessage(slug, DEPRECATED_REGISTRY_RECIPES[slug]));
-  }
-  const url = `${getConfig().apiBaseUrl}/recipes/${encodeURIComponent(name)}`;
-  const res = await authedFetch(url);
-  if (!res.ok) {
-    throw await registryError(res, `fetch recipe "${name}"`);
-  }
-  const text = await res.text();
-  return validateRecipe(parseYaml(text), `registry:${name}`);
-}
-
-function loadRecipeFromFile(path) {
-  const abs = isAbsolute(path) ? path : join(process.cwd(), path);
-  if (!existsSync(abs)) {
-    throw new Error(`Recipe file not found: ${abs}`);
-  }
-  let parsed;
-  try {
-    parsed = parseYaml(readFileSync(abs, 'utf-8'));
-  } catch (err) {
-    throw new Error(`Failed to parse recipe at ${abs}: ${err.message}`);
-  }
-  return validateRecipe(parsed, abs);
-}
-
-async function loadRecipeFromUrl(url) {
-  // Attach the bearer token only if this URL is on a MyVillage host —
-  // sending it to a third-party URL would leak the developer's
-  // platform credentials.
-  const fetcher = isMyVillageHost(url) ? authedFetch : fetch;
-  let response;
-  try {
-    response = await fetcher(url, { redirect: 'follow' });
-  } catch (err) {
-    throw new Error(`Failed to fetch recipe from ${url}: ${err.message}`);
-  }
-  if (!response.ok) {
-    if (isMyVillageHost(url) && (response.status === 401 || response.status === 403)) {
-      throw new Error(`Recipe at ${url} requires authentication. Run 'myvillage login' first.`);
-    }
-    throw new Error(`Failed to fetch recipe from ${url}: HTTP ${response.status}`);
-  }
-  const text = await response.text();
-  let parsed;
-  try {
-    parsed = parseYaml(text);
-  } catch (err) {
-    throw new Error(`Failed to parse recipe from ${url}: ${err.message}`);
-  }
-  return validateRecipe(parsed, url);
-}
-
-// ── Auth ────────────────────────────────────────────────
-
-function isMyVillageHost(urlString) {
-  try {
-    const host = new URL(urlString).hostname;
-    return host === 'myvillageproject.ai' || host.endsWith('.myvillageproject.ai');
-  } catch {
-    return false;
-  }
-}
-
-async function authedFetch(url, options = {}) {
-  const token = getAccessToken();
-  const headers = { ...(options.headers || {}) };
-  if (token) headers['Authorization'] = `Bearer ${token}`;
-  return fetch(url, { ...options, headers });
-}
-
-async function registryError(response, action) {
-  let detail = '';
-  try {
-    const body = await response.json();
-    if (body?.error) detail = body.error;
-    if (body?.hint) detail += detail ? ` — ${body.hint}` : body.hint;
-  } catch {
-    // non-JSON body, ignore
-  }
-  if (response.status === 401) {
-    return new Error(`Could not ${action}: authentication required. Run 'myvillage login' first.`);
-  }
-  if (response.status === 404) {
-    return new Error(`Could not ${action}: not found in the MyVillage recipe registry.`);
-  }
-  return new Error(`Could not ${action}: HTTP ${response.status}${detail ? ` — ${detail}` : ''}`);
-}
-
-// ── Validation ──────────────────────────────────────────
-
-function validateRecipe(recipe, sourceLabel) {
-  if (!recipe || typeof recipe !== 'object') {
-    throw new Error(`Recipe at ${sourceLabel} is empty or not a YAML object`);
-  }
-  if (!recipe.name || typeof recipe.name !== 'string') {
-    throw new Error(`Recipe at ${sourceLabel} is missing a "name" field`);
-  }
-
-  const hasCommand = typeof recipe.command === 'string' && recipe.command.length > 0;
-  const hasUrl = typeof recipe.url === 'string' && recipe.url.length > 0;
-  if (hasCommand && hasUrl) {
-    throw new Error(`Recipe "${recipe.name}" has both "command" and "url" — pick one`);
-  }
-  if (!hasCommand && !hasUrl) {
-    throw new Error(`Recipe "${recipe.name}" needs either a "command" (for local subprocess) or "url" (for remote MCP)`);
-  }
-
-  if (hasCommand && recipe.args && !Array.isArray(recipe.args)) {
-    throw new Error(`Recipe "${recipe.name}": "args" must be an array of strings`);
-  }
-  if (hasUrl && recipe.transport && !['http', 'sse'].includes(recipe.transport)) {
-    throw new Error(`Recipe "${recipe.name}": "transport" must be "http" or "sse"`);
-  }
-
-  if (recipe.env != null) {
-    if (typeof recipe.env !== 'object' || Array.isArray(recipe.env)) {
-      throw new Error(`Recipe "${recipe.name}": "env" must be a mapping of env-var-name to descriptor`);
-    }
-  }
-
-  return recipe;
-}
-
-// ── Recipe → tools.yaml entry ───────────────────────────
-
-/**
- * Translate a finalized recipe (with developer edits already applied)
- * into the server entry that goes under `servers:` in tools.yaml.
- */
-export function recipeToServerEntry(recipe) {
-  if (recipe.url) {
-    const entry = { url: recipe.url };
-    if (recipe.transport) entry.transport = recipe.transport;
-    if (recipe.headers && Object.keys(recipe.headers).length > 0) {
-      entry.headers = { ...recipe.headers };
-    }
-    if (recipe.description) entry.description = recipe.description;
-    return entry;
-  }
-
-  const entry = { command: recipe.command };
-  if (recipe.args && recipe.args.length > 0) entry.args = [...recipe.args];
-  if (recipe.env_vars && Object.keys(recipe.env_vars).length > 0) {
-    entry.env = { ...recipe.env_vars };
-  }
-  if (recipe.description) entry.description = recipe.description;
-  return entry;
-}
-
-/**
- * List of env-var names a recipe declares as needed. The wizard prints
- * these so the developer knows what to set in their .env / shell.
- */
-export function declaredEnvVars(recipe) {
-  if (!recipe.env || typeof recipe.env !== 'object') return [];
-  return Object.entries(recipe.env).map(([name, schema]) => ({
-    name,
-    description: schema?.description || '',
-    required: schema?.required !== false,
-  }));
-}
+// Old name              → New name (in connectors.js)
+//   loadRecipe          → loadConnector
+//   recipeToServerEntry → connectorToServerEntry
+//   listRegistryRecipes → listRegistryConnectors
+//   declaredEnvVars     → declaredEnvVars (unchanged)
+
+export {
+  loadConnector as loadRecipe,
+  connectorToServerEntry as recipeToServerEntry,
+  listRegistryConnectors as listRegistryRecipes,
+  declaredEnvVars,
+} from './connectors.js';