@friggframework/core 2.0.0--canary.679.a2bcc2f.0 → 2.0.0--canary.686.87e9875.0

package/modules/use-cases/multi-step-authorization.js

@@ -3,6 +3,8 @@ const { FetchError } = require('../../errors/fetch-error');
 const { getLogger } = require('../../logs');
 const { AuthorizationSession } = require('../domain/authorization-session');
 const { findDefinition, getAuthStepCount } = require('./entity-types');
+const { describeRecord } = require('../scope-visibility');
+const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
 
 const log = getLogger('frigg.api.authorize');
 
@@ -144,21 +146,30 @@ class SubmitAuthorizationStep {
         moduleDefinitions,
         getAuthorizationRequirements,
         authorizationSessionRepository,
-        processAuthorizationCallback,
+        authorizeEntityForUser,
         moduleRepository,
         credentialRepository,
         createModule,
+        scopePolicy,
     }) {
+        this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
         this.moduleDefinitions = moduleDefinitions || [];
         this.getAuthorizationRequirements = getAuthorizationRequirements;
         this.sessions = authorizationSessionRepository;
-        this.processAuthorizationCallback = processAuthorizationCallback;
+        this.authorizeEntityForUser = authorizeEntityForUser;
         this.moduleRepository = moduleRepository;
         this.credentialRepository = credentialRepository;
         this.createModule = createModule || defaultCreateModule;
     }
 
