@lobehub/lobehub 2.0.0-next.128 → 2.0.0-next.129

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

@@ -350,6 +350,13 @@
       "when": 1764229953081,
       "tag": "0049_better_auth",
       "breakpoints": true
+    },
+    {
+      "idx": 50,
+      "version": "7",
+      "when": 1764303057060,
+      "tag": "0050_thread_and_user_id",
+      "breakpoints": true
     }
   ],
   "version": "6"

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

@@ -223,7 +223,10 @@
     "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"
@@ -295,7 +298,9 @@
     "hash": "845a692ceabbfc3caf252a97d3e19a213bc0c433df2689900135f9cfded2cf49"
   },
   {
-    "sql": ["ALTER TABLE \"messages\" ADD COLUMN \"reasoning\" jsonb;"],
+    "sql": [
+      "ALTER TABLE \"messages\" ADD COLUMN \"reasoning\" jsonb;"
+    ],
     "bps": true,
     "folderMillis": 1737609172353,
     "hash": "2cb36ae4fcdd7b7064767e04bfbb36ae34518ff4bb1b39006f2dd394d1893868"
@@ -510,7 +515,9 @@
     "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"
@@ -628,7 +635,9 @@
     "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"
@@ -678,13 +687,17 @@
     "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"
@@ -764,13 +777,17 @@
     "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"
@@ -799,7 +816,9 @@
     "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"
@@ -816,5 +835,27 @@
     "bps": true,
     "folderMillis": 1764229953081,
     "hash": "1532ebceae7b70550bc9c230fb0a65090aaa773bc7b873eefbc2ce2a815997e2"
+  },
+  {
+    "sql": [
+      "ALTER TABLE \"nextauth_accounts\" RENAME COLUMN \"userId\" TO \"user_id\";",
+      "\nALTER TABLE \"nextauth_authenticators\" RENAME COLUMN \"userId\" TO \"user_id\";",
+      "\nALTER TABLE \"nextauth_sessions\" RENAME COLUMN \"userId\" TO \"user_id\";",
+      "\nALTER TABLE \"nextauth_accounts\" DROP CONSTRAINT \"nextauth_accounts_userId_users_id_fk\";\n",
+      "\nALTER TABLE \"nextauth_authenticators\" DROP CONSTRAINT \"nextauth_authenticators_userId_users_id_fk\";\n",
+      "\nALTER TABLE \"nextauth_sessions\" DROP CONSTRAINT \"nextauth_sessions_userId_users_id_fk\";\n",
+      "\nALTER TABLE \"nextauth_authenticators\" DROP CONSTRAINT \"nextauth_authenticators_userId_credentialID_pk\";",
+      "\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 \"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;"
+    ],
+    "bps": true,
+    "folderMillis": 1764303057060,
+    "hash": "edcebee8f59971210c1f8b567d3bd0ffa37da286afeead5bdaaa19eeaa4b89cb"
   }
-]
+]

package/packages/database/src/repositories/knowledge/index.test.ts

@@ -146,17 +146,29 @@ describe('KnowledgeRepo', () => {
       expect(regularFile?.sourceType).toBe('file');
     });
 
