@lobehub/chat 1.77.10 → 1.77.12

package/src/server/globalConfig/genServerAiProviderConfig.ts

@@ -5,7 +5,15 @@ import { AiFullModelCard } from '@/types/aiModel';
 import { ProviderConfig } from '@/types/user/settings';
 import { extractEnabledModels, transformToAiChatModelList } from '@/utils/parseModels';
 
-export const genServerAiProvidersConfig = (specificConfig: Record<any, any>) => {
+interface ProviderSpecificConfig {
+  enabled?: boolean;
+  enabledKey?: string;
+  fetchOnClient?: boolean;
+  modelListKey?: string;
+  withDeploymentName?: boolean;
+}
+
+export const genServerAiProvidersConfig = (specificConfig: Record<any, ProviderSpecificConfig>) => {
   const llmConfig = getLLMConfig() as Record<string, any>;
 
   return Object.values(ModelProvider).reduce(
@@ -26,8 +34,9 @@ export const genServerAiProvidersConfig = (specificConfig: Record<any, any>) =>
 
       config[provider] = {
         enabled:
-          providerConfig.enabled ||
-          llmConfig[providerConfig.enabledKey || `ENABLED_${providerUpperCase}`],
+          typeof providerConfig.enabled !== 'undefined'
+            ? providerConfig.enabled
+            : llmConfig[providerConfig.enabledKey || `ENABLED_${providerUpperCase}`],
 
         enabledModels: extractEnabledModels(
           providerModelList,

package/src/server/globalConfig/index.ts

@@ -4,6 +4,7 @@ import { fileEnv } from '@/config/file';
 import { knowledgeEnv } from '@/config/knowledge';
 import { langfuseEnv } from '@/config/langfuse';
 import { enableNextAuth } from '@/const/auth';
+import { isDesktop } from '@/const/version';
 import { parseSystemAgent } from '@/server/globalConfig/parseSystemAgent';
 import { GlobalServerConfig } from '@/types/serverConfig';
 
@@ -36,7 +37,11 @@ export const getServerGlobalConfig = async () => {
 
       /* ↑ cloud slot ↑ */
       ollama: {
-        fetchOnClient: !process.env.OLLAMA_PROXY_URL,
+        enabled: isDesktop ? true : undefined,
+        fetchOnClient: isDesktop ? false : !process.env.OLLAMA_PROXY_URL,
+      },
+      openai: {
+        enabled: isDesktop ? false : undefined,
       },
       volcengine: {
         withDeploymentName: true,

package/src/server/globalConfig/parseSystemAgent.test.ts

@@ -92,4 +92,60 @@ describe('parseSystemAgent', () => {
 
     expect(parseSystemAgent(envValue)).toEqual(expected);
   });
+
+  it('should apply default setting to all system agents when default is specified', () => {
+    const envValue = 'default=ollama/deepseek-v3';
+
+    const result = parseSystemAgent(envValue);
+
+    expect(result.topic).toEqual({ provider: 'ollama', model: 'deepseek-v3' });
+    expect(result.translation).toEqual({ provider: 'ollama', model: 'deepseek-v3' });
+    expect(result.agentMeta).toEqual({ provider: 'ollama', model: 'deepseek-v3' });
+    expect(result.historyCompress).toEqual({ provider: 'ollama', model: 'deepseek-v3' });
+    expect(result.thread).toEqual({ provider: 'ollama', model: 'deepseek-v3' });
+    expect(result.queryRewrite).toEqual({
+      provider: 'ollama',
+      model: 'deepseek-v3',
+      enabled: true,
+    });
+  });
+
+  it('should override default setting with specific settings', () => {
+    const envValue = 'default=ollama/deepseek-v3,topic=openai/gpt-4';
+
+    const result = parseSystemAgent(envValue);
+
+    expect(result.topic).toEqual({ provider: 'openai', model: 'gpt-4' });
+
+    expect(result.translation).toEqual({ provider: 'ollama', model: 'deepseek-v3' });
+    expect(result.agentMeta).toEqual({ provider: 'ollama', model: 'deepseek-v3' });
+    expect(result.historyCompress).toEqual({ provider: 'ollama', model: 'deepseek-v3' });
+    expect(result.thread).toEqual({ provider: 'ollama', model: 'deepseek-v3' });
+    expect(result.queryRewrite).toEqual({
+      provider: 'ollama',
+      model: 'deepseek-v3',
+      enabled: true,
+    });
+  });
+
+  it('should properly handle priority when topic appears before default in the string', () => {
+    // 即使 topic 在 default 之前出现，topic 的设置仍然应该优先
+    const envValue = 'topic=openai/gpt-4,default=ollama/deepseek-v3';
+
+    const result = parseSystemAgent(envValue);
+
+    // topic 应该保持自己的设置而不被 default 覆盖
+    expect(result.topic).toEqual({ provider: 'openai', model: 'gpt-4' });
+
+    // 其他系统智能体应该使用默认配置
+    expect(result.translation).toEqual({ provider: 'ollama', model: 'deepseek-v3' });
+    expect(result.agentMeta).toEqual({ provider: 'ollama', model: 'deepseek-v3' });
+    expect(result.historyCompress).toEqual({ provider: 'ollama', model: 'deepseek-v3' });
+    expect(result.thread).toEqual({ provider: 'ollama', model: 'deepseek-v3' });
+    expect(result.queryRewrite).toEqual({
+      provider: 'ollama',
+      model: 'deepseek-v3',
+      enabled: true,
+    });
+  });
 });

package/src/server/globalConfig/parseSystemAgent.ts

@@ -13,6 +13,9 @@ export const parseSystemAgent = (envString: string = ''): Partial<UserSystemAgen
 
   const pairs = envValue.split(',');
 
+  // 用于存储默认设置，如果有 default=provider/model 的情况
+  let defaultSetting: { model: string; provider: string } | undefined;
+
   for (const pair of pairs) {
     const [key, value] = pair.split('=').map((s) => s.trim());
 
@@ -24,6 +27,15 @@ export const parseSystemAgent = (envString: string = ''): Partial<UserSystemAgen
         throw new Error('Missing model or provider value');
       }
 
+      // 如果是 default 键，保存默认设置
+      if (key === 'default') {
+        defaultSetting = {
+          model: model.trim(),
+          provider: provider.trim(),
+        };
+        continue;
+      }
+
       if (protectedKeys.includes(key)) {
         config[key as keyof UserSystemAgentConfig] = {
           enabled: key === 'queryRewrite' ? true : undefined,
@@ -36,5 +48,18 @@ export const parseSystemAgent = (envString: string = ''): Partial<UserSystemAgen
     }
   }
 
+  // 如果有默认设置，应用到所有未设置的系统智能体
+  if (defaultSetting) {
+    for (const key of protectedKeys) {
+      if (!config[key as keyof UserSystemAgentConfig]) {
+        config[key as keyof UserSystemAgentConfig] = {
+          enabled: key === 'queryRewrite' ? true : undefined,
+          model: defaultSetting.model,
+          provider: defaultSetting.provider,
+        } as any;
+      }
+    }
+  }
+
   return config;
 };

package/src/server/modules/AssistantStore/index.ts

@@ -66,6 +66,14 @@ export class AssistantStore {
 
       return data;
     } catch (e) {
+      // it means failed to fetch
+      if ((e as Error).message.includes('fetch failed')) {
+        return {
+          agents: [],
+          schemaVersion: 1,
+        };
+      }
+
       console.error('[AgentIndexFetchError] failed to fetch agent index, error detail:');
       console.error(e);
 

package/src/server/services/changelog/index.test.ts

@@ -79,6 +79,7 @@ describe('ChangelogService', () => {
   describe('getChangelogIndex', () => {
     it('should fetch and merge changelog data', async () => {
       const mockResponse = {
+        ok: true,
         json: vi.fn().mockResolvedValue({
           cloud: [{ id: 'cloud1', date: '2023-01-01', versionRange: ['1.0.0'] }],
           community: [{ id: 'community1', date: '2023-01-02', versionRange: ['1.1.0'] }],
@@ -104,6 +105,7 @@ describe('ChangelogService', () => {
     it('should return only community items when config type is community', async () => {
       service.config.type = 'community';
       const mockResponse = {
+        ok: true,
         json: vi.fn().mockResolvedValue({
           cloud: [{ id: 'cloud1', date: '2023-01-01', versionRange: ['1.0.0'] }],
           community: [{ id: 'community1', date: '2023-01-02', versionRange: ['1.1.0'] }],

package/src/server/services/changelog/index.ts

@@ -55,9 +55,13 @@ export class ChangelogService {
         next: { revalidate: 3600, tags: [FetchCacheTag.Changelog] },
       });
 
-      const data = await res.json();
+      if (res.ok) {
+        const data = await res.json();
+
+        return this.mergeChangelogs(data.cloud, data.community).slice(0, 5);
+      }
 
-      return this.mergeChangelogs(data.cloud, data.community).slice(0, 5);
+      return [];
     } catch (e) {
       const cause = (e as Error).cause as { code: string };
       if (cause?.code.includes('ETIMEDOUT')) {

package/src/services/__tests__/chat.test.ts

@@ -65,6 +65,7 @@ beforeEach(() => {
   vi.mock('@/const/version', () => ({
     isServerMode: false,
     isDeprecatedEdition: true,
+    isDesktop: false,
   }));
 });
 
@@ -878,6 +879,7 @@ describe('ChatService', () => {
         vi.doMock('@/const/version', () => ({
           isServerMode: true,
           isDeprecatedEdition: false,
+          isDesktop: false,
         }));
 
         // 需要在修改模拟后重新导入相关模块
@@ -965,6 +967,7 @@ describe('ChatService', () => {
         vi.doMock('@/const/version', () => ({
           isServerMode: true,
           isDeprecatedEdition: true,
+          isDesktop: false,
         }));
 
         // 需要在修改模拟后重新导入相关模块

package/src/services/electron/devtools.ts

@@ -1,4 +1,4 @@
-import { dispatch } from '@/utils/electron/dispatch';
+import { dispatch } from '@lobechat/electron-client-ipc';
 
 class DevtoolsService {
   async openDevtools(): Promise<void> {

package/src/store/user/slices/modelList/selectors/modelConfig.ts

@@ -1,4 +1,5 @@
 import { isProviderDisableBrowserRequest } from '@/config/modelProviders';
+import { isDesktop } from '@/const/version';
 import { UserStore } from '@/store/user';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 
@@ -19,6 +20,9 @@ const providerWhitelist = new Set(['ollama']);
 const isProviderFetchOnClient = (provider: GlobalLLMProviderKey | string) => (s: UserStore) => {
   const config = getProviderConfigById(provider)(s);
 
+  // if is desktop, force on Server.
+  if (isDesktop) return false;
+
   // If the provider already disable browser request in model config, force on Server.
   if (isProviderDisableBrowserRequest(provider)) return false;
 

package/src/styles/global.ts

@@ -1,4 +1,7 @@
 import { Theme, css } from 'antd-style';
+import { rgba } from 'polished';
+
+import { isDesktop } from '@/const/version';
 
 // fix ios input keyboard
 // overflow: hidden;
@@ -22,6 +25,17 @@ export default ({ token }: { prefixCls: string; token: Theme }) => css`
     }
   }
 
+  html {
+    background: ${isDesktop ? 'none' : token.colorBgLayout};
+  }
+
+  body {
+    /* 提高合成层级，强制硬件加速，否则会有渲染黑边出现 */
+    will-change: opacity;
+    transform: translateZ(0);
+    background: ${isDesktop ? rgba(token.colorBgLayout, 0.66) : token.colorBgLayout};
+  }
+
   * {
     scrollbar-color: ${token.colorFill} transparent;
     scrollbar-width: thin;

package/src/types/hotkey.ts

@@ -10,6 +10,7 @@ export const HotkeyEnum = {
   EditMessage: 'editMessage',
   OpenChatSettings: 'openChatSettings',
   OpenHotkeyHelper: 'openHotkeyHelper',
+  OpenSettings: 'openSettings',
   RegenerateMessage: 'regenerateMessage',
   SaveTopic: 'saveTopic',
   Search: 'search',

package/src/utils/errorResponse.ts

@@ -40,6 +40,8 @@ const getStatus = (errorType: ILobeAgentRuntimeErrorType | ErrorType) => {
       return 471;
     }
 
+    // all local provider connection error
+    case AgentRuntimeErrorType.OllamaServiceUnavailable:
     case ChatErrorType.OllamaServiceUnavailable:
     case AgentRuntimeErrorType.OllamaBizError: {
       return 472;

package/tsconfig.json

@@ -37,10 +37,5 @@
     "src",
     "tests",
     "vitest.config.ts"
-  ],
-  "ts-node": {
-    "compilerOptions": {
-      "module": "commonjs"
-    }
-  }
+  ]
 }

package/packages/electron-client-ipc/src/events/devtools.ts

@@ -1,6 +0,0 @@
-export interface DevtoolsDispatchEvents {
-  /**
-   * open the LobeHub Devtools
-   */
-  openDevtools: () => void;
-}

package/src/app/[variants]/(main)/settings/hotkey/index.tsx

@@ -1,9 +0,0 @@
-import HotkeySetting from './features/HotkeySetting';
-
-const Page = () => {
-  return <HotkeySetting />;
-};
-
-Page.displayName = 'HotkeySetting';
-
-export default Page;

package/src/types/electron.ts

@@ -1,11 +0,0 @@
-import type { DispatchInvoke } from '@lobechat/electron-client-ipc';
-
-export interface IElectronAPI {
-  invoke: DispatchInvoke;
-}
-
-declare global {
-  interface Window {
-    electronAPI: IElectronAPI;
-  }
-}

package/src/utils/electron/dispatch.ts

@@ -1,10 +0,0 @@
-import { DispatchInvoke } from '@lobechat/electron-client-ipc';
-
-/**
- * client 端请求 sketch 端 event 数据的方法
- */
-export const dispatch: DispatchInvoke = async (event, ...data) => {
-  if (!window.electronAPI) throw new Error('electronAPI not found');
-
-  return window.electronAPI.invoke(event, ...data);
-};