@xopcai/xopc 0.0.124 → 0.0.125

package/dist/src/agent/workflow/subagent-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-runner.js","names":[],"sources":["../../../../src/agent/workflow/subagent-runner.ts"],"sourcesContent":["/**\n * Adapter: spawns one isolated child agent per `agent()` call from a workflow.\n *\n * Wraps the existing `createDelegateChildHandle` so the workflow runtime stays\n * decoupled from the LLM stack (it sees only the `SubagentRunner` interface).\n *\n * Key behaviour:\n * - When `opts.schema` is provided, we inject `structured_output` into the child\n *   tool set and unwrap the captured value on success. If the subagent finishes\n *   without ever calling `structured_output`, we treat it as failure (`null`).\n * - Failures and aborts resolve to `null`. The workflow runtime continues — this\n *   matches the pi-dynamic-workflows contract and keeps fan-out pipelines robust.\n * - We do NOT mutate `createDelegateChildHandle` — we just leverage its\n *   `buildChildTools` injection point.\n */\n\nimport type { AgentTool } from '@earendil-works/pi-agent-core';\nimport type { Api, Model } from '@earendil-works/pi-ai';\n\nimport type { Config } from '../../config/schema.js';\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport type { SessionStore } from '../../session/store.js';\nimport { emitSessionTranscriptUpdate } from '../../session/transcript-events.js';\nimport { createLogger } from '../../utils/logger.js';\n\nimport {\n  type BuildChildToolsOptions,\n  createDelegateChildHandle,\n  type DelegateChildHandleOptions,\n} from '../child-agent-factory.js';\nimport {\n  DEFAULT_DELEGATE_TOOLS,\n  DELEGATE_BLOCKED_TOOLS,\n} from '../tools/delegate-tool.js';\nimport type { ToolExecutorConfig } from '../tools/executor.js';\n\nimport {\n  createStructuredOutputTool,\n  STRUCTURED_OUTPUT_TOOL_NAME,\n  type StructuredOutputCapture,\n} from './structured-output-tool.js';\nimport type { SubagentRunOptions, SubagentRunner, SubagentProgressEvent } from './types.js';\n\nconst log = createLogger('Agent:WorkflowSubagent');\n\nconst DEFAULT_MAX_ITERATIONS = 30;\n\nexport interface DelegateSubagentRunnerDeps {\n  workspace: string;\n  bus: MessageBus;\n  /** Resolves the default subagent model (typically the parent agent's primary model). */\n  getDefaultModel: () => Model<Api>;\n  getConfig: () => Config | undefined;\n  toolExecutorConfig?: Partial<ToolExecutorConfig>;\n  sessionStore?: SessionStore;\n  /**\n   * Provided by the workflow tool from `AgentToolsFactory` — mirrors how\n   * `delegate-tool` is wired (avoids importing `tools/factory.ts` here and\n   * breaking the existing factory ↔ delegate-tool ↔ child-agent-factory\n   * dependency contract).\n   */\n  buildChildTools: (opts: BuildChildToolsOptions) => AgentTool<any, any>[];\n}\n\nexport class DelegateSubagentRunner implements SubagentRunner {\n  constructor(private readonly deps: DelegateSubagentRunnerDeps) {}\n\n  async run<T = string>(prompt: string, opts: SubagentRunOptions<T>): Promise<T | null> {\n    if (opts.signal?.aborted) return null;\n\n    const capture: StructuredOutputCapture<T> = { called: false, value: undefined };\n    const wantStructured = Boolean(opts.schema);\n\n    const allowed = resolveAllowedToolNames(opts.allowedToolNames, wantStructured);\n    const model = opts.model ?? safeResolveDefaultModel(this.deps.getDefaultModel);\n    if (!model) {\n      log.warn({ label: opts.label }, 'subagent run skipped: no primary model resolved');\n      return null;\n    }\n\n    const fullPrompt = buildPrompt(prompt, opts, wantStructured);\n    const streamMode = resolveSubagentStreamMode(this.deps.getConfig);\n\n    let transcriptPersistQueue: Promise<void> = Promise.resolve();\n    const persistTranscriptSnapshot = opts.sessionKey && this.deps.sessionStore\n      ? (messages: Parameters<SessionStore['saveMessages']>[1]) => {\n          const store = this.deps.sessionStore;\n          const key = opts.sessionKey;\n          if (!store || !key) return;\n          const snapshot = cloneAgentMessages(messages);\n          transcriptPersistQueue = transcriptPersistQueue\n            .then(async () => {\n              await store.saveMessages(key, snapshot);\n              emitSessionTranscriptUpdate({ sessionKey: key });\n            })\n            .catch((err) => {\n              const msg = err instanceof Error ? err.message : String(err);\n              log.warn(\n                { err, sessionKey: key, errorMessage: msg },\n                `Failed to persist workflow subagent transcript snapshot: ${msg}`,\n              );\n            });\n        }\n      : undefined;\n\n    const childOptions: DelegateChildHandleOptions = {\n      workspace: this.deps.workspace,\n      goal: fullPrompt,\n      allowedToolNames: allowed,\n      maxIterations: opts.maxIterations ?? DEFAULT_MAX_ITERATIONS,\n      model,\n      bus: this.deps.bus,\n      getConfig: this.deps.getConfig,\n      toolExecutorConfig: this.deps.toolExecutorConfig,\n      buildChildTools: (childOpts) => {\n        const base = this.deps.buildChildTools(childOpts);\n        if (!wantStructured || !opts.schema) return base;\n        // Replace any existing tool with the same name so the per-run capture wins.\n        const filtered = base.filter((t) => t.name !== STRUCTURED_OUTPUT_TOOL_NAME);\n        return [\n          ...filtered,\n          createStructuredOutputTool({ schema: opts.schema, capture }) as unknown as AgentTool<any, any>,\n        ];\n      },\n      progressHooks:\n        opts.onProgress && streamMode !== 'off'\n          ? {\n              mode: streamMode === 'full' ? 'full' : 'steps',\n              onProgress: (event) => {\n                opts.onProgress?.(mapChildProgressEvent(event));\n              },\n            }\n          : undefined,\n      onTranscriptSnapshot: persistTranscriptSnapshot,\n    };\n\n    if (opts.sessionKey && opts.sessionMetadata && this.deps.sessionStore) {\n      await this.preparePersistentSubagentSession(opts.sessionKey, opts.sessionMetadata);\n    }\n\n    const handle = createDelegateChildHandle(childOptions);\n    const onAbort = () => handle.abort();\n    opts.signal?.addEventListener('abort', onAbort, { once: true });\n\n    try {\n      const { summary, messages } = await handle.run();\n      await transcriptPersistQueue;\n      if (opts.sessionKey && this.deps.sessionStore) {\n        await this.deps.sessionStore.saveMessages(opts.sessionKey, messages);\n        emitSessionTranscriptUpdate({ sessionKey: opts.sessionKey });\n      }\n      if (opts.signal?.aborted) return null;\n\n      if (wantStructured) {\n        if (!capture.called) {\n          log.warn({ label: opts.label }, 'subagent finished without calling structured_output');\n          return null;\n        }\n        return capture.value as T;\n      }\n      return summary as unknown as T;\n    } catch (e) {\n      if (opts.rethrow) throw e;\n      const msg = e instanceof Error ? e.message : String(e);\n      log.warn({ err: e, label: opts.label, errorMessage: msg }, `subagent run failed: ${msg}`);\n      return null;\n    } finally {\n      opts.signal?.removeEventListener('abort', onAbort);\n    }\n  }\n\n  private async preparePersistentSubagentSession(\n    sessionKey: string,\n    metadata: NonNullable<SubagentRunOptions['sessionMetadata']>,\n  ): Promise<void> {\n    const store = this.deps.sessionStore;\n    if (!store) return;\n    await store.resolveTranscriptPath(sessionKey, {\n      metadata: {\n        sessionType: 'workflow-subagent',\n        hiddenFromSessionList: true,\n        parentSessionKey: metadata.parentSessionKey,\n        workflowRunId: metadata.workflowRunId,\n        workflowDefinitionId: metadata.workflowDefinitionId,\n        workflowAgentId: metadata.workflowAgentId,\n        workflowAgentLabel: metadata.workflowAgentLabel,\n        sourceChannel: 'workflow',\n        sourceChatId: metadata.workflowRunId,\n        routing: {\n          agentId: metadata.workflowAgentId || 'main',\n          source: 'workflow',\n          accountId: 'default',\n          peerKind: 'subagent',\n          peerId: metadata.workflowRunId,\n        },\n      },\n    });\n    await store.updateMetadata(sessionKey, {\n      sessionType: 'workflow-subagent',\n      hiddenFromSessionList: true,\n      parentSessionKey: metadata.parentSessionKey,\n      workflowRunId: metadata.workflowRunId,\n      workflowDefinitionId: metadata.workflowDefinitionId,\n      workflowAgentId: metadata.workflowAgentId,\n      workflowAgentLabel: metadata.workflowAgentLabel,\n      name: metadata.workflowAgentLabel,\n      tags: ['workflow-subagent', metadata.workflowDefinitionId],\n    });\n  }\n}\n\nfunction cloneAgentMessages(messages: Parameters<SessionStore['saveMessages']>[1]): Parameters<SessionStore['saveMessages']>[1] {\n  return messages.map((message) => structuredClone(message));\n}\n\nfunction resolveAllowedToolNames(\n  requested: string[] | undefined,\n  wantStructured: boolean,\n): string[] {\n  const base = requested && requested.length > 0 ? requested : [...DEFAULT_DELEGATE_TOOLS];\n  const filtered = base\n    .map((s) => String(s).trim())\n    .filter((s) => s.length > 0)\n    .filter((s) => !DELEGATE_BLOCKED_TOOLS.has(s));\n  if (wantStructured && !filtered.includes(STRUCTURED_OUTPUT_TOOL_NAME)) {\n    filtered.push(STRUCTURED_OUTPUT_TOOL_NAME);\n  }\n  return [...new Set(filtered)];\n}\n\nfunction buildPrompt(prompt: string, opts: SubagentRunOptions<unknown>, structured: boolean): string {\n  const parts: string[] = [];\n  if (opts.instructions?.trim()) parts.push(opts.instructions.trim());\n  if (opts.label) parts.push(`Task label: ${opts.label}`);\n  if (opts.phase) parts.push(`Workflow phase: ${opts.phase}`);\n  parts.push(prompt);\n  if (structured) {\n    parts.push(\n      [\n        'Final output contract:',\n        '- Your final action MUST be a structured_output tool call.',\n        '- The structured_output arguments are the return value of this subagent.',\n        '- Do not emit a prose final answer instead of structured_output.',\n        '- If you need to inspect files or run commands first, do so, then call structured_output exactly once.',\n      ].join('\\n'),\n    );\n  }\n  return parts.join('\\n\\n');\n}\n\nfunction safeResolveDefaultModel(get: () => Model<Api>): Model<Api> | null {\n  try {\n    return get();\n  } catch (e) {\n    log.warn({ err: e }, 'failed to resolve default subagent model');\n    return null;\n  }\n}\n\nfunction resolveSubagentStreamMode(\n  _getConfig: () => Config | undefined,\n): 'off' | 'steps' | 'full' {\n  return 'steps';\n}\n\nfunction mapChildProgressEvent(event: {\n  type: 'tool_start' | 'tool_end' | 'iteration' | 'text_delta' | 'thinking_delta';\n  toolCallId?: string;\n  toolName?: string;\n  args?: Record<string, unknown>;\n  isError?: boolean;\n  resultPreview?: string;\n  error?: string;\n  count?: number;\n  max?: number;\n  delta?: string;\n}): SubagentProgressEvent {\n  switch (event.type) {\n    case 'tool_start':\n      return {\n        type: 'tool_start',\n        toolCallId: event.toolCallId ?? '',\n        toolName: event.toolName ?? 'tool',\n        args: event.args ?? {},\n      };\n    case 'tool_end':\n      return {\n        type: 'tool_end',\n        toolCallId: event.toolCallId ?? '',\n        toolName: event.toolName ?? 'tool',\n        isError: Boolean(event.isError),\n        resultPreview: event.resultPreview,\n        error: event.error,\n      };\n    case 'iteration':\n      return {\n        type: 'iteration',\n        count: event.count ?? 0,\n        max: event.max ?? 0,\n      };\n    case 'text_delta':\n      return { type: 'text_delta', delta: event.delta ?? '' };\n    case 'thinking_delta':\n      return { type: 'thinking_delta', delta: event.delta ?? '' };\n    default:\n      return { type: 'text_delta', delta: '' };\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"subagent-runner.js","names":[],"sources":["../../../../src/agent/workflow/subagent-runner.ts"],"sourcesContent":["/**\n * Adapter: spawns one isolated child agent per `agent()` call from a workflow.\n *\n * Wraps the existing `createDelegateChildHandle` so the workflow runtime stays\n * decoupled from the LLM stack (it sees only the `SubagentRunner` interface).\n *\n * Key behaviour:\n * - When `opts.schema` is provided, we inject `structured_output` into the child\n *   tool set and unwrap the captured value on success. If the subagent finishes\n *   without ever calling `structured_output`, we treat it as failure (`null`).\n * - Failures and aborts resolve to `null`. The workflow runtime continues — this\n *   matches the pi-dynamic-workflows contract and keeps fan-out pipelines robust.\n * - We do NOT mutate `createDelegateChildHandle` — we just leverage its\n *   `buildChildTools` injection point.\n */\n\nimport type { AgentTool } from '@earendil-works/pi-agent-core';\nimport type { Api, Model } from '@earendil-works/pi-ai';\n\nimport type { Config } from '../../config/schema.js';\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport type { SessionStore } from '../../session/store.js';\nimport { emitSessionTranscriptUpdate } from '../../session/transcript-events.js';\nimport { createLogger } from '../../utils/logger.js';\n\nimport {\n  type BuildChildToolsOptions,\n  createDelegateChildHandle,\n  type DelegateChildHandleOptions,\n} from '../child-agent-factory.js';\nimport {\n  DEFAULT_DELEGATE_TOOLS,\n  DELEGATE_BLOCKED_TOOLS,\n} from '../tools/delegate-tool.js';\nimport type { ToolExecutorConfig } from '../tools/executor.js';\n\nimport {\n  createStructuredOutputTool,\n  STRUCTURED_OUTPUT_TOOL_NAME,\n  type StructuredOutputCapture,\n} from './structured-output-tool.js';\nimport type { SubagentRunOptions, SubagentRunner, SubagentProgressEvent } from './types.js';\n\nconst log = createLogger('Agent:WorkflowSubagent');\n\nconst DEFAULT_MAX_ITERATIONS = 30;\n\nexport interface DelegateSubagentRunnerDeps {\n  workspace: string;\n  bus: MessageBus;\n  agentId?: string;\n  /** Resolves the default subagent model (typically the parent agent's primary model). */\n  getDefaultModel: () => Model<Api>;\n  getConfig: () => Config | undefined;\n  toolExecutorConfig?: Partial<ToolExecutorConfig>;\n  sessionStore?: SessionStore;\n  /**\n   * Provided by the workflow tool from `AgentToolsFactory` — mirrors how\n   * `delegate-tool` is wired (avoids importing `tools/factory.ts` here and\n   * breaking the existing factory ↔ delegate-tool ↔ child-agent-factory\n   * dependency contract).\n   */\n  buildChildTools: (opts: BuildChildToolsOptions) => AgentTool<any, any>[];\n}\n\nexport class DelegateSubagentRunner implements SubagentRunner {\n  constructor(private readonly deps: DelegateSubagentRunnerDeps) {}\n\n  async run<T = string>(prompt: string, opts: SubagentRunOptions<T>): Promise<T | null> {\n    if (opts.signal?.aborted) return null;\n\n    const capture: StructuredOutputCapture<T> = { called: false, value: undefined };\n    const wantStructured = Boolean(opts.schema);\n\n    const allowed = resolveAllowedToolNames(opts.allowedToolNames, wantStructured);\n    const model = opts.model ?? safeResolveDefaultModel(this.deps.getDefaultModel);\n    if (!model) {\n      log.warn({ label: opts.label }, 'subagent run skipped: no primary model resolved');\n      return null;\n    }\n\n    const fullPrompt = buildPrompt(prompt, opts, wantStructured);\n    const streamMode = resolveSubagentStreamMode(this.deps.getConfig);\n\n    let transcriptPersistQueue: Promise<void> = Promise.resolve();\n    const persistTranscriptSnapshot = opts.sessionKey && this.deps.sessionStore\n      ? (messages: Parameters<SessionStore['saveMessages']>[1]) => {\n          const store = this.deps.sessionStore;\n          const key = opts.sessionKey;\n          if (!store || !key) return;\n          const snapshot = cloneAgentMessages(messages);\n          transcriptPersistQueue = transcriptPersistQueue\n            .then(async () => {\n              await store.saveMessages(key, snapshot);\n              emitSessionTranscriptUpdate({ sessionKey: key });\n            })\n            .catch((err) => {\n              const msg = err instanceof Error ? err.message : String(err);\n              log.warn(\n                { err, sessionKey: key, errorMessage: msg },\n                `Failed to persist workflow subagent transcript snapshot: ${msg}`,\n              );\n            });\n        }\n      : undefined;\n\n    const childOptions: DelegateChildHandleOptions = {\n      workspace: this.deps.workspace,\n      goal: fullPrompt,\n      allowedToolNames: allowed,\n      maxIterations: opts.maxIterations ?? DEFAULT_MAX_ITERATIONS,\n      model,\n      bus: this.deps.bus,\n      agentId: this.deps.agentId,\n      getConfig: this.deps.getConfig,\n      toolExecutorConfig: this.deps.toolExecutorConfig,\n      buildChildTools: (childOpts) => {\n        const base = this.deps.buildChildTools({ ...childOpts, agentId: this.deps.agentId ?? childOpts.agentId });\n        if (!wantStructured || !opts.schema) return base;\n        // Replace any existing tool with the same name so the per-run capture wins.\n        const filtered = base.filter((t) => t.name !== STRUCTURED_OUTPUT_TOOL_NAME);\n        return [\n          ...filtered,\n          createStructuredOutputTool({ schema: opts.schema, capture }) as unknown as AgentTool<any, any>,\n        ];\n      },\n      progressHooks:\n        opts.onProgress && streamMode !== 'off'\n          ? {\n              mode: streamMode === 'full' ? 'full' : 'steps',\n              onProgress: (event) => {\n                opts.onProgress?.(mapChildProgressEvent(event));\n              },\n            }\n          : undefined,\n      onTranscriptSnapshot: persistTranscriptSnapshot,\n    };\n\n    if (opts.sessionKey && opts.sessionMetadata && this.deps.sessionStore) {\n      await this.preparePersistentSubagentSession(opts.sessionKey, opts.sessionMetadata);\n    }\n\n    const handle = createDelegateChildHandle(childOptions);\n    const onAbort = () => handle.abort();\n    opts.signal?.addEventListener('abort', onAbort, { once: true });\n\n    try {\n      const { summary, messages } = await handle.run();\n      await transcriptPersistQueue;\n      if (opts.sessionKey && this.deps.sessionStore) {\n        await this.deps.sessionStore.saveMessages(opts.sessionKey, messages);\n        emitSessionTranscriptUpdate({ sessionKey: opts.sessionKey });\n      }\n      if (opts.signal?.aborted) return null;\n\n      if (wantStructured) {\n        if (!capture.called) {\n          log.warn({ label: opts.label }, 'subagent finished without calling structured_output');\n          return null;\n        }\n        return capture.value as T;\n      }\n      return summary as unknown as T;\n    } catch (e) {\n      if (opts.rethrow) throw e;\n      const msg = e instanceof Error ? e.message : String(e);\n      log.warn({ err: e, label: opts.label, errorMessage: msg }, `subagent run failed: ${msg}`);\n      return null;\n    } finally {\n      opts.signal?.removeEventListener('abort', onAbort);\n    }\n  }\n\n  private async preparePersistentSubagentSession(\n    sessionKey: string,\n    metadata: NonNullable<SubagentRunOptions['sessionMetadata']>,\n  ): Promise<void> {\n    const store = this.deps.sessionStore;\n    if (!store) return;\n    await store.resolveTranscriptPath(sessionKey, {\n      metadata: {\n        sessionType: 'workflow-subagent',\n        hiddenFromSessionList: true,\n        parentSessionKey: metadata.parentSessionKey,\n        workflowRunId: metadata.workflowRunId,\n        workflowDefinitionId: metadata.workflowDefinitionId,\n        workflowAgentId: metadata.workflowAgentId,\n        workflowAgentLabel: metadata.workflowAgentLabel,\n        sourceChannel: 'workflow',\n        sourceChatId: metadata.workflowRunId,\n        routing: {\n          agentId: metadata.workflowAgentId || 'main',\n          source: 'workflow',\n          accountId: 'default',\n          peerKind: 'subagent',\n          peerId: metadata.workflowRunId,\n        },\n      },\n    });\n    await store.updateMetadata(sessionKey, {\n      sessionType: 'workflow-subagent',\n      hiddenFromSessionList: true,\n      parentSessionKey: metadata.parentSessionKey,\n      workflowRunId: metadata.workflowRunId,\n      workflowDefinitionId: metadata.workflowDefinitionId,\n      workflowAgentId: metadata.workflowAgentId,\n      workflowAgentLabel: metadata.workflowAgentLabel,\n      name: metadata.workflowAgentLabel,\n      tags: ['workflow-subagent', metadata.workflowDefinitionId],\n    });\n  }\n}\n\nfunction cloneAgentMessages(messages: Parameters<SessionStore['saveMessages']>[1]): Parameters<SessionStore['saveMessages']>[1] {\n  return messages.map((message) => structuredClone(message));\n}\n\nfunction resolveAllowedToolNames(\n  requested: string[] | undefined,\n  wantStructured: boolean,\n): string[] {\n  const base = requested && requested.length > 0 ? requested : [...DEFAULT_DELEGATE_TOOLS];\n  const filtered = base\n    .map((s) => String(s).trim())\n    .filter((s) => s.length > 0)\n    .filter((s) => !DELEGATE_BLOCKED_TOOLS.has(s));\n  if (wantStructured && !filtered.includes(STRUCTURED_OUTPUT_TOOL_NAME)) {\n    filtered.push(STRUCTURED_OUTPUT_TOOL_NAME);\n  }\n  return [...new Set(filtered)];\n}\n\nfunction buildPrompt(prompt: string, opts: SubagentRunOptions<unknown>, structured: boolean): string {\n  const parts: string[] = [];\n  if (opts.instructions?.trim()) parts.push(opts.instructions.trim());\n  if (opts.label) parts.push(`Task label: ${opts.label}`);\n  if (opts.phase) parts.push(`Workflow phase: ${opts.phase}`);\n  parts.push(prompt);\n  if (structured) {\n    parts.push(\n      [\n        'Final output contract:',\n        '- Your final action MUST be a structured_output tool call.',\n        '- The structured_output arguments are the return value of this subagent.',\n        '- Do not emit a prose final answer instead of structured_output.',\n        '- If you need to inspect files or run commands first, do so, then call structured_output exactly once.',\n      ].join('\\n'),\n    );\n  }\n  return parts.join('\\n\\n');\n}\n\nfunction safeResolveDefaultModel(get: () => Model<Api>): Model<Api> | null {\n  try {\n    return get();\n  } catch (e) {\n    log.warn({ err: e }, 'failed to resolve default subagent model');\n    return null;\n  }\n}\n\nfunction resolveSubagentStreamMode(\n  _getConfig: () => Config | undefined,\n): 'off' | 'steps' | 'full' {\n  return 'steps';\n}\n\nfunction mapChildProgressEvent(event: {\n  type: 'tool_start' | 'tool_end' | 'iteration' | 'text_delta' | 'thinking_delta';\n  toolCallId?: string;\n  toolName?: string;\n  args?: Record<string, unknown>;\n  isError?: boolean;\n  resultPreview?: string;\n  error?: string;\n  count?: number;\n  max?: number;\n  delta?: string;\n}): SubagentProgressEvent {\n  switch (event.type) {\n    case 'tool_start':\n      return {\n        type: 'tool_start',\n        toolCallId: event.toolCallId ?? '',\n        toolName: event.toolName ?? 'tool',\n        args: event.args ?? {},\n      };\n    case 'tool_end':\n      return {\n        type: 'tool_end',\n        toolCallId: event.toolCallId ?? '',\n        toolName: event.toolName ?? 'tool',\n        isError: Boolean(event.isError),\n        resultPreview: event.resultPreview,\n        error: event.error,\n      };\n    case 'iteration':\n      return {\n        type: 'iteration',\n        count: event.count ?? 0,\n        max: event.max ?? 0,\n      };\n    case 'text_delta':\n      return { type: 'text_delta', delta: event.delta ?? '' };\n    case 'thinking_delta':\n      return { type: 'thinking_delta', delta: event.delta ?? '' };\n    default:\n      return { type: 'text_delta', delta: '' };\n  }\n}\n"],"mappings":"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"}

package/dist/src/agent/workflow/workflow-child-tools.js

@@ -1,7 +1,10 @@
+import { resolveDreamingRootForAgent } from "../memory/dreaming/scope.js";
 import { AgentToolsFactory } from "../tools/factory.js";
 //#region src/agent/workflow/workflow-child-tools.ts
 /** Builds the tool set for workflow child agents (wired from gateway to avoid cycles). */
 function buildWorkflowChildTools(childOptions) {
+	const config = childOptions.getConfig();
+	const dreamingRoot = config && childOptions.agentId ? resolveDreamingRootForAgent(config, childOptions.agentId) : void 0;
 	return new AgentToolsFactory({
 		workspace: childOptions.workspace,
 		bus: childOptions.bus,
@@ -12,6 +15,8 @@ function buildWorkflowChildTools(childOptions) {
 	}).createAllTools({
 		workspace: childOptions.workspace,
 		getPrimaryModel: () => childOptions.model,
+		agentId: childOptions.agentId,
+		dreamingRoot,
 		disabledTools: new Set(["extensions"])
 	});
 }

package/dist/src/agent/workflow/workflow-child-tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-child-tools.js","names":[],"sources":["../../../../src/agent/workflow/workflow-child-tools.ts"],"sourcesContent":["import type { AgentTool } from '@earendil-works/pi-agent-core';\n\nimport type { BuildChildToolsOptions } from '../child-agent-factory.js';\nimport { AgentToolsFactory } from '../tools/factory.js';\n\n/** Builds the tool set for workflow child agents (wired from gateway to avoid cycles). */\nexport function buildWorkflowChildTools(childOptions: BuildChildToolsOptions): AgentTool<any, any>[] {\n  const childFactory = new AgentToolsFactory({\n    workspace: childOptions.workspace,\n    bus: childOptions.bus,\n    getCurrentContext: () => null,\n    getConfig: childOptions.getConfig,\n    getPrimaryModel: () => childOptions.model,\n    toolExecutorConfig: childOptions.toolExecutorConfig,\n  });\n  return childFactory.createAllTools({\n    workspace: childOptions.workspace,\n    getPrimaryModel: () => childOptions.model,\n    disabledTools: new Set(['extensions']),\n  });\n}\n"],"mappings":";;;AAMA,SAAgB,wBAAwB,cAA6D;AASnG,QAAO,IARkB,kBAAkB;EACzC,WAAW,aAAa;EACxB,KAAK,aAAa;EAClB,yBAAyB;EACzB,WAAW,aAAa;EACxB,uBAAuB,aAAa;EACpC,oBAAoB,aAAa;EAClC,CACkB,CAAC,eAAe;EACjC,WAAW,aAAa;EACxB,uBAAuB,aAAa;EACpC,eAAe,IAAI,IAAI,CAAC,aAAa,CAAC;EACvC,CAAC"}
+{"version":3,"file":"workflow-child-tools.js","names":[],"sources":["../../../../src/agent/workflow/workflow-child-tools.ts"],"sourcesContent":["import type { AgentTool } from '@earendil-works/pi-agent-core';\n\nimport type { BuildChildToolsOptions } from '../child-agent-factory.js';\nimport { resolveDreamingRootForAgent } from '../memory/dreaming/scope.js';\nimport { AgentToolsFactory } from '../tools/factory.js';\n\n/** Builds the tool set for workflow child agents (wired from gateway to avoid cycles). */\nexport function buildWorkflowChildTools(childOptions: BuildChildToolsOptions): AgentTool<any, any>[] {\n  const config = childOptions.getConfig();\n  const dreamingRoot = config && childOptions.agentId\n    ? resolveDreamingRootForAgent(config, childOptions.agentId)\n    : undefined;\n  const childFactory = new AgentToolsFactory({\n    workspace: childOptions.workspace,\n    bus: childOptions.bus,\n    getCurrentContext: () => null,\n    getConfig: childOptions.getConfig,\n    getPrimaryModel: () => childOptions.model,\n    toolExecutorConfig: childOptions.toolExecutorConfig,\n  });\n  return childFactory.createAllTools({\n    workspace: childOptions.workspace,\n    getPrimaryModel: () => childOptions.model,\n    agentId: childOptions.agentId,\n    dreamingRoot,\n    disabledTools: new Set(['extensions']),\n  });\n}\n"],"mappings":";;;;AAOA,SAAgB,wBAAwB,cAA6D;CACnG,MAAM,SAAS,aAAa,WAAW;CACvC,MAAM,eAAe,UAAU,aAAa,UACxC,4BAA4B,QAAQ,aAAa,QAAQ,GACzD,KAAA;AASJ,QAAO,IARkB,kBAAkB;EACzC,WAAW,aAAa;EACxB,KAAK,aAAa;EAClB,yBAAyB;EACzB,WAAW,aAAa;EACxB,uBAAuB,aAAa;EACpC,oBAAoB,aAAa;EAClC,CACkB,CAAC,eAAe;EACjC,WAAW,aAAa;EACxB,uBAAuB,aAAa;EACpC,SAAS,aAAa;EACtB;EACA,eAAe,IAAI,IAAI,CAAC,aAAa,CAAC;EACvC,CAAC"}

package/dist/src/cli/commands/doctor/checks/database-schema.js

@@ -52,7 +52,7 @@ async function checkDatabaseSchema(ctx) {
 		id: "database-schema",
 		label: "Database schema",
 		status: "pass",
-		message: `SQLite schema v${status.dbVersion} (current release v21).`,
+		message: `SQLite schema v${status.dbVersion} (current release v23).`,
 		hints: []
 	};
 }

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

@@ -1,3 +1,4 @@
 import type { Config } from '../config/schema.js';
-import type { ConnectorHealthResult } from './types.js';
+import type { ConnectorDefinition, ConnectorHealthResult, ConnectorInstallInput } from './types.js';
 export declare function testConnectorInstance(config: Config, serverId: string): Promise<ConnectorHealthResult>;
+export declare function previewConnectorDefinition(config: Config, definition: ConnectorDefinition, input?: ConnectorInstallInput): Promise<ConnectorHealthResult>;

package/dist/src/connectors/health.js

@@ -1,5 +1,6 @@
 import { listBundleMcpServerCapabilitiesForGateway } from "../agent/mcp/bundle-mcp-materialize.js";
 import { getWorkspacePath } from "../config/workspace-path-helpers.js";
+import { materializeConnectorMcpServer } from "./materialize.js";
 import { getConnectorInstance } from "./instances.js";
 //#region src/connectors/health.ts
 function classifyConnectorHealthError(error) {
@@ -79,7 +80,64 @@ async function testConnectorInstance(config, serverId) {
 		};
 	}
 }
+async function previewConnectorDefinition(config, definition, input = {}) {
+	if (definition.runtime.type !== "mcp") return {
+		serverId: definition.id,
+		ok: false,
+		status: "unknown_error",
+		toolCount: 0,
+		resourceCount: 0,
+		promptCount: 0,
+		tools: [],
+		resources: [],
+		prompts: [],
+		error: `Connector type "${definition.runtime.type}" does not support MCP capability preview.`
+	};
+	try {
+		const { serverId, server } = materializeConnectorMcpServer(definition, input);
+		const capabilities = await listBundleMcpServerCapabilitiesForGateway({
+			workspaceDir: getWorkspacePath(config) || "./workspace",
+			cfg: {
+				...config,
+				mcp: {
+					...config.mcp ?? {},
+					servers: {
+						...config.mcp?.servers ?? {},
+						[serverId]: server
+					}
+				}
+			},
+			serverId
+		});
+		return {
+			serverId,
+			ok: true,
+			status: "ok",
+			toolCount: capabilities.toolCount,
+			resourceCount: capabilities.resourceCount,
+			promptCount: capabilities.promptCount,
+			tools: capabilities.tools,
+			resources: capabilities.resources,
+			prompts: capabilities.prompts
+		};
+	} catch (error) {
+		const status = classifyConnectorHealthError(error);
+		return {
+			serverId: definition.id,
+			ok: false,
+			status,
+			toolCount: 0,
+			resourceCount: 0,
+			promptCount: 0,
+			tools: [],
+			resources: [],
+			prompts: [],
+			error: error instanceof Error ? error.message : String(error),
+			action: healthActionForStatus(status)
+		};
+	}
+}
 //#endregion
-export { testConnectorInstance };
+export { previewConnectorDefinition, testConnectorInstance };
 
 //# sourceMappingURL=health.js.map

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 (/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"}
+{"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 { materializeConnectorMcpServer } from './materialize.js';\nimport type { ConnectorDefinition, ConnectorHealthResult, ConnectorHealthStatus, ConnectorInstallInput } 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\nexport async function previewConnectorDefinition(\n  config: Config,\n  definition: ConnectorDefinition,\n  input: ConnectorInstallInput = {},\n): Promise<ConnectorHealthResult> {\n  if (definition.runtime.type !== 'mcp') {\n    return {\n      serverId: definition.id,\n      ok: false,\n      status: 'unknown_error',\n      toolCount: 0,\n      resourceCount: 0,\n      promptCount: 0,\n      tools: [],\n      resources: [],\n      prompts: [],\n      error: `Connector type \"${definition.runtime.type}\" does not support MCP capability preview.`,\n    };\n  }\n\n  try {\n    const { serverId, server } = materializeConnectorMcpServer(definition, input);\n    const workspaceDir = getWorkspacePath(config) || './workspace';\n    const previewConfig: Config = {\n      ...config,\n      mcp: {\n        ...(config.mcp ?? {}),\n        servers: {\n          ...(config.mcp?.servers ?? {}),\n          [serverId]: server,\n        },\n      },\n    };\n    const capabilities = await listBundleMcpServerCapabilitiesForGateway({\n      workspaceDir,\n      cfg: previewConfig,\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: definition.id,\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":"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"}

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":";;;;;;;;;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,sBACd,QACA,YACA,OACmB;CACnB,MAAM,iBAAiB,OAAO,KAAK,UAAU;AAC7C,KAAI,CAAC,kBAAkB,CAAC,yBAAyB,eAAe,CAC9D,OAAM,IAAI,MAAM,eAAe,WAAW,iCAAiC;CAE7E,MAAM,aAAa,uBAAuB,eAAe,cAAc,YAAY;AACnF,KAAI,CAAC,WACH,OAAM,IAAI,MAAM,sBAAsB,eAAe,cAAc,cAAc;AAEnF,KAAI,WAAW,QAAQ,SAAS,MAC9B,OAAM,IAAI,MAAM,mBAAmB,WAAW,QAAQ,KAAK,oCAAoC;AAEjG,MAAK,WAAW,MAAM,WAAW,EAAE,EAAE,SAAS,EAC5C,OAAM,IAAI,MAAM,uEAAuE;CAGzF,MAAM,EAAE,UAAU,WAAW,8BAA8B,YAAY,MAAM;AAC7E,KAAI,aAAa,WACf,OAAM,IAAI,MAAM,yDAAyD,WAAW,QAAQ,SAAS,IAAI;AAG3G,QAAO,MAAM,OAAO,OAAO,EAAE;AAC7B,QAAO,IAAI,UAAU;EACnB,GAAI,OAAO,IAAI,WAAW,EAAE;GAC3B,WAAW;GACV,GAAG;GACH,eAAe;IACb,GAAG,eAAe;IAClB,GAAI,OAAO;IACX,SAAS,eAAe,cAAc;IACtC,iBAAiB,eAAe,cAAc;IAC9C,WAAW,eAAe,cAAc;IACzC;GACF;EACF;CAED,MAAM,WAAW,uBAAuB,OAAO,CAAC,MAAM,cAAc,UAAU,eAAe,SAAS;AACtG,KAAI,CAAC,SACH,OAAM,IAAI,MAAM,cAAc,WAAW,GAAG,0CAA0C;AAExF,QAAO;;AAGT,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

@@ -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":";;;aAAsD;AAItD,MAAM,oBAAoB;AAC1B,MAAM,mBAAmB;AAEzB,SAAgB,6BAA6B,UAAwB;AACnE,KAAI,CAAC,kBAAkB,KAAK,SAAS,CACnC,OAAM,IAAI,MAAM,iIAAiI;;AAIrJ,SAAS,eACP,YACA,OACA,OACA,KACS;AACT,KAAI,UAAU,UACZ,QAAO,+BAA+B,WAAW,IAAI,IAAI;AAE3D,QAAO,MAAM,SAAS;;AAGxB,SAAS,qBAAqB,OAAgB,YAAiC,OAAuC;AACpH,KAAI,OAAO,UAAU,SACnB,QAAO;CAET,MAAM,QAAQ,iBAAiB,KAAK,MAAM,MAAM,CAAC;AACjD,KAAI,CAAC,MACH,QAAO;AAET,QAAO,eAAe,YAAY,OAAO,MAAM,IAA4B,MAAM,GAAG;;AAGtF,SAAS,oBAAoB,OAAgB,YAAiC,OAAuC;CACnH,MAAM,WAAW,qBAAqB,OAAO,YAAY,MAAM;AAC/D,KAAI,MAAM,QAAQ,SAAS,CACzB,QAAO,SAAS,KAAK,SAAS,oBAAoB,MAAM,YAAY,MAAM,CAAC;AAE7E,KAAI,YAAY,OAAO,aAAa,UAAU;EAC5C,MAAM,SAAkC,EAAE;AAC1C,OAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,SAAoC,EAAE;GAC9E,MAAM,oBAAoB,oBAAoB,OAAO,YAAY,MAAM;AACvE,OAAI,sBAAsB,KAAA,EACxB,QAAO,OAAO;;AAGlB,SAAO;;AAET,QAAO;;AAGT,SAAS,qBAAqB,YAAiC,OAAoC;AACjG,MAAK,MAAM,UAAU,WAAW,MAAM,WAAW,EAAE,EAAE;EACnD,MAAM,QAAQ,MAAM,UAAU,OAAO;AACrC,MAAI,OAAO,aAAa,OAAO,UAAU,YAAY,MAAM,MAAM,CAAC,WAAW,GAC3E,OAAM,IAAI,MAAM,4BAA4B,OAAO,MAAM;;AAG7D,MAAK,MAAM,SAAS,WAAW,MAAM,UAAU,EAAE,EAAE;EACjD,MAAM,QAAQ,MAAM,SAAS,MAAM;AACnC,MAAI,MAAM,aAAa,UAAU,KAAA,KAAa,UAAU,QAAQ,UAAU,IACxE,OAAM,IAAI,MAAM,4BAA4B,MAAM,MAAM;;;AAK9D,SAAgB,8BACd,YACA,OACuD;AACvD,sBAAqB,YAAY,MAAM;AACvC,KAAI,WAAW,QAAQ,SAAS,MAC9B,OAAM,IAAI,MAAM,kCAAkC,WAAW,QAAQ,OAAO;CAG9E,MAAM,cAAc,oBAAoB,WAAW,QAAQ,UAAU,YAAY,MAAM;AACvF,KAAI,OAAO,gBAAgB,SACzB,OAAM,IAAI,MAAM,0CAA0C;CAE5D,MAAM,WAAW,YAAY,MAAM;AACnC,8BAA6B,SAAS;CAEtC,MAAM,YAAY,oBAAoB,WAAW,QAAQ,gBAAgB,YAAY,MAAM;AAC3F,KAAI,CAAC,aAAa,OAAO,cAAc,YAAY,MAAM,QAAQ,UAAU,CACzE,OAAM,IAAI,MAAM,+DAA+D;CAGjF,MAAM,SAAiC;EACrC,SAAS;EACT,aAAa,WAAW;EACxB,SAAS,WAAW;EACpB,aAAa,WAAW;EACzB;CACD,MAAM,SAAS;EACb,GAAI;EACJ,eAAe;EAChB;CACD,MAAM,SAAS,gBAAgB,UAAU,OAAO;AAChD,KAAI,CAAC,OAAO,QACV,OAAM,IAAI,MAAM,OAAO,MAAM,OAAO,IAAI,WAAW,6BAA6B;AAElF,QAAO;EAAE;EAAU;EAAQ;;AAG7B,SAAgB,yBAAyB,QAAgG;AACvI,KAAI,CAAC,UAAU,OAAO,WAAW,YAAY,MAAM,QAAQ,OAAO,CAChE,QAAO;CAET,MAAM,SAAU,OAAmC;AACnD,QAAO,QACL,UACE,OAAO,WAAW,YAClB,CAAC,MAAM,QAAQ,OAAO,IACrB,OAAmC,YAAY,QAChD,OAAQ,OAAmC,gBAAgB,SAC9D"}
+{"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":";;;aAAsD;AAItD,MAAM,oBAAoB;AAC1B,MAAM,mBAAmB;AAEzB,SAAgB,6BAA6B,UAAwB;AACnE,KAAI,CAAC,kBAAkB,KAAK,SAAS,CACnC,OAAM,IAAI,MAAM,iIAAiI;;AAIrJ,SAAS,eACP,YACA,OACA,OACA,KACS;AACT,KAAI,UAAU,UACZ,QAAO,+BAA+B,WAAW,IAAI,IAAI;AAE3D,QAAO,MAAM,SAAS;;AAGxB,SAAS,qBAAqB,OAAgB,YAAiC,OAAuC;AACpH,KAAI,OAAO,UAAU,SACnB,QAAO;CAET,MAAM,QAAQ,iBAAiB,KAAK,MAAM,MAAM,CAAC;AACjD,KAAI,CAAC,MACH,QAAO;AAET,QAAO,eAAe,YAAY,OAAO,MAAM,IAA4B,MAAM,GAAG;;AAGtF,SAAS,oBAAoB,OAAgB,YAAiC,OAAuC;CACnH,MAAM,WAAW,qBAAqB,OAAO,YAAY,MAAM;AAC/D,KAAI,MAAM,QAAQ,SAAS,CACzB,QAAO,SAAS,KAAK,SAAS,oBAAoB,MAAM,YAAY,MAAM,CAAC;AAE7E,KAAI,YAAY,OAAO,aAAa,UAAU;EAC5C,MAAM,SAAkC,EAAE;AAC1C,OAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,SAAoC,EAAE;GAC9E,MAAM,oBAAoB,oBAAoB,OAAO,YAAY,MAAM;AACvE,OAAI,sBAAsB,KAAA,EACxB,QAAO,OAAO;;AAGlB,SAAO;;AAET,QAAO;;AAGT,SAAS,qBAAqB,YAAiC,OAAoC;AACjG,MAAK,MAAM,UAAU,WAAW,MAAM,WAAW,EAAE,EAAE;EACnD,MAAM,QAAQ,MAAM,UAAU,OAAO;AACrC,MAAI,OAAO,aAAa,OAAO,UAAU,YAAY,MAAM,MAAM,CAAC,WAAW,GAC3E,OAAM,IAAI,MAAM,4BAA4B,OAAO,MAAM;;AAG7D,MAAK,MAAM,SAAS,WAAW,MAAM,UAAU,EAAE,EAAE;EACjD,MAAM,QAAQ,MAAM,SAAS,MAAM;AACnC,MAAI,MAAM,aAAa,UAAU,KAAA,KAAa,UAAU,QAAQ,UAAU,IACxE,OAAM,IAAI,MAAM,4BAA4B,MAAM,MAAM;;;AAK9D,SAAgB,8BACd,YACA,OACuD;AACvD,sBAAqB,YAAY,MAAM;AACvC,KAAI,WAAW,QAAQ,SAAS,MAC9B,OAAM,IAAI,MAAM,kCAAkC,WAAW,QAAQ,OAAO;CAG9E,MAAM,cAAc,oBAAoB,WAAW,QAAQ,UAAU,YAAY,MAAM;AACvF,KAAI,OAAO,gBAAgB,SACzB,OAAM,IAAI,MAAM,0CAA0C;CAE5D,MAAM,WAAW,YAAY,MAAM;AACnC,8BAA6B,SAAS;CAEtC,MAAM,YAAY,oBAAoB,WAAW,QAAQ,gBAAgB,YAAY,MAAM;AAC3F,KAAI,CAAC,aAAa,OAAO,cAAc,YAAY,MAAM,QAAQ,UAAU,CACzE,OAAM,IAAI,MAAM,+DAA+D;CAGjF,MAAM,SAAiC;EACrC,SAAS;EACT,aAAa,WAAW;EACxB,SAAS,WAAW;EACpB,aAAa,WAAW;EACxB,GAAI,MAAM,UAAU,OAAO,KAAK,MAAM,OAAO,CAAC,SAAS,IAAI,EAAE,QAAQ,MAAM,QAAQ,GAAG,EAAE;EACzF;CACD,MAAM,SAAS;EACb,GAAI;EACJ,eAAe;EAChB;CACD,MAAM,SAAS,gBAAgB,UAAU,OAAO;AAChD,KAAI,CAAC,OAAO,QACV,OAAM,IAAI,MAAM,OAAO,MAAM,OAAO,IAAI,WAAW,6BAA6B;AAElF,QAAO;EAAE;EAAU;EAAQ;;AAG7B,SAAgB,yBAAyB,QAAgG;AACvI,KAAI,CAAC,UAAU,OAAO,WAAW,YAAY,MAAM,QAAQ,OAAO,CAChE,QAAO;CAET,MAAM,SAAU,OAAmC;AACnD,QAAO,QACL,UACE,OAAO,WAAW,YAClB,CAAC,MAAM,QAAQ,OAAO,IACrB,OAAmC,YAAY,QAChD,OAAQ,OAAmC,gBAAgB,SAC9D"}

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;