@lobehub/chat 1.81.3 → 1.81.4

package/src/features/Conversation/Messages/Assistant/Tool/Render/Arguments/index.tsx

@@ -0,0 +1,120 @@
+import { Highlighter } from '@lobehub/ui';
+import { createStyles } from 'antd-style';
+import { parse } from 'partial-json';
+import { ReactNode, memo, useMemo } from 'react';
+import { Flexbox } from 'react-layout-kit';
+
+import { useYamlArguments } from '@/hooks/useYamlArguments';
+
+import ObjectEntity from './ObjectEntity';
+
+const useStyles = createStyles(({ css, token, cx }) => ({
+  button: css`
+    color: ${token.colorTextSecondary};
+
+    &:hover {
+      color: ${token.colorText};
+    }
+  `,
+  container: css`
+    position: relative;
+
+    padding-block: 4px;
+    padding-inline: 12px 64px;
+    border-radius: ${token.borderRadiusLG}px;
+
+    font-family: ${token.fontFamilyCode};
+    font-size: 13px;
+    line-height: 1.5;
+
+    background: ${token.colorFillQuaternary};
+
+    pre {
+      margin: 0 !important;
+      background: none !important;
+    }
+
+    &:hover {
+      .actions {
+        opacity: 1;
+      }
+    }
+  `,
+  editButton: cx(
+    'actions',
+    css`
+      position: absolute;
+      z-index: 10;
+      inset-block-start: 4px;
+      inset-inline-end: 4px;
+
+      opacity: 0;
+
+      transition: opacity 0.2s ${token.motionEaseInOut};
+    `,
+  ),
+}));
+
+export interface ArgumentsProps {
+  actions?: ReactNode;
+  arguments?: string;
+  shine?: boolean;
+}
+
+const Arguments = memo<ArgumentsProps>(({ arguments: args = '', shine, actions }) => {
+  const { styles } = useStyles();
+
+  const displayArgs = useMemo(() => {
+    try {
+      const obj = parse(args);
+      if (Object.keys(obj).length === 0) return {};
+      return obj;
+    } catch {
+      return args;
+    }
+  }, [args]);
+
+  const yaml = useYamlArguments(args);
+
+  const showActions = !!actions;
+
+  if (typeof displayArgs === 'string') {
+    return (
+      !!yaml && (
+        <div className={styles.container}>
+          <Highlighter language={'yaml'} showLanguage={false}>
+            {yaml}
+          </Highlighter>
+        </div>
+      )
+    );
+  }
+
+  const hasMinWidth = Object.keys(displayArgs).length > 1;
+
+  if (Object.keys(displayArgs).length === 0) return null;
+
+  return (
+    <div className={styles.container}>
+      {showActions && (
+        <Flexbox className={styles.editButton} gap={4} horizontal>
+          {actions}
+        </Flexbox>
+      )}
+      {Object.entries(displayArgs).map(([key, value]) => {
+        return (
+          <ObjectEntity
+            editable={false}
+            hasMinWidth={hasMinWidth}
+            key={key}
+            objectKey={key}
+            shine={shine}
+            value={value}
+          />
+        );
+      })}
+    </div>
+  );
+});
+
+export default Arguments;

package/src/features/Conversation/Messages/Assistant/Tool/Render/CustomRender.tsx

