@lobehub/lobehub 2.0.0-next.216 → 2.0.0-next.218

package/src/store/chat/slices/plugin/actions/pluginTypes.ts

@@ -9,63 +9,20 @@ import { type StateCreator } from 'zustand/vanilla';
 
 import { type MCPToolCallResult } from '@/libs/mcp';
 import { chatService } from '@/services/chat';
-import { codeInterpreterService } from '@/services/codeInterpreter';
-import { fileService } from '@/services/file';
 import { mcpService } from '@/services/mcp';
 import { messageService } from '@/services/message';
 import { AI_RUNTIME_OPERATION_TYPES } from '@/store/chat/slices/operation';
 import { type ChatStore } from '@/store/chat/store';
 import { useToolStore } from '@/store/tool';
 import { hasExecutor } from '@/store/tool/slices/builtin/executors';
+import { useUserStore } from '@/store/user';
+import { userProfileSelectors } from '@/store/user/slices/auth/selectors';
 import { safeParseJSON } from '@/utils/safeParseJSON';
 
 import { dbMessageSelectors } from '../../message/selectors';
 
 const log = debug('lobe-store:plugin-types');
 
-/**
- * Get MIME type from filename extension
- */
-const getMimeTypeFromFilename = (filename: string): string => {
-  const ext = filename.split('.').pop()?.toLowerCase() || '';
-  const mimeTypes: Record<string, string> = {
-    // Images
-    bmp: 'image/bmp',
-    gif: 'image/gif',
-    jpeg: 'image/jpeg',
-    jpg: 'image/jpeg',
-    png: 'image/png',
-    svg: 'image/svg+xml',
-    webp: 'image/webp',
-    // Videos
-    mp4: 'video/mp4',
-    webm: 'video/webm',
-    mov: 'video/quicktime',
-    avi: 'video/x-msvideo',
-    // Documents
-    csv: 'text/csv',
-    doc: 'application/msword',
-    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-    html: 'text/html',
-    json: 'application/json',
-    md: 'text/markdown',
-    pdf: 'application/pdf',
-    ppt: 'application/vnd.ms-powerpoint',
-    pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-    rtf: 'application/rtf',
-    txt: 'text/plain',
-    xls: 'application/vnd.ms-excel',
-    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-    xml: 'application/xml',
-    // Code
-    css: 'text/css',
-    js: 'text/javascript',
-    py: 'text/x-python',
-    ts: 'text/typescript',
-  };
-  return mimeTypes[ext] || 'application/octet-stream';
-};
-
 /**
  * Plugin type-specific implementations
  * Each method handles a specific type of plugin invocation
@@ -284,10 +241,13 @@ export const pluginTypes: StateCreator<
       const { CloudSandboxExecutionRuntime } =
         await import('@lobechat/builtin-tool-cloud-sandbox/executionRuntime');
 
+      // Get userId from user store
+      const userId = userProfileSelectors.userId(useUserStore.getState()) || 'anonymous';
+
       // Create runtime with context
       const runtime = new CloudSandboxExecutionRuntime({
         topicId: message?.topicId || 'default',
-        userId: 'current-user', // TODO: Get actual userId from auth context
+        userId,
       });
 
       // Parse arguments
@@ -341,58 +301,25 @@ export const pluginTypes: StateCreator<
       context,
     );
 
-    // Handle exportFile: save exported file and associate with assistant message (parent)
+    // Handle exportFile: associate the file (already created by server) with assistant message (parent)
     if (payload.apiName === 'exportFile' && data.success && data.state) {
       const exportState = data.state as ExportFileState;
-      if (exportState.downloadUrl && exportState.filename) {
+      // Server now creates the file record and returns fileId in the response
+      if (exportState.fileId && exportState.filename) {
         try {
-          // Generate a hash from the URL path (without query params) for deduplication
-          // Extract the path before query params: .../code-interpreter-exports/tpc_xxx/filename.ext
-          const urlPath = exportState.downloadUrl.split('?')[0];
-          const hash = `ci-export-${btoa(urlPath).slice(0, 32)}`;
-
-          // Use mimeType from state if available, otherwise infer from filename
-          const mimeType = exportState.mimeType || getMimeTypeFromFilename(exportState.filename);
-
-          // 1. Create file record in database
-          const fileResult = await fileService.createFile({
-            fileType: mimeType,
-            hash,
-            name: exportState.filename,
-            size: exportState.size || 0,
-            source: 'code-interpreter',
-            url: exportState.downloadUrl,
-          });
-
-          // 2. If there's text content, save it to documents table for retrieval
-          if (exportState.content) {
-            await codeInterpreterService.saveExportedFileContent({
-              content: exportState.content,
-              fileId: fileResult.id,
-              fileType: mimeType,
-              filename: exportState.filename,
-              url: exportState.downloadUrl,
-            });
-
-            log(
-              '[invokeCloudCodeInterpreterTool] Saved file content to document: fileId=%s',
-              fileResult.id,
-            );
-          }
-
-          // 3. Associate file with the assistant message (parent of tool message)
+          // Associate file with the assistant message (parent of tool message)
           // The current message (id) is the tool message, we need to attach to its parent
           const targetMessageId = message?.parentId || id;
 
-          await messageService.addFilesToMessage(targetMessageId, [fileResult.id], {
+          await messageService.addFilesToMessage(targetMessageId, [exportState.fileId], {
             agentId: message?.agentId,
             topicId: message?.topicId,
           });
 
           log(
-            '[invokeCloudCodeInterpreterTool] Saved exported file: targetMessageId=%s, fileId=%s, filename=%s',
+            '[invokeCloudCodeInterpreterTool] Associated exported file with message: targetMessageId=%s, fileId=%s, filename=%s',
             targetMessageId,
-            fileResult.id,
+            exportState.fileId,
             exportState.filename,
           );
         } catch (error) {

package/packages/utils/src/server/__tests__/geo.test.ts

@@ -1,116 +0,0 @@
-import { geolocation } from '@vercel/functions';
-import { getCountry } from 'countries-and-timezones';
-import { NextRequest } from 'next/server';
-import { afterEach, describe, expect, it, vi } from 'vitest';
-
-import { parseDefaultThemeFromCountry } from '../geo';
-
-vi.mock('@vercel/functions', () => ({
-  geolocation: vi.fn(),
-}));
-
-vi.mock('countries-and-timezones', () => ({
-  getCountry: vi.fn(),
-}));
-
-describe('parseDefaultThemeFromCountry', () => {
-  const mockRequest = (headers: Record<string, string> = {}) => {
-    return {
-      headers: {
-        get: (key: string) => headers[key],
-      },
-    } as NextRequest;
-  };
-
-  it('should return light theme when no country code is found', () => {
-    vi.mocked(geolocation).mockReturnValue({});
-    const request = mockRequest();
-    expect(parseDefaultThemeFromCountry(request)).toBe('light');
-  });
-
-  it('should return light theme when country has no timezone', () => {
-    vi.mocked(geolocation).mockReturnValue({ country: 'US' });
-    vi.mocked(getCountry).mockReturnValue({
-      id: 'US',
-      name: 'United States',
-      timezones: [],
-    });
-    const request = mockRequest();
-    expect(parseDefaultThemeFromCountry(request)).toBe('light');
-  });
-
-  it('should return light theme when country has invalid timezone', () => {
-    vi.mocked(geolocation).mockReturnValue({ country: 'US' });
-    vi.mocked(getCountry).mockReturnValue({
-      id: 'US',
-      name: 'United States',
-      // @ts-ignore
-      timezones: ['America/Invalid'],
-    });
-
-    const mockDate = new Date('2025-04-01T12:00:00');
-    vi.setSystemTime(mockDate);
-
-    const request = mockRequest();
-    expect(parseDefaultThemeFromCountry(request)).toBe('light');
-  });
-
-  it('should return light theme during daytime hours', () => {
-    vi.mocked(geolocation).mockReturnValue({ country: 'US' });
-    vi.mocked(getCountry).mockReturnValue({
-      id: 'US',
-      name: 'United States',
-      timezones: ['America/New_York'],
-    });
-
-    // 设置UTC时间16:00，这样在纽约时区（EDT，UTC-4）就是12:00
-    const mockDate = new Date('2025-04-01T16:00:00.000Z');
-    vi.setSystemTime(mockDate);
-
-    const request = mockRequest();
-    const result = parseDefaultThemeFromCountry(request);
-    expect(result).toBe('light');
-  });
-
-  it('should return dark theme during night hours', () => {
-    vi.mocked(geolocation).mockReturnValue({ country: 'US' });
-    vi.mocked(getCountry).mockReturnValue({
-      id: 'US',
-      name: 'United States',
-      timezones: ['America/New_York'],
-    });
-
-    // 设置UTC时间02:00，这样在纽约时区（EDT，UTC-4）就是22:00
-    const mockDate = new Date('2025-04-01T02:00:00.000Z');
-    vi.setSystemTime(mockDate);
-
-    const request = mockRequest();
-    expect(parseDefaultThemeFromCountry(request)).toBe('dark');
-  });
-
-  it('should try different header sources for country code', () => {
-    vi.mocked(geolocation).mockReturnValue({});
-    vi.mocked(getCountry).mockReturnValue({
-      id: 'US',
-      name: 'United States',
-      timezones: ['America/New_York'],
-    });
-
-    const headers = {
-      'x-vercel-ip-country': 'US',
-      'cf-ipcountry': 'CA',
-      'x-zeabur-ip-country': 'UK',
-      'x-country-code': 'FR',
-    };
-
-    const request = mockRequest(headers);
-    parseDefaultThemeFromCountry(request);
-
-    expect(getCountry).toHaveBeenCalledWith('US');
-  });
-
-  afterEach(() => {
-    vi.useRealTimers();
-    vi.clearAllMocks();
-  });
-});

package/packages/utils/src/server/geo.ts

@@ -1,60 +0,0 @@
-import { geolocation } from '@vercel/functions';
-import { getCountry } from 'countries-and-timezones';
-import { NextRequest } from 'next/server';
-
-const getLocalTime = (timeZone: string) => {
-  return new Date().toLocaleString('en-US', {
-    hour: 'numeric',
-    hour12: false,
-    timeZone,
-  });
-};
-
-const isValidTimeZone = (timeZone: string) => {
-  try {
-    getLocalTime(timeZone);
-    return true; // If no exception is thrown, the timezone is valid
-  } catch (e) {
-    // If a RangeError is caught, the timezone is invalid
-    if (e instanceof RangeError) {
-      return false;
-    }
-    // If it's another error, better to re-throw it
-    throw e;
-  }
-};
-
-export const parseDefaultThemeFromCountry = (request: NextRequest) => {
-  // 1. Get country code from request headers
-  const geo = geolocation(request);
-
-  const countryCode =
-    geo?.country ||
-    request.headers.get('x-vercel-ip-country') || // Vercel
-    request.headers.get('cf-ipcountry') || // Cloudflare
-    request.headers.get('x-zeabur-ip-country') || // Zeabur
-    request.headers.get('x-country-code'); // Netlify
-
-  // If no country code is obtained, return light theme directly
-  if (!countryCode) return 'light';
-
-  // 2. Get timezone information for the country
-  const country = getCountry(countryCode);
-
-  // If country information is not found or the country has no timezone information, return light theme
-  if (!country?.timezones?.length) return 'light';
-
-  const timeZone = country.timezones.find((tz) => isValidTimeZone(tz));
-  if (!timeZone) return 'light';
-
-  // 3. Get the current time in the country's first timezone
-  const localTime = getLocalTime(timeZone);
-
-  // 4. Parse the hour and determine the theme
-  const localHour = parseInt(localTime);
-  // console.log(
-  //   `[theme] Country: ${countryCode}, Timezone: ${country.timezones[0]}, LocalHour: ${localHour}`,
-  // );
-
-  return localHour >= 6 && localHour < 18 ? 'light' : 'dark';
-};

package/src/app/[variants]/(main)/memory/features/EditableModal/Typobar.tsx

@@ -1,150 +0,0 @@
-import { HotkeyEnum, type IEditor, getHotkeyById } from '@lobehub/editor';
-import { useEditorState } from '@lobehub/editor/react';
-import {
-  ChatInputActionBar,
-  ChatInputActions,
-  type ChatInputActionsProps,
-  CodeLanguageSelect,
-} from '@lobehub/editor/react';
-import { cssVar } from 'antd-style';
-import {
-  BoldIcon,
-  CodeXmlIcon,
-  ItalicIcon,
-  ListIcon,
-  ListOrderedIcon,
-  ListTodoIcon,
-  MessageSquareQuote,
-  SigmaIcon,
-  SquareDashedBottomCodeIcon,
-  StrikethroughIcon,
-  UnderlineIcon,
-} from 'lucide-react';
-import { memo, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-
-const TypoBar = memo<{ editor?: IEditor }>(({ editor }) => {
-  const { t } = useTranslation('editor');
-  const editorState = useEditorState(editor);
-
-  const items: ChatInputActionsProps['items'] = useMemo(
-    () =>
-      [
-        {
-          active: editorState.isBold,
-          icon: BoldIcon,
-          key: 'bold',
-          label: t('typobar.bold'),
-          onClick: editorState.bold,
-          tooltipProps: { hotkey: getHotkeyById(HotkeyEnum.Bold).keys },
-        },
-        {
-          active: editorState.isItalic,
-          icon: ItalicIcon,
-          key: 'italic',
-          label: t('typobar.italic'),
-          onClick: editorState.italic,
-          tooltipProps: { hotkey: getHotkeyById(HotkeyEnum.Italic).keys },
-        },
-        {
-          active: editorState.isUnderline,
-          icon: UnderlineIcon,
-          key: 'underline',
-          label: t('typobar.underline'),
-          onClick: editorState.underline,
-          tooltipProps: { hotkey: getHotkeyById(HotkeyEnum.Underline).keys },
-        },
-        {
-          active: editorState.isStrikethrough,
-          icon: StrikethroughIcon,
-          key: 'strikethrough',
-          label: t('typobar.strikethrough'),
-          onClick: editorState.strikethrough,
-          tooltipProps: { hotkey: getHotkeyById(HotkeyEnum.Strikethrough).keys },
-        },
-        {
-          type: 'divider',
-        },
-
-        {
-          icon: ListIcon,
-          key: 'bulletList',
-          label: t('typobar.bulletList'),
-          onClick: editorState.bulletList,
-          tooltipProps: { hotkey: getHotkeyById(HotkeyEnum.BulletList).keys },
-        },
-        {
-          icon: ListOrderedIcon,
-          key: 'numberlist',
-          label: t('typobar.numberList'),
-          onClick: editorState.numberList,
-          tooltipProps: { hotkey: getHotkeyById(HotkeyEnum.NumberList).keys },
-        },
-        {
-          icon: ListTodoIcon,
-          key: 'tasklist',
-          label: t('typobar.taskList'),
-          onClick: editorState.checkList,
-        },
-        {
-          type: 'divider',
-        },
-        {
-          active: editorState.isBlockquote,
-          icon: MessageSquareQuote,
-          key: 'blockquote',
-          label: t('typobar.blockquote'),
-          onClick: editorState.blockquote,
-        },
-        {
-          type: 'divider',
-        },
-        {
-          icon: SigmaIcon,
-          key: 'math',
-          label: t('typobar.tex'),
-          onClick: editorState.insertMath,
-        },
-        {
-          active: editorState.isCode,
-          icon: CodeXmlIcon,
-          key: 'code',
-          label: t('typobar.code'),
-          onClick: editorState.code,
-          tooltipProps: { hotkey: getHotkeyById(HotkeyEnum.CodeInline).keys },
-        },
-        {
-          icon: SquareDashedBottomCodeIcon,
-          key: 'codeblock',
-          label: t('typobar.codeblock'),
-          onClick: editorState.codeblock,
-        },
-        editorState.isCodeblock && {
-          children: (
-            <CodeLanguageSelect
-              onSelect={(value) => editorState.updateCodeblockLang(value)}
-              value={editorState.codeblockLang}
-            />
-          ),
-          disabled: !editorState.isCodeblock,
-          key: 'codeblockLang',
-        },
-      ].filter(Boolean) as ChatInputActionsProps['items'],
-    [editorState],
-  );
-
-  return (
-    <ChatInputActionBar
-      left={<ChatInputActions items={items} />}
-      style={{
-        background: cssVar.colorFillQuaternary,
-        borderTopLeftRadius: 8,
-        borderTopRightRadius: 8,
-      }}
-    />
-  );
-});
-
-TypoBar.displayName = 'TypoBar';
-
-export default TypoBar;

package/src/features/Conversation/ChatItem/components/MessageContent/EditableModal.tsx

@@ -1,119 +0,0 @@
-import {
-  ReactCodePlugin,
-  ReactCodemirrorPlugin,
-  ReactHRPlugin,
-  ReactLinkHighlightPlugin,
-  ReactListPlugin,
-  ReactMathPlugin,
-  ReactTablePlugin,
-} from '@lobehub/editor';
-import { Editor, useEditor } from '@lobehub/editor/react';
-import { Flexbox, Modal } from '@lobehub/ui';
-import { memo, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import { useUserStore } from '@/store/user';
-import { labPreferSelectors } from '@/store/user/slices/preference/selectors';
-
-import TypoBar from './Typobar';
-
-interface EditableMessageProps {
-  editing?: boolean;
-  onChange?: (value: string) => void;
-  onEditingChange?: (editing: boolean) => void;
-  value?: string;
-}
-
-const EditableMessage = memo<EditableMessageProps>(
-  ({ editing, onEditingChange, onChange, value }) => {
-    const { t } = useTranslation('common');
-    const editor = useEditor();
-
-    const enableRichRender = useUserStore(labPreferSelectors.enableInputMarkdown);
-
-    const richRenderProps = useMemo(
-      () =>
-        !enableRichRender
-          ? {
-              enablePasteMarkdown: false,
-              markdownOption: {
-                bold: false,
-                code: false,
-                header: false,
-                italic: false,
-                quote: false,
-                strikethrough: false,
-                underline: false,
-                underlineStrikethrough: false,
-              },
-            }
-          : {
-              plugins: [
-                ReactListPlugin,
-                ReactCodePlugin,
-                ReactCodemirrorPlugin,
-                ReactHRPlugin,
-                ReactLinkHighlightPlugin,
-                ReactTablePlugin,
-                ReactMathPlugin,
-              ],
-            },
-      [enableRichRender],
-    );
-
-    return (
-      <Modal
-        cancelText={t('cancel')}
-        closable={false}
-        destroyOnHidden
-        okText={t('ok')}
-        onCancel={() => onEditingChange?.(false)}
-        onOk={() => {
-          if (!editor) return;
-          const newValue = editor.getDocument('markdown') as unknown as string;
-          onChange?.(newValue);
-          onEditingChange?.(false);
-        }}
-        open={editing}
-        styles={{
-          body: {
-            overflow: 'hidden',
-            padding: 0,
-          },
-        }}
-        title={null}
-        width={'min(90vw, 960px)'}
-      >
-        <TypoBar editor={editor} />
-        <Flexbox
-          onClick={() => {
-            editor.focus();
-          }}
-          paddingBlock={16}
-          paddingInline={48}
-          style={{ cursor: 'text', maxHeight: '80vh', minHeight: '50vh', overflowY: 'auto' }}
-        >
-          <Editor
-            autoFocus
-            content={''}
-            editor={editor}
-            onInit={(editor) => {
-              if (!editor) return;
-              try {
-                editor?.setDocument('markdown', value);
-              } catch {}
-            }}
-            style={{
-              paddingBottom: 120,
-            }}
-            type={'text'}
-            variant={'chat'}
-            {...richRenderProps}
-          />
-        </Flexbox>
-      </Modal>
-    );
-  },
-);
-
-export default EditableMessage;