diff --git a/.agents/skills/cli-public/references/construct-blueprint.md b/.agents/skills/cli-public/references/construct-blueprint.md
index 222f6ddbb..b7ccad570 100644
--- a/.agents/skills/cli-public/references/construct-blueprint.md
+++ b/.agents/skills/cli-public/references/construct-blueprint.md
@@ -2,7 +2,7 @@
 
 <!-- @constructive-io/graphql-codegen - DO NOT EDIT -->
 
-Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
+Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
 
 ## Usage
 
diff --git a/.agents/skills/hooks-public/references/construct-blueprint.md b/.agents/skills/hooks-public/references/construct-blueprint.md
index 4a7f9d488..084fb629f 100644
--- a/.agents/skills/hooks-public/references/construct-blueprint.md
+++ b/.agents/skills/hooks-public/references/construct-blueprint.md
@@ -2,7 +2,7 @@
 
 <!-- @constructive-io/graphql-codegen - DO NOT EDIT -->
 
-Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
+Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
 
 ## Usage
 
diff --git a/.agents/skills/orm-public/references/construct-blueprint.md b/.agents/skills/orm-public/references/construct-blueprint.md
index f701a985b..f99df061b 100644
--- a/.agents/skills/orm-public/references/construct-blueprint.md
+++ b/.agents/skills/orm-public/references/construct-blueprint.md
@@ -2,7 +2,7 @@
 
 <!-- @constructive-io/graphql-codegen - DO NOT EDIT -->
 
-Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
+Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
 
 ## Usage
 
diff --git a/sdk/constructive-cli/src/admin/cli/commands/app-achievement.ts b/sdk/constructive-cli/src/admin/cli/commands/app-achievement.ts
index 103d9d6aa..040c863a9 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/app-achievement.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/app-achievement.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppAchievementSelect, AppAchievementFilter, never, AppAchievementOrderBy> & {
+      FindManyArgs<AppAchievementSelect, AppAchievementFilter, AppAchievementOrderBy> & {
         select: AppAchievementSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppAchievementSelect, AppAchievementFilter, never> & {
+      FindFirstArgs<AppAchievementSelect, AppAchievementFilter> & {
         select: AppAchievementSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/app-admin-grant.ts b/sdk/constructive-cli/src/admin/cli/commands/app-admin-grant.ts
index 502b8b80b..e30b63954 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/app-admin-grant.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/app-admin-grant.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppAdminGrantSelect, AppAdminGrantFilter, never, AppAdminGrantOrderBy> & {
+      FindManyArgs<AppAdminGrantSelect, AppAdminGrantFilter, AppAdminGrantOrderBy> & {
         select: AppAdminGrantSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppAdminGrantSelect, AppAdminGrantFilter, never> & {
+      FindFirstArgs<AppAdminGrantSelect, AppAdminGrantFilter> & {
         select: AppAdminGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/app-grant.ts b/sdk/constructive-cli/src/admin/cli/commands/app-grant.ts
index 5d49497b5..961288ffa 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/app-grant.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/app-grant.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppGrantSelect, AppGrantFilter, never, AppGrantOrderBy> & {
+      FindManyArgs<AppGrantSelect, AppGrantFilter, AppGrantOrderBy> & {
         select: AppGrantSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppGrantSelect, AppGrantFilter, never> & {
+      FindFirstArgs<AppGrantSelect, AppGrantFilter> & {
         select: AppGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/app-level-requirement.ts b/sdk/constructive-cli/src/admin/cli/commands/app-level-requirement.ts
index 09a1ca603..dcad1ad7c 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/app-level-requirement.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/app-level-requirement.ts
@@ -89,7 +89,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         AppLevelRequirementSelect,
         AppLevelRequirementFilter,
-        never,
         AppLevelRequirementOrderBy
       > & {
         select: AppLevelRequirementSelect;
@@ -119,7 +118,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppLevelRequirementSelect, AppLevelRequirementFilter, never> & {
+      FindFirstArgs<AppLevelRequirementSelect, AppLevelRequirementFilter> & {
         select: AppLevelRequirementSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/app-level.ts b/sdk/constructive-cli/src/admin/cli/commands/app-level.ts
index 5f5cadf30..fd5b9d9e6 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/app-level.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/app-level.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppLevelSelect, AppLevelFilter, never, AppLevelOrderBy> & {
+      FindManyArgs<AppLevelSelect, AppLevelFilter, AppLevelOrderBy> & {
         select: AppLevelSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppLevelSelect, AppLevelFilter, never> & {
+      FindFirstArgs<AppLevelSelect, AppLevelFilter> & {
         select: AppLevelSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/app-limit-default.ts b/sdk/constructive-cli/src/admin/cli/commands/app-limit-default.ts
index 6894a28e4..0cf146154 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/app-limit-default.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/app-limit-default.ts
@@ -76,7 +76,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       max: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppLimitDefaultSelect, AppLimitDefaultFilter, never, AppLimitDefaultOrderBy> & {
+      FindManyArgs<AppLimitDefaultSelect, AppLimitDefaultFilter, AppLimitDefaultOrderBy> & {
         select: AppLimitDefaultSelect;
       }
     >(argv, defaultSelect);
@@ -99,7 +99,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       max: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppLimitDefaultSelect, AppLimitDefaultFilter, never> & {
+      FindFirstArgs<AppLimitDefaultSelect, AppLimitDefaultFilter> & {
         select: AppLimitDefaultSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/app-limit.ts b/sdk/constructive-cli/src/admin/cli/commands/app-limit.ts
index 715ec43b7..ef31b6337 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/app-limit.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/app-limit.ts
@@ -80,7 +80,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       max: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppLimitSelect, AppLimitFilter, never, AppLimitOrderBy> & {
+      FindManyArgs<AppLimitSelect, AppLimitFilter, AppLimitOrderBy> & {
         select: AppLimitSelect;
       }
     >(argv, defaultSelect);
@@ -105,7 +105,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       max: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppLimitSelect, AppLimitFilter, never> & {
+      FindFirstArgs<AppLimitSelect, AppLimitFilter> & {
         select: AppLimitSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/app-membership-default.ts b/sdk/constructive-cli/src/admin/cli/commands/app-membership-default.ts
index ca4257671..31b53fded 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/app-membership-default.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/app-membership-default.ts
@@ -87,7 +87,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         AppMembershipDefaultSelect,
         AppMembershipDefaultFilter,
-        never,
         AppMembershipDefaultOrderBy
       > & {
         select: AppMembershipDefaultSelect;
@@ -116,7 +115,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       isVerified: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppMembershipDefaultSelect, AppMembershipDefaultFilter, never> & {
+      FindFirstArgs<AppMembershipDefaultSelect, AppMembershipDefaultFilter> & {
         select: AppMembershipDefaultSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/app-membership.ts b/sdk/constructive-cli/src/admin/cli/commands/app-membership.ts
index 8d960a914..d463fd934 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/app-membership.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/app-membership.ts
@@ -102,7 +102,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       profileId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppMembershipSelect, AppMembershipFilter, never, AppMembershipOrderBy> & {
+      FindManyArgs<AppMembershipSelect, AppMembershipFilter, AppMembershipOrderBy> & {
         select: AppMembershipSelect;
       }
     >(argv, defaultSelect);
@@ -138,7 +138,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       profileId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppMembershipSelect, AppMembershipFilter, never> & {
+      FindFirstArgs<AppMembershipSelect, AppMembershipFilter> & {
         select: AppMembershipSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/app-owner-grant.ts b/sdk/constructive-cli/src/admin/cli/commands/app-owner-grant.ts
index c459e0a07..b8189a180 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/app-owner-grant.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/app-owner-grant.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppOwnerGrantSelect, AppOwnerGrantFilter, never, AppOwnerGrantOrderBy> & {
+      FindManyArgs<AppOwnerGrantSelect, AppOwnerGrantFilter, AppOwnerGrantOrderBy> & {
         select: AppOwnerGrantSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppOwnerGrantSelect, AppOwnerGrantFilter, never> & {
+      FindFirstArgs<AppOwnerGrantSelect, AppOwnerGrantFilter> & {
         select: AppOwnerGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/app-permission-default.ts b/sdk/constructive-cli/src/admin/cli/commands/app-permission-default.ts
index c25b842a3..02ba19499 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/app-permission-default.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/app-permission-default.ts
@@ -77,7 +77,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         AppPermissionDefaultSelect,
         AppPermissionDefaultFilter,
-        never,
         AppPermissionDefaultOrderBy
       > & {
         select: AppPermissionDefaultSelect;
@@ -101,7 +100,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       permissions: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppPermissionDefaultSelect, AppPermissionDefaultFilter, never> & {
+      FindFirstArgs<AppPermissionDefaultSelect, AppPermissionDefaultFilter> & {
         select: AppPermissionDefaultSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/app-permission.ts b/sdk/constructive-cli/src/admin/cli/commands/app-permission.ts
index 7a354db18..db2d37c76 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/app-permission.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/app-permission.ts
@@ -80,7 +80,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       description: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppPermissionSelect, AppPermissionFilter, never, AppPermissionOrderBy> & {
+      FindManyArgs<AppPermissionSelect, AppPermissionFilter, AppPermissionOrderBy> & {
         select: AppPermissionSelect;
       }
     >(argv, defaultSelect);
@@ -105,7 +105,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       description: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppPermissionSelect, AppPermissionFilter, never> & {
+      FindFirstArgs<AppPermissionSelect, AppPermissionFilter> & {
         select: AppPermissionSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/app-step.ts b/sdk/constructive-cli/src/admin/cli/commands/app-step.ts
index daf16cc8f..537dbd7bf 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/app-step.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/app-step.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppStepSelect, AppStepFilter, never, AppStepOrderBy> & {
+      FindManyArgs<AppStepSelect, AppStepFilter, AppStepOrderBy> & {
         select: AppStepSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppStepSelect, AppStepFilter, never> & {
+      FindFirstArgs<AppStepSelect, AppStepFilter> & {
         select: AppStepSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/claimed-invite.ts b/sdk/constructive-cli/src/admin/cli/commands/claimed-invite.ts
index f0f106228..2e3659add 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/claimed-invite.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/claimed-invite.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<ClaimedInviteSelect, ClaimedInviteFilter, never, ClaimedInviteOrderBy> & {
+      FindManyArgs<ClaimedInviteSelect, ClaimedInviteFilter, ClaimedInviteOrderBy> & {
         select: ClaimedInviteSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ClaimedInviteSelect, ClaimedInviteFilter, never> & {
+      FindFirstArgs<ClaimedInviteSelect, ClaimedInviteFilter> & {
         select: ClaimedInviteSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/invite.ts b/sdk/constructive-cli/src/admin/cli/commands/invite.ts
index c7c10081f..85aa0c416 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/invite.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/invite.ts
@@ -94,7 +94,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<InviteSelect, InviteFilter, never, InviteOrderBy> & {
+      FindManyArgs<InviteSelect, InviteFilter, InviteOrderBy> & {
         select: InviteSelect;
       }
     >(argv, defaultSelect);
@@ -126,7 +126,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<InviteSelect, InviteFilter, never> & {
+      FindFirstArgs<InviteSelect, InviteFilter> & {
         select: InviteSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/membership-type.ts b/sdk/constructive-cli/src/admin/cli/commands/membership-type.ts
index 056b84cd3..91dc29236 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/membership-type.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/membership-type.ts
@@ -78,7 +78,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       prefix: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<MembershipTypeSelect, MembershipTypeFilter, never, MembershipTypeOrderBy> & {
+      FindManyArgs<MembershipTypeSelect, MembershipTypeFilter, MembershipTypeOrderBy> & {
         select: MembershipTypeSelect;
       }
     >(argv, defaultSelect);
@@ -102,7 +102,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       prefix: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<MembershipTypeSelect, MembershipTypeFilter, never> & {
+      FindFirstArgs<MembershipTypeSelect, MembershipTypeFilter> & {
         select: MembershipTypeSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-admin-grant.ts b/sdk/constructive-cli/src/admin/cli/commands/org-admin-grant.ts
index e9d41e5ed..22e11bc2f 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-admin-grant.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-admin-grant.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgAdminGrantSelect, OrgAdminGrantFilter, never, OrgAdminGrantOrderBy> & {
+      FindManyArgs<OrgAdminGrantSelect, OrgAdminGrantFilter, OrgAdminGrantOrderBy> & {
         select: OrgAdminGrantSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgAdminGrantSelect, OrgAdminGrantFilter, never> & {
+      FindFirstArgs<OrgAdminGrantSelect, OrgAdminGrantFilter> & {
         select: OrgAdminGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-chart-edge-grant.ts b/sdk/constructive-cli/src/admin/cli/commands/org-chart-edge-grant.ts
index 537be47af..095cf055f 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-chart-edge-grant.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-chart-edge-grant.ts
@@ -88,12 +88,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       createdAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        OrgChartEdgeGrantSelect,
-        OrgChartEdgeGrantFilter,
-        never,
-        OrgChartEdgeGrantOrderBy
-      > & {
+      FindManyArgs<OrgChartEdgeGrantSelect, OrgChartEdgeGrantFilter, OrgChartEdgeGrantOrderBy> & {
         select: OrgChartEdgeGrantSelect;
       }
     >(argv, defaultSelect);
@@ -122,7 +117,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       createdAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgChartEdgeGrantSelect, OrgChartEdgeGrantFilter, never> & {
+      FindFirstArgs<OrgChartEdgeGrantSelect, OrgChartEdgeGrantFilter> & {
         select: OrgChartEdgeGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-chart-edge.ts b/sdk/constructive-cli/src/admin/cli/commands/org-chart-edge.ts
index 410d4f84f..d6c0839a5 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-chart-edge.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-chart-edge.ts
@@ -86,7 +86,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       positionLevel: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgChartEdgeSelect, OrgChartEdgeFilter, never, OrgChartEdgeOrderBy> & {
+      FindManyArgs<OrgChartEdgeSelect, OrgChartEdgeFilter, OrgChartEdgeOrderBy> & {
         select: OrgChartEdgeSelect;
       }
     >(argv, defaultSelect);
@@ -114,7 +114,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       positionLevel: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgChartEdgeSelect, OrgChartEdgeFilter, never> & {
+      FindFirstArgs<OrgChartEdgeSelect, OrgChartEdgeFilter> & {
         select: OrgChartEdgeSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-claimed-invite.ts b/sdk/constructive-cli/src/admin/cli/commands/org-claimed-invite.ts
index ddf858e3c..8a7be4ccc 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-claimed-invite.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-claimed-invite.ts
@@ -84,12 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       entityId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        OrgClaimedInviteSelect,
-        OrgClaimedInviteFilter,
-        never,
-        OrgClaimedInviteOrderBy
-      > & {
+      FindManyArgs<OrgClaimedInviteSelect, OrgClaimedInviteFilter, OrgClaimedInviteOrderBy> & {
         select: OrgClaimedInviteSelect;
       }
     >(argv, defaultSelect);
@@ -116,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       entityId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgClaimedInviteSelect, OrgClaimedInviteFilter, never> & {
+      FindFirstArgs<OrgClaimedInviteSelect, OrgClaimedInviteFilter> & {
         select: OrgClaimedInviteSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-get-managers-record.ts b/sdk/constructive-cli/src/admin/cli/commands/org-get-managers-record.ts
index 8a3595b5e..6808fc470 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-get-managers-record.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-get-managers-record.ts
@@ -71,7 +71,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         OrgGetManagersRecordSelect,
         OrgGetManagersRecordFilter,
-        never,
         OrgGetManagersRecordsOrderBy
       > & {
         select: OrgGetManagersRecordSelect;
@@ -95,7 +94,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       depth: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgGetManagersRecordSelect, OrgGetManagersRecordFilter, never> & {
+      FindFirstArgs<OrgGetManagersRecordSelect, OrgGetManagersRecordFilter> & {
         select: OrgGetManagersRecordSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-get-subordinates-record.ts b/sdk/constructive-cli/src/admin/cli/commands/org-get-subordinates-record.ts
index 64eff3fef..0d1eb8e5f 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-get-subordinates-record.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-get-subordinates-record.ts
@@ -71,7 +71,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         OrgGetSubordinatesRecordSelect,
         OrgGetSubordinatesRecordFilter,
-        never,
         OrgGetSubordinatesRecordsOrderBy
       > & {
         select: OrgGetSubordinatesRecordSelect;
@@ -95,7 +94,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       depth: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgGetSubordinatesRecordSelect, OrgGetSubordinatesRecordFilter, never> & {
+      FindFirstArgs<OrgGetSubordinatesRecordSelect, OrgGetSubordinatesRecordFilter> & {
         select: OrgGetSubordinatesRecordSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-grant.ts b/sdk/constructive-cli/src/admin/cli/commands/org-grant.ts
index a538aa1c2..634c7d588 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-grant.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-grant.ts
@@ -86,7 +86,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgGrantSelect, OrgGrantFilter, never, OrgGrantOrderBy> & {
+      FindManyArgs<OrgGrantSelect, OrgGrantFilter, OrgGrantOrderBy> & {
         select: OrgGrantSelect;
       }
     >(argv, defaultSelect);
@@ -114,7 +114,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgGrantSelect, OrgGrantFilter, never> & {
+      FindFirstArgs<OrgGrantSelect, OrgGrantFilter> & {
         select: OrgGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-invite.ts b/sdk/constructive-cli/src/admin/cli/commands/org-invite.ts
index 85aeda86c..f25f613ae 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-invite.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-invite.ts
@@ -98,7 +98,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       entityId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgInviteSelect, OrgInviteFilter, never, OrgInviteOrderBy> & {
+      FindManyArgs<OrgInviteSelect, OrgInviteFilter, OrgInviteOrderBy> & {
         select: OrgInviteSelect;
       }
     >(argv, defaultSelect);
@@ -132,7 +132,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       entityId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgInviteSelect, OrgInviteFilter, never> & {
+      FindFirstArgs<OrgInviteSelect, OrgInviteFilter> & {
         select: OrgInviteSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-limit-default.ts b/sdk/constructive-cli/src/admin/cli/commands/org-limit-default.ts
index 88d800132..ed3396fe3 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-limit-default.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-limit-default.ts
@@ -76,7 +76,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       max: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgLimitDefaultSelect, OrgLimitDefaultFilter, never, OrgLimitDefaultOrderBy> & {
+      FindManyArgs<OrgLimitDefaultSelect, OrgLimitDefaultFilter, OrgLimitDefaultOrderBy> & {
         select: OrgLimitDefaultSelect;
       }
     >(argv, defaultSelect);
@@ -99,7 +99,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       max: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgLimitDefaultSelect, OrgLimitDefaultFilter, never> & {
+      FindFirstArgs<OrgLimitDefaultSelect, OrgLimitDefaultFilter> & {
         select: OrgLimitDefaultSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-limit.ts b/sdk/constructive-cli/src/admin/cli/commands/org-limit.ts
index 3428c1ea9..57ad76e26 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-limit.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-limit.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       entityId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgLimitSelect, OrgLimitFilter, never, OrgLimitOrderBy> & {
+      FindManyArgs<OrgLimitSelect, OrgLimitFilter, OrgLimitOrderBy> & {
         select: OrgLimitSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       entityId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgLimitSelect, OrgLimitFilter, never> & {
+      FindFirstArgs<OrgLimitSelect, OrgLimitFilter> & {
         select: OrgLimitSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-member.ts b/sdk/constructive-cli/src/admin/cli/commands/org-member.ts
index c3c831dcb..cc7a7087a 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-member.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-member.ts
@@ -78,7 +78,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       entityId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgMemberSelect, OrgMemberFilter, never, OrgMemberOrderBy> & {
+      FindManyArgs<OrgMemberSelect, OrgMemberFilter, OrgMemberOrderBy> & {
         select: OrgMemberSelect;
       }
     >(argv, defaultSelect);
@@ -102,7 +102,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       entityId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgMemberSelect, OrgMemberFilter, never> & {
+      FindFirstArgs<OrgMemberSelect, OrgMemberFilter> & {
         select: OrgMemberSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-membership-default.ts b/sdk/constructive-cli/src/admin/cli/commands/org-membership-default.ts
index a0d1bc6dc..598281e4f 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-membership-default.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-membership-default.ts
@@ -91,7 +91,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         OrgMembershipDefaultSelect,
         OrgMembershipDefaultFilter,
-        never,
         OrgMembershipDefaultOrderBy
       > & {
         select: OrgMembershipDefaultSelect;
@@ -122,7 +121,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       createGroupsCascadeMembers: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgMembershipDefaultSelect, OrgMembershipDefaultFilter, never> & {
+      FindFirstArgs<OrgMembershipDefaultSelect, OrgMembershipDefaultFilter> & {
         select: OrgMembershipDefaultSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-membership.ts b/sdk/constructive-cli/src/admin/cli/commands/org-membership.ts
index 0e9b312b2..0810171d5 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-membership.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-membership.ts
@@ -102,7 +102,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       profileId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgMembershipSelect, OrgMembershipFilter, never, OrgMembershipOrderBy> & {
+      FindManyArgs<OrgMembershipSelect, OrgMembershipFilter, OrgMembershipOrderBy> & {
         select: OrgMembershipSelect;
       }
     >(argv, defaultSelect);
@@ -138,7 +138,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       profileId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgMembershipSelect, OrgMembershipFilter, never> & {
+      FindFirstArgs<OrgMembershipSelect, OrgMembershipFilter> & {
         select: OrgMembershipSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-owner-grant.ts b/sdk/constructive-cli/src/admin/cli/commands/org-owner-grant.ts
index 15ed00359..99dc9ac3c 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-owner-grant.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-owner-grant.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgOwnerGrantSelect, OrgOwnerGrantFilter, never, OrgOwnerGrantOrderBy> & {
+      FindManyArgs<OrgOwnerGrantSelect, OrgOwnerGrantFilter, OrgOwnerGrantOrderBy> & {
         select: OrgOwnerGrantSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgOwnerGrantSelect, OrgOwnerGrantFilter, never> & {
+      FindFirstArgs<OrgOwnerGrantSelect, OrgOwnerGrantFilter> & {
         select: OrgOwnerGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-permission-default.ts b/sdk/constructive-cli/src/admin/cli/commands/org-permission-default.ts
index 9eeee8a17..2448918b6 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-permission-default.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-permission-default.ts
@@ -79,7 +79,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         OrgPermissionDefaultSelect,
         OrgPermissionDefaultFilter,
-        never,
         OrgPermissionDefaultOrderBy
       > & {
         select: OrgPermissionDefaultSelect;
@@ -104,7 +103,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       entityId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgPermissionDefaultSelect, OrgPermissionDefaultFilter, never> & {
+      FindFirstArgs<OrgPermissionDefaultSelect, OrgPermissionDefaultFilter> & {
         select: OrgPermissionDefaultSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/commands/org-permission.ts b/sdk/constructive-cli/src/admin/cli/commands/org-permission.ts
index f1a175a20..ed92cabc7 100644
--- a/sdk/constructive-cli/src/admin/cli/commands/org-permission.ts
+++ b/sdk/constructive-cli/src/admin/cli/commands/org-permission.ts
@@ -80,7 +80,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       description: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgPermissionSelect, OrgPermissionFilter, never, OrgPermissionOrderBy> & {
+      FindManyArgs<OrgPermissionSelect, OrgPermissionFilter, OrgPermissionOrderBy> & {
         select: OrgPermissionSelect;
       }
     >(argv, defaultSelect);
@@ -105,7 +105,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       description: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgPermissionSelect, OrgPermissionFilter, never> & {
+      FindFirstArgs<OrgPermissionSelect, OrgPermissionFilter> & {
         select: OrgPermissionSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/admin/cli/utils.ts b/sdk/constructive-cli/src/admin/cli/utils.ts
index 7d8d25ac8..1a3f288db 100644
--- a/sdk/constructive-cli/src/admin/cli/utils.ts
+++ b/sdk/constructive-cli/src/admin/cli/utils.ts
@@ -239,7 +239,6 @@ export function parseFindManyArgs<T = Record<string, unknown>>(
     (parsed.where ?? extraWhere)
       ? { ...(extraWhere ?? {}), ...((parsed.where as Record<string, unknown>) ?? {}) }
       : undefined;
-  const condition = parsed.condition;
   const orderBy = parseOrderByFlag(argv);
 
   return {
@@ -250,14 +249,13 @@ export function parseFindManyArgs<T = Record<string, unknown>>(
     ...(before !== undefined ? { before } : {}),
     ...(offset !== undefined ? { offset } : {}),
     ...(where !== undefined ? { where } : {}),
-    ...(condition !== undefined ? { condition } : {}),
     ...(orderBy !== undefined ? { orderBy } : {}),
   } as unknown as T;
 }
 
 /**
  * Build findFirst args from CLI argv.
- * Like parseFindManyArgs but only includes select, where, and condition
+ * Like parseFindManyArgs but only includes select and where
  * (no pagination flags — findFirst returns the first matching record).
  */
 export function parseFindFirstArgs<T = Record<string, unknown>>(
@@ -267,12 +265,10 @@ export function parseFindFirstArgs<T = Record<string, unknown>>(
   const select = parseSelectFlag(argv, defaultSelect);
   const parsed = unflattenDotNotation(argv);
   const where = parsed.where;
-  const condition = parsed.condition;
 
   return {
     select,
     ...(where !== undefined ? { where } : {}),
-    ...(condition !== undefined ? { condition } : {}),
   } as unknown as T;
 }
 
diff --git a/sdk/constructive-cli/src/admin/orm/models/appAchievement.ts b/sdk/constructive-cli/src/admin/orm/models/appAchievement.ts
index 371094039..f24447777 100644
--- a/sdk/constructive-cli/src/admin/orm/models/appAchievement.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/appAchievement.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppAchievementModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppAchievementSelect>(
-    args: FindManyArgs<S, AppAchievementFilter, never, AppAchievementOrderBy> & {
+    args: FindManyArgs<S, AppAchievementFilter, AppAchievementOrderBy> & {
       select: S;
     } & StrictSelect<S, AppAchievementSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/appAdminGrant.ts b/sdk/constructive-cli/src/admin/orm/models/appAdminGrant.ts
index 4ab5443fe..6a2a59893 100644
--- a/sdk/constructive-cli/src/admin/orm/models/appAdminGrant.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/appAdminGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppAdminGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppAdminGrantSelect>(
-    args: FindManyArgs<S, AppAdminGrantFilter, never, AppAdminGrantOrderBy> & {
+    args: FindManyArgs<S, AppAdminGrantFilter, AppAdminGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppAdminGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/appGrant.ts b/sdk/constructive-cli/src/admin/orm/models/appGrant.ts
index f7bd4d049..2cb4f429a 100644
--- a/sdk/constructive-cli/src/admin/orm/models/appGrant.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/appGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppGrantSelect>(
-    args: FindManyArgs<S, AppGrantFilter, never, AppGrantOrderBy> & {
+    args: FindManyArgs<S, AppGrantFilter, AppGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/appLevel.ts b/sdk/constructive-cli/src/admin/orm/models/appLevel.ts
index a3f53cfeb..f9abef512 100644
--- a/sdk/constructive-cli/src/admin/orm/models/appLevel.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/appLevel.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLevelModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLevelSelect>(
-    args: FindManyArgs<S, AppLevelFilter, never, AppLevelOrderBy> & {
+    args: FindManyArgs<S, AppLevelFilter, AppLevelOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLevelSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/appLevelRequirement.ts b/sdk/constructive-cli/src/admin/orm/models/appLevelRequirement.ts
index c89f580c2..54baeb7dc 100644
--- a/sdk/constructive-cli/src/admin/orm/models/appLevelRequirement.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/appLevelRequirement.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLevelRequirementModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLevelRequirementSelect>(
-    args: FindManyArgs<S, AppLevelRequirementFilter, never, AppLevelRequirementOrderBy> & {
+    args: FindManyArgs<S, AppLevelRequirementFilter, AppLevelRequirementOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLevelRequirementSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/appLimit.ts b/sdk/constructive-cli/src/admin/orm/models/appLimit.ts
index 0b228e5ed..dea896420 100644
--- a/sdk/constructive-cli/src/admin/orm/models/appLimit.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/appLimit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLimitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLimitSelect>(
-    args: FindManyArgs<S, AppLimitFilter, never, AppLimitOrderBy> & {
+    args: FindManyArgs<S, AppLimitFilter, AppLimitOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLimitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/appLimitDefault.ts b/sdk/constructive-cli/src/admin/orm/models/appLimitDefault.ts
index 7731e46ba..dfec3cdd9 100644
--- a/sdk/constructive-cli/src/admin/orm/models/appLimitDefault.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/appLimitDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLimitDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLimitDefaultSelect>(
-    args: FindManyArgs<S, AppLimitDefaultFilter, never, AppLimitDefaultOrderBy> & {
+    args: FindManyArgs<S, AppLimitDefaultFilter, AppLimitDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLimitDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/appMembership.ts b/sdk/constructive-cli/src/admin/orm/models/appMembership.ts
index dd0f68855..a830192e6 100644
--- a/sdk/constructive-cli/src/admin/orm/models/appMembership.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/appMembership.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppMembershipModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppMembershipSelect>(
-    args: FindManyArgs<S, AppMembershipFilter, never, AppMembershipOrderBy> & {
+    args: FindManyArgs<S, AppMembershipFilter, AppMembershipOrderBy> & {
       select: S;
     } & StrictSelect<S, AppMembershipSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/appMembershipDefault.ts b/sdk/constructive-cli/src/admin/orm/models/appMembershipDefault.ts
index 88dea6243..8b1a54c01 100644
--- a/sdk/constructive-cli/src/admin/orm/models/appMembershipDefault.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/appMembershipDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppMembershipDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppMembershipDefaultSelect>(
-    args: FindManyArgs<S, AppMembershipDefaultFilter, never, AppMembershipDefaultOrderBy> & {
+    args: FindManyArgs<S, AppMembershipDefaultFilter, AppMembershipDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppMembershipDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/appOwnerGrant.ts b/sdk/constructive-cli/src/admin/orm/models/appOwnerGrant.ts
index acc216d4a..a8695557e 100644
--- a/sdk/constructive-cli/src/admin/orm/models/appOwnerGrant.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/appOwnerGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppOwnerGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppOwnerGrantSelect>(
-    args: FindManyArgs<S, AppOwnerGrantFilter, never, AppOwnerGrantOrderBy> & {
+    args: FindManyArgs<S, AppOwnerGrantFilter, AppOwnerGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppOwnerGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/appPermission.ts b/sdk/constructive-cli/src/admin/orm/models/appPermission.ts
index c191e5066..2575c5de2 100644
--- a/sdk/constructive-cli/src/admin/orm/models/appPermission.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/appPermission.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppPermissionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppPermissionSelect>(
-    args: FindManyArgs<S, AppPermissionFilter, never, AppPermissionOrderBy> & {
+    args: FindManyArgs<S, AppPermissionFilter, AppPermissionOrderBy> & {
       select: S;
     } & StrictSelect<S, AppPermissionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/appPermissionDefault.ts b/sdk/constructive-cli/src/admin/orm/models/appPermissionDefault.ts
index 33fdd49dd..427272883 100644
--- a/sdk/constructive-cli/src/admin/orm/models/appPermissionDefault.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/appPermissionDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppPermissionDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppPermissionDefaultSelect>(
-    args: FindManyArgs<S, AppPermissionDefaultFilter, never, AppPermissionDefaultOrderBy> & {
+    args: FindManyArgs<S, AppPermissionDefaultFilter, AppPermissionDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppPermissionDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/appStep.ts b/sdk/constructive-cli/src/admin/orm/models/appStep.ts
index a683087da..29dae0d6c 100644
--- a/sdk/constructive-cli/src/admin/orm/models/appStep.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/appStep.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppStepModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppStepSelect>(
-    args: FindManyArgs<S, AppStepFilter, never, AppStepOrderBy> & {
+    args: FindManyArgs<S, AppStepFilter, AppStepOrderBy> & {
       select: S;
     } & StrictSelect<S, AppStepSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/claimedInvite.ts b/sdk/constructive-cli/src/admin/orm/models/claimedInvite.ts
index c7724b14a..cbe1429e5 100644
--- a/sdk/constructive-cli/src/admin/orm/models/claimedInvite.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/claimedInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ClaimedInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ClaimedInviteSelect>(
-    args: FindManyArgs<S, ClaimedInviteFilter, never, ClaimedInviteOrderBy> & {
+    args: FindManyArgs<S, ClaimedInviteFilter, ClaimedInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, ClaimedInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/invite.ts b/sdk/constructive-cli/src/admin/orm/models/invite.ts
index 05d88af09..8fabe0aec 100644
--- a/sdk/constructive-cli/src/admin/orm/models/invite.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/invite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class InviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends InviteSelect>(
-    args: FindManyArgs<S, InviteFilter, never, InviteOrderBy> & {
+    args: FindManyArgs<S, InviteFilter, InviteOrderBy> & {
       select: S;
     } & StrictSelect<S, InviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/membershipType.ts b/sdk/constructive-cli/src/admin/orm/models/membershipType.ts
index bc8b65d9e..40fac5490 100644
--- a/sdk/constructive-cli/src/admin/orm/models/membershipType.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/membershipType.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MembershipTypeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MembershipTypeSelect>(
-    args: FindManyArgs<S, MembershipTypeFilter, never, MembershipTypeOrderBy> & {
+    args: FindManyArgs<S, MembershipTypeFilter, MembershipTypeOrderBy> & {
       select: S;
     } & StrictSelect<S, MembershipTypeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgAdminGrant.ts b/sdk/constructive-cli/src/admin/orm/models/orgAdminGrant.ts
index 5378a74f0..e611a8578 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgAdminGrant.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgAdminGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgAdminGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgAdminGrantSelect>(
-    args: FindManyArgs<S, OrgAdminGrantFilter, never, OrgAdminGrantOrderBy> & {
+    args: FindManyArgs<S, OrgAdminGrantFilter, OrgAdminGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgAdminGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgChartEdge.ts b/sdk/constructive-cli/src/admin/orm/models/orgChartEdge.ts
index 8a71ab56f..6c6fc84cc 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgChartEdge.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgChartEdge.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgChartEdgeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgChartEdgeSelect>(
-    args: FindManyArgs<S, OrgChartEdgeFilter, never, OrgChartEdgeOrderBy> & {
+    args: FindManyArgs<S, OrgChartEdgeFilter, OrgChartEdgeOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgChartEdgeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgChartEdgeGrant.ts b/sdk/constructive-cli/src/admin/orm/models/orgChartEdgeGrant.ts
index b048dead6..58345c78d 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgChartEdgeGrant.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgChartEdgeGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgChartEdgeGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgChartEdgeGrantSelect>(
-    args: FindManyArgs<S, OrgChartEdgeGrantFilter, never, OrgChartEdgeGrantOrderBy> & {
+    args: FindManyArgs<S, OrgChartEdgeGrantFilter, OrgChartEdgeGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgChartEdgeGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgClaimedInvite.ts b/sdk/constructive-cli/src/admin/orm/models/orgClaimedInvite.ts
index 75975b11b..475de7291 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgClaimedInvite.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgClaimedInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgClaimedInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgClaimedInviteSelect>(
-    args: FindManyArgs<S, OrgClaimedInviteFilter, never, OrgClaimedInviteOrderBy> & {
+    args: FindManyArgs<S, OrgClaimedInviteFilter, OrgClaimedInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgClaimedInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgGetManagersRecord.ts b/sdk/constructive-cli/src/admin/orm/models/orgGetManagersRecord.ts
index e8f5a29ec..9a0cefa8a 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgGetManagersRecord.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgGetManagersRecord.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGetManagersRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGetManagersRecordSelect>(
-    args: FindManyArgs<S, OrgGetManagersRecordFilter, never, OrgGetManagersRecordsOrderBy> & {
+    args: FindManyArgs<S, OrgGetManagersRecordFilter, OrgGetManagersRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGetManagersRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgGetSubordinatesRecord.ts b/sdk/constructive-cli/src/admin/orm/models/orgGetSubordinatesRecord.ts
index be9fa6a62..5eeec50ca 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgGetSubordinatesRecord.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgGetSubordinatesRecord.ts
@@ -37,12 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGetSubordinatesRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGetSubordinatesRecordSelect>(
-    args: FindManyArgs<
-      S,
-      OrgGetSubordinatesRecordFilter,
-      never,
-      OrgGetSubordinatesRecordsOrderBy
-    > & {
+    args: FindManyArgs<S, OrgGetSubordinatesRecordFilter, OrgGetSubordinatesRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGetSubordinatesRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgGrant.ts b/sdk/constructive-cli/src/admin/orm/models/orgGrant.ts
index 23c9cd546..291264ec5 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgGrant.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGrantSelect>(
-    args: FindManyArgs<S, OrgGrantFilter, never, OrgGrantOrderBy> & {
+    args: FindManyArgs<S, OrgGrantFilter, OrgGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgInvite.ts b/sdk/constructive-cli/src/admin/orm/models/orgInvite.ts
index cacca9210..639cb8dd5 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgInvite.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgInviteSelect>(
-    args: FindManyArgs<S, OrgInviteFilter, never, OrgInviteOrderBy> & {
+    args: FindManyArgs<S, OrgInviteFilter, OrgInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgLimit.ts b/sdk/constructive-cli/src/admin/orm/models/orgLimit.ts
index ab50514ae..2d7937963 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgLimit.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgLimit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgLimitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgLimitSelect>(
-    args: FindManyArgs<S, OrgLimitFilter, never, OrgLimitOrderBy> & {
+    args: FindManyArgs<S, OrgLimitFilter, OrgLimitOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgLimitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgLimitDefault.ts b/sdk/constructive-cli/src/admin/orm/models/orgLimitDefault.ts
index d8c76fb6a..bf0cfcf5e 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgLimitDefault.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgLimitDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgLimitDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgLimitDefaultSelect>(
-    args: FindManyArgs<S, OrgLimitDefaultFilter, never, OrgLimitDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgLimitDefaultFilter, OrgLimitDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgLimitDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgMember.ts b/sdk/constructive-cli/src/admin/orm/models/orgMember.ts
index 8575c7fdc..dd1d20e45 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgMember.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgMember.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMemberModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMemberSelect>(
-    args: FindManyArgs<S, OrgMemberFilter, never, OrgMemberOrderBy> & {
+    args: FindManyArgs<S, OrgMemberFilter, OrgMemberOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMemberSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgMembership.ts b/sdk/constructive-cli/src/admin/orm/models/orgMembership.ts
index 20d60836a..c0173b3e1 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgMembership.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgMembership.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMembershipModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMembershipSelect>(
-    args: FindManyArgs<S, OrgMembershipFilter, never, OrgMembershipOrderBy> & {
+    args: FindManyArgs<S, OrgMembershipFilter, OrgMembershipOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMembershipSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgMembershipDefault.ts b/sdk/constructive-cli/src/admin/orm/models/orgMembershipDefault.ts
index 83b9f7dea..09d525bec 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgMembershipDefault.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgMembershipDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMembershipDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMembershipDefaultSelect>(
-    args: FindManyArgs<S, OrgMembershipDefaultFilter, never, OrgMembershipDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgMembershipDefaultFilter, OrgMembershipDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMembershipDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgOwnerGrant.ts b/sdk/constructive-cli/src/admin/orm/models/orgOwnerGrant.ts
index 136082317..bdf045511 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgOwnerGrant.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgOwnerGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgOwnerGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgOwnerGrantSelect>(
-    args: FindManyArgs<S, OrgOwnerGrantFilter, never, OrgOwnerGrantOrderBy> & {
+    args: FindManyArgs<S, OrgOwnerGrantFilter, OrgOwnerGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgOwnerGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgPermission.ts b/sdk/constructive-cli/src/admin/orm/models/orgPermission.ts
index 256395283..c5910be63 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgPermission.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgPermission.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgPermissionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgPermissionSelect>(
-    args: FindManyArgs<S, OrgPermissionFilter, never, OrgPermissionOrderBy> & {
+    args: FindManyArgs<S, OrgPermissionFilter, OrgPermissionOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgPermissionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/models/orgPermissionDefault.ts b/sdk/constructive-cli/src/admin/orm/models/orgPermissionDefault.ts
index 18631fd2d..40389a11b 100644
--- a/sdk/constructive-cli/src/admin/orm/models/orgPermissionDefault.ts
+++ b/sdk/constructive-cli/src/admin/orm/models/orgPermissionDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgPermissionDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgPermissionDefaultSelect>(
-    args: FindManyArgs<S, OrgPermissionDefaultFilter, never, OrgPermissionDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgPermissionDefaultFilter, OrgPermissionDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgPermissionDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/admin/orm/query-builder.ts b/sdk/constructive-cli/src/admin/orm/query-builder.ts
index 8dbcb9646..b0261f895 100644
--- a/sdk/constructive-cli/src/admin/orm/query-builder.ts
+++ b/sdk/constructive-cli/src/admin/orm/query-builder.ts
@@ -189,13 +189,12 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindManyDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
   args: {
     where?: TWhere;
-    condition?: TCondition;
     orderBy?: string[];
     first?: number;
     last?: number;
@@ -205,8 +204,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   },
   filterTypeName: string,
   orderByTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -216,16 +214,6 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   const queryArgs: ArgumentNode[] = [];
   const variables: Record<string, unknown> = {};
 
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
@@ -301,14 +289,13 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindFirstDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
-  args: { where?: TWhere; condition?: TCondition },
+  args: { where?: TWhere },
   filterTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -325,16 +312,6 @@ export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
     queryArgs,
     variables
   );
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
diff --git a/sdk/constructive-cli/src/admin/orm/select-types.ts b/sdk/constructive-cli/src/admin/orm/select-types.ts
index 919d1b935..2621b3570 100644
--- a/sdk/constructive-cli/src/admin/orm/select-types.ts
+++ b/sdk/constructive-cli/src/admin/orm/select-types.ts
@@ -16,10 +16,9 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
+export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -28,10 +27,9 @@ export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = ne
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
+export interface FindFirstArgs<TSelect, TWhere> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {
diff --git a/sdk/constructive-cli/src/auth/cli/commands/audit-log.ts b/sdk/constructive-cli/src/auth/cli/commands/audit-log.ts
index 79a5c1b1c..5c7263710 100644
--- a/sdk/constructive-cli/src/auth/cli/commands/audit-log.ts
+++ b/sdk/constructive-cli/src/auth/cli/commands/audit-log.ts
@@ -86,7 +86,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       createdAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AuditLogSelect, AuditLogFilter, never, AuditLogOrderBy> & {
+      FindManyArgs<AuditLogSelect, AuditLogFilter, AuditLogOrderBy> & {
         select: AuditLogSelect;
       }
     >(argv, defaultSelect);
@@ -114,7 +114,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       createdAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AuditLogSelect, AuditLogFilter, never> & {
+      FindFirstArgs<AuditLogSelect, AuditLogFilter> & {
         select: AuditLogSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/auth/cli/commands/connected-account.ts b/sdk/constructive-cli/src/auth/cli/commands/connected-account.ts
index 5b0ea5d96..5522a3457 100644
--- a/sdk/constructive-cli/src/auth/cli/commands/connected-account.ts
+++ b/sdk/constructive-cli/src/auth/cli/commands/connected-account.ts
@@ -86,12 +86,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        ConnectedAccountSelect,
-        ConnectedAccountFilter,
-        never,
-        ConnectedAccountOrderBy
-      > & {
+      FindManyArgs<ConnectedAccountSelect, ConnectedAccountFilter, ConnectedAccountOrderBy> & {
         select: ConnectedAccountSelect;
       }
     >(argv, defaultSelect);
@@ -119,7 +114,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ConnectedAccountSelect, ConnectedAccountFilter, never> & {
+      FindFirstArgs<ConnectedAccountSelect, ConnectedAccountFilter> & {
         select: ConnectedAccountSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/auth/cli/commands/crypto-address.ts b/sdk/constructive-cli/src/auth/cli/commands/crypto-address.ts
index 8b3902d0e..5e65d2909 100644
--- a/sdk/constructive-cli/src/auth/cli/commands/crypto-address.ts
+++ b/sdk/constructive-cli/src/auth/cli/commands/crypto-address.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<CryptoAddressSelect, CryptoAddressFilter, never, CryptoAddressOrderBy> & {
+      FindManyArgs<CryptoAddressSelect, CryptoAddressFilter, CryptoAddressOrderBy> & {
         select: CryptoAddressSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<CryptoAddressSelect, CryptoAddressFilter, never> & {
+      FindFirstArgs<CryptoAddressSelect, CryptoAddressFilter> & {
         select: CryptoAddressSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/auth/cli/commands/email.ts b/sdk/constructive-cli/src/auth/cli/commands/email.ts
index b21c9e87a..2b2d98380 100644
--- a/sdk/constructive-cli/src/auth/cli/commands/email.ts
+++ b/sdk/constructive-cli/src/auth/cli/commands/email.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<EmailSelect, EmailFilter, never, EmailOrderBy> & {
+      FindManyArgs<EmailSelect, EmailFilter, EmailOrderBy> & {
         select: EmailSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<EmailSelect, EmailFilter, never> & {
+      FindFirstArgs<EmailSelect, EmailFilter> & {
         select: EmailSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/auth/cli/commands/phone-number.ts b/sdk/constructive-cli/src/auth/cli/commands/phone-number.ts
index 984aeec18..e0387631e 100644
--- a/sdk/constructive-cli/src/auth/cli/commands/phone-number.ts
+++ b/sdk/constructive-cli/src/auth/cli/commands/phone-number.ts
@@ -86,7 +86,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<PhoneNumberSelect, PhoneNumberFilter, never, PhoneNumberOrderBy> & {
+      FindManyArgs<PhoneNumberSelect, PhoneNumberFilter, PhoneNumberOrderBy> & {
         select: PhoneNumberSelect;
       }
     >(argv, defaultSelect);
@@ -114,7 +114,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<PhoneNumberSelect, PhoneNumberFilter, never> & {
+      FindFirstArgs<PhoneNumberSelect, PhoneNumberFilter> & {
         select: PhoneNumberSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/auth/cli/commands/role-type.ts b/sdk/constructive-cli/src/auth/cli/commands/role-type.ts
index 30724bbfe..b29048ae9 100644
--- a/sdk/constructive-cli/src/auth/cli/commands/role-type.ts
+++ b/sdk/constructive-cli/src/auth/cli/commands/role-type.ts
@@ -74,7 +74,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       name: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<RoleTypeSelect, RoleTypeFilter, never, RoleTypeOrderBy> & {
+      FindManyArgs<RoleTypeSelect, RoleTypeFilter, RoleTypeOrderBy> & {
         select: RoleTypeSelect;
       }
     >(argv, defaultSelect);
@@ -96,7 +96,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       name: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<RoleTypeSelect, RoleTypeFilter, never> & {
+      FindFirstArgs<RoleTypeSelect, RoleTypeFilter> & {
         select: RoleTypeSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/auth/cli/commands/user.ts b/sdk/constructive-cli/src/auth/cli/commands/user.ts
index cc49c77ce..7bf4feb16 100644
--- a/sdk/constructive-cli/src/auth/cli/commands/user.ts
+++ b/sdk/constructive-cli/src/auth/cli/commands/user.ts
@@ -90,7 +90,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<UserSelect, UserFilter, never, UserOrderBy> & {
+      FindManyArgs<UserSelect, UserFilter, UserOrderBy> & {
         select: UserSelect;
       }
     >(argv, defaultSelect);
@@ -117,7 +117,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<UserSelect, UserFilter, never> & {
+      FindFirstArgs<UserSelect, UserFilter> & {
         select: UserSelect;
       }
     >(argv, defaultSelect);
@@ -158,7 +158,7 @@ async function handleSearch(argv: Partial<Record<string, unknown>>, _prompter: I
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<UserSelect, UserFilter, never, UserOrderBy> & {
+      FindManyArgs<UserSelect, UserFilter, UserOrderBy> & {
         select: UserSelect;
       }
     >(argv, defaultSelect, searchWhere);
diff --git a/sdk/constructive-cli/src/auth/cli/utils.ts b/sdk/constructive-cli/src/auth/cli/utils.ts
index 7d8d25ac8..1a3f288db 100644
--- a/sdk/constructive-cli/src/auth/cli/utils.ts
+++ b/sdk/constructive-cli/src/auth/cli/utils.ts
@@ -239,7 +239,6 @@ export function parseFindManyArgs<T = Record<string, unknown>>(
     (parsed.where ?? extraWhere)
       ? { ...(extraWhere ?? {}), ...((parsed.where as Record<string, unknown>) ?? {}) }
       : undefined;
-  const condition = parsed.condition;
   const orderBy = parseOrderByFlag(argv);
 
   return {
@@ -250,14 +249,13 @@ export function parseFindManyArgs<T = Record<string, unknown>>(
     ...(before !== undefined ? { before } : {}),
     ...(offset !== undefined ? { offset } : {}),
     ...(where !== undefined ? { where } : {}),
-    ...(condition !== undefined ? { condition } : {}),
     ...(orderBy !== undefined ? { orderBy } : {}),
   } as unknown as T;
 }
 
 /**
  * Build findFirst args from CLI argv.
- * Like parseFindManyArgs but only includes select, where, and condition
+ * Like parseFindManyArgs but only includes select and where
  * (no pagination flags — findFirst returns the first matching record).
  */
 export function parseFindFirstArgs<T = Record<string, unknown>>(
@@ -267,12 +265,10 @@ export function parseFindFirstArgs<T = Record<string, unknown>>(
   const select = parseSelectFlag(argv, defaultSelect);
   const parsed = unflattenDotNotation(argv);
   const where = parsed.where;
-  const condition = parsed.condition;
 
   return {
     select,
     ...(where !== undefined ? { where } : {}),
-    ...(condition !== undefined ? { condition } : {}),
   } as unknown as T;
 }
 
diff --git a/sdk/constructive-cli/src/auth/orm/models/auditLog.ts b/sdk/constructive-cli/src/auth/orm/models/auditLog.ts
index fac372386..2d388026d 100644
--- a/sdk/constructive-cli/src/auth/orm/models/auditLog.ts
+++ b/sdk/constructive-cli/src/auth/orm/models/auditLog.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AuditLogModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AuditLogSelect>(
-    args: FindManyArgs<S, AuditLogFilter, never, AuditLogOrderBy> & {
+    args: FindManyArgs<S, AuditLogFilter, AuditLogOrderBy> & {
       select: S;
     } & StrictSelect<S, AuditLogSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/auth/orm/models/connectedAccount.ts b/sdk/constructive-cli/src/auth/orm/models/connectedAccount.ts
index 8a24193b8..c9def156d 100644
--- a/sdk/constructive-cli/src/auth/orm/models/connectedAccount.ts
+++ b/sdk/constructive-cli/src/auth/orm/models/connectedAccount.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ConnectedAccountModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ConnectedAccountSelect>(
-    args: FindManyArgs<S, ConnectedAccountFilter, never, ConnectedAccountOrderBy> & {
+    args: FindManyArgs<S, ConnectedAccountFilter, ConnectedAccountOrderBy> & {
       select: S;
     } & StrictSelect<S, ConnectedAccountSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/auth/orm/models/cryptoAddress.ts b/sdk/constructive-cli/src/auth/orm/models/cryptoAddress.ts
index 8cbe37d7b..7357c0126 100644
--- a/sdk/constructive-cli/src/auth/orm/models/cryptoAddress.ts
+++ b/sdk/constructive-cli/src/auth/orm/models/cryptoAddress.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CryptoAddressModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CryptoAddressSelect>(
-    args: FindManyArgs<S, CryptoAddressFilter, never, CryptoAddressOrderBy> & {
+    args: FindManyArgs<S, CryptoAddressFilter, CryptoAddressOrderBy> & {
       select: S;
     } & StrictSelect<S, CryptoAddressSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/auth/orm/models/email.ts b/sdk/constructive-cli/src/auth/orm/models/email.ts
index cf129a2d2..aa83efc07 100644
--- a/sdk/constructive-cli/src/auth/orm/models/email.ts
+++ b/sdk/constructive-cli/src/auth/orm/models/email.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EmailModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EmailSelect>(
-    args: FindManyArgs<S, EmailFilter, never, EmailOrderBy> & {
+    args: FindManyArgs<S, EmailFilter, EmailOrderBy> & {
       select: S;
     } & StrictSelect<S, EmailSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/auth/orm/models/phoneNumber.ts b/sdk/constructive-cli/src/auth/orm/models/phoneNumber.ts
index 592b010fa..a711db272 100644
--- a/sdk/constructive-cli/src/auth/orm/models/phoneNumber.ts
+++ b/sdk/constructive-cli/src/auth/orm/models/phoneNumber.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PhoneNumberModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PhoneNumberSelect>(
-    args: FindManyArgs<S, PhoneNumberFilter, never, PhoneNumberOrderBy> & {
+    args: FindManyArgs<S, PhoneNumberFilter, PhoneNumberOrderBy> & {
       select: S;
     } & StrictSelect<S, PhoneNumberSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/auth/orm/models/roleType.ts b/sdk/constructive-cli/src/auth/orm/models/roleType.ts
index 58716fc1e..5b258dc9a 100644
--- a/sdk/constructive-cli/src/auth/orm/models/roleType.ts
+++ b/sdk/constructive-cli/src/auth/orm/models/roleType.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RoleTypeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RoleTypeSelect>(
-    args: FindManyArgs<S, RoleTypeFilter, never, RoleTypeOrderBy> & {
+    args: FindManyArgs<S, RoleTypeFilter, RoleTypeOrderBy> & {
       select: S;
     } & StrictSelect<S, RoleTypeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/auth/orm/models/user.ts b/sdk/constructive-cli/src/auth/orm/models/user.ts
index ada9a0e34..aedd4fcc8 100644
--- a/sdk/constructive-cli/src/auth/orm/models/user.ts
+++ b/sdk/constructive-cli/src/auth/orm/models/user.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UserModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UserSelect>(
-    args: FindManyArgs<S, UserFilter, never, UserOrderBy> & {
+    args: FindManyArgs<S, UserFilter, UserOrderBy> & {
       select: S;
     } & StrictSelect<S, UserSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/auth/orm/query-builder.ts b/sdk/constructive-cli/src/auth/orm/query-builder.ts
index 8dbcb9646..b0261f895 100644
--- a/sdk/constructive-cli/src/auth/orm/query-builder.ts
+++ b/sdk/constructive-cli/src/auth/orm/query-builder.ts
@@ -189,13 +189,12 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindManyDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
   args: {
     where?: TWhere;
-    condition?: TCondition;
     orderBy?: string[];
     first?: number;
     last?: number;
@@ -205,8 +204,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   },
   filterTypeName: string,
   orderByTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -216,16 +214,6 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   const queryArgs: ArgumentNode[] = [];
   const variables: Record<string, unknown> = {};
 
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
@@ -301,14 +289,13 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindFirstDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
-  args: { where?: TWhere; condition?: TCondition },
+  args: { where?: TWhere },
   filterTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -325,16 +312,6 @@ export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
     queryArgs,
     variables
   );
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
diff --git a/sdk/constructive-cli/src/auth/orm/select-types.ts b/sdk/constructive-cli/src/auth/orm/select-types.ts
index 919d1b935..2621b3570 100644
--- a/sdk/constructive-cli/src/auth/orm/select-types.ts
+++ b/sdk/constructive-cli/src/auth/orm/select-types.ts
@@ -16,10 +16,9 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
+export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -28,10 +27,9 @@ export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = ne
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
+export interface FindFirstArgs<TSelect, TWhere> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {
diff --git a/sdk/constructive-cli/src/objects/cli/commands/commit.ts b/sdk/constructive-cli/src/objects/cli/commands/commit.ts
index cbea0bc89..45ab130b7 100644
--- a/sdk/constructive-cli/src/objects/cli/commands/commit.ts
+++ b/sdk/constructive-cli/src/objects/cli/commands/commit.ts
@@ -88,7 +88,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       date: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<CommitSelect, CommitFilter, never, CommitOrderBy> & {
+      FindManyArgs<CommitSelect, CommitFilter, CommitOrderBy> & {
         select: CommitSelect;
       }
     >(argv, defaultSelect);
@@ -117,7 +117,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       date: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<CommitSelect, CommitFilter, never> & {
+      FindFirstArgs<CommitSelect, CommitFilter> & {
         select: CommitSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/objects/cli/commands/get-all-record.ts b/sdk/constructive-cli/src/objects/cli/commands/get-all-record.ts
index 5ef092f6c..2e18efa39 100644
--- a/sdk/constructive-cli/src/objects/cli/commands/get-all-record.ts
+++ b/sdk/constructive-cli/src/objects/cli/commands/get-all-record.ts
@@ -68,7 +68,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       data: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<GetAllRecordSelect, GetAllRecordFilter, never, GetAllRecordsOrderBy> & {
+      FindManyArgs<GetAllRecordSelect, GetAllRecordFilter, GetAllRecordsOrderBy> & {
         select: GetAllRecordSelect;
       }
     >(argv, defaultSelect);
@@ -90,7 +90,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       data: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<GetAllRecordSelect, GetAllRecordFilter, never> & {
+      FindFirstArgs<GetAllRecordSelect, GetAllRecordFilter> & {
         select: GetAllRecordSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/objects/cli/commands/object.ts b/sdk/constructive-cli/src/objects/cli/commands/object.ts
index a6293a397..a731ea2dd 100644
--- a/sdk/constructive-cli/src/objects/cli/commands/object.ts
+++ b/sdk/constructive-cli/src/objects/cli/commands/object.ts
@@ -85,7 +85,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       createdAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<ObjectSelect, ObjectFilter, never, ObjectOrderBy> & {
+      FindManyArgs<ObjectSelect, ObjectFilter, ObjectOrderBy> & {
         select: ObjectSelect;
       }
     >(argv, defaultSelect);
@@ -112,7 +112,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       createdAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ObjectSelect, ObjectFilter, never> & {
+      FindFirstArgs<ObjectSelect, ObjectFilter> & {
         select: ObjectSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/objects/cli/commands/ref.ts b/sdk/constructive-cli/src/objects/cli/commands/ref.ts
index e511ebe7d..8595f4926 100644
--- a/sdk/constructive-cli/src/objects/cli/commands/ref.ts
+++ b/sdk/constructive-cli/src/objects/cli/commands/ref.ts
@@ -80,7 +80,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       commitId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<RefSelect, RefFilter, never, RefOrderBy> & {
+      FindManyArgs<RefSelect, RefFilter, RefOrderBy> & {
         select: RefSelect;
       }
     >(argv, defaultSelect);
@@ -105,7 +105,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       commitId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<RefSelect, RefFilter, never> & {
+      FindFirstArgs<RefSelect, RefFilter> & {
         select: RefSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/objects/cli/commands/store.ts b/sdk/constructive-cli/src/objects/cli/commands/store.ts
index 206779c0f..cb3879c59 100644
--- a/sdk/constructive-cli/src/objects/cli/commands/store.ts
+++ b/sdk/constructive-cli/src/objects/cli/commands/store.ts
@@ -80,7 +80,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       createdAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<StoreSelect, StoreFilter, never, StoreOrderBy> & {
+      FindManyArgs<StoreSelect, StoreFilter, StoreOrderBy> & {
         select: StoreSelect;
       }
     >(argv, defaultSelect);
@@ -105,7 +105,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       createdAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<StoreSelect, StoreFilter, never> & {
+      FindFirstArgs<StoreSelect, StoreFilter> & {
         select: StoreSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/objects/cli/utils.ts b/sdk/constructive-cli/src/objects/cli/utils.ts
index 7d8d25ac8..1a3f288db 100644
--- a/sdk/constructive-cli/src/objects/cli/utils.ts
+++ b/sdk/constructive-cli/src/objects/cli/utils.ts
@@ -239,7 +239,6 @@ export function parseFindManyArgs<T = Record<string, unknown>>(
     (parsed.where ?? extraWhere)
       ? { ...(extraWhere ?? {}), ...((parsed.where as Record<string, unknown>) ?? {}) }
       : undefined;
-  const condition = parsed.condition;
   const orderBy = parseOrderByFlag(argv);
 
   return {
@@ -250,14 +249,13 @@ export function parseFindManyArgs<T = Record<string, unknown>>(
     ...(before !== undefined ? { before } : {}),
     ...(offset !== undefined ? { offset } : {}),
     ...(where !== undefined ? { where } : {}),
-    ...(condition !== undefined ? { condition } : {}),
     ...(orderBy !== undefined ? { orderBy } : {}),
   } as unknown as T;
 }
 
 /**
  * Build findFirst args from CLI argv.
- * Like parseFindManyArgs but only includes select, where, and condition
+ * Like parseFindManyArgs but only includes select and where
  * (no pagination flags — findFirst returns the first matching record).
  */
 export function parseFindFirstArgs<T = Record<string, unknown>>(
@@ -267,12 +265,10 @@ export function parseFindFirstArgs<T = Record<string, unknown>>(
   const select = parseSelectFlag(argv, defaultSelect);
   const parsed = unflattenDotNotation(argv);
   const where = parsed.where;
-  const condition = parsed.condition;
 
   return {
     select,
     ...(where !== undefined ? { where } : {}),
-    ...(condition !== undefined ? { condition } : {}),
   } as unknown as T;
 }
 
diff --git a/sdk/constructive-cli/src/objects/orm/models/commit.ts b/sdk/constructive-cli/src/objects/orm/models/commit.ts
index b9e8c51d2..de0e94710 100644
--- a/sdk/constructive-cli/src/objects/orm/models/commit.ts
+++ b/sdk/constructive-cli/src/objects/orm/models/commit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CommitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CommitSelect>(
-    args: FindManyArgs<S, CommitFilter, never, CommitOrderBy> & {
+    args: FindManyArgs<S, CommitFilter, CommitOrderBy> & {
       select: S;
     } & StrictSelect<S, CommitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/objects/orm/models/getAllRecord.ts b/sdk/constructive-cli/src/objects/orm/models/getAllRecord.ts
index 94a06bdd9..53873a0f3 100644
--- a/sdk/constructive-cli/src/objects/orm/models/getAllRecord.ts
+++ b/sdk/constructive-cli/src/objects/orm/models/getAllRecord.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class GetAllRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends GetAllRecordSelect>(
-    args: FindManyArgs<S, GetAllRecordFilter, never, GetAllRecordsOrderBy> & {
+    args: FindManyArgs<S, GetAllRecordFilter, GetAllRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, GetAllRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/objects/orm/models/object.ts b/sdk/constructive-cli/src/objects/orm/models/object.ts
index 1cbe85b7c..085bdd4df 100644
--- a/sdk/constructive-cli/src/objects/orm/models/object.ts
+++ b/sdk/constructive-cli/src/objects/orm/models/object.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ObjectModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ObjectSelect>(
-    args: FindManyArgs<S, ObjectFilter, never, ObjectOrderBy> & {
+    args: FindManyArgs<S, ObjectFilter, ObjectOrderBy> & {
       select: S;
     } & StrictSelect<S, ObjectSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/objects/orm/models/ref.ts b/sdk/constructive-cli/src/objects/orm/models/ref.ts
index 6a128cc2f..016c70644 100644
--- a/sdk/constructive-cli/src/objects/orm/models/ref.ts
+++ b/sdk/constructive-cli/src/objects/orm/models/ref.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RefModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RefSelect>(
-    args: FindManyArgs<S, RefFilter, never, RefOrderBy> & {
+    args: FindManyArgs<S, RefFilter, RefOrderBy> & {
       select: S;
     } & StrictSelect<S, RefSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/objects/orm/models/store.ts b/sdk/constructive-cli/src/objects/orm/models/store.ts
index b372bd4c4..f249ee921 100644
--- a/sdk/constructive-cli/src/objects/orm/models/store.ts
+++ b/sdk/constructive-cli/src/objects/orm/models/store.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class StoreModel {
   constructor(private client: OrmClient) {}
   findMany<S extends StoreSelect>(
-    args: FindManyArgs<S, StoreFilter, never, StoreOrderBy> & {
+    args: FindManyArgs<S, StoreFilter, StoreOrderBy> & {
       select: S;
     } & StrictSelect<S, StoreSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/objects/orm/query-builder.ts b/sdk/constructive-cli/src/objects/orm/query-builder.ts
index 8dbcb9646..b0261f895 100644
--- a/sdk/constructive-cli/src/objects/orm/query-builder.ts
+++ b/sdk/constructive-cli/src/objects/orm/query-builder.ts
@@ -189,13 +189,12 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindManyDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
   args: {
     where?: TWhere;
-    condition?: TCondition;
     orderBy?: string[];
     first?: number;
     last?: number;
@@ -205,8 +204,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   },
   filterTypeName: string,
   orderByTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -216,16 +214,6 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   const queryArgs: ArgumentNode[] = [];
   const variables: Record<string, unknown> = {};
 
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
@@ -301,14 +289,13 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindFirstDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
-  args: { where?: TWhere; condition?: TCondition },
+  args: { where?: TWhere },
   filterTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -325,16 +312,6 @@ export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
     queryArgs,
     variables
   );
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
diff --git a/sdk/constructive-cli/src/objects/orm/select-types.ts b/sdk/constructive-cli/src/objects/orm/select-types.ts
index 919d1b935..2621b3570 100644
--- a/sdk/constructive-cli/src/objects/orm/select-types.ts
+++ b/sdk/constructive-cli/src/objects/orm/select-types.ts
@@ -16,10 +16,9 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
+export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -28,10 +27,9 @@ export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = ne
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
+export interface FindFirstArgs<TSelect, TWhere> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {
diff --git a/sdk/constructive-cli/src/public/cli/README.md b/sdk/constructive-cli/src/public/cli/README.md
index d066d593c..10ee10372 100644
--- a/sdk/constructive-cli/src/public/cli/README.md
+++ b/sdk/constructive-cli/src/public/cli/README.md
@@ -167,7 +167,7 @@ csdk auth set-token <your-token>
 | `verify-email` | verifyEmail |
 | `freeze-objects` | freezeObjects |
 | `init-empty-repo` | initEmptyRepo |
-| `construct-blueprint` | Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure. |
+| `construct-blueprint` | Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure. |
 | `reset-password` | resetPassword |
 | `remove-node-at-path` | removeNodeAtPath |
 | `copy-template-to-blueprint` | Creates a new blueprint by copying a template definition. Checks visibility: owners can always copy their own templates, others require public visibility. Increments the template copy_count. Returns the new blueprint ID. |
@@ -4008,7 +4008,7 @@ initEmptyRepo
 
 ### `construct-blueprint`
 
-Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
+Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
 
 - **Type:** mutation
 - **Arguments:**
diff --git a/sdk/constructive-cli/src/public/cli/commands.ts b/sdk/constructive-cli/src/public/cli/commands.ts
index bd3ebd718..9b1866163 100644
--- a/sdk/constructive-cli/src/public/cli/commands.ts
+++ b/sdk/constructive-cli/src/public/cli/commands.ts
@@ -362,7 +362,7 @@ const createCommandMap: () => Record<
   'provision-bucket': provisionBucketCmd,
 });
 const usage =
-  "\ncsdk <command>\n\nCommands:\n  context               Manage API contexts\n  auth                  Manage authentication\n  org-get-managers-record orgGetManagersRecord CRUD operations\n  org-get-subordinates-record orgGetSubordinatesRecord CRUD operations\n  get-all-record       getAllRecord CRUD operations\n  object               object CRUD operations\n  app-permission       appPermission CRUD operations\n  org-permission       orgPermission CRUD operations\n  app-level-requirement appLevelRequirement CRUD operations\n  database             database CRUD operations\n  schema               schema CRUD operations\n  table                table CRUD operations\n  check-constraint     checkConstraint CRUD operations\n  field                field CRUD operations\n  foreign-key-constraint foreignKeyConstraint CRUD operations\n  full-text-search     fullTextSearch CRUD operations\n  index                index CRUD operations\n  policy               policy CRUD operations\n  primary-key-constraint primaryKeyConstraint CRUD operations\n  table-grant          tableGrant CRUD operations\n  trigger              trigger CRUD operations\n  unique-constraint    uniqueConstraint CRUD operations\n  view                 view CRUD operations\n  view-table           viewTable CRUD operations\n  view-grant           viewGrant CRUD operations\n  view-rule            viewRule CRUD operations\n  embedding-chunk      embeddingChunk CRUD operations\n  table-template-module tableTemplateModule CRUD operations\n  secure-table-provision secureTableProvision CRUD operations\n  relation-provision   relationProvision CRUD operations\n  schema-grant         schemaGrant CRUD operations\n  default-privilege    defaultPrivilege CRUD operations\n  enum                 enum CRUD operations\n  api-schema           apiSchema CRUD operations\n  api-module           apiModule CRUD operations\n  domain               domain CRUD operations\n  site-metadatum       siteMetadatum CRUD operations\n  site-module          siteModule CRUD operations\n  site-theme           siteTheme CRUD operations\n  trigger-function     triggerFunction CRUD operations\n  database-transfer    databaseTransfer CRUD operations\n  api                  api CRUD operations\n  site                 site CRUD operations\n  app                  app CRUD operations\n  connected-accounts-module connectedAccountsModule CRUD operations\n  crypto-addresses-module cryptoAddressesModule CRUD operations\n  crypto-auth-module   cryptoAuthModule CRUD operations\n  default-ids-module   defaultIdsModule CRUD operations\n  denormalized-table-field denormalizedTableField CRUD operations\n  emails-module        emailsModule CRUD operations\n  encrypted-secrets-module encryptedSecretsModule CRUD operations\n  invites-module       invitesModule CRUD operations\n  levels-module        levelsModule CRUD operations\n  limits-module        limitsModule CRUD operations\n  membership-types-module membershipTypesModule CRUD operations\n  memberships-module   membershipsModule CRUD operations\n  permissions-module   permissionsModule CRUD operations\n  phone-numbers-module phoneNumbersModule CRUD operations\n  profiles-module      profilesModule CRUD operations\n  secrets-module       secretsModule CRUD operations\n  sessions-module      sessionsModule CRUD operations\n  user-auth-module     userAuthModule CRUD operations\n  users-module         usersModule CRUD operations\n  blueprint            blueprint CRUD operations\n  blueprint-template   blueprintTemplate CRUD operations\n  blueprint-construction blueprintConstruction CRUD operations\n  storage-module       storageModule CRUD operations\n  database-provision-module databaseProvisionModule CRUD operations\n  app-admin-grant      appAdminGrant CRUD operations\n  app-owner-grant      appOwnerGrant CRUD operations\n  app-grant            appGrant CRUD operations\n  org-membership       orgMembership CRUD operations\n  org-member           orgMember CRUD operations\n  org-admin-grant      orgAdminGrant CRUD operations\n  org-owner-grant      orgOwnerGrant CRUD operations\n  org-grant            orgGrant CRUD operations\n  org-chart-edge       orgChartEdge CRUD operations\n  org-chart-edge-grant orgChartEdgeGrant CRUD operations\n  org-permission-default orgPermissionDefault CRUD operations\n  app-limit            appLimit CRUD operations\n  org-limit            orgLimit CRUD operations\n  app-step             appStep CRUD operations\n  app-achievement      appAchievement CRUD operations\n  app-level            appLevel CRUD operations\n  email                email CRUD operations\n  phone-number         phoneNumber CRUD operations\n  crypto-address       cryptoAddress CRUD operations\n  connected-account    connectedAccount CRUD operations\n  invite               invite CRUD operations\n  claimed-invite       claimedInvite CRUD operations\n  org-invite           orgInvite CRUD operations\n  org-claimed-invite   orgClaimedInvite CRUD operations\n  audit-log            auditLog CRUD operations\n  app-permission-default appPermissionDefault CRUD operations\n  ref                  ref CRUD operations\n  store                store CRUD operations\n  role-type            roleType CRUD operations\n  migrate-file         migrateFile CRUD operations\n  app-limit-default    appLimitDefault CRUD operations\n  org-limit-default    orgLimitDefault CRUD operations\n  membership-type      membershipType CRUD operations\n  app-membership-default appMembershipDefault CRUD operations\n  commit               commit CRUD operations\n  org-membership-default orgMembershipDefault CRUD operations\n  rls-module           rlsModule CRUD operations\n  sql-action           sqlAction CRUD operations\n  user                 user CRUD operations\n  ast-migration        astMigration CRUD operations\n  app-membership       appMembership CRUD operations\n  hierarchy-module     hierarchyModule CRUD operations\n  current-user-id      currentUserId\n  current-ip-address   currentIpAddress\n  current-user-agent   currentUserAgent\n  app-permissions-get-padded-mask appPermissionsGetPaddedMask\n  org-permissions-get-padded-mask orgPermissionsGetPaddedMask\n  steps-achieved       stepsAchieved\n  rev-parse            revParse\n  org-is-manager-of    orgIsManagerOf\n  app-permissions-get-mask appPermissionsGetMask\n  org-permissions-get-mask orgPermissionsGetMask\n  resolve-blueprint-table Resolves a table_name (with optional schema_name) to a table_id. Resolution order: (1) if schema_name provided, exact lookup via metaschema_public.schema.name + metaschema_public.table; (2) check local table_map (tables created in current blueprint); (3) search metaschema_public.table by name across all schemas; (4) if multiple matches, throw ambiguous error asking for schema_name; (5) if no match, throw not-found error.\n  app-permissions-get-mask-by-names appPermissionsGetMaskByNames\n  org-permissions-get-mask-by-names orgPermissionsGetMaskByNames\n  get-all-objects-from-root Reads and enables pagination through a set of `Object`.\n  get-path-objects-from-root Reads and enables pagination through a set of `Object`.\n  get-object-at-path   getObjectAtPath\n  app-permissions-get-by-mask Reads and enables pagination through a set of `AppPermission`.\n  org-permissions-get-by-mask Reads and enables pagination through a set of `OrgPermission`.\n  steps-required       Reads and enables pagination through a set of `AppLevelRequirement`.\n  current-user         currentUser\n  send-account-deletion-email sendAccountDeletionEmail\n  sign-out             signOut\n  accept-database-transfer acceptDatabaseTransfer\n  cancel-database-transfer cancelDatabaseTransfer\n  reject-database-transfer rejectDatabaseTransfer\n  submit-invite-code   submitInviteCode\n  submit-org-invite-code submitOrgInviteCode\n  check-password       checkPassword\n  confirm-delete-account confirmDeleteAccount\n  set-password         setPassword\n  verify-email         verifyEmail\n  freeze-objects       freezeObjects\n  init-empty-repo      initEmptyRepo\n  construct-blueprint  Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.\n  reset-password       resetPassword\n  remove-node-at-path  removeNodeAtPath\n  copy-template-to-blueprint Creates a new blueprint by copying a template definition. Checks visibility: owners can always copy their own templates, others require public visibility. Increments the template copy_count. Returns the new blueprint ID.\n  bootstrap-user       bootstrapUser\n  set-field-order      setFieldOrder\n  provision-unique-constraint Creates a unique constraint on a table. Accepts a jsonb definition with columns (array of field names). Graceful: skips if the exact same unique constraint already exists.\n  provision-full-text-search Creates a full-text search configuration on a table. Accepts a jsonb definition with field (tsvector column name) and sources (array of {field, weight, lang}). Graceful: skips if FTS config already exists for the same (table_id, field_id). Returns the fts_id.\n  provision-index      Creates an index on a table. Accepts a jsonb definition with columns (array of names or single column string), access_method (default BTREE), is_unique, op_classes, options, and name (auto-generated if omitted). Graceful: skips if an index with the same (table_id, field_ids, access_method) already exists. Returns the index_id.\n  set-data-at-path     setDataAtPath\n  set-props-and-commit setPropsAndCommit\n  provision-database-with-user provisionDatabaseWithUser\n  insert-node-at-path  insertNodeAtPath\n  update-node-at-path  updateNodeAtPath\n  set-and-commit       setAndCommit\n  provision-relation   Composable relation provisioning: creates FK fields, indexes, unique constraints, and junction tables depending on the relation_type. Supports RelationBelongsTo, RelationHasOne, RelationHasMany, and RelationManyToMany. ManyToMany uses provision_table() internally for junction table creation with full node/grant/policy support. All operations are graceful (skip existing). Returns (out_field_id, out_junction_table_id, out_source_field_id, out_target_field_id).\n  apply-rls            applyRls\n  sign-in-one-time-token signInOneTimeToken\n  create-user-database Creates a new user database with all required modules, permissions, and RLS policies.\n\nParameters:\n  - database_name: Name for the new database (required)\n  - owner_id: UUID of the owner user (required)\n  - include_invites: Include invite system (default: true)\n  - include_groups: Include group-level memberships (default: false)\n  - include_levels: Include levels/achievements (default: false)\n  - bitlen: Bit length for permission masks (default: 64)\n  - tokens_expiration: Token expiration interval (default: 30 days)\n\nReturns the database_id UUID of the newly created database.\n\nExample usage:\n  SELECT metaschema_public.create_user_database('my_app', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid);\n  SELECT metaschema_public.create_user_database('my_app', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, true, true);  -- with invites and groups\n\n  extend-token-expires extendTokenExpires\n  sign-in              signIn\n  sign-up              signUp\n  one-time-token       oneTimeToken\n  provision-table      Composable table provisioning: creates or finds a table, then creates fields (so Data* modules can reference them), applies N nodes (Data* modules), enables RLS, creates grants, creates N policies, and optionally creates table-level indexes/full_text_searches/unique_constraints. All operations are graceful (skip existing). Accepts multiple nodes and multiple policies per call, unlike secure_table_provision which is limited to one of each. Returns (out_table_id, out_fields).\n  send-verification-email sendVerificationEmail\n  forgot-password      forgotPassword\n  verify-password      verifyPassword\n  verify-totp          verifyTotp\n  request-upload-url   Request a presigned URL for uploading a file directly to S3.\nClient computes SHA-256 of the file content and provides it here.\nIf a file with the same hash already exists (dedup), returns the\nexisting file ID and deduplicated=true with no uploadUrl.\n  confirm-upload       Confirm that a file has been uploaded to S3.\nVerifies the object exists in S3, checks content-type,\nand transitions the file status from 'pending' to 'ready'.\n  provision-bucket     Provision an S3 bucket for a logical bucket in the database.\nReads the bucket config via RLS, then creates and configures\nthe S3 bucket with the appropriate privacy policies, CORS rules,\nand lifecycle settings.\n\n  --help, -h            Show this help message\n  --version, -v         Show version\n";
+  "\ncsdk <command>\n\nCommands:\n  context               Manage API contexts\n  auth                  Manage authentication\n  org-get-managers-record orgGetManagersRecord CRUD operations\n  org-get-subordinates-record orgGetSubordinatesRecord CRUD operations\n  get-all-record       getAllRecord CRUD operations\n  object               object CRUD operations\n  app-permission       appPermission CRUD operations\n  org-permission       orgPermission CRUD operations\n  app-level-requirement appLevelRequirement CRUD operations\n  database             database CRUD operations\n  schema               schema CRUD operations\n  table                table CRUD operations\n  check-constraint     checkConstraint CRUD operations\n  field                field CRUD operations\n  foreign-key-constraint foreignKeyConstraint CRUD operations\n  full-text-search     fullTextSearch CRUD operations\n  index                index CRUD operations\n  policy               policy CRUD operations\n  primary-key-constraint primaryKeyConstraint CRUD operations\n  table-grant          tableGrant CRUD operations\n  trigger              trigger CRUD operations\n  unique-constraint    uniqueConstraint CRUD operations\n  view                 view CRUD operations\n  view-table           viewTable CRUD operations\n  view-grant           viewGrant CRUD operations\n  view-rule            viewRule CRUD operations\n  embedding-chunk      embeddingChunk CRUD operations\n  table-template-module tableTemplateModule CRUD operations\n  secure-table-provision secureTableProvision CRUD operations\n  relation-provision   relationProvision CRUD operations\n  schema-grant         schemaGrant CRUD operations\n  default-privilege    defaultPrivilege CRUD operations\n  enum                 enum CRUD operations\n  api-schema           apiSchema CRUD operations\n  api-module           apiModule CRUD operations\n  domain               domain CRUD operations\n  site-metadatum       siteMetadatum CRUD operations\n  site-module          siteModule CRUD operations\n  site-theme           siteTheme CRUD operations\n  trigger-function     triggerFunction CRUD operations\n  database-transfer    databaseTransfer CRUD operations\n  api                  api CRUD operations\n  site                 site CRUD operations\n  app                  app CRUD operations\n  connected-accounts-module connectedAccountsModule CRUD operations\n  crypto-addresses-module cryptoAddressesModule CRUD operations\n  crypto-auth-module   cryptoAuthModule CRUD operations\n  default-ids-module   defaultIdsModule CRUD operations\n  denormalized-table-field denormalizedTableField CRUD operations\n  emails-module        emailsModule CRUD operations\n  encrypted-secrets-module encryptedSecretsModule CRUD operations\n  invites-module       invitesModule CRUD operations\n  levels-module        levelsModule CRUD operations\n  limits-module        limitsModule CRUD operations\n  membership-types-module membershipTypesModule CRUD operations\n  memberships-module   membershipsModule CRUD operations\n  permissions-module   permissionsModule CRUD operations\n  phone-numbers-module phoneNumbersModule CRUD operations\n  profiles-module      profilesModule CRUD operations\n  secrets-module       secretsModule CRUD operations\n  sessions-module      sessionsModule CRUD operations\n  user-auth-module     userAuthModule CRUD operations\n  users-module         usersModule CRUD operations\n  blueprint            blueprint CRUD operations\n  blueprint-template   blueprintTemplate CRUD operations\n  blueprint-construction blueprintConstruction CRUD operations\n  storage-module       storageModule CRUD operations\n  database-provision-module databaseProvisionModule CRUD operations\n  app-admin-grant      appAdminGrant CRUD operations\n  app-owner-grant      appOwnerGrant CRUD operations\n  app-grant            appGrant CRUD operations\n  org-membership       orgMembership CRUD operations\n  org-member           orgMember CRUD operations\n  org-admin-grant      orgAdminGrant CRUD operations\n  org-owner-grant      orgOwnerGrant CRUD operations\n  org-grant            orgGrant CRUD operations\n  org-chart-edge       orgChartEdge CRUD operations\n  org-chart-edge-grant orgChartEdgeGrant CRUD operations\n  org-permission-default orgPermissionDefault CRUD operations\n  app-limit            appLimit CRUD operations\n  org-limit            orgLimit CRUD operations\n  app-step             appStep CRUD operations\n  app-achievement      appAchievement CRUD operations\n  app-level            appLevel CRUD operations\n  email                email CRUD operations\n  phone-number         phoneNumber CRUD operations\n  crypto-address       cryptoAddress CRUD operations\n  connected-account    connectedAccount CRUD operations\n  invite               invite CRUD operations\n  claimed-invite       claimedInvite CRUD operations\n  org-invite           orgInvite CRUD operations\n  org-claimed-invite   orgClaimedInvite CRUD operations\n  audit-log            auditLog CRUD operations\n  app-permission-default appPermissionDefault CRUD operations\n  ref                  ref CRUD operations\n  store                store CRUD operations\n  role-type            roleType CRUD operations\n  migrate-file         migrateFile CRUD operations\n  app-limit-default    appLimitDefault CRUD operations\n  org-limit-default    orgLimitDefault CRUD operations\n  membership-type      membershipType CRUD operations\n  app-membership-default appMembershipDefault CRUD operations\n  commit               commit CRUD operations\n  org-membership-default orgMembershipDefault CRUD operations\n  rls-module           rlsModule CRUD operations\n  sql-action           sqlAction CRUD operations\n  user                 user CRUD operations\n  ast-migration        astMigration CRUD operations\n  app-membership       appMembership CRUD operations\n  hierarchy-module     hierarchyModule CRUD operations\n  current-user-id      currentUserId\n  current-ip-address   currentIpAddress\n  current-user-agent   currentUserAgent\n  app-permissions-get-padded-mask appPermissionsGetPaddedMask\n  org-permissions-get-padded-mask orgPermissionsGetPaddedMask\n  steps-achieved       stepsAchieved\n  rev-parse            revParse\n  org-is-manager-of    orgIsManagerOf\n  app-permissions-get-mask appPermissionsGetMask\n  org-permissions-get-mask orgPermissionsGetMask\n  resolve-blueprint-table Resolves a table_name (with optional schema_name) to a table_id. Resolution order: (1) if schema_name provided, exact lookup via metaschema_public.schema.name + metaschema_public.table; (2) check local table_map (tables created in current blueprint); (3) search metaschema_public.table by name across all schemas; (4) if multiple matches, throw ambiguous error asking for schema_name; (5) if no match, throw not-found error.\n  app-permissions-get-mask-by-names appPermissionsGetMaskByNames\n  org-permissions-get-mask-by-names orgPermissionsGetMaskByNames\n  get-all-objects-from-root Reads and enables pagination through a set of `Object`.\n  get-path-objects-from-root Reads and enables pagination through a set of `Object`.\n  get-object-at-path   getObjectAtPath\n  app-permissions-get-by-mask Reads and enables pagination through a set of `AppPermission`.\n  org-permissions-get-by-mask Reads and enables pagination through a set of `OrgPermission`.\n  steps-required       Reads and enables pagination through a set of `AppLevelRequirement`.\n  current-user         currentUser\n  send-account-deletion-email sendAccountDeletionEmail\n  sign-out             signOut\n  accept-database-transfer acceptDatabaseTransfer\n  cancel-database-transfer cancelDatabaseTransfer\n  reject-database-transfer rejectDatabaseTransfer\n  submit-invite-code   submitInviteCode\n  submit-org-invite-code submitOrgInviteCode\n  check-password       checkPassword\n  confirm-delete-account confirmDeleteAccount\n  set-password         setPassword\n  verify-email         verifyEmail\n  freeze-objects       freezeObjects\n  init-empty-repo      initEmptyRepo\n  construct-blueprint  Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.\n  reset-password       resetPassword\n  remove-node-at-path  removeNodeAtPath\n  copy-template-to-blueprint Creates a new blueprint by copying a template definition. Checks visibility: owners can always copy their own templates, others require public visibility. Increments the template copy_count. Returns the new blueprint ID.\n  bootstrap-user       bootstrapUser\n  set-field-order      setFieldOrder\n  provision-unique-constraint Creates a unique constraint on a table. Accepts a jsonb definition with columns (array of field names). Graceful: skips if the exact same unique constraint already exists.\n  provision-full-text-search Creates a full-text search configuration on a table. Accepts a jsonb definition with field (tsvector column name) and sources (array of {field, weight, lang}). Graceful: skips if FTS config already exists for the same (table_id, field_id). Returns the fts_id.\n  provision-index      Creates an index on a table. Accepts a jsonb definition with columns (array of names or single column string), access_method (default BTREE), is_unique, op_classes, options, and name (auto-generated if omitted). Graceful: skips if an index with the same (table_id, field_ids, access_method) already exists. Returns the index_id.\n  set-data-at-path     setDataAtPath\n  set-props-and-commit setPropsAndCommit\n  provision-database-with-user provisionDatabaseWithUser\n  insert-node-at-path  insertNodeAtPath\n  update-node-at-path  updateNodeAtPath\n  set-and-commit       setAndCommit\n  provision-relation   Composable relation provisioning: creates FK fields, indexes, unique constraints, and junction tables depending on the relation_type. Supports RelationBelongsTo, RelationHasOne, RelationHasMany, and RelationManyToMany. ManyToMany uses provision_table() internally for junction table creation with full node/grant/policy support. All operations are graceful (skip existing). Returns (out_field_id, out_junction_table_id, out_source_field_id, out_target_field_id).\n  apply-rls            applyRls\n  sign-in-one-time-token signInOneTimeToken\n  create-user-database Creates a new user database with all required modules, permissions, and RLS policies.\n\nParameters:\n  - database_name: Name for the new database (required)\n  - owner_id: UUID of the owner user (required)\n  - include_invites: Include invite system (default: true)\n  - include_groups: Include group-level memberships (default: false)\n  - include_levels: Include levels/achievements (default: false)\n  - bitlen: Bit length for permission masks (default: 64)\n  - tokens_expiration: Token expiration interval (default: 30 days)\n\nReturns the database_id UUID of the newly created database.\n\nExample usage:\n  SELECT metaschema_public.create_user_database('my_app', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid);\n  SELECT metaschema_public.create_user_database('my_app', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, true, true);  -- with invites and groups\n\n  extend-token-expires extendTokenExpires\n  sign-in              signIn\n  sign-up              signUp\n  one-time-token       oneTimeToken\n  provision-table      Composable table provisioning: creates or finds a table, then creates fields (so Data* modules can reference them), applies N nodes (Data* modules), enables RLS, creates grants, creates N policies, and optionally creates table-level indexes/full_text_searches/unique_constraints. All operations are graceful (skip existing). Accepts multiple nodes and multiple policies per call, unlike secure_table_provision which is limited to one of each. Returns (out_table_id, out_fields).\n  send-verification-email sendVerificationEmail\n  forgot-password      forgotPassword\n  verify-password      verifyPassword\n  verify-totp          verifyTotp\n  request-upload-url   Request a presigned URL for uploading a file directly to S3.\nClient computes SHA-256 of the file content and provides it here.\nIf a file with the same hash already exists (dedup), returns the\nexisting file ID and deduplicated=true with no uploadUrl.\n  confirm-upload       Confirm that a file has been uploaded to S3.\nVerifies the object exists in S3, checks content-type,\nand transitions the file status from 'pending' to 'ready'.\n  provision-bucket     Provision an S3 bucket for a logical bucket in the database.\nReads the bucket config via RLS, then creates and configures\nthe S3 bucket with the appropriate privacy policies, CORS rules,\nand lifecycle settings.\n\n  --help, -h            Show this help message\n  --version, -v         Show version\n";
 export const commands = async (
   argv: Partial<Record<string, unknown>>,
   prompter: Inquirerer,
diff --git a/sdk/constructive-cli/src/public/cli/commands/api-module.ts b/sdk/constructive-cli/src/public/cli/commands/api-module.ts
index 934971a10..8cc1460b1 100644
--- a/sdk/constructive-cli/src/public/cli/commands/api-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/api-module.ts
@@ -80,7 +80,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       data: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<ApiModuleSelect, ApiModuleFilter, never, ApiModuleOrderBy> & {
+      FindManyArgs<ApiModuleSelect, ApiModuleFilter, ApiModuleOrderBy> & {
         select: ApiModuleSelect;
       }
     >(argv, defaultSelect);
@@ -105,7 +105,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       data: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ApiModuleSelect, ApiModuleFilter, never> & {
+      FindFirstArgs<ApiModuleSelect, ApiModuleFilter> & {
         select: ApiModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/api-schema.ts b/sdk/constructive-cli/src/public/cli/commands/api-schema.ts
index aa060f650..bad7dec89 100644
--- a/sdk/constructive-cli/src/public/cli/commands/api-schema.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/api-schema.ts
@@ -78,7 +78,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       apiId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<ApiSchemaSelect, ApiSchemaFilter, never, ApiSchemaOrderBy> & {
+      FindManyArgs<ApiSchemaSelect, ApiSchemaFilter, ApiSchemaOrderBy> & {
         select: ApiSchemaSelect;
       }
     >(argv, defaultSelect);
@@ -102,7 +102,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       apiId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ApiSchemaSelect, ApiSchemaFilter, never> & {
+      FindFirstArgs<ApiSchemaSelect, ApiSchemaFilter> & {
         select: ApiSchemaSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/api.ts b/sdk/constructive-cli/src/public/cli/commands/api.ts
index 46113cd37..80a41ba0e 100644
--- a/sdk/constructive-cli/src/public/cli/commands/api.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/api.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       isPublic: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<ApiSelect, ApiFilter, never, ApiOrderBy> & {
+      FindManyArgs<ApiSelect, ApiFilter, ApiOrderBy> & {
         select: ApiSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       isPublic: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ApiSelect, ApiFilter, never> & {
+      FindFirstArgs<ApiSelect, ApiFilter> & {
         select: ApiSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app-achievement.ts b/sdk/constructive-cli/src/public/cli/commands/app-achievement.ts
index 103d9d6aa..040c863a9 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app-achievement.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app-achievement.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppAchievementSelect, AppAchievementFilter, never, AppAchievementOrderBy> & {
+      FindManyArgs<AppAchievementSelect, AppAchievementFilter, AppAchievementOrderBy> & {
         select: AppAchievementSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppAchievementSelect, AppAchievementFilter, never> & {
+      FindFirstArgs<AppAchievementSelect, AppAchievementFilter> & {
         select: AppAchievementSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app-admin-grant.ts b/sdk/constructive-cli/src/public/cli/commands/app-admin-grant.ts
index 502b8b80b..e30b63954 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app-admin-grant.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app-admin-grant.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppAdminGrantSelect, AppAdminGrantFilter, never, AppAdminGrantOrderBy> & {
+      FindManyArgs<AppAdminGrantSelect, AppAdminGrantFilter, AppAdminGrantOrderBy> & {
         select: AppAdminGrantSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppAdminGrantSelect, AppAdminGrantFilter, never> & {
+      FindFirstArgs<AppAdminGrantSelect, AppAdminGrantFilter> & {
         select: AppAdminGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app-grant.ts b/sdk/constructive-cli/src/public/cli/commands/app-grant.ts
index 5d49497b5..961288ffa 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app-grant.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app-grant.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppGrantSelect, AppGrantFilter, never, AppGrantOrderBy> & {
+      FindManyArgs<AppGrantSelect, AppGrantFilter, AppGrantOrderBy> & {
         select: AppGrantSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppGrantSelect, AppGrantFilter, never> & {
+      FindFirstArgs<AppGrantSelect, AppGrantFilter> & {
         select: AppGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app-level-requirement.ts b/sdk/constructive-cli/src/public/cli/commands/app-level-requirement.ts
index 09a1ca603..dcad1ad7c 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app-level-requirement.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app-level-requirement.ts
@@ -89,7 +89,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         AppLevelRequirementSelect,
         AppLevelRequirementFilter,
-        never,
         AppLevelRequirementOrderBy
       > & {
         select: AppLevelRequirementSelect;
@@ -119,7 +118,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppLevelRequirementSelect, AppLevelRequirementFilter, never> & {
+      FindFirstArgs<AppLevelRequirementSelect, AppLevelRequirementFilter> & {
         select: AppLevelRequirementSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app-level.ts b/sdk/constructive-cli/src/public/cli/commands/app-level.ts
index 5f5cadf30..fd5b9d9e6 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app-level.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app-level.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppLevelSelect, AppLevelFilter, never, AppLevelOrderBy> & {
+      FindManyArgs<AppLevelSelect, AppLevelFilter, AppLevelOrderBy> & {
         select: AppLevelSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppLevelSelect, AppLevelFilter, never> & {
+      FindFirstArgs<AppLevelSelect, AppLevelFilter> & {
         select: AppLevelSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app-limit-default.ts b/sdk/constructive-cli/src/public/cli/commands/app-limit-default.ts
index 6894a28e4..0cf146154 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app-limit-default.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app-limit-default.ts
@@ -76,7 +76,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       max: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppLimitDefaultSelect, AppLimitDefaultFilter, never, AppLimitDefaultOrderBy> & {
+      FindManyArgs<AppLimitDefaultSelect, AppLimitDefaultFilter, AppLimitDefaultOrderBy> & {
         select: AppLimitDefaultSelect;
       }
     >(argv, defaultSelect);
@@ -99,7 +99,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       max: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppLimitDefaultSelect, AppLimitDefaultFilter, never> & {
+      FindFirstArgs<AppLimitDefaultSelect, AppLimitDefaultFilter> & {
         select: AppLimitDefaultSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app-limit.ts b/sdk/constructive-cli/src/public/cli/commands/app-limit.ts
index 715ec43b7..ef31b6337 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app-limit.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app-limit.ts
@@ -80,7 +80,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       max: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppLimitSelect, AppLimitFilter, never, AppLimitOrderBy> & {
+      FindManyArgs<AppLimitSelect, AppLimitFilter, AppLimitOrderBy> & {
         select: AppLimitSelect;
       }
     >(argv, defaultSelect);
@@ -105,7 +105,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       max: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppLimitSelect, AppLimitFilter, never> & {
+      FindFirstArgs<AppLimitSelect, AppLimitFilter> & {
         select: AppLimitSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app-membership-default.ts b/sdk/constructive-cli/src/public/cli/commands/app-membership-default.ts
index ca4257671..31b53fded 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app-membership-default.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app-membership-default.ts
@@ -87,7 +87,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         AppMembershipDefaultSelect,
         AppMembershipDefaultFilter,
-        never,
         AppMembershipDefaultOrderBy
       > & {
         select: AppMembershipDefaultSelect;
@@ -116,7 +115,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       isVerified: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppMembershipDefaultSelect, AppMembershipDefaultFilter, never> & {
+      FindFirstArgs<AppMembershipDefaultSelect, AppMembershipDefaultFilter> & {
         select: AppMembershipDefaultSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app-membership.ts b/sdk/constructive-cli/src/public/cli/commands/app-membership.ts
index 8d960a914..d463fd934 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app-membership.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app-membership.ts
@@ -102,7 +102,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       profileId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppMembershipSelect, AppMembershipFilter, never, AppMembershipOrderBy> & {
+      FindManyArgs<AppMembershipSelect, AppMembershipFilter, AppMembershipOrderBy> & {
         select: AppMembershipSelect;
       }
     >(argv, defaultSelect);
@@ -138,7 +138,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       profileId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppMembershipSelect, AppMembershipFilter, never> & {
+      FindFirstArgs<AppMembershipSelect, AppMembershipFilter> & {
         select: AppMembershipSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app-owner-grant.ts b/sdk/constructive-cli/src/public/cli/commands/app-owner-grant.ts
index c459e0a07..b8189a180 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app-owner-grant.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app-owner-grant.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppOwnerGrantSelect, AppOwnerGrantFilter, never, AppOwnerGrantOrderBy> & {
+      FindManyArgs<AppOwnerGrantSelect, AppOwnerGrantFilter, AppOwnerGrantOrderBy> & {
         select: AppOwnerGrantSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppOwnerGrantSelect, AppOwnerGrantFilter, never> & {
+      FindFirstArgs<AppOwnerGrantSelect, AppOwnerGrantFilter> & {
         select: AppOwnerGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app-permission-default.ts b/sdk/constructive-cli/src/public/cli/commands/app-permission-default.ts
index c25b842a3..02ba19499 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app-permission-default.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app-permission-default.ts
@@ -77,7 +77,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         AppPermissionDefaultSelect,
         AppPermissionDefaultFilter,
-        never,
         AppPermissionDefaultOrderBy
       > & {
         select: AppPermissionDefaultSelect;
@@ -101,7 +100,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       permissions: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppPermissionDefaultSelect, AppPermissionDefaultFilter, never> & {
+      FindFirstArgs<AppPermissionDefaultSelect, AppPermissionDefaultFilter> & {
         select: AppPermissionDefaultSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app-permission.ts b/sdk/constructive-cli/src/public/cli/commands/app-permission.ts
index 7a354db18..db2d37c76 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app-permission.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app-permission.ts
@@ -80,7 +80,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       description: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppPermissionSelect, AppPermissionFilter, never, AppPermissionOrderBy> & {
+      FindManyArgs<AppPermissionSelect, AppPermissionFilter, AppPermissionOrderBy> & {
         select: AppPermissionSelect;
       }
     >(argv, defaultSelect);
@@ -105,7 +105,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       description: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppPermissionSelect, AppPermissionFilter, never> & {
+      FindFirstArgs<AppPermissionSelect, AppPermissionFilter> & {
         select: AppPermissionSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app-step.ts b/sdk/constructive-cli/src/public/cli/commands/app-step.ts
index daf16cc8f..537dbd7bf 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app-step.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app-step.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppStepSelect, AppStepFilter, never, AppStepOrderBy> & {
+      FindManyArgs<AppStepSelect, AppStepFilter, AppStepOrderBy> & {
         select: AppStepSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppStepSelect, AppStepFilter, never> & {
+      FindFirstArgs<AppStepSelect, AppStepFilter> & {
         select: AppStepSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/app.ts b/sdk/constructive-cli/src/public/cli/commands/app.ts
index 4f5c4772f..652af53f1 100644
--- a/sdk/constructive-cli/src/public/cli/commands/app.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/app.ts
@@ -88,7 +88,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       playStoreLink: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AppSelect, AppFilter, never, AppOrderBy> & {
+      FindManyArgs<AppSelect, AppFilter, AppOrderBy> & {
         select: AppSelect;
       }
     >(argv, defaultSelect);
@@ -117,7 +117,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       playStoreLink: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppSelect, AppFilter, never> & {
+      FindFirstArgs<AppSelect, AppFilter> & {
         select: AppSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/ast-migration.ts b/sdk/constructive-cli/src/public/cli/commands/ast-migration.ts
index e754f9166..d84210241 100644
--- a/sdk/constructive-cli/src/public/cli/commands/ast-migration.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/ast-migration.ts
@@ -90,7 +90,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       actorId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AstMigrationSelect, AstMigrationFilter, never, AstMigrationOrderBy> & {
+      FindManyArgs<AstMigrationSelect, AstMigrationFilter, AstMigrationOrderBy> & {
         select: AstMigrationSelect;
       }
     >(argv, defaultSelect);
@@ -123,7 +123,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       actorId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AstMigrationSelect, AstMigrationFilter, never> & {
+      FindFirstArgs<AstMigrationSelect, AstMigrationFilter> & {
         select: AstMigrationSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/audit-log.ts b/sdk/constructive-cli/src/public/cli/commands/audit-log.ts
index 79a5c1b1c..5c7263710 100644
--- a/sdk/constructive-cli/src/public/cli/commands/audit-log.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/audit-log.ts
@@ -86,7 +86,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       createdAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<AuditLogSelect, AuditLogFilter, never, AuditLogOrderBy> & {
+      FindManyArgs<AuditLogSelect, AuditLogFilter, AuditLogOrderBy> & {
         select: AuditLogSelect;
       }
     >(argv, defaultSelect);
@@ -114,7 +114,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       createdAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AuditLogSelect, AuditLogFilter, never> & {
+      FindFirstArgs<AuditLogSelect, AuditLogFilter> & {
         select: AuditLogSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/blueprint-construction.ts b/sdk/constructive-cli/src/public/cli/commands/blueprint-construction.ts
index e0ddf187e..364488633 100644
--- a/sdk/constructive-cli/src/public/cli/commands/blueprint-construction.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/blueprint-construction.ts
@@ -95,7 +95,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         BlueprintConstructionSelect,
         BlueprintConstructionFilter,
-        never,
         BlueprintConstructionOrderBy
       > & {
         select: BlueprintConstructionSelect;
@@ -128,7 +127,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<BlueprintConstructionSelect, BlueprintConstructionFilter, never> & {
+      FindFirstArgs<BlueprintConstructionSelect, BlueprintConstructionFilter> & {
         select: BlueprintConstructionSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/blueprint-template.ts b/sdk/constructive-cli/src/public/cli/commands/blueprint-template.ts
index 614f62cc2..82a909626 100644
--- a/sdk/constructive-cli/src/public/cli/commands/blueprint-template.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/blueprint-template.ts
@@ -110,12 +110,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        BlueprintTemplateSelect,
-        BlueprintTemplateFilter,
-        never,
-        BlueprintTemplateOrderBy
-      > & {
+      FindManyArgs<BlueprintTemplateSelect, BlueprintTemplateFilter, BlueprintTemplateOrderBy> & {
         select: BlueprintTemplateSelect;
       }
     >(argv, defaultSelect);
@@ -155,7 +150,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<BlueprintTemplateSelect, BlueprintTemplateFilter, never> & {
+      FindFirstArgs<BlueprintTemplateSelect, BlueprintTemplateFilter> & {
         select: BlueprintTemplateSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/blueprint.ts b/sdk/constructive-cli/src/public/cli/commands/blueprint.ts
index 400d80a13..3af8c2513 100644
--- a/sdk/constructive-cli/src/public/cli/commands/blueprint.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/blueprint.ts
@@ -94,7 +94,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<BlueprintSelect, BlueprintFilter, never, BlueprintOrderBy> & {
+      FindManyArgs<BlueprintSelect, BlueprintFilter, BlueprintOrderBy> & {
         select: BlueprintSelect;
       }
     >(argv, defaultSelect);
@@ -126,7 +126,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<BlueprintSelect, BlueprintFilter, never> & {
+      FindFirstArgs<BlueprintSelect, BlueprintFilter> & {
         select: BlueprintSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/check-constraint.ts b/sdk/constructive-cli/src/public/cli/commands/check-constraint.ts
index ae29dc80d..6ed36f378 100644
--- a/sdk/constructive-cli/src/public/cli/commands/check-constraint.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/check-constraint.ts
@@ -98,7 +98,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<CheckConstraintSelect, CheckConstraintFilter, never, CheckConstraintOrderBy> & {
+      FindManyArgs<CheckConstraintSelect, CheckConstraintFilter, CheckConstraintOrderBy> & {
         select: CheckConstraintSelect;
       }
     >(argv, defaultSelect);
@@ -132,7 +132,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<CheckConstraintSelect, CheckConstraintFilter, never> & {
+      FindFirstArgs<CheckConstraintSelect, CheckConstraintFilter> & {
         select: CheckConstraintSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/claimed-invite.ts b/sdk/constructive-cli/src/public/cli/commands/claimed-invite.ts
index f0f106228..2e3659add 100644
--- a/sdk/constructive-cli/src/public/cli/commands/claimed-invite.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/claimed-invite.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<ClaimedInviteSelect, ClaimedInviteFilter, never, ClaimedInviteOrderBy> & {
+      FindManyArgs<ClaimedInviteSelect, ClaimedInviteFilter, ClaimedInviteOrderBy> & {
         select: ClaimedInviteSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ClaimedInviteSelect, ClaimedInviteFilter, never> & {
+      FindFirstArgs<ClaimedInviteSelect, ClaimedInviteFilter> & {
         select: ClaimedInviteSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/commit.ts b/sdk/constructive-cli/src/public/cli/commands/commit.ts
index cbea0bc89..45ab130b7 100644
--- a/sdk/constructive-cli/src/public/cli/commands/commit.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/commit.ts
@@ -88,7 +88,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       date: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<CommitSelect, CommitFilter, never, CommitOrderBy> & {
+      FindManyArgs<CommitSelect, CommitFilter, CommitOrderBy> & {
         select: CommitSelect;
       }
     >(argv, defaultSelect);
@@ -117,7 +117,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       date: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<CommitSelect, CommitFilter, never> & {
+      FindFirstArgs<CommitSelect, CommitFilter> & {
         select: CommitSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/connected-account.ts b/sdk/constructive-cli/src/public/cli/commands/connected-account.ts
index 5b0ea5d96..5522a3457 100644
--- a/sdk/constructive-cli/src/public/cli/commands/connected-account.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/connected-account.ts
@@ -86,12 +86,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        ConnectedAccountSelect,
-        ConnectedAccountFilter,
-        never,
-        ConnectedAccountOrderBy
-      > & {
+      FindManyArgs<ConnectedAccountSelect, ConnectedAccountFilter, ConnectedAccountOrderBy> & {
         select: ConnectedAccountSelect;
       }
     >(argv, defaultSelect);
@@ -119,7 +114,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ConnectedAccountSelect, ConnectedAccountFilter, never> & {
+      FindFirstArgs<ConnectedAccountSelect, ConnectedAccountFilter> & {
         select: ConnectedAccountSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/connected-accounts-module.ts b/sdk/constructive-cli/src/public/cli/commands/connected-accounts-module.ts
index 79f27f73f..4ce5c1114 100644
--- a/sdk/constructive-cli/src/public/cli/commands/connected-accounts-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/connected-accounts-module.ts
@@ -87,7 +87,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         ConnectedAccountsModuleSelect,
         ConnectedAccountsModuleFilter,
-        never,
         ConnectedAccountsModuleOrderBy
       > & {
         select: ConnectedAccountsModuleSelect;
@@ -116,7 +115,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       tableName: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ConnectedAccountsModuleSelect, ConnectedAccountsModuleFilter, never> & {
+      FindFirstArgs<ConnectedAccountsModuleSelect, ConnectedAccountsModuleFilter> & {
         select: ConnectedAccountsModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/construct-blueprint.ts b/sdk/constructive-cli/src/public/cli/commands/construct-blueprint.ts
index 71b95e427..1cb6057ef 100644
--- a/sdk/constructive-cli/src/public/cli/commands/construct-blueprint.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/construct-blueprint.ts
@@ -16,7 +16,7 @@ export default async (
   try {
     if (argv.help || argv.h) {
       console.log(
-        'construct-blueprint - Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.\n\nUsage: construct-blueprint [OPTIONS]\n'
+        'construct-blueprint - Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.\n\nUsage: construct-blueprint [OPTIONS]\n'
       );
       process.exit(0);
     }
diff --git a/sdk/constructive-cli/src/public/cli/commands/crypto-address.ts b/sdk/constructive-cli/src/public/cli/commands/crypto-address.ts
index 8b3902d0e..5e65d2909 100644
--- a/sdk/constructive-cli/src/public/cli/commands/crypto-address.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/crypto-address.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<CryptoAddressSelect, CryptoAddressFilter, never, CryptoAddressOrderBy> & {
+      FindManyArgs<CryptoAddressSelect, CryptoAddressFilter, CryptoAddressOrderBy> & {
         select: CryptoAddressSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<CryptoAddressSelect, CryptoAddressFilter, never> & {
+      FindFirstArgs<CryptoAddressSelect, CryptoAddressFilter> & {
         select: CryptoAddressSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/crypto-addresses-module.ts b/sdk/constructive-cli/src/public/cli/commands/crypto-addresses-module.ts
index fc598c9be..3b0ce17cc 100644
--- a/sdk/constructive-cli/src/public/cli/commands/crypto-addresses-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/crypto-addresses-module.ts
@@ -89,7 +89,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         CryptoAddressesModuleSelect,
         CryptoAddressesModuleFilter,
-        never,
         CryptoAddressesModuleOrderBy
       > & {
         select: CryptoAddressesModuleSelect;
@@ -119,7 +118,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       cryptoNetwork: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<CryptoAddressesModuleSelect, CryptoAddressesModuleFilter, never> & {
+      FindFirstArgs<CryptoAddressesModuleSelect, CryptoAddressesModuleFilter> & {
         select: CryptoAddressesModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/crypto-auth-module.ts b/sdk/constructive-cli/src/public/cli/commands/crypto-auth-module.ts
index 85c1e39df..b1940005b 100644
--- a/sdk/constructive-cli/src/public/cli/commands/crypto-auth-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/crypto-auth-module.ts
@@ -98,12 +98,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       signInWithChallenge: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        CryptoAuthModuleSelect,
-        CryptoAuthModuleFilter,
-        never,
-        CryptoAuthModuleOrderBy
-      > & {
+      FindManyArgs<CryptoAuthModuleSelect, CryptoAuthModuleFilter, CryptoAuthModuleOrderBy> & {
         select: CryptoAuthModuleSelect;
       }
     >(argv, defaultSelect);
@@ -137,7 +132,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       signInWithChallenge: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<CryptoAuthModuleSelect, CryptoAuthModuleFilter, never> & {
+      FindFirstArgs<CryptoAuthModuleSelect, CryptoAuthModuleFilter> & {
         select: CryptoAuthModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/database-provision-module.ts b/sdk/constructive-cli/src/public/cli/commands/database-provision-module.ts
index ddcfaa058..1c398dd09 100644
--- a/sdk/constructive-cli/src/public/cli/commands/database-provision-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/database-provision-module.ts
@@ -101,7 +101,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         DatabaseProvisionModuleSelect,
         DatabaseProvisionModuleFilter,
-        never,
         DatabaseProvisionModuleOrderBy
       > & {
         select: DatabaseProvisionModuleSelect;
@@ -137,7 +136,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       completedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<DatabaseProvisionModuleSelect, DatabaseProvisionModuleFilter, never> & {
+      FindFirstArgs<DatabaseProvisionModuleSelect, DatabaseProvisionModuleFilter> & {
         select: DatabaseProvisionModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/database-transfer.ts b/sdk/constructive-cli/src/public/cli/commands/database-transfer.ts
index d307df67c..5f8115b60 100644
--- a/sdk/constructive-cli/src/public/cli/commands/database-transfer.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/database-transfer.ts
@@ -98,12 +98,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       completedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        DatabaseTransferSelect,
-        DatabaseTransferFilter,
-        never,
-        DatabaseTransferOrderBy
-      > & {
+      FindManyArgs<DatabaseTransferSelect, DatabaseTransferFilter, DatabaseTransferOrderBy> & {
         select: DatabaseTransferSelect;
       }
     >(argv, defaultSelect);
@@ -137,7 +132,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       completedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<DatabaseTransferSelect, DatabaseTransferFilter, never> & {
+      FindFirstArgs<DatabaseTransferSelect, DatabaseTransferFilter> & {
         select: DatabaseTransferSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/database.ts b/sdk/constructive-cli/src/public/cli/commands/database.ts
index 1d98d4f2c..fef127018 100644
--- a/sdk/constructive-cli/src/public/cli/commands/database.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/database.ts
@@ -86,7 +86,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<DatabaseSelect, DatabaseFilter, never, DatabaseOrderBy> & {
+      FindManyArgs<DatabaseSelect, DatabaseFilter, DatabaseOrderBy> & {
         select: DatabaseSelect;
       }
     >(argv, defaultSelect);
@@ -114,7 +114,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<DatabaseSelect, DatabaseFilter, never> & {
+      FindFirstArgs<DatabaseSelect, DatabaseFilter> & {
         select: DatabaseSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/default-ids-module.ts b/sdk/constructive-cli/src/public/cli/commands/default-ids-module.ts
index 3752c91c2..65799bbf9 100644
--- a/sdk/constructive-cli/src/public/cli/commands/default-ids-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/default-ids-module.ts
@@ -74,12 +74,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       databaseId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        DefaultIdsModuleSelect,
-        DefaultIdsModuleFilter,
-        never,
-        DefaultIdsModuleOrderBy
-      > & {
+      FindManyArgs<DefaultIdsModuleSelect, DefaultIdsModuleFilter, DefaultIdsModuleOrderBy> & {
         select: DefaultIdsModuleSelect;
       }
     >(argv, defaultSelect);
@@ -101,7 +96,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       databaseId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<DefaultIdsModuleSelect, DefaultIdsModuleFilter, never> & {
+      FindFirstArgs<DefaultIdsModuleSelect, DefaultIdsModuleFilter> & {
         select: DefaultIdsModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/default-privilege.ts b/sdk/constructive-cli/src/public/cli/commands/default-privilege.ts
index 3137ddcba..b46d0716f 100644
--- a/sdk/constructive-cli/src/public/cli/commands/default-privilege.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/default-privilege.ts
@@ -84,12 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       isGrant: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        DefaultPrivilegeSelect,
-        DefaultPrivilegeFilter,
-        never,
-        DefaultPrivilegeOrderBy
-      > & {
+      FindManyArgs<DefaultPrivilegeSelect, DefaultPrivilegeFilter, DefaultPrivilegeOrderBy> & {
         select: DefaultPrivilegeSelect;
       }
     >(argv, defaultSelect);
@@ -116,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       isGrant: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<DefaultPrivilegeSelect, DefaultPrivilegeFilter, never> & {
+      FindFirstArgs<DefaultPrivilegeSelect, DefaultPrivilegeFilter> & {
         select: DefaultPrivilegeSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/denormalized-table-field.ts b/sdk/constructive-cli/src/public/cli/commands/denormalized-table-field.ts
index 4fe8aaed5..d479e3508 100644
--- a/sdk/constructive-cli/src/public/cli/commands/denormalized-table-field.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/denormalized-table-field.ts
@@ -97,7 +97,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         DenormalizedTableFieldSelect,
         DenormalizedTableFieldFilter,
-        never,
         DenormalizedTableFieldOrderBy
       > & {
         select: DenormalizedTableFieldSelect;
@@ -131,7 +130,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       funcOrder: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<DenormalizedTableFieldSelect, DenormalizedTableFieldFilter, never> & {
+      FindFirstArgs<DenormalizedTableFieldSelect, DenormalizedTableFieldFilter> & {
         select: DenormalizedTableFieldSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/domain.ts b/sdk/constructive-cli/src/public/cli/commands/domain.ts
index 1f760775e..03bab8892 100644
--- a/sdk/constructive-cli/src/public/cli/commands/domain.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/domain.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       domain: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<DomainSelect, DomainFilter, never, DomainOrderBy> & {
+      FindManyArgs<DomainSelect, DomainFilter, DomainOrderBy> & {
         select: DomainSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       domain: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<DomainSelect, DomainFilter, never> & {
+      FindFirstArgs<DomainSelect, DomainFilter> & {
         select: DomainSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/email.ts b/sdk/constructive-cli/src/public/cli/commands/email.ts
index b21c9e87a..2b2d98380 100644
--- a/sdk/constructive-cli/src/public/cli/commands/email.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/email.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<EmailSelect, EmailFilter, never, EmailOrderBy> & {
+      FindManyArgs<EmailSelect, EmailFilter, EmailOrderBy> & {
         select: EmailSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<EmailSelect, EmailFilter, never> & {
+      FindFirstArgs<EmailSelect, EmailFilter> & {
         select: EmailSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/emails-module.ts b/sdk/constructive-cli/src/public/cli/commands/emails-module.ts
index 82a559e17..c841c5eff 100644
--- a/sdk/constructive-cli/src/public/cli/commands/emails-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/emails-module.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       tableName: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<EmailsModuleSelect, EmailsModuleFilter, never, EmailsModuleOrderBy> & {
+      FindManyArgs<EmailsModuleSelect, EmailsModuleFilter, EmailsModuleOrderBy> & {
         select: EmailsModuleSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       tableName: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<EmailsModuleSelect, EmailsModuleFilter, never> & {
+      FindFirstArgs<EmailsModuleSelect, EmailsModuleFilter> & {
         select: EmailsModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/embedding-chunk.ts b/sdk/constructive-cli/src/public/cli/commands/embedding-chunk.ts
index 67175415d..425f6a121 100644
--- a/sdk/constructive-cli/src/public/cli/commands/embedding-chunk.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/embedding-chunk.ts
@@ -106,7 +106,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<EmbeddingChunkSelect, EmbeddingChunkFilter, never, EmbeddingChunkOrderBy> & {
+      FindManyArgs<EmbeddingChunkSelect, EmbeddingChunkFilter, EmbeddingChunkOrderBy> & {
         select: EmbeddingChunkSelect;
       }
     >(argv, defaultSelect);
@@ -144,7 +144,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<EmbeddingChunkSelect, EmbeddingChunkFilter, never> & {
+      FindFirstArgs<EmbeddingChunkSelect, EmbeddingChunkFilter> & {
         select: EmbeddingChunkSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/encrypted-secrets-module.ts b/sdk/constructive-cli/src/public/cli/commands/encrypted-secrets-module.ts
index 9e0dcc443..35d446e19 100644
--- a/sdk/constructive-cli/src/public/cli/commands/encrypted-secrets-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/encrypted-secrets-module.ts
@@ -83,7 +83,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         EncryptedSecretsModuleSelect,
         EncryptedSecretsModuleFilter,
-        never,
         EncryptedSecretsModuleOrderBy
       > & {
         select: EncryptedSecretsModuleSelect;
@@ -110,7 +109,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       tableName: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<EncryptedSecretsModuleSelect, EncryptedSecretsModuleFilter, never> & {
+      FindFirstArgs<EncryptedSecretsModuleSelect, EncryptedSecretsModuleFilter> & {
         select: EncryptedSecretsModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/enum.ts b/sdk/constructive-cli/src/public/cli/commands/enum.ts
index 3784bd955..f396dabcd 100644
--- a/sdk/constructive-cli/src/public/cli/commands/enum.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/enum.ts
@@ -94,7 +94,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       tags: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<EnumSelect, EnumFilter, never, EnumOrderBy> & {
+      FindManyArgs<EnumSelect, EnumFilter, EnumOrderBy> & {
         select: EnumSelect;
       }
     >(argv, defaultSelect);
@@ -126,7 +126,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       tags: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<EnumSelect, EnumFilter, never> & {
+      FindFirstArgs<EnumSelect, EnumFilter> & {
         select: EnumSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/field.ts b/sdk/constructive-cli/src/public/cli/commands/field.ts
index 51bf112ee..e16a4c3f1 100644
--- a/sdk/constructive-cli/src/public/cli/commands/field.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/field.ts
@@ -118,7 +118,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<FieldSelect, FieldFilter, never, FieldOrderBy> & {
+      FindManyArgs<FieldSelect, FieldFilter, FieldOrderBy> & {
         select: FieldSelect;
       }
     >(argv, defaultSelect);
@@ -162,7 +162,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<FieldSelect, FieldFilter, never> & {
+      FindFirstArgs<FieldSelect, FieldFilter> & {
         select: FieldSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/foreign-key-constraint.ts b/sdk/constructive-cli/src/public/cli/commands/foreign-key-constraint.ts
index 0eecd5e98..c6e5a65c4 100644
--- a/sdk/constructive-cli/src/public/cli/commands/foreign-key-constraint.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/foreign-key-constraint.ts
@@ -109,7 +109,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         ForeignKeyConstraintSelect,
         ForeignKeyConstraintFilter,
-        never,
         ForeignKeyConstraintOrderBy
       > & {
         select: ForeignKeyConstraintSelect;
@@ -149,7 +148,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ForeignKeyConstraintSelect, ForeignKeyConstraintFilter, never> & {
+      FindFirstArgs<ForeignKeyConstraintSelect, ForeignKeyConstraintFilter> & {
         select: ForeignKeyConstraintSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/full-text-search.ts b/sdk/constructive-cli/src/public/cli/commands/full-text-search.ts
index d418f178c..267c1b6d1 100644
--- a/sdk/constructive-cli/src/public/cli/commands/full-text-search.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/full-text-search.ts
@@ -88,7 +88,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<FullTextSearchSelect, FullTextSearchFilter, never, FullTextSearchOrderBy> & {
+      FindManyArgs<FullTextSearchSelect, FullTextSearchFilter, FullTextSearchOrderBy> & {
         select: FullTextSearchSelect;
       }
     >(argv, defaultSelect);
@@ -117,7 +117,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<FullTextSearchSelect, FullTextSearchFilter, never> & {
+      FindFirstArgs<FullTextSearchSelect, FullTextSearchFilter> & {
         select: FullTextSearchSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/get-all-record.ts b/sdk/constructive-cli/src/public/cli/commands/get-all-record.ts
index 5ef092f6c..2e18efa39 100644
--- a/sdk/constructive-cli/src/public/cli/commands/get-all-record.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/get-all-record.ts
@@ -68,7 +68,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       data: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<GetAllRecordSelect, GetAllRecordFilter, never, GetAllRecordsOrderBy> & {
+      FindManyArgs<GetAllRecordSelect, GetAllRecordFilter, GetAllRecordsOrderBy> & {
         select: GetAllRecordSelect;
       }
     >(argv, defaultSelect);
@@ -90,7 +90,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       data: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<GetAllRecordSelect, GetAllRecordFilter, never> & {
+      FindFirstArgs<GetAllRecordSelect, GetAllRecordFilter> & {
         select: GetAllRecordSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/hierarchy-module.ts b/sdk/constructive-cli/src/public/cli/commands/hierarchy-module.ts
index 78ad03714..c78492e89 100644
--- a/sdk/constructive-cli/src/public/cli/commands/hierarchy-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/hierarchy-module.ts
@@ -110,7 +110,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       createdAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<HierarchyModuleSelect, HierarchyModuleFilter, never, HierarchyModuleOrderBy> & {
+      FindManyArgs<HierarchyModuleSelect, HierarchyModuleFilter, HierarchyModuleOrderBy> & {
         select: HierarchyModuleSelect;
       }
     >(argv, defaultSelect);
@@ -150,7 +150,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       createdAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<HierarchyModuleSelect, HierarchyModuleFilter, never> & {
+      FindFirstArgs<HierarchyModuleSelect, HierarchyModuleFilter> & {
         select: HierarchyModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/index.ts b/sdk/constructive-cli/src/public/cli/commands/index.ts
index af4910f91..e42be5f9e 100644
--- a/sdk/constructive-cli/src/public/cli/commands/index.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/index.ts
@@ -108,7 +108,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<IndexSelect, IndexFilter, never, IndexOrderBy> & {
+      FindManyArgs<IndexSelect, IndexFilter, IndexOrderBy> & {
         select: IndexSelect;
       }
     >(argv, defaultSelect);
@@ -147,7 +147,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<IndexSelect, IndexFilter, never> & {
+      FindFirstArgs<IndexSelect, IndexFilter> & {
         select: IndexSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/invite.ts b/sdk/constructive-cli/src/public/cli/commands/invite.ts
index c7c10081f..85aa0c416 100644
--- a/sdk/constructive-cli/src/public/cli/commands/invite.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/invite.ts
@@ -94,7 +94,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<InviteSelect, InviteFilter, never, InviteOrderBy> & {
+      FindManyArgs<InviteSelect, InviteFilter, InviteOrderBy> & {
         select: InviteSelect;
       }
     >(argv, defaultSelect);
@@ -126,7 +126,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<InviteSelect, InviteFilter, never> & {
+      FindFirstArgs<InviteSelect, InviteFilter> & {
         select: InviteSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/invites-module.ts b/sdk/constructive-cli/src/public/cli/commands/invites-module.ts
index c94ad08cc..df3542ed8 100644
--- a/sdk/constructive-cli/src/public/cli/commands/invites-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/invites-module.ts
@@ -98,7 +98,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       entityTableId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<InvitesModuleSelect, InvitesModuleFilter, never, InvitesModuleOrderBy> & {
+      FindManyArgs<InvitesModuleSelect, InvitesModuleFilter, InvitesModuleOrderBy> & {
         select: InvitesModuleSelect;
       }
     >(argv, defaultSelect);
@@ -132,7 +132,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       entityTableId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<InvitesModuleSelect, InvitesModuleFilter, never> & {
+      FindFirstArgs<InvitesModuleSelect, InvitesModuleFilter> & {
         select: InvitesModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/levels-module.ts b/sdk/constructive-cli/src/public/cli/commands/levels-module.ts
index 0cbde8a52..d326e931f 100644
--- a/sdk/constructive-cli/src/public/cli/commands/levels-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/levels-module.ts
@@ -122,7 +122,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       actorTableId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<LevelsModuleSelect, LevelsModuleFilter, never, LevelsModuleOrderBy> & {
+      FindManyArgs<LevelsModuleSelect, LevelsModuleFilter, LevelsModuleOrderBy> & {
         select: LevelsModuleSelect;
       }
     >(argv, defaultSelect);
@@ -168,7 +168,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       actorTableId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<LevelsModuleSelect, LevelsModuleFilter, never> & {
+      FindFirstArgs<LevelsModuleSelect, LevelsModuleFilter> & {
         select: LevelsModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/limits-module.ts b/sdk/constructive-cli/src/public/cli/commands/limits-module.ts
index e087004e4..4736c00a2 100644
--- a/sdk/constructive-cli/src/public/cli/commands/limits-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/limits-module.ts
@@ -106,7 +106,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       actorTableId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<LimitsModuleSelect, LimitsModuleFilter, never, LimitsModuleOrderBy> & {
+      FindManyArgs<LimitsModuleSelect, LimitsModuleFilter, LimitsModuleOrderBy> & {
         select: LimitsModuleSelect;
       }
     >(argv, defaultSelect);
@@ -144,7 +144,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       actorTableId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<LimitsModuleSelect, LimitsModuleFilter, never> & {
+      FindFirstArgs<LimitsModuleSelect, LimitsModuleFilter> & {
         select: LimitsModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/membership-type.ts b/sdk/constructive-cli/src/public/cli/commands/membership-type.ts
index 056b84cd3..91dc29236 100644
--- a/sdk/constructive-cli/src/public/cli/commands/membership-type.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/membership-type.ts
@@ -78,7 +78,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       prefix: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<MembershipTypeSelect, MembershipTypeFilter, never, MembershipTypeOrderBy> & {
+      FindManyArgs<MembershipTypeSelect, MembershipTypeFilter, MembershipTypeOrderBy> & {
         select: MembershipTypeSelect;
       }
     >(argv, defaultSelect);
@@ -102,7 +102,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       prefix: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<MembershipTypeSelect, MembershipTypeFilter, never> & {
+      FindFirstArgs<MembershipTypeSelect, MembershipTypeFilter> & {
         select: MembershipTypeSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/membership-types-module.ts b/sdk/constructive-cli/src/public/cli/commands/membership-types-module.ts
index d1e3b4b06..6593e9518 100644
--- a/sdk/constructive-cli/src/public/cli/commands/membership-types-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/membership-types-module.ts
@@ -83,7 +83,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         MembershipTypesModuleSelect,
         MembershipTypesModuleFilter,
-        never,
         MembershipTypesModuleOrderBy
       > & {
         select: MembershipTypesModuleSelect;
@@ -110,7 +109,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       tableName: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<MembershipTypesModuleSelect, MembershipTypesModuleFilter, never> & {
+      FindFirstArgs<MembershipTypesModuleSelect, MembershipTypesModuleFilter> & {
         select: MembershipTypesModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/memberships-module.ts b/sdk/constructive-cli/src/public/cli/commands/memberships-module.ts
index 12d998450..8345b95ae 100644
--- a/sdk/constructive-cli/src/public/cli/commands/memberships-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/memberships-module.ts
@@ -132,12 +132,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       entityIdsFunction: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        MembershipsModuleSelect,
-        MembershipsModuleFilter,
-        never,
-        MembershipsModuleOrderBy
-      > & {
+      FindManyArgs<MembershipsModuleSelect, MembershipsModuleFilter, MembershipsModuleOrderBy> & {
         select: MembershipsModuleSelect;
       }
     >(argv, defaultSelect);
@@ -188,7 +183,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       entityIdsFunction: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<MembershipsModuleSelect, MembershipsModuleFilter, never> & {
+      FindFirstArgs<MembershipsModuleSelect, MembershipsModuleFilter> & {
         select: MembershipsModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/migrate-file.ts b/sdk/constructive-cli/src/public/cli/commands/migrate-file.ts
index c6a44d3b1..857850eb3 100644
--- a/sdk/constructive-cli/src/public/cli/commands/migrate-file.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/migrate-file.ts
@@ -70,7 +70,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       upload: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<MigrateFileSelect, MigrateFileFilter, never, MigrateFileOrderBy> & {
+      FindManyArgs<MigrateFileSelect, MigrateFileFilter, MigrateFileOrderBy> & {
         select: MigrateFileSelect;
       }
     >(argv, defaultSelect);
@@ -93,7 +93,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       upload: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<MigrateFileSelect, MigrateFileFilter, never> & {
+      FindFirstArgs<MigrateFileSelect, MigrateFileFilter> & {
         select: MigrateFileSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/object.ts b/sdk/constructive-cli/src/public/cli/commands/object.ts
index a6293a397..a731ea2dd 100644
--- a/sdk/constructive-cli/src/public/cli/commands/object.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/object.ts
@@ -85,7 +85,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       createdAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<ObjectSelect, ObjectFilter, never, ObjectOrderBy> & {
+      FindManyArgs<ObjectSelect, ObjectFilter, ObjectOrderBy> & {
         select: ObjectSelect;
       }
     >(argv, defaultSelect);
@@ -112,7 +112,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       createdAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ObjectSelect, ObjectFilter, never> & {
+      FindFirstArgs<ObjectSelect, ObjectFilter> & {
         select: ObjectSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-admin-grant.ts b/sdk/constructive-cli/src/public/cli/commands/org-admin-grant.ts
index e9d41e5ed..22e11bc2f 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-admin-grant.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-admin-grant.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgAdminGrantSelect, OrgAdminGrantFilter, never, OrgAdminGrantOrderBy> & {
+      FindManyArgs<OrgAdminGrantSelect, OrgAdminGrantFilter, OrgAdminGrantOrderBy> & {
         select: OrgAdminGrantSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgAdminGrantSelect, OrgAdminGrantFilter, never> & {
+      FindFirstArgs<OrgAdminGrantSelect, OrgAdminGrantFilter> & {
         select: OrgAdminGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-chart-edge-grant.ts b/sdk/constructive-cli/src/public/cli/commands/org-chart-edge-grant.ts
index 537be47af..095cf055f 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-chart-edge-grant.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-chart-edge-grant.ts
@@ -88,12 +88,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       createdAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        OrgChartEdgeGrantSelect,
-        OrgChartEdgeGrantFilter,
-        never,
-        OrgChartEdgeGrantOrderBy
-      > & {
+      FindManyArgs<OrgChartEdgeGrantSelect, OrgChartEdgeGrantFilter, OrgChartEdgeGrantOrderBy> & {
         select: OrgChartEdgeGrantSelect;
       }
     >(argv, defaultSelect);
@@ -122,7 +117,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       createdAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgChartEdgeGrantSelect, OrgChartEdgeGrantFilter, never> & {
+      FindFirstArgs<OrgChartEdgeGrantSelect, OrgChartEdgeGrantFilter> & {
         select: OrgChartEdgeGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-chart-edge.ts b/sdk/constructive-cli/src/public/cli/commands/org-chart-edge.ts
index 410d4f84f..d6c0839a5 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-chart-edge.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-chart-edge.ts
@@ -86,7 +86,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       positionLevel: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgChartEdgeSelect, OrgChartEdgeFilter, never, OrgChartEdgeOrderBy> & {
+      FindManyArgs<OrgChartEdgeSelect, OrgChartEdgeFilter, OrgChartEdgeOrderBy> & {
         select: OrgChartEdgeSelect;
       }
     >(argv, defaultSelect);
@@ -114,7 +114,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       positionLevel: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgChartEdgeSelect, OrgChartEdgeFilter, never> & {
+      FindFirstArgs<OrgChartEdgeSelect, OrgChartEdgeFilter> & {
         select: OrgChartEdgeSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-claimed-invite.ts b/sdk/constructive-cli/src/public/cli/commands/org-claimed-invite.ts
index ddf858e3c..8a7be4ccc 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-claimed-invite.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-claimed-invite.ts
@@ -84,12 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       entityId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        OrgClaimedInviteSelect,
-        OrgClaimedInviteFilter,
-        never,
-        OrgClaimedInviteOrderBy
-      > & {
+      FindManyArgs<OrgClaimedInviteSelect, OrgClaimedInviteFilter, OrgClaimedInviteOrderBy> & {
         select: OrgClaimedInviteSelect;
       }
     >(argv, defaultSelect);
@@ -116,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       entityId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgClaimedInviteSelect, OrgClaimedInviteFilter, never> & {
+      FindFirstArgs<OrgClaimedInviteSelect, OrgClaimedInviteFilter> & {
         select: OrgClaimedInviteSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-get-managers-record.ts b/sdk/constructive-cli/src/public/cli/commands/org-get-managers-record.ts
index 8a3595b5e..6808fc470 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-get-managers-record.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-get-managers-record.ts
@@ -71,7 +71,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         OrgGetManagersRecordSelect,
         OrgGetManagersRecordFilter,
-        never,
         OrgGetManagersRecordsOrderBy
       > & {
         select: OrgGetManagersRecordSelect;
@@ -95,7 +94,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       depth: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgGetManagersRecordSelect, OrgGetManagersRecordFilter, never> & {
+      FindFirstArgs<OrgGetManagersRecordSelect, OrgGetManagersRecordFilter> & {
         select: OrgGetManagersRecordSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-get-subordinates-record.ts b/sdk/constructive-cli/src/public/cli/commands/org-get-subordinates-record.ts
index 64eff3fef..0d1eb8e5f 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-get-subordinates-record.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-get-subordinates-record.ts
@@ -71,7 +71,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         OrgGetSubordinatesRecordSelect,
         OrgGetSubordinatesRecordFilter,
-        never,
         OrgGetSubordinatesRecordsOrderBy
       > & {
         select: OrgGetSubordinatesRecordSelect;
@@ -95,7 +94,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       depth: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgGetSubordinatesRecordSelect, OrgGetSubordinatesRecordFilter, never> & {
+      FindFirstArgs<OrgGetSubordinatesRecordSelect, OrgGetSubordinatesRecordFilter> & {
         select: OrgGetSubordinatesRecordSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-grant.ts b/sdk/constructive-cli/src/public/cli/commands/org-grant.ts
index a538aa1c2..634c7d588 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-grant.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-grant.ts
@@ -86,7 +86,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgGrantSelect, OrgGrantFilter, never, OrgGrantOrderBy> & {
+      FindManyArgs<OrgGrantSelect, OrgGrantFilter, OrgGrantOrderBy> & {
         select: OrgGrantSelect;
       }
     >(argv, defaultSelect);
@@ -114,7 +114,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgGrantSelect, OrgGrantFilter, never> & {
+      FindFirstArgs<OrgGrantSelect, OrgGrantFilter> & {
         select: OrgGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-invite.ts b/sdk/constructive-cli/src/public/cli/commands/org-invite.ts
index 85aeda86c..f25f613ae 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-invite.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-invite.ts
@@ -98,7 +98,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       entityId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgInviteSelect, OrgInviteFilter, never, OrgInviteOrderBy> & {
+      FindManyArgs<OrgInviteSelect, OrgInviteFilter, OrgInviteOrderBy> & {
         select: OrgInviteSelect;
       }
     >(argv, defaultSelect);
@@ -132,7 +132,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       entityId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgInviteSelect, OrgInviteFilter, never> & {
+      FindFirstArgs<OrgInviteSelect, OrgInviteFilter> & {
         select: OrgInviteSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-limit-default.ts b/sdk/constructive-cli/src/public/cli/commands/org-limit-default.ts
index 88d800132..ed3396fe3 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-limit-default.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-limit-default.ts
@@ -76,7 +76,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       max: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgLimitDefaultSelect, OrgLimitDefaultFilter, never, OrgLimitDefaultOrderBy> & {
+      FindManyArgs<OrgLimitDefaultSelect, OrgLimitDefaultFilter, OrgLimitDefaultOrderBy> & {
         select: OrgLimitDefaultSelect;
       }
     >(argv, defaultSelect);
@@ -99,7 +99,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       max: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgLimitDefaultSelect, OrgLimitDefaultFilter, never> & {
+      FindFirstArgs<OrgLimitDefaultSelect, OrgLimitDefaultFilter> & {
         select: OrgLimitDefaultSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-limit.ts b/sdk/constructive-cli/src/public/cli/commands/org-limit.ts
index 3428c1ea9..57ad76e26 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-limit.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-limit.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       entityId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgLimitSelect, OrgLimitFilter, never, OrgLimitOrderBy> & {
+      FindManyArgs<OrgLimitSelect, OrgLimitFilter, OrgLimitOrderBy> & {
         select: OrgLimitSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       entityId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgLimitSelect, OrgLimitFilter, never> & {
+      FindFirstArgs<OrgLimitSelect, OrgLimitFilter> & {
         select: OrgLimitSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-member.ts b/sdk/constructive-cli/src/public/cli/commands/org-member.ts
index c3c831dcb..cc7a7087a 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-member.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-member.ts
@@ -78,7 +78,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       entityId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgMemberSelect, OrgMemberFilter, never, OrgMemberOrderBy> & {
+      FindManyArgs<OrgMemberSelect, OrgMemberFilter, OrgMemberOrderBy> & {
         select: OrgMemberSelect;
       }
     >(argv, defaultSelect);
@@ -102,7 +102,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       entityId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgMemberSelect, OrgMemberFilter, never> & {
+      FindFirstArgs<OrgMemberSelect, OrgMemberFilter> & {
         select: OrgMemberSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-membership-default.ts b/sdk/constructive-cli/src/public/cli/commands/org-membership-default.ts
index a0d1bc6dc..598281e4f 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-membership-default.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-membership-default.ts
@@ -91,7 +91,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         OrgMembershipDefaultSelect,
         OrgMembershipDefaultFilter,
-        never,
         OrgMembershipDefaultOrderBy
       > & {
         select: OrgMembershipDefaultSelect;
@@ -122,7 +121,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       createGroupsCascadeMembers: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgMembershipDefaultSelect, OrgMembershipDefaultFilter, never> & {
+      FindFirstArgs<OrgMembershipDefaultSelect, OrgMembershipDefaultFilter> & {
         select: OrgMembershipDefaultSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-membership.ts b/sdk/constructive-cli/src/public/cli/commands/org-membership.ts
index 0e9b312b2..0810171d5 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-membership.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-membership.ts
@@ -102,7 +102,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       profileId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgMembershipSelect, OrgMembershipFilter, never, OrgMembershipOrderBy> & {
+      FindManyArgs<OrgMembershipSelect, OrgMembershipFilter, OrgMembershipOrderBy> & {
         select: OrgMembershipSelect;
       }
     >(argv, defaultSelect);
@@ -138,7 +138,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       profileId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgMembershipSelect, OrgMembershipFilter, never> & {
+      FindFirstArgs<OrgMembershipSelect, OrgMembershipFilter> & {
         select: OrgMembershipSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-owner-grant.ts b/sdk/constructive-cli/src/public/cli/commands/org-owner-grant.ts
index 15ed00359..99dc9ac3c 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-owner-grant.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-owner-grant.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgOwnerGrantSelect, OrgOwnerGrantFilter, never, OrgOwnerGrantOrderBy> & {
+      FindManyArgs<OrgOwnerGrantSelect, OrgOwnerGrantFilter, OrgOwnerGrantOrderBy> & {
         select: OrgOwnerGrantSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgOwnerGrantSelect, OrgOwnerGrantFilter, never> & {
+      FindFirstArgs<OrgOwnerGrantSelect, OrgOwnerGrantFilter> & {
         select: OrgOwnerGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-permission-default.ts b/sdk/constructive-cli/src/public/cli/commands/org-permission-default.ts
index 9eeee8a17..2448918b6 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-permission-default.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-permission-default.ts
@@ -79,7 +79,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         OrgPermissionDefaultSelect,
         OrgPermissionDefaultFilter,
-        never,
         OrgPermissionDefaultOrderBy
       > & {
         select: OrgPermissionDefaultSelect;
@@ -104,7 +103,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       entityId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgPermissionDefaultSelect, OrgPermissionDefaultFilter, never> & {
+      FindFirstArgs<OrgPermissionDefaultSelect, OrgPermissionDefaultFilter> & {
         select: OrgPermissionDefaultSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/org-permission.ts b/sdk/constructive-cli/src/public/cli/commands/org-permission.ts
index f1a175a20..ed92cabc7 100644
--- a/sdk/constructive-cli/src/public/cli/commands/org-permission.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/org-permission.ts
@@ -80,7 +80,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       description: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<OrgPermissionSelect, OrgPermissionFilter, never, OrgPermissionOrderBy> & {
+      FindManyArgs<OrgPermissionSelect, OrgPermissionFilter, OrgPermissionOrderBy> & {
         select: OrgPermissionSelect;
       }
     >(argv, defaultSelect);
@@ -105,7 +105,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       description: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgPermissionSelect, OrgPermissionFilter, never> & {
+      FindFirstArgs<OrgPermissionSelect, OrgPermissionFilter> & {
         select: OrgPermissionSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/permissions-module.ts b/sdk/constructive-cli/src/public/cli/commands/permissions-module.ts
index 20187523c..cfa9e60b2 100644
--- a/sdk/constructive-cli/src/public/cli/commands/permissions-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/permissions-module.ts
@@ -104,12 +104,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       getMaskByName: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        PermissionsModuleSelect,
-        PermissionsModuleFilter,
-        never,
-        PermissionsModuleOrderBy
-      > & {
+      FindManyArgs<PermissionsModuleSelect, PermissionsModuleFilter, PermissionsModuleOrderBy> & {
         select: PermissionsModuleSelect;
       }
     >(argv, defaultSelect);
@@ -146,7 +141,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       getMaskByName: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<PermissionsModuleSelect, PermissionsModuleFilter, never> & {
+      FindFirstArgs<PermissionsModuleSelect, PermissionsModuleFilter> & {
         select: PermissionsModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/phone-number.ts b/sdk/constructive-cli/src/public/cli/commands/phone-number.ts
index 984aeec18..e0387631e 100644
--- a/sdk/constructive-cli/src/public/cli/commands/phone-number.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/phone-number.ts
@@ -86,7 +86,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<PhoneNumberSelect, PhoneNumberFilter, never, PhoneNumberOrderBy> & {
+      FindManyArgs<PhoneNumberSelect, PhoneNumberFilter, PhoneNumberOrderBy> & {
         select: PhoneNumberSelect;
       }
     >(argv, defaultSelect);
@@ -114,7 +114,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<PhoneNumberSelect, PhoneNumberFilter, never> & {
+      FindFirstArgs<PhoneNumberSelect, PhoneNumberFilter> & {
         select: PhoneNumberSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/phone-numbers-module.ts b/sdk/constructive-cli/src/public/cli/commands/phone-numbers-module.ts
index a563d45f3..7ba7112fa 100644
--- a/sdk/constructive-cli/src/public/cli/commands/phone-numbers-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/phone-numbers-module.ts
@@ -87,7 +87,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         PhoneNumbersModuleSelect,
         PhoneNumbersModuleFilter,
-        never,
         PhoneNumbersModuleOrderBy
       > & {
         select: PhoneNumbersModuleSelect;
@@ -116,7 +115,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       tableName: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<PhoneNumbersModuleSelect, PhoneNumbersModuleFilter, never> & {
+      FindFirstArgs<PhoneNumbersModuleSelect, PhoneNumbersModuleFilter> & {
         select: PhoneNumbersModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/policy.ts b/sdk/constructive-cli/src/public/cli/commands/policy.ts
index 93f78c8df..7ff8ee5e2 100644
--- a/sdk/constructive-cli/src/public/cli/commands/policy.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/policy.ts
@@ -104,7 +104,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<PolicySelect, PolicyFilter, never, PolicyOrderBy> & {
+      FindManyArgs<PolicySelect, PolicyFilter, PolicyOrderBy> & {
         select: PolicySelect;
       }
     >(argv, defaultSelect);
@@ -141,7 +141,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<PolicySelect, PolicyFilter, never> & {
+      FindFirstArgs<PolicySelect, PolicyFilter> & {
         select: PolicySelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/primary-key-constraint.ts b/sdk/constructive-cli/src/public/cli/commands/primary-key-constraint.ts
index 16129f89d..4b402e2c8 100644
--- a/sdk/constructive-cli/src/public/cli/commands/primary-key-constraint.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/primary-key-constraint.ts
@@ -99,7 +99,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         PrimaryKeyConstraintSelect,
         PrimaryKeyConstraintFilter,
-        never,
         PrimaryKeyConstraintOrderBy
       > & {
         select: PrimaryKeyConstraintSelect;
@@ -134,7 +133,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<PrimaryKeyConstraintSelect, PrimaryKeyConstraintFilter, never> & {
+      FindFirstArgs<PrimaryKeyConstraintSelect, PrimaryKeyConstraintFilter> & {
         select: PrimaryKeyConstraintSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/profiles-module.ts b/sdk/constructive-cli/src/public/cli/commands/profiles-module.ts
index dfb452856..2162f42ce 100644
--- a/sdk/constructive-cli/src/public/cli/commands/profiles-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/profiles-module.ts
@@ -106,7 +106,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       prefix: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<ProfilesModuleSelect, ProfilesModuleFilter, never, ProfilesModuleOrderBy> & {
+      FindManyArgs<ProfilesModuleSelect, ProfilesModuleFilter, ProfilesModuleOrderBy> & {
         select: ProfilesModuleSelect;
       }
     >(argv, defaultSelect);
@@ -144,7 +144,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       prefix: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ProfilesModuleSelect, ProfilesModuleFilter, never> & {
+      FindFirstArgs<ProfilesModuleSelect, ProfilesModuleFilter> & {
         select: ProfilesModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/ref.ts b/sdk/constructive-cli/src/public/cli/commands/ref.ts
index e511ebe7d..8595f4926 100644
--- a/sdk/constructive-cli/src/public/cli/commands/ref.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/ref.ts
@@ -80,7 +80,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       commitId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<RefSelect, RefFilter, never, RefOrderBy> & {
+      FindManyArgs<RefSelect, RefFilter, RefOrderBy> & {
         select: RefSelect;
       }
     >(argv, defaultSelect);
@@ -105,7 +105,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       commitId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<RefSelect, RefFilter, never> & {
+      FindFirstArgs<RefSelect, RefFilter> & {
         select: RefSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/relation-provision.ts b/sdk/constructive-cli/src/public/cli/commands/relation-provision.ts
index 5f1d8cf05..25ab9621b 100644
--- a/sdk/constructive-cli/src/public/cli/commands/relation-provision.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/relation-provision.ts
@@ -130,12 +130,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       outTargetFieldId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        RelationProvisionSelect,
-        RelationProvisionFilter,
-        never,
-        RelationProvisionOrderBy
-      > & {
+      FindManyArgs<RelationProvisionSelect, RelationProvisionFilter, RelationProvisionOrderBy> & {
         select: RelationProvisionSelect;
       }
     >(argv, defaultSelect);
@@ -185,7 +180,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       outTargetFieldId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<RelationProvisionSelect, RelationProvisionFilter, never> & {
+      FindFirstArgs<RelationProvisionSelect, RelationProvisionFilter> & {
         select: RelationProvisionSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/rls-module.ts b/sdk/constructive-cli/src/public/cli/commands/rls-module.ts
index ff7c6e449..3756fea19 100644
--- a/sdk/constructive-cli/src/public/cli/commands/rls-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/rls-module.ts
@@ -92,7 +92,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       currentRoleId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<RlsModuleSelect, RlsModuleFilter, never, RlsModuleOrderBy> & {
+      FindManyArgs<RlsModuleSelect, RlsModuleFilter, RlsModuleOrderBy> & {
         select: RlsModuleSelect;
       }
     >(argv, defaultSelect);
@@ -123,7 +123,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       currentRoleId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<RlsModuleSelect, RlsModuleFilter, never> & {
+      FindFirstArgs<RlsModuleSelect, RlsModuleFilter> & {
         select: RlsModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/role-type.ts b/sdk/constructive-cli/src/public/cli/commands/role-type.ts
index 30724bbfe..b29048ae9 100644
--- a/sdk/constructive-cli/src/public/cli/commands/role-type.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/role-type.ts
@@ -74,7 +74,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       name: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<RoleTypeSelect, RoleTypeFilter, never, RoleTypeOrderBy> & {
+      FindManyArgs<RoleTypeSelect, RoleTypeFilter, RoleTypeOrderBy> & {
         select: RoleTypeSelect;
       }
     >(argv, defaultSelect);
@@ -96,7 +96,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       name: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<RoleTypeSelect, RoleTypeFilter, never> & {
+      FindFirstArgs<RoleTypeSelect, RoleTypeFilter> & {
         select: RoleTypeSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/schema-grant.ts b/sdk/constructive-cli/src/public/cli/commands/schema-grant.ts
index 20098cbcd..6bb27927a 100644
--- a/sdk/constructive-cli/src/public/cli/commands/schema-grant.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/schema-grant.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<SchemaGrantSelect, SchemaGrantFilter, never, SchemaGrantOrderBy> & {
+      FindManyArgs<SchemaGrantSelect, SchemaGrantFilter, SchemaGrantOrderBy> & {
         select: SchemaGrantSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<SchemaGrantSelect, SchemaGrantFilter, never> & {
+      FindFirstArgs<SchemaGrantSelect, SchemaGrantFilter> & {
         select: SchemaGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/schema.ts b/sdk/constructive-cli/src/public/cli/commands/schema.ts
index a4b9b529f..e7b6b8f78 100644
--- a/sdk/constructive-cli/src/public/cli/commands/schema.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/schema.ts
@@ -98,7 +98,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<SchemaSelect, SchemaFilter, never, SchemaOrderBy> & {
+      FindManyArgs<SchemaSelect, SchemaFilter, SchemaOrderBy> & {
         select: SchemaSelect;
       }
     >(argv, defaultSelect);
@@ -132,7 +132,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<SchemaSelect, SchemaFilter, never> & {
+      FindFirstArgs<SchemaSelect, SchemaFilter> & {
         select: SchemaSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/secrets-module.ts b/sdk/constructive-cli/src/public/cli/commands/secrets-module.ts
index c5203f4b8..28373201c 100644
--- a/sdk/constructive-cli/src/public/cli/commands/secrets-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/secrets-module.ts
@@ -80,7 +80,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       tableName: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<SecretsModuleSelect, SecretsModuleFilter, never, SecretsModuleOrderBy> & {
+      FindManyArgs<SecretsModuleSelect, SecretsModuleFilter, SecretsModuleOrderBy> & {
         select: SecretsModuleSelect;
       }
     >(argv, defaultSelect);
@@ -105,7 +105,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       tableName: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<SecretsModuleSelect, SecretsModuleFilter, never> & {
+      FindFirstArgs<SecretsModuleSelect, SecretsModuleFilter> & {
         select: SecretsModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/secure-table-provision.ts b/sdk/constructive-cli/src/public/cli/commands/secure-table-provision.ts
index 27d667f7d..c6f273cfe 100644
--- a/sdk/constructive-cli/src/public/cli/commands/secure-table-provision.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/secure-table-provision.ts
@@ -107,7 +107,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         SecureTableProvisionSelect,
         SecureTableProvisionFilter,
-        never,
         SecureTableProvisionOrderBy
       > & {
         select: SecureTableProvisionSelect;
@@ -146,7 +145,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       outFields: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<SecureTableProvisionSelect, SecureTableProvisionFilter, never> & {
+      FindFirstArgs<SecureTableProvisionSelect, SecureTableProvisionFilter> & {
         select: SecureTableProvisionSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/sessions-module.ts b/sdk/constructive-cli/src/public/cli/commands/sessions-module.ts
index 662601161..e8982391d 100644
--- a/sdk/constructive-cli/src/public/cli/commands/sessions-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/sessions-module.ts
@@ -92,7 +92,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       authSettingsTable: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<SessionsModuleSelect, SessionsModuleFilter, never, SessionsModuleOrderBy> & {
+      FindManyArgs<SessionsModuleSelect, SessionsModuleFilter, SessionsModuleOrderBy> & {
         select: SessionsModuleSelect;
       }
     >(argv, defaultSelect);
@@ -123,7 +123,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       authSettingsTable: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<SessionsModuleSelect, SessionsModuleFilter, never> & {
+      FindFirstArgs<SessionsModuleSelect, SessionsModuleFilter> & {
         select: SessionsModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/site-metadatum.ts b/sdk/constructive-cli/src/public/cli/commands/site-metadatum.ts
index 76461ace0..52aac2825 100644
--- a/sdk/constructive-cli/src/public/cli/commands/site-metadatum.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/site-metadatum.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       ogImage: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<SiteMetadatumSelect, SiteMetadatumFilter, never, SiteMetadatumOrderBy> & {
+      FindManyArgs<SiteMetadatumSelect, SiteMetadatumFilter, SiteMetadatumOrderBy> & {
         select: SiteMetadatumSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       ogImage: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<SiteMetadatumSelect, SiteMetadatumFilter, never> & {
+      FindFirstArgs<SiteMetadatumSelect, SiteMetadatumFilter> & {
         select: SiteMetadatumSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/site-module.ts b/sdk/constructive-cli/src/public/cli/commands/site-module.ts
index 582180d61..f9565cbad 100644
--- a/sdk/constructive-cli/src/public/cli/commands/site-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/site-module.ts
@@ -80,7 +80,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       data: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<SiteModuleSelect, SiteModuleFilter, never, SiteModuleOrderBy> & {
+      FindManyArgs<SiteModuleSelect, SiteModuleFilter, SiteModuleOrderBy> & {
         select: SiteModuleSelect;
       }
     >(argv, defaultSelect);
@@ -105,7 +105,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       data: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<SiteModuleSelect, SiteModuleFilter, never> & {
+      FindFirstArgs<SiteModuleSelect, SiteModuleFilter> & {
         select: SiteModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/site-theme.ts b/sdk/constructive-cli/src/public/cli/commands/site-theme.ts
index 091e4cf66..e972f3d3d 100644
--- a/sdk/constructive-cli/src/public/cli/commands/site-theme.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/site-theme.ts
@@ -78,7 +78,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       theme: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<SiteThemeSelect, SiteThemeFilter, never, SiteThemeOrderBy> & {
+      FindManyArgs<SiteThemeSelect, SiteThemeFilter, SiteThemeOrderBy> & {
         select: SiteThemeSelect;
       }
     >(argv, defaultSelect);
@@ -102,7 +102,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       theme: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<SiteThemeSelect, SiteThemeFilter, never> & {
+      FindFirstArgs<SiteThemeSelect, SiteThemeFilter> & {
         select: SiteThemeSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/site.ts b/sdk/constructive-cli/src/public/cli/commands/site.ts
index 12de496a1..bed665eda 100644
--- a/sdk/constructive-cli/src/public/cli/commands/site.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/site.ts
@@ -88,7 +88,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       dbname: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<SiteSelect, SiteFilter, never, SiteOrderBy> & {
+      FindManyArgs<SiteSelect, SiteFilter, SiteOrderBy> & {
         select: SiteSelect;
       }
     >(argv, defaultSelect);
@@ -117,7 +117,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       dbname: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<SiteSelect, SiteFilter, never> & {
+      FindFirstArgs<SiteSelect, SiteFilter> & {
         select: SiteSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/sql-action.ts b/sdk/constructive-cli/src/public/cli/commands/sql-action.ts
index 58ef657b8..de0075b14 100644
--- a/sdk/constructive-cli/src/public/cli/commands/sql-action.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/sql-action.ts
@@ -90,7 +90,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       actorId: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<SqlActionSelect, SqlActionFilter, never, SqlActionOrderBy> & {
+      FindManyArgs<SqlActionSelect, SqlActionFilter, SqlActionOrderBy> & {
         select: SqlActionSelect;
       }
     >(argv, defaultSelect);
@@ -123,7 +123,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       actorId: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<SqlActionSelect, SqlActionFilter, never> & {
+      FindFirstArgs<SqlActionSelect, SqlActionFilter> & {
         select: SqlActionSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/storage-module.ts b/sdk/constructive-cli/src/public/cli/commands/storage-module.ts
index 46c274346..adbf7233f 100644
--- a/sdk/constructive-cli/src/public/cli/commands/storage-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/storage-module.ts
@@ -110,7 +110,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       cacheTtlSeconds: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<StorageModuleSelect, StorageModuleFilter, never, StorageModuleOrderBy> & {
+      FindManyArgs<StorageModuleSelect, StorageModuleFilter, StorageModuleOrderBy> & {
         select: StorageModuleSelect;
       }
     >(argv, defaultSelect);
@@ -150,7 +150,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       cacheTtlSeconds: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<StorageModuleSelect, StorageModuleFilter, never> & {
+      FindFirstArgs<StorageModuleSelect, StorageModuleFilter> & {
         select: StorageModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/store.ts b/sdk/constructive-cli/src/public/cli/commands/store.ts
index 206779c0f..cb3879c59 100644
--- a/sdk/constructive-cli/src/public/cli/commands/store.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/store.ts
@@ -80,7 +80,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       createdAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<StoreSelect, StoreFilter, never, StoreOrderBy> & {
+      FindManyArgs<StoreSelect, StoreFilter, StoreOrderBy> & {
         select: StoreSelect;
       }
     >(argv, defaultSelect);
@@ -105,7 +105,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       createdAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<StoreSelect, StoreFilter, never> & {
+      FindFirstArgs<StoreSelect, StoreFilter> & {
         select: StoreSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/table-grant.ts b/sdk/constructive-cli/src/public/cli/commands/table-grant.ts
index 6019663df..c5e4011db 100644
--- a/sdk/constructive-cli/src/public/cli/commands/table-grant.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/table-grant.ts
@@ -88,7 +88,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<TableGrantSelect, TableGrantFilter, never, TableGrantOrderBy> & {
+      FindManyArgs<TableGrantSelect, TableGrantFilter, TableGrantOrderBy> & {
         select: TableGrantSelect;
       }
     >(argv, defaultSelect);
@@ -117,7 +117,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<TableGrantSelect, TableGrantFilter, never> & {
+      FindFirstArgs<TableGrantSelect, TableGrantFilter> & {
         select: TableGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/table-template-module.ts b/sdk/constructive-cli/src/public/cli/commands/table-template-module.ts
index 40d4273d4..def0f01f9 100644
--- a/sdk/constructive-cli/src/public/cli/commands/table-template-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/table-template-module.ts
@@ -91,7 +91,6 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       FindManyArgs<
         TableTemplateModuleSelect,
         TableTemplateModuleFilter,
-        never,
         TableTemplateModuleOrderBy
       > & {
         select: TableTemplateModuleSelect;
@@ -122,7 +121,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       data: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<TableTemplateModuleSelect, TableTemplateModuleFilter, never> & {
+      FindFirstArgs<TableTemplateModuleSelect, TableTemplateModuleFilter> & {
         select: TableTemplateModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/table.ts b/sdk/constructive-cli/src/public/cli/commands/table.ts
index 76ea1d1c9..58152c860 100644
--- a/sdk/constructive-cli/src/public/cli/commands/table.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/table.ts
@@ -108,7 +108,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<TableSelect, TableFilter, never, TableOrderBy> & {
+      FindManyArgs<TableSelect, TableFilter, TableOrderBy> & {
         select: TableSelect;
       }
     >(argv, defaultSelect);
@@ -147,7 +147,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<TableSelect, TableFilter, never> & {
+      FindFirstArgs<TableSelect, TableFilter> & {
         select: TableSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/trigger-function.ts b/sdk/constructive-cli/src/public/cli/commands/trigger-function.ts
index 99b6084ca..f9bab2f62 100644
--- a/sdk/constructive-cli/src/public/cli/commands/trigger-function.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/trigger-function.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<TriggerFunctionSelect, TriggerFunctionFilter, never, TriggerFunctionOrderBy> & {
+      FindManyArgs<TriggerFunctionSelect, TriggerFunctionFilter, TriggerFunctionOrderBy> & {
         select: TriggerFunctionSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<TriggerFunctionSelect, TriggerFunctionFilter, never> & {
+      FindFirstArgs<TriggerFunctionSelect, TriggerFunctionFilter> & {
         select: TriggerFunctionSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/trigger.ts b/sdk/constructive-cli/src/public/cli/commands/trigger.ts
index 8de102263..056b75efe 100644
--- a/sdk/constructive-cli/src/public/cli/commands/trigger.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/trigger.ts
@@ -96,7 +96,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<TriggerSelect, TriggerFilter, never, TriggerOrderBy> & {
+      FindManyArgs<TriggerSelect, TriggerFilter, TriggerOrderBy> & {
         select: TriggerSelect;
       }
     >(argv, defaultSelect);
@@ -129,7 +129,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<TriggerSelect, TriggerFilter, never> & {
+      FindFirstArgs<TriggerSelect, TriggerFilter> & {
         select: TriggerSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/unique-constraint.ts b/sdk/constructive-cli/src/public/cli/commands/unique-constraint.ts
index 969ffb71a..65f69f8f7 100644
--- a/sdk/constructive-cli/src/public/cli/commands/unique-constraint.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/unique-constraint.ts
@@ -98,12 +98,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<
-        UniqueConstraintSelect,
-        UniqueConstraintFilter,
-        never,
-        UniqueConstraintOrderBy
-      > & {
+      FindManyArgs<UniqueConstraintSelect, UniqueConstraintFilter, UniqueConstraintOrderBy> & {
         select: UniqueConstraintSelect;
       }
     >(argv, defaultSelect);
@@ -137,7 +132,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<UniqueConstraintSelect, UniqueConstraintFilter, never> & {
+      FindFirstArgs<UniqueConstraintSelect, UniqueConstraintFilter> & {
         select: UniqueConstraintSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/user-auth-module.ts b/sdk/constructive-cli/src/public/cli/commands/user-auth-module.ts
index 155b1f64b..0ae292f23 100644
--- a/sdk/constructive-cli/src/public/cli/commands/user-auth-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/user-auth-module.ts
@@ -122,7 +122,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       extendTokenExpires: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<UserAuthModuleSelect, UserAuthModuleFilter, never, UserAuthModuleOrderBy> & {
+      FindManyArgs<UserAuthModuleSelect, UserAuthModuleFilter, UserAuthModuleOrderBy> & {
         select: UserAuthModuleSelect;
       }
     >(argv, defaultSelect);
@@ -168,7 +168,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       extendTokenExpires: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<UserAuthModuleSelect, UserAuthModuleFilter, never> & {
+      FindFirstArgs<UserAuthModuleSelect, UserAuthModuleFilter> & {
         select: UserAuthModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/user.ts b/sdk/constructive-cli/src/public/cli/commands/user.ts
index cc49c77ce..7bf4feb16 100644
--- a/sdk/constructive-cli/src/public/cli/commands/user.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/user.ts
@@ -90,7 +90,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<UserSelect, UserFilter, never, UserOrderBy> & {
+      FindManyArgs<UserSelect, UserFilter, UserOrderBy> & {
         select: UserSelect;
       }
     >(argv, defaultSelect);
@@ -117,7 +117,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       updatedAt: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<UserSelect, UserFilter, never> & {
+      FindFirstArgs<UserSelect, UserFilter> & {
         select: UserSelect;
       }
     >(argv, defaultSelect);
@@ -158,7 +158,7 @@ async function handleSearch(argv: Partial<Record<string, unknown>>, _prompter: I
       updatedAt: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<UserSelect, UserFilter, never, UserOrderBy> & {
+      FindManyArgs<UserSelect, UserFilter, UserOrderBy> & {
         select: UserSelect;
       }
     >(argv, defaultSelect, searchWhere);
diff --git a/sdk/constructive-cli/src/public/cli/commands/users-module.ts b/sdk/constructive-cli/src/public/cli/commands/users-module.ts
index fa93a25c6..5e063f56a 100644
--- a/sdk/constructive-cli/src/public/cli/commands/users-module.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/users-module.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       typeTableName: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<UsersModuleSelect, UsersModuleFilter, never, UsersModuleOrderBy> & {
+      FindManyArgs<UsersModuleSelect, UsersModuleFilter, UsersModuleOrderBy> & {
         select: UsersModuleSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       typeTableName: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<UsersModuleSelect, UsersModuleFilter, never> & {
+      FindFirstArgs<UsersModuleSelect, UsersModuleFilter> & {
         select: UsersModuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/view-grant.ts b/sdk/constructive-cli/src/public/cli/commands/view-grant.ts
index 3f449ec68..8e2da565e 100644
--- a/sdk/constructive-cli/src/public/cli/commands/view-grant.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/view-grant.ts
@@ -84,7 +84,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       isGrant: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<ViewGrantSelect, ViewGrantFilter, never, ViewGrantOrderBy> & {
+      FindManyArgs<ViewGrantSelect, ViewGrantFilter, ViewGrantOrderBy> & {
         select: ViewGrantSelect;
       }
     >(argv, defaultSelect);
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       isGrant: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ViewGrantSelect, ViewGrantFilter, never> & {
+      FindFirstArgs<ViewGrantSelect, ViewGrantFilter> & {
         select: ViewGrantSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/view-rule.ts b/sdk/constructive-cli/src/public/cli/commands/view-rule.ts
index c50a16009..332a62dd5 100644
--- a/sdk/constructive-cli/src/public/cli/commands/view-rule.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/view-rule.ts
@@ -82,7 +82,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       action: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<ViewRuleSelect, ViewRuleFilter, never, ViewRuleOrderBy> & {
+      FindManyArgs<ViewRuleSelect, ViewRuleFilter, ViewRuleOrderBy> & {
         select: ViewRuleSelect;
       }
     >(argv, defaultSelect);
@@ -108,7 +108,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       action: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ViewRuleSelect, ViewRuleFilter, never> & {
+      FindFirstArgs<ViewRuleSelect, ViewRuleFilter> & {
         select: ViewRuleSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/view-table.ts b/sdk/constructive-cli/src/public/cli/commands/view-table.ts
index 505f5c97e..000e73739 100644
--- a/sdk/constructive-cli/src/public/cli/commands/view-table.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/view-table.ts
@@ -78,7 +78,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       joinOrder: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<ViewTableSelect, ViewTableFilter, never, ViewTableOrderBy> & {
+      FindManyArgs<ViewTableSelect, ViewTableFilter, ViewTableOrderBy> & {
         select: ViewTableSelect;
       }
     >(argv, defaultSelect);
@@ -102,7 +102,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       joinOrder: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ViewTableSelect, ViewTableFilter, never> & {
+      FindFirstArgs<ViewTableSelect, ViewTableFilter> & {
         select: ViewTableSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/commands/view.ts b/sdk/constructive-cli/src/public/cli/commands/view.ts
index 0ea707092..d05334504 100644
--- a/sdk/constructive-cli/src/public/cli/commands/view.ts
+++ b/sdk/constructive-cli/src/public/cli/commands/view.ts
@@ -102,7 +102,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
       tags: true,
     };
     const findManyArgs = parseFindManyArgs<
-      FindManyArgs<ViewSelect, ViewFilter, never, ViewOrderBy> & {
+      FindManyArgs<ViewSelect, ViewFilter, ViewOrderBy> & {
         select: ViewSelect;
       }
     >(argv, defaultSelect);
@@ -138,7 +138,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       tags: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<ViewSelect, ViewFilter, never> & {
+      FindFirstArgs<ViewSelect, ViewFilter> & {
         select: ViewSelect;
       }
     >(argv, defaultSelect);
diff --git a/sdk/constructive-cli/src/public/cli/utils.ts b/sdk/constructive-cli/src/public/cli/utils.ts
index 7d8d25ac8..1a3f288db 100644
--- a/sdk/constructive-cli/src/public/cli/utils.ts
+++ b/sdk/constructive-cli/src/public/cli/utils.ts
@@ -239,7 +239,6 @@ export function parseFindManyArgs<T = Record<string, unknown>>(
     (parsed.where ?? extraWhere)
       ? { ...(extraWhere ?? {}), ...((parsed.where as Record<string, unknown>) ?? {}) }
       : undefined;
-  const condition = parsed.condition;
   const orderBy = parseOrderByFlag(argv);
 
   return {
@@ -250,14 +249,13 @@ export function parseFindManyArgs<T = Record<string, unknown>>(
     ...(before !== undefined ? { before } : {}),
     ...(offset !== undefined ? { offset } : {}),
     ...(where !== undefined ? { where } : {}),
-    ...(condition !== undefined ? { condition } : {}),
     ...(orderBy !== undefined ? { orderBy } : {}),
   } as unknown as T;
 }
 
 /**
  * Build findFirst args from CLI argv.
- * Like parseFindManyArgs but only includes select, where, and condition
+ * Like parseFindManyArgs but only includes select and where
  * (no pagination flags — findFirst returns the first matching record).
  */
 export function parseFindFirstArgs<T = Record<string, unknown>>(
@@ -267,12 +265,10 @@ export function parseFindFirstArgs<T = Record<string, unknown>>(
   const select = parseSelectFlag(argv, defaultSelect);
   const parsed = unflattenDotNotation(argv);
   const where = parsed.where;
-  const condition = parsed.condition;
 
   return {
     select,
     ...(where !== undefined ? { where } : {}),
-    ...(condition !== undefined ? { condition } : {}),
   } as unknown as T;
 }
 
diff --git a/sdk/constructive-cli/src/public/orm/README.md b/sdk/constructive-cli/src/public/orm/README.md
index 52aae21f0..425d78091 100644
--- a/sdk/constructive-cli/src/public/orm/README.md
+++ b/sdk/constructive-cli/src/public/orm/README.md
@@ -4745,7 +4745,7 @@ const result = await db.mutation.initEmptyRepo({ input: { dbId: '<UUID>', storeI
 
 ### `db.mutation.constructBlueprint`
 
-Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
+Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
 
 - **Type:** mutation
 - **Arguments:**
diff --git a/sdk/constructive-cli/src/public/orm/models/api.ts b/sdk/constructive-cli/src/public/orm/models/api.ts
index 315771917..295ccbb65 100644
--- a/sdk/constructive-cli/src/public/orm/models/api.ts
+++ b/sdk/constructive-cli/src/public/orm/models/api.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ApiModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ApiSelect>(
-    args: FindManyArgs<S, ApiFilter, never, ApiOrderBy> & {
+    args: FindManyArgs<S, ApiFilter, ApiOrderBy> & {
       select: S;
     } & StrictSelect<S, ApiSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/apiModule.ts b/sdk/constructive-cli/src/public/orm/models/apiModule.ts
index 2cc5a7585..d90c9f9e9 100644
--- a/sdk/constructive-cli/src/public/orm/models/apiModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/apiModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ApiModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ApiModuleSelect>(
-    args: FindManyArgs<S, ApiModuleFilter, never, ApiModuleOrderBy> & {
+    args: FindManyArgs<S, ApiModuleFilter, ApiModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, ApiModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/apiSchema.ts b/sdk/constructive-cli/src/public/orm/models/apiSchema.ts
index 0fb92e7c4..f9288041c 100644
--- a/sdk/constructive-cli/src/public/orm/models/apiSchema.ts
+++ b/sdk/constructive-cli/src/public/orm/models/apiSchema.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ApiSchemaModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ApiSchemaSelect>(
-    args: FindManyArgs<S, ApiSchemaFilter, never, ApiSchemaOrderBy> & {
+    args: FindManyArgs<S, ApiSchemaFilter, ApiSchemaOrderBy> & {
       select: S;
     } & StrictSelect<S, ApiSchemaSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/app.ts b/sdk/constructive-cli/src/public/orm/models/app.ts
index 56be2a0fb..f6a45b422 100644
--- a/sdk/constructive-cli/src/public/orm/models/app.ts
+++ b/sdk/constructive-cli/src/public/orm/models/app.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppSelect>(
-    args: FindManyArgs<S, AppFilter, never, AppOrderBy> & {
+    args: FindManyArgs<S, AppFilter, AppOrderBy> & {
       select: S;
     } & StrictSelect<S, AppSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/appAchievement.ts b/sdk/constructive-cli/src/public/orm/models/appAchievement.ts
index 371094039..f24447777 100644
--- a/sdk/constructive-cli/src/public/orm/models/appAchievement.ts
+++ b/sdk/constructive-cli/src/public/orm/models/appAchievement.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppAchievementModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppAchievementSelect>(
-    args: FindManyArgs<S, AppAchievementFilter, never, AppAchievementOrderBy> & {
+    args: FindManyArgs<S, AppAchievementFilter, AppAchievementOrderBy> & {
       select: S;
     } & StrictSelect<S, AppAchievementSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/appAdminGrant.ts b/sdk/constructive-cli/src/public/orm/models/appAdminGrant.ts
index 4ab5443fe..6a2a59893 100644
--- a/sdk/constructive-cli/src/public/orm/models/appAdminGrant.ts
+++ b/sdk/constructive-cli/src/public/orm/models/appAdminGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppAdminGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppAdminGrantSelect>(
-    args: FindManyArgs<S, AppAdminGrantFilter, never, AppAdminGrantOrderBy> & {
+    args: FindManyArgs<S, AppAdminGrantFilter, AppAdminGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppAdminGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/appGrant.ts b/sdk/constructive-cli/src/public/orm/models/appGrant.ts
index f7bd4d049..2cb4f429a 100644
--- a/sdk/constructive-cli/src/public/orm/models/appGrant.ts
+++ b/sdk/constructive-cli/src/public/orm/models/appGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppGrantSelect>(
-    args: FindManyArgs<S, AppGrantFilter, never, AppGrantOrderBy> & {
+    args: FindManyArgs<S, AppGrantFilter, AppGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/appLevel.ts b/sdk/constructive-cli/src/public/orm/models/appLevel.ts
index a3f53cfeb..f9abef512 100644
--- a/sdk/constructive-cli/src/public/orm/models/appLevel.ts
+++ b/sdk/constructive-cli/src/public/orm/models/appLevel.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLevelModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLevelSelect>(
-    args: FindManyArgs<S, AppLevelFilter, never, AppLevelOrderBy> & {
+    args: FindManyArgs<S, AppLevelFilter, AppLevelOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLevelSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/appLevelRequirement.ts b/sdk/constructive-cli/src/public/orm/models/appLevelRequirement.ts
index c89f580c2..54baeb7dc 100644
--- a/sdk/constructive-cli/src/public/orm/models/appLevelRequirement.ts
+++ b/sdk/constructive-cli/src/public/orm/models/appLevelRequirement.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLevelRequirementModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLevelRequirementSelect>(
-    args: FindManyArgs<S, AppLevelRequirementFilter, never, AppLevelRequirementOrderBy> & {
+    args: FindManyArgs<S, AppLevelRequirementFilter, AppLevelRequirementOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLevelRequirementSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/appLimit.ts b/sdk/constructive-cli/src/public/orm/models/appLimit.ts
index 0b228e5ed..dea896420 100644
--- a/sdk/constructive-cli/src/public/orm/models/appLimit.ts
+++ b/sdk/constructive-cli/src/public/orm/models/appLimit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLimitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLimitSelect>(
-    args: FindManyArgs<S, AppLimitFilter, never, AppLimitOrderBy> & {
+    args: FindManyArgs<S, AppLimitFilter, AppLimitOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLimitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/appLimitDefault.ts b/sdk/constructive-cli/src/public/orm/models/appLimitDefault.ts
index 7731e46ba..dfec3cdd9 100644
--- a/sdk/constructive-cli/src/public/orm/models/appLimitDefault.ts
+++ b/sdk/constructive-cli/src/public/orm/models/appLimitDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLimitDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLimitDefaultSelect>(
-    args: FindManyArgs<S, AppLimitDefaultFilter, never, AppLimitDefaultOrderBy> & {
+    args: FindManyArgs<S, AppLimitDefaultFilter, AppLimitDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLimitDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/appMembership.ts b/sdk/constructive-cli/src/public/orm/models/appMembership.ts
index dd0f68855..a830192e6 100644
--- a/sdk/constructive-cli/src/public/orm/models/appMembership.ts
+++ b/sdk/constructive-cli/src/public/orm/models/appMembership.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppMembershipModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppMembershipSelect>(
-    args: FindManyArgs<S, AppMembershipFilter, never, AppMembershipOrderBy> & {
+    args: FindManyArgs<S, AppMembershipFilter, AppMembershipOrderBy> & {
       select: S;
     } & StrictSelect<S, AppMembershipSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/appMembershipDefault.ts b/sdk/constructive-cli/src/public/orm/models/appMembershipDefault.ts
index 88dea6243..8b1a54c01 100644
--- a/sdk/constructive-cli/src/public/orm/models/appMembershipDefault.ts
+++ b/sdk/constructive-cli/src/public/orm/models/appMembershipDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppMembershipDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppMembershipDefaultSelect>(
-    args: FindManyArgs<S, AppMembershipDefaultFilter, never, AppMembershipDefaultOrderBy> & {
+    args: FindManyArgs<S, AppMembershipDefaultFilter, AppMembershipDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppMembershipDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/appOwnerGrant.ts b/sdk/constructive-cli/src/public/orm/models/appOwnerGrant.ts
index acc216d4a..a8695557e 100644
--- a/sdk/constructive-cli/src/public/orm/models/appOwnerGrant.ts
+++ b/sdk/constructive-cli/src/public/orm/models/appOwnerGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppOwnerGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppOwnerGrantSelect>(
-    args: FindManyArgs<S, AppOwnerGrantFilter, never, AppOwnerGrantOrderBy> & {
+    args: FindManyArgs<S, AppOwnerGrantFilter, AppOwnerGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppOwnerGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/appPermission.ts b/sdk/constructive-cli/src/public/orm/models/appPermission.ts
index c191e5066..2575c5de2 100644
--- a/sdk/constructive-cli/src/public/orm/models/appPermission.ts
+++ b/sdk/constructive-cli/src/public/orm/models/appPermission.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppPermissionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppPermissionSelect>(
-    args: FindManyArgs<S, AppPermissionFilter, never, AppPermissionOrderBy> & {
+    args: FindManyArgs<S, AppPermissionFilter, AppPermissionOrderBy> & {
       select: S;
     } & StrictSelect<S, AppPermissionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/appPermissionDefault.ts b/sdk/constructive-cli/src/public/orm/models/appPermissionDefault.ts
index 33fdd49dd..427272883 100644
--- a/sdk/constructive-cli/src/public/orm/models/appPermissionDefault.ts
+++ b/sdk/constructive-cli/src/public/orm/models/appPermissionDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppPermissionDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppPermissionDefaultSelect>(
-    args: FindManyArgs<S, AppPermissionDefaultFilter, never, AppPermissionDefaultOrderBy> & {
+    args: FindManyArgs<S, AppPermissionDefaultFilter, AppPermissionDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppPermissionDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/appStep.ts b/sdk/constructive-cli/src/public/orm/models/appStep.ts
index a683087da..29dae0d6c 100644
--- a/sdk/constructive-cli/src/public/orm/models/appStep.ts
+++ b/sdk/constructive-cli/src/public/orm/models/appStep.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppStepModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppStepSelect>(
-    args: FindManyArgs<S, AppStepFilter, never, AppStepOrderBy> & {
+    args: FindManyArgs<S, AppStepFilter, AppStepOrderBy> & {
       select: S;
     } & StrictSelect<S, AppStepSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/astMigration.ts b/sdk/constructive-cli/src/public/orm/models/astMigration.ts
index 44b0d3469..8bab8cfd0 100644
--- a/sdk/constructive-cli/src/public/orm/models/astMigration.ts
+++ b/sdk/constructive-cli/src/public/orm/models/astMigration.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AstMigrationModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AstMigrationSelect>(
-    args: FindManyArgs<S, AstMigrationFilter, never, AstMigrationOrderBy> & {
+    args: FindManyArgs<S, AstMigrationFilter, AstMigrationOrderBy> & {
       select: S;
     } & StrictSelect<S, AstMigrationSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/auditLog.ts b/sdk/constructive-cli/src/public/orm/models/auditLog.ts
index fac372386..2d388026d 100644
--- a/sdk/constructive-cli/src/public/orm/models/auditLog.ts
+++ b/sdk/constructive-cli/src/public/orm/models/auditLog.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AuditLogModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AuditLogSelect>(
-    args: FindManyArgs<S, AuditLogFilter, never, AuditLogOrderBy> & {
+    args: FindManyArgs<S, AuditLogFilter, AuditLogOrderBy> & {
       select: S;
     } & StrictSelect<S, AuditLogSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/blueprint.ts b/sdk/constructive-cli/src/public/orm/models/blueprint.ts
index 72c9f4bbe..fa1ea0286 100644
--- a/sdk/constructive-cli/src/public/orm/models/blueprint.ts
+++ b/sdk/constructive-cli/src/public/orm/models/blueprint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class BlueprintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends BlueprintSelect>(
-    args: FindManyArgs<S, BlueprintFilter, never, BlueprintOrderBy> & {
+    args: FindManyArgs<S, BlueprintFilter, BlueprintOrderBy> & {
       select: S;
     } & StrictSelect<S, BlueprintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/blueprintConstruction.ts b/sdk/constructive-cli/src/public/orm/models/blueprintConstruction.ts
index 5c5247d43..3f7a8657d 100644
--- a/sdk/constructive-cli/src/public/orm/models/blueprintConstruction.ts
+++ b/sdk/constructive-cli/src/public/orm/models/blueprintConstruction.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class BlueprintConstructionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends BlueprintConstructionSelect>(
-    args: FindManyArgs<S, BlueprintConstructionFilter, never, BlueprintConstructionOrderBy> & {
+    args: FindManyArgs<S, BlueprintConstructionFilter, BlueprintConstructionOrderBy> & {
       select: S;
     } & StrictSelect<S, BlueprintConstructionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/blueprintTemplate.ts b/sdk/constructive-cli/src/public/orm/models/blueprintTemplate.ts
index 346928f06..31d7824e5 100644
--- a/sdk/constructive-cli/src/public/orm/models/blueprintTemplate.ts
+++ b/sdk/constructive-cli/src/public/orm/models/blueprintTemplate.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class BlueprintTemplateModel {
   constructor(private client: OrmClient) {}
   findMany<S extends BlueprintTemplateSelect>(
-    args: FindManyArgs<S, BlueprintTemplateFilter, never, BlueprintTemplateOrderBy> & {
+    args: FindManyArgs<S, BlueprintTemplateFilter, BlueprintTemplateOrderBy> & {
       select: S;
     } & StrictSelect<S, BlueprintTemplateSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/checkConstraint.ts b/sdk/constructive-cli/src/public/orm/models/checkConstraint.ts
index 48a1e2031..323b64b6c 100644
--- a/sdk/constructive-cli/src/public/orm/models/checkConstraint.ts
+++ b/sdk/constructive-cli/src/public/orm/models/checkConstraint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CheckConstraintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CheckConstraintSelect>(
-    args: FindManyArgs<S, CheckConstraintFilter, never, CheckConstraintOrderBy> & {
+    args: FindManyArgs<S, CheckConstraintFilter, CheckConstraintOrderBy> & {
       select: S;
     } & StrictSelect<S, CheckConstraintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/claimedInvite.ts b/sdk/constructive-cli/src/public/orm/models/claimedInvite.ts
index c7724b14a..cbe1429e5 100644
--- a/sdk/constructive-cli/src/public/orm/models/claimedInvite.ts
+++ b/sdk/constructive-cli/src/public/orm/models/claimedInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ClaimedInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ClaimedInviteSelect>(
-    args: FindManyArgs<S, ClaimedInviteFilter, never, ClaimedInviteOrderBy> & {
+    args: FindManyArgs<S, ClaimedInviteFilter, ClaimedInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, ClaimedInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/commit.ts b/sdk/constructive-cli/src/public/orm/models/commit.ts
index b9e8c51d2..de0e94710 100644
--- a/sdk/constructive-cli/src/public/orm/models/commit.ts
+++ b/sdk/constructive-cli/src/public/orm/models/commit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CommitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CommitSelect>(
-    args: FindManyArgs<S, CommitFilter, never, CommitOrderBy> & {
+    args: FindManyArgs<S, CommitFilter, CommitOrderBy> & {
       select: S;
     } & StrictSelect<S, CommitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/connectedAccount.ts b/sdk/constructive-cli/src/public/orm/models/connectedAccount.ts
index 8a24193b8..c9def156d 100644
--- a/sdk/constructive-cli/src/public/orm/models/connectedAccount.ts
+++ b/sdk/constructive-cli/src/public/orm/models/connectedAccount.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ConnectedAccountModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ConnectedAccountSelect>(
-    args: FindManyArgs<S, ConnectedAccountFilter, never, ConnectedAccountOrderBy> & {
+    args: FindManyArgs<S, ConnectedAccountFilter, ConnectedAccountOrderBy> & {
       select: S;
     } & StrictSelect<S, ConnectedAccountSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/connectedAccountsModule.ts b/sdk/constructive-cli/src/public/orm/models/connectedAccountsModule.ts
index a7776029a..408aec32a 100644
--- a/sdk/constructive-cli/src/public/orm/models/connectedAccountsModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/connectedAccountsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ConnectedAccountsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ConnectedAccountsModuleSelect>(
-    args: FindManyArgs<S, ConnectedAccountsModuleFilter, never, ConnectedAccountsModuleOrderBy> & {
+    args: FindManyArgs<S, ConnectedAccountsModuleFilter, ConnectedAccountsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, ConnectedAccountsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/cryptoAddress.ts b/sdk/constructive-cli/src/public/orm/models/cryptoAddress.ts
index 8cbe37d7b..7357c0126 100644
--- a/sdk/constructive-cli/src/public/orm/models/cryptoAddress.ts
+++ b/sdk/constructive-cli/src/public/orm/models/cryptoAddress.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CryptoAddressModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CryptoAddressSelect>(
-    args: FindManyArgs<S, CryptoAddressFilter, never, CryptoAddressOrderBy> & {
+    args: FindManyArgs<S, CryptoAddressFilter, CryptoAddressOrderBy> & {
       select: S;
     } & StrictSelect<S, CryptoAddressSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/cryptoAddressesModule.ts b/sdk/constructive-cli/src/public/orm/models/cryptoAddressesModule.ts
index e90451b95..25af5781a 100644
--- a/sdk/constructive-cli/src/public/orm/models/cryptoAddressesModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/cryptoAddressesModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CryptoAddressesModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CryptoAddressesModuleSelect>(
-    args: FindManyArgs<S, CryptoAddressesModuleFilter, never, CryptoAddressesModuleOrderBy> & {
+    args: FindManyArgs<S, CryptoAddressesModuleFilter, CryptoAddressesModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, CryptoAddressesModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/cryptoAuthModule.ts b/sdk/constructive-cli/src/public/orm/models/cryptoAuthModule.ts
index 5aa929484..c654aa3f7 100644
--- a/sdk/constructive-cli/src/public/orm/models/cryptoAuthModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/cryptoAuthModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CryptoAuthModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CryptoAuthModuleSelect>(
-    args: FindManyArgs<S, CryptoAuthModuleFilter, never, CryptoAuthModuleOrderBy> & {
+    args: FindManyArgs<S, CryptoAuthModuleFilter, CryptoAuthModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, CryptoAuthModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/database.ts b/sdk/constructive-cli/src/public/orm/models/database.ts
index a053e55ca..6a4293010 100644
--- a/sdk/constructive-cli/src/public/orm/models/database.ts
+++ b/sdk/constructive-cli/src/public/orm/models/database.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DatabaseModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DatabaseSelect>(
-    args: FindManyArgs<S, DatabaseFilter, never, DatabaseOrderBy> & {
+    args: FindManyArgs<S, DatabaseFilter, DatabaseOrderBy> & {
       select: S;
     } & StrictSelect<S, DatabaseSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/databaseProvisionModule.ts b/sdk/constructive-cli/src/public/orm/models/databaseProvisionModule.ts
index 256ab0228..4d6c37645 100644
--- a/sdk/constructive-cli/src/public/orm/models/databaseProvisionModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/databaseProvisionModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DatabaseProvisionModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DatabaseProvisionModuleSelect>(
-    args: FindManyArgs<S, DatabaseProvisionModuleFilter, never, DatabaseProvisionModuleOrderBy> & {
+    args: FindManyArgs<S, DatabaseProvisionModuleFilter, DatabaseProvisionModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, DatabaseProvisionModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/databaseTransfer.ts b/sdk/constructive-cli/src/public/orm/models/databaseTransfer.ts
index 58d1b392b..e5d347907 100644
--- a/sdk/constructive-cli/src/public/orm/models/databaseTransfer.ts
+++ b/sdk/constructive-cli/src/public/orm/models/databaseTransfer.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DatabaseTransferModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DatabaseTransferSelect>(
-    args: FindManyArgs<S, DatabaseTransferFilter, never, DatabaseTransferOrderBy> & {
+    args: FindManyArgs<S, DatabaseTransferFilter, DatabaseTransferOrderBy> & {
       select: S;
     } & StrictSelect<S, DatabaseTransferSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/defaultIdsModule.ts b/sdk/constructive-cli/src/public/orm/models/defaultIdsModule.ts
index aa81b4a91..aa235bd39 100644
--- a/sdk/constructive-cli/src/public/orm/models/defaultIdsModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/defaultIdsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DefaultIdsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DefaultIdsModuleSelect>(
-    args: FindManyArgs<S, DefaultIdsModuleFilter, never, DefaultIdsModuleOrderBy> & {
+    args: FindManyArgs<S, DefaultIdsModuleFilter, DefaultIdsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, DefaultIdsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/defaultPrivilege.ts b/sdk/constructive-cli/src/public/orm/models/defaultPrivilege.ts
index 3e2c9e33b..7041b7b55 100644
--- a/sdk/constructive-cli/src/public/orm/models/defaultPrivilege.ts
+++ b/sdk/constructive-cli/src/public/orm/models/defaultPrivilege.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DefaultPrivilegeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DefaultPrivilegeSelect>(
-    args: FindManyArgs<S, DefaultPrivilegeFilter, never, DefaultPrivilegeOrderBy> & {
+    args: FindManyArgs<S, DefaultPrivilegeFilter, DefaultPrivilegeOrderBy> & {
       select: S;
     } & StrictSelect<S, DefaultPrivilegeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/denormalizedTableField.ts b/sdk/constructive-cli/src/public/orm/models/denormalizedTableField.ts
index 448948388..d94b84104 100644
--- a/sdk/constructive-cli/src/public/orm/models/denormalizedTableField.ts
+++ b/sdk/constructive-cli/src/public/orm/models/denormalizedTableField.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DenormalizedTableFieldModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DenormalizedTableFieldSelect>(
-    args: FindManyArgs<S, DenormalizedTableFieldFilter, never, DenormalizedTableFieldOrderBy> & {
+    args: FindManyArgs<S, DenormalizedTableFieldFilter, DenormalizedTableFieldOrderBy> & {
       select: S;
     } & StrictSelect<S, DenormalizedTableFieldSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/domain.ts b/sdk/constructive-cli/src/public/orm/models/domain.ts
index d90a82bb0..acf05455c 100644
--- a/sdk/constructive-cli/src/public/orm/models/domain.ts
+++ b/sdk/constructive-cli/src/public/orm/models/domain.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DomainModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DomainSelect>(
-    args: FindManyArgs<S, DomainFilter, never, DomainOrderBy> & {
+    args: FindManyArgs<S, DomainFilter, DomainOrderBy> & {
       select: S;
     } & StrictSelect<S, DomainSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/email.ts b/sdk/constructive-cli/src/public/orm/models/email.ts
index cf129a2d2..aa83efc07 100644
--- a/sdk/constructive-cli/src/public/orm/models/email.ts
+++ b/sdk/constructive-cli/src/public/orm/models/email.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EmailModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EmailSelect>(
-    args: FindManyArgs<S, EmailFilter, never, EmailOrderBy> & {
+    args: FindManyArgs<S, EmailFilter, EmailOrderBy> & {
       select: S;
     } & StrictSelect<S, EmailSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/emailsModule.ts b/sdk/constructive-cli/src/public/orm/models/emailsModule.ts
index 11ae816ce..984018c0c 100644
--- a/sdk/constructive-cli/src/public/orm/models/emailsModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/emailsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EmailsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EmailsModuleSelect>(
-    args: FindManyArgs<S, EmailsModuleFilter, never, EmailsModuleOrderBy> & {
+    args: FindManyArgs<S, EmailsModuleFilter, EmailsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, EmailsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/embeddingChunk.ts b/sdk/constructive-cli/src/public/orm/models/embeddingChunk.ts
index c44b9ed55..6c175145d 100644
--- a/sdk/constructive-cli/src/public/orm/models/embeddingChunk.ts
+++ b/sdk/constructive-cli/src/public/orm/models/embeddingChunk.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EmbeddingChunkModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EmbeddingChunkSelect>(
-    args: FindManyArgs<S, EmbeddingChunkFilter, never, EmbeddingChunkOrderBy> & {
+    args: FindManyArgs<S, EmbeddingChunkFilter, EmbeddingChunkOrderBy> & {
       select: S;
     } & StrictSelect<S, EmbeddingChunkSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/encryptedSecretsModule.ts b/sdk/constructive-cli/src/public/orm/models/encryptedSecretsModule.ts
index 49b9cdc3e..8656f0937 100644
--- a/sdk/constructive-cli/src/public/orm/models/encryptedSecretsModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/encryptedSecretsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EncryptedSecretsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EncryptedSecretsModuleSelect>(
-    args: FindManyArgs<S, EncryptedSecretsModuleFilter, never, EncryptedSecretsModuleOrderBy> & {
+    args: FindManyArgs<S, EncryptedSecretsModuleFilter, EncryptedSecretsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, EncryptedSecretsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/enum.ts b/sdk/constructive-cli/src/public/orm/models/enum.ts
index c5da5f40b..1e0e12ee3 100644
--- a/sdk/constructive-cli/src/public/orm/models/enum.ts
+++ b/sdk/constructive-cli/src/public/orm/models/enum.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EnumModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EnumSelect>(
-    args: FindManyArgs<S, EnumFilter, never, EnumOrderBy> & {
+    args: FindManyArgs<S, EnumFilter, EnumOrderBy> & {
       select: S;
     } & StrictSelect<S, EnumSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/field.ts b/sdk/constructive-cli/src/public/orm/models/field.ts
index fe784abc0..d8e8fc4ee 100644
--- a/sdk/constructive-cli/src/public/orm/models/field.ts
+++ b/sdk/constructive-cli/src/public/orm/models/field.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class FieldModel {
   constructor(private client: OrmClient) {}
   findMany<S extends FieldSelect>(
-    args: FindManyArgs<S, FieldFilter, never, FieldOrderBy> & {
+    args: FindManyArgs<S, FieldFilter, FieldOrderBy> & {
       select: S;
     } & StrictSelect<S, FieldSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/foreignKeyConstraint.ts b/sdk/constructive-cli/src/public/orm/models/foreignKeyConstraint.ts
index 0b96b62d7..951dc4fe2 100644
--- a/sdk/constructive-cli/src/public/orm/models/foreignKeyConstraint.ts
+++ b/sdk/constructive-cli/src/public/orm/models/foreignKeyConstraint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ForeignKeyConstraintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ForeignKeyConstraintSelect>(
-    args: FindManyArgs<S, ForeignKeyConstraintFilter, never, ForeignKeyConstraintOrderBy> & {
+    args: FindManyArgs<S, ForeignKeyConstraintFilter, ForeignKeyConstraintOrderBy> & {
       select: S;
     } & StrictSelect<S, ForeignKeyConstraintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/fullTextSearch.ts b/sdk/constructive-cli/src/public/orm/models/fullTextSearch.ts
index f53ad57a8..a0a592138 100644
--- a/sdk/constructive-cli/src/public/orm/models/fullTextSearch.ts
+++ b/sdk/constructive-cli/src/public/orm/models/fullTextSearch.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class FullTextSearchModel {
   constructor(private client: OrmClient) {}
   findMany<S extends FullTextSearchSelect>(
-    args: FindManyArgs<S, FullTextSearchFilter, never, FullTextSearchOrderBy> & {
+    args: FindManyArgs<S, FullTextSearchFilter, FullTextSearchOrderBy> & {
       select: S;
     } & StrictSelect<S, FullTextSearchSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/getAllRecord.ts b/sdk/constructive-cli/src/public/orm/models/getAllRecord.ts
index 94a06bdd9..53873a0f3 100644
--- a/sdk/constructive-cli/src/public/orm/models/getAllRecord.ts
+++ b/sdk/constructive-cli/src/public/orm/models/getAllRecord.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class GetAllRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends GetAllRecordSelect>(
-    args: FindManyArgs<S, GetAllRecordFilter, never, GetAllRecordsOrderBy> & {
+    args: FindManyArgs<S, GetAllRecordFilter, GetAllRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, GetAllRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/hierarchyModule.ts b/sdk/constructive-cli/src/public/orm/models/hierarchyModule.ts
index 8e570f16b..325927bd5 100644
--- a/sdk/constructive-cli/src/public/orm/models/hierarchyModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/hierarchyModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class HierarchyModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends HierarchyModuleSelect>(
-    args: FindManyArgs<S, HierarchyModuleFilter, never, HierarchyModuleOrderBy> & {
+    args: FindManyArgs<S, HierarchyModuleFilter, HierarchyModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, HierarchyModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/indexModel.ts b/sdk/constructive-cli/src/public/orm/models/indexModel.ts
index 2782876f8..052334e57 100644
--- a/sdk/constructive-cli/src/public/orm/models/indexModel.ts
+++ b/sdk/constructive-cli/src/public/orm/models/indexModel.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class IndexModel {
   constructor(private client: OrmClient) {}
   findMany<S extends IndexSelect>(
-    args: FindManyArgs<S, IndexFilter, never, IndexOrderBy> & {
+    args: FindManyArgs<S, IndexFilter, IndexOrderBy> & {
       select: S;
     } & StrictSelect<S, IndexSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/invite.ts b/sdk/constructive-cli/src/public/orm/models/invite.ts
index 05d88af09..8fabe0aec 100644
--- a/sdk/constructive-cli/src/public/orm/models/invite.ts
+++ b/sdk/constructive-cli/src/public/orm/models/invite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class InviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends InviteSelect>(
-    args: FindManyArgs<S, InviteFilter, never, InviteOrderBy> & {
+    args: FindManyArgs<S, InviteFilter, InviteOrderBy> & {
       select: S;
     } & StrictSelect<S, InviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/invitesModule.ts b/sdk/constructive-cli/src/public/orm/models/invitesModule.ts
index 52aeb72c4..f7999f502 100644
--- a/sdk/constructive-cli/src/public/orm/models/invitesModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/invitesModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class InvitesModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends InvitesModuleSelect>(
-    args: FindManyArgs<S, InvitesModuleFilter, never, InvitesModuleOrderBy> & {
+    args: FindManyArgs<S, InvitesModuleFilter, InvitesModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, InvitesModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/levelsModule.ts b/sdk/constructive-cli/src/public/orm/models/levelsModule.ts
index 77eeea28d..0c758ad86 100644
--- a/sdk/constructive-cli/src/public/orm/models/levelsModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/levelsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class LevelsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends LevelsModuleSelect>(
-    args: FindManyArgs<S, LevelsModuleFilter, never, LevelsModuleOrderBy> & {
+    args: FindManyArgs<S, LevelsModuleFilter, LevelsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, LevelsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/limitsModule.ts b/sdk/constructive-cli/src/public/orm/models/limitsModule.ts
index 41c850afe..10e89be1d 100644
--- a/sdk/constructive-cli/src/public/orm/models/limitsModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/limitsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class LimitsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends LimitsModuleSelect>(
-    args: FindManyArgs<S, LimitsModuleFilter, never, LimitsModuleOrderBy> & {
+    args: FindManyArgs<S, LimitsModuleFilter, LimitsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, LimitsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/membershipType.ts b/sdk/constructive-cli/src/public/orm/models/membershipType.ts
index bc8b65d9e..40fac5490 100644
--- a/sdk/constructive-cli/src/public/orm/models/membershipType.ts
+++ b/sdk/constructive-cli/src/public/orm/models/membershipType.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MembershipTypeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MembershipTypeSelect>(
-    args: FindManyArgs<S, MembershipTypeFilter, never, MembershipTypeOrderBy> & {
+    args: FindManyArgs<S, MembershipTypeFilter, MembershipTypeOrderBy> & {
       select: S;
     } & StrictSelect<S, MembershipTypeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/membershipTypesModule.ts b/sdk/constructive-cli/src/public/orm/models/membershipTypesModule.ts
index e49903cc2..31807c914 100644
--- a/sdk/constructive-cli/src/public/orm/models/membershipTypesModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/membershipTypesModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MembershipTypesModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MembershipTypesModuleSelect>(
-    args: FindManyArgs<S, MembershipTypesModuleFilter, never, MembershipTypesModuleOrderBy> & {
+    args: FindManyArgs<S, MembershipTypesModuleFilter, MembershipTypesModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, MembershipTypesModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/membershipsModule.ts b/sdk/constructive-cli/src/public/orm/models/membershipsModule.ts
index 2b46f663e..b1ce2f836 100644
--- a/sdk/constructive-cli/src/public/orm/models/membershipsModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/membershipsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MembershipsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MembershipsModuleSelect>(
-    args: FindManyArgs<S, MembershipsModuleFilter, never, MembershipsModuleOrderBy> & {
+    args: FindManyArgs<S, MembershipsModuleFilter, MembershipsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, MembershipsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/migrateFile.ts b/sdk/constructive-cli/src/public/orm/models/migrateFile.ts
index 17d47149a..35bfa715e 100644
--- a/sdk/constructive-cli/src/public/orm/models/migrateFile.ts
+++ b/sdk/constructive-cli/src/public/orm/models/migrateFile.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MigrateFileModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MigrateFileSelect>(
-    args: FindManyArgs<S, MigrateFileFilter, never, MigrateFileOrderBy> & {
+    args: FindManyArgs<S, MigrateFileFilter, MigrateFileOrderBy> & {
       select: S;
     } & StrictSelect<S, MigrateFileSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/object.ts b/sdk/constructive-cli/src/public/orm/models/object.ts
index 1cbe85b7c..085bdd4df 100644
--- a/sdk/constructive-cli/src/public/orm/models/object.ts
+++ b/sdk/constructive-cli/src/public/orm/models/object.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ObjectModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ObjectSelect>(
-    args: FindManyArgs<S, ObjectFilter, never, ObjectOrderBy> & {
+    args: FindManyArgs<S, ObjectFilter, ObjectOrderBy> & {
       select: S;
     } & StrictSelect<S, ObjectSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgAdminGrant.ts b/sdk/constructive-cli/src/public/orm/models/orgAdminGrant.ts
index 5378a74f0..e611a8578 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgAdminGrant.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgAdminGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgAdminGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgAdminGrantSelect>(
-    args: FindManyArgs<S, OrgAdminGrantFilter, never, OrgAdminGrantOrderBy> & {
+    args: FindManyArgs<S, OrgAdminGrantFilter, OrgAdminGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgAdminGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgChartEdge.ts b/sdk/constructive-cli/src/public/orm/models/orgChartEdge.ts
index 8a71ab56f..6c6fc84cc 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgChartEdge.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgChartEdge.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgChartEdgeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgChartEdgeSelect>(
-    args: FindManyArgs<S, OrgChartEdgeFilter, never, OrgChartEdgeOrderBy> & {
+    args: FindManyArgs<S, OrgChartEdgeFilter, OrgChartEdgeOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgChartEdgeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgChartEdgeGrant.ts b/sdk/constructive-cli/src/public/orm/models/orgChartEdgeGrant.ts
index b048dead6..58345c78d 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgChartEdgeGrant.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgChartEdgeGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgChartEdgeGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgChartEdgeGrantSelect>(
-    args: FindManyArgs<S, OrgChartEdgeGrantFilter, never, OrgChartEdgeGrantOrderBy> & {
+    args: FindManyArgs<S, OrgChartEdgeGrantFilter, OrgChartEdgeGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgChartEdgeGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgClaimedInvite.ts b/sdk/constructive-cli/src/public/orm/models/orgClaimedInvite.ts
index 75975b11b..475de7291 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgClaimedInvite.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgClaimedInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgClaimedInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgClaimedInviteSelect>(
-    args: FindManyArgs<S, OrgClaimedInviteFilter, never, OrgClaimedInviteOrderBy> & {
+    args: FindManyArgs<S, OrgClaimedInviteFilter, OrgClaimedInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgClaimedInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgGetManagersRecord.ts b/sdk/constructive-cli/src/public/orm/models/orgGetManagersRecord.ts
index e8f5a29ec..9a0cefa8a 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgGetManagersRecord.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgGetManagersRecord.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGetManagersRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGetManagersRecordSelect>(
-    args: FindManyArgs<S, OrgGetManagersRecordFilter, never, OrgGetManagersRecordsOrderBy> & {
+    args: FindManyArgs<S, OrgGetManagersRecordFilter, OrgGetManagersRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGetManagersRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgGetSubordinatesRecord.ts b/sdk/constructive-cli/src/public/orm/models/orgGetSubordinatesRecord.ts
index be9fa6a62..5eeec50ca 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgGetSubordinatesRecord.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgGetSubordinatesRecord.ts
@@ -37,12 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGetSubordinatesRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGetSubordinatesRecordSelect>(
-    args: FindManyArgs<
-      S,
-      OrgGetSubordinatesRecordFilter,
-      never,
-      OrgGetSubordinatesRecordsOrderBy
-    > & {
+    args: FindManyArgs<S, OrgGetSubordinatesRecordFilter, OrgGetSubordinatesRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGetSubordinatesRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgGrant.ts b/sdk/constructive-cli/src/public/orm/models/orgGrant.ts
index 23c9cd546..291264ec5 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgGrant.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGrantSelect>(
-    args: FindManyArgs<S, OrgGrantFilter, never, OrgGrantOrderBy> & {
+    args: FindManyArgs<S, OrgGrantFilter, OrgGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgInvite.ts b/sdk/constructive-cli/src/public/orm/models/orgInvite.ts
index cacca9210..639cb8dd5 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgInvite.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgInviteSelect>(
-    args: FindManyArgs<S, OrgInviteFilter, never, OrgInviteOrderBy> & {
+    args: FindManyArgs<S, OrgInviteFilter, OrgInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgLimit.ts b/sdk/constructive-cli/src/public/orm/models/orgLimit.ts
index ab50514ae..2d7937963 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgLimit.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgLimit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgLimitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgLimitSelect>(
-    args: FindManyArgs<S, OrgLimitFilter, never, OrgLimitOrderBy> & {
+    args: FindManyArgs<S, OrgLimitFilter, OrgLimitOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgLimitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgLimitDefault.ts b/sdk/constructive-cli/src/public/orm/models/orgLimitDefault.ts
index d8c76fb6a..bf0cfcf5e 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgLimitDefault.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgLimitDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgLimitDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgLimitDefaultSelect>(
-    args: FindManyArgs<S, OrgLimitDefaultFilter, never, OrgLimitDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgLimitDefaultFilter, OrgLimitDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgLimitDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgMember.ts b/sdk/constructive-cli/src/public/orm/models/orgMember.ts
index 8575c7fdc..dd1d20e45 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgMember.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgMember.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMemberModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMemberSelect>(
-    args: FindManyArgs<S, OrgMemberFilter, never, OrgMemberOrderBy> & {
+    args: FindManyArgs<S, OrgMemberFilter, OrgMemberOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMemberSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgMembership.ts b/sdk/constructive-cli/src/public/orm/models/orgMembership.ts
index 20d60836a..c0173b3e1 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgMembership.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgMembership.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMembershipModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMembershipSelect>(
-    args: FindManyArgs<S, OrgMembershipFilter, never, OrgMembershipOrderBy> & {
+    args: FindManyArgs<S, OrgMembershipFilter, OrgMembershipOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMembershipSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgMembershipDefault.ts b/sdk/constructive-cli/src/public/orm/models/orgMembershipDefault.ts
index 83b9f7dea..09d525bec 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgMembershipDefault.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgMembershipDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMembershipDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMembershipDefaultSelect>(
-    args: FindManyArgs<S, OrgMembershipDefaultFilter, never, OrgMembershipDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgMembershipDefaultFilter, OrgMembershipDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMembershipDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgOwnerGrant.ts b/sdk/constructive-cli/src/public/orm/models/orgOwnerGrant.ts
index 136082317..bdf045511 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgOwnerGrant.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgOwnerGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgOwnerGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgOwnerGrantSelect>(
-    args: FindManyArgs<S, OrgOwnerGrantFilter, never, OrgOwnerGrantOrderBy> & {
+    args: FindManyArgs<S, OrgOwnerGrantFilter, OrgOwnerGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgOwnerGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgPermission.ts b/sdk/constructive-cli/src/public/orm/models/orgPermission.ts
index 256395283..c5910be63 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgPermission.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgPermission.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgPermissionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgPermissionSelect>(
-    args: FindManyArgs<S, OrgPermissionFilter, never, OrgPermissionOrderBy> & {
+    args: FindManyArgs<S, OrgPermissionFilter, OrgPermissionOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgPermissionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/orgPermissionDefault.ts b/sdk/constructive-cli/src/public/orm/models/orgPermissionDefault.ts
index 18631fd2d..40389a11b 100644
--- a/sdk/constructive-cli/src/public/orm/models/orgPermissionDefault.ts
+++ b/sdk/constructive-cli/src/public/orm/models/orgPermissionDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgPermissionDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgPermissionDefaultSelect>(
-    args: FindManyArgs<S, OrgPermissionDefaultFilter, never, OrgPermissionDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgPermissionDefaultFilter, OrgPermissionDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgPermissionDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/permissionsModule.ts b/sdk/constructive-cli/src/public/orm/models/permissionsModule.ts
index 2a797d3b8..6066e6218 100644
--- a/sdk/constructive-cli/src/public/orm/models/permissionsModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/permissionsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PermissionsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PermissionsModuleSelect>(
-    args: FindManyArgs<S, PermissionsModuleFilter, never, PermissionsModuleOrderBy> & {
+    args: FindManyArgs<S, PermissionsModuleFilter, PermissionsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, PermissionsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/phoneNumber.ts b/sdk/constructive-cli/src/public/orm/models/phoneNumber.ts
index 592b010fa..a711db272 100644
--- a/sdk/constructive-cli/src/public/orm/models/phoneNumber.ts
+++ b/sdk/constructive-cli/src/public/orm/models/phoneNumber.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PhoneNumberModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PhoneNumberSelect>(
-    args: FindManyArgs<S, PhoneNumberFilter, never, PhoneNumberOrderBy> & {
+    args: FindManyArgs<S, PhoneNumberFilter, PhoneNumberOrderBy> & {
       select: S;
     } & StrictSelect<S, PhoneNumberSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/phoneNumbersModule.ts b/sdk/constructive-cli/src/public/orm/models/phoneNumbersModule.ts
index e844b2055..9b3da81ae 100644
--- a/sdk/constructive-cli/src/public/orm/models/phoneNumbersModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/phoneNumbersModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PhoneNumbersModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PhoneNumbersModuleSelect>(
-    args: FindManyArgs<S, PhoneNumbersModuleFilter, never, PhoneNumbersModuleOrderBy> & {
+    args: FindManyArgs<S, PhoneNumbersModuleFilter, PhoneNumbersModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, PhoneNumbersModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/policy.ts b/sdk/constructive-cli/src/public/orm/models/policy.ts
index 82e6d4e95..c76c4a3ad 100644
--- a/sdk/constructive-cli/src/public/orm/models/policy.ts
+++ b/sdk/constructive-cli/src/public/orm/models/policy.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PolicyModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PolicySelect>(
-    args: FindManyArgs<S, PolicyFilter, never, PolicyOrderBy> & {
+    args: FindManyArgs<S, PolicyFilter, PolicyOrderBy> & {
       select: S;
     } & StrictSelect<S, PolicySelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/primaryKeyConstraint.ts b/sdk/constructive-cli/src/public/orm/models/primaryKeyConstraint.ts
index 81c3f19e3..f1d79e61c 100644
--- a/sdk/constructive-cli/src/public/orm/models/primaryKeyConstraint.ts
+++ b/sdk/constructive-cli/src/public/orm/models/primaryKeyConstraint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PrimaryKeyConstraintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PrimaryKeyConstraintSelect>(
-    args: FindManyArgs<S, PrimaryKeyConstraintFilter, never, PrimaryKeyConstraintOrderBy> & {
+    args: FindManyArgs<S, PrimaryKeyConstraintFilter, PrimaryKeyConstraintOrderBy> & {
       select: S;
     } & StrictSelect<S, PrimaryKeyConstraintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/profilesModule.ts b/sdk/constructive-cli/src/public/orm/models/profilesModule.ts
index e48c6fedb..7841e9222 100644
--- a/sdk/constructive-cli/src/public/orm/models/profilesModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/profilesModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ProfilesModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ProfilesModuleSelect>(
-    args: FindManyArgs<S, ProfilesModuleFilter, never, ProfilesModuleOrderBy> & {
+    args: FindManyArgs<S, ProfilesModuleFilter, ProfilesModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, ProfilesModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/ref.ts b/sdk/constructive-cli/src/public/orm/models/ref.ts
index 6a128cc2f..016c70644 100644
--- a/sdk/constructive-cli/src/public/orm/models/ref.ts
+++ b/sdk/constructive-cli/src/public/orm/models/ref.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RefModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RefSelect>(
-    args: FindManyArgs<S, RefFilter, never, RefOrderBy> & {
+    args: FindManyArgs<S, RefFilter, RefOrderBy> & {
       select: S;
     } & StrictSelect<S, RefSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/relationProvision.ts b/sdk/constructive-cli/src/public/orm/models/relationProvision.ts
index 75b413246..5d27d5872 100644
--- a/sdk/constructive-cli/src/public/orm/models/relationProvision.ts
+++ b/sdk/constructive-cli/src/public/orm/models/relationProvision.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RelationProvisionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RelationProvisionSelect>(
-    args: FindManyArgs<S, RelationProvisionFilter, never, RelationProvisionOrderBy> & {
+    args: FindManyArgs<S, RelationProvisionFilter, RelationProvisionOrderBy> & {
       select: S;
     } & StrictSelect<S, RelationProvisionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/rlsModule.ts b/sdk/constructive-cli/src/public/orm/models/rlsModule.ts
index fb9b58f3b..750815c7b 100644
--- a/sdk/constructive-cli/src/public/orm/models/rlsModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/rlsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RlsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RlsModuleSelect>(
-    args: FindManyArgs<S, RlsModuleFilter, never, RlsModuleOrderBy> & {
+    args: FindManyArgs<S, RlsModuleFilter, RlsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, RlsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/roleType.ts b/sdk/constructive-cli/src/public/orm/models/roleType.ts
index 58716fc1e..5b258dc9a 100644
--- a/sdk/constructive-cli/src/public/orm/models/roleType.ts
+++ b/sdk/constructive-cli/src/public/orm/models/roleType.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RoleTypeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RoleTypeSelect>(
-    args: FindManyArgs<S, RoleTypeFilter, never, RoleTypeOrderBy> & {
+    args: FindManyArgs<S, RoleTypeFilter, RoleTypeOrderBy> & {
       select: S;
     } & StrictSelect<S, RoleTypeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/schema.ts b/sdk/constructive-cli/src/public/orm/models/schema.ts
index e4f823235..5bc546943 100644
--- a/sdk/constructive-cli/src/public/orm/models/schema.ts
+++ b/sdk/constructive-cli/src/public/orm/models/schema.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SchemaModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SchemaSelect>(
-    args: FindManyArgs<S, SchemaFilter, never, SchemaOrderBy> & {
+    args: FindManyArgs<S, SchemaFilter, SchemaOrderBy> & {
       select: S;
     } & StrictSelect<S, SchemaSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/schemaGrant.ts b/sdk/constructive-cli/src/public/orm/models/schemaGrant.ts
index 472d017e3..97671a523 100644
--- a/sdk/constructive-cli/src/public/orm/models/schemaGrant.ts
+++ b/sdk/constructive-cli/src/public/orm/models/schemaGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SchemaGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SchemaGrantSelect>(
-    args: FindManyArgs<S, SchemaGrantFilter, never, SchemaGrantOrderBy> & {
+    args: FindManyArgs<S, SchemaGrantFilter, SchemaGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, SchemaGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/secretsModule.ts b/sdk/constructive-cli/src/public/orm/models/secretsModule.ts
index 6a292713e..808b0154d 100644
--- a/sdk/constructive-cli/src/public/orm/models/secretsModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/secretsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SecretsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SecretsModuleSelect>(
-    args: FindManyArgs<S, SecretsModuleFilter, never, SecretsModuleOrderBy> & {
+    args: FindManyArgs<S, SecretsModuleFilter, SecretsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, SecretsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/secureTableProvision.ts b/sdk/constructive-cli/src/public/orm/models/secureTableProvision.ts
index 7784ac351..585ea33c9 100644
--- a/sdk/constructive-cli/src/public/orm/models/secureTableProvision.ts
+++ b/sdk/constructive-cli/src/public/orm/models/secureTableProvision.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SecureTableProvisionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SecureTableProvisionSelect>(
-    args: FindManyArgs<S, SecureTableProvisionFilter, never, SecureTableProvisionOrderBy> & {
+    args: FindManyArgs<S, SecureTableProvisionFilter, SecureTableProvisionOrderBy> & {
       select: S;
     } & StrictSelect<S, SecureTableProvisionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/sessionsModule.ts b/sdk/constructive-cli/src/public/orm/models/sessionsModule.ts
index 03456dfa5..01cf5198a 100644
--- a/sdk/constructive-cli/src/public/orm/models/sessionsModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/sessionsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SessionsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SessionsModuleSelect>(
-    args: FindManyArgs<S, SessionsModuleFilter, never, SessionsModuleOrderBy> & {
+    args: FindManyArgs<S, SessionsModuleFilter, SessionsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, SessionsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/site.ts b/sdk/constructive-cli/src/public/orm/models/site.ts
index 027a17a9a..fa790b4d1 100644
--- a/sdk/constructive-cli/src/public/orm/models/site.ts
+++ b/sdk/constructive-cli/src/public/orm/models/site.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SiteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SiteSelect>(
-    args: FindManyArgs<S, SiteFilter, never, SiteOrderBy> & {
+    args: FindManyArgs<S, SiteFilter, SiteOrderBy> & {
       select: S;
     } & StrictSelect<S, SiteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/siteMetadatum.ts b/sdk/constructive-cli/src/public/orm/models/siteMetadatum.ts
index 0cad9ee3f..629c19725 100644
--- a/sdk/constructive-cli/src/public/orm/models/siteMetadatum.ts
+++ b/sdk/constructive-cli/src/public/orm/models/siteMetadatum.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SiteMetadatumModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SiteMetadatumSelect>(
-    args: FindManyArgs<S, SiteMetadatumFilter, never, SiteMetadatumOrderBy> & {
+    args: FindManyArgs<S, SiteMetadatumFilter, SiteMetadatumOrderBy> & {
       select: S;
     } & StrictSelect<S, SiteMetadatumSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/siteModule.ts b/sdk/constructive-cli/src/public/orm/models/siteModule.ts
index 8aa439832..943a6d7ae 100644
--- a/sdk/constructive-cli/src/public/orm/models/siteModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/siteModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SiteModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SiteModuleSelect>(
-    args: FindManyArgs<S, SiteModuleFilter, never, SiteModuleOrderBy> & {
+    args: FindManyArgs<S, SiteModuleFilter, SiteModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, SiteModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/siteTheme.ts b/sdk/constructive-cli/src/public/orm/models/siteTheme.ts
index 9f7d1f399..da7e85ab8 100644
--- a/sdk/constructive-cli/src/public/orm/models/siteTheme.ts
+++ b/sdk/constructive-cli/src/public/orm/models/siteTheme.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SiteThemeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SiteThemeSelect>(
-    args: FindManyArgs<S, SiteThemeFilter, never, SiteThemeOrderBy> & {
+    args: FindManyArgs<S, SiteThemeFilter, SiteThemeOrderBy> & {
       select: S;
     } & StrictSelect<S, SiteThemeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/sqlAction.ts b/sdk/constructive-cli/src/public/orm/models/sqlAction.ts
index 9235c79f9..449f16020 100644
--- a/sdk/constructive-cli/src/public/orm/models/sqlAction.ts
+++ b/sdk/constructive-cli/src/public/orm/models/sqlAction.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SqlActionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SqlActionSelect>(
-    args: FindManyArgs<S, SqlActionFilter, never, SqlActionOrderBy> & {
+    args: FindManyArgs<S, SqlActionFilter, SqlActionOrderBy> & {
       select: S;
     } & StrictSelect<S, SqlActionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/storageModule.ts b/sdk/constructive-cli/src/public/orm/models/storageModule.ts
index 347c71c81..cbfeb5b1e 100644
--- a/sdk/constructive-cli/src/public/orm/models/storageModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/storageModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class StorageModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends StorageModuleSelect>(
-    args: FindManyArgs<S, StorageModuleFilter, never, StorageModuleOrderBy> & {
+    args: FindManyArgs<S, StorageModuleFilter, StorageModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, StorageModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/store.ts b/sdk/constructive-cli/src/public/orm/models/store.ts
index b372bd4c4..f249ee921 100644
--- a/sdk/constructive-cli/src/public/orm/models/store.ts
+++ b/sdk/constructive-cli/src/public/orm/models/store.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class StoreModel {
   constructor(private client: OrmClient) {}
   findMany<S extends StoreSelect>(
-    args: FindManyArgs<S, StoreFilter, never, StoreOrderBy> & {
+    args: FindManyArgs<S, StoreFilter, StoreOrderBy> & {
       select: S;
     } & StrictSelect<S, StoreSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/table.ts b/sdk/constructive-cli/src/public/orm/models/table.ts
index f4ba83e84..c10b604a3 100644
--- a/sdk/constructive-cli/src/public/orm/models/table.ts
+++ b/sdk/constructive-cli/src/public/orm/models/table.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TableModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TableSelect>(
-    args: FindManyArgs<S, TableFilter, never, TableOrderBy> & {
+    args: FindManyArgs<S, TableFilter, TableOrderBy> & {
       select: S;
     } & StrictSelect<S, TableSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/tableGrant.ts b/sdk/constructive-cli/src/public/orm/models/tableGrant.ts
index c5d976be5..02d19136c 100644
--- a/sdk/constructive-cli/src/public/orm/models/tableGrant.ts
+++ b/sdk/constructive-cli/src/public/orm/models/tableGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TableGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TableGrantSelect>(
-    args: FindManyArgs<S, TableGrantFilter, never, TableGrantOrderBy> & {
+    args: FindManyArgs<S, TableGrantFilter, TableGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, TableGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/tableTemplateModule.ts b/sdk/constructive-cli/src/public/orm/models/tableTemplateModule.ts
index 57c161ee3..c08032798 100644
--- a/sdk/constructive-cli/src/public/orm/models/tableTemplateModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/tableTemplateModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TableTemplateModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TableTemplateModuleSelect>(
-    args: FindManyArgs<S, TableTemplateModuleFilter, never, TableTemplateModuleOrderBy> & {
+    args: FindManyArgs<S, TableTemplateModuleFilter, TableTemplateModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, TableTemplateModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/trigger.ts b/sdk/constructive-cli/src/public/orm/models/trigger.ts
index cf7947984..3e2404f0e 100644
--- a/sdk/constructive-cli/src/public/orm/models/trigger.ts
+++ b/sdk/constructive-cli/src/public/orm/models/trigger.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TriggerModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TriggerSelect>(
-    args: FindManyArgs<S, TriggerFilter, never, TriggerOrderBy> & {
+    args: FindManyArgs<S, TriggerFilter, TriggerOrderBy> & {
       select: S;
     } & StrictSelect<S, TriggerSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/triggerFunction.ts b/sdk/constructive-cli/src/public/orm/models/triggerFunction.ts
index d9fbab79d..999438070 100644
--- a/sdk/constructive-cli/src/public/orm/models/triggerFunction.ts
+++ b/sdk/constructive-cli/src/public/orm/models/triggerFunction.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TriggerFunctionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TriggerFunctionSelect>(
-    args: FindManyArgs<S, TriggerFunctionFilter, never, TriggerFunctionOrderBy> & {
+    args: FindManyArgs<S, TriggerFunctionFilter, TriggerFunctionOrderBy> & {
       select: S;
     } & StrictSelect<S, TriggerFunctionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/uniqueConstraint.ts b/sdk/constructive-cli/src/public/orm/models/uniqueConstraint.ts
index 97f50e176..de5ba6f76 100644
--- a/sdk/constructive-cli/src/public/orm/models/uniqueConstraint.ts
+++ b/sdk/constructive-cli/src/public/orm/models/uniqueConstraint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UniqueConstraintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UniqueConstraintSelect>(
-    args: FindManyArgs<S, UniqueConstraintFilter, never, UniqueConstraintOrderBy> & {
+    args: FindManyArgs<S, UniqueConstraintFilter, UniqueConstraintOrderBy> & {
       select: S;
     } & StrictSelect<S, UniqueConstraintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/user.ts b/sdk/constructive-cli/src/public/orm/models/user.ts
index ada9a0e34..aedd4fcc8 100644
--- a/sdk/constructive-cli/src/public/orm/models/user.ts
+++ b/sdk/constructive-cli/src/public/orm/models/user.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UserModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UserSelect>(
-    args: FindManyArgs<S, UserFilter, never, UserOrderBy> & {
+    args: FindManyArgs<S, UserFilter, UserOrderBy> & {
       select: S;
     } & StrictSelect<S, UserSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/userAuthModule.ts b/sdk/constructive-cli/src/public/orm/models/userAuthModule.ts
index 1c641932e..431026d87 100644
--- a/sdk/constructive-cli/src/public/orm/models/userAuthModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/userAuthModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UserAuthModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UserAuthModuleSelect>(
-    args: FindManyArgs<S, UserAuthModuleFilter, never, UserAuthModuleOrderBy> & {
+    args: FindManyArgs<S, UserAuthModuleFilter, UserAuthModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, UserAuthModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/usersModule.ts b/sdk/constructive-cli/src/public/orm/models/usersModule.ts
index 4ff2a4fd9..c5b6d361b 100644
--- a/sdk/constructive-cli/src/public/orm/models/usersModule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/usersModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UsersModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UsersModuleSelect>(
-    args: FindManyArgs<S, UsersModuleFilter, never, UsersModuleOrderBy> & {
+    args: FindManyArgs<S, UsersModuleFilter, UsersModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, UsersModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/view.ts b/sdk/constructive-cli/src/public/orm/models/view.ts
index ba3b478f5..5e7fa5f74 100644
--- a/sdk/constructive-cli/src/public/orm/models/view.ts
+++ b/sdk/constructive-cli/src/public/orm/models/view.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ViewModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ViewSelect>(
-    args: FindManyArgs<S, ViewFilter, never, ViewOrderBy> & {
+    args: FindManyArgs<S, ViewFilter, ViewOrderBy> & {
       select: S;
     } & StrictSelect<S, ViewSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/viewGrant.ts b/sdk/constructive-cli/src/public/orm/models/viewGrant.ts
index d760efc09..1023b5f7f 100644
--- a/sdk/constructive-cli/src/public/orm/models/viewGrant.ts
+++ b/sdk/constructive-cli/src/public/orm/models/viewGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ViewGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ViewGrantSelect>(
-    args: FindManyArgs<S, ViewGrantFilter, never, ViewGrantOrderBy> & {
+    args: FindManyArgs<S, ViewGrantFilter, ViewGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, ViewGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/viewRule.ts b/sdk/constructive-cli/src/public/orm/models/viewRule.ts
index 85692955e..101bd199a 100644
--- a/sdk/constructive-cli/src/public/orm/models/viewRule.ts
+++ b/sdk/constructive-cli/src/public/orm/models/viewRule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ViewRuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ViewRuleSelect>(
-    args: FindManyArgs<S, ViewRuleFilter, never, ViewRuleOrderBy> & {
+    args: FindManyArgs<S, ViewRuleFilter, ViewRuleOrderBy> & {
       select: S;
     } & StrictSelect<S, ViewRuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/models/viewTable.ts b/sdk/constructive-cli/src/public/orm/models/viewTable.ts
index 0011002e1..a37e7137b 100644
--- a/sdk/constructive-cli/src/public/orm/models/viewTable.ts
+++ b/sdk/constructive-cli/src/public/orm/models/viewTable.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ViewTableModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ViewTableSelect>(
-    args: FindManyArgs<S, ViewTableFilter, never, ViewTableOrderBy> & {
+    args: FindManyArgs<S, ViewTableFilter, ViewTableOrderBy> & {
       select: S;
     } & StrictSelect<S, ViewTableSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-cli/src/public/orm/mutation/index.ts b/sdk/constructive-cli/src/public/orm/mutation/index.ts
index 9302abc18..a2bc9ca55 100644
--- a/sdk/constructive-cli/src/public/orm/mutation/index.ts
+++ b/sdk/constructive-cli/src/public/orm/mutation/index.ts
@@ -182,7 +182,7 @@ export interface InitEmptyRepoVariables {
 }
 /**
  * Variables for constructBlueprint
- * Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
+ * Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
  */
 export interface ConstructBlueprintVariables {
   input: ConstructBlueprintInput;
diff --git a/sdk/constructive-cli/src/public/orm/query-builder.ts b/sdk/constructive-cli/src/public/orm/query-builder.ts
index 8dbcb9646..b0261f895 100644
--- a/sdk/constructive-cli/src/public/orm/query-builder.ts
+++ b/sdk/constructive-cli/src/public/orm/query-builder.ts
@@ -189,13 +189,12 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindManyDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
   args: {
     where?: TWhere;
-    condition?: TCondition;
     orderBy?: string[];
     first?: number;
     last?: number;
@@ -205,8 +204,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   },
   filterTypeName: string,
   orderByTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -216,16 +214,6 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   const queryArgs: ArgumentNode[] = [];
   const variables: Record<string, unknown> = {};
 
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
@@ -301,14 +289,13 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindFirstDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
-  args: { where?: TWhere; condition?: TCondition },
+  args: { where?: TWhere },
   filterTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -325,16 +312,6 @@ export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
     queryArgs,
     variables
   );
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
diff --git a/sdk/constructive-cli/src/public/orm/select-types.ts b/sdk/constructive-cli/src/public/orm/select-types.ts
index 919d1b935..2621b3570 100644
--- a/sdk/constructive-cli/src/public/orm/select-types.ts
+++ b/sdk/constructive-cli/src/public/orm/select-types.ts
@@ -16,10 +16,9 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
+export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -28,10 +27,9 @@ export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = ne
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
+export interface FindFirstArgs<TSelect, TWhere> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {
diff --git a/sdk/constructive-react/src/admin/orm/models/appAchievement.ts b/sdk/constructive-react/src/admin/orm/models/appAchievement.ts
index 371094039..f24447777 100644
--- a/sdk/constructive-react/src/admin/orm/models/appAchievement.ts
+++ b/sdk/constructive-react/src/admin/orm/models/appAchievement.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppAchievementModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppAchievementSelect>(
-    args: FindManyArgs<S, AppAchievementFilter, never, AppAchievementOrderBy> & {
+    args: FindManyArgs<S, AppAchievementFilter, AppAchievementOrderBy> & {
       select: S;
     } & StrictSelect<S, AppAchievementSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/appAdminGrant.ts b/sdk/constructive-react/src/admin/orm/models/appAdminGrant.ts
index 4ab5443fe..6a2a59893 100644
--- a/sdk/constructive-react/src/admin/orm/models/appAdminGrant.ts
+++ b/sdk/constructive-react/src/admin/orm/models/appAdminGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppAdminGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppAdminGrantSelect>(
-    args: FindManyArgs<S, AppAdminGrantFilter, never, AppAdminGrantOrderBy> & {
+    args: FindManyArgs<S, AppAdminGrantFilter, AppAdminGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppAdminGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/appGrant.ts b/sdk/constructive-react/src/admin/orm/models/appGrant.ts
index f7bd4d049..2cb4f429a 100644
--- a/sdk/constructive-react/src/admin/orm/models/appGrant.ts
+++ b/sdk/constructive-react/src/admin/orm/models/appGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppGrantSelect>(
-    args: FindManyArgs<S, AppGrantFilter, never, AppGrantOrderBy> & {
+    args: FindManyArgs<S, AppGrantFilter, AppGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/appLevel.ts b/sdk/constructive-react/src/admin/orm/models/appLevel.ts
index a3f53cfeb..f9abef512 100644
--- a/sdk/constructive-react/src/admin/orm/models/appLevel.ts
+++ b/sdk/constructive-react/src/admin/orm/models/appLevel.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLevelModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLevelSelect>(
-    args: FindManyArgs<S, AppLevelFilter, never, AppLevelOrderBy> & {
+    args: FindManyArgs<S, AppLevelFilter, AppLevelOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLevelSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/appLevelRequirement.ts b/sdk/constructive-react/src/admin/orm/models/appLevelRequirement.ts
index c89f580c2..54baeb7dc 100644
--- a/sdk/constructive-react/src/admin/orm/models/appLevelRequirement.ts
+++ b/sdk/constructive-react/src/admin/orm/models/appLevelRequirement.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLevelRequirementModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLevelRequirementSelect>(
-    args: FindManyArgs<S, AppLevelRequirementFilter, never, AppLevelRequirementOrderBy> & {
+    args: FindManyArgs<S, AppLevelRequirementFilter, AppLevelRequirementOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLevelRequirementSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/appLimit.ts b/sdk/constructive-react/src/admin/orm/models/appLimit.ts
index 0b228e5ed..dea896420 100644
--- a/sdk/constructive-react/src/admin/orm/models/appLimit.ts
+++ b/sdk/constructive-react/src/admin/orm/models/appLimit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLimitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLimitSelect>(
-    args: FindManyArgs<S, AppLimitFilter, never, AppLimitOrderBy> & {
+    args: FindManyArgs<S, AppLimitFilter, AppLimitOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLimitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/appLimitDefault.ts b/sdk/constructive-react/src/admin/orm/models/appLimitDefault.ts
index 7731e46ba..dfec3cdd9 100644
--- a/sdk/constructive-react/src/admin/orm/models/appLimitDefault.ts
+++ b/sdk/constructive-react/src/admin/orm/models/appLimitDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLimitDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLimitDefaultSelect>(
-    args: FindManyArgs<S, AppLimitDefaultFilter, never, AppLimitDefaultOrderBy> & {
+    args: FindManyArgs<S, AppLimitDefaultFilter, AppLimitDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLimitDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/appMembership.ts b/sdk/constructive-react/src/admin/orm/models/appMembership.ts
index dd0f68855..a830192e6 100644
--- a/sdk/constructive-react/src/admin/orm/models/appMembership.ts
+++ b/sdk/constructive-react/src/admin/orm/models/appMembership.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppMembershipModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppMembershipSelect>(
-    args: FindManyArgs<S, AppMembershipFilter, never, AppMembershipOrderBy> & {
+    args: FindManyArgs<S, AppMembershipFilter, AppMembershipOrderBy> & {
       select: S;
     } & StrictSelect<S, AppMembershipSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/appMembershipDefault.ts b/sdk/constructive-react/src/admin/orm/models/appMembershipDefault.ts
index 88dea6243..8b1a54c01 100644
--- a/sdk/constructive-react/src/admin/orm/models/appMembershipDefault.ts
+++ b/sdk/constructive-react/src/admin/orm/models/appMembershipDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppMembershipDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppMembershipDefaultSelect>(
-    args: FindManyArgs<S, AppMembershipDefaultFilter, never, AppMembershipDefaultOrderBy> & {
+    args: FindManyArgs<S, AppMembershipDefaultFilter, AppMembershipDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppMembershipDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/appOwnerGrant.ts b/sdk/constructive-react/src/admin/orm/models/appOwnerGrant.ts
index acc216d4a..a8695557e 100644
--- a/sdk/constructive-react/src/admin/orm/models/appOwnerGrant.ts
+++ b/sdk/constructive-react/src/admin/orm/models/appOwnerGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppOwnerGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppOwnerGrantSelect>(
-    args: FindManyArgs<S, AppOwnerGrantFilter, never, AppOwnerGrantOrderBy> & {
+    args: FindManyArgs<S, AppOwnerGrantFilter, AppOwnerGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppOwnerGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/appPermission.ts b/sdk/constructive-react/src/admin/orm/models/appPermission.ts
index c191e5066..2575c5de2 100644
--- a/sdk/constructive-react/src/admin/orm/models/appPermission.ts
+++ b/sdk/constructive-react/src/admin/orm/models/appPermission.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppPermissionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppPermissionSelect>(
-    args: FindManyArgs<S, AppPermissionFilter, never, AppPermissionOrderBy> & {
+    args: FindManyArgs<S, AppPermissionFilter, AppPermissionOrderBy> & {
       select: S;
     } & StrictSelect<S, AppPermissionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/appPermissionDefault.ts b/sdk/constructive-react/src/admin/orm/models/appPermissionDefault.ts
index 33fdd49dd..427272883 100644
--- a/sdk/constructive-react/src/admin/orm/models/appPermissionDefault.ts
+++ b/sdk/constructive-react/src/admin/orm/models/appPermissionDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppPermissionDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppPermissionDefaultSelect>(
-    args: FindManyArgs<S, AppPermissionDefaultFilter, never, AppPermissionDefaultOrderBy> & {
+    args: FindManyArgs<S, AppPermissionDefaultFilter, AppPermissionDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppPermissionDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/appStep.ts b/sdk/constructive-react/src/admin/orm/models/appStep.ts
index a683087da..29dae0d6c 100644
--- a/sdk/constructive-react/src/admin/orm/models/appStep.ts
+++ b/sdk/constructive-react/src/admin/orm/models/appStep.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppStepModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppStepSelect>(
-    args: FindManyArgs<S, AppStepFilter, never, AppStepOrderBy> & {
+    args: FindManyArgs<S, AppStepFilter, AppStepOrderBy> & {
       select: S;
     } & StrictSelect<S, AppStepSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/claimedInvite.ts b/sdk/constructive-react/src/admin/orm/models/claimedInvite.ts
index c7724b14a..cbe1429e5 100644
--- a/sdk/constructive-react/src/admin/orm/models/claimedInvite.ts
+++ b/sdk/constructive-react/src/admin/orm/models/claimedInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ClaimedInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ClaimedInviteSelect>(
-    args: FindManyArgs<S, ClaimedInviteFilter, never, ClaimedInviteOrderBy> & {
+    args: FindManyArgs<S, ClaimedInviteFilter, ClaimedInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, ClaimedInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/invite.ts b/sdk/constructive-react/src/admin/orm/models/invite.ts
index 05d88af09..8fabe0aec 100644
--- a/sdk/constructive-react/src/admin/orm/models/invite.ts
+++ b/sdk/constructive-react/src/admin/orm/models/invite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class InviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends InviteSelect>(
-    args: FindManyArgs<S, InviteFilter, never, InviteOrderBy> & {
+    args: FindManyArgs<S, InviteFilter, InviteOrderBy> & {
       select: S;
     } & StrictSelect<S, InviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/membershipType.ts b/sdk/constructive-react/src/admin/orm/models/membershipType.ts
index bc8b65d9e..40fac5490 100644
--- a/sdk/constructive-react/src/admin/orm/models/membershipType.ts
+++ b/sdk/constructive-react/src/admin/orm/models/membershipType.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MembershipTypeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MembershipTypeSelect>(
-    args: FindManyArgs<S, MembershipTypeFilter, never, MembershipTypeOrderBy> & {
+    args: FindManyArgs<S, MembershipTypeFilter, MembershipTypeOrderBy> & {
       select: S;
     } & StrictSelect<S, MembershipTypeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgAdminGrant.ts b/sdk/constructive-react/src/admin/orm/models/orgAdminGrant.ts
index 5378a74f0..e611a8578 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgAdminGrant.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgAdminGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgAdminGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgAdminGrantSelect>(
-    args: FindManyArgs<S, OrgAdminGrantFilter, never, OrgAdminGrantOrderBy> & {
+    args: FindManyArgs<S, OrgAdminGrantFilter, OrgAdminGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgAdminGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgChartEdge.ts b/sdk/constructive-react/src/admin/orm/models/orgChartEdge.ts
index 8a71ab56f..6c6fc84cc 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgChartEdge.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgChartEdge.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgChartEdgeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgChartEdgeSelect>(
-    args: FindManyArgs<S, OrgChartEdgeFilter, never, OrgChartEdgeOrderBy> & {
+    args: FindManyArgs<S, OrgChartEdgeFilter, OrgChartEdgeOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgChartEdgeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgChartEdgeGrant.ts b/sdk/constructive-react/src/admin/orm/models/orgChartEdgeGrant.ts
index b048dead6..58345c78d 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgChartEdgeGrant.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgChartEdgeGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgChartEdgeGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgChartEdgeGrantSelect>(
-    args: FindManyArgs<S, OrgChartEdgeGrantFilter, never, OrgChartEdgeGrantOrderBy> & {
+    args: FindManyArgs<S, OrgChartEdgeGrantFilter, OrgChartEdgeGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgChartEdgeGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgClaimedInvite.ts b/sdk/constructive-react/src/admin/orm/models/orgClaimedInvite.ts
index 75975b11b..475de7291 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgClaimedInvite.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgClaimedInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgClaimedInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgClaimedInviteSelect>(
-    args: FindManyArgs<S, OrgClaimedInviteFilter, never, OrgClaimedInviteOrderBy> & {
+    args: FindManyArgs<S, OrgClaimedInviteFilter, OrgClaimedInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgClaimedInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgGetManagersRecord.ts b/sdk/constructive-react/src/admin/orm/models/orgGetManagersRecord.ts
index e8f5a29ec..9a0cefa8a 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgGetManagersRecord.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgGetManagersRecord.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGetManagersRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGetManagersRecordSelect>(
-    args: FindManyArgs<S, OrgGetManagersRecordFilter, never, OrgGetManagersRecordsOrderBy> & {
+    args: FindManyArgs<S, OrgGetManagersRecordFilter, OrgGetManagersRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGetManagersRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgGetSubordinatesRecord.ts b/sdk/constructive-react/src/admin/orm/models/orgGetSubordinatesRecord.ts
index be9fa6a62..5eeec50ca 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgGetSubordinatesRecord.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgGetSubordinatesRecord.ts
@@ -37,12 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGetSubordinatesRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGetSubordinatesRecordSelect>(
-    args: FindManyArgs<
-      S,
-      OrgGetSubordinatesRecordFilter,
-      never,
-      OrgGetSubordinatesRecordsOrderBy
-    > & {
+    args: FindManyArgs<S, OrgGetSubordinatesRecordFilter, OrgGetSubordinatesRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGetSubordinatesRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgGrant.ts b/sdk/constructive-react/src/admin/orm/models/orgGrant.ts
index 23c9cd546..291264ec5 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgGrant.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGrantSelect>(
-    args: FindManyArgs<S, OrgGrantFilter, never, OrgGrantOrderBy> & {
+    args: FindManyArgs<S, OrgGrantFilter, OrgGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgInvite.ts b/sdk/constructive-react/src/admin/orm/models/orgInvite.ts
index cacca9210..639cb8dd5 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgInvite.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgInviteSelect>(
-    args: FindManyArgs<S, OrgInviteFilter, never, OrgInviteOrderBy> & {
+    args: FindManyArgs<S, OrgInviteFilter, OrgInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgLimit.ts b/sdk/constructive-react/src/admin/orm/models/orgLimit.ts
index ab50514ae..2d7937963 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgLimit.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgLimit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgLimitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgLimitSelect>(
-    args: FindManyArgs<S, OrgLimitFilter, never, OrgLimitOrderBy> & {
+    args: FindManyArgs<S, OrgLimitFilter, OrgLimitOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgLimitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgLimitDefault.ts b/sdk/constructive-react/src/admin/orm/models/orgLimitDefault.ts
index d8c76fb6a..bf0cfcf5e 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgLimitDefault.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgLimitDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgLimitDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgLimitDefaultSelect>(
-    args: FindManyArgs<S, OrgLimitDefaultFilter, never, OrgLimitDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgLimitDefaultFilter, OrgLimitDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgLimitDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgMember.ts b/sdk/constructive-react/src/admin/orm/models/orgMember.ts
index 8575c7fdc..dd1d20e45 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgMember.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgMember.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMemberModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMemberSelect>(
-    args: FindManyArgs<S, OrgMemberFilter, never, OrgMemberOrderBy> & {
+    args: FindManyArgs<S, OrgMemberFilter, OrgMemberOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMemberSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgMembership.ts b/sdk/constructive-react/src/admin/orm/models/orgMembership.ts
index 20d60836a..c0173b3e1 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgMembership.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgMembership.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMembershipModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMembershipSelect>(
-    args: FindManyArgs<S, OrgMembershipFilter, never, OrgMembershipOrderBy> & {
+    args: FindManyArgs<S, OrgMembershipFilter, OrgMembershipOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMembershipSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgMembershipDefault.ts b/sdk/constructive-react/src/admin/orm/models/orgMembershipDefault.ts
index 83b9f7dea..09d525bec 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgMembershipDefault.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgMembershipDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMembershipDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMembershipDefaultSelect>(
-    args: FindManyArgs<S, OrgMembershipDefaultFilter, never, OrgMembershipDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgMembershipDefaultFilter, OrgMembershipDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMembershipDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgOwnerGrant.ts b/sdk/constructive-react/src/admin/orm/models/orgOwnerGrant.ts
index 136082317..bdf045511 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgOwnerGrant.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgOwnerGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgOwnerGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgOwnerGrantSelect>(
-    args: FindManyArgs<S, OrgOwnerGrantFilter, never, OrgOwnerGrantOrderBy> & {
+    args: FindManyArgs<S, OrgOwnerGrantFilter, OrgOwnerGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgOwnerGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgPermission.ts b/sdk/constructive-react/src/admin/orm/models/orgPermission.ts
index 256395283..c5910be63 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgPermission.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgPermission.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgPermissionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgPermissionSelect>(
-    args: FindManyArgs<S, OrgPermissionFilter, never, OrgPermissionOrderBy> & {
+    args: FindManyArgs<S, OrgPermissionFilter, OrgPermissionOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgPermissionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/models/orgPermissionDefault.ts b/sdk/constructive-react/src/admin/orm/models/orgPermissionDefault.ts
index 18631fd2d..40389a11b 100644
--- a/sdk/constructive-react/src/admin/orm/models/orgPermissionDefault.ts
+++ b/sdk/constructive-react/src/admin/orm/models/orgPermissionDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgPermissionDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgPermissionDefaultSelect>(
-    args: FindManyArgs<S, OrgPermissionDefaultFilter, never, OrgPermissionDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgPermissionDefaultFilter, OrgPermissionDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgPermissionDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/admin/orm/query-builder.ts b/sdk/constructive-react/src/admin/orm/query-builder.ts
index 8dbcb9646..b0261f895 100644
--- a/sdk/constructive-react/src/admin/orm/query-builder.ts
+++ b/sdk/constructive-react/src/admin/orm/query-builder.ts
@@ -189,13 +189,12 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindManyDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
   args: {
     where?: TWhere;
-    condition?: TCondition;
     orderBy?: string[];
     first?: number;
     last?: number;
@@ -205,8 +204,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   },
   filterTypeName: string,
   orderByTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -216,16 +214,6 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   const queryArgs: ArgumentNode[] = [];
   const variables: Record<string, unknown> = {};
 
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
@@ -301,14 +289,13 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindFirstDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
-  args: { where?: TWhere; condition?: TCondition },
+  args: { where?: TWhere },
   filterTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -325,16 +312,6 @@ export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
     queryArgs,
     variables
   );
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
diff --git a/sdk/constructive-react/src/admin/orm/select-types.ts b/sdk/constructive-react/src/admin/orm/select-types.ts
index 919d1b935..2621b3570 100644
--- a/sdk/constructive-react/src/admin/orm/select-types.ts
+++ b/sdk/constructive-react/src/admin/orm/select-types.ts
@@ -16,10 +16,9 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
+export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -28,10 +27,9 @@ export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = ne
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
+export interface FindFirstArgs<TSelect, TWhere> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {
diff --git a/sdk/constructive-react/src/auth/orm/models/auditLog.ts b/sdk/constructive-react/src/auth/orm/models/auditLog.ts
index fac372386..2d388026d 100644
--- a/sdk/constructive-react/src/auth/orm/models/auditLog.ts
+++ b/sdk/constructive-react/src/auth/orm/models/auditLog.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AuditLogModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AuditLogSelect>(
-    args: FindManyArgs<S, AuditLogFilter, never, AuditLogOrderBy> & {
+    args: FindManyArgs<S, AuditLogFilter, AuditLogOrderBy> & {
       select: S;
     } & StrictSelect<S, AuditLogSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/auth/orm/models/connectedAccount.ts b/sdk/constructive-react/src/auth/orm/models/connectedAccount.ts
index 8a24193b8..c9def156d 100644
--- a/sdk/constructive-react/src/auth/orm/models/connectedAccount.ts
+++ b/sdk/constructive-react/src/auth/orm/models/connectedAccount.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ConnectedAccountModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ConnectedAccountSelect>(
-    args: FindManyArgs<S, ConnectedAccountFilter, never, ConnectedAccountOrderBy> & {
+    args: FindManyArgs<S, ConnectedAccountFilter, ConnectedAccountOrderBy> & {
       select: S;
     } & StrictSelect<S, ConnectedAccountSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/auth/orm/models/cryptoAddress.ts b/sdk/constructive-react/src/auth/orm/models/cryptoAddress.ts
index 8cbe37d7b..7357c0126 100644
--- a/sdk/constructive-react/src/auth/orm/models/cryptoAddress.ts
+++ b/sdk/constructive-react/src/auth/orm/models/cryptoAddress.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CryptoAddressModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CryptoAddressSelect>(
-    args: FindManyArgs<S, CryptoAddressFilter, never, CryptoAddressOrderBy> & {
+    args: FindManyArgs<S, CryptoAddressFilter, CryptoAddressOrderBy> & {
       select: S;
     } & StrictSelect<S, CryptoAddressSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/auth/orm/models/email.ts b/sdk/constructive-react/src/auth/orm/models/email.ts
index cf129a2d2..aa83efc07 100644
--- a/sdk/constructive-react/src/auth/orm/models/email.ts
+++ b/sdk/constructive-react/src/auth/orm/models/email.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EmailModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EmailSelect>(
-    args: FindManyArgs<S, EmailFilter, never, EmailOrderBy> & {
+    args: FindManyArgs<S, EmailFilter, EmailOrderBy> & {
       select: S;
     } & StrictSelect<S, EmailSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/auth/orm/models/phoneNumber.ts b/sdk/constructive-react/src/auth/orm/models/phoneNumber.ts
index 592b010fa..a711db272 100644
--- a/sdk/constructive-react/src/auth/orm/models/phoneNumber.ts
+++ b/sdk/constructive-react/src/auth/orm/models/phoneNumber.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PhoneNumberModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PhoneNumberSelect>(
-    args: FindManyArgs<S, PhoneNumberFilter, never, PhoneNumberOrderBy> & {
+    args: FindManyArgs<S, PhoneNumberFilter, PhoneNumberOrderBy> & {
       select: S;
     } & StrictSelect<S, PhoneNumberSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/auth/orm/models/roleType.ts b/sdk/constructive-react/src/auth/orm/models/roleType.ts
index 58716fc1e..5b258dc9a 100644
--- a/sdk/constructive-react/src/auth/orm/models/roleType.ts
+++ b/sdk/constructive-react/src/auth/orm/models/roleType.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RoleTypeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RoleTypeSelect>(
-    args: FindManyArgs<S, RoleTypeFilter, never, RoleTypeOrderBy> & {
+    args: FindManyArgs<S, RoleTypeFilter, RoleTypeOrderBy> & {
       select: S;
     } & StrictSelect<S, RoleTypeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/auth/orm/models/user.ts b/sdk/constructive-react/src/auth/orm/models/user.ts
index ada9a0e34..aedd4fcc8 100644
--- a/sdk/constructive-react/src/auth/orm/models/user.ts
+++ b/sdk/constructive-react/src/auth/orm/models/user.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UserModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UserSelect>(
-    args: FindManyArgs<S, UserFilter, never, UserOrderBy> & {
+    args: FindManyArgs<S, UserFilter, UserOrderBy> & {
       select: S;
     } & StrictSelect<S, UserSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/auth/orm/query-builder.ts b/sdk/constructive-react/src/auth/orm/query-builder.ts
index 8dbcb9646..b0261f895 100644
--- a/sdk/constructive-react/src/auth/orm/query-builder.ts
+++ b/sdk/constructive-react/src/auth/orm/query-builder.ts
@@ -189,13 +189,12 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindManyDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
   args: {
     where?: TWhere;
-    condition?: TCondition;
     orderBy?: string[];
     first?: number;
     last?: number;
@@ -205,8 +204,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   },
   filterTypeName: string,
   orderByTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -216,16 +214,6 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   const queryArgs: ArgumentNode[] = [];
   const variables: Record<string, unknown> = {};
 
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
@@ -301,14 +289,13 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindFirstDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
-  args: { where?: TWhere; condition?: TCondition },
+  args: { where?: TWhere },
   filterTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -325,16 +312,6 @@ export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
     queryArgs,
     variables
   );
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
diff --git a/sdk/constructive-react/src/auth/orm/select-types.ts b/sdk/constructive-react/src/auth/orm/select-types.ts
index 919d1b935..2621b3570 100644
--- a/sdk/constructive-react/src/auth/orm/select-types.ts
+++ b/sdk/constructive-react/src/auth/orm/select-types.ts
@@ -16,10 +16,9 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
+export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -28,10 +27,9 @@ export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = ne
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
+export interface FindFirstArgs<TSelect, TWhere> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {
diff --git a/sdk/constructive-react/src/objects/orm/models/commit.ts b/sdk/constructive-react/src/objects/orm/models/commit.ts
index b9e8c51d2..de0e94710 100644
--- a/sdk/constructive-react/src/objects/orm/models/commit.ts
+++ b/sdk/constructive-react/src/objects/orm/models/commit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CommitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CommitSelect>(
-    args: FindManyArgs<S, CommitFilter, never, CommitOrderBy> & {
+    args: FindManyArgs<S, CommitFilter, CommitOrderBy> & {
       select: S;
     } & StrictSelect<S, CommitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/objects/orm/models/getAllRecord.ts b/sdk/constructive-react/src/objects/orm/models/getAllRecord.ts
index 94a06bdd9..53873a0f3 100644
--- a/sdk/constructive-react/src/objects/orm/models/getAllRecord.ts
+++ b/sdk/constructive-react/src/objects/orm/models/getAllRecord.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class GetAllRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends GetAllRecordSelect>(
-    args: FindManyArgs<S, GetAllRecordFilter, never, GetAllRecordsOrderBy> & {
+    args: FindManyArgs<S, GetAllRecordFilter, GetAllRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, GetAllRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/objects/orm/models/object.ts b/sdk/constructive-react/src/objects/orm/models/object.ts
index 1cbe85b7c..085bdd4df 100644
--- a/sdk/constructive-react/src/objects/orm/models/object.ts
+++ b/sdk/constructive-react/src/objects/orm/models/object.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ObjectModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ObjectSelect>(
-    args: FindManyArgs<S, ObjectFilter, never, ObjectOrderBy> & {
+    args: FindManyArgs<S, ObjectFilter, ObjectOrderBy> & {
       select: S;
     } & StrictSelect<S, ObjectSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/objects/orm/models/ref.ts b/sdk/constructive-react/src/objects/orm/models/ref.ts
index 6a128cc2f..016c70644 100644
--- a/sdk/constructive-react/src/objects/orm/models/ref.ts
+++ b/sdk/constructive-react/src/objects/orm/models/ref.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RefModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RefSelect>(
-    args: FindManyArgs<S, RefFilter, never, RefOrderBy> & {
+    args: FindManyArgs<S, RefFilter, RefOrderBy> & {
       select: S;
     } & StrictSelect<S, RefSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/objects/orm/models/store.ts b/sdk/constructive-react/src/objects/orm/models/store.ts
index b372bd4c4..f249ee921 100644
--- a/sdk/constructive-react/src/objects/orm/models/store.ts
+++ b/sdk/constructive-react/src/objects/orm/models/store.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class StoreModel {
   constructor(private client: OrmClient) {}
   findMany<S extends StoreSelect>(
-    args: FindManyArgs<S, StoreFilter, never, StoreOrderBy> & {
+    args: FindManyArgs<S, StoreFilter, StoreOrderBy> & {
       select: S;
     } & StrictSelect<S, StoreSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/objects/orm/query-builder.ts b/sdk/constructive-react/src/objects/orm/query-builder.ts
index 8dbcb9646..b0261f895 100644
--- a/sdk/constructive-react/src/objects/orm/query-builder.ts
+++ b/sdk/constructive-react/src/objects/orm/query-builder.ts
@@ -189,13 +189,12 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindManyDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
   args: {
     where?: TWhere;
-    condition?: TCondition;
     orderBy?: string[];
     first?: number;
     last?: number;
@@ -205,8 +204,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   },
   filterTypeName: string,
   orderByTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -216,16 +214,6 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   const queryArgs: ArgumentNode[] = [];
   const variables: Record<string, unknown> = {};
 
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
@@ -301,14 +289,13 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindFirstDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
-  args: { where?: TWhere; condition?: TCondition },
+  args: { where?: TWhere },
   filterTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -325,16 +312,6 @@ export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
     queryArgs,
     variables
   );
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
diff --git a/sdk/constructive-react/src/objects/orm/select-types.ts b/sdk/constructive-react/src/objects/orm/select-types.ts
index 919d1b935..2621b3570 100644
--- a/sdk/constructive-react/src/objects/orm/select-types.ts
+++ b/sdk/constructive-react/src/objects/orm/select-types.ts
@@ -16,10 +16,9 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
+export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -28,10 +27,9 @@ export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = ne
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
+export interface FindFirstArgs<TSelect, TWhere> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {
diff --git a/sdk/constructive-react/src/public/hooks/README.md b/sdk/constructive-react/src/public/hooks/README.md
index 032048261..2c64b3513 100644
--- a/sdk/constructive-react/src/public/hooks/README.md
+++ b/sdk/constructive-react/src/public/hooks/README.md
@@ -631,7 +631,7 @@ function App() {
 | `useVerifyEmailMutation` | Mutation | verifyEmail |
 | `useFreezeObjectsMutation` | Mutation | freezeObjects |
 | `useInitEmptyRepoMutation` | Mutation | initEmptyRepo |
-| `useConstructBlueprintMutation` | Mutation | Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure. |
+| `useConstructBlueprintMutation` | Mutation | Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure. |
 | `useResetPasswordMutation` | Mutation | resetPassword |
 | `useRemoveNodeAtPathMutation` | Mutation | removeNodeAtPath |
 | `useCopyTemplateToBlueprintMutation` | Mutation | Creates a new blueprint by copying a template definition. Checks visibility: owners can always copy their own templates, others require public visibility. Increments the template copy_count. Returns the new blueprint ID. |
@@ -3322,7 +3322,7 @@ initEmptyRepo
 
 ### `useConstructBlueprintMutation`
 
-Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
+Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
 
 - **Type:** mutation
 - **Arguments:**
diff --git a/sdk/constructive-react/src/public/orm/README.md b/sdk/constructive-react/src/public/orm/README.md
index 52aae21f0..425d78091 100644
--- a/sdk/constructive-react/src/public/orm/README.md
+++ b/sdk/constructive-react/src/public/orm/README.md
@@ -4745,7 +4745,7 @@ const result = await db.mutation.initEmptyRepo({ input: { dbId: '<UUID>', storeI
 
 ### `db.mutation.constructBlueprint`
 
-Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
+Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
 
 - **Type:** mutation
 - **Arguments:**
diff --git a/sdk/constructive-react/src/public/orm/models/api.ts b/sdk/constructive-react/src/public/orm/models/api.ts
index 315771917..295ccbb65 100644
--- a/sdk/constructive-react/src/public/orm/models/api.ts
+++ b/sdk/constructive-react/src/public/orm/models/api.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ApiModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ApiSelect>(
-    args: FindManyArgs<S, ApiFilter, never, ApiOrderBy> & {
+    args: FindManyArgs<S, ApiFilter, ApiOrderBy> & {
       select: S;
     } & StrictSelect<S, ApiSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/apiModule.ts b/sdk/constructive-react/src/public/orm/models/apiModule.ts
index 2cc5a7585..d90c9f9e9 100644
--- a/sdk/constructive-react/src/public/orm/models/apiModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/apiModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ApiModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ApiModuleSelect>(
-    args: FindManyArgs<S, ApiModuleFilter, never, ApiModuleOrderBy> & {
+    args: FindManyArgs<S, ApiModuleFilter, ApiModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, ApiModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/apiSchema.ts b/sdk/constructive-react/src/public/orm/models/apiSchema.ts
index 0fb92e7c4..f9288041c 100644
--- a/sdk/constructive-react/src/public/orm/models/apiSchema.ts
+++ b/sdk/constructive-react/src/public/orm/models/apiSchema.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ApiSchemaModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ApiSchemaSelect>(
-    args: FindManyArgs<S, ApiSchemaFilter, never, ApiSchemaOrderBy> & {
+    args: FindManyArgs<S, ApiSchemaFilter, ApiSchemaOrderBy> & {
       select: S;
     } & StrictSelect<S, ApiSchemaSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/app.ts b/sdk/constructive-react/src/public/orm/models/app.ts
index 56be2a0fb..f6a45b422 100644
--- a/sdk/constructive-react/src/public/orm/models/app.ts
+++ b/sdk/constructive-react/src/public/orm/models/app.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppSelect>(
-    args: FindManyArgs<S, AppFilter, never, AppOrderBy> & {
+    args: FindManyArgs<S, AppFilter, AppOrderBy> & {
       select: S;
     } & StrictSelect<S, AppSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/appAchievement.ts b/sdk/constructive-react/src/public/orm/models/appAchievement.ts
index 371094039..f24447777 100644
--- a/sdk/constructive-react/src/public/orm/models/appAchievement.ts
+++ b/sdk/constructive-react/src/public/orm/models/appAchievement.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppAchievementModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppAchievementSelect>(
-    args: FindManyArgs<S, AppAchievementFilter, never, AppAchievementOrderBy> & {
+    args: FindManyArgs<S, AppAchievementFilter, AppAchievementOrderBy> & {
       select: S;
     } & StrictSelect<S, AppAchievementSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/appAdminGrant.ts b/sdk/constructive-react/src/public/orm/models/appAdminGrant.ts
index 4ab5443fe..6a2a59893 100644
--- a/sdk/constructive-react/src/public/orm/models/appAdminGrant.ts
+++ b/sdk/constructive-react/src/public/orm/models/appAdminGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppAdminGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppAdminGrantSelect>(
-    args: FindManyArgs<S, AppAdminGrantFilter, never, AppAdminGrantOrderBy> & {
+    args: FindManyArgs<S, AppAdminGrantFilter, AppAdminGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppAdminGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/appGrant.ts b/sdk/constructive-react/src/public/orm/models/appGrant.ts
index f7bd4d049..2cb4f429a 100644
--- a/sdk/constructive-react/src/public/orm/models/appGrant.ts
+++ b/sdk/constructive-react/src/public/orm/models/appGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppGrantSelect>(
-    args: FindManyArgs<S, AppGrantFilter, never, AppGrantOrderBy> & {
+    args: FindManyArgs<S, AppGrantFilter, AppGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/appLevel.ts b/sdk/constructive-react/src/public/orm/models/appLevel.ts
index a3f53cfeb..f9abef512 100644
--- a/sdk/constructive-react/src/public/orm/models/appLevel.ts
+++ b/sdk/constructive-react/src/public/orm/models/appLevel.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLevelModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLevelSelect>(
-    args: FindManyArgs<S, AppLevelFilter, never, AppLevelOrderBy> & {
+    args: FindManyArgs<S, AppLevelFilter, AppLevelOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLevelSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/appLevelRequirement.ts b/sdk/constructive-react/src/public/orm/models/appLevelRequirement.ts
index c89f580c2..54baeb7dc 100644
--- a/sdk/constructive-react/src/public/orm/models/appLevelRequirement.ts
+++ b/sdk/constructive-react/src/public/orm/models/appLevelRequirement.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLevelRequirementModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLevelRequirementSelect>(
-    args: FindManyArgs<S, AppLevelRequirementFilter, never, AppLevelRequirementOrderBy> & {
+    args: FindManyArgs<S, AppLevelRequirementFilter, AppLevelRequirementOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLevelRequirementSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/appLimit.ts b/sdk/constructive-react/src/public/orm/models/appLimit.ts
index 0b228e5ed..dea896420 100644
--- a/sdk/constructive-react/src/public/orm/models/appLimit.ts
+++ b/sdk/constructive-react/src/public/orm/models/appLimit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLimitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLimitSelect>(
-    args: FindManyArgs<S, AppLimitFilter, never, AppLimitOrderBy> & {
+    args: FindManyArgs<S, AppLimitFilter, AppLimitOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLimitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/appLimitDefault.ts b/sdk/constructive-react/src/public/orm/models/appLimitDefault.ts
index 7731e46ba..dfec3cdd9 100644
--- a/sdk/constructive-react/src/public/orm/models/appLimitDefault.ts
+++ b/sdk/constructive-react/src/public/orm/models/appLimitDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLimitDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLimitDefaultSelect>(
-    args: FindManyArgs<S, AppLimitDefaultFilter, never, AppLimitDefaultOrderBy> & {
+    args: FindManyArgs<S, AppLimitDefaultFilter, AppLimitDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLimitDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/appMembership.ts b/sdk/constructive-react/src/public/orm/models/appMembership.ts
index dd0f68855..a830192e6 100644
--- a/sdk/constructive-react/src/public/orm/models/appMembership.ts
+++ b/sdk/constructive-react/src/public/orm/models/appMembership.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppMembershipModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppMembershipSelect>(
-    args: FindManyArgs<S, AppMembershipFilter, never, AppMembershipOrderBy> & {
+    args: FindManyArgs<S, AppMembershipFilter, AppMembershipOrderBy> & {
       select: S;
     } & StrictSelect<S, AppMembershipSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/appMembershipDefault.ts b/sdk/constructive-react/src/public/orm/models/appMembershipDefault.ts
index 88dea6243..8b1a54c01 100644
--- a/sdk/constructive-react/src/public/orm/models/appMembershipDefault.ts
+++ b/sdk/constructive-react/src/public/orm/models/appMembershipDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppMembershipDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppMembershipDefaultSelect>(
-    args: FindManyArgs<S, AppMembershipDefaultFilter, never, AppMembershipDefaultOrderBy> & {
+    args: FindManyArgs<S, AppMembershipDefaultFilter, AppMembershipDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppMembershipDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/appOwnerGrant.ts b/sdk/constructive-react/src/public/orm/models/appOwnerGrant.ts
index acc216d4a..a8695557e 100644
--- a/sdk/constructive-react/src/public/orm/models/appOwnerGrant.ts
+++ b/sdk/constructive-react/src/public/orm/models/appOwnerGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppOwnerGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppOwnerGrantSelect>(
-    args: FindManyArgs<S, AppOwnerGrantFilter, never, AppOwnerGrantOrderBy> & {
+    args: FindManyArgs<S, AppOwnerGrantFilter, AppOwnerGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppOwnerGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/appPermission.ts b/sdk/constructive-react/src/public/orm/models/appPermission.ts
index c191e5066..2575c5de2 100644
--- a/sdk/constructive-react/src/public/orm/models/appPermission.ts
+++ b/sdk/constructive-react/src/public/orm/models/appPermission.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppPermissionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppPermissionSelect>(
-    args: FindManyArgs<S, AppPermissionFilter, never, AppPermissionOrderBy> & {
+    args: FindManyArgs<S, AppPermissionFilter, AppPermissionOrderBy> & {
       select: S;
     } & StrictSelect<S, AppPermissionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/appPermissionDefault.ts b/sdk/constructive-react/src/public/orm/models/appPermissionDefault.ts
index 33fdd49dd..427272883 100644
--- a/sdk/constructive-react/src/public/orm/models/appPermissionDefault.ts
+++ b/sdk/constructive-react/src/public/orm/models/appPermissionDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppPermissionDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppPermissionDefaultSelect>(
-    args: FindManyArgs<S, AppPermissionDefaultFilter, never, AppPermissionDefaultOrderBy> & {
+    args: FindManyArgs<S, AppPermissionDefaultFilter, AppPermissionDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppPermissionDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/appStep.ts b/sdk/constructive-react/src/public/orm/models/appStep.ts
index a683087da..29dae0d6c 100644
--- a/sdk/constructive-react/src/public/orm/models/appStep.ts
+++ b/sdk/constructive-react/src/public/orm/models/appStep.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppStepModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppStepSelect>(
-    args: FindManyArgs<S, AppStepFilter, never, AppStepOrderBy> & {
+    args: FindManyArgs<S, AppStepFilter, AppStepOrderBy> & {
       select: S;
     } & StrictSelect<S, AppStepSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/astMigration.ts b/sdk/constructive-react/src/public/orm/models/astMigration.ts
index 44b0d3469..8bab8cfd0 100644
--- a/sdk/constructive-react/src/public/orm/models/astMigration.ts
+++ b/sdk/constructive-react/src/public/orm/models/astMigration.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AstMigrationModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AstMigrationSelect>(
-    args: FindManyArgs<S, AstMigrationFilter, never, AstMigrationOrderBy> & {
+    args: FindManyArgs<S, AstMigrationFilter, AstMigrationOrderBy> & {
       select: S;
     } & StrictSelect<S, AstMigrationSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/auditLog.ts b/sdk/constructive-react/src/public/orm/models/auditLog.ts
index fac372386..2d388026d 100644
--- a/sdk/constructive-react/src/public/orm/models/auditLog.ts
+++ b/sdk/constructive-react/src/public/orm/models/auditLog.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AuditLogModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AuditLogSelect>(
-    args: FindManyArgs<S, AuditLogFilter, never, AuditLogOrderBy> & {
+    args: FindManyArgs<S, AuditLogFilter, AuditLogOrderBy> & {
       select: S;
     } & StrictSelect<S, AuditLogSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/blueprint.ts b/sdk/constructive-react/src/public/orm/models/blueprint.ts
index 72c9f4bbe..fa1ea0286 100644
--- a/sdk/constructive-react/src/public/orm/models/blueprint.ts
+++ b/sdk/constructive-react/src/public/orm/models/blueprint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class BlueprintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends BlueprintSelect>(
-    args: FindManyArgs<S, BlueprintFilter, never, BlueprintOrderBy> & {
+    args: FindManyArgs<S, BlueprintFilter, BlueprintOrderBy> & {
       select: S;
     } & StrictSelect<S, BlueprintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/blueprintConstruction.ts b/sdk/constructive-react/src/public/orm/models/blueprintConstruction.ts
index 5c5247d43..3f7a8657d 100644
--- a/sdk/constructive-react/src/public/orm/models/blueprintConstruction.ts
+++ b/sdk/constructive-react/src/public/orm/models/blueprintConstruction.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class BlueprintConstructionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends BlueprintConstructionSelect>(
-    args: FindManyArgs<S, BlueprintConstructionFilter, never, BlueprintConstructionOrderBy> & {
+    args: FindManyArgs<S, BlueprintConstructionFilter, BlueprintConstructionOrderBy> & {
       select: S;
     } & StrictSelect<S, BlueprintConstructionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/blueprintTemplate.ts b/sdk/constructive-react/src/public/orm/models/blueprintTemplate.ts
index 346928f06..31d7824e5 100644
--- a/sdk/constructive-react/src/public/orm/models/blueprintTemplate.ts
+++ b/sdk/constructive-react/src/public/orm/models/blueprintTemplate.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class BlueprintTemplateModel {
   constructor(private client: OrmClient) {}
   findMany<S extends BlueprintTemplateSelect>(
-    args: FindManyArgs<S, BlueprintTemplateFilter, never, BlueprintTemplateOrderBy> & {
+    args: FindManyArgs<S, BlueprintTemplateFilter, BlueprintTemplateOrderBy> & {
       select: S;
     } & StrictSelect<S, BlueprintTemplateSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/checkConstraint.ts b/sdk/constructive-react/src/public/orm/models/checkConstraint.ts
index 48a1e2031..323b64b6c 100644
--- a/sdk/constructive-react/src/public/orm/models/checkConstraint.ts
+++ b/sdk/constructive-react/src/public/orm/models/checkConstraint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CheckConstraintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CheckConstraintSelect>(
-    args: FindManyArgs<S, CheckConstraintFilter, never, CheckConstraintOrderBy> & {
+    args: FindManyArgs<S, CheckConstraintFilter, CheckConstraintOrderBy> & {
       select: S;
     } & StrictSelect<S, CheckConstraintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/claimedInvite.ts b/sdk/constructive-react/src/public/orm/models/claimedInvite.ts
index c7724b14a..cbe1429e5 100644
--- a/sdk/constructive-react/src/public/orm/models/claimedInvite.ts
+++ b/sdk/constructive-react/src/public/orm/models/claimedInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ClaimedInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ClaimedInviteSelect>(
-    args: FindManyArgs<S, ClaimedInviteFilter, never, ClaimedInviteOrderBy> & {
+    args: FindManyArgs<S, ClaimedInviteFilter, ClaimedInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, ClaimedInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/commit.ts b/sdk/constructive-react/src/public/orm/models/commit.ts
index b9e8c51d2..de0e94710 100644
--- a/sdk/constructive-react/src/public/orm/models/commit.ts
+++ b/sdk/constructive-react/src/public/orm/models/commit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CommitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CommitSelect>(
-    args: FindManyArgs<S, CommitFilter, never, CommitOrderBy> & {
+    args: FindManyArgs<S, CommitFilter, CommitOrderBy> & {
       select: S;
     } & StrictSelect<S, CommitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/connectedAccount.ts b/sdk/constructive-react/src/public/orm/models/connectedAccount.ts
index 8a24193b8..c9def156d 100644
--- a/sdk/constructive-react/src/public/orm/models/connectedAccount.ts
+++ b/sdk/constructive-react/src/public/orm/models/connectedAccount.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ConnectedAccountModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ConnectedAccountSelect>(
-    args: FindManyArgs<S, ConnectedAccountFilter, never, ConnectedAccountOrderBy> & {
+    args: FindManyArgs<S, ConnectedAccountFilter, ConnectedAccountOrderBy> & {
       select: S;
     } & StrictSelect<S, ConnectedAccountSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/connectedAccountsModule.ts b/sdk/constructive-react/src/public/orm/models/connectedAccountsModule.ts
index a7776029a..408aec32a 100644
--- a/sdk/constructive-react/src/public/orm/models/connectedAccountsModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/connectedAccountsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ConnectedAccountsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ConnectedAccountsModuleSelect>(
-    args: FindManyArgs<S, ConnectedAccountsModuleFilter, never, ConnectedAccountsModuleOrderBy> & {
+    args: FindManyArgs<S, ConnectedAccountsModuleFilter, ConnectedAccountsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, ConnectedAccountsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/cryptoAddress.ts b/sdk/constructive-react/src/public/orm/models/cryptoAddress.ts
index 8cbe37d7b..7357c0126 100644
--- a/sdk/constructive-react/src/public/orm/models/cryptoAddress.ts
+++ b/sdk/constructive-react/src/public/orm/models/cryptoAddress.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CryptoAddressModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CryptoAddressSelect>(
-    args: FindManyArgs<S, CryptoAddressFilter, never, CryptoAddressOrderBy> & {
+    args: FindManyArgs<S, CryptoAddressFilter, CryptoAddressOrderBy> & {
       select: S;
     } & StrictSelect<S, CryptoAddressSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/cryptoAddressesModule.ts b/sdk/constructive-react/src/public/orm/models/cryptoAddressesModule.ts
index e90451b95..25af5781a 100644
--- a/sdk/constructive-react/src/public/orm/models/cryptoAddressesModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/cryptoAddressesModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CryptoAddressesModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CryptoAddressesModuleSelect>(
-    args: FindManyArgs<S, CryptoAddressesModuleFilter, never, CryptoAddressesModuleOrderBy> & {
+    args: FindManyArgs<S, CryptoAddressesModuleFilter, CryptoAddressesModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, CryptoAddressesModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/cryptoAuthModule.ts b/sdk/constructive-react/src/public/orm/models/cryptoAuthModule.ts
index 5aa929484..c654aa3f7 100644
--- a/sdk/constructive-react/src/public/orm/models/cryptoAuthModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/cryptoAuthModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CryptoAuthModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CryptoAuthModuleSelect>(
-    args: FindManyArgs<S, CryptoAuthModuleFilter, never, CryptoAuthModuleOrderBy> & {
+    args: FindManyArgs<S, CryptoAuthModuleFilter, CryptoAuthModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, CryptoAuthModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/database.ts b/sdk/constructive-react/src/public/orm/models/database.ts
index a053e55ca..6a4293010 100644
--- a/sdk/constructive-react/src/public/orm/models/database.ts
+++ b/sdk/constructive-react/src/public/orm/models/database.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DatabaseModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DatabaseSelect>(
-    args: FindManyArgs<S, DatabaseFilter, never, DatabaseOrderBy> & {
+    args: FindManyArgs<S, DatabaseFilter, DatabaseOrderBy> & {
       select: S;
     } & StrictSelect<S, DatabaseSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/databaseProvisionModule.ts b/sdk/constructive-react/src/public/orm/models/databaseProvisionModule.ts
index 256ab0228..4d6c37645 100644
--- a/sdk/constructive-react/src/public/orm/models/databaseProvisionModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/databaseProvisionModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DatabaseProvisionModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DatabaseProvisionModuleSelect>(
-    args: FindManyArgs<S, DatabaseProvisionModuleFilter, never, DatabaseProvisionModuleOrderBy> & {
+    args: FindManyArgs<S, DatabaseProvisionModuleFilter, DatabaseProvisionModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, DatabaseProvisionModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/databaseTransfer.ts b/sdk/constructive-react/src/public/orm/models/databaseTransfer.ts
index 58d1b392b..e5d347907 100644
--- a/sdk/constructive-react/src/public/orm/models/databaseTransfer.ts
+++ b/sdk/constructive-react/src/public/orm/models/databaseTransfer.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DatabaseTransferModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DatabaseTransferSelect>(
-    args: FindManyArgs<S, DatabaseTransferFilter, never, DatabaseTransferOrderBy> & {
+    args: FindManyArgs<S, DatabaseTransferFilter, DatabaseTransferOrderBy> & {
       select: S;
     } & StrictSelect<S, DatabaseTransferSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/defaultIdsModule.ts b/sdk/constructive-react/src/public/orm/models/defaultIdsModule.ts
index aa81b4a91..aa235bd39 100644
--- a/sdk/constructive-react/src/public/orm/models/defaultIdsModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/defaultIdsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DefaultIdsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DefaultIdsModuleSelect>(
-    args: FindManyArgs<S, DefaultIdsModuleFilter, never, DefaultIdsModuleOrderBy> & {
+    args: FindManyArgs<S, DefaultIdsModuleFilter, DefaultIdsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, DefaultIdsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/defaultPrivilege.ts b/sdk/constructive-react/src/public/orm/models/defaultPrivilege.ts
index 3e2c9e33b..7041b7b55 100644
--- a/sdk/constructive-react/src/public/orm/models/defaultPrivilege.ts
+++ b/sdk/constructive-react/src/public/orm/models/defaultPrivilege.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DefaultPrivilegeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DefaultPrivilegeSelect>(
-    args: FindManyArgs<S, DefaultPrivilegeFilter, never, DefaultPrivilegeOrderBy> & {
+    args: FindManyArgs<S, DefaultPrivilegeFilter, DefaultPrivilegeOrderBy> & {
       select: S;
     } & StrictSelect<S, DefaultPrivilegeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/denormalizedTableField.ts b/sdk/constructive-react/src/public/orm/models/denormalizedTableField.ts
index 448948388..d94b84104 100644
--- a/sdk/constructive-react/src/public/orm/models/denormalizedTableField.ts
+++ b/sdk/constructive-react/src/public/orm/models/denormalizedTableField.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DenormalizedTableFieldModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DenormalizedTableFieldSelect>(
-    args: FindManyArgs<S, DenormalizedTableFieldFilter, never, DenormalizedTableFieldOrderBy> & {
+    args: FindManyArgs<S, DenormalizedTableFieldFilter, DenormalizedTableFieldOrderBy> & {
       select: S;
     } & StrictSelect<S, DenormalizedTableFieldSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/domain.ts b/sdk/constructive-react/src/public/orm/models/domain.ts
index d90a82bb0..acf05455c 100644
--- a/sdk/constructive-react/src/public/orm/models/domain.ts
+++ b/sdk/constructive-react/src/public/orm/models/domain.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DomainModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DomainSelect>(
-    args: FindManyArgs<S, DomainFilter, never, DomainOrderBy> & {
+    args: FindManyArgs<S, DomainFilter, DomainOrderBy> & {
       select: S;
     } & StrictSelect<S, DomainSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/email.ts b/sdk/constructive-react/src/public/orm/models/email.ts
index cf129a2d2..aa83efc07 100644
--- a/sdk/constructive-react/src/public/orm/models/email.ts
+++ b/sdk/constructive-react/src/public/orm/models/email.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EmailModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EmailSelect>(
-    args: FindManyArgs<S, EmailFilter, never, EmailOrderBy> & {
+    args: FindManyArgs<S, EmailFilter, EmailOrderBy> & {
       select: S;
     } & StrictSelect<S, EmailSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/emailsModule.ts b/sdk/constructive-react/src/public/orm/models/emailsModule.ts
index 11ae816ce..984018c0c 100644
--- a/sdk/constructive-react/src/public/orm/models/emailsModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/emailsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EmailsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EmailsModuleSelect>(
-    args: FindManyArgs<S, EmailsModuleFilter, never, EmailsModuleOrderBy> & {
+    args: FindManyArgs<S, EmailsModuleFilter, EmailsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, EmailsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/embeddingChunk.ts b/sdk/constructive-react/src/public/orm/models/embeddingChunk.ts
index c44b9ed55..6c175145d 100644
--- a/sdk/constructive-react/src/public/orm/models/embeddingChunk.ts
+++ b/sdk/constructive-react/src/public/orm/models/embeddingChunk.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EmbeddingChunkModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EmbeddingChunkSelect>(
-    args: FindManyArgs<S, EmbeddingChunkFilter, never, EmbeddingChunkOrderBy> & {
+    args: FindManyArgs<S, EmbeddingChunkFilter, EmbeddingChunkOrderBy> & {
       select: S;
     } & StrictSelect<S, EmbeddingChunkSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/encryptedSecretsModule.ts b/sdk/constructive-react/src/public/orm/models/encryptedSecretsModule.ts
index 49b9cdc3e..8656f0937 100644
--- a/sdk/constructive-react/src/public/orm/models/encryptedSecretsModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/encryptedSecretsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EncryptedSecretsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EncryptedSecretsModuleSelect>(
-    args: FindManyArgs<S, EncryptedSecretsModuleFilter, never, EncryptedSecretsModuleOrderBy> & {
+    args: FindManyArgs<S, EncryptedSecretsModuleFilter, EncryptedSecretsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, EncryptedSecretsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/enum.ts b/sdk/constructive-react/src/public/orm/models/enum.ts
index c5da5f40b..1e0e12ee3 100644
--- a/sdk/constructive-react/src/public/orm/models/enum.ts
+++ b/sdk/constructive-react/src/public/orm/models/enum.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EnumModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EnumSelect>(
-    args: FindManyArgs<S, EnumFilter, never, EnumOrderBy> & {
+    args: FindManyArgs<S, EnumFilter, EnumOrderBy> & {
       select: S;
     } & StrictSelect<S, EnumSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/field.ts b/sdk/constructive-react/src/public/orm/models/field.ts
index fe784abc0..d8e8fc4ee 100644
--- a/sdk/constructive-react/src/public/orm/models/field.ts
+++ b/sdk/constructive-react/src/public/orm/models/field.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class FieldModel {
   constructor(private client: OrmClient) {}
   findMany<S extends FieldSelect>(
-    args: FindManyArgs<S, FieldFilter, never, FieldOrderBy> & {
+    args: FindManyArgs<S, FieldFilter, FieldOrderBy> & {
       select: S;
     } & StrictSelect<S, FieldSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/foreignKeyConstraint.ts b/sdk/constructive-react/src/public/orm/models/foreignKeyConstraint.ts
index 0b96b62d7..951dc4fe2 100644
--- a/sdk/constructive-react/src/public/orm/models/foreignKeyConstraint.ts
+++ b/sdk/constructive-react/src/public/orm/models/foreignKeyConstraint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ForeignKeyConstraintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ForeignKeyConstraintSelect>(
-    args: FindManyArgs<S, ForeignKeyConstraintFilter, never, ForeignKeyConstraintOrderBy> & {
+    args: FindManyArgs<S, ForeignKeyConstraintFilter, ForeignKeyConstraintOrderBy> & {
       select: S;
     } & StrictSelect<S, ForeignKeyConstraintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/fullTextSearch.ts b/sdk/constructive-react/src/public/orm/models/fullTextSearch.ts
index f53ad57a8..a0a592138 100644
--- a/sdk/constructive-react/src/public/orm/models/fullTextSearch.ts
+++ b/sdk/constructive-react/src/public/orm/models/fullTextSearch.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class FullTextSearchModel {
   constructor(private client: OrmClient) {}
   findMany<S extends FullTextSearchSelect>(
-    args: FindManyArgs<S, FullTextSearchFilter, never, FullTextSearchOrderBy> & {
+    args: FindManyArgs<S, FullTextSearchFilter, FullTextSearchOrderBy> & {
       select: S;
     } & StrictSelect<S, FullTextSearchSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/getAllRecord.ts b/sdk/constructive-react/src/public/orm/models/getAllRecord.ts
index 94a06bdd9..53873a0f3 100644
--- a/sdk/constructive-react/src/public/orm/models/getAllRecord.ts
+++ b/sdk/constructive-react/src/public/orm/models/getAllRecord.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class GetAllRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends GetAllRecordSelect>(
-    args: FindManyArgs<S, GetAllRecordFilter, never, GetAllRecordsOrderBy> & {
+    args: FindManyArgs<S, GetAllRecordFilter, GetAllRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, GetAllRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/hierarchyModule.ts b/sdk/constructive-react/src/public/orm/models/hierarchyModule.ts
index 8e570f16b..325927bd5 100644
--- a/sdk/constructive-react/src/public/orm/models/hierarchyModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/hierarchyModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class HierarchyModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends HierarchyModuleSelect>(
-    args: FindManyArgs<S, HierarchyModuleFilter, never, HierarchyModuleOrderBy> & {
+    args: FindManyArgs<S, HierarchyModuleFilter, HierarchyModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, HierarchyModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/indexModel.ts b/sdk/constructive-react/src/public/orm/models/indexModel.ts
index 2782876f8..052334e57 100644
--- a/sdk/constructive-react/src/public/orm/models/indexModel.ts
+++ b/sdk/constructive-react/src/public/orm/models/indexModel.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class IndexModel {
   constructor(private client: OrmClient) {}
   findMany<S extends IndexSelect>(
-    args: FindManyArgs<S, IndexFilter, never, IndexOrderBy> & {
+    args: FindManyArgs<S, IndexFilter, IndexOrderBy> & {
       select: S;
     } & StrictSelect<S, IndexSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/invite.ts b/sdk/constructive-react/src/public/orm/models/invite.ts
index 05d88af09..8fabe0aec 100644
--- a/sdk/constructive-react/src/public/orm/models/invite.ts
+++ b/sdk/constructive-react/src/public/orm/models/invite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class InviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends InviteSelect>(
-    args: FindManyArgs<S, InviteFilter, never, InviteOrderBy> & {
+    args: FindManyArgs<S, InviteFilter, InviteOrderBy> & {
       select: S;
     } & StrictSelect<S, InviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/invitesModule.ts b/sdk/constructive-react/src/public/orm/models/invitesModule.ts
index 52aeb72c4..f7999f502 100644
--- a/sdk/constructive-react/src/public/orm/models/invitesModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/invitesModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class InvitesModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends InvitesModuleSelect>(
-    args: FindManyArgs<S, InvitesModuleFilter, never, InvitesModuleOrderBy> & {
+    args: FindManyArgs<S, InvitesModuleFilter, InvitesModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, InvitesModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/levelsModule.ts b/sdk/constructive-react/src/public/orm/models/levelsModule.ts
index 77eeea28d..0c758ad86 100644
--- a/sdk/constructive-react/src/public/orm/models/levelsModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/levelsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class LevelsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends LevelsModuleSelect>(
-    args: FindManyArgs<S, LevelsModuleFilter, never, LevelsModuleOrderBy> & {
+    args: FindManyArgs<S, LevelsModuleFilter, LevelsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, LevelsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/limitsModule.ts b/sdk/constructive-react/src/public/orm/models/limitsModule.ts
index 41c850afe..10e89be1d 100644
--- a/sdk/constructive-react/src/public/orm/models/limitsModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/limitsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class LimitsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends LimitsModuleSelect>(
-    args: FindManyArgs<S, LimitsModuleFilter, never, LimitsModuleOrderBy> & {
+    args: FindManyArgs<S, LimitsModuleFilter, LimitsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, LimitsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/membershipType.ts b/sdk/constructive-react/src/public/orm/models/membershipType.ts
index bc8b65d9e..40fac5490 100644
--- a/sdk/constructive-react/src/public/orm/models/membershipType.ts
+++ b/sdk/constructive-react/src/public/orm/models/membershipType.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MembershipTypeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MembershipTypeSelect>(
-    args: FindManyArgs<S, MembershipTypeFilter, never, MembershipTypeOrderBy> & {
+    args: FindManyArgs<S, MembershipTypeFilter, MembershipTypeOrderBy> & {
       select: S;
     } & StrictSelect<S, MembershipTypeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/membershipTypesModule.ts b/sdk/constructive-react/src/public/orm/models/membershipTypesModule.ts
index e49903cc2..31807c914 100644
--- a/sdk/constructive-react/src/public/orm/models/membershipTypesModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/membershipTypesModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MembershipTypesModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MembershipTypesModuleSelect>(
-    args: FindManyArgs<S, MembershipTypesModuleFilter, never, MembershipTypesModuleOrderBy> & {
+    args: FindManyArgs<S, MembershipTypesModuleFilter, MembershipTypesModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, MembershipTypesModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/membershipsModule.ts b/sdk/constructive-react/src/public/orm/models/membershipsModule.ts
index 2b46f663e..b1ce2f836 100644
--- a/sdk/constructive-react/src/public/orm/models/membershipsModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/membershipsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MembershipsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MembershipsModuleSelect>(
-    args: FindManyArgs<S, MembershipsModuleFilter, never, MembershipsModuleOrderBy> & {
+    args: FindManyArgs<S, MembershipsModuleFilter, MembershipsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, MembershipsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/migrateFile.ts b/sdk/constructive-react/src/public/orm/models/migrateFile.ts
index 17d47149a..35bfa715e 100644
--- a/sdk/constructive-react/src/public/orm/models/migrateFile.ts
+++ b/sdk/constructive-react/src/public/orm/models/migrateFile.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MigrateFileModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MigrateFileSelect>(
-    args: FindManyArgs<S, MigrateFileFilter, never, MigrateFileOrderBy> & {
+    args: FindManyArgs<S, MigrateFileFilter, MigrateFileOrderBy> & {
       select: S;
     } & StrictSelect<S, MigrateFileSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/object.ts b/sdk/constructive-react/src/public/orm/models/object.ts
index 1cbe85b7c..085bdd4df 100644
--- a/sdk/constructive-react/src/public/orm/models/object.ts
+++ b/sdk/constructive-react/src/public/orm/models/object.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ObjectModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ObjectSelect>(
-    args: FindManyArgs<S, ObjectFilter, never, ObjectOrderBy> & {
+    args: FindManyArgs<S, ObjectFilter, ObjectOrderBy> & {
       select: S;
     } & StrictSelect<S, ObjectSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgAdminGrant.ts b/sdk/constructive-react/src/public/orm/models/orgAdminGrant.ts
index 5378a74f0..e611a8578 100644
--- a/sdk/constructive-react/src/public/orm/models/orgAdminGrant.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgAdminGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgAdminGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgAdminGrantSelect>(
-    args: FindManyArgs<S, OrgAdminGrantFilter, never, OrgAdminGrantOrderBy> & {
+    args: FindManyArgs<S, OrgAdminGrantFilter, OrgAdminGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgAdminGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgChartEdge.ts b/sdk/constructive-react/src/public/orm/models/orgChartEdge.ts
index 8a71ab56f..6c6fc84cc 100644
--- a/sdk/constructive-react/src/public/orm/models/orgChartEdge.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgChartEdge.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgChartEdgeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgChartEdgeSelect>(
-    args: FindManyArgs<S, OrgChartEdgeFilter, never, OrgChartEdgeOrderBy> & {
+    args: FindManyArgs<S, OrgChartEdgeFilter, OrgChartEdgeOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgChartEdgeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgChartEdgeGrant.ts b/sdk/constructive-react/src/public/orm/models/orgChartEdgeGrant.ts
index b048dead6..58345c78d 100644
--- a/sdk/constructive-react/src/public/orm/models/orgChartEdgeGrant.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgChartEdgeGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgChartEdgeGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgChartEdgeGrantSelect>(
-    args: FindManyArgs<S, OrgChartEdgeGrantFilter, never, OrgChartEdgeGrantOrderBy> & {
+    args: FindManyArgs<S, OrgChartEdgeGrantFilter, OrgChartEdgeGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgChartEdgeGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgClaimedInvite.ts b/sdk/constructive-react/src/public/orm/models/orgClaimedInvite.ts
index 75975b11b..475de7291 100644
--- a/sdk/constructive-react/src/public/orm/models/orgClaimedInvite.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgClaimedInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgClaimedInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgClaimedInviteSelect>(
-    args: FindManyArgs<S, OrgClaimedInviteFilter, never, OrgClaimedInviteOrderBy> & {
+    args: FindManyArgs<S, OrgClaimedInviteFilter, OrgClaimedInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgClaimedInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgGetManagersRecord.ts b/sdk/constructive-react/src/public/orm/models/orgGetManagersRecord.ts
index e8f5a29ec..9a0cefa8a 100644
--- a/sdk/constructive-react/src/public/orm/models/orgGetManagersRecord.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgGetManagersRecord.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGetManagersRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGetManagersRecordSelect>(
-    args: FindManyArgs<S, OrgGetManagersRecordFilter, never, OrgGetManagersRecordsOrderBy> & {
+    args: FindManyArgs<S, OrgGetManagersRecordFilter, OrgGetManagersRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGetManagersRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgGetSubordinatesRecord.ts b/sdk/constructive-react/src/public/orm/models/orgGetSubordinatesRecord.ts
index be9fa6a62..5eeec50ca 100644
--- a/sdk/constructive-react/src/public/orm/models/orgGetSubordinatesRecord.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgGetSubordinatesRecord.ts
@@ -37,12 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGetSubordinatesRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGetSubordinatesRecordSelect>(
-    args: FindManyArgs<
-      S,
-      OrgGetSubordinatesRecordFilter,
-      never,
-      OrgGetSubordinatesRecordsOrderBy
-    > & {
+    args: FindManyArgs<S, OrgGetSubordinatesRecordFilter, OrgGetSubordinatesRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGetSubordinatesRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgGrant.ts b/sdk/constructive-react/src/public/orm/models/orgGrant.ts
index 23c9cd546..291264ec5 100644
--- a/sdk/constructive-react/src/public/orm/models/orgGrant.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGrantSelect>(
-    args: FindManyArgs<S, OrgGrantFilter, never, OrgGrantOrderBy> & {
+    args: FindManyArgs<S, OrgGrantFilter, OrgGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgInvite.ts b/sdk/constructive-react/src/public/orm/models/orgInvite.ts
index cacca9210..639cb8dd5 100644
--- a/sdk/constructive-react/src/public/orm/models/orgInvite.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgInviteSelect>(
-    args: FindManyArgs<S, OrgInviteFilter, never, OrgInviteOrderBy> & {
+    args: FindManyArgs<S, OrgInviteFilter, OrgInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgLimit.ts b/sdk/constructive-react/src/public/orm/models/orgLimit.ts
index ab50514ae..2d7937963 100644
--- a/sdk/constructive-react/src/public/orm/models/orgLimit.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgLimit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgLimitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgLimitSelect>(
-    args: FindManyArgs<S, OrgLimitFilter, never, OrgLimitOrderBy> & {
+    args: FindManyArgs<S, OrgLimitFilter, OrgLimitOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgLimitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgLimitDefault.ts b/sdk/constructive-react/src/public/orm/models/orgLimitDefault.ts
index d8c76fb6a..bf0cfcf5e 100644
--- a/sdk/constructive-react/src/public/orm/models/orgLimitDefault.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgLimitDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgLimitDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgLimitDefaultSelect>(
-    args: FindManyArgs<S, OrgLimitDefaultFilter, never, OrgLimitDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgLimitDefaultFilter, OrgLimitDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgLimitDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgMember.ts b/sdk/constructive-react/src/public/orm/models/orgMember.ts
index 8575c7fdc..dd1d20e45 100644
--- a/sdk/constructive-react/src/public/orm/models/orgMember.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgMember.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMemberModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMemberSelect>(
-    args: FindManyArgs<S, OrgMemberFilter, never, OrgMemberOrderBy> & {
+    args: FindManyArgs<S, OrgMemberFilter, OrgMemberOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMemberSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgMembership.ts b/sdk/constructive-react/src/public/orm/models/orgMembership.ts
index 20d60836a..c0173b3e1 100644
--- a/sdk/constructive-react/src/public/orm/models/orgMembership.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgMembership.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMembershipModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMembershipSelect>(
-    args: FindManyArgs<S, OrgMembershipFilter, never, OrgMembershipOrderBy> & {
+    args: FindManyArgs<S, OrgMembershipFilter, OrgMembershipOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMembershipSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgMembershipDefault.ts b/sdk/constructive-react/src/public/orm/models/orgMembershipDefault.ts
index 83b9f7dea..09d525bec 100644
--- a/sdk/constructive-react/src/public/orm/models/orgMembershipDefault.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgMembershipDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMembershipDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMembershipDefaultSelect>(
-    args: FindManyArgs<S, OrgMembershipDefaultFilter, never, OrgMembershipDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgMembershipDefaultFilter, OrgMembershipDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMembershipDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgOwnerGrant.ts b/sdk/constructive-react/src/public/orm/models/orgOwnerGrant.ts
index 136082317..bdf045511 100644
--- a/sdk/constructive-react/src/public/orm/models/orgOwnerGrant.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgOwnerGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgOwnerGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgOwnerGrantSelect>(
-    args: FindManyArgs<S, OrgOwnerGrantFilter, never, OrgOwnerGrantOrderBy> & {
+    args: FindManyArgs<S, OrgOwnerGrantFilter, OrgOwnerGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgOwnerGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgPermission.ts b/sdk/constructive-react/src/public/orm/models/orgPermission.ts
index 256395283..c5910be63 100644
--- a/sdk/constructive-react/src/public/orm/models/orgPermission.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgPermission.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgPermissionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgPermissionSelect>(
-    args: FindManyArgs<S, OrgPermissionFilter, never, OrgPermissionOrderBy> & {
+    args: FindManyArgs<S, OrgPermissionFilter, OrgPermissionOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgPermissionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/orgPermissionDefault.ts b/sdk/constructive-react/src/public/orm/models/orgPermissionDefault.ts
index 18631fd2d..40389a11b 100644
--- a/sdk/constructive-react/src/public/orm/models/orgPermissionDefault.ts
+++ b/sdk/constructive-react/src/public/orm/models/orgPermissionDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgPermissionDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgPermissionDefaultSelect>(
-    args: FindManyArgs<S, OrgPermissionDefaultFilter, never, OrgPermissionDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgPermissionDefaultFilter, OrgPermissionDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgPermissionDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/permissionsModule.ts b/sdk/constructive-react/src/public/orm/models/permissionsModule.ts
index 2a797d3b8..6066e6218 100644
--- a/sdk/constructive-react/src/public/orm/models/permissionsModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/permissionsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PermissionsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PermissionsModuleSelect>(
-    args: FindManyArgs<S, PermissionsModuleFilter, never, PermissionsModuleOrderBy> & {
+    args: FindManyArgs<S, PermissionsModuleFilter, PermissionsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, PermissionsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/phoneNumber.ts b/sdk/constructive-react/src/public/orm/models/phoneNumber.ts
index 592b010fa..a711db272 100644
--- a/sdk/constructive-react/src/public/orm/models/phoneNumber.ts
+++ b/sdk/constructive-react/src/public/orm/models/phoneNumber.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PhoneNumberModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PhoneNumberSelect>(
-    args: FindManyArgs<S, PhoneNumberFilter, never, PhoneNumberOrderBy> & {
+    args: FindManyArgs<S, PhoneNumberFilter, PhoneNumberOrderBy> & {
       select: S;
     } & StrictSelect<S, PhoneNumberSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/phoneNumbersModule.ts b/sdk/constructive-react/src/public/orm/models/phoneNumbersModule.ts
index e844b2055..9b3da81ae 100644
--- a/sdk/constructive-react/src/public/orm/models/phoneNumbersModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/phoneNumbersModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PhoneNumbersModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PhoneNumbersModuleSelect>(
-    args: FindManyArgs<S, PhoneNumbersModuleFilter, never, PhoneNumbersModuleOrderBy> & {
+    args: FindManyArgs<S, PhoneNumbersModuleFilter, PhoneNumbersModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, PhoneNumbersModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/policy.ts b/sdk/constructive-react/src/public/orm/models/policy.ts
index 82e6d4e95..c76c4a3ad 100644
--- a/sdk/constructive-react/src/public/orm/models/policy.ts
+++ b/sdk/constructive-react/src/public/orm/models/policy.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PolicyModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PolicySelect>(
-    args: FindManyArgs<S, PolicyFilter, never, PolicyOrderBy> & {
+    args: FindManyArgs<S, PolicyFilter, PolicyOrderBy> & {
       select: S;
     } & StrictSelect<S, PolicySelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/primaryKeyConstraint.ts b/sdk/constructive-react/src/public/orm/models/primaryKeyConstraint.ts
index 81c3f19e3..f1d79e61c 100644
--- a/sdk/constructive-react/src/public/orm/models/primaryKeyConstraint.ts
+++ b/sdk/constructive-react/src/public/orm/models/primaryKeyConstraint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PrimaryKeyConstraintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PrimaryKeyConstraintSelect>(
-    args: FindManyArgs<S, PrimaryKeyConstraintFilter, never, PrimaryKeyConstraintOrderBy> & {
+    args: FindManyArgs<S, PrimaryKeyConstraintFilter, PrimaryKeyConstraintOrderBy> & {
       select: S;
     } & StrictSelect<S, PrimaryKeyConstraintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/profilesModule.ts b/sdk/constructive-react/src/public/orm/models/profilesModule.ts
index e48c6fedb..7841e9222 100644
--- a/sdk/constructive-react/src/public/orm/models/profilesModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/profilesModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ProfilesModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ProfilesModuleSelect>(
-    args: FindManyArgs<S, ProfilesModuleFilter, never, ProfilesModuleOrderBy> & {
+    args: FindManyArgs<S, ProfilesModuleFilter, ProfilesModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, ProfilesModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/ref.ts b/sdk/constructive-react/src/public/orm/models/ref.ts
index 6a128cc2f..016c70644 100644
--- a/sdk/constructive-react/src/public/orm/models/ref.ts
+++ b/sdk/constructive-react/src/public/orm/models/ref.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RefModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RefSelect>(
-    args: FindManyArgs<S, RefFilter, never, RefOrderBy> & {
+    args: FindManyArgs<S, RefFilter, RefOrderBy> & {
       select: S;
     } & StrictSelect<S, RefSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/relationProvision.ts b/sdk/constructive-react/src/public/orm/models/relationProvision.ts
index 75b413246..5d27d5872 100644
--- a/sdk/constructive-react/src/public/orm/models/relationProvision.ts
+++ b/sdk/constructive-react/src/public/orm/models/relationProvision.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RelationProvisionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RelationProvisionSelect>(
-    args: FindManyArgs<S, RelationProvisionFilter, never, RelationProvisionOrderBy> & {
+    args: FindManyArgs<S, RelationProvisionFilter, RelationProvisionOrderBy> & {
       select: S;
     } & StrictSelect<S, RelationProvisionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/rlsModule.ts b/sdk/constructive-react/src/public/orm/models/rlsModule.ts
index fb9b58f3b..750815c7b 100644
--- a/sdk/constructive-react/src/public/orm/models/rlsModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/rlsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RlsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RlsModuleSelect>(
-    args: FindManyArgs<S, RlsModuleFilter, never, RlsModuleOrderBy> & {
+    args: FindManyArgs<S, RlsModuleFilter, RlsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, RlsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/roleType.ts b/sdk/constructive-react/src/public/orm/models/roleType.ts
index 58716fc1e..5b258dc9a 100644
--- a/sdk/constructive-react/src/public/orm/models/roleType.ts
+++ b/sdk/constructive-react/src/public/orm/models/roleType.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RoleTypeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RoleTypeSelect>(
-    args: FindManyArgs<S, RoleTypeFilter, never, RoleTypeOrderBy> & {
+    args: FindManyArgs<S, RoleTypeFilter, RoleTypeOrderBy> & {
       select: S;
     } & StrictSelect<S, RoleTypeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/schema.ts b/sdk/constructive-react/src/public/orm/models/schema.ts
index e4f823235..5bc546943 100644
--- a/sdk/constructive-react/src/public/orm/models/schema.ts
+++ b/sdk/constructive-react/src/public/orm/models/schema.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SchemaModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SchemaSelect>(
-    args: FindManyArgs<S, SchemaFilter, never, SchemaOrderBy> & {
+    args: FindManyArgs<S, SchemaFilter, SchemaOrderBy> & {
       select: S;
     } & StrictSelect<S, SchemaSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/schemaGrant.ts b/sdk/constructive-react/src/public/orm/models/schemaGrant.ts
index 472d017e3..97671a523 100644
--- a/sdk/constructive-react/src/public/orm/models/schemaGrant.ts
+++ b/sdk/constructive-react/src/public/orm/models/schemaGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SchemaGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SchemaGrantSelect>(
-    args: FindManyArgs<S, SchemaGrantFilter, never, SchemaGrantOrderBy> & {
+    args: FindManyArgs<S, SchemaGrantFilter, SchemaGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, SchemaGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/secretsModule.ts b/sdk/constructive-react/src/public/orm/models/secretsModule.ts
index 6a292713e..808b0154d 100644
--- a/sdk/constructive-react/src/public/orm/models/secretsModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/secretsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SecretsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SecretsModuleSelect>(
-    args: FindManyArgs<S, SecretsModuleFilter, never, SecretsModuleOrderBy> & {
+    args: FindManyArgs<S, SecretsModuleFilter, SecretsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, SecretsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/secureTableProvision.ts b/sdk/constructive-react/src/public/orm/models/secureTableProvision.ts
index 7784ac351..585ea33c9 100644
--- a/sdk/constructive-react/src/public/orm/models/secureTableProvision.ts
+++ b/sdk/constructive-react/src/public/orm/models/secureTableProvision.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SecureTableProvisionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SecureTableProvisionSelect>(
-    args: FindManyArgs<S, SecureTableProvisionFilter, never, SecureTableProvisionOrderBy> & {
+    args: FindManyArgs<S, SecureTableProvisionFilter, SecureTableProvisionOrderBy> & {
       select: S;
     } & StrictSelect<S, SecureTableProvisionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/sessionsModule.ts b/sdk/constructive-react/src/public/orm/models/sessionsModule.ts
index 03456dfa5..01cf5198a 100644
--- a/sdk/constructive-react/src/public/orm/models/sessionsModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/sessionsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SessionsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SessionsModuleSelect>(
-    args: FindManyArgs<S, SessionsModuleFilter, never, SessionsModuleOrderBy> & {
+    args: FindManyArgs<S, SessionsModuleFilter, SessionsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, SessionsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/site.ts b/sdk/constructive-react/src/public/orm/models/site.ts
index 027a17a9a..fa790b4d1 100644
--- a/sdk/constructive-react/src/public/orm/models/site.ts
+++ b/sdk/constructive-react/src/public/orm/models/site.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SiteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SiteSelect>(
-    args: FindManyArgs<S, SiteFilter, never, SiteOrderBy> & {
+    args: FindManyArgs<S, SiteFilter, SiteOrderBy> & {
       select: S;
     } & StrictSelect<S, SiteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/siteMetadatum.ts b/sdk/constructive-react/src/public/orm/models/siteMetadatum.ts
index 0cad9ee3f..629c19725 100644
--- a/sdk/constructive-react/src/public/orm/models/siteMetadatum.ts
+++ b/sdk/constructive-react/src/public/orm/models/siteMetadatum.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SiteMetadatumModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SiteMetadatumSelect>(
-    args: FindManyArgs<S, SiteMetadatumFilter, never, SiteMetadatumOrderBy> & {
+    args: FindManyArgs<S, SiteMetadatumFilter, SiteMetadatumOrderBy> & {
       select: S;
     } & StrictSelect<S, SiteMetadatumSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/siteModule.ts b/sdk/constructive-react/src/public/orm/models/siteModule.ts
index 8aa439832..943a6d7ae 100644
--- a/sdk/constructive-react/src/public/orm/models/siteModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/siteModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SiteModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SiteModuleSelect>(
-    args: FindManyArgs<S, SiteModuleFilter, never, SiteModuleOrderBy> & {
+    args: FindManyArgs<S, SiteModuleFilter, SiteModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, SiteModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/siteTheme.ts b/sdk/constructive-react/src/public/orm/models/siteTheme.ts
index 9f7d1f399..da7e85ab8 100644
--- a/sdk/constructive-react/src/public/orm/models/siteTheme.ts
+++ b/sdk/constructive-react/src/public/orm/models/siteTheme.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SiteThemeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SiteThemeSelect>(
-    args: FindManyArgs<S, SiteThemeFilter, never, SiteThemeOrderBy> & {
+    args: FindManyArgs<S, SiteThemeFilter, SiteThemeOrderBy> & {
       select: S;
     } & StrictSelect<S, SiteThemeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/sqlAction.ts b/sdk/constructive-react/src/public/orm/models/sqlAction.ts
index 9235c79f9..449f16020 100644
--- a/sdk/constructive-react/src/public/orm/models/sqlAction.ts
+++ b/sdk/constructive-react/src/public/orm/models/sqlAction.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SqlActionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SqlActionSelect>(
-    args: FindManyArgs<S, SqlActionFilter, never, SqlActionOrderBy> & {
+    args: FindManyArgs<S, SqlActionFilter, SqlActionOrderBy> & {
       select: S;
     } & StrictSelect<S, SqlActionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/storageModule.ts b/sdk/constructive-react/src/public/orm/models/storageModule.ts
index 347c71c81..cbfeb5b1e 100644
--- a/sdk/constructive-react/src/public/orm/models/storageModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/storageModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class StorageModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends StorageModuleSelect>(
-    args: FindManyArgs<S, StorageModuleFilter, never, StorageModuleOrderBy> & {
+    args: FindManyArgs<S, StorageModuleFilter, StorageModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, StorageModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/store.ts b/sdk/constructive-react/src/public/orm/models/store.ts
index b372bd4c4..f249ee921 100644
--- a/sdk/constructive-react/src/public/orm/models/store.ts
+++ b/sdk/constructive-react/src/public/orm/models/store.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class StoreModel {
   constructor(private client: OrmClient) {}
   findMany<S extends StoreSelect>(
-    args: FindManyArgs<S, StoreFilter, never, StoreOrderBy> & {
+    args: FindManyArgs<S, StoreFilter, StoreOrderBy> & {
       select: S;
     } & StrictSelect<S, StoreSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/table.ts b/sdk/constructive-react/src/public/orm/models/table.ts
index f4ba83e84..c10b604a3 100644
--- a/sdk/constructive-react/src/public/orm/models/table.ts
+++ b/sdk/constructive-react/src/public/orm/models/table.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TableModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TableSelect>(
-    args: FindManyArgs<S, TableFilter, never, TableOrderBy> & {
+    args: FindManyArgs<S, TableFilter, TableOrderBy> & {
       select: S;
     } & StrictSelect<S, TableSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/tableGrant.ts b/sdk/constructive-react/src/public/orm/models/tableGrant.ts
index c5d976be5..02d19136c 100644
--- a/sdk/constructive-react/src/public/orm/models/tableGrant.ts
+++ b/sdk/constructive-react/src/public/orm/models/tableGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TableGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TableGrantSelect>(
-    args: FindManyArgs<S, TableGrantFilter, never, TableGrantOrderBy> & {
+    args: FindManyArgs<S, TableGrantFilter, TableGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, TableGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/tableTemplateModule.ts b/sdk/constructive-react/src/public/orm/models/tableTemplateModule.ts
index 57c161ee3..c08032798 100644
--- a/sdk/constructive-react/src/public/orm/models/tableTemplateModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/tableTemplateModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TableTemplateModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TableTemplateModuleSelect>(
-    args: FindManyArgs<S, TableTemplateModuleFilter, never, TableTemplateModuleOrderBy> & {
+    args: FindManyArgs<S, TableTemplateModuleFilter, TableTemplateModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, TableTemplateModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/trigger.ts b/sdk/constructive-react/src/public/orm/models/trigger.ts
index cf7947984..3e2404f0e 100644
--- a/sdk/constructive-react/src/public/orm/models/trigger.ts
+++ b/sdk/constructive-react/src/public/orm/models/trigger.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TriggerModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TriggerSelect>(
-    args: FindManyArgs<S, TriggerFilter, never, TriggerOrderBy> & {
+    args: FindManyArgs<S, TriggerFilter, TriggerOrderBy> & {
       select: S;
     } & StrictSelect<S, TriggerSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/triggerFunction.ts b/sdk/constructive-react/src/public/orm/models/triggerFunction.ts
index d9fbab79d..999438070 100644
--- a/sdk/constructive-react/src/public/orm/models/triggerFunction.ts
+++ b/sdk/constructive-react/src/public/orm/models/triggerFunction.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TriggerFunctionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TriggerFunctionSelect>(
-    args: FindManyArgs<S, TriggerFunctionFilter, never, TriggerFunctionOrderBy> & {
+    args: FindManyArgs<S, TriggerFunctionFilter, TriggerFunctionOrderBy> & {
       select: S;
     } & StrictSelect<S, TriggerFunctionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/uniqueConstraint.ts b/sdk/constructive-react/src/public/orm/models/uniqueConstraint.ts
index 97f50e176..de5ba6f76 100644
--- a/sdk/constructive-react/src/public/orm/models/uniqueConstraint.ts
+++ b/sdk/constructive-react/src/public/orm/models/uniqueConstraint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UniqueConstraintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UniqueConstraintSelect>(
-    args: FindManyArgs<S, UniqueConstraintFilter, never, UniqueConstraintOrderBy> & {
+    args: FindManyArgs<S, UniqueConstraintFilter, UniqueConstraintOrderBy> & {
       select: S;
     } & StrictSelect<S, UniqueConstraintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/user.ts b/sdk/constructive-react/src/public/orm/models/user.ts
index ada9a0e34..aedd4fcc8 100644
--- a/sdk/constructive-react/src/public/orm/models/user.ts
+++ b/sdk/constructive-react/src/public/orm/models/user.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UserModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UserSelect>(
-    args: FindManyArgs<S, UserFilter, never, UserOrderBy> & {
+    args: FindManyArgs<S, UserFilter, UserOrderBy> & {
       select: S;
     } & StrictSelect<S, UserSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/userAuthModule.ts b/sdk/constructive-react/src/public/orm/models/userAuthModule.ts
index 1c641932e..431026d87 100644
--- a/sdk/constructive-react/src/public/orm/models/userAuthModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/userAuthModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UserAuthModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UserAuthModuleSelect>(
-    args: FindManyArgs<S, UserAuthModuleFilter, never, UserAuthModuleOrderBy> & {
+    args: FindManyArgs<S, UserAuthModuleFilter, UserAuthModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, UserAuthModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/usersModule.ts b/sdk/constructive-react/src/public/orm/models/usersModule.ts
index 4ff2a4fd9..c5b6d361b 100644
--- a/sdk/constructive-react/src/public/orm/models/usersModule.ts
+++ b/sdk/constructive-react/src/public/orm/models/usersModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UsersModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UsersModuleSelect>(
-    args: FindManyArgs<S, UsersModuleFilter, never, UsersModuleOrderBy> & {
+    args: FindManyArgs<S, UsersModuleFilter, UsersModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, UsersModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/view.ts b/sdk/constructive-react/src/public/orm/models/view.ts
index ba3b478f5..5e7fa5f74 100644
--- a/sdk/constructive-react/src/public/orm/models/view.ts
+++ b/sdk/constructive-react/src/public/orm/models/view.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ViewModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ViewSelect>(
-    args: FindManyArgs<S, ViewFilter, never, ViewOrderBy> & {
+    args: FindManyArgs<S, ViewFilter, ViewOrderBy> & {
       select: S;
     } & StrictSelect<S, ViewSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/viewGrant.ts b/sdk/constructive-react/src/public/orm/models/viewGrant.ts
index d760efc09..1023b5f7f 100644
--- a/sdk/constructive-react/src/public/orm/models/viewGrant.ts
+++ b/sdk/constructive-react/src/public/orm/models/viewGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ViewGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ViewGrantSelect>(
-    args: FindManyArgs<S, ViewGrantFilter, never, ViewGrantOrderBy> & {
+    args: FindManyArgs<S, ViewGrantFilter, ViewGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, ViewGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/viewRule.ts b/sdk/constructive-react/src/public/orm/models/viewRule.ts
index 85692955e..101bd199a 100644
--- a/sdk/constructive-react/src/public/orm/models/viewRule.ts
+++ b/sdk/constructive-react/src/public/orm/models/viewRule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ViewRuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ViewRuleSelect>(
-    args: FindManyArgs<S, ViewRuleFilter, never, ViewRuleOrderBy> & {
+    args: FindManyArgs<S, ViewRuleFilter, ViewRuleOrderBy> & {
       select: S;
     } & StrictSelect<S, ViewRuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/models/viewTable.ts b/sdk/constructive-react/src/public/orm/models/viewTable.ts
index 0011002e1..a37e7137b 100644
--- a/sdk/constructive-react/src/public/orm/models/viewTable.ts
+++ b/sdk/constructive-react/src/public/orm/models/viewTable.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ViewTableModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ViewTableSelect>(
-    args: FindManyArgs<S, ViewTableFilter, never, ViewTableOrderBy> & {
+    args: FindManyArgs<S, ViewTableFilter, ViewTableOrderBy> & {
       select: S;
     } & StrictSelect<S, ViewTableSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-react/src/public/orm/mutation/index.ts b/sdk/constructive-react/src/public/orm/mutation/index.ts
index 9302abc18..a2bc9ca55 100644
--- a/sdk/constructive-react/src/public/orm/mutation/index.ts
+++ b/sdk/constructive-react/src/public/orm/mutation/index.ts
@@ -182,7 +182,7 @@ export interface InitEmptyRepoVariables {
 }
 /**
  * Variables for constructBlueprint
- * Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
+ * Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
  */
 export interface ConstructBlueprintVariables {
   input: ConstructBlueprintInput;
diff --git a/sdk/constructive-react/src/public/orm/query-builder.ts b/sdk/constructive-react/src/public/orm/query-builder.ts
index 8dbcb9646..b0261f895 100644
--- a/sdk/constructive-react/src/public/orm/query-builder.ts
+++ b/sdk/constructive-react/src/public/orm/query-builder.ts
@@ -189,13 +189,12 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindManyDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
   args: {
     where?: TWhere;
-    condition?: TCondition;
     orderBy?: string[];
     first?: number;
     last?: number;
@@ -205,8 +204,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   },
   filterTypeName: string,
   orderByTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -216,16 +214,6 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   const queryArgs: ArgumentNode[] = [];
   const variables: Record<string, unknown> = {};
 
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
@@ -301,14 +289,13 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindFirstDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
-  args: { where?: TWhere; condition?: TCondition },
+  args: { where?: TWhere },
   filterTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -325,16 +312,6 @@ export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
     queryArgs,
     variables
   );
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
diff --git a/sdk/constructive-react/src/public/orm/select-types.ts b/sdk/constructive-react/src/public/orm/select-types.ts
index 919d1b935..2621b3570 100644
--- a/sdk/constructive-react/src/public/orm/select-types.ts
+++ b/sdk/constructive-react/src/public/orm/select-types.ts
@@ -16,10 +16,9 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
+export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -28,10 +27,9 @@ export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = ne
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
+export interface FindFirstArgs<TSelect, TWhere> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {
diff --git a/sdk/constructive-sdk/schemas/public.graphql b/sdk/constructive-sdk/schemas/public.graphql
index 753486557..521e9ae14 100644
--- a/sdk/constructive-sdk/schemas/public.graphql
+++ b/sdk/constructive-sdk/schemas/public.graphql
@@ -43782,7 +43782,7 @@ type Mutation {
   ): InitEmptyRepoPayload
 
   """
-  Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
+  Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
   """
   constructBlueprint(
     """
diff --git a/sdk/constructive-sdk/src/admin/orm/models/appAchievement.ts b/sdk/constructive-sdk/src/admin/orm/models/appAchievement.ts
index 371094039..f24447777 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/appAchievement.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/appAchievement.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppAchievementModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppAchievementSelect>(
-    args: FindManyArgs<S, AppAchievementFilter, never, AppAchievementOrderBy> & {
+    args: FindManyArgs<S, AppAchievementFilter, AppAchievementOrderBy> & {
       select: S;
     } & StrictSelect<S, AppAchievementSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/appAdminGrant.ts b/sdk/constructive-sdk/src/admin/orm/models/appAdminGrant.ts
index 4ab5443fe..6a2a59893 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/appAdminGrant.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/appAdminGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppAdminGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppAdminGrantSelect>(
-    args: FindManyArgs<S, AppAdminGrantFilter, never, AppAdminGrantOrderBy> & {
+    args: FindManyArgs<S, AppAdminGrantFilter, AppAdminGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppAdminGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/appGrant.ts b/sdk/constructive-sdk/src/admin/orm/models/appGrant.ts
index f7bd4d049..2cb4f429a 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/appGrant.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/appGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppGrantSelect>(
-    args: FindManyArgs<S, AppGrantFilter, never, AppGrantOrderBy> & {
+    args: FindManyArgs<S, AppGrantFilter, AppGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/appLevel.ts b/sdk/constructive-sdk/src/admin/orm/models/appLevel.ts
index a3f53cfeb..f9abef512 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/appLevel.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/appLevel.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLevelModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLevelSelect>(
-    args: FindManyArgs<S, AppLevelFilter, never, AppLevelOrderBy> & {
+    args: FindManyArgs<S, AppLevelFilter, AppLevelOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLevelSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/appLevelRequirement.ts b/sdk/constructive-sdk/src/admin/orm/models/appLevelRequirement.ts
index c89f580c2..54baeb7dc 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/appLevelRequirement.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/appLevelRequirement.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLevelRequirementModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLevelRequirementSelect>(
-    args: FindManyArgs<S, AppLevelRequirementFilter, never, AppLevelRequirementOrderBy> & {
+    args: FindManyArgs<S, AppLevelRequirementFilter, AppLevelRequirementOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLevelRequirementSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/appLimit.ts b/sdk/constructive-sdk/src/admin/orm/models/appLimit.ts
index 0b228e5ed..dea896420 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/appLimit.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/appLimit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLimitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLimitSelect>(
-    args: FindManyArgs<S, AppLimitFilter, never, AppLimitOrderBy> & {
+    args: FindManyArgs<S, AppLimitFilter, AppLimitOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLimitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/appLimitDefault.ts b/sdk/constructive-sdk/src/admin/orm/models/appLimitDefault.ts
index 7731e46ba..dfec3cdd9 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/appLimitDefault.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/appLimitDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLimitDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLimitDefaultSelect>(
-    args: FindManyArgs<S, AppLimitDefaultFilter, never, AppLimitDefaultOrderBy> & {
+    args: FindManyArgs<S, AppLimitDefaultFilter, AppLimitDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLimitDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/appMembership.ts b/sdk/constructive-sdk/src/admin/orm/models/appMembership.ts
index dd0f68855..a830192e6 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/appMembership.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/appMembership.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppMembershipModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppMembershipSelect>(
-    args: FindManyArgs<S, AppMembershipFilter, never, AppMembershipOrderBy> & {
+    args: FindManyArgs<S, AppMembershipFilter, AppMembershipOrderBy> & {
       select: S;
     } & StrictSelect<S, AppMembershipSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/appMembershipDefault.ts b/sdk/constructive-sdk/src/admin/orm/models/appMembershipDefault.ts
index 88dea6243..8b1a54c01 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/appMembershipDefault.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/appMembershipDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppMembershipDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppMembershipDefaultSelect>(
-    args: FindManyArgs<S, AppMembershipDefaultFilter, never, AppMembershipDefaultOrderBy> & {
+    args: FindManyArgs<S, AppMembershipDefaultFilter, AppMembershipDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppMembershipDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/appOwnerGrant.ts b/sdk/constructive-sdk/src/admin/orm/models/appOwnerGrant.ts
index acc216d4a..a8695557e 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/appOwnerGrant.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/appOwnerGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppOwnerGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppOwnerGrantSelect>(
-    args: FindManyArgs<S, AppOwnerGrantFilter, never, AppOwnerGrantOrderBy> & {
+    args: FindManyArgs<S, AppOwnerGrantFilter, AppOwnerGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppOwnerGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/appPermission.ts b/sdk/constructive-sdk/src/admin/orm/models/appPermission.ts
index c191e5066..2575c5de2 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/appPermission.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/appPermission.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppPermissionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppPermissionSelect>(
-    args: FindManyArgs<S, AppPermissionFilter, never, AppPermissionOrderBy> & {
+    args: FindManyArgs<S, AppPermissionFilter, AppPermissionOrderBy> & {
       select: S;
     } & StrictSelect<S, AppPermissionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/appPermissionDefault.ts b/sdk/constructive-sdk/src/admin/orm/models/appPermissionDefault.ts
index 33fdd49dd..427272883 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/appPermissionDefault.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/appPermissionDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppPermissionDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppPermissionDefaultSelect>(
-    args: FindManyArgs<S, AppPermissionDefaultFilter, never, AppPermissionDefaultOrderBy> & {
+    args: FindManyArgs<S, AppPermissionDefaultFilter, AppPermissionDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppPermissionDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/appStep.ts b/sdk/constructive-sdk/src/admin/orm/models/appStep.ts
index a683087da..29dae0d6c 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/appStep.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/appStep.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppStepModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppStepSelect>(
-    args: FindManyArgs<S, AppStepFilter, never, AppStepOrderBy> & {
+    args: FindManyArgs<S, AppStepFilter, AppStepOrderBy> & {
       select: S;
     } & StrictSelect<S, AppStepSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/claimedInvite.ts b/sdk/constructive-sdk/src/admin/orm/models/claimedInvite.ts
index c7724b14a..cbe1429e5 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/claimedInvite.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/claimedInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ClaimedInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ClaimedInviteSelect>(
-    args: FindManyArgs<S, ClaimedInviteFilter, never, ClaimedInviteOrderBy> & {
+    args: FindManyArgs<S, ClaimedInviteFilter, ClaimedInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, ClaimedInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/invite.ts b/sdk/constructive-sdk/src/admin/orm/models/invite.ts
index 05d88af09..8fabe0aec 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/invite.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/invite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class InviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends InviteSelect>(
-    args: FindManyArgs<S, InviteFilter, never, InviteOrderBy> & {
+    args: FindManyArgs<S, InviteFilter, InviteOrderBy> & {
       select: S;
     } & StrictSelect<S, InviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/membershipType.ts b/sdk/constructive-sdk/src/admin/orm/models/membershipType.ts
index bc8b65d9e..40fac5490 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/membershipType.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/membershipType.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MembershipTypeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MembershipTypeSelect>(
-    args: FindManyArgs<S, MembershipTypeFilter, never, MembershipTypeOrderBy> & {
+    args: FindManyArgs<S, MembershipTypeFilter, MembershipTypeOrderBy> & {
       select: S;
     } & StrictSelect<S, MembershipTypeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgAdminGrant.ts b/sdk/constructive-sdk/src/admin/orm/models/orgAdminGrant.ts
index 5378a74f0..e611a8578 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgAdminGrant.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgAdminGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgAdminGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgAdminGrantSelect>(
-    args: FindManyArgs<S, OrgAdminGrantFilter, never, OrgAdminGrantOrderBy> & {
+    args: FindManyArgs<S, OrgAdminGrantFilter, OrgAdminGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgAdminGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgChartEdge.ts b/sdk/constructive-sdk/src/admin/orm/models/orgChartEdge.ts
index 8a71ab56f..6c6fc84cc 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgChartEdge.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgChartEdge.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgChartEdgeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgChartEdgeSelect>(
-    args: FindManyArgs<S, OrgChartEdgeFilter, never, OrgChartEdgeOrderBy> & {
+    args: FindManyArgs<S, OrgChartEdgeFilter, OrgChartEdgeOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgChartEdgeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgChartEdgeGrant.ts b/sdk/constructive-sdk/src/admin/orm/models/orgChartEdgeGrant.ts
index b048dead6..58345c78d 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgChartEdgeGrant.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgChartEdgeGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgChartEdgeGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgChartEdgeGrantSelect>(
-    args: FindManyArgs<S, OrgChartEdgeGrantFilter, never, OrgChartEdgeGrantOrderBy> & {
+    args: FindManyArgs<S, OrgChartEdgeGrantFilter, OrgChartEdgeGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgChartEdgeGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgClaimedInvite.ts b/sdk/constructive-sdk/src/admin/orm/models/orgClaimedInvite.ts
index 75975b11b..475de7291 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgClaimedInvite.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgClaimedInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgClaimedInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgClaimedInviteSelect>(
-    args: FindManyArgs<S, OrgClaimedInviteFilter, never, OrgClaimedInviteOrderBy> & {
+    args: FindManyArgs<S, OrgClaimedInviteFilter, OrgClaimedInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgClaimedInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgGetManagersRecord.ts b/sdk/constructive-sdk/src/admin/orm/models/orgGetManagersRecord.ts
index e8f5a29ec..9a0cefa8a 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgGetManagersRecord.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgGetManagersRecord.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGetManagersRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGetManagersRecordSelect>(
-    args: FindManyArgs<S, OrgGetManagersRecordFilter, never, OrgGetManagersRecordsOrderBy> & {
+    args: FindManyArgs<S, OrgGetManagersRecordFilter, OrgGetManagersRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGetManagersRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgGetSubordinatesRecord.ts b/sdk/constructive-sdk/src/admin/orm/models/orgGetSubordinatesRecord.ts
index be9fa6a62..5eeec50ca 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgGetSubordinatesRecord.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgGetSubordinatesRecord.ts
@@ -37,12 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGetSubordinatesRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGetSubordinatesRecordSelect>(
-    args: FindManyArgs<
-      S,
-      OrgGetSubordinatesRecordFilter,
-      never,
-      OrgGetSubordinatesRecordsOrderBy
-    > & {
+    args: FindManyArgs<S, OrgGetSubordinatesRecordFilter, OrgGetSubordinatesRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGetSubordinatesRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgGrant.ts b/sdk/constructive-sdk/src/admin/orm/models/orgGrant.ts
index 23c9cd546..291264ec5 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgGrant.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGrantSelect>(
-    args: FindManyArgs<S, OrgGrantFilter, never, OrgGrantOrderBy> & {
+    args: FindManyArgs<S, OrgGrantFilter, OrgGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgInvite.ts b/sdk/constructive-sdk/src/admin/orm/models/orgInvite.ts
index cacca9210..639cb8dd5 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgInvite.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgInviteSelect>(
-    args: FindManyArgs<S, OrgInviteFilter, never, OrgInviteOrderBy> & {
+    args: FindManyArgs<S, OrgInviteFilter, OrgInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgLimit.ts b/sdk/constructive-sdk/src/admin/orm/models/orgLimit.ts
index ab50514ae..2d7937963 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgLimit.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgLimit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgLimitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgLimitSelect>(
-    args: FindManyArgs<S, OrgLimitFilter, never, OrgLimitOrderBy> & {
+    args: FindManyArgs<S, OrgLimitFilter, OrgLimitOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgLimitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgLimitDefault.ts b/sdk/constructive-sdk/src/admin/orm/models/orgLimitDefault.ts
index d8c76fb6a..bf0cfcf5e 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgLimitDefault.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgLimitDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgLimitDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgLimitDefaultSelect>(
-    args: FindManyArgs<S, OrgLimitDefaultFilter, never, OrgLimitDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgLimitDefaultFilter, OrgLimitDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgLimitDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgMember.ts b/sdk/constructive-sdk/src/admin/orm/models/orgMember.ts
index 8575c7fdc..dd1d20e45 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgMember.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgMember.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMemberModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMemberSelect>(
-    args: FindManyArgs<S, OrgMemberFilter, never, OrgMemberOrderBy> & {
+    args: FindManyArgs<S, OrgMemberFilter, OrgMemberOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMemberSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgMembership.ts b/sdk/constructive-sdk/src/admin/orm/models/orgMembership.ts
index 20d60836a..c0173b3e1 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgMembership.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgMembership.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMembershipModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMembershipSelect>(
-    args: FindManyArgs<S, OrgMembershipFilter, never, OrgMembershipOrderBy> & {
+    args: FindManyArgs<S, OrgMembershipFilter, OrgMembershipOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMembershipSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgMembershipDefault.ts b/sdk/constructive-sdk/src/admin/orm/models/orgMembershipDefault.ts
index 83b9f7dea..09d525bec 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgMembershipDefault.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgMembershipDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMembershipDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMembershipDefaultSelect>(
-    args: FindManyArgs<S, OrgMembershipDefaultFilter, never, OrgMembershipDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgMembershipDefaultFilter, OrgMembershipDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMembershipDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgOwnerGrant.ts b/sdk/constructive-sdk/src/admin/orm/models/orgOwnerGrant.ts
index 136082317..bdf045511 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgOwnerGrant.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgOwnerGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgOwnerGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgOwnerGrantSelect>(
-    args: FindManyArgs<S, OrgOwnerGrantFilter, never, OrgOwnerGrantOrderBy> & {
+    args: FindManyArgs<S, OrgOwnerGrantFilter, OrgOwnerGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgOwnerGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgPermission.ts b/sdk/constructive-sdk/src/admin/orm/models/orgPermission.ts
index 256395283..c5910be63 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgPermission.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgPermission.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgPermissionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgPermissionSelect>(
-    args: FindManyArgs<S, OrgPermissionFilter, never, OrgPermissionOrderBy> & {
+    args: FindManyArgs<S, OrgPermissionFilter, OrgPermissionOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgPermissionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/models/orgPermissionDefault.ts b/sdk/constructive-sdk/src/admin/orm/models/orgPermissionDefault.ts
index 18631fd2d..40389a11b 100644
--- a/sdk/constructive-sdk/src/admin/orm/models/orgPermissionDefault.ts
+++ b/sdk/constructive-sdk/src/admin/orm/models/orgPermissionDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgPermissionDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgPermissionDefaultSelect>(
-    args: FindManyArgs<S, OrgPermissionDefaultFilter, never, OrgPermissionDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgPermissionDefaultFilter, OrgPermissionDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgPermissionDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/admin/orm/query-builder.ts b/sdk/constructive-sdk/src/admin/orm/query-builder.ts
index 8dbcb9646..b0261f895 100644
--- a/sdk/constructive-sdk/src/admin/orm/query-builder.ts
+++ b/sdk/constructive-sdk/src/admin/orm/query-builder.ts
@@ -189,13 +189,12 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindManyDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
   args: {
     where?: TWhere;
-    condition?: TCondition;
     orderBy?: string[];
     first?: number;
     last?: number;
@@ -205,8 +204,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   },
   filterTypeName: string,
   orderByTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -216,16 +214,6 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   const queryArgs: ArgumentNode[] = [];
   const variables: Record<string, unknown> = {};
 
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
@@ -301,14 +289,13 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindFirstDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
-  args: { where?: TWhere; condition?: TCondition },
+  args: { where?: TWhere },
   filterTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -325,16 +312,6 @@ export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
     queryArgs,
     variables
   );
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
diff --git a/sdk/constructive-sdk/src/admin/orm/select-types.ts b/sdk/constructive-sdk/src/admin/orm/select-types.ts
index 919d1b935..2621b3570 100644
--- a/sdk/constructive-sdk/src/admin/orm/select-types.ts
+++ b/sdk/constructive-sdk/src/admin/orm/select-types.ts
@@ -16,10 +16,9 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
+export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -28,10 +27,9 @@ export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = ne
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
+export interface FindFirstArgs<TSelect, TWhere> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {
diff --git a/sdk/constructive-sdk/src/auth/orm/models/auditLog.ts b/sdk/constructive-sdk/src/auth/orm/models/auditLog.ts
index fac372386..2d388026d 100644
--- a/sdk/constructive-sdk/src/auth/orm/models/auditLog.ts
+++ b/sdk/constructive-sdk/src/auth/orm/models/auditLog.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AuditLogModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AuditLogSelect>(
-    args: FindManyArgs<S, AuditLogFilter, never, AuditLogOrderBy> & {
+    args: FindManyArgs<S, AuditLogFilter, AuditLogOrderBy> & {
       select: S;
     } & StrictSelect<S, AuditLogSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/auth/orm/models/connectedAccount.ts b/sdk/constructive-sdk/src/auth/orm/models/connectedAccount.ts
index 8a24193b8..c9def156d 100644
--- a/sdk/constructive-sdk/src/auth/orm/models/connectedAccount.ts
+++ b/sdk/constructive-sdk/src/auth/orm/models/connectedAccount.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ConnectedAccountModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ConnectedAccountSelect>(
-    args: FindManyArgs<S, ConnectedAccountFilter, never, ConnectedAccountOrderBy> & {
+    args: FindManyArgs<S, ConnectedAccountFilter, ConnectedAccountOrderBy> & {
       select: S;
     } & StrictSelect<S, ConnectedAccountSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/auth/orm/models/cryptoAddress.ts b/sdk/constructive-sdk/src/auth/orm/models/cryptoAddress.ts
index 8cbe37d7b..7357c0126 100644
--- a/sdk/constructive-sdk/src/auth/orm/models/cryptoAddress.ts
+++ b/sdk/constructive-sdk/src/auth/orm/models/cryptoAddress.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CryptoAddressModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CryptoAddressSelect>(
-    args: FindManyArgs<S, CryptoAddressFilter, never, CryptoAddressOrderBy> & {
+    args: FindManyArgs<S, CryptoAddressFilter, CryptoAddressOrderBy> & {
       select: S;
     } & StrictSelect<S, CryptoAddressSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/auth/orm/models/email.ts b/sdk/constructive-sdk/src/auth/orm/models/email.ts
index cf129a2d2..aa83efc07 100644
--- a/sdk/constructive-sdk/src/auth/orm/models/email.ts
+++ b/sdk/constructive-sdk/src/auth/orm/models/email.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EmailModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EmailSelect>(
-    args: FindManyArgs<S, EmailFilter, never, EmailOrderBy> & {
+    args: FindManyArgs<S, EmailFilter, EmailOrderBy> & {
       select: S;
     } & StrictSelect<S, EmailSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/auth/orm/models/phoneNumber.ts b/sdk/constructive-sdk/src/auth/orm/models/phoneNumber.ts
index 592b010fa..a711db272 100644
--- a/sdk/constructive-sdk/src/auth/orm/models/phoneNumber.ts
+++ b/sdk/constructive-sdk/src/auth/orm/models/phoneNumber.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PhoneNumberModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PhoneNumberSelect>(
-    args: FindManyArgs<S, PhoneNumberFilter, never, PhoneNumberOrderBy> & {
+    args: FindManyArgs<S, PhoneNumberFilter, PhoneNumberOrderBy> & {
       select: S;
     } & StrictSelect<S, PhoneNumberSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/auth/orm/models/roleType.ts b/sdk/constructive-sdk/src/auth/orm/models/roleType.ts
index 58716fc1e..5b258dc9a 100644
--- a/sdk/constructive-sdk/src/auth/orm/models/roleType.ts
+++ b/sdk/constructive-sdk/src/auth/orm/models/roleType.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RoleTypeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RoleTypeSelect>(
-    args: FindManyArgs<S, RoleTypeFilter, never, RoleTypeOrderBy> & {
+    args: FindManyArgs<S, RoleTypeFilter, RoleTypeOrderBy> & {
       select: S;
     } & StrictSelect<S, RoleTypeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/auth/orm/models/user.ts b/sdk/constructive-sdk/src/auth/orm/models/user.ts
index ada9a0e34..aedd4fcc8 100644
--- a/sdk/constructive-sdk/src/auth/orm/models/user.ts
+++ b/sdk/constructive-sdk/src/auth/orm/models/user.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UserModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UserSelect>(
-    args: FindManyArgs<S, UserFilter, never, UserOrderBy> & {
+    args: FindManyArgs<S, UserFilter, UserOrderBy> & {
       select: S;
     } & StrictSelect<S, UserSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/auth/orm/query-builder.ts b/sdk/constructive-sdk/src/auth/orm/query-builder.ts
index 8dbcb9646..b0261f895 100644
--- a/sdk/constructive-sdk/src/auth/orm/query-builder.ts
+++ b/sdk/constructive-sdk/src/auth/orm/query-builder.ts
@@ -189,13 +189,12 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindManyDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
   args: {
     where?: TWhere;
-    condition?: TCondition;
     orderBy?: string[];
     first?: number;
     last?: number;
@@ -205,8 +204,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   },
   filterTypeName: string,
   orderByTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -216,16 +214,6 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   const queryArgs: ArgumentNode[] = [];
   const variables: Record<string, unknown> = {};
 
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
@@ -301,14 +289,13 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindFirstDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
-  args: { where?: TWhere; condition?: TCondition },
+  args: { where?: TWhere },
   filterTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -325,16 +312,6 @@ export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
     queryArgs,
     variables
   );
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
diff --git a/sdk/constructive-sdk/src/auth/orm/select-types.ts b/sdk/constructive-sdk/src/auth/orm/select-types.ts
index 919d1b935..2621b3570 100644
--- a/sdk/constructive-sdk/src/auth/orm/select-types.ts
+++ b/sdk/constructive-sdk/src/auth/orm/select-types.ts
@@ -16,10 +16,9 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
+export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -28,10 +27,9 @@ export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = ne
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
+export interface FindFirstArgs<TSelect, TWhere> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {
diff --git a/sdk/constructive-sdk/src/objects/orm/models/commit.ts b/sdk/constructive-sdk/src/objects/orm/models/commit.ts
index b9e8c51d2..de0e94710 100644
--- a/sdk/constructive-sdk/src/objects/orm/models/commit.ts
+++ b/sdk/constructive-sdk/src/objects/orm/models/commit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CommitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CommitSelect>(
-    args: FindManyArgs<S, CommitFilter, never, CommitOrderBy> & {
+    args: FindManyArgs<S, CommitFilter, CommitOrderBy> & {
       select: S;
     } & StrictSelect<S, CommitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/objects/orm/models/getAllRecord.ts b/sdk/constructive-sdk/src/objects/orm/models/getAllRecord.ts
index 94a06bdd9..53873a0f3 100644
--- a/sdk/constructive-sdk/src/objects/orm/models/getAllRecord.ts
+++ b/sdk/constructive-sdk/src/objects/orm/models/getAllRecord.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class GetAllRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends GetAllRecordSelect>(
-    args: FindManyArgs<S, GetAllRecordFilter, never, GetAllRecordsOrderBy> & {
+    args: FindManyArgs<S, GetAllRecordFilter, GetAllRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, GetAllRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/objects/orm/models/object.ts b/sdk/constructive-sdk/src/objects/orm/models/object.ts
index 1cbe85b7c..085bdd4df 100644
--- a/sdk/constructive-sdk/src/objects/orm/models/object.ts
+++ b/sdk/constructive-sdk/src/objects/orm/models/object.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ObjectModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ObjectSelect>(
-    args: FindManyArgs<S, ObjectFilter, never, ObjectOrderBy> & {
+    args: FindManyArgs<S, ObjectFilter, ObjectOrderBy> & {
       select: S;
     } & StrictSelect<S, ObjectSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/objects/orm/models/ref.ts b/sdk/constructive-sdk/src/objects/orm/models/ref.ts
index 6a128cc2f..016c70644 100644
--- a/sdk/constructive-sdk/src/objects/orm/models/ref.ts
+++ b/sdk/constructive-sdk/src/objects/orm/models/ref.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RefModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RefSelect>(
-    args: FindManyArgs<S, RefFilter, never, RefOrderBy> & {
+    args: FindManyArgs<S, RefFilter, RefOrderBy> & {
       select: S;
     } & StrictSelect<S, RefSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/objects/orm/models/store.ts b/sdk/constructive-sdk/src/objects/orm/models/store.ts
index b372bd4c4..f249ee921 100644
--- a/sdk/constructive-sdk/src/objects/orm/models/store.ts
+++ b/sdk/constructive-sdk/src/objects/orm/models/store.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class StoreModel {
   constructor(private client: OrmClient) {}
   findMany<S extends StoreSelect>(
-    args: FindManyArgs<S, StoreFilter, never, StoreOrderBy> & {
+    args: FindManyArgs<S, StoreFilter, StoreOrderBy> & {
       select: S;
     } & StrictSelect<S, StoreSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/objects/orm/query-builder.ts b/sdk/constructive-sdk/src/objects/orm/query-builder.ts
index 8dbcb9646..b0261f895 100644
--- a/sdk/constructive-sdk/src/objects/orm/query-builder.ts
+++ b/sdk/constructive-sdk/src/objects/orm/query-builder.ts
@@ -189,13 +189,12 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindManyDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
   args: {
     where?: TWhere;
-    condition?: TCondition;
     orderBy?: string[];
     first?: number;
     last?: number;
@@ -205,8 +204,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   },
   filterTypeName: string,
   orderByTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -216,16 +214,6 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   const queryArgs: ArgumentNode[] = [];
   const variables: Record<string, unknown> = {};
 
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
@@ -301,14 +289,13 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindFirstDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
-  args: { where?: TWhere; condition?: TCondition },
+  args: { where?: TWhere },
   filterTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -325,16 +312,6 @@ export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
     queryArgs,
     variables
   );
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
diff --git a/sdk/constructive-sdk/src/objects/orm/select-types.ts b/sdk/constructive-sdk/src/objects/orm/select-types.ts
index 919d1b935..2621b3570 100644
--- a/sdk/constructive-sdk/src/objects/orm/select-types.ts
+++ b/sdk/constructive-sdk/src/objects/orm/select-types.ts
@@ -16,10 +16,9 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
+export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -28,10 +27,9 @@ export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = ne
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
+export interface FindFirstArgs<TSelect, TWhere> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {
diff --git a/sdk/constructive-sdk/src/public/orm/README.md b/sdk/constructive-sdk/src/public/orm/README.md
index 52aae21f0..425d78091 100644
--- a/sdk/constructive-sdk/src/public/orm/README.md
+++ b/sdk/constructive-sdk/src/public/orm/README.md
@@ -4745,7 +4745,7 @@ const result = await db.mutation.initEmptyRepo({ input: { dbId: '<UUID>', storeI
 
 ### `db.mutation.constructBlueprint`
 
-Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
+Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
 
 - **Type:** mutation
 - **Arguments:**
diff --git a/sdk/constructive-sdk/src/public/orm/models/api.ts b/sdk/constructive-sdk/src/public/orm/models/api.ts
index 315771917..295ccbb65 100644
--- a/sdk/constructive-sdk/src/public/orm/models/api.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/api.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ApiModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ApiSelect>(
-    args: FindManyArgs<S, ApiFilter, never, ApiOrderBy> & {
+    args: FindManyArgs<S, ApiFilter, ApiOrderBy> & {
       select: S;
     } & StrictSelect<S, ApiSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/apiModule.ts b/sdk/constructive-sdk/src/public/orm/models/apiModule.ts
index 2cc5a7585..d90c9f9e9 100644
--- a/sdk/constructive-sdk/src/public/orm/models/apiModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/apiModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ApiModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ApiModuleSelect>(
-    args: FindManyArgs<S, ApiModuleFilter, never, ApiModuleOrderBy> & {
+    args: FindManyArgs<S, ApiModuleFilter, ApiModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, ApiModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/apiSchema.ts b/sdk/constructive-sdk/src/public/orm/models/apiSchema.ts
index 0fb92e7c4..f9288041c 100644
--- a/sdk/constructive-sdk/src/public/orm/models/apiSchema.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/apiSchema.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ApiSchemaModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ApiSchemaSelect>(
-    args: FindManyArgs<S, ApiSchemaFilter, never, ApiSchemaOrderBy> & {
+    args: FindManyArgs<S, ApiSchemaFilter, ApiSchemaOrderBy> & {
       select: S;
     } & StrictSelect<S, ApiSchemaSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/app.ts b/sdk/constructive-sdk/src/public/orm/models/app.ts
index 56be2a0fb..f6a45b422 100644
--- a/sdk/constructive-sdk/src/public/orm/models/app.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/app.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppSelect>(
-    args: FindManyArgs<S, AppFilter, never, AppOrderBy> & {
+    args: FindManyArgs<S, AppFilter, AppOrderBy> & {
       select: S;
     } & StrictSelect<S, AppSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/appAchievement.ts b/sdk/constructive-sdk/src/public/orm/models/appAchievement.ts
index 371094039..f24447777 100644
--- a/sdk/constructive-sdk/src/public/orm/models/appAchievement.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/appAchievement.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppAchievementModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppAchievementSelect>(
-    args: FindManyArgs<S, AppAchievementFilter, never, AppAchievementOrderBy> & {
+    args: FindManyArgs<S, AppAchievementFilter, AppAchievementOrderBy> & {
       select: S;
     } & StrictSelect<S, AppAchievementSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/appAdminGrant.ts b/sdk/constructive-sdk/src/public/orm/models/appAdminGrant.ts
index 4ab5443fe..6a2a59893 100644
--- a/sdk/constructive-sdk/src/public/orm/models/appAdminGrant.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/appAdminGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppAdminGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppAdminGrantSelect>(
-    args: FindManyArgs<S, AppAdminGrantFilter, never, AppAdminGrantOrderBy> & {
+    args: FindManyArgs<S, AppAdminGrantFilter, AppAdminGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppAdminGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/appGrant.ts b/sdk/constructive-sdk/src/public/orm/models/appGrant.ts
index f7bd4d049..2cb4f429a 100644
--- a/sdk/constructive-sdk/src/public/orm/models/appGrant.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/appGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppGrantSelect>(
-    args: FindManyArgs<S, AppGrantFilter, never, AppGrantOrderBy> & {
+    args: FindManyArgs<S, AppGrantFilter, AppGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/appLevel.ts b/sdk/constructive-sdk/src/public/orm/models/appLevel.ts
index a3f53cfeb..f9abef512 100644
--- a/sdk/constructive-sdk/src/public/orm/models/appLevel.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/appLevel.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLevelModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLevelSelect>(
-    args: FindManyArgs<S, AppLevelFilter, never, AppLevelOrderBy> & {
+    args: FindManyArgs<S, AppLevelFilter, AppLevelOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLevelSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/appLevelRequirement.ts b/sdk/constructive-sdk/src/public/orm/models/appLevelRequirement.ts
index c89f580c2..54baeb7dc 100644
--- a/sdk/constructive-sdk/src/public/orm/models/appLevelRequirement.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/appLevelRequirement.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLevelRequirementModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLevelRequirementSelect>(
-    args: FindManyArgs<S, AppLevelRequirementFilter, never, AppLevelRequirementOrderBy> & {
+    args: FindManyArgs<S, AppLevelRequirementFilter, AppLevelRequirementOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLevelRequirementSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/appLimit.ts b/sdk/constructive-sdk/src/public/orm/models/appLimit.ts
index 0b228e5ed..dea896420 100644
--- a/sdk/constructive-sdk/src/public/orm/models/appLimit.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/appLimit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLimitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLimitSelect>(
-    args: FindManyArgs<S, AppLimitFilter, never, AppLimitOrderBy> & {
+    args: FindManyArgs<S, AppLimitFilter, AppLimitOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLimitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/appLimitDefault.ts b/sdk/constructive-sdk/src/public/orm/models/appLimitDefault.ts
index 7731e46ba..dfec3cdd9 100644
--- a/sdk/constructive-sdk/src/public/orm/models/appLimitDefault.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/appLimitDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppLimitDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppLimitDefaultSelect>(
-    args: FindManyArgs<S, AppLimitDefaultFilter, never, AppLimitDefaultOrderBy> & {
+    args: FindManyArgs<S, AppLimitDefaultFilter, AppLimitDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLimitDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/appMembership.ts b/sdk/constructive-sdk/src/public/orm/models/appMembership.ts
index dd0f68855..a830192e6 100644
--- a/sdk/constructive-sdk/src/public/orm/models/appMembership.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/appMembership.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppMembershipModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppMembershipSelect>(
-    args: FindManyArgs<S, AppMembershipFilter, never, AppMembershipOrderBy> & {
+    args: FindManyArgs<S, AppMembershipFilter, AppMembershipOrderBy> & {
       select: S;
     } & StrictSelect<S, AppMembershipSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/appMembershipDefault.ts b/sdk/constructive-sdk/src/public/orm/models/appMembershipDefault.ts
index 88dea6243..8b1a54c01 100644
--- a/sdk/constructive-sdk/src/public/orm/models/appMembershipDefault.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/appMembershipDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppMembershipDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppMembershipDefaultSelect>(
-    args: FindManyArgs<S, AppMembershipDefaultFilter, never, AppMembershipDefaultOrderBy> & {
+    args: FindManyArgs<S, AppMembershipDefaultFilter, AppMembershipDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppMembershipDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/appOwnerGrant.ts b/sdk/constructive-sdk/src/public/orm/models/appOwnerGrant.ts
index acc216d4a..a8695557e 100644
--- a/sdk/constructive-sdk/src/public/orm/models/appOwnerGrant.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/appOwnerGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppOwnerGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppOwnerGrantSelect>(
-    args: FindManyArgs<S, AppOwnerGrantFilter, never, AppOwnerGrantOrderBy> & {
+    args: FindManyArgs<S, AppOwnerGrantFilter, AppOwnerGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, AppOwnerGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/appPermission.ts b/sdk/constructive-sdk/src/public/orm/models/appPermission.ts
index c191e5066..2575c5de2 100644
--- a/sdk/constructive-sdk/src/public/orm/models/appPermission.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/appPermission.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppPermissionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppPermissionSelect>(
-    args: FindManyArgs<S, AppPermissionFilter, never, AppPermissionOrderBy> & {
+    args: FindManyArgs<S, AppPermissionFilter, AppPermissionOrderBy> & {
       select: S;
     } & StrictSelect<S, AppPermissionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/appPermissionDefault.ts b/sdk/constructive-sdk/src/public/orm/models/appPermissionDefault.ts
index 33fdd49dd..427272883 100644
--- a/sdk/constructive-sdk/src/public/orm/models/appPermissionDefault.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/appPermissionDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppPermissionDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppPermissionDefaultSelect>(
-    args: FindManyArgs<S, AppPermissionDefaultFilter, never, AppPermissionDefaultOrderBy> & {
+    args: FindManyArgs<S, AppPermissionDefaultFilter, AppPermissionDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, AppPermissionDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/appStep.ts b/sdk/constructive-sdk/src/public/orm/models/appStep.ts
index a683087da..29dae0d6c 100644
--- a/sdk/constructive-sdk/src/public/orm/models/appStep.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/appStep.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AppStepModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AppStepSelect>(
-    args: FindManyArgs<S, AppStepFilter, never, AppStepOrderBy> & {
+    args: FindManyArgs<S, AppStepFilter, AppStepOrderBy> & {
       select: S;
     } & StrictSelect<S, AppStepSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/astMigration.ts b/sdk/constructive-sdk/src/public/orm/models/astMigration.ts
index 44b0d3469..8bab8cfd0 100644
--- a/sdk/constructive-sdk/src/public/orm/models/astMigration.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/astMigration.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AstMigrationModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AstMigrationSelect>(
-    args: FindManyArgs<S, AstMigrationFilter, never, AstMigrationOrderBy> & {
+    args: FindManyArgs<S, AstMigrationFilter, AstMigrationOrderBy> & {
       select: S;
     } & StrictSelect<S, AstMigrationSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/auditLog.ts b/sdk/constructive-sdk/src/public/orm/models/auditLog.ts
index fac372386..2d388026d 100644
--- a/sdk/constructive-sdk/src/public/orm/models/auditLog.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/auditLog.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class AuditLogModel {
   constructor(private client: OrmClient) {}
   findMany<S extends AuditLogSelect>(
-    args: FindManyArgs<S, AuditLogFilter, never, AuditLogOrderBy> & {
+    args: FindManyArgs<S, AuditLogFilter, AuditLogOrderBy> & {
       select: S;
     } & StrictSelect<S, AuditLogSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/blueprint.ts b/sdk/constructive-sdk/src/public/orm/models/blueprint.ts
index 72c9f4bbe..fa1ea0286 100644
--- a/sdk/constructive-sdk/src/public/orm/models/blueprint.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/blueprint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class BlueprintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends BlueprintSelect>(
-    args: FindManyArgs<S, BlueprintFilter, never, BlueprintOrderBy> & {
+    args: FindManyArgs<S, BlueprintFilter, BlueprintOrderBy> & {
       select: S;
     } & StrictSelect<S, BlueprintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/blueprintConstruction.ts b/sdk/constructive-sdk/src/public/orm/models/blueprintConstruction.ts
index 5c5247d43..3f7a8657d 100644
--- a/sdk/constructive-sdk/src/public/orm/models/blueprintConstruction.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/blueprintConstruction.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class BlueprintConstructionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends BlueprintConstructionSelect>(
-    args: FindManyArgs<S, BlueprintConstructionFilter, never, BlueprintConstructionOrderBy> & {
+    args: FindManyArgs<S, BlueprintConstructionFilter, BlueprintConstructionOrderBy> & {
       select: S;
     } & StrictSelect<S, BlueprintConstructionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/blueprintTemplate.ts b/sdk/constructive-sdk/src/public/orm/models/blueprintTemplate.ts
index 346928f06..31d7824e5 100644
--- a/sdk/constructive-sdk/src/public/orm/models/blueprintTemplate.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/blueprintTemplate.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class BlueprintTemplateModel {
   constructor(private client: OrmClient) {}
   findMany<S extends BlueprintTemplateSelect>(
-    args: FindManyArgs<S, BlueprintTemplateFilter, never, BlueprintTemplateOrderBy> & {
+    args: FindManyArgs<S, BlueprintTemplateFilter, BlueprintTemplateOrderBy> & {
       select: S;
     } & StrictSelect<S, BlueprintTemplateSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/checkConstraint.ts b/sdk/constructive-sdk/src/public/orm/models/checkConstraint.ts
index 48a1e2031..323b64b6c 100644
--- a/sdk/constructive-sdk/src/public/orm/models/checkConstraint.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/checkConstraint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CheckConstraintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CheckConstraintSelect>(
-    args: FindManyArgs<S, CheckConstraintFilter, never, CheckConstraintOrderBy> & {
+    args: FindManyArgs<S, CheckConstraintFilter, CheckConstraintOrderBy> & {
       select: S;
     } & StrictSelect<S, CheckConstraintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/claimedInvite.ts b/sdk/constructive-sdk/src/public/orm/models/claimedInvite.ts
index c7724b14a..cbe1429e5 100644
--- a/sdk/constructive-sdk/src/public/orm/models/claimedInvite.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/claimedInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ClaimedInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ClaimedInviteSelect>(
-    args: FindManyArgs<S, ClaimedInviteFilter, never, ClaimedInviteOrderBy> & {
+    args: FindManyArgs<S, ClaimedInviteFilter, ClaimedInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, ClaimedInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/commit.ts b/sdk/constructive-sdk/src/public/orm/models/commit.ts
index b9e8c51d2..de0e94710 100644
--- a/sdk/constructive-sdk/src/public/orm/models/commit.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/commit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CommitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CommitSelect>(
-    args: FindManyArgs<S, CommitFilter, never, CommitOrderBy> & {
+    args: FindManyArgs<S, CommitFilter, CommitOrderBy> & {
       select: S;
     } & StrictSelect<S, CommitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/connectedAccount.ts b/sdk/constructive-sdk/src/public/orm/models/connectedAccount.ts
index 8a24193b8..c9def156d 100644
--- a/sdk/constructive-sdk/src/public/orm/models/connectedAccount.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/connectedAccount.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ConnectedAccountModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ConnectedAccountSelect>(
-    args: FindManyArgs<S, ConnectedAccountFilter, never, ConnectedAccountOrderBy> & {
+    args: FindManyArgs<S, ConnectedAccountFilter, ConnectedAccountOrderBy> & {
       select: S;
     } & StrictSelect<S, ConnectedAccountSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/connectedAccountsModule.ts b/sdk/constructive-sdk/src/public/orm/models/connectedAccountsModule.ts
index a7776029a..408aec32a 100644
--- a/sdk/constructive-sdk/src/public/orm/models/connectedAccountsModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/connectedAccountsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ConnectedAccountsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ConnectedAccountsModuleSelect>(
-    args: FindManyArgs<S, ConnectedAccountsModuleFilter, never, ConnectedAccountsModuleOrderBy> & {
+    args: FindManyArgs<S, ConnectedAccountsModuleFilter, ConnectedAccountsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, ConnectedAccountsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/cryptoAddress.ts b/sdk/constructive-sdk/src/public/orm/models/cryptoAddress.ts
index 8cbe37d7b..7357c0126 100644
--- a/sdk/constructive-sdk/src/public/orm/models/cryptoAddress.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/cryptoAddress.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CryptoAddressModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CryptoAddressSelect>(
-    args: FindManyArgs<S, CryptoAddressFilter, never, CryptoAddressOrderBy> & {
+    args: FindManyArgs<S, CryptoAddressFilter, CryptoAddressOrderBy> & {
       select: S;
     } & StrictSelect<S, CryptoAddressSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/cryptoAddressesModule.ts b/sdk/constructive-sdk/src/public/orm/models/cryptoAddressesModule.ts
index e90451b95..25af5781a 100644
--- a/sdk/constructive-sdk/src/public/orm/models/cryptoAddressesModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/cryptoAddressesModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CryptoAddressesModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CryptoAddressesModuleSelect>(
-    args: FindManyArgs<S, CryptoAddressesModuleFilter, never, CryptoAddressesModuleOrderBy> & {
+    args: FindManyArgs<S, CryptoAddressesModuleFilter, CryptoAddressesModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, CryptoAddressesModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/cryptoAuthModule.ts b/sdk/constructive-sdk/src/public/orm/models/cryptoAuthModule.ts
index 5aa929484..c654aa3f7 100644
--- a/sdk/constructive-sdk/src/public/orm/models/cryptoAuthModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/cryptoAuthModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class CryptoAuthModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends CryptoAuthModuleSelect>(
-    args: FindManyArgs<S, CryptoAuthModuleFilter, never, CryptoAuthModuleOrderBy> & {
+    args: FindManyArgs<S, CryptoAuthModuleFilter, CryptoAuthModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, CryptoAuthModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/database.ts b/sdk/constructive-sdk/src/public/orm/models/database.ts
index a053e55ca..6a4293010 100644
--- a/sdk/constructive-sdk/src/public/orm/models/database.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/database.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DatabaseModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DatabaseSelect>(
-    args: FindManyArgs<S, DatabaseFilter, never, DatabaseOrderBy> & {
+    args: FindManyArgs<S, DatabaseFilter, DatabaseOrderBy> & {
       select: S;
     } & StrictSelect<S, DatabaseSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/databaseProvisionModule.ts b/sdk/constructive-sdk/src/public/orm/models/databaseProvisionModule.ts
index 256ab0228..4d6c37645 100644
--- a/sdk/constructive-sdk/src/public/orm/models/databaseProvisionModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/databaseProvisionModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DatabaseProvisionModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DatabaseProvisionModuleSelect>(
-    args: FindManyArgs<S, DatabaseProvisionModuleFilter, never, DatabaseProvisionModuleOrderBy> & {
+    args: FindManyArgs<S, DatabaseProvisionModuleFilter, DatabaseProvisionModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, DatabaseProvisionModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/databaseTransfer.ts b/sdk/constructive-sdk/src/public/orm/models/databaseTransfer.ts
index 58d1b392b..e5d347907 100644
--- a/sdk/constructive-sdk/src/public/orm/models/databaseTransfer.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/databaseTransfer.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DatabaseTransferModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DatabaseTransferSelect>(
-    args: FindManyArgs<S, DatabaseTransferFilter, never, DatabaseTransferOrderBy> & {
+    args: FindManyArgs<S, DatabaseTransferFilter, DatabaseTransferOrderBy> & {
       select: S;
     } & StrictSelect<S, DatabaseTransferSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/defaultIdsModule.ts b/sdk/constructive-sdk/src/public/orm/models/defaultIdsModule.ts
index aa81b4a91..aa235bd39 100644
--- a/sdk/constructive-sdk/src/public/orm/models/defaultIdsModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/defaultIdsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DefaultIdsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DefaultIdsModuleSelect>(
-    args: FindManyArgs<S, DefaultIdsModuleFilter, never, DefaultIdsModuleOrderBy> & {
+    args: FindManyArgs<S, DefaultIdsModuleFilter, DefaultIdsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, DefaultIdsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/defaultPrivilege.ts b/sdk/constructive-sdk/src/public/orm/models/defaultPrivilege.ts
index 3e2c9e33b..7041b7b55 100644
--- a/sdk/constructive-sdk/src/public/orm/models/defaultPrivilege.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/defaultPrivilege.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DefaultPrivilegeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DefaultPrivilegeSelect>(
-    args: FindManyArgs<S, DefaultPrivilegeFilter, never, DefaultPrivilegeOrderBy> & {
+    args: FindManyArgs<S, DefaultPrivilegeFilter, DefaultPrivilegeOrderBy> & {
       select: S;
     } & StrictSelect<S, DefaultPrivilegeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/denormalizedTableField.ts b/sdk/constructive-sdk/src/public/orm/models/denormalizedTableField.ts
index 448948388..d94b84104 100644
--- a/sdk/constructive-sdk/src/public/orm/models/denormalizedTableField.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/denormalizedTableField.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DenormalizedTableFieldModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DenormalizedTableFieldSelect>(
-    args: FindManyArgs<S, DenormalizedTableFieldFilter, never, DenormalizedTableFieldOrderBy> & {
+    args: FindManyArgs<S, DenormalizedTableFieldFilter, DenormalizedTableFieldOrderBy> & {
       select: S;
     } & StrictSelect<S, DenormalizedTableFieldSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/domain.ts b/sdk/constructive-sdk/src/public/orm/models/domain.ts
index d90a82bb0..acf05455c 100644
--- a/sdk/constructive-sdk/src/public/orm/models/domain.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/domain.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class DomainModel {
   constructor(private client: OrmClient) {}
   findMany<S extends DomainSelect>(
-    args: FindManyArgs<S, DomainFilter, never, DomainOrderBy> & {
+    args: FindManyArgs<S, DomainFilter, DomainOrderBy> & {
       select: S;
     } & StrictSelect<S, DomainSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/email.ts b/sdk/constructive-sdk/src/public/orm/models/email.ts
index cf129a2d2..aa83efc07 100644
--- a/sdk/constructive-sdk/src/public/orm/models/email.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/email.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EmailModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EmailSelect>(
-    args: FindManyArgs<S, EmailFilter, never, EmailOrderBy> & {
+    args: FindManyArgs<S, EmailFilter, EmailOrderBy> & {
       select: S;
     } & StrictSelect<S, EmailSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/emailsModule.ts b/sdk/constructive-sdk/src/public/orm/models/emailsModule.ts
index 11ae816ce..984018c0c 100644
--- a/sdk/constructive-sdk/src/public/orm/models/emailsModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/emailsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EmailsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EmailsModuleSelect>(
-    args: FindManyArgs<S, EmailsModuleFilter, never, EmailsModuleOrderBy> & {
+    args: FindManyArgs<S, EmailsModuleFilter, EmailsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, EmailsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/embeddingChunk.ts b/sdk/constructive-sdk/src/public/orm/models/embeddingChunk.ts
index c44b9ed55..6c175145d 100644
--- a/sdk/constructive-sdk/src/public/orm/models/embeddingChunk.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/embeddingChunk.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EmbeddingChunkModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EmbeddingChunkSelect>(
-    args: FindManyArgs<S, EmbeddingChunkFilter, never, EmbeddingChunkOrderBy> & {
+    args: FindManyArgs<S, EmbeddingChunkFilter, EmbeddingChunkOrderBy> & {
       select: S;
     } & StrictSelect<S, EmbeddingChunkSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/encryptedSecretsModule.ts b/sdk/constructive-sdk/src/public/orm/models/encryptedSecretsModule.ts
index 49b9cdc3e..8656f0937 100644
--- a/sdk/constructive-sdk/src/public/orm/models/encryptedSecretsModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/encryptedSecretsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EncryptedSecretsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EncryptedSecretsModuleSelect>(
-    args: FindManyArgs<S, EncryptedSecretsModuleFilter, never, EncryptedSecretsModuleOrderBy> & {
+    args: FindManyArgs<S, EncryptedSecretsModuleFilter, EncryptedSecretsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, EncryptedSecretsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/enum.ts b/sdk/constructive-sdk/src/public/orm/models/enum.ts
index c5da5f40b..1e0e12ee3 100644
--- a/sdk/constructive-sdk/src/public/orm/models/enum.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/enum.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class EnumModel {
   constructor(private client: OrmClient) {}
   findMany<S extends EnumSelect>(
-    args: FindManyArgs<S, EnumFilter, never, EnumOrderBy> & {
+    args: FindManyArgs<S, EnumFilter, EnumOrderBy> & {
       select: S;
     } & StrictSelect<S, EnumSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/field.ts b/sdk/constructive-sdk/src/public/orm/models/field.ts
index fe784abc0..d8e8fc4ee 100644
--- a/sdk/constructive-sdk/src/public/orm/models/field.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/field.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class FieldModel {
   constructor(private client: OrmClient) {}
   findMany<S extends FieldSelect>(
-    args: FindManyArgs<S, FieldFilter, never, FieldOrderBy> & {
+    args: FindManyArgs<S, FieldFilter, FieldOrderBy> & {
       select: S;
     } & StrictSelect<S, FieldSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/foreignKeyConstraint.ts b/sdk/constructive-sdk/src/public/orm/models/foreignKeyConstraint.ts
index 0b96b62d7..951dc4fe2 100644
--- a/sdk/constructive-sdk/src/public/orm/models/foreignKeyConstraint.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/foreignKeyConstraint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ForeignKeyConstraintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ForeignKeyConstraintSelect>(
-    args: FindManyArgs<S, ForeignKeyConstraintFilter, never, ForeignKeyConstraintOrderBy> & {
+    args: FindManyArgs<S, ForeignKeyConstraintFilter, ForeignKeyConstraintOrderBy> & {
       select: S;
     } & StrictSelect<S, ForeignKeyConstraintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/fullTextSearch.ts b/sdk/constructive-sdk/src/public/orm/models/fullTextSearch.ts
index f53ad57a8..a0a592138 100644
--- a/sdk/constructive-sdk/src/public/orm/models/fullTextSearch.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/fullTextSearch.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class FullTextSearchModel {
   constructor(private client: OrmClient) {}
   findMany<S extends FullTextSearchSelect>(
-    args: FindManyArgs<S, FullTextSearchFilter, never, FullTextSearchOrderBy> & {
+    args: FindManyArgs<S, FullTextSearchFilter, FullTextSearchOrderBy> & {
       select: S;
     } & StrictSelect<S, FullTextSearchSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/getAllRecord.ts b/sdk/constructive-sdk/src/public/orm/models/getAllRecord.ts
index 94a06bdd9..53873a0f3 100644
--- a/sdk/constructive-sdk/src/public/orm/models/getAllRecord.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/getAllRecord.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class GetAllRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends GetAllRecordSelect>(
-    args: FindManyArgs<S, GetAllRecordFilter, never, GetAllRecordsOrderBy> & {
+    args: FindManyArgs<S, GetAllRecordFilter, GetAllRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, GetAllRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/hierarchyModule.ts b/sdk/constructive-sdk/src/public/orm/models/hierarchyModule.ts
index 8e570f16b..325927bd5 100644
--- a/sdk/constructive-sdk/src/public/orm/models/hierarchyModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/hierarchyModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class HierarchyModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends HierarchyModuleSelect>(
-    args: FindManyArgs<S, HierarchyModuleFilter, never, HierarchyModuleOrderBy> & {
+    args: FindManyArgs<S, HierarchyModuleFilter, HierarchyModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, HierarchyModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/indexModel.ts b/sdk/constructive-sdk/src/public/orm/models/indexModel.ts
index 2782876f8..052334e57 100644
--- a/sdk/constructive-sdk/src/public/orm/models/indexModel.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/indexModel.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class IndexModel {
   constructor(private client: OrmClient) {}
   findMany<S extends IndexSelect>(
-    args: FindManyArgs<S, IndexFilter, never, IndexOrderBy> & {
+    args: FindManyArgs<S, IndexFilter, IndexOrderBy> & {
       select: S;
     } & StrictSelect<S, IndexSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/invite.ts b/sdk/constructive-sdk/src/public/orm/models/invite.ts
index 05d88af09..8fabe0aec 100644
--- a/sdk/constructive-sdk/src/public/orm/models/invite.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/invite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class InviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends InviteSelect>(
-    args: FindManyArgs<S, InviteFilter, never, InviteOrderBy> & {
+    args: FindManyArgs<S, InviteFilter, InviteOrderBy> & {
       select: S;
     } & StrictSelect<S, InviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/invitesModule.ts b/sdk/constructive-sdk/src/public/orm/models/invitesModule.ts
index 52aeb72c4..f7999f502 100644
--- a/sdk/constructive-sdk/src/public/orm/models/invitesModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/invitesModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class InvitesModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends InvitesModuleSelect>(
-    args: FindManyArgs<S, InvitesModuleFilter, never, InvitesModuleOrderBy> & {
+    args: FindManyArgs<S, InvitesModuleFilter, InvitesModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, InvitesModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/levelsModule.ts b/sdk/constructive-sdk/src/public/orm/models/levelsModule.ts
index 77eeea28d..0c758ad86 100644
--- a/sdk/constructive-sdk/src/public/orm/models/levelsModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/levelsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class LevelsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends LevelsModuleSelect>(
-    args: FindManyArgs<S, LevelsModuleFilter, never, LevelsModuleOrderBy> & {
+    args: FindManyArgs<S, LevelsModuleFilter, LevelsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, LevelsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/limitsModule.ts b/sdk/constructive-sdk/src/public/orm/models/limitsModule.ts
index 41c850afe..10e89be1d 100644
--- a/sdk/constructive-sdk/src/public/orm/models/limitsModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/limitsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class LimitsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends LimitsModuleSelect>(
-    args: FindManyArgs<S, LimitsModuleFilter, never, LimitsModuleOrderBy> & {
+    args: FindManyArgs<S, LimitsModuleFilter, LimitsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, LimitsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/membershipType.ts b/sdk/constructive-sdk/src/public/orm/models/membershipType.ts
index bc8b65d9e..40fac5490 100644
--- a/sdk/constructive-sdk/src/public/orm/models/membershipType.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/membershipType.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MembershipTypeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MembershipTypeSelect>(
-    args: FindManyArgs<S, MembershipTypeFilter, never, MembershipTypeOrderBy> & {
+    args: FindManyArgs<S, MembershipTypeFilter, MembershipTypeOrderBy> & {
       select: S;
     } & StrictSelect<S, MembershipTypeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/membershipTypesModule.ts b/sdk/constructive-sdk/src/public/orm/models/membershipTypesModule.ts
index e49903cc2..31807c914 100644
--- a/sdk/constructive-sdk/src/public/orm/models/membershipTypesModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/membershipTypesModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MembershipTypesModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MembershipTypesModuleSelect>(
-    args: FindManyArgs<S, MembershipTypesModuleFilter, never, MembershipTypesModuleOrderBy> & {
+    args: FindManyArgs<S, MembershipTypesModuleFilter, MembershipTypesModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, MembershipTypesModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/membershipsModule.ts b/sdk/constructive-sdk/src/public/orm/models/membershipsModule.ts
index 2b46f663e..b1ce2f836 100644
--- a/sdk/constructive-sdk/src/public/orm/models/membershipsModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/membershipsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MembershipsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MembershipsModuleSelect>(
-    args: FindManyArgs<S, MembershipsModuleFilter, never, MembershipsModuleOrderBy> & {
+    args: FindManyArgs<S, MembershipsModuleFilter, MembershipsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, MembershipsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/migrateFile.ts b/sdk/constructive-sdk/src/public/orm/models/migrateFile.ts
index 17d47149a..35bfa715e 100644
--- a/sdk/constructive-sdk/src/public/orm/models/migrateFile.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/migrateFile.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MigrateFileModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MigrateFileSelect>(
-    args: FindManyArgs<S, MigrateFileFilter, never, MigrateFileOrderBy> & {
+    args: FindManyArgs<S, MigrateFileFilter, MigrateFileOrderBy> & {
       select: S;
     } & StrictSelect<S, MigrateFileSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/object.ts b/sdk/constructive-sdk/src/public/orm/models/object.ts
index 1cbe85b7c..085bdd4df 100644
--- a/sdk/constructive-sdk/src/public/orm/models/object.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/object.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ObjectModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ObjectSelect>(
-    args: FindManyArgs<S, ObjectFilter, never, ObjectOrderBy> & {
+    args: FindManyArgs<S, ObjectFilter, ObjectOrderBy> & {
       select: S;
     } & StrictSelect<S, ObjectSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgAdminGrant.ts b/sdk/constructive-sdk/src/public/orm/models/orgAdminGrant.ts
index 5378a74f0..e611a8578 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgAdminGrant.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgAdminGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgAdminGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgAdminGrantSelect>(
-    args: FindManyArgs<S, OrgAdminGrantFilter, never, OrgAdminGrantOrderBy> & {
+    args: FindManyArgs<S, OrgAdminGrantFilter, OrgAdminGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgAdminGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgChartEdge.ts b/sdk/constructive-sdk/src/public/orm/models/orgChartEdge.ts
index 8a71ab56f..6c6fc84cc 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgChartEdge.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgChartEdge.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgChartEdgeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgChartEdgeSelect>(
-    args: FindManyArgs<S, OrgChartEdgeFilter, never, OrgChartEdgeOrderBy> & {
+    args: FindManyArgs<S, OrgChartEdgeFilter, OrgChartEdgeOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgChartEdgeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgChartEdgeGrant.ts b/sdk/constructive-sdk/src/public/orm/models/orgChartEdgeGrant.ts
index b048dead6..58345c78d 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgChartEdgeGrant.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgChartEdgeGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgChartEdgeGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgChartEdgeGrantSelect>(
-    args: FindManyArgs<S, OrgChartEdgeGrantFilter, never, OrgChartEdgeGrantOrderBy> & {
+    args: FindManyArgs<S, OrgChartEdgeGrantFilter, OrgChartEdgeGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgChartEdgeGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgClaimedInvite.ts b/sdk/constructive-sdk/src/public/orm/models/orgClaimedInvite.ts
index 75975b11b..475de7291 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgClaimedInvite.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgClaimedInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgClaimedInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgClaimedInviteSelect>(
-    args: FindManyArgs<S, OrgClaimedInviteFilter, never, OrgClaimedInviteOrderBy> & {
+    args: FindManyArgs<S, OrgClaimedInviteFilter, OrgClaimedInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgClaimedInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgGetManagersRecord.ts b/sdk/constructive-sdk/src/public/orm/models/orgGetManagersRecord.ts
index e8f5a29ec..9a0cefa8a 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgGetManagersRecord.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgGetManagersRecord.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGetManagersRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGetManagersRecordSelect>(
-    args: FindManyArgs<S, OrgGetManagersRecordFilter, never, OrgGetManagersRecordsOrderBy> & {
+    args: FindManyArgs<S, OrgGetManagersRecordFilter, OrgGetManagersRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGetManagersRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgGetSubordinatesRecord.ts b/sdk/constructive-sdk/src/public/orm/models/orgGetSubordinatesRecord.ts
index be9fa6a62..5eeec50ca 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgGetSubordinatesRecord.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgGetSubordinatesRecord.ts
@@ -37,12 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGetSubordinatesRecordModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGetSubordinatesRecordSelect>(
-    args: FindManyArgs<
-      S,
-      OrgGetSubordinatesRecordFilter,
-      never,
-      OrgGetSubordinatesRecordsOrderBy
-    > & {
+    args: FindManyArgs<S, OrgGetSubordinatesRecordFilter, OrgGetSubordinatesRecordsOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGetSubordinatesRecordSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgGrant.ts b/sdk/constructive-sdk/src/public/orm/models/orgGrant.ts
index 23c9cd546..291264ec5 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgGrant.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgGrantSelect>(
-    args: FindManyArgs<S, OrgGrantFilter, never, OrgGrantOrderBy> & {
+    args: FindManyArgs<S, OrgGrantFilter, OrgGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgInvite.ts b/sdk/constructive-sdk/src/public/orm/models/orgInvite.ts
index cacca9210..639cb8dd5 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgInvite.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgInvite.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgInviteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgInviteSelect>(
-    args: FindManyArgs<S, OrgInviteFilter, never, OrgInviteOrderBy> & {
+    args: FindManyArgs<S, OrgInviteFilter, OrgInviteOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgInviteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgLimit.ts b/sdk/constructive-sdk/src/public/orm/models/orgLimit.ts
index ab50514ae..2d7937963 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgLimit.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgLimit.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgLimitModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgLimitSelect>(
-    args: FindManyArgs<S, OrgLimitFilter, never, OrgLimitOrderBy> & {
+    args: FindManyArgs<S, OrgLimitFilter, OrgLimitOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgLimitSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgLimitDefault.ts b/sdk/constructive-sdk/src/public/orm/models/orgLimitDefault.ts
index d8c76fb6a..bf0cfcf5e 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgLimitDefault.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgLimitDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgLimitDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgLimitDefaultSelect>(
-    args: FindManyArgs<S, OrgLimitDefaultFilter, never, OrgLimitDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgLimitDefaultFilter, OrgLimitDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgLimitDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgMember.ts b/sdk/constructive-sdk/src/public/orm/models/orgMember.ts
index 8575c7fdc..dd1d20e45 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgMember.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgMember.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMemberModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMemberSelect>(
-    args: FindManyArgs<S, OrgMemberFilter, never, OrgMemberOrderBy> & {
+    args: FindManyArgs<S, OrgMemberFilter, OrgMemberOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMemberSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgMembership.ts b/sdk/constructive-sdk/src/public/orm/models/orgMembership.ts
index 20d60836a..c0173b3e1 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgMembership.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgMembership.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMembershipModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMembershipSelect>(
-    args: FindManyArgs<S, OrgMembershipFilter, never, OrgMembershipOrderBy> & {
+    args: FindManyArgs<S, OrgMembershipFilter, OrgMembershipOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMembershipSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgMembershipDefault.ts b/sdk/constructive-sdk/src/public/orm/models/orgMembershipDefault.ts
index 83b9f7dea..09d525bec 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgMembershipDefault.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgMembershipDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgMembershipDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgMembershipDefaultSelect>(
-    args: FindManyArgs<S, OrgMembershipDefaultFilter, never, OrgMembershipDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgMembershipDefaultFilter, OrgMembershipDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgMembershipDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgOwnerGrant.ts b/sdk/constructive-sdk/src/public/orm/models/orgOwnerGrant.ts
index 136082317..bdf045511 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgOwnerGrant.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgOwnerGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgOwnerGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgOwnerGrantSelect>(
-    args: FindManyArgs<S, OrgOwnerGrantFilter, never, OrgOwnerGrantOrderBy> & {
+    args: FindManyArgs<S, OrgOwnerGrantFilter, OrgOwnerGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgOwnerGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgPermission.ts b/sdk/constructive-sdk/src/public/orm/models/orgPermission.ts
index 256395283..c5910be63 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgPermission.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgPermission.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgPermissionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgPermissionSelect>(
-    args: FindManyArgs<S, OrgPermissionFilter, never, OrgPermissionOrderBy> & {
+    args: FindManyArgs<S, OrgPermissionFilter, OrgPermissionOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgPermissionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/orgPermissionDefault.ts b/sdk/constructive-sdk/src/public/orm/models/orgPermissionDefault.ts
index 18631fd2d..40389a11b 100644
--- a/sdk/constructive-sdk/src/public/orm/models/orgPermissionDefault.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/orgPermissionDefault.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class OrgPermissionDefaultModel {
   constructor(private client: OrmClient) {}
   findMany<S extends OrgPermissionDefaultSelect>(
-    args: FindManyArgs<S, OrgPermissionDefaultFilter, never, OrgPermissionDefaultOrderBy> & {
+    args: FindManyArgs<S, OrgPermissionDefaultFilter, OrgPermissionDefaultOrderBy> & {
       select: S;
     } & StrictSelect<S, OrgPermissionDefaultSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/permissionsModule.ts b/sdk/constructive-sdk/src/public/orm/models/permissionsModule.ts
index 2a797d3b8..6066e6218 100644
--- a/sdk/constructive-sdk/src/public/orm/models/permissionsModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/permissionsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PermissionsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PermissionsModuleSelect>(
-    args: FindManyArgs<S, PermissionsModuleFilter, never, PermissionsModuleOrderBy> & {
+    args: FindManyArgs<S, PermissionsModuleFilter, PermissionsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, PermissionsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/phoneNumber.ts b/sdk/constructive-sdk/src/public/orm/models/phoneNumber.ts
index 592b010fa..a711db272 100644
--- a/sdk/constructive-sdk/src/public/orm/models/phoneNumber.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/phoneNumber.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PhoneNumberModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PhoneNumberSelect>(
-    args: FindManyArgs<S, PhoneNumberFilter, never, PhoneNumberOrderBy> & {
+    args: FindManyArgs<S, PhoneNumberFilter, PhoneNumberOrderBy> & {
       select: S;
     } & StrictSelect<S, PhoneNumberSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/phoneNumbersModule.ts b/sdk/constructive-sdk/src/public/orm/models/phoneNumbersModule.ts
index e844b2055..9b3da81ae 100644
--- a/sdk/constructive-sdk/src/public/orm/models/phoneNumbersModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/phoneNumbersModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PhoneNumbersModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PhoneNumbersModuleSelect>(
-    args: FindManyArgs<S, PhoneNumbersModuleFilter, never, PhoneNumbersModuleOrderBy> & {
+    args: FindManyArgs<S, PhoneNumbersModuleFilter, PhoneNumbersModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, PhoneNumbersModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/policy.ts b/sdk/constructive-sdk/src/public/orm/models/policy.ts
index 82e6d4e95..c76c4a3ad 100644
--- a/sdk/constructive-sdk/src/public/orm/models/policy.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/policy.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PolicyModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PolicySelect>(
-    args: FindManyArgs<S, PolicyFilter, never, PolicyOrderBy> & {
+    args: FindManyArgs<S, PolicyFilter, PolicyOrderBy> & {
       select: S;
     } & StrictSelect<S, PolicySelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/primaryKeyConstraint.ts b/sdk/constructive-sdk/src/public/orm/models/primaryKeyConstraint.ts
index 81c3f19e3..f1d79e61c 100644
--- a/sdk/constructive-sdk/src/public/orm/models/primaryKeyConstraint.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/primaryKeyConstraint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class PrimaryKeyConstraintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends PrimaryKeyConstraintSelect>(
-    args: FindManyArgs<S, PrimaryKeyConstraintFilter, never, PrimaryKeyConstraintOrderBy> & {
+    args: FindManyArgs<S, PrimaryKeyConstraintFilter, PrimaryKeyConstraintOrderBy> & {
       select: S;
     } & StrictSelect<S, PrimaryKeyConstraintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/profilesModule.ts b/sdk/constructive-sdk/src/public/orm/models/profilesModule.ts
index e48c6fedb..7841e9222 100644
--- a/sdk/constructive-sdk/src/public/orm/models/profilesModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/profilesModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ProfilesModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ProfilesModuleSelect>(
-    args: FindManyArgs<S, ProfilesModuleFilter, never, ProfilesModuleOrderBy> & {
+    args: FindManyArgs<S, ProfilesModuleFilter, ProfilesModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, ProfilesModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/ref.ts b/sdk/constructive-sdk/src/public/orm/models/ref.ts
index 6a128cc2f..016c70644 100644
--- a/sdk/constructive-sdk/src/public/orm/models/ref.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/ref.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RefModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RefSelect>(
-    args: FindManyArgs<S, RefFilter, never, RefOrderBy> & {
+    args: FindManyArgs<S, RefFilter, RefOrderBy> & {
       select: S;
     } & StrictSelect<S, RefSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/relationProvision.ts b/sdk/constructive-sdk/src/public/orm/models/relationProvision.ts
index 75b413246..5d27d5872 100644
--- a/sdk/constructive-sdk/src/public/orm/models/relationProvision.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/relationProvision.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RelationProvisionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RelationProvisionSelect>(
-    args: FindManyArgs<S, RelationProvisionFilter, never, RelationProvisionOrderBy> & {
+    args: FindManyArgs<S, RelationProvisionFilter, RelationProvisionOrderBy> & {
       select: S;
     } & StrictSelect<S, RelationProvisionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/rlsModule.ts b/sdk/constructive-sdk/src/public/orm/models/rlsModule.ts
index fb9b58f3b..750815c7b 100644
--- a/sdk/constructive-sdk/src/public/orm/models/rlsModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/rlsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RlsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RlsModuleSelect>(
-    args: FindManyArgs<S, RlsModuleFilter, never, RlsModuleOrderBy> & {
+    args: FindManyArgs<S, RlsModuleFilter, RlsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, RlsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/roleType.ts b/sdk/constructive-sdk/src/public/orm/models/roleType.ts
index 58716fc1e..5b258dc9a 100644
--- a/sdk/constructive-sdk/src/public/orm/models/roleType.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/roleType.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class RoleTypeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends RoleTypeSelect>(
-    args: FindManyArgs<S, RoleTypeFilter, never, RoleTypeOrderBy> & {
+    args: FindManyArgs<S, RoleTypeFilter, RoleTypeOrderBy> & {
       select: S;
     } & StrictSelect<S, RoleTypeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/schema.ts b/sdk/constructive-sdk/src/public/orm/models/schema.ts
index e4f823235..5bc546943 100644
--- a/sdk/constructive-sdk/src/public/orm/models/schema.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/schema.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SchemaModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SchemaSelect>(
-    args: FindManyArgs<S, SchemaFilter, never, SchemaOrderBy> & {
+    args: FindManyArgs<S, SchemaFilter, SchemaOrderBy> & {
       select: S;
     } & StrictSelect<S, SchemaSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/schemaGrant.ts b/sdk/constructive-sdk/src/public/orm/models/schemaGrant.ts
index 472d017e3..97671a523 100644
--- a/sdk/constructive-sdk/src/public/orm/models/schemaGrant.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/schemaGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SchemaGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SchemaGrantSelect>(
-    args: FindManyArgs<S, SchemaGrantFilter, never, SchemaGrantOrderBy> & {
+    args: FindManyArgs<S, SchemaGrantFilter, SchemaGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, SchemaGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/secretsModule.ts b/sdk/constructive-sdk/src/public/orm/models/secretsModule.ts
index 6a292713e..808b0154d 100644
--- a/sdk/constructive-sdk/src/public/orm/models/secretsModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/secretsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SecretsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SecretsModuleSelect>(
-    args: FindManyArgs<S, SecretsModuleFilter, never, SecretsModuleOrderBy> & {
+    args: FindManyArgs<S, SecretsModuleFilter, SecretsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, SecretsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/secureTableProvision.ts b/sdk/constructive-sdk/src/public/orm/models/secureTableProvision.ts
index 7784ac351..585ea33c9 100644
--- a/sdk/constructive-sdk/src/public/orm/models/secureTableProvision.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/secureTableProvision.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SecureTableProvisionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SecureTableProvisionSelect>(
-    args: FindManyArgs<S, SecureTableProvisionFilter, never, SecureTableProvisionOrderBy> & {
+    args: FindManyArgs<S, SecureTableProvisionFilter, SecureTableProvisionOrderBy> & {
       select: S;
     } & StrictSelect<S, SecureTableProvisionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/sessionsModule.ts b/sdk/constructive-sdk/src/public/orm/models/sessionsModule.ts
index 03456dfa5..01cf5198a 100644
--- a/sdk/constructive-sdk/src/public/orm/models/sessionsModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/sessionsModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SessionsModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SessionsModuleSelect>(
-    args: FindManyArgs<S, SessionsModuleFilter, never, SessionsModuleOrderBy> & {
+    args: FindManyArgs<S, SessionsModuleFilter, SessionsModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, SessionsModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/site.ts b/sdk/constructive-sdk/src/public/orm/models/site.ts
index 027a17a9a..fa790b4d1 100644
--- a/sdk/constructive-sdk/src/public/orm/models/site.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/site.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SiteModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SiteSelect>(
-    args: FindManyArgs<S, SiteFilter, never, SiteOrderBy> & {
+    args: FindManyArgs<S, SiteFilter, SiteOrderBy> & {
       select: S;
     } & StrictSelect<S, SiteSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/siteMetadatum.ts b/sdk/constructive-sdk/src/public/orm/models/siteMetadatum.ts
index 0cad9ee3f..629c19725 100644
--- a/sdk/constructive-sdk/src/public/orm/models/siteMetadatum.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/siteMetadatum.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SiteMetadatumModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SiteMetadatumSelect>(
-    args: FindManyArgs<S, SiteMetadatumFilter, never, SiteMetadatumOrderBy> & {
+    args: FindManyArgs<S, SiteMetadatumFilter, SiteMetadatumOrderBy> & {
       select: S;
     } & StrictSelect<S, SiteMetadatumSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/siteModule.ts b/sdk/constructive-sdk/src/public/orm/models/siteModule.ts
index 8aa439832..943a6d7ae 100644
--- a/sdk/constructive-sdk/src/public/orm/models/siteModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/siteModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SiteModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SiteModuleSelect>(
-    args: FindManyArgs<S, SiteModuleFilter, never, SiteModuleOrderBy> & {
+    args: FindManyArgs<S, SiteModuleFilter, SiteModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, SiteModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/siteTheme.ts b/sdk/constructive-sdk/src/public/orm/models/siteTheme.ts
index 9f7d1f399..da7e85ab8 100644
--- a/sdk/constructive-sdk/src/public/orm/models/siteTheme.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/siteTheme.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SiteThemeModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SiteThemeSelect>(
-    args: FindManyArgs<S, SiteThemeFilter, never, SiteThemeOrderBy> & {
+    args: FindManyArgs<S, SiteThemeFilter, SiteThemeOrderBy> & {
       select: S;
     } & StrictSelect<S, SiteThemeSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/sqlAction.ts b/sdk/constructive-sdk/src/public/orm/models/sqlAction.ts
index 9235c79f9..449f16020 100644
--- a/sdk/constructive-sdk/src/public/orm/models/sqlAction.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/sqlAction.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SqlActionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SqlActionSelect>(
-    args: FindManyArgs<S, SqlActionFilter, never, SqlActionOrderBy> & {
+    args: FindManyArgs<S, SqlActionFilter, SqlActionOrderBy> & {
       select: S;
     } & StrictSelect<S, SqlActionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/storageModule.ts b/sdk/constructive-sdk/src/public/orm/models/storageModule.ts
index 347c71c81..cbfeb5b1e 100644
--- a/sdk/constructive-sdk/src/public/orm/models/storageModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/storageModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class StorageModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends StorageModuleSelect>(
-    args: FindManyArgs<S, StorageModuleFilter, never, StorageModuleOrderBy> & {
+    args: FindManyArgs<S, StorageModuleFilter, StorageModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, StorageModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/store.ts b/sdk/constructive-sdk/src/public/orm/models/store.ts
index b372bd4c4..f249ee921 100644
--- a/sdk/constructive-sdk/src/public/orm/models/store.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/store.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class StoreModel {
   constructor(private client: OrmClient) {}
   findMany<S extends StoreSelect>(
-    args: FindManyArgs<S, StoreFilter, never, StoreOrderBy> & {
+    args: FindManyArgs<S, StoreFilter, StoreOrderBy> & {
       select: S;
     } & StrictSelect<S, StoreSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/table.ts b/sdk/constructive-sdk/src/public/orm/models/table.ts
index f4ba83e84..c10b604a3 100644
--- a/sdk/constructive-sdk/src/public/orm/models/table.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/table.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TableModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TableSelect>(
-    args: FindManyArgs<S, TableFilter, never, TableOrderBy> & {
+    args: FindManyArgs<S, TableFilter, TableOrderBy> & {
       select: S;
     } & StrictSelect<S, TableSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/tableGrant.ts b/sdk/constructive-sdk/src/public/orm/models/tableGrant.ts
index c5d976be5..02d19136c 100644
--- a/sdk/constructive-sdk/src/public/orm/models/tableGrant.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/tableGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TableGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TableGrantSelect>(
-    args: FindManyArgs<S, TableGrantFilter, never, TableGrantOrderBy> & {
+    args: FindManyArgs<S, TableGrantFilter, TableGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, TableGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/tableTemplateModule.ts b/sdk/constructive-sdk/src/public/orm/models/tableTemplateModule.ts
index 57c161ee3..c08032798 100644
--- a/sdk/constructive-sdk/src/public/orm/models/tableTemplateModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/tableTemplateModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TableTemplateModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TableTemplateModuleSelect>(
-    args: FindManyArgs<S, TableTemplateModuleFilter, never, TableTemplateModuleOrderBy> & {
+    args: FindManyArgs<S, TableTemplateModuleFilter, TableTemplateModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, TableTemplateModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/trigger.ts b/sdk/constructive-sdk/src/public/orm/models/trigger.ts
index cf7947984..3e2404f0e 100644
--- a/sdk/constructive-sdk/src/public/orm/models/trigger.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/trigger.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TriggerModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TriggerSelect>(
-    args: FindManyArgs<S, TriggerFilter, never, TriggerOrderBy> & {
+    args: FindManyArgs<S, TriggerFilter, TriggerOrderBy> & {
       select: S;
     } & StrictSelect<S, TriggerSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/triggerFunction.ts b/sdk/constructive-sdk/src/public/orm/models/triggerFunction.ts
index d9fbab79d..999438070 100644
--- a/sdk/constructive-sdk/src/public/orm/models/triggerFunction.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/triggerFunction.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class TriggerFunctionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends TriggerFunctionSelect>(
-    args: FindManyArgs<S, TriggerFunctionFilter, never, TriggerFunctionOrderBy> & {
+    args: FindManyArgs<S, TriggerFunctionFilter, TriggerFunctionOrderBy> & {
       select: S;
     } & StrictSelect<S, TriggerFunctionSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/uniqueConstraint.ts b/sdk/constructive-sdk/src/public/orm/models/uniqueConstraint.ts
index 97f50e176..de5ba6f76 100644
--- a/sdk/constructive-sdk/src/public/orm/models/uniqueConstraint.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/uniqueConstraint.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UniqueConstraintModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UniqueConstraintSelect>(
-    args: FindManyArgs<S, UniqueConstraintFilter, never, UniqueConstraintOrderBy> & {
+    args: FindManyArgs<S, UniqueConstraintFilter, UniqueConstraintOrderBy> & {
       select: S;
     } & StrictSelect<S, UniqueConstraintSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/user.ts b/sdk/constructive-sdk/src/public/orm/models/user.ts
index ada9a0e34..aedd4fcc8 100644
--- a/sdk/constructive-sdk/src/public/orm/models/user.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/user.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UserModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UserSelect>(
-    args: FindManyArgs<S, UserFilter, never, UserOrderBy> & {
+    args: FindManyArgs<S, UserFilter, UserOrderBy> & {
       select: S;
     } & StrictSelect<S, UserSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/userAuthModule.ts b/sdk/constructive-sdk/src/public/orm/models/userAuthModule.ts
index 1c641932e..431026d87 100644
--- a/sdk/constructive-sdk/src/public/orm/models/userAuthModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/userAuthModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UserAuthModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UserAuthModuleSelect>(
-    args: FindManyArgs<S, UserAuthModuleFilter, never, UserAuthModuleOrderBy> & {
+    args: FindManyArgs<S, UserAuthModuleFilter, UserAuthModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, UserAuthModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/usersModule.ts b/sdk/constructive-sdk/src/public/orm/models/usersModule.ts
index 4ff2a4fd9..c5b6d361b 100644
--- a/sdk/constructive-sdk/src/public/orm/models/usersModule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/usersModule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class UsersModuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends UsersModuleSelect>(
-    args: FindManyArgs<S, UsersModuleFilter, never, UsersModuleOrderBy> & {
+    args: FindManyArgs<S, UsersModuleFilter, UsersModuleOrderBy> & {
       select: S;
     } & StrictSelect<S, UsersModuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/view.ts b/sdk/constructive-sdk/src/public/orm/models/view.ts
index ba3b478f5..5e7fa5f74 100644
--- a/sdk/constructive-sdk/src/public/orm/models/view.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/view.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ViewModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ViewSelect>(
-    args: FindManyArgs<S, ViewFilter, never, ViewOrderBy> & {
+    args: FindManyArgs<S, ViewFilter, ViewOrderBy> & {
       select: S;
     } & StrictSelect<S, ViewSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/viewGrant.ts b/sdk/constructive-sdk/src/public/orm/models/viewGrant.ts
index d760efc09..1023b5f7f 100644
--- a/sdk/constructive-sdk/src/public/orm/models/viewGrant.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/viewGrant.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ViewGrantModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ViewGrantSelect>(
-    args: FindManyArgs<S, ViewGrantFilter, never, ViewGrantOrderBy> & {
+    args: FindManyArgs<S, ViewGrantFilter, ViewGrantOrderBy> & {
       select: S;
     } & StrictSelect<S, ViewGrantSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/viewRule.ts b/sdk/constructive-sdk/src/public/orm/models/viewRule.ts
index 85692955e..101bd199a 100644
--- a/sdk/constructive-sdk/src/public/orm/models/viewRule.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/viewRule.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ViewRuleModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ViewRuleSelect>(
-    args: FindManyArgs<S, ViewRuleFilter, never, ViewRuleOrderBy> & {
+    args: FindManyArgs<S, ViewRuleFilter, ViewRuleOrderBy> & {
       select: S;
     } & StrictSelect<S, ViewRuleSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/models/viewTable.ts b/sdk/constructive-sdk/src/public/orm/models/viewTable.ts
index 0011002e1..a37e7137b 100644
--- a/sdk/constructive-sdk/src/public/orm/models/viewTable.ts
+++ b/sdk/constructive-sdk/src/public/orm/models/viewTable.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class ViewTableModel {
   constructor(private client: OrmClient) {}
   findMany<S extends ViewTableSelect>(
-    args: FindManyArgs<S, ViewTableFilter, never, ViewTableOrderBy> & {
+    args: FindManyArgs<S, ViewTableFilter, ViewTableOrderBy> & {
       select: S;
     } & StrictSelect<S, ViewTableSelect>
   ): QueryBuilder<{
diff --git a/sdk/constructive-sdk/src/public/orm/mutation/index.ts b/sdk/constructive-sdk/src/public/orm/mutation/index.ts
index 9302abc18..a2bc9ca55 100644
--- a/sdk/constructive-sdk/src/public/orm/mutation/index.ts
+++ b/sdk/constructive-sdk/src/public/orm/mutation/index.ts
@@ -182,7 +182,7 @@ export interface InitEmptyRepoVariables {
 }
 /**
  * Variables for constructBlueprint
- * Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with all nodes[], fields[], policies[], grants, and table-level indexes/fts/unique_constraints in a single call, (2) provision_relation() for each relation, (3) provision_index() for top-level indexes, (4) provision_full_text_search() for top-level FTS, (5) provision_unique_constraint() for top-level unique constraints. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
+ * Executes a blueprint definition by delegating to provision_* procedures. Creates a blueprint_construction record to track the attempt. Five phases: (1) provision_table() for each table with nodes[], fields[], policies[], and grants (table-level indexes/fts/unique_constraints are deferred), (2) provision_relation() for each relation, (3) provision_index() for top-level + deferred indexes, (4) provision_full_text_search() for top-level + deferred FTS, (5) provision_unique_constraint() for top-level + deferred unique constraints. Table-level indexes/fts/unique_constraints are deferred to phases 3-5 so they can reference columns created by relations in phase 2. Tables are identified by table_name with optional per-table schema_name. Relations use $type for relation_type with source_table/target_table. Returns the construction record ID on success, NULL on failure.
  */
 export interface ConstructBlueprintVariables {
   input: ConstructBlueprintInput;
diff --git a/sdk/constructive-sdk/src/public/orm/query-builder.ts b/sdk/constructive-sdk/src/public/orm/query-builder.ts
index 8dbcb9646..b0261f895 100644
--- a/sdk/constructive-sdk/src/public/orm/query-builder.ts
+++ b/sdk/constructive-sdk/src/public/orm/query-builder.ts
@@ -189,13 +189,12 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindManyDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
   args: {
     where?: TWhere;
-    condition?: TCondition;
     orderBy?: string[];
     first?: number;
     last?: number;
@@ -205,8 +204,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   },
   filterTypeName: string,
   orderByTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -216,16 +214,6 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   const queryArgs: ArgumentNode[] = [];
   const variables: Record<string, unknown> = {};
 
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
@@ -301,14 +289,13 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindFirstDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
-  args: { where?: TWhere; condition?: TCondition },
+  args: { where?: TWhere },
   filterTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -325,16 +312,6 @@ export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
     queryArgs,
     variables
   );
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
diff --git a/sdk/constructive-sdk/src/public/orm/select-types.ts b/sdk/constructive-sdk/src/public/orm/select-types.ts
index 919d1b935..2621b3570 100644
--- a/sdk/constructive-sdk/src/public/orm/select-types.ts
+++ b/sdk/constructive-sdk/src/public/orm/select-types.ts
@@ -16,10 +16,9 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
+export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -28,10 +27,9 @@ export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = ne
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
+export interface FindFirstArgs<TSelect, TWhere> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {
diff --git a/sdk/migrate-client/src/migrate/orm/models/migrateFile.ts b/sdk/migrate-client/src/migrate/orm/models/migrateFile.ts
index 06237176e..58fb76360 100644
--- a/sdk/migrate-client/src/migrate/orm/models/migrateFile.ts
+++ b/sdk/migrate-client/src/migrate/orm/models/migrateFile.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class MigrateFileModel {
   constructor(private client: OrmClient) {}
   findMany<S extends MigrateFileSelect>(
-    args: FindManyArgs<S, MigrateFileFilter, never, MigrateFileOrderBy> & {
+    args: FindManyArgs<S, MigrateFileFilter, MigrateFileOrderBy> & {
       select: S;
     } & StrictSelect<S, MigrateFileSelect>
   ): QueryBuilder<{
diff --git a/sdk/migrate-client/src/migrate/orm/models/sqlAction.ts b/sdk/migrate-client/src/migrate/orm/models/sqlAction.ts
index fcd6a8ec3..3917660f3 100644
--- a/sdk/migrate-client/src/migrate/orm/models/sqlAction.ts
+++ b/sdk/migrate-client/src/migrate/orm/models/sqlAction.ts
@@ -37,7 +37,7 @@ import { connectionFieldsMap } from '../input-types';
 export class SqlActionModel {
   constructor(private client: OrmClient) {}
   findMany<S extends SqlActionSelect>(
-    args: FindManyArgs<S, SqlActionFilter, never, SqlActionOrderBy> & {
+    args: FindManyArgs<S, SqlActionFilter, SqlActionOrderBy> & {
       select: S;
     } & StrictSelect<S, SqlActionSelect>
   ): QueryBuilder<{
diff --git a/sdk/migrate-client/src/migrate/orm/query-builder.ts b/sdk/migrate-client/src/migrate/orm/query-builder.ts
index 8dbcb9646..b0261f895 100644
--- a/sdk/migrate-client/src/migrate/orm/query-builder.ts
+++ b/sdk/migrate-client/src/migrate/orm/query-builder.ts
@@ -189,13 +189,12 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindManyDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
   args: {
     where?: TWhere;
-    condition?: TCondition;
     orderBy?: string[];
     first?: number;
     last?: number;
@@ -205,8 +204,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   },
   filterTypeName: string,
   orderByTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -216,16 +214,6 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   const queryArgs: ArgumentNode[] = [];
   const variables: Record<string, unknown> = {};
 
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
@@ -301,14 +289,13 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
+export function buildFindFirstDocument<TSelect, TWhere>(
   operationName: string,
   queryField: string,
   select: TSelect,
-  args: { where?: TWhere; condition?: TCondition },
+  args: { where?: TWhere },
   filterTypeName: string,
-  connectionFieldsMap?: Record<string, Record<string, string>>,
-  conditionTypeName?: string
+  connectionFieldsMap?: Record<string, Record<string, string>>
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(select as Record<string, unknown>, connectionFieldsMap, operationName)
@@ -325,16 +312,6 @@ export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
     queryArgs,
     variables
   );
-  addVariable(
-    {
-      varName: 'condition',
-      typeName: conditionTypeName,
-      value: args.condition,
-    },
-    variableDefinitions,
-    queryArgs,
-    variables
-  );
   addVariable(
     {
       varName: 'where',
diff --git a/sdk/migrate-client/src/migrate/orm/select-types.ts b/sdk/migrate-client/src/migrate/orm/select-types.ts
index 919d1b935..2621b3570 100644
--- a/sdk/migrate-client/src/migrate/orm/select-types.ts
+++ b/sdk/migrate-client/src/migrate/orm/select-types.ts
@@ -16,10 +16,9 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
+export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -28,10 +27,9 @@ export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = ne
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
+export interface FindFirstArgs<TSelect, TWhere> {
   select?: TSelect;
   where?: TWhere;
-  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {