@lobehub/lobehub 2.0.0-next.130 → 2.0.0-next.132

package/packages/database/migrations/meta/_journal.json

@@ -357,6 +357,13 @@
       "when": 1764303057060,
       "tag": "0050_thread_and_user_id",
       "breakpoints": true
+    },
+    {
+      "idx": 51,
+      "version": "7",
+      "when": 1764335703306,
+      "tag": "0051_add_market_into_user_settings",
+      "breakpoints": true
     }
   ],
   "version": "6"

package/packages/database/src/core/migrations.json

@@ -223,10 +223,7 @@
     "hash": "9646161fa041354714f823d726af27247bcd6e60fa3be5698c0d69f337a5700b"
   },
   {
-    "sql": [
-      "DROP TABLE \"user_budgets\";",
-      "\nDROP TABLE \"user_subscriptions\";"
-    ],
+    "sql": ["DROP TABLE \"user_budgets\";", "\nDROP TABLE \"user_subscriptions\";"],
     "bps": true,
     "folderMillis": 1729699958471,
     "hash": "7dad43a2a25d1aec82124a4e53f8d82f8505c3073f23606c1dc5d2a4598eacf9"
@@ -298,9 +295,7 @@
     "hash": "845a692ceabbfc3caf252a97d3e19a213bc0c433df2689900135f9cfded2cf49"
   },
   {
-    "sql": [
-      "ALTER TABLE \"messages\" ADD COLUMN \"reasoning\" jsonb;"
-    ],
+    "sql": ["ALTER TABLE \"messages\" ADD COLUMN \"reasoning\" jsonb;"],
     "bps": true,
     "folderMillis": 1737609172353,
     "hash": "2cb36ae4fcdd7b7064767e04bfbb36ae34518ff4bb1b39006f2dd394d1893868"
@@ -515,9 +510,7 @@
     "hash": "a7ccf007fd185ff922823148d1eae6fafe652fc98d2fd2793f84a84f29e93cd1"
   },
   {
-    "sql": [
-      "ALTER TABLE \"ai_providers\" ADD COLUMN \"config\" jsonb;"
-    ],
+    "sql": ["ALTER TABLE \"ai_providers\" ADD COLUMN \"config\" jsonb;"],
     "bps": true,
     "folderMillis": 1749309388370,
     "hash": "39cea379f08ee4cb944875c0b67f7791387b508c2d47958bb4cd501ed1ef33eb"
@@ -635,9 +628,7 @@
     "hash": "1ba9b1f74ea13348da98d6fcdad7867ab4316ed565bf75d84d160c526cdac14b"
   },
   {
-    "sql": [
-      "ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"virtual\" boolean DEFAULT false;"
-    ],
+    "sql": ["ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"virtual\" boolean DEFAULT false;"],
     "bps": true,
     "folderMillis": 1759116400580,
     "hash": "433ddae88e785f2db734e49a4c115eee93e60afe389f7919d66e5ba9aa159a37"
@@ -687,17 +678,13 @@
     "hash": "4bdc6505797d7a33b622498c138cfd47f637239f6905e1c484cd01d9d5f21d6b"
   },
   {
-    "sql": [
-      "ALTER TABLE \"user_settings\" ADD COLUMN IF NOT EXISTS \"image\" jsonb;"
-    ],
+    "sql": ["ALTER TABLE \"user_settings\" ADD COLUMN IF NOT EXISTS \"image\" jsonb;"],
     "bps": true,
     "folderMillis": 1760108430562,
     "hash": "ce09b301abb80f6563abc2f526bdd20b4f69bae430f09ba2179b9e3bfec43067"
   },
   {
-    "sql": [
-      "ALTER TABLE \"documents\" ADD COLUMN IF NOT EXISTS \"editor_data\" jsonb;"
-    ],
+    "sql": ["ALTER TABLE \"documents\" ADD COLUMN IF NOT EXISTS \"editor_data\" jsonb;"],
     "bps": true,
     "folderMillis": 1761554153406,
     "hash": "bf2f21293e90e11cf60a784cf3ec219eafa95f7545d7d2f9d1449c0b0949599a"
@@ -777,17 +764,13 @@
     "hash": "923ccbdf46c32be9a981dabd348e6923b4a365444241e9b8cc174bf5b914cbc5"
   },
   {
-    "sql": [
-      "ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"market_identifier\" text;\n"
-    ],
+    "sql": ["ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"market_identifier\" text;\n"],
     "bps": true,
     "folderMillis": 1762870034882,
     "hash": "4178aacb4b8892b7fd15d29209bbf9b1d1f9d7c406ba796f27542c0bcd919680"
   },
   {
-    "sql": [
-      "ALTER TABLE \"message_plugins\" ADD COLUMN IF NOT EXISTS \"intervention\" jsonb;\n"
-    ],
+    "sql": ["ALTER TABLE \"message_plugins\" ADD COLUMN IF NOT EXISTS \"intervention\" jsonb;\n"],
     "bps": true,
     "folderMillis": 1762911968658,
     "hash": "552a032cc0e595277232e70b5f9338658585bafe9481ae8346a5f322b673a68b"
@@ -816,9 +799,7 @@
     "hash": "f823b521f4d25e5dc5ab238b372727d2d2d7f0aed27b5eabc8a9608ce4e50568"
   },
   {
-    "sql": [
-      "ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"editor_data\" jsonb;"
-    ],
+    "sql": ["ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"editor_data\" jsonb;"],
     "bps": true,
     "folderMillis": 1764215503726,
     "hash": "4188893a9083b3c7baebdbad0dd3f9d9400ede7584ca2394f5c64305dc9ec7b0"
@@ -848,14 +829,20 @@
       "\nALTER TABLE \"threads\" ALTER COLUMN \"status\" DROP DEFAULT;",
       "\nALTER TABLE \"threads\" ALTER COLUMN \"source_message_id\" DROP NOT NULL;",
       "\nALTER TABLE \"nextauth_authenticators\" ADD CONSTRAINT \"nextauth_authenticators_user_id_credentialID_pk\" PRIMARY KEY(\"user_id\",\"credentialID\");",
-      "\nALTER TABLE \"threads\" ADD COLUMN \"content\" text;",
-      "\nALTER TABLE \"threads\" ADD COLUMN \"editor_data\" jsonb;",
+      "\nALTER TABLE \"threads\" ADD COLUMN IF NOT EXISTS \"content\" text;",
+      "\nALTER TABLE \"threads\" ADD COLUMN IF NOT EXISTS \"editor_data\" jsonb;",
       "\nALTER TABLE \"nextauth_accounts\" ADD CONSTRAINT \"nextauth_accounts_user_id_users_id_fk\" FOREIGN KEY (\"user_id\") REFERENCES \"public\".\"users\"(\"id\") ON DELETE cascade ON UPDATE no action;",
       "\nALTER TABLE \"nextauth_authenticators\" ADD CONSTRAINT \"nextauth_authenticators_user_id_users_id_fk\" FOREIGN KEY (\"user_id\") REFERENCES \"public\".\"users\"(\"id\") ON DELETE cascade ON UPDATE no action;",
-      "\nALTER TABLE \"nextauth_sessions\" ADD CONSTRAINT \"nextauth_sessions_user_id_users_id_fk\" FOREIGN KEY (\"user_id\") REFERENCES \"public\".\"users\"(\"id\") ON DELETE cascade ON UPDATE no action;"
+      "\nALTER TABLE \"nextauth_sessions\" ADD CONSTRAINT \"nextauth_sessions_user_id_users_id_fk\" FOREIGN KEY (\"user_id\") REFERENCES \"public\".\"users\"(\"id\") ON DELETE cascade ON UPDATE no action;\n"
     ],
     "bps": true,
     "folderMillis": 1764303057060,
