@lobehub/chat 1.80.1 → 1.80.3

package/src/config/aiModels/zhipu.ts

@@ -8,7 +8,6 @@ const zhipuChatModels: AIChatModelCard[] = [
     contextWindowTokens: 16_384,
     description: 'GLM-Zero-Preview具备强大的复杂推理能力，在逻辑推理、数学、编程等领域表现优异。',
     displayName: 'GLM-Zero-Preview',
-    enabled: true,
     id: 'glm-zero-preview',
     pricing: {
       currency: 'CNY',
@@ -17,6 +16,67 @@ const zhipuChatModels: AIChatModelCard[] = [
     },
     type: 'chat',
   },
+  {
+    abilities: {
+      reasoning: true,
+      search: true,
+    },
+    contextWindowTokens: 32_000,
+    description: '推理模型: 具备强大推理能力，适用于需要深度推理的任务。',
+    displayName: 'GLM-Z1-Air',
+    id: 'glm-z1-air',
+    maxOutput: 30_000,
+    pricing: {
+      currency: 'CNY',
+      input: 0.5,
+      output: 0.5,
+    },
+    settings: {
+      searchImpl: 'params',
+    },
+    type: 'chat',
+  },
+  {
+    abilities: {
+      reasoning: true,
+      search: true,
+    },
+    contextWindowTokens: 32_000,
+    description: '极速推理：具有超快的推理速度和强大的推理效果。',
+    displayName: 'GLM-Z1-AirX',
+    id: 'glm-z1-airx',
+    maxOutput: 30_000,
+    pricing: {
+      currency: 'CNY',
+      input: 5,
+      output: 5,
+    },
+    settings: {
+      searchImpl: 'params',
+    },
+    type: 'chat',
+  },
+  {
+    abilities: {
+      reasoning: true,
+      search: true,
+    },
+    contextWindowTokens: 32_000,
+    description: 'GLM-Z1 系列具备强大的复杂推理能力，在逻辑推理、数学、编程等领域表现优异。最大上下文长度为32K。',
+    displayName: 'GLM-Z1-Flash',
+    enabled: true,
+    id: 'glm-z1-flash',
+    maxOutput: 30_000,
+    pricing: {
+      currency: 'CNY',
+      input: 0,
+      output: 0,
+    },
+    settings: {
+      searchImpl: 'params',
+    },
+    type: 'chat',
+  },
   {
     abilities: {
       functionCall: true,
@@ -24,9 +84,10 @@ const zhipuChatModels: AIChatModelCard[] = [
     },
     contextWindowTokens: 128_000,
     description: 'GLM-4-Flash 是处理简单任务的理想选择，速度最快且免费。',
-    displayName: 'GLM-4-Flash',
+    displayName: 'GLM-4-Flash-250414',
     enabled: true,
-    id: 'glm-4-flash',
+    id: 'glm-4-flash-250414',
+    maxOutput: 4000,
     pricing: {
       currency: 'CNY',
       input: 0,
@@ -45,8 +106,8 @@ const zhipuChatModels: AIChatModelCard[] = [
     contextWindowTokens: 128_000,
     description: 'GLM-4-FlashX 是Flash的增强版本，超快推理速度。',
     displayName: 'GLM-4-FlashX',
-    enabled: true,
     id: 'glm-4-flashx',
+    maxOutput: 4000,
     pricing: {
       currency: 'CNY',
       input: 0.1,
@@ -66,6 +127,7 @@ const zhipuChatModels: AIChatModelCard[] = [
     description: 'GLM-4-Long 支持超长文本输入，适合记忆型任务与大规模文档处理。',
     displayName: 'GLM-4-Long',
     id: 'glm-4-long',
+    maxOutput: 4000,
     pricing: {
       currency: 'CNY',
       input: 1,
@@ -81,15 +143,15 @@ const zhipuChatModels: AIChatModelCard[] = [
       functionCall: true,
       search: true,
     },
-    contextWindowTokens: 128_000,
+    contextWindowTokens: 32_000,
     description: 'GLM-4-Air 是性价比高的版本，性能接近GLM-4，提供快速度和实惠的价格。',
-    displayName: 'GLM-4-Air',
-    enabled: true,
-    id: 'glm-4-air',
+    displayName: 'GLM-4-Air-250414',
+    id: 'glm-4-air-250414',
+    maxOutput: 4000,
     pricing: {
       currency: 'CNY',
-      input: 1,
-      output: 1,
+      input: 0.5,
+      output: 0.5,
     },
     settings: {
       searchImpl: 'params',
@@ -104,8 +166,8 @@ const zhipuChatModels: AIChatModelCard[] = [
     contextWindowTokens: 8192,
     description: 'GLM-4-AirX 提供 GLM-4-Air 的高效版本，推理速度可达其2.6倍。',
     displayName: 'GLM-4-AirX',
-    enabled: true,
     id: 'glm-4-airx',
+     maxOutput: 4000,
     pricing: {
       currency: 'CNY',
       input: 10,
@@ -144,8 +206,8 @@ const zhipuChatModels: AIChatModelCard[] = [
     contextWindowTokens: 128_000,
     description: 'GLM-4-Plus 作为高智能旗舰，具备强大的处理长文本和复杂任务的能力，性能全面提升。',
     displayName: 'GLM-4-Plus',
-    enabled: true,
     id: 'glm-4-plus',
+    maxOutput: 4000,
     pricing: {
       currency: 'CNY',
       input: 50,
@@ -164,7 +226,7 @@ const zhipuChatModels: AIChatModelCard[] = [
     contextWindowTokens: 128_000,
     description: 'GLM-4-0520 是最新模型版本，专为高度复杂和多样化任务设计，表现卓越。',
     displayName: 'GLM-4-0520',
-    id: 'glm-4-0520',
+    id: 'glm-4-0520', // 弃用时间 2025年12月30日
     pricing: {
       currency: 'CNY',
       input: 100,
@@ -183,7 +245,7 @@ const zhipuChatModels: AIChatModelCard[] = [
     contextWindowTokens: 128_000,
     description: 'GLM-4 是发布于2024年1月的旧旗舰版本，目前已被更强的 GLM-4-0520 取代。',
     displayName: 'GLM-4',
-    id: 'glm-4',
+    id: 'glm-4', // 弃用时间 2025年6月30日
     pricing: {
       currency: 'CNY',
       input: 100,
@@ -198,7 +260,7 @@ const zhipuChatModels: AIChatModelCard[] = [
     abilities: {
       vision: true,
     },
-    contextWindowTokens: 8192,
+    contextWindowTokens: 4096,
     description:
       'GLM-4V-Flash 专注于高效的单一图像理解，适用于快速图像解析的场景，例如实时图像分析或批量图像处理。',
     displayName: 'GLM-4V-Flash',
@@ -218,13 +280,12 @@ const zhipuChatModels: AIChatModelCard[] = [
     },
     contextWindowTokens: 8192,
     description: 'GLM-4V-Plus 具备对视频内容及多图片的理解能力，适合多模态任务。',
-    displayName: 'GLM-4V-Plus',
-    enabled: true,
-    id: 'glm-4v-plus',
+    displayName: 'GLM-4V-Plus-0111',
+    id: 'glm-4v-plus-0111',
     pricing: {
       currency: 'CNY',
-      input: 10,
-      output: 10,
+      input: 4,
+      output: 4,
     },
     type: 'chat',
   },
@@ -232,7 +293,7 @@ const zhipuChatModels: AIChatModelCard[] = [
     abilities: {
       vision: true,
     },
-    contextWindowTokens: 2048,
+    contextWindowTokens: 4096,
     description: 'GLM-4V 提供强大的图像理解与推理能力，支持多种视觉任务。',
     displayName: 'GLM-4V',
     id: 'glm-4v',
@@ -249,6 +310,7 @@ const zhipuChatModels: AIChatModelCard[] = [
       'CodeGeeX-4 是强大的AI编程助手，支持多种编程语言的智能问答与代码补全，提升开发效率。',
     displayName: 'CodeGeeX-4',
     id: 'codegeex-4',
+    maxOutput: 32_000,
     pricing: {
       currency: 'CNY',
       input: 0.1,
@@ -257,14 +319,15 @@ const zhipuChatModels: AIChatModelCard[] = [
     type: 'chat',
   },
   {
-    contextWindowTokens: 4096,
-    description: 'CharGLM-3 专为角色扮演与情感陪伴设计，支持超长多轮记忆与个性化对话，应用广泛。',
-    displayName: 'CharGLM-3',
-    id: 'charglm-3',
+    contextWindowTokens: 8192,
+    description: 'CharGLM-4 专为角色扮演与情感陪伴设计，支持超长多轮记忆与个性化对话，应用广泛。',
+    displayName: 'CharGLM-4',
+    id: 'charglm-4',
+    maxOutput: 4000,
     pricing: {
       currency: 'CNY',
-      input: 15,
-      output: 15,
+      input: 1,
+      output: 1,
     },
     type: 'chat',
   },
@@ -273,6 +336,7 @@ const zhipuChatModels: AIChatModelCard[] = [
     description: 'Emohaa 是心理模型，具备专业咨询能力，帮助用户理解情感问题。',
     displayName: 'Emohaa',
     id: 'emohaa',
+    maxOutput: 4000,
     pricing: {
       currency: 'CNY',
       input: 15,

package/src/const/settings/knowledge.ts

@@ -2,7 +2,7 @@ import { FilesConfig, FilesConfigItem } from '@/types/user/settings/filesConfig'
 
 import {
   DEFAULT_EMBEDDING_MODEL,
-  DEFAULT_PROVIDER,
+  DEFAULT_EMBEDDING_PROVIDER,
   DEFAULT_RERANK_MODEL,
   DEFAULT_RERANK_PROVIDER,
   DEFAULT_RERANK_QUERY_MODE,
@@ -10,7 +10,7 @@ import {
 
 export const DEFAULT_FILE_EMBEDDING_MODEL_ITEM: FilesConfigItem = {
   model: DEFAULT_EMBEDDING_MODEL,
-  provider: DEFAULT_PROVIDER,
+  provider: DEFAULT_EMBEDDING_PROVIDER,
 };
 
 export const DEFAULT_FILE_RERANK_MODEL_ITEM: FilesConfigItem = {

package/src/database/models/user.ts

@@ -62,10 +62,15 @@ export class UserModel {
   getUserState = async (decryptor: DecryptUserKeyVaults) => {
     const result = await this.db
       .select({
+        avatar: users.avatar,
+        email: users.email,
+        firstName: users.firstName,
+        fullName: users.fullName,
         isOnboarded: users.isOnboarded,
+        lastName: users.lastName,
         preference: users.preference,
-
         settingsDefaultAgent: userSettings.defaultAgent,
+
         settingsGeneral: userSettings.general,
         settingsHotkey: userSettings.hotkey,
         settingsKeyVaults: userSettings.keyVaults,
@@ -73,6 +78,7 @@ export class UserModel {
         settingsSystemAgent: userSettings.systemAgent,
         settingsTTS: userSettings.tts,
         settingsTool: userSettings.tool,
+        username: users.username,
       })
       .from(users)
       .where(eq(users.id, this.userId))
@@ -105,10 +111,16 @@ export class UserModel {
     };
 
     return {
+      avatar: state.avatar || undefined,
+      email: state.email || undefined,
+      firstName: state.firstName || undefined,
+      fullName: state.fullName || undefined,
       isOnboarded: state.isOnboarded,
+      lastName: state.lastName || undefined,
       preference: state.preference as UserPreference,
       settings,
       userId: this.userId,
+      username: state.username || undefined,
     };
   };
 

package/src/layout/AuthProvider/NextAuth/UserUpdater.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useSession } from 'next-auth/react';
-import { memo } from 'react';
+import { memo, useEffect } from 'react';
 import { createStoreUpdater } from 'zustand-utils';
 
 import { useUserStore } from '@/store/user';
@@ -17,20 +17,27 @@ const UserUpdater = memo(() => {
   const nextUser = session?.user;
   const useStoreUpdater = createStoreUpdater(useUserStore);
 
-  const lobeUser = {
-    avatar: nextUser?.image,
-    email: nextUser?.email,
-    fullName: nextUser?.name,
-    id: nextUser?.id,
-  } as LobeUser;
-
   useStoreUpdater('isLoaded', isLoaded);
-  useStoreUpdater('user', lobeUser);
   useStoreUpdater('isSignedIn', isSignedIn);
-
   useStoreUpdater('nextSession', session);
-  useStoreUpdater('nextUser', nextUser);
 
+  // 使用 useEffect 处理需要保持同步的用户数据
+  useEffect(() => {
+    if (nextUser) {
+      const userAvatar = useUserStore.getState().user?.avatar;
+
+      const lobeUser = {
+        // 头像使用设置的，而不是从 next-auth 中获取
+        avatar: userAvatar || '',
+        email: nextUser.email,
+        fullName: nextUser.name,
+        id: nextUser.id,
+      } as LobeUser;
+
+      // 更新用户相关数据
+      useUserStore.setState({ nextUser: nextUser, user: lobeUser });
+    }
+  }, [nextUser]);
   return null;
 });
 

package/src/libs/oidc-provider/adapter.ts

@@ -22,9 +22,10 @@ class OIDCAdapter {
   private name: string;
 
   constructor(name: string, db: LobeChatDatabase) {
+    log('[%s] Constructor called with name: %s', name, name);
+
     this.name = name;
     this.db = db;
-    log('Creating adapter for model: %s', name);
   }
 
   /**
@@ -530,12 +531,10 @@ class OIDCAdapter {
   /**
    * 创建适配器工厂
    */
-  static createAdapterFactory(db: LobeChatDatabase) {
+  static createAdapterFactory = (db: LobeChatDatabase) => {
     log('Creating adapter factory with database instance');
-    return function (name: string) {
-      return new OIDCAdapter(name, db);
-    };
-  }
+    return (name: string) => new OIDCAdapter(name, db);
+  };
 }
 
 export { OIDCAdapter as DrizzleAdapter };

package/src/libs/oidc-provider/config.ts

@@ -11,9 +11,6 @@ export const defaultClients: ClientMetadata[] = [
     // 仅支持授权码流程
     grant_types: ['authorization_code', 'refresh_token'],
 
-    // 明确指明是原生应用
-    isFirstParty: true,
-
     logo_uri: 'https://hub-apac-1.lobeobjects.space/lobehub-desktop-icon.png',
 
     // 桌面端注册的自定义协议回调（使用反向域名格式）

package/src/libs/oidc-provider/provider.ts

@@ -272,6 +272,7 @@ export const createOIDCProvider = async (db: LobeChatDatabase): Promise<Provider
   const baseUrl = urlJoin(appEnv.APP_URL!, '/oidc');
 
   const provider = new Provider(baseUrl, configuration);
+  provider.proxy = true;
 
   provider.on('server_error', (ctx, err) => {
     logProvider('OIDC Provider Server Error: %O', err); // Use logProvider

package/src/libs/trpc/edge/index.ts

@@ -10,7 +10,6 @@
 import { DESKTOP_USER_ID } from '@/const/desktop';
 import { isDesktop } from '@/const/version';
 
-import { userAuth } from '../middleware/userAuth';
 import { edgeTrpc } from './init';
 import { jwtPayloadChecker } from './middleware/jwtPayload';
 
@@ -30,9 +29,6 @@ export const publicProcedure = edgeTrpc.procedure.use(({ next, ctx }) => {
   });
 });
 
-// procedure that asserts that the user is logged in
-export const authedProcedure = edgeTrpc.procedure.use(userAuth);
-
 // procedure that asserts that the user add the password
 export const passwordProcedure = edgeTrpc.procedure.use(jwtPayloadChecker);
 

package/src/libs/trpc/lambda/context.ts

@@ -1,14 +1,31 @@
+import debug from 'debug';
 import { User } from 'next-auth';
 import { NextRequest } from 'next/server';
 
 import { JWTPayload, LOBE_CHAT_AUTH_HEADER, enableClerk, enableNextAuth } from '@/const/auth';
+import { oidcEnv } from '@/envs/oidc';
 import { ClerkAuth, IClerkAuth } from '@/libs/clerk-auth';
+import { extractBearerToken } from '@/utils/server/auth';
+
+// Create context logger namespace
+const log = debug('lobe-trpc:lambda:context');
+
+export interface OIDCAuth {
+  // Other OIDC information that might be needed (optional, as payload contains all info)
+  [key: string]: any;
+  // OIDC token data (now the complete payload)
+  payload: any;
+  // User ID
+  sub: string;
+}
 
 export interface AuthContext {
   authorizationHeader?: string | null;
   clerkAuth?: IClerkAuth;
   jwtPayload?: JWTPayload | null;
   nextAuth?: User;
+  // Add OIDC authentication information
+  oidcAuth?: OIDCAuth | null;
   userId?: string | null;
 }
 
@@ -20,13 +37,18 @@ export const createContextInner = async (params?: {
   authorizationHeader?: string | null;
   clerkAuth?: IClerkAuth;
   nextAuth?: User;
+  oidcAuth?: OIDCAuth | null;
   userId?: string | null;
-}): Promise<AuthContext> => ({
-  authorizationHeader: params?.authorizationHeader,
-  clerkAuth: params?.clerkAuth,
-  nextAuth: params?.nextAuth,
-  userId: params?.userId,
-});
+}): Promise<AuthContext> => {
+  log('createContextInner called with params: %O', params);
+  return {
+    authorizationHeader: params?.authorizationHeader,
+    clerkAuth: params?.clerkAuth,
+    nextAuth: params?.nextAuth,
+    oidcAuth: params?.oidcAuth,
+    userId: params?.userId,
+  };
+};
 
 export type LambdaContext = Awaited<ReturnType<typeof createContextInner>>;
 
@@ -35,23 +57,76 @@ export type LambdaContext = Awaited<ReturnType<typeof createContextInner>>;
  * @link https://trpc.io/docs/v11/context
  */
 export const createLambdaContext = async (request: NextRequest): Promise<LambdaContext> => {
+  log('createLambdaContext called for request');
   // for API-response caching see https://trpc.io/docs/v11/caching
 
   const authorization = request.headers.get(LOBE_CHAT_AUTH_HEADER);
+  log('LobeChat Authorization header: %s', authorization ? 'exists' : 'not found');
 
   let userId;
   let auth;
+  let oidcAuth = null;
+
+  // Prioritize checking the standard Authorization header for OIDC Bearer Token validation
+  if (oidcEnv.ENABLE_OIDC) {
+    log('OIDC enabled, attempting OIDC authentication');
+    const standardAuthorization = request.headers.get('Authorization');
+    log('Standard Authorization header: %s', standardAuthorization ? 'exists' : 'not found');
+
+    try {
+      // Use extractBearerToken from utils
+      const bearerToken = extractBearerToken(standardAuthorization);
+
+      log('Extracted Bearer Token: %s', bearerToken ? 'valid' : 'invalid');
+      if (bearerToken) {
+        const { OIDCService } = await import('@/server/services/oidc');
+
+        // Initialize OIDC service
+        log('Initializing OIDC service');
+        const oidcService = await OIDCService.initialize();
+        // Validate token using OIDCService
+        log('Validating OIDC token');
+        const tokenInfo = await oidcService.validateToken(bearerToken);
+        oidcAuth = {
+          payload: tokenInfo.tokenData,
+          ...tokenInfo.tokenData, // Spread payload into oidcAuth
+          sub: tokenInfo.userId, // Use tokenData as payload
+        };
+        userId = tokenInfo.userId;
+        log('OIDC authentication successful, userId: %s', userId);
+
+        // If OIDC authentication is successful, return context immediately
+        log('OIDC authentication successful, creating context and returning');
+        return createContextInner({
+          // Preserve original LobeChat Authorization Header (if any)
+          authorizationHeader: authorization,
+          oidcAuth,
+          userId,
+        });
+      }
+    } catch (error) {
+      // If OIDC authentication fails, log error and continue with other authentication methods
+      if (standardAuthorization?.startsWith('Bearer ')) {
+        log('OIDC authentication failed, error: %O', error);
+        console.error('OIDC authentication failed, trying other methods:', error);
+      }
+    }
+  }
 
+  // If OIDC is not enabled or validation fails, try LobeChat custom Header and other authentication methods
   if (enableClerk) {
+    log('Attempting Clerk authentication');
     const clerkAuth = new ClerkAuth();
     const result = clerkAuth.getAuthFromRequest(request);
     auth = result.clerkAuth;
     userId = result.userId;
+    log('Clerk authentication result, userId: %s', userId || 'not authenticated');
 
     return createContextInner({ authorizationHeader: authorization, clerkAuth: auth, userId });
   }
 
   if (enableNextAuth) {
+    log('Attempting NextAuth authentication');
     try {
       const { default: NextAuthEdge } = await import('@/libs/next-auth/edge');
 
@@ -59,12 +134,21 @@ export const createLambdaContext = async (request: NextRequest): Promise<LambdaC
       if (session && session?.user?.id) {
         auth = session.user;
         userId = session.user.id;
+        log('NextAuth authentication successful, userId: %s', userId);
+      } else {
+        log('NextAuth authentication failed, no valid session');
       }
       return createContextInner({ authorizationHeader: authorization, nextAuth: auth, userId });
     } catch (e) {
+      log('NextAuth authentication error: %O', e);
       console.error('next auth err', e);
     }
   }
 
+  // Final return, userId may be undefined
+  log(
+    'All authentication methods attempted, returning final context, userId: %s',
+    userId || 'not authenticated',
+  );
   return createContextInner({ authorizationHeader: authorization, userId });
 };

package/src/libs/trpc/lambda/index.ts

@@ -12,6 +12,7 @@ import { isDesktop } from '@/const/version';
 
 import { userAuth } from '../middleware/userAuth';
 import { trpc } from './init';
+import { oidcAuth } from './middleware/oidcAuth';
 
 /**
  * Create a router
@@ -30,7 +31,7 @@ export const publicProcedure = trpc.procedure.use(({ next, ctx }) => {
 });
 
 // procedure that asserts that the user is logged in
-export const authedProcedure = trpc.procedure.use(userAuth);
+export const authedProcedure = trpc.procedure.use(oidcAuth).use(userAuth);
 
 /**
  * Create a server-side caller

package/src/libs/trpc/lambda/middleware/oidcAuth.ts

@@ -0,0 +1,14 @@
+import { trpc } from '../init';
+
+export const oidcAuth = trpc.middleware(async (opts) => {
+  const { ctx, next } = opts;
+
+  // 检查 OIDC 认证
+  if (ctx.oidcAuth) {
+    return next({
+      ctx: { oidcAuth: ctx.oidcAuth, userId: ctx.oidcAuth.sub },
+    });
+  }
+
+  return next();
+});

package/src/libs/trpc/middleware/userAuth.ts

@@ -26,9 +26,7 @@ export const userAuth = trpc.middleware(async (opts) => {
   }
 
   return opts.next({
-    ctx: {
-      // ✅ user value is known to be non-null now
-      userId: ctx.userId,
-    },
+    // ✅ user value is known to be non-null now
+    ctx: { userId: ctx.userId },
   });
 });

package/src/server/routers/lambda/user.ts

@@ -85,17 +85,24 @@ export const userRouter = router({
     const hasExtraSession = await sessionModel.hasMoreThanN(1);
 
     return {
+      avatar: state.avatar,
       canEnablePWAGuide: hasMoreThan4Messages,
       canEnableTrace: hasMoreThan4Messages,
+      email: state.email,
+      firstName: state.firstName,
+
+      fullName: state.fullName,
+
       // 有消息，或者创建过助手，则认为有 conversation
       hasConversation: hasAnyMessages || hasExtraSession,
-
       // always return true for community version
       isOnboard: state.isOnboarded || true,
+      lastName: state.lastName,
       preference: state.preference as UserPreference,
       settings: state.settings,
       userId: ctx.userId,
-    };
+      username: state.username,
+    } satisfies UserInitializationState;
   }),
 
   makeUserOnboarded: userProcedure.mutation(async ({ ctx }) => {