@lobehub/chat 1.84.1 → 1.84.3

package/src/app/[variants]/(main)/chat/settings/page.tsx

@@ -7,22 +7,20 @@ import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import PageTitle from '@/components/PageTitle';
-import { INBOX_SESSION_ID } from '@/const/session';
+import { useCategory } from '@/features/AgentSetting/AgentCategory/useCategory';
+import AgentSettings from '@/features/AgentSetting/AgentSettings';
 import { useInitAgentConfig } from '@/hooks/useInitAgentConfig';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/selectors';
 import { ChatSettingsTabs } from '@/store/global/initialState';
-import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
 import { useSessionStore } from '@/store/session';
 import { sessionMetaSelectors } from '@/store/session/selectors';
 
-import AgentSettings from '../../../../../features/AgentSetting/AgentSettings';
-
 const EditPage = memo(() => {
   const { t } = useTranslation('setting');
   const [tab, setTab] = useState(ChatSettingsTabs.Prompt);
   const theme = useTheme();
-
+  const cateItems = useCategory();
   const [id, updateAgentMeta, title] = useSessionStore((s) => [
     s.activeId,
     s.updateSessionMeta,
@@ -36,39 +34,12 @@ const EditPage = memo(() => {
 
   const { isLoading } = useInitAgentConfig();
 
-  const { enablePlugins } = useServerConfigStore(featureFlagsSelectors);
-
   return (
     <>
       <PageTitle title={t('header.sessionWithName', { name: title })} />
       <Tabs
         compact
-        items={[
-          {
-            key: ChatSettingsTabs.Prompt,
-            label: t('settingAgent.prompt.title'),
-          },
-          (id !== INBOX_SESSION_ID && {
-            key: ChatSettingsTabs.Meta,
-            label: t('settingAgent.title'),
-          }) as any,
-          {
-            key: ChatSettingsTabs.Chat,
-            label: t('settingChat.title'),
-          },
-          {
-            key: ChatSettingsTabs.Modal,
-            label: t('settingModel.title'),
-          },
-          {
-            key: ChatSettingsTabs.TTS,
-            label: t('settingTTS.title'),
-          },
-          (enablePlugins && {
-            key: ChatSettingsTabs.Plugin,
-            label: t('settingPlugin.title'),
-          }) as any,
-        ]}
+        items={cateItems as any}
         onChange={(value) => setTab(value as ChatSettingsTabs)}
         style={{
           borderBottom: `1px solid ${theme.colorBorderSecondary}`,

package/src/app/[variants]/(main)/settings/_layout/Desktop/Header.tsx

@@ -15,7 +15,7 @@ const useStyles = createStyles(({ token, css }) => ({
     position: relative;
     flex: none;
     height: 54px;
-    background: ${token.colorBgContainer};
+    background: ${token.colorBgLayout};
   `,
   title: css`
     font-size: 18px;
@@ -52,6 +52,11 @@ const Header = memo<HeaderProps>(({ children, getContainer, title }) => {
             }
           />
         }
+        styles={{
+          left: {
+            padding: 0,
+          },
+        }}
       />
       <Drawer
         getContainer={getContainer}
@@ -61,7 +66,7 @@ const Header = memo<HeaderProps>(({ children, getContainer, title }) => {
         placement={'left'}
         rootStyle={{ position: 'absolute' }}
         style={{
-          background: theme.colorBgContainer,
+          background: theme.colorBgLayout,
           borderRight: `1px solid ${theme.colorSplit}`,
         }}
         styles={{

package/src/app/[variants]/(main)/settings/_layout/Mobile/Header.tsx

@@ -2,12 +2,14 @@
 
 import { Tag } from '@lobehub/ui';
 import { ChatHeader } from '@lobehub/ui/mobile';
+import { usePathname } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { enableAuth } from '@/const/auth';
 import { useActiveSettingsKey } from '@/hooks/useActiveTabKey';
+import { useProviderName } from '@/hooks/useProviderName';
 import { useQueryRoute } from '@/hooks/useQueryRoute';
 import { useShowMobileWorkspace } from '@/hooks/useShowMobileWorkspace';
 import { SettingsTabs } from '@/store/global/initialState';
@@ -21,6 +23,9 @@ const Header = memo(() => {
   const showMobileWorkspace = useShowMobileWorkspace();
   const activeSettingsKey = useActiveSettingsKey();
   const isSessionActive = useSessionStore((s) => !!s.activeId);
+  const pathname = usePathname();
+  const isProvider = pathname.includes('/settings/provider/');
+  const providerName = useProviderName(activeSettingsKey);
 
   const handleBackClick = () => {
     if (isSessionActive && showMobileWorkspace) {
@@ -29,13 +34,16 @@ const Header = memo(() => {
       router.push(enableAuth ? '/me/settings' : '/me');
     }
   };
+
   return (
     <ChatHeader
       center={
         <ChatHeader.Title
           title={
             <Flexbox align={'center'} gap={8} horizontal>
-              <span style={{ lineHeight: 1.2 }}> {t(`tab.${activeSettingsKey}`)}</span>
+              <span style={{ lineHeight: 1.2 }}>
+                {isProvider ? providerName : t(`tab.${activeSettingsKey}`)}
+              </span>
               {activeSettingsKey === SettingsTabs.Sync && (
                 <Tag bordered={false} color={'warning'}>
                   {t('tab.experiment')}

package/src/app/[variants]/(main)/settings/agent/_layout/Desktop.tsx

@@ -10,7 +10,7 @@ const Layout = ({ children }: PropsWithChildren) => {
   return (
     <>
       <NProgress />
-      <Flexbox horizontal width={'100%'}>
+      <Flexbox height={'100%'} horizontal width={'100%'}>
         <AgentMenu />
         <SettingContainer>{children}</SettingContainer>
       </Flexbox>

package/src/app/[variants]/(main)/settings/agent/_layout/Mobile.tsx

@@ -1,14 +1,7 @@
-'use client';
-
-import { usePathname } from 'next/navigation';
 import { PropsWithChildren } from 'react';
 
-import ProviderMenu from '../AgentMenu';
-
 const Layout = ({ children }: PropsWithChildren) => {
-  const pathname = usePathname();
-
-  return pathname === '/settings/agent' ? <ProviderMenu mobile /> : children;
+  return children;
 };
 
 export default Layout;

package/src/app/[variants]/(main)/settings/agent/index.tsx

@@ -1,38 +1,58 @@
 'use client';
 
+import { Tabs } from '@lobehub/ui';
+import { useTheme } from 'antd-style';
 import isEqual from 'fast-deep-equal';
 import { useQueryState } from 'nuqs';
 import { memo } from 'react';
 
 import { INBOX_SESSION_ID } from '@/const/session';
 import { AgentSettings } from '@/features/AgentSetting';
+import { useCategory } from '@/features/AgentSetting/AgentCategory/useCategory';
 import { ChatSettingsTabs } from '@/store/global/initialState';
+import { useServerConfigStore } from '@/store/serverConfig';
 import { useUserStore } from '@/store/user';
 import { settingsSelectors } from '@/store/user/selectors';
 
 const Page = memo(() => {
-  const [tab] = useQueryState('tab', {
+  const cateItems = useCategory();
+  const [tab, setTab] = useQueryState('tab', {
     defaultValue: ChatSettingsTabs.Prompt,
   });
   const config = useUserStore(settingsSelectors.defaultAgentConfig, isEqual);
   const meta = useUserStore(settingsSelectors.defaultAgentMeta, isEqual);
   const [updateAgent] = useUserStore((s) => [s.updateDefaultAgent]);
   const isUserStateInit = useUserStore((s) => s.isUserStateInit);
+  const theme = useTheme();
+  const mobile = useServerConfigStore((s) => s.isMobile);
 
   return (
-    <AgentSettings
-      config={config}
-      id={INBOX_SESSION_ID}
-      loading={!isUserStateInit}
-      meta={meta}
-      onConfigChange={(config) => {
-        updateAgent({ config });
-      }}
-      onMetaChange={(meta) => {
-        updateAgent({ meta });
-      }}
-      tab={tab as ChatSettingsTabs}
-    />
+    <>
+      {mobile && (
+        <Tabs
+          activeKey={tab}
+          compact
+          items={cateItems as any}
+          onChange={(value) => setTab(value as ChatSettingsTabs)}
+          style={{
+            borderBottom: `1px solid ${theme.colorBorderSecondary}`,
+          }}
+        />
+      )}
+      <AgentSettings
+        config={config}
+        id={INBOX_SESSION_ID}
+        loading={!isUserStateInit}
+        meta={meta}
+        onConfigChange={(config) => {
+          updateAgent({ config });
+        }}
+        onMetaChange={(meta) => {
+          updateAgent({ meta });
+        }}
+        tab={tab as ChatSettingsTabs}
+      />
+    </>
   );
 });
 

package/src/app/[variants]/(main)/settings/common/features/Common.tsx

@@ -60,6 +60,7 @@ const Common = memo(() => {
         ),
         desc: t('danger.reset.desc'),
         label: t('danger.reset.title'),
+        layout: 'horizontal',
         minWidth: undefined,
       },
     ],

package/src/app/[variants]/(main)/settings/provider/features/ModelList/index.tsx

@@ -1,5 +1,6 @@
 'use client';
 
+import { useTheme } from 'antd-style';
 import { Suspense, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
@@ -48,12 +49,21 @@ interface ModelListProps extends ProviderSettingsContextValue {
 const ModelList = memo<ModelListProps>(
   ({ id, showModelFetcher, sdkType, showAddNewModel, showDeployName, modelEditable = true }) => {
     const mobile = useIsMobile();
+    const theme = useTheme();
 
     return (
       <ProviderSettingsContext
         value={{ modelEditable, sdkType, showAddNewModel, showDeployName, showModelFetcher }}
       >
-        <Flexbox gap={16} paddingInline={mobile ? 12 : 0}>
+        <Flexbox
+          gap={16}
+          paddingInline={mobile ? 12 : 0}
+          style={{
+            background: mobile ? theme.colorBgContainer : undefined,
+            paddingBottom: 16,
+            paddingTop: 8,
+          }}
+        >
           <ModelTitle
             provider={id}
             showAddNewModel={showAddNewModel}

package/src/app/[variants]/(main)/settings/storage/Advanced.tsx

@@ -64,6 +64,7 @@ const AdvancedActions = () => {
           </DataImporter>
         ),
         label: t('storage.actions.import.title'),
+        layout: 'horizontal',
         minWidth: undefined,
       },
       {
@@ -78,6 +79,7 @@ const AdvancedActions = () => {
           </Button>
         ),
         label: t('storage.actions.export.title'),
+        layout: 'horizontal',
         minWidth: undefined,
       },
       {
@@ -88,6 +90,7 @@ const AdvancedActions = () => {
         ),
         desc: t('danger.clear.desc'),
         label: t('danger.clear.title'),
+        layout: 'horizontal',
         minWidth: undefined,
       },
     ],

package/src/features/ChatInput/ActionBar/Params/ParamsControls.tsx

@@ -14,21 +14,21 @@ import {
 } from '@/features/ModelParamsControl';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/selectors';
+import { useServerConfigStore } from '@/store/serverConfig';
 
 interface ParamsControlsProps {
   setUpdating: (updating: boolean) => void;
 }
 const ParamsControls = memo<ParamsControlsProps>(({ setUpdating }) => {
   const { t } = useTranslation('setting');
-
+  const mobile = useServerConfigStore((s) => s.isMobile);
   const updateAgentConfig = useAgentStore((s) => s.updateAgentConfig);
 
   const config = useAgentStore(agentSelectors.currentAgentConfig, isEqual);
 
-  const items: FormItemProps[] = [
+  let items: FormItemProps[] = [
     {
       children: <Temperature />,
-      desc: <Tag>temperature</Tag>,
       label: (
         <Flexbox align={'center'} gap={8} horizontal justify={'space-between'}>
           {t('settingModel.temperature.title')}
@@ -36,10 +36,10 @@ const ParamsControls = memo<ParamsControlsProps>(({ setUpdating }) => {
         </Flexbox>
       ),
       name: ['params', 'temperature'],
+      tag: 'temperature',
     },
     {
       children: <TopP />,
-      desc: <Tag>top_p</Tag>,
       label: (
         <Flexbox gap={8} horizontal>
           {t('settingModel.topP.title')}
@@ -47,10 +47,10 @@ const ParamsControls = memo<ParamsControlsProps>(({ setUpdating }) => {
         </Flexbox>
       ),
       name: ['params', 'top_p'],
+      tag: 'top_p',
     },
     {
       children: <PresencePenalty />,
-      desc: <Tag>presence_penalty</Tag>,
       label: (
         <Flexbox gap={8} horizontal>
           {t('settingModel.presencePenalty.title')}
@@ -58,10 +58,10 @@ const ParamsControls = memo<ParamsControlsProps>(({ setUpdating }) => {
         </Flexbox>
       ),
       name: ['params', 'presence_penalty'],
+      tag: 'presence_penalty',
     },
     {
       children: <FrequencyPenalty />,
-      desc: <Tag>frequency_penalty</Tag>,
       label: (
         <Flexbox gap={8} horizontal>
           {t('settingModel.frequencyPenalty.title')}
@@ -69,6 +69,7 @@ const ParamsControls = memo<ParamsControlsProps>(({ setUpdating }) => {
         </Flexbox>
       ),
       name: ['params', 'frequency_penalty'],
+      tag: 'frequency_penalty',
     },
   ];
 
@@ -76,7 +77,9 @@ const ParamsControls = memo<ParamsControlsProps>(({ setUpdating }) => {
     <Form
       initialValues={config}
       itemMinWidth={200}
-      items={items}
+      items={
+        mobile ? items : items.map(({ tag, ...item }) => ({ ...item, desc: <Tag>{tag}</Tag> }))
+      }
       itemsType={'flat'}
       onValuesChange={debounce(async (values) => {
         setUpdating(true);
@@ -84,6 +87,13 @@ const ParamsControls = memo<ParamsControlsProps>(({ setUpdating }) => {
         setUpdating(false);
       }, 500)}
       style={{ fontSize: 12 }}
+      styles={{
+        group: {
+          background: 'transparent',
+          paddingBottom: mobile ? 16 : 0,
+          paddingInline: 0,
+        },
+      }}
       variant={'borderless'}
     />
   );

package/src/features/ModelSwitchPanel/index.tsx

@@ -135,6 +135,12 @@ const ModelSwitchPanel = memo<PropsWithChildren>(({ children }) => {
         activeKey: menuKey(provider, model),
         className: styles.menu,
         items,
+        // 不加限高就会导致面板超长，顶部的内容会被隐藏
+        // https://github.com/user-attachments/assets/9c043c47-42c5-46ef-b5c1-bee89376f042
+        style: {
+          maxHeight: 500,
+          overflowY: 'scroll',
+        },
       }}
       placement={'topLeft'}
     >

package/src/features/PluginDevModal/MCPManifestForm/EnvEditor.tsx

@@ -0,0 +1,227 @@
+import { ActionIcon, Icon } from '@lobehub/ui';
+import { Button } from 'antd';
+import { createStyles } from 'antd-style';
+import fastDeepEqual from 'fast-deep-equal';
+import { LucidePlus, LucideTrash } from 'lucide-react';
+import { memo, useEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Flexbox } from 'react-layout-kit';
+import { v4 as uuidv4 } from 'uuid';
+
+import { FormInput } from '@/components/FormInput';
+
+const useStyles = createStyles(({ css, token }) => ({
+  container: css`
+    position: relative;
+
+    width: 100%;
+    padding: 12px;
+    border: 1px solid ${token.colorBorderSecondary};
+    border-radius: ${token.borderRadiusLG}px;
+  `,
+  input: css`
+    font-family: ${token.fontFamilyCode};
+    font-size: 12px;
+  `,
+  row: css`
+    margin-block-end: 8px;
+
+    &:last-child {
+      margin-block-end: 0;
+    }
+  `,
+  title: css`
+    margin-block-end: 8px;
+    color: ${token.colorTextTertiary};
+  `,
+}));
+
+interface KeyValueItem {
+  id: string;
+  key: string;
+  value: string;
+}
+
+export interface EnvEditorProps {
+  onChange?: (value: Record<string, string>) => void;
+  value?: Record<string, string>;
+}
+
+const recordToLocalList = (
+  record: Record<string, string> | undefined | null = {},
+): KeyValueItem[] =>
+  Object.entries(record || {}).map(([key, val]) => ({
+    id: uuidv4(),
+    key,
+    value: typeof val === 'string' ? val : '',
+  }));
+
+const localListToRecord = (
+  list: KeyValueItem[] | undefined | null = [],
+): Record<string, string> => {
+  const record: Record<string, string> = {};
+  const keys = new Set<string>();
+  (list || [])
+    .slice()
+    .reverse()
+    .forEach((item) => {
+      const trimmedKey = item.key.trim();
+      if (trimmedKey && !keys.has(trimmedKey)) {
+        record[trimmedKey] = typeof item.value === 'string' ? item.value : '';
+        keys.add(trimmedKey);
+      }
+    });
+  return Object.keys(record)
+    .reverse()
+    .reduce(
+      (acc, key) => {
+        acc[key] = record[key];
+        return acc;
+      },
+      {} as Record<string, string>,
+    );
+};
+
+const EnvEditor = memo<EnvEditorProps>(({ value, onChange }) => {
+  const { styles } = useStyles();
+  const { t } = useTranslation(['plugin', 'common']);
+  const [items, setItems] = useState<KeyValueItem[]>(() => recordToLocalList(value));
+  const prevValueRef = useRef<Record<string, string> | undefined>(undefined);
+
+  useEffect(() => {
+    const externalRecord = value || {};
+    if (!fastDeepEqual(externalRecord, prevValueRef.current)) {
+      setItems(recordToLocalList(externalRecord));
+      prevValueRef.current = externalRecord;
+    }
+  }, [value]);
+
+  const triggerChange = (newItems: KeyValueItem[]) => {
+    const keysCount: Record<string, number> = {};
+    newItems.forEach((item) => {
+      const trimmedKey = item.key.trim();
+      if (trimmedKey) {
+        keysCount[trimmedKey] = (keysCount[trimmedKey] || 0) + 1;
+      }
+    });
+    setItems(
+      newItems.map((item) => ({
+        ...item,
+      })),
+    );
+    onChange?.(localListToRecord(newItems));
+  };
+
+  const handleAdd = () => {
+    const newItems = [...items, { id: uuidv4(), key: '', value: '' }];
+    triggerChange(newItems);
+  };
+
+  const handleRemove = (id: string) => {
+    const newItems = items.filter((item) => item.id !== id);
+    triggerChange(newItems);
+  };
+
+  const handleKeyChange = (id: string, newKey: string) => {
+    const newItems = items.map((item) => (item.id === id ? { ...item, key: newKey } : item));
+    triggerChange(newItems);
+  };
+
+  const handleValueChange = (id: string, newValue: string) => {
+    const newItems = items.map((item) => (item.id === id ? { ...item, value: newValue } : item));
+    triggerChange(newItems);
+  };
+
+  const getDuplicateKeys = (currentItems: KeyValueItem[]): Set<string> => {
+    const keys = new Set<string>();
+    const duplicates = new Set<string>();
+    currentItems.forEach((item) => {
+      const trimmedKey = item.key.trim();
+      if (trimmedKey) {
+        if (keys.has(trimmedKey)) {
+          duplicates.add(trimmedKey);
+        } else {
+          keys.add(trimmedKey);
+        }
+      }
+    });
+    return duplicates;
+  };
+  const duplicateKeys = getDuplicateKeys(items);
+
+  return (
+    <div className={styles.container}>
+      <Flexbox className={styles.title} gap={8} horizontal>
+        <Flexbox flex={1}>key</Flexbox>
+        <Flexbox flex={2}>value</Flexbox>
+        <Flexbox style={{ width: 30 }} />
+      </Flexbox>
+      <Flexbox width={'100%'}>
+        {items.map((item) => {
+          const isDuplicate = item.key.trim() && duplicateKeys.has(item.key.trim());
+          return (
+            <Flexbox
+              align="flex-start"
+              className={styles.row}
+              gap={8}
+              horizontal
+              key={item.id}
+              width={'100%'}
+            >
+              <Flexbox flex={1} style={{ position: 'relative' }}>
+                <FormInput
+                  className={styles.input}
+                  onChange={(e) => handleKeyChange(item.id, e)}
+                  placeholder={'key'}
+                  status={isDuplicate ? 'error' : undefined}
+                  value={item.key}
+                  variant={'filled'}
+                />
+                {isDuplicate && (
+                  <div
+                    style={{
+                      bottom: '-16px',
+                      color: 'red',
+                      fontSize: '12px',
+                      position: 'absolute',
+                    }}
+                  >
+                    {t('dev.mcp.env.duplicateKeyError')}
+                  </div>
+                )}
+              </Flexbox>
+              <Flexbox flex={2}>
+                <FormInput
+                  className={styles.input}
+                  onChange={(value) => handleValueChange(item.id, value)}
+                  placeholder={'value'}
+                  value={item.value}
+                  variant={'filled'}
+                />
+              </Flexbox>
+              <ActionIcon
+                icon={LucideTrash}
+                onClick={() => handleRemove(item.id)}
+                size={'small'}
+                style={{ marginTop: 4 }}
+                title={t('delete', { ns: 'common' })}
+              />
+            </Flexbox>
+          );
+        })}
+        <Button
+          block
+          icon={<Icon icon={LucidePlus} />}
+          onClick={handleAdd}
+          size={'small'}
+          style={{ marginTop: items.length > 0 ? 16 : 8 }}
+          type="dashed"
+        >
+          {t('dev.mcp.env.add')}
+        </Button>
+      </Flexbox>
+    </div>
+  );
+});
+
+export default EnvEditor;