fix(resolution-search): resolve TypeError in webpack-runtime by refactoring utils and config

app/actions.tsx

@@ -12,7 +12,11 @@ import type { FeatureCollection } from 'geojson'
 import { Spinner } from '@/components/ui/spinner'
 import { Section } from '@/components/section'
 import { FollowupPanel } from '@/components/followup-panel'
-import { inquire, researcher, taskManager, querySuggestor, resolutionSearch, type DrawnFeature } from '@/lib/agents'
+import { inquire } from '@/lib/agents/inquire'
+import { researcher } from '@/lib/agents/researcher'
+import { taskManager } from '@/lib/agents/task-manager'
+import { querySuggestor } from '@/lib/agents/query-suggestor'
+import { resolutionSearch, type DrawnFeature } from '@/lib/agents/resolution-search'
 import { writer } from '@/lib/agents/writer'
 import { saveChat, getSystemPrompt } from '@/lib/actions/chat'
 import { Chat, AIMessage } from '@/lib/types'

lib/actions/suggest.ts

@@ -3,7 +3,7 @@
 import { createStreamableUI, createStreamableValue } from 'ai/rsc'
 import { CoreMessage, LanguageModel, streamObject } from 'ai'
 import { PartialRelated, relatedSchema } from '@/lib/schema/related'
