@strav/brain 1.0.0-alpha.21 → 1.0.0-alpha.24

package/src/{providers/gemini_provider.ts → drivers/gemini/gemini_brain_driver.ts}

@@ -1,5 +1,5 @@
 /**
- * `GeminiProvider` — implementation of `Provider` backed by the
+ * `GeminiBrainDriver` — implementation of `Provider` backed by the
  * official `@google/genai` SDK (Gemini Developer API / Vertex AI).
  *
  * Maps framework shapes to Gemini's wire format:
@@ -56,12 +56,12 @@ import type {
   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 type { AgentGenerateResult } from '../agent_generate_result.ts'
-import type { AgentStreamEvent } from '../agent_stream_event.ts'
+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 type { AgentGenerateResult } from '../../agent_generate_result.ts'
+import type { AgentStreamEvent } from '../../agent_stream_event.ts'
 import type {
   AudioSource,
   EmbedOptions,
@@ -69,17 +69,17 @@ import type {
   ServerTool,
   TranscribeOptions,
   TranscribeResult,
-} from '../types.ts'
-import { resolveMcpTools, type ResolveMcpToolsOptions } from '../mcp/resolve_mcp_tools.ts'
-import { parseGenerated, type OutputSchema } from '../output_schema.ts'
-import { runToolWithRecovery } from '../tool_runner.ts'
+} from '../../types.ts'
+import { resolveMcpTools, type ResolveMcpToolsOptions } from '../../mcp/resolve_mcp_tools.ts'
+import { parseGenerated, type OutputSchema } from '../../output_schema.ts'
+import { runToolWithRecovery } from '../../tool_runner.ts'
 import type {
-  Provider,
+  BrainDriver,
   RunWithToolsOptions,
   RunWithToolsOptionsWithSuspend,
-} from '../provider.ts'
-import type { SuspendedRun } from '../suspended_run.ts'
-import type { Tool } from '../tool.ts'
+} from '../../brain_driver.ts'
+import type { SuspendedRun } from '../../suspended_run.ts'
+import type { Tool } from '../../tool.ts'
 import type {
   ChatOptions,
   ChatResult,
@@ -92,7 +92,7 @@ import type {
   TextBlock,
   ToolResultBlock,
   ToolUseBlock,
-} from '../types.ts'
+} from '../../types.ts'
 
 const DEFAULT_GEMINI_MODEL = 'gemini-2.5-flash'
 const DEFAULT_GEMINI_EMBED_MODEL = 'text-embedding-004'
@@ -128,7 +128,7 @@ export interface GeminiProviderOptions {
   mcpPool?: ResolveMcpToolsOptions['pool']
 }
 
-export class GeminiProvider implements Provider {
+export class GeminiBrainDriver implements BrainDriver {
   readonly name: string
   private readonly models: GeminiModelsClient
   private readonly defaultModel: string
@@ -264,7 +264,7 @@ export class GeminiProvider implements Provider {
     if (options.signal !== undefined) config.abortSignal = options.signal
     if (!this.models.embedContent) {
       throw new BrainError(
-        `GeminiProvider.embed: underlying SDK does not implement embedContent. This usually means a test stub omitted it.`,
+        `GeminiBrainDriver.embed: underlying SDK does not implement embedContent. This usually means a test stub omitted it.`,
         { context: { provider: this.name } },
       )
     }
@@ -349,7 +349,7 @@ export class GeminiProvider implements Provider {
 
       const candidate = response.candidates?.[0]
       if (!candidate) {
-        throw new BrainError('GeminiProvider: response had no candidates.')
+        throw new BrainError('GeminiBrainDriver: response had no candidates.')
       }
       const parts = candidate.content?.parts ?? []
       const assistantContent = fromGeminiParts(parts)
@@ -453,7 +453,7 @@ export class GeminiProvider implements Provider {
 
       const candidate = response.candidates?.[0]
       if (!candidate) {
-        throw new BrainError('GeminiProvider: response had no candidates.')
+        throw new BrainError('GeminiBrainDriver: response had no candidates.')
       }
       const parts = candidate.content?.parts ?? []
       const assistantContent = fromGeminiParts(parts)
@@ -953,7 +953,7 @@ function geminiServerTools(
       out.push({ urlContext: {} })
     } else if (t.type === 'web_fetch') {
       throw new BrainError(
-        'GeminiProvider: server tool `web_fetch` is Anthropic-only. Use `url_context` for Gemini or route the call to Anthropic.',
+        'GeminiBrainDriver: server tool `web_fetch` is Anthropic-only. Use `url_context` for Gemini or route the call to Anthropic.',
         { context: { provider: 'google' } },
       )
     }

package/src/drivers/gemini/index.ts

@@ -0,0 +1 @@
+export { GeminiBrainDriver } from './gemini_brain_driver.ts'

package/src/drivers/ollama/index.ts

@@ -0,0 +1 @@
+export { OllamaBrainDriver } from './ollama_brain_driver.ts'

package/src/{providers/ollama_provider.ts → drivers/ollama/ollama_brain_driver.ts}

@@ -1,5 +1,5 @@
 /**
- * `OllamaProvider` — `OpenAICompatProvider` pointed at a local
+ * `OllamaBrainDriver` — `OpenAICompatBrainDriver` pointed at a local
  * Ollama server's OpenAI-compatible `/v1` endpoint.
  *
  * Why this matters: Ollama (and the wider local-LLM ecosystem —
@@ -40,9 +40,9 @@
  */
 
 import type OpenAI from 'openai'
-import type { OllamaProviderConfig } from '../brain_config.ts'
-import type { ResolveMcpToolsOptions } from '../mcp/resolve_mcp_tools.ts'
-import { OpenAICompatProvider } from './openai_compat_provider.ts'
+import type { OllamaProviderConfig } from '../../brain_config.ts'
+import type { ResolveMcpToolsOptions } from '../../mcp/resolve_mcp_tools.ts'
+import { OpenAICompatBrainDriver } from '../openai_compat/openai_compat_brain_driver.ts'
 
 const DEFAULT_OLLAMA_BASE_URL = 'http://localhost:11434/v1'
 const DEFAULT_OLLAMA_API_KEY = 'ollama'
@@ -57,7 +57,7 @@ export interface OllamaProviderOptions {
   mcpClientFactory?: ResolveMcpToolsOptions['clientFactory']
 }
 
-export class OllamaProvider extends OpenAICompatProvider {
+export class OllamaBrainDriver extends OpenAICompatBrainDriver {
   constructor(
     name: string,
     config: OllamaProviderConfig,

package/src/drivers/openai/index.ts

@@ -0,0 +1 @@
+export { OpenAIBrainDriver } from './openai_brain_driver.ts'