@@ -1,4 +1,9 @@
-import { memo, useEffect } from 'react';
+import { ActionIcon } from '@lobehub/ui';
+import { App } from 'antd';
+import { Edit3Icon, PlayCircleIcon } from 'lucide-react';
+import { parse } from 'partial-json';
+import { memo, useCallback, useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import PluginRender from '@/features/PluginsUI/Render';
@@ -7,6 +12,16 @@ import { chatSelectors } from '@/store/chat/selectors';
 import { ChatMessage } from '@/types/message';
 
 import Arguments from './Arguments';
+import KeyValueEditor from './KeyValueEditor';
+
+const safeParseJson = (str: string): Record<string, any> => {
+  try {
+    const obj = parse(str);
+    return typeof obj === 'object' && obj !== null ? obj : {};
+  } catch {
+    return {};
+  }
+};
 
 interface CustomRenderProps extends ChatMessage {
   requestArgs?: string;
@@ -25,7 +40,37 @@ const CustomRender = memo<CustomRenderProps>(
     setShowPluginRender,
     pluginError,
   }) => {
+    const { t } = useTranslation(['tool', 'common']);
     const [loading] = useChatStore((s) => [chatSelectors.isPluginApiInvoking(id)(s)]);
+    const [isEditing, setIsEditing] = useState(false);
+    const { message } = App.useApp();
+    const [updatePluginArguments, reInvokeToolMessage] = useChatStore((s) => [
+      s.updatePluginArguments,
+      s.reInvokeToolMessage,
+    ]);
+    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 updatePluginArguments(id, editedObject, true);
+            await reInvokeToolMessage(id);
+          }
+          setIsEditing(false);
+        } catch (error) {
+          console.error('Error stringifying arguments:', error);
+          message.error(t('updateArgs.stringifyError'));
+        }
+      },
+      [requestArgs, id],
+    );
 
     useEffect(() => {
       if (!plugin?.type || loading) return;
@@ -49,8 +94,36 @@ const CustomRender = memo<CustomRenderProps>(
             pluginState={pluginState}
             type={plugin?.type}
           />
+        ) : isEditing ? (
+          <KeyValueEditor
+            initialValue={safeParseJson(requestArgs || '')}
+            onCancel={handleCancel}
+            onFinish={handleFinish}
+          />
         ) : (
-          <Arguments arguments={requestArgs} />
+          <Arguments
+            actions={
+              <>
+                <ActionIcon
+                  icon={Edit3Icon}
+                  onClick={() => {
+                    setIsEditing(true);
+                  }}
+                  size={'small'}
+                  title={t('edit', { ns: 'common' })}
+                />
+                <ActionIcon
+                  icon={PlayCircleIcon}
+                  onClick={async () => {
+                    await reInvokeToolMessage(id);
+                  }}
+                  size={'small'}
+                  title={t('run', { ns: 'common' })}
+                />
+              </>
+            }
+            arguments={requestArgs}
+          />
         )}
       </Flexbox>
     );

package/src/features/Conversation/Messages/Assistant/Tool/Render/KeyValueEditor.tsx