-    "hash": "edcebee8f59971210c1f8b567d3bd0ffa37da286afeead5bdaaa19eeaa4b89cb"
+    "hash": "2c103eee82bdf329944fb622dd9c2b9f20df80eb54f23eb9254d2285de413099"
+  },
+  {
+    "sql": ["ALTER TABLE \"user_settings\" ADD COLUMN IF NOT EXISTS \"market\" jsonb;"],
+    "bps": true,
+    "folderMillis": 1764335703306,
+    "hash": "28c0d738c0b1fdf5fd871363be1a1477b4accbabdc140fe8dc6e9b339aae2c89"
   }
-]
+]

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

@@ -46,6 +46,7 @@ export const userSettings = pgTable('user_settings', {
   languageModel: jsonb('language_model'),
   systemAgent: jsonb('system_agent'),
   defaultAgent: jsonb('default_agent'),
+  market: jsonb('market'),
   tool: jsonb('tool'),
   image: jsonb('image'),
 });

package/packages/model-bank/src/standard-parameters/index.ts

@@ -5,18 +5,18 @@ import { z } from 'zod';
 export const MAX_SEED = 2 ** 31 - 1;
 
 /**
- * 默认宽高比，当模型不支持原生宽高比时使用
+ * Default aspect ratio, used when the model doesn't support native aspect ratio
  */
 export const DEFAULT_ASPECT_RATIO = '1:1';
 
 export const PRESET_ASPECT_RATIOS = [
-  DEFAULT_ASPECT_RATIO, // '1:1' - 正方形，最常用
-  '16:9', // 现代显示器/电视/视频标准
-  '9:16', // 手机竖屏/短视频
-  '4:3', // 传统显示器/照片
-  '3:4', // 传统竖屏照片
-  '3:2', // 经典照片比例横屏
-  '2:3', // 经典照片比例竖屏
+  DEFAULT_ASPECT_RATIO, // '1:1' - Square, most commonly used
+  '16:9', // Modern monitors/TVs/video standard
+  '9:16', // Mobile portrait/short videos
+  '4:3', // Traditional monitors/photos
+  '3:4', // Traditional portrait photos
+  '3:2', // Classic photo ratio landscape
+  '2:3', // Classic photo ratio portrait
 ];
 
 /**
@@ -52,10 +52,10 @@ export const CHAT_MODEL_IMAGE_GENERATION_PARAMS: ModelParamsSchema = {
   prompt: { default: '' },
 };
 
-// 定义顶层的元规范 - 平铺结构
+// Define top-level meta specification - flat structure
 export const ModelParamsMetaSchema = z.object({
   /**
-   * Prompt 是唯一一个每个模型都有的参数
+   * Prompt is the only parameter that every model has
    */
   prompt: z.object({
     default: z.string().optional().default(''),
@@ -213,7 +213,7 @@ export const ModelParamsMetaSchema = z.object({
     })
     .optional(),
 });
