@lobehub/lobehub 2.0.0-next.51 → 2.0.0-next.52

package/src/tools/local-system/Render/SearchFiles/index.tsx

@@ -1,5 +1,5 @@
 import { LocalSearchFilesParams } from '@lobechat/electron-client-ipc';
-import { ChatMessagePluginError } from '@lobechat/types';
+import { BuiltinRenderProps } from '@lobechat/types';
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
@@ -8,25 +8,20 @@ import { LocalFileSearchState } from '@/tools/local-system/type';
 import SearchResult from './Result';
 import SearchQuery from './SearchQuery';
 
-interface SearchFilesProps {
-  args: LocalSearchFilesParams;
-  messageId: string;
-  pluginError: ChatMessagePluginError;
-  pluginState?: LocalFileSearchState;
-}
-
-const SearchFiles = memo<SearchFilesProps>(({ messageId, pluginError, args, pluginState }) => {
-  return (
-    <Flexbox gap={4}>
-      <SearchQuery args={args} messageId={messageId} pluginState={pluginState} />
-      <SearchResult
-        messageId={messageId}
-        pluginError={pluginError}
-        searchResults={pluginState?.searchResults}
-      />
-    </Flexbox>
-  );
-});
+const SearchFiles = memo<BuiltinRenderProps<LocalSearchFilesParams, LocalFileSearchState>>(
+  ({ messageId, pluginError, args, pluginState }) => {
+    return (
+      <Flexbox gap={4}>
+        <SearchQuery args={args} messageId={messageId} pluginState={pluginState} />
+        <SearchResult
+          messageId={messageId}
+          pluginError={pluginError}
+          searchResults={pluginState?.searchResults}
+        />
+      </Flexbox>
+    );
+  },
+);
 
 SearchFiles.displayName = 'SearchFiles';
 

package/src/tools/local-system/Render/WriteFile/index.tsx

@@ -1,5 +1,5 @@
 import { WriteLocalFileParams } from '@lobechat/electron-client-ipc';
-import { ChatMessagePluginError } from '@lobechat/types';
+import { BuiltinRenderProps } from '@lobechat/types';
 import { Icon } from '@lobehub/ui';
 import { Skeleton } from 'antd';
 import { ChevronRight } from 'lucide-react';
@@ -9,13 +9,7 @@ import { Flexbox } from 'react-layout-kit';
 
 import { LocalFile, LocalFolder } from '@/features/LocalFile';
 