@@ -0,0 +1,214 @@
+import { ActionIcon, Icon } from '@lobehub/ui';
+import { App, Button, Form, FormInstance, Input } from 'antd';
+import { createStyles } from 'antd-style';
+import { LucidePlus, LucideTrash } from 'lucide-react';
+import { memo, useEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Flexbox } from 'react-layout-kit';
+
+const useStyles = createStyles(({ css, token }) => ({
+  form: css`
+    position: relative;
+
+    width: 100%;
+    min-width: 600px;
+    padding-block: 8px;
+    padding-inline: 12px;
+    border: 1px solid ${token.colorBorder};
+    border-radius: ${token.borderRadiusLG}px;
+  `,
+  formItem: css`
+    margin-block-end: 4px !important;
+  `,
+  input: css`
+    font-family: ${token.fontFamilyCode};
+    font-size: 12px;
+  `,
+  row: css`
+    position: relative;
+  `,
+  title: css`
+    color: ${token.colorTextTertiary};
+  `,
+}));
+
+interface KeyValueItem {
+  id: string;
+  key?: string;
+  value?: string;
+}
+
+interface KeyValueEditorProps {
+  initialValue?: Record<string, any>;
+  onCancel?: () => void;
+  onFinish?: (value: Record<string, any>) => Promise<void>;
+}
+
+const recordToFormList = (record: Record<string, any>): KeyValueItem[] =>
+  Object.entries(record)
+    .map(([key, val], index) => ({
+      id: `${key}-${index}`,
+      key,
+      value: typeof val === 'string' ? val : JSON.stringify(val),
+    }))
+    .filter((item) => item.key);
+
+const formListToRecord = (list: KeyValueItem[]): Record<string, any> => {
+  const record: Record<string, any> = {};
+  list.forEach((item) => {
+    if (item.key) {
+      try {
+        record[item.key] = JSON.parse(item.value || '""');
+      } catch {
+        record[item.key] = item.value || '';
+      }
+    }
+  });
+  return record;
+};
+
+const KeyValueEditor = memo<KeyValueEditorProps>(({ initialValue = {}, onFinish, onCancel }) => {
+  const { styles } = useStyles();
+  const { t } = useTranslation(['tool', 'common']);
+  const [form] = Form.useForm();
+  const { message } = App.useApp();
+  const formRef = useRef<FormInstance>(null);
+
+  useEffect(() => {
+    form.setFieldsValue({ items: recordToFormList(initialValue) });
+  }, [initialValue, form]);
+
+  const [updating, setUpdating] = useState(false);
+  const handleFinish = async () => {
+    setUpdating(true);
+    try {
+      await form.validateFields();
+      const values = form.getFieldsValue();
+      const record = formListToRecord(values.items || []);
+      await onFinish?.(record);
+    } catch (errorInfo) {
+      console.error('Validation Failed:', errorInfo);
+      message.error(t('updateArgs.formValidationFailed') || 'Please check the form for errors.');
+    }
+    setUpdating(false);
+  };
+
+  const handleCancel = () => {
+    onCancel?.();
+  };
+
+  const validateKeys = (_: any, item: KeyValueItem, items: KeyValueItem[]) => {
+    if (!item?.key) {
+      return Promise.resolve();
+    }
+    const keys = items.map((i) => i?.key).filter(Boolean);
+    if (keys.filter((k) => k === item.key).length > 1) {
+      return Promise.reject(new Error(t('updateArgs.duplicateKeyError')));
+    }
+
+    return Promise.resolve();
+  };
+
+  return (
+    <Form
+      autoComplete="off"
+      className={styles.form}
+      form={form}
+      initialValues={{ items: recordToFormList(initialValue) }}
+      ref={formRef}
+    >
+      <Flexbox className={styles.title} gap={8} horizontal>
+        <Flexbox flex={1}>key</Flexbox>
+        <Flexbox flex={4}>value</Flexbox>
+      </Flexbox>
+      <Form.List name="items">
+        {(fields, { add, remove }) => (
+          <Flexbox width={'100%'}>
+            {fields.map(({ key, name, ...restField }, index) => (
+              <Flexbox
+                align="center"
+                className={styles.row}
+                gap={8}
+                horizontal
+                key={key}
+                width={'100%'}
+              >
+                <Form.Item
+                  {...restField}
+                  className={styles.formItem}
+                  name={[name, 'key']}
+                  rules={[
+                    { message: t('updateArgs.keyRequired'), required: true },
+                    {
+                      validator: (rule) =>
+                        validateKeys(
+                          rule,
+                          form.getFieldValue(['items', index]),
+                          form.getFieldValue('items'),
+                        ),
+                    },
+                  ]}
+                  style={{ flex: 1 }}
+                  validateTrigger={['onChange', 'onBlur']}
+                >
+                  <Input
+                    allowClear
+                    className={styles.input}
+                    placeholder={t('updateArgs.form.key')}
+                    variant={'filled'}
+                  />
+                </Form.Item>
+                <Form.Item
+                  {...restField}
+                  className={styles.formItem}
+                  name={[name, 'value']}
+                  style={{ flex: 4 }}
+                >
+                  <Input
+                    allowClear
+                    className={styles.input}
+                    placeholder={t('updateArgs.form.value')}
+                    variant={'filled'}
+                  />
+                </Form.Item>
+                <ActionIcon
+                  icon={LucideTrash}
+                  onClick={() => remove(name)}
+                  size={'small'}
+                  style={{
+                    marginBottom: 6,
+                  }}
+                  title={t('delete', { ns: 'common' })}
+                />
+              </Flexbox>
+            ))}
+            <Form.Item style={{ marginBottom: 0, marginTop: 8 }}>
+              <Flexbox gap={8} horizontal justify={'space-between'}>
+                <Button
+                  color={'default'}
+                  icon={<Icon icon={LucidePlus} />}
+                  onClick={() => add({ id: `new-${Date.now()}`, key: '', value: '' })}
+                  size={'small'}
+                  variant="filled"
+                >
+                  {t('updateArgs.form.add')}
+                </Button>
+
+                <Flexbox gap={8} horizontal>
+                  <Button onClick={handleCancel} size={'small'}>
+                    {t('cancel', { ns: 'common' })}
+                  </Button>
+                  <Button loading={updating} onClick={handleFinish} size={'small'} type={'primary'}>
+                    {t('save', { ns: 'common' })}
+                  </Button>
+                </Flexbox>
+              </Flexbox>
+            </Form.Item>
+          </Flexbox>
+        )}
+      </Form.List>
+    </Form>
+  );
+});
+
+export default KeyValueEditor;

