@xopcai/xopc 0.0.115 → 0.0.117

package/dist/src/connectors/composio.js

@@ -0,0 +1,334 @@
+import { CredentialResolver, init_credentials } from "../auth/credentials.js";
+import { consumeConnectorSetupSecretRef } from "./setup-secrets.js";
+//#region src/connectors/composio.ts
+init_credentials();
+const COMPOSIO_TOOLKITS = [
+	[
+		"gmail",
+		"Gmail",
+		"Read and send Gmail messages through Composio."
+	],
+	[
+		"googlecalendar",
+		"Google Calendar",
+		"Read and manage Google Calendar events through Composio."
+	],
+	[
+		"googledrive",
+		"Google Drive",
+		"Search and manage Google Drive files through Composio."
+	],
+	[
+		"notion",
+		"Notion",
+		"Search and update Notion pages and databases through Composio."
+	],
+	[
+		"slack",
+		"Slack",
+		"Read and send Slack workspace messages through Composio."
+	],
+	[
+		"github",
+		"GitHub via Composio",
+		"Work with GitHub repositories, issues, and pull requests through Composio."
+	],
+	[
+		"linear",
+		"Linear via Composio",
+		"Manage Linear issues and projects through Composio."
+	]
+];
+const COMPOSIO_API_KEY_PROVIDER = "connector-composio-api-key";
+const COMPOSIO_SCOPE_ORDER = {
+	read: 1,
+	write: 2,
+	admin: 3
+};
+const COMPOSIO_CURATED_ACTIONS = {
+	gmail: {
+		GMAIL_FETCH_EMAILS: "read",
+		GMAIL_GET_EMAIL: "read",
+		GMAIL_LIST_LABELS: "read",
+		GMAIL_SEND_EMAIL: "write",
+		GMAIL_CREATE_EMAIL_DRAFT: "write",
+		GMAIL_REPLY_TO_THREAD: "write",
+		GMAIL_TRASH_EMAIL: "admin"
+	},
+	googlecalendar: {
+		GOOGLECALENDAR_FIND_EVENT: "read",
+		GOOGLECALENDAR_LIST_EVENTS: "read",
+		GOOGLECALENDAR_CREATE_EVENT: "write",
+		GOOGLECALENDAR_UPDATE_EVENT: "write",
+		GOOGLECALENDAR_DELETE_EVENT: "admin"
+	},
+	googledrive: {
+		GOOGLEDRIVE_SEARCH_FILES: "read",
+		GOOGLEDRIVE_GET_FILE: "read",
+		GOOGLEDRIVE_CREATE_FILE: "write",
+		GOOGLEDRIVE_UPDATE_FILE: "write",
+		GOOGLEDRIVE_DELETE_FILE: "admin"
+	},
+	notion: {
+		NOTION_SEARCH: "read",
+		NOTION_FETCH_PAGE: "read",
+		NOTION_CREATE_PAGE: "write",
+		NOTION_UPDATE_PAGE: "write"
+	},
+	slack: {
+		SLACK_LIST_CHANNELS: "read",
+		SLACK_FETCH_CONVERSATION_HISTORY: "read",
+		SLACK_SENDS_A_MESSAGE_TO_A_SLACK_CHANNEL: "write",
+		SLACK_SEND_DIRECT_MESSAGE: "write"
+	},
+	github: {
+		GITHUB_GET_REPOSITORY: "read",
+		GITHUB_LIST_REPOSITORY_ISSUES: "read",
+		GITHUB_CREATE_AN_ISSUE: "write",
+		GITHUB_CREATE_PULL_REQUEST: "write"
+	},
+	linear: {
+		LINEAR_LIST_ISSUES: "read",
+		LINEAR_GET_ISSUE: "read",
+		LINEAR_CREATE_ISSUE: "write",
+		LINEAR_UPDATE_ISSUE: "write"
+	}
+};
+function composioBaseUrl() {
+	return process.env.XOPC_COMPOSIO_BASE_URL?.trim().replace(/\/+$/, "") || "https://backend.composio.dev/api/v3";
+}
+async function composioApiKey(resolver = new CredentialResolver()) {
+	const key = (await resolver.resolveApiKey(COMPOSIO_API_KEY_PROVIDER).catch(() => void 0))?.trim() || process.env.XOPC_COMPOSIO_API_KEY?.trim() || process.env.COMPOSIO_API_KEY?.trim();
+	if (!key) throw new Error("Composio API key is not configured. Set XOPC_COMPOSIO_API_KEY or connect the Composio API Key connector.");
+	return key;
+}
+async function composioFetch(path, init = {}, resolver = new CredentialResolver()) {
+	const apiKey = await composioApiKey(resolver);
+	const response = await fetch(`${composioBaseUrl()}${path}`, {
+		...init,
+		headers: {
+			Accept: "application/json",
+			"Content-Type": "application/json",
+			"x-api-key": apiKey,
+			Authorization: `Bearer ${apiKey}`,
+			...init.headers ?? {}
+		}
+	});
+	const data = await response.json().catch(async () => ({ error: await response.text().catch(() => response.statusText) }));
+	if (!response.ok) {
+		const record = data && typeof data === "object" && !Array.isArray(data) ? data : {};
+		throw new Error(String(record.error ?? record.message ?? response.statusText));
+	}
+	return data;
+}
+function arrayAt(payload, keys) {
+	if (Array.isArray(payload)) return payload;
+	if (!payload || typeof payload !== "object" || Array.isArray(payload)) return [];
+	const record = payload;
+	for (const key of keys) if (Array.isArray(record[key])) return record[key];
+	return [];
+}
+function readString(value) {
+	return typeof value === "string" && value.trim() ? value.trim() : void 0;
+}
+function normalizeToolkit(toolkit) {
+	return toolkit.trim().toLowerCase().replace(/[^a-z0-9_]+/g, "");
+}
+function toolkitFromComposioSlug(slug) {
+	const upper = slug.trim().toUpperCase();
+	if (!upper) return void 0;
+	if (upper.startsWith("GOOGLECALENDAR_")) return "googlecalendar";
+	if (upper.startsWith("GOOGLEDRIVE_")) return "googledrive";
+	return upper.split("_")[0]?.toLowerCase() || void 0;
+}
+function scopeForComposioAction(slug) {
+	const toolkit = toolkitFromComposioSlug(slug);
+	if (!toolkit) return {
+		scope: "write",
+		curated: false
+	};
+	const scope = COMPOSIO_CURATED_ACTIONS[toolkit]?.[slug.trim().toUpperCase()];
+	if (scope) return {
+		toolkit,
+		scope,
+		curated: true
+	};
+	return {
+		toolkit,
+		scope: "write",
+		curated: false
+	};
+}
+function getComposioToolkitScope(config, toolkit) {
+	const record = config?.connectors?.instances?.[`composio-${normalizeToolkit(toolkit)}`];
+	const raw = record && typeof record === "object" && !Array.isArray(record) ? record.scope : void 0;
+	return raw === "admin" || raw === "write" || raw === "read" ? raw : "read";
+}
+function setComposioToolkitScope(config, toolkit, scope) {
+	const instanceId = `composio-${normalizeToolkit(toolkit)}`;
+	const record = config.connectors?.instances?.[instanceId];
+	if (!record || typeof record !== "object" || Array.isArray(record)) throw new Error(`Composio connector is not installed: ${toolkit}`);
+	record.scope = scope;
+}
+function canUseComposioAction(config, slug) {
+	const action = scopeForComposioAction(slug);
+	if (!action.toolkit) return {
+		ok: false,
+		reason: `Unknown Composio toolkit for action: ${slug}`,
+		scope: action.scope
+	};
+	if (!config?.connectors?.instances?.[`composio-${action.toolkit}`]) return {
+		ok: false,
+		reason: `Composio connector is not installed: ${action.toolkit}`,
+		toolkit: action.toolkit,
+		scope: action.scope
+	};
+	const allowedScope = getComposioToolkitScope(config, action.toolkit);
+	if (COMPOSIO_SCOPE_ORDER[allowedScope] < COMPOSIO_SCOPE_ORDER[action.scope]) return {
+		ok: false,
+		reason: `Composio action ${slug} requires ${action.scope} scope; connector allows ${allowedScope}.`,
+		toolkit: action.toolkit,
+		scope: action.scope
+	};
+	if (!action.curated && allowedScope !== "admin") return {
+		ok: false,
+		reason: `Composio action ${slug} is not in the curated allowlist. Set connector scope to admin to allow uncurated actions.`,
+		toolkit: action.toolkit,
+		scope: action.scope
+	};
+	return {
+		ok: true,
+		toolkit: action.toolkit,
+		scope: action.scope
+	};
+}
+const COMPOSIO_CONNECTORS = [{
+	id: "composio-api-key",
+	version: "1.0.0",
+	displayName: "Composio API Key",
+	description: "Store a Composio API key for direct-mode toolkit connectors.",
+	category: "automation",
+	kind: "composio",
+	source: "builtin",
+	capabilities: [
+		"auth.apiKey",
+		"tools",
+		"events",
+		"workflows"
+	],
+	tags: [
+		"composio",
+		"oauth",
+		"integrations"
+	],
+	auth: { mode: "apiKey" },
+	setup: { secrets: [{
+		key: "COMPOSIO_API_KEY",
+		label: "Composio API key",
+		required: true
+	}] },
+	runtime: {
+		type: "composio",
+		toolkit: "composio"
+	}
+}, ...COMPOSIO_TOOLKITS.map(([toolkit, displayName, description]) => ({
+	id: `composio-${toolkit}`,
+	version: "1.0.0",
+	displayName,
+	description,
+	category: "automation",
+	kind: "composio",
+	source: "builtin",
+	capabilities: [
+		"tools",
+		"auth.oauth",
+		"events",
+		"workflows"
+	],
+	tags: ["composio", toolkit],
+	auth: { mode: "none" },
+	setup: {},
+	runtime: {
+		type: "composio",
+		toolkit
+	}
+}))];
+async function saveComposioApiKey(input, resolver = new CredentialResolver()) {
+	const raw = input.secrets?.COMPOSIO_API_KEY;
+	const resolved = typeof raw === "string" && raw.trim().startsWith("secret://") ? consumeConnectorSetupSecretRef(raw) : raw;
+	if (typeof resolved === "string" && resolved.trim()) await resolver.saveApiKey(COMPOSIO_API_KEY_PROVIDER, resolved.trim(), { profileName: "default" });
+}
+async function listComposioConnections(resolver = new CredentialResolver()) {
+	return arrayAt(await composioFetch("/connected_accounts", {}, resolver), [
+		"items",
+		"connected_accounts",
+		"connections",
+		"data"
+	]).flatMap((item) => {
+		if (!item || typeof item !== "object" || Array.isArray(item)) return [];
+		const row = item;
+		const toolkit = readString(row.toolkit_slug ?? row.toolkit ?? row.appName ?? row.app_name);
+		const id = readString(row.id ?? row.uuid ?? row.connectedAccountId ?? row.connected_account_id);
+		if (!toolkit || !id) return [];
+		return [{
+			id,
+			toolkit,
+			status: readString(row.status) ?? "unknown",
+			accountEmail: readString(row.accountEmail ?? row.account_email ?? row.email),
+			workspace: readString(row.workspace ?? row.teamName ?? row.team_name),
+			username: readString(row.username ?? row.name)
+		}];
+	});
+}
+async function startComposioAuthorize(toolkit, resolver = new CredentialResolver()) {
+	const payload = await composioFetch("/connected_accounts", {
+		method: "POST",
+		body: JSON.stringify({
+			toolkit_slug: toolkit,
+			toolkit,
+			auth_config: {}
+		})
+	}, resolver);
+	const record = payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
+	const connectUrl = readString(record.redirect_url ?? record.redirectUrl ?? record.connect_url ?? record.connectUrl);
+	if (!connectUrl) throw new Error("Composio authorize did not return a connect URL.");
+	return {
+		toolkit,
+		connectUrl,
+		connectionId: readString(record.id ?? record.connectionId ?? record.connected_account_id)
+	};
+}
+async function listComposioTools(toolkit, config, resolver = new CredentialResolver()) {
+	return arrayAt(await composioFetch(`/tools?toolkit_slug=${encodeURIComponent(toolkit)}`, {}, resolver), [
+		"items",
+		"tools",
+		"data"
+	]).flatMap((item) => {
+		if (!item || typeof item !== "object" || Array.isArray(item)) return [];
+		const row = item;
+		const slug = readString(row.slug ?? row.name);
+		if (!slug) return [];
+		const action = scopeForComposioAction(slug);
+		if (!(config ? canUseComposioAction(config, slug).ok : true)) return [];
+		return [{
+			slug,
+			name: readString(row.name),
+			description: readString(row.description),
+			inputSchema: row.inputSchema ?? row.input_schema ?? row.parameters,
+			scope: action.scope,
+			curated: action.curated
+		}];
+	});
+}
+async function executeComposioTool(params, resolver = new CredentialResolver()) {
+	const allowed = canUseComposioAction(params.config, params.slug);
+	if (allowed.ok === false) throw new Error(allowed.reason);
+	return composioFetch(`/tools/${encodeURIComponent(params.slug)}/execute`, {
+		method: "POST",
+		body: JSON.stringify({ arguments: params.arguments ?? {} })
+	}, resolver);
+}
+//#endregion
+export { COMPOSIO_CONNECTORS, canUseComposioAction, executeComposioTool, getComposioToolkitScope, listComposioConnections, listComposioTools, saveComposioApiKey, scopeForComposioAction, setComposioToolkitScope, startComposioAuthorize, toolkitFromComposioSlug };
+
+//# sourceMappingURL=composio.js.map

