@lobehub/lobehub 2.0.0-next.224 → 2.0.0-next.226

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/layout/AuthProvider/MarketAuth/MarketAuthProvider.tsx

@@ -5,7 +5,8 @@ import { type ReactNode, createContext, useCallback, useContext, useEffect, useS
 import { useTranslation } from 'react-i18next';
 import { mutate as globalMutate } from 'swr';
 
-import { MARKET_ENDPOINTS, MARKET_OIDC_ENDPOINTS } from '@/services/_url';
+import { lambdaClient } from '@/libs/trpc/client';
+import { MARKET_OIDC_ENDPOINTS } from '@/services/_url';
 import { useServerConfigStore } from '@/store/serverConfig';
 import { serverConfigSelectors } from '@/store/serverConfig/selectors';
 import { useUserStore } from '@/store/user';
@@ -32,31 +33,16 @@ interface MarketAuthProviderProps {
 }
 
 /**
- * 获取用户信息（从 OIDC userinfo endpoint）
+ * 获取用户信息（通过 tRPC OIDC endpoint）
  * @param accessToken - 可选的 access token，如果不传则后端会尝试使用 trustedClientToken
  */
 const fetchUserInfo = async (accessToken?: string): Promise<MarketUserInfo | null> => {
   try {
-    const response = await fetch(MARKET_OIDC_ENDPOINTS.userinfo, {
-      body: JSON.stringify({ token: accessToken }),
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      method: 'POST',
+    const userInfo = await lambdaClient.market.oidc.getUserInfo.mutate({
+      token: accessToken,
     });
 
-    if (!response.ok) {
-      console.error(
-        '[MarketAuth] Failed to fetch user info:',
-        response.status,
-        response.statusText,
-      );
-      return null;
-    }
-
-    const userInfo = (await response.json()) as MarketUserInfo;
-
-    return userInfo;
+    return userInfo as MarketUserInfo;
   } catch (error) {
     console.error('[MarketAuth] Error fetching user info:', error);
     return null;
@@ -136,16 +122,11 @@ const refreshToken = async (): Promise<boolean> => {
  */
 const checkNeedsProfileSetup = async (username: string): Promise<boolean> => {
   try {
-    const response = await fetch(MARKET_ENDPOINTS.getUserProfile(username));
-    if (!response.ok) {
-      // User profile not found, needs setup
-      return true;
-    }
-    const profile = (await response.json()) as MarketUserProfile;
+    const profile = await lambdaClient.market.user.getUserByUsername.query({ username });
     // If userName is not set, user needs to complete profile setup
     return !profile.userName;
   } catch {
-    // Error fetching profile, assume needs setup
+    // Error fetching profile (e.g., NOT_FOUND), assume needs setup
     return true;
   }
 };
@@ -177,7 +158,9 @@ export const MarketAuthProvider = ({ children, isDesktop }: MarketAuthProviderPr
   const isUserStateInit = useUserStore((s) => s.isUserStateInit);
 
   // 检查是否启用了 Market Trusted Client 认证
-  const enableMarketTrustedClient = useServerConfigStore(serverConfigSelectors.enableMarketTrustedClient);
+  const enableMarketTrustedClient = useServerConfigStore(
+    serverConfigSelectors.enableMarketTrustedClient,
+  );
 
   // 初始化 OIDC 客户端（仅在客户端）
   useEffect(() => {