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

package/packages/model-runtime/src/providers/wenxin/index.ts

@@ -4,12 +4,17 @@ import {
   OpenAICompatibleFactoryOptions,
   createOpenAICompatibleRuntime,
 } from '../../core/openaiCompatibleFactory';
+import { processMultiProviderModelList } from '../../utils/modelParse';
+
+export interface WenxinModelCard {
+  id: string;
+}
 
 export const params = {
   baseURL: 'https://qianfan.baidubce.com/v2',
   chatCompletion: {
     handlePayload: (payload) => {
-      const { enabledSearch, ...rest } = payload;
+      const { enabledSearch, thinking, ...rest } = payload;
 
       return {
         ...rest,
@@ -21,12 +26,28 @@ export const params = {
             enable_trace: true,
           },
         }),
+        ...(thinking && {
+          enable_thinking: { disabled: false, enabled: true }[thinking.type],
+          ...(thinking?.budget_tokens !== 0 && {
+            thinking_budget: Math.min(Math.max(thinking?.budget_tokens, 100), 16_384),
+          }),
+        }),
       } as any;
     },
   },
   debug: {
     chatCompletion: () => process.env.DEBUG_WENXIN_CHAT_COMPLETION === '1',
   },
+  models: async ({ client }) => {
+    const modelsPage = (await client.models.list()) as any;
+    const modelList: WenxinModelCard[] = modelsPage.data;
+
+    const standardModelList = modelList.map((model) => ({
+      id: model.id,
+    }));
+
+    return processMultiProviderModelList(standardModelList, 'wenxin');
+  },
   provider: ModelProvider.Wenxin,
 } satisfies OpenAICompatibleFactoryOptions;
 

package/packages/model-runtime/src/utils/modelParse.ts

@@ -98,6 +98,11 @@ export const MODEL_LIST_CONFIGS = {
     reasoningKeywords: ['thinking', 'seed', 'ui-tars'],
     visionKeywords: ['vision', '-m', 'seed', 'ui-tars'],
   },
