@lobehub/lobehub 2.0.0-next.47 → 2.0.0-next.49

package/src/app/[variants]/(main)/discover/(detail)/assistant/[...slugs]/features/Sidebar/ActionButton/AddAgent.tsx

@@ -10,6 +10,7 @@ import { useTranslation } from 'react-i18next';
 
 import { SESSION_CHAT_URL } from '@/const/url';
 import { useSessionStore } from '@/store/session';
+import type { LobeAgentConfig } from '@/types/agent';
 
 import { useDetailContext } from '../../DetailProvider';
 
@@ -21,12 +22,54 @@ const useStyles = createStyles(({ css }) => ({
   `,
 }));
 
+type MarketAgentModel =
+  | LobeAgentConfig['model']
+  | {
+      model: LobeAgentConfig['model'];
+      parameters?: Partial<LobeAgentConfig['params']>;
+      provider?: LobeAgentConfig['provider'];
+    };
+
+type MarketAgentConfig = Partial<Omit<LobeAgentConfig, 'model' | 'params'>> & {
+  model?: MarketAgentModel;
+  params?: Partial<LobeAgentConfig['params']>;
+};
+
+const normalizeMarketAgentConfig = (
+  config?: MarketAgentConfig,
+): Partial<LobeAgentConfig> | undefined => {
+  if (!config) return undefined;
+
+  const { model, params, ...rest } = config;
+  const normalized: Partial<LobeAgentConfig> = { ...rest };
+
+  const modelInfo = model;
+
+  const mergedParams: Partial<LobeAgentConfig['params']> = {};
+  if (typeof modelInfo === 'object' && modelInfo) {
+    Object.assign(mergedParams, modelInfo.parameters ?? {});
+    normalized.provider = normalized.provider ?? modelInfo.provider;
+    normalized.model = modelInfo.model;
+  } else {
+    normalized.model = modelInfo;
+  }
+  Object.assign(mergedParams, params ?? {});
+
+  normalized.params = Object.keys(mergedParams).length > 0 ? mergedParams : undefined;
+
+  normalized.plugins = normalized.plugins ?? [];
+
+  return normalized;
+};
+
 const AddAgent = memo<{ mobile?: boolean }>(({ mobile }) => {
-  const { avatar, description, tags, title, config, backgroundColor } = useDetailContext();
+  const { avatar, description, tags, title, config, backgroundColor, identifier } =
+    useDetailContext();
   const { styles } = useStyles();
   const [isLoading, setIsLoading] = useState(false);
   const createSession = useSessionStore((s) => s.createSession);
-  const { message } = App.useApp();
+  const sessions = useSessionStore((s) => s.sessions);
+  const { message, modal } = App.useApp();
   const router = useRouter();
   const { t } = useTranslation('discover');
 
@@ -34,29 +77,77 @@ const AddAgent = memo<{ mobile?: boolean }>(({ mobile }) => {
     avatar,
     backgroundColor,
     description,
+    marketIdentifier: identifier,
     tags,
     title,
   };
 
-  const handleAddAgentAndConverse = async () => {
+  const checkDuplicateAgent = () => {
+    if (!identifier) return false;
+    return sessions.some((session) => session.meta?.marketIdentifier === identifier);
+  };
+
+  const showDuplicateConfirmation = (callback: () => void) => {
+    modal.confirm({
+      cancelText: '取消',
+      content: `当前已经添加过「${title}」Agent，是否需要重复添加？`,
+      okText: '确认添加',
+      onOk: callback,
+      title: '重复添加确认',
+    });
+  };
+
+  const createSessionWithMarketIdentifier = async (isSwitchSession = true) => {
     if (!config) return;
 
-    setIsLoading(true);
-    const session = await createSession({
-      config,
+    const sessionData = {
+      config: normalizeMarketAgentConfig(config),
       meta,
-    });
-    setIsLoading(false);
-    message.success(t('assistants.addAgentSuccess'));
-    router.push(SESSION_CHAT_URL(session, mobile));
+    };
+
+    const session = await createSession(sessionData, isSwitchSession);
+    return session;
+  };
+
+  const handleCreateAndConverse = async () => {
+    setIsLoading(true);
+    try {
+      const session = await createSessionWithMarketIdentifier(true);
+      message.success(t('assistants.addAgentSuccess'));
+      router.push(SESSION_CHAT_URL(session, mobile));
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleCreate = async () => {
+    setIsLoading(true);
+    try {
+      await createSessionWithMarketIdentifier(false);
+      message.success(t('assistants.addAgentSuccess'));
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleAddAgentAndConverse = async () => {
+    if (!config) return;
+
+    if (checkDuplicateAgent()) {
+      showDuplicateConfirmation(handleCreateAndConverse);
+    } else {
+      await handleCreateAndConverse();
+    }
   };
 
   const handleAddAgent = async () => {
     if (!config) return;
-    setIsLoading(true);
-    createSession({ config, meta }, false);
-    message.success(t('assistants.addAgentSuccess'));
-    setIsLoading(false);
+
+    if (checkDuplicateAgent()) {
+      showDuplicateConfirmation(handleCreate);
+    } else {
+      await handleCreate();
+    }
   };
 
   return (

package/src/app/[variants]/(main)/discover/(detail)/assistant/[...slugs]/features/Sidebar/Related/index.tsx

@@ -6,29 +6,43 @@ import { Link } from 'react-router-dom';
 import urlJoin from 'url-join';
 
 import Title from '../../../../../../features/Title';
+import { useQuery } from '@/hooks/useQuery';
+import { AssistantMarketSource } from '@/types/discover';
 import { useDetailContext } from '../../DetailProvider';
 import Item from './Item';
 
 const Related = memo(() => {
   const { t } = useTranslation('discover');
   const { related, category } = useDetailContext();
+  const { source } = useQuery() as { source?: AssistantMarketSource };
+  const marketSource = source === 'legacy' ? 'legacy' : undefined;
 
   return (
     <Flexbox gap={16}>
       <Title
         more={t('assistants.details.related.more')}
-        moreLink={qs.stringifyUrl({
-          query: {
-            category,
+        moreLink={qs.stringifyUrl(
+          {
+            query: {
+              category,
+              source: marketSource,
+            },
+            url: '/discover/assistant',
           },
-          url: '/discover/assistant',
-        })}
+          { skipNull: true },
+        )}
       >
         {t('assistants.details.related.listTitle')}
       </Title>
       <Flexbox gap={8}>
         {related?.map((item, index) => {
-          const link = urlJoin('/assistant', item.identifier);
+          const link = qs.stringifyUrl(
+            {
+              query: marketSource ? { source: marketSource } : undefined,
+              url: urlJoin('/discover/assistant', item.identifier),
+            },
+            { skipNull: true },
+          );
           return (
             <Link key={index} style={{ color: 'inherit', overflow: 'hidden' }} to={link}>
               <Item {...item} />

package/src/app/[variants]/(main)/discover/(detail)/assistant/[...slugs]/features/StatusPage/index.tsx

@@ -0,0 +1,113 @@
+'use client';
+
+import {
+  ClockCircleOutlined,
+  ExclamationCircleOutlined,
+  FolderOpenOutlined,
+} from '@ant-design/icons';
+import { Button, Result } from 'antd';
+import { useRouter } from 'next/navigation';
+import { memo } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
+
+interface StatusPageProps {
+  status: 'unpublished' | 'archived' | 'deprecated';
+}
+
+const StatusPage = memo<StatusPageProps>(({ status }) => {
+  const router = useRouter();
+  const { t } = useTranslation('discover');
+
+  const handleBackToMarket = () => {
+    router.push('/discover/assistant');
+  };
+
+  // 审核中状态
+  if (status === 'unpublished') {
+    return (
+      <div
+        style={{
+          alignItems: 'center',
+          display: 'flex',
+          flex: 1,
+          justifyContent: 'center',
+          minHeight: '60vh',
+          padding: '20px',
+        }}
+      >
+        <Result
+          extra={
+            <Button onClick={handleBackToMarket} type="primary">
+              {t('assistants.status.backToMarket')}
+            </Button>
+          }
+          icon={<ClockCircleOutlined style={{ color: '#faad14' }} />}
+          subTitle={
+            <div style={{ color: '#666', lineHeight: 1.6 }}>
+              <Trans i18nKey="assistants.status.unpublished.subtitle" ns="discover">
+                当前访问的助手正在进行版本审核中，如果有疑问复制链接发送问题到{' '}
+                <a href="mailto:support@lobehub.com" style={{ color: '#1890ff' }}>
+                  support@lobehub.com
+                </a>{' '}
+                进行咨询。
+              </Trans>
+            </div>
+          }
+          title={t('assistants.status.unpublished.title')}
+        />
+      </div>
+    );
+  }
+
+  // 归档/拒绝状态
+  const isArchived = status === 'archived';
+  const statusKey = isArchived ? 'archived' : 'deprecated';
+  const statusIcon = isArchived ? (
+    <FolderOpenOutlined style={{ color: '#8c8c8c' }} />
+  ) : (
+    <ExclamationCircleOutlined style={{ color: '#ff4d4f' }} />
+  );
+
+  return (
+    <div
+      style={{
+        alignItems: 'center',
+        display: 'flex',
+        flex: 1,
+        justifyContent: 'center',
+        minHeight: '60vh',
+        padding: '20px',
+      }}
+    >
+      <Result
+        extra={
+          <Button onClick={handleBackToMarket} type="primary">
+            {t('assistants.status.backToMarket')}
+          </Button>
+        }
+        icon={statusIcon}
+        subTitle={
+          <div style={{ color: '#666', lineHeight: 1.6 }}>
+            <p>{t(`assistants.status.${statusKey}.subtitle`)}</p>
+            <ul style={{ margin: '16px 0', paddingLeft: '20px', textAlign: 'left' }}>
+              <li>{t(`assistants.status.${statusKey}.reasons.owner`)}</li>
+              <li>{t(`assistants.status.${statusKey}.reasons.official`)}</li>
+            </ul>
+            <p>
+              <Trans i18nKey="assistants.status.support" ns="discover">
+                有各种问题请复制链接发送到{' '}
+                <a href="mailto:support@lobehub.com" style={{ color: '#1890ff' }}>
+                  support@lobehub.com
+                </a>{' '}
+                进行咨询。
+              </Trans>
+            </p>
+          </div>
+        }
+        title={t(`assistants.status.${statusKey}.title`)}
+      />
+    </div>
+  );
+});
+
+export default StatusPage;

package/src/app/[variants]/(main)/discover/(detail)/features/Breadcrumb.tsx

@@ -3,10 +3,11 @@
 import { CopyButton } from '@lobehub/ui';
 import { Breadcrumb as AntdBreadcrumb } from 'antd';
 import { useTheme } from 'antd-style';
+import Link from 'next/link';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
-import { Link } from 'react-router-dom';
+import urlJoin from 'url-join';
 
 import { DiscoverTab } from '@/types/discover';
 
@@ -17,11 +18,11 @@ const Breadcrumb = memo<{ identifier: string; tab: DiscoverTab }>(({ tab, identi
     <AntdBreadcrumb
       items={[
         {
-          title: <Link to={'/'}>Discover</Link>,
+          title: <Link href={'/discover'}>Discover</Link>,
         },
         {
           title: (
-            <Link to={`/${tab}`}>
+            <Link href={urlJoin('/discover', tab)}>
               {tab === DiscoverTab.Mcp ? 'MCP Servers' : t(`tab.${tab}` as any)}
             </Link>
           ),

package/src/app/[variants]/(main)/discover/(list)/_layout/Desktop/Nav.tsx

@@ -14,6 +14,7 @@ import { DiscoverTab } from '@/types/discover';
 import { MAX_WIDTH, SCROLL_PARENT_ID } from '../../../features/const';
 import { useNav } from '../../../features/useNav';
 import SortButton from '../../features/SortButton';
+import MarketSourceSwitch from '../../assistant/features/MarketSourceSwitch';
 import { useScroll } from './useScroll';
 
 export const useStyles = createStyles(({ cx, stylish, css, token }) => ({
@@ -88,7 +89,8 @@ const Nav = memo(() => {
           />
         </Flexbox>
         {!isHome && (
-          <Flexbox align={'center'} gap={4} horizontal>
+          <Flexbox align={'center'} gap={8} horizontal>
+            {activeKey === DiscoverTab.Assistants && <MarketSourceSwitch />}
             <SortButton />
           </Flexbox>
         )}

package/src/app/[variants]/(main)/discover/(list)/assistant/AssistantPage.tsx

@@ -13,7 +13,7 @@ import List from './features/List';
 import Loading from './loading';
 
 const AssistantPage = memo<{ mobile?: boolean }>(() => {
-  const { q, page, category, sort, order } = useQuery() as AssistantQueryParams;
+  const { q, page, category, sort, order, source } = useQuery() as AssistantQueryParams;
   const useAssistantList = useDiscoverStore((s) => s.useAssistantList);
   const { data, isLoading } = useAssistantList({
     category,
@@ -22,8 +22,11 @@ const AssistantPage = memo<{ mobile?: boolean }>(() => {
     pageSize: 21,
     q,
     sort,
+    source,
   });
 
+  console.log("data",data)
+
   if (isLoading || !data) return <Loading />;
 
   const { items, currentPage, pageSize, totalCount } = data;

package/src/app/[variants]/(main)/discover/(list)/assistant/Client.tsx

@@ -6,22 +6,26 @@ import { Flexbox } from 'react-layout-kit';
 import { withSuspense } from '@/components/withSuspense';
 import { useQuery } from '@/hooks/useQuery';
 import { useDiscoverStore } from '@/store/discover';
-import { AssistantQueryParams, DiscoverTab } from '@/types/discover';
+import { AssistantMarketSource, AssistantQueryParams, DiscoverTab } from '@/types/discover';
 
 import Pagination from '../features/Pagination';
 import List from './features/List';
 import Loading from './loading';
 
 const Client = memo<{ mobile?: boolean }>(() => {
-  const { q, page, category, sort, order } = useQuery() as AssistantQueryParams;
+  const { q, page, category, sort, order, ownerId, source } =
+    useQuery() as AssistantQueryParams;
+  const marketSource = (source as AssistantMarketSource | undefined) ?? 'new';
   const useAssistantList = useDiscoverStore((s) => s.useAssistantList);
   const { data, isLoading } = useAssistantList({
     category,
     order,
+    ownerId,
     page,
     pageSize: 21,
     q,
     sort,
+    source: marketSource,
   });
 
   if (isLoading || !data) return <Loading />;

package/src/app/[variants]/(main)/discover/(list)/assistant/features/Category/index.tsx

@@ -16,15 +16,19 @@ import { useCategory } from './useCategory';
 
 const Category = memo(() => {
   const useAssistantCategories = useDiscoverStore((s) => s.useAssistantCategories);
-  const { category = 'all', q } = useQuery() as { category?: AssistantCategory; q?: string };
-  const { data: items = [] } = useAssistantCategories({ q });
+  const {
+    category = 'all',
+    q,
+    source,
+  } = useQuery() as { category?: AssistantCategory; q?: string; source?: string };
+  const { data: items = [] } = useAssistantCategories({ q, source: source as any });
   const navigate = useNavigate();
   const cates = useCategory();
 
   const genUrl = (key: AssistantCategory) =>
     qs.stringifyUrl(
       {
-        query: { category: key === AssistantCategory.All ? null : key, q },
+        query: { category: key === AssistantCategory.All ? null : key, q, source },
         url: '/assistant',
       },
       { skipNull: true },

package/src/app/[variants]/(main)/discover/(list)/assistant/features/List/Item.tsx

@@ -2,6 +2,7 @@ import { Github } from '@lobehub/icons';
 import { ActionIcon, Avatar, Block, Icon, Text } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
 import { ClockIcon } from 'lucide-react';
+import qs from 'query-string';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
@@ -9,7 +10,8 @@ import { Link, useNavigate } from 'react-router-dom';
 import urlJoin from 'url-join';
 
 import PublishedTime from '@/components/PublishedTime';
-import { DiscoverAssistantItem } from '@/types/discover';
+import { useQuery } from '@/hooks/useQuery';
+import { AssistantMarketSource, DiscoverAssistantItem } from '@/types/discover';
 
 import TokenTag from './TokenTag';
 
@@ -61,9 +63,18 @@ const AssistantItem = memo<DiscoverAssistantItem>(
     knowledgeCount,
     backgroundColor,
   }) => {
+
+    console.log("author",author)
     const { styles, theme } = useStyles();
     const navigate = useNavigate();
-    const link = urlJoin('/assistant', identifier);
+    const { source } = useQuery() as { source?: AssistantMarketSource };
+    const link = qs.stringifyUrl(
+      {
+        query: { source },
+        url: urlJoin('/assistant', identifier),
+      },
+      { skipNull: true },
+    );
     const { t } = useTranslation('discover');
 
     return (

package/src/app/[variants]/(main)/discover/(list)/assistant/features/MarketSourceSwitch.tsx

@@ -0,0 +1,64 @@
+'use client';
+
+import { Dropdown, DropdownMenuItemType, Icon } from '@lobehub/ui';
+import { Button } from 'antd';
+import { ChevronDown, Store } from 'lucide-react';
+import { memo, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useQuery } from '@/hooks/useQuery';
+import { useQueryRoute } from '@/hooks/useQueryRoute';
+import { AssistantMarketSource } from '@/types/discover';
+
+const MarketSourceSwitch = memo(() => {
+  const { t } = useTranslation('discover');
+  const router = useQueryRoute();
+  const query = useQuery() as { source?: AssistantMarketSource };
+  const currentSource = (query.source as AssistantMarketSource) ?? 'new';
+
+  const items = useMemo(
+    () =>
+      [
+        {
+          key: 'new',
+          label: t('assistants.marketSource.new'),
+        },
+        {
+          key: 'legacy',
+          label: t('assistants.marketSource.legacy'),
+        },
+      ] satisfies DropdownMenuItemType[],
+    [t],
+  );
+
+  const handleChange = (value: AssistantMarketSource) => {
+    router.push('/discover/assistant', {
+      query: {
+        page: null,
+        source: value === 'new' ? null : value,
+      },
+    });
+  };
+
+  return (
+    <Dropdown
+      menu={{
+        // @ts-expect-error 等待 antd 修复
+        activeKey: currentSource,
+        items,
+        onClick: ({ key }) => handleChange(key as AssistantMarketSource),
+      }}
+      trigger={['click', 'hover']}
+    >
+      <Button icon={<Icon icon={Store} />} type={'text'}>
+        {t('assistants.marketSource.label')}:{' '}
+        {items.find((item) => item.key === currentSource)?.label}
+        <Icon icon={ChevronDown} />
+      </Button>
+    </Dropdown>
+  );
+});
+
+MarketSourceSwitch.displayName = 'MarketSourceSwitch';
+
+export default MarketSourceSwitch;

package/src/app/[variants]/(main)/discover/(list)/features/SortButton/index.tsx

@@ -7,6 +7,7 @@ import { useTranslation } from 'react-i18next';
 
 import { useQuery } from '@/hooks/useQuery';
 import { useQueryRoute } from '@/hooks/useQueryRoute';
+import { useMarketAuth } from '@/layout/AuthProvider/MarketAuth';
 import {
   AssistantSorts,
   DiscoverTab,
@@ -21,11 +22,12 @@ const SortButton = memo(() => {
   const pathname = usePathname();
   const { sort } = useQuery();
   const router = useQueryRoute();
+  const { isAuthenticated, getCurrentUserInfo } = useMarketAuth();
   const activeTab = useMemo(() => pathname.split('discover/')[1] as DiscoverTab, [pathname]);
   const items = useMemo(() => {
     switch (activeTab) {
       case DiscoverTab.Assistants: {
-        return [
+        const baseItems = [
           {
             key: AssistantSorts.CreatedAt,
             label: t('assistants.sorts.createdAt'),
@@ -51,6 +53,16 @@ const SortButton = memo(() => {
             label: t('assistants.sorts.knowledgeCount'),
           },
         ];
+
+        // Only add "My Own" option if user is authenticated
+        if (isAuthenticated) {
+          baseItems.push({
+            key: AssistantSorts.MyOwn,
+            label: t('assistants.sorts.myown'),
+          });
+        }
+
+        return baseItems;
       }
       case DiscoverTab.Plugins: {
         return [
@@ -144,7 +156,7 @@ const SortButton = memo(() => {
         return [];
       }
     }
-  }, [t, activeTab]);
+  }, [t, activeTab, isAuthenticated]);
 
   const activeItem: any = useMemo(() => {
     if (sort) {
@@ -155,11 +167,18 @@ const SortButton = memo(() => {
   }, [items, sort]);
 
   const handleSort = (config: string) => {
-    router.push(pathname, {
-      query: {
-        sort: config,
-      },
-    });
+    const query: any = { sort: config };
+
+    // If "My Own" is selected, add ownerId to query
+    if (config === AssistantSorts.MyOwn) {
+      const userInfo = getCurrentUserInfo();
+      console.log('userInfo', userInfo);
+      if (userInfo?.accountId) {
+        query.ownerId = userInfo.accountId;
+      }
+    }
+
+    router.push(pathname, { query });
   };
 
   if (items?.length === 0) return null;

package/src/app/[variants]/(main)/profile/_layout/Desktop/index.tsx

@@ -34,16 +34,16 @@ const Layout = memo<LayoutProps>(({ children, category }) => {
           {category}
         </Header>
       )}
-      <SettingContainer
-        addonAfter={<Footer />}
-        style={{
-          paddingBlock: 24,
-          paddingInline: 32,
-        }}
-      >
-        {children}
-      </SettingContainer>
-    </Flexbox>
+        <SettingContainer
+          addonAfter={<Footer />}
+          style={{
+            paddingBlock: 24,
+            paddingInline: 32,
+          }}
+        >
+          {children}
+        </SettingContainer>
+      </Flexbox>
   );
 });
 

package/src/app/[variants]/(main)/settings/_layout/type.ts

@@ -2,5 +2,5 @@ import { ReactNode } from 'react';
 
 export interface LayoutProps {
   children?: ReactNode;
-  showLLM?: boolean
+  showLLM?: boolean;
 }