@lobehub/chat 1.124.0 → 1.124.2

package/scripts/electronWorkflow/mergeMacReleaseFiles.ts

@@ -0,0 +1,207 @@
+/* eslint-disable unicorn/no-process-exit, unicorn/prefer-top-level-await */
+import fs from 'fs-extra';
+import path from 'node:path';
+import { parse, stringify } from 'yaml';
+
+interface LatestMacYml {
+  files: Array<{
+    sha512: string;
+    size: number;
+    url: string;
+  }>;
+  path: string;
+  releaseDate: string;
+  sha512: string;
+  version: string;
+}
+
+// 配置
+const RELEASE_TAG = process.env.RELEASE_TAG || process.argv[2];
+const FILE_NAME = 'latest-mac.yml';
+const RELEASE_DIR = path.resolve('release');
+
+// 验证环境变量和输入
+if (!RELEASE_TAG) {
+  console.error('❌ RELEASE_TAG environment variable or argument is required');
+  process.exit(1);
+}
+
+// 验证 release tag 格式
+if (!/^v?\d+\.\d+\.\d+/.test(RELEASE_TAG)) {
+  console.error(`❌ Invalid RELEASE_TAG format: ${RELEASE_TAG}. Expected format: v1.2.3`);
+  process.exit(1);
+}
+
+/**
+ * 检测 latest-mac.yml 文件的平台类型
+ */
+function detectPlatform(yamlContent: LatestMacYml): 'intel' | 'arm' | 'both' | 'none' {
+  const hasIntel = yamlContent.files.some((file) => file.url.includes('-x64.dmg'));
+  const hasArm = yamlContent.files.some((file) => file.url.includes('-arm64.dmg'));
+
+  if (hasIntel && hasArm) return 'both';
+  if (hasIntel && !hasArm) return 'intel';
+  if (!hasIntel && hasArm) return 'arm';
+  return 'none';
+}
+
+/**
+ * 合并两个 latest-mac.yml 文件
+ * @param intelContent Intel 平台的 YAML 内容
+ * @param armContent ARM 平台的 YAML 内容
+ */
+function mergeYamlFiles(intelContent: LatestMacYml, armContent: LatestMacYml): string {
+  // 以 Intel 为基础（保持兼容性）
+  const merged: LatestMacYml = {
+    ...intelContent,
+    files: [...intelContent.files, ...armContent.files],
+  };
+
+  // 使用 yaml 库生成，保持 sha512 在同一行
+  return stringify(merged, {
+    lineWidth: 0, // 不换行
+  });
+}
+
+// GitHub API functions removed since we're working with local files only
+
+/**
+ * 读取本地文件
+ */
+function readLocalFile(filePath: string): string | null {
+  try {
+    if (fs.existsSync(filePath)) {
+      const content = fs.readFileSync(filePath, 'utf8');
+      console.log(`✅ Read local file: ${filePath} (${content.length} chars)`);
+      return content;
+    }
+    console.log(`⚠️  Local file not found: ${filePath}`);
+    return null;
+  } catch (error) {
+    console.error(`❌ Error reading local file ${filePath}:`, error);
+    return null;
+  }
+}
+
+/**
+ * 写入本地文件
+ */
+function writeLocalFile(filePath: string, content: string): void {
+  try {
+    fs.writeFileSync(filePath, content, 'utf8');
+    console.log(`✅ Written local file: ${filePath} (${content.length} chars)`);
+  } catch (error) {
+    console.error(`❌ Error writing local file ${filePath}:`, error);
+    throw error;
+  }
+}
+
+/**
+ * 主函数
+ */
+async function main(): Promise<void> {
+  try {
+    console.log(`🚀 Starting macOS Release file merge for ${RELEASE_TAG}`);
+    console.log(`📁 Working directory: ${RELEASE_DIR}`);
+
+    // 1. 检查 release 目录下的所有文件
+    const releaseFiles = fs.readdirSync(RELEASE_DIR);
+    console.log(`📂 Files in release directory: ${releaseFiles.join(', ')}`);
+
+    // 2. 查找所有 latest-mac*.yml 文件
+    const macYmlFiles = releaseFiles.filter(
+      (f) => f.startsWith('latest-mac') && f.endsWith('.yml'),
+    );
+    console.log(`🔍 Found macOS YAML files: ${macYmlFiles.join(', ')}`);
+
+    if (macYmlFiles.length === 0) {
+      console.log('⚠️  No macOS YAML files found, skipping merge');
+      return;
+    }
+
+    // 3. 处理找到的文件，识别平台
+    const macFiles: Array<{
+      content: string;
+      filename: string;
+      platform: 'intel' | 'arm';
+      yaml: LatestMacYml;
+    }> = [];
+
+    for (const fileName of macYmlFiles) {
+      const filePath = path.join(RELEASE_DIR, fileName);
+      const content = readLocalFile(filePath);
+
+      if (!content) continue;
+
+      try {
+        const yamlContent = parse(content) as LatestMacYml;
+        const platform = detectPlatform(yamlContent);
+
+        if (platform === 'intel' || platform === 'arm') {
+          macFiles.push({ content, filename: fileName, platform, yaml: yamlContent });
+          console.log(`🔍 Detected ${platform} platform in ${fileName}`);
+        } else if (platform === 'both') {
+          console.log(`✅ Found already merged file: ${fileName}`);
+          // 如果已经是合并后的文件，直接复制为最终文件
+          writeLocalFile(path.join(RELEASE_DIR, FILE_NAME), content);
+          return;
+        } else {
+          console.log(`⚠️  Unknown platform type: ${platform} in ${fileName}`);
+        }
+      } catch (error) {
+        console.warn(`⚠️  Failed to parse ${fileName}:`, error);
+      }
+    }
+
+    // 4. 检查是否有两个不同平台的文件
+    const intelFiles = macFiles.filter((f) => f.platform === 'intel');
+    const armFiles = macFiles.filter((f) => f.platform === 'arm');
+
+    if (intelFiles.length === 0 && armFiles.length === 0) {
+      console.log('⚠️  No valid platform files found');
+      return;
+    }
+
+    if (intelFiles.length === 0) {
+      console.log('⚠️  No Intel files found, using ARM only');
+      writeLocalFile(path.join(RELEASE_DIR, FILE_NAME), armFiles[0].content);
+      return;
+    }
+
+    if (armFiles.length === 0) {
+      console.log('⚠️  No ARM files found, using Intel only');
+      writeLocalFile(path.join(RELEASE_DIR, FILE_NAME), intelFiles[0].content);
+      return;
+    }
+
+    // 5. 合并 Intel 和 ARM 文件
+    const intelFile = intelFiles[0];
+    const armFile = armFiles[0];
+
+    console.log(`🔄 Merging ${intelFile.filename} (Intel) and ${armFile.filename} (ARM)...`);
+    const mergedContent = mergeYamlFiles(intelFile.yaml, armFile.yaml);
+
+    // 6. 保存合并后的文件
+    const mergedFilePath = path.join(RELEASE_DIR, FILE_NAME);
+    writeLocalFile(mergedFilePath, mergedContent);
+
+    // 7. 验证合并结果
+    const mergedYaml = parse(mergedContent) as LatestMacYml;
+    const finalPlatform = detectPlatform(mergedYaml);
+
+    if (finalPlatform === 'both') {
+      console.log('✅ Successfully merged both Intel and ARM platforms');
+      console.log(`📊 Final file contains ${mergedYaml.files.length} files`);
+    } else {
+      console.warn(`⚠️  Merge result unexpected: ${finalPlatform}`);
+    }
+
+    console.log('🎉 Merge complete!');
+  } catch (error) {
+    console.error('❌ Error during merge:', error);
+    process.exit(1);
+  }
+}
+
+// 运行主函数
+void main();

