@xopcai/xopc 0.0.124 → 0.0.126

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

@@ -3,4 +3,5 @@ import type { Config } from '../config/schema.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 updateConnectorConfig(config: Config, instanceId: string, input: ConnectorInstallInput): ConnectorInstance;
 export declare function uninstallConnector(config: Config, instanceId: string): ConnectorInstance;

package/dist/src/connectors/install.js

@@ -51,6 +51,33 @@ async function installConnector(config, connectorId, input, resolver = new Crede
 	if (!definition) throw new Error(`Unknown connector: ${connectorId}`);
 	return installConnectorDefinition(config, definition, input, resolver);
 }
+function updateConnectorConfig(config, instanceId, input) {
+	const existingServer = config.mcp?.servers?.[instanceId];
+	if (!existingServer || !isManagedConnectorServer(existingServer)) throw new Error(`MCP server "${instanceId}" is not managed by Connectors.`);
+	const definition = getConnectorDefinition(existingServer.xopcConnector.connectorId);
+	if (!definition) throw new Error(`Unknown connector: ${existingServer.xopcConnector.connectorId}`);
+	if (definition.runtime.type !== "mcp") throw new Error(`Connector type "${definition.runtime.type}" does not support config updates.`);
+	if ((definition.setup.secrets ?? []).length > 0) throw new Error("Connectors with secrets must be reinstalled to change configuration.");
+	const { serverId, server } = materializeConnectorMcpServer(definition, input);
+	if (serverId !== instanceId) throw new Error(`Connector config update cannot change server id from "${instanceId}" to "${serverId}".`);
+	config.mcp = config.mcp ?? {};
+	config.mcp.servers = {
+		...config.mcp.servers ?? {},
+		[serverId]: {
+			...server,
+			xopcConnector: {
+				...existingServer.xopcConnector,
+				...server.xopcConnector,
+				enabled: existingServer.xopcConnector.enabled,
+				lastConnectedAt: existingServer.xopcConnector.lastConnectedAt,
+				lastError: existingServer.xopcConnector.lastError
+			}
+		}
+	};
+	const instance = listConnectorInstances(config).find((candidate) => candidate.instanceId === serverId);
+	if (!instance) throw new Error(`Connector "${definition.id}" was updated but could not be resolved.`);
+	return instance;
+}
 function uninstallConnector(config, instanceId) {
 	const server = config.mcp?.servers?.[instanceId];
 	const connectorRecord = config.connectors?.instances?.[instanceId];
@@ -78,6 +105,6 @@ function uninstallConnector(config, instanceId) {
 	return instance;
 }
 //#endregion
-export { installConnector, installConnectorDefinition, uninstallConnector };
+export { installConnector, installConnectorDefinition, uninstallConnector, updateConnectorConfig };
 
 //# 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 { 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"}
+{"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 updateConnectorConfig(\n  config: Config,\n  instanceId: string,\n  input: ConnectorInstallInput,\n): ConnectorInstance {\n  const existingServer = config.mcp?.servers?.[instanceId];\n  if (!existingServer || !isManagedConnectorServer(existingServer)) {\n    throw new Error(`MCP server \"${instanceId}\" is not managed by Connectors.`);\n  }\n  const definition = getConnectorDefinition(existingServer.xopcConnector.connectorId);\n  if (!definition) {\n    throw new Error(`Unknown connector: ${existingServer.xopcConnector.connectorId}`);\n  }\n  if (definition.runtime.type !== 'mcp') {\n    throw new Error(`Connector type \"${definition.runtime.type}\" does not support config updates.`);\n  }\n  if ((definition.setup.secrets ?? []).length > 0) {\n    throw new Error('Connectors with secrets must be reinstalled to change configuration.');\n  }\n\n  const { serverId, server } = materializeConnectorMcpServer(definition, input);\n  if (serverId !== instanceId) {\n    throw new Error(`Connector config update cannot change server id from \"${instanceId}\" to \"${serverId}\".`);\n  }\n\n  config.mcp = config.mcp ?? {};\n  config.mcp.servers = {\n    ...(config.mcp.servers ?? {}),\n    [serverId]: {\n      ...server,\n      xopcConnector: {\n        ...existingServer.xopcConnector,\n        ...(server.xopcConnector as Record<string, unknown>),\n        enabled: existingServer.xopcConnector.enabled,\n        lastConnectedAt: existingServer.xopcConnector.lastConnectedAt,\n        lastError: existingServer.xopcConnector.lastError,\n      },\n    },\n  };\n\n  const instance = listConnectorInstances(config).find((candidate) => candidate.instanceId === serverId);\n  if (!instance) {\n    throw new Error(`Connector \"${definition.id}\" was updated but could not be resolved.`);\n  }\n  return instance;\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":"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"}

package/dist/src/connectors/instances.js

@@ -2,6 +2,11 @@ import { getConnectorDefinition } from "./catalog.js";
 import { isManagedConnectorServer } from "./materialize.js";
 import { getConnectorAuditFromMarker, getConnectorUsageFromMarker } from "./usage.js";
 //#region src/connectors/instances.ts
+function readMarkerConfig(marker) {
+	if (!marker || typeof marker !== "object" || Array.isArray(marker)) return void 0;
+	const config = marker.config;
+	return config && typeof config === "object" && !Array.isArray(config) ? config : void 0;
+}
 function secretStatusForServer(server) {
 	const marker = server.xopcConnector;
 	const definition = marker?.connectorId ? getConnectorDefinition(marker.connectorId) : void 0;
@@ -34,6 +39,7 @@ function connectorInstanceFromRecord(instanceId, record) {
 		lastConnectedAt: typeof markerRecord.lastConnectedAt === "string" ? markerRecord.lastConnectedAt : void 0,
 		lastError: typeof markerRecord.lastError === "string" ? markerRecord.lastError : void 0,
 		secretStatus: {},
+		config: readMarkerConfig(markerRecord),
 		materialized: runtimeType === "composio" ? {
 			type: "composio",
 			id: instanceId
@@ -74,6 +80,7 @@ function listConnectorInstances(config) {
 			lastConnectedAt: server.xopcConnector.lastConnectedAt,
 			lastError: server.xopcConnector.lastError,
 			secretStatus: secretStatusForServer(server),
+			config: readMarkerConfig(server.xopcConnector),
 			materialized: {
 				type: "mcp",
 				serverId

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

@@ -1 +1 @@
-{"version":3,"file":"instances.js","names":[],"sources":["../../../src/connectors/instances.ts"],"sourcesContent":["import type { Config } from '../config/schema.js';\nimport { getConnectorDefinition } from './catalog.js';\nimport { isManagedConnectorServer } from './materialize.js';\nimport { getConnectorAuditFromMarker, getConnectorUsageFromMarker } from './usage.js';\nimport type { ConnectorInstance } from './types.js';\n\nfunction secretStatusForServer(server: Record<string, unknown>): Record<string, boolean> {\n  const marker = server.xopcConnector as { connectorId?: string } | undefined;\n  const definition = marker?.connectorId ? getConnectorDefinition(marker.connectorId) : undefined;\n  const env = server.env && typeof server.env === 'object' && !Array.isArray(server.env)\n    ? (server.env as Record<string, unknown>)\n    : {};\n  const status: Record<string, boolean> = {};\n  for (const secret of definition?.setup.secrets ?? []) {\n    const value = env[secret.key];\n    status[secret.key] = Boolean(\n      value &&\n        typeof value === 'object' &&\n        !Array.isArray(value) &&\n        'xopcSecretRef' in value,\n    );\n  }\n  return status;\n}\n\nfunction connectorInstanceFromRecord(instanceId: string, record: Record<string, unknown>): ConnectorInstance[] {\n  const marker = record.xopcConnector;\n  if (!marker || typeof marker !== 'object' || Array.isArray(marker)) return [];\n  const markerRecord = marker as Record<string, unknown>;\n  if (markerRecord.managed !== true || typeof markerRecord.connectorId !== 'string') return [];\n  const connectorId = markerRecord.connectorId;\n  const definition = getConnectorDefinition(connectorId);\n  const runtime = record.runtime && typeof record.runtime === 'object' && !Array.isArray(record.runtime)\n    ? record.runtime as Record<string, unknown>\n    : {};\n  const runtimeType = typeof runtime.type === 'string' ? runtime.type : 'composio';\n  const enabled = markerRecord.enabled !== false;\n  return [{\n    instanceId,\n    connectorId,\n    displayName: definition?.displayName ?? (typeof markerRecord.displayName === 'string' ? markerRecord.displayName : connectorId),\n    enabled,\n    status: enabled ? 'installed' : 'disabled',\n    connectionStatus: enabled ? 'unknown' : 'disabled',\n    authStatus: definition?.auth.mode === 'none' ? 'none' : 'unknown',\n    lastConnectedAt: typeof markerRecord.lastConnectedAt === 'string' ? markerRecord.lastConnectedAt : undefined,\n    lastError: typeof markerRecord.lastError === 'string' ? markerRecord.lastError : undefined,\n    secretStatus: {},\n    materialized: runtimeType === 'composio'\n      ? { type: 'composio', id: instanceId }\n      : runtimeType === 'channel'\n        ? { type: 'channel', id: instanceId }\n        : runtimeType === 'nativeTool'\n          ? { type: 'nativeTool', id: instanceId }\n          : { type: 'memorySource', id: instanceId },\n    usage: getConnectorUsageFromMarker(marker),\n    audit: getConnectorAuditFromMarker(marker),\n  }];\n}\n\nexport function listConnectorInstances(config: Config): ConnectorInstance[] {\n  const servers = config.mcp?.servers ?? {};\n  const mcpInstances = Object.entries(servers)\n    .flatMap(([serverId, server]) => {\n      if (!isManagedConnectorServer(server)) {\n        return [];\n      }\n      const connectorId = server.xopcConnector.connectorId;\n      const definition = getConnectorDefinition(connectorId);\n      const enabled = server.xopcConnector.enabled !== false;\n      const usage = getConnectorUsageFromMarker(server.xopcConnector);\n      const lastHealthStatus = usage.lastHealthStatus;\n      const connectionStatus: ConnectorInstance['connectionStatus'] = !enabled\n        ? 'disabled'\n        : lastHealthStatus === 'ok'\n          ? 'connected'\n          : lastHealthStatus === 'unauthorized'\n            ? 'unauthorized'\n            : lastHealthStatus\n              ? 'error'\n              : 'unknown';\n      const authStatus: ConnectorInstance['authStatus'] = definition?.auth.mode === 'none'\n        ? 'none'\n        : lastHealthStatus === 'missing_secret'\n          ? 'missing'\n          : lastHealthStatus === 'unauthorized'\n            ? 'unauthorized'\n            : 'unknown';\n      const status: ConnectorInstance['status'] = enabled ? (lastHealthStatus === 'ok' ? 'connected' : 'installed') : 'disabled';\n      return [\n        {\n          instanceId: serverId,\n          connectorId,\n          displayName: definition?.displayName ?? server.xopcConnector.displayName ?? connectorId,\n          enabled,\n          status,\n          connectionStatus,\n          authStatus,\n          lastConnectedAt: server.xopcConnector.lastConnectedAt,\n          lastError: server.xopcConnector.lastError,\n          secretStatus: secretStatusForServer(server),\n          materialized: {\n            type: 'mcp' as const,\n            serverId,\n          },\n          usage,\n          audit: getConnectorAuditFromMarker(server.xopcConnector),\n        },\n      ];\n    });\n  const genericInstances = Object.entries(config.connectors?.instances ?? {})\n    .flatMap(([instanceId, record]) => (\n      record && typeof record === 'object' && !Array.isArray(record)\n        ? connectorInstanceFromRecord(instanceId, record as Record<string, unknown>)\n        : []\n    ));\n  return [...mcpInstances, ...genericInstances]\n    .sort((left, right) => left.displayName.localeCompare(right.displayName));\n}\n\nexport function getConnectorInstance(config: Config, instanceId: string): ConnectorInstance | undefined {\n  return listConnectorInstances(config).find((instance) => instance.instanceId === instanceId);\n}\n"],"mappings":"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"}
+{"version":3,"file":"instances.js","names":[],"sources":["../../../src/connectors/instances.ts"],"sourcesContent":["import type { Config } from '../config/schema.js';\nimport { getConnectorDefinition } from './catalog.js';\nimport { isManagedConnectorServer } from './materialize.js';\nimport { getConnectorAuditFromMarker, getConnectorUsageFromMarker } from './usage.js';\nimport type { ConnectorInstance } from './types.js';\n\nfunction readMarkerConfig(marker: unknown): Record<string, unknown> | undefined {\n  if (!marker || typeof marker !== 'object' || Array.isArray(marker)) return undefined;\n  const config = (marker as Record<string, unknown>).config;\n  return config && typeof config === 'object' && !Array.isArray(config)\n    ? config as Record<string, unknown>\n    : undefined;\n}\n\nfunction secretStatusForServer(server: Record<string, unknown>): Record<string, boolean> {\n  const marker = server.xopcConnector as { connectorId?: string } | undefined;\n  const definition = marker?.connectorId ? getConnectorDefinition(marker.connectorId) : undefined;\n  const env = server.env && typeof server.env === 'object' && !Array.isArray(server.env)\n    ? (server.env as Record<string, unknown>)\n    : {};\n  const status: Record<string, boolean> = {};\n  for (const secret of definition?.setup.secrets ?? []) {\n    const value = env[secret.key];\n    status[secret.key] = Boolean(\n      value &&\n        typeof value === 'object' &&\n        !Array.isArray(value) &&\n        'xopcSecretRef' in value,\n    );\n  }\n  return status;\n}\n\nfunction connectorInstanceFromRecord(instanceId: string, record: Record<string, unknown>): ConnectorInstance[] {\n  const marker = record.xopcConnector;\n  if (!marker || typeof marker !== 'object' || Array.isArray(marker)) return [];\n  const markerRecord = marker as Record<string, unknown>;\n  if (markerRecord.managed !== true || typeof markerRecord.connectorId !== 'string') return [];\n  const connectorId = markerRecord.connectorId;\n  const definition = getConnectorDefinition(connectorId);\n  const runtime = record.runtime && typeof record.runtime === 'object' && !Array.isArray(record.runtime)\n    ? record.runtime as Record<string, unknown>\n    : {};\n  const runtimeType = typeof runtime.type === 'string' ? runtime.type : 'composio';\n  const enabled = markerRecord.enabled !== false;\n  return [{\n    instanceId,\n    connectorId,\n    displayName: definition?.displayName ?? (typeof markerRecord.displayName === 'string' ? markerRecord.displayName : connectorId),\n    enabled,\n    status: enabled ? 'installed' : 'disabled',\n    connectionStatus: enabled ? 'unknown' : 'disabled',\n    authStatus: definition?.auth.mode === 'none' ? 'none' : 'unknown',\n    lastConnectedAt: typeof markerRecord.lastConnectedAt === 'string' ? markerRecord.lastConnectedAt : undefined,\n    lastError: typeof markerRecord.lastError === 'string' ? markerRecord.lastError : undefined,\n    secretStatus: {},\n    config: readMarkerConfig(markerRecord),\n    materialized: runtimeType === 'composio'\n      ? { type: 'composio', id: instanceId }\n      : runtimeType === 'channel'\n        ? { type: 'channel', id: instanceId }\n        : runtimeType === 'nativeTool'\n          ? { type: 'nativeTool', id: instanceId }\n          : { type: 'memorySource', id: instanceId },\n    usage: getConnectorUsageFromMarker(marker),\n    audit: getConnectorAuditFromMarker(marker),\n  }];\n}\n\nexport function listConnectorInstances(config: Config): ConnectorInstance[] {\n  const servers = config.mcp?.servers ?? {};\n  const mcpInstances = Object.entries(servers)\n    .flatMap(([serverId, server]) => {\n      if (!isManagedConnectorServer(server)) {\n        return [];\n      }\n      const connectorId = server.xopcConnector.connectorId;\n      const definition = getConnectorDefinition(connectorId);\n      const enabled = server.xopcConnector.enabled !== false;\n      const usage = getConnectorUsageFromMarker(server.xopcConnector);\n      const lastHealthStatus = usage.lastHealthStatus;\n      const connectionStatus: ConnectorInstance['connectionStatus'] = !enabled\n        ? 'disabled'\n        : lastHealthStatus === 'ok'\n          ? 'connected'\n          : lastHealthStatus === 'unauthorized'\n            ? 'unauthorized'\n            : lastHealthStatus\n              ? 'error'\n              : 'unknown';\n      const authStatus: ConnectorInstance['authStatus'] = definition?.auth.mode === 'none'\n        ? 'none'\n        : lastHealthStatus === 'missing_secret'\n          ? 'missing'\n          : lastHealthStatus === 'unauthorized'\n            ? 'unauthorized'\n            : 'unknown';\n      const status: ConnectorInstance['status'] = enabled ? (lastHealthStatus === 'ok' ? 'connected' : 'installed') : 'disabled';\n      return [\n        {\n          instanceId: serverId,\n          connectorId,\n          displayName: definition?.displayName ?? server.xopcConnector.displayName ?? connectorId,\n          enabled,\n          status,\n          connectionStatus,\n          authStatus,\n          lastConnectedAt: server.xopcConnector.lastConnectedAt,\n          lastError: server.xopcConnector.lastError,\n          secretStatus: secretStatusForServer(server),\n          config: readMarkerConfig(server.xopcConnector),\n          materialized: {\n            type: 'mcp' as const,\n            serverId,\n          },\n          usage,\n          audit: getConnectorAuditFromMarker(server.xopcConnector),\n        },\n      ];\n    });\n  const genericInstances = Object.entries(config.connectors?.instances ?? {})\n    .flatMap(([instanceId, record]) => (\n      record && typeof record === 'object' && !Array.isArray(record)\n        ? connectorInstanceFromRecord(instanceId, record as Record<string, unknown>)\n        : []\n    ));\n  return [...mcpInstances, ...genericInstances]\n    .sort((left, right) => left.displayName.localeCompare(right.displayName));\n}\n\nexport function getConnectorInstance(config: Config, instanceId: string): ConnectorInstance | undefined {\n  return listConnectorInstances(config).find((instance) => instance.instanceId === instanceId);\n}\n"],"mappings":"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"}

package/dist/src/connectors/materialize.js

@@ -53,7 +53,8 @@ function materializeConnectorMcpServer(definition, input) {
 		managed: true,
 		connectorId: definition.id,
 		version: definition.version,
-		displayName: definition.displayName
+		displayName: definition.displayName,
+		...input.config && Object.keys(input.config).length > 0 ? { config: input.config } : {}
 	};
 	const server = {
 		...rawServer,

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

@@ -1 +1 @@
-{"version":3,"file":"materialize.js","names":[],"sources":["../../../src/connectors/materialize.ts"],"sourcesContent":["import { McpServerSchema } from '../config/schema.js';\nimport { createConnectorSecretReference } from './secret-store.js';\nimport type { ConnectorDefinition, ConnectorInstallInput, ManagedConnectorMarker } from './types.js';\n\nconst SERVER_ID_PATTERN = /^[a-z][a-z0-9_-]{0,63}$/;\nconst TEMPLATE_PATTERN = /^\\{\\{(secrets|config)\\.([A-Za-z0-9_.-]+)\\}\\}$/;\n\nexport function assertValidConnectorServerId(serverId: string): void {\n  if (!SERVER_ID_PATTERN.test(serverId)) {\n    throw new Error('Connector server name must start with a lowercase letter and only contain lowercase letters, numbers, dashes, and underscores.');\n  }\n}\n\nfunction readInputValue(\n  definition: ConnectorDefinition,\n  input: ConnectorInstallInput,\n  scope: 'secrets' | 'config',\n  key: string,\n): unknown {\n  if (scope === 'secrets') {\n    return createConnectorSecretReference(definition.id, key);\n  }\n  return input.config?.[key];\n}\n\nfunction resolveTemplateValue(value: unknown, definition: ConnectorDefinition, input: ConnectorInstallInput): unknown {\n  if (typeof value !== 'string') {\n    return value;\n  }\n  const match = TEMPLATE_PATTERN.exec(value.trim());\n  if (!match) {\n    return value;\n  }\n  return readInputValue(definition, input, match[1] as 'secrets' | 'config', match[2]);\n}\n\nfunction materializeTemplate(value: unknown, definition: ConnectorDefinition, input: ConnectorInstallInput): unknown {\n  const resolved = resolveTemplateValue(value, definition, input);\n  if (Array.isArray(resolved)) {\n    return resolved.map((item) => materializeTemplate(item, definition, input));\n  }\n  if (resolved && typeof resolved === 'object') {\n    const output: Record<string, unknown> = {};\n    for (const [key, child] of Object.entries(resolved as Record<string, unknown>)) {\n      const materializedChild = materializeTemplate(child, definition, input);\n      if (materializedChild !== undefined) {\n        output[key] = materializedChild;\n      }\n    }\n    return output;\n  }\n  return resolved;\n}\n\nfunction assertRequiredInputs(definition: ConnectorDefinition, input: ConnectorInstallInput): void {\n  for (const secret of definition.setup.secrets ?? []) {\n    const value = input.secrets?.[secret.key];\n    if (secret.required && (typeof value !== 'string' || value.trim().length === 0)) {\n      throw new Error(`Missing required secret: ${secret.key}`);\n    }\n  }\n  for (const field of definition.setup.config ?? []) {\n    const value = input.config?.[field.key];\n    if (field.required && (value === undefined || value === null || value === '')) {\n      throw new Error(`Missing required config: ${field.key}`);\n    }\n  }\n}\n\nexport function materializeConnectorMcpServer(\n  definition: ConnectorDefinition,\n  input: ConnectorInstallInput,\n): { serverId: string; server: Record<string, unknown> } {\n  assertRequiredInputs(definition, input);\n  if (definition.runtime.type !== 'mcp') {\n    throw new Error(`Unsupported connector runtime: ${definition.runtime.type}`);\n  }\n\n  const rawServerId = materializeTemplate(definition.runtime.serverId, definition, input);\n  if (typeof rawServerId !== 'string') {\n    throw new Error('Connector server name must be a string.');\n  }\n  const serverId = rawServerId.trim();\n  assertValidConnectorServerId(serverId);\n\n  const rawServer = materializeTemplate(definition.runtime.serverTemplate, definition, input);\n  if (!rawServer || typeof rawServer !== 'object' || Array.isArray(rawServer)) {\n    throw new Error('Connector MCP server template must resolve to a JSON object.');\n  }\n\n  const marker: ManagedConnectorMarker = {\n    managed: true,\n    connectorId: definition.id,\n    version: definition.version,\n    displayName: definition.displayName,\n  };\n  const server = {\n    ...(rawServer as Record<string, unknown>),\n    xopcConnector: marker,\n  };\n  const parsed = McpServerSchema.safeParse(server);\n  if (!parsed.success) {\n    throw new Error(parsed.error.issues[0]?.message ?? 'Invalid MCP server config.');\n  }\n  return { serverId, server };\n}\n\nexport function isManagedConnectorServer(server: unknown): server is Record<string, unknown> & { xopcConnector: ManagedConnectorMarker } {\n  if (!server || typeof server !== 'object' || Array.isArray(server)) {\n    return false;\n  }\n  const marker = (server as Record<string, unknown>).xopcConnector;\n  return Boolean(\n    marker &&\n      typeof marker === 'object' &&\n      !Array.isArray(marker) &&\n      (marker as Record<string, unknown>).managed === true &&\n      typeof (marker as Record<string, unknown>).connectorId === 'string',\n  );\n}\n"],"mappings":"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"}
+{"version":3,"file":"materialize.js","names":[],"sources":["../../../src/connectors/materialize.ts"],"sourcesContent":["import { McpServerSchema } from '../config/schema.js';\nimport { createConnectorSecretReference } from './secret-store.js';\nimport type { ConnectorDefinition, ConnectorInstallInput, ManagedConnectorMarker } from './types.js';\n\nconst SERVER_ID_PATTERN = /^[a-z][a-z0-9_-]{0,63}$/;\nconst TEMPLATE_PATTERN = /^\\{\\{(secrets|config)\\.([A-Za-z0-9_.-]+)\\}\\}$/;\n\nexport function assertValidConnectorServerId(serverId: string): void {\n  if (!SERVER_ID_PATTERN.test(serverId)) {\n    throw new Error('Connector server name must start with a lowercase letter and only contain lowercase letters, numbers, dashes, and underscores.');\n  }\n}\n\nfunction readInputValue(\n  definition: ConnectorDefinition,\n  input: ConnectorInstallInput,\n  scope: 'secrets' | 'config',\n  key: string,\n): unknown {\n  if (scope === 'secrets') {\n    return createConnectorSecretReference(definition.id, key);\n  }\n  return input.config?.[key];\n}\n\nfunction resolveTemplateValue(value: unknown, definition: ConnectorDefinition, input: ConnectorInstallInput): unknown {\n  if (typeof value !== 'string') {\n    return value;\n  }\n  const match = TEMPLATE_PATTERN.exec(value.trim());\n  if (!match) {\n    return value;\n  }\n  return readInputValue(definition, input, match[1] as 'secrets' | 'config', match[2]);\n}\n\nfunction materializeTemplate(value: unknown, definition: ConnectorDefinition, input: ConnectorInstallInput): unknown {\n  const resolved = resolveTemplateValue(value, definition, input);\n  if (Array.isArray(resolved)) {\n    return resolved.map((item) => materializeTemplate(item, definition, input));\n  }\n  if (resolved && typeof resolved === 'object') {\n    const output: Record<string, unknown> = {};\n    for (const [key, child] of Object.entries(resolved as Record<string, unknown>)) {\n      const materializedChild = materializeTemplate(child, definition, input);\n      if (materializedChild !== undefined) {\n        output[key] = materializedChild;\n      }\n    }\n    return output;\n  }\n  return resolved;\n}\n\nfunction assertRequiredInputs(definition: ConnectorDefinition, input: ConnectorInstallInput): void {\n  for (const secret of definition.setup.secrets ?? []) {\n    const value = input.secrets?.[secret.key];\n    if (secret.required && (typeof value !== 'string' || value.trim().length === 0)) {\n      throw new Error(`Missing required secret: ${secret.key}`);\n    }\n  }\n  for (const field of definition.setup.config ?? []) {\n    const value = input.config?.[field.key];\n    if (field.required && (value === undefined || value === null || value === '')) {\n      throw new Error(`Missing required config: ${field.key}`);\n    }\n  }\n}\n\nexport function materializeConnectorMcpServer(\n  definition: ConnectorDefinition,\n  input: ConnectorInstallInput,\n): { serverId: string; server: Record<string, unknown> } {\n  assertRequiredInputs(definition, input);\n  if (definition.runtime.type !== 'mcp') {\n    throw new Error(`Unsupported connector runtime: ${definition.runtime.type}`);\n  }\n\n  const rawServerId = materializeTemplate(definition.runtime.serverId, definition, input);\n  if (typeof rawServerId !== 'string') {\n    throw new Error('Connector server name must be a string.');\n  }\n  const serverId = rawServerId.trim();\n  assertValidConnectorServerId(serverId);\n\n  const rawServer = materializeTemplate(definition.runtime.serverTemplate, definition, input);\n  if (!rawServer || typeof rawServer !== 'object' || Array.isArray(rawServer)) {\n    throw new Error('Connector MCP server template must resolve to a JSON object.');\n  }\n\n  const marker: ManagedConnectorMarker = {\n    managed: true,\n    connectorId: definition.id,\n    version: definition.version,\n    displayName: definition.displayName,\n    ...(input.config && Object.keys(input.config).length > 0 ? { config: input.config } : {}),\n  };\n  const server = {\n    ...(rawServer as Record<string, unknown>),\n    xopcConnector: marker,\n  };\n  const parsed = McpServerSchema.safeParse(server);\n  if (!parsed.success) {\n    throw new Error(parsed.error.issues[0]?.message ?? 'Invalid MCP server config.');\n  }\n  return { serverId, server };\n}\n\nexport function isManagedConnectorServer(server: unknown): server is Record<string, unknown> & { xopcConnector: ManagedConnectorMarker } {\n  if (!server || typeof server !== 'object' || Array.isArray(server)) {\n    return false;\n  }\n  const marker = (server as Record<string, unknown>).xopcConnector;\n  return Boolean(\n    marker &&\n      typeof marker === 'object' &&\n      !Array.isArray(marker) &&\n      (marker as Record<string, unknown>).managed === true &&\n      typeof (marker as Record<string, unknown>).connectorId === 'string',\n  );\n}\n"],"mappings":"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"}

package/dist/src/connectors/registries/modelscope.js

@@ -12,6 +12,9 @@ function readArray(value) {
 function readRecord(value) {
 	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
+function isHttpUrl(value) {
+	return value?.startsWith("http://") || value?.startsWith("https://") || false;
+}
 function slugFrom(value) {
 	return value.trim().toLowerCase().replace(/^@/, "").replace(/[^a-z0-9_-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 64) || "modelscope-mcp";
 }
@@ -38,18 +41,29 @@ function secretFieldsFromEnvSchema(schema) {
 		};
 	});
 }
-function firstMcpServerConfig(server) {
-	for (const config of readArray(server.ServerConfig ?? server.serverConfig)) {
-		const mcpServers = readRecord(readRecord(config)?.mcpServers);
-		if (!mcpServers) continue;
+function readMcpServerConfigs(value) {
+	const configItems = Array.isArray(value) ? value : [value];
+	const configs = [];
+	for (const config of configItems) {
+		const configRecord = readRecord(config);
+		if (!configRecord) continue;
+		const mcpServers = readRecord(configRecord?.mcpServers);
+		if (!mcpServers) {
+			configs.push(configRecord);
+			continue;
+		}
 		for (const value of Object.values(mcpServers)) {
 			const serverConfig = readRecord(value);
-			if (serverConfig && readString(serverConfig.command)) return serverConfig;
+			if (serverConfig) configs.push(serverConfig);
 		}
 	}
+	return configs;
+}
+function firstMcpServerConfig(server, predicate = (config) => Boolean(readString(config.command))) {
+	for (const config of readMcpServerConfigs(server.ServerConfig ?? server.serverConfig)) if (predicate(config)) return config;
 }
 function secretFieldsFromServerConfig(server) {
-	const env = readRecord(firstMcpServerConfig(server)?.env);
+	const env = readRecord((firstMcpServerConfig(server, (candidate) => Boolean(readRecord(candidate.env))) ?? firstMcpServerConfig(server))?.env);
 	if (!env) return [];
 	return Object.keys(env).map((key) => ({
 		key,
@@ -77,9 +91,12 @@ function normalizeEnv(env, secrets) {
 	for (const field of secrets) if (output[field.key] === void 0) output[field.key] = `{{secrets.${field.key}}}`;
 	return Object.keys(output).length ? output : void 0;
 }
+function transportFromConfig(config, fallback) {
+	return (readString(config.transport ?? config.type)?.toLowerCase())?.includes("sse") ? "sse" : fallback;
+}
 function normalizeServerTemplate(server, secrets) {
 	const deployedUrl = readString(server.DeployedUrl ?? server.deployedUrl);
-	if (deployedUrl?.startsWith("http://") || deployedUrl?.startsWith("https://")) return {
+	if (isHttpUrl(deployedUrl)) return {
 		url: deployedUrl,
 		transport: readString(server.DeployedUrlTransportType ?? server.deployedUrlTransportType)?.toLowerCase() === "sse" ? "sse" : "streamable-http"
 	};
@@ -89,13 +106,21 @@ function normalizeServerTemplate(server, secrets) {
 		"SSEServerConfig",
 		"sseServerConfig"
 	]) {
-		const config = readRecord(server[key]);
-		const url = readString(config?.url ?? config?.endpoint);
-		if (url?.startsWith("http://") || url?.startsWith("https://")) return {
-			url,
-			transport: key.toLowerCase().includes("sse") ? "sse" : "streamable-http"
-		};
+		const fallbackTransport = key.toLowerCase().includes("sse") ? "sse" : "streamable-http";
+		for (const config of readMcpServerConfigs(server[key])) {
+			const url = readString(config.url ?? config.endpoint);
+			if (isHttpUrl(url)) return {
+				url,
+				transport: transportFromConfig(config, fallbackTransport)
+			};
+		}
 	}
+	const remoteConfig = firstMcpServerConfig(server, (candidate) => isHttpUrl(readString(candidate.url ?? candidate.endpoint)));
+	const remoteUrl = readString(remoteConfig?.url ?? remoteConfig?.endpoint);
+	if (isHttpUrl(remoteUrl) && remoteConfig) return {
+		url: remoteUrl,
+		transport: transportFromConfig(remoteConfig, "streamable-http")
+	};
 	const config = firstMcpServerConfig(server);
 	const command = readString(config?.command);
 	if (!command) return void 0;

package/dist/src/connectors/registries/modelscope.js.map

@@ -1 +1 @@
-{"version":3,"file":"modelscope.js","names":[],"sources":["../../../../src/connectors/registries/modelscope.ts"],"sourcesContent":["import type { ConnectorDefinition, ConnectorSecretField } from '../types.js';\nimport type { ConnectorRegistryAdapter, ConnectorRegistrySearchParams, ConnectorRegistrySearchResult } from './types.js';\n\nconst DEFAULT_BASE_URL = 'https://www.modelscope.cn';\n\nfunction modelscopeBaseUrl(): string {\n  return process.env.XOPC_MODELSCOPE_REGISTRY_URL?.trim().replace(/\\/+$/, '') || DEFAULT_BASE_URL;\n}\n\nfunction readString(value: unknown): string | undefined {\n  return typeof value === 'string' && value.trim() ? value.trim() : undefined;\n}\n\nfunction readArray(value: unknown): unknown[] {\n  return Array.isArray(value) ? value : [];\n}\n\nfunction readRecord(value: unknown): Record<string, unknown> | undefined {\n  return value && typeof value === 'object' && !Array.isArray(value) ? value as Record<string, unknown> : undefined;\n}\n\nfunction slugFrom(value: string): string {\n  return value\n    .trim()\n    .toLowerCase()\n    .replace(/^@/, '')\n    .replace(/[^a-z0-9_-]+/g, '-')\n    .replace(/^-+|-+$/g, '')\n    .slice(0, 64) || 'modelscope-mcp';\n}\n\nfunction categoryFromModelScope(categories: unknown): ConnectorDefinition['category'] {\n  const text = readArray(categories).map((item) => readString(item)).filter(Boolean).join(' ').toLowerCase();\n  if (text.includes('browser')) return 'browser';\n  if (text.includes('automation')) return 'automation';\n  if (text.includes('database') || text.includes('data')) return 'data';\n  if (text.includes('code') || text.includes('developer')) return 'code';\n  if (text.includes('docs') || text.includes('knowledge')) return 'docs';\n  return 'custom';\n}\n\nfunction secretFieldsFromEnvSchema(schema: unknown): ConnectorSecretField[] {\n  const record = readRecord(schema);\n  const properties = readRecord(record?.properties);\n  if (!properties) return [];\n  const required = new Set(readArray(record?.required).map((item) => readString(item)).filter((item): item is string => Boolean(item)));\n  return Object.entries(properties).map(([key, value]) => {\n    const field = readRecord(value);\n    return {\n      key,\n      label: key,\n      description: readString(field?.description),\n      required: required.size === 0 ? true : required.has(key),\n    } satisfies ConnectorSecretField;\n  });\n}\n\nfunction firstMcpServerConfig(server: Record<string, unknown>): Record<string, unknown> | undefined {\n  for (const config of readArray(server.ServerConfig ?? server.serverConfig)) {\n    const configRecord = readRecord(config);\n    const mcpServers = readRecord(configRecord?.mcpServers);\n    if (!mcpServers) continue;\n    for (const value of Object.values(mcpServers)) {\n      const serverConfig = readRecord(value);\n      if (serverConfig && readString(serverConfig.command)) return serverConfig;\n    }\n  }\n  return undefined;\n}\n\nfunction secretFieldsFromServerConfig(server: Record<string, unknown>): ConnectorSecretField[] {\n  const config = firstMcpServerConfig(server);\n  const env = readRecord(config?.env);\n  if (!env) return [];\n  return Object.keys(env).map((key) => ({\n    key,\n    label: key,\n    description: `Environment variable required by the ModelScope MCP server config.`,\n    required: true,\n  } satisfies ConnectorSecretField));\n}\n\nfunction mergeSecretFields(...groups: ConnectorSecretField[][]): ConnectorSecretField[] {\n  const merged = new Map<string, ConnectorSecretField>();\n  for (const group of groups) {\n    for (const field of group) {\n      const previous = merged.get(field.key);\n      merged.set(field.key, {\n        ...field,\n        description: previous?.description ?? field.description,\n        required: previous?.required ?? field.required,\n      });\n    }\n  }\n  return [...merged.values()];\n}\n\nfunction normalizeEnv(env: unknown, secrets: ConnectorSecretField[]): Record<string, unknown> | undefined {\n  const envRecord = readRecord(env);\n  const output: Record<string, unknown> = {};\n  for (const [key, value] of Object.entries(envRecord ?? {})) {\n    output[key] = secrets.some((field) => field.key === key) ? `{{secrets.${key}}}` : value;\n  }\n  for (const field of secrets) {\n    if (output[field.key] === undefined) output[field.key] = `{{secrets.${field.key}}}`;\n  }\n  return Object.keys(output).length ? output : undefined;\n}\n\nfunction normalizeServerTemplate(server: Record<string, unknown>, secrets: ConnectorSecretField[]): Record<string, unknown> | undefined {\n  const deployedUrl = readString(server.DeployedUrl ?? server.deployedUrl);\n  if (deployedUrl?.startsWith('http://') || deployedUrl?.startsWith('https://')) {\n    const transport = readString(server.DeployedUrlTransportType ?? server.deployedUrlTransportType)?.toLowerCase();\n    return { url: deployedUrl, transport: transport === 'sse' ? 'sse' : 'streamable-http' };\n  }\n\n  for (const key of ['StreamableHTTPServerConfig', 'streamableHTTPServerConfig', 'SSEServerConfig', 'sseServerConfig']) {\n    const config = readRecord(server[key]);\n    const url = readString(config?.url ?? config?.endpoint);\n    if (url?.startsWith('http://') || url?.startsWith('https://')) {\n      return { url, transport: key.toLowerCase().includes('sse') ? 'sse' : 'streamable-http' };\n    }\n  }\n\n  const config = firstMcpServerConfig(server);\n  const command = readString(config?.command);\n  if (!command) return undefined;\n  const args = readArray(config?.args).map((arg) => String(arg));\n  const env = normalizeEnv(config.env, secrets);\n  return {\n    command,\n    ...(args.length ? { args } : {}),\n    ...(env ? { env } : {}),\n    ...(readString(config.cwd) ? { cwd: readString(config.cwd) } : {}),\n  };\n}\n\nfunction connectorFromModelScopeServer(server: Record<string, unknown>): ConnectorDefinition | undefined {\n  const name = readString(server.Name ?? server.name);\n  const path = readString(server.Path ?? server.path ?? server.FromSitePath ?? server.fromSitePath);\n  const displayName = readString(server.ChineseName ?? server.DisplayName ?? server.displayName) || name;\n  if (!name || !displayName) return undefined;\n\n  const qualifiedName = path ? `${path}/${name}` : name;\n  const serverId = slugFrom(qualifiedName);\n  const secrets = mergeSecretFields(\n    secretFieldsFromEnvSchema(server.EnvSchema ?? server.envSchema),\n    secretFieldsFromServerConfig(server),\n  );\n  const serverTemplate = normalizeServerTemplate(server, secrets);\n  if (!serverTemplate) return undefined;\n\n  const isRemote = typeof serverTemplate.url === 'string';\n  const tags = [\n    ...readArray(server.Category ?? server.category).map((tag) => readString(tag)).filter((tag): tag is string => Boolean(tag)),\n    ...readArray(server.Tags ?? server.tags).map((tag) => readString(tag)).filter((tag): tag is string => Boolean(tag)),\n    'modelscope',\n    'registry',\n    'mcp',\n  ];\n\n  return {\n    id: `modelscope-${serverId}`,\n    version: readString(server.Version ?? server.version) ?? 'registry',\n    displayName,\n    description: readString(server.Abstract ?? server.AbstractCN ?? server.description) ?? 'MCP server from ModelScope MCP registry.',\n    category: categoryFromModelScope(server.Category ?? server.category),\n    kind: 'mcp',\n    source: 'registry',\n    capabilities: isRemote\n      ? ['tools', 'resources', 'prompts', 'runtime.mcp.streamableHttp']\n      : ['tools', 'resources', 'prompts', 'runtime.mcp.stdio'],\n    tags: Array.from(new Set(tags)).slice(0, 8),\n    auth: { mode: secrets.length ? 'apiKey' : 'none' },\n    setup: { secrets: secrets.length ? secrets : undefined },\n    runtime: {\n      type: 'mcp',\n      serverId,\n      serverTemplate,\n    },\n  };\n}\n\nfunction readNumber(value: unknown): number {\n  return typeof value === 'number' && Number.isFinite(value) ? value : 0;\n}\n\nfunction extractMcpServers(payload: unknown): { servers: Record<string, unknown>[]; total?: number } {\n  const root = readRecord(payload);\n  const data = readRecord(root?.Data);\n  const nestedData = readRecord(data?.Data) ?? data;\n  const mcp = readRecord(nestedData?.Mcp ?? nestedData?.McpServer ?? nestedData?.mcp);\n  const servers = readArray(mcp?.McpServers ?? mcp?.servers ?? mcp?.items)\n    .map((item) => readRecord(item))\n    .filter((item): item is Record<string, unknown> => Boolean(item));\n  const total = typeof mcp?.TotalCount === 'number' ? mcp.TotalCount : undefined;\n  return { servers, total };\n}\n\nasync function fetchModelScopeMcp(params: ConnectorRegistrySearchParams): Promise<unknown> {\n  const url = new URL('/api/v1/dolphin/agg', modelscopeBaseUrl());\n  const body = {\n    PageSize: Math.min(Math.max(params.pageSize ?? 24, 1), 100),\n    PageNumber: Math.max(params.page ?? 1, 1),\n    Query: params.query?.trim() ?? '',\n    Criterion: [],\n  };\n  const response = await fetch(url, {\n    method: 'PUT',\n    headers: {\n      Accept: 'application/json',\n      'Content-Type': 'application/json',\n      'x-modelscope-accept-language': 'zh_CN',\n    },\n    body: JSON.stringify(body),\n  });\n  if (!response.ok) throw new Error(`ModelScope registry returned ${response.status}`);\n  return response.json();\n}\n\nexport const modelscopeRegistryAdapter: ConnectorRegistryAdapter = {\n  source: 'modelscope',\n  displayName: 'ModelScope',\n  async search(params: ConnectorRegistrySearchParams): Promise<ConnectorRegistrySearchResult> {\n    const payload = await fetchModelScopeMcp(params);\n    const { servers, total } = extractMcpServers(payload);\n    const pageSize = Math.min(Math.max(params.pageSize ?? 24, 1), 100);\n    return {\n      source: 'modelscope',\n      connectors: servers\n        .toSorted((a, b) => readNumber(b.CallVolume ?? b.callVolume) - readNumber(a.CallVolume ?? a.callVolume))\n        .map(connectorFromModelScopeServer)\n        .filter((item): item is ConnectorDefinition => Boolean(item)),\n      totalPages: total === undefined ? undefined : Math.ceil(total / pageSize),\n    };\n  },\n};\n"],"mappings":"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"}
+{"version":3,"file":"modelscope.js","names":[],"sources":["../../../../src/connectors/registries/modelscope.ts"],"sourcesContent":["import type { ConnectorDefinition, ConnectorSecretField } from '../types.js';\nimport type { ConnectorRegistryAdapter, ConnectorRegistrySearchParams, ConnectorRegistrySearchResult } from './types.js';\n\nconst DEFAULT_BASE_URL = 'https://www.modelscope.cn';\n\nfunction modelscopeBaseUrl(): string {\n  return process.env.XOPC_MODELSCOPE_REGISTRY_URL?.trim().replace(/\\/+$/, '') || DEFAULT_BASE_URL;\n}\n\nfunction readString(value: unknown): string | undefined {\n  return typeof value === 'string' && value.trim() ? value.trim() : undefined;\n}\n\nfunction readArray(value: unknown): unknown[] {\n  return Array.isArray(value) ? value : [];\n}\n\nfunction readRecord(value: unknown): Record<string, unknown> | undefined {\n  return value && typeof value === 'object' && !Array.isArray(value) ? value as Record<string, unknown> : undefined;\n}\n\nfunction isHttpUrl(value: string | undefined): value is string {\n  return value?.startsWith('http://') || value?.startsWith('https://') || false;\n}\n\nfunction slugFrom(value: string): string {\n  return value\n    .trim()\n    .toLowerCase()\n    .replace(/^@/, '')\n    .replace(/[^a-z0-9_-]+/g, '-')\n    .replace(/^-+|-+$/g, '')\n    .slice(0, 64) || 'modelscope-mcp';\n}\n\nfunction categoryFromModelScope(categories: unknown): ConnectorDefinition['category'] {\n  const text = readArray(categories).map((item) => readString(item)).filter(Boolean).join(' ').toLowerCase();\n  if (text.includes('browser')) return 'browser';\n  if (text.includes('automation')) return 'automation';\n  if (text.includes('database') || text.includes('data')) return 'data';\n  if (text.includes('code') || text.includes('developer')) return 'code';\n  if (text.includes('docs') || text.includes('knowledge')) return 'docs';\n  return 'custom';\n}\n\nfunction secretFieldsFromEnvSchema(schema: unknown): ConnectorSecretField[] {\n  const record = readRecord(schema);\n  const properties = readRecord(record?.properties);\n  if (!properties) return [];\n  const required = new Set(readArray(record?.required).map((item) => readString(item)).filter((item): item is string => Boolean(item)));\n  return Object.entries(properties).map(([key, value]) => {\n    const field = readRecord(value);\n    return {\n      key,\n      label: key,\n      description: readString(field?.description),\n      required: required.size === 0 ? true : required.has(key),\n    } satisfies ConnectorSecretField;\n  });\n}\n\nfunction readMcpServerConfigs(value: unknown): Record<string, unknown>[] {\n  const configItems = Array.isArray(value) ? value : [value];\n  const configs: Record<string, unknown>[] = [];\n  for (const config of configItems) {\n    const configRecord = readRecord(config);\n    if (!configRecord) continue;\n    const mcpServers = readRecord(configRecord?.mcpServers);\n    if (!mcpServers) {\n      configs.push(configRecord);\n      continue;\n    }\n    for (const value of Object.values(mcpServers)) {\n      const serverConfig = readRecord(value);\n      if (serverConfig) configs.push(serverConfig);\n    }\n  }\n  return configs;\n}\n\nfunction firstMcpServerConfig(\n  server: Record<string, unknown>,\n  predicate: (config: Record<string, unknown>) => boolean = (config) => Boolean(readString(config.command)),\n): Record<string, unknown> | undefined {\n  for (const config of readMcpServerConfigs(server.ServerConfig ?? server.serverConfig)) {\n    if (predicate(config)) return config;\n  }\n  return undefined;\n}\n\nfunction secretFieldsFromServerConfig(server: Record<string, unknown>): ConnectorSecretField[] {\n  const config = firstMcpServerConfig(server, (candidate) => Boolean(readRecord(candidate.env)))\n    ?? firstMcpServerConfig(server);\n  const env = readRecord(config?.env);\n  if (!env) return [];\n  return Object.keys(env).map((key) => ({\n    key,\n    label: key,\n    description: `Environment variable required by the ModelScope MCP server config.`,\n    required: true,\n  } satisfies ConnectorSecretField));\n}\n\nfunction mergeSecretFields(...groups: ConnectorSecretField[][]): ConnectorSecretField[] {\n  const merged = new Map<string, ConnectorSecretField>();\n  for (const group of groups) {\n    for (const field of group) {\n      const previous = merged.get(field.key);\n      merged.set(field.key, {\n        ...field,\n        description: previous?.description ?? field.description,\n        required: previous?.required ?? field.required,\n      });\n    }\n  }\n  return [...merged.values()];\n}\n\nfunction normalizeEnv(env: unknown, secrets: ConnectorSecretField[]): Record<string, unknown> | undefined {\n  const envRecord = readRecord(env);\n  const output: Record<string, unknown> = {};\n  for (const [key, value] of Object.entries(envRecord ?? {})) {\n    output[key] = secrets.some((field) => field.key === key) ? `{{secrets.${key}}}` : value;\n  }\n  for (const field of secrets) {\n    if (output[field.key] === undefined) output[field.key] = `{{secrets.${field.key}}}`;\n  }\n  return Object.keys(output).length ? output : undefined;\n}\n\nfunction transportFromConfig(config: Record<string, unknown>, fallback: 'sse' | 'streamable-http'): 'sse' | 'streamable-http' {\n  const raw = readString(config.transport ?? config.type)?.toLowerCase();\n  return raw?.includes('sse') ? 'sse' : fallback;\n}\n\nfunction normalizeServerTemplate(server: Record<string, unknown>, secrets: ConnectorSecretField[]): Record<string, unknown> | undefined {\n  const deployedUrl = readString(server.DeployedUrl ?? server.deployedUrl);\n  if (isHttpUrl(deployedUrl)) {\n    const transport = readString(server.DeployedUrlTransportType ?? server.deployedUrlTransportType)?.toLowerCase();\n    return { url: deployedUrl, transport: transport === 'sse' ? 'sse' : 'streamable-http' };\n  }\n\n  for (const key of ['StreamableHTTPServerConfig', 'streamableHTTPServerConfig', 'SSEServerConfig', 'sseServerConfig']) {\n    const fallbackTransport = key.toLowerCase().includes('sse') ? 'sse' : 'streamable-http';\n    for (const config of readMcpServerConfigs(server[key])) {\n      const url = readString(config.url ?? config.endpoint);\n      if (isHttpUrl(url)) {\n        return { url, transport: transportFromConfig(config, fallbackTransport) };\n      }\n    }\n  }\n\n  const remoteConfig = firstMcpServerConfig(server, (candidate) => isHttpUrl(readString(candidate.url ?? candidate.endpoint)));\n  const remoteUrl = readString(remoteConfig?.url ?? remoteConfig?.endpoint);\n  if (isHttpUrl(remoteUrl) && remoteConfig) {\n    return { url: remoteUrl, transport: transportFromConfig(remoteConfig, 'streamable-http') };\n  }\n\n  const config = firstMcpServerConfig(server);\n  const command = readString(config?.command);\n  if (!command) return undefined;\n  const args = readArray(config?.args).map((arg) => String(arg));\n  const env = normalizeEnv(config.env, secrets);\n  return {\n    command,\n    ...(args.length ? { args } : {}),\n    ...(env ? { env } : {}),\n    ...(readString(config.cwd) ? { cwd: readString(config.cwd) } : {}),\n  };\n}\n\nfunction connectorFromModelScopeServer(server: Record<string, unknown>): ConnectorDefinition | undefined {\n  const name = readString(server.Name ?? server.name);\n  const path = readString(server.Path ?? server.path ?? server.FromSitePath ?? server.fromSitePath);\n  const displayName = readString(server.ChineseName ?? server.DisplayName ?? server.displayName) || name;\n  if (!name || !displayName) return undefined;\n\n  const qualifiedName = path ? `${path}/${name}` : name;\n  const serverId = slugFrom(qualifiedName);\n  const secrets = mergeSecretFields(\n    secretFieldsFromEnvSchema(server.EnvSchema ?? server.envSchema),\n    secretFieldsFromServerConfig(server),\n  );\n  const serverTemplate = normalizeServerTemplate(server, secrets);\n  if (!serverTemplate) return undefined;\n\n  const isRemote = typeof serverTemplate.url === 'string';\n  const tags = [\n    ...readArray(server.Category ?? server.category).map((tag) => readString(tag)).filter((tag): tag is string => Boolean(tag)),\n    ...readArray(server.Tags ?? server.tags).map((tag) => readString(tag)).filter((tag): tag is string => Boolean(tag)),\n    'modelscope',\n    'registry',\n    'mcp',\n  ];\n\n  return {\n    id: `modelscope-${serverId}`,\n    version: readString(server.Version ?? server.version) ?? 'registry',\n    displayName,\n    description: readString(server.Abstract ?? server.AbstractCN ?? server.description) ?? 'MCP server from ModelScope MCP registry.',\n    category: categoryFromModelScope(server.Category ?? server.category),\n    kind: 'mcp',\n    source: 'registry',\n    capabilities: isRemote\n      ? ['tools', 'resources', 'prompts', 'runtime.mcp.streamableHttp']\n      : ['tools', 'resources', 'prompts', 'runtime.mcp.stdio'],\n    tags: Array.from(new Set(tags)).slice(0, 8),\n    auth: { mode: secrets.length ? 'apiKey' : 'none' },\n    setup: { secrets: secrets.length ? secrets : undefined },\n    runtime: {\n      type: 'mcp',\n      serverId,\n      serverTemplate,\n    },\n  };\n}\n\nfunction readNumber(value: unknown): number {\n  return typeof value === 'number' && Number.isFinite(value) ? value : 0;\n}\n\nfunction extractMcpServers(payload: unknown): { servers: Record<string, unknown>[]; total?: number } {\n  const root = readRecord(payload);\n  const data = readRecord(root?.Data);\n  const nestedData = readRecord(data?.Data) ?? data;\n  const mcp = readRecord(nestedData?.Mcp ?? nestedData?.McpServer ?? nestedData?.mcp);\n  const servers = readArray(mcp?.McpServers ?? mcp?.servers ?? mcp?.items)\n    .map((item) => readRecord(item))\n    .filter((item): item is Record<string, unknown> => Boolean(item));\n  const total = typeof mcp?.TotalCount === 'number' ? mcp.TotalCount : undefined;\n  return { servers, total };\n}\n\nasync function fetchModelScopeMcp(params: ConnectorRegistrySearchParams): Promise<unknown> {\n  const url = new URL('/api/v1/dolphin/agg', modelscopeBaseUrl());\n  const body = {\n    PageSize: Math.min(Math.max(params.pageSize ?? 24, 1), 100),\n    PageNumber: Math.max(params.page ?? 1, 1),\n    Query: params.query?.trim() ?? '',\n    Criterion: [],\n  };\n  const response = await fetch(url, {\n    method: 'PUT',\n    headers: {\n      Accept: 'application/json',\n      'Content-Type': 'application/json',\n      'x-modelscope-accept-language': 'zh_CN',\n    },\n    body: JSON.stringify(body),\n  });\n  if (!response.ok) throw new Error(`ModelScope registry returned ${response.status}`);\n  return response.json();\n}\n\nexport const modelscopeRegistryAdapter: ConnectorRegistryAdapter = {\n  source: 'modelscope',\n  displayName: 'ModelScope',\n  async search(params: ConnectorRegistrySearchParams): Promise<ConnectorRegistrySearchResult> {\n    const payload = await fetchModelScopeMcp(params);\n    const { servers, total } = extractMcpServers(payload);\n    const pageSize = Math.min(Math.max(params.pageSize ?? 24, 1), 100);\n    return {\n      source: 'modelscope',\n      connectors: servers\n        .toSorted((a, b) => readNumber(b.CallVolume ?? b.callVolume) - readNumber(a.CallVolume ?? a.callVolume))\n        .map(connectorFromModelScopeServer)\n        .filter((item): item is ConnectorDefinition => Boolean(item)),\n      totalPages: total === undefined ? undefined : Math.ceil(total / pageSize),\n    };\n  },\n};\n"],"mappings":"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"}

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

@@ -91,6 +91,7 @@ export type ConnectorInstance = {
     lastConnectedAt?: string;
     lastError?: string;
     secretStatus: Record<string, boolean>;
+    config?: Record<string, unknown>;
     materialized: {
         type: 'mcp';
         serverId: string;
@@ -142,4 +143,5 @@ export type ManagedConnectorMarker = {
     lastConnectedAt?: string;
     lastError?: string;
     displayName?: string;
+    config?: Record<string, unknown>;
 };

package/dist/src/daemon/launchd.js

@@ -4,8 +4,8 @@ import { resolveGatewayLaunchAgentLabel, resolveLaunchAgentPlistPath as resolveL
 import os from "node:os";
 import path from "node:path";
 import { existsSync } from "node:fs";
-import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { spawn, spawnSync } from "node:child_process";
+import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 //#region src/daemon/launchd.ts
 /**
 * LaunchAgent Service - macOS user service management

package/dist/src/daemon/systemd.js

@@ -4,8 +4,8 @@ import { resolveGatewaySystemdServiceName, resolveSystemdUnitPath } from "./cons
 import os from "node:os";
 import path from "node:path";
 import { existsSync } from "node:fs";
-import { access, constants as constants$1, mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { spawn, spawnSync } from "node:child_process";
+import { access, constants as constants$1, mkdir, readFile, rm, writeFile } from "node:fs/promises";
 //#region src/daemon/systemd.ts
 /**
 * Systemd Service - Linux user service management

package/dist/src/extensions/discover-extensions.js

@@ -1,7 +1,7 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
-import { init_agent_scope, resolveDefaultAgentId } from "../agent/agent-scope.js";
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
+import { init_agent_scope, resolveDefaultAgentId } from "../agent/agent-scope.js";
 import { init_paths, resolveBundledExtensionsDir, resolveExtensionsDir, resolveWorkspaceExtensionsDir } from "../config/paths.js";
 import { init_normalize_manifest, normalizeExtensionManifest } from "./normalize-manifest.js";
 import { join } from "path";

package/dist/src/extensions/loader.js

@@ -1,7 +1,7 @@
 import { PACKAGE_VERSION, init_package_version } from "../package-version.js";
-import { init_agent_scope, resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agent/agent-scope.js";
 import { createLogger, createServiceLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
+import { init_agent_scope, resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agent/agent-scope.js";
 import { init_paths, resolveBundledExtensionsDir, resolveExtensionSdkPath, resolveExtensionsDir, resolveWorkspaceExtensionsDir } from "../config/paths.js";
 import { init_normalize_manifest, normalizeExtensionManifest } from "./normalize-manifest.js";
 import { areExtensionsGloballyDisabled, discoverExtensionsFromDisk, init_discover_extensions } from "./discover-extensions.js";
@@ -18,9 +18,9 @@ import { validateMediaUnderstandingProviderContracts } from "./media-provider-co
 import { DEFAULT_SECURITY_CONFIG, checkExtensionPathSafety, isExtensionAllowed, logSecurityIssue, provenanceTracker } from "./security.js";
 import { getSlotRegistry } from "./slots.js";
 import { getExtensionCache, getExtensionDiagnostics } from "./diagnostics.js";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { dirname, isAbsolute, join } from "path";
 import { existsSync, readFileSync } from "fs";
-import { fileURLToPath, pathToFileURL } from "node:url";
 import { createJiti } from "jiti";
 //#region src/extensions/loader.ts
 /**

package/dist/src/gateway/agents-admin.js

@@ -1,5 +1,5 @@
-import { init_agent_scope, listAgentEntries, normalizeAgentId, resolveAgentDir, resolveAgentProfileDir, resolveAgentWorkspaceDir, resolveDefaultAgentId, resolveUserPath, validateAgentIdForNewAgent } from "../agent/agent-scope.js";
 import { resolveEffectiveAgentManifest } from "../agent-manifest/resolver.js";
+import { init_agent_scope, listAgentEntries, normalizeAgentId, resolveAgentDir, resolveAgentProfileDir, resolveAgentWorkspaceDir, resolveDefaultAgentId, resolveUserPath, validateAgentIdForNewAgent } from "../agent/agent-scope.js";
 import { resolveEffectiveAgentProfile } from "../config/agent-profile.js";
 import { WORKSPACE_FILES, init_paths, resolveUserProfilePath } from "../config/paths.js";
 import { AGENT_PROFILE_MARKDOWN_SYSTEM_FILES, REQUIRED_AGENT_PROFILE_MARKDOWN_FILE_SET } from "../agent/context/workspace.js";

package/dist/src/gateway/dreaming-automation-reconciler.d.ts

@@ -4,6 +4,7 @@ export type DreamingAutomationReconcileResult = {
     created: string[];
     updated: string[];
     disabled: string[];
+    removed: string[];
 };
 export declare function reconcileDreamingAutomations(params: {
     config: Config;

package/dist/src/gateway/dreaming-automation-reconciler.js

@@ -1,7 +1,7 @@
-import { init_agent_scope, resolveDefaultAgentId } from "../agent/agent-scope.js";
+import { init_agent_scope, normalizeAgentId } from "../agent/agent-scope.js";
 import { DREAMING_CRON_NAME, DREAMING_CRON_TAG, DREAMING_LIGHT_CRON_NAME, DREAMING_LIGHT_SWEEP_TOKEN, DREAMING_REM_CRON_NAME, DREAMING_REM_SWEEP_TOKEN, DREAMING_SWEEP_TOKEN } from "../agent/memory/dreaming/constants.js";
 import { resolveDreamingConfig } from "../agent/memory/dreaming/config.js";
-import { getWorkspacePath } from "../config/workspace-path-helpers.js";
+import { resolveDreamingAgentScope } from "../agent/memory/dreaming/scope.js";
 //#region src/gateway/dreaming-automation-reconciler.ts
 init_agent_scope();
 const DREAMING_AUTOMATIONS = [
@@ -37,13 +37,16 @@ function buildTrigger(config, phase) {
 		}
 	};
 }
+function dreamingAutomationId(agentId, phase) {
+	return `system-dreaming:${normalizeAgentId(agentId)}:${phase}`;
+}
 function buildAction(config, agentId, token) {
-	const workspaceDir = getWorkspacePath(config);
+	const scope = resolveDreamingAgentScope(config, agentId);
 	return {
 		kind: "agent",
-		agentId,
+		agentId: scope.agentId,
 		instruction: token,
-		...workspaceDir ? { workingDirectory: workspaceDir } : {},
+		workingDirectory: scope.workspaceDir,
 		timeoutSeconds: 3600
 	};
 }
@@ -52,49 +55,66 @@ function automationNeedsUpdate(current, next) {
 }
 async function reconcileDreamingAutomations(params) {
 	const { config, automationService } = params;
-	const resolved = resolveDreamingConfig(config);
-	const agentId = resolveDefaultAgentId(config);
 	const result = {
 		created: [],
 		updated: [],
-		disabled: []
+		disabled: [],
+		removed: []
 	};
-	for (const spec of DREAMING_AUTOMATIONS) {
-		const current = await automationService.get(spec.id);
-		const enabled = resolved.enabled && resolved.phases[spec.phase].enabled;
-		if (!resolved.enabled) {
-			if (current?.enabled) {
-				await automationService.update(spec.id, { enabled: false });
-				result.disabled.push(spec.id);
+	for (const spec of DREAMING_AUTOMATIONS) if (await automationService.remove(spec.id)) result.removed.push(spec.id);
+	const expectedIds = /* @__PURE__ */ new Set();
+	const agents = config.agents.list.filter((agent) => agent.enabled !== false);
+	for (const agent of agents) {
+		const agentId = normalizeAgentId(agent.id);
+		const resolved = resolveDreamingConfig(config, agentId);
+		for (const spec of DREAMING_AUTOMATIONS) {
+			const id = dreamingAutomationId(agentId, spec.phase);
+			expectedIds.add(id);
+			const current = await automationService.get(id);
+			const enabled = resolved.enabled && resolved.phases[spec.phase].enabled;
+			if (!resolved.enabled) {
+				if (current?.enabled) {
+					await automationService.update(id, { enabled: false });
+					result.disabled.push(id);
+				}
+				continue;
+			}
+			const next = {
+				name: `${spec.name} (${agentId})`,
+				description: phaseDescription(spec.phase),
+				enabled,
+				trigger: buildTrigger(resolved, spec.phase),
+				action: buildAction(config, agentId, spec.token)
+			};
+			if (!current) {
+				await automationService.create({
+					id,
+					...next,
+					safety: { mode: "auto_apply" },
+					afterRun: { kind: "none" },
+					reliability: { disableAfterConsecutiveFailures: 3 }
+				});
+				result.created.push(id);
+				continue;
+			}
+			if (automationNeedsUpdate(current, next)) {
+				await automationService.update(id, {
+					...next,
+					safety: { mode: "auto_apply" },
+					afterRun: { kind: "none" },
+					reliability: { disableAfterConsecutiveFailures: 3 }
+				});
+				result.updated.push(id);
 			}
-			continue;
-		}
-		const next = {
-			name: spec.name,
-			description: phaseDescription(spec.phase),
-			enabled,
-			trigger: buildTrigger(resolved, spec.phase),
-			action: buildAction(config, agentId, spec.token)
-		};
-		if (!current) {
-			await automationService.create({
-				id: spec.id,
-				...next,
-				safety: { mode: "auto_apply" },
-				afterRun: { kind: "none" },
-				reliability: { disableAfterConsecutiveFailures: 3 }
-			});
-			result.created.push(spec.id);
-			continue;
 		}
-		if (automationNeedsUpdate(current, next)) {
-			await automationService.update(spec.id, {
-				...next,
-				safety: { mode: "auto_apply" },
-				afterRun: { kind: "none" },
-				reliability: { disableAfterConsecutiveFailures: 3 }
-			});
-			result.updated.push(spec.id);
+	}
+	const allAutomations = await automationService.list();
+	for (const automation of allAutomations) {
+		if (!automation.id.startsWith("system-dreaming:")) continue;
+		if (expectedIds.has(automation.id)) continue;
+		if (automation.enabled) {
+			await automationService.update(automation.id, { enabled: false });
+			result.disabled.push(automation.id);
 		}
 	}
 	return result;