diff --git a/apps/server/src/api/v2/datasets/[id]/index.ts b/apps/server/src/api/v2/datasets/[id]/index.ts
index a93794be8..7fd63be95 100644
--- a/apps/server/src/api/v2/datasets/[id]/index.ts
+++ b/apps/server/src/api/v2/datasets/[id]/index.ts
@@ -1,4 +1,4 @@
-import type { User } from '@buster/database';
+import type { User } from '@buster/database/queries';
 import { Hono } from 'hono';
 import { sample } from './sample';
 
diff --git a/apps/server/src/api/v2/datasets/[id]/sample/GET.ts b/apps/server/src/api/v2/datasets/[id]/sample/GET.ts
index f43831773..aea008ef0 100644
--- a/apps/server/src/api/v2/datasets/[id]/sample/GET.ts
+++ b/apps/server/src/api/v2/datasets/[id]/sample/GET.ts
@@ -1,4 +1,4 @@
-import type { User } from '@buster/database';
+import type { User } from '@buster/database/queries';
 import { GetDatasetSampleParamsSchema } from '@buster/server-shared';
 import type { GetDatasetSampleResponse } from '@buster/server-shared';
 import { zValidator } from '@hono/zod-validator';
diff --git a/apps/server/src/api/v2/datasets/[id]/sample/get-dataset-sample.ts b/apps/server/src/api/v2/datasets/[id]/sample/get-dataset-sample.ts
index a9bbc640d..2b72bc097 100644
--- a/apps/server/src/api/v2/datasets/[id]/sample/get-dataset-sample.ts
+++ b/apps/server/src/api/v2/datasets/[id]/sample/get-dataset-sample.ts
@@ -1,8 +1,8 @@
 import { AccessControlError, ensureDatasetAccess } from '@buster/access-controls';
 import { executeSampleQuery } from '@buster/data-source';
 import type { Credentials } from '@buster/data-source';
-import type { User } from '@buster/database';
-import { getDataSourceById, getDataSourceCredentials } from '@buster/database';
+import type { User } from '@buster/database/queries';
+import { getDataSourceById, getDataSourceCredentials } from '@buster/database/queries';
 import { ModelSchema } from '@buster/server-shared';
 import type { GetDatasetSampleResponse } from '@buster/server-shared';
 import { HTTPException } from 'hono/http-exception';
diff --git a/apps/server/src/api/v2/datasets/[id]/sample/index.ts b/apps/server/src/api/v2/datasets/[id]/sample/index.ts
index 40bf24237..a5c8255de 100644
--- a/apps/server/src/api/v2/datasets/[id]/sample/index.ts
+++ b/apps/server/src/api/v2/datasets/[id]/sample/index.ts
@@ -1,4 +1,4 @@
-import type { User } from '@buster/database';
+import type { User } from '@buster/database/queries';
 import { Hono } from 'hono';
 import { requireAuth } from '../../../../../middleware/auth';
 import { GET } from './GET';
diff --git a/apps/trigger/package.json b/apps/trigger/package.json
index f28ef0a49..09ccafedc 100644
--- a/apps/trigger/package.json
+++ b/apps/trigger/package.json
@@ -46,4 +46,4 @@
   "devDependencies": {
     "@trigger.dev/build": "4.0.4"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/ai/src/tools/communication-tools/done-tool/done-tool-streaming.test.ts b/packages/ai/src/tools/communication-tools/done-tool/done-tool-streaming.test.ts
index ce203556b..36eae4a2a 100644
--- a/packages/ai/src/tools/communication-tools/done-tool/done-tool-streaming.test.ts
+++ b/packages/ai/src/tools/communication-tools/done-tool/done-tool-streaming.test.ts
@@ -201,11 +201,12 @@ describe('Done Tool Streaming Tests', () => {
       // No file response messages should be created for report-only case
       const fileResponseCallWithFiles = (
         queries.updateMessageEntries as unknown as { mock: { calls: [Record<string, any>][] } }
-      ).mock.calls.find((c) =>
-        Array.isArray((c[0] as { responseMessages?: unknown[] }).responseMessages) &&
-        ((c[0] as { responseMessages?: { type?: string }[] }).responseMessages || []).some(
-          (m) => m?.type === 'file'
-        )
+      ).mock.calls.find(
+        (c) =>
+          Array.isArray((c[0] as { responseMessages?: unknown[] }).responseMessages) &&
+          ((c[0] as { responseMessages?: { type?: string }[] }).responseMessages || []).some(
+            (m) => m?.type === 'file'
+          )
       );
       expect(fileResponseCallWithFiles).toBeUndefined();
     });
@@ -297,16 +298,18 @@ describe('Done Tool Streaming Tests', () => {
       // Response messages should include the metric file
       const fileResponseCall = (
         queries.updateMessageEntries as unknown as { mock: { calls: [Record<string, any>][] } }
-      ).mock.calls.find((c) =>
-        Array.isArray((c[0] as { responseMessages?: unknown[] }).responseMessages) &&
-        ((c[0] as { responseMessages?: { type?: string }[] }).responseMessages || []).some(
-          (m) => m?.type === 'file'
-        )
+      ).mock.calls.find(
+        (c) =>
+          Array.isArray((c[0] as { responseMessages?: unknown[] }).responseMessages) &&
+          ((c[0] as { responseMessages?: { type?: string }[] }).responseMessages || []).some(
+            (m) => m?.type === 'file'
+          )
       );
 
       expect(fileResponseCall).toBeDefined();
-      const responseMessages = (fileResponseCall?.[0] as { responseMessages?: Record<string, any>[] })
-        ?.responseMessages as Record<string, any>[];
+      const responseMessages = (
+        fileResponseCall?.[0] as { responseMessages?: Record<string, any>[] }
+      )?.responseMessages as Record<string, any>[];
       const metricResponse = responseMessages?.find((m) => m.id === metricId);
       expect(metricResponse).toBeDefined();
       expect(metricResponse?.file_type).toBe('metric_file');