@lobehub/lobehub 2.0.0-next.223 → 2.0.0-next.225

package/.github/workflows/test.yml

@@ -6,9 +6,14 @@ permissions:
   actions: write
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   # Check for duplicate runs
-  pre_job:
+  check-duplicate-run:
+    name: Check Duplicate Run
     runs-on: ubuntu-latest
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
@@ -16,69 +21,18 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          concurrent_skipping: 'same_content_newer'
-          skip_after_successful_duplicate: 'true'
+          concurrent_skipping: "same_content_newer"
+          skip_after_successful_duplicate: "true"
           do_not_skip: '["workflow_dispatch", "schedule"]'
 
-  # Package tests - using each package's own test script
-  test-intenral-packages:
-    needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        package:
-          - file-loaders
-          - prompts
-          - model-runtime
-          - web-crawler
-          - electron-server-ipc
-          - utils
-          - python-interpreter
-          - context-engine
-          - agent-runtime
-          - conversation-flow
-          - ssrf-safe-fetch
-          - memory-user-memory
-
-    name: Test package ${{ matrix.package }}
-
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24.11.1
-          package-manager-cache: false
-
-      - name: Install bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: ${{ secrets.BUN_VERSION }}
-
-      - name: Install deps
-        run: bun i
-
-      - name: Test ${{ matrix.package }} package with coverage
-        run: bun run --filter @lobechat/${{ matrix.package }} test:coverage
-
-      - name: Upload ${{ matrix.package }} coverage to Codecov
-        uses: codecov/codecov-action@v5
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./packages/${{ matrix.package }}/coverage/lcov.info
-          flags: packages/${{ matrix.package }}
-
+  # Package tests - all packages in single job to save runner resources
   test-packages:
-    needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'
+    needs: check-duplicate-run
+    if: needs.check-duplicate-run.outputs.should_skip != 'true'
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        package: [model-bank]
-
-    name: Test package ${{ matrix.package }}
+    name: Test Packages
+    env:
+      PACKAGES: "@lobechat/file-loaders @lobechat/prompts @lobechat/model-runtime @lobechat/web-crawler @lobechat/electron-server-ipc @lobechat/utils @lobechat/python-interpreter @lobechat/context-engine @lobechat/agent-runtime @lobechat/conversation-flow @lobechat/ssrf-safe-fetch @lobechat/memory-user-memory model-bank"
 
     steps:
       - uses: actions/checkout@v6
@@ -92,25 +46,40 @@ jobs:
       - name: Install bun
         uses: oven-sh/setup-bun@v2
         with:
-          bun-version: latest
+          bun-version: ${{ secrets.BUN_VERSION }}
 
       - name: Install deps
         run: bun i
 
-      - name: Test ${{ matrix.package }} package with coverage
-        run: bun run --filter ${{ matrix.package }} test:coverage
-
-      - name: Upload ${{ matrix.package }} coverage to Codecov
-        uses: codecov/codecov-action@v5
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./packages/${{ matrix.package }}/coverage/lcov.info
-          flags: packages/${{ matrix.package }}
+      - name: Test packages with coverage
+        run: |
+          for package in $PACKAGES; do
+            echo "::group::Testing $package"
+            bun run --filter $package test:coverage
+            echo "::endgroup::"
+          done
+
+      - name: Upload coverage to Codecov
+        if: always()
+        run: |
+          curl -Os https://cli.codecov.io/latest/linux/codecov
+          chmod +x codecov
+          for package in $PACKAGES; do
+            dir="${package#@lobechat/}"
+            if [ -f "./packages/$dir/coverage/lcov.info" ]; then
+              echo "Uploading coverage for $dir..."
+              ./codecov upload-process \
+                -t ${{ secrets.CODECOV_TOKEN }} \
+                -f ./packages/$dir/coverage/lcov.info \
+                -F packages/$dir \
+                --disable-search
+            fi
+          done
 
   # App tests
   test-website:
-    needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'
+    needs: check-duplicate-run
+    if: needs.check-duplicate-run.outputs.should_skip != 'true'
     name: Test Website
 
     runs-on: ubuntu-latest
@@ -143,8 +112,8 @@ jobs:
           flags: app
 
   test-desktop:
-    needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'
+    needs: check-duplicate-run
+    if: needs.check-duplicate-run.outputs.should_skip != 'true'
     name: Test Desktop App
 
     runs-on: ubuntu-latest
@@ -185,8 +154,8 @@ jobs:
           flags: desktop
 
   test-databsae:
