@lobehub/lobehub 2.0.0-next.21 → 2.0.0-next.22

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

@@ -294,6 +294,13 @@
       "when": 1761878697451,
       "tag": "0041_improve_index",
       "breakpoints": true
+    },
+    {
+      "idx": 42,
+      "version": "7",
+      "when": 1762232313711,
+      "tag": "0042_improve_agent_index",
+      "breakpoints": true
     }
   ],
   "version": "6"

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

@@ -746,5 +746,13 @@
     "bps": true,
     "folderMillis": 1761878697451,
     "hash": "2f740719356c4ea28a4f71b6089595871f6e185e056b43288a7d16f7d0aae196"
+  },
+  {
+    "sql": [
+      "CREATE INDEX \"agents_knowledge_bases_agent_id_idx\" ON \"agents_knowledge_bases\" USING btree (\"agent_id\");"
+    ],
+    "bps": true,
+    "folderMillis": 1762232313711,
+    "hash": "8988ec15592e000430d76566323f437b2ebde46122c5f7172067cd0a65f99614"
   }
 ]

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

@@ -28,19 +28,21 @@ export class AgentModel {
   };
 
   getAgentAssignedKnowledge = async (id: string) => {
-    const knowledgeBaseResult = await this.db
-      .select({ enabled: agentsKnowledgeBases.enabled, knowledgeBases })
-      .from(agentsKnowledgeBases)
-      .where(eq(agentsKnowledgeBases.agentId, id))
-      .orderBy(desc(agentsKnowledgeBases.createdAt))
-      .leftJoin(knowledgeBases, eq(knowledgeBases.id, agentsKnowledgeBases.knowledgeBaseId));
-
-    const fileResult = await this.db
-      .select({ enabled: agentsFiles.enabled, files })
-      .from(agentsFiles)
-      .where(eq(agentsFiles.agentId, id))
-      .orderBy(desc(agentsFiles.createdAt))
-      .leftJoin(files, eq(files.id, agentsFiles.fileId));
+    // Run both queries in parallel for better performance
+    const [knowledgeBaseResult, fileResult] = await Promise.all([
+      this.db
+        .select({ enabled: agentsKnowledgeBases.enabled, knowledgeBases })
+        .from(agentsKnowledgeBases)
+        .where(eq(agentsKnowledgeBases.agentId, id))
+        .orderBy(desc(agentsKnowledgeBases.createdAt))
+        .leftJoin(knowledgeBases, eq(knowledgeBases.id, agentsKnowledgeBases.knowledgeBaseId)),
+      this.db
+        .select({ enabled: agentsFiles.enabled, files })
+        .from(agentsFiles)
+        .where(eq(agentsFiles.agentId, id))
+        .orderBy(desc(agentsFiles.createdAt))
+        .leftJoin(files, eq(files.id, agentsFiles.fileId)),
+    ]);
 
     return {
       files: fileResult.map((item) => ({
@@ -61,6 +63,7 @@ export class AgentModel {
     const item = await this.db.query.agentsToSessions.findFirst({
       where: eq(agentsToSessions.sessionId, sessionId),
     });
+
     if (!item) return;
 
     const agentId = item.agentId;

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

@@ -123,17 +123,28 @@ export class SessionModel {
   findByIdOrSlug = async (
     idOrSlug: string,
   ): Promise<(SessionItem & { agent: AgentItem }) | undefined> => {
-    const result = await this.db.query.sessions.findFirst({
-      where: and(
-        or(eq(sessions.id, idOrSlug), eq(sessions.slug, idOrSlug)),
-        eq(sessions.userId, this.userId),
-      ),
-      with: { agentsToSessions: { columns: {}, with: { agent: true } }, group: true },
-    });
+    // Use leftJoin instead of nested 'with' for better performance
+    const result = await this.db
+      .select({
+        agent: agents,
+        group: sessionGroups,
+        session: sessions,
+      })
+      .from(sessions)
+      .where(
+        and(
+          or(eq(sessions.id, idOrSlug), eq(sessions.slug, idOrSlug)),
+          eq(sessions.userId, this.userId),
+        ),
+      )
+      .leftJoin(agentsToSessions, eq(sessions.id, agentsToSessions.sessionId))
+      .leftJoin(agents, eq(agentsToSessions.agentId, agents.id))
+      .leftJoin(sessionGroups, eq(sessions.groupId, sessionGroups.id))
+      .limit(1);
 
-    if (!result) return;
+    if (!result || !result[0]) return;
 
-    return { ...result, agent: (result?.agentsToSessions?.[0] as any)?.agent } as any;
+    return { ...result[0].session, agent: result[0].agent, group: result[0].group } as any;
   };
 
   count = async (params?: {

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

@@ -82,7 +82,8 @@ export class UserModel {
       })
       .from(users)
       .where(eq(users.id, this.userId))
-      .leftJoin(userSettings, eq(users.id, userSettings.id));
+      .leftJoin(userSettings, eq(users.id, userSettings.id))
+      .limit(1);
 
     if (!result || !result[0]) {
       throw new UserNotFoundError();

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

@@ -90,7 +90,10 @@ export const agentsKnowledgeBases = pgTable(
 
     ...timestamps,
   },
-  (t) => [primaryKey({ columns: [t.agentId, t.knowledgeBaseId] })],
+  (t) => [
+    primaryKey({ columns: [t.agentId, t.knowledgeBaseId] }),
+    index('agents_knowledge_bases_agent_id_idx').on(t.agentId),
+  ],
 );
 
 export const agentsFiles = pgTable(

package/packages/types/src/message/ui/params.ts

@@ -180,7 +180,7 @@ export const CreateNewMessageParamsSchema = z
     plugin: ChatPluginPayloadSchema.optional(),
     // Grouping
     parentId: z.string().optional(),
-    groupId: z.string().optional(),
+    groupId: z.string().nullable().optional(),
     // Context
     topicId: z.string().optional(),
     threadId: z.string().nullable().optional(),

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

@@ -283,5 +283,3 @@ export const messageRouter = router({
       return ctx.messageModel.updateTranslate(input.id, input.value);
     }),
 });
-
-export type MessageRouter = typeof messageRouter;

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

@@ -30,7 +30,9 @@ const userProcedure = authedProcedure.use(serverDatabase).use(async ({ ctx, next
     ctx: {
       clerkAuth: new ClerkAuth(),
       fileService: new FileService(ctx.serverDB, ctx.userId),
+      messageModel: new MessageModel(ctx.serverDB, ctx.userId),
       nextAuthUserService: new NextAuthUserService(ctx.serverDB),
+      sessionModel: new SessionModel(ctx.serverDB, ctx.userId),
       userModel: new UserModel(ctx.serverDB, ctx.userId),
     },
   });
@@ -97,12 +99,12 @@ export const userRouter = router({
       }
     }
 
-    const messageModel = new MessageModel(ctx.serverDB, ctx.userId);
-    const hasMoreThan4Messages = await messageModel.hasMoreThanN(4);
-
-    const sessionModel = new SessionModel(ctx.serverDB, ctx.userId);
-    const hasAnyMessages = await messageModel.hasMoreThanN(0);
-    const hasExtraSession = await sessionModel.hasMoreThanN(1);
+    // Run all count queries in parallel
+    const [hasMoreThan4Messages, hasAnyMessages, hasExtraSession] = await Promise.all([
+      ctx.messageModel.hasMoreThanN(4),
+      ctx.messageModel.hasMoreThanN(0),
+      ctx.sessionModel.hasMoreThanN(1),
+    ]);
 
     return {
       avatar: state.avatar,