-// 导出推断出的类型，供定义对象使用
+// Export inferred type for use in defining objects
 export type ModelParamsSchema = z.input<typeof ModelParamsMetaSchema>;
 export type ModelParamsOutputSchema = z.output<typeof ModelParamsMetaSchema>;
 export type ModelParamsKeys = Simplify<keyof ModelParamsOutputSchema>;
@@ -244,16 +244,16 @@ export type RuntimeImageGenParams = Pick<_StandardImageGenerationParameters, 'pr
 export type RuntimeImageGenParamsKeys = keyof RuntimeImageGenParams;
 export type RuntimeImageGenParamsValue = RuntimeImageGenParams[RuntimeImageGenParamsKeys];
 
-// 验证函数
+// Validation function
 export function validateModelParamsSchema(paramsSchema: unknown): ModelParamsOutputSchema {
   return ModelParamsMetaSchema.parse(paramsSchema);
 }
 
 /**
- * 从参数定义对象提取默认值
+ * Extract default values from parameter definition object
  */
 export function extractDefaultValues(paramsSchema: ModelParamsSchema) {
-  // 部分默认值从 ModelParamsMetaSchema 中获取
+  // Some default values are obtained from ModelParamsMetaSchema
   const schemaWithDefault = ModelParamsMetaSchema.parse(paramsSchema);
   return Object.fromEntries(
     Object.entries(schemaWithDefault).map(([key, value]) => {

package/packages/types/src/user/settings/index.ts

@@ -5,6 +5,7 @@ import { UserGeneralConfig } from './general';
 import { UserHotkeyConfig } from './hotkey';
 import { UserImageConfig } from './image';
 import { UserKeyVaults } from './keyVaults';
+import { MarketAuthTokens } from './market';
 import { UserModelProviderConfig } from './modelProvider';
 import { UserSystemAgentConfig } from './systemAgent';
 import { UserToolConfig } from './tool';
@@ -17,6 +18,7 @@ export * from './general';
 export * from './hotkey';
 export * from './image';
 export * from './keyVaults';
+export * from './market';
 export * from './modelProvider';
 export * from './sync';
 export * from './systemAgent';
@@ -33,6 +35,7 @@ export interface UserSettings {
   image: UserImageConfig;
   keyVaults: UserKeyVaults;
   languageModel: UserModelProviderConfig;
+  market?: MarketAuthTokens;
   systemAgent: UserSystemAgentConfig;
   tool: UserToolConfig;
   tts: UserTTSConfig;
@@ -50,6 +53,7 @@ export const UserSettingsSchema = z
     image: z.any().optional(),
     keyVaults: z.any().optional(),
     languageModel: z.any().optional(),
+    market: z.any().optional(),
     systemAgent: z.any().optional(),
     tool: z.any().optional(),
     tts: z.any().optional(),

package/packages/types/src/user/settings/market.ts

@@ -0,0 +1,17 @@
+/**
+ * Market authentication tokens
+ */
+export interface MarketAuthTokens {
+  /**
+   * Access token for Market API requests
+   */
+  accessToken?: string;
+  /**
+   * Token expiration timestamp (milliseconds since epoch)
+   */
+  expiresAt?: number;
+  /**
+   * Refresh token for renewing access tokens
+   */
+  refreshToken?: string;
+}

package/src/app/[variants]/(main)/chat/components/topic/features/Topic/TopicListContent/TopicItem/index.tsx

@@ -53,7 +53,10 @@ export interface ConfigCellProps {
 const TopicItem = memo<ConfigCellProps>(({ title, active, id, fav, threadId }) => {
   const { styles, cx } = useStyles();
   const toggleConfig = useGlobalStore((s) => s.toggleMobileTopic);
-  const [toggleTopic, editing] = useChatStore((s) => [s.switchTopic, s.topicRenamingId === id]);
+  const [toggleTopic, editing] = useChatStore((s) => [
+    s.switchTopic,
+    s.topicRenamingId !== undefined && s.topicRenamingId === id,
+  ]);
   const activeId = useSessionStore((s) => s.activeId);
   const [isHover, setHovering] = useState(false);
 
@@ -65,6 +68,8 @@ const TopicItem = memo<ConfigCellProps>(({ title, active, id, fav, threadId }) =
         distribution={'space-between'}
         horizontal
         onClick={(e) => {
+          // Alt+Click should keep the current topic selection (reserved shortcut)
+          if (e.altKey) return;
           // 重命名时不切换话题
           if (editing) return;
           // Ctrl/Cmd+点击在新窗口打开

package/src/app/[variants]/(main)/chat/settings/features/SmartAgentActionButton/MarketPublishModal.tsx

@@ -40,7 +40,8 @@ const MarketPublishModal = memo<MarketPublishModalProps>(
     const isSubmit = action === 'submit';
     const isUpload = action === 'upload';
 
-    const { session: marketSession, isAuthenticated } = useMarketAuth();
+    const marketAuth = useMarketAuth();
+    const { isAuthenticated } = marketAuth;
     const meta = useSessionStore(sessionMetaSelectors.currentAgentMeta, isEqual);
     const updateSessionMeta = useSessionStore((s) => s.updateSessionMeta);
 
@@ -74,7 +75,7 @@ const MarketPublishModal = memo<MarketPublishModalProps>(
     useEffect(() => {
       if (!isUpload) return;
       const marketIdentifier = meta?.marketIdentifier;
-      const accessToken = marketSession?.accessToken;
+      const accessToken = marketAuth.getAccessToken();
       if (!open || !isAuthenticated || !accessToken || !marketIdentifier) return;
 
       let cancelled = false;
@@ -105,13 +106,14 @@ const MarketPublishModal = memo<MarketPublishModalProps>(
       return () => {
         cancelled = true;
       };
-    }, [isAuthenticated, isUpload, marketSession?.accessToken, meta?.marketIdentifier, open]);
+    }, [isAuthenticated, isUpload, marketAuth, meta?.marketIdentifier, open]);
 
     const tokenUsage = useTokenCount(systemRole);
 
     const handleSubmit = useCallback(
       async (values: MarketPublishFormValues) => {
-        if (!isAuthenticated || !marketSession?.accessToken) {
+        const accessToken = marketAuth.getAccessToken();
+        if (!isAuthenticated || !accessToken) {
           message.error(t('marketPublish.modal.messages.notAuthenticated'));
           return false;
         }
@@ -126,12 +128,15 @@ const MarketPublishModal = memo<MarketPublishModalProps>(
 
         try {
           message.loading({ content: loadingMessage, key: messageKey });
-          marketApiService.setAccessToken(marketSession.accessToken);
+          marketApiService.setAccessToken(accessToken);
 
           if (isSubmit) {
             identifier = values.identifier?.trim();
             if (!identifier) {
-              message.error({ content: t('marketPublish.modal.identifier.required'), key: messageKey });
+              message.error({
+                content: t('marketPublish.modal.identifier.required'),
+                key: messageKey,
+              });
               return false;
             }
 
@@ -145,7 +150,10 @@ const MarketPublishModal = memo<MarketPublishModalProps>(
               await marketApiService.createAgent(createPayload as any);
             }
           } else if (!identifier) {
-            message.error({ content: t('marketPublish.modal.messages.missingIdentifier'), key: messageKey });
+            message.error({
+              content: t('marketPublish.modal.messages.missingIdentifier'),
+              key: messageKey,
+            });
             return false;
           }
 
@@ -174,7 +182,7 @@ const MarketPublishModal = memo<MarketPublishModalProps>(
                   if (typeof plugin === 'string') {
                     return plugin;
                   } else {
-                    return null
+                    return null;
                   }
                 }) || [],
               systemRole: systemRole,
@@ -191,7 +199,9 @@ const MarketPublishModal = memo<MarketPublishModalProps>(
           } catch (versionError) {
             const errorMessage = versionError instanceof Error ? versionError.message : '未知错误';
             message.error({
-              content: t('marketPublish.modal.messages.createVersionFailed', { message: errorMessage }),
+              content: t('marketPublish.modal.messages.createVersionFailed', {
+                message: errorMessage,
+              }),
               key: messageKey,
             });
             return false;
@@ -210,7 +220,10 @@ const MarketPublishModal = memo<MarketPublishModalProps>(
         } catch (error) {
           console.error('Market publish failed:', error);
           const errorMessage = error instanceof Error ? error.message : '发布失败';
-          message.error({ content: t('marketPublish.modal.messages.publishFailed', { message: errorMessage }), key: messageKey });
+          message.error({
+            content: t('marketPublish.modal.messages.publishFailed', { message: errorMessage }),
+            key: messageKey,
+          });
           return false;
         }
       },
@@ -223,12 +236,12 @@ const MarketPublishModal = memo<MarketPublishModalProps>(
         isAuthenticated,
         isSubmit,
         language,
+        marketAuth,
         meta?.avatar,
         meta?.description,
         meta?.marketIdentifier,
         meta?.tags,
         meta?.title,
-        marketSession?.accessToken,
         messageKey,
         loadingMessage,
         model,
@@ -271,7 +284,10 @@ const MarketPublishModal = memo<MarketPublishModalProps>(
               placeholder={t('marketPublish.modal.identifier.placeholder')}
               rules={[
                 { message: t('marketPublish.modal.identifier.required'), required: true },
-                { message: t('marketPublish.modal.identifier.patternError'), pattern: /^[\da-z-]+$/ },
+                {
+                  message: t('marketPublish.modal.identifier.patternError'),
+                  pattern: /^[\da-z-]+$/,
+                },
                 { max: 50, message: t('marketPublish.modal.identifier.lengthError'), min: 3 },
               ]}
             />

package/src/config/modelProviders/cerebras.ts

@@ -9,6 +9,9 @@ const Cerebras: ModelProviderCard = {
   modelsUrl: 'https://inference-docs.cerebras.ai/models/overview',
   name: 'Cerebras',
   settings: {
+    proxyUrl: {
+      placeholder: 'https://api.cerebras.ai/v1',
+    },
     sdkType: 'openai',
     showModelFetcher: true,
   },

package/src/hooks/useAgentOwnershipCheck.ts

@@ -99,10 +99,10 @@ export const checkOwnership = async ({
 export const useAgentOwnershipCheck = (marketIdentifier?: string): AgentOwnershipResult => {
   const [result, setResult] = useState<AgentOwnershipResult>({ isOwnAgent: null });
   const marketAuth = useMarketAuth();
-  const { session, isAuthenticated } = marketAuth;
+  const { isAuthenticated } = marketAuth;
 
   useEffect(() => {
-    if (!marketIdentifier || !isAuthenticated || !session) {
+    if (!marketIdentifier || !isAuthenticated) {
       setResult({ isOwnAgent: false });
       return;
     }
@@ -121,8 +121,16 @@ export const useAgentOwnershipCheck = (marketIdentifier?: string): AgentOwnershi
           return;
         }
 
+        // 优先从 DB 获取 access token，如果没有则从 session 获取
+        const accessToken = marketAuth.getAccessToken();
+        if (!accessToken) {
+          console.warn('[useAgentOwnershipCheck] No access token available');
+          setResult({ isOwnAgent: false });
+          return;
+        }
+
         const isOwner = await checkOwnership({
-          accessToken: session.accessToken,
+          accessToken,
           accountId: currentAccountId,
           marketIdentifier,
         });
@@ -137,7 +145,7 @@ export const useAgentOwnershipCheck = (marketIdentifier?: string): AgentOwnershi
     };
 
     runOwnershipCheck();
-  }, [marketIdentifier, isAuthenticated, session, marketAuth]);
+  }, [marketIdentifier, isAuthenticated, marketAuth]);
 
   return result;
 };

package/src/layout/AuthProvider/MarketAuth/MarketAuthProvider.tsx

@@ -3,6 +3,8 @@
 import { ReactNode, createContext, useContext, useEffect, useState } from 'react';
 
 import { MARKET_OIDC_ENDPOINTS } from '@/services/_url';
+import { useUserStore } from '@/store/user';
+import { settingsSelectors } from '@/store/user/slices/settings/selectors/settings';
 
 import { MarketAuthError } from './errors';
 import { MarketOIDC } from './oidc';
@@ -86,6 +88,71 @@ const fetchUserInfo = async (accessToken: string): Promise<MarketUserInfo | null
   }
 };
 
+/**
+ * 从 DB 获取 market tokens
+ */
+const getMarketTokensFromDB = () => {
+  const settings = settingsSelectors.currentSettings(useUserStore.getState());
+  return settings.market;
+};
+
+/**
+ * 存储 market tokens 到 DB
+ */
+const saveMarketTokensToDB = async (
+  accessToken: string,
+  refreshToken?: string,
+  expiresAt?: number,
+) => {
+  console.log('[MarketAuth] Saving tokens to DB');
+  try {
+    await useUserStore.getState().setSettings({
+      market: {
+        accessToken,
+        expiresAt,
+        refreshToken,
+      },
+    });
+    console.log('[MarketAuth] Tokens saved to DB successfully');
+  } catch (error) {
+    console.error('[MarketAuth] Failed to save tokens to DB:', error);
+  }
+};
+
+/**
+ * 清除 DB 中的 market tokens
+ */
+const clearMarketTokensFromDB = async () => {
+  console.log('[MarketAuth] Clearing tokens from DB');
+  try {
+    await useUserStore.getState().setSettings({
+      market: {
+        accessToken: undefined,
+        expiresAt: undefined,
+        refreshToken: undefined,
+      },
+    });
+    console.log('[MarketAuth] Tokens cleared from DB successfully');
+  } catch (error) {
+    console.error('[MarketAuth] Failed to clear tokens from DB:', error);
+  }
+};
+
+/**
+ * 获取 refresh token（优先从 DB 获取）
+ */
+const getRefreshToken = (): string | null => {
+  // 优先从 DB 获取
+  const dbTokens = getMarketTokensFromDB();
+  if (dbTokens?.refreshToken) {
+    console.log('[MarketAuth] Retrieved refresh token from DB');
+    return dbTokens.refreshToken;
+  }
+
+  console.log('[MarketAuth] No refresh token found');
+  return null;
+};
+
 /**
  * 刷新令牌（暂时简化，后续可以实现 refresh token 逻辑）
  */
@@ -234,6 +301,13 @@ export const MarketAuthProvider = ({ children, isDesktop }: MarketAuthProviderPr
         sessionStorage.setItem('market_user_info', JSON.stringify(userInfo));
       }
 
+      // 存储 tokens 到 DB
+      await saveMarketTokensToDB(
+        tokenResponse.accessToken,
+        tokenResponse.refreshToken,
+        newSession.expiresAt,
+      );
+
       setSession(newSession);
       setStatus('authenticated');
 
@@ -249,12 +323,14 @@ export const MarketAuthProvider = ({ children, isDesktop }: MarketAuthProviderPr
   /**
    * 登出方法
    */
-  const signOut = () => {
+  const signOut = async () => {
     setSession(null);
     setStatus('unauthenticated');
     removeTokenFromCookie();
     sessionStorage.removeItem('market_auth_session');
     sessionStorage.removeItem('market_user_info');
+    // 清除 DB 中的 tokens
+    await clearMarketTokensFromDB();
   };
 
   /**
@@ -279,6 +355,40 @@ export const MarketAuthProvider = ({ children, isDesktop }: MarketAuthProviderPr
     return null;
   };
 
+  /**
+   * 获取 access token（优先从 DB 获取，否则从 session 获取）
+   */
+  const getAccessToken = (): string | null => {
+    // 优先从 DB 获取
+    const dbTokens = getMarketTokensFromDB();
+    if (dbTokens?.accessToken) {
+      console.log('[MarketAuth] Retrieved access token from DB');
+      return dbTokens.accessToken;
+    }
+
+    // 如果 DB 中没有，从 session 获取
+    if (session?.accessToken) {
+      console.log('[MarketAuth] Retrieved access token from session');
+      return session.accessToken;
+    }
+
+    // 如果 session 中也没有，尝试从 sessionStorage 获取
+    try {
+      const sessionData = sessionStorage.getItem('market_auth_session');
+      if (sessionData) {
+        const parsedSession = JSON.parse(sessionData) as MarketAuthSession;
+        if (parsedSession.accessToken) {
+          console.log('[MarketAuth] Retrieved access token from sessionStorage');
+          return parsedSession.accessToken;
+        }
+      }
+    } catch (error) {
+      console.error('[MarketAuth] Failed to get access token from sessionStorage:', error);
+    }
+
+    return null;
+  };
+
   /**
    * 初始化时恢复会话
    */
@@ -324,6 +434,13 @@ export const MarketAuthProvider = ({ children, isDesktop }: MarketAuthProviderPr
             sessionStorage.setItem('market_user_info', JSON.stringify(userInfo));
           }
 
+          // 存储 tokens 到 DB
+          await saveMarketTokensToDB(
+            tokenResponse.accessToken,
+            tokenResponse.refreshToken,
+            newSession.expiresAt,
+          );
+
           setSession(newSession);
           setStatus('authenticated');
 
@@ -339,7 +456,9 @@ export const MarketAuthProvider = ({ children, isDesktop }: MarketAuthProviderPr
   }, [shouldReauthorize, oidcClient]);
 
   const contextValue: MarketAuthContextType = {
+    getAccessToken,
     getCurrentUserInfo,
+    getRefreshToken,
     isAuthenticated: status === 'authenticated',
     isLoading: status === 'loading',
     refreshToken,

package/src/layout/AuthProvider/MarketAuth/types.ts

@@ -36,10 +36,12 @@ export interface MarketAuthState {
 }
 
 export interface MarketAuthContextType extends MarketAuthState {
+  getAccessToken: () => string | null;
   getCurrentUserInfo: () => MarketUserInfo | null;
+  getRefreshToken: () => string | null;
   refreshToken: () => Promise<boolean>;
   signIn: () => Promise<number | null>;
-  signOut: () => void;
+  signOut: () => Promise<void>;
 }
 
 export interface OIDCConfig {
@@ -59,6 +61,7 @@ export interface TokenResponse {
   accessToken: string;
   expiresIn: number;
   idToken?: string;
+  refreshToken?: string;
   scope: string;
   tokenType: string;
 }

package/src/libs/better-auth/sso/index.ts

@@ -102,6 +102,9 @@ export const initBetterAuthSSOProviders = () => {
     const config = definition.build(env);
 
     if (config) {
+      // the generic oidc callback url is /api/auth/oauth2/callback/{providerId}
+      // different from builtin providers' /api/auth/callback/{providerId}
+      config.redirectURI = `${authEnv.NEXT_PUBLIC_AUTH_URL}/api/auth/callback/${definition.id}`;
       genericOAuthProviders.push(config);
     }
   }