@lobehub/chat 1.68.11 → 1.69.1

package/src/store/chat/slices/aiChat/actions/__tests__/generateAIChat.test.ts

@@ -8,7 +8,7 @@ import { messageService } from '@/services/message';
 import { sessionService } from '@/services/session';
 import { topicService } from '@/services/topic';
 import { useAgentStore } from '@/store/agent';
-import { agentSelectors } from '@/store/agent/selectors';
+import { agentChatConfigSelectors, agentSelectors } from '@/store/agent/selectors';
 import { chatSelectors } from '@/store/chat/selectors';
 import { messageMapKey } from '@/store/chat/utils/messageMapKey';
 import { sessionMetaSelectors } from '@/store/session/selectors';
@@ -79,7 +79,7 @@ beforeEach(() => {
   vi.clearAllMocks();
   useChatStore.setState(mockState, false);
   vi.spyOn(agentSelectors, 'currentAgentConfig').mockImplementation(() => DEFAULT_AGENT_CONFIG);
-  vi.spyOn(agentSelectors, 'currentAgentChatConfig').mockImplementation(
+  vi.spyOn(agentChatConfigSelectors, 'currentChatConfig').mockImplementation(
     () => DEFAULT_AGENT_CHAT_CONFIG,
   );
   vi.spyOn(sessionMetaSelectors, 'currentAgentMeta').mockImplementation(() => ({ tags: [] }));
@@ -285,7 +285,7 @@ describe('chatMessage actions', () => {
         (messageService.createMessage as Mock).mockResolvedValue('new-message-id');
 
         // Mock agent config to simulate auto-create topic behavior
-        (agentSelectors.currentAgentChatConfig as Mock).mockImplementation(() => ({
+        (agentChatConfigSelectors.currentChatConfig as Mock).mockImplementation(() => ({
           autoCreateTopicThreshold,
           enableAutoCreateTopic,
         }));

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

@@ -21,7 +21,12 @@ import { MessageSemanticSearchChunk } from '@/types/rag';
 import { setNamespace } from '@/utils/storeDebug';
 
 import { chatSelectors, topicSelectors } from '../../../selectors';
-import { getAgentChatConfig, getAgentConfig, getAgentKnowledge } from './helpers';
+import {
+  getAgentChatConfig,
+  getAgentConfig,
+  getAgentEnableHistoryCount,
+  getAgentKnowledge,
+} from './helpers';
 
 const n = setNamespace('ai');
 
@@ -392,7 +397,11 @@ export const generateAIChat: StateCreator<
     // ================================== //
 
     // 1. slice messages with config
-    let preprocessMsgs = chatHelpers.getSlicedMessagesWithConfig(messages, chatConfig, true);
+    let preprocessMsgs = chatHelpers.getSlicedMessages(messages, {
+      includeNewUserMessage: true,
+      enableHistoryCount: getAgentEnableHistoryCount(),
+      historyCount: chatConfig.historyCount,
+    });
 
     // 2. replace inputMessage template
     preprocessMsgs = !chatConfig.inputTemplate

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

@@ -1,9 +1,13 @@
 import { useAgentStore } from '@/store/agent';
-import { agentSelectors } from '@/store/agent/selectors';
+import { agentChatConfigSelectors, agentSelectors } from '@/store/agent/selectors';
 
 export const getAgentConfig = () => agentSelectors.currentAgentConfig(useAgentStore.getState());
+
 export const getAgentChatConfig = () =>
-  agentSelectors.currentAgentChatConfig(useAgentStore.getState());
+  agentChatConfigSelectors.currentChatConfig(useAgentStore.getState());
+
+export const getAgentEnableHistoryCount = () =>
+  agentChatConfigSelectors.enableHistoryCount(useAgentStore.getState());
 
 export const getAgentKnowledge = () =>
   agentSelectors.currentEnabledKnowledge(useAgentStore.getState());

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

@@ -52,29 +52,37 @@ export const searchSlice: StateCreator<
   crawlMultiPages: async (id, params, aiSummary = true) => {
     const { internal_updateMessageContent } = get();
     get().toggleSearchLoading(id, true);
-    const response = await searchService.crawlPages(params.urls);
+    try {
+      const response = await searchService.crawlPages(params.urls);
 
-    await get().updatePluginState(id, response);
-    get().toggleSearchLoading(id, false);
-    const { results } = response;
-
-    if (!results) return;
-
-    const content = results.map((item) =>
-      'errorMessage' in item
-        ? item
-        : {
-            ...item.data,
-            // if crawl too many content
-            // slice the top 10000 char
-            content: item.data.content?.slice(0, CRAWL_CONTENT_LIMITED_COUNT),
-          },
-    );
+      await get().updatePluginState(id, response);
+      get().toggleSearchLoading(id, false);
+      const { results } = response;
 
-    await internal_updateMessageContent(id, JSON.stringify(content));
+      if (!results) return;
 
-    // if aiSummary is true, then trigger ai message
-    return aiSummary;
+      const content = results.map((item) =>
+        'errorMessage' in item
+          ? item
+          : {
+              ...item.data,
+              // if crawl too many content
+              // slice the top 10000 char
+              content: item.data.content?.slice(0, CRAWL_CONTENT_LIMITED_COUNT),
+            },
+      );
+
+      await internal_updateMessageContent(id, JSON.stringify(content));
+
+      // if aiSummary is true, then trigger ai message
+      return aiSummary;
+    } catch (e) {
+      const err = e as Error;
+      console.error(e);
+      const content = [{ ...err, errorMessage: err.message, errorType: err.name }];
+
+      await internal_updateMessageContent(id, JSON.stringify(content));
+    }
   },
 
   crawlSinglePage: async (id, params, aiSummary) => {

package/src/store/chat/slices/message/selectors.ts

@@ -1,7 +1,7 @@
 import { DEFAULT_USER_AVATAR } from '@/const/meta';
 import { INBOX_SESSION_ID } from '@/const/session';
 import { useAgentStore } from '@/store/agent';
-import { agentSelectors } from '@/store/agent/selectors';
+import { agentChatConfigSelectors } from '@/store/agent/selectors';
 import { messageMapKey } from '@/store/chat/utils/messageMapKey';
 import { useSessionStore } from '@/store/session';
 import { sessionMetaSelectors } from '@/store/session/selectors';
@@ -84,9 +84,13 @@ const mainAIChats = (s: ChatStoreState): ChatMessage[] => {
 
 const mainAIChatsWithHistoryConfig = (s: ChatStoreState): ChatMessage[] => {
   const chats = mainAIChats(s);
-  const config = agentSelectors.currentAgentChatConfig(useAgentStore.getState());
+  const enableHistoryCount = agentChatConfigSelectors.enableHistoryCount(useAgentStore.getState());
+  const historyCount = agentChatConfigSelectors.historyCount(useAgentStore.getState());
 
-  return chatHelpers.getSlicedMessagesWithConfig(chats, config);
+  return chatHelpers.getSlicedMessages(chats, {
+    enableHistoryCount,
+    historyCount,
+  });
 };
 
 const mainAIChatsMessageString = (s: ChatStoreState): string => {

package/src/store/chat/slices/thread/selectors/index.ts

@@ -1,6 +1,6 @@
 import { THREAD_DRAFT_ID } from '@/const/message';
 import { useAgentStore } from '@/store/agent';
-import { agentSelectors } from '@/store/agent/selectors';
+import { agentChatConfigSelectors } from '@/store/agent/selectors';
 import type { ChatStoreState } from '@/store/chat';
 import { chatHelpers } from '@/store/chat/helpers';
 import { ChatMessage } from '@/types/message';
@@ -123,9 +123,13 @@ const portalAIChatsWithHistoryConfig = (s: ChatStoreState) => {
 
   const messages = [...parentMessages, ...afterMessages].filter(Boolean) as ChatMessage[];
 
-  const config = agentSelectors.currentAgentChatConfig(useAgentStore.getState());
+  const enableHistoryCount = agentChatConfigSelectors.enableHistoryCount(useAgentStore.getState());
+  const historyCount = agentChatConfigSelectors.historyCount(useAgentStore.getState());
 
-  return chatHelpers.getSlicedMessagesWithConfig(messages, config);
+  return chatHelpers.getSlicedMessages(messages, {
+    enableHistoryCount,
+    historyCount,
+  });
 };
 
 const threadSourceMessageIndex = (s: ChatStoreState) => {

package/src/tools/web-browsing/Render/PageContent/Result.tsx

@@ -51,12 +51,13 @@ const useStyles = createStyles(({ token, css }) => {
       }
     `,
     footer: css`
-      padding: ${token.paddingXS}px;
+      padding-block: 8px;
+      padding-inline: 16px;
       text-align: center;
       background-color: ${token.colorFillQuaternary};
     `,
     footerText: css`
-      font-size: ${token.fontSizeSM}px;
+      font-size: 12px !important;
       color: ${token.colorTextTertiary} !important;
     `,
     metaInfo: css`
@@ -153,6 +154,7 @@ const CrawlerResultCard = memo<CrawlerData>(({ result, messageId, crawler, origi
         <Descriptions
           classNames={{
             content: styles.footerText,
+            label: styles.footerText,
           }}
           column={2}
           items={[

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

@@ -45,4 +45,6 @@ const WebBrowsing = memo<BuiltinRenderProps<SearchContent[]>>(
   },
 );
 
+WebBrowsing.displayName = 'WebBrowsing';
+
 export default WebBrowsing;

package/src/types/agent/index.ts

@@ -75,6 +75,10 @@ export interface LobeAgentChatConfig {
   enableReasoningEffort?: boolean;
   reasoningBudgetToken?: number;
 
+  /**
+   * 禁用上下文缓存
+   */
+  disableContextCaching?: boolean;
   /**
    * 历史消息条数
    */

package/src/types/aiModel.ts

@@ -140,7 +140,7 @@ export interface AiModelConfig {
 
 export type ModelSearchImplementType = 'tool' | 'params' | 'internal';
 
-export type ExtendParamsType = 'reasoningBudgetToken' | 'enableReasoning';
+export type ExtendParamsType = 'reasoningBudgetToken' | 'enableReasoning' | 'disableContextCaching';
 
 export interface AiModelSettings {
   extendParams?: ExtendParamsType[];

package/src/types/aiProvider.ts

@@ -32,37 +32,6 @@ export const AiProviderSDKEnum = {
 
 export type AiProviderSDKType = (typeof AiProviderSDKEnum)[keyof typeof AiProviderSDKEnum];
 
-// create
-export const CreateAiProviderSchema = z.object({
-  config: z.object({}).passthrough().optional(),
-  description: z.string().optional(),
-  id: z.string(),
-  keyVaults: z.any().optional(),
-  logo: z.string().optional(),
-  name: z.string(),
-  sdkType: z.enum(['openai', 'anthropic']).optional(),
-  source: z.enum(['builtin', 'custom']),
-  // checkModel: z.string().optional(),
-  // homeUrl: z.string().optional(),
-  // modelsUrl: z.string().optional(),
-});
-
-export type CreateAiProviderParams = z.infer<typeof CreateAiProviderSchema>;
-
-// List Query
-
-export interface AiProviderListItem {
-  description?: string;
-  enabled: boolean;
-  id: string;
-  logo?: string;
-  name?: string;
-  sort?: number;
-  source: AiProviderSourceType;
-}
-
-// Detail Query
-
 export interface AiProviderSettings {
   /**
    * whether provider show browser request option by default
@@ -115,6 +84,65 @@ export interface AiProviderSettings {
   smoothing?: SmoothingParams;
 }
 
+const AiProviderSettingsSchema = z.object({
+  defaultShowBrowserRequest: z.boolean().optional(),
+  disableBrowserRequest: z.boolean().optional(),
+  modelEditable: z.boolean().optional(),
+  proxyUrl: z
+    .object({
+      desc: z.string().optional(),
+      placeholder: z.string(),
+      title: z.string().optional(),
+    })
+    .or(z.literal(false))
+    .optional(),
+  sdkType: z.enum(['anthropic', 'openai', 'ollama']).optional(),
+  searchMode: z.enum(['params', 'internal']).optional(),
+  showAddNewModel: z.boolean().optional(),
+  showApiKey: z.boolean().optional(),
+  showChecker: z.boolean().optional(),
+  showDeployName: z.boolean().optional(),
+  showModelFetcher: z.boolean().optional(),
+  smoothing: z
+    .object({
+      text: z.boolean().optional(),
+      toolsCalling: z.boolean().optional(),
+    })
+    .optional(),
+});
+
+// create
+export const CreateAiProviderSchema = z.object({
+  config: z.object({}).passthrough().optional(),
+  description: z.string().optional(),
+  id: z.string(),
+  keyVaults: z.any().optional(),
+  logo: z.string().optional(),
+  name: z.string(),
+  sdkType: z.enum(['openai', 'anthropic']).optional(),
+  settings: AiProviderSettingsSchema.optional(),
+  source: z.enum(['builtin', 'custom']),
+  // checkModel: z.string().optional(),
+  // homeUrl: z.string().optional(),
+  // modelsUrl: z.string().optional(),
+});
+
+export type CreateAiProviderParams = z.infer<typeof CreateAiProviderSchema>;
+
+// List Query
+
+export interface AiProviderListItem {
+  description?: string;
+  enabled: boolean;
+  id: string;
+  logo?: string;
+  name?: string;
+  sort?: number;
+  source: AiProviderSourceType;
+}
+
+// Detail Query
+
 export interface AiProviderCard {
   /**
    * the default model that used for connection check
@@ -174,6 +202,7 @@ export const UpdateAiProviderSchema = z.object({
   logo: z.string().nullable().optional(),
   name: z.string(),
   sdkType: z.enum(['openai', 'anthropic']).optional(),
+  settings: AiProviderSettingsSchema.optional(),
 });
 
 export type UpdateAiProviderParams = z.infer<typeof UpdateAiProviderSchema>;