feat(providers): adapt Ollama support to @archon/providers package (#1137 rebase)

.env.example

@@ -24,10 +24,13 @@ CODEX_REFRESH_TOKEN=
 CODEX_ACCOUNT_ID=
 # CODEX_BIN_PATH=  # Optional: path to Codex native binary (binary builds only)
 
-# Default AI Assistant (claude | codex)
+# Default AI Assistant (claude | codex | ollama)
 # Used for new conversations when no codebase specified
 DEFAULT_AI_ASSISTANT=claude
 
+# Ollama server base URL (optional, defaults to http://localhost:11434)
+# OLLAMA_BASE_URL=http://localhost:11434
+
 # Title Generation Model (optional)
 # Model used for generating conversation titles (lightweight task)
 # When unset, uses the SDK's default model

packages/core/package.json

@@ -22,7 +22,7 @@
     "./state/*": "./src/state/*.ts"
   },
   "scripts": {
-    "test": "bun test src/handlers/command-handler.test.ts && bun test src/handlers/clone.test.ts && bun test src/db/adapters/postgres.test.ts && bun test src/db/adapters/sqlite.test.ts src/db/codebases.test.ts src/db/connection.test.ts src/db/conversations.test.ts src/db/env-vars.test.ts src/db/isolation-environments.test.ts src/db/messages.test.ts src/db/sessions.test.ts src/db/workflow-events.test.ts src/db/workflows.test.ts src/utils/defaults-copy.test.ts src/utils/worktree-sync.test.ts src/utils/conversation-lock.test.ts src/utils/credential-sanitizer.test.ts src/utils/port-allocation.test.ts src/utils/error.test.ts src/utils/error-formatter.test.ts src/utils/github-graphql.test.ts src/config/ src/state/ && bun test src/utils/path-validation.test.ts && bun test src/services/cleanup-service.test.ts && bun test src/services/title-generator.test.ts && bun test src/workflows/ && bun test src/operations/workflow-operations.test.ts && bun test src/operations/isolation-operations.test.ts && bun test src/orchestrator/orchestrator.test.ts && bun test src/orchestrator/orchestrator-agent.test.ts && bun test src/orchestrator/orchestrator-isolation.test.ts",
+    "test": "bun test src/handlers/command-handler.test.ts && bun test src/handlers/clone.test.ts && bun test src/db/adapters/postgres.test.ts && bun test src/db/adapters/sqlite.test.ts src/db/codebases.test.ts src/db/connection.test.ts src/db/env-vars.test.ts src/db/isolation-environments.test.ts src/db/messages.test.ts src/db/sessions.test.ts src/db/workflow-events.test.ts src/db/workflows.test.ts src/utils/defaults-copy.test.ts src/utils/worktree-sync.test.ts src/utils/conversation-lock.test.ts src/utils/credential-sanitizer.test.ts src/utils/port-allocation.test.ts src/utils/error.test.ts src/utils/error-formatter.test.ts src/utils/github-graphql.test.ts src/config/ src/state/ && bun test src/db/conversations.test.ts && bun test src/utils/path-validation.test.ts && bun test src/services/cleanup-service.test.ts && bun test src/services/title-generator.test.ts && bun test src/workflows/ && bun test src/operations/workflow-operations.test.ts && bun test src/operations/isolation-operations.test.ts && bun test src/orchestrator/orchestrator.test.ts && bun test src/orchestrator/orchestrator-agent.test.ts && bun test src/orchestrator/orchestrator-isolation.test.ts",
     "type-check": "bun x tsc --noEmit",
     "build": "echo 'No build needed - Bun runs TypeScript directly'"
   },

packages/core/src/config/config-loader.test.ts

@@ -224,7 +224,7 @@ concurrency:
       const config = await loadConfig();
 
       expect(config.assistant).toBe('claude');
-      expect(config.assistants).toEqual({ claude: {}, codex: {} });
+      expect(config.assistants).toEqual({ claude: {}, codex: {}, ollama: {} });
       expect(config.streaming.telegram).toBe('stream');
       expect(config.concurrency.maxConversations).toBe(10);
     });

packages/core/src/config/config-loader.ts

@@ -176,6 +176,7 @@ function getDefaults(): MergedConfig {
     assistants: {
       claude: {},
       codex: {},
+      ollama: {},
     },
     streaming: {
       telegram: 'stream',
@@ -258,6 +259,7 @@ function mergeGlobalConfig(defaults: MergedConfig, global: GlobalConfig): Merged
     assistants: {
       claude: { ...defaults.assistants.claude },
       codex: { ...defaults.assistants.codex },
+      ollama: { ...defaults.assistants.ollama },
     },
   };
 
@@ -283,6 +285,9 @@ function mergeGlobalConfig(defaults: MergedConfig, global: GlobalConfig): Merged
       ...global.assistants.codex,
     };
   }
