@pgpm/metaschema-modules 0.26.3 → 0.26.6

package/sql/{metaschema-modules--0.26.1.sql → metaschema-modules--0.26.5.sql}

@@ -31,17 +31,19 @@ CREATE TABLE metaschema_modules_public.connected_accounts_module (
   table_id uuid NOT NULL DEFAULT uuid_nil(),
   owner_table_id uuid NOT NULL DEFAULT uuid_nil(),
   table_name text NOT NULL,
+  api_name text DEFAULT 'auth',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT owner_table_fkey
     FOREIGN KEY(owner_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT schema_fkey
     FOREIGN KEY(schema_id)
@@ -64,17 +66,19 @@ CREATE TABLE metaschema_modules_public.crypto_addresses_module (
   owner_table_id uuid NOT NULL DEFAULT uuid_nil(),
   table_name text NOT NULL,
   crypto_network text NOT NULL DEFAULT 'BTC',
+  api_name text DEFAULT 'auth',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT owner_table_fkey
     FOREIGN KEY(owner_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT schema_fkey
     FOREIGN KEY(schema_id)
@@ -109,19 +113,19 @@ CREATE TABLE metaschema_modules_public.crypto_auth_module (
     ON DELETE CASCADE,
   CONSTRAINT secrets_table_fkey
     FOREIGN KEY(secrets_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT users_table_fkey
     FOREIGN KEY(users_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT sessions_table_fkey
     FOREIGN KEY(sessions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT session_credentials_table_fkey
     FOREIGN KEY(session_credentials_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT schema_fkey
     FOREIGN KEY(schema_id)
@@ -161,11 +165,11 @@ CREATE TABLE metaschema_modules_public.denormalized_table_field (
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT ref_table_fkey
     FOREIGN KEY(ref_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT field_fkey
     FOREIGN KEY(field_id)
@@ -187,17 +191,19 @@ CREATE TABLE metaschema_modules_public.emails_module (
   table_id uuid NOT NULL DEFAULT uuid_nil(),
   owner_table_id uuid NOT NULL DEFAULT uuid_nil(),
   table_name text NOT NULL,
+  api_name text DEFAULT 'auth',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT owner_table_fkey
     FOREIGN KEY(owner_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT schema_fkey
     FOREIGN KEY(schema_id)
@@ -218,6 +224,8 @@ CREATE TABLE metaschema_modules_public.config_secrets_user_module (
   table_id uuid NOT NULL DEFAULT uuid_nil(),
   table_name text NOT NULL DEFAULT 'user_secrets',
   config_definitions_table_id uuid NOT NULL DEFAULT uuid_nil(),
+  api_name text DEFAULT 'config',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -228,11 +236,11 @@ CREATE TABLE metaschema_modules_public.config_secrets_user_module (
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT config_defs_table_fkey
     FOREIGN KEY(config_definitions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -250,32 +258,34 @@ CREATE TABLE metaschema_modules_public.invites_module (
   invites_table_name text NOT NULL DEFAULT '',
   claimed_invites_table_name text NOT NULL DEFAULT '',
   submit_invite_code_function text NOT NULL DEFAULT '',
-  prefix text NULL,
-  membership_type int NOT NULL,
+  scope text NOT NULL DEFAULT 'app',
+  prefix text NOT NULL DEFAULT '',
   entity_table_id uuid NULL,
+  api_name text DEFAULT 'admin',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
     ON DELETE CASCADE,
   CONSTRAINT invites_table_fkey
     FOREIGN KEY(invites_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT emails_table_fkey
     FOREIGN KEY(emails_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT users_table_fkey
     FOREIGN KEY(users_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT entity_table_fkey
     FOREIGN KEY(entity_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT claimed_invites_table_fkey
     FOREIGN KEY(claimed_invites_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT schema_fkey
     FOREIGN KEY(schema_id)
@@ -289,7 +299,7 @@ CREATE TABLE metaschema_modules_public.invites_module (
 
 CREATE INDEX invites_module_database_id_idx ON metaschema_modules_public.invites_module (database_id);
 
-CREATE UNIQUE INDEX invites_module_unique_scope ON metaschema_modules_public.invites_module (database_id, membership_type);
+CREATE UNIQUE INDEX invites_module_unique_scope ON metaschema_modules_public.invites_module (database_id, scope, prefix);
 
 CREATE TABLE metaschema_modules_public.events_module (
   id uuid PRIMARY KEY DEFAULT uuidv7(),
@@ -324,13 +334,16 @@ CREATE TABLE metaschema_modules_public.events_module (
   tg_check_achievements text NOT NULL DEFAULT '',
   grant_achievement text NOT NULL DEFAULT '',
   tg_achievement_reward text NOT NULL DEFAULT '',
-  interval text NOT NULL DEFAULT '1 month',
+  "interval" text NOT NULL DEFAULT '1 month',
   retention text DEFAULT '12 months',
   premake int NOT NULL DEFAULT 2,
-  prefix text NULL,
-  membership_type int NOT NULL,
+  scope text NOT NULL DEFAULT 'app',
+  prefix text NOT NULL DEFAULT '',
   entity_table_id uuid NULL,
   actor_table_id uuid NOT NULL DEFAULT uuid_nil(),
+  default_permissions text[] DEFAULT NULL,
+  api_name text DEFAULT 'usage',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -345,39 +358,39 @@ CREATE TABLE metaschema_modules_public.events_module (
     ON DELETE CASCADE,
   CONSTRAINT events_table_fkey
     FOREIGN KEY(events_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT event_aggregates_table_fkey
     FOREIGN KEY(event_aggregates_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT event_types_table_fkey
     FOREIGN KEY(event_types_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT levels_table_fkey
     FOREIGN KEY(levels_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT level_requirements_table_fkey
     FOREIGN KEY(level_requirements_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT level_grants_table_fkey
     FOREIGN KEY(level_grants_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT achievement_rewards_table_fkey
     FOREIGN KEY(achievement_rewards_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT entity_table_fkey
     FOREIGN KEY(entity_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT actor_table_fkey
     FOREIGN KEY(actor_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -412,10 +425,12 @@ CREATE TABLE metaschema_modules_public.limits_module (
   limit_warning_state_table_id uuid NULL,
   limit_check_soft_function text NOT NULL DEFAULT '',
   limit_aggregate_check_soft_function text NOT NULL DEFAULT '',
-  prefix text NULL,
-  membership_type int NOT NULL,
+  scope text NOT NULL DEFAULT 'app',
+  prefix text NOT NULL DEFAULT '',
   entity_table_id uuid NULL,
   actor_table_id uuid NOT NULL DEFAULT uuid_nil(),
+  api_name text DEFAULT 'usage',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -430,59 +445,59 @@ CREATE TABLE metaschema_modules_public.limits_module (
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT default_table_fkey
     FOREIGN KEY(default_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT entity_table_fkey
     FOREIGN KEY(entity_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT actor_table_fkey
     FOREIGN KEY(actor_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT aggregate_table_fkey
     FOREIGN KEY(aggregate_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT limit_credits_table_fkey
     FOREIGN KEY(limit_credits_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT events_table_fkey
     FOREIGN KEY(events_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT credit_codes_table_fkey
     FOREIGN KEY(credit_codes_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT credit_code_items_table_fkey
     FOREIGN KEY(credit_code_items_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT credit_redemptions_table_fkey
     FOREIGN KEY(credit_redemptions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT limit_caps_table_fkey
     FOREIGN KEY(limit_caps_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT limit_caps_defaults_table_fkey
     FOREIGN KEY(limit_caps_defaults_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT limit_warnings_table_fkey
     FOREIGN KEY(limit_warnings_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT limit_warning_state_table_fkey
     FOREIGN KEY(limit_warning_state_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -504,7 +519,7 @@ CREATE TABLE metaschema_modules_public.membership_types_module (
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -535,10 +550,10 @@ CREATE TABLE metaschema_modules_public.memberships_module (
   admin_grants_table_name text NOT NULL DEFAULT '',
   owner_grants_table_id uuid NOT NULL DEFAULT uuid_nil(),
   owner_grants_table_name text NOT NULL DEFAULT '',
-  membership_type int NOT NULL,
+  scope text NOT NULL DEFAULT 'app',
+  prefix text NOT NULL DEFAULT '',
   entity_table_id uuid NULL,
   entity_table_owner_id uuid NULL,
-  prefix text NULL,
   get_org_fn text NULL,
   actor_mask_check text NOT NULL DEFAULT '',
   actor_perm_check text NOT NULL DEFAULT '',
@@ -546,6 +561,10 @@ CREATE TABLE metaschema_modules_public.memberships_module (
   entity_ids_by_perm text NULL,
   entity_ids_function text NULL,
   member_profiles_table_id uuid NULL,
+  permission_default_permissions_table_id uuid NULL,
+  permission_default_grants_table_id uuid NULL,
+  api_name text DEFAULT 'admin',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -560,31 +579,31 @@ CREATE TABLE metaschema_modules_public.memberships_module (
     ON DELETE CASCADE,
   CONSTRAINT memberships_table_fkey
     FOREIGN KEY(memberships_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT membership_defaults_table_fkey
     FOREIGN KEY(membership_defaults_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT membership_settings_table_fkey
     FOREIGN KEY(membership_settings_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT members_table_fkey
     FOREIGN KEY(members_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT grants_table_fkey
     FOREIGN KEY(grants_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT sprt_table_fkey
     FOREIGN KEY(sprt_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT entity_table_fkey
     FOREIGN KEY(entity_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT entity_table_owner_fkey
     FOREIGN KEY(entity_table_owner_id)
@@ -592,24 +611,26 @@ CREATE TABLE metaschema_modules_public.memberships_module (
     ON DELETE CASCADE,
   CONSTRAINT actor_table_fkey
     FOREIGN KEY(actor_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT limits_table_fkey
     FOREIGN KEY(limits_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT default_limits_table_fkey
     FOREIGN KEY(default_limits_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT permissions_table_fkey
     FOREIGN KEY(permissions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT default_permissions_table_fkey
     FOREIGN KEY(default_permissions_table_id)
-    REFERENCES metaschema_public."table" (id)
-    ON DELETE CASCADE
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE,
+  CONSTRAINT memberships_module_unique 
+    UNIQUE (database_id, scope, prefix)
 );
 
 CREATE INDEX memberships_module_database_id_idx ON metaschema_modules_public.memberships_module (database_id);
@@ -624,14 +645,16 @@ CREATE TABLE metaschema_modules_public.permissions_module (
   default_table_id uuid NOT NULL DEFAULT uuid_nil(),
   default_table_name text NOT NULL DEFAULT '',
   bitlen int NOT NULL DEFAULT 64,
-  membership_type int NOT NULL,
+  scope text NOT NULL DEFAULT 'app',
+  prefix text NOT NULL DEFAULT '',
   entity_table_id uuid NULL,
   actor_table_id uuid NOT NULL DEFAULT uuid_nil(),
-  prefix text NULL,
   get_padded_mask text NOT NULL DEFAULT '',
   get_mask text NOT NULL DEFAULT '',
   get_by_mask text NOT NULL DEFAULT '',
   get_mask_by_name text NOT NULL DEFAULT '',
+  api_name text DEFAULT 'admin',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -646,19 +669,19 @@ CREATE TABLE metaschema_modules_public.permissions_module (
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT default_table_fkey
     FOREIGN KEY(default_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT entity_table_fkey
     FOREIGN KEY(entity_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT actor_table_fkey
     FOREIGN KEY(actor_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -672,17 +695,19 @@ CREATE TABLE metaschema_modules_public.phone_numbers_module (
   table_id uuid NOT NULL DEFAULT uuid_nil(),
   owner_table_id uuid NOT NULL DEFAULT uuid_nil(),
   table_name text NOT NULL,
+  api_name text DEFAULT 'auth',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT owner_table_fkey
     FOREIGN KEY(owner_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT schema_fkey
     FOREIGN KEY(schema_id)
@@ -711,12 +736,14 @@ CREATE TABLE metaschema_modules_public.profiles_module (
   profile_definition_grants_table_name text NOT NULL DEFAULT '',
   profile_templates_table_id uuid NOT NULL DEFAULT uuid_nil(),
   profile_templates_table_name text NOT NULL DEFAULT '',
-  membership_type int NOT NULL,
+  scope text NOT NULL DEFAULT 'app',
+  prefix text NOT NULL DEFAULT '',
   entity_table_id uuid NULL,
   actor_table_id uuid NOT NULL DEFAULT uuid_nil(),
   permissions_table_id uuid NOT NULL DEFAULT uuid_nil(),
   memberships_table_id uuid NOT NULL DEFAULT uuid_nil(),
-  prefix text NULL,
+  api_name text DEFAULT 'admin',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -731,42 +758,42 @@ CREATE TABLE metaschema_modules_public.profiles_module (
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT profile_permissions_table_fkey
     FOREIGN KEY(profile_permissions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT profile_grants_table_fkey
     FOREIGN KEY(profile_grants_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT profile_definition_grants_table_fkey
     FOREIGN KEY(profile_definition_grants_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT profile_templates_table_fkey
     FOREIGN KEY(profile_templates_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT entity_table_fkey
     FOREIGN KEY(entity_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT actor_table_fkey
     FOREIGN KEY(actor_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT permissions_table_fkey
     FOREIGN KEY(permissions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT memberships_table_fkey
     FOREIGN KEY(memberships_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT profiles_module_unique 
-    UNIQUE (database_id, membership_type)
+    UNIQUE (database_id, scope, prefix)
 );
 
 CREATE INDEX profiles_module_database_id_idx ON metaschema_modules_public.profiles_module (database_id);
@@ -783,21 +810,23 @@ CREATE TABLE metaschema_modules_public.rls_module (
   authenticate_strict text NOT NULL DEFAULT 'authenticate_strict',
   "current_role" text NOT NULL DEFAULT 'current_user',
   current_role_id text NOT NULL DEFAULT 'current_user_id',
+  api_name text DEFAULT 'auth',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
     ON DELETE CASCADE,
   CONSTRAINT session_credentials_table_fkey
     FOREIGN KEY(session_credentials_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT sessions_table_fkey
     FOREIGN KEY(sessions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT users_table_fkey
     FOREIGN KEY(users_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT schema_fkey
     FOREIGN KEY(schema_id)
@@ -837,7 +866,7 @@ CREATE TABLE metaschema_modules_public.user_state_module (
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -865,19 +894,19 @@ CREATE TABLE metaschema_modules_public.sessions_module (
     ON DELETE CASCADE,
   CONSTRAINT sessions_table_fkey
     FOREIGN KEY(sessions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT session_credentials_table_fkey
     FOREIGN KEY(session_credentials_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT auth_settings_table_fkey
     FOREIGN KEY(auth_settings_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT users_table_fkey
     FOREIGN KEY(users_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -916,6 +945,8 @@ CREATE TABLE metaschema_modules_public.user_auth_module (
   sign_in_cross_origin_function text NOT NULL DEFAULT 'sign_in_cross_origin',
   request_cross_origin_token_function text NOT NULL DEFAULT 'request_cross_origin_token',
   extend_token_expires text NOT NULL DEFAULT 'extend_token_expires',
+  api_name text DEFAULT 'auth',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -926,27 +957,27 @@ CREATE TABLE metaschema_modules_public.user_auth_module (
     ON DELETE CASCADE,
   CONSTRAINT email_table_fkey
     FOREIGN KEY(emails_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT users_table_fkey
     FOREIGN KEY(users_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT secrets_table_fkey
     FOREIGN KEY(secrets_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT encrypted_table_fkey
     FOREIGN KEY(encrypted_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT sessions_table_fkey
     FOREIGN KEY(sessions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT session_credentials_table_fkey
     FOREIGN KEY(session_credentials_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -972,6 +1003,8 @@ CREATE TABLE metaschema_modules_public.users_module (
   table_name text NOT NULL DEFAULT 'users',
   type_table_id uuid NOT NULL DEFAULT uuid_nil(),
   type_table_name text NOT NULL DEFAULT 'role_types',
+  api_name text DEFAULT 'auth',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -982,11 +1015,11 @@ CREATE TABLE metaschema_modules_public.users_module (
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT type_table_fkey
     FOREIGN KEY(type_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -1005,13 +1038,15 @@ CREATE TABLE metaschema_modules_public.hierarchy_module (
   chart_edge_grants_table_name text NOT NULL DEFAULT '',
   entity_table_id uuid NOT NULL,
   users_table_id uuid NOT NULL,
-  prefix text NOT NULL DEFAULT 'org',
+  scope text NOT NULL DEFAULT 'org',
+  prefix text NOT NULL DEFAULT '',
   private_schema_name text NOT NULL DEFAULT '',
   sprt_table_name text NOT NULL DEFAULT '',
   rebuild_hierarchy_function text NOT NULL DEFAULT '',
   get_subordinates_function text NOT NULL DEFAULT '',
   get_managers_function text NOT NULL DEFAULT '',
   is_manager_of_function text NOT NULL DEFAULT '',
+  default_permissions text[] DEFAULT NULL,
   created_at timestamptz NOT NULL DEFAULT now(),
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
@@ -1027,23 +1062,23 @@ CREATE TABLE metaschema_modules_public.hierarchy_module (
     ON DELETE CASCADE,
   CONSTRAINT chart_edges_table_fkey
     FOREIGN KEY(chart_edges_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT hierarchy_sprt_table_fkey
     FOREIGN KEY(hierarchy_sprt_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT chart_edge_grants_table_fkey
     FOREIGN KEY(chart_edge_grants_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT entity_table_fkey
     FOREIGN KEY(entity_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT users_table_fkey
     FOREIGN KEY(users_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT hierarchy_module_database_unique 
     UNIQUE (database_id)
@@ -1069,7 +1104,7 @@ CREATE TABLE metaschema_modules_public.secure_table_provision (
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT schema_fkey
     FOREIGN KEY(schema_id)
@@ -1136,11 +1171,11 @@ CREATE TABLE metaschema_modules_public.relation_provision (
     ON DELETE CASCADE,
   CONSTRAINT source_table_fkey
     FOREIGN KEY(source_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT target_table_fkey
     FOREIGN KEY(target_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -1460,10 +1495,10 @@ CREATE TABLE metaschema_modules_public.storage_module (
   private_schema_id uuid NOT NULL DEFAULT uuid_nil(),
   buckets_table_id uuid NOT NULL DEFAULT uuid_nil(),
   files_table_id uuid NOT NULL DEFAULT uuid_nil(),
-  buckets_table_name text NOT NULL DEFAULT 'app_buckets',
-  files_table_name text NOT NULL DEFAULT 'app_files',
-  membership_type int DEFAULT NULL,
-  key text NOT NULL DEFAULT 'default',
+  buckets_table_name text NOT NULL DEFAULT 'buckets',
+  files_table_name text NOT NULL DEFAULT 'files',
+  scope text NOT NULL DEFAULT 'app',
+  prefix text NOT NULL DEFAULT '',
   policies jsonb NULL,
   provisions jsonb NULL,
   entity_table_id uuid NULL,
@@ -1488,6 +1523,9 @@ CREATE TABLE metaschema_modules_public.storage_module (
   has_confirm_upload boolean NOT NULL DEFAULT false,
   confirm_upload_delay interval NOT NULL DEFAULT '30 seconds',
   file_events_table_id uuid NULL DEFAULT NULL,
+  default_permissions text[] DEFAULT NULL,
+  api_name text DEFAULT 'admin',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -1502,29 +1540,29 @@ CREATE TABLE metaschema_modules_public.storage_module (
     ON DELETE CASCADE,
   CONSTRAINT buckets_table_fkey
     FOREIGN KEY(buckets_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT files_table_fkey
     FOREIGN KEY(files_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT entity_table_fkey
     FOREIGN KEY(entity_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT path_shares_table_fkey
     FOREIGN KEY(path_shares_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT file_events_table_fkey
     FOREIGN KEY(file_events_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
 CREATE INDEX storage_module_database_id_idx ON metaschema_modules_public.storage_module (database_id);
 
-CREATE UNIQUE INDEX storage_module_unique_scope ON metaschema_modules_public.storage_module (database_id, (COALESCE(membership_type, -1)), key);
+CREATE UNIQUE INDEX storage_module_unique_scope ON metaschema_modules_public.storage_module (database_id, scope, prefix);
 
 CREATE TABLE metaschema_modules_public.entity_type_provision (
   id uuid PRIMARY KEY DEFAULT uuidv7(),
@@ -1564,8 +1602,6 @@ CREATE TABLE metaschema_modules_public.entity_type_provision (
   out_invocations_table_id uuid DEFAULT NULL,
   out_execution_logs_table_id uuid DEFAULT NULL,
   out_secret_definitions_table_id uuid DEFAULT NULL,
-  out_requirements_table_id uuid DEFAULT NULL,
-  out_config_requirements_table_id uuid DEFAULT NULL,
   out_graph_module_id uuid DEFAULT NULL,
   out_graphs_table_id uuid DEFAULT NULL,
   out_agent_module_id uuid DEFAULT NULL,
@@ -1800,15 +1836,15 @@ CREATE TABLE metaschema_modules_public.rate_limits_module (
     ON DELETE CASCADE,
   CONSTRAINT rate_limit_settings_table_fkey
     FOREIGN KEY(rate_limit_settings_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT ip_rate_limits_table_fkey
     FOREIGN KEY(ip_rate_limits_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT rate_limits_table_fkey
     FOREIGN KEY(rate_limits_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT rate_limits_module_database_id_uniq 
     UNIQUE (database_id)
@@ -1840,11 +1876,11 @@ CREATE TABLE metaschema_modules_public.devices_module (
     ON DELETE CASCADE,
   CONSTRAINT user_devices_table_fkey
     FOREIGN KEY(user_devices_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT device_settings_table_fkey
     FOREIGN KEY(device_settings_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT devices_module_database_id_uniq 
     UNIQUE (database_id)
@@ -1873,11 +1909,11 @@ CREATE TABLE metaschema_modules_public.session_secrets_module (
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT sessions_table_fkey
     FOREIGN KEY(sessions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -1901,17 +1937,19 @@ CREATE TABLE metaschema_modules_public.webauthn_credentials_module (
   table_id uuid NOT NULL DEFAULT uuid_nil(),
   owner_table_id uuid NOT NULL DEFAULT uuid_nil(),
   table_name text NOT NULL DEFAULT 'webauthn_credentials',
+  api_name text DEFAULT 'auth',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT owner_table_fkey
     FOREIGN KEY(owner_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT schema_fkey
     FOREIGN KEY(schema_id)
@@ -1956,27 +1994,27 @@ CREATE TABLE metaschema_modules_public.webauthn_auth_module (
     ON DELETE CASCADE,
   CONSTRAINT users_table_fkey
     FOREIGN KEY(users_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT credentials_table_fkey
     FOREIGN KEY(credentials_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT sessions_table_fkey
     FOREIGN KEY(sessions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT session_credentials_table_fkey
     FOREIGN KEY(session_credentials_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT session_secrets_table_fkey
     FOREIGN KEY(session_secrets_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT auth_settings_table_fkey
     FOREIGN KEY(auth_settings_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -1989,13 +2027,18 @@ CREATE TABLE metaschema_modules_public.identity_providers_module (
   private_schema_id uuid NOT NULL DEFAULT uuid_nil(),
   table_id uuid NOT NULL DEFAULT uuid_nil(),
   table_name text NOT NULL DEFAULT 'identity_providers',
+  api_name text DEFAULT 'auth',
+  private_api_name text DEFAULT NULL,
+  scope text NOT NULL DEFAULT 'app',
+  prefix text NOT NULL DEFAULT '',
+  entity_table_id uuid NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT schema_fkey
     FOREIGN KEY(schema_id)
@@ -2004,6 +2047,10 @@ CREATE TABLE metaschema_modules_public.identity_providers_module (
   CONSTRAINT private_schema_fkey
     FOREIGN KEY(private_schema_id)
     REFERENCES metaschema_public.schema (id)
+    ON DELETE CASCADE,
+  CONSTRAINT entity_table_fkey
+    FOREIGN KEY(entity_table_id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -2015,7 +2062,18 @@ CREATE INDEX identity_providers_module_private_schema_id_idx ON metaschema_modul
 
 CREATE INDEX identity_providers_module_table_id_idx ON metaschema_modules_public.identity_providers_module (table_id);
 
-COMMENT ON TABLE metaschema_modules_public.identity_providers_module IS 'Config row for the identity_providers_module, which provisions a per-database identity_providers config table holding OAuth2 / OIDC (and future SAML) provider definitions: protocol kind, endpoint URLs, encrypted client secret, scopes, audience validation, PKCE, and email-handling flags. Built-in providers (google, github, apple, ...) are seeded as is_built_in=true rows; custom providers use slugs of the form custom:<slug>.';
+CREATE UNIQUE INDEX identity_providers_module_unique_scope ON metaschema_modules_public.identity_providers_module (database_id, scope);
+
+COMMENT ON TABLE metaschema_modules_public.identity_providers_module IS 'Entity-aware config row for the identity_providers_module, which provisions a per-database
+     identity_providers table holding OAuth2 / OIDC (and future SAML) provider definitions.
+     The scope column determines which config_secrets_module table the rotate proc targets
+     (app_secrets for app scope, org_secrets for org scope). When scope = platform,
+     the secrets table gets a database_id column and platform-level RLS via
+     AuthzRelatedEntityMembership through database.owner_id.
+     Scoping matrix:
+       scope=app       → per-database flat, in-app admin manages
+       scope=platform  → per-database, platform admin manages (generate:constructive)
+       scope=org       → per-org tenant, org admin manages';
 
 COMMENT ON COLUMN metaschema_modules_public.identity_providers_module.private_schema_id IS 'Private schema that hosts SECURITY DEFINER admin helpers which write to identity_providers (create / update / enable / disable / rotate-secret / delete) and the per-app quota check.';
 
@@ -2029,6 +2087,7 @@ CREATE TABLE metaschema_modules_public.notifications_module (
   preferences_table_id uuid,
   channels_table_id uuid,
   delivery_log_table_id uuid,
+  suppressions_table_id uuid,
   owner_table_id uuid NOT NULL DEFAULT uuid_nil(),
   user_settings_table_id uuid,
   organization_settings_table_id uuid,
@@ -2037,41 +2096,48 @@ CREATE TABLE metaschema_modules_public.notifications_module (
   has_settings_extension boolean NOT NULL DEFAULT false,
   has_digest_metadata boolean NOT NULL DEFAULT false,
   has_subscriptions boolean NOT NULL DEFAULT false,
+  default_permissions text[] DEFAULT NULL,
+  api_name text DEFAULT 'notifications',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
     ON DELETE CASCADE,
   CONSTRAINT notifications_table_fkey
     FOREIGN KEY(notifications_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT read_state_table_fkey
     FOREIGN KEY(read_state_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT preferences_table_fkey
     FOREIGN KEY(preferences_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE SET NULL,
   CONSTRAINT channels_table_fkey
     FOREIGN KEY(channels_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE SET NULL,
   CONSTRAINT delivery_log_table_fkey
     FOREIGN KEY(delivery_log_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE SET NULL,
+  CONSTRAINT suppressions_table_fkey
+    FOREIGN KEY(suppressions_table_id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE SET NULL,
   CONSTRAINT owner_table_fkey
     FOREIGN KEY(owner_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT user_settings_table_fkey
     FOREIGN KEY(user_settings_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE SET NULL,
   CONSTRAINT organization_settings_table_fkey
     FOREIGN KEY(organization_settings_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE SET NULL,
   CONSTRAINT schema_fkey
     FOREIGN KEY(schema_id)
@@ -2102,6 +2168,8 @@ COMMENT ON CONSTRAINT channels_table_fkey ON metaschema_modules_public.notificat
 COMMENT ON CONSTRAINT delivery_log_table_fkey ON metaschema_modules_public.notifications_module IS '@fieldName deliveryLogTableByDeliveryLogTableId
 @omit manyToMany';
 
+COMMENT ON CONSTRAINT suppressions_table_fkey ON metaschema_modules_public.notifications_module IS '@fieldName suppressionsTableBySuppressionsTableId';
+
 COMMENT ON CONSTRAINT owner_table_fkey ON metaschema_modules_public.notifications_module IS '@omit manyToMany';
 
 COMMENT ON CONSTRAINT user_settings_table_fkey ON metaschema_modules_public.notifications_module IS '@fieldName userSettingsTableByUserSettingsTableId
@@ -2125,9 +2193,15 @@ CREATE TABLE metaschema_modules_public.plans_module (
   plan_limits_table_name text NOT NULL DEFAULT '',
   plan_pricing_table_id uuid NULL,
   plan_overrides_table_id uuid NULL,
+  plan_meter_limits_table_id uuid NULL,
+  plan_caps_table_id uuid NULL,
   apply_plan_function text NOT NULL DEFAULT '',
   apply_plan_aggregate_function text NOT NULL DEFAULT '',
+  apply_billing_plan_function text NULL,
+  apply_plan_caps_function text NULL,
   prefix text NULL,
+  api_name text DEFAULT 'usage',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2142,19 +2216,27 @@ CREATE TABLE metaschema_modules_public.plans_module (
     ON DELETE CASCADE,
   CONSTRAINT plans_table_fkey
     FOREIGN KEY(plans_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT plan_limits_table_fkey
     FOREIGN KEY(plan_limits_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT plan_pricing_table_fkey
     FOREIGN KEY(plan_pricing_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT plan_overrides_table_fkey
     FOREIGN KEY(plan_overrides_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE,
+  CONSTRAINT plan_meter_limits_table_fkey
+    FOREIGN KEY(plan_meter_limits_table_id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE,
+  CONSTRAINT plan_caps_table_fkey
+    FOREIGN KEY(plan_caps_table_id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT plans_module_database_id_unique 
     UNIQUE (database_id)
@@ -2179,8 +2261,13 @@ CREATE TABLE metaschema_modules_public.billing_module (
   meter_credits_table_name text NOT NULL DEFAULT '',
   meter_sources_table_id uuid NOT NULL DEFAULT uuid_nil(),
   meter_sources_table_name text NOT NULL DEFAULT '',
+  meter_defaults_table_id uuid NOT NULL DEFAULT uuid_nil(),
+  meter_defaults_table_name text NOT NULL DEFAULT '',
   record_usage_function text NOT NULL DEFAULT '',
   prefix text NULL,
+  default_permissions text[] DEFAULT NULL,
+  api_name text DEFAULT 'usage',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2195,27 +2282,31 @@ CREATE TABLE metaschema_modules_public.billing_module (
     ON DELETE CASCADE,
   CONSTRAINT meters_table_fkey
     FOREIGN KEY(meters_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT plan_subscriptions_table_fkey
     FOREIGN KEY(plan_subscriptions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT ledger_table_fkey
     FOREIGN KEY(ledger_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT balances_table_fkey
     FOREIGN KEY(balances_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT meter_credits_table_fkey
     FOREIGN KEY(meter_credits_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT meter_sources_table_fkey
     FOREIGN KEY(meter_sources_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE,
+  CONSTRAINT meter_defaults_table_fkey
+    FOREIGN KEY(meter_defaults_table_id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT billing_module_database_id_unique 
     UNIQUE (database_id)
@@ -2244,6 +2335,8 @@ CREATE TABLE metaschema_modules_public.billing_provider_module (
   billing_webhook_events_table_name text NOT NULL DEFAULT '',
   process_billing_event_function text NOT NULL DEFAULT '',
   prefix text NULL,
+  api_name text DEFAULT NULL,
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2258,35 +2351,35 @@ CREATE TABLE metaschema_modules_public.billing_provider_module (
     ON DELETE CASCADE,
   CONSTRAINT billing_customers_table_fkey
     FOREIGN KEY(billing_customers_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT billing_products_table_fkey
     FOREIGN KEY(billing_products_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT billing_prices_table_fkey
     FOREIGN KEY(billing_prices_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT billing_subscriptions_table_fkey
     FOREIGN KEY(billing_subscriptions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT billing_webhook_events_table_fkey
     FOREIGN KEY(billing_webhook_events_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT products_table_fkey
     FOREIGN KEY(products_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE SET NULL,
   CONSTRAINT prices_table_fkey
     FOREIGN KEY(prices_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE SET NULL,
   CONSTRAINT subscriptions_table_fkey
     FOREIGN KEY(subscriptions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE SET NULL,
   CONSTRAINT billing_provider_module_database_id_unique 
     UNIQUE (database_id)
@@ -2305,8 +2398,10 @@ CREATE TABLE metaschema_modules_public.realtime_module (
   source_registry_table_id uuid NOT NULL DEFAULT uuid_nil(),
   retention_hours int NOT NULL DEFAULT 168,
   premake int NOT NULL DEFAULT 7,
-  interval text NOT NULL DEFAULT '1 day',
+  "interval" text NOT NULL DEFAULT '1 day',
   notify_channel text NULL,
+  api_name text DEFAULT 'realtime',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2325,15 +2420,15 @@ CREATE TABLE metaschema_modules_public.realtime_module (
     ON DELETE CASCADE,
   CONSTRAINT change_log_table_fkey
     FOREIGN KEY(change_log_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT listener_node_table_fkey
     FOREIGN KEY(listener_node_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT source_registry_table_fkey
     FOREIGN KEY(source_registry_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -2366,6 +2461,9 @@ CREATE TABLE metaschema_modules_public.rate_limit_meters_module (
   rate_window_limits_table_name text NOT NULL DEFAULT '',
   check_rate_limit_function text NOT NULL DEFAULT '',
   prefix text NULL,
+  default_permissions text[] DEFAULT NULL,
+  api_name text DEFAULT 'usage',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2380,15 +2478,15 @@ CREATE TABLE metaschema_modules_public.rate_limit_meters_module (
     ON DELETE CASCADE,
   CONSTRAINT rate_limit_state_table_fkey
     FOREIGN KEY(rate_limit_state_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT rate_limit_overrides_table_fkey
     FOREIGN KEY(rate_limit_overrides_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT rate_window_limits_table_fkey
     FOREIGN KEY(rate_window_limits_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT rate_limit_meters_module_database_id_unique 
     UNIQUE (database_id)
@@ -2408,6 +2506,8 @@ CREATE TABLE metaschema_modules_public.config_secrets_org_module (
   schema_id uuid NOT NULL DEFAULT uuid_nil(),
   table_id uuid NOT NULL DEFAULT uuid_nil(),
   table_name text NOT NULL DEFAULT 'org_secrets',
+  api_name text DEFAULT 'config',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2418,7 +2518,7 @@ CREATE TABLE metaschema_modules_public.config_secrets_org_module (
     ON DELETE CASCADE,
   CONSTRAINT table_fkey
     FOREIGN KEY(table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
@@ -2439,13 +2539,15 @@ CREATE TABLE metaschema_modules_public.inference_log_module (
   inference_log_table_name text NOT NULL DEFAULT '',
   usage_daily_table_id uuid NOT NULL DEFAULT uuid_nil(),
   usage_daily_table_name text NOT NULL DEFAULT '',
-  interval text NOT NULL DEFAULT '1 month',
+  "interval" text NOT NULL DEFAULT '1 month',
   retention text NOT NULL DEFAULT '12 months',
   premake int NOT NULL DEFAULT 2,
   scope text NOT NULL DEFAULT 'app',
   actor_fk_table_id uuid NULL,
   entity_fk_table_id uuid NULL,
-  prefix text NULL,
+  prefix text NOT NULL DEFAULT '',
+  api_name text DEFAULT 'usage',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2460,11 +2562,11 @@ CREATE TABLE metaschema_modules_public.inference_log_module (
     ON DELETE CASCADE,
   CONSTRAINT inference_log_table_fkey
     FOREIGN KEY(inference_log_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT usage_daily_table_fkey
     FOREIGN KEY(usage_daily_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT inference_log_module_database_id_prefix_unique 
     UNIQUE NULLS NOT DISTINCT (database_id, prefix)
@@ -2481,13 +2583,15 @@ CREATE TABLE metaschema_modules_public.compute_log_module (
   compute_log_table_name text NOT NULL DEFAULT '',
   usage_daily_table_id uuid NOT NULL DEFAULT uuid_nil(),
   usage_daily_table_name text NOT NULL DEFAULT '',
-  interval text NOT NULL DEFAULT '1 month',
+  "interval" text NOT NULL DEFAULT '1 month',
   retention text NOT NULL DEFAULT '12 months',
   premake int NOT NULL DEFAULT 2,
   scope text NOT NULL DEFAULT 'app',
   actor_fk_table_id uuid NULL,
   entity_fk_table_id uuid NULL,
-  prefix text NULL,
+  prefix text NOT NULL DEFAULT '',
+  api_name text DEFAULT 'usage',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2502,11 +2606,11 @@ CREATE TABLE metaschema_modules_public.compute_log_module (
     ON DELETE CASCADE,
   CONSTRAINT compute_log_table_fkey
     FOREIGN KEY(compute_log_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT usage_daily_table_fkey
     FOREIGN KEY(usage_daily_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT compute_log_module_database_id_prefix_unique 
     UNIQUE NULLS NOT DISTINCT (database_id, prefix)
@@ -2523,13 +2627,15 @@ CREATE TABLE metaschema_modules_public.transfer_log_module (
   transfer_log_table_name text NOT NULL DEFAULT '',
   usage_daily_table_id uuid NOT NULL DEFAULT uuid_nil(),
   usage_daily_table_name text NOT NULL DEFAULT '',
-  interval text NOT NULL DEFAULT '1 month',
+  "interval" text NOT NULL DEFAULT '1 month',
   retention text NOT NULL DEFAULT '12 months',
   premake int NOT NULL DEFAULT 2,
   scope text NOT NULL DEFAULT 'app',
   actor_fk_table_id uuid NULL,
   entity_fk_table_id uuid NULL,
-  prefix text NULL,
+  prefix text NOT NULL DEFAULT '',
+  api_name text DEFAULT 'usage',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2544,11 +2650,11 @@ CREATE TABLE metaschema_modules_public.transfer_log_module (
     ON DELETE CASCADE,
   CONSTRAINT transfer_log_table_fkey
     FOREIGN KEY(transfer_log_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT usage_daily_table_fkey
     FOREIGN KEY(usage_daily_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT transfer_log_module_database_id_prefix_unique 
     UNIQUE NULLS NOT DISTINCT (database_id, prefix)
@@ -2565,13 +2671,15 @@ CREATE TABLE metaschema_modules_public.storage_log_module (
   storage_log_table_name text NOT NULL DEFAULT '',
   usage_daily_table_id uuid NOT NULL DEFAULT uuid_nil(),
   usage_daily_table_name text NOT NULL DEFAULT '',
-  interval text NOT NULL DEFAULT '1 month',
+  "interval" text NOT NULL DEFAULT '1 month',
   retention text NOT NULL DEFAULT '12 months',
   premake int NOT NULL DEFAULT 2,
   scope text NOT NULL DEFAULT 'app',
   actor_fk_table_id uuid NULL,
   entity_fk_table_id uuid NULL,
-  prefix text NULL,
+  prefix text NOT NULL DEFAULT '',
+  api_name text DEFAULT 'usage',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2586,11 +2694,11 @@ CREATE TABLE metaschema_modules_public.storage_log_module (
     ON DELETE CASCADE,
   CONSTRAINT storage_log_table_fkey
     FOREIGN KEY(storage_log_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT usage_daily_table_fkey
     FOREIGN KEY(usage_daily_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT storage_log_module_database_id_prefix_unique 
     UNIQUE NULLS NOT DISTINCT (database_id, prefix)
@@ -2611,11 +2719,14 @@ CREATE TABLE metaschema_modules_public.db_usage_module (
   query_stats_log_table_name text NOT NULL DEFAULT '',
   query_stats_daily_table_id uuid NOT NULL DEFAULT uuid_nil(),
   query_stats_daily_table_name text NOT NULL DEFAULT '',
-  interval text NOT NULL DEFAULT '1 month',
+  "interval" text NOT NULL DEFAULT '1 month',
   retention text NOT NULL DEFAULT '12 months',
   premake int NOT NULL DEFAULT 2,
   scope text NOT NULL DEFAULT 'app',
-  prefix text NULL,
+  prefix text NOT NULL DEFAULT '',
+  default_permissions text[] DEFAULT NULL,
+  api_name text DEFAULT 'usage',
+  private_api_name text DEFAULT NULL,
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2630,19 +2741,19 @@ CREATE TABLE metaschema_modules_public.db_usage_module (
     ON DELETE CASCADE,
   CONSTRAINT table_stats_log_table_fkey
     FOREIGN KEY(table_stats_log_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT table_stats_daily_table_fkey
     FOREIGN KEY(table_stats_daily_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT query_stats_log_table_fkey
     FOREIGN KEY(query_stats_log_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT query_stats_daily_table_fkey
     FOREIGN KEY(query_stats_daily_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT db_usage_module_database_id_prefix_unique 
     UNIQUE NULLS NOT DISTINCT (database_id, prefix)
@@ -2659,21 +2770,31 @@ CREATE TABLE metaschema_modules_public.agent_module (
   message_table_id uuid NOT NULL DEFAULT uuid_nil(),
   task_table_id uuid NOT NULL DEFAULT uuid_nil(),
   prompts_table_id uuid NOT NULL DEFAULT uuid_nil(),
-  knowledge_table_id uuid DEFAULT NULL,
+  plan_table_id uuid DEFAULT NULL,
+  agent_table_id uuid DEFAULT NULL,
+  persona_table_id uuid DEFAULT NULL,
+  resource_table_id uuid DEFAULT NULL,
   thread_table_name text NOT NULL DEFAULT 'agent_thread',
   message_table_name text NOT NULL DEFAULT 'agent_message',
   task_table_name text NOT NULL DEFAULT 'agent_task',
   prompts_table_name text NOT NULL DEFAULT 'agent_prompt',
-  knowledge_table_name text NOT NULL DEFAULT 'agent_knowledge',
-  has_knowledge boolean NOT NULL DEFAULT false,
+  plan_table_name text NOT NULL DEFAULT 'agent_plan',
+  agent_table_name text NOT NULL DEFAULT 'agent',
+  persona_table_name text NOT NULL DEFAULT 'agent_persona',
+  resource_table_name text NOT NULL DEFAULT 'agent_resource',
+  has_plans boolean NOT NULL DEFAULT false,
+  has_resources boolean NOT NULL DEFAULT false,
+  has_agents boolean NOT NULL DEFAULT false,
+  shared boolean NOT NULL DEFAULT false,
   api_name text DEFAULT 'agent',
-  membership_type int DEFAULT NULL,
-  key text NOT NULL DEFAULT 'default',
+  private_api_name text DEFAULT NULL,
+  scope text NOT NULL DEFAULT 'app',
+  prefix text NOT NULL DEFAULT '',
   entity_table_id uuid NULL,
   policies jsonb NULL,
-  knowledge_config jsonb NULL,
-  knowledge_policies jsonb NULL,
+  resources jsonb NULL,
   provisions jsonb NULL,
+  default_permissions text[] DEFAULT NULL,
   CONSTRAINT agent_module_db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2688,33 +2809,45 @@ CREATE TABLE metaschema_modules_public.agent_module (
     ON DELETE CASCADE,
   CONSTRAINT agent_module_thread_table_fkey
     FOREIGN KEY(thread_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT agent_module_message_table_fkey
     FOREIGN KEY(message_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT agent_module_task_table_fkey
     FOREIGN KEY(task_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT agent_module_prompts_table_fkey
     FOREIGN KEY(prompts_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE,
+  CONSTRAINT agent_module_plan_table_fkey
+    FOREIGN KEY(plan_table_id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE,
+  CONSTRAINT agent_module_agent_table_fkey
+    FOREIGN KEY(agent_table_id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
-  CONSTRAINT agent_module_knowledge_table_fkey
-    FOREIGN KEY(knowledge_table_id)
-    REFERENCES metaschema_public."table" (id)
+  CONSTRAINT agent_module_persona_table_fkey
+    FOREIGN KEY(persona_table_id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE,
+  CONSTRAINT agent_module_resource_table_fkey
+    FOREIGN KEY(resource_table_id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT agent_module_entity_table_fkey
     FOREIGN KEY(entity_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
 CREATE INDEX agent_module_database_id_idx ON metaschema_modules_public.agent_module (database_id);
 
-CREATE UNIQUE INDEX agent_module_unique_scope ON metaschema_modules_public.agent_module (database_id, (COALESCE(membership_type, -1)), key);
+CREATE UNIQUE INDEX agent_module_unique_scope ON metaschema_modules_public.agent_module (database_id, scope, prefix);
 
 CREATE TABLE metaschema_modules_public.merkle_store_module (
   id uuid PRIMARY KEY DEFAULT uuidv7(),
@@ -2730,7 +2863,8 @@ CREATE TABLE metaschema_modules_public.merkle_store_module (
   prefix text NOT NULL DEFAULT '',
   api_name text,
   private_api_name text,
-  scope_field text NOT NULL DEFAULT 'scope_id',
+  scope text NOT NULL DEFAULT 'app',
+  function_prefix text DEFAULT NULL,
   created_at timestamptz NOT NULL DEFAULT now(),
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
@@ -2746,19 +2880,19 @@ CREATE TABLE metaschema_modules_public.merkle_store_module (
     ON DELETE CASCADE,
   CONSTRAINT object_table_fkey
     FOREIGN KEY(object_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT store_table_fkey
     FOREIGN KEY(store_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT commit_table_fkey
     FOREIGN KEY(commit_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT ref_table_fkey
     FOREIGN KEY(ref_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT merkle_store_module_database_prefix_unique 
     UNIQUE (database_id, prefix)
@@ -2775,6 +2909,7 @@ CREATE TABLE metaschema_modules_public.graph_module (
   private_schema_id uuid NOT NULL DEFAULT uuid_nil(),
   public_schema_name text,
   private_schema_name text,
+  scope text NOT NULL DEFAULT 'app',
   prefix text NOT NULL DEFAULT '',
   merkle_store_module_id uuid NOT NULL,
   graphs_table_id uuid NOT NULL DEFAULT uuid_nil(),
@@ -2782,11 +2917,10 @@ CREATE TABLE metaschema_modules_public.graph_module (
   outputs_table_id uuid NOT NULL DEFAULT uuid_nil(),
   api_name text,
   private_api_name text,
-  scope_field text NOT NULL DEFAULT 'scope_id',
-  membership_type int DEFAULT NULL,
   entity_table_id uuid NULL,
   policies jsonb NULL,
   provisions jsonb NULL,
+  default_permissions text[] DEFAULT NULL,
   created_at timestamptz NOT NULL DEFAULT now(),
   CONSTRAINT db_fkey
     FOREIGN KEY(database_id)
@@ -2806,19 +2940,19 @@ CREATE TABLE metaschema_modules_public.graph_module (
     ON DELETE CASCADE,
   CONSTRAINT graphs_table_fkey
     FOREIGN KEY(graphs_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT executions_table_fkey
     FOREIGN KEY(executions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT outputs_table_fkey
     FOREIGN KEY(outputs_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT graph_module_entity_table_fkey
     FOREIGN KEY(entity_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT graph_module_database_merkle_unique 
     UNIQUE (database_id, merkle_store_module_id)
@@ -2839,11 +2973,12 @@ CREATE TABLE metaschema_modules_public.namespace_module (
   namespace_events_table_name text NOT NULL DEFAULT 'namespace_events',
   api_name text,
   private_api_name text,
-  membership_type int DEFAULT NULL,
-  key text NOT NULL DEFAULT 'default',
+  scope text NOT NULL DEFAULT 'app',
+  prefix text NOT NULL DEFAULT '',
   entity_table_id uuid NULL,
   policies jsonb NULL,
   provisions jsonb NULL,
+  default_permissions text[] DEFAULT NULL,
   CONSTRAINT namespace_module_db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2858,21 +2993,21 @@ CREATE TABLE metaschema_modules_public.namespace_module (
     ON DELETE CASCADE,
   CONSTRAINT namespace_module_namespaces_table_fkey
     FOREIGN KEY(namespaces_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT namespace_module_events_table_fkey
     FOREIGN KEY(namespace_events_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
   CONSTRAINT namespace_module_entity_table_fkey
     FOREIGN KEY(entity_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
 CREATE INDEX namespace_module_database_id_idx ON metaschema_modules_public.namespace_module (database_id);
 
-CREATE UNIQUE INDEX namespace_module_unique_scope ON metaschema_modules_public.namespace_module (database_id, (COALESCE(membership_type, -1)), key);
+CREATE UNIQUE INDEX namespace_module_unique_scope ON metaschema_modules_public.namespace_module (database_id, scope, prefix);
 
 CREATE TABLE metaschema_modules_public.function_module (
   id uuid PRIMARY KEY DEFAULT uuidv7(),
@@ -2882,26 +3017,17 @@ CREATE TABLE metaschema_modules_public.function_module (
   public_schema_name text,
   private_schema_name text,
   definitions_table_id uuid NOT NULL DEFAULT uuid_nil(),
-  invocations_table_id uuid NOT NULL DEFAULT uuid_nil(),
-  execution_logs_table_id uuid NOT NULL DEFAULT uuid_nil(),
   secret_definitions_table_id uuid NOT NULL DEFAULT uuid_nil(),
-  requirements_table_id uuid NOT NULL DEFAULT uuid_nil(),
-  config_definitions_table_id uuid NOT NULL DEFAULT uuid_nil(),
-  config_requirements_table_id uuid NOT NULL DEFAULT uuid_nil(),
   definitions_table_name text NOT NULL DEFAULT 'function_definitions',
-  invocations_table_name text NOT NULL DEFAULT 'function_invocations',
-  execution_logs_table_name text NOT NULL DEFAULT 'function_execution_logs',
   secret_definitions_table_name text NOT NULL DEFAULT 'secret_definitions',
-  requirements_table_name text NOT NULL DEFAULT 'function_secret_requirements',
-  config_requirements_table_name text NOT NULL DEFAULT 'function_config_requirements',
   api_name text,
   private_api_name text,
-  membership_type int DEFAULT NULL,
-  prefix text NULL,
-  key text NOT NULL DEFAULT 'default',
+  scope text NOT NULL DEFAULT 'app',
+  prefix text NOT NULL DEFAULT '',
   entity_table_id uuid NULL,
   policies jsonb NULL,
   provisions jsonb NULL,
+  default_permissions text[] DEFAULT NULL,
   CONSTRAINT function_module_db_fkey
     FOREIGN KEY(database_id)
     REFERENCES metaschema_public.database (id)
@@ -2916,38 +3042,215 @@ CREATE TABLE metaschema_modules_public.function_module (
     ON DELETE CASCADE,
   CONSTRAINT function_module_definitions_table_fkey
     FOREIGN KEY(definitions_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE,
+  CONSTRAINT function_module_secret_defs_table_fkey
+    FOREIGN KEY(secret_definitions_table_id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE,
+  CONSTRAINT function_module_entity_table_fkey
+    FOREIGN KEY(entity_table_id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE
+);
+
+CREATE INDEX function_module_database_id_idx ON metaschema_modules_public.function_module (database_id);
+
+CREATE UNIQUE INDEX function_module_unique_scope ON metaschema_modules_public.function_module (database_id, scope, prefix);
+
+CREATE TABLE metaschema_modules_public.function_invocation_module (
+  id uuid PRIMARY KEY DEFAULT uuidv7(),
+  database_id uuid NOT NULL,
+  schema_id uuid NOT NULL DEFAULT uuid_nil(),
+  private_schema_id uuid NOT NULL DEFAULT uuid_nil(),
+  public_schema_name text,
+  private_schema_name text,
+  invocations_table_id uuid NOT NULL DEFAULT uuid_nil(),
+  execution_logs_table_id uuid NOT NULL DEFAULT uuid_nil(),
+  invocations_table_name text NOT NULL DEFAULT 'function_invocations',
+  execution_logs_table_name text NOT NULL DEFAULT 'function_execution_logs',
+  api_name text,
+  private_api_name text,
+  scope text NOT NULL DEFAULT 'app',
+  prefix text NOT NULL DEFAULT '',
+  entity_table_id uuid NULL,
+  policies jsonb NULL,
+  provisions jsonb NULL,
+  default_permissions text[] DEFAULT NULL,
+  CONSTRAINT function_invocation_module_db_fkey
+    FOREIGN KEY(database_id)
+    REFERENCES metaschema_public.database (id)
+    ON DELETE CASCADE,
+  CONSTRAINT function_invocation_module_schema_fkey
+    FOREIGN KEY(schema_id)
+    REFERENCES metaschema_public.schema (id)
+    ON DELETE CASCADE,
+  CONSTRAINT function_invocation_module_private_schema_fkey
+    FOREIGN KEY(private_schema_id)
+    REFERENCES metaschema_public.schema (id)
     ON DELETE CASCADE,
-  CONSTRAINT function_module_invocations_table_fkey
+  CONSTRAINT function_invocation_module_invocations_table_fkey
     FOREIGN KEY(invocations_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
-  CONSTRAINT function_module_execution_logs_table_fkey
+  CONSTRAINT function_invocation_module_logs_table_fkey
     FOREIGN KEY(execution_logs_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
-  CONSTRAINT function_module_secret_defs_table_fkey
-    FOREIGN KEY(secret_definitions_table_id)
-    REFERENCES metaschema_public."table" (id)
+  CONSTRAINT function_invocation_module_entity_table_fkey
+    FOREIGN KEY(entity_table_id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE
+);
+
+CREATE INDEX function_invocation_module_database_id_idx ON metaschema_modules_public.function_invocation_module (database_id);
+
+CREATE UNIQUE INDEX function_invocation_module_unique_scope ON metaschema_modules_public.function_invocation_module (database_id, scope, prefix);
+
+CREATE TABLE metaschema_modules_public.config_secrets_module (
+  id uuid PRIMARY KEY DEFAULT uuidv7(),
+  database_id uuid NOT NULL,
+  schema_id uuid NOT NULL DEFAULT uuid_nil(),
+  private_schema_id uuid NOT NULL DEFAULT uuid_nil(),
+  table_id uuid NOT NULL DEFAULT uuid_nil(),
+  config_definitions_table_id uuid NULL DEFAULT NULL,
+  table_name text NOT NULL DEFAULT 'secrets',
+  api_name text DEFAULT 'config',
+  private_api_name text DEFAULT NULL,
+  scope text NOT NULL DEFAULT 'app',
+  prefix text NOT NULL DEFAULT '',
+  entity_table_id uuid NULL,
+  policies jsonb NULL,
+  provisions jsonb NULL,
+  has_config boolean NOT NULL DEFAULT false,
+  CONSTRAINT config_secrets_module_db_fkey
+    FOREIGN KEY(database_id)
+    REFERENCES metaschema_public.database (id)
     ON DELETE CASCADE,
-  CONSTRAINT function_module_requirements_table_fkey
-    FOREIGN KEY(requirements_table_id)
-    REFERENCES metaschema_public."table" (id)
+  CONSTRAINT config_secrets_module_schema_fkey
+    FOREIGN KEY(schema_id)
+    REFERENCES metaschema_public.schema (id)
     ON DELETE CASCADE,
-  CONSTRAINT function_module_config_defs_table_fkey
-    FOREIGN KEY(config_definitions_table_id)
-    REFERENCES metaschema_public."table" (id)
+  CONSTRAINT config_secrets_module_private_schema_fkey
+    FOREIGN KEY(private_schema_id)
+    REFERENCES metaschema_public.schema (id)
     ON DELETE CASCADE,
-  CONSTRAINT function_module_config_reqs_table_fkey
-    FOREIGN KEY(config_requirements_table_id)
-    REFERENCES metaschema_public."table" (id)
+  CONSTRAINT config_secrets_module_table_fkey
+    FOREIGN KEY(table_id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE,
-  CONSTRAINT function_module_entity_table_fkey
+  CONSTRAINT config_secrets_module_config_defs_table_fkey
+    FOREIGN KEY(config_definitions_table_id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE,
+  CONSTRAINT config_secrets_module_entity_table_fkey
     FOREIGN KEY(entity_table_id)
-    REFERENCES metaschema_public."table" (id)
+    REFERENCES metaschema_public.table (id)
     ON DELETE CASCADE
 );
 
-CREATE INDEX function_module_database_id_idx ON metaschema_modules_public.function_module (database_id);
+CREATE INDEX config_secrets_module_database_id_idx ON metaschema_modules_public.config_secrets_module (database_id);
+
+CREATE INDEX config_secrets_module_schema_id_idx ON metaschema_modules_public.config_secrets_module (schema_id);
+
+CREATE INDEX config_secrets_module_table_id_idx ON metaschema_modules_public.config_secrets_module (table_id);
+
+CREATE UNIQUE INDEX config_secrets_module_unique_scope ON metaschema_modules_public.config_secrets_module (database_id, scope, prefix);
+
+COMMENT ON TABLE metaschema_modules_public.config_secrets_module IS 'Entity-aware PGP-encrypted key-value config/secrets module. Supports app-level (admin-only)
+     and org-scoped (per-org secrets with manage_secrets permission) via the scope column.
+     User-scoped bcrypt credentials are handled by user_credentials_module.';
+
+CREATE TABLE metaschema_modules_public.user_credentials_module (
+  id uuid PRIMARY KEY DEFAULT uuidv7(),
+  database_id uuid NOT NULL,
+  schema_id uuid NOT NULL DEFAULT uuid_nil(),
+  table_id uuid NOT NULL DEFAULT uuid_nil(),
+  table_name text NOT NULL DEFAULT 'user_secrets',
+  api_name text DEFAULT 'config',
+  private_api_name text DEFAULT NULL,
+  CONSTRAINT user_credentials_module_db_fkey
+    FOREIGN KEY(database_id)
+    REFERENCES metaschema_public.database (id)
+    ON DELETE CASCADE,
+  CONSTRAINT user_credentials_module_schema_fkey
+    FOREIGN KEY(schema_id)
+    REFERENCES metaschema_public.schema (id)
+    ON DELETE CASCADE,
+  CONSTRAINT user_credentials_module_table_fkey
+    FOREIGN KEY(table_id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE
+);
+
+CREATE INDEX user_credentials_module_database_id_idx ON metaschema_modules_public.user_credentials_module (database_id);
+
+CREATE INDEX user_credentials_module_schema_id_idx ON metaschema_modules_public.user_credentials_module (schema_id);
+
+CREATE INDEX user_credentials_module_table_id_idx ON metaschema_modules_public.user_credentials_module (table_id);
+
+CREATE UNIQUE INDEX user_credentials_module_unique ON metaschema_modules_public.user_credentials_module (database_id);
+
+COMMENT ON TABLE metaschema_modules_public.user_credentials_module IS 'Per-user bcrypt credential store (password hashes, API key hashes).
+     Always user-scoped with AuthzDirectOwner RLS. Consumed by user_auth_module,
+     identity_providers_module, and bootstrap procedures.';
+
+CREATE TABLE metaschema_modules_public.user_settings_module (
+  id uuid PRIMARY KEY DEFAULT uuidv7(),
+  database_id uuid NOT NULL,
+  schema_id uuid NOT NULL DEFAULT uuid_nil(),
+  table_id uuid NOT NULL DEFAULT uuid_nil(),
+  owner_table_id uuid NOT NULL DEFAULT uuid_nil(),
+  table_name text NOT NULL DEFAULT 'user_settings',
+  api_name text DEFAULT NULL,
+  CONSTRAINT db_fkey
+    FOREIGN KEY(database_id)
+    REFERENCES metaschema_public.database (id)
+    ON DELETE CASCADE,
+  CONSTRAINT schema_fkey
+    FOREIGN KEY(schema_id)
+    REFERENCES metaschema_public.schema (id)
+    ON DELETE CASCADE,
+  CONSTRAINT table_fkey
+    FOREIGN KEY(table_id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE,
+  CONSTRAINT owner_table_fkey
+    FOREIGN KEY(owner_table_id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE
+);
+
+CREATE INDEX user_settings_module_database_id_idx ON metaschema_modules_public.user_settings_module (database_id);
+
+CREATE UNIQUE INDEX user_settings_module_unique_per_db ON metaschema_modules_public.user_settings_module (database_id);
+
+CREATE TABLE metaschema_modules_public.i18n_module (
+  id uuid PRIMARY KEY DEFAULT uuidv7(),
+  database_id uuid NOT NULL,
+  schema_id uuid NOT NULL DEFAULT uuid_nil(),
+  private_schema_id uuid NOT NULL DEFAULT uuid_nil(),
+  settings_table_id uuid NOT NULL DEFAULT uuid_nil(),
+  api_name text DEFAULT NULL,
+  private_api_name text DEFAULT NULL,
+  CONSTRAINT db_fkey
+    FOREIGN KEY(database_id)
+    REFERENCES metaschema_public.database (id)
+    ON DELETE CASCADE,
+  CONSTRAINT schema_fkey
+    FOREIGN KEY(schema_id)
+    REFERENCES metaschema_public.schema (id)
+    ON DELETE CASCADE,
+  CONSTRAINT private_schema_fkey
+    FOREIGN KEY(private_schema_id)
+    REFERENCES metaschema_public.schema (id)
+    ON DELETE CASCADE,
+  CONSTRAINT settings_table_fkey
+    FOREIGN KEY(settings_table_id)
+    REFERENCES metaschema_public.table (id)
+    ON DELETE CASCADE
+);
+
+CREATE INDEX i18n_module_database_id_idx ON metaschema_modules_public.i18n_module (database_id);
 
-CREATE UNIQUE INDEX function_module_unique_scope ON metaschema_modules_public.function_module (database_id, (COALESCE(membership_type, -1)), key);
+CREATE UNIQUE INDEX i18n_module_unique_per_db ON metaschema_modules_public.i18n_module (database_id);