fix: custom fetch for all providers

src-tauri/tauri.conf.json

@@ -6,7 +6,7 @@
   "build": {
     "frontendDist": "../web-app/dist",
     "devUrl": "http://localhost:1420",
-    "beforeDevCommand": "cross-env IS_TAURI=true yarn dev:web",
+    "beforeDevCommand": "cross-env IS_TAURI=true IS_DEV=true yarn dev:web",
     "beforeBuildCommand": "cross-env IS_TAURI=true yarn build:web"
   },
   "app": {

web-app/src/lib/completion.ts

@@ -71,18 +71,18 @@
 
   // Add attachments to content array
   if (attachments) {
     attachments.forEach((attachment) => {
       if (attachment.type.startsWith('image/')) {
         contentParts.push({
           type: ContentType.Image,
           image_url: {
             url: `data:${attachment.type};base64,${attachment.base64}`,
             detail: 'auto',
           },
         } as any)
       }
     })
   }
 
   return {
     type: 'text',
@@ -169,11 +169,12 @@
     providerName = 'openai-compatible'
 
   const tokenJS = new TokenJS({
-    apiKey: provider.api_key ?? (await getServiceHub().core().getAppToken()) ?? '',
+    apiKey:
+      provider.api_key ?? (await getServiceHub().core().getAppToken()) ?? '',
     // TODO: Retrieve from extension settings
     baseURL: provider.base_url,
     // Use Tauri's fetch to avoid CORS issues only for openai-compatible provider
-    ...(providerName === 'openai-compatible' && { fetch: getServiceHub().providers().fetch() }),
+    fetch: IS_DEV ? fetch : getServiceHub().providers().fetch(),
     // OpenRouter identification headers for Jan
     // ref: https://openrouter.ai/docs/api-reference/overview#headers
     ...(provider.provider === 'openrouter' && {
@@ -183,10 +184,11 @@
       },
     }),
     // Add Origin header for local providers to avoid CORS issues
-    ...((provider.base_url?.includes('localhost:') || provider.base_url?.includes('127.0.0.1:')) && {
+    ...((provider.base_url?.includes('localhost:') ||
+      provider.base_url?.includes('127.0.0.1:')) && {
       fetch: getServiceHub().providers().fetch(),
       defaultHeaders: {
-        'Origin': 'tauri://localhost',
+        Origin: 'tauri://localhost',
       },
     }),
   } as ExtendedConfigOptions)
@@ -402,7 +404,10 @@
           console.log('Parsed tool parameters:', toolParameters)
         } catch (error) {
           console.error('Failed to parse tool arguments:', error)
-          console.error('Raw arguments that failed:', toolCall.function.arguments)
+          console.error(
+            'Raw arguments that failed:',
+            toolCall.function.arguments
+          )
         }
       }
       const approved =
@@ -416,10 +421,12 @@
             )
           : true)
 
-      const { promise, cancel } = getServiceHub().mcp().callToolWithCancellation({
-        toolName: toolCall.function.name,
-        arguments: toolCall.function.arguments.length ? toolParameters : {},
-      })
+      const { promise, cancel } = getServiceHub()
+        .mcp()
+        .callToolWithCancellation({
+          toolName: toolCall.function.name,
+          arguments: toolCall.function.arguments.length ? toolParameters : {},
+        })
 
       useAppState.getState().setCancelToolCall(cancel)
 

web-app/src/types/global.d.ts

@@ -22,6 +22,7 @@ declare global {
   declare const MODEL_CATALOG_URL: string
   declare const AUTO_UPDATER_DISABLED: boolean
   declare const GA_MEASUREMENT_ID: string
+  declare const IS_DEV: boolean
   interface Window {
     core: AppCore | undefined
     gtag?: (...args: unknown[]) => void

web-app/vite.config.ts

@@ -1,96 +1,97 @@
 import { defineConfig, loadEnv } from 'vite'
 import react from '@vitejs/plugin-react'
 import tailwindcss from '@tailwindcss/vite'
 import path from 'path'
 import { TanStackRouterVite } from '@tanstack/router-plugin/vite'
 import { nodePolyfills } from 'vite-plugin-node-polyfills'
 import packageJson from './package.json'
 const host = process.env.TAURI_DEV_HOST
 
 // https://vite.dev/config/
 export default defineConfig(({ mode }) => {
   // Load env file based on `mode` in the current working directory.
   const env = loadEnv(mode, process.cwd(), '')
 
   return {
     plugins: [
       TanStackRouterVite({
         target: 'react',
         autoCodeSplitting: true,
         routeFileIgnorePattern: '.((test).ts)|test-page',
       }),
       react(),
       tailwindcss(),
       nodePolyfills({
         include: ['path'],
       }),
     ],
     resolve: {
       alias: {
         '@': path.resolve(__dirname, './src'),
       },
     },
     optimizeDeps: {
       exclude: ['@jan/extensions-web'],
     },
     build: {
       rollupOptions: {
         external: ['@jan/extensions-web'],
       },
     },
     define: {
       IS_TAURI: JSON.stringify(process.env.IS_TAURI),
+      IS_DEV: JSON.stringify(process.env.IS_DEV),
       IS_WEB_APP: JSON.stringify(false),
       IS_MACOS: JSON.stringify(
         process.env.TAURI_ENV_PLATFORM?.includes('darwin') ?? false
       ),
       IS_WINDOWS: JSON.stringify(
         process.env.TAURI_ENV_PLATFORM?.includes('windows') ?? false
       ),
       IS_LINUX: JSON.stringify(
         process.env.TAURI_ENV_PLATFORM?.includes('linux') ?? false
       ),
       IS_IOS: JSON.stringify(
         process.env.TAURI_ENV_PLATFORM?.includes('ios') ?? false
       ),
       IS_ANDROID: JSON.stringify(
         process.env.TAURI_ENV_PLATFORM?.includes('android') ?? false
       ),
       PLATFORM: JSON.stringify(process.env.TAURI_ENV_PLATFORM),
 
       VERSION: JSON.stringify(packageJson.version),
 
       POSTHOG_KEY: JSON.stringify(env.POSTHOG_KEY),
       POSTHOG_HOST: JSON.stringify(env.POSTHOG_HOST),
       GA_MEASUREMENT_ID: JSON.stringify(env.GA_MEASUREMENT_ID),
       MODEL_CATALOG_URL: JSON.stringify(
         'https://raw.githubusercontent.com/menloresearch/model-catalog/main/model_catalog.json'
       ),
       AUTO_UPDATER_DISABLED: JSON.stringify(
         env.AUTO_UPDATER_DISABLED === 'true'
       ),
     },
 
     // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
     //
     // 1. prevent vite from obscuring rust errors
     clearScreen: false,
     // 2. tauri expects a fixed port, fail if that port is not available
     server: {
       port: 1420,
       strictPort: true,
       host: host || false,
       hmr: host
         ? {
             protocol: 'ws',
             host,
             port: 1421,
           }
         : undefined,
       watch: {
         // 3. tell vite to ignore watching `src-tauri`
         ignored: ['**/src-tauri/**'],
       },
     },
   }
 })