+  if (global.assistants?.ollama !== undefined) {
+    result.assistants.ollama = global.assistants.ollama;
+  }
 
   // Streaming preferences
   if (global.streaming) {
@@ -314,6 +319,7 @@ function mergeRepoConfig(merged: MergedConfig, repo: RepoConfig): MergedConfig {
     assistants: {
       claude: { ...merged.assistants.claude },
       codex: { ...merged.assistants.codex },
+      ollama: { ...merged.assistants.ollama },
     },
   };
 
@@ -334,6 +340,9 @@ function mergeRepoConfig(merged: MergedConfig, repo: RepoConfig): MergedConfig {
       ...repo.assistants.codex,
     };
   }
+  if (repo.assistants?.ollama !== undefined) {
+    result.assistants.ollama = repo.assistants.ollama;
+  }
 
   // Commands config
   if (repo.commands) {
@@ -446,6 +455,8 @@ export async function updateGlobalConfig(updates: Partial<GlobalConfig>): Promis
       merged.assistants = {
         claude: { ...current.assistants?.claude, ...updates.assistants.claude },
         codex: { ...current.assistants?.codex, ...updates.assistants.codex },
+        // Replace ollama section entirely so cleared fields (model, baseUrl) are removed
+        ...(updates.assistants.ollama !== undefined ? { ollama: updates.assistants.ollama } : {}),
       };
     }
 