-    async execute({ user, entityType, data, step = 1, sessionId, credentialId = null }) {
+    /**
+     * @param {Object} params
+     * @param {string} [params.scope] - the scope the caller asks for, from the
+     *   deciding level's allow list (ADR-056 §3.1). Never `global`.
+     * @param {string} [params.fixedScope] - re-authorization keeps the scope the
+     *   credential already has, whatever the config says now.
+     */
+    async execute({ user, entityType, data, step = 1, sessionId, credentialId = null, scope, fixedScope }) {
         if (!data || typeof data !== 'object' || Array.isArray(data)) {
             throw Boom.badRequest('data must be an object', {
                 code: 'VALIDATION_ERROR',
@@ -166,7 +177,16 @@ class SubmitAuthorizationStep {
             });
         }
         const definition = findDefinition(this.moduleDefinitions, entityType);
+        // `userId` binds a session to the caller and is what GET /authorize
+        // computes too. The owner of the entity this creates is decided by
+        // scope (§3.2), not by user.primary, and is `ownership.ownerId`.
         const userId = user.getId();
+        const ownership = this.authorizeEntityForUser.resolveOwnership({
+            user,
+            entityType,
+            scope,
+            fixedScope,
+        });
 
         if (!isMultiStep(definition)) {
             if (step !== 1) {
@@ -174,7 +194,7 @@ class SubmitAuthorizationStep {
                     code: 'INVALID_STEP',
                 });
             }
-            return this.complete({ userId, entityType, params: data, credentialId });
+            return this.complete({ ownership, user, entityType, params: data, credentialId });
         }
 
         const totalSteps = getAuthStepCount(definition);
@@ -205,7 +225,7 @@ class SubmitAuthorizationStep {
             );
         }
 
-        const module = this.createModule({ userId, definition });
+        const module = this.createModule({ userId: ownership.ownerId, definition });
         let result;
         try {
             result = await definition.processAuthorizationStep(
@@ -224,7 +244,8 @@ class SubmitAuthorizationStep {
             session.markComplete();
             await this.sessions.update(session);
             const outcome = await this.complete({
-                userId,
+                ownership,
+                user,
                 entityType,
                 params: result.authData || {},
                 credentialId,
@@ -261,14 +282,15 @@ class SubmitAuthorizationStep {
         };
     }
 
-    async complete({ userId, entityType, params, credentialId }) {
+    async complete({ ownership, user, entityType, params, credentialId }) {
         let callback;
         try {
-            callback = await this.processAuthorizationCallback.execute(
-                userId,
+            ({ result: callback } = await this.authorizeEntityForUser.execute({
+                user,
                 entityType,
-                params
-            );
+                data: params,
+                ownership,
+            }));
         } catch (error) {
             throw toAuthorizationError(error);
         }
@@ -276,13 +298,18 @@ class SubmitAuthorizationStep {
             this.moduleRepository.findEntityById(callback.entity_id),
             this.credentialRepository.findCredentialById(callback.credential_id),
         ]);
+        // What the new entity is to this caller (§3.4), so a client need not list again.
+        const tenancy = entity
+            ? describeRecord(entity, this.scopePolicy.accessContext(user), 'entity')
+            : null;
         const outcome = {
             status: 'complete',
-            entity,
+            entity: entity && tenancy ? { ...entity, tenancy } : entity,
             credential: credential && {
                 ...credential,
                 type: entityType,
                 entityIds: entity ? [String(entity.id)] : [],
+                ...(tenancy && { tenancy }),
             },
         };
         if (credentialId && String(callback.credential_id) !== String(credentialId)) {

package/modules/use-cases/process-authorization-callback.js

@@ -1,5 +1,16 @@
 const { Module } = require('../module');
 const { ModuleConstants } = require('../ModuleConstants');
+const { pickExistingEntity } = require('../scope-resolution');
+
+/**
+ * What an entity belongs to when the caller says nothing: the person's own,
+ * outside any organization.
+ */
+const DEFAULT_TENANCY = Object.freeze({
+    scope: 'individual',
+    organizationId: null,
+    legacyOrgId: null,
+});
 const { getLogger } = require('../../logs');
 
 const log = getLogger('frigg.modules.authorization_callback');
@@ -30,7 +41,17 @@ class ProcessAuthorizationCallback {
         this.integrationRepository = integrationRepository;
     }
 
-    async execute(userId, entityType, params) {
+    /**
+     * @param {string} userId - the OWNER of what this creates (ADR-056 §3.2): the
+     *   person for `individual`, the organization's user for `organization`.
+     *   Not necessarily the caller; callers resolve it from the scope.
+     * @param {string} entityType
+     * @param {Object} params - what the module's authorization needs
+     * @param {{scope: string, organizationId: (string|null), legacyOrgId: (string|null)}} [tenancy]
+     *   the entity's scope and organization (§3.6); default: the person's own,
+     *   with no organization
+     */
+    async execute(userId, entityType, params, tenancy = DEFAULT_TENANCY) {
         log.debug('Authorization callback started', {
             eventName: `${log.name}.started`,
             userId,
@@ -57,10 +78,7 @@ class ProcessAuthorizationCallback {
                 userId,
                 entityType
             );
-        const existingEntity =
-            existingEntities && existingEntities.length > 0
-                ? existingEntities[0]
-                : null;
+        const existingEntity = pickExistingEntity(existingEntities, tenancy);
 
         if (existingEntity) {
             log.debug('Existing entity found', {
@@ -156,7 +174,8 @@ class ProcessAuthorizationCallback {
         const persistedEntity = await this.findOrCreateEntity(
             entityDetails,
             entityType,
-            module.credential.id
+            module.credential.id,
+            tenancy
         );
         log.debug('Authorization callback completed', {
             eventName: `${log.name}.completed`,
@@ -233,7 +252,12 @@ class ProcessAuthorizationCallback {
         module.credential = persisted;
     }
 
-    async findOrCreateEntity(entityDetails, moduleName, credentialId) {
+    async findOrCreateEntity(
+        entityDetails,
+        moduleName,
+        credentialId,
+        tenancy = DEFAULT_TENANCY
+    ) {
         const { identifiers, details } = entityDetails;
 
         // Support both 'user' and 'userId' field names from module definitions
@@ -247,11 +271,16 @@ class ProcessAuthorizationCallback {
             );
         }
 
-        const existingEntity = await this.moduleRepository.findEntity({
-            externalId: identifiers.externalId,
-            user: userId,
-            moduleName: moduleName,
-        });
+        // The same provider account in two organizations is two entities
+        // (ADR-056 §3.6), so the match is per organization.
+        const existingEntity = pickExistingEntity(
+            await this.moduleRepository.findEntities({
+                externalId: identifiers.externalId,
+                user: userId,
+                moduleName: moduleName,
+            }),
+            tenancy
+        );
 
         if (existingEntity) {
             // Repoint the entity's credentialId when re-auth produced a
@@ -282,12 +311,17 @@ class ProcessAuthorizationCallback {
             return existingEntity;
         }
 
-        return await this.moduleRepository.createEntity({
-            ...identifiers,
-            ...details,
-            moduleName: moduleName,
-            credential: credentialId,
-        });
+        // `organizationId` is not part of the entity data: that carries provider
+        // fields, and one that happens to be called organizationId is theirs.
+        return await this.moduleRepository.createEntity(
+            {
+                ...identifiers,
+                ...details,
+                moduleName: moduleName,
+                credential: credentialId,
+            },
+            { organizationId: tenancy.organizationId ?? null }
+        );
     }
 }
 

package/modules/use-cases/refresh-entity-options.js

@@ -1,4 +1,5 @@
 const { Module } = require('../module');
+const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
 
 class RefreshEntityOptions {
     /**
@@ -6,9 +7,11 @@ class RefreshEntityOptions {
      * @param {import('../repositories/module-repository-interface').ModuleRepositoryInterface} params.moduleRepository
      * @param {} params.moduleDefinitions
      */
-    constructor({ moduleRepository, moduleDefinitions }) {
+    constructor({ moduleRepository, moduleDefinitions, scopePolicy }) {
         this.moduleRepository = moduleRepository;
         this.moduleDefinitions = moduleDefinitions;
+        // Who may load an entity follows its scope (ADR-056 §3.6).
+        this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
     }
 
     /**
@@ -36,7 +39,7 @@ class RefreshEntityOptions {
 
         // Validate entity ownership
         const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
-            ? userIdOrUser.ownsUserId(entity.userId)
+            ? this.scopePolicy.canUseEntity(userIdOrUser, entity)
             : entity.userId?.toString() === userId?.toString();
 
         if (!isOwned) {
@@ -58,8 +61,11 @@ class RefreshEntityOptions {
             );
         }
 
+        // Built for the entity's OWNER, not the caller: a caller may use an
+        // organization's entity, and a token refresh during this call must
+        // update the owner's credential, not create one under the caller.
         const module = new Module({
-            userId,
+            userId: entity.userId ?? userId,
             entity,
             definition: moduleDefinition,
         });

package/modules/use-cases/test-module-auth.js

@@ -1,4 +1,5 @@
 const { Module } = require('../module');
+const { DEFAULT_SCOPE_POLICY } = require('../scope-policy');
 
 class TestModuleAuth {
     /**
@@ -6,9 +7,11 @@ class TestModuleAuth {
      * @param {import('../repositories/module-repository-interface').ModuleRepositoryInterface} params.moduleRepository - Repository for module data operations.
      * @param {Array<Object>} params.moduleDefinitions - Array of module definitions.
      */
-    constructor({ moduleRepository, moduleDefinitions }) {
+    constructor({ moduleRepository, moduleDefinitions, scopePolicy }) {
         this.moduleRepository = moduleRepository;
         this.moduleDefinitions = moduleDefinitions;
+        // Who may load an entity follows its scope (ADR-056 §3.6).
+        this.scopePolicy = scopePolicy || DEFAULT_SCOPE_POLICY;
     }
 
     /**
@@ -35,7 +38,7 @@ class TestModuleAuth {
 
         // Validate entity ownership
         const isOwned = typeof userIdOrUser === 'object' && userIdOrUser?.ownsUserId
-            ? userIdOrUser.ownsUserId(entity.userId)
+            ? this.scopePolicy.canUseEntity(userIdOrUser, entity)
             : entity.userId?.toString() === userId?.toString();
 
         if (!isOwned) {
@@ -57,8 +60,11 @@ class TestModuleAuth {
             );
         }
 
+        // Built for the entity's OWNER, not the caller: a caller may use an
+        // organization's entity, and a token refresh during this call must
+        // update the owner's credential, not create one under the caller.
         const module = new Module({
-            userId,
+            userId: entity.userId ?? userId,
             entity,
             definition: moduleDefinition,
         });

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.679.a2bcc2f.0",
+    "version": "2.0.0--canary.686.87e9875.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -28,6 +28,7 @@
         "express-async-handler": "^1.2.0",
         "form-data": "^4.0.6",
         "fs-extra": "^11.2.0",
+        "jose": "^5.10.0",
         "lodash": "4.18.1",
         "lodash.get": "^4.4.2",
         "node-fetch": "^2.6.7",
@@ -47,9 +48,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.679.a2bcc2f.0",
-        "@friggframework/prettier-config": "2.0.0--canary.679.a2bcc2f.0",
-        "@friggframework/test": "2.0.0--canary.679.a2bcc2f.0",
+        "@friggframework/eslint-config": "2.0.0--canary.686.87e9875.0",
+        "@friggframework/prettier-config": "2.0.0--canary.686.87e9875.0",
+        "@friggframework/test": "2.0.0--canary.686.87e9875.0",
         "@prisma/client": "^6.19.3",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -89,5 +90,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "a2bcc2f124b0574c0d868beff77b4da848fd7849"
+    "gitHead": "87e9875d4dba36bf3bb90400e862d5fb9db17ae1"
 }

package/prisma-mongodb/schema.prisma

@@ -56,6 +56,14 @@ model User {
   integrations Integration[]
   processes    Process[]
 
+  // Organization memberships (ADR-056 §3.6). `organizationId` above is the legacy
+  // single-org pointer: set on a person's first link, never moved afterwards, and
+  // read as an implicit membership when no row exists for it.
+  // As an individual: the organizations this person belongs to.
+  memberships OrganizationMembership[] @relation("IndividualMemberships")
+  // As an organization: the people who belong to it.
+  orgMembers OrganizationMembership[] @relation("OrganizationMemberships")
+
   @@unique([username, appUserId])
   @@index([type])
   @@index([appUserId])
@@ -126,6 +134,14 @@ model Entity {
   moduleName   String?
   externalId   String?
 
+  // Organization this entity was connected in (ADR-056 §3.6): the active
+  // organization for `individual`, the owner for `organization`, null for
+  // `global`. Null on an `individual` entity is also what every row written
+  // before this column existed has, and what `individualAcross: 'all'` writes.
+  // Deliberately not a relation: a deleted organization must leave its rows
+  // invisible, not turn them into "unscoped" ones (SetNull would do that).
+  organizationId String? @db.ObjectId
+
   data Json @default("{}")
 
   createdAt DateTime @default(now())
@@ -142,6 +158,7 @@ model Entity {
   associationObjects AssociationObject[]
 
   @@index([userId])
+  @@index([userId, organizationId])
   @@index([externalId])
   @@index([moduleName])
   @@index([credentialId])
@@ -159,6 +176,11 @@ model Integration {
   user   User?             @relation(fields: [userId], references: [id], onDelete: Cascade)
   status IntegrationStatus @default(IN_CREATION)
 
+  // Organization this integration was created in (ADR-056 §3.6): the active
+  // organization at create time. Null for rows that predate the column. Not a
+  // relation, for the same reason as Entity.organizationId.
+  organizationId String? @db.ObjectId
+
   // Configuration and version
   config  Json? // Integration configuration object
   version String?
@@ -183,6 +205,7 @@ model Integration {
   processes    Process[]
 
   @@index([userId])
+  @@index([userId, organizationId])
   @@index([status])
   @@map("Integration")
 }
@@ -480,3 +503,45 @@ model AuthorizationSession {
   @@index([expiresAt])
   @@map("AuthorizationSession")
 }
+
+// ============================================================================
+// ORGANIZATION MEMBERSHIP (ADR-056 §3.6)
+// ============================================================================
+
+/// One person's membership of one organization. Unique on the pair, so adding a
+/// membership is an idempotent upsert. `orgRole` is the organization role the
+/// adopter token carried when the membership was created (MEMBER when it named none). NoAction on delete
+/// because MongoDB gives no referential integrity: delete a user's memberships
+/// before the user.
+model OrganizationMembership {
+  id                 String   @id @default(auto()) @map("_id") @db.ObjectId
+  individualUserId   String   @db.ObjectId
+  organizationUserId String   @db.ObjectId
+  orgRole            String   @default("MEMBER")
+  createdAt          DateTime @default(now())
+
+  individualUser   User @relation("IndividualMemberships", fields: [individualUserId], references: [id], onDelete: NoAction, onUpdate: NoAction)
+  organizationUser User @relation("OrganizationMemberships", fields: [organizationUserId], references: [id], onDelete: NoAction, onUpdate: NoAction)
+
+  @@unique([individualUserId, organizationUserId])
+  @@index([organizationUserId])
+  @@map("OrganizationMembership")
+}
+
+/// One-time scheduled jobs for poll-and-dispatch scheduling pattern.
+/// Used by providers without native one-time scheduling APIs (e.g., Netlify).
+/// A cron function queries for due jobs and dispatches them to a queue.
+model ScheduledJob {
+  id              String   @id @default(auto()) @map("_id") @db.ObjectId
+  scheduleName    String   @unique
+  scheduledAt     DateTime
+  queueResourceId String
+  payload         Json?
+  state           String   @default("PENDING")
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@index([state, scheduledAt])
+  @@map("ScheduledJob")
+}

package/prisma-postgresql/migrations/20261015000000_add_organization_membership/migration.sql

@@ -0,0 +1,26 @@
+-- CreateTable
+-- Organization memberships (ADR-056 §3.6). One row per person per organization.
+-- "User"."organizationId" stays as the legacy single-org pointer. It is NOT
+-- backfilled into this table: the domain (user/membership.js) reads it as an
+-- implicit membership when no row exists (see docs/guides/organization-memberships.md).
+CREATE TABLE "OrganizationMembership" (
+    "id" SERIAL NOT NULL,
+    "individualUserId" INTEGER NOT NULL,
+    "organizationUserId" INTEGER NOT NULL,
+    "orgRole" TEXT NOT NULL DEFAULT 'MEMBER',
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "OrganizationMembership_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "OrganizationMembership_organizationUserId_idx" ON "OrganizationMembership"("organizationUserId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "OrganizationMembership_individualUserId_organizationUserId_key" ON "OrganizationMembership"("individualUserId", "organizationUserId");
+
+-- AddForeignKey
+ALTER TABLE "OrganizationMembership" ADD CONSTRAINT "OrganizationMembership_individualUserId_fkey" FOREIGN KEY ("individualUserId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE NO ACTION;
+
+-- AddForeignKey
+ALTER TABLE "OrganizationMembership" ADD CONSTRAINT "OrganizationMembership_organizationUserId_fkey" FOREIGN KEY ("organizationUserId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE NO ACTION;

package/prisma-postgresql/migrations/20261016000000_add_entity_integration_organization/migration.sql

@@ -0,0 +1,25 @@
+-- Entity and Integration carry the organization they were created in (ADR-056 §3.6).
+-- Nullable, no default and no backfill: a row written before this migration keeps
+-- NULL, and the domain (modules/entity-scope.js) reads NULL as "predates scoping"
+-- (docs/guides/entity-scopes.md). No scope column: the owner's user type says it.
+-- Deliberately no foreign key: a deleted organization must leave its rows
+-- invisible, and ON DELETE SET NULL would turn them into unscoped ones.
+--
+-- Release note: the two CREATE INDEX statements below are plain (not
+-- CONCURRENTLY, which Prisma migrations cannot run inside a transaction). Each
+-- takes a SHARE lock on its table while it builds, so writes to "Entity" and
+-- "Integration" wait for it. Both tables are small in a typical Frigg
+-- deployment; on a very large one, create the indexes by hand first with
+-- CREATE INDEX CONCURRENTLY IF NOT EXISTS under the same names, then deploy.
+
+-- AlterTable
+ALTER TABLE "Entity" ADD COLUMN     "organizationId" INTEGER;
+
+-- AlterTable
+ALTER TABLE "Integration" ADD COLUMN     "organizationId" INTEGER;
+
+-- CreateIndex
+CREATE INDEX "Entity_userId_organizationId_idx" ON "Entity"("userId", "organizationId");
+
+-- CreateIndex
+CREATE INDEX "Integration_userId_organizationId_idx" ON "Integration"("userId", "organizationId");

package/prisma-postgresql/migrations/20261017000000_add_scheduled_job/migration.sql

@@ -0,0 +1,28 @@
+-- One-time scheduled jobs for the poll-and-dispatch scheduler
+-- (NetlifySchedulerAdapter, friggframework/frigg#545): a cron function reads
+-- PENDING rows that are due and dispatches them to a queue.
+--
+-- IF NOT EXISTS on purpose: #545 shipped this model in the Prisma schema with
+-- no migration, so an app that ran its canary may already have the table from
+-- `prisma db push`. On such a database this migration is a no-op; on a fresh
+-- one it is the SQL `prisma migrate diff` generates.
+
+-- CreateTable
+CREATE TABLE IF NOT EXISTS "ScheduledJob" (
+    "id" SERIAL NOT NULL,
+    "scheduleName" TEXT NOT NULL,
+    "scheduledAt" TIMESTAMP(3) NOT NULL,
+    "queueResourceId" TEXT NOT NULL,
+    "payload" JSONB,
+    "state" TEXT NOT NULL DEFAULT 'PENDING',
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "ScheduledJob_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX IF NOT EXISTS "ScheduledJob_scheduleName_key" ON "ScheduledJob"("scheduleName");
+
+-- CreateIndex
+CREATE INDEX IF NOT EXISTS "ScheduledJob_state_scheduledAt_idx" ON "ScheduledJob"("state", "scheduledAt");

package/prisma-postgresql/schema.prisma

@@ -56,6 +56,14 @@ model User {
   integrations Integration[]
   processes    Process[]
 
+  // Organization memberships (ADR-056 §3.6). `organizationId` above is the legacy
+  // single-org pointer: set on a person's first link, never moved afterwards, and
+  // read as an implicit membership when no row exists for it.
+  // As an individual: the organizations this person belongs to.
+  memberships OrganizationMembership[] @relation("IndividualMemberships")
+  // As an organization: the people who belong to it.
+  orgMembers OrganizationMembership[] @relation("OrganizationMemberships")
+
   @@unique([username, appUserId])
   @@index([type])
   @@index([appUserId])
@@ -123,6 +131,14 @@ model Entity {
   moduleName   String?
   externalId   String?
 
+  // Organization this entity was connected in (ADR-056 §3.6): the active
+  // organization for `individual`, the owner for `organization`, null for
+  // `global`. Null on an `individual` entity is also what every row written
+  // before this column existed has, and what `individualAcross: 'all'` writes.
+  // Deliberately not a relation: a deleted organization must leave its rows
+  // invisible, not turn them into "unscoped" ones (SetNull would do that).
+  organizationId Int?
+
   data Json @default("{}")
 
   createdAt DateTime @default(now())
@@ -136,6 +152,7 @@ model Entity {
   associationObjects AssociationObject[]
 
   @@index([userId])
+  @@index([userId, organizationId])
   @@index([externalId])
   @@index([moduleName])
   @@index([credentialId])
@@ -152,6 +169,11 @@ model Integration {
   user   User?             @relation(fields: [userId], references: [id], onDelete: Cascade)
   status IntegrationStatus @default(IN_CREATION)
 
+  // Organization this integration was created in (ADR-056 §3.6): the active
+  // organization at create time. Null for rows that predate the column. Not a
+  // relation, for the same reason as Entity.organizationId.
+  organizationId Int?
+
   // Configuration and version
   config  Json? // Integration configuration object
   version String?
@@ -175,6 +197,7 @@ model Integration {
   processes    Process[]
 
   @@index([userId])
+  @@index([userId, organizationId])
   @@index([status])
 }
 
@@ -460,3 +483,41 @@ model AuthorizationSession {
   @@index([userId, entityType])
   @@index([expiresAt])
 }
+
+// ============================================================================
+// ORGANIZATION MEMBERSHIP (ADR-056 §3.6)
+// ============================================================================
+
+/// One person's membership of one organization. Unique on the pair, so adding a
+/// membership is an idempotent upsert. `orgRole` is the organization role the
+/// adopter token carried when the membership was created (MEMBER when it named none).
+model OrganizationMembership {
+  id                 Int      @id @default(autoincrement())
+  individualUserId   Int
+  organizationUserId Int
+  orgRole            String   @default("MEMBER")
+  createdAt          DateTime @default(now())
+
+  individualUser   User @relation("IndividualMemberships", fields: [individualUserId], references: [id], onDelete: Cascade, onUpdate: NoAction)
+  organizationUser User @relation("OrganizationMemberships", fields: [organizationUserId], references: [id], onDelete: Cascade, onUpdate: NoAction)
+
+  @@unique([individualUserId, organizationUserId])
+  @@index([organizationUserId])
+}
+
+/// One-time scheduled jobs for poll-and-dispatch scheduling pattern.
+/// Used by providers without native one-time scheduling APIs (e.g., Netlify).
+/// A cron function queries for due jobs and dispatches them to a queue.
+model ScheduledJob {
+  id              Int       @id @default(autoincrement())
+  scheduleName    String    @unique
+  scheduledAt     DateTime
+  queueResourceId String
+  payload         Json?
+  state           String    @default("PENDING")
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@index([state, scheduledAt])
+}

package/providers/index.js

@@ -0,0 +1,13 @@
+const {
+    resolveProvider,
+    determineProviderName,
+    providerPackageName,
+    KNOWN_PROVIDERS,
+} = require('./resolve-provider');
+
+module.exports = {
+    resolveProvider,
+    determineProviderName,
+    providerPackageName,
+    KNOWN_PROVIDERS,
+};