package/dist/src/connectors/composio.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"composio.js","names":[],"sources":["../../../src/connectors/composio.ts"],"sourcesContent":["import { CredentialResolver } from '../auth/credentials.js';\nimport type { Config } from '../config/schema.js';\nimport { consumeConnectorSetupSecretRef } from './setup-secrets.js';\nimport type { ConnectorDefinition } from './types.js';\n\nexport type ComposioConnection = {\n  id: string;\n  toolkit: string;\n  status: string;\n  accountEmail?: string;\n  workspace?: string;\n  username?: string;\n};\n\nexport type ComposioScope = 'read' | 'write' | 'admin';\n\nexport type ComposioTool = {\n  slug: string;\n  name?: string;\n  description?: string;\n  inputSchema?: unknown;\n  scope: ComposioScope;\n  curated: boolean;\n};\n\nconst COMPOSIO_TOOLKITS = [\n  ['gmail', 'Gmail', 'Read and send Gmail messages through Composio.'],\n  ['googlecalendar', 'Google Calendar', 'Read and manage Google Calendar events through Composio.'],\n  ['googledrive', 'Google Drive', 'Search and manage Google Drive files through Composio.'],\n  ['notion', 'Notion', 'Search and update Notion pages and databases through Composio.'],\n  ['slack', 'Slack', 'Read and send Slack workspace messages through Composio.'],\n  ['github', 'GitHub via Composio', 'Work with GitHub repositories, issues, and pull requests through Composio.'],\n  ['linear', 'Linear via Composio', 'Manage Linear issues and projects through Composio.'],\n] as const;\n\nconst COMPOSIO_API_KEY_PROVIDER = 'connector-composio-api-key';\nconst COMPOSIO_SCOPE_ORDER: Record<ComposioScope, number> = { read: 1, write: 2, admin: 3 };\n\nconst COMPOSIO_CURATED_ACTIONS: Record<string, Record<string, ComposioScope>> = {\n  gmail: {\n    GMAIL_FETCH_EMAILS: 'read',\n    GMAIL_GET_EMAIL: 'read',\n    GMAIL_LIST_LABELS: 'read',\n    GMAIL_SEND_EMAIL: 'write',\n    GMAIL_CREATE_EMAIL_DRAFT: 'write',\n    GMAIL_REPLY_TO_THREAD: 'write',\n    GMAIL_TRASH_EMAIL: 'admin',\n  },\n  googlecalendar: {\n    GOOGLECALENDAR_FIND_EVENT: 'read',\n    GOOGLECALENDAR_LIST_EVENTS: 'read',\n    GOOGLECALENDAR_CREATE_EVENT: 'write',\n    GOOGLECALENDAR_UPDATE_EVENT: 'write',\n    GOOGLECALENDAR_DELETE_EVENT: 'admin',\n  },\n  googledrive: {\n    GOOGLEDRIVE_SEARCH_FILES: 'read',\n    GOOGLEDRIVE_GET_FILE: 'read',\n    GOOGLEDRIVE_CREATE_FILE: 'write',\n    GOOGLEDRIVE_UPDATE_FILE: 'write',\n    GOOGLEDRIVE_DELETE_FILE: 'admin',\n  },\n  notion: {\n    NOTION_SEARCH: 'read',\n    NOTION_FETCH_PAGE: 'read',\n    NOTION_CREATE_PAGE: 'write',\n    NOTION_UPDATE_PAGE: 'write',\n  },\n  slack: {\n    SLACK_LIST_CHANNELS: 'read',\n    SLACK_FETCH_CONVERSATION_HISTORY: 'read',\n    SLACK_SENDS_A_MESSAGE_TO_A_SLACK_CHANNEL: 'write',\n    SLACK_SEND_DIRECT_MESSAGE: 'write',\n  },\n  github: {\n    GITHUB_GET_REPOSITORY: 'read',\n    GITHUB_LIST_REPOSITORY_ISSUES: 'read',\n    GITHUB_CREATE_AN_ISSUE: 'write',\n    GITHUB_CREATE_PULL_REQUEST: 'write',\n  },\n  linear: {\n    LINEAR_LIST_ISSUES: 'read',\n    LINEAR_GET_ISSUE: 'read',\n    LINEAR_CREATE_ISSUE: 'write',\n    LINEAR_UPDATE_ISSUE: 'write',\n  },\n};\n\nfunction composioBaseUrl(): string {\n  return process.env.XOPC_COMPOSIO_BASE_URL?.trim().replace(/\\/+$/, '') || 'https://backend.composio.dev/api/v3';\n}\n\nasync function composioApiKey(resolver = new CredentialResolver()): Promise<string> {\n  const stored = await resolver.resolveApiKey(COMPOSIO_API_KEY_PROVIDER).catch(() => undefined);\n  const key = stored?.trim() || process.env.XOPC_COMPOSIO_API_KEY?.trim() || process.env.COMPOSIO_API_KEY?.trim();\n  if (!key) {\n    throw new Error('Composio API key is not configured. Set XOPC_COMPOSIO_API_KEY or connect the Composio API Key connector.');\n  }\n  return key;\n}\n\nasync function composioFetch(path: string, init: RequestInit = {}, resolver = new CredentialResolver()): Promise<unknown> {\n  const apiKey = await composioApiKey(resolver);\n  const response = await fetch(`${composioBaseUrl()}${path}`, {\n    ...init,\n    headers: {\n      Accept: 'application/json',\n      'Content-Type': 'application/json',\n      'x-api-key': apiKey,\n      Authorization: `Bearer ${apiKey}`,\n      ...(init.headers ?? {}),\n    },\n  });\n  const data = await response.json().catch(async () => ({ error: await response.text().catch(() => response.statusText) }));\n  if (!response.ok) {\n    const record = data && typeof data === 'object' && !Array.isArray(data) ? data as Record<string, unknown> : {};\n    throw new Error(String(record.error ?? record.message ?? response.statusText));\n  }\n  return data;\n}\n\nfunction arrayAt(payload: unknown, keys: string[]): unknown[] {\n  if (Array.isArray(payload)) return payload;\n  if (!payload || typeof payload !== 'object' || Array.isArray(payload)) return [];\n  const record = payload as Record<string, unknown>;\n  for (const key of keys) {\n    if (Array.isArray(record[key])) return record[key] as unknown[];\n  }\n  return [];\n}\n\nfunction readString(value: unknown): string | undefined {\n  return typeof value === 'string' && value.trim() ? value.trim() : undefined;\n}\n\nfunction normalizeToolkit(toolkit: string): string {\n  return toolkit.trim().toLowerCase().replace(/[^a-z0-9_]+/g, '');\n}\n\nexport function toolkitFromComposioSlug(slug: string): string | undefined {\n  const upper = slug.trim().toUpperCase();\n  if (!upper) return undefined;\n  if (upper.startsWith('GOOGLECALENDAR_')) return 'googlecalendar';\n  if (upper.startsWith('GOOGLEDRIVE_')) return 'googledrive';\n  const prefix = upper.split('_')[0]?.toLowerCase();\n  return prefix || undefined;\n}\n\nexport function scopeForComposioAction(slug: string): { toolkit?: string; scope: ComposioScope; curated: boolean } {\n  const toolkit = toolkitFromComposioSlug(slug);\n  if (!toolkit) return { scope: 'write', curated: false };\n  const scope = COMPOSIO_CURATED_ACTIONS[toolkit]?.[slug.trim().toUpperCase()];\n  if (scope) return { toolkit, scope, curated: true };\n  return { toolkit, scope: 'write', curated: false };\n}\n\nexport function getComposioToolkitScope(config: Config | undefined, toolkit: string): ComposioScope {\n  const record = config?.connectors?.instances?.[`composio-${normalizeToolkit(toolkit)}`];\n  const raw = record && typeof record === 'object' && !Array.isArray(record)\n    ? (record as Record<string, unknown>).scope\n    : undefined;\n  return raw === 'admin' || raw === 'write' || raw === 'read' ? raw : 'read';\n}\n\nexport function setComposioToolkitScope(config: Config, toolkit: string, scope: ComposioScope): void {\n  const instanceId = `composio-${normalizeToolkit(toolkit)}`;\n  const record = config.connectors?.instances?.[instanceId];\n  if (!record || typeof record !== 'object' || Array.isArray(record)) {\n    throw new Error(`Composio connector is not installed: ${toolkit}`);\n  }\n  (record as Record<string, unknown>).scope = scope;\n}\n\nexport function canUseComposioAction(config: Config | undefined, slug: string): { ok: true; toolkit?: string; scope: ComposioScope } | { ok: false; reason: string; toolkit?: string; scope: ComposioScope } {\n  const action = scopeForComposioAction(slug);\n  if (!action.toolkit) return { ok: false, reason: `Unknown Composio toolkit for action: ${slug}`, scope: action.scope };\n  const installed = config?.connectors?.instances?.[`composio-${action.toolkit}`];\n  if (!installed) return { ok: false, reason: `Composio connector is not installed: ${action.toolkit}`, toolkit: action.toolkit, scope: action.scope };\n  const allowedScope = getComposioToolkitScope(config, action.toolkit);\n  if (COMPOSIO_SCOPE_ORDER[allowedScope] < COMPOSIO_SCOPE_ORDER[action.scope]) {\n    return { ok: false, reason: `Composio action ${slug} requires ${action.scope} scope; connector allows ${allowedScope}.`, toolkit: action.toolkit, scope: action.scope };\n  }\n  if (!action.curated && allowedScope !== 'admin') {\n    return { ok: false, reason: `Composio action ${slug} is not in the curated allowlist. Set connector scope to admin to allow uncurated actions.`, toolkit: action.toolkit, scope: action.scope };\n  }\n  return { ok: true, toolkit: action.toolkit, scope: action.scope };\n}\n\nexport const COMPOSIO_CONNECTORS: readonly ConnectorDefinition[] = [\n  {\n    id: 'composio-api-key',\n    version: '1.0.0',\n    displayName: 'Composio API Key',\n    description: 'Store a Composio API key for direct-mode toolkit connectors.',\n    category: 'automation',\n    kind: 'composio',\n    source: 'builtin',\n    capabilities: ['auth.apiKey', 'tools', 'events', 'workflows'],\n    tags: ['composio', 'oauth', 'integrations'],\n    auth: { mode: 'apiKey' },\n    setup: {\n      secrets: [{ key: 'COMPOSIO_API_KEY', label: 'Composio API key', required: true }],\n    },\n    runtime: { type: 'composio', toolkit: 'composio' },\n  },\n  ...COMPOSIO_TOOLKITS.map(([toolkit, displayName, description]) => ({\n    id: `composio-${toolkit}`,\n    version: '1.0.0',\n    displayName,\n    description,\n    category: 'automation' as const,\n    kind: 'composio' as const,\n    source: 'builtin' as const,\n    capabilities: ['tools', 'auth.oauth', 'events', 'workflows'] as ConnectorDefinition['capabilities'],\n    tags: ['composio', toolkit],\n    auth: { mode: 'none' as const },\n    setup: {},\n    runtime: { type: 'composio' as const, toolkit },\n  })),\n];\n\nexport async function saveComposioApiKey(input: { secrets?: Record<string, unknown> }, resolver = new CredentialResolver()): Promise<void> {\n  const raw = input.secrets?.COMPOSIO_API_KEY;\n  const resolved = typeof raw === 'string' && raw.trim().startsWith('secret://')\n    ? consumeConnectorSetupSecretRef(raw)\n    : raw;\n  if (typeof resolved === 'string' && resolved.trim()) {\n    await resolver.saveApiKey(COMPOSIO_API_KEY_PROVIDER, resolved.trim(), { profileName: 'default' });\n  }\n}\n\nexport async function listComposioConnections(resolver = new CredentialResolver()): Promise<ComposioConnection[]> {\n  const payload = await composioFetch('/connected_accounts', {}, resolver);\n  return arrayAt(payload, ['items', 'connected_accounts', 'connections', 'data']).flatMap((item) => {\n    if (!item || typeof item !== 'object' || Array.isArray(item)) return [];\n    const row = item as Record<string, unknown>;\n    const toolkit = readString(row.toolkit_slug ?? row.toolkit ?? row.appName ?? row.app_name);\n    const id = readString(row.id ?? row.uuid ?? row.connectedAccountId ?? row.connected_account_id);\n    if (!toolkit || !id) return [];\n    return [{\n      id,\n      toolkit,\n      status: readString(row.status) ?? 'unknown',\n      accountEmail: readString(row.accountEmail ?? row.account_email ?? row.email),\n      workspace: readString(row.workspace ?? row.teamName ?? row.team_name),\n      username: readString(row.username ?? row.name),\n    }];\n  });\n}\n\nexport async function startComposioAuthorize(toolkit: string, resolver = new CredentialResolver()): Promise<{ toolkit: string; connectUrl: string; connectionId?: string }> {\n  const payload = await composioFetch('/connected_accounts', {\n    method: 'POST',\n    body: JSON.stringify({ toolkit_slug: toolkit, toolkit, auth_config: {} }),\n  }, resolver);\n  const record = payload && typeof payload === 'object' && !Array.isArray(payload) ? payload as Record<string, unknown> : {};\n  const connectUrl = readString(record.redirect_url ?? record.redirectUrl ?? record.connect_url ?? record.connectUrl);\n  if (!connectUrl) {\n    throw new Error('Composio authorize did not return a connect URL.');\n  }\n  return { toolkit, connectUrl, connectionId: readString(record.id ?? record.connectionId ?? record.connected_account_id) };\n}\n\nexport async function listComposioTools(toolkit: string, config?: Config, resolver = new CredentialResolver()): Promise<ComposioTool[]> {\n  const path = `/tools?toolkit_slug=${encodeURIComponent(toolkit)}`;\n  const payload = await composioFetch(path, {}, resolver);\n  return arrayAt(payload, ['items', 'tools', 'data']).flatMap((item) => {\n    if (!item || typeof item !== 'object' || Array.isArray(item)) return [];\n    const row = item as Record<string, unknown>;\n    const slug = readString(row.slug ?? row.name);\n    if (!slug) return [];\n    const action = scopeForComposioAction(slug);\n    const allowed = config ? canUseComposioAction(config, slug).ok : true;\n    if (!allowed) return [];\n    return [{\n      slug,\n      name: readString(row.name),\n      description: readString(row.description),\n      inputSchema: row.inputSchema ?? row.input_schema ?? row.parameters,\n      scope: action.scope,\n      curated: action.curated,\n    }];\n  });\n}\n\nexport async function executeComposioTool(params: { slug: string; arguments?: unknown; config?: Config }, resolver = new CredentialResolver()): Promise<unknown> {\n  const allowed = canUseComposioAction(params.config, params.slug);\n  if (allowed.ok === false) {\n    throw new Error(allowed.reason);\n  }\n  return composioFetch(`/tools/${encodeURIComponent(params.slug)}/execute`, {\n    method: 'POST',\n    body: JSON.stringify({ arguments: params.arguments ?? {} }),\n  }, resolver);\n}\n"],"mappings":"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"}