package/src/app/[variants]/(main)/settings/provider/(detail)/newapi/page.tsx

@@ -16,7 +16,7 @@ const Page = () => {
         ...NewAPIProviderCard.settings,
         proxyUrl: {
           desc: t('newapi.apiUrl.desc'),
-          placeholder: 'https://any-newapi-provider.com/v1',
+          placeholder: 'https://any-newapi-provider.com/',
           title: t('newapi.apiUrl.title'),
         },
       }}

package/src/components/Thinking/index.tsx

@@ -1,3 +1,4 @@
+import { ChatCitationItem } from '@lobechat/types';
 import { ActionIcon, CopyButton, Icon, Markdown, ScrollShadow } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
 import { AnimatePresence, motion } from 'framer-motion';
@@ -7,8 +8,6 @@ import { CSSProperties, RefObject, memo, useEffect, useRef, useState } from 'rea
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import { CitationItem } from '@/types/message';
-
 const useStyles = createStyles(({ css, token }) => ({
   container: css`
     overflow: hidden;
@@ -74,7 +73,7 @@ const useStyles = createStyles(({ css, token }) => ({
 }));
 
 interface ThinkingProps {
-  citations?: CitationItem[];
+  citations?: ChatCitationItem[];
   content?: string;
   duration?: number;
   style?: CSSProperties;

package/src/config/llm.ts

@@ -186,6 +186,10 @@ export const getLLMConfig = () => {
 
       ENABLED_AIHUBMIX: z.boolean(),
       AIHUBMIX_API_KEY: z.string().optional(),
+
+      ENABLED_NEWAPI: z.boolean(),
+      NEWAPI_API_KEY: z.string().optional(),
+      NEWAPI_PROXY_URL: z.string().optional(),
     },
     runtimeEnv: {
       API_KEY_SELECT_MODE: process.env.API_KEY_SELECT_MODE,
@@ -368,6 +372,10 @@ export const getLLMConfig = () => {
       ENABLED_AIHUBMIX: !!process.env.AIHUBMIX_API_KEY,
       AIHUBMIX_API_KEY: process.env.AIHUBMIX_API_KEY,
 
+      ENABLED_NEWAPI: !!process.env.NEWAPI_API_KEY,
+      NEWAPI_API_KEY: process.env.NEWAPI_API_KEY,
+      NEWAPI_PROXY_URL: process.env.NEWAPI_PROXY_URL,
+
       ENABLED_NEBIUS: !!process.env.NEBIUS_API_KEY,
       NEBIUS_API_KEY: process.env.NEBIUS_API_KEY,
     },

package/src/features/ChatInput/Desktop/index.tsx

@@ -1,9 +1,11 @@
 'use client';
 
 import { ChatInput, ChatInputActionBar } from '@lobehub/editor/react';
+import { Text } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
 import { memo, useEffect } from 'react';
-import { Flexbox } from 'react-layout-kit';
+import { useTranslation } from 'react-i18next';
+import { Center, Flexbox } from 'react-layout-kit';
 
 import { useChatInputStore } from '@/features/ChatInput/store';
 import { useChatStore } from '@/store/chat';
@@ -12,7 +14,6 @@ import { chatSelectors } from '@/store/chat/selectors';
 import ActionBar from '../ActionBar';
 import InputEditor from '../InputEditor';
 import SendArea from '../SendArea';
-import ShortcutHint from '../SendArea/ShortcutHint';
 import TypoBar from '../TypoBar';
 import FilePreview from './FilePreview';
 
@@ -28,6 +29,9 @@ const useStyles = createStyles(({ css, token }) => ({
       }
     }
   `,
+  footnote: css`
+    font-size: 10px;
+  `,
   fullscreen: css`
     position: absolute;
     z-index: 100;
@@ -42,6 +46,7 @@ const useStyles = createStyles(({ css, token }) => ({
 }));
 
 const DesktopChatInput = memo<{ showFootnote?: boolean }>(({ showFootnote }) => {
+  const { t } = useTranslation('chat');
   const [slashMenuRef, expand, showTypoBar, editor, leftActions] = useChatInputStore((s) => [
     s.slashMenuRef,
     s.expand,
@@ -65,7 +70,8 @@ const DesktopChatInput = memo<{ showFootnote?: boolean }>(({ showFootnote }) =>
       {!expand && fileNode}
       <Flexbox
         className={cx(styles.container, expand && styles.fullscreen)}
-        paddingBlock={showFootnote ? 0 : '0 12px'}
+        gap={8}
+        paddingBlock={showFootnote ? '0 8px' : '0 12px'}
         paddingInline={12}
       >
         <ChatInput
@@ -85,7 +91,13 @@ const DesktopChatInput = memo<{ showFootnote?: boolean }>(({ showFootnote }) =>
           {expand && fileNode}
           <InputEditor />
         </ChatInput>
-        {showFootnote && !expand && <ShortcutHint />}
+        {showFootnote && !expand && (
+          <Center style={{ pointerEvents: 'none', zIndex: 100 }}>
+            <Text className={styles.footnote} type={'secondary'}>
+              {t('input.disclaimer')}
+            </Text>
+          </Center>
+        )}
       </Flexbox>
     </>
   );

package/src/features/ChatInput/StoreUpdater.tsx

@@ -19,12 +19,14 @@ const StoreUpdater = memo<StoreUpdaterProps>(
     rightActions,
     onSend,
     onMarkdownContentChange,
+    sendMenu,
   }) => {
     const storeApi = useStoreApi();
     const useStoreUpdater = createStoreUpdater(storeApi);
     const editor = useChatInputEditor();
 
     useStoreUpdater('mobile', mobile);
+    useStoreUpdater('sendMenu', sendMenu);
     useStoreUpdater('leftActions', leftActions);
     useStoreUpdater('rightActions', rightActions);
 

package/src/libs/traces/index.ts

@@ -1,7 +1,7 @@
+import { CURRENT_VERSION } from '@lobechat/const';
 import { Langfuse } from 'langfuse';
 import { CreateLangfuseTraceBody } from 'langfuse-core';
 
-import { CURRENT_VERSION } from '@/const/version';
 import { getLangfuseConfig } from '@/envs/langfuse';
 import { TraceEventClient } from '@/libs/traces/event';
 

package/src/locales/default/chat.ts

@@ -71,6 +71,7 @@ export default {
   input: {
     addAi: '添加一条 AI 消息',
     addUser: '添加一条用户消息',
+    disclaimer: 'AI 也可能会犯错，请检查重要信息',
     errorMsg: '消息发送失败，请检查网络后重试: {{errorMsg}}',
     more: '更多',
     send: '发送',

package/src/locales/default/modelProvider.ts

@@ -164,7 +164,7 @@ export default {
       title: 'API 密钥',
     },
     apiUrl: {
-      desc: 'New API 服务的 API 地址，大部分时候需要带 /v1',
+      desc: 'New API 服务的 API 地址，大部分时候不要带 /v1',
       title: 'API 地址',
     },
     enabled: {

package/src/server/modules/ModelRuntime/trace.ts

@@ -1,9 +1,8 @@
+import { INBOX_SESSION_ID, LOBE_CHAT_OBSERVATION_ID, LOBE_CHAT_TRACE_ID } from '@lobechat/const';
 import { ChatStreamCallbacks, ChatStreamPayload } from '@lobechat/model-runtime';
 import { TracePayload, TraceTagMap } from '@lobechat/types';
 import { after } from 'next/server';
 
-import { INBOX_SESSION_ID } from '@/const/session';
-import { LOBE_CHAT_OBSERVATION_ID, LOBE_CHAT_TRACE_ID } from '@/const/trace';
 import { TraceClient } from '@/libs/traces';
 
 export interface AgentChatOptions {

package/src/store/chat/slices/aiChat/actions/__tests__/cancel-functionality.test.ts

@@ -0,0 +1,107 @@
+import { act, renderHook } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+
+import { useChatStore } from '../../../../store';
+
+describe('Cancel send message functionality tests', () => {
+  describe('cancelSendMessageInServer', () => {
+    it('should be able to call cancel method normally', () => {
+      const { result } = renderHook(() => useChatStore());
+
+      // Initial state setup
+      act(() => {
+        useChatStore.setState({
+          activeId: 'session-1',
+          activeTopicId: 'topic-1',
+          mainSendMessageOperations: {},
+        });
+      });
+
+      // Test method exists
+      expect(typeof result.current.cancelSendMessageInServer).toBe('function');
+
+      // Test method can be called safely
+      expect(() => {
+        act(() => {
+          result.current.cancelSendMessageInServer();
+        });
+      }).not.toThrow();
+    });
+
+    it('should be able to call with specified topic ID', () => {
+      const { result } = renderHook(() => useChatStore());
+
+      act(() => {
+        useChatStore.setState({
+          activeId: 'session-1',
+          mainSendMessageOperations: {},
+        });
+      });
+
+      expect(() => {
+        act(() => {
+          result.current.cancelSendMessageInServer('topic-2');
+        });
+      }).not.toThrow();
+    });
+  });
+
+  describe('clearSendMessageError', () => {
+    it('should be able to call clear error method normally', () => {
+      const { result } = renderHook(() => useChatStore());
+
+      act(() => {
+        useChatStore.setState({
+          activeId: 'session-1',
+          activeTopicId: 'topic-1',
+          mainSendMessageOperations: {},
+        });
+      });
+
+      expect(typeof result.current.clearSendMessageError).toBe('function');
+
+      expect(() => {
+        act(() => {
+          result.current.clearSendMessageError();
+        });
+      }).not.toThrow();
+    });
+  });
+
+  describe('Internal methods', () => {
+    it('should have internal state management methods', () => {
+      const { result } = renderHook(() => useChatStore());
+
+      expect(typeof result.current.internal_toggleSendMessageOperation).toBe('function');
+      expect(typeof result.current.internal_updateSendMessageOperation).toBe('function');
+    });
+
+    it('internal_toggleSendMessageOperation should work normally', () => {
+      const { result } = renderHook(() => useChatStore());
+
+      act(() => {
+        useChatStore.setState({ mainSendMessageOperations: {} });
+      });
+
+      expect(() => {
+        act(() => {
+          const abortController = result.current.internal_toggleSendMessageOperation(
+            'test-key',
+            true,
+          );
+          expect(abortController).toBeInstanceOf(AbortController);
+        });
+      }).not.toThrow();
+    });
+  });
+
+  describe('State structure', () => {
+    it('should have mainSendMessageOperations state', () => {
+      const { result } = renderHook(() => useChatStore());
+
+      // Ensure state exists
+      expect(result.current.mainSendMessageOperations).toBeDefined();
+      expect(typeof result.current.mainSendMessageOperations).toBe('object');
+    });
+  });
+});