diff --git a/apps/web/src/api/buster_rest/search/requests.ts b/apps/web/src/api/buster_rest/search/requests.ts
index 714a536b3..27a327cc5 100644
--- a/apps/web/src/api/buster_rest/search/requests.ts
+++ b/apps/web/src/api/buster_rest/search/requests.ts
@@ -1,9 +1,10 @@
+import type { AssetType } from '@buster/server-shared/assets';
 import type { BusterSearchResult } from '@/api/asset_interfaces/search';
 import { mainApi } from '../instances';
 
 export const search = async (params: {
   query: string;
-  asset_types: ('dashboard_file' | 'metric_file' | 'collection')[];
+  asset_types: Extract<AssetType, 'dashboard_file' | 'metric_file' | 'collection'>[];
   num_results?: number;
 }) => {
   return mainApi.post<BusterSearchResult[]>('/search', params).then((res) => res.data);
diff --git a/packages/access-controls/src/types/asset-permissions.ts b/packages/access-controls/src/types/asset-permissions.ts
index 32237f370..4e4a50093 100644
--- a/packages/access-controls/src/types/asset-permissions.ts
+++ b/packages/access-controls/src/types/asset-permissions.ts
@@ -1,4 +1,4 @@
-import type { AssetType } from '@buster/database';
+import type { AssetType } from '@buster/database/schema-types';
 import { z } from 'zod';
 
 // Internal types for asset permissions
@@ -7,12 +7,7 @@ export const IdentityTypeSchema = z.enum(['user', 'team', 'organization']);
 export type IdentityType = z.infer<typeof IdentityTypeSchema>;
 
 // Types that support cascading permissions
-export type CascadingAssetType =
-  | 'chat'
-  | 'metric_file'
-  | 'dashboard_file'
-  | 'report_file'
-  | 'collection';
+export type CascadingAssetType = AssetType;
 
 // Permission roles - matching database AssetPermissionRole enum
 export const AssetPermissionRoleSchema = z.enum([
diff --git a/packages/ai/src/tools/communication-tools/done-tool/done-tool-start.ts b/packages/ai/src/tools/communication-tools/done-tool/done-tool-start.ts
index 3aed75577..f900d9b51 100644
--- a/packages/ai/src/tools/communication-tools/done-tool/done-tool-start.ts
+++ b/packages/ai/src/tools/communication-tools/done-tool/done-tool-start.ts
@@ -94,10 +94,7 @@ export function createDoneToolStart(context: DoneToolContext, doneToolState: Don
           try {
             await updateChat(context.chatId, {
               mostRecentFileId: mostRecentFile.id,
-              mostRecentFileType: mostRecentFile.fileType as
-                | 'metric_file'
-                | 'dashboard_file'
-                | 'report_file',
+              mostRecentFileType: mostRecentFile.fileType,
               mostRecentVersionNumber: mostRecentFile.versionNumber || 1,
             });
           } catch (error) {