-import { getModel } from '../utils'
+import { getModel } from '../utils/ai-model'
 import { MapData } from '@/components/map/map-data-context'
 
 export async function getSuggestions(

lib/agents/inquire.tsx

@@ -2,7 +2,7 @@ import { Copilot } from '@/components/copilot';
 import { createStreamableUI, createStreamableValue } from 'ai/rsc';
 import { CoreMessage, LanguageModel, streamObject } from 'ai';
 import { PartialInquiry, inquirySchema } from '@/lib/schema/inquiry';
-import { getModel } from '../utils';
+import { getModel } from '../utils/ai-model';
 
 // Define a plain object type for the inquiry prop
 interface InquiryProp {

lib/agents/query-suggestor.tsx

@@ -3,7 +3,7 @@ import { CoreMessage, LanguageModel, streamObject } from 'ai'
 import { PartialRelated, relatedSchema } from '@/lib/schema/related'
 import { Section } from '@/components/section'
 import SearchRelated from '@/components/search-related'
-import { getModel } from '../utils'
+import { getModel } from '../utils/ai-model'
 
 export async function querySuggestor(
   uiStream: ReturnType<typeof createStreamableUI>,

lib/agents/researcher.tsx

@@ -10,7 +10,7 @@ import {
 import { Section } from '@/components/section'
 import { BotMessage } from '@/components/message'
 import { getTools } from './tools'
-import { getModel } from '../utils'
+import { getModel } from '../utils/ai-model'
 import { MapProvider } from '@/lib/store/settings'
 import { DrawnFeature } from './resolution-search'
 

lib/agents/resolution-search.tsx

@@ -1,5 +1,5 @@
 import { CoreMessage, streamObject } from 'ai'
-import { getModel } from '@/lib/utils'
+import { getModel } from '@/lib/utils/ai-model'
 import { z } from 'zod'
 
 // This agent is now a pure data-processing module, with no UI dependencies.

lib/agents/task-manager.tsx

@@ -1,6 +1,6 @@
 import { CoreMessage, generateObject, LanguageModel } from 'ai'
 import { nextActionSchema } from '../schema/next-action'
-import { getModel } from '../utils'
+import { getModel } from '../utils/ai-model'
 
 // Decide whether inquiry is required for the user input
 export async function taskManager(messages: CoreMessage[]) {

lib/agents/writer.tsx

@@ -2,7 +2,7 @@ import { createStreamableUI, createStreamableValue } from 'ai/rsc'
 import { CoreMessage, LanguageModel, streamText as nonexperimental_streamText } from 'ai'
 import { Section } from '@/components/section'
 import { BotMessage } from '@/components/message'
-import { getModel } from '../utils'
+import { getModel } from '../utils/ai-model'
 
 export async function writer(
   dynamicSystemPrompt: string, // New parameter

lib/utils/ai-model.ts

@@ -0,0 +1,103 @@
+import { getSelectedModel } from '@/lib/actions/users'
+import { createOpenAI } from '@ai-sdk/openai'
+import { createGoogleGenerativeAI } from '@ai-sdk/google'
+import { createAmazonBedrock } from '@ai-sdk/amazon-bedrock'
+import { createXai } from '@ai-sdk/xai';
+
+export async function getModel(requireVision: boolean = false) {
+  // Check for specific API model override
+  if (process.env.SPECIFIC_API_MODEL) {
+    const provider = process.env.SPECIFIC_API_MODEL.split(':')[0];
+    const modelId = process.env.SPECIFIC_API_MODEL.split(':').slice(1).join(':');
+
+    if (provider === 'openai') {
+      return createOpenAI({ apiKey: process.env.OPENAI_API_KEY })(modelId);
+    } else if (provider === 'google') {
+      return createGoogleGenerativeAI({ apiKey: process.env.GEMINI_3_PRO_API_KEY })(modelId);
+    } else if (provider === 'xai') {
+      return createXai({ apiKey: process.env.XAI_API_KEY })(modelId);
+    }
+  }
+
+  const selectedModel = await getSelectedModel();
+
+  const xaiApiKey = process.env.XAI_API_KEY;
+  const gemini3ProApiKey = process.env.GEMINI_3_PRO_API_KEY;
+  const awsAccessKeyId = process.env.AWS_ACCESS_KEY_ID;
+  const awsSecretAccessKey = process.env.AWS_SECRET_ACCESS_KEY;
+  const awsRegion = process.env.AWS_REGION;
+  const bedrockModelId = process.env.BEDROCK_MODEL_ID || (requireVision ? 'anthropic.claude-3-5-sonnet-20241022-v2:0' : 'anthropic.claude-3-5-sonnet-20241022-v2:0');
+  const openaiApiKey = process.env.OPENAI_API_KEY;
+
+  if (selectedModel) {
+    switch (selectedModel) {
+      case 'Grok 4.2':
+        if (xaiApiKey) {
+          const xai = createXai({
+            apiKey: xaiApiKey,
+            baseURL: 'https://api.x.ai/v1',
+          });
+          return xai(requireVision ? 'grok-vision-beta' : 'grok-beta');
+        }
+        break;
+      case 'Gemini 3':
+        if (gemini3ProApiKey) {
+          const google = createGoogleGenerativeAI({
+            apiKey: gemini3ProApiKey,
+          });
+          return google(requireVision ? 'gemini-1.5-pro' : 'gemini-1.5-pro');
+        }
+        break;
+      case 'GPT-5.1':
+        if (openaiApiKey) {
+          const openai = createOpenAI({
+            apiKey: openaiApiKey,
+          });
+          return openai('gpt-4o');
+        }
+        break;
+    }
+  }
+
+  // Default behavior: Grok -> Gemini -> Bedrock -> OpenAI
+  if (xaiApiKey) {
+    const xai = createXai({
+      apiKey: xaiApiKey,
+      baseURL: 'https://api.x.ai/v1',
+    });
+    try {
+      return xai(requireVision ? 'grok-vision-beta' : 'grok-beta');
+    } catch (error) {
+      console.warn('xAI API unavailable, falling back to next provider');
+    }
+  }
+
+  if (gemini3ProApiKey) {
+    const google = createGoogleGenerativeAI({
+      apiKey: gemini3ProApiKey,
+    });
+    try {
+      return google(requireVision ? 'gemini-1.5-pro' : 'gemini-1.5-pro');
+    } catch (error) {
+      console.warn('Gemini 3 Pro API unavailable, falling back to next provider:', error);
+    }
+  }
+
+  if (awsAccessKeyId && awsSecretAccessKey) {
+    const bedrock = createAmazonBedrock({
+      bedrockOptions: {
+        region: awsRegion,
+        credentials: {
+          accessKeyId: awsAccessKeyId,
+          secretAccessKey: awsSecretAccessKey,
+        },
+      },
+    });
+    return bedrock(bedrockModelId);
+  }
+
+  const openai = createOpenAI({
+    apiKey: openaiApiKey,
+  });
+  return openai('gpt-4o');
+}

lib/utils/index.ts

@@ -1,10 +1,5 @@
 import { type ClassValue, clsx } from 'clsx'
 import { twMerge } from 'tailwind-merge'
-import { getSelectedModel } from '@/lib/actions/users'
-import { createOpenAI } from '@ai-sdk/openai'
-import { createGoogleGenerativeAI } from '@ai-sdk/google'
-import { createAmazonBedrock } from '@ai-sdk/amazon-bedrock'
-import { createXai } from '@ai-sdk/xai';
 import { v4 as uuidv4 } from 'uuid';
 
 export function cn(...inputs: ClassValue[]) {
@@ -14,106 +9,3 @@ export function cn(...inputs: ClassValue[]) {
 export function generateUUID(): string {
   return uuidv4();
 }
-
-export async function getModel(requireVision: boolean = false) {
-  const selectedModel = await getSelectedModel();
-
-  const xaiApiKey = process.env.XAI_API_KEY;
-  const gemini3ProApiKey = process.env.GEMINI_3_PRO_API_KEY;
-  const awsAccessKeyId = process.env.AWS_ACCESS_KEY_ID;
-  const awsSecretAccessKey = process.env.AWS_SECRET_ACCESS_KEY;
-  const awsRegion = process.env.AWS_REGION;
-  const bedrockModelId = process.env.BEDROCK_MODEL_ID || 'anthropic.claude-3-5-sonnet-20241022-v2:0';
-  const openaiApiKey = process.env.OPENAI_API_KEY;
-
-  if (selectedModel) {
-    switch (selectedModel) {
-      case 'Grok 4.2':
-        if (xaiApiKey) {
-          const xai = createXai({
-            apiKey: xaiApiKey,
-            baseURL: 'https://api.x.ai/v1',
-          });
-          try {
-            return xai('grok-4-fast-non-reasoning');
-          } catch (error) {
-            console.error('Selected model "Grok 4.2" is configured but failed to initialize.', error);
-            throw new Error('Failed to initialize selected model.');
-          }
-        } else {
-            console.error('User selected "Grok 4.2" but XAI_API_KEY is not set.');
-            throw new Error('Selected model is not configured.');
-        }
-      case 'Gemini 3':
-        if (gemini3ProApiKey) {
-          const google = createGoogleGenerativeAI({
-            apiKey: gemini3ProApiKey,
-          });
-          try {
-            return google('gemini-3-pro-preview');
-          } catch (error) {
-            console.error('Selected model "Gemini 3" is configured but failed to initialize.', error);
-            throw new Error('Failed to initialize selected model.');
-          }
-        } else {
-            console.error('User selected "Gemini 3" but GEMINI_3_PRO_API_KEY is not set.');
-            throw new Error('Selected model is not configured.');
-        }
-      case 'GPT-5.1':
-        if (openaiApiKey) {
-          const openai = createOpenAI({
-            apiKey: openaiApiKey,
-          });
-          return openai('gpt-4o');
-        } else {
-            console.error('User selected "GPT-5.1" but OPENAI_API_KEY is not set.');
-            throw new Error('Selected model is not configured.');
-        }
-    }
-  }
-
-  // Default behavior: Grok -> Gemini -> Bedrock -> OpenAI
-  if (xaiApiKey) {
-    const xai = createXai({
-      apiKey: xaiApiKey,
-      baseURL: 'https://api.x.ai/v1',
-    });
-    try {
-      return xai('grok-4-fast-non-reasoning');
-    } catch (error) {
-      console.warn('xAI API unavailable, falling back to next provider:');
-    }
-  }
-
-  if (gemini3ProApiKey) {
-    const google = createGoogleGenerativeAI({
-      apiKey: gemini3ProApiKey,
-    });
-    try {
-      return google('gemini-3-pro-preview');
-    } catch (error) {
-      console.warn('Gemini 3 Pro API unavailable, falling back to next provider:', error);
-    }
-  }
-
-  if (awsAccessKeyId && awsSecretAccessKey) {
-    const bedrock = createAmazonBedrock({
-      bedrockOptions: {
-        region: awsRegion,
-        credentials: {
-          accessKeyId: awsAccessKeyId,
-          secretAccessKey: awsSecretAccessKey,
-        },
-      },
-    });
-    const model = bedrock(bedrockModelId, {
-      additionalModelRequestFields: { top_k: 350 },
-    });
-    return model;
-  }
-
-  const openai = createOpenAI({
-    apiKey: openaiApiKey,
-  });
-  return openai('gpt-4o');
-}

mapbox_mcp/hooks.ts

@@ -1,6 +1,6 @@
 import { useState, useCallback, useRef, useEffect } from 'react';
 import { generateText } from 'ai';
-import { getModel } from '@/lib/utils';
+import { getModel } from '@/lib/utils/ai-model';
 
 // Define Tool type locally if needed
 type Tool = {

next.config.mjs

@@ -9,7 +9,7 @@ const nextConfig = {
       bodySizeLimit: '200mb',
     },
   },
-  transpilePackages: ['QCX', 'mapbox_mcp'], // Added to transpile local packages
+  transpilePackages: ['mapbox_mcp'], // Removed 'QCX' as it's the app itself
 };  
 
 export default nextConfig