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

package/src/locales/default/tool.ts

@@ -17,6 +17,14 @@ export default {
   localFiles: {
     file: '文件',
     folder: '文件夹',
+    moveFiles: {
+      itemsMoved: '已移动 {{count}} 个项目：',
+      itemsMoved_one: '已移动 {{count}} 个项目：',
+      itemsMoved_other: '已移动 {{count}} 个项目：',
+      itemsToMove: '{{count}} 个项目待移动：',
+      itemsToMove_one: '{{count}} 个项目待移动：',
+      itemsToMove_other: '{{count}} 个项目待移动：',
+    },
     open: '打开',
     openFile: '打开文件',
     openFolder: '打开文件夹',

package/src/services/chat/index.ts

@@ -174,6 +174,13 @@ class ChatService {
         extendParams.reasoning_effort = chatConfig.gpt5ReasoningEffort;
       }
 
+      if (
+        modelExtendParams!.includes('gpt5_1ReasoningEffort') &&
+        chatConfig.gpt5_1ReasoningEffort
+      ) {
+        extendParams.reasoning_effort = chatConfig.gpt5_1ReasoningEffort;
+      }
+
       if (modelExtendParams!.includes('textVerbosity') && chatConfig.textVerbosity) {
         extendParams.verbosity = chatConfig.textVerbosity;
       }

package/src/store/chat/slices/aiChat/actions/conversationControl.ts

@@ -43,6 +43,10 @@ export interface ConversationControlAction {
    * Reject tool intervention
    */
   rejectToolCalling: (messageId: string, reason?: string) => Promise<void>;
+  /**
+   * Reject tool intervention and continue
+   */
+  rejectAndContinueToolCalling: (messageId: string, reason?: string) => Promise<void>;
   /**
    * Toggle sendMessage operation state
    */
@@ -206,6 +210,44 @@ export const conversationControl: StateCreator<
     await get().optimisticUpdateMessageContent(messageId, toolContent);
   },
 
+  rejectAndContinueToolCalling: async (messageId, reason) => {
+    await get().rejectToolCalling(messageId, reason);
+
+    const toolMessage = dbMessageSelectors.getDbMessageById(messageId)(get());
+    if (!toolMessage) return;
+
+    // Get current messages for state construction
+    const currentMessages = displayMessageSelectors.mainAIChats(get());
+    const { activeThreadId, internal_execAgentRuntime } = get();
+
+    // Create agent state and context to continue from rejected tool message
+    const { state, context: initialContext } = get().internal_createAgentState({
+      messages: currentMessages,
+      parentMessageId: messageId,
+      threadId: activeThreadId,
+    });
+
+    // Override context with 'userInput' phase to continue as if user provided feedback
+    const context: AgentRuntimeContext = {
+      ...initialContext,
+      phase: 'user_input',
+    };
+
+    // Execute agent runtime from rejected tool message position to continue
+    try {
+      await internal_execAgentRuntime({
+        messages: currentMessages,
+        parentMessageId: messageId,
+        parentMessageType: 'tool',
+        threadId: activeThreadId,
+        initialState: state,
+        initialContext: context,
+      });
+    } catch (error) {
+      console.error('[rejectAndContinueToolCalling] Error executing agent runtime:', error);
+    }
+  },
+
   internal_updateSendMessageOperation: (key, value, actionName) => {
     const operationKey = typeof key === 'string' ? key : messageMapKey(key.sessionId, key.topicId);
 

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

@@ -252,7 +252,7 @@ export const localSystemSlice: StateCreator<
         if (result.shell_id) {
           message = `Command started in background with shell_id: ${result.shell_id}`;
         } else {
-          message = `Command completed successfully. Exit code: ${result.exit_code}`;
+          message = `Command completed successfully.`;
         }
       } else {
         message = `Command failed: ${result.error}`;

package/src/tools/interventions.ts

@@ -1,7 +1,7 @@
 import { BuiltinIntervention } from '@lobechat/types';
 
-import { LocalSystemApiName, LocalSystemManifest } from './local-system';
-import RunCommand from './local-system/Intervention/RunCommand';
+import { LocalSystemManifest } from './local-system';
+import { LocalSystemInterventions } from './local-system/Intervention';
 
 /**
  * Builtin tools interventions registry
@@ -9,9 +9,7 @@ import RunCommand from './local-system/Intervention/RunCommand';
  * Only register APIs that have custom intervention UI
  */
 export const BuiltinToolInterventions: Record<string, Record<string, any>> = {
-  [LocalSystemManifest.identifier]: {
-    [LocalSystemApiName.runCommand]: RunCommand,
-  },
+  [LocalSystemManifest.identifier]: LocalSystemInterventions,
 };
 
 /**

package/src/tools/local-system/Intervention/MoveLocalFiles/MoveFileItem.tsx

@@ -0,0 +1,56 @@
+import { Icon, Text } from '@lobehub/ui';
+import { createStyles } from 'antd-style';
+import { ArrowRight } from 'lucide-react';
+import { memo } from 'react';
+import { Flexbox } from 'react-layout-kit';
+
+import { useElectronStore } from '@/store/electron';
+import { desktopStateSelectors } from '@/store/electron/selectors';
+
+const useStyles = createStyles(({ css, token }) => ({
+  icon: css`
+    color: ${token.colorTextQuaternary};
+  `,
+  item: css`
+    padding-block: 4px;
+    padding-inline: 12px;
+    border-radius: ${token.borderRadius}px;
+    transition: all 0.2s ease;
+
+    &:hover {
+      background: ${token.colorFillQuaternary};
+    }
+  `,
+  path: css`
+    font-family: ${token.fontFamilyCode};
+    font-size: 12px;
+    word-break: break-all;
+  `,
+}));
+
+interface MoveFileItemProps {
+  newPath: string;
+  oldPath: string;
+}
+
+const MoveFileItem = memo<MoveFileItemProps>(({ oldPath, newPath }) => {
+  const { styles } = useStyles();
+  const displayOldPath = useElectronStore(desktopStateSelectors.displayRelativePath(oldPath));
+  const displayNewPath = useElectronStore(desktopStateSelectors.displayRelativePath(newPath));
+
+  return (
+    <Flexbox align="center" className={styles.item} gap={8} horizontal width="100%">
+      <Flexbox flex={1}>
+        <Text className={styles.path} type="secondary">
+          {displayOldPath}
+        </Text>
+      </Flexbox>
+      <Icon className={styles.icon} icon={ArrowRight} />
+      <Flexbox flex={2}>
+        <Text className={styles.path}>{displayNewPath}</Text>
+      </Flexbox>
+    </Flexbox>
+  );
+});
+
+export default MoveFileItem;

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

@@ -0,0 +1,26 @@
+import { MoveLocalFilesParams } from '@lobechat/electron-client-ipc';
+import { BuiltinInterventionProps } from '@lobechat/types';
+import { Text } from '@lobehub/ui';
+import { memo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Flexbox } from 'react-layout-kit';
+
+import MoveFileItem from './MoveFileItem';
+
+const MoveLocalFiles = memo<BuiltinInterventionProps<MoveLocalFilesParams>>(({ args }) => {
+  const { items } = args;
+  const { t } = useTranslation('tool');
+
+  return (
+    <Flexbox gap={8}>
+      <Text type="secondary">{t('localFiles.moveFiles.itemsToMove', { count: items.length })}</Text>
+      <Flexbox gap={6}>
+        {items.map((item, index) => (
+          <MoveFileItem key={index} newPath={item.newPath} oldPath={item.oldPath} />
+        ))}
+      </Flexbox>
+    </Flexbox>
+  );
+});
+
+export default MoveLocalFiles;

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

@@ -1,4 +1,5 @@
 import { RunCommandParams } from '@lobechat/electron-client-ipc';
+import { BuiltinInterventionProps } from '@lobechat/types';
 import { Highlighter, Text } from '@lobehub/ui';
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
@@ -23,11 +24,8 @@ const formatTimeout = (ms?: number) => {
   return `${ms}ms`;
 };
 
-interface RunCommandProps extends RunCommandParams {
-  messageId: string;
-}
-
-const RunCommand = memo<RunCommandProps>(({ description, command, timeout }) => {
+const RunCommand = memo<BuiltinInterventionProps<RunCommandParams>>(({ args }) => {
+  const { description, command, timeout } = args;
   return (
     <Flexbox gap={8}>
       <Flexbox horizontal justify={'space-between'}>

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

@@ -0,0 +1,11 @@
+import { LocalSystemApiName } from '../index';
+import MoveLocalFiles from './MoveLocalFiles';
+import RunCommand from './RunCommand';
+
+/**
+ * Local System Intervention Components Registry
+ */
+export const LocalSystemInterventions = {
+  [LocalSystemApiName.moveLocalFiles]: MoveLocalFiles,
+  [LocalSystemApiName.runCommand]: RunCommand,
+};

package/src/tools/local-system/Render/MoveLocalFiles/MoveFileItem.tsx

@@ -0,0 +1,56 @@
+import { Icon, Text } from '@lobehub/ui';
+import { createStyles } from 'antd-style';
+import { ArrowRight } from 'lucide-react';
+import { memo } from 'react';
+import { Flexbox } from 'react-layout-kit';
+
+import { useElectronStore } from '@/store/electron';
+import { desktopStateSelectors } from '@/store/electron/selectors';
+
+const useStyles = createStyles(({ css, token }) => ({
+  icon: css`
+    color: ${token.colorTextQuaternary};
+  `,
+  item: css`
+    padding-block: 4px;
+    padding-inline: 12px;
+    border-radius: ${token.borderRadius}px;
+    transition: all 0.2s ease;
+
+    &:hover {
+      background: ${token.colorFillQuaternary};
+    }
+  `,
+  path: css`
+    font-family: ${token.fontFamilyCode};
+    font-size: 12px;
+    word-break: break-all;
+  `,
+}));
+
+interface MoveFileItemProps {
+  newPath: string;
+  oldPath: string;
+}
+
+const MoveFileItem = memo<MoveFileItemProps>(({ oldPath, newPath }) => {
+  const { styles } = useStyles();
+  const displayOldPath = useElectronStore(desktopStateSelectors.displayRelativePath(oldPath));
+  const displayNewPath = useElectronStore(desktopStateSelectors.displayRelativePath(newPath));
+
+  return (
+    <Flexbox align="center" className={styles.item} gap={8} horizontal width="100%">
+      <Flexbox flex={1}>
+        <Text className={styles.path} type="secondary">
+          {displayOldPath}
+        </Text>
+      </Flexbox>
+      <Icon className={styles.icon} icon={ArrowRight} />
+      <Flexbox flex={2}>
+        <Text className={styles.path}>{displayNewPath}</Text>
+      </Flexbox>
+    </Flexbox>
+  );
+});
+
+export default MoveFileItem;

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

@@ -0,0 +1,26 @@
+import { MoveLocalFilesParams } from '@lobechat/electron-client-ipc';
+import { BuiltinRenderProps } from '@lobechat/types';
+import { Text } from '@lobehub/ui';
+import { memo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Flexbox } from 'react-layout-kit';
+
+import MoveFileItem from './MoveFileItem';
+
+const MoveLocalFiles = memo<BuiltinRenderProps<MoveLocalFilesParams>>(({ args }) => {
+  const { items } = args;
+  const { t } = useTranslation('tool');
+
+  return (
+    <Flexbox gap={8}>
+      <Text type="secondary">{t('localFiles.moveFiles.itemsMoved', { count: items.length })}</Text>
+      <Flexbox gap={6}>
+        {items.map((item, index) => (
+          <MoveFileItem key={index} newPath={item.newPath} oldPath={item.oldPath} />
+        ))}
+      </Flexbox>
+    </Flexbox>
+  );
+});
+
+export default MoveLocalFiles;

package/src/tools/local-system/Render/ReadLocalFile/ReadFileView.tsx

@@ -26,9 +26,10 @@ const useStyles = createStyles(({ css, token, cx }) => ({
 
     height: 64px;
     padding: 8px;
-    border: 1px solid ${token.colorBorderSecondary};
     border-radius: ${token.borderRadiusLG}px;
 
+    background: ${token.colorFillQuaternary};
+
     transition: all 0.2s ${token.motionEaseInOut};
 
     .local-file-actions {

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

@@ -0,0 +1,21 @@
+import { LocalSystemApiName } from '../index';
+import ListFiles from './ListFiles';
+import MoveLocalFiles from './MoveLocalFiles';
+import ReadLocalFile from './ReadLocalFile';
+import RenameLocalFile from './RenameLocalFile';
+import RunCommand from './RunCommand';
+import SearchFiles from './SearchFiles';
+import WriteFile from './WriteFile';
+
+/**
+ * Local System Render Components Registry
+ */
+export const LocalSystemRenders = {
+  [LocalSystemApiName.listLocalFiles]: ListFiles,
+  [LocalSystemApiName.moveLocalFiles]: MoveLocalFiles,
+  [LocalSystemApiName.readLocalFile]: ReadLocalFile,
+  [LocalSystemApiName.renameLocalFile]: RenameLocalFile,
+  [LocalSystemApiName.runCommand]: RunCommand,
+  [LocalSystemApiName.searchLocalFiles]: SearchFiles,
+  [LocalSystemApiName.writeLocalFile]: WriteFile,
+};

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

@@ -186,6 +186,7 @@ export const LocalSystemManifest: BuiltinToolManifest = {
     {
       description:
         'Write content to a specific file. Input should be the file path and content. Overwrites existing file or creates a new one.',
+      humanIntervention: 'required',
       name: LocalSystemApiName.writeLocalFile,
       parameters: {
         properties: {

package/src/tools/renders.ts

@@ -3,37 +3,19 @@ import { BuiltinRender } from '@lobechat/types';
 import { CodeInterpreterManifest } from './code-interpreter';
 import CodeInterpreterRender from './code-interpreter/Render';
 // 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';
+import { LocalSystemManifest } from './local-system';
+import { LocalSystemRenders } from './local-system/Render';
 // 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';
+import { WebBrowsingManifest } from './web-browsing';
+import { WebBrowsingRenders } from './web-browsing/Render';
 
 /**
  * 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,
-  },
+  [LocalSystemManifest.identifier]: LocalSystemRenders as Record<string, BuiltinRender>,
+  [WebBrowsingManifest.identifier]: WebBrowsingRenders as Record<string, BuiltinRender>,
   [CodeInterpreterManifest.identifier]: {
     python: CodeInterpreterRender as BuiltinRender,
   },

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

@@ -0,0 +1,13 @@
+import { WebBrowsingApiName } from '../index';
+import CrawlMultiPages from './CrawlMultiPages';
+import CrawlSinglePage from './CrawlSinglePage';
+import Search from './Search';
+
+/**
+ * Web Browsing Render Components Registry
+ */
+export const WebBrowsingRenders = {
+  [WebBrowsingApiName.crawlMultiPages]: CrawlMultiPages,
+  [WebBrowsingApiName.crawlSinglePage]: CrawlSinglePage,
+  [WebBrowsingApiName.search]: Search,
+};