@lobehub/lobehub 2.0.0-next.73 → 2.0.0-next.75

package/scripts/prebuild.mts

@@ -20,11 +20,11 @@ const partialBuildPages = [
     disabled: isDesktop,
     paths: ['src/app/[variants]/(auth)'],
   },
-  {
-    name: 'mobile',
-    disabled: isDesktop,
-    paths: ['src/app/[variants]/(main)/(mobile)'],
-  },
+  // {
+  //   name: 'mobile',
+  //   disabled: isDesktop,
+  //   paths: ['src/app/[variants]/(main)/(mobile)'],
+  // },
   {
     name: 'oauth',
     disabled: isDesktop,
@@ -35,6 +35,16 @@ const partialBuildPages = [
     disabled: isDesktop,
     paths: ['src/app/(backend)/api/webhooks'],
   },
+  {
+    name: 'market-auth',
+    disabled: isDesktop,
+    paths: ['src/app/market-auth-callback'],
+  },
+  {
+    name: 'pwa',
+    disabled: isDesktop,
+    paths: ['src/manifest.ts', 'src/sitemap.tsx', 'src/robots.tsx', 'src/sw'],
+  },
   // no need for web
   {
     name: 'desktop-devtools',

package/src/app/[variants]/desktopRouter.config.tsx

@@ -7,7 +7,6 @@ import Loading from '@/components/Loading/BrandTextLoading';
 import { useGlobalStore } from '@/store/global';
 import type { Locales } from '@/types/locale';
 
-import DesktopChangelogLayout from './(main)/changelog/_layout/Desktop';
 import DesktopMainLayout from './(main)/layouts/desktop';
 import { idLoader, slugLoader } from './loaders/routeParams';
 
@@ -300,22 +299,6 @@ export const createDesktopRouter = (locale: Locales) =>
           path: 'labs',
         },
 
-        // Changelog routes
-        {
-          children: [
-            {
-              index: true,
-              lazy: () =>
-                import('./(main)/changelog').then((m) => ({
-                  Component: m.DesktopPage,
-                })),
-              path: '*',
-            },
-          ],
-          element: <DesktopChangelogLayout locale={locale} />,
-          path: 'changelog',
-        },
-
         // Profile routes
         {
           children: [

package/src/app/[variants]/mobileRouter.config.tsx

@@ -7,7 +7,6 @@ import Loading from '@/components/Loading/BrandTextLoading';
 import { useGlobalStore } from '@/store/global';
 import type { Locales } from '@/types/locale';
 
-import MobileChangelogLayout from './(main)/changelog/_layout/Mobile';
 import { MobileMainLayout } from './(main)/layouts/mobile';
 import { idLoader, slugLoader } from './loaders/routeParams';
 
@@ -287,21 +286,6 @@ export const createMobileRouter = (locale: Locales) =>
           path: 'labs',
         },
 
-        // Changelog routes
-        {
-          children: [
-            {
-              index: true,
-              lazy: () =>
-                import('./(main)/changelog').then((m) => ({
-                  Component: m.MobilePage,
-                })),
-            },
-          ],
-          element: <MobileChangelogLayout locale={locale} />,
-          path: 'changelog',
-        },
-
         // Profile routes
         {
           children: [

package/src/app/[variants]/page.tsx

@@ -1,7 +1,10 @@
 import { DynamicLayoutProps } from '@/types/next';
 import { RouteVariants } from '@/utils/server/routeVariants';
 
-export default async function Page(props: DynamicLayoutProps) {
+import DesktopRouter from './DesktopRouter';
+import MobileRouter from './MobileRouter';
+
+export default async (props: DynamicLayoutProps) => {
   // Get isMobile from variants parameter on server side
   const isMobile = await RouteVariants.getIsMobile(props);
   const { locale } = await RouteVariants.getVariantsFromProps(props);
@@ -10,10 +13,8 @@ export default async function Page(props: DynamicLayoutProps) {
   // Using native dynamic import ensures complete code splitting
   // Mobile and Desktop bundles will be completely separate
   if (isMobile) {
-    const { default: MobileRouter } = await import('./MobileRouter');
     return <MobileRouter locale={locale} />;
   }
 
-  const { default: DesktopRouter } = await import('./DesktopRouter');
   return <DesktopRouter locale={locale} />;
-}
+};

package/src/features/Conversation/Messages/Group/Tool/Inspector/index.tsx

@@ -11,7 +11,7 @@ import {
   Trash2,
   X,
 } from 'lucide-react';
-import { CSSProperties, memo, useState } from 'react';
+import { CSSProperties, memo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
@@ -97,7 +97,6 @@ const Inspectors = memo<InspectorProps>(
     apiName,
     id,
     arguments: requestArgs,
-    showRender,
     result,
     setShowRender,
     showPluginRender,
@@ -109,6 +108,8 @@ const Inspectors = memo<InspectorProps>(
     const { styles, theme } = useStyles();
 
     const [showDebug, setShowDebug] = useState(false);
+    const [isPinned, setIsPinned] = useState(false);
+    const [isHovered, setIsHovered] = useState(false);
 
     const [deleteAssistantMessage] = useChatStore((s) => [s.deleteAssistantMessage]);
 
@@ -121,7 +122,15 @@ const Inspectors = memo<InspectorProps>(
     const isReject = intervention?.status === 'rejected';
     const isTitleLoading = !hasResult && !isPending;
 
-    const showCustomPluginRender = showRender && !isPending && !isReject;
+    // Compute actual render state based on pinned or hovered
+    const shouldShowRender = isPinned || isHovered;
+
+    // Sync with parent state
+    useEffect(() => {
+      setShowRender(shouldShowRender);
+    }, [shouldShowRender, setShowRender]);
+
+    const showCustomPluginRender = shouldShowRender && !isPending && !isReject;
     return (
       <Flexbox className={styles.container} gap={4}>
         <Flexbox align={'center'} distribution={'space-between'} gap={8} horizontal>
@@ -131,7 +140,17 @@ const Inspectors = memo<InspectorProps>(
             gap={8}
             horizontal
             onClick={() => {
-              setShowRender(!showRender);
+              setIsPinned(!isPinned);
+            }}
+            onMouseEnter={() => {
+              if (!isPinned) {
+                setIsHovered(true);
+              }
+            }}
+            onMouseLeave={() => {
+              if (!isPinned) {
+                setIsHovered(false);
+              }
             }}
             paddingInline={4}
           >

package/src/locales/default/tool.ts

@@ -15,6 +15,12 @@ export default {
     prompt: '提示词',
   },
   localFiles: {
+    editFile: {
+      newString: '替换为',
+      oldString: '查找内容',
+      replaceAll: '替换全部匹配项',
+      replaceFirst: '仅替换第一个匹配项',
+    },
     file: '文件',
     folder: '文件夹',
     moveFiles: {
@@ -35,6 +41,11 @@ export default {
     readFileError: '读取文件失败，请检查文件路径是否正确',
     readFiles: '读取文件',
     readFilesError: '读取文件失败，请检查文件路径是否正确',
+    writeFile: {
+      characters: '字符',
+      preview: '内容预览',
+      truncated: '已截断',
+    },
   },
   search: {
     createNewSearch: '创建新的搜索记录',

package/src/store/chat/slices/builtinTool/actions/__tests__/localSystem.test.ts

@@ -50,18 +50,17 @@ describe('localFileSlice', () => {
 
   describe('internal_triggerLocalFileToolCalling', () => {
     it('should handle successful calling', async () => {
-      const mockContent = { foo: 'bar' };
+      const mockContent = 'result content';
       const mockState = { state: 'test' };
-      const mockService = vi.fn().mockResolvedValue({ content: mockContent, state: mockState });
+      const mockService = vi
+        .fn()
+        .mockResolvedValue({ content: mockContent, state: mockState, success: true });
 
       await store.internal_triggerLocalFileToolCalling('test-id', mockService);
 
       expect(mockStore.toggleLocalFileLoading).toBeCalledWith('test-id', true);
       expect(mockStore.optimisticUpdatePluginState).toBeCalledWith('test-id', mockState);
-      expect(mockStore.optimisticUpdateMessageContent).toBeCalledWith(
-        'test-id',
-        JSON.stringify(mockContent),
-      );
+      expect(mockStore.optimisticUpdateMessageContent).toBeCalledWith('test-id', mockContent);
       expect(mockStore.toggleLocalFileLoading).toBeCalledWith('test-id', false);
     });
 

package/src/store/chat/slices/builtinTool/actions/localSystem.ts

@@ -5,7 +5,6 @@ import {
   GrepContentParams,
   KillCommandParams,
   ListLocalFileParams,
-  LocalMoveFilesResultItem,
   LocalReadFileParams,
   LocalReadFilesParams,
   LocalSearchFilesParams,
@@ -16,28 +15,14 @@ import {
 } from '@lobechat/electron-client-ipc';
 import { StateCreator } from 'zustand/vanilla';
 
-import { localFileService } from '@/services/electron/localFileService';
 import { ChatStore } from '@/store/chat/store';
-import {
-  EditLocalFileState,
-  GetCommandOutputState,
-  GlobFilesState,
-  GrepContentState,
-  KillCommandState,
-  LocalFileListState,
-  LocalFileSearchState,
-  LocalMoveFilesState,
-  LocalReadFileState,
-  LocalReadFilesState,
-  LocalRenameFileState,
-  RunCommandState,
-} from '@/tools/local-system/type';
+import { LocalSystemExecutionRuntime } from '@/tools/local-system/ExecutionRuntime';
 
 /* eslint-disable typescript-sort-keys/interface */
 export interface LocalFileAction {
-  internal_triggerLocalFileToolCalling: <T = any>(
+  internal_triggerLocalFileToolCalling: (
     id: string,
-    callingService: () => Promise<{ content: any; state?: T }>,
+    callingService: () => Promise<{ content: string; error?: any; state?: any; success: boolean }>,
   ) => Promise<boolean>;
 
   // File Operations
@@ -63,6 +48,8 @@ export interface LocalFileAction {
 }
 /* eslint-enable typescript-sort-keys/interface */
 
+const runtime = new LocalSystemExecutionRuntime();
+
 /* eslint-disable sort-keys-fix/sort-keys-fix */
 export const localSystemSlice: StateCreator<
   ChatStore,
@@ -72,148 +59,49 @@ export const localSystemSlice: StateCreator<
 > = (set, get) => ({
   // ==================== File Editing ====================
   editLocalFile: async (id, params) => {
-    return get().internal_triggerLocalFileToolCalling<EditLocalFileState>(id, async () => {
-      const result = await localFileService.editLocalFile(params);
-
-      const message = result.success
-        ? `Successfully replaced ${result.replacements} occurrence(s) in ${params.file_path}`
-        : `Edit failed: ${result.error}`;
-
-      const state: EditLocalFileState = { message, result };
-
-      return { content: result, state };
+    return get().internal_triggerLocalFileToolCalling(id, async () => {
+      return await runtime.editLocalFile(params);
     });
   },
 
   writeLocalFile: async (id, params) => {
     return get().internal_triggerLocalFileToolCalling(id, async () => {
-      const result = await localFileService.writeFile(params);
-
-      let content: { message: string; success: boolean };
-
-      if (result.success) {
-        content = {
-          message: `成功写入文件 ${params.path}`,
-          success: true,
-        };
-      } else {
-        const errorMessage = result.error;
-
-        content = { message: errorMessage || '写入文件失败', success: false };
-      }
-      return { content };
+      return await runtime.writeLocalFile(params);
     });
   },
   moveLocalFiles: async (id, params) => {
-    return get().internal_triggerLocalFileToolCalling<LocalMoveFilesState>(id, async () => {
-      const results: LocalMoveFilesResultItem[] = await localFileService.moveLocalFiles(params);
-
-      // 检查所有文件是否成功移动以更新消息内容
-      const allSucceeded = results.every((r) => r.success);
-      const someFailed = results.some((r) => !r.success);
-      const successCount = results.filter((r) => r.success).length;
-      const failedCount = results.length - successCount;
-
-      let message = '';
-
-      if (allSucceeded) {
-        message = `Successfully moved ${results.length} item(s).`;
-      } else if (someFailed) {
-        message = `Moved ${successCount} item(s) successfully. Failed to move ${failedCount} item(s).`;
-      } else {
-        // 所有都失败了？
-        message = `Failed to move all ${results.length} item(s).`;
-      }
-
-      const state: LocalMoveFilesState = { results, successCount, totalCount: results.length };
-
-      return { content: { message, results }, state };
+    return get().internal_triggerLocalFileToolCalling(id, async () => {
+      return await runtime.moveLocalFiles(params);
     });
   },
   renameLocalFile: async (id, params) => {
-    return get().internal_triggerLocalFileToolCalling<LocalRenameFileState>(id, async () => {
-      const { path: currentPath, newName } = params;
-
-      // Basic validation for newName (can be done here or backend, maybe better in backend)
-      if (
-        !newName ||
-        newName.includes('/') ||
-        newName.includes('\\') ||
-        newName === '.' ||
-        newName === '..' ||
-        /["*/:<>?\\|]/.test(newName)
-      ) {
-        throw new Error(
-          'Invalid new name provided. It cannot be empty, contain path separators, or invalid characters.',
-        );
-      }
-
-      const result = await localFileService.renameLocalFile({ newName, path: currentPath }); // Call the specific service
-
-      let state: LocalRenameFileState;
-      let content: { message: string; success: boolean };
-
-      if (result.success) {
-        state = { newPath: result.newPath!, oldPath: currentPath, success: true };
-        // Simplified message
-        content = {
-          message: `Successfully renamed file ${currentPath} to ${newName}.`,
-          success: true,
-        };
-      } else {
-        const errorMessage = result.error;
-        state = {
-          error: errorMessage,
-          newPath: '',
-          oldPath: params.path,
-          success: false,
-        };
-        content = { message: errorMessage, success: false };
-      }
-      return { content, state };
+    return get().internal_triggerLocalFileToolCalling(id, async () => {
+      return await runtime.renameLocalFile(params);
     });
   },
 
   // ==================== Search & Find ====================
   grepContent: async (id, params) => {
-    return get().internal_triggerLocalFileToolCalling<GrepContentState>(id, async () => {
-      const result = await localFileService.grepContent(params);
-
-      const message = result.success
-        ? `Found ${result.total_matches} matches in ${result.matches.length} locations`
-        : 'Search failed';
-
-      const state: GrepContentState = { message, result };
-
-      return { content: result, state };
+    return get().internal_triggerLocalFileToolCalling(id, async () => {
+      return await runtime.grepContent(params);
     });
   },
 
   globLocalFiles: async (id, params) => {
-    return get().internal_triggerLocalFileToolCalling<GlobFilesState>(id, async () => {
-      const result = await localFileService.globFiles(params);
-
-      const message = result.success ? `Found ${result.total_files} files` : 'Glob search failed';
-
-      const state: GlobFilesState = { message, result };
-
-      return { content: result, state };
+    return get().internal_triggerLocalFileToolCalling(id, async () => {
+      return await runtime.globLocalFiles(params);
     });
   },
 
   searchLocalFiles: async (id, params) => {
-    return get().internal_triggerLocalFileToolCalling<LocalFileSearchState>(id, async () => {
-      const result = await localFileService.searchLocalFiles(params);
-      const state: LocalFileSearchState = { searchResults: result };
-      return { content: result, state };
+    return get().internal_triggerLocalFileToolCalling(id, async () => {
+      return await runtime.searchLocalFiles(params);
     });
   },
 
   listLocalFiles: async (id, params) => {
-    return get().internal_triggerLocalFileToolCalling<LocalFileListState>(id, async () => {
-      const result = await localFileService.listLocalFiles(params);
-      const state: LocalFileListState = { listResults: result };
-      return { content: result, state };
+    return get().internal_triggerLocalFileToolCalling(id, async () => {
+      return await runtime.listLocalFiles(params);
     });
   },
 
@@ -226,67 +114,31 @@ export const localSystemSlice: StateCreator<
   },
 
   readLocalFile: async (id, params) => {
-    return get().internal_triggerLocalFileToolCalling<LocalReadFileState>(id, async () => {
-      const result = await localFileService.readLocalFile(params);
-      const state: LocalReadFileState = { fileContent: result };
-      return { content: result, state };
+    return get().internal_triggerLocalFileToolCalling(id, async () => {
+      return await runtime.readLocalFile(params);
     });
   },
 
   readLocalFiles: async (id, params) => {
-    return get().internal_triggerLocalFileToolCalling<LocalReadFilesState>(id, async () => {
-      const results = await localFileService.readLocalFiles(params);
-      const state: LocalReadFilesState = { filesContent: results };
-      return { content: results, state };
+    return get().internal_triggerLocalFileToolCalling(id, async () => {
+      return await runtime.readLocalFiles(params);
     });
   },
 
   // ==================== Shell Commands ====================
   runCommand: async (id, params) => {
-    return get().internal_triggerLocalFileToolCalling<RunCommandState>(id, async () => {
-      const result = await localFileService.runCommand(params);
-
-      let message: string;
-
-      if (result.success) {
-        if (result.shell_id) {
-          message = `Command started in background with shell_id: ${result.shell_id}`;
-        } else {
-          message = `Command completed successfully.`;
-        }
-      } else {
-        message = `Command failed: ${result.error}`;
-      }
-
-      const state: RunCommandState = { message, result };
-
-      return { content: result, state };
+    return get().internal_triggerLocalFileToolCalling(id, async () => {
+      return await runtime.runCommand(params);
     });
   },
   killCommand: async (id, params) => {
-    return get().internal_triggerLocalFileToolCalling<KillCommandState>(id, async () => {
-      const result = await localFileService.killCommand(params);
-
-      const message = result.success
-        ? `Successfully killed shell: ${params.shell_id}`
-        : `Failed to kill shell: ${result.error}`;
-
-      const state: KillCommandState = { message, result };
-
-      return { content: result, state };
+    return get().internal_triggerLocalFileToolCalling(id, async () => {
+      return await runtime.killCommand(params);
     });
   },
   getCommandOutput: async (id, params) => {
-    return get().internal_triggerLocalFileToolCalling<GetCommandOutputState>(id, async () => {
-      const result = await localFileService.getCommandOutput(params);
-
-      const message = result.success
-        ? `Output retrieved. Running: ${result.running}`
-        : `Failed: ${result.error}`;
-
-      const state: GetCommandOutputState = { message, result };
-
-      return { content: result, state };
+    return get().internal_triggerLocalFileToolCalling(id, async () => {
+      return await runtime.getCommandOutput(params);
     });
   },
 
@@ -305,11 +157,22 @@ export const localSystemSlice: StateCreator<
   internal_triggerLocalFileToolCalling: async (id, callingService) => {
     get().toggleLocalFileLoading(id, true);
     try {
-      const { state, content } = await callingService();
-      if (state) {
-        await get().optimisticUpdatePluginState(id, state as any);
+      const { state, content, success, error } = await callingService();
+
+      if (success) {
+        if (state) {
+          await get().optimisticUpdatePluginState(id, state);
+        }
+        await get().optimisticUpdateMessageContent(id, content);
+      } else {
+        await get().optimisticUpdateMessagePluginError(id, {
+          body: error,
+          message: error?.message || 'Operation failed',
+          type: 'PluginServerError',
+        });
+        // Still update content even if failed, to show error message
+        await get().optimisticUpdateMessageContent(id, content);
       }
-      await get().optimisticUpdateMessageContent(id, JSON.stringify(content));
     } catch (error) {
       await get().optimisticUpdateMessagePluginError(id, {
         body: error,

package/src/tools/executionRuntimes.ts

@@ -1,6 +1,9 @@
+import { LocalSystemManifest } from './local-system';
+import { LocalSystemExecutionRuntime } from './local-system/ExecutionRuntime';
 import { WebBrowsingManifest } from './web-browsing';
 import { WebBrowsingExecutionRuntime } from './web-browsing/ExecutionRuntime';
 
 export const BuiltinToolServerRuntimes: Record<string, any> = {
+  [LocalSystemManifest.identifier]: LocalSystemExecutionRuntime,
   [WebBrowsingManifest.identifier]: WebBrowsingExecutionRuntime,
 };