@mastra/libsql 0.10.2-alpha.1 → 0.10.2-alpha.2

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/libsql@0.10.2-alpha.1 build /home/runner/work/mastra/mastra/stores/libsql
+> @mastra/libsql@0.10.2-alpha.2 build /home/runner/work/mastra/mastra/stores/libsql
 > tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.0
 TSC Build start
-TSC ⚡️ Build success in 10122ms
+TSC ⚡️ Build success in 9592ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/stores/libsql/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/stores/libsql/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 11851ms
+DTS ⚡️ Build success in 10548ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.js 57.43 KB
-ESM ⚡️ Build success in 1740ms
-CJS dist/index.cjs 57.72 KB
-CJS ⚡️ Build success in 1740ms
+ESM dist/index.js 58.54 KB
+ESM ⚡️ Build success in 1646ms
+CJS dist/index.cjs 58.83 KB
+CJS ⚡️ Build success in 1647ms

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @mastra/libsql
 
+## 0.10.2-alpha.2
+
+### Patch Changes
+
+- 48eddb9: update filter logic in Memory class to support semantic recall search scope
+- Updated dependencies [48eddb9]
+  - @mastra/core@0.10.4-alpha.2
+
 ## 0.10.2-alpha.1
 
 ### Patch Changes

package/dist/_tsup-dts-rollup.d.cts