@@ -484,9 +495,19 @@ export async function updateGlobalConfig(updates: Partial<GlobalConfig>): Promis
  * Strips filesystem paths and any other server-internal fields.
  */
 export function toSafeConfig(config: MergedConfig): SafeConfig {
+  // Determine which providers are available based on configuration and environment.
+  // Claude is always available (API key checked at request time, not config time).
+  // Codex requires the binary to be present; we optimistically include it here.
+  // Ollama is included when a model is configured or OLLAMA_BASE_URL is set.
+  const availableAssistants: ('claude' | 'codex' | 'ollama')[] = ['claude', 'codex'];
+  if (config.assistants.ollama.model || process.env.OLLAMA_BASE_URL) {
+    availableAssistants.push('ollama');
+  }
+
   return {
     botName: config.botName,
     assistant: config.assistant,
+    availableAssistants,
     assistants: {
       claude: {
         model: config.assistants.claude.model,
@@ -496,6 +517,10 @@ export function toSafeConfig(config: MergedConfig): SafeConfig {
         modelReasoningEffort: config.assistants.codex.modelReasoningEffort,
         webSearchMode: config.assistants.codex.webSearchMode,
       },
+      ollama: {
+        model: config.assistants.ollama.model,
+        baseUrl: config.assistants.ollama.baseUrl,
+      },
     },
     streaming: {
       telegram: config.streaming.telegram,

packages/core/src/config/config-types.ts

@@ -13,9 +13,13 @@
 
 // Provider config defaults — canonical definitions live in @archon/providers/types.
 // Imported and re-exported here so existing consumers don't break.
-import type { ClaudeProviderDefaults, CodexProviderDefaults } from '@archon/providers/types';
+import type {
+  ClaudeProviderDefaults,
+  CodexProviderDefaults,
+  OllamaProviderDefaults,
+} from '@archon/providers/types';
 
-export type { ClaudeProviderDefaults, CodexProviderDefaults };
+export type { ClaudeProviderDefaults, CodexProviderDefaults, OllamaProviderDefaults };
 
 export interface GlobalConfig {
   /**
@@ -28,14 +32,15 @@ export interface GlobalConfig {
    * Default AI assistant when no codebase-specific preference
    * @default 'claude'
    */
-  defaultAssistant?: 'claude' | 'codex';
+  defaultAssistant?: 'claude' | 'codex' | 'ollama';
 
   /**
    * Assistant-specific defaults (model, reasoning effort, etc.)
    */
   assistants?: {
     claude?: ClaudeProviderDefaults;
     codex?: CodexProviderDefaults;
+    ollama?: OllamaProviderDefaults;
   };
 
   /**
@@ -85,14 +90,15 @@ export interface RepoConfig {
    * AI assistant preference for this repository
    * Overrides global default
    */
-  assistant?: 'claude' | 'codex';
+  assistant?: 'claude' | 'codex' | 'ollama';
 
   /**
    * Assistant-specific defaults for this repository
    */
   assistants?: {
     claude?: ClaudeProviderDefaults;
     codex?: CodexProviderDefaults;
+    ollama?: OllamaProviderDefaults;
   };
 
   /**
@@ -182,10 +188,11 @@ export interface RepoConfig {
  */
 export interface MergedConfig {
   botName: string;
-  assistant: 'claude' | 'codex';
+  assistant: 'claude' | 'codex' | 'ollama';
   assistants: {
     claude: ClaudeProviderDefaults;
     codex: CodexProviderDefaults;
+    ollama: OllamaProviderDefaults;
   };
   streaming: {
     telegram: 'stream' | 'batch';
@@ -238,10 +245,13 @@ export interface MergedConfig {
  */
 export interface SafeConfig {
   botName: string;
-  assistant: 'claude' | 'codex';
+  assistant: 'claude' | 'codex' | 'ollama';
+  /** Providers that are configured and available on this server. */
+  availableAssistants: ('claude' | 'codex' | 'ollama')[];
   assistants: {
     claude: Pick<ClaudeProviderDefaults, 'model'>;
     codex: Pick<CodexProviderDefaults, 'model' | 'modelReasoningEffort' | 'webSearchMode'>;
+    ollama: Pick<OllamaProviderDefaults, 'model' | 'baseUrl'>;
   };
   streaming: {
     telegram: 'stream' | 'batch';

packages/core/src/db/conversations.test.ts

@@ -11,6 +11,16 @@ mock.module('./connection', () => ({
   getDialect: () => mockPostgresDialect,
 }));
 
+// Mock config-loader: getOrCreateConversation calls loadConfig() for the default assistant
+mock.module('../config/config-loader', () => ({
+  loadConfig: mock(() =>
+    Promise.resolve({
+      assistant: 'claude',
+      assistants: { claude: {}, codex: {}, ollama: {} },
+    })
+  ),
+}));
+
 import {
   getOrCreateConversation,
   updateConversation,

packages/core/src/db/conversations.ts

@@ -5,6 +5,7 @@ import { pool, getDialect } from './connection';
 import type { Conversation } from '../types';
 import { ConversationNotFoundError } from '../types';
 import { createLogger } from '@archon/paths';
+import { loadConfig } from '../config/config-loader';
 
 /** Lazy-initialized logger (deferred so test mocks can intercept createLogger) */
 let cachedLog: ReturnType<typeof createLogger> | undefined;
@@ -72,7 +73,18 @@ export async function getOrCreateConversation(
   // Check if we should inherit from a parent conversation (e.g., Discord thread inheriting from parent channel)
   let inheritedCodebaseId: string | null = null;
   let inheritedCwd: string | null = null;
-  let assistantType = process.env.DEFAULT_AI_ASSISTANT ?? 'claude';
+  const config = await loadConfig();
+  let assistantType: 'claude' | 'codex' | 'ollama' = config.assistant;
+  const envAssistant = process.env.DEFAULT_AI_ASSISTANT;
+  if (envAssistant) {
+    if (envAssistant === 'claude' || envAssistant === 'codex' || envAssistant === 'ollama') {
+      assistantType = envAssistant;
+    } else {
+      throw new Error(
+        `Invalid DEFAULT_AI_ASSISTANT: "${envAssistant}". Must be one of: claude, codex, ollama`
+      );
+    }
+  }
 
   if (parentConversationId) {
     const parent = await pool.query<Conversation>(
@@ -82,7 +94,7 @@ export async function getOrCreateConversation(
     if (parent.rows[0]) {
       inheritedCodebaseId = parent.rows[0].codebase_id;
       inheritedCwd = parent.rows[0].cwd;
-      assistantType = parent.rows[0].ai_assistant_type;
+      assistantType = parent.rows[0].ai_assistant_type as 'claude' | 'codex' | 'ollama';
       getLog().debug(
         { inheritedCodebaseId, inheritedCwd },
         'db.conversation_parent_context_inherited'
@@ -100,7 +112,7 @@ export async function getOrCreateConversation(
       [codebaseId]
     );
     if (codebase.rows[0]) {
-      assistantType = codebase.rows[0].ai_assistant_type;
+      assistantType = codebase.rows[0].ai_assistant_type as 'claude' | 'codex' | 'ollama';
     }
   }
 

packages/core/src/orchestrator/orchestrator-agent.ts

@@ -759,7 +759,7 @@ export async function handleMessage(
     // Reuse the config already loaded during workflow discovery (avoids a second disk read).
     // Fall back to loadConfig only when no codebase is scoped (discoveredConfig is undefined).
     const config = discoveredConfig ?? (await loadConfig());
-    const providerKey = conversation.ai_assistant_type as 'claude' | 'codex';
+    const providerKey = conversation.ai_assistant_type as 'claude' | 'codex' | 'ollama';
     let dbEnvVars: Record<string, string> = {};
     if (conversation.codebase_id) {
       try {

packages/providers/package.json

@@ -12,6 +12,8 @@
     "./codex/provider": "./src/codex/provider.ts",
     "./codex/config": "./src/codex/config.ts",
     "./codex/binary-resolver": "./src/codex/binary-resolver.ts",
+    "./ollama/provider": "./src/ollama/provider.ts",
+    "./ollama/config": "./src/ollama/config.ts",
     "./errors": "./src/errors.ts",
     "./factory": "./src/factory.ts"
   },

packages/providers/src/factory.ts

@@ -2,18 +2,20 @@
  * Agent Provider Factory
  *
  * Dynamic provider instantiation and static capability lookup.
- * Built-in providers only: Claude and Codex.
+ * Built-in providers: Claude, Codex, and Ollama.
  */
 import type { IAgentProvider, ProviderCapabilities } from './types';
 import { ClaudeProvider } from './claude/provider';
 import { CodexProvider } from './codex/provider';
+import { OllamaProvider } from './ollama/provider';
 import { CLAUDE_CAPABILITIES } from './claude/capabilities';
 import { CODEX_CAPABILITIES } from './codex/capabilities';
+import { OLLAMA_CAPABILITIES } from './ollama/capabilities';
 import { UnknownProviderError } from './errors';
 import { createLogger } from '@archon/paths';
 
 /** Built-in provider types. */
-const REGISTERED_PROVIDERS = ['claude', 'codex'] as const;
+const REGISTERED_PROVIDERS = ['claude', 'codex', 'ollama'] as const;
 
 /** Lazy-initialized logger (deferred so test mocks can intercept createLogger) */
 let cachedLog: ReturnType<typeof createLogger> | undefined;
@@ -37,6 +39,9 @@ export function getAgentProvider(type: string): IAgentProvider {
     case 'codex':
       getLog().debug({ provider: 'codex' }, 'provider_selected');
       return new CodexProvider();
+    case 'ollama':
+      getLog().debug({ provider: 'ollama' }, 'provider_selected');
+      return new OllamaProvider();
     default:
       throw new UnknownProviderError(type, [...REGISTERED_PROVIDERS]);
   }
@@ -52,6 +57,8 @@ export function getProviderCapabilities(type: string): ProviderCapabilities {
       return CLAUDE_CAPABILITIES;
     case 'codex':
       return CODEX_CAPABILITIES;
+    case 'ollama':
+      return OLLAMA_CAPABILITIES;
     default:
       throw new UnknownProviderError(type, [...REGISTERED_PROVIDERS]);
   }

packages/providers/src/index.ts

@@ -23,10 +23,12 @@ export { UnknownProviderError } from './errors';
 // Provider classes
 export { ClaudeProvider } from './claude/provider';
 export { CodexProvider } from './codex/provider';
+export { OllamaProvider } from './ollama/provider';
 
 // Config parsers
 export { parseClaudeConfig, type ClaudeProviderDefaults } from './claude/config';
 export { parseCodexConfig, type CodexProviderDefaults } from './codex/config';
+export { parseOllamaConfig, type OllamaProviderDefaults } from './ollama/config';
 
 // Utilities (needed by consumers)
 export { resetCodexSingleton } from './codex/provider';

packages/providers/src/ollama/capabilities.ts

@@ -0,0 +1,22 @@
+import type { ProviderCapabilities } from '../types';
+
+/**
+ * Ollama capability flags.
+ * Ollama runs locally via /api/chat — no session resume, MCP, hooks, or SDK-level
+ * tool restrictions. Structured output, cost control, effort, and sandbox are also
+ * unsupported at this time.
+ */
+export const OLLAMA_CAPABILITIES: ProviderCapabilities = {
+  sessionResume: false,
+  mcp: false,
+  hooks: false,
+  skills: false,
+  toolRestrictions: false,
+  structuredOutput: false,
+  envInjection: false,
+  costControl: false,
+  effortControl: false,
+  thinkingControl: false,
+  fallbackModel: false,
+  sandbox: false,
+};

packages/providers/src/ollama/config.ts

@@ -0,0 +1,26 @@
+/**
+ * Typed config parsing for Ollama provider defaults.
+ * Validates and narrows the opaque assistantConfig to typed fields.
+ */
+import type { OllamaProviderDefaults } from '../types';
+
+// Re-export so consumers can import the type from either location
+export type { OllamaProviderDefaults } from '../types';
+
+/**
+ * Parse raw assistantConfig into typed Ollama defaults.
+ * Defensive: invalid fields are silently dropped.
+ */
+export function parseOllamaConfig(raw: Record<string, unknown>): OllamaProviderDefaults {
+  const result: OllamaProviderDefaults = {};
+
+  if (typeof raw.model === 'string') {
+    result.model = raw.model;
+  }
+
+  if (typeof raw.baseUrl === 'string') {
+    result.baseUrl = raw.baseUrl;
+  }
+
+  return result;
+}

packages/providers/src/ollama/index.ts

@@ -0,0 +1,2 @@
+export { OllamaProvider } from './provider';
+export { parseOllamaConfig, type OllamaProviderDefaults } from './config';