@opengeni/db 3.6.0 → 3.7.4-canary.0

package/src/pr-review.ts

@@ -318,6 +318,8 @@ export async function createPrReviewRepositoryBinding(
     eventTypes: string[];
     configuration: Record<string, unknown>;
     sessionTemplate: AutomationSessionTemplate;
+    /** Trusted database-only admission seam. Throwing rolls the binding and trigger back. */
+    beforeCreateCommit?: (tx: Database) => Promise<void>;
   },
 ): Promise<PrReviewRepositoryBinding> {
   return await withRlsContext(db, input, async (scopedDb) => {
@@ -345,6 +347,7 @@ export async function createPrReviewRepositoryBinding(
           "PR Review repository provider does not match its app",
         );
       }
+      await input.beforeCreateCommit?.(tx);
       const bindingId = randomUUID();
       const [trigger] = await tx
         .insert(schema.automationTriggers)
@@ -842,6 +845,16 @@ export async function updatePrReviewRepositoryBinding(
     model?: string | null;
     additionalInstructions?: string | null;
     status?: "active" | "disabled";
+    /** Trusted database-only admission seam. Throwing rolls the binding revision back. */
+    beforeUpdateCommit?: (
+      tx: Database,
+      context: {
+        currentModel: string | null;
+        currentStatus: "active" | "disabled";
+        nextModel: string | null;
+        nextStatus: "active" | "disabled";
+      },
+    ) => Promise<void>;
   },
 ): Promise<PrReviewRepositoryBinding | null> {
   return await withRlsContext(db, input, async (scopedDb) => {
@@ -891,6 +904,12 @@ export async function updatePrReviewRepositoryBinding(
             : input.additionalInstructions,
         status: input.status ?? (current.binding.status as "active" | "disabled"),
       };
+      await input.beforeUpdateCommit?.(tx, {
+        currentModel: current.binding.model,
+        currentStatus: current.binding.status as "active" | "disabled",
+        nextModel: next.model,
+        nextStatus: next.status,
+      });
       const nextRevision = current.trigger.currentRevision + 1;
       await tx.insert(schema.automationTriggerRevisions).values({
         triggerId: current.trigger.id,

package/src/provision-roles.ts

@@ -294,7 +294,9 @@ END $$;
 }
 
 async function ensureLoginRole(sql: postgres.Sql, role: string, password: string): Promise<void> {
-  await sql.unsafe(`
+  await executeRoleConvergence(
+    sql,
+    `
 DO $$
 BEGIN
   IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = ${literal(role)}) THEN
@@ -303,7 +305,8 @@ BEGIN
     EXECUTE format('ALTER ROLE %I LOGIN PASSWORD %L', ${literal(role)}, ${literal(password)});
   END IF;
 END $$;
-`);
+`,
+  );
 }
 
 async function ensureRestrictedAppLoginRole(
@@ -311,7 +314,9 @@ async function ensureRestrictedAppLoginRole(
   role: string,
   password: string,
 ): Promise<void> {
-  await sql.unsafe(`
+  await executeRoleConvergence(
+    sql,
+    `
 DO $$
 BEGIN
   IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = ${literal(role)}) THEN
@@ -339,7 +344,41 @@ BEGIN
     );
   END IF;
 END $$;
-`);
+`,
+  );
+}
+
+const ROLE_CONVERGENCE_MAX_ATTEMPTS = 20;
+
+function isRetryableConcurrentRoleMutation(error: unknown): boolean {
+  const details = error as { code?: unknown; message?: unknown; routine?: unknown };
+  return (
+    (details.code === "XX000" &&
+      details.message === "tuple concurrently updated" &&
+      details.routine === "simple_heap_update") ||
+    (details.code === "42710" &&
+      typeof details.message === "string" &&
+      /^role ".+" already exists$/u.test(details.message))
+  );
+}
+
+async function executeRoleConvergence(sql: postgres.Sql, statement: string): Promise<void> {
+  // Roles live in a cluster-global catalog. Two otherwise independent
+  // databases can therefore race an identical CREATE/ALTER during parallel
+  // deployment or test setup. PostgreSQL exposes no cross-database advisory
+  // lock, so retry only its exact concurrent-catalog outcomes and keep every
+  // other provisioning failure immediate.
+  for (let attempt = 1; attempt <= ROLE_CONVERGENCE_MAX_ATTEMPTS; attempt += 1) {
+    try {
+      await sql.unsafe(statement);
+      return;
+    } catch (error) {
+      if (!isRetryableConcurrentRoleMutation(error) || attempt === ROLE_CONVERGENCE_MAX_ATTEMPTS) {
+        throw error;
+      }
+      await new Promise((resolve) => setTimeout(resolve, Math.min(25 * attempt, 250)));
+    }
+  }
 }
 
 /**
@@ -494,6 +533,8 @@ async function grantAppRoleIfSchemaExists(
     "list_organization_invitations(uuid,text,uuid,integer)",
     "get_organization_administration_overview(uuid,text)",
     "get_workspace_kind(uuid,uuid)",
+    "resolve_workspace_codex_subscription_source(uuid,uuid)",
+    "list_organization_workspace_ids(uuid)",
     "organization_workspace_command(jsonb)",
     "resolve_organization_workspace_removal_subject(uuid,text,uuid)",
     "prepare_organization_workspace_member_removal(jsonb)",
@@ -1063,6 +1104,18 @@ BEGIN
         ${literal(role)}
       );
     END IF;
+    IF to_regprocedure(
+      format(
+        '%I.propose_company_profile_for_attempt_v2(uuid,uuid,uuid,uuid,uuid,integer,uuid,uuid,text,text,text)',
+        ${literal(schema)}
+      )
+    ) IS NOT NULL THEN
+      EXECUTE format(
+        'GRANT EXECUTE ON FUNCTION %I.propose_company_profile_for_attempt_v2(uuid, uuid, uuid, uuid, uuid, integer, uuid, uuid, text, text, text) TO %I',
+        ${literal(schema)},
+        ${literal(role)}
+      );
+    END IF;
     IF to_regprocedure(
       format(
         '%I.confirm_company_profile_for_attempt(uuid,uuid,uuid,uuid,uuid,integer,uuid,uuid,uuid)',
@@ -1075,6 +1128,27 @@ BEGIN
         ${literal(role)}
       );
     END IF;
+    IF to_regprocedure(
+      format('%I.get_company_profile_agent_policy(uuid,uuid,text)', ${literal(schema)})
+    ) IS NOT NULL THEN
+      EXECUTE format(
+        'GRANT EXECUTE ON FUNCTION %I.get_company_profile_agent_policy(uuid, uuid, text) TO %I',
+        ${literal(schema)},
+        ${literal(role)}
+      );
+    END IF;
+    IF to_regprocedure(
+      format(
+        '%I.update_company_profile_agent_policy(uuid,uuid,text,text,bigint,uuid)',
+        ${literal(schema)}
+      )
+    ) IS NOT NULL THEN
+      EXECUTE format(
+        'GRANT EXECUTE ON FUNCTION %I.update_company_profile_agent_policy(uuid, uuid, text, text, bigint, uuid) TO %I',
+        ${literal(schema)},
+        ${literal(role)}
+      );
+    END IF;
     IF to_regprocedure(
       format(
         '%I.workspace_learning_policy_apply_activation(uuid,text,uuid,uuid,uuid,uuid,bigint,text,text,text)',
@@ -1661,6 +1735,11 @@ BEGIN
       EXECUTE format('REVOKE ALL ON FUNCTION %I.authorize_session_attempt_personal_resource_reads(uuid, uuid, uuid) FROM PUBLIC', ${literal(schema)});
       EXECUTE format('GRANT EXECUTE ON FUNCTION %I.authorize_session_attempt_personal_resource_reads(uuid, uuid, uuid) TO %I', ${literal(schema)}, ${literal(role)});
     END IF;
+    IF to_regprocedure(format('%I.issue_self_local_connection_use_grant(uuid,uuid,uuid,text,boolean)', ${literal(schema)}))
+      IS NOT NULL THEN
+      EXECUTE format('REVOKE ALL ON FUNCTION %I.issue_self_local_connection_use_grant(uuid, uuid, uuid, text, boolean) FROM PUBLIC', ${literal(schema)});
+      EXECUTE format('GRANT EXECUTE ON FUNCTION %I.issue_self_local_connection_use_grant(uuid, uuid, uuid, text, boolean) TO %I', ${literal(schema)}, ${literal(role)});
+    END IF;
     IF to_regprocedure(format('%I.resolve_connection_use_authority(uuid,uuid,uuid,jsonb)', ${literal(schema)}))
       IS NOT NULL THEN
       EXECUTE format('REVOKE ALL ON FUNCTION %I.list_self_connection_authorities(uuid) FROM PUBLIC', ${literal(schema)});

package/src/runtime-posture.ts

@@ -91,6 +91,8 @@ const ORGANIZATION_MEMBERSHIP_LIFECYCLE_ROUTINES = [
   "list_organization_administration_members(uuid, text)",
   "get_organization_administration_overview(uuid, text)",
   "get_workspace_kind(uuid, uuid)",
+  "resolve_workspace_codex_subscription_source(uuid, uuid)",
+  "list_organization_workspace_ids(uuid)",
   "organization_workspace_command(jsonb)",
   "resolve_organization_workspace_removal_subject(uuid, text, uuid)",
   "prepare_organization_workspace_member_removal(jsonb)",
@@ -212,6 +214,7 @@ const USER_RESOURCE_LIFECYCLE_ROUTINES = [
   "accept_turn_personal_resource_attachment(uuid, uuid, uuid, uuid, text, integer, boolean, integer)",
   "list_self_user_resource_authorities(uuid, uuid, text, uuid, integer)",
   "issue_self_user_resource_grant(uuid, uuid, uuid, text, text, text, uuid, integer, boolean)",
+  "issue_self_local_connection_use_grant(uuid, uuid, uuid, text, boolean)",
   "revoke_self_user_resource_grant(uuid, uuid, uuid)",
   "authorize_session_attempt_personal_resource_reads(uuid, uuid, uuid)",
 ] as const;
@@ -407,15 +410,21 @@ const GOVERNED_LEARNING_INSPECTION_AUTHORITY_TABLES = [
 ] as const;
 const COMPANY_PROFILE_AGENT_ADMIN_ROUTINES = [
   "propose_company_profile_for_attempt(uuid, uuid, uuid, uuid, uuid, integer, uuid, text, text, text)",
+  "propose_company_profile_for_attempt_v2(uuid, uuid, uuid, uuid, uuid, integer, uuid, uuid, text, text, text)",
   "confirm_company_profile_for_attempt(uuid, uuid, uuid, uuid, uuid, integer, uuid, uuid, uuid)",
+  "get_company_profile_agent_policy(uuid, uuid, text)",
+  "update_company_profile_agent_policy(uuid, uuid, text, text, bigint, uuid)",
 ] as const;
 const COMPANY_PROFILE_AGENT_ADMIN_AUTHORITY_TABLES = [
   "company_profile_activation_events",
+  "company_profile_agent_automatic_activation_receipts",
   "company_profile_agent_confirmation_receipts",
   "company_profile_agent_proposal_receipts",
   "company_profile_heads",
   "company_profile_revisions",
   "managed_accounts",
+  "organization_company_profile_agent_policies",
+  "organization_company_profile_agent_policy_events",
   "organization_memberships",
   "session_human_input_requests",
   "session_turn_attempts",
@@ -597,6 +606,7 @@ export const RUNTIME_TARGET_SCHEMA_FORBIDDEN_ROUTINES = [
 ] as const;
 
 export const RUNTIME_TARGET_SCHEMA_INVOKER_ROUTINES = [
+  "resolve_workspace_codex_subscription_source(uuid, uuid)",
   SESSION_REFERENCE_VISIBLE_ROUTINE,
   XAI_SNAPSHOT_VALIDATOR_ROUTINE,
 ] as const;
@@ -659,6 +669,7 @@ export const FORCE_RLS_TABLES = [
   "company_brain_preference_proposal_receipts",
   "company_brain_turn_context_snapshots",
   "company_profile_activation_events",
+  "company_profile_agent_automatic_activation_receipts",
   "company_profile_agent_confirmation_receipts",
   "company_profile_agent_proposal_receipts",
   "company_profile_heads",
@@ -767,6 +778,9 @@ export const FORCE_RLS_TABLES = [
   "model_call_facts",
   "network_routes",
   "new_session_drafts",
+  "organization_codex_rotation_settings",
+  "organization_company_profile_agent_policies",
+  "organization_company_profile_agent_policy_events",
   "organization_invitation_binding_events",
   "organization_membership_invitations",
   "organization_membership_lifecycle_events",
@@ -849,6 +863,7 @@ export const FORCE_RLS_TABLES = [
   "session_attempt_tool_catalogs",
   "session_background_commands",
   "session_command_receipts",
+  "session_event_cursors",
   "session_events",
   "session_goal_revisions",
   "session_goals",
@@ -925,7 +940,9 @@ export const FORCE_RLS_TABLES = [
   "workspace_artifact_versions",
   "workspace_artifacts",
   "workspace_captures",
+  "workspace_codex_subscription_preferences",
   "workspace_control_events",
+  "workspace_gateway_custom_models",
   "workspace_inference_controls",
   "workspace_instruction_policy_activation_events",
   "workspace_instruction_policy_deactivation_events",
@@ -965,6 +982,7 @@ export const NON_RLS_RUNTIME_TABLES = [
   "auth_users",
   "auth_verifications",
   "automation_webhook_endpoints",
+  "deployment_model_catalog",
   "integration_oauth_clients",
   "managed_accounts",
   "nested_agent_depth_configuration",
@@ -1050,6 +1068,7 @@ export const RUNTIME_FULL_DML_TABLES = [
   "memory_slack_publications",
   "model_call_facts",
   "new_session_drafts",
+  "organization_codex_rotation_settings",
   "pack_installation_components",
   "pack_installations",
   "pr_review_app_registrations",
@@ -1070,6 +1089,7 @@ export const RUNTIME_FULL_DML_TABLES = [
   "session_attempt_interruptions",
   "session_background_commands",
   "session_command_receipts",
+  "session_event_cursors",
   "session_events",
   "session_goals",
   "session_history_items",
@@ -1115,7 +1135,9 @@ export const RUNTIME_FULL_DML_TABLES = [
   "video_generation_references",
   "workspace_artifacts",
   "workspace_captures",
+  "workspace_codex_subscription_preferences",
   "workspace_control_events",
+  "workspace_gateway_custom_models",
   "workspace_inference_controls",
   "workspace_instruction_policy_heads",
   "workspace_memberships",
@@ -1137,6 +1159,7 @@ export const RUNTIME_READ_ONLY_TABLES = [
   "company_profile_activation_events",
   "company_profile_heads",
   "company_profile_snapshots",
+  "deployment_model_catalog",
   "document_authority_reclassifications",
   "knowledge_lifecycle_events",
   "knowledge_memory_lifecycle_events",
@@ -1258,6 +1281,7 @@ export const PROTECTED_NO_DIRECT_DML_TABLES = [
   "company_brain_context_selection_receipts",
   "company_brain_preference_proposal_receipts",
   "company_brain_turn_context_snapshots",
+  "company_profile_agent_automatic_activation_receipts",
   "company_profile_agent_confirmation_receipts",
   "company_profile_agent_proposal_receipts",
   "connection_use_audit_facts",
@@ -1283,6 +1307,8 @@ export const PROTECTED_NO_DIRECT_DML_TABLES = [
   "managed_auth_login_transactions",
   "managed_auth_session_set_operations",
   "managed_auth_session_sets",
+  "organization_company_profile_agent_policies",
+  "organization_company_profile_agent_policy_events",
   "organization_invitation_binding_events",
   "organization_membership_invitations",
   "organization_membership_lifecycle_events",

package/src/schema.ts

@@ -1090,6 +1090,8 @@ export const organizationUserResourceAuthorities = pgTable(
   }),
 );
 
+export type ApiKeyCredentialKind = "workspace" | "organization" | "legacy_account";
+
 export const apiKeys = pgTable(
   "api_keys",
   {
@@ -1102,6 +1104,7 @@ export const apiKeys = pgTable(
     }),
     name: text("name").notNull(),
     description: text("description"),
+    credentialKind: text("credential_kind").$type<ApiKeyCredentialKind>().notNull(),
     prefix: text("prefix").notNull(),
     keyHash: text("key_hash").notNull(),
     permissions: jsonb("permissions").$type<string[]>().notNull().default([]),
@@ -1120,6 +1123,20 @@ export const apiKeys = pgTable(
       "api_keys_description_check",
       sql`${table.description} is null or length(${table.description}) between 1 and 500`,
     ),
+    credentialKindValid: check(
+      "api_keys_credential_kind_check",
+      sql`(
+        ${table.workspaceId} is not null
+        and ${table.credentialKind} = 'workspace'
+      ) or (
+        ${table.workspaceId} is null
+        and ${table.credentialKind} = 'organization'
+      ) or (
+        ${table.workspaceId} is null
+        and ${table.credentialKind} = 'legacy_account'
+        and ${table.revokedAt} is not null
+      )`,
+    ),
   }),
 );
 
@@ -1232,8 +1249,9 @@ export const workspaceVariableSetVariables = pgTable(
   }),
 );
 
-// Per-workspace ChatGPT/Codex subscription credential. One row per connected
-// ChatGPT account within a workspace.
+// Workspace- or organization-owned ChatGPT/Codex subscription credential. One
+// row per connected ChatGPT account in the owning pool. Organization rows have
+// workspace_id = NULL and are selected only for inheriting shared workspaces.
 // access/refresh/id tokens live INSIDE credential_encrypted (v1 AES-256-GCM,
 // same envelope as workspace_variable_set_variables); the other columns are
 // plaintext metadata (header value + UI). RLS-isolated per workspace.
@@ -1244,9 +1262,18 @@ export const codexSubscriptionCredentials = pgTable(
     accountId: uuid("account_id")
       .notNull()
       .references(() => managedAccounts.id, { onDelete: "cascade" }),
-    workspaceId: uuid("workspace_id")
-      .notNull()
-      .references(() => workspaces.id, { onDelete: "cascade" }),
+    workspaceId: uuid("workspace_id").references(() => workspaces.id, { onDelete: "cascade" }),
+    organizationId: uuid("organization_id").references(() => managedAccounts.id, {
+      onDelete: "cascade",
+    }),
+    authorityScope: text("authority_scope").notNull().default("workspace"),
+    ownerOrganizationMembershipId: uuid("owner_organization_membership_id"),
+    organizationUserResourceAuthorityId: uuid("organization_user_resource_authority_id"),
+    organizationUserResourceKind: text("organization_user_resource_kind"),
+    organizationUserResourceAuthorityGeneration: bigint(
+      "organization_user_resource_authority_generation",
+      { mode: "number" },
+    ),
     // Format: v1:<base64 iv>:<base64 ciphertext||gcm-tag>. JSON {access_token, refresh_token, id_token}. Never returned by any API.
     credentialEncrypted: text("credential_encrypted").notNull(),
     chatgptAccountId: text("chatgpt_account_id"), // plaintext ChatGPT-Account-ID header value (non-secret)
@@ -1268,10 +1295,13 @@ export const codexSubscriptionCredentials = pgTable(
     secondaryUsedPercent: integer("secondary_used_percent"),
     secondaryResetAt: timestamp("secondary_reset_at", { withTimezone: true }),
     usageCheckedAt: timestamp("usage_checked_at", { withTimezone: true }), // snapshot freshness → cache TTL clock
-    // P3 rotation cooldown (plaintext metadata; NEVER a token). Set when this account hit its
-    // usage cap on a rotation turn; the rotation engine treats `exhausted_until > now()` as
-    // capped/skip so it isn't immediately re-picked. Self-clears via the now() comparison.
+    // P3 rotation cooldown (plaintext metadata; NEVER a token). The kind keeps
+    // quota refusals distinct from generic provider backpressure. The independent
+    // revision fences a live usage response against a concurrently newer refusal;
+    // neither field participates in token-refresh OCC.
     exhaustedUntil: timestamp("exhausted_until", { withTimezone: true }),
+    exhaustedKind: text("exhausted_kind"), // quota | rate_limit | null (legacy/cleared)
+    exhaustedRevision: bigint("exhausted_revision", { mode: "number" }).notNull().default(0),
     // Workspace-local, server-held fairness cursor. Provider usage headers are
     // capacity hints, never the sole allocator: live lease count is ranked first
     // and this cursor deterministically breaks equal-load/equal-capacity ties.
@@ -1319,6 +1349,69 @@ export const codexSubscriptionCredentials = pgTable(
     workspaceAccountIdentity: uniqueIndex(
       "codex_subscription_credentials_workspace_account_id_idx",
     ).on(table.workspaceId, table.accountId, table.id),
+    accountIdentity: uniqueIndex("codex_subscription_credentials_account_id_idx").on(
+      table.accountId,
+      table.id,
+    ),
+    organizationAccount: uniqueIndex("codex_subscription_credentials_organization_account_idx")
+      .on(table.organizationId, table.chatgptAccountId)
+      .where(
+        sql`${table.authorityScope} = 'organization' and ${table.chatgptAccountId} is not null`,
+      ),
+    organizationLookup: index("codex_subscription_credentials_organization_lookup_idx")
+      .on(table.organizationId, table.createdAt, table.id)
+      .where(sql`${table.authorityScope} = 'organization'`),
+  }),
+);
+
+export const workspaceCodexSubscriptionPreferences = pgTable(
+  "workspace_codex_subscription_preferences",
+  {
+    workspaceId: uuid("workspace_id")
+      .primaryKey()
+      .references(() => workspaces.id, { onDelete: "cascade" }),
+    accountId: uuid("account_id")
+      .notNull()
+      .references(() => managedAccounts.id, { onDelete: "cascade" }),
+    mode: text("mode").notNull().default("automatic"),
+    updatedBySubjectId: text("updated_by_subject_id"),
+    createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
+    updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow(),
+  },
+  (table) => ({
+    workspaceAccount: foreignKey({
+      name: "workspace_codex_subscription_preferences_workspace_account_fk",
+      columns: [table.workspaceId, table.accountId],
+      foreignColumns: [workspaces.id, workspaces.accountId],
+    }).onDelete("cascade"),
+    modeValid: check(
+      "workspace_codex_subscription_preferences_mode_chk",
+      sql`${table.mode} in ('automatic', 'workspace', 'organization', 'disabled')`,
+    ),
+  }),
+);
+
+export const organizationCodexRotationSettings = pgTable(
+  "organization_codex_rotation_settings",
+  {
+    id: uuid("id").primaryKey().defaultRandom(),
+    accountId: uuid("account_id")
+      .notNull()
+      .references(() => managedAccounts.id, { onDelete: "cascade" }),
+    activeCredentialId: uuid("active_credential_id"),
+    rotationEnabled: boolean("rotation_enabled").notNull().default(false),
+    leaseRotationEnabled: boolean("lease_rotation_enabled").notNull().default(false),
+    rotationStrategy: text("rotation_strategy").notNull().default("sharded"),
+    createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
+    updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow(),
+  },
+  (table) => ({
+    account: uniqueIndex("organization_codex_rotation_settings_account_idx").on(table.accountId),
+    activeCredential: foreignKey({
+      name: "organization_codex_rotation_settings_active_fk",
+      columns: [table.activeCredentialId],
+      foreignColumns: [codexSubscriptionCredentials.id],
+    }).onDelete("set null"),
   }),
 );
 
@@ -6987,6 +7080,15 @@ export const sessionCommandReceipts = pgTable(
       table.targetSessionId,
       table.createdAt,
     ),
+    promptActorOperation: index("session_command_receipts_prompt_actor_operation_idx")
+      .on(
+        table.workspaceId,
+        table.actorType,
+        table.actorSubjectId,
+        table.actorAttemptId,
+        table.operationKey,
+      )
+      .where(sql`${table.action} in ('prompt.send', 'prompt.steer')`),
     goalUpdateOperation: uniqueIndex("session_command_receipts_goal_update_operation_uq")
       .on(table.workspaceId, table.action, table.targetSessionId, table.operationKey)
       .where(sql`${table.action} = 'goal.update'`),
@@ -7800,6 +7902,43 @@ export const xaiCapacityWaiters = pgTable(
   }),
 );
 
+export const sessionEventCursors = pgTable(
+  "session_event_cursors",
+  {
+    sessionId: uuid("session_id")
+      .primaryKey()
+      .references(() => sessions.id, { onDelete: "cascade" }),
+    accountId: uuid("account_id")
+      .notNull()
+      .references(() => managedAccounts.id, { onDelete: "cascade" }),
+    workspaceId: uuid("workspace_id")
+      .notNull()
+      .references(() => workspaces.id, { onDelete: "cascade" }),
+    lastSequence: integer("last_sequence").notNull().default(0),
+    revision: bigint("revision", { mode: "number" }).notNull().default(0),
+    createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
+    updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow(),
+  },
+  (table) => ({
+    workspaceAccount: foreignKey({
+      name: "session_event_cursors_workspace_account_fk",
+      columns: [table.workspaceId, table.accountId],
+      foreignColumns: [workspaces.id, workspaces.accountId],
+    }).onDelete("cascade"),
+    workspaceSession: foreignKey({
+      name: "session_event_cursors_workspace_session_fk",
+      columns: [table.workspaceId, table.sessionId],
+      foreignColumns: [sessions.workspaceId, sessions.id],
+    }).onDelete("cascade"),
+    workspaceIdentity: uniqueIndex("session_event_cursors_workspace_session_idx").on(
+      table.workspaceId,
+      table.sessionId,
+    ),
+    sequenceValid: check("session_event_cursors_sequence_check", sql`${table.lastSequence} >= 0`),
+    revisionValid: check("session_event_cursors_revision_check", sql`${table.revision} >= 0`),
+  }),
+);
+
 export const sessionEvents = pgTable(
   "session_events",
   {
@@ -8472,6 +8611,29 @@ export const sandboxLeases = pgTable(
     currentCheckpointArtifactId: uuid("current_checkpoint_artifact_id"),
     previousCheckpointArtifactId: uuid("previous_checkpoint_artifact_id"),
 
+    // Durable single-flight for immutable machine setup (currently exact rig
+    // setup only). Per-turn credentials, repositories, files, and cloud login
+    // deliberately remain outside this lease-scoped receipt.
+    sharedPreparationLeaseEpoch: integer("shared_preparation_lease_epoch"),
+    sharedPreparationInstanceId: text("shared_preparation_instance_id"),
+    sharedPreparationSpecHash: text("shared_preparation_spec_hash"),
+    sharedPreparationStatus: text("shared_preparation_status", {
+      enum: ["running", "completed", "failed"],
+    }),
+    sharedPreparationClaimId: uuid("shared_preparation_claim_id"),
+    sharedPreparationOwnerAttemptId: uuid("shared_preparation_owner_attempt_id"),
+    sharedPreparationAttempt: integer("shared_preparation_attempt"),
+    sharedPreparationRevision: integer("shared_preparation_revision").notNull().default(0),
+    sharedPreparationStartedAt: timestamp("shared_preparation_started_at", {
+      withTimezone: true,
+    }),
+    sharedPreparationDeadlineAt: timestamp("shared_preparation_deadline_at", {
+      withTimezone: true,
+    }),
+    sharedPreparationSettledAt: timestamp("shared_preparation_settled_at", {
+      withTimezone: true,
+    }),
+
     expiresAt: timestamp("expires_at", { withTimezone: true }).notNull(),
     createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
     updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow(),
@@ -10874,8 +11036,9 @@ export const hostExportConfig = pgTable(
 /**
  * Transactional delivery buffer. It intentionally has no tenant/source FKs:
  * a workspace deletion must not erase an already-committed, unacknowledged
- * host fact. Session-event payloads retain their exact storage bytes plus
- * explicit codec truth; usage payloads remain ordinary JSON.
+ * host fact. Session-event rows retain exact storage bytes while they fit the
+ * bounded host wire; larger canonical events carry an explicit content-free
+ * projection plus literal-JSON codec truth. Usage payloads remain ordinary JSON.
  */
 export const hostExportOutbox = pgTable(
   "host_export_outbox",
@@ -12475,6 +12638,92 @@ export const rigChanges = pgTable(
   }),
 );
 
+export const deploymentModelCatalog = pgTable(
+  "deployment_model_catalog",
+  {
+    singleton: boolean("singleton").primaryKey().notNull().default(true),
+    document: jsonb("document").$type<unknown>().notNull(),
+    version: bigint("version", { mode: "number" }).notNull().default(1),
+    updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow(),
+  },
+  (table) => ({
+    singletonCheck: check("deployment_model_catalog_singleton_chk", sql`${table.singleton}`),
+    documentCheck: check(
+      "deployment_model_catalog_document_chk",
+      sql`jsonb_typeof(${table.document}) = 'object'`,
+    ),
+    versionCheck: check("deployment_model_catalog_version_chk", sql`${table.version} > 0`),
+  }),
+);
+
+export const workspaceGatewayCustomModels = pgTable(
+  "workspace_gateway_custom_models",
+  {
+    id: uuid("id").primaryKey().defaultRandom(),
+    accountId: uuid("account_id")
+      .notNull()
+      .references(() => managedAccounts.id, { onDelete: "cascade" }),
+    workspaceId: uuid("workspace_id")
+      .notNull()
+      .references(() => workspaces.id, { onDelete: "cascade" }),
+    providerKind: text("provider_kind").$type<"vercel_gateway" | "openrouter">().notNull(),
+    upstreamModelId: text("upstream_model_id").notNull(),
+    label: text("label"),
+    version: integer("version").notNull().default(1),
+    createOperationId: uuid("create_operation_id").notNull(),
+    createRequestHash: text("create_request_hash").notNull(),
+    deleteOperationId: uuid("delete_operation_id"),
+    deleteRequestHash: text("delete_request_hash"),
+    createdBySubjectId: text("created_by_subject_id").notNull(),
+    retiredAt: timestamp("retired_at", { withTimezone: true }),
+    createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
+    updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow(),
+  },
+  (table) => ({
+    workspaceAccountFk: foreignKey({
+      name: "workspace_gateway_custom_models_workspace_account_fk",
+      columns: [table.workspaceId, table.accountId],
+      foreignColumns: [workspaces.id, workspaces.accountId],
+    }).onDelete("cascade"),
+    workspaceUpstream: uniqueIndex("workspace_gateway_custom_models_workspace_upstream_uq")
+      .on(table.workspaceId, table.providerKind, table.upstreamModelId)
+      .where(sql`${table.retiredAt} is null`),
+    createOperation: uniqueIndex("workspace_gateway_custom_models_create_operation_uq").on(
+      table.workspaceId,
+      table.providerKind,
+      table.createOperationId,
+    ),
+    deleteOperation: uniqueIndex("workspace_gateway_custom_models_delete_operation_uq")
+      .on(table.workspaceId, table.providerKind, table.deleteOperationId)
+      .where(sql`${table.deleteOperationId} is not null`),
+    providerKindCheck: check(
+      "workspace_gateway_custom_models_provider_kind_chk",
+      sql`${table.providerKind} in ('vercel_gateway', 'openrouter')`,
+    ),
+    upstreamCheck: check(
+      "workspace_gateway_custom_models_upstream_chk",
+      sql`octet_length(${table.upstreamModelId}) between 1 and 238 and ${table.upstreamModelId} ~ '^[!-~]+$' and ${table.upstreamModelId} !~ '[|]'`,
+    ),
+    labelCheck: check(
+      "workspace_gateway_custom_models_label_chk",
+      sql`${table.label} is null or (octet_length(${table.label}) between 1 and 128 and ${table.label} !~ '[\r\n|]')`,
+    ),
+    actorCheck: check(
+      "workspace_gateway_custom_models_actor_chk",
+      sql`octet_length(${table.createdBySubjectId}) between 1 and 1024`,
+    ),
+    versionCheck: check("workspace_gateway_custom_models_version_chk", sql`${table.version} > 0`),
+    createHashCheck: check(
+      "workspace_gateway_custom_models_create_hash_chk",
+      sql`${table.createRequestHash} ~ '^[a-f0-9]{64}$'`,
+    ),
+    deleteReceiptCheck: check(
+      "workspace_gateway_custom_models_delete_receipt_chk",
+      sql`(${table.deleteOperationId} is null and ${table.deleteRequestHash} is null) or (${table.deleteOperationId} is not null and ${table.deleteRequestHash} ~ '^[a-f0-9]{64}$' and ${table.retiredAt} is not null)`,
+    ),
+  }),
+);
+
 export * from "./workspace-instruction-policies-schema";
 export * from "./company-profile-schema";
 export * from "./workspace-learning-policy-schema";