Merge pull request #7555 from remix-project-org/aws2

Aws Bedrock

Author: STetsing

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

@@ -61,45 +61,64 @@ export class ApiKeySettingsHelper {
    */
   async getUserApiKeysConfig(): Promise<IUserApiKeyConfig | undefined> {
     try {
-      // First check if user has permission to use own API keys
+      // Whether the user may swap the Remix proxy for their own keys on the
+      // proxy-backed providers (anthropic / mistral / openai / moonshot).
       const hasPermission = await this.canUseOwnApiKeys()
-      if (!hasPermission) {
-        remixAILogger.log('[ApiKeySettingsHelper] User does not have permission to use own API keys')
-        return undefined
-      }
 
-      // Read settings via plugin calls (parallel for performance)
-      const [useOwnKeysValue, anthropicApiKey, mistralApiKey, openaiApiKey, moonshotApiKey] = await Promise.all([
+      // 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.
+      const [
+        useOwnKeysValue,
+        anthropicApiKey,
+        mistralApiKey,
+        openaiApiKey,
+        moonshotApiKey,
+        bedrockBearerToken
+      ] = await Promise.all([
         this.getSetting('deepagent-api-keys-config'),
         this.getSetting('deepagent-anthropic-api-key'),
         this.getSetting('deepagent-mistral-api-key'),
         this.getSetting('deepagent-openai-api-key'),
-        this.getSetting('deepagent-moonshot-api-key')
+        this.getSetting('deepagent-moonshot-api-key'),
+        this.getSetting('deepagent-bedrock-bearer-token')
       ])
 
       const useOwnKeys = useOwnKeysValue === 'true' || useOwnKeysValue === true
 
+      const hasBedrockKey = !!bedrockBearerToken
+
+      // Proxy-provider own keys are gated behind the permission; the Bedrock
+      // key is not (see above).
+      const anthropic = hasPermission ? String(anthropicApiKey || '') : ''
+      const mistral = hasPermission ? String(mistralApiKey || '') : ''
+      const openai = hasPermission ? String(openaiApiKey || '') : ''
+      const moonshot = hasPermission ? String(moonshotApiKey || '') : ''
+      const hasAnyProxyKey = !!(anthropic || mistral || openai || moonshot)
+
       // Debug logging
       remixAILogger.log('[ApiKeySettingsHelper] Reading API keys from settings:', {
+        hasPermission,
         useOwnKeys,
-        hasAnthropicKey: !!anthropicApiKey,
-        hasMistralKey: !!mistralApiKey,
-        hasOpenaiKey: !!openaiApiKey,
-        hasMoonshotKey: !!moonshotApiKey
+        hasAnyProxyKey,
+        hasBedrockKey
       })
 
-      // Auto-enable if any API key is set
-      const hasAnyKey = anthropicApiKey || mistralApiKey || openaiApiKey || moonshotApiKey
-      if (!useOwnKeys && !hasAnyKey) {
+      // Nothing to contribute → callers fall back to the proxy.
+      //  - No Bedrock key AND no proxy-provider own keys in play.
+      if (!hasBedrockKey && !hasAnyProxyKey && !(useOwnKeys && hasPermission)) {
         return undefined
       }
 
       return {
-        useOwnKeys: useOwnKeys || !!hasAnyKey,
-        anthropicApiKey: String(anthropicApiKey || ''),
-        mistralApiKey: String(mistralApiKey || ''),
-        openaiApiKey: String(openaiApiKey || ''),
-        moonshotApiKey: String(moonshotApiKey || '')
+        useOwnKeys: (useOwnKeys && hasPermission) || hasAnyProxyKey || hasBedrockKey,
+        anthropicApiKey: anthropic,
+        mistralApiKey: mistral,
+        openaiApiKey: openai,
+        moonshotApiKey: moonshot,
+        bedrockBearerToken: String(bedrockBearerToken || '')
       }
     } catch (error) {
       remixAILogger.warn('[ApiKeySettingsHelper] Failed to read user API keys config:', error)
@@ -112,6 +131,12 @@ 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.
+      if (provider === 'bedrock') {
+        return !!(await this.getSetting('deepagent-bedrock-bearer-token'))
+      }
+
       const useOwnKeysValue = await this.getSetting('deepagent-api-keys-config')
       const useOwnKeys = useOwnKeysValue === 'true' || useOwnKeysValue === true
 

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

@@ -1,4 +1,4 @@
-import { remixAILogger, CONVERSATION_THREAD_PREFIX, DeepAgentInferencer, getBestAvailableModel } from '@remix/remix-ai-core'
+import { remixAILogger, CONVERSATION_THREAD_PREFIX, DeepAgentInferencer, getBestAvailableModel, isUsingOwnKeyForProvider } from '@remix/remix-ai-core'
 import type { IRemixAIPlugin, ToolApprovalResponse } from './types'
 import type { DeepAgentEventBridge } from './DeepAgentEventBridge'
 import type { MCPServerManager } from './MCPServerManager'
@@ -88,8 +88,9 @@ export class DeepAgentManager {
         remixAILogger.log('[RemixAI Plugin] Using user-provided API keys for DeepAgent')
       }
       const resolvedModelId = await this.resolveOllamaModelId(plugin.selectedModel.provider, plugin.selectedModelId)
-      // Don't use remote fallback for Ollama - user explicitly chose local models
-      const fallbackInferencer = plugin.selectedModel.provider === 'ollama' ? null : plugin.remoteInferencer
+      const fallbackInferencer = (plugin.selectedModel.provider === 'ollama' || isUsingOwnKeyForProvider(plugin.selectedModel.provider, userApiKeys))
+        ? null
+        : plugin.remoteInferencer
 
       // Clean up old instance if it exists
       if (plugin.deepAgentInferencer && typeof plugin.deepAgentInferencer.cleanup === 'function') {
@@ -107,7 +108,7 @@ export class DeepAgentManager {
         },
         fallbackInferencer,
         plugin.mcpInferencer,
-        { provider: plugin.selectedModel.provider as 'anthropic' | 'mistralai' | 'openai' | 'moonshot' | 'ollama', modelId: resolvedModelId }
+        { provider: plugin.selectedModel.provider as 'anthropic' | 'mistralai' | 'openai' | 'moonshot' | 'ollama' | 'bedrock', modelId: resolvedModelId }
       )
 
       await plugin.deepAgentInferencer.initialize()
@@ -283,6 +284,7 @@ export class DeepAgentManager {
   }
 
   private async doReinitialize(): Promise<void> {
+    console.log('[DeepAgentManager] doReinitialize: starting reinitialization of DeepAgentInferencer')
     const plugin = this.deps.plugin
     const hasSelectedModel = !!(plugin.selectedModel && plugin.selectedModelId)
 
@@ -308,8 +310,9 @@ export class DeepAgentManager {
           remixAILogger.log('[RemixAI Plugin] Using user-provided API keys for DeepAgent (reinitialize)')
         }
         const resolvedModelId = await this.resolveOllamaModelId(plugin.selectedModel.provider, plugin.selectedModelId)
-        // Don't use remote fallback for Ollama - user explicitly chose local models
-        const fallbackInferencer = plugin.selectedModel.provider === 'ollama' ? null : plugin.remoteInferencer
+        const fallbackInferencer = (plugin.selectedModel.provider === 'ollama' || isUsingOwnKeyForProvider(plugin.selectedModel.provider, userApiKeys))
+          ? null
+          : plugin.remoteInferencer
 
         // Clean up old instance if it exists
         if (plugin.deepAgentInferencer && typeof plugin.deepAgentInferencer.cleanup === 'function') {
@@ -327,7 +330,7 @@ export class DeepAgentManager {
           },
           fallbackInferencer,
           plugin.mcpInferencer,
-          { provider: plugin.selectedModel.provider as 'anthropic' | 'mistralai' | 'openai' | 'moonshot' | 'ollama', modelId: resolvedModelId }
+          { provider: plugin.selectedModel.provider as 'anthropic' | 'mistralai' | 'openai' | 'moonshot' | 'ollama' | 'bedrock', modelId: resolvedModelId }
         )
         await plugin.deepAgentInferencer.initialize()
         plugin.deepAgentEnabled = true
@@ -357,6 +360,7 @@ export class DeepAgentManager {
         remixAILogger.log('[RemixAI Plugin] DeepAgent reinitialized successfully')
       } catch (error) {
         remixAILogger.error('[RemixAI Plugin] Failed to reinitialize DeepAgent:', error)
+        console.error('[DeepAgentManager] doReinitialize: caught error', error)
         plugin.deepAgentEnabled = false
         plugin.deepAgentInferencer = null
         ;(plugin as any).traceDeepAgentLifecycle?.('manager.reinitialize:failed', 'caught error inside DeepAgentManager.reinitialize()', {

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

@@ -3,7 +3,7 @@ import { Plugin } from '@remixproject/engine';
 import { trackMatomoEvent, Features, ChatPromptMetadata } from '@remix-api'
 import { remixAILogger, RemoteInferencer, IRemoteModel, IParams, GenerationParams, AssistantParams, CodeExplainAgent, SecurityAgent, CompletionParams, OllamaInferencer } from '@remix/remix-ai-core';
 import { CodeCompletionAgent, ContractAgent, workspaceAgent, IContextType, mcpDefaultServersConfig, mcpBasicServersConfig, mcpWebSearchServersConfig } from '@remix/remix-ai-core';
-import { MCPInferencer, DeepAgentInferencer, onApiKeysChange } from '@remix/remix-ai-core';
+import { MCPInferencer, DeepAgentInferencer, onApiKeysChange, isUsingOwnKeyForProvider } from '@remix/remix-ai-core';
 import { IMCPServer, IMCPConnectionStatus } from '@remix/remix-ai-core';
 import { RemixMCPServer, createRemixMCPServer } from '@remix/remix-ai-core';
 import { AIModel } from '@remix/remix-ai-core';
@@ -493,8 +493,9 @@ export class RemixAIPlugin extends Plugin {
           remixAILogger.log('[RemixAI Plugin] Using user-provided API keys for DeepAgent')
         }
 
-        // Don't use remote fallback for Ollama - user explicitly chose local models
-        const fallbackInferencer = this.selectedModel.provider === 'ollama' ? null : this.remoteInferencer
+        const fallbackInferencer = (this.selectedModel.provider === 'ollama' || isUsingOwnKeyForProvider(this.selectedModel.provider, userApiKeys))
+          ? null
+          : this.remoteInferencer
 
         // Clean up old instance if it exists
         if (this.deepAgentInferencer && typeof this.deepAgentInferencer.cleanup === 'function') {
@@ -512,7 +513,7 @@ export class RemixAIPlugin extends Plugin {
           },
           fallbackInferencer,
           this.mcpInferencer, // Pass MCPInferencer to gather external MCP client tools
-          { provider: this.selectedModel.provider as 'anthropic' | 'mistralai' | 'openai' | 'moonshot' | 'ollama', modelId: this.selectedModelId } // Pass selected model
+          { provider: this.selectedModel.provider as 'anthropic' | 'mistralai' | 'openai' | 'moonshot' | 'ollama' | 'bedrock', modelId: this.selectedModelId } // Pass selected model
         )
         await this.deepAgentInferencer.initialize()
         // Set up DeepAgent event listeners for streaming (once only)
@@ -743,6 +744,7 @@ 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')
       }

apps/remix-ide/src/app/tabs/locales/en/settings.json

@@ -107,6 +107,7 @@
   "settings.deepagent-mistral-api-key": "MistralAI API Key",
   "settings.deepagent-openai-api-key": "OpenAI API Key",
   "settings.deepagent-moonshot-api-key": "Moonshot/Kimi API Key",
+  "settings.deepagent-bedrock-bearer-token": "AWS Bedrock API Key",
   "settings.testApiKey": "Test",
   "settings.testing": "Testing...",
   "settings.apiKeyValid": "API key is valid",

apps/remix-ide/webpack.config.js

@@ -123,6 +123,8 @@ module.exports = composePlugins(withNx(), withReact(), (config) => {
     module: false,
     tls: false,
     net: false,
+    http2: false,
+    dns: false,
     readline: false,
     child_process: false,
     buffer: require.resolve('buffer/'),
@@ -155,6 +157,9 @@ module.exports = composePlugins(withNx(), withReact(), (config) => {
   // Prefer browser/Esm entry points where available
   config.resolve.mainFields = ['browser', 'module', 'main']
 
+  // Honor the `browser` field remaps in package.json (object form) for the AWS SDK
+  config.resolve.aliasFields = ['browser']
+
   config.resolve.alias = {
     ...config.resolve.alias,
     // Avoid bundling server-only deps or optional node paths
@@ -276,6 +281,8 @@ module.exports = composePlugins(withNx(), withReact(), (config) => {
         `)
       } else if (replacements[module]) {
         resource.request = replacements[module]
+      } else {
+        resource.request = module
       }
     })
   )

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

@@ -79,6 +79,16 @@ export function validateApiKeyFormat(provider: ModelProvider, apiKey: string): A
     }
     break
 
+  case 'bedrock':
+    if (trimmedKey.length < 20) {
+      return {
+        isValid: false,
+        provider,
+        error: 'AWS Bedrock API key appears to be too short'
+      }
+    }
+    break
+
   case 'ollama':
     return {
       isValid: true,
@@ -117,6 +127,9 @@ export async function testApiKey(provider: ModelProvider, apiKey: string): Promi
     case 'moonshot':
       return await testMoonshotKey(trimmedKey)
 
+    case 'bedrock':
+      return await testBedrockKey(trimmedKey)
+
     case 'ollama':
       return { isValid: true, provider }
 
@@ -311,7 +324,63 @@ async function testMoonshotKey(apiKey: string): Promise<ApiKeyValidationResult>
   }
 }
 
+async function testBedrockKey(apiKey: string): Promise<ApiKeyValidationResult> {
+  const region = 'us-east-1'
+  const modelId = 'amazon.nova-micro-v1:0'
+  try {
+    const response = await fetch(
+      `https://bedrock-runtime.${region}.amazonaws.com/model/${encodeURIComponent(modelId)}/converse`,
+      {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': `Bearer ${apiKey}`
+        },
+        body: JSON.stringify({
+          messages: [{ role: 'user', content: [{ text: 'ping' }]}],
+          inferenceConfig: { maxTokens: 1 }
+        })
+      }
+    )
+
+    // Authenticated and served.
+    if (response.ok) {
+      return { isValid: true, provider: 'bedrock' }
+    }
+
+    // Bad / expired / unrecognized token.
+    if (response.status === 401 || response.status === 403) {
+      const errorData = await response.json().catch(() => ({} as any))
+      return {
+        isValid: false,
+        provider: 'bedrock',
+        error: errorData?.message || errorData?.Message || 'Invalid API key - authentication failed'
+      }
+    }
+
+    // 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' }
+    }
+
+    const errorData = await response.json().catch(() => ({} as any))
+    return {
+      isValid: false,
+      provider: 'bedrock',
+      error: errorData?.message || errorData?.Message || `API returned status ${response.status}`
+    }
+  } catch (error: any) {
+    return {
+      isValid: false,
+      provider: 'bedrock',
+      error: error?.message || 'Network error testing API key'
+    }
+  }
+}
+
 export function getProviderFromSettingKey(settingKey: string): ModelProvider | null {
+  if (settingKey.includes('bedrock')) return 'bedrock'
   if (settingKey.includes('anthropic')) return 'anthropic'
   if (settingKey.includes('openai')) return 'openai'
   if (settingKey.includes('mistral')) return 'mistralai'

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, getModelById, parseAIModelsFromPermissions } from './types/models'
+import { InsertionParams, CompletionParams, GenerationParams, AssistantParams, AIModel, ANONYMOUS_FALLBACK_MODELS, ANONYMOUS_PLACEHOLDER_MODEL, OLLAMA_MODEL, BEDROCK_MODELS, getModelById, parseAIModelsFromPermissions } 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, getModelById, parseAIModelsFromPermissions,
+  AIModel, ANONYMOUS_FALLBACK_MODELS, ANONYMOUS_PLACEHOLDER_MODEL, OLLAMA_MODEL, BEDROCK_MODELS, getModelById, parseAIModelsFromPermissions,
   ChatHistoryStorageManager, IndexedDBChatHistoryBackend,
   WeightedToolSelector, IChatMessage,
   remixAILogger, setRemixAILoggingEnabled, isRemixAILoggingEnabled

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

@@ -799,7 +799,6 @@ export class DeepAgentInferencer implements ICompletions, IGeneration {
   }
 
   public async getProjectStructure(): Promise<string> {
-    console.log('[DeepAgentInferencer] Attempting to retrieve project structure from MCP...')
     if (!this.mcpInferencer) {
       return ''
     }