-    needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'
+    needs: check-duplicate-run
+    if: needs.check-duplicate-run.outputs.should_skip != 'true'
     name: Test Database
 
     runs-on: ubuntu-latest
@@ -199,7 +168,6 @@ jobs:
         options: >-
           --health-cmd pg_isready --health-interval 10s --health-timeout 5s  --health-retries 5
 
-
         ports:
           - 5432:5432
 

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+## [Version 2.0.0-next.225](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.224...v2.0.0-next.225)
+
+<sup>Released on **2026-01-06**</sup>
+
+#### ✨ Features
+
+- **ModelSwitchPanel**: Add provider preference storage in By Model view.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **ModelSwitchPanel**: Add provider preference storage in By Model view, closes [#11246](https://github.com/lobehub/lobe-chat/issues/11246) ([d778093](https://github.com/lobehub/lobe-chat/commit/d778093))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+## [Version 2.0.0-next.224](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.223...v2.0.0-next.224)
+
+<sup>Released on **2026-01-06**</sup>
+
+#### ♻ Code Refactoring
+
+- **router**: Replace client-side rendering with dynamic import for DesktopClientRouter.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **router**: Replace client-side rendering with dynamic import for DesktopClientRouter, closes [#11276](https://github.com/lobehub/lobe-chat/issues/11276) ([f50305b](https://github.com/lobehub/lobe-chat/commit/f50305b))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 2.0.0-next.223](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.222...v2.0.0-next.223)
 
 <sup>Released on **2026-01-06**</sup>

package/changelog/v1.json

@@ -1,4 +1,14 @@
 [
+  {
+    "children": {},
+    "date": "2026-01-06",
+    "version": "2.0.0-next.225"
+  },
+  {
+    "children": {},
+    "date": "2026-01-06",
+    "version": "2.0.0-next.224"
+  },
   {
     "children": {
       "fixes": [

package/locales/en-US/common.json

@@ -119,8 +119,8 @@
   "cmdk.navigate": "Navigate",
   "cmdk.newAgent": "Create New Agent",
   "cmdk.newAgentTeam": "Create New Group",
-  "cmdk.newLibrary": "New Library",
-  "cmdk.newPage": "New Page",
+  "cmdk.newLibrary": "Create New Library",
+  "cmdk.newPage": "Create New Page",
   "cmdk.newTopic": "New topic in current Agent",
   "cmdk.noResults": "No results found",
   "cmdk.openSettings": "Open Settings",
@@ -158,6 +158,7 @@
   "cmdk.themeLight": "Light",
   "cmdk.toOpen": "Open",
   "cmdk.toSelect": "Select",
+  "cmdk.upgradePlan": "Upgrade Plan",
   "confirm": "Confirm",
   "contact": "Contact Us",
   "copy": "Copy",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/lobehub",
-  "version": "2.0.0-next.223",
+  "version": "2.0.0-next.225",
   "description": "LobeHub - an open-source,comprehensive AI Agent framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/packages/database/src/models/user.ts

@@ -1,5 +1,6 @@
 import {
   SSOProvider,
+  UserGeneralConfig,
   UserGuide,
   UserKeyVaults,
   UserPreference,
@@ -45,6 +46,11 @@ export type ListUsersForMemoryExtractorOptions = {
   whitelist?: string[];
 };
 
+export interface UserInfoForAIGeneration {
+  responseLanguage: string;
+  userName: string;
+}
+
 export class UserModel {
   private userId: string;
   private db: LobeChatDatabase;
@@ -339,4 +345,31 @@ export class UserModel {
       where,
     });
   };
+
+  /**
+   * Get user info for AI generation (name and language preference)
+   */
+  static getInfoForAIGeneration = async (
+    db: LobeChatDatabase,
+    userId: string,
+  ): Promise<UserInfoForAIGeneration> => {
+    const result = await db
+      .select({
+        firstName: users.firstName,
+        fullName: users.fullName,
+        general: userSettings.general,
+      })
+      .from(users)
+      .leftJoin(userSettings, eq(users.id, userSettings.id))
+      .where(eq(users.id, userId))
+      .limit(1);
+
+    const user = result[0];
+    const general = user?.general as UserGeneralConfig | undefined;
+
+    return {
+      responseLanguage: general?.responseLanguage || 'en-US',
+      userName: user?.fullName || user?.firstName || 'User',
+    };
+  };
 }

package/packages/database/src/repositories/knowledge/index.ts

@@ -29,7 +29,7 @@ export interface KnowledgeItem {
 }
 
 /**
- * Knowledge Repository - combines files and documents into a unified interface
+ * Resources Repository - combines files and documents into a unified interface
  */
 export class KnowledgeRepo {
   private userId: string;

package/src/app/[variants]/router/index.tsx

@@ -1,20 +1,16 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import dynamic from 'next/dynamic';
 
-import DesktopClientRouter from './DesktopClientRouter';
+import Loading from '@/components/Loading/BrandTextLoading';
+
+const DesktopRouterClient = dynamic(() => import('./DesktopClientRouter'), {
+  loading: () => <Loading debugId="DesktopRouter" />,
+  ssr: false,
+});
 
-const useIsClient = () => {
-  const [isClient, setIsClient] = useState(false);
-  useEffect(() => {
-    setIsClient(true);
-  }, []);
-  return isClient;
-};
 const DesktopRouter = () => {
-  const isClient = useIsClient();
-  if (!isClient) return null;
-  return <DesktopClientRouter />;
+  return <DesktopRouterClient />;
 };
 
 export default DesktopRouter;

package/src/business/client/hooks/useRenderBusinessChatErrorMessageExtra.tsx

@@ -0,0 +1,10 @@
+import { type ChatMessageError } from '@lobechat/types';
+
+export default function useRenderBusinessChatErrorMessageExtra(
+  // eslint-disable-next-line unused-imports/no-unused-vars, @typescript-eslint/no-unused-vars
+  error: ChatMessageError | null | undefined,
+  // eslint-disable-next-line unused-imports/no-unused-vars, @typescript-eslint/no-unused-vars
+  messageId: string,
+) {
+  return null;
+}

package/src/features/CommandMenu/ContextCommands.tsx

@@ -6,11 +6,12 @@ import { useTranslation } from 'react-i18next';
 import { useCommandMenuContext } from './CommandMenuContext';
 import { CommandItem } from './components';
 import { useCommandMenu } from './useCommandMenu';
-import { getContextCommands } from './utils/contextCommands';
+import { CONTEXT_COMMANDS, getContextCommands } from './utils/contextCommands';
 
 const ContextCommands = memo(() => {
   const { t } = useTranslation('setting');
   const { t: tAuth } = useTranslation('auth');
+  const { t: tSubscription } = useTranslation('subscription');
   const { t: tCommon } = useTranslation('common');
   const { handleNavigate } = useCommandMenu();
   const { menuContext, pathname } = useCommandMenuContext();
@@ -23,48 +24,107 @@ const ContextCommands = memo(() => {
 
   const commands = getContextCommands(menuContext, subPath);
 
-  if (commands.length === 0) return null;
+  // Get settings commands to show globally (when not in settings context)
+  const globalSettingsCommands = useMemo(() => {
+    if (menuContext === 'settings') return [];
+    return CONTEXT_COMMANDS.settings;
+  }, [menuContext]);
+
+  const hasCommands = commands.length > 0 || globalSettingsCommands.length > 0;
+
+  if (!hasCommands) return null;
 
   // Get localized context name
   const contextName = tCommon(`cmdk.context.${menuContext}`, { defaultValue: menuContext });
+  const settingsContextName = tCommon('cmdk.context.settings', { defaultValue: 'settings' });
 
   return (
-    <Command.Group>
-      {commands.map((cmd) => {
-        const Icon = cmd.icon;
-        // Get localized label using the correct namespace
-        let label = cmd.label;
-        if (cmd.labelKey) {
-          if (cmd.labelNamespace === 'auth') {
-            label = tAuth(cmd.labelKey, { defaultValue: cmd.label });
-          } else {
-            label = t(cmd.labelKey, { defaultValue: cmd.label });
-          }
-        }
-        const searchValue = `${contextName} ${label} ${cmd.keywords.join(' ')}`;
+    <>
+      {/* Current context commands */}
+      {commands.length > 0 && (
+        <Command.Group>
+          {commands.map((cmd) => {
+            const Icon = cmd.icon;
+            // Get localized label using the correct namespace
+            let label = cmd.label;
+            if (cmd.labelKey) {
+              if (cmd.labelNamespace === 'auth') {
+                label = tAuth(cmd.labelKey, { defaultValue: cmd.label });
+              } else if (cmd.labelNamespace === 'subscription') {
+                label = tSubscription(cmd.labelKey, { defaultValue: cmd.label });
+              } else {
+                label = t(cmd.labelKey, { defaultValue: cmd.label });
+              }
+            }
+            const searchValue = `${contextName} ${label} ${cmd.keywords.join(' ')}`;
+
+            return (
+              <CommandItem
+                icon={<Icon />}
+                key={cmd.path}
+                onSelect={() => handleNavigate(cmd.path)}
+                value={searchValue}
+              >
+                <span style={{ opacity: 0.5 }}>{contextName}</span>
+                <ChevronRight
+                  size={14}
+                  style={{
+                    display: 'inline',
+                    marginInline: '6px',
+                    opacity: 0.5,
+                    verticalAlign: 'middle',
+                  }}
+                />
+                {label}
+              </CommandItem>
+            );
+          })}
+        </Command.Group>
+      )}
+
+      {/* Global settings commands (searchable from any page) */}
+      {globalSettingsCommands.length > 0 && (
+        <Command.Group>
+          {globalSettingsCommands.map((cmd) => {
+            const Icon = cmd.icon;
+            // Get localized label using the correct namespace
+            let label = cmd.label;
+            if (cmd.labelKey) {
+              if (cmd.labelNamespace === 'auth') {
+                label = tAuth(cmd.labelKey, { defaultValue: cmd.label });
+              } else if (cmd.labelNamespace === 'subscription') {
+                label = tSubscription(cmd.labelKey, { defaultValue: cmd.label });
+              } else {
+                label = t(cmd.labelKey, { defaultValue: cmd.label });
+              }
+            }
+            const searchValue = `${settingsContextName} ${label} ${cmd.keywords.join(' ')}`;
 
-        return (
-          <CommandItem
-            icon={<Icon />}
-            key={cmd.path}
-            onSelect={() => handleNavigate(cmd.path)}
-            value={searchValue}
-          >
-            <span style={{ opacity: 0.5 }}>{contextName}</span>
-            <ChevronRight
-              size={14}
-              style={{
-                display: 'inline',
-                marginInline: '6px',
-                opacity: 0.5,
-                verticalAlign: 'middle',
-              }}
-            />
-            {label}
-          </CommandItem>
-        );
-      })}
-    </Command.Group>
+            return (
+              <CommandItem
+                icon={<Icon />}
+                key={cmd.path}
+                onSelect={() => handleNavigate(cmd.path)}
+                unpinned={true}
+                value={searchValue}
+              >
+                <span style={{ opacity: 0.5 }}>{settingsContextName}</span>
+                <ChevronRight
+                  size={14}
+                  style={{
+                    display: 'inline',
+                    marginInline: '6px',
+                    opacity: 0.5,
+                    verticalAlign: 'middle',
+                  }}
+                />
+                {label}
+              </CommandItem>
+            );
+          })}
+        </Command.Group>
+      )}
+    </>
   );
 });
 

package/src/features/CommandMenu/SearchResults.tsx

@@ -1,6 +1,15 @@
 import { Command } from 'cmdk';
 import dayjs from 'dayjs';
-import { Bot, FileText, MessageCircle, MessageSquare, Plug, Puzzle, Sparkles } from 'lucide-react';
+import {
+  Bot,
+  ChevronRight,
+  FileText,
+  MessageCircle,
+  MessageSquare,
+  Plug,
+  Puzzle,
+  Sparkles,
+} from 'lucide-react';
 import { markdownToTxt } from 'markdown-to-txt';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -8,7 +17,6 @@ import { useNavigate } from 'react-router-dom';
 
 import type { SearchResult } from '@/database/repositories/search';
 
-import { useCommandMenuContext } from './CommandMenuContext';
 import { CommandItem } from './components';
 import { styles } from './styles';
 import type { ValidSearchType } from './utils/queryParser';
@@ -29,7 +37,6 @@ const SearchResults = memo<SearchResultsProps>(
   ({ isLoading, onClose, onSetTypeFilter, results, searchQuery, typeFilter }) => {
     const { t } = useTranslation('common');
     const navigate = useNavigate();
-    const { menuContext } = useCommandMenuContext();
 
     const handleNavigate = (result: SearchResult) => {
       switch (result.type) {
@@ -146,15 +153,6 @@ const SearchResults = memo<SearchResultsProps>(
       }
     };
 
-    // Get trailing label for search results (shows "Market" for marketplace items)
-    const getTrailingLabel = (type: SearchResult['type']) => {
-      // Marketplace items: MCP, plugins, assistants
-      if (type === 'mcp' || type === 'plugin' || type === 'communityAgent') {
-        return t('cmdk.search.market');
-      }
-      return getTypeLabel(type);
-    };
-
     // eslint-disable-next-line unicorn/consistent-function-scoping
     const getItemValue = (result: SearchResult) => {
       const meta = [result.title, result.description].filter(Boolean).join(' ');
@@ -193,26 +191,6 @@ const SearchResults = memo<SearchResultsProps>(
       onSetTypeFilter(type);
     };
 
-    // Helper to render "Search More" button
-    const renderSearchMore = (type: ValidSearchType, count: number) => {
-      // Don't show if already filtering by this type
-      if (typeFilter) return null;
-
-      // Show if there are results (might have more)
-      if (count === 0) return null;
-
-      return (
-        <CommandItem
-          forceMount
-          icon={getIcon(type)}
-          onSelect={() => handleSearchMore(type)}
-          title={t('cmdk.search.searchMore', { type: getTypeLabel(type) })}
-          value={`action-show-more-results-for-type-${type}`}
-          variant="detailed"
-        />
-      );
-    };
-
     const hasResults = results.length > 0;
 
     // Group results by type
@@ -225,289 +203,135 @@ const SearchResults = memo<SearchResultsProps>(
     const pluginResults = results.filter((r) => r.type === 'plugin');
     const assistantResults = results.filter((r) => r.type === 'communityAgent');
 
-    // Detect context types
-    const isResourceContext = menuContext === 'resource';
-    const isPageContext = menuContext === 'page';
-
     // Don't render anything if no results and not loading
     if (!hasResults && !isLoading) {
       return null;
     }
 
-    return (
-      <>
-        {/* Show pages first in page context */}
-        {hasResults && isPageContext && pageResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.pages')} key="pages-page-context">
-            {pageResults.map((result) => (
-              <CommandItem
-                description={result.description}
-                icon={getIcon(result.type)}
-                key={`page-page-context-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
-            {renderSearchMore('page', pageResults.length)}
-          </Command.Group>
-        )}
-
-        {/* Show other results in page context */}
-        {hasResults && isPageContext && fileResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.files')}>
-            {fileResults.map((result) => (
-              <CommandItem
-                description={result.type === 'file' ? result.fileType : undefined}
-                icon={getIcon(result.type)}
-                key={`file-page-context-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
-            {renderSearchMore('file', fileResults.length)}
-          </Command.Group>
-        )}
+    // Render a single result item with type prefix (like "Message > content")
+    const renderResultItem = (result: SearchResult) => {
+      const typeLabel = getTypeLabel(result.type);
+      const subtitle = getSubtitle(result);
+
+      // Hide type prefix when filtering by specific type
+      const showTypePrefix = !typeFilter;
+
+      // Create title with or without type prefix
+      const titleWithPrefix = showTypePrefix ? (
+        <>
+          <span style={{ opacity: 0.5 }}>{typeLabel}</span>
+          <ChevronRight
+            size={14}
+            style={{
+              display: 'inline',
+              marginInline: '6px',
+              opacity: 0.5,
+              verticalAlign: 'middle',
+            }}
+          />
+          {result.title}
+        </>
+      ) : (
+        result.title
+      );
 
-        {hasResults && isPageContext && agentResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.agents')}>
-            {agentResults.map((result) => (
-              <CommandItem
-                description={getDescription(result)}
-                icon={getIcon(result.type)}
-                key={`agent-page-context-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
-            {renderSearchMore('agent', agentResults.length)}
-          </Command.Group>
-        )}
+      return (
+        <CommandItem
+          description={subtitle}
+          icon={getIcon(result.type)}
+          key={result.id}
+          onSelect={() => handleNavigate(result)}
+          title={titleWithPrefix}
+          value={getItemValue(result)}
+          variant="detailed"
+        />
+      );
+    };
 
-        {hasResults && isPageContext && topicResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.topics')}>
-            {topicResults.map((result) => (
-              <CommandItem
-                description={getSubtitle(result)}
-                icon={getIcon(result.type)}
-                key={`topic-page-context-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
-            {renderSearchMore('topic', topicResults.length)}
-          </Command.Group>
-        )}
+    // Helper to render "Search More" button
+    const renderSearchMore = (type: ValidSearchType, count: number) => {
+      // Don't show if already filtering by this type
+      if (typeFilter) return null;
 
-        {hasResults && isPageContext && messageResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.messages')}>
-            {messageResults.map((result) => (
-              <CommandItem
-                description={getSubtitle(result)}
-                icon={getIcon(result.type)}
-                key={`message-page-context-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
-            {renderSearchMore('message', messageResults.length)}
-          </Command.Group>
-        )}
+      // Show if there are results (might have more)
+      if (count === 0) return null;
 
-        {/* Show pages first in resource context */}
-        {hasResults && isResourceContext && pageResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.pages')} key="pages-resource">
-            {pageResults.map((result) => (
-              <CommandItem
-                description={result.description}
-                icon={getIcon(result.type)}
-                key={`page-resource-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
-            {renderSearchMore('page', pageResults.length)}
-          </Command.Group>
-        )}
+      const typeLabel = getTypeLabel(type);
+      const titleText = `${t('cmdk.search.searchMore', { type: typeLabel })} with "${searchQuery}"`;
 
-        {/* Show files in resource context */}
-        {hasResults && isResourceContext && fileResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.files')}>
-            {fileResults.map((result) => (
-              <CommandItem
-                description={result.type === 'file' ? result.fileType : undefined}
-                icon={getIcon(result.type)}
-                key={`file-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
-            {renderSearchMore('file', fileResults.length)}
-          </Command.Group>
-        )}
+      return (
+        <Command.Item
+          forceMount
+          key={`search-more-${type}`}
+          keywords={[`zzz-action-${type}`]}
+          onSelect={() => handleSearchMore(type)}
+          value={`zzz-action-${type}-search-more`}
+        >
+          <div className={styles.itemContent}>
+            <div className={styles.itemIcon}>{getIcon(type)}</div>
+            <div className={styles.itemDetails}>
+              <div className={styles.itemTitle}>{titleText}</div>
+            </div>
+          </div>
+        </Command.Item>
+      );
+    };
 
-        {hasResults && !isPageContext && !isResourceContext && messageResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.messages')}>
-            {messageResults.map((result) => (
-              <CommandItem
-                description={getSubtitle(result)}
-                icon={getIcon(result.type)}
-                key={`message-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
+    return (
+      <>
+        {/* Render search results grouped by type without headers */}
+        {messageResults.length > 0 && (
+          <Command.Group>
+            {messageResults.map((result) => renderResultItem(result))}
             {renderSearchMore('message', messageResults.length)}
           </Command.Group>
         )}
 
-        {hasResults && !isPageContext && agentResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.agents')}>
-            {agentResults.map((result) => (
-              <CommandItem
-                description={getDescription(result)}
-                icon={getIcon(result.type)}
-                key={`agent-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
+        {agentResults.length > 0 && (
+          <Command.Group>
+            {agentResults.map((result) => renderResultItem(result))}
             {renderSearchMore('agent', agentResults.length)}
           </Command.Group>
         )}
 
-        {hasResults && !isPageContext && topicResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.topics')}>
-            {topicResults.map((result) => (
-              <CommandItem
-                description={getSubtitle(result)}
-                icon={getIcon(result.type)}
-                key={`topic-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
+        {topicResults.length > 0 && (
+          <Command.Group>
+            {topicResults.map((result) => renderResultItem(result))}
             {renderSearchMore('topic', topicResults.length)}
           </Command.Group>
         )}
 
-        {/* Show document pages in normal context (not in resource or page context) */}
-        {hasResults && !isResourceContext && !isPageContext && pageResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.pages')} key="pages-normal">
-            {pageResults.map((result) => (
-              <CommandItem
-                description={result.description}
-                icon={getIcon(result.type)}
-                key={`page-normal-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
+        {pageResults.length > 0 && (
+          <Command.Group>
+            {pageResults.map((result) => renderResultItem(result))}
             {renderSearchMore('page', pageResults.length)}
           </Command.Group>
         )}
 
-        {/* Show files in original position when NOT in resource or page context */}
-        {hasResults && !isResourceContext && !isPageContext && fileResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.files')}>
-            {fileResults.map((result) => (
-              <CommandItem
-                description={result.type === 'file' ? result.fileType : undefined}
-                icon={getIcon(result.type)}
-                key={`file-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
+        {fileResults.length > 0 && (
+          <Command.Group>
+            {fileResults.map((result) => renderResultItem(result))}
             {renderSearchMore('file', fileResults.length)}
           </Command.Group>
         )}
 
-        {hasResults && mcpResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.mcps')}>
-            {mcpResults.map((result) => (
-              <CommandItem
-                description={getDescription(result)}
-                icon={getIcon(result.type)}
-                key={`mcp-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
+        {mcpResults.length > 0 && (
+          <Command.Group>
+            {mcpResults.map((result) => renderResultItem(result))}
             {renderSearchMore('mcp', mcpResults.length)}
           </Command.Group>
         )}
 
-        {hasResults && pluginResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.plugins')}>
-            {pluginResults.map((result) => (
-              <CommandItem
-                description={getDescription(result)}
-                icon={getIcon(result.type)}
-                key={`plugin-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
+        {pluginResults.length > 0 && (
+          <Command.Group>
+            {pluginResults.map((result) => renderResultItem(result))}
             {renderSearchMore('plugin', pluginResults.length)}
           </Command.Group>
         )}
 
-        {hasResults && assistantResults.length > 0 && (
-          <Command.Group heading={t('cmdk.search.assistants')}>
-            {assistantResults.map((result) => (
-              <CommandItem
-                description={getDescription(result)}
-                icon={getIcon(result.type)}
-                key={`assistant-${result.id}`}
-                onSelect={() => handleNavigate(result)}
-                title={result.title}
-                trailingLabel={getTrailingLabel(result.type)}
-                value={getItemValue(result)}
-                variant="detailed"
-              />
-            ))}
+        {assistantResults.length > 0 && (
+          <Command.Group>
+            {assistantResults.map((result) => renderResultItem(result))}
             {renderSearchMore('communityAgent', assistantResults.length)}
           </Command.Group>
         )}

package/src/features/CommandMenu/components/CommandItem.tsx

@@ -5,7 +5,7 @@ import { cloneElement, isValidElement, memo } from 'react';
 import { useCommandMenuContext } from '../CommandMenuContext';
 import { styles } from '../styles';
 
-type BaseCommandItemProps = Omit<ComponentProps<typeof Command.Item>, 'children'> & {
+type BaseCommandItemProps = Omit<ComponentProps<typeof Command.Item>, 'children' | 'title'> & {
   /**
    * Hide the item from default view but keep it searchable
    * When true, the item won't show in the default list but will appear in search results

package/src/features/CommandMenu/utils/contextCommands.ts

@@ -1,13 +1,19 @@
+import { ENABLE_BUSINESS_FEATURES } from '@lobechat/business-const';
 import type { LucideIcon } from 'lucide-react';
 import {
   Brain,
   ChartColumnBigIcon,
+  Coins,
+  CreditCard,
   EthernetPort,
+  Gift,
   Image as ImageIcon,
   Info,
   KeyIcon,
   KeyboardIcon,
+  Map,
   Palette as PaletteIcon,
+  PieChart,
   UserCircle,
 } from 'lucide-react';
 
@@ -18,7 +24,7 @@ export interface ContextCommand {
   keywords: string[];
   label: string;
   labelKey?: string; // i18n key for the label
-  labelNamespace?: 'setting' | 'auth'; // i18n namespace for the label
+  labelNamespace?: 'setting' | 'auth' | 'subscription'; // i18n namespace for the label
   path: string;
   subPath: string;
 }
@@ -114,6 +120,55 @@ export const CONTEXT_COMMANDS: Record<ContextType, ContextCommand[]> = {
       path: '/settings/about',
       subPath: 'about',
     },
+    ...(ENABLE_BUSINESS_FEATURES
+      ? [
+          {
+            icon: Map,
+            keywords: ['subscription', 'plan', 'upgrade', 'pricing'],
+            label: 'Subscription Plans',
+            labelKey: 'tab.plans',
+            labelNamespace: 'subscription' as const,
+            path: '/settings/plans',
+            subPath: 'plans',
+          },
+          {
+            icon: Coins,
+            keywords: ['funds', 'balance', 'credit', 'money'],
+            label: 'Funds',
+            labelKey: 'tab.funds',
+            labelNamespace: 'subscription' as const,
+            path: '/settings/funds',
+            subPath: 'funds',
+          },
+          {
+            icon: PieChart,
+            keywords: ['usage', 'statistics', 'consumption', 'quota'],
+            label: 'Usage',
+            labelKey: 'tab.usage',
+            labelNamespace: 'subscription' as const,
+            path: '/settings/usage',
+            subPath: 'usage',
+          },
+          {
+            icon: CreditCard,
+            keywords: ['billing', 'payment', 'invoice', 'transaction'],
+            label: 'Billing',
+            labelKey: 'tab.billing',
+            labelNamespace: 'subscription' as const,
+            path: '/settings/billing',
+            subPath: 'billing',
+          },
+          {
+            icon: Gift,
+            keywords: ['referral', 'rewards', 'invite', 'bonus'],
+            label: 'Referral Rewards',
+            labelKey: 'tab.referral',
+            labelNamespace: 'subscription' as const,
+            path: '/settings/referral',
+            subPath: 'referral',
+          },
+        ]
+      : []),
   ],
 };
 

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

@@ -1,3 +1,4 @@
+import { ENABLE_BUSINESS_FEATURES } from '@lobechat/business-const';
 import { AgentRuntimeErrorType, type ILobeAgentRuntimeErrorType } from '@lobechat/model-runtime';
 import { ChatErrorType, type ChatMessageError, type ErrorType } from '@lobechat/types';
 import { type IPluginErrorType } from '@lobehub/chat-plugin-sdk';
@@ -6,6 +7,7 @@ import dynamic from 'next/dynamic';
 import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import useRenderBusinessChatErrorMessageExtra from '@/business/client/hooks/useRenderBusinessChatErrorMessageExtra';
 import ErrorContent from '@/features/Conversation/ChatItem/components/ErrorContent';
 import { useProviderName } from '@/hooks/useProviderName';
 
@@ -103,7 +105,11 @@ interface ErrorExtraProps {
 }
 
 const ErrorMessageExtra = memo<ErrorExtraProps>(({ error: alertError, data }) => {
-  const error = data.error as ChatMessageError;
+  const error = data.error;
+  const businessChatErrorMessageExtra = useRenderBusinessChatErrorMessageExtra(error, data.id);
+  if (ENABLE_BUSINESS_FEATURES && businessChatErrorMessageExtra)
+    return businessChatErrorMessageExtra;
+
   if (!error?.type) return;
 
   switch (error.type) {

package/src/libs/redis/manager.ts

@@ -2,6 +2,33 @@ import { IoRedisRedisProvider } from './redis';
 import { type BaseRedisProvider, type RedisConfig } from './types';
 import { UpstashRedisProvider } from './upstash';
 
+/**
+ * Create a Redis provider instance based on config
+ *
+ * @param config - Redis config
+ * @param prefix - Optional custom prefix to override config.prefix
+ * @returns Provider instance or null if disabled/unsupported
+ */
+const createProvider = (config: RedisConfig, prefix?: string): BaseRedisProvider | null => {
+  if (!config.enabled) return null;
+
+  const actualPrefix = prefix ?? config.prefix;
+
+  if (config.provider === 'redis') {
+    return new IoRedisRedisProvider({ ...config, prefix: actualPrefix });
+  }
+
+  if (config.provider === 'upstash') {
+    return new UpstashRedisProvider({
+      prefix: actualPrefix,
+      token: config.token,
+      url: config.url,
+    });
+  }
+
+  return null;
+};
+
 class RedisManager {
   private static instance: BaseRedisProvider | null = null;
   // NOTICE: initPromise keeps concurrent initialize() calls sharing the same in-flight setup,
@@ -13,25 +40,13 @@ class RedisManager {
     if (RedisManager.initPromise) return RedisManager.initPromise;
 
     RedisManager.initPromise = (async () => {
-      if (!config.enabled) {
+      const provider = createProvider(config);
+
+      if (!provider) {
         RedisManager.instance = null;
         return null;
       }
 
-      let provider: BaseRedisProvider;
-
-      if (config.provider === 'redis') {
-        provider = new IoRedisRedisProvider(config);
-      } else if (config.provider === 'upstash') {
-        provider = new UpstashRedisProvider({
-          prefix: config.prefix,
-          token: config.token,
-          url: config.url,
-        });
-      } else {
-        throw new Error(`Unsupported redis provider: ${String((config as any).provider)}`);
-      }
-
       await provider.initialize();
       RedisManager.instance = provider;
 
@@ -58,3 +73,24 @@ export const initializeRedis = (config: RedisConfig) => RedisManager.initialize(
 export const resetRedisClient = () => RedisManager.reset();
 export const isRedisEnabled = (config: RedisConfig) => config.enabled;
 export { RedisManager };
+
+/**
+ * Create a Redis client with custom prefix
+ *
+ * Unlike initializeRedis, this creates an independent client
+ * that doesn't share the singleton instance.
+ *
+ * @param config - Redis config
+ * @param prefix - Custom prefix for all keys (e.g., 'aiGeneration')
+ * @returns Redis client or null if Redis is disabled
+ */
+export const createRedisWithPrefix = async (
+  config: RedisConfig,
+  prefix: string,
+): Promise<BaseRedisProvider | null> => {
+  const provider = createProvider(config, prefix);
+  if (!provider) return null;
+
+  await provider.initialize();
+  return provider;
+};

package/src/locales/default/common.ts

@@ -133,8 +133,8 @@ export default {
   'cmdk.navigate': 'Navigate',
   'cmdk.newAgent': 'Create New Agent',
   'cmdk.newAgentTeam': 'Create New Group',
-  'cmdk.newLibrary': 'New Library',
-  'cmdk.newPage': 'New Page',
+  'cmdk.newLibrary': 'Create New Library',
+  'cmdk.newPage': 'Create New Page',
   'cmdk.newTopic': 'New topic in current Agent',
   'cmdk.noResults': 'No results found',
   'cmdk.openSettings': 'Open Settings',