@strav/brain 1.0.0-alpha.11 → 1.0.0-alpha.13

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@strav/brain",
-  "version": "1.0.0-alpha.11",
+  "version": "1.0.0-alpha.13",
   "description": "Strav AI module — unified Provider interface, BrainManager, threads, prompt caching, tools / agents / MCP. Anthropic + OpenAI providers; Gemini / DeepSeek follow.",
   "type": "module",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
   "exports": {
-    ".": "./src/index.ts"
+    ".": "./src/index.ts",
+    "./mcp": "./src/mcp/index.ts"
   },
   "files": [
     "src",
@@ -19,8 +20,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@strav/kernel": "1.0.0-alpha.11",
     "@anthropic-ai/sdk": "^0.100.0",
+    "@google/genai": "^2.7.0",
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@strav/kernel": "1.0.0-alpha.13",
     "openai": "^6.0.0"
   },
   "peerDependencies": {

package/src/brain_config.ts

@@ -49,7 +49,25 @@ export interface OpenAIProviderConfig {
   defaultMaxTokens?: number
 }
 
-export type ProviderConfig = AnthropicProviderConfig | OpenAIProviderConfig // | GoogleProviderConfig | DeepSeekProviderConfig (later slices)
+/** Google (Gemini) driver config — backed by `@google/genai`. */
+export interface GeminiProviderConfig {
+  driver: 'google'
+  /** API key. Required. Most apps source from `env('GOOGLE_API_KEY')` or `env('GEMINI_API_KEY')`. */
+  apiKey: string
+  /** Optional override of the SDK's base URL — useful for proxies or test doubles. */
+  baseUrl?: string
+  /** Default model when neither `options.model` nor `options.tier` is passed. Defaults to `gemini-2.5-flash`. */
+  defaultModel?: string
+  /** Default `max_tokens` for `chat()` calls that don't specify one. */
+  defaultMaxTokens?: number
+  /** Optional API version pin (`v1` / `v1beta`). */
+  apiVersion?: string
+}
+
+export type ProviderConfig =
+  | AnthropicProviderConfig
+  | OpenAIProviderConfig
+  | GeminiProviderConfig // | DeepSeekProviderConfig (later slice)
 
 /** Cache-shape defaults applied when `ChatOptions.cache` is omitted. */
 export interface BrainCacheConfig {

package/src/brain_provider.ts

@@ -28,6 +28,7 @@ import { type Application, ConfigError, ConfigRepository, ServiceProvider } from
 import { BrainManager } from './brain_manager.ts'
 import type { BrainConfigShape, ProviderConfig } from './brain_config.ts'
 import { AnthropicProvider } from './providers/anthropic_provider.ts'
+import { GeminiProvider } from './providers/gemini_provider.ts'
 import { OpenAIProvider } from './providers/openai_provider.ts'
 import type { Provider } from './provider.ts'
 
@@ -101,10 +102,17 @@ function buildProvider(name: string, config: ProviderConfig): Provider {
         )
       }
       return new OpenAIProvider(name, config)
+    case 'google':
+      if (!config.apiKey) {
+        throw new ConfigError(
+          `BrainProvider: google provider "${name}" is missing apiKey. Source from env('GOOGLE_API_KEY').`,
+        )
+      }
+      return new GeminiProvider(name, config)
     default: {
       const exhaustiveCheck: never = config
       throw new ConfigError(
-        `BrainProvider: unknown driver for provider "${name}". Known drivers: anthropic, openai.`,
+        `BrainProvider: unknown driver for provider "${name}". Known drivers: anthropic, openai, google.`,
       )
       // (unreachable — kept for the exhaustive check to fire when a new driver lands)
       // biome-ignore lint/correctness/noUnreachable: kept for the exhaustive-check above

package/src/index.ts

@@ -16,6 +16,7 @@ export {
   type BrainConfigShape,
   DEFAULT_MODEL,
   DEFAULT_TIERS,
+  type GeminiProviderConfig,
   type OpenAIProviderConfig,
   type ProviderConfig,
 } from './brain_config.ts'
@@ -29,6 +30,7 @@ export { BrainProvider } from './brain_provider.ts'
 export { defineTool, type DefineToolSpec } from './define_tool.ts'
 export type { MCPServer, MCPServerToolConfig } from './mcp_server.ts'
 export { AnthropicProvider } from './providers/anthropic_provider.ts'
+export { GeminiProvider } from './providers/gemini_provider.ts'
 export { OpenAIProvider } from './providers/openai_provider.ts'
 export type { Provider, RunWithToolsOptions } from './provider.ts'
 export { Thread, type ThreadOptions, type ThreadState } from './thread.ts'

package/src/mcp/client.ts

@@ -0,0 +1,157 @@
+/**
+ * `MCPClient` — local MCP client for providers that lack server-side
+ * MCP support (OpenAI, Gemini, DeepSeek, …).
+ *
+ * Wraps the official `@modelcontextprotocol/sdk` client. Connects to a
+ * single MCP server over Streamable HTTP, lists its tools, and invokes
+ * them. The agentic loop sees these as ordinary `Tool`s — translation
+ * happens in `resolveMcpTools`.
+ *
+ * Lifecycle:
+ *
+ *   const client = new MCPClient(serverConfig)
+ *   await client.connect()
+ *   const tools = await client.listTools()
+ *   const result = await client.callTool('name', {...})
+ *   await client.close()
+ *
+ * Authentication:
+ *   `MCPServer.authorizationToken` is forwarded as
+ *   `Authorization: Bearer <token>`. OAuth-flow servers need
+ *   out-of-band token exchange — same constraint as the server-side
+ *   path. Full OAuth handshake is a later slice.
+ *
+ * Transport:
+ *   V1 only does Streamable HTTP — the current MCP transport. Legacy
+ *   SSE-only endpoints aren't supported; if a server URL ends with
+ *   `/sse` and only speaks the legacy protocol, the connection will
+ *   fail and apps should run against a Streamable-HTTP endpoint
+ *   instead.
+ */
+
+import { Client } from '@modelcontextprotocol/sdk/client/index.js'
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
+import { BrainError } from '../brain_error.ts'
+import type { MCPServer } from '../mcp_server.ts'
+
+/** Result of a single MCP tool invocation, as returned by `tools/call`. */
+export interface MCPCallToolResult {
+  /** Stringified content — text blocks concatenated; image / resource blocks JSON-serialized. */
+  content: string
+  /** `true` when the MCP server reports the tool execution failed. */
+  isError: boolean
+}
+
+/** Tool descriptor surfaced by `tools/list`. */
+export interface MCPToolDescriptor {
+  name: string
+  description: string
+  inputSchema: Record<string, unknown>
+}
+
+export interface MCPClientOptions {
+  /** Override the transport used to dial the server. Tests inject a mock here. */
+  client?: Client
+}
+
+export class MCPClient {
+  readonly server: MCPServer
+  private readonly _client: Client
+  private _connected = false
+
+  constructor(server: MCPServer, options: MCPClientOptions = {}) {
+    this.server = server
+    this._client =
+      options.client ??
+      new Client(
+        { name: `@strav/brain:${server.name}`, version: '1.0.0' },
+        { capabilities: {} },
+      )
+  }
+
+  async connect(): Promise<void> {
+    if (this._connected) return
+    const transport = this._buildTransport()
+    try {
+      await this._client.connect(transport)
+      this._connected = true
+    } catch (cause) {
+      throw new BrainError(
+        `MCPClient(${this.server.name}): failed to connect to ${this.server.url}.`,
+        { context: { server: this.server.name, url: this.server.url }, cause },
+      )
+    }
+  }
+
+  async listTools(): Promise<MCPToolDescriptor[]> {
+    await this.connect()
+    let response: Awaited<ReturnType<Client['listTools']>>
+    try {
+      response = await this._client.listTools()
+    } catch (cause) {
+      throw new BrainError(
+        `MCPClient(${this.server.name}): tools/list failed.`,
+        { context: { server: this.server.name }, cause },
+      )
+    }
+    return response.tools.map((t) => ({
+      name: t.name,
+      description: t.description ?? '',
+      inputSchema: (t.inputSchema ?? { type: 'object' }) as Record<string, unknown>,
+    }))
+  }
+
+  async callTool(name: string, input: unknown): Promise<MCPCallToolResult> {
+    await this.connect()
+    let response: Awaited<ReturnType<Client['callTool']>>
+    try {
+      response = await this._client.callTool({
+        name,
+        arguments: (input ?? {}) as Record<string, unknown>,
+      })
+    } catch (cause) {
+      throw new BrainError(
+        `MCPClient(${this.server.name}): tools/call ${name} failed.`,
+        { context: { server: this.server.name, tool: name }, cause },
+      )
+    }
+    return {
+      content: flattenContent(response.content),
+      isError: Boolean(response.isError),
+    }
+  }
+
+  async close(): Promise<void> {
+    if (!this._connected) return
+    try {
+      await this._client.close()
+    } finally {
+      this._connected = false
+    }
+  }
+
+  private _buildTransport(): StreamableHTTPClientTransport {
+    const headers: Record<string, string> = {}
+    if (this.server.authorizationToken !== undefined) {
+      headers.Authorization = `Bearer ${this.server.authorizationToken}`
+    }
+    return new StreamableHTTPClientTransport(new URL(this.server.url), {
+      requestInit: { headers },
+    })
+  }
+}
+
+function flattenContent(
+  content: Awaited<ReturnType<Client['callTool']>>['content'],
+): string {
+  if (!Array.isArray(content)) return ''
+  const parts: string[] = []
+  for (const block of content) {
+    if (block.type === 'text') {
+      parts.push(block.text)
+    } else {
+      parts.push(JSON.stringify(block))
+    }
+  }
+  return parts.join('')
+}

package/src/mcp/index.ts

@@ -0,0 +1,16 @@
+// Public API of `@strav/brain/mcp` — local MCP client for providers
+// without server-side MCP support (OpenAI, Gemini, DeepSeek). The
+// Anthropic provider continues to use server-side MCP via the
+// top-level `MCPServer` config; nothing here is needed for that path.
+
+export {
+  MCPClient,
+  type MCPCallToolResult,
+  type MCPClientOptions,
+  type MCPToolDescriptor,
+} from './client.ts'
+export {
+  resolveMcpTools,
+  type ResolveMcpToolsOptions,
+  type ResolvedMcpTools,
+} from './resolve_mcp_tools.ts'

package/src/mcp/resolve_mcp_tools.ts

@@ -0,0 +1,86 @@
+/**
+ * `resolveMcpTools` — connects to each `MCPServer`, discovers its
+ * tools, and surfaces them as framework `Tool`s the standard agentic
+ * loop already knows how to invoke.
+ *
+ * Honors the per-server config in `MCPServer.tools`:
+ *   - `enabled: false` → server is skipped entirely.
+ *   - `allowedTools` → only those tool names are exposed.
+ *
+ * Naming: discovered tools are namespaced as `<server>__<tool>` to
+ * keep names unique when multiple servers expose overlapping names.
+ * The `Tool.execute` then routes back to the correct server. The
+ * underscore separator (not `.` or `/`) is chosen because OpenAI's
+ * tool-name regex rejects `.` and `/`.
+ *
+ * Lifecycle: this helper returns `{ tools, close }`. `close` runs all
+ * client `close()` calls in parallel — providers must call it in a
+ * `finally` to avoid leaking transports.
+ */
+
+import type { MCPServer } from '../mcp_server.ts'
+import type { Tool, ToolContext } from '../tool.ts'
+import { MCPClient } from './client.ts'
+
+export interface ResolvedMcpTools {
+  tools: Tool[]
+  close(): Promise<void>
+}
+
+export interface ResolveMcpToolsOptions {
+  /** Override the client factory — tests inject mock clients per server here. */
+  clientFactory?(server: MCPServer): MCPClient
+}
+
+const NAME_SEPARATOR = '__'
+
+export async function resolveMcpTools(
+  servers: readonly MCPServer[],
+  options: ResolveMcpToolsOptions = {},
+): Promise<ResolvedMcpTools> {
+  const clients: MCPClient[] = []
+  const tools: Tool[] = []
+
+  for (const server of servers) {
+    if (server.tools?.enabled === false) continue
+    const client = options.clientFactory
+      ? options.clientFactory(server)
+      : new MCPClient(server)
+    clients.push(client)
+
+    const allowed = server.tools?.allowedTools
+    const allowedSet = allowed ? new Set(allowed) : null
+
+    const descriptors = await client.listTools()
+    for (const descriptor of descriptors) {
+      if (allowedSet && !allowedSet.has(descriptor.name)) continue
+      tools.push(buildTool(server.name, client, descriptor))
+    }
+  }
+
+  return {
+    tools,
+    close: async () => {
+      await Promise.all(clients.map((c) => c.close()))
+    },
+  }
+}
+
+function buildTool(
+  serverName: string,
+  client: MCPClient,
+  descriptor: { name: string; description: string; inputSchema: Record<string, unknown> },
+): Tool {
+  return {
+    name: `${serverName}${NAME_SEPARATOR}${descriptor.name}`,
+    description: descriptor.description,
+    inputSchema: descriptor.inputSchema,
+    async execute(input: unknown, _ctx: ToolContext): Promise<string> {
+      const result = await client.callTool(descriptor.name, input)
+      if (result.isError) {
+        return `MCP tool error: ${result.content}`
+      }
+      return result.content
+    },
+  }
+}

package/src/providers/gemini_provider.ts

@@ -0,0 +1,445 @@
+/**
+ * `GeminiProvider` — implementation of `Provider` backed by the
+ * official `@google/genai` SDK (Gemini Developer API / Vertex AI).
+ *
+ * Maps framework shapes to Gemini's wire format:
+ *
+ *   - `system` → `config.systemInstruction` (string-joined when
+ *     multi-block). Cache flags on the system prompt are ignored —
+ *     Gemini's prompt caching uses an explicit Caches API rather
+ *     than per-block flags, so `cache: true` becomes a no-op
+ *     consistent with the OpenAI provider.
+ *
+ *   - `Message[]` → `Content[]`. Framework `role: 'user' | 'assistant'`
+ *     maps to Gemini's `role: 'user' | 'model'`. String content
+ *     becomes a single `{text}` part; `ContentBlock[]` content fans
+ *     out:
+ *       - `TextBlock`         → `{text}`
+ *       - `ToolUseBlock`      → `{functionCall: {id, name, args}}`
+ *       - `ToolResultBlock`   → `{functionResponse: {id, name,
+ *                                  response: {result | error}}}`
+ *       - `MCP*` blocks       → silently dropped (Anthropic-only).
+ *
+ *   - `Tool[]` → `[{functionDeclarations: [{name, description,
+ *     parametersJsonSchema: inputSchema}]}]`. We use
+ *     `parametersJsonSchema` (not `parameters`) so JSON-Schema-shaped
+ *     tool inputs pass through verbatim without translation to
+ *     Gemini's `Schema` form.
+ *
+ *   - `MCPServer[]` → resolved via the local MCP client
+ *     (`@strav/brain/mcp`). Discovered tools are namespaced
+ *     `<server>__<tool>` and merged with caller-supplied tools.
+ *     Transports are closed in a `finally` once the loop exits.
+ *     Gemini has no first-party server-side MCP equivalent to
+ *     Anthropic's connector.
+ *
+ *   - `thinking: 'adaptive'` → `thinkingConfig: { thinkingBudget: -1 }`
+ *     (auto). `'disabled'` → `thinkingConfig: { thinkingBudget: 0 }`.
+ *     Explicit `effort` (`low`/`medium`/`high`/`xhigh`/`max`) maps to
+ *     `thinkingConfig.thinkingLevel`. Non-thinking models ignore the
+ *     field upstream — we always emit, the SDK rejects only for
+ *     models that don't support it.
+ *
+ *   - `cache: true` → no-op. Gemini's prompt cache lives behind the
+ *     `Caches` API; same accepted-silently behavior as OpenAI.
+ *
+ *   - `countTokens` IS implemented — `ai.models.countTokens` exists
+ *     and is cheap. Returns `totalTokens`.
+ */
+
+import { GoogleGenAI, ThinkingLevel } from '@google/genai'
+import type {
+  Content,
+  FunctionDeclaration,
+  GenerateContentConfig,
+  GenerateContentParameters,
+  GenerateContentResponse,
+  Part,
+} from '@google/genai'
+import type { AgentResult } from '../agent_result.ts'
+import { BrainError } from '../brain_error.ts'
+import type { GeminiProviderConfig } from '../brain_config.ts'
+import type { MCPServer } from '../mcp_server.ts'
+import { resolveMcpTools, type ResolveMcpToolsOptions } from '../mcp/resolve_mcp_tools.ts'
+import type { Provider, RunWithToolsOptions } from '../provider.ts'
+import type { Tool } from '../tool.ts'
+import { ToolExecutionError } from '../tool_execution_error.ts'
+import type {
+  ChatOptions,
+  ChatResult,
+  ChatUsage,
+  ContentBlock,
+  Message,
+  StreamEvent,
+  SystemPrompt,
+  TextBlock,
+  ToolResultBlock,
+  ToolUseBlock,
+} from '../types.ts'
+
+const DEFAULT_GEMINI_MODEL = 'gemini-2.5-flash'
+
+/**
+ * The slice of `GoogleGenAI` the provider exercises. Narrowed so
+ * tests can inject a stub without satisfying the full SDK surface.
+ */
+export interface GeminiModelsClient {
+  generateContent(params: GenerateContentParameters): Promise<GenerateContentResponse>
+  generateContentStream(
+    params: GenerateContentParameters,
+  ): Promise<AsyncIterable<GenerateContentResponse>>
+  countTokens(params: { model: string; contents: Content[] }): Promise<{ totalTokens?: number }>
+}
+
+export interface GeminiProviderOptions {
+  client?: { models: GeminiModelsClient }
+  /** Internal seam — tests inject a stub MCP client factory. */
+  mcpClientFactory?: ResolveMcpToolsOptions['clientFactory']
+}
+
+export class GeminiProvider implements Provider {
+  readonly name: string
+  private readonly models: GeminiModelsClient
+  private readonly defaultModel: string
+  private readonly defaultMaxTokens: number
+  private readonly mcpClientFactory?: ResolveMcpToolsOptions['clientFactory']
+
+  constructor(name: string, config: GeminiProviderConfig, options: GeminiProviderOptions = {}) {
+    this.name = name
+    this.defaultModel = config.defaultModel ?? DEFAULT_GEMINI_MODEL
+    this.defaultMaxTokens = config.defaultMaxTokens ?? 4096
+    this.mcpClientFactory = options.mcpClientFactory
+    if (options.client) {
+      this.models = options.client.models
+    } else {
+      const httpOpts =
+        config.baseUrl !== undefined || config.apiVersion !== undefined
+          ? {
+              ...(config.baseUrl !== undefined ? { baseUrl: config.baseUrl } : {}),
+              ...(config.apiVersion !== undefined ? { apiVersion: config.apiVersion } : {}),
+            }
+          : undefined
+      const sdk = new GoogleGenAI({
+        apiKey: config.apiKey,
+        ...(httpOpts ? { httpOptions: httpOpts } : {}),
+      })
+      this.models = sdk.models as unknown as GeminiModelsClient
+    }
+  }
+
+  async chat(messages: readonly Message[], options: ChatOptions = {}): Promise<ChatResult> {
+    const params = this.buildParams(messages, options, [])
+    const response = await this.models.generateContent(params)
+    return this.toChatResult(response, params.model)
+  }
+
+  async *stream(
+    messages: readonly Message[],
+    options: ChatOptions = {},
+  ): AsyncIterable<StreamEvent> {
+    const params = this.buildParams(messages, options, [])
+    const stream = await this.models.generateContentStream(params)
+    let finishReason: string | null = null
+    let lastUsage: ChatUsage | undefined
+    for await (const chunk of stream) {
+      const candidate = chunk.candidates?.[0]
+      const text = candidateText(candidate)
+      if (text.length > 0) yield { type: 'text', delta: text }
+      if (candidate?.finishReason) finishReason = String(candidate.finishReason)
+      if (chunk.usageMetadata) lastUsage = toUsage(chunk.usageMetadata)
+    }
+    yield {
+      type: 'stop',
+      stopReason: finishReason,
+      usage: lastUsage ?? {
+        inputTokens: 0,
+        outputTokens: 0,
+        cacheReadTokens: 0,
+        cacheCreationTokens: 0,
+      },
+    }
+  }
+
+  async countTokens(messages: readonly Message[], options: ChatOptions = {}): Promise<number> {
+    const contents = this.toContents(messages)
+    const model = options.model ?? this.defaultModel
+    const response = await this.models.countTokens({ model, contents })
+    return response.totalTokens ?? 0
+  }
+
+  async runWithTools(
+    messages: readonly Message[],
+    tools: readonly Tool[],
+    options: RunWithToolsOptions = {},
+  ): Promise<AgentResult> {
+    const mcpServers: readonly MCPServer[] = options.mcpServers ?? []
+    const resolved =
+      mcpServers.length > 0
+        ? await resolveMcpTools(mcpServers, {
+            ...(this.mcpClientFactory ? { clientFactory: this.mcpClientFactory } : {}),
+          })
+        : { tools: [] as Tool[], close: async () => {} }
+    try {
+      return await this._runLoop(messages, [...tools, ...resolved.tools], options)
+    } finally {
+      await resolved.close()
+    }
+  }
+
+  private async _runLoop(
+    messages: readonly Message[],
+    tools: readonly Tool[],
+    options: RunWithToolsOptions,
+  ): Promise<AgentResult> {
+    const maxIterations = options.maxIterations ?? 10
+    const toolMap = new Map<string, Tool>(tools.map((t) => [t.name, t]))
+    const workingMessages: Message[] = [...messages]
+    const aggregated: ChatUsage = {
+      inputTokens: 0,
+      outputTokens: 0,
+      cacheReadTokens: 0,
+      cacheCreationTokens: 0,
+    }
+    let iterations = 0
+
+    while (true) {
+      const params = this.buildParams(workingMessages, options, tools)
+      const response = await this.models.generateContent(params)
+      addUsage(aggregated, response.usageMetadata)
+
+      const candidate = response.candidates?.[0]
+      if (!candidate) {
+        throw new BrainError('GeminiProvider: response had no candidates.')
+      }
+      const parts = candidate.content?.parts ?? []
+      const assistantContent = fromGeminiParts(parts)
+      workingMessages.push({ role: 'assistant', content: assistantContent })
+
+      const toolUses = (Array.isArray(assistantContent) ? assistantContent : []).filter(
+        (b): b is ToolUseBlock => b.type === 'tool_use',
+      )
+
+      if (toolUses.length === 0) {
+        return {
+          text: typeof assistantContent === 'string'
+            ? assistantContent
+            : candidateText(candidate),
+          messages: workingMessages,
+          iterations,
+          stopReason: candidate.finishReason ? String(candidate.finishReason) : 'stop',
+          usage: aggregated,
+        }
+      }
+
+      const resultBlocks: ContentBlock[] = []
+      for (const call of toolUses) {
+        const tool = toolMap.get(call.name)
+        if (!tool) {
+          throw new ToolExecutionError(
+            call.name,
+            call.id,
+            new Error(`Tool "${call.name}" is not registered.`),
+          )
+        }
+        let output: unknown
+        try {
+          output = await tool.execute(call.input, {
+            callId: call.id,
+            context: options.context ?? {},
+          })
+        } catch (cause) {
+          throw new ToolExecutionError(call.name, call.id, cause)
+        }
+        const resultBlock: ToolResultBlock = {
+          type: 'tool_result',
+          toolUseId: call.id,
+          content: typeof output === 'string' ? output : JSON.stringify(output),
+        }
+        resultBlocks.push(resultBlock)
+      }
+      workingMessages.push({ role: 'user', content: resultBlocks })
+
+      iterations++
+      if (iterations >= maxIterations) {
+        return {
+          text: candidateText(candidate),
+          messages: workingMessages,
+          iterations,
+          stopReason: 'max_iterations',
+          usage: aggregated,
+        }
+      }
+    }
+  }
+
+  // ─── Param translation ──────────────────────────────────────────────────
+
+  private buildParams(
+    messages: readonly Message[],
+    options: ChatOptions,
+    tools: readonly Tool[],
+  ): GenerateContentParameters {
+    const model = options.model ?? this.defaultModel
+    const contents = this.toContents(messages)
+    const config: GenerateContentConfig = {
+      maxOutputTokens: options.maxTokens ?? this.defaultMaxTokens,
+    }
+
+    const systemText = systemPromptText(options.system)
+    if (systemText.length > 0) {
+      config.systemInstruction = systemText
+    }
+
+    if (tools.length > 0) {
+      const functionDeclarations: FunctionDeclaration[] = tools.map((t) => ({
+        name: t.name,
+        description: t.description,
+        parametersJsonSchema: t.inputSchema,
+      }))
+      config.tools = [{ functionDeclarations }]
+    }
+
+    const thinking = buildThinkingConfig(options)
+    if (thinking !== undefined) config.thinkingConfig = thinking
+
+    return { model, contents, config }
+  }
+
+  private toContents(messages: readonly Message[]): Content[] {
+    return messages.map((m) => ({
+      role: m.role === 'assistant' ? 'model' : 'user',
+      parts: toGeminiParts(m.content),
+    }))
+  }
+
+  private toChatResult(
+    response: GenerateContentResponse,
+    requestedModel: string,
+  ): ChatResult<GenerateContentResponse> {
+    const candidate = response.candidates?.[0]
+    return {
+      text: candidateText(candidate),
+      model: response.modelVersion ?? requestedModel,
+      stopReason: candidate?.finishReason ? String(candidate.finishReason) : null,
+      usage: toUsage(response.usageMetadata),
+      raw: response,
+    }
+  }
+}
+
+// ─── Shape converters ─────────────────────────────────────────────────────
+
+function systemPromptText(system: SystemPrompt | undefined): string {
+  if (system === undefined) return ''
+  if (typeof system === 'string') return system
+  if (Array.isArray(system)) return system.map((b) => b.text).join('\n')
+  return system.text
+}
+
+function toGeminiParts(content: string | ContentBlock[]): Part[] {
+  if (typeof content === 'string') return [{ text: content }]
+  const parts: Part[] = []
+  for (const block of content) {
+    if (block.type === 'text') {
+      parts.push({ text: block.text })
+    } else if (block.type === 'tool_use') {
+      parts.push({
+        functionCall: {
+          id: block.id,
+          name: block.name,
+          args: (block.input ?? {}) as Record<string, unknown>,
+        },
+      })
+    } else if (block.type === 'tool_result') {
+      const text = typeof block.content === 'string'
+        ? block.content
+        : block.content.map((t) => t.text).join('')
+      parts.push({
+        functionResponse: {
+          id: block.toolUseId,
+          name: '',
+          response: block.isError ? { error: text } : { result: text },
+        },
+      })
+    }
+    // MCP blocks (Anthropic-only) silently dropped.
+  }
+  return parts
+}
+
+function fromGeminiParts(parts: readonly Part[]): string | ContentBlock[] {
+  const blocks: ContentBlock[] = []
+  for (const part of parts) {
+    if (typeof part.text === 'string' && part.text.length > 0) {
+      blocks.push({ type: 'text', text: part.text })
+    } else if (part.functionCall) {
+      const fc = part.functionCall
+      blocks.push({
+        type: 'tool_use',
+        id: fc.id ?? `gemini_${cryptoRandomId()}`,
+        name: fc.name ?? '',
+        input: fc.args ?? {},
+      } satisfies ToolUseBlock)
+    }
+  }
+  if (blocks.length === 1 && blocks[0]?.type === 'text') return blocks[0].text
+  return blocks
+}
+
+function candidateText(candidate: { content?: { parts?: Part[] } } | undefined): string {
+  const parts = candidate?.content?.parts ?? []
+  return parts
+    .filter((p) => typeof p.text === 'string' && p.text.length > 0)
+    .map((p) => p.text as string)
+    .join('')
+}
+
+function buildThinkingConfig(options: ChatOptions): GenerateContentConfig['thinkingConfig'] {
+  if (options.effort !== undefined) {
+    const level = effortToThinkingLevel(options.effort)
+    return level !== undefined ? { thinkingLevel: level } : { thinkingBudget: -1 }
+  }
+  if (options.thinking === 'adaptive') return { thinkingBudget: -1 }
+  if (options.thinking === 'disabled') return { thinkingBudget: 0 }
+  return undefined
+}
+
+function effortToThinkingLevel(
+  effort: NonNullable<ChatOptions['effort']>,
+): ThinkingLevel | undefined {
+  switch (effort) {
+    case 'low': return ThinkingLevel.LOW
+    case 'medium': return ThinkingLevel.MEDIUM
+    case 'high':
+    case 'xhigh':
+    case 'max':
+      return ThinkingLevel.HIGH
+  }
+}
+
+function toUsage(u: { promptTokenCount?: number; candidatesTokenCount?: number; cachedContentTokenCount?: number } | undefined): ChatUsage {
+  return {
+    inputTokens: u?.promptTokenCount ?? 0,
+    outputTokens: u?.candidatesTokenCount ?? 0,
+    cacheReadTokens: u?.cachedContentTokenCount ?? 0,
+    cacheCreationTokens: 0,
+  }
+}
+
+function addUsage(
+  acc: ChatUsage,
+  u: { promptTokenCount?: number; candidatesTokenCount?: number; cachedContentTokenCount?: number } | undefined,
+): void {
+  if (!u) return
+  acc.inputTokens += u.promptTokenCount ?? 0
+  acc.outputTokens += u.candidatesTokenCount ?? 0
+  acc.cacheReadTokens += u.cachedContentTokenCount ?? 0
+}
+
+function cryptoRandomId(): string {
+  // Stable, low-entropy fallback for synthesizing tool-use ids when
+  // Gemini omits them. Uniqueness within a single response is all the
+  // loop requires — the id only travels back paired with its result
+  // and never escapes to the caller.
+  return Math.random().toString(36).slice(2, 12)
+}

package/src/providers/openai_provider.ts

@@ -22,9 +22,12 @@
  *     a `function` namespace where Anthropic uses flat tool
  *     definitions.
  *
- *   - `MCPServer[]` → throws `BrainError`. OpenAI has no
- *     server-side MCP support; the local MCP client slice
- *     (`@strav/brain/mcp`) lands when this is needed.
+ *   - `MCPServer[]` → resolved via the local MCP client
+ *     (`@strav/brain/mcp`). Each server is dialed, its tools are
+ *     discovered, and they're merged with locally-defined tools.
+ *     The agentic loop then treats them uniformly. Tool names are
+ *     namespaced `<server>__<tool>` to avoid collisions. Transports
+ *     are closed in a `finally` once the loop exits.
  *
  *   - `cache: true` is a no-op. OpenAI auto-caches; there's no
  *     per-block cache_control to set. The framework flag is
@@ -48,6 +51,8 @@ import OpenAI from 'openai'
 import type { AgentResult } from '../agent_result.ts'
 import { BrainError } from '../brain_error.ts'
 import type { OpenAIProviderConfig } from '../brain_config.ts'
+import type { MCPServer } from '../mcp_server.ts'
+import { resolveMcpTools, type ResolveMcpToolsOptions } from '../mcp/resolve_mcp_tools.ts'
 import type { Provider, RunWithToolsOptions } from '../provider.ts'
 import type { Tool } from '../tool.ts'
 import { ToolExecutionError } from '../tool_execution_error.ts'
@@ -66,20 +71,32 @@ import type {
 
 const DEFAULT_OPENAI_MODEL = 'gpt-5'
 
+export interface OpenAIProviderOptions {
+  client?: OpenAI
+  /**
+   * Internal seam — tests inject a stub MCP client factory so MCP
+   * tool resolution doesn't dial the network. Real apps leave it
+   * unset; the provider uses the default `MCPClient`.
+   */
+  mcpClientFactory?: ResolveMcpToolsOptions['clientFactory']
+}
+
 export class OpenAIProvider implements Provider {
   readonly name: string
   private readonly client: OpenAI
   private readonly defaultModel: string
   private readonly defaultMaxTokens: number
+  private readonly mcpClientFactory?: ResolveMcpToolsOptions['clientFactory']
 
   constructor(
     name: string,
     config: OpenAIProviderConfig,
-    options: { client?: OpenAI } = {},
+    options: OpenAIProviderOptions = {},
   ) {
     this.name = name
     this.defaultModel = config.defaultModel ?? DEFAULT_OPENAI_MODEL
     this.defaultMaxTokens = config.defaultMaxTokens ?? 4096
+    this.mcpClientFactory = options.mcpClientFactory
     this.client =
       options.client ??
       new OpenAI({
@@ -129,12 +146,25 @@ export class OpenAIProvider implements Provider {
     tools: readonly Tool[],
     options: RunWithToolsOptions = {},
   ): Promise<AgentResult> {
-    if (options.mcpServers && options.mcpServers.length > 0) {
-      throw new BrainError(
-        'OpenAIProvider.runWithTools: MCP servers are not supported by the OpenAI provider in V1. Use the Anthropic provider for server-side MCP, or wait for the local MCP client slice.',
-        { context: { provider: this.name } },
-      )
+    const mcpServers: readonly MCPServer[] = options.mcpServers ?? []
+    const resolved =
+      mcpServers.length > 0
+        ? await resolveMcpTools(mcpServers, {
+            ...(this.mcpClientFactory ? { clientFactory: this.mcpClientFactory } : {}),
+          })
+        : { tools: [] as Tool[], close: async () => {} }
+    try {
+      return await this._runLoop(messages, [...tools, ...resolved.tools], options)
+    } finally {
+      await resolved.close()
     }
+  }
+
+  private async _runLoop(
+    messages: readonly Message[],
+    tools: readonly Tool[],
+    options: RunWithToolsOptions,
+  ): Promise<AgentResult> {
     const maxIterations = options.maxIterations ?? 10
     const toolMap = new Map<string, Tool>(tools.map((t) => [t.name, t]))
     const workingMessages: Message[] = [...messages]