0xkobold 0.7.2 → 0.8.0

package/dist/src/llm/multi-provider.js

@@ -0,0 +1,258 @@
+/**
+ * Multi-Provider Router
+ *
+ * Extends AdaptiveModelRouter to support multiple LLM providers.
+ * Routes requests to the appropriate provider based on model prefix.
+ *
+ * Model prefixes:
+ * - ollama/* → OllamaProvider (local or cloud)
+ * - claude/* → AnthropicProvider
+ * - anthropic/* → AnthropicProvider (alias)
+ *
+ * Usage:
+ *   const router = await getMultiProviderRouter();
+ *   const response = await router.chat({ model: 'claude/claude-3-5-sonnet', ... });
+ */
+import { createRouter } from './router-core';
+import { getOllamaProvider } from './ollama';
+import { createAnthropicProvider } from './anthropic';
+// ============================================================================
+// Provider Registry
+// ============================================================================
+const DEFAULT_PROVIDERS = [
+    {
+        name: 'ollama',
+        prefix: 'ollama/',
+        create: () => getOllamaProvider(),
+    },
+    {
+        name: 'claude',
+        prefix: 'claude/',
+        create: () => createAnthropicProvider(),
+    },
+    {
+        name: 'anthropic',
+        prefix: 'anthropic/',
+        create: () => createAnthropicProvider(), // Alias
+    },
+];
+class ProviderRegistry {
+    providers = new Map();
+    configs;
+    status = new Map();
+    constructor(configs = DEFAULT_PROVIDERS) {
+        this.configs = configs;
+    }
+    /**
+     * Get provider for a model
+     */
+    getProvider(model) {
+        // Extract prefix (e.g., "ollama/", "claude/")
+        const prefixMatch = this.configs.find(cfg => model.startsWith(cfg.prefix));
+        if (prefixMatch) {
+            const providerName = prefixMatch.name;
+            // Cache provider instance
+            if (!this.providers.has(providerName)) {
+                this.providers.set(providerName, prefixMatch.create());
+            }
+            return this.providers.get(providerName);
+        }
+        // Default to Ollama if no prefix
+        if (!this.providers.has('ollama')) {
+            this.providers.set('ollama', getOllamaProvider());
+        }
+        return this.providers.get('ollama');
+    }
+    /**
+     * Get provider name from model
+     */
+    getProviderName(model) {
+        const prefixMatch = this.configs.find(cfg => model.startsWith(cfg.prefix));
+        return prefixMatch?.name ?? 'ollama';
+    }
+    /**
+     * Strip provider prefix from model name
+     */
+    stripPrefix(model) {
+        const prefixMatch = this.configs.find(cfg => model.startsWith(cfg.prefix));
+        if (prefixMatch) {
+            return model.slice(prefixMatch.prefix.length);
+        }
+        return model;
+    }
+    /**
+     * Check if provider is available
+     */
+    async checkAvailability(providerName) {
+        const config = this.configs.find(cfg => cfg.name === providerName);
+        if (!config)
+            return false;
+        try {
+            const provider = this.getProvider(`${config.prefix}test`);
+            // Try to list models or make a minimal call
+            if (provider.listModels) {
+                const models = await provider.listModels();
+                return models.length > 0;
+            }
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Get all provider statuses
+     */
+    async getStatuses() {
+        const statuses = [];
+        for (const config of this.configs) {
+            const available = await this.checkAvailability(config.name);
+            const provider = this.providers.get(config.name);
+            statuses.push({
+                name: config.name,
+                available,
+                modelCount: available ? (await provider?.listModels?.() ?? []).length : 0,
+                lastChecked: Date.now(),
+            });
+        }
+        return statuses;
+    }
+    /**
+     * Register a new provider
+     */
+    register(config) {
+        this.configs.push(config);
+    }
+    /**
+     * List configured providers
+     */
+    listProviders() {
+        return this.configs.map(cfg => cfg.name);
+    }
+}
+// ============================================================================
+// Multi-Provider Router
+// ============================================================================
+let registryInstance = null;
+let multiProviderRouter = null;
+export class MultiProviderRouter {
+    name = 'multi-provider';
+    registry;
+    defaultProvider = 'ollama';
+    routers = new Map();
+    constructor(registry) {
+        this.registry = registry;
+    }
+    /**
+     * Chat using appropriate provider
+     */
+    async chat(options) {
+        const providerName = this.registry.getProviderName(options.model);
+        const provider = this.registry.getProvider(options.model);
+        const modelName = this.registry.stripPrefix(options.model);
+        // Adapt ChatOptions for the provider
+        const providerOptions = {
+            ...options,
+            model: modelName,
+        };
+        console.log(`[MultiProvider] Routing to ${providerName}: ${modelName}`);
+        // Track timing for performance
+        const startTime = Date.now();
+        try {
+            const response = await provider.chat(providerOptions);
+            const duration = Date.now() - startTime;
+            console.log(`[MultiProvider] ${providerName}/${modelName} completed in ${duration}ms`);
+            // Add provider info to response
+            return {
+                ...response,
+                model: `${providerName}/${modelName}`,
+            };
+        }
+        catch (error) {
+            const duration = Date.now() - startTime;
+            console.error(`[MultiProvider] ${providerName}/${modelName} failed after ${duration}ms:`, error);
+            throw error;
+        }
+    }
+    /**
+     * List models from all providers
+     */
+    async listModels() {
+        const allModels = [];
+        for (const providerName of this.registry.listProviders()) {
+            try {
+                const provider = this.registry.getProvider(`${providerName}/test`);
+                if (provider.listModels) {
+                    const models = await provider.listModels();
+                    for (const model of models) {
+                        allModels.push(`${providerName}/${model}`);
+                    }
+                }
+            }
+            catch (error) {
+                console.warn(`[MultiProvider] Failed to list models from ${providerName}:`, error);
+            }
+        }
+        return allModels;
+    }
+    /**
+     * Get provider registry
+     */
+    getRegistry() {
+        return this.registry;
+    }
+    /**
+     * Get adaptive router for a specific provider
+     */
+    async getRouterForProvider(providerName) {
+        if (this.routers.has(providerName)) {
+            return this.routers.get(providerName);
+        }
+        const config = this.registry.listProviders().includes(providerName);
+        if (!config)
+            return null;
+        const provider = this.registry.getProvider(`${providerName}/default`);
+        const router = await createRouter(provider, 'default');
+        this.routers.set(providerName, router);
+        return router;
+    }
+}
+// ============================================================================
+// Singleton Access
+// ============================================================================
+export function getProviderRegistry() {
+    if (!registryInstance) {
+        registryInstance = new ProviderRegistry();
+    }
+    return registryInstance;
+}
+export async function getMultiProviderRouter() {
+    if (!multiProviderRouter) {
+        const registry = getProviderRegistry();
+        multiProviderRouter = new MultiProviderRouter(registry);
+        console.log('[MultiProvider] Initialized with providers:', registry.listProviders());
+    }
+    return multiProviderRouter;
+}
+/**
+ * Convenience: Chat with automatic provider routing
+ */
+export async function chat(options) {
+    const router = await getMultiProviderRouter();
+    return router.chat(options);
+}
+/**
+ * Convenience: List all available models with provider prefixes
+ */
+export async function listAllModels() {
+    const router = await getMultiProviderRouter();
+    return router.listModels();
+}
+/**
+ * Convenience: Get provider statuses
+ */
+export async function getProviderStatuses() {
+    const registry = getProviderRegistry();
+    return registry.getStatuses();
+}
+//# sourceMappingURL=multi-provider.js.map

package/dist/src/llm/multi-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"multi-provider.js","sourceRoot":"","sources":["../../../src/llm/multi-provider.ts"],"names":[],"mappings":"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"}

package/dist/src/llm/ollama.js

@@ -1,243 +1,179 @@
 /**
  * Ollama LLM Provider
  *
- * Unified local + cloud support via ollama-extension.ts
- * Routing logic is now handled in the extension, this provider
- * just makes the actual API calls.
+ * Unified local + cloud support using official Ollama client.
+ * Uses OpenAI-compatible endpoints (/v1) for pi-coding-agent compatibility.
  */
-// Cloud URL for fallback
-const CLOUD_URL = 'https://ollama.com';
-// Helper functions (previously imported from extension)
-async function checkLocalOllama() {
-    try {
-        const res = await fetch('http://localhost:11434/api/tags', {
-            method: 'GET',
-            signal: AbortSignal.timeout(5000)
-        });
-        return res.ok;
-    }
-    catch {
-        return false;
-    }
-}
-function getOllamaBaseUrl(modelId) {
-    // If model has cloud/ prefix or no local Ollama, use cloud
-    if (modelId.includes('cloud/'))
-        return CLOUD_URL;
-    return 'http://localhost:11434';
-}
-function getOllamaApiKey() {
-    return process.env.OLLAMA_API_KEY;
-}
-function modelRequiresApiKey(modelId) {
-    // Cloud models require API key
-    return modelId.includes('cloud/') || modelId.startsWith('cloud-');
-}
+import { Ollama } from 'ollama';
+import { loadConfigFromEnv, DEFAULT_CONFIG, } from '@0xkobold/pi-ollama/shared';
 /**
  * Ollama Provider
- * Supports both local and cloud modes
+ * Supports both local and cloud modes using official client
  */
 export class OllamaProvider {
     name = 'ollama';
-    baseUrl = 'http://localhost:11434';
+    clients;
     cloudOnly = false;
     constructor() {
-        // Check if we have local Ollama
+        // Merge env config with defaults
+        const envConfig = loadConfigFromEnv();
+        const config = {
+            baseUrl: envConfig.baseUrl ?? process.env.OLLAMA_BASE_URL ?? DEFAULT_CONFIG.baseUrl,
+            cloudUrl: envConfig.cloudUrl ?? process.env.OLLAMA_CLOUD_URL ?? DEFAULT_CONFIG.cloudUrl,
+            apiKey: envConfig.apiKey ?? process.env.OLLAMA_API_KEY ?? DEFAULT_CONFIG.apiKey,
+        };
+        // Create clients
+        this.clients = {
+            local: new Ollama({ host: config.baseUrl }),
+            cloud: config.apiKey
+                ? new Ollama({ host: config.cloudUrl, headers: { Authorization: `Bearer ${config.apiKey}` } })
+                : null,
+        };
         this.detectMode();
     }
     async detectMode() {
-        const hasLocal = await checkLocalOllama();
-        this.cloudOnly = !hasLocal;
-        this.baseUrl = hasLocal ? 'http://localhost:11434' : CLOUD_URL;
-    }
-    /**
-     * Update base URL based on current mode and model
-     */
-    updateBaseUrl(modelId) {
-        // Use the extension's routing logic
-        this.baseUrl = getOllamaBaseUrl(modelId);
+        try {
+            await this.clients.local.list();
+            this.cloudOnly = false;
+        }
+        catch {
+            this.cloudOnly = true;
+        }
     }
     /**
-     * Check if running in cloud-only mode
+     * Get the appropriate client for a model
      */
-    isCloudOnly() {
-        return this.cloudOnly;
+    getClient(model) {
+        // If model has :cloud suffix, use cloud client
+        if (model.endsWith(':cloud') && this.clients.cloud) {
+            return { client: this.clients.cloud, isCloud: true };
+        }
+        // If local is unavailable, use cloud
+        if (this.cloudOnly && this.clients.cloud) {
+            return { client: this.clients.cloud, isCloud: true };
+        }
+        // Default to local
+        return { client: this.clients.local, isCloud: false };
     }
     async chat(options) {
-        // Set base URL based on model
-        this.updateBaseUrl(options.model);
-        const isCloud = this.baseUrl === CLOUD_URL || options.model.includes('cloud/');
-        // Get model name (strip prefix)
-        const model = options.model.replace(/^ollama\//, '').replace(/^cloud\//, '');
-        // Build messages
+        const { client, isCloud } = this.getClient(options.model);
+        const model = options.model.replace(':cloud', '');
+        // Convert messages to OpenAI format
         const messages = options.messages.map((m) => ({
             role: m.role,
             content: m.content,
         }));
-        // Build request body
-        const body = {
-            model,
-            messages,
-            stream: options.stream ?? false,
-            options: {
-                temperature: options.temperature ?? 0.7,
-                num_predict: options.maxTokens ?? 4096,
-            },
-        };
-        // Add tools if provided
-        if (options.tools && options.tools.length > 0) {
-            body.tools = options.tools.map(t => ({
-                type: t.type,
-                function: t.function,
-            }));
-        }
-        // Build headers
-        const headers = {
-            'Content-Type': 'application/json',
-        };
-        // Add auth for cloud mode
-        if (isCloud || modelRequiresApiKey(options.model)) {
-            const apiKey = getOllamaApiKey();
-            if (apiKey) {
-                headers['Authorization'] = `Bearer ${apiKey}`;
-            }
+        try {
+            // Use the chat API
+            const response = await client.chat({
+                model,
+                messages,
+                options: {
+                    temperature: options.temperature ?? 0.7,
+                    num_predict: options.maxTokens ?? 4096,
+                },
+            });
+            return {
+                content: response.message.content,
+                usage: {
+                    inputTokens: response.prompt_eval_count ?? 0,
+                    outputTokens: response.eval_count ?? 0,
+                },
+                model: options.model,
+            };
         }
-        const res = await fetch(`${this.baseUrl}/api/chat`, {
-            method: 'POST',
-            headers,
-            body: JSON.stringify(body),
-            signal: options.signal,
-        });
-        if (!res.ok) {
-            const err = await res.text().catch(() => res.statusText);
-            throw new Error(`Ollama ${isCloud ? 'Cloud' : 'Local'} error: ${err}`);
+        catch (err) {
+            throw new Error(`Ollama ${isCloud ? 'Cloud' : 'Local'} error: ${err.message}`);
         }
-        const data = await res.json();
-        // Parse tool calls from response
-        const toolCalls = data.message?.tool_calls?.map((tc) => ({
-            id: `call-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
-            function: {
-                name: tc.function?.name ?? tc.function,
-                arguments: typeof tc.function?.arguments === 'string'
-                    ? JSON.parse(tc.function.arguments)
-                    : tc.function?.arguments ?? {},
-            },
-        }));
-        // Calculate usage (Ollama provides eval counts)
-        const usage = {
-            inputTokens: data.prompt_eval_count ?? 0,
-            outputTokens: data.eval_count ?? 0,
-        };
-        return {
-            content: data.message?.content ?? '',
-            toolCalls,
-            model: options.model,
-            usage,
-        };
     }
     async *chatStream(options) {
-        // Set base URL based on model
-        this.updateBaseUrl(options.model);
-        const isCloud = this.baseUrl === CLOUD_URL || options.model.includes('cloud/');
-        // Get model name (strip prefix)
-        const model = options.model.replace(/^ollama\//, '').replace(/^cloud\//, '');
-        // Build messages
+        const { client, isCloud } = this.getClient(options.model);
+        const model = options.model.replace(':cloud', '');
+        // Convert messages to OpenAI format
         const messages = options.messages.map((m) => ({
             role: m.role,
             content: m.content,
         }));
-        const body = {
-            model,
-            messages,
-            stream: true,
-            options: {
-                temperature: options.temperature ?? 0.7,
-                num_predict: options.maxTokens ?? 4096,
-            },
-        };
-        // Build headers
-        const headers = {
-            'Content-Type': 'application/json',
-        };
-        // Add auth for cloud mode
-        if (isCloud || modelRequiresApiKey(options.model)) {
-            const apiKey = getOllamaApiKey();
-            if (apiKey) {
-                headers['Authorization'] = `Bearer ${apiKey}`;
-            }
-        }
-        const res = await fetch(`${this.baseUrl}/api/chat`, {
-            method: 'POST',
-            headers,
-            body: JSON.stringify(body),
-            signal: options.signal,
-        });
-        if (!res.ok) {
-            const err = await res.text().catch(() => res.statusText);
-            throw new Error(`Ollama ${isCloud ? 'Cloud' : 'Local'} error: ${err}`);
-        }
-        if (!res.body) {
-            throw new Error('No response body');
-        }
-        // Process stream
-        const reader = res.body.getReader();
-        const decoder = new TextDecoder();
         try {
-            while (true) {
-                const { done, value } = await reader.read();
-                if (done)
-                    break;
-                const chunk = decoder.decode(value, { stream: true });
-                const lines = chunk.split('\n').filter(line => line.trim());
-                for (const line of lines) {
-                    try {
-                        const data = JSON.parse(line);
-                        if (data.message?.content) {
-                            yield data.message.content;
-                        }
-                    }
-                    catch {
-                        // Ignore parse errors
-                    }
+            const stream = await client.chat({
+                model,
+                messages,
+                stream: true,
+                options: {
+                    temperature: options.temperature ?? 0.7,
+                    num_predict: options.maxTokens ?? 4096,
+                },
+            });
+            for await (const chunk of stream) {
+                if (chunk.message?.content) {
+                    yield chunk.message.content;
                 }
             }
         }
-        finally {
-            reader.releaseLock();
+        catch (err) {
+            throw new Error(`Ollama stream error: ${err.message}`);
         }
     }
     async listModels() {
-        // Try local first
-        const hasLocal = await checkLocalOllama();
         try {
-            const headers = {};
-            const url = hasLocal ? 'http://localhost:11434' : CLOUD_URL;
-            if (!hasLocal) {
-                const apiKey = getOllamaApiKey();
-                if (apiKey)
-                    headers['Authorization'] = `Bearer ${apiKey}`;
+            const { models } = await this.clients.local.list();
+            const modelNames = models.map(m => m.name);
+            // Also list cloud models if available
+            if (this.clients.cloud && !this.cloudOnly) {
+                try {
+                    const { models: cloudModels } = await this.clients.cloud.list();
+                    const cloudNames = cloudModels.map(m => `${m.name}:cloud`);
+                    return [...modelNames, ...cloudNames];
+                }
+                catch {
+                    // Cloud unavailable, just return local
+                }
             }
-            const res = await fetch(`${url}/api/tags`, { headers });
-            if (!res.ok)
-                return [];
-            const data = await res.json();
-            return (data.models ?? []).map((m) => m.name);
+            return modelNames;
         }
         catch {
+            // If local fails, try cloud
+            if (this.clients.cloud) {
+                const { models } = await this.clients.cloud.list();
+                return models.map(m => `${m.name}:cloud`);
+            }
             return [];
         }
     }
+    /**
+     * Check if Ollama is running (local mode)
+     */
+    async isLocalRunning() {
+        try {
+            await this.clients.local.list();
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Check if running in cloud-only mode
+     */
+    isCloudOnly() {
+        return this.cloudOnly;
+    }
 }
 /**
  * Check if Ollama is running (local mode)
- * Re-exported from extension for compatibility
  */
 export async function isOllamaRunning() {
-    return checkLocalOllama();
+    try {
+        const client = new Ollama({ host: process.env.OLLAMA_HOST || 'http://localhost:11434' });
+        await client.list();
+        return true;
+    }
+    catch {
+        return false;
+    }
 }
 /**
  * List available Ollama models
- * Re-exported from extension for compatibility
  */
 export async function listOllamaModels() {
     const provider = new OllamaProvider();
@@ -249,5 +185,15 @@ export async function listOllamaModels() {
 export function createOllamaProvider() {
     return new OllamaProvider();
 }
+/**
+ * Get singleton Ollama provider instance
+ */
+let ollamaProviderInstance = null;
+export function getOllamaProvider() {
+    if (!ollamaProviderInstance) {
+        ollamaProviderInstance = new OllamaProvider();
+    }
+    return ollamaProviderInstance;
+}
 export default createOllamaProvider;
 //# sourceMappingURL=ollama.js.map