@inneranimalmedia/agentsam-sdk 2.6.4 → 2.6.7

package/src/mcp/authority.js

@@ -1,142 +1,65 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { cloudflareBundlesAsServerCatalog, getCloudflareMcpBundle } from './cloudflare-bundles.js';
 
 export const MCP_AUTHORITY_SCHEMA = 'agentsam.mcp.authority.v1';
 export const SERVER_CATALOG_CACHE_SCHEMA = 'agentsam.mcp.server-catalog.v1';
 export const DEFAULT_SERVER_CATALOG_URL = 'https://mcp.inneranimalmedia.com/api/mcp/servers';
 
 /**
- * Seed MCP server catalog snapshot derived directly from D1 table:
- * `agentsam_mcp_servers`.
- *
- * Captures live server authority, authentication requirements, and live health metrics
- * for offline and instantaneous CLI resolution.
+ * Seed MCP *server* catalog.
+ * Cloudflare portal rows come from cloudflare-bundles.js (not client-adapters).
+ * Health metrics are unknown until probed — do not fabricate latency.
  */
-export const SEED_MCP_SERVER_CATALOG = Object.freeze([
+const IAM_SEED_SERVERS = Object.freeze([
   {
     name: 'inneranimalmedia',
     display_name: 'InnerAnimalMedia Main MCP',
     url: 'https://mcp.inneranimalmedia.com/mcp',
     authUrl: 'https://mcp.inneranimalmedia.com/auth/connect',
     auth_type: 'bearer',
-    protocol: 'sse',
+    protocol: 'streamable_http',
     defaultClients: ['cursor', 'claude'],
-    health_status: 'healthy',
-    avg_latency_ms: 443,
-    error_rate: 0,
-    description: 'Inner Animal Media canonical MCP server (~218 tools, D1 telemetry)',
+    health_status: 'unknown',
+    avg_latency_ms: null,
+    error_rate: null,
+    description: 'Inner Animal Media canonical MCP server',
+    provider: 'inneranimalmedia',
   },
   {
     name: 'agent_sam_bridge',
     display_name: 'Agent Sam Bridge MCP',
     url: 'https://mcp.inneranimalmedia.com/mcp',
     auth_type: 'bearer',
-    protocol: 'sse',
-    defaultClients: ['cursor'],
-    health_status: 'healthy',
-    avg_latency_ms: 432,
-    error_rate: 0,
-    description: 'Agent Sam Bridge MCP',
-  },
-  {
-    name: 'cloudflare-api',
-    display_name: 'Cloudflare API',
-    url: 'https://mcp.cloudflare.com/mcp',
-    auth_type: 'bearer',
-    protocol: 'sse',
-    defaultClients: ['cursor'],
-    health_status: 'degraded',
-    avg_latency_ms: 9,
-    error_rate: 0,
-    description: 'Cloudflare API (Codex registered)',
-  },
-  {
-    name: 'cloudflare-docs',
-    display_name: 'Cloudflare Docs',
-    url: 'https://docs.mcp.cloudflare.com/mcp',
-    auth_type: 'none',
-    protocol: 'sse',
-    defaultClients: ['cursor'],
-    health_status: 'degraded',
-    avg_latency_ms: 10,
-    error_rate: 0,
-    description: 'Cloudflare documentation reference tools',
-  },
-  {
-    name: 'cloudflare-bindings',
-    display_name: 'Cloudflare Bindings',
-    url: 'https://bindings.mcp.cloudflare.com/mcp',
-    auth_type: 'user_oauth_cloudflare',
-    protocol: 'sse',
-    defaultClients: ['cursor'],
-    health_status: 'degraded',
-    avg_latency_ms: 8,
-    error_rate: 0,
-    description: 'Cloudflare Workers storage, AI, and compute bindings',
-  },
-  {
-    name: 'cloudflare-builds',
-    display_name: 'Cloudflare Builds',
-    url: 'https://builds.mcp.cloudflare.com/mcp',
-    auth_type: 'bearer',
-    protocol: 'sse',
+    protocol: 'streamable_http',
     defaultClients: ['cursor'],
-    health_status: 'degraded',
-    avg_latency_ms: 6,
-    error_rate: 0,
-    description: 'Cloudflare Workers Builds and CI/CD operations',
-  },
-  {
-    name: 'cloudflare-observability',
-    display_name: 'Cloudflare Observability',
-    url: 'https://observability.mcp.cloudflare.com/mcp',
-    auth_type: 'bearer',
-    protocol: 'sse',
-    defaultClients: ['cursor'],
-    health_status: 'degraded',
-    avg_latency_ms: 10,
-    error_rate: 0,
-    description: 'Cloudflare logs and analytics tools',
+    health_status: 'unknown',
+    avg_latency_ms: null,
+    error_rate: null,
+    description: 'Agent Sam Bridge MCP (same IAM endpoint; bridge-scoped tools)',
+    provider: 'inneranimalmedia',
   },
   {
     name: 'github-official',
     display_name: 'GitHub (official)',
     url: 'https://api.githubcopilot.com/mcp/',
     auth_type: 'user_oauth_github',
-    protocol: 'sse',
-    defaultClients: ['cursor'],
-    health_status: 'degraded',
-    avg_latency_ms: 338,
-    error_rate: 0,
-    description: 'Official GitHub Copilot MCP server',
-  },
-  {
-    name: 'gmail-official',
-    display_name: 'Gmail (official Google MCP)',
-    url: 'https://gmailmcp.googleapis.com/mcp/v1',
-    auth_type: 'user_oauth_gmail',
-    protocol: 'sse',
-    defaultClients: ['cursor'],
-    health_status: 'degraded',
-    avg_latency_ms: 662,
-    error_rate: 0,
-    description: 'Official Google Gmail MCP server',
-  },
-  {
-    name: 'cf_builds',
-    display_name: 'Cloudflare Builds System',
-    url: 'internal',
-    auth_type: 'bearer',
-    protocol: 'sse',
+    protocol: 'streamable_http',
     defaultClients: ['cursor'],
     health_status: 'unknown',
     avg_latency_ms: null,
-    error_rate: 0,
-    description: 'Cloudflare internal builds system',
+    error_rate: null,
+    description: 'Official GitHub Copilot MCP server',
+    provider: 'github',
   },
 ]);
 
+export const SEED_MCP_SERVER_CATALOG = Object.freeze([
+  ...IAM_SEED_SERVERS,
+  ...cloudflareBundlesAsServerCatalog(),
+]);
+
 /**
  * Backward compatibility dictionary mapping server_key/name to preset definition.
  */
@@ -220,7 +143,7 @@ export async function fetchMcpServerCatalog(options = {}) {
     return cached.servers;
   }
 
-  return SEED_MCP_SERVER_CATALOG;
+  return [...SEED_MCP_SERVER_CATALOG];
 }
 
 export function listKnownServers(options = {}) {
@@ -228,13 +151,35 @@ export function listKnownServers(options = {}) {
   if (cached?.servers?.length) {
     return cached.servers;
   }
-  return SEED_MCP_SERVER_CATALOG;
+  return [...SEED_MCP_SERVER_CATALOG];
 }
 
 export function resolveServerPreset(name, options = {}) {
   const cleanName = clean(name).toLowerCase();
   if (!cleanName) return null;
 
+  const bundle = getCloudflareMcpBundle(cleanName);
+  if (bundle) {
+    return {
+      name: bundle.name,
+      display_name: bundle.display_name,
+      url: bundle.url,
+      authUrl: null,
+      auth_type: bundle.auth_type,
+      protocol: bundle.protocol,
+      defaultClients: ['cursor'],
+      health_status: 'unknown',
+      avg_latency_ms: null,
+      error_rate: null,
+      description: bundle.description,
+      feature_packs: bundle.feature_packs,
+      capability_ids: bundle.capability_ids,
+      portal_manage_scopes: bundle.portal_manage_scopes,
+      provider: 'cloudflare',
+      kind: 'mcp_portal_bundle',
+    };
+  }
+
   const catalog = listKnownServers(options);
   const found = catalog.find((s) => (s.name || s.server_key || '').toLowerCase() === cleanName);
   if (found) {
@@ -244,12 +189,17 @@ export function resolveServerPreset(name, options = {}) {
       url: found.url,
       authUrl: found.authUrl || (found.name === 'inneranimalmedia' ? 'https://mcp.inneranimalmedia.com/auth/connect' : null),
       auth_type: found.auth_type || 'bearer',
-      protocol: found.protocol || 'sse',
+      protocol: found.protocol || 'streamable_http',
       defaultClients: found.defaultClients || ['cursor'],
       health_status: found.health_status || 'unknown',
       avg_latency_ms: found.avg_latency_ms ?? null,
-      error_rate: found.error_rate ?? 0,
+      error_rate: found.error_rate ?? null,
       description: found.description || found.display_name || '',
+      feature_packs: found.feature_packs || [],
+      capability_ids: found.capability_ids || [],
+      portal_manage_scopes: found.portal_manage_scopes || [],
+      provider: found.provider || null,
+      kind: found.kind || null,
     };
   }
 
@@ -300,7 +250,7 @@ export function writeMcpServer(name, serverConfig, options = {}) {
     schema_version: MCP_AUTHORITY_SCHEMA,
     name: clean(name).toLowerCase(),
     url: clean(serverConfig.url),
-    protocol: clean(serverConfig.protocol) || 'sse',
+    protocol: clean(serverConfig.protocol) || 'streamable_http',
     auth: serverConfig.auth || null,
     clients: Array.isArray(serverConfig.clients) ? [...new Set(serverConfig.clients.map(clean).filter(Boolean))] : ['cursor'],
     metadata: serverConfig.metadata || {},

package/src/mcp/client-adapters.js

@@ -1,17 +1,50 @@
+/**
+ * MCP *client* adapters — hosts that consume MCP servers (Cursor, Claude, …).
+ *
+ * Cloudflare MCP portal hostnames are offerable *server* connections
+ * (see SEED_OFFERABLE_MCP_SERVER_CONNECTIONS / cloudflare-bundles.js) — not
+ * OAuth client registry rows.
+ */
 import fs from 'node:fs';
-import os from 'node:os';
 import path from 'node:path';
 import { getMcpDir, homeDirectory } from './authority.js';
+import { listCloudflareMcpBundles } from './cloudflare-bundles.js';
 
 export const DEFAULT_CLIENT_REGISTRY_URL = 'https://mcp.inneranimalmedia.com/api/mcp/clients';
 export const CLIENT_REGISTRY_CACHE_SCHEMA = 'agentsam.mcp.client-registry.v1';
 
 /**
- * Seed external MCP client registry snapshot derived directly from D1 table:
- * `agentsam_mcp_oauth_external_client_registry`.
- *
- * This acts as the baseline cache for offline or pre-fetch execution,
- * respecting `is_active` and `sort_order`.
+ * Offerable MCP server connections (including every CF portal hostname).
+ * These are what `agentsam mcp add` / Studio connection pickers should list.
+ */
+export const SEED_OFFERABLE_MCP_SERVER_CONNECTIONS = Object.freeze([
+  {
+    connection_key: 'inneranimalmedia',
+    display_name: 'Inner Animal Media MCP',
+    url: 'https://mcp.inneranimalmedia.com/mcp',
+    kind: 'mcp_server',
+    provider: 'inneranimalmedia',
+  },
+  ...listCloudflareMcpBundles().map((b) => ({
+    connection_key: b.name,
+    display_name: b.display_name,
+    url: b.url,
+    kind: 'mcp_server',
+    provider: 'cloudflare',
+    host: new URL(b.url).hostname,
+    feature_packs: b.feature_packs,
+    portal_manage_scopes: b.portal_manage_scopes,
+    notes: b.description,
+  })),
+]);
+
+export function listOfferableMcpServerConnections() {
+  return [...SEED_OFFERABLE_MCP_SERVER_CONNECTIONS];
+}
+
+/**
+ * Seed for OAuth/external *client* registry only (who connects TO an MCP server).
+ * Do not put Cloudflare portal hostnames here — those belong in the server catalog.
  */
 export const SEED_EXTERNAL_CLIENT_REGISTRY = Object.freeze([
   {
@@ -32,105 +65,6 @@ export const SEED_EXTERNAL_CLIENT_REGISTRY = Object.freeze([
     is_active: 1,
     notes: 'OpenAI ChatGPT connector_platform_oauth + per-connector redirect',
   },
-  {
-    client_key: 'cf_docs_mcp',
-    display_name: 'Cloudflare Docs',
-    oauth_client_id: 'iam_mcp_inneranimalmedia',
-    redirect_host_patterns: ['docs.mcp.cloudflare.com'],
-    sort_order: 10,
-    is_active: 1,
-    notes: 'https://docs.mcp.cloudflare.com/mcp — CF docs reference',
-  },
-  {
-    client_key: 'cf_bindings_mcp',
-    display_name: 'Cloudflare Workers Bindings',
-    oauth_client_id: 'iam_mcp_inneranimalmedia',
-    redirect_host_patterns: ['bindings.mcp.cloudflare.com'],
-    sort_order: 11,
-    is_active: 1,
-    notes: 'https://bindings.mcp.cloudflare.com/mcp — Workers storage, AI, compute',
-  },
-  {
-    client_key: 'cf_builds_mcp',
-    display_name: 'Cloudflare Workers Builds',
-    oauth_client_id: 'iam_mcp_inneranimalmedia',
-    redirect_host_patterns: ['builds.mcp.cloudflare.com'],
-    sort_order: 12,
-    is_active: 1,
-    notes: 'https://builds.mcp.cloudflare.com/mcp — CI/CD insights',
-  },
-  {
-    client_key: 'cf_observability_mcp',
-    display_name: 'Cloudflare Observability',
-    oauth_client_id: 'iam_mcp_inneranimalmedia',
-    redirect_host_patterns: ['observability.mcp.cloudflare.com'],
-    sort_order: 13,
-    is_active: 1,
-    notes: 'https://observability.mcp.cloudflare.com/mcp — logs and analytics',
-  },
-  {
-    client_key: 'cf_browser_mcp',
-    display_name: 'Cloudflare Browser Rendering',
-    oauth_client_id: 'iam_mcp_inneranimalmedia',
-    redirect_host_patterns: ['browser.mcp.cloudflare.com'],
-    sort_order: 14,
-    is_active: 1,
-    notes: 'https://browser.mcp.cloudflare.com/mcp — fetch pages, markdown, screenshots',
-  },
-  {
-    client_key: 'cf_logs_mcp',
-    display_name: 'Cloudflare Logpush',
-    oauth_client_id: 'iam_mcp_inneranimalmedia',
-    redirect_host_patterns: ['logs.mcp.cloudflare.com'],
-    sort_order: 15,
-    is_active: 1,
-    notes: 'https://logs.mcp.cloudflare.com/mcp — Logpush job health',
-  },
-  {
-    client_key: 'cf_ai_gateway_mcp',
-    display_name: 'Cloudflare AI Gateway',
-    oauth_client_id: 'iam_mcp_inneranimalmedia',
-    redirect_host_patterns: ['ai-gateway.mcp.cloudflare.com'],
-    sort_order: 16,
-    is_active: 1,
-    notes: 'https://ai-gateway.mcp.cloudflare.com/mcp — AI request logs',
-  },
-  {
-    client_key: 'cf_audit_logs_mcp',
-    display_name: 'Cloudflare Audit Logs',
-    oauth_client_id: 'iam_mcp_inneranimalmedia',
-    redirect_host_patterns: ['auditlogs.mcp.cloudflare.com'],
-    sort_order: 17,
-    is_active: 1,
-    notes: 'https://auditlogs.mcp.cloudflare.com/mcp — audit log reports',
-  },
-  {
-    client_key: 'cf_dns_analytics_mcp',
-    display_name: 'Cloudflare DNS Analytics',
-    oauth_client_id: 'iam_mcp_inneranimalmedia',
-    redirect_host_patterns: ['dns-analytics.mcp.cloudflare.com'],
-    sort_order: 18,
-    is_active: 1,
-    notes: 'https://dns-analytics.mcp.cloudflare.com/mcp — DNS performance',
-  },
-  {
-    client_key: 'cf_graphql_mcp',
-    display_name: 'Cloudflare GraphQL',
-    oauth_client_id: 'iam_mcp_inneranimalmedia',
-    redirect_host_patterns: ['graphql.mcp.cloudflare.com'],
-    sort_order: 19,
-    is_active: 1,
-    notes: 'https://graphql.mcp.cloudflare.com/mcp — analytics via GraphQL',
-  },
-  {
-    client_key: 'cf_codemode_mcp',
-    display_name: 'Cloudflare Code Mode',
-    oauth_client_id: 'iam_mcp_inneranimalmedia',
-    redirect_host_patterns: ['mcp.cloudflare.com'],
-    sort_order: 20,
-    is_active: 1,
-    notes: 'https://mcp.cloudflare.com/mcp — full CF API in 2 tools, ~1000 tokens',
-  },
   {
     client_key: 'claude',
     display_name: 'Claude.ai',
@@ -140,15 +74,6 @@ export const SEED_EXTERNAL_CLIENT_REGISTRY = Object.freeze([
     is_active: 1,
     notes: 'Anthropic Claude.ai MCP auth_callback',
   },
-  {
-    client_key: 'cf_containers_mcp',
-    display_name: 'Cloudflare Container Sandbox',
-    oauth_client_id: 'iam_mcp_inneranimalmedia',
-    redirect_host_patterns: ['containers.mcp.cloudflare.com'],
-    sort_order: 21,
-    is_active: 1,
-    notes: 'https://containers.mcp.cloudflare.com/mcp — ephemeral ~10min sandboxed containers',
-  },
   {
     client_key: 'cursor',
     display_name: 'Cursor',
@@ -156,13 +81,11 @@ export const SEED_EXTERNAL_CLIENT_REGISTRY = Object.freeze([
     redirect_host_patterns: ['mcp.inneranimalmedia.com', 'cursor.com', 'www.cursor.com'],
     sort_order: 30,
     is_active: 1,
-    notes: 'Cursor desktop (cursor://, localhost:8787) + Cursor Agents',
+    notes: 'Cursor desktop (cursor://, localhost) + Cursor Agents',
   },
 ]);
 
-/**
- * Dynamic list of all recognized active client keys.
- */
+/** Active client keys from seed (IDE hosts only). */
 export const SUPPORTED_CLIENTS = Object.freeze(
   SEED_EXTERNAL_CLIENT_REGISTRY.filter((c) => Number(c.is_active) !== 0).map((c) => c.client_key),
 );
@@ -222,8 +145,14 @@ export async function fetchExternalClientRegistry(options = {}) {
     if (res.ok) {
       const body = await res.json();
       if (body?.ok && Array.isArray(body.clients)) {
-        writeCachedClientRegistry(body.clients, options);
-        return body.clients.filter((c) => Number(c.is_active) !== 0);
+        // Never treat MCP portal hostnames as clients even if a stale API row says so.
+        const clients = body.clients.filter((c) => {
+          if (Number(c.is_active) === 0) return false;
+          const key = String(c.client_key || '').toLowerCase();
+          return !key.startsWith('cf_') && !key.includes('mcp.cloudflare');
+        });
+        writeCachedClientRegistry(clients, options);
+        return clients;
       }
     }
   } catch {
@@ -241,7 +170,10 @@ export async function fetchExternalClientRegistry(options = {}) {
 export function listRegisteredClients(options = {}) {
   const cached = loadCachedClientRegistry(options);
   if (cached?.clients?.length) {
-    return cached.clients;
+    return cached.clients.filter((c) => {
+      const key = String(c.client_key || '').toLowerCase();
+      return !key.startsWith('cf_');
+    });
   }
   return SEED_EXTERNAL_CLIENT_REGISTRY.filter((c) => Number(c.is_active) !== 0);
 }
@@ -276,12 +208,10 @@ export function getClientConfigPath(clientName, options = {}) {
     return path.join(getMcpDir(options), 'clients', 'chatgpt-connector.json');
   }
 
-  // AgentSam apps/ family and standalone binary adapter
   if (client === 'agentsam') {
     return path.join(home, '.agentsam', 'mcp.json');
   }
 
-  // Any other active client in registry: adapter configuration JSON
   if (isClientRegistered(client, options)) {
     return path.join(getMcpDir(options), 'clients', `${client}.json`);
   }
@@ -293,29 +223,25 @@ export function detectInstalledClients(options = {}) {
   const detected = [];
   const home = homeDirectory(options);
 
-  // Check Cursor
   const cursorDir = path.join(home, '.cursor');
-  if (fs.existsSync(cursorDir)) {
-    detected.push('cursor');
-  }
+  if (fs.existsSync(cursorDir)) detected.push('cursor');
 
-  // Check Claude
-  const claudeConfig = getClientConfigPath('claude', options);
-  if (fs.existsSync(path.dirname(claudeConfig))) {
-    detected.push('claude');
+  try {
+    const claudeConfig = getClientConfigPath('claude', options);
+    if (fs.existsSync(path.dirname(claudeConfig))) detected.push('claude');
+  } catch {
+    // ignore
   }
 
-  // Check ChatGPT
-  const chatgptConfig = getClientConfigPath('chatgpt', options);
-  if (fs.existsSync(chatgptConfig)) {
-    detected.push('chatgpt');
+  try {
+    const chatgptConfig = getClientConfigPath('chatgpt', options);
+    if (fs.existsSync(chatgptConfig)) detected.push('chatgpt');
+  } catch {
+    // ignore
   }
 
-  // Check AgentSam family adapter target (~/.agentsam)
   const agentsamDir = path.join(home, '.agentsam');
-  if (fs.existsSync(agentsamDir)) {
-    detected.push('agentsam');
-  }
+  if (fs.existsSync(agentsamDir)) detected.push('agentsam');
 
   return detected;
 }
@@ -338,13 +264,12 @@ export function syncServerToClient(clientName, serverName, serverConfig, options
   const configPath = getClientConfigPath(clientName, options);
   const client = clean(clientName).toLowerCase();
 
-  // ChatGPT connector payload export
   if (client === 'chatgpt') {
     const chatgptPayload = {
       schema: 'agentsam.mcp.client-adapter.chatgpt.v1',
       name: serverName,
       server_url: serverConfig.url,
-      protocol: serverConfig.protocol || 'sse',
+      protocol: serverConfig.protocol || 'streamable_http',
       auth: serverConfig.auth || { type: 'none' },
       description: serverConfig.metadata?.description || `MCP Server connection for ${serverName}`,
       instructions: 'Use in ChatGPT Custom GPTs or ChatGPT Developer Mode Action Connectors.',
@@ -354,7 +279,6 @@ export function syncServerToClient(clientName, serverName, serverConfig, options
     return { client, configPath, synced: true };
   }
 
-  // Default Cursor / Claude mcpServers schema
   const existing = readJsonSafe(configPath) || { mcpServers: {} };
   if (!existing.mcpServers || typeof existing.mcpServers !== 'object') {
     existing.mcpServers = {};
@@ -362,10 +286,10 @@ export function syncServerToClient(clientName, serverName, serverConfig, options
 
   const headers = {};
   if (serverConfig.auth?.token) {
-    headers['Authorization'] = `Bearer ${serverConfig.auth.token}`;
+    headers.Authorization = `Bearer ${serverConfig.auth.token}`;
   }
   if (client === 'cursor') {
-    headers['Accept'] = 'application/json, text/event-stream';
+    headers.Accept = 'application/json, text/event-stream';
   }
 
   existing.mcpServers[serverName] = {