@pgpm/metaschema-modules 0.26.1 → 0.26.2

package/Makefile

@@ -1,5 +1,5 @@
 EXTENSION = metaschema-modules
-DATA = sql/metaschema-modules--0.26.0.sql
+DATA = sql/metaschema-modules--0.26.1.sql
 
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)

package/deploy/schemas/metaschema_modules_public/tables/agent_module/table.sql

@@ -35,6 +35,12 @@ CREATE TABLE metaschema_modules_public.agent_module (
   -- Multi-tenant scope
   membership_type int DEFAULT NULL,
 
+  -- Module key discriminator: allows multiple agent modules per scope.
+  -- 'default' is omitted from table names, any other value becomes
+  -- an infix: {prefix}_{key}_agent_thread.
+  -- Max 16 chars, lowercase snake_case.
+  key text NOT NULL DEFAULT 'default',
+
   -- Entity table for RLS (NULL for app-level, entity table for entity-scoped)
   entity_table_id uuid NULL,
 
@@ -69,9 +75,9 @@ CREATE TABLE metaschema_modules_public.agent_module (
 
 CREATE INDEX agent_module_database_id_idx ON metaschema_modules_public.agent_module ( database_id );
 
--- Unique constraint on (database_id, membership_type) using COALESCE to handle NULLs.
--- NULL membership_type = app-level, non-NULL = entity-scoped.
--- Only one agent module per scope.
-CREATE UNIQUE INDEX agent_module_unique_scope ON metaschema_modules_public.agent_module ( database_id, COALESCE(membership_type, -1) );
+-- Unique constraint on (database_id, membership_type, key) using COALESCE to handle NULLs.
+-- NULL membership_type = app-level, non-NULL = entity-scoped. key discriminates
+-- multiple agent modules for the same scope (e.g. 'support' + 'internal').
+CREATE UNIQUE INDEX agent_module_unique_scope ON metaschema_modules_public.agent_module ( database_id, COALESCE(membership_type, -1), key );
 
 COMMIT;

package/deploy/schemas/metaschema_modules_public/tables/config_secrets_user_module/table.sql

@@ -12,11 +12,15 @@ CREATE TABLE metaschema_modules_public.config_secrets_user_module (
     schema_id uuid NOT NULL DEFAULT uuid_nil(),
     table_id uuid NOT NULL DEFAULT uuid_nil(),
     table_name text NOT NULL DEFAULT 'user_secrets',
+
+    -- Config definitions table ID (populated by the generator)
+    config_definitions_table_id uuid NOT NULL DEFAULT uuid_nil(),
     -- 
     
     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 table_fkey FOREIGN KEY (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) ON DELETE CASCADE
 );
 
 CREATE INDEX config_secrets_user_module_database_id_idx ON metaschema_modules_public.config_secrets_user_module ( database_id );

package/deploy/schemas/metaschema_modules_public/tables/entity_type_provision/table.sql

@@ -135,6 +135,12 @@ CREATE TABLE metaschema_modules_public.entity_type_provision (
 
     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,
@@ -328,12 +334,13 @@ COMMENT ON COLUMN metaschema_modules_public.entity_type_provision.storage IS
     'Optional JSON array of storage module definitions. Presence triggers provisioning
      (same inference model as namespaces, functions, agents).
      Each element provisions a separate storage module with its own tables
-     ({prefix}_{storage_key}_buckets/files), RLS policies, and feature flags.
+     ({prefix}_{key}_buckets/files), RLS policies, and feature flags.
      NULL = do not provision storage. ''[{}]'' = provision one default storage module.
      Each array element recognizes (all optional):
-       - storage_key                   (text) module discriminator, max 16 chars, lowercase snake_case.
+       - key                           (text) module discriminator, max 16 chars, lowercase snake_case.
                                               Defaults to ''default'' (omitted from table names).
                                               Non-default keys become infixes: {prefix}_{key}_buckets.
+                                              (storage_key accepted for backward compat)
        - upload_url_expiry_seconds     (integer) presigned PUT URL expiry override
        - download_url_expiry_seconds   (integer) presigned GET URL expiry override
        - default_max_file_size         (bigint)  global max file size in bytes for this module
@@ -353,7 +360,7 @@ COMMENT ON COLUMN metaschema_modules_public.entity_type_provision.storage IS
      Example (single module, backward compat):
        storage := ''[{"buckets": [{"name": "documents"}]}]''::jsonb
      Example (multi-module):
-       storage := ''[{"has_path_shares": true, "buckets": [{"name": "documents"}]}, {"storage_key": "fn", "has_custom_keys": true, "buckets": [{"name": "functions"}]}]''::jsonb';
+       storage := ''[{"has_path_shares": true, "buckets": [{"name": "documents"}]}, {"key": "fn", "has_custom_keys": true, "buckets": [{"name": "functions"}]}]''::jsonb';
 
 COMMENT ON COLUMN metaschema_modules_public.entity_type_provision.out_storage_module_id IS
     'Output: the UUID of the storage_module row created for this entity type. Populated by the trigger when storage is non-NULL and non-empty.';

package/deploy/schemas/metaschema_modules_public/tables/function_module/table.sql

@@ -20,11 +20,19 @@ CREATE TABLE metaschema_modules_public.function_module (
     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(),
 
-    -- Table names (input to the generator)
+    -- Table names (input to the generator — bare names without scope prefix).
+    -- The trigger prepends the scope prefix automatically.
     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 routing (get-or-create: if set, schema is added to this API; if NULL, no API is added)
     api_name text,
@@ -33,6 +41,18 @@ CREATE TABLE metaschema_modules_public.function_module (
     -- Multi-tenant function identity
     membership_type int DEFAULT NULL,              -- NULL = database-root (AuthzMembership via app_sprt), non-NULL = entity-scoped (AuthzEntityMembership)
 
+    -- Scope prefix for table naming.  Auto-derived from membership_type when
+    -- NULL:  NULL/1 → 'app',  2 → 'org'.  Can be overridden explicitly.
+    -- The trigger prepends this to all bare table names
+    -- (e.g. prefix='app' + 'function_definitions' → 'app_function_definitions').
+    prefix text NULL,
+
+    -- Module key discriminator: allows multiple function modules per scope.
+    -- 'default' is omitted from table names, any other value becomes
+    -- an infix: {prefix}_{key}_function_definitions.
+    -- Max 16 chars, lowercase snake_case.
+    key text NOT NULL DEFAULT 'default',
+
     -- Entity table for RLS (NULL for app-level functions, entity table for entity-scoped functions)
     entity_table_id uuid NULL,
 
@@ -43,7 +63,7 @@ CREATE TABLE metaschema_modules_public.function_module (
     policies jsonb NULL,
 
     -- Per-table provisions overrides from blueprint config.
-    -- Keys are table keys (definitions, invocations, execution_logs).
+    -- Keys are table keys (definitions, invocations, execution_logs, secret_definitions, requirements).
     -- When a key is present, the module trigger skips default security for that table;
     -- secure_table_provision applies the custom grants/policies instead.
     provisions jsonb NULL,
@@ -55,14 +75,18 @@ CREATE TABLE metaschema_modules_public.function_module (
     CONSTRAINT function_module_definitions_table_fkey FOREIGN KEY (definitions_table_id) REFERENCES metaschema_public.table (id) ON DELETE CASCADE,
     CONSTRAINT function_module_invocations_table_fkey FOREIGN KEY (invocations_table_id) REFERENCES metaschema_public.table (id) ON DELETE CASCADE,
     CONSTRAINT function_module_execution_logs_table_fkey FOREIGN KEY (execution_logs_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_requirements_table_fkey FOREIGN KEY (requirements_table_id) REFERENCES metaschema_public.table (id) ON DELETE CASCADE,
+    CONSTRAINT function_module_config_defs_table_fkey FOREIGN KEY (config_definitions_table_id) REFERENCES metaschema_public.table (id) ON DELETE CASCADE,
+    CONSTRAINT function_module_config_reqs_table_fkey FOREIGN KEY (config_requirements_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 );
 
--- Unique constraint on (database_id, membership_type) using COALESCE to handle NULLs.
--- NULL membership_type = app-level, non-NULL = entity-scoped.
--- Only one function module per scope.
-CREATE UNIQUE INDEX function_module_unique_scope ON metaschema_modules_public.function_module ( database_id, COALESCE(membership_type, -1) );
+-- Unique constraint on (database_id, membership_type, key) using COALESCE to handle NULLs.
+-- NULL membership_type = app-level, non-NULL = entity-scoped. key discriminates
+-- multiple function modules for the same scope (e.g. 'webhooks' + 'automations').
+CREATE UNIQUE INDEX function_module_unique_scope ON metaschema_modules_public.function_module ( database_id, COALESCE(membership_type, -1), key );
 
 COMMIT;

package/deploy/schemas/metaschema_modules_public/tables/memberships_module/table.sql

@@ -50,6 +50,9 @@ CREATE TABLE metaschema_modules_public.memberships_module (
 
     prefix text NULL,
 
+    -- Populated by memberships_module generator when get_organization_id is created
+    get_org_fn text NULL,
+
     --
 
     actor_mask_check text NOT NULL DEFAULT '',

package/deploy/schemas/metaschema_modules_public/tables/merkle_store_module/table.sql

@@ -8,11 +8,13 @@ CREATE TABLE metaschema_modules_public.merkle_store_module (
     id uuid PRIMARY KEY DEFAULT uuidv7(),
     database_id uuid NOT NULL,
 
-    -- Schema reference (if uuid_nil, resolved from public_schema_name or default)
+    -- Schema references (if uuid_nil, resolved from schema name or default)
     schema_id uuid NOT NULL DEFAULT uuid_nil(),
+    private_schema_id uuid NOT NULL DEFAULT uuid_nil(),
 
-    -- Optional schema name override (used when schema_id is not provided)
+    -- Optional schema name overrides (used when schema IDs are not provided)
     public_schema_name text,
+    private_schema_name text,
 
     -- Generated table IDs (populated by BEFORE INSERT trigger)
     object_table_id uuid NOT NULL DEFAULT uuid_nil(),
@@ -24,8 +26,9 @@ CREATE TABLE metaschema_modules_public.merkle_store_module (
     -- Stored normalized (no trailing underscore); underscore added at generation time
     prefix text NOT NULL DEFAULT '',
 
-    -- API name (if set, schema is added to this API; if NULL, no API is added)
+    -- API routing (get-or-create: if set, schema is added to this API; if NULL, no API is added)
     api_name text,
+    private_api_name text,
 
     -- Scope field name (column used for multi-tenant isolation)
     scope_field text NOT NULL DEFAULT 'scope_id',
@@ -36,6 +39,7 @@ CREATE TABLE metaschema_modules_public.merkle_store_module (
     -- Constraints
     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 object_table_fkey FOREIGN KEY (object_table_id) REFERENCES metaschema_public.table (id) ON DELETE CASCADE,
     CONSTRAINT store_table_fkey FOREIGN KEY (store_table_id) REFERENCES metaschema_public.table (id) ON DELETE CASCADE,
     CONSTRAINT commit_table_fkey FOREIGN KEY (commit_table_id) REFERENCES metaschema_public.table (id) ON DELETE CASCADE,
@@ -46,5 +50,6 @@ CREATE TABLE metaschema_modules_public.merkle_store_module (
 );
 
 CREATE INDEX merkle_store_module_database_id_idx ON metaschema_modules_public.merkle_store_module ( database_id );
+CREATE INDEX merkle_store_module_private_schema_id_idx ON metaschema_modules_public.merkle_store_module ( private_schema_id );
 
 COMMIT;

package/deploy/schemas/metaschema_modules_public/tables/namespace_module/table.sql

@@ -31,6 +31,12 @@ CREATE TABLE metaschema_modules_public.namespace_module (
     -- Multi-tenant namespace identity
     membership_type int DEFAULT NULL,              -- NULL = database-root (AuthzMembership via app_sprt), non-NULL = entity-scoped (AuthzEntityMembership)
 
+    -- Module key discriminator: allows multiple namespace modules per scope.
+    -- 'default' is omitted from table names, any other value becomes
+    -- an infix: {prefix}_{key}_namespaces.
+    -- Max 16 chars, lowercase snake_case.
+    key text NOT NULL DEFAULT 'default',
+
     -- Entity table for RLS (NULL for app-level namespaces, entity table for entity-scoped namespaces)
     entity_table_id uuid NULL,
 
@@ -57,9 +63,9 @@ CREATE TABLE metaschema_modules_public.namespace_module (
 
 CREATE INDEX namespace_module_database_id_idx ON metaschema_modules_public.namespace_module ( database_id );
 
--- Unique constraint on (database_id, membership_type) using COALESCE to handle NULLs.
--- NULL membership_type = app-level, non-NULL = entity-scoped.
--- Only one namespace module per scope (unlike storage_module which has storage_key).
-CREATE UNIQUE INDEX namespace_module_unique_scope ON metaschema_modules_public.namespace_module ( database_id, COALESCE(membership_type, -1) );
+-- Unique constraint on (database_id, membership_type, key) using COALESCE to handle NULLs.
+-- NULL membership_type = app-level, non-NULL = entity-scoped. key discriminates
+-- multiple namespace modules for the same scope (e.g. 'config' + 'content').
+CREATE UNIQUE INDEX namespace_module_unique_scope ON metaschema_modules_public.namespace_module ( database_id, COALESCE(membership_type, -1), key );
 
 COMMIT;

package/deploy/schemas/metaschema_modules_public/tables/storage_module/table.sql

@@ -23,11 +23,11 @@ CREATE TABLE metaschema_modules_public.storage_module (
     -- Multi-tenant storage identity
     membership_type int DEFAULT NULL,              -- NULL = global gate (AuthzMembership via app_sprt), non-NULL = entity-scoped (AuthzEntityMembership)
 
-    -- Storage module discriminator: allows multiple storage modules per entity type.
+    -- Module key discriminator: allows multiple storage modules per entity type.
     -- 'default' is omitted from table names (backward compat), any other value becomes
-    -- an infix: {prefix}_{storage_key}_{buckets|files}.
+    -- an infix: {prefix}_{key}_{buckets|files}.
     -- Max 16 chars, lowercase snake_case, cannot be 'buckets'/'files'/'bucket'/'file'.
-    storage_key text NOT NULL DEFAULT 'default',
+    key text NOT NULL DEFAULT 'default',
 
     -- Configurable security policies (NULL = use defaults based on membership_type).
     -- When provided, replaces the default policy set in apply_storage_security.
@@ -100,9 +100,9 @@ CREATE TABLE metaschema_modules_public.storage_module (
 
 CREATE INDEX storage_module_database_id_idx ON metaschema_modules_public.storage_module ( database_id );
 
--- Unique constraint on (database_id, membership_type, storage_key) using COALESCE to handle NULLs.
--- NULL membership_type = app-level, non-NULL = entity-scoped. storage_key discriminates
+-- Unique constraint on (database_id, membership_type, key) using COALESCE to handle NULLs.
+-- NULL membership_type = app-level, non-NULL = entity-scoped. key discriminates
 -- multiple storage modules for the same entity type (e.g. 'default' + 'fn').
-CREATE UNIQUE INDEX storage_module_unique_scope ON metaschema_modules_public.storage_module ( database_id, COALESCE(membership_type, -1), storage_key );
+CREATE UNIQUE INDEX storage_module_unique_scope ON metaschema_modules_public.storage_module ( database_id, COALESCE(membership_type, -1), key );
 
 COMMIT;

package/metaschema-modules.control

@@ -1,6 +1,6 @@
 # metaschema-modules extension
 comment = 'metaschema-modules extension'
-default_version = '0.26.0'
+default_version = '0.26.1'
 module_pathname = '$libdir/metaschema-modules'
 requires = 'plpgsql,uuid-ossp,metaschema-schema,services,pgpm-verify'
 relocatable = false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpm/metaschema-modules",
-  "version": "0.26.1",
+  "version": "0.26.2",
   "description": "Module metadata handling and dependency tracking",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "contributors": [
@@ -21,7 +21,7 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@pgpm/metaschema-schema": "0.26.1",
+    "@pgpm/metaschema-schema": "0.26.2",
     "@pgpm/verify": "0.26.0"
   },
   "devDependencies": {
@@ -35,5 +35,5 @@
   "bugs": {
     "url": "https://github.com/constructive-io/pgpm-modules/issues"
   },
-  "gitHead": "e1f2e9bec1c91d0751ebe49e9193459191d3c464"
+  "gitHead": "d938867e5d7c0e7b2e130a2bdc5d58cd0d5874e1"
 }

package/pgpm.plan

@@ -60,3 +60,4 @@ schemas/metaschema_modules_public/tables/merkle_store_module/table [schemas/meta
 schemas/metaschema_modules_public/tables/graph_module/table [schemas/metaschema_modules_public/schema schemas/metaschema_modules_public/tables/merkle_store_module/table] 2026-05-21T01:00:00Z devin <devin@cognition.ai> # add graph_module config table for FBP graph utilities on top of merkle store
 schemas/metaschema_modules_public/tables/namespace_module/table [schemas/metaschema_modules_public/schema] 2026-05-21T02:00:00Z devin <devin@cognition.ai> # add namespace_module config table for entity-aware namespace provisioning
 schemas/metaschema_modules_public/tables/function_module/table [schemas/metaschema_modules_public/schema] 2026-05-21T03:00:00Z devin <devin@cognition.ai> # add function_module config table for entity-aware function definitions
+