thighthening

Author: STetsing

apps/remix-ide/src/app/plugins/remixAI/ApiKeySettingsHelper.ts

@@ -66,10 +66,11 @@ export class ApiKeySettingsHelper {
       const hasPermission = await this.canUseOwnApiKeys()
 
       // Read settings via plugin calls (parallel for performance). We read the
-      // Bedrock API key regardless of `hasPermission`, because Bedrock has no
-      // Remix proxy: if the user entered a key it must be used, there's no
-      // proxy alternative to gate it against. The permission flag only governs
-      // the proxy-backed providers below.
+      // Bedrock API key regardless of `hasPermission`: a present key means the
+      // user wants direct access, which must be honoured. When absent, Bedrock
+      // falls back to the Remix proxy (handled in the ModelFactory). The
+      // permission flag only governs own-key access on the proxy-backed
+      // providers below.
       const [
         useOwnKeysValue,
         anthropicApiKey,
@@ -84,7 +85,7 @@ export class ApiKeySettingsHelper {
         this.getSetting('deepagent-mistral-api-key'),
         this.getSetting('deepagent-openai-api-key'),
         this.getSetting('deepagent-moonshot-api-key'),
-        this.getSetting('deepagent-openrouter-api-key')
+        this.getSetting('deepagent-openrouter-api-key'),
         this.getSetting('deepagent-bedrock-bearer-token')
       ])
 
@@ -124,7 +125,7 @@ export class ApiKeySettingsHelper {
         mistralApiKey: String(mistralApiKey || ''),
         openaiApiKey: String(openaiApiKey || ''),
         moonshotApiKey: String(moonshotApiKey || ''),
-        openrouterApiKey: String(openrouterApiKey || '')
+        openrouterApiKey: String(openrouterApiKey || ''),
         bedrockBearerToken: String(bedrockBearerToken || '')
       }
     } catch (error) {
@@ -138,8 +139,8 @@ export class ApiKeySettingsHelper {
    */
   async isUsingOwnApiKeyForProvider(provider: string): Promise<boolean> {
     try {
-      // Bedrock has no proxy — it's always "own key" when a Bedrock API key is
-      // present, independent of the proxy-vs-own-key toggle.
+      // A present Bedrock API key means direct ("own key") access, independent
+      // of the proxy-vs-own-key toggle; without one we route through the proxy.
       if (provider === 'bedrock') {
         return !!(await this.getSetting('deepagent-bedrock-bearer-token'))
       }

apps/remix-ide/src/app/plugins/remixAI/MCPServerManager.ts

@@ -6,7 +6,7 @@ import type { PermissionChecker } from './PermissionChecker'
 export interface MCPServerManagerDeps {
   plugin: IRemixAIPlugin
   permissionChecker: PermissionChecker
-  setModel: (modelId: string) => Promise<void>
+  setModel: (modelId: string, provider?: string) => Promise<void>
   reinitializeDeepAgent: () => Promise<void>
 }
 

apps/remix-ide/src/app/plugins/remixAI/ModelManager.ts

@@ -7,7 +7,9 @@ import { remixAILogger,
   getBestAvailableModel,
   listModels,
   modelSupportsTools,
-  getModelById
+  getModelById,
+  findModel,
+  ANONYMOUS_FALLBACK_MODELS
 } from '@remix/remix-ai-core'
 import type { AIModel } from '@remix/remix-ai-core'
 import type { IRemixAIPlugin } from './types'
@@ -26,23 +28,18 @@ export class ModelManager {
     this.deps = deps
   }
 
-  async setModel(modelId: string, allowedModels: string[] = []): Promise<void> {
+  async setModel(modelId: string, allowedModels: string[] = [], provider?: string): Promise<void> {
     const plugin = this.deps.plugin
-    // The static `getModelById` only knows the anonymous fallback list
-    // (placeholder + ollama). Real model metadata lives in the
-    // assistantState plugin, fed by /permissions.ai_models. Look it up
-    // there first; only fall back to the static helper for the bootstrap
-    // / ollama cases.
     let model: AIModel | undefined
     try {
       const dynamic: AIModel[] = await plugin.call('assistantState', 'getAvailableModels')
       if (Array.isArray(dynamic)) {
-        model = dynamic.find(m => m.id === modelId)
+        model = findModel(dynamic, modelId, provider)
       }
     } catch (e) {
       remixAILogger.warn('[ModelManager] assistantState.getAvailableModels failed', e)
     }
-    if (!model) model = getModelById(modelId)
+    if (!model) model = findModel(ANONYMOUS_FALLBACK_MODELS, modelId, provider) ?? getModelById(modelId)
     if (!model) {
       // No silent fallback. The picker is fed by /permissions — if a
       // caller asks for a model id that isn't in any catalogue we have a
@@ -180,7 +177,7 @@ export class ModelManager {
       throw new Error(`[ModelManager.setAssistantProvider] No available model for provider "${provider}" in /permissions ai_models. Backend must advertise at least one row for this provider.`)
     }
     const chosen = candidates.find(m => m.isDefault) ?? candidates[0]
-    await this.setModel(chosen.id)
+    await this.setModel(chosen.id, [], chosen.provider)
   }
 
   async getOllamaModels(): Promise<{ name: string; supported: boolean }[]> {

apps/remix-ide/src/app/plugins/remixAIPlugin.tsx

@@ -131,7 +131,7 @@ export class RemixAIPlugin extends Plugin {
     this.mcpManager.setDeps({
       plugin: this as any,
       permissionChecker: this.permissionChecker,
-      setModel: (modelId: string) => this.modelManager.setModel(modelId),
+      setModel: (modelId: string, provider?: string) => this.modelManager.setModel(modelId, [], provider),
       reinitializeDeepAgent: () => this.deepAgentManager.reinitialize()
     })
 
@@ -357,7 +357,7 @@ export class RemixAIPlugin extends Plugin {
         // GenerationParams/CompletionParams pick up the provider+model
         // and DeepAgent (if enabled) reinitialises.
         try {
-          await this.setModel(def.id)
+          await this.setModel(def.id, def.provider)
         } catch (e) {
           remixAILogger.warn('[RemixAI Plugin] setModel failed during initial /permissions resolution', e)
         }
@@ -562,7 +562,7 @@ export class RemixAIPlugin extends Plugin {
     // resolved one. Without an id the picker is empty and downstream
     // setModel would throw — we let the assistantState subscription do it.
     if (this.selectedModelId) {
-      await this.setModel(this.selectedModelId)
+      await this.setModel(this.selectedModelId, this.selectedModel?.provider)
     } else {
       remixAILogger.log('[RemixAI Plugin] initialize: no selectedModelId yet, deferring setModel until /permissions loads')
     }
@@ -744,15 +744,10 @@ export class RemixAIPlugin extends Plugin {
         }
       }
       remixAILogger.log('[answer][route-flow]', routeFlow)
-      console.log('[answer][route-flow] route', route)
       if (!remoteRouteCheck && route === 'remote') {
         remixAILogger.warn('[answer][route-flow] remote route selected but remoteInferencer is missing')
       }
       if (route === 'deepagent') {
-        // If a previous cancelRequest is still rebuilding the inferencer,
-        // wait for it to finish so this dispatch lands on the new
-        // instance with a clean LangGraph pipe rather than racing the
-        // about-to-be-discarded one.
         await this.deepAgentManager.awaitReady()
         remixAILogger.log('[answer][route-flow] dispatch=deepagent.answer')
         return await this.deepAgentInferencer.answer(newPrompt, params, this.workspaceAgent.ctxFiles || '')
@@ -1014,8 +1009,8 @@ export class RemixAIPlugin extends Plugin {
     return this.modelManager.setAssistantProvider(provider)
   }
 
-  async setModel(modelId: string, allowedModels: string[] = []) {
-    return this.modelManager.setModel(modelId, allowedModels)
+  async setModel(modelId: string, provider?: string, allowedModels: string[] = []) {
+    return this.modelManager.setModel(modelId, allowedModels, provider)
   }
 
   async setOllamaModel(ollamaModelName: string) {

libs/remix-ai-core/src/helpers/apiKeyValidator.ts

@@ -87,6 +87,8 @@ export function validateApiKeyFormat(provider: ModelProvider, apiKey: string): A
         error: 'OpenRouter API key should start with "sk-or-"'
       }
     }
+    break
+
   case 'bedrock':
     if (trimmedKey.length < 20) {
       return {
@@ -137,7 +139,7 @@ export async function testApiKey(provider: ModelProvider, apiKey: string): Promi
 
     case 'openrouter':
       return await testOpenRouterKey(trimmedKey)
-        
+
     case 'bedrock':
       return await testBedrockKey(trimmedKey)
 
@@ -335,6 +337,47 @@ async function testMoonshotKey(apiKey: string): Promise<ApiKeyValidationResult>
   }
 }
 
+async function testOpenRouterKey(apiKey: string): Promise<ApiKeyValidationResult> {
+  try {
+    const response = await fetch('https://openrouter.ai/api/v1/key', {
+      method: 'GET',
+      headers: {
+        'Authorization': `Bearer ${apiKey}`
+      }
+    })
+
+    if (response.ok) {
+      return { isValid: true, provider: 'openrouter' }
+    }
+
+    if (response.status === 401) {
+      return {
+        isValid: false,
+        provider: 'openrouter',
+        error: 'Invalid API key - authentication failed'
+      }
+    }
+
+    if (response.status === 429) {
+      // Rate limited but key is valid
+      return { isValid: true, provider: 'openrouter' }
+    }
+
+    const errorData = await response.json().catch(() => ({}))
+    return {
+      isValid: false,
+      provider: 'openrouter',
+      error: errorData?.error?.message || `API returned status ${response.status}`
+    }
+  } catch (error: any) {
+    return {
+      isValid: false,
+      provider: 'openrouter',
+      error: error?.message || 'Network error testing API key'
+    }
+  }
+}
+
 async function testBedrockKey(apiKey: string): Promise<ApiKeyValidationResult> {
   const region = 'us-east-1'
   const modelId = 'amazon.nova-micro-v1:0'
@@ -369,8 +412,6 @@ async function testBedrockKey(apiKey: string): Promise<ApiKeyValidationResult> {
       }
     }
 
-    // Throttled, or a request-shape validation error — the token still
-    // authenticated (an invalid one is rejected with 401/403 first).
     if (response.status === 429 || response.status === 400) {
       return { isValid: true, provider: 'bedrock' }
     }

libs/remix-ai-core/src/index.ts

@@ -3,7 +3,7 @@
 import { ICompletions,
   IParams, ChatEntry, AIRequestType, IRemoteModel } from './types/types'
 import { ModelType } from './types/constants'
-import { InsertionParams, CompletionParams, GenerationParams, AssistantParams, AIModel, ANONYMOUS_FALLBACK_MODELS, ANONYMOUS_PLACEHOLDER_MODEL, OLLAMA_MODEL, BEDROCK_MODELS, getModelById, parseAIModelsFromPermissions } from './types/models'
+import { InsertionParams, CompletionParams, GenerationParams, AssistantParams, AIModel, ANONYMOUS_FALLBACK_MODELS, ANONYMOUS_PLACEHOLDER_MODEL, OLLAMA_MODEL, BEDROCK_MODELS, getModelById, parseAIModelsFromPermissions, modelKey, parseModelKey, findModel } from './types/models'
 import { buildChatPrompt } from './prompts/promptBuilder'
 import { RemoteInferencer } from './inferencers/remote/remoteInference'
 import { OllamaInferencer } from './inferencers/local/ollamaInferencer'
@@ -28,7 +28,7 @@ export {
   InsertionParams, CompletionParams, GenerationParams, AssistantParams,
   ChatEntry, AIRequestType, ChatHistory, resetOllamaHostOnSettingsChange,
   mcpDefaultServersConfig, mcpBasicServersConfig, mcpWebSearchServersConfig,
-  AIModel, ANONYMOUS_FALLBACK_MODELS, ANONYMOUS_PLACEHOLDER_MODEL, OLLAMA_MODEL, BEDROCK_MODELS, getModelById, parseAIModelsFromPermissions,
+  AIModel, ANONYMOUS_FALLBACK_MODELS, ANONYMOUS_PLACEHOLDER_MODEL, OLLAMA_MODEL, BEDROCK_MODELS, getModelById, parseAIModelsFromPermissions, modelKey, parseModelKey, findModel,
   ChatHistoryStorageManager, IndexedDBChatHistoryBackend,
   WeightedToolSelector, IChatMessage,
   remixAILogger, setRemixAILoggingEnabled, isRemixAILoggingEnabled

libs/remix-ai-core/src/inferencers/deepagent/ModelFactory.ts

@@ -2,14 +2,15 @@ import { remixAILogger } from '../../helpers/logger'
 import { ChatAnthropic } from '@langchain/anthropic'
 import { ChatMistralAI } from '@langchain/mistralai'
 import { ChatOpenAI } from '@langchain/openai'
+import { ChatOpenRouter } from '@langchain/openrouter'
 import { ChatOllama } from '@langchain/ollama'
 import { ChatBedrockConverse } from '@langchain/aws'
 import { BaseChatModel } from '@langchain/core/language_models/chat_models'
 import { HTTPClient } from '@mistralai/mistralai/lib/http.js'
 import { endpointUrls } from '@remix-endpoints-helper'
 import { ModelSelection, IUserApiKeyConfig } from '../../types/deepagent'
 import { DAPP_MAX_TOKENS } from './constants'
-import { getRemixAuthHeader } from '../auth'
+import { getRemixAuthHeader, getRemixAccessToken } from '../auth'
 import { discoverOllamaHost, getBestAvailableModel, getModelCapabilities } from '../local/ollama'
 
 const AI_DEBUG = (() => {
@@ -460,39 +461,58 @@ export async function createModelInstance(
   case 'openrouter': {
     const useDirectApi = !!(userApiKeys?.useOwnKeys && userApiKeys?.openrouterApiKey)
     remixAILogger.log(`[ModelFactory] Creating OpenRouter model: ${modelId}${useDirectApi ? ' (direct API)' : ' (proxy)'}`)
+    // Own key → talk to OpenRouter directly through its dedicated LangChain SDK.
+    if (useDirectApi) {
+      return wrapModelForDebug(new ChatOpenRouter({
+        apiKey: userApiKeys!.openrouterApiKey as string,
+        model: modelId,
+        temperature: 0.7,
+        maxTokens: maxTokens,
+        maxRetries: 0,
+      }), `openrouter/${modelId}`)
+    }
+    // No key → route through the Remix proxy (OpenAI-compatible endpoint).
     return wrapModelForDebug(new ChatOpenAI({
-      apiKey: useDirectApi ? (userApiKeys!.openrouterApiKey as string) : 'proxy-handled',
+      apiKey: 'proxy-handled',
       model: modelId,
       temperature: 0.7,
       maxTokens: maxTokens,
       streaming: true,
       maxRetries: 0,
-      ...(useDirectApi
-        ? {
-          configuration: {
-            baseURL: 'https://openrouter.ai/api/v1'
-          }
-        }
-        : {
-          configuration: {
-            baseURL: `${endpointUrls.langchain}/openrouter`,
-            fetch: authedFetch
-          }
-        })
+      configuration: {
+        baseURL: `${endpointUrls.langchain}/openrouter`,
+        fetch: authedFetch
+      }
     }), `openrouter/${modelId}`)
+  }
+
   case 'bedrock': {
     const bedrockBearerToken = userApiKeys?.bedrockBearerToken?.trim()
-    if (!bedrockBearerToken) {
-      throw new Error('[ModelFactory] AWS Bedrock models requires a Bedrock API key. Add it under Settings → Bring Your Own API Keys.')
-    }
-
     const region = DEFAULT_BEDROCK_REGION
     const bedrockModelId = resolveBedrockModelId(modelId, region)
-    remixAILogger.log(`[ModelFactory] Creating AWS Bedrock model: ${bedrockModelId} @ ${region}`)
+    const useDirectApi = !!bedrockBearerToken
+
+    if (useDirectApi) {
+      remixAILogger.log(`[ModelFactory] Creating AWS Bedrock model: ${bedrockModelId} @ ${region} (direct API)`)
+      return wrapModelForDebug(patchBedrockBindTools(new ChatBedrockConverse({
+        model: bedrockModelId,
+        region,
+        bedrockBearerToken,
+      })), `bedrock/${bedrockModelId}`)
+    }
+
+    // Proxy mode: no user-provided key. Route the Bedrock Converse calls through
+    const remixToken = getRemixAccessToken()
+    if (!remixToken) {
+      throw new Error('[ModelFactory] AWS Bedrock requires you to be signed in to use the Remix proxy, or add your own Bedrock API key under Settings → Bring Your Own API Keys.')
+    }
+    const proxyEndpointHost = `${endpointUrls.langchain}/bedrock`.replace(/^https?:\/\//, '')
+    remixAILogger.log(`[ModelFactory] Creating AWS Bedrock model: ${bedrockModelId} @ ${region} (proxy)`)
     return wrapModelForDebug(patchBedrockBindTools(new ChatBedrockConverse({
       model: bedrockModelId,
       region,
-      bedrockBearerToken,
+      bedrockBearerToken: remixToken,
+      endpointHost: proxyEndpointHost,
     })), `bedrock/${bedrockModelId}`)
   }
 

libs/remix-ai-core/src/types/deepagent.ts

@@ -15,9 +15,6 @@ export interface IUserApiKeyConfig {
   openaiApiKey?: string
   moonshotApiKey?: string
   openrouterApiKey?: string
-  // AWS Bedrock API key (bearer token) for the `bedrock` provider. Bedrock has
-  // no Remix proxy, so this is always user-provided. The key is region-scoped
-  // at creation (see DEFAULT_BEDROCK_REGION in ModelFactory).
   bedrockBearerToken?: string
 }
 
@@ -28,7 +25,6 @@ export function isUsingOwnKeyForProvider(
   if (!keys) return false
   switch (provider) {
   case 'bedrock':
-    // Bedrock has no proxy — a configured key means own-key, always.
     return !!keys.bedrockBearerToken
   case 'anthropic':
     return !!(keys.useOwnKeys && keys.anthropicApiKey)
@@ -38,6 +34,8 @@ export function isUsingOwnKeyForProvider(
     return !!(keys.useOwnKeys && keys.openaiApiKey)
   case 'moonshot':
     return !!(keys.useOwnKeys && keys.moonshotApiKey)
+  case 'openrouter':
+    return !!(keys.useOwnKeys && keys.openrouterApiKey)
   default:
     return false
   }