@lobehub/chat 1.84.9 → 1.84.10

package/src/features/ChatInput/ActionBar/{Knowledge/ListItem.tsx → components/CheckbokWithLoading.tsx}

@@ -1,22 +1,22 @@
 import { Icon } from '@lobehub/ui';
 import { Checkbox } from 'antd';
 import { Loader2 } from 'lucide-react';
-import { memo, useState } from 'react';
+import { ReactNode, memo, useState } from 'react';
 import { Center, Flexbox } from 'react-layout-kit';
 
-interface FileItemProps {
-  enabled?: boolean;
+export interface CheckboxItemProps {
+  checked?: boolean;
   id: string;
-  label: string;
+  label?: ReactNode;
   onUpdate: (id: string, enabled: boolean) => Promise<void>;
 }
 
-const ListItem = memo<FileItemProps>(({ id, onUpdate, label, enabled }) => {
+const CheckboxItem = memo<CheckboxItemProps>(({ id, onUpdate, label, checked }) => {
   const [loading, setLoading] = useState(false);
 
   const updateState = async () => {
     setLoading(true);
-    await onUpdate(id, !enabled);
+    await onUpdate(id, !checked);
     setLoading(false);
   };
 
@@ -29,19 +29,21 @@ const ListItem = memo<FileItemProps>(({ id, onUpdate, label, enabled }) => {
         e.stopPropagation();
         updateState();
       }}
-      padding={'8px 12px'}
+      style={{
+        paddingLeft: 8,
+      }}
     >
-      {label}
+      {label || id}
       {loading ? (
         <Center width={18}>
           <Icon icon={Loader2} spin />
         </Center>
       ) : (
         <Checkbox
-          checked={enabled}
-          onClick={(e) => {
+          checked={checked}
+          onClick={async (e) => {
             e.stopPropagation();
-            updateState();
+            await updateState();
           }}
         />
       )}
@@ -49,4 +51,4 @@ const ListItem = memo<FileItemProps>(({ id, onUpdate, label, enabled }) => {
   );
 });
 
-export default ListItem;
+export default CheckboxItem;

package/src/features/ChatInput/ActionBar/config.ts

@@ -1,9 +1,9 @@
-import STT from '../STT';
 import Clear from './Clear';
 import History from './History';
 import Knowledge from './Knowledge';
 import Model from './Model';
 import Params from './Params';
+import STT from './STT';
 import Search from './Search';
 import { MainToken, PortalToken } from './Token';
 import Tools from './Tools';

package/src/features/Conversation/Error/OllamaBizError/index.tsx

@@ -8,7 +8,7 @@ import ErrorJsonViewer from '../ErrorJsonViewer';
 
 const loading = () => <Skeleton active style={{ width: 300 }} />;
 
-const SetupGuide = dynamic(() => import('./SetupGuide'), { loading, ssr: false });
+const SetupGuide = dynamic(() => import('@/features/OllamaSetupGuide'), { loading, ssr: false });
 
 const InvalidModel = dynamic(() => import('./InvalidOllamaModel'), { loading, ssr: false });
 
@@ -38,7 +38,7 @@ const OllamaBizError = memo<ChatMessage>(({ error, id }) => {
 
   // error of not enable model or not set the CORS rules
   if (errorMessage?.includes('Failed to fetch')) {
-    return <SetupGuide />;
+    return <SetupGuide id={id} />;
   }
 
   return <ErrorJsonViewer error={error} id={id} />;

package/src/features/Conversation/Error/index.tsx

@@ -5,7 +5,6 @@ import dynamic from 'next/dynamic';
 import { Suspense, memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { isDesktop } from '@/const/version';
 import { useProviderName } from '@/hooks/useProviderName';
 import { AgentRuntimeErrorType, ILobeAgentRuntimeErrorType } from '@/libs/agent-runtime';
 import { ChatErrorType, ErrorType } from '@/types/fetch';
@@ -20,11 +19,8 @@ import { ErrorActionContainer } from './style';
 const loading = () => <Skeleton active />;
 
 const OllamaBizError = dynamic(() => import('./OllamaBizError'), { loading, ssr: false });
-const OllamaSetupGuide = dynamic(() => import('./OllamaBizError/SetupGuide'), {
-  loading,
-  ssr: false,
-});
-const OllamaDesktopSetupGuide = dynamic(() => import('./OllamaDesktopSetupGuide'), {
+
+const OllamaSetupGuide = dynamic(() => import('@/features/OllamaSetupGuide'), {
   loading,
   ssr: false,
 });
@@ -95,11 +91,8 @@ const ErrorMessageExtra = memo<{ data: ChatMessage }>(({ data }) => {
   if (!error?.type) return;
 
   switch (error.type) {
-    // TODO: 优化 Ollama setup 的流程，isDesktop 模式下可以直接做到端到端检测
     case AgentRuntimeErrorType.OllamaServiceUnavailable: {
-      if (isDesktop) return <OllamaDesktopSetupGuide id={data.id} />;
-
-      return <OllamaSetupGuide />;
+      return <OllamaSetupGuide id={data.id} />;
     }
 
     case AgentRuntimeErrorType.OllamaBizError: {

package/src/features/KnowledgeBaseModal/AssignKnowledgeBase/Loading.tsx

@@ -5,7 +5,7 @@ import { Flexbox } from 'react-layout-kit';
 const Loading = memo(() => {
   return (
     <Flexbox>
-      <Skeleton paragraph={{ rows: 8 }} />
+      <Skeleton paragraph={{ rows: 8 }} title={false} />
     </Flexbox>
   );
 });

package/src/features/ModelSwitchPanel/index.tsx

@@ -10,7 +10,7 @@ import { Flexbox } from 'react-layout-kit';
 
 import { ModelItemRender, ProviderItemRender } from '@/components/ModelSelect';
 import { isDeprecatedEdition } from '@/const/version';
-import ActionDropdown from '@/features/ChatInput/components/ActionDropdown';
+import ActionDropdown from '@/features/ChatInput/ActionBar/components/ActionDropdown';
 import { useEnabledChatModels } from '@/hooks/useEnabledChatModels';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/slices/chat';
@@ -40,7 +40,14 @@ const useStyles = createStyles(({ css, prefixCls }) => ({
 
 const menuKey = (provider: string, model: string) => `${provider}-${model}`;
 
-const ModelSwitchPanel = memo<PropsWithChildren>(({ children }) => {
+const ModelSwitchPanel = memo<
+  PropsWithChildren<{
+    onOpenChange?: (open: boolean) => void;
+    open?: boolean;
+    setUpdating?: (updating: boolean) => void;
+    updating?: boolean;
+  }>
+>(({ children, setUpdating, onOpenChange, open }) => {
   const { t } = useTranslation('components');
   const { styles, theme } = useStyles();
   const [model, provider, updateAgentConfig] = useAgentStore((s) => [
@@ -57,8 +64,10 @@ const ModelSwitchPanel = memo<PropsWithChildren>(({ children }) => {
       const items = provider.children.map((model) => ({
         key: menuKey(provider.id, model.id),
         label: <ModelItemRender {...model} {...model.abilities} />,
-        onClick: () => {
-          updateAgentConfig({ model: model.id, provider: provider.id });
+        onClick: async () => {
+          setUpdating?.(true);
+          await updateAgentConfig({ model: model.id, provider: provider.id });
+          setUpdating?.(false);
         },
       }));
 
@@ -129,6 +138,8 @@ const ModelSwitchPanel = memo<PropsWithChildren>(({ children }) => {
     }));
   }, [enabledList]);
 
+  const icon = <div className={styles.tag}>{children}</div>;
+
   return (
     <ActionDropdown
       menu={{
@@ -142,9 +153,11 @@ const ModelSwitchPanel = memo<PropsWithChildren>(({ children }) => {
           overflowY: 'scroll',
         },
       }}
+      onOpenChange={onOpenChange}
+      open={open}
       placement={'topLeft'}
     >
-      <div className={styles.tag}>{children}</div>
+      {icon}
     </ActionDropdown>
   );
 });

package/src/features/{Conversation/Error/OllamaDesktopSetupGuide/index.tsx → OllamaSetupGuide/Desktop.tsx}

@@ -9,9 +9,10 @@ import { Center } from 'react-layout-kit';
 import FormAction from '@/components/FormAction';
 import { useChatStore } from '@/store/chat';
 
-import { ErrorActionContainer } from '../style';
+import { ErrorActionContainer } from '../Conversation/Error/style';
 
-const OllamaDesktopSetupGuide = memo<{ id: string }>(({ id }) => {
+// TODO: 优化 Ollama setup 的流程，isDesktop 模式下可以直接做到端到端检测
+const OllamaDesktopSetupGuide = memo<{ id?: string }>(({ id }) => {
   const theme = useTheme();
   const { t } = useTranslation('components');
 
@@ -35,24 +36,28 @@ const OllamaDesktopSetupGuide = memo<{ id: string }>(({ id }) => {
           }
           title={t('OllamaSetupGuide.install.title')}
         />
-        <Button
-          block
-          onClick={() => {
-            delAndRegenerateMessage(id);
-          }}
-          style={{ marginTop: 8 }}
-          type={'primary'}
-        >
-          {t('OllamaSetupGuide.action.start')}
-        </Button>
-        <Button
-          block
-          onClick={() => {
-            deleteMessage(id);
-          }}
-        >
-          {t('OllamaSetupGuide.action.close')}
-        </Button>
+        {id && (
+          <>
+            <Button
+              block
+              onClick={() => {
+                delAndRegenerateMessage(id);
+              }}
+              style={{ marginTop: 8 }}
+              type={'primary'}
+            >
+              {t('OllamaSetupGuide.action.start')}
+            </Button>
+            <Button
+              block
+              onClick={() => {
+                deleteMessage(id);
+              }}
+            >
+              {t('OllamaSetupGuide.action.close')}
+            </Button>
+          </>
+        )}
       </Center>
     </ErrorActionContainer>
   );

package/src/features/OllamaSetupGuide/index.tsx

@@ -0,0 +1,17 @@
+import { memo } from 'react';
+
+import OllamaSetupGuide from '@/components/OllamaSetupGuide';
+import { isDesktop } from '@/const/version';
+import { ErrorActionContainer } from '@/features/Conversation/Error/style';
+
+import OllamaDesktopSetupGuide from './Desktop';
+
+const SetupGuide = memo<{ container?: boolean; id?: string }>(({ id, container = true }) => {
+  const content = isDesktop ? <OllamaDesktopSetupGuide id={id} /> : <OllamaSetupGuide />;
+
+  if (!container) return content;
+
+  return <ErrorActionContainer style={{ paddingBlock: 0 }}>{content}</ErrorActionContainer>;
+});
+
+export default SetupGuide;

package/src/features/ShareModal/ShareImage/ChatList/index.tsx

@@ -9,7 +9,7 @@ const ChatList = memo(() => {
   const ids = useChatStore(chatSelectors.mainDisplayChatIDs);
 
   return (
-    <Flexbox height={'100%'} style={{ paddingTop: 24, position: 'relative' }}>
+    <Flexbox height={'100%'} style={{ paddingTop: 24, position: 'relative' }} width={'100%'}>
       {ids.map((id, index) => (
         <ChatItem id={id} index={index} key={id} />
       ))}

package/src/features/ShareModal/ShareImage/Preview.tsx

@@ -49,10 +49,10 @@ const Preview = memo<FieldType & { title?: string }>(
                 <ChatHeaderTitle
                   desc={displayDesc}
                   tag={
-                    <>
+                    <Flexbox gap={4} horizontal>
                       <ModelTag model={model} />
                       {plugins?.length > 0 && <PluginTag plugins={plugins} />}
-                    </>
+                    </Flexbox>
                   }
                   title={displayTitle}
                 />

package/src/features/ShareModal/ShareImage/index.tsx

@@ -24,7 +24,7 @@ const DEFAULT_FIELD_VALUE: FieldType = {
   withSystemRole: false,
 };
 
-const ShareImage = memo<{ mobile?: boolean }>(({ mobile }) => {
+const ShareImage = memo<{ mobile?: boolean }>(() => {
   const currentAgentTitle = useSessionStore(sessionMetaSelectors.currentAgentTitle);
   const [fieldValue, setFieldValue] = useState<FieldType>(DEFAULT_FIELD_VALUE);
   const { t } = useTranslation(['chat', 'common']);
@@ -32,11 +32,8 @@ const ShareImage = memo<{ mobile?: boolean }>(({ mobile }) => {
   const { loading, onDownload, title } = useScreenshot({
     imageType: fieldValue.imageType,
     title: currentAgentTitle,
-    width: mobile ? 720 : undefined,
-  });
-  const { loading: copyLoading, onCopy } = useImgToClipboard({
-    width: mobile ? 720 : undefined,
   });
+  const { loading: copyLoading, onCopy } = useImgToClipboard();
   const settings: FormItemProps[] = [
     {
       children: <Switch />,
@@ -65,6 +62,7 @@ const ShareImage = memo<{ mobile?: boolean }>(({ mobile }) => {
     {
       children: <Segmented options={imageTypeOptions} />,
       label: t('shareModal.imageType'),
+      layout: 'horizontal',
       minWidth: undefined,
       name: 'imageType',
     },
@@ -105,7 +103,11 @@ const ShareImage = memo<{ mobile?: boolean }>(({ mobile }) => {
           {!isMobile && button}
         </Flexbox>
       </Flexbox>
-      {isMobile && <Flexbox className={styles.footer}>{button}</Flexbox>}
+      {isMobile && (
+        <Flexbox className={styles.footer} gap={8} horizontal>
+          {button}
+        </Flexbox>
+      )}
     </>
   );
 });

package/src/hooks/useImgToClipboard.ts

@@ -4,7 +4,10 @@ import { useState } from 'react';
 
 import { ImageType, getImageUrl } from './useScreenshot';
 
-export const useImgToClipboard = ({ id = '#preview', width }: { id?: string; width?: number }) => {
+export const useImgToClipboard = ({
+  id = '#preview',
+  width,
+}: { id?: string; width?: number } = {}) => {
   const [loading, setLoading] = useState(false);
   const { message } = App.useApp();
 

package/src/layout/GlobalProvider/Locale.tsx

@@ -88,11 +88,7 @@ const Locale = memo<LocaleLayoutProps>(({ children, defaultLang, antdLocale }) =
       theme={{
         components: {
           Button: {
-            borderRadiusSM: 6,
             contentFontSizeSM: 12,
-            defaultActiveBorderColor: theme.colorBorder,
-            defaultActiveColor: theme.colorText,
-            groupBorderColor: theme.colorBorder,
           },
           DatePicker: {
             activeBorderColor: theme.colorBorder,
@@ -114,10 +110,6 @@ const Locale = memo<LocaleLayoutProps>(({ children, defaultLang, antdLocale }) =
             activeBorderColor: theme.colorBorder,
             hoverBorderColor: theme.colorBorder,
           },
-          Typography: {
-            titleMarginBottom: 0,
-            titleMarginTop: 0,
-          },
         },
       }}
     >

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

@@ -40,8 +40,21 @@ export const LobeSiliconCloudAI = LobeOpenAICompatibleFactory({
       };
     },
     handlePayload: (payload) => {
+      const { max_tokens, model, thinking, ...rest } = payload;
+      const thinkingBudget = thinking?.budget_tokens === 0 ? 1 : (thinking?.budget_tokens || undefined)
+
       return {
-        ...payload,
+        ...rest,
+        ...( ['qwen3'].some(keyword => model.toLowerCase().includes(keyword))
+          ? { 
+            enable_thinking: thinking !== undefined ? thinking.type === 'enabled' : false,
+            thinking_budget: thinkingBudget === undefined ? undefined : Math.min(Math.max(thinkingBudget, 1), 32_768),
+          }
+          : {}),
+        max_tokens: max_tokens === undefined
+          ? undefined
+          : Math.min(Math.max(max_tokens, 1), 16_384),
+        model,
         stream: !payload.tools,
       } as any;
     },

package/src/locales/default/components.ts

@@ -91,6 +91,7 @@ export default {
     emptyProvider: '没有启用的服务商，请前往设置开启',
     goToSettings: '前往设置',
     provider: '服务商',
+    title: '模型',
   },
   OllamaSetupGuide: {
     action: {

package/src/utils/server/auth.ts

@@ -1,4 +1,6 @@
 import { enableClerk, enableNextAuth } from '@/const/auth';
+import { DESKTOP_USER_ID } from '@/const/desktop';
+import { isDesktop } from '@/const/version';
 
 export const getUserAuth = async () => {
   if (enableClerk) {
@@ -19,6 +21,10 @@ export const getUserAuth = async () => {
     return { nextAuth: session, userId };
   }
 
+  if (isDesktop) {
+    return { userId: DESKTOP_USER_ID };
+  }
+
   throw new Error('Auth method is not enabled');
 };
 

package/src/features/ChatInput/ActionBar/History.tsx

@@ -1,78 +0,0 @@
-import { ActionIcon, SliderWithInput } from '@lobehub/ui';
-import { Switch } from 'antd';
-import { Timer, TimerOff } from 'lucide-react';
-import { memo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import { useAgentStore } from '@/store/agent';
-import { agentChatConfigSelectors } from '@/store/agent/selectors';
-
-import ActionPopover from '../components/ActionPopover';
-
-const History = memo(() => {
-  const { t } = useTranslation('setting');
-  const [loading, setLoading] = useState(false);
-  const [popoverOpen, setPopoverOpen] = useState(false);
-
-  const [historyCount, enableHistoryCount, updateAgentConfig] = useAgentStore((s) => {
-    return [
-      agentChatConfigSelectors.historyCount(s),
-      agentChatConfigSelectors.enableHistoryCount(s),
-      s.updateAgentChatConfig,
-    ];
-  });
-
-  const title = t(
-    enableHistoryCount
-      ? 'settingChat.enableHistoryCount.limited'
-      : 'settingChat.enableHistoryCount.unlimited',
-    { number: historyCount || 0 },
-  );
-
-  return (
-    <ActionPopover
-      arrow={false}
-      content={
-        <SliderWithInput
-          disabled={!enableHistoryCount}
-          max={20}
-          min={0}
-          onChange={async (v) => {
-            setLoading(true);
-            await updateAgentConfig({ historyCount: v });
-            setLoading(false);
-          }}
-          size={'small'}
-          step={1}
-          value={historyCount}
-        />
-      }
-      extra={
-        <Switch
-          checked={enableHistoryCount}
-          loading={loading}
-          onChange={async (enableHistoryCount) => {
-            setLoading(true);
-            await updateAgentConfig({ enableHistoryCount });
-            setLoading(false);
-          }}
-          size={'small'}
-        />
-      }
-      minWidth={240}
-      onOpenChange={setPopoverOpen}
-      open={popoverOpen}
-      title={t('settingChat.enableHistoryCount.title')}
-    >
-      <ActionIcon
-        icon={enableHistoryCount ? Timer : TimerOff}
-        title={title}
-        tooltipProps={{
-          placement: 'bottom',
-        }}
-      />
-    </ActionPopover>
-  );
-});
-
-export default History;

package/src/features/Conversation/Error/OllamaBizError/SetupGuide.tsx

@@ -1,14 +0,0 @@
-import { memo } from 'react';
-
-import OllamaSetupGuide from '@/components/OllamaSetupGuide';
-import { ErrorActionContainer } from '@/features/Conversation/Error/style';
-
-const SetupGuide = memo(() => {
-  return (
-    <ErrorActionContainer style={{ paddingBlock: 0 }}>
-      <OllamaSetupGuide />
-    </ErrorActionContainer>
-  );
-});
-
-export default SetupGuide;