-    it('should show all documents in All category (no filtering)', async () => {
+    it('should exclude sourceType=file documents from All category', async () => {
       const results = await knowledgeRepo.query({ category: FilesTabs.All });
 
-      // All category should include everything
-      expect(results.length).toBeGreaterThanOrEqual(6); // 2 files + 4 documents
+      // All category should include files from files table + documents with sourceType != 'file'
+      // 2 files + 2 documents (api-pdf and web-doc)
+      // Excluded: uploaded-pdf and editor-doc both have sourceType='file'
+      expect(results.length).toBe(4);
 
+      // Should NOT include documents with sourceType='file' (globally excluded now)
       const editorDoc = results.find((item) => item.name === 'editor-doc.md');
       const uploadedPdf = results.find((item) => item.name === 'uploaded-pdf.pdf');
+      expect(editorDoc).toBeUndefined();
+      expect(uploadedPdf).toBeUndefined();
 
-      expect(editorDoc).toBeDefined();
-      expect(uploadedPdf).toBeDefined();
+      // Should include documents with sourceType != 'file'
+      const apiPdf = results.find((item) => item.name === 'api-pdf.pdf');
+      const webDoc = results.find((item) => item.name === 'web-doc.txt');
+      expect(apiPdf).toBeDefined();
+      expect(webDoc).toBeDefined();
+
+      // Should include files from files table
+      const regularFile = results.find((item) => item.name === 'regular-pdf-file.pdf');
+      expect(regularFile).toBeDefined();
     });
 
     it('should apply both filters together in Documents category', async () => {

package/packages/database/src/repositories/knowledge/index.ts

@@ -281,7 +281,10 @@ export class KnowledgeRepo {
     q,
     knowledgeBaseId,
   }: QueryFileListParams = {}): ReturnType<typeof sql> {
-    let whereConditions: any[] = [sql`${documents.userId} = ${this.userId}`];
+    let whereConditions: any[] = [
+      sql`${documents.userId} = ${this.userId}`,
+      sql`${documents.sourceType} != ${'file'}`,
+    ];
 
     // Search filter
     if (q) {
@@ -300,12 +303,9 @@ export class KnowledgeRepo {
         );
         whereConditions.push(sql`(${sql.join(orConditions, sql` OR `)})`);
 
-        // Exclude custom/document and source_type='file' from Documents category
+        // Exclude custom/document from Documents category
         if (category === FilesTabs.Documents) {
-          whereConditions.push(
-            sql`${documents.fileType} != ${'custom/document'}`,
-            sql`${documents.sourceType} != ${'file'}`,
-          );
+          whereConditions.push(sql`${documents.fileType} != ${'custom/document'}`);
         }
       } else if (fileTypePrefix) {
         whereConditions.push(sql`${documents.fileType} ILIKE ${`${fileTypePrefix}%`}`);

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

@@ -20,7 +20,7 @@ export const nextauthAccounts = pgTable(
     session_state: text('session_state'),
     token_type: text('token_type'),
     type: text('type').$type<AdapterAccount>().notNull(),
-    userId: text('userId')
+    userId: text('user_id')
       .notNull()
       .references(() => users.id, { onDelete: 'cascade' }),
   },
@@ -40,7 +40,7 @@ export const nextauthAccounts = pgTable(
 export const nextauthSessions = pgTable(`nextauth_sessions`, {
   expires: timestamp('expires', { mode: 'date' }).notNull(),
   sessionToken: text('sessionToken').primaryKey(),
-  userId: text('userId')
+  userId: text('user_id')
     .notNull()
     .references(() => users.id, { onDelete: 'cascade' }),
 });
@@ -77,7 +77,7 @@ export const nextauthAuthenticators = pgTable(
     credentialPublicKey: text('credentialPublicKey').notNull(),
     providerAccountId: text('providerAccountId').notNull(),
     transports: text('transports'),
-    userId: text('userId')
+    userId: text('user_id')
       .notNull()
       .references(() => users.id, { onDelete: 'cascade' }),
   },

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

@@ -49,12 +49,17 @@ export const threads = pgTable(
       .primaryKey(),
 
     title: text('title'),
-    type: text('type', { enum: ['continuation', 'standalone'] }).notNull(),
-    status: text('status', { enum: ['active', 'deprecated', 'archived'] }).default('active'),
+    content: text('content'),
+    editor_data: jsonb('editor_data'),
+    type: text('type', { enum: ['continuation', 'standalone', 'isolation'] }).notNull(),
+    status: text('status', {
+      enum: ['active', 'processing', 'pending', 'inReview', 'todo', 'cancel'],
+    }),
+
     topicId: text('topic_id')
       .references(() => topics.id, { onDelete: 'cascade' })
       .notNull(),
-    sourceMessageId: text('source_message_id').notNull(),
+    sourceMessageId: text('source_message_id'),
     // @ts-ignore
     parentThreadId: text('parent_thread_id').references(() => threads.id, { onDelete: 'set null' }),
     clientId: text('client_id'),

package/packages/types/src/topic/thread.ts

@@ -16,7 +16,7 @@ export interface ThreadItem {
   id: string;
   lastActiveAt: Date;
   parentThreadId?: string;
-  sourceMessageId: string;
+  sourceMessageId?: string | null;
   status: ThreadStatus;
   title: string;
   topicId: string;
@@ -27,7 +27,7 @@ export interface ThreadItem {
 
 export interface CreateThreadParams {
   parentThreadId?: string;
-  sourceMessageId: string;
+  sourceMessageId?: string;
   title?: string;
   topicId: string;
   type: ThreadType;
@@ -35,7 +35,7 @@ export interface CreateThreadParams {
 
 export const createThreadSchema = z.object({
   parentThreadId: z.string().optional(),
-  sourceMessageId: z.string(),
+  sourceMessageId: z.string().optional(),
   title: z.string().optional(),
   topicId: z.string(),
   type: z.nativeEnum(ThreadType),

package/src/store/chat/slices/thread/action.ts

@@ -47,7 +47,7 @@ export interface ChatThreadAction {
     type: ThreadType;
   }) => Promise<{ threadId: string; messageId: string }>;
   openThreadCreator: (messageId: string) => void;
-  openThreadInPortal: (threadId: string, sourceMessageId: string) => void;
+  openThreadInPortal: (threadId: string, sourceMessageId?: string | null) => void;
   closeThreadPortal: () => void;
   useFetchThreads: (enable: boolean, topicId?: string) => SWRResponse<ThreadItem[]>;
   summaryThreadTitle: (threadId: string, messages: UIChatMessage[]) => Promise<void>;

package/src/store/chat/slices/thread/initialState.ts

@@ -20,7 +20,7 @@ export interface ChatThreadState {
   /**
    * when open thread creator, set the message id to it
    */
-  threadStartMessageId?: string;
+  threadStartMessageId?: string | null;
   threadsInit?: boolean;
 }
 

package/src/store/chat/slices/thread/selectors/util.ts

@@ -2,7 +2,7 @@ import { ThreadType, UIChatMessage } from '@lobechat/types';
 
 export const genMessage = (
   messages: UIChatMessage[],
-  startMessageId: string | undefined,
+  startMessageId: string | null | undefined,
   threadMode?: ThreadType,
 ) => {
   if (!startMessageId) return [];