@@ -84,6 +84,9 @@ declare class LibSQLStore extends MastraStorage {
     private readonly maxRetries;
     private readonly initialBackoffMs;
     constructor(config: LibSQLConfig);
+    get supports(): {
+        selectByIncludeResourceScope: boolean;
+    };
     private getCreateTableSQL;
     createTable({ tableName, schema, }: {
         tableName: TABLE_NAMES;

package/dist/_tsup-dts-rollup.d.ts

@@ -84,6 +84,9 @@ declare class LibSQLStore extends MastraStorage {
     private readonly maxRetries;
     private readonly initialBackoffMs;
     constructor(config: LibSQLConfig);
+    get supports(): {
+        selectByIncludeResourceScope: boolean;
+    };
     private getCreateTableSQL;
     createTable({ tableName, schema, }: {
         tableName: TABLE_NAMES;

package/dist/index.cjs

@@ -818,6 +818,11 @@ var LibSQLStore = class extends storage.MastraStorage {
       this.client.execute("PRAGMA busy_timeout = 5000;").then(() => this.logger.debug("LibSQLStore: PRAGMA busy_timeout=5000 set.")).catch((err) => this.logger.warn("LibSQLStore: Failed to set PRAGMA busy_timeout.", err));
     }
   }
+  get supports() {
+    return {
+      selectByIncludeResourceScope: true
+    };
+  }
   getCreateTableSQL(tableName, schema) {
     const parsedTableName = utils.parseSqlIdentifier(tableName, "table name");
     const columns = Object.entries(schema).map(([name, col]) => {
@@ -1148,35 +1153,55 @@ var LibSQLStore = class extends storage.MastraStorage {
     if (row.type && row.type !== `v2`) result.type = row.type;
     return result;
   }
-  async _getIncludedMessages(threadId, selectBy) {
+  async _getIncludedMessages({
+    threadId,
+    selectBy
+  }) {
     const include = selectBy?.include;
     if (!include) return null;
-    const includeIds = include.map((i) => i.id);
-    const maxPrev = Math.max(...include.map((i) => i.withPreviousMessages || 0));
-    const maxNext = Math.max(...include.map((i) => i.withNextMessages || 0));
-    const includeResult = await this.client.execute({
-      sql: `
-          WITH numbered_messages AS (
-            SELECT 
-              id, content, role, type, "createdAt", thread_id,
-              ROW_NUMBER() OVER (ORDER BY "createdAt" ASC) as row_num
-            FROM "${storage.TABLE_MESSAGES}"
-            WHERE thread_id = ?
-          ),
-          target_positions AS (
-            SELECT row_num as target_pos
-            FROM numbered_messages
-            WHERE id IN (${includeIds.map(() => "?").join(", ")})
-          )
-          SELECT DISTINCT m.*
-          FROM numbered_messages m
-          CROSS JOIN target_positions t
-          WHERE m.row_num BETWEEN (t.target_pos - ?) AND (t.target_pos + ?)
-          ORDER BY m."createdAt" ASC
-        `,
-      args: [threadId, ...includeIds, maxPrev, maxNext]
-    });
-    return includeResult.rows?.map((row) => this.parseRow(row));
+    const unionQueries = [];
+    const params = [];
+    for (const inc of include) {
+      const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
+      const searchId = inc.threadId || threadId;
+      unionQueries.push(
+        `
+            SELECT * FROM (
+              WITH numbered_messages AS (
+                SELECT
+                  id, content, role, type, "createdAt", thread_id, "resourceId",
+                  ROW_NUMBER() OVER (ORDER BY "createdAt" ASC) as row_num
+                FROM "${storage.TABLE_MESSAGES}"
+                WHERE thread_id = ?
+              ),
+              target_positions AS (
+                SELECT row_num as target_pos
+                FROM numbered_messages
+                WHERE id = ?
+              )
+              SELECT DISTINCT m.*
+              FROM numbered_messages m
+              CROSS JOIN target_positions t
+              WHERE m.row_num BETWEEN (t.target_pos - ?) AND (t.target_pos + ?)
+            ) 
+            `
+        // Keep ASC for final sorting after fetching context
+      );
+      params.push(searchId, id, withPreviousMessages, withNextMessages);
+    }
+    const finalQuery = unionQueries.join(" UNION ALL ") + ' ORDER BY "createdAt" ASC';
+    const includedResult = await this.client.execute({ sql: finalQuery, args: params });
+    const includedRows = includedResult.rows?.map((row) => this.parseRow(row));
+    const dedupedRows = Object.values(
+      includedRows.reduce(
+        (acc, row) => {
+          acc[row.id] = row;
+          return acc;
+        },
+        {}
+      )
+    );
+    return dedupedRows;
   }
   async getMessages({
     threadId,
@@ -1187,19 +1212,27 @@ var LibSQLStore = class extends storage.MastraStorage {
       const messages = [];
       const limit = typeof selectBy?.last === `number` ? selectBy.last : 40;
       if (selectBy?.include?.length) {
-        const includeMessages = await this._getIncludedMessages(threadId, selectBy);
+        const includeMessages = await this._getIncludedMessages({ threadId, selectBy });
         if (includeMessages) {
           messages.push(...includeMessages);
         }
       }
       const excludeIds = messages.map((m) => m.id);
       const remainingSql = `
-          SELECT id, content, role, type, "createdAt", thread_id
-          FROM "${storage.TABLE_MESSAGES}"
-          WHERE thread_id = ?
-          ${excludeIds.length ? `AND id NOT IN (${excludeIds.map(() => "?").join(", ")})` : ""}
-          ORDER BY "createdAt" DESC LIMIT ?
-        `;
+        SELECT 
+          id, 
+          content, 
+          role, 
+          type,
+          "createdAt", 
+          thread_id,
+          "resourceId"
+        FROM "${storage.TABLE_MESSAGES}"
+        WHERE thread_id = ?
+        ${excludeIds.length ? `AND id NOT IN (${excludeIds.map(() => "?").join(", ")})` : ""}
+        ORDER BY "createdAt" DESC
+        LIMIT ?
+      `;
       const remainingArgs = [threadId, ...excludeIds.length ? excludeIds : [], limit];
       const remainingResult = await this.client.execute({ sql: remainingSql, args: remainingArgs });
       if (remainingResult.rows) {
@@ -1221,7 +1254,7 @@ var LibSQLStore = class extends storage.MastraStorage {
     const toDate = dateRange?.end;
     const messages = [];
     if (selectBy?.include?.length) {
-      const includeMessages = await this._getIncludedMessages(threadId, selectBy);
+      const includeMessages = await this._getIncludedMessages({ threadId, selectBy });
       if (includeMessages) {
         messages.push(...includeMessages);
       }
@@ -1283,16 +1316,27 @@ var LibSQLStore = class extends storage.MastraStorage {
       }
       const batchStatements = messages.map((message) => {
         const time = message.createdAt || /* @__PURE__ */ new Date();
+        if (!message.threadId) {
+          throw new Error(
+            `Expected to find a threadId for message, but couldn't find one. An unexpected error has occurred.`
+          );
+        }
+        if (!message.resourceId) {
+          throw new Error(
+            `Expected to find a resourceId for message, but couldn't find one. An unexpected error has occurred.`
+          );
+        }
         return {
-          sql: `INSERT INTO ${storage.TABLE_MESSAGES} (id, thread_id, content, role, type, createdAt) 
-                VALUES (?, ?, ?, ?, ?, ?)`,
+          sql: `INSERT INTO ${storage.TABLE_MESSAGES} (id, thread_id, content, role, type, createdAt, resourceId) 
+                VALUES (?, ?, ?, ?, ?, ?, ?)`,
           args: [
             message.id,
-            threadId,
+            message.threadId,
             typeof message.content === "object" ? JSON.stringify(message.content) : message.content,
             message.role,
             message.type || "v2",
-            time instanceof Date ? time.toISOString() : time
+            time instanceof Date ? time.toISOString() : time,
+            message.resourceId
           ]
         };
       });

package/dist/index.js

@@ -816,6 +816,11 @@ var LibSQLStore = class extends MastraStorage {
       this.client.execute("PRAGMA busy_timeout = 5000;").then(() => this.logger.debug("LibSQLStore: PRAGMA busy_timeout=5000 set.")).catch((err) => this.logger.warn("LibSQLStore: Failed to set PRAGMA busy_timeout.", err));
     }
   }
+  get supports() {
+    return {
+      selectByIncludeResourceScope: true
+    };
+  }
   getCreateTableSQL(tableName, schema) {
     const parsedTableName = parseSqlIdentifier(tableName, "table name");
     const columns = Object.entries(schema).map(([name, col]) => {
@@ -1146,35 +1151,55 @@ var LibSQLStore = class extends MastraStorage {
     if (row.type && row.type !== `v2`) result.type = row.type;
     return result;
   }
-  async _getIncludedMessages(threadId, selectBy) {
+  async _getIncludedMessages({
+    threadId,
+    selectBy
+  }) {
     const include = selectBy?.include;
     if (!include) return null;
-    const includeIds = include.map((i) => i.id);
-    const maxPrev = Math.max(...include.map((i) => i.withPreviousMessages || 0));
-    const maxNext = Math.max(...include.map((i) => i.withNextMessages || 0));
-    const includeResult = await this.client.execute({
-      sql: `
-          WITH numbered_messages AS (
-            SELECT 
-              id, content, role, type, "createdAt", thread_id,
-              ROW_NUMBER() OVER (ORDER BY "createdAt" ASC) as row_num
-            FROM "${TABLE_MESSAGES}"
-            WHERE thread_id = ?
-          ),
-          target_positions AS (
-            SELECT row_num as target_pos
-            FROM numbered_messages
-            WHERE id IN (${includeIds.map(() => "?").join(", ")})
-          )
-          SELECT DISTINCT m.*
-          FROM numbered_messages m
-          CROSS JOIN target_positions t
-          WHERE m.row_num BETWEEN (t.target_pos - ?) AND (t.target_pos + ?)
-          ORDER BY m."createdAt" ASC
-        `,
-      args: [threadId, ...includeIds, maxPrev, maxNext]
-    });
-    return includeResult.rows?.map((row) => this.parseRow(row));
+    const unionQueries = [];
+    const params = [];
+    for (const inc of include) {
+      const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
+      const searchId = inc.threadId || threadId;
+      unionQueries.push(
+        `
+            SELECT * FROM (
+              WITH numbered_messages AS (
+                SELECT
+                  id, content, role, type, "createdAt", thread_id, "resourceId",
+                  ROW_NUMBER() OVER (ORDER BY "createdAt" ASC) as row_num
+                FROM "${TABLE_MESSAGES}"
+                WHERE thread_id = ?
+              ),
+              target_positions AS (
+                SELECT row_num as target_pos
+                FROM numbered_messages
+                WHERE id = ?
+              )
+              SELECT DISTINCT m.*
+              FROM numbered_messages m
+              CROSS JOIN target_positions t
+              WHERE m.row_num BETWEEN (t.target_pos - ?) AND (t.target_pos + ?)
+            ) 
+            `
+        // Keep ASC for final sorting after fetching context
+      );
+      params.push(searchId, id, withPreviousMessages, withNextMessages);
+    }
+    const finalQuery = unionQueries.join(" UNION ALL ") + ' ORDER BY "createdAt" ASC';
+    const includedResult = await this.client.execute({ sql: finalQuery, args: params });
+    const includedRows = includedResult.rows?.map((row) => this.parseRow(row));
+    const dedupedRows = Object.values(
+      includedRows.reduce(
+        (acc, row) => {
+          acc[row.id] = row;
+          return acc;
+        },
+        {}
+      )
+    );
+    return dedupedRows;
   }
   async getMessages({
     threadId,
@@ -1185,19 +1210,27 @@ var LibSQLStore = class extends MastraStorage {
       const messages = [];
       const limit = typeof selectBy?.last === `number` ? selectBy.last : 40;
       if (selectBy?.include?.length) {
-        const includeMessages = await this._getIncludedMessages(threadId, selectBy);
+        const includeMessages = await this._getIncludedMessages({ threadId, selectBy });
         if (includeMessages) {
           messages.push(...includeMessages);
         }
       }
       const excludeIds = messages.map((m) => m.id);
       const remainingSql = `
-          SELECT id, content, role, type, "createdAt", thread_id
-          FROM "${TABLE_MESSAGES}"
-          WHERE thread_id = ?
-          ${excludeIds.length ? `AND id NOT IN (${excludeIds.map(() => "?").join(", ")})` : ""}
-          ORDER BY "createdAt" DESC LIMIT ?
-        `;
+        SELECT 
+          id, 
+          content, 
+          role, 
+          type,
+          "createdAt", 
+          thread_id,
+          "resourceId"
+        FROM "${TABLE_MESSAGES}"
+        WHERE thread_id = ?
+        ${excludeIds.length ? `AND id NOT IN (${excludeIds.map(() => "?").join(", ")})` : ""}
+        ORDER BY "createdAt" DESC
+        LIMIT ?
+      `;
       const remainingArgs = [threadId, ...excludeIds.length ? excludeIds : [], limit];
       const remainingResult = await this.client.execute({ sql: remainingSql, args: remainingArgs });
       if (remainingResult.rows) {
@@ -1219,7 +1252,7 @@ var LibSQLStore = class extends MastraStorage {
     const toDate = dateRange?.end;
     const messages = [];
     if (selectBy?.include?.length) {
-      const includeMessages = await this._getIncludedMessages(threadId, selectBy);
+      const includeMessages = await this._getIncludedMessages({ threadId, selectBy });
       if (includeMessages) {
         messages.push(...includeMessages);
       }
@@ -1281,16 +1314,27 @@ var LibSQLStore = class extends MastraStorage {
       }
       const batchStatements = messages.map((message) => {
         const time = message.createdAt || /* @__PURE__ */ new Date();
+        if (!message.threadId) {
+          throw new Error(
+            `Expected to find a threadId for message, but couldn't find one. An unexpected error has occurred.`
+          );
+        }
+        if (!message.resourceId) {
+          throw new Error(
+            `Expected to find a resourceId for message, but couldn't find one. An unexpected error has occurred.`
+          );
+        }
         return {
-          sql: `INSERT INTO ${TABLE_MESSAGES} (id, thread_id, content, role, type, createdAt) 
-                VALUES (?, ?, ?, ?, ?, ?)`,
+          sql: `INSERT INTO ${TABLE_MESSAGES} (id, thread_id, content, role, type, createdAt, resourceId) 
+                VALUES (?, ?, ?, ?, ?, ?, ?)`,
           args: [
             message.id,
-            threadId,
+            message.threadId,
             typeof message.content === "object" ? JSON.stringify(message.content) : message.content,
             message.role,
             message.type || "v2",
-            time instanceof Date ? time.toISOString() : time
+            time instanceof Date ? time.toISOString() : time,
+            message.resourceId
           ]
         };
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/libsql",
-  "version": "0.10.2-alpha.1",
+  "version": "0.10.2-alpha.2",
   "description": "Libsql provider for Mastra - includes both vector and db storage capabilities",
   "type": "module",
   "main": "dist/index.js",
@@ -29,9 +29,9 @@
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
     "vitest": "^3.2.2",
-    "@mastra/core": "0.10.4-alpha.1",
-    "@internal/storage-test-utils": "0.0.6",
-    "@internal/lint": "0.0.10"
+    "@internal/lint": "0.0.10",
+    "@mastra/core": "0.10.4-alpha.2",
+    "@internal/storage-test-utils": "0.0.6"
   },
   "peerDependencies": {
     "@mastra/core": "^0.10.2-alpha.0"

package/src/storage/index.ts

@@ -81,6 +81,14 @@ export class LibSQLStore extends MastraStorage {
     }
   }
 
+  public get supports(): {
+    selectByIncludeResourceScope: boolean;
+  } {
+    return {
+      selectByIncludeResourceScope: true,
+    };
+  }
+
   private getCreateTableSQL(tableName: TABLE_NAMES, schema: Record<string, StorageColumn>): string {
     const parsedTableName = parseSqlIdentifier(tableName, 'table name');
     const columns = Object.entries(schema).map(([name, col]) => {
@@ -476,7 +484,6 @@ export class LibSQLStore extends MastraStorage {
       sql: `DELETE FROM ${TABLE_MESSAGES} WHERE thread_id = ?`,
       args: [threadId],
     });
-
     await this.client.execute({
       sql: `DELETE FROM ${TABLE_THREADS} WHERE id = ?`,
       args: [threadId],
@@ -503,37 +510,60 @@ export class LibSQLStore extends MastraStorage {
     return result;
   }
 
-  private async _getIncludedMessages(threadId: string, selectBy: StorageGetMessagesArg['selectBy']) {
+  private async _getIncludedMessages({
+    threadId,
+    selectBy,
+  }: {
+    threadId: string;
+    selectBy: StorageGetMessagesArg['selectBy'];
+  }) {
     const include = selectBy?.include;
     if (!include) return null;
 
-    const includeIds = include.map(i => i.id);
-    const maxPrev = Math.max(...include.map(i => i.withPreviousMessages || 0));
-    const maxNext = Math.max(...include.map(i => i.withNextMessages || 0));
-
-    const includeResult = await this.client.execute({
-      sql: `
-          WITH numbered_messages AS (
-            SELECT 
-              id, content, role, type, "createdAt", thread_id,
-              ROW_NUMBER() OVER (ORDER BY "createdAt" ASC) as row_num
-            FROM "${TABLE_MESSAGES}"
-            WHERE thread_id = ?
-          ),
-          target_positions AS (
-            SELECT row_num as target_pos
-            FROM numbered_messages
-            WHERE id IN (${includeIds.map(() => '?').join(', ')})
-          )
-          SELECT DISTINCT m.*
-          FROM numbered_messages m
-          CROSS JOIN target_positions t
-          WHERE m.row_num BETWEEN (t.target_pos - ?) AND (t.target_pos + ?)
-          ORDER BY m."createdAt" ASC
-        `,
-      args: [threadId, ...includeIds, maxPrev, maxNext],
-    });
-    return includeResult.rows?.map((row: any) => this.parseRow(row));
+    const unionQueries: string[] = [];
+    const params: any[] = [];
+
+    for (const inc of include) {
+      const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
+      // if threadId is provided, use it, otherwise use threadId from args
+      const searchId = inc.threadId || threadId;
+      unionQueries.push(
+        `
+            SELECT * FROM (
+              WITH numbered_messages AS (
+                SELECT
+                  id, content, role, type, "createdAt", thread_id, "resourceId",
+                  ROW_NUMBER() OVER (ORDER BY "createdAt" ASC) as row_num
+                FROM "${TABLE_MESSAGES}"
+                WHERE thread_id = ?
+              ),
+              target_positions AS (
+                SELECT row_num as target_pos
+                FROM numbered_messages
+                WHERE id = ?
+              )
+              SELECT DISTINCT m.*
+              FROM numbered_messages m
+              CROSS JOIN target_positions t
+              WHERE m.row_num BETWEEN (t.target_pos - ?) AND (t.target_pos + ?)
+            ) 
+            `, // Keep ASC for final sorting after fetching context
+      );
+      params.push(searchId, id, withPreviousMessages, withNextMessages);
+    }
+    const finalQuery = unionQueries.join(' UNION ALL ') + ' ORDER BY "createdAt" ASC';
+    const includedResult = await this.client.execute({ sql: finalQuery, args: params });
+    const includedRows = includedResult.rows?.map(row => this.parseRow(row));
+    const dedupedRows = Object.values(
+      includedRows.reduce(
+        (acc, row) => {
+          acc[row.id] = row;
+          return acc;
+        },
+        {} as Record<string, MastraMessageV2>,
+      ),
+    );
+    return dedupedRows;
   }
 
   /**
@@ -553,7 +583,7 @@ export class LibSQLStore extends MastraStorage {
       const limit = typeof selectBy?.last === `number` ? selectBy.last : 40;
 
       if (selectBy?.include?.length) {
-        const includeMessages = await this._getIncludedMessages(threadId, selectBy);
+        const includeMessages = await this._getIncludedMessages({ threadId, selectBy });
         if (includeMessages) {
           messages.push(...includeMessages);
         }
@@ -561,12 +591,20 @@ export class LibSQLStore extends MastraStorage {
 
       const excludeIds = messages.map(m => m.id);
       const remainingSql = `
-          SELECT id, content, role, type, "createdAt", thread_id
-          FROM "${TABLE_MESSAGES}"
-          WHERE thread_id = ?
-          ${excludeIds.length ? `AND id NOT IN (${excludeIds.map(() => '?').join(', ')})` : ''}
-          ORDER BY "createdAt" DESC LIMIT ?
-        `;
+        SELECT 
+          id, 
+          content, 
+          role, 
+          type,
+          "createdAt", 
+          thread_id,
+          "resourceId"
+        FROM "${TABLE_MESSAGES}"
+        WHERE thread_id = ?
+        ${excludeIds.length ? `AND id NOT IN (${excludeIds.map(() => '?').join(', ')})` : ''}
+        ORDER BY "createdAt" DESC
+        LIMIT ?
+      `;
       const remainingArgs = [threadId, ...(excludeIds.length ? excludeIds : []), limit];
       const remainingResult = await this.client.execute({ sql: remainingSql, args: remainingArgs });
       if (remainingResult.rows) {
@@ -595,7 +633,7 @@ export class LibSQLStore extends MastraStorage {
     const messages: MastraMessageV2[] = [];
 
     if (selectBy?.include?.length) {
-      const includeMessages = await this._getIncludedMessages(threadId, selectBy);
+      const includeMessages = await this._getIncludedMessages({ threadId, selectBy });
       if (includeMessages) {
         messages.push(...includeMessages);
       }
@@ -677,16 +715,27 @@ export class LibSQLStore extends MastraStorage {
       // Prepare batch statements for all messages
       const batchStatements = messages.map(message => {
         const time = message.createdAt || new Date();
+        if (!message.threadId) {
+          throw new Error(
+            `Expected to find a threadId for message, but couldn't find one. An unexpected error has occurred.`,
+          );
+        }
+        if (!message.resourceId) {
+          throw new Error(
+            `Expected to find a resourceId for message, but couldn't find one. An unexpected error has occurred.`,
+          );
+        }
         return {
-          sql: `INSERT INTO ${TABLE_MESSAGES} (id, thread_id, content, role, type, createdAt) 
-                VALUES (?, ?, ?, ?, ?, ?)`,
+          sql: `INSERT INTO ${TABLE_MESSAGES} (id, thread_id, content, role, type, createdAt, resourceId) 
+                VALUES (?, ?, ?, ?, ?, ?, ?)`,
           args: [
             message.id,
-            threadId,
+            message.threadId!,
             typeof message.content === 'object' ? JSON.stringify(message.content) : message.content,
             message.role,
             message.type || 'v2',
             time instanceof Date ? time.toISOString() : time,
+            message.resourceId,
           ],
         };
       });