-interface WriteFileProps {
-  args: WriteLocalFileParams;
-  messageId: string;
-  pluginError: ChatMessagePluginError;
-}
-
-const WriteFile = memo<WriteFileProps>(({ args }) => {
+const WriteFile = memo<BuiltinRenderProps<WriteLocalFileParams>>(({ args }) => {
   if (!args) return <Skeleton active />;
 
   const { base, dir } = path.parse(args.path);

package/src/tools/local-system/index.ts

@@ -78,6 +78,10 @@ export const LocalSystemManifest: BuiltinToolManifest = {
             format: 'date-time',
             type: 'string',
           },
+          directory: {
+            description: 'Limit the search to this specific directory path',
+            type: 'string',
+          },
           exclude: {
             description: 'Array of file or directory paths to exclude',
             items: {
@@ -114,10 +118,6 @@ export const LocalSystemManifest: BuiltinToolManifest = {
             format: 'date-time',
             type: 'string',
           },
-          onlyIn: {
-            description: 'Limit the search to this specific directory path',
-            type: 'string',
-          },
           sortBy: {
             description: 'Sort results by',
             enum: ['name', 'date', 'size'],

package/src/tools/local-system/systemRole.ts

@@ -1,4 +1,4 @@
-export const systemPrompt = `You have a Local System tool with capabilities to interact with the user's local file system. You can list directories, read file contents, search for files, move, and rename files/directories.
+export const systemPrompt = `You have a Local System tool with capabilities to interact with the user's local system. You can list directories, read file contents, search for files, move, and rename files/directories.
 
 <user_context>
 Here are some known locations and system details on the user's system. User is using the Operating System: {{platform}}({{arch}}). Use these paths when the user refers to these common locations by name (e.g., "my desktop", "downloads folder").

package/src/tools/placeholders.ts

@@ -1,11 +1,42 @@
 import { BuiltinPlaceholder } from '@lobechat/types';
 
-import { LocalSystemManifest } from './local-system';
-import LocalSystem from './local-system/Placeholder';
-import { WebBrowsingManifest } from './web-browsing';
-import WebBrowsing from './web-browsing/Placeholder';
-
-export const BuiltinToolPlaceholders: Record<string, BuiltinPlaceholder> = {
-  [WebBrowsingManifest.identifier]: WebBrowsing as BuiltinPlaceholder,
-  [LocalSystemManifest.identifier]: LocalSystem as BuiltinPlaceholder,
+import { LocalSystemApiName, LocalSystemManifest } from './local-system';
+import { ListFiles as LocalSystemListFiles } from './local-system/Placeholder/ListFiles';
+import LocalSystemSearchFiles from './local-system/Placeholder/SearchFiles';
+import { WebBrowsingApiName, WebBrowsingManifest } from './web-browsing';
+import CrawlMultiPages from './web-browsing/Placeholder/CrawlMultiPages';
+import CrawlSinglePage from './web-browsing/Placeholder/CrawlSinglePage';
+import { Search } from './web-browsing/Placeholder/Search';
+
+/**
+ * Builtin tools placeholders registry
+ * Organized by toolset (identifier) -> API name
+ */
+export const BuiltinToolPlaceholders: Record<string, Record<string, any>> = {
+  [LocalSystemManifest.identifier]: {
+    [LocalSystemApiName.searchLocalFiles]: LocalSystemSearchFiles,
+    [LocalSystemApiName.listLocalFiles]: LocalSystemListFiles,
+  },
+  [WebBrowsingManifest.identifier]: {
+    [WebBrowsingApiName.search]: Search,
+    [WebBrowsingApiName.crawlSinglePage]: CrawlSinglePage,
+    [WebBrowsingApiName.crawlMultiPages]: CrawlMultiPages,
+  },
+};
+
+/**
+ * Get builtin placeholder component for a specific API
+ * @param identifier - Tool identifier (e.g., 'lobe-local-system')
+ * @param apiName - API name (e.g., 'searchLocalFiles')
+ */
+export const getBuiltinPlaceholder = (
+  identifier?: string,
+  apiName?: string,
+): BuiltinPlaceholder | undefined => {
+  if (!identifier || !apiName) return undefined;
+
+  const toolset = BuiltinToolPlaceholders[identifier];
+  if (!toolset) return undefined;
+
+  return toolset[apiName];
 };

package/src/tools/renders.ts

@@ -2,13 +2,60 @@ import { BuiltinRender } from '@lobechat/types';
 
 import { CodeInterpreterManifest } from './code-interpreter';
 import CodeInterpreterRender from './code-interpreter/Render';
-import { LocalSystemManifest } from './local-system';
-import LocalFilesRender from './local-system/Render';
-import { WebBrowsingManifest } from './web-browsing';
-import WebBrowsing from './web-browsing/Render';
-
-export const BuiltinToolsRenders: Record<string, BuiltinRender> = {
-  [WebBrowsingManifest.identifier]: WebBrowsing as BuiltinRender,
-  [LocalSystemManifest.identifier]: LocalFilesRender as BuiltinRender,
-  [CodeInterpreterManifest.identifier]: CodeInterpreterRender as BuiltinRender,
+// local-system
+import { LocalSystemApiName, LocalSystemManifest } from './local-system';
+import ListFiles from './local-system/Render/ListFiles';
+import ReadLocalFile from './local-system/Render/ReadLocalFile';
+import RenameLocalFile from './local-system/Render/RenameLocalFile';
+import RunCommand from './local-system/Render/RunCommand';
+import SearchFiles from './local-system/Render/SearchFiles';
+import WriteFile from './local-system/Render/WriteFile';
+// web-browsing
+import { WebBrowsingApiName, WebBrowsingManifest } from './web-browsing';
+import CrawlMultiPages from './web-browsing/Render/CrawlMultiPages';
+import CrawlSinglePage from './web-browsing/Render/CrawlSinglePage';
+import Search from './web-browsing/Render/Search';
+
+/**
+ * Builtin tools renders registry
+ * Organized by toolset (identifier) -> API name
+ */
+const BuiltinToolsRenders: Record<string, Record<string, BuiltinRender>> = {
+  [LocalSystemManifest.identifier]: {
+    [LocalSystemApiName.searchLocalFiles]: SearchFiles as BuiltinRender,
+    [LocalSystemApiName.listLocalFiles]: ListFiles as BuiltinRender,
+    [LocalSystemApiName.readLocalFile]: ReadLocalFile as BuiltinRender,
+    [LocalSystemApiName.renameLocalFile]: RenameLocalFile as BuiltinRender,
+    [LocalSystemApiName.writeLocalFile]: WriteFile as BuiltinRender,
+    [LocalSystemApiName.runCommand]: RunCommand as BuiltinRender,
+  },
+  [WebBrowsingManifest.identifier]: {
+    [WebBrowsingApiName.search]: Search as BuiltinRender,
+    [WebBrowsingApiName.crawlSinglePage]: CrawlSinglePage as BuiltinRender,
+    [WebBrowsingApiName.crawlMultiPages]: CrawlMultiPages as BuiltinRender,
+  },
+  [CodeInterpreterManifest.identifier]: {
+    python: CodeInterpreterRender as BuiltinRender,
+  },
+};
+
+/**
+ * Get builtin render component for a specific API
+ * @param identifier - Tool identifier (e.g., 'lobe-local-system')
+ * @param apiName - API name (e.g., 'searchLocalFiles')
+ */
+export const getBuiltinRender = (
+  identifier?: string,
+  apiName?: string,
+): BuiltinRender | undefined => {
+  if (!identifier) return undefined;
+
+  const toolset = BuiltinToolsRenders[identifier];
+  if (!toolset) return undefined;
+
+  if (apiName && toolset[apiName]) {
+    return toolset[apiName];
+  }
+
+  return undefined;
 };

package/src/tools/web-browsing/Placeholder/{PageContent.tsx → CrawlMultiPages.tsx}

@@ -1,5 +1,6 @@
 'use client';
 
+import { BuiltinPlaceholderProps } from '@lobechat/types';
 import { ScrollShadow } from '@lobehub/ui';
 import { memo } from 'react';
 
@@ -7,7 +8,9 @@ import { useIsMobile } from '@/hooks/useIsMobile';
 
 import LoadingCard from '../Render/PageContent/Loading';
 
-const PageContent = memo<{ urls: string[] }>(({ urls }) => {
+const PageContent = memo<BuiltinPlaceholderProps<{ urls: string[] }>>(({ args }) => {
+  const urls = args?.urls;
+
   const isMobile = useIsMobile();
 
   return (

package/src/tools/web-browsing/Placeholder/CrawlSinglePage.tsx

@@ -0,0 +1,12 @@
+'use client';
+
+import { BuiltinPlaceholderProps } from '@lobechat/types';
+import { memo } from 'react';
+
+import LoadingCard from '../Render/PageContent/Loading';
+
+const CrawlSinglePage = memo<BuiltinPlaceholderProps<{ url: string }>>(({ args }) => {
+  return <LoadingCard url={args?.url || ''} />;
+});
+
+export default CrawlSinglePage;

package/src/tools/web-browsing/Placeholder/Search.tsx

@@ -1,3 +1,4 @@
+import { BuiltinPlaceholderProps, SearchQuery } from '@lobechat/types';
 import { Icon } from '@lobehub/ui';
 import { Skeleton } from 'antd';
 import { createStyles } from 'antd-style';
@@ -29,10 +30,9 @@ const useStyles = createStyles(({ css, token, cx }) => ({
   ),
 }));
 
-interface SearchProps {
-  query?: string;
-}
-export const Search = memo<SearchProps>(({ query }) => {
+export const Search = memo<BuiltinPlaceholderProps<SearchQuery>>(({ args }) => {
+  const { query } = args || {};
+
   const isMobile = useIsMobile();
   const { styles } = useStyles();
   return (

package/src/tools/web-browsing/Render/CrawlMultiPages.tsx

@@ -0,0 +1,15 @@
+import { BuiltinRenderProps, CrawlMultiPagesQuery, CrawlPluginState } from '@lobechat/types';
+import { memo } from 'react';
+
+import PageContent from './PageContent';
+
+const CrawlSinglePage = memo<BuiltinRenderProps<CrawlMultiPagesQuery, CrawlPluginState>>(
+  ({ messageId, pluginState = {}, args = {} }) => {
+    const { results } = pluginState;
+    const { urls } = args;
+
+    return <PageContent messageId={messageId} results={results} urls={urls} />;
+  },
+);
+
+export default CrawlSinglePage;

package/src/tools/web-browsing/Render/CrawlSinglePage.tsx

@@ -0,0 +1,15 @@
+import { BuiltinRenderProps, CrawlPluginState, CrawlSinglePageQuery } from '@lobechat/types';
+import { memo } from 'react';
+
+import PageContent from './PageContent';
+
+const MultiPages = memo<BuiltinRenderProps<CrawlSinglePageQuery, CrawlPluginState>>(
+  ({ messageId, pluginState, args }) => {
+    const { results } = pluginState || {};
+    const { url } = args || {};
+
+    return <PageContent messageId={messageId} results={results} urls={[url]} />;
+  },
+);
+
+export default MultiPages;

package/src/tools/web-browsing/Render/Search/index.tsx

@@ -1,4 +1,4 @@
-import { ChatMessagePluginError, SearchQuery, UniformSearchResponse } from '@lobechat/types';
+import { BuiltinRenderProps, SearchQuery, UniformSearchResponse } from '@lobechat/types';
 import { Alert, Highlighter } from '@lobehub/ui';
 import { memo, useState } from 'react';
 import { Flexbox } from 'react-layout-kit';
@@ -7,54 +7,49 @@ import ConfigForm from './ConfigForm';
 import SearchQueryView from './SearchQuery';
 import SearchResult from './SearchResult';
 
-interface SearchProps {
-  messageId: string;
-  pluginError: ChatMessagePluginError;
-  searchQuery: SearchQuery;
-  searchResponse?: UniformSearchResponse;
-}
+const Search = memo<BuiltinRenderProps<SearchQuery, UniformSearchResponse>>(
+  ({ messageId, args: searchQuery, pluginState: searchResponse, pluginError }) => {
+    const [editing, setEditing] = useState(false);
 
-const Search = memo<SearchProps>(({ messageId, searchQuery, searchResponse, pluginError }) => {
-  const [editing, setEditing] = useState(false);
+    if (pluginError) {
+      if (pluginError?.type === 'PluginSettingsInvalid') {
+        return <ConfigForm id={messageId} provider={pluginError.body?.provider} />;
+      }
 
-  if (pluginError) {
-    if (pluginError?.type === 'PluginSettingsInvalid') {
-      return <ConfigForm id={messageId} provider={pluginError.body?.provider} />;
+      return (
+        <Alert
+          extra={
+            <Flexbox>
+              <Highlighter actionIconSize={'small'} language={'json'} variant={'borderless'}>
+                {JSON.stringify(pluginError.body?.data || pluginError.body, null, 2)}
+              </Highlighter>
+            </Flexbox>
+          }
+          message={pluginError?.message}
+          type={'error'}
+        />
+      );
     }
 
     return (
-      <Alert
-        extra={
-          <Flexbox>
-            <Highlighter actionIconSize={'small'} language={'json'} variant={'borderless'}>
-              {JSON.stringify(pluginError.body?.data || pluginError.body, null, 2)}
-            </Highlighter>
-          </Flexbox>
-        }
-        message={pluginError?.message}
-        type={'error'}
-      />
+      <Flexbox gap={8}>
+        <SearchQueryView
+          args={searchQuery}
+          editing={editing}
+          messageId={messageId}
+          pluginState={searchResponse}
+          setEditing={setEditing}
+        />
+        <SearchResult
+          args={searchQuery}
+          editing={editing}
+          messageId={messageId}
+          pluginState={searchResponse}
+          setEditing={setEditing}
+        />
+      </Flexbox>
     );
-  }
-
-  return (
-    <Flexbox gap={8}>
-      <SearchQueryView
-        args={searchQuery}
-        editing={editing}
-        messageId={messageId}
-        pluginState={searchResponse}
-        setEditing={setEditing}
-      />
-      <SearchResult
-        args={searchQuery}
-        editing={editing}
-        messageId={messageId}
-        pluginState={searchResponse}
-        setEditing={setEditing}
-      />
-    </Flexbox>
-  );
-});
+  },
+);
 
 export default Search;

package/packages/database/migrations/0044_add_tool_intervention.sql

@@ -1 +0,0 @@
-ALTER TABLE "message_plugins" ADD COLUMN "intervention" jsonb;

package/src/tools/local-system/Intervention/index.tsx

@@ -1,17 +0,0 @@
-import { RunCommandParams } from '@lobechat/electron-client-ipc';
-import { BuiltinInterventionProps } from '@lobechat/types';
-import { memo } from 'react';
-
-import RunCommand from './RunCommand';
-
-const Intervention = memo<BuiltinInterventionProps<RunCommandParams>>(
-  ({ apiName, args, messageId }) => {
-    if (apiName === 'runCommand') {
-      return <RunCommand {...args} messageId={messageId} />;
-    }
-
-    return null;
-  },
-);
-
-export default Intervention;

package/src/tools/local-system/Placeholder/index.tsx

@@ -1,25 +0,0 @@
-import { BuiltinPlaceholderProps } from '@lobechat/types';
-import { memo } from 'react';
-
-import { LocalSystemApiName } from '@/tools/local-system';
-
-import ReadLocalFile from '../Render/ReadLocalFile/ReadFileSkeleton';
-import { ListFiles } from './ListFiles';
-import SearchFiles from './SearchFiles';
-
-const RenderMap = {
-  [LocalSystemApiName.searchLocalFiles]: SearchFiles,
-  [LocalSystemApiName.listLocalFiles]: ListFiles,
-  [LocalSystemApiName.readLocalFile]: ReadLocalFile,
-  // [LocalSystemApiName.renameLocalFile]: RenameLocalFile,
-  // [LocalSystemApiName.writeLocalFile]: WriteFile,
-};
-const Placeholder = memo<BuiltinPlaceholderProps>(({ apiName, args }) => {
-  const Render = RenderMap[apiName as any];
-
-  if (!Render) return;
-
-  return <Render args={(args || {}) as any} />;
-});
-
-export default Placeholder;

package/src/tools/local-system/Render/index.tsx

@@ -1,42 +0,0 @@
-import { LocalFileItem } from '@lobechat/electron-client-ipc';
-import { BuiltinRenderProps } from '@lobechat/types';
-import { memo } from 'react';
-
-import { LocalSystemApiName } from '@/tools/local-system';
-
-import ListFiles from './ListFiles';
-import ReadLocalFile from './ReadLocalFile';
-import RenameLocalFile from './RenameLocalFile';
-import RunCommand from './RunCommand';
-import SearchFiles from './SearchFiles';
-import WriteFile from './WriteFile';
-
-const RenderMap = {
-  [LocalSystemApiName.searchLocalFiles]: SearchFiles,
-  [LocalSystemApiName.listLocalFiles]: ListFiles,
-  [LocalSystemApiName.readLocalFile]: ReadLocalFile,
-  [LocalSystemApiName.renameLocalFile]: RenameLocalFile,
-  [LocalSystemApiName.writeLocalFile]: WriteFile,
-  [LocalSystemApiName.runCommand]: RunCommand,
-};
-
-const LocalFilesRender = memo<BuiltinRenderProps<LocalFileItem[]>>(
-  ({ pluginState, apiName, messageId, pluginError, args }) => {
-    const Render = RenderMap[apiName as any];
-
-    if (!Render) return;
-
-    return (
-      <Render
-        args={args}
-        messageId={messageId}
-        pluginError={pluginError}
-        pluginState={pluginState}
-      />
-    );
-  },
-);
-
-LocalFilesRender.displayName = 'LocalFilesRender';
-
-export default LocalFilesRender;

package/src/tools/web-browsing/Placeholder/index.tsx

@@ -1,40 +0,0 @@
-import {
-  BuiltinPlaceholderProps,
-  CrawlMultiPagesQuery,
-  CrawlSinglePageQuery,
-  SearchQuery,
-} from '@lobechat/types';
-import { Skeleton } from 'antd';
-import { memo } from 'react';
-
-import { WebBrowsingApiName } from '@/tools/web-browsing';
-
-import PageContent from './PageContent';
-import { Search } from './Search';
-
-const Placeholder = memo<BuiltinPlaceholderProps>(({ apiName, args }) => {
-  switch (apiName) {
-    case WebBrowsingApiName.search: {
-      const { query } = args as SearchQuery;
-      return <Search query={query} />;
-    }
-
-    case WebBrowsingApiName.crawlSinglePage: {
-      const { url } = args as CrawlSinglePageQuery;
-
-      return <PageContent urls={[url]} />;
-    }
-
-    case WebBrowsingApiName.crawlMultiPages: {
-      const { urls } = args as CrawlMultiPagesQuery;
-
-      return <PageContent urls={urls} />;
-    }
-
-    default: {
-      return <Skeleton.Button />;
-    }
-  }
-});
-
-export default Placeholder;

package/src/tools/web-browsing/Render/index.tsx

@@ -1,57 +0,0 @@
-import {
-  BuiltinRenderProps,
-  CrawlMultiPagesQuery,
-  CrawlPluginState,
-  CrawlSinglePageQuery,
-  SearchContent,
-  SearchQuery,
-  UniformSearchResponse,
-} from '@lobechat/types';
-import { memo } from 'react';
-
-import { WebBrowsingApiName } from '@/tools/web-browsing';
-import PageContent from '@/tools/web-browsing/Render/PageContent';
-
-import Search from './Search';
-
-const WebBrowsing = memo<BuiltinRenderProps<SearchContent[]>>(
-  ({ messageId, args, pluginState, pluginError, apiName }) => {
-    switch (apiName) {
-      case WebBrowsingApiName.search:
-      case 'searchWithSearXNG': {
-        return (
-          <Search
-            messageId={messageId}
-            pluginError={pluginError}
-            searchQuery={(args as SearchQuery) || {}}
-            searchResponse={pluginState as UniformSearchResponse}
-          />
-        );
-      }
-
-      case WebBrowsingApiName.crawlSinglePage: {
-        return (
-          <PageContent
-            messageId={messageId}
-            results={(pluginState as CrawlPluginState)?.results}
-            urls={[(args as CrawlSinglePageQuery)?.url]}
-          />
-        );
-      }
-
-      case WebBrowsingApiName.crawlMultiPages: {
-        return (
-          <PageContent
-            messageId={messageId}
-            results={(pluginState as CrawlPluginState)?.results}
-            urls={(args as CrawlMultiPagesQuery)?.urls}
-          />
-        );
-      }
-    }
-  },
-);
-
-WebBrowsing.displayName = 'WebBrowsing';
-
-export default WebBrowsing;