package/dist/src/connectors/health.js

@@ -6,6 +6,7 @@ function classifyConnectorHealthError(error) {
 	const message = error instanceof Error ? error.message : String(error);
 	if (/timed out|timeout/i.test(message)) return "timeout";
 	if (/ECONN|ENOTFOUND|network|fetch failed/i.test(message)) return "network_failed";
+	if (/401|unauthorized|forbidden|permission denied/i.test(message)) return "unauthorized";
 	if (/missing|required|credential|api key|token/i.test(message)) return "missing_secret";
 	if (/tools|listTools/i.test(message)) return "tools_list_failed";
 	if (/spawn|command|start|connect/i.test(message)) return "startup_failed";
@@ -15,9 +16,11 @@ function healthActionForStatus(status) {
 	if (status === "missing_secret") return "Reconnect the connector and provide the required secret.";
 	if (status === "timeout" || status === "network_failed") return "Check network access and retry the connector health check.";
 	if (status === "startup_failed") return "Verify the connector runtime dependency is installed and reachable.";
+	if (status === "unauthorized") return "Reconnect the connector or refresh its credentials.";
 }
 async function testConnectorInstance(config, serverId) {
-	if (!getConnectorInstance(config, serverId)) return {
+	const instance = getConnectorInstance(config, serverId);
+	if (!instance) return {
 		serverId,
 		ok: false,
 		status: "server_not_found",
@@ -29,6 +32,18 @@ async function testConnectorInstance(config, serverId) {
 		prompts: [],
 		error: `Connector instance not found: ${serverId}`
 	};
+	if (!instance.enabled) return {
+		serverId,
+		ok: false,
+		status: "disabled",
+		toolCount: 0,
+		resourceCount: 0,
+		promptCount: 0,
+		tools: [],
+		resources: [],
+		prompts: [],
+		action: "Enable the connector before running a health check."
+	};
 	const workspaceDir = getWorkspacePath(config) || "./workspace";
 	try {
 		const capabilities = await listBundleMcpServerCapabilitiesForGateway({

package/dist/src/connectors/health.js.map

@@ -1 +1 @@
-{"version":3,"file":"health.js","names":[],"sources":["../../../src/connectors/health.ts"],"sourcesContent":["import { getWorkspacePath } from '../config/workspace-path-helpers.js';\nimport {\n  listBundleMcpServerCapabilitiesForGateway,\n} from '../agent/mcp/bundle-mcp-materialize.js';\nimport type { Config } from '../config/schema.js';\nimport { getConnectorInstance } from './instances.js';\nimport type { ConnectorHealthResult, ConnectorHealthStatus } from './types.js';\n\nfunction classifyConnectorHealthError(error: unknown): ConnectorHealthStatus {\n  const message = error instanceof Error ? error.message : String(error);\n  if (/timed out|timeout/i.test(message)) {\n    return 'timeout';\n  }\n  if (/ECONN|ENOTFOUND|network|fetch failed/i.test(message)) {\n    return 'network_failed';\n  }\n  if (/missing|required|credential|api key|token/i.test(message)) {\n    return 'missing_secret';\n  }\n  if (/tools|listTools/i.test(message)) {\n    return 'tools_list_failed';\n  }\n  if (/spawn|command|start|connect/i.test(message)) {\n    return 'startup_failed';\n  }\n  return 'unknown_error';\n}\n\nfunction healthActionForStatus(status: ConnectorHealthStatus): string | undefined {\n  if (status === 'missing_secret') {\n    return 'Reconnect the connector and provide the required secret.';\n  }\n  if (status === 'timeout' || status === 'network_failed') {\n    return 'Check network access and retry the connector health check.';\n  }\n  if (status === 'startup_failed') {\n    return 'Verify the connector runtime dependency is installed and reachable.';\n  }\n  return undefined;\n}\n\nexport async function testConnectorInstance(config: Config, serverId: string): Promise<ConnectorHealthResult> {\n  const instance = getConnectorInstance(config, serverId);\n  if (!instance) {\n    return {\n      serverId,\n      ok: false,\n      status: 'server_not_found',\n      toolCount: 0,\n      resourceCount: 0,\n      promptCount: 0,\n      tools: [],\n      resources: [],\n      prompts: [],\n      error: `Connector instance not found: ${serverId}`,\n    };\n  }\n\n  const workspaceDir = getWorkspacePath(config) || './workspace';\n  try {\n    const capabilities = await listBundleMcpServerCapabilitiesForGateway({\n      workspaceDir,\n      cfg: config,\n      serverId,\n    });\n    return {\n      serverId,\n      ok: true,\n      status: 'ok',\n      toolCount: capabilities.toolCount,\n      resourceCount: capabilities.resourceCount,\n      promptCount: capabilities.promptCount,\n      tools: capabilities.tools,\n      resources: capabilities.resources,\n      prompts: capabilities.prompts,\n    };\n  } catch (error) {\n    const status = classifyConnectorHealthError(error);\n    return {\n      serverId,\n      ok: false,\n      status,\n      toolCount: 0,\n      resourceCount: 0,\n      promptCount: 0,\n      tools: [],\n      resources: [],\n      prompts: [],\n      error: error instanceof Error ? error.message : String(error),\n      action: healthActionForStatus(status),\n    };\n  }\n}\n"],"mappings":";;;;AAQA,SAAS,6BAA6B,OAAuC;CAC3E,MAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM;AACtE,KAAI,qBAAqB,KAAK,QAAQ,CACpC,QAAO;AAET,KAAI,wCAAwC,KAAK,QAAQ,CACvD,QAAO;AAET,KAAI,6CAA6C,KAAK,QAAQ,CAC5D,QAAO;AAET,KAAI,mBAAmB,KAAK,QAAQ,CAClC,QAAO;AAET,KAAI,+BAA+B,KAAK,QAAQ,CAC9C,QAAO;AAET,QAAO;;AAGT,SAAS,sBAAsB,QAAmD;AAChF,KAAI,WAAW,iBACb,QAAO;AAET,KAAI,WAAW,aAAa,WAAW,iBACrC,QAAO;AAET,KAAI,WAAW,iBACb,QAAO;;AAKX,eAAsB,sBAAsB,QAAgB,UAAkD;AAE5G,KAAI,CADa,qBAAqB,QAAQ,SACjC,CACX,QAAO;EACL;EACA,IAAI;EACJ,QAAQ;EACR,WAAW;EACX,eAAe;EACf,aAAa;EACb,OAAO,EAAE;EACT,WAAW,EAAE;EACb,SAAS,EAAE;EACX,OAAO,iCAAiC;EACzC;CAGH,MAAM,eAAe,iBAAiB,OAAO,IAAI;AACjD,KAAI;EACF,MAAM,eAAe,MAAM,0CAA0C;GACnE;GACA,KAAK;GACL;GACD,CAAC;AACF,SAAO;GACL;GACA,IAAI;GACJ,QAAQ;GACR,WAAW,aAAa;GACxB,eAAe,aAAa;GAC5B,aAAa,aAAa;GAC1B,OAAO,aAAa;GACpB,WAAW,aAAa;GACxB,SAAS,aAAa;GACvB;UACM,OAAO;EACd,MAAM,SAAS,6BAA6B,MAAM;AAClD,SAAO;GACL;GACA,IAAI;GACJ;GACA,WAAW;GACX,eAAe;GACf,aAAa;GACb,OAAO,EAAE;GACT,WAAW,EAAE;GACb,SAAS,EAAE;GACX,OAAO,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM;GAC7D,QAAQ,sBAAsB,OAAO;GACtC"}
+{"version":3,"file":"health.js","names":[],"sources":["../../../src/connectors/health.ts"],"sourcesContent":["import { getWorkspacePath } from '../config/workspace-path-helpers.js';\nimport {\n  listBundleMcpServerCapabilitiesForGateway,\n} from '../agent/mcp/bundle-mcp-materialize.js';\nimport type { Config } from '../config/schema.js';\nimport { getConnectorInstance } from './instances.js';\nimport type { ConnectorHealthResult, ConnectorHealthStatus } from './types.js';\n\nfunction classifyConnectorHealthError(error: unknown): ConnectorHealthStatus {\n  const message = error instanceof Error ? error.message : String(error);\n  if (/timed out|timeout/i.test(message)) {\n    return 'timeout';\n  }\n  if (/ECONN|ENOTFOUND|network|fetch failed/i.test(message)) {\n    return 'network_failed';\n  }\n  if (/401|unauthorized|forbidden|permission denied/i.test(message)) {\n    return 'unauthorized';\n  }\n  if (/missing|required|credential|api key|token/i.test(message)) {\n    return 'missing_secret';\n  }\n  if (/tools|listTools/i.test(message)) {\n    return 'tools_list_failed';\n  }\n  if (/spawn|command|start|connect/i.test(message)) {\n    return 'startup_failed';\n  }\n  return 'unknown_error';\n}\n\nfunction healthActionForStatus(status: ConnectorHealthStatus): string | undefined {\n  if (status === 'missing_secret') {\n    return 'Reconnect the connector and provide the required secret.';\n  }\n  if (status === 'timeout' || status === 'network_failed') {\n    return 'Check network access and retry the connector health check.';\n  }\n  if (status === 'startup_failed') {\n    return 'Verify the connector runtime dependency is installed and reachable.';\n  }\n  if (status === 'unauthorized') {\n    return 'Reconnect the connector or refresh its credentials.';\n  }\n  return undefined;\n}\n\nexport async function testConnectorInstance(config: Config, serverId: string): Promise<ConnectorHealthResult> {\n  const instance = getConnectorInstance(config, serverId);\n  if (!instance) {\n    return {\n      serverId,\n      ok: false,\n      status: 'server_not_found',\n      toolCount: 0,\n      resourceCount: 0,\n      promptCount: 0,\n      tools: [],\n      resources: [],\n      prompts: [],\n      error: `Connector instance not found: ${serverId}`,\n    };\n  }\n\n  if (!instance.enabled) {\n    return {\n      serverId,\n      ok: false,\n      status: 'disabled',\n      toolCount: 0,\n      resourceCount: 0,\n      promptCount: 0,\n      tools: [],\n      resources: [],\n      prompts: [],\n      action: 'Enable the connector before running a health check.',\n    };\n  }\n\n  const workspaceDir = getWorkspacePath(config) || './workspace';\n  try {\n    const capabilities = await listBundleMcpServerCapabilitiesForGateway({\n      workspaceDir,\n      cfg: config,\n      serverId,\n    });\n    return {\n      serverId,\n      ok: true,\n      status: 'ok',\n      toolCount: capabilities.toolCount,\n      resourceCount: capabilities.resourceCount,\n      promptCount: capabilities.promptCount,\n      tools: capabilities.tools,\n      resources: capabilities.resources,\n      prompts: capabilities.prompts,\n    };\n  } catch (error) {\n    const status = classifyConnectorHealthError(error);\n    return {\n      serverId,\n      ok: false,\n      status,\n      toolCount: 0,\n      resourceCount: 0,\n      promptCount: 0,\n      tools: [],\n      resources: [],\n      prompts: [],\n      error: error instanceof Error ? error.message : String(error),\n      action: healthActionForStatus(status),\n    };\n  }\n}\n"],"mappings":";;;;AAQA,SAAS,6BAA6B,OAAuC;CAC3E,MAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM;AACtE,KAAI,qBAAqB,KAAK,QAAQ,CACpC,QAAO;AAET,KAAI,wCAAwC,KAAK,QAAQ,CACvD,QAAO;AAET,KAAI,gDAAgD,KAAK,QAAQ,CAC/D,QAAO;AAET,KAAI,6CAA6C,KAAK,QAAQ,CAC5D,QAAO;AAET,KAAI,mBAAmB,KAAK,QAAQ,CAClC,QAAO;AAET,KAAI,+BAA+B,KAAK,QAAQ,CAC9C,QAAO;AAET,QAAO;;AAGT,SAAS,sBAAsB,QAAmD;AAChF,KAAI,WAAW,iBACb,QAAO;AAET,KAAI,WAAW,aAAa,WAAW,iBACrC,QAAO;AAET,KAAI,WAAW,iBACb,QAAO;AAET,KAAI,WAAW,eACb,QAAO;;AAKX,eAAsB,sBAAsB,QAAgB,UAAkD;CAC5G,MAAM,WAAW,qBAAqB,QAAQ,SAAS;AACvD,KAAI,CAAC,SACH,QAAO;EACL;EACA,IAAI;EACJ,QAAQ;EACR,WAAW;EACX,eAAe;EACf,aAAa;EACb,OAAO,EAAE;EACT,WAAW,EAAE;EACb,SAAS,EAAE;EACX,OAAO,iCAAiC;EACzC;AAGH,KAAI,CAAC,SAAS,QACZ,QAAO;EACL;EACA,IAAI;EACJ,QAAQ;EACR,WAAW;EACX,eAAe;EACf,aAAa;EACb,OAAO,EAAE;EACT,WAAW,EAAE;EACb,SAAS,EAAE;EACX,QAAQ;EACT;CAGH,MAAM,eAAe,iBAAiB,OAAO,IAAI;AACjD,KAAI;EACF,MAAM,eAAe,MAAM,0CAA0C;GACnE;GACA,KAAK;GACL;GACD,CAAC;AACF,SAAO;GACL;GACA,IAAI;GACJ,QAAQ;GACR,WAAW,aAAa;GACxB,eAAe,aAAa;GAC5B,aAAa,aAAa;GAC1B,OAAO,aAAa;GACpB,WAAW,aAAa;GACxB,SAAS,aAAa;GACvB;UACM,OAAO;EACd,MAAM,SAAS,6BAA6B,MAAM;AAClD,SAAO;GACL;GACA,IAAI;GACJ;GACA,WAAW;GACX,eAAe;GACf,aAAa;GACb,OAAO,EAAE;GACT,WAAW,EAAE;GACb,SAAS,EAAE;GACX,OAAO,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM;GAC7D,QAAQ,sBAAsB,OAAO;GACtC"}

package/dist/src/connectors/install.d.ts

@@ -1,5 +1,6 @@
 import { CredentialResolver } from '../auth/credentials.js';
 import type { Config } from '../config/schema.js';
-import type { ConnectorInstallInput, ConnectorInstance } from './types.js';
+import type { ConnectorDefinition, ConnectorInstallInput, ConnectorInstance } from './types.js';
+export declare function installConnectorDefinition(config: Config, definition: ConnectorDefinition, input: ConnectorInstallInput, resolver?: CredentialResolver): Promise<ConnectorInstance>;
 export declare function installConnector(config: Config, connectorId: string, input: ConnectorInstallInput, resolver?: CredentialResolver): Promise<ConnectorInstance>;
 export declare function uninstallConnector(config: Config, instanceId: string): ConnectorInstance;

package/dist/src/connectors/install.js

@@ -1,4 +1,5 @@
 import { CredentialResolver, init_credentials } from "../auth/credentials.js";
+import { saveComposioApiKey } from "./composio.js";
 import { saveConnectorSecrets } from "./secret-store.js";
 import { getConnectorDefinition } from "./catalog.js";
 import { isManagedConnectorServer, materializeConnectorMcpServer } from "./materialize.js";
@@ -7,9 +8,29 @@ import { listConnectorInstances } from "./instances.js";
 import { assertConnectorOAuthReady } from "./oauth.js";
 //#region src/connectors/install.ts
 init_credentials();
-async function installConnector(config, connectorId, input, resolver = new CredentialResolver()) {
-	const definition = getConnectorDefinition(connectorId);
-	if (!definition) throw new Error(`Unknown connector: ${connectorId}`);
+async function installConnectorDefinition(config, definition, input, resolver = new CredentialResolver()) {
+	if (definition.runtime.type !== "mcp") {
+		const instanceId = definition.id;
+		if (definition.runtime.type === "composio" && definition.id === "composio-api-key") await saveComposioApiKey(input, resolver);
+		config.connectors = config.connectors ?? {};
+		config.connectors.instances = {
+			...config.connectors.instances ?? {},
+			[instanceId]: {
+				xopcConnector: {
+					managed: true,
+					connectorId: definition.id,
+					version: definition.version,
+					enabled: true,
+					displayName: definition.displayName
+				},
+				runtime: definition.runtime,
+				...definition.runtime.type === "composio" && definition.runtime.toolkit !== "composio" ? { scope: "read" } : {}
+			}
+		};
+		const instance = listConnectorInstances(config).find((candidate) => candidate.instanceId === instanceId);
+		if (!instance) throw new Error(`Connector "${definition.id}" was installed but could not be resolved.`);
+		return instance;
+	}
 	const { serverId, server } = materializeConnectorMcpServer(definition, input);
 	const existingServer = config.mcp?.servers?.[serverId];
 	if (existingServer && !isManagedConnectorServer(existingServer)) throw new Error(`MCP server "${serverId}" already exists and is not managed by Connectors.`);
@@ -21,26 +42,42 @@ async function installConnector(config, connectorId, input, resolver = new Crede
 		[serverId]: server
 	};
 	const instance = listConnectorInstances(config).find((candidate) => candidate.instanceId === serverId);
-	if (!instance) throw new Error(`Connector "${connectorId}" was installed but could not be resolved.`);
+	if (!instance) throw new Error(`Connector "${definition.id}" was installed but could not be resolved.`);
 	appendConnectorAuditRecord(config, serverId, { action: "installed" });
 	return instance;
 }
+async function installConnector(config, connectorId, input, resolver = new CredentialResolver()) {
+	const definition = getConnectorDefinition(connectorId);
+	if (!definition) throw new Error(`Unknown connector: ${connectorId}`);
+	return installConnectorDefinition(config, definition, input, resolver);
+}
 function uninstallConnector(config, instanceId) {
 	const server = config.mcp?.servers?.[instanceId];
-	if (!server) throw new Error(`Connector instance not found: ${instanceId}`);
-	if (!isManagedConnectorServer(server)) throw new Error(`MCP server "${instanceId}" is not managed by Connectors.`);
+	const connectorRecord = config.connectors?.instances?.[instanceId];
+	if (!server && !connectorRecord) throw new Error(`Connector instance not found: ${instanceId}`);
+	if (server && !isManagedConnectorServer(server)) throw new Error(`MCP server "${instanceId}" is not managed by Connectors.`);
 	const instance = listConnectorInstances(config).find((candidate) => candidate.instanceId === instanceId);
 	if (!instance) throw new Error(`Connector instance not found: ${instanceId}`);
 	appendConnectorAuditRecord(config, instanceId, { action: "removed" });
-	const nextServers = { ...config.mcp?.servers ?? {} };
-	delete nextServers[instanceId];
-	config.mcp = {
-		...config.mcp ?? {},
-		servers: nextServers
-	};
+	if (server) {
+		const nextServers = { ...config.mcp?.servers ?? {} };
+		delete nextServers[instanceId];
+		config.mcp = {
+			...config.mcp ?? {},
+			servers: nextServers
+		};
+	}
+	if (connectorRecord) {
+		const nextInstances = { ...config.connectors?.instances ?? {} };
+		delete nextInstances[instanceId];
+		config.connectors = {
+			...config.connectors ?? {},
+			instances: nextInstances
+		};
+	}
 	return instance;
 }
 //#endregion
-export { installConnector, uninstallConnector };
+export { installConnector, installConnectorDefinition, uninstallConnector };
 
 //# sourceMappingURL=install.js.map

package/dist/src/connectors/install.js.map

@@ -1 +1 @@
-{"version":3,"file":"install.js","names":[],"sources":["../../../src/connectors/install.ts"],"sourcesContent":["import { CredentialResolver } from '../auth/credentials.js';\nimport type { Config } from '../config/schema.js';\nimport { getConnectorDefinition } from './catalog.js';\nimport { listConnectorInstances } from './instances.js';\nimport { isManagedConnectorServer, materializeConnectorMcpServer } from './materialize.js';\nimport { assertConnectorOAuthReady } from './oauth.js';\nimport { saveConnectorSecrets } from './secret-store.js';\nimport { appendConnectorAuditRecord } from './usage.js';\nimport type { ConnectorInstallInput, ConnectorInstance } from './types.js';\n\nexport async function installConnector(\n  config: Config,\n  connectorId: string,\n  input: ConnectorInstallInput,\n  resolver = new CredentialResolver(),\n): Promise<ConnectorInstance> {\n  const definition = getConnectorDefinition(connectorId);\n  if (!definition) {\n    throw new Error(`Unknown connector: ${connectorId}`);\n  }\n\n  const { serverId, server } = materializeConnectorMcpServer(definition, input);\n  const existingServer = config.mcp?.servers?.[serverId];\n  if (existingServer && !isManagedConnectorServer(existingServer)) {\n    throw new Error(`MCP server \"${serverId}\" already exists and is not managed by Connectors.`);\n  }\n\n  await assertConnectorOAuthReady(definition, resolver);\n  await saveConnectorSecrets(definition, input, resolver);\n\n  config.mcp = config.mcp ?? {};\n  config.mcp.servers = {\n    ...(config.mcp.servers ?? {}),\n    [serverId]: server,\n  };\n\n  const instance = listConnectorInstances(config).find((candidate) => candidate.instanceId === serverId);\n  if (!instance) {\n    throw new Error(`Connector \"${connectorId}\" was installed but could not be resolved.`);\n  }\n  appendConnectorAuditRecord(config, serverId, { action: 'installed' });\n  return instance;\n}\n\nexport function uninstallConnector(config: Config, instanceId: string): ConnectorInstance {\n  const server = config.mcp?.servers?.[instanceId];\n  if (!server) {\n    throw new Error(`Connector instance not found: ${instanceId}`);\n  }\n  if (!isManagedConnectorServer(server)) {\n    throw new Error(`MCP server \"${instanceId}\" is not managed by Connectors.`);\n  }\n\n  const instance = listConnectorInstances(config).find((candidate) => candidate.instanceId === instanceId);\n  if (!instance) {\n    throw new Error(`Connector instance not found: ${instanceId}`);\n  }\n  appendConnectorAuditRecord(config, instanceId, { action: 'removed' });\n\n  const nextServers = { ...(config.mcp?.servers ?? {}) };\n  delete nextServers[instanceId];\n  config.mcp = {\n    ...(config.mcp ?? {}),\n    servers: nextServers,\n  };\n  return instance;\n}\n"],"mappings":";;;;;;;;kBAA4D;AAU5D,eAAsB,iBACpB,QACA,aACA,OACA,WAAW,IAAI,oBAAoB,EACP;CAC5B,MAAM,aAAa,uBAAuB,YAAY;AACtD,KAAI,CAAC,WACH,OAAM,IAAI,MAAM,sBAAsB,cAAc;CAGtD,MAAM,EAAE,UAAU,WAAW,8BAA8B,YAAY,MAAM;CAC7E,MAAM,iBAAiB,OAAO,KAAK,UAAU;AAC7C,KAAI,kBAAkB,CAAC,yBAAyB,eAAe,CAC7D,OAAM,IAAI,MAAM,eAAe,SAAS,oDAAoD;AAG9F,OAAM,0BAA0B,YAAY,SAAS;AACrD,OAAM,qBAAqB,YAAY,OAAO,SAAS;AAEvD,QAAO,MAAM,OAAO,OAAO,EAAE;AAC7B,QAAO,IAAI,UAAU;EACnB,GAAI,OAAO,IAAI,WAAW,EAAE;GAC3B,WAAW;EACb;CAED,MAAM,WAAW,uBAAuB,OAAO,CAAC,MAAM,cAAc,UAAU,eAAe,SAAS;AACtG,KAAI,CAAC,SACH,OAAM,IAAI,MAAM,cAAc,YAAY,4CAA4C;AAExF,4BAA2B,QAAQ,UAAU,EAAE,QAAQ,aAAa,CAAC;AACrE,QAAO;;AAGT,SAAgB,mBAAmB,QAAgB,YAAuC;CACxF,MAAM,SAAS,OAAO,KAAK,UAAU;AACrC,KAAI,CAAC,OACH,OAAM,IAAI,MAAM,iCAAiC,aAAa;AAEhE,KAAI,CAAC,yBAAyB,OAAO,CACnC,OAAM,IAAI,MAAM,eAAe,WAAW,iCAAiC;CAG7E,MAAM,WAAW,uBAAuB,OAAO,CAAC,MAAM,cAAc,UAAU,eAAe,WAAW;AACxG,KAAI,CAAC,SACH,OAAM,IAAI,MAAM,iCAAiC,aAAa;AAEhE,4BAA2B,QAAQ,YAAY,EAAE,QAAQ,WAAW,CAAC;CAErE,MAAM,cAAc,EAAE,GAAI,OAAO,KAAK,WAAW,EAAE,EAAG;AACtD,QAAO,YAAY;AACnB,QAAO,MAAM;EACX,GAAI,OAAO,OAAO,EAAE;EACpB,SAAS;EACV;AACD,QAAO"}
+{"version":3,"file":"install.js","names":[],"sources":["../../../src/connectors/install.ts"],"sourcesContent":["import { CredentialResolver } from '../auth/credentials.js';\nimport type { Config } from '../config/schema.js';\nimport { getConnectorDefinition } from './catalog.js';\nimport { listConnectorInstances } from './instances.js';\nimport { isManagedConnectorServer, materializeConnectorMcpServer } from './materialize.js';\nimport { saveComposioApiKey } from './composio.js';\nimport { assertConnectorOAuthReady } from './oauth.js';\nimport { saveConnectorSecrets } from './secret-store.js';\nimport { appendConnectorAuditRecord } from './usage.js';\nimport type { ConnectorDefinition, ConnectorInstallInput, ConnectorInstance } from './types.js';\n\nexport async function installConnectorDefinition(\n  config: Config,\n  definition: ConnectorDefinition,\n  input: ConnectorInstallInput,\n  resolver = new CredentialResolver(),\n): Promise<ConnectorInstance> {\n  if (definition.runtime.type !== 'mcp') {\n    const instanceId = definition.id;\n    if (definition.runtime.type === 'composio' && definition.id === 'composio-api-key') {\n      await saveComposioApiKey(input, resolver);\n    }\n    config.connectors = config.connectors ?? {};\n    config.connectors.instances = {\n      ...(config.connectors.instances ?? {}),\n      [instanceId]: {\n        xopcConnector: {\n          managed: true,\n          connectorId: definition.id,\n          version: definition.version,\n          enabled: true,\n          displayName: definition.displayName,\n        },\n        runtime: definition.runtime,\n        ...(definition.runtime.type === 'composio' && definition.runtime.toolkit !== 'composio' ? { scope: 'read' } : {}),\n      },\n    };\n    const instance = listConnectorInstances(config).find((candidate) => candidate.instanceId === instanceId);\n    if (!instance) {\n      throw new Error(`Connector \"${definition.id}\" was installed but could not be resolved.`);\n    }\n    return instance;\n  }\n\n  const { serverId, server } = materializeConnectorMcpServer(definition, input);\n  const existingServer = config.mcp?.servers?.[serverId];\n  if (existingServer && !isManagedConnectorServer(existingServer)) {\n    throw new Error(`MCP server \"${serverId}\" already exists and is not managed by Connectors.`);\n  }\n\n  await assertConnectorOAuthReady(definition, resolver);\n  await saveConnectorSecrets(definition, input, resolver);\n\n  config.mcp = config.mcp ?? {};\n  config.mcp.servers = {\n    ...(config.mcp.servers ?? {}),\n    [serverId]: server,\n  };\n\n  const instance = listConnectorInstances(config).find((candidate) => candidate.instanceId === serverId);\n  if (!instance) {\n    throw new Error(`Connector \"${definition.id}\" was installed but could not be resolved.`);\n  }\n  appendConnectorAuditRecord(config, serverId, { action: 'installed' });\n  return instance;\n}\n\nexport async function installConnector(\n  config: Config,\n  connectorId: string,\n  input: ConnectorInstallInput,\n  resolver = new CredentialResolver(),\n): Promise<ConnectorInstance> {\n  const definition = getConnectorDefinition(connectorId);\n  if (!definition) {\n    throw new Error(`Unknown connector: ${connectorId}`);\n  }\n  return installConnectorDefinition(config, definition, input, resolver);\n}\n\nexport function uninstallConnector(config: Config, instanceId: string): ConnectorInstance {\n  const server = config.mcp?.servers?.[instanceId];\n  const connectorRecord = config.connectors?.instances?.[instanceId];\n  if (!server && !connectorRecord) {\n    throw new Error(`Connector instance not found: ${instanceId}`);\n  }\n  if (server && !isManagedConnectorServer(server)) {\n    throw new Error(`MCP server \"${instanceId}\" is not managed by Connectors.`);\n  }\n\n  const instance = listConnectorInstances(config).find((candidate) => candidate.instanceId === instanceId);\n  if (!instance) {\n    throw new Error(`Connector instance not found: ${instanceId}`);\n  }\n  appendConnectorAuditRecord(config, instanceId, { action: 'removed' });\n\n  if (server) {\n    const nextServers = { ...(config.mcp?.servers ?? {}) };\n    delete nextServers[instanceId];\n    config.mcp = {\n      ...(config.mcp ?? {}),\n      servers: nextServers,\n    };\n  }\n  if (connectorRecord) {\n    const nextInstances = { ...(config.connectors?.instances ?? {}) };\n    delete nextInstances[instanceId];\n    config.connectors = { ...(config.connectors ?? {}), instances: nextInstances };\n  }\n  return instance;\n}\n"],"mappings":";;;;;;;;;kBAA4D;AAW5D,eAAsB,2BACpB,QACA,YACA,OACA,WAAW,IAAI,oBAAoB,EACP;AAC5B,KAAI,WAAW,QAAQ,SAAS,OAAO;EACrC,MAAM,aAAa,WAAW;AAC9B,MAAI,WAAW,QAAQ,SAAS,cAAc,WAAW,OAAO,mBAC9D,OAAM,mBAAmB,OAAO,SAAS;AAE3C,SAAO,aAAa,OAAO,cAAc,EAAE;AAC3C,SAAO,WAAW,YAAY;GAC5B,GAAI,OAAO,WAAW,aAAa,EAAE;IACpC,aAAa;IACZ,eAAe;KACb,SAAS;KACT,aAAa,WAAW;KACxB,SAAS,WAAW;KACpB,SAAS;KACT,aAAa,WAAW;KACzB;IACD,SAAS,WAAW;IACpB,GAAI,WAAW,QAAQ,SAAS,cAAc,WAAW,QAAQ,YAAY,aAAa,EAAE,OAAO,QAAQ,GAAG,EAAE;IACjH;GACF;EACD,MAAM,WAAW,uBAAuB,OAAO,CAAC,MAAM,cAAc,UAAU,eAAe,WAAW;AACxG,MAAI,CAAC,SACH,OAAM,IAAI,MAAM,cAAc,WAAW,GAAG,4CAA4C;AAE1F,SAAO;;CAGT,MAAM,EAAE,UAAU,WAAW,8BAA8B,YAAY,MAAM;CAC7E,MAAM,iBAAiB,OAAO,KAAK,UAAU;AAC7C,KAAI,kBAAkB,CAAC,yBAAyB,eAAe,CAC7D,OAAM,IAAI,MAAM,eAAe,SAAS,oDAAoD;AAG9F,OAAM,0BAA0B,YAAY,SAAS;AACrD,OAAM,qBAAqB,YAAY,OAAO,SAAS;AAEvD,QAAO,MAAM,OAAO,OAAO,EAAE;AAC7B,QAAO,IAAI,UAAU;EACnB,GAAI,OAAO,IAAI,WAAW,EAAE;GAC3B,WAAW;EACb;CAED,MAAM,WAAW,uBAAuB,OAAO,CAAC,MAAM,cAAc,UAAU,eAAe,SAAS;AACtG,KAAI,CAAC,SACH,OAAM,IAAI,MAAM,cAAc,WAAW,GAAG,4CAA4C;AAE1F,4BAA2B,QAAQ,UAAU,EAAE,QAAQ,aAAa,CAAC;AACrE,QAAO;;AAGT,eAAsB,iBACpB,QACA,aACA,OACA,WAAW,IAAI,oBAAoB,EACP;CAC5B,MAAM,aAAa,uBAAuB,YAAY;AACtD,KAAI,CAAC,WACH,OAAM,IAAI,MAAM,sBAAsB,cAAc;AAEtD,QAAO,2BAA2B,QAAQ,YAAY,OAAO,SAAS;;AAGxE,SAAgB,mBAAmB,QAAgB,YAAuC;CACxF,MAAM,SAAS,OAAO,KAAK,UAAU;CACrC,MAAM,kBAAkB,OAAO,YAAY,YAAY;AACvD,KAAI,CAAC,UAAU,CAAC,gBACd,OAAM,IAAI,MAAM,iCAAiC,aAAa;AAEhE,KAAI,UAAU,CAAC,yBAAyB,OAAO,CAC7C,OAAM,IAAI,MAAM,eAAe,WAAW,iCAAiC;CAG7E,MAAM,WAAW,uBAAuB,OAAO,CAAC,MAAM,cAAc,UAAU,eAAe,WAAW;AACxG,KAAI,CAAC,SACH,OAAM,IAAI,MAAM,iCAAiC,aAAa;AAEhE,4BAA2B,QAAQ,YAAY,EAAE,QAAQ,WAAW,CAAC;AAErE,KAAI,QAAQ;EACV,MAAM,cAAc,EAAE,GAAI,OAAO,KAAK,WAAW,EAAE,EAAG;AACtD,SAAO,YAAY;AACnB,SAAO,MAAM;GACX,GAAI,OAAO,OAAO,EAAE;GACpB,SAAS;GACV;;AAEH,KAAI,iBAAiB;EACnB,MAAM,gBAAgB,EAAE,GAAI,OAAO,YAAY,aAAa,EAAE,EAAG;AACjE,SAAO,cAAc;AACrB,SAAO,aAAa;GAAE,GAAI,OAAO,cAAc,EAAE;GAAG,WAAW;GAAe;;AAEhF,QAAO"}

package/dist/src/connectors/instances.js

@@ -13,26 +13,77 @@ function secretStatusForServer(server) {
 	}
 	return status;
 }
+function connectorInstanceFromRecord(instanceId, record) {
+	const marker = record.xopcConnector;
+	if (!marker || typeof marker !== "object" || Array.isArray(marker)) return [];
+	const markerRecord = marker;
+	if (markerRecord.managed !== true || typeof markerRecord.connectorId !== "string") return [];
+	const connectorId = markerRecord.connectorId;
+	const definition = getConnectorDefinition(connectorId);
+	const runtime = record.runtime && typeof record.runtime === "object" && !Array.isArray(record.runtime) ? record.runtime : {};
+	const runtimeType = typeof runtime.type === "string" ? runtime.type : "composio";
+	const enabled = markerRecord.enabled !== false;
+	return [{
+		instanceId,
+		connectorId,
+		displayName: definition?.displayName ?? (typeof markerRecord.displayName === "string" ? markerRecord.displayName : connectorId),
+		enabled,
+		status: enabled ? "installed" : "disabled",
+		connectionStatus: enabled ? "unknown" : "disabled",
+		authStatus: definition?.auth.mode === "none" ? "none" : "unknown",
+		lastConnectedAt: typeof markerRecord.lastConnectedAt === "string" ? markerRecord.lastConnectedAt : void 0,
+		lastError: typeof markerRecord.lastError === "string" ? markerRecord.lastError : void 0,
+		secretStatus: {},
+		materialized: runtimeType === "composio" ? {
+			type: "composio",
+			id: instanceId
+		} : runtimeType === "channel" ? {
+			type: "channel",
+			id: instanceId
+		} : runtimeType === "nativeTool" ? {
+			type: "nativeTool",
+			id: instanceId
+		} : {
+			type: "memorySource",
+			id: instanceId
+		},
+		usage: getConnectorUsageFromMarker(marker),
+		audit: getConnectorAuditFromMarker(marker)
+	}];
+}
 function listConnectorInstances(config) {
 	const servers = config.mcp?.servers ?? {};
-	return Object.entries(servers).flatMap(([serverId, server]) => {
+	const mcpInstances = Object.entries(servers).flatMap(([serverId, server]) => {
 		if (!isManagedConnectorServer(server)) return [];
 		const connectorId = server.xopcConnector.connectorId;
+		const definition = getConnectorDefinition(connectorId);
+		const enabled = server.xopcConnector.enabled !== false;
+		const usage = getConnectorUsageFromMarker(server.xopcConnector);
+		const lastHealthStatus = usage.lastHealthStatus;
+		const connectionStatus = !enabled ? "disabled" : lastHealthStatus === "ok" ? "connected" : lastHealthStatus === "unauthorized" ? "unauthorized" : lastHealthStatus ? "error" : "unknown";
+		const authStatus = definition?.auth.mode === "none" ? "none" : lastHealthStatus === "missing_secret" ? "missing" : lastHealthStatus === "unauthorized" ? "unauthorized" : "unknown";
+		const status = enabled ? lastHealthStatus === "ok" ? "connected" : "installed" : "disabled";
 		return [{
 			instanceId: serverId,
 			connectorId,
-			displayName: getConnectorDefinition(connectorId)?.displayName ?? connectorId,
-			enabled: true,
-			status: "installed",
+			displayName: definition?.displayName ?? server.xopcConnector.displayName ?? connectorId,
+			enabled,
+			status,
+			connectionStatus,
+			authStatus,
+			lastConnectedAt: server.xopcConnector.lastConnectedAt,
+			lastError: server.xopcConnector.lastError,
 			secretStatus: secretStatusForServer(server),
 			materialized: {
 				type: "mcp",
 				serverId
 			},
-			usage: getConnectorUsageFromMarker(server.xopcConnector),
+			usage,
 			audit: getConnectorAuditFromMarker(server.xopcConnector)
 		}];
-	}).sort((left, right) => left.displayName.localeCompare(right.displayName));
+	});
+	const genericInstances = Object.entries(config.connectors?.instances ?? {}).flatMap(([instanceId, record]) => record && typeof record === "object" && !Array.isArray(record) ? connectorInstanceFromRecord(instanceId, record) : []);
+	return [...mcpInstances, ...genericInstances].sort((left, right) => left.displayName.localeCompare(right.displayName));
 }
 function getConnectorInstance(config, instanceId) {
 	return listConnectorInstances(config).find((instance) => instance.instanceId === instanceId);