package/src/features/User/UserPanel/useMenu.tsx

@@ -1,4 +1,4 @@
-import { DiscordIcon, Icon } from '@lobehub/ui';
+import { DiscordIcon, Hotkey, Icon } from '@lobehub/ui';
 import { Badge } from 'antd';
 import { ItemType } from 'antd/es/menu/interface';
 import {
@@ -22,6 +22,7 @@ import { Flexbox } from 'react-layout-kit';
 import type { MenuProps } from '@/components/Menu';
 import { enableAuth } from '@/const/auth';
 import { LOBE_CHAT_CLOUD } from '@/const/branding';
+import { DEFAULT_HOTKEY_CONFIG } from '@/const/settings';
 import {
   DISCORD,
   DOCUMENTS_REFER_URL,
@@ -31,6 +32,7 @@ import {
   UTM_SOURCE,
   mailTo,
 } from '@/const/url';
+import { isDesktop } from '@/const/version';
 import DataImporter from '@/features/DataImporter';
 import { usePWAInstall } from '@/hooks/usePWAInstall';
 import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
@@ -81,6 +83,11 @@ export const useMenu = () => {
 
   const settings: MenuProps['items'] = [
     {
+      extra: isDesktop ? (
+        <div>
+          <Hotkey keys={DEFAULT_HOTKEY_CONFIG.openSettings} />
+        </div>
+      ) : undefined,
       icon: <Icon icon={Settings2} />,
       key: 'setting',
       label: (

package/src/libs/agent-runtime/google/index.ts

@@ -368,6 +368,9 @@ export class LobeGoogleAI implements LobeRuntimeAI {
     payload?: ChatStreamPayload,
   ): GoogleFunctionCallTool[] | undefined {
     // 目前 Tools (例如 googleSearch) 无法与其他 FunctionCall 同时使用
+    if (payload?.messages?.some(m => m.tool_calls?.length)) {
+      return; // 若历史消息中已有 function calling，则不再注入任何 Tools
+    }
     if (payload?.enabledSearch) {
       return [{ googleSearch: {} } as GoogleSearchRetrievalTool];
     }

package/src/libs/trpc/client/desktop.ts

@@ -0,0 +1,14 @@
+import { createTRPCClient, httpBatchLink } from '@trpc/client';
+import superjson from 'superjson';
+
+import type { DesktopRouter } from '@/server/routers/desktop';
+
+export const desktopClient = createTRPCClient<DesktopRouter>({
+  links: [
+    httpBatchLink({
+      maxURLLength: 2083,
+      transformer: superjson,
+      url: '/trpc/desktop',
+    }),
+  ],
+});

package/src/locales/default/common.ts

@@ -287,6 +287,8 @@ export default {
   rename: '重命名',
   reset: '重置',
   retry: '重试',
+  run: '运行',
+  save: '保存',
   send: '发送',
   setting: '设置',
   share: '分享',

package/src/locales/default/electron.ts

@@ -0,0 +1,34 @@
+const electron = {
+  remoteServer: {
+    authError: '授权失败: {{error}}',
+    authPending: '请在浏览器中完成授权',
+    configDesc: '连接到远程LobeChat服务器，启用数据同步',
+    configError: '配置出错',
+    configTitle: '配置云同步',
+    connect: '连接并授权',
+    connected: '已连接',
+    disconnect: '断开连接',
+    disconnectError: '断开连接失败',
+    disconnected: '未连接',
+    fetchError: '获取配置失败',
+    invalidUrl: '请输入有效的URL地址',
+    serverUrl: '服务器地址',
+    statusConnected: '已连接',
+    statusDisconnected: '未连接',
+    urlRequired: '请输入服务器地址',
+  },
+  updater: {
+    downloadingUpdate: '正在下载更新',
+    downloadingUpdateDesc: '更新正在下载中，请稍候...',
+    later: '稍后更新',
+    newVersionAvailable: '新版本可用',
+    newVersionAvailableDesc: '发现新版本 {{version}}，是否立即下载？',
+    restartAndInstall: '重启并安装',
+    updateError: '更新错误',
+    updateReady: '更新已就绪',
+    updateReadyDesc: 'Lobe Chat {{version}} 已下载完成，重启应用后即可完成安装。',
+    upgradeNow: '立即更新',
+  },
+};
+
+export default electron;

package/src/locales/default/index.ts

@@ -5,6 +5,7 @@ import clerk from './clerk';
 import common from './common';
 import components from './components';
 import discover from './discover';
+import electron from './electron';
 import error from './error';
 import file from './file';
 import hotkey from './hotkey';
@@ -32,6 +33,7 @@ const resources = {
   common,
   components,
   discover,
+  electron,
   error,
   file,
   hotkey,

package/src/locales/default/tool.ts

@@ -7,6 +7,20 @@ export default {
     images: '图片:',
     prompt: '提示词',
   },
+  localFiles: {
+    file: '文件',
+    folder: '文件夹',
+    open: '打开',
+    openFile: '打开文件',
+    openFolder: '打开文件夹',
+    read: {
+      more: '查看更多',
+    },
+    readFile: '读取文件',
+    readFileError: '读取文件失败，请检查文件路径是否正确',
+    readFiles: '读取文件',
+    readFilesError: '读取文件失败，请检查文件路径是否正确',
+  },
   search: {
     createNewSearch: '创建新的搜索记录',
     emptyResult: '没有搜索到结果，请修改关键词后重试',
@@ -54,4 +68,15 @@ export default {
     summaryTooltip: '总结当前内容',
     viewMoreResults: '查看更多 {{results}} 个结果',
   },
+  updateArgs: {
+    duplicateKeyError: '字段键必须唯一',
+    form: {
+      add: '添加一项',
+      key: '字段键',
+      value: '字段值',
+    },
+    formValidationFailed: '表单验证失败，请检查参数格式',
+    keyRequired: '字段键不能为空',
+    stringifyError: '无法序列化参数，请检查参数格式',
+  },
 };

package/src/server/routers/desktop/index.ts

@@ -0,0 +1,9 @@
+import { router } from '@/libs/trpc/lambda';
+
+import { pgTableRouter } from './pgTable';
+
+export const desktopRouter = router({
+  pgTable: pgTableRouter,
+});
+
+export type DesktopRouter = typeof desktopRouter;

package/src/server/routers/desktop/pgTable.ts

@@ -0,0 +1,43 @@
+import { z } from 'zod';
+
+import { DESKTOP_USER_ID } from '@/const/desktop';
+import { TableViewerRepo } from '@/database/repositories/tableViewer';
+import { publicProcedure, router } from '@/libs/trpc/lambda';
+import { serverDatabase } from '@/libs/trpc/lambda/middleware';
+
+const pgTableProcedure = publicProcedure.use(serverDatabase).use(async ({ ctx, next }) => {
+  return next({
+    ctx: {
+      tableViewerRepo: new TableViewerRepo(ctx.serverDB, DESKTOP_USER_ID),
+    },
+  });
+});
+
+export const pgTableRouter = router({
+  getAllTables: pgTableProcedure.query(async ({ ctx }) => {
+    return ctx.tableViewerRepo.getAllTables();
+  }),
+  getTableData: pgTableProcedure
+    .input(
+      z.object({
+        page: z.number(),
+        pageSize: z.number(),
+        tableName: z.string(),
+      }),
+    )
+    .query(async ({ input, ctx }) => {
+      return ctx.tableViewerRepo.getTableData(input.tableName, {
+        page: input.page,
+        pageSize: input.pageSize,
+      });
+    }),
+  getTableDetails: pgTableProcedure
+    .input(
+      z.object({
+        tableName: z.string(),
+      }),
+    )
+    .query(async ({ input, ctx }) => {
+      return ctx.tableViewerRepo.getTableDetails(input.tableName);
+    }),
+});

package/src/services/electron/autoUpdate.ts

@@ -0,0 +1,17 @@
+import { dispatch } from '@lobechat/electron-client-ipc';
+
+class AutoUpdateService {
+  checkUpdate = async () => {
+    return dispatch('checkUpdate');
+  };
+
+  installNow = async () => {
+    return dispatch('installNow');
+  };
+
+  installLater = async () => {
+    return dispatch('installLater');
+  };
+}
+
+export const autoUpdateService = new AutoUpdateService();