+  wenxin: {
+    functionCallKeywords: ['ernie-5', 'ernie-x1', 'pro', 'ernie-4.5-21b-a3b-thinking'],
+    reasoningKeywords: ['thinking', 'ernie-x', 'ernie-4.5-vl-28b-a3b'],
+    visionKeywords: ['-vl', 'ernie-5.0', 'picocr', 'qianfan-composition'],
+  },
   xai: {
     functionCallKeywords: ['grok'],
     reasoningKeywords: ['mini', 'grok-4', 'grok-code-fast', '!non-reasoning'],
@@ -129,6 +134,7 @@ export const MODEL_OWNER_DETECTION_CONFIG = {
   qwen: ['qwen', 'qwq', 'qvq'],
   v0: ['v0'],
   volcengine: ['doubao'],
+  wenxin: ['ernie', 'qianfan'],
   xai: ['grok'],
   zeroone: ['yi-'],
   zhipu: ['glm'],

package/packages/types/src/tool/builtin.ts

@@ -151,3 +151,12 @@ export interface BuiltinServerRuntimeOutput {
   state?: any;
   success: boolean;
 }
+
+export interface BuiltinInterventionProps<Arguments = any> {
+  apiName?: string;
+  args: Arguments;
+  identifier?: string;
+  messageId: string;
+}
+
+export type BuiltinIntervention = (props: BuiltinInterventionProps) => ReactNode;

package/packages/types/src/tool/intervention.ts

@@ -5,9 +5,9 @@ import { z } from 'zod';
  */
 export type HumanInterventionPolicy =
   | 'never' // Never intervene, auto-execute
-  | 'require'; // Always require intervention
+  | 'required'; // Always require intervention
 
-export const HumanInterventionPolicySchema = z.enum(['never', 'require']);
+export const HumanInterventionPolicySchema = z.enum(['never', 'required']);
 
 /**
  * Argument Matcher for parameter-level filtering
@@ -116,6 +116,36 @@ export const HumanInterventionResponseSchema = z.object({
     .optional(),
 });
 
+/**
+ * User's global intervention configuration
+ * Applied across all tools in the session
+ */
+export interface UserInterventionConfig {
+  /**
+   * Allow list of approved tools (used in 'allow-list' mode)
+   * Format: "identifier/apiName"
+   *
+   * Examples:
+   * - "bash/bash"
+   * - "web-browsing/crawlSinglePage"
+   * - "search/search"
+   */
+  allowList?: string[];
+
+  /**
+   * Tool approval mode
+   * - auto-run: Automatically approve all tools without user consent
+   * - allow-list: Only approve tools in the allow list
+   * - manual: Use tool's own humanIntervention config (default)
+   */
+  approvalMode: 'auto-run' | 'allow-list' | 'manual';
+}
+
+export const UserInterventionConfigSchema = z.object({
+  allowList: z.array(z.string()).optional(),
+  approvalMode: z.enum(['auto-run', 'allow-list', 'manual']),
+});
+
 /**
  * Parameters for shouldIntervene method
  */

package/packages/types/src/user/settings/tool.ts

@@ -1,29 +1,5 @@
-export interface UserToolConfig {
-  /**
-   * Tool approval mode
-   * - auto-run: Automatically approve all tools without user consent
-   * - allow-list: Only approve tools in the allow list
-   * - manual: Require manual approval for each tool execution
-   */
-  approvalMode?: 'auto-run' | 'allow-list' | 'manual';
-
-  dalle: {
-    autoGenerate: boolean;
-  };
+import { UserInterventionConfig } from '../../tool';
 
-  /**
-   * Tool intervention configuration
-   */
-  humanIntervention?: {
-    /**
-     * Allow list of approved tools (used in 'allow-list' mode)
-     * Format: "identifier/apiName"
-     *
-     * Examples:
-     * - "web-browsing/crawlSinglePage"
-     * - "bash/bash"
-     * - "search/search"
-     */
-    allowList?: string[];
-  };
+export interface UserToolConfig {
+  humanIntervention?: UserInterventionConfig;
 }

package/src/config/modelProviders/wenxin.ts

@@ -1,13 +1,12 @@
 import { ModelProviderCard } from '@/types/llm';
 
-// ref https://cloud.baidu.com/doc/WENXINWORKSHOP/s/Nlks5zkzu
 const BaiduWenxin: ModelProviderCard = {
   chatModels: [],
-  checkModel: 'ernie-speed-128k',
+  checkModel: 'ernie-4.5-turbo-latest',
   description:
     '企业级一站式大模型与AI原生应用开发及服务平台，提供最全面易用的生成式人工智能模型开发、应用开发全流程工具链',
   id: 'wenxin',
-  modelsUrl: 'https://cloud.baidu.com/doc/WENXINWORKSHOP/s/Nlks5zkzu#%E5%AF%B9%E8%AF%9Dchat',
+  modelsUrl: 'https://console.bce.baidu.com/qianfan/modelcenter/model/buildIn/list',
   name: 'Wenxin',
   settings: {
     proxyUrl: {

package/src/features/Conversation/MarkdownElements/remarkPlugins/__snapshots__/createRemarkSelfClosingTagPlugin.test.ts.snap

@@ -1,5 +1,138 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`createRemarkSelfClosingTagPlugin > should handle multiple tags in unordered list with directories and files 1`] = `
+{
+  "children": [
+    {
+      "children": [
+        {
+          "position": {
+            "end": {
+              "column": 32,
+              "line": 1,
+              "offset": 31,
+            },
+            "start": {
+              "column": 1,
+              "line": 1,
+              "offset": 0,
+            },
+          },
+          "type": "text",
+          "value": "我已查看了你桌面上 test 文件夹的目录，里面包含以下项目：",
+        },
+      ],
+      "position": {
+        "end": {
+          "column": 32,
+          "line": 1,
+          "offset": 31,
+        },
+        "start": {
+          "column": 1,
+          "line": 1,
+          "offset": 0,
+        },
+      },
+      "type": "paragraph",
+    },
+    {
+      "children": [
+        {
+          "checked": null,
+          "children": [
+            {
+              "data": {
+                "hName": "localFile",
+                "hProperties": {
+                  "isDirectory": true,
+                  "name": ".config",
+                  "path": "/Users/user/Desktop/test/.config",
+                },
+              },
+              "type": "localFile",
+            },
+          ],
+          "position": {
+            "end": {
+              "column": 87,
+              "line": 3,
+              "offset": 119,
+            },
+            "start": {
+              "column": 1,
+              "line": 3,
+              "offset": 33,
+            },
+          },
+          "spread": false,
+          "type": "listItem",
+        },
+        {
+          "checked": null,
+          "children": [
+            {
+              "data": {
+                "hName": "localFile",
+                "hProperties": {
+                  "isDirectory": true,
+                  "name": ".venv",
+                  "path": "/Users/user/Desktop/test/.venv",
+                },
+              },
+              "type": "localFile",
+            },
+          ],
+          "position": {
+            "end": {
+              "column": 79,
+              "line": 4,
+              "offset": 198,
+            },
+            "start": {
+              "column": 1,
+              "line": 4,
+              "offset": 120,
+            },
+          },
+          "spread": false,
+          "type": "listItem",
+        },
+      ],
+      "ordered": false,
+      "position": {
+        "end": {
+          "column": 79,
+          "line": 4,
+          "offset": 198,
+        },
+        "start": {
+          "column": 1,
+          "line": 3,
+          "offset": 33,
+        },
+      },
+      "spread": false,
+      "start": null,
+      "type": "list",
+    },
+  ],
+  "position": {
+    "end": {
+      "column": 79,
+      "line": 4,
+      "offset": 198,
+    },
+    "start": {
+      "column": 1,
+      "line": 1,
+      "offset": 0,
+    },
+  },
+  "type": "root",
+}
+`;
+
 exports[`createRemarkSelfClosingTagPlugin > should handle tag within a list item and generate snapshot 1`] = `
 {
   "children": [

package/src/features/Conversation/MarkdownElements/remarkPlugins/createRemarkSelfClosingTagPlugin.test.ts

@@ -201,4 +201,52 @@ describe('createRemarkSelfClosingTagPlugin', () => {
     const tree = processMarkdown(markdown, tagName);
     expect(tree).toMatchSnapshot();
   });
+
+  it('should handle multiple tags in unordered list with directories and files', () => {
+    const markdown = [
+      '我已查看了你桌面上 test 文件夹的目录，里面包含以下项目：',
+      '',
+      '- <localFile name=".config" path="/Users/user/Desktop/test/.config" isDirectory />    ', // 注意：行尾有 4 个空格
+      '- <localFile name=".venv" path="/Users/user/Desktop/test/.venv" isDirectory />',
+    ].join('\n');
+    const tree = processMarkdown(markdown, tagName);
+
+    // Should have 2 children: a paragraph and a list
+    expect(tree.children).toHaveLength(2);
+
+    // First child should be the introductory paragraph
+    expect(tree.children[0].type).toBe('paragraph');
+
+    // Second child should be the unordered list
+    const listNode = tree.children[1];
+    expect(listNode.type).toBe('list');
+    expect(listNode.ordered).toBe(false);
+
+    // The list should have 2 items
+    expect(listNode.children).toHaveLength(2);
+
+    // Verify first item (.config directory) - this one has trailing spaces after />
+    // When a tag is standalone in a list item, remark doesn't wrap it in a paragraph
+    const firstItem = listNode.children[0];
+    expect(firstItem.type).toBe('listItem');
+    const firstTag = firstItem.children[0];
+    expect(firstTag.type).toBe(tagName);
+    expect(firstTag.data?.hProperties).toEqual({
+      name: '.config',
+      path: '/Users/user/Desktop/test/.config',
+      isDirectory: true,
+    });
+
+    // Verify second item (.venv directory)
+    const secondItem = listNode.children[1];
+    const secondTag = secondItem.children[0];
+    expect(secondTag.type).toBe(tagName);
+    expect(secondTag.data?.hProperties).toEqual({
+      name: '.venv',
+      path: '/Users/user/Desktop/test/.venv',
+      isDirectory: true,
+    });
+
+    expect(tree).toMatchSnapshot();
+  });
 });

package/src/features/Conversation/MarkdownElements/remarkPlugins/createRemarkSelfClosingTagPlugin.ts

@@ -25,7 +25,8 @@ export const createRemarkSelfClosingTagPlugin =
   (tagName: string): Plugin<[], any> =>
   () => {
     // Regex for the specific tag, ensure it matches the entire string for HTML check
-    const exactTagRegex = new RegExp(`^<${tagName}(\\s+[^>]*?)?\\s*\\/>$`);
+    // Allow trailing whitespace after /> to handle cases where markdown parsers include it
+    const exactTagRegex = new RegExp(`^<${tagName}(\\s+[^>]*?)?\\s*\\/>\\s*$`);
     // Regex for finding tags within text
     const textTagRegex = new RegExp(`<${tagName}(\\s+[^>]*?)?\\s*\\/>`, 'g');
 

package/src/features/Conversation/Messages/Group/Tool/Render/Intervention/Fallback.tsx

@@ -0,0 +1,98 @@
+import { safeParseJSON } from '@lobechat/utils';
+import { ActionIcon } from '@lobehub/ui';
+import { Edit3Icon } from 'lucide-react';
+import { Suspense, memo, useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Flexbox } from 'react-layout-kit';
+
+import { useChatStore } from '@/store/chat';
+import { useUserStore } from '@/store/user';
+import { toolInterventionSelectors } from '@/store/user/selectors';
+
+import Arguments from '../Arguments';
+import ApprovalActions from './ApprovalActions';
+import KeyValueEditor from './KeyValueEditor';
+import ModeSelector from './ModeSelector';
+
+interface FallbackInterventionProps {
+  apiName: string;
+  id: string;
+  identifier: string;
+  requestArgs: string;
+  toolCallId: string;
+}
+
+const FallbackIntervention = memo<FallbackInterventionProps>(
+  ({ requestArgs, id, identifier, apiName, toolCallId }) => {
+    const { t } = useTranslation('chat');
+    const approvalMode = useUserStore(toolInterventionSelectors.approvalMode);
+    const [isEditing, setIsEditing] = useState(false);
+    const [optimisticUpdatePluginArguments] = useChatStore((s) => [
+      s.optimisticUpdatePluginArguments,
+    ]);
+
+    const handleCancel = useCallback(() => {
+      setIsEditing(false);
+    }, []);
+
+    const handleFinish = useCallback(
+      async (editedObject: Record<string, any>) => {
+        if (!id) return;
+
+        try {
+          const newArgsString = JSON.stringify(editedObject, null, 2);
+
+          if (newArgsString !== requestArgs) {
+            await optimisticUpdatePluginArguments(id, editedObject, true);
+          }
+          setIsEditing(false);
+        } catch (error) {
+          console.error('Error stringifying arguments:', error);
+        }
+      },
+      [requestArgs, id],
+    );
+
+    if (isEditing)
+      return (
+        <Suspense fallback={<Arguments arguments={requestArgs} />}>
+          <KeyValueEditor
+            initialValue={safeParseJSON(requestArgs || '')}
+            onCancel={handleCancel}
+            onFinish={handleFinish}
+          />
+        </Suspense>
+      );
+
+    return (
+      <Flexbox gap={12}>
+        <Arguments
+          actions={
+            <ActionIcon
+              icon={Edit3Icon}
+              onClick={() => {
+                setIsEditing(true);
+              }}
+              size={'small'}
+              title={t('edit', { ns: 'common' })}
+            />
+          }
+          arguments={requestArgs}
+        />
+
+        <Flexbox horizontal justify={'space-between'}>
+          <ModeSelector />
+          <ApprovalActions
+            apiName={apiName}
+            approvalMode={approvalMode}
+            identifier={identifier}
+            messageId={id}
+            toolCallId={toolCallId}
+          />
+        </Flexbox>
+      </Flexbox>
+    );
+  },
+);
+
+export default FallbackIntervention;

package/src/features/Conversation/Messages/Group/Tool/Render/Intervention/ModeSelector.tsx

@@ -6,6 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { Center } from 'react-layout-kit';
 
 import { useUserStore } from '@/store/user';
+import { toolInterventionSelectors } from '@/store/user/selectors';
 
 import { ApprovalMode } from './index';
 
@@ -39,10 +40,8 @@ const useStyles = createStyles(({ css, token }) => ({
 const ModeSelector = memo(() => {
   const { t } = useTranslation('chat');
   const { styles } = useStyles();
-  const [approvalMode, setSettings] = useUserStore((s) => [
-    s.settings.tool?.approvalMode || 'manual',
-    s.setSettings,
-  ]);
+  const approvalMode = useUserStore(toolInterventionSelectors.approvalMode);
+  const updateHumanIntervention = useUserStore((s) => s.updateHumanIntervention);
 
   const modeLabels = useMemo(
     () => ({
@@ -55,9 +54,9 @@ const ModeSelector = memo(() => {
 
   const handleModeChange = useCallback(
     async (mode: ApprovalMode) => {
-      await setSettings({ tool: { approvalMode: mode } });
+      await updateHumanIntervention({ approvalMode: mode });
     },
-    [setSettings],
+    [updateHumanIntervention],
   );
 
   const menuItems = useMemo<MenuProps['items']>(

package/src/features/Conversation/Messages/Group/Tool/Render/Intervention/index.tsx

@@ -1,15 +1,15 @@
 import { safeParseJSON } from '@lobechat/utils';
-import { ActionIcon } from '@lobehub/ui';
-import { Edit3Icon } from 'lucide-react';
 import { Suspense, memo, useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
 import { useUserStore } from '@/store/user';
+import { toolInterventionSelectors } from '@/store/user/selectors';
+import { BuiltinToolInterventions } from '@/tools/interventions';
 
 import Arguments from '../Arguments';
 import ApprovalActions from './ApprovalActions';
+import Fallback from './Fallback';
 import KeyValueEditor from './KeyValueEditor';
 import ModeSelector from './ModeSelector';
 
@@ -25,8 +25,7 @@ interface InterventionProps {
 
 const Intervention = memo<InterventionProps>(
   ({ requestArgs, id, identifier, apiName, toolCallId }) => {
-    const { t } = useTranslation('chat');
-    const approvalMode = useUserStore((s) => s.settings.tool?.approvalMode || 'manual');
+    const approvalMode = useUserStore(toolInterventionSelectors.approvalMode);
     const [isEditing, setIsEditing] = useState(false);
     const [optimisticUpdatePluginArguments] = useChatStore((s) => [
       s.optimisticUpdatePluginArguments,
@@ -53,45 +52,50 @@ const Intervention = memo<InterventionProps>(
       },
       [requestArgs, id],
     );
+    const BuiltinToolInterventionRender = BuiltinToolInterventions[identifier];
 
-    if (isEditing)
-      return (
-        <Suspense fallback={<Arguments arguments={requestArgs} />}>
-          <KeyValueEditor
-            initialValue={safeParseJSON(requestArgs || '')}
-            onCancel={handleCancel}
-            onFinish={handleFinish}
-          />
-        </Suspense>
-      );
-
-    return (
-      <Flexbox gap={12}>
-        <Arguments
-          actions={
-            <ActionIcon
-              icon={Edit3Icon}
-              onClick={() => {
-                setIsEditing(true);
-              }}
-              size={'small'}
-              title={t('edit', { ns: 'common' })}
+    if (BuiltinToolInterventionRender) {
+      if (isEditing)
+        return (
+          <Suspense fallback={<Arguments arguments={requestArgs} />}>
+            <KeyValueEditor
+              initialValue={safeParseJSON(requestArgs || '')}
+              onCancel={handleCancel}
+              onFinish={handleFinish}
             />
-          }
-          arguments={requestArgs}
-        />
+          </Suspense>
+        );
 
-        <Flexbox horizontal justify={'space-between'}>
-          <ModeSelector />
-          <ApprovalActions
+      return (
+        <Flexbox gap={12}>
+          <BuiltinToolInterventionRender
             apiName={apiName}
-            approvalMode={approvalMode}
+            args={safeParseJSON(requestArgs || '')}
             identifier={identifier}
             messageId={id}
-            toolCallId={toolCallId}
           />
+          <Flexbox horizontal justify={'space-between'}>
+            <ModeSelector />
+            <ApprovalActions
+              apiName={apiName}
+              approvalMode={approvalMode}
+              identifier={identifier}
+              messageId={id}
+              toolCallId={toolCallId}
+            />
+          </Flexbox>
         </Flexbox>
-      </Flexbox>
+      );
+    }
+
+    return (
+      <Fallback
+        apiName={apiName}
+        id={id}
+        identifier={identifier}
+        requestArgs={requestArgs}
+        toolCallId={toolCallId}
+      />
     );
   },
 );