@foundrynorth/flux-schema 1.17.3 → 1.18.0

package/dist/schema.js

@@ -6,7 +6,7 @@
  *
  * CRITICAL: No stubs. All tables are real and will be created on migration.
  */
-import { pgTable, varchar, text, boolean, timestamp, date, jsonb, integer, bigint, numeric, uuid, real, serial, time, pgEnum, uniqueIndex, index, customType, } from "drizzle-orm/pg-core";
+import { pgTable, varchar, text, boolean, timestamp, date, jsonb, integer, bigint, bigserial, numeric, uuid, real, serial, time, pgEnum, uniqueIndex, index, customType, } from "drizzle-orm/pg-core";
 import { relations, sql } from "drizzle-orm";
 /**
  * Custom pgvector type for embedding columns.
@@ -512,6 +512,7 @@ export const fluxAlerts = pgTable("flux_alerts", {
     createdAt: timestamp("created_at").defaultNow().notNull(),
 }, (table) => ({
     projectIdx: index("flux_alerts_project_idx").on(table.projectId),
+    ruleIdx: index("flux_alerts_rule_idx").on(table.ruleId),
     firedAtIdx: index("flux_alerts_fired_at_idx").on(table.firedAt),
     unacknowledgedIdx: index("flux_alerts_unacknowledged_idx").on(table.acknowledgedAt),
 }));
@@ -2570,6 +2571,20 @@ export const fluxFulfillmentTickets = pgTable("flux_fulfillment_tickets", {
     dealOrderTotal: numeric("deal_order_total", { precision: 12, scale: 2 }),
     /** Compass order status (e.g., "signed", "draft", "amended") */
     compassOrderStatus: text("compass_order_status"),
+    /** Human-readable product family name derived from Compass context */
+    familyName: text("family_name"),
+    /** Requested creative sizes from Compass / HubSpot line item context */
+    adSizes: jsonb("ad_sizes").$type(),
+    /** Product / offer description for stronger creative briefs */
+    productDescription: text("product_description"),
+    /** Product KPIs / use cases carried from upstream when available */
+    productKpis: jsonb("product_kpis").$type(),
+    /** Creative refresh cadence inherited from upstream order defaults */
+    creativeRefreshCadence: text("creative_refresh_cadence"),
+    /** Company domain used for landing page and brand context */
+    companyDomain: text("company_domain"),
+    /** Company industry used for briefing and brand alignment */
+    companyIndustry: text("company_industry"),
     // -- Native HubSpot SLA --
     /** HubSpot SLA status for first response (Overdue, Due Soon, Active SLA, etc.) */
     hubspotSlaFirstResponse: varchar("hubspot_sla_first_response"),
@@ -4046,26 +4061,46 @@ export const fluxSlaAuditLog = pgTable("flux_sla_audit_log", {
 // Agreement Tracking
 // ============================================================================
 /**
- * Agreement tier: contract (annual commitment), io (per-order), approval (lightweight)
+ * Agreement tier discriminator. Contracts are the umbrella commitment,
+ * IOs are tactical executions (usually under a parent contract), NDAs
+ * are non-disclosure documents with no commitment.
  */
-export const fluxAgreementTierEnum = pgEnum("flux_agreement_tier", [
+export const fluxAgreementTier = pgEnum("flux_agreement_tier", [
     "contract",
     "io",
-    "approval",
+    "nda",
 ]);
 /**
- * Agreement lifecycle status
+ * Signing workflow state machine (pre-execution).
  */
-export const fluxAgreementStatusEnum = pgEnum("flux_agreement_status", [
+export const fluxSigningStatus = pgEnum("flux_signing_status", [
     "draft",
     "pending_internal",
     "pending_client",
     "pending_countersign",
-    "negotiation",
+    "signed",
+    "voided",
+]);
+/**
+ * Post-signing lifecycle state machine. Separate from signing_status so
+ * the two concerns don't interleave in a single enum.
+ */
+export const fluxLifecycleStatus = pgEnum("flux_lifecycle_status", [
+    "pre_active",
     "active",
-    "amended",
+    "expiring_soon",
     "expired",
-    "voided",
+    "renewed",
+    "terminated_early",
+]);
+/**
+ * Relationship between a version chain entry and its predecessor.
+ * NULL = original (not a revision). 'amendment' = revision of the same
+ * commitment period. 'renewal' = sequential new commitment period.
+ */
+export const fluxRelationType = pgEnum("flux_relation_type", [
+    "amendment",
+    "renewal",
 ]);
 /**
  * Signer role in the signing workflow
@@ -4085,29 +4120,69 @@ export const fluxSignerStatusEnum = pgEnum("flux_signer_status", [
     "delegated",
 ]);
 /**
- * Agreements — tracks contracts, IOs, and approvals across their lifecycle.
- * Links to projects, deals, fulfillment tickets, and Compass entities.
+ * Agreements — unified table for contracts, insertion orders, and NDAs.
+ * Discriminated by `tier`. fn-flux is the system of record for this
+ * entity; Compass keeps shadow rows in its own `contracts` table via
+ * the `fluxAgreementId` back-reference.
+ *
+ * See docs/superpowers/specs/2026-04-10-contract-agreement-p0-design.md
+ * for the full design rationale.
  */
 export const fluxAgreements = pgTable("flux_agreements", {
+    // ─── Identity + discriminator ─────────────────────────────────────
     id: text("id").primaryKey().default(sql `gen_random_uuid()::text`),
-    tier: fluxAgreementTierEnum("tier").notNull(),
-    status: fluxAgreementStatusEnum("status").notNull().default("draft"),
+    tier: fluxAgreementTier("tier").notNull(),
+    version: integer("version").notNull().default(1),
+    previousVersionId: text("previous_version_id").references(() => fluxAgreements.id),
+    relationType: fluxRelationType("relation_type"),
+    // ─── Two status state machines ─────────────────────────────────────
+    signingStatus: fluxSigningStatus("signing_status")
+        .notNull()
+        .default("draft"),
+    lifecycleStatus: fluxLifecycleStatus("lifecycle_status"),
+    // ─── Counterparty (canonical: hubspot_company_id) ─────────────────
+    hubspotCompanyId: text("hubspot_company_id"),
+    counterpartyName: text("counterparty_name"),
     projectId: text("project_id").references(() => fluxProjects.id),
-    dealId: text("deal_id").references(() => fluxDealPipeline.id),
     hubspotDealId: text("hubspot_deal_id"),
-    fulfillmentTicketId: text("fulfillment_ticket_id").references(() => fluxFulfillmentTickets.id),
+    // ─── Hierarchy ─────────────────────────────────────────────────────
+    parentAgreementId: text("parent_agreement_id").references(() => fluxAgreements.id),
+    pendingCompassContractIdHint: text("pending_compass_contract_id_hint"),
+    standaloneConfirmedAt: timestamp("standalone_confirmed_at", {
+        withTimezone: true,
+    }),
+    standaloneConfirmedByUserId: text("standalone_confirmed_by_user_id").references(() => fluxUsers.id),
+    // ─── Cross-system identity ─────────────────────────────────────────
     compassContractId: text("compass_contract_id"),
     compassOrderId: text("compass_order_id"),
+    fulfillmentTicketId: text("fulfillment_ticket_id").references(() => fluxFulfillmentTickets.id),
+    // ─── Terms ─────────────────────────────────────────────────────────
     title: text("title").notNull(),
     description: text("description"),
-    commitmentAmount: numeric("commitment_amount", { precision: 14, scale: 2 }),
-    tierCode: text("tier_code"),
-    currency: text("currency").default("USD"),
     effectiveDate: date("effective_date"),
     expirationDate: date("expiration_date"),
-    version: integer("version").notNull().default(1),
-    previousVersionId: text("previous_version_id").references(() => fluxAgreements.id),
-    amendmentReason: text("amendment_reason"),
+    currency: text("currency").notNull().default("USD"),
+    entitlementTierCode: text("entitlement_tier_code"),
+    // ─── Commitment + 3-stage drawdown (contract-tier only) ───────────
+    commitmentAmount: numeric("commitment_amount", { precision: 14, scale: 2 }),
+    committedAmount: numeric("committed_amount", { precision: 14, scale: 2 }),
+    allocatedAmount: numeric("allocated_amount", { precision: 14, scale: 2 }),
+    billedAmount: numeric("billed_amount", { precision: 14, scale: 2 }),
+    remainingAmount: numeric("remaining_amount", { precision: 14, scale: 2 }),
+    // ─── Margin (contract-tier only) ──────────────────────────────────
+    projectedMarginPct: numeric("projected_margin_pct", { precision: 5, scale: 2 }),
+    projectedMarginDollars: numeric("projected_margin_dollars", { precision: 14, scale: 2 }),
+    actualMarginPct: numeric("actual_margin_pct", { precision: 5, scale: 2 }),
+    actualMarginDollars: numeric("actual_margin_dollars", { precision: 14, scale: 2 }),
+    // ─── Value-add, rate card, product mix (contract-tier only) ───────
+    valueAddTotal: numeric("value_add_total", { precision: 14, scale: 2 }),
+    rateCard: jsonb("rate_card"),
+    productAllocations: jsonb("product_allocations"),
+    // ─── Renewal terms (contract-tier only) ───────────────────────────
+    autorenew: boolean("autorenew").notNull().default(false),
+    renewalTermMonths: integer("renewal_term_months"),
+    noticeDeadline: date("notice_deadline"),
+    // ─── E-sign + document (all tiers) ────────────────────────────────
     documentUrl: text("document_url"),
     documentFingerprint: text("document_fingerprint"),
     documentFileName: text("document_file_name"),
@@ -4115,31 +4190,19 @@ export const fluxAgreements = pgTable("flux_agreements", {
     esignEnvelopeId: text("esign_envelope_id"),
     esignCallbackUrl: text("esign_callback_url"),
     esignStatus: text("esign_status"),
-    hubspotPropertySyncedAt: timestamp("hubspot_property_synced_at", {
-        withTimezone: true,
-    }),
-    slackChannelId: text("slack_channel_id"),
-    slackMessageTs: text("slack_message_ts"),
+    // ─── Health / risk / compliance (feeds P4) ────────────────────────
     healthScore: integer("health_score"),
-    complianceStatus: text("compliance_status"),
-    riskIndicators: jsonb("risk_indicators").default([]),
-    parentContractId: text("parent_contract_id").references(() => fluxMasterContracts.id),
-    metadata: jsonb("metadata").default({}),
-    // --- Workspace columns (graduated from metadata JSONB) ---
-    priority: text("priority").default("medium"),
-    workspaceStatus: text("workspace_status"),
-    counterpartyName: text("counterparty_name"),
-    currentModule: text("current_module"),
-    receivedAt: timestamp("received_at", { withTimezone: true }),
-    requestedBy: text("requested_by"),
-    ownerName: text("owner_name"),
-    needsBy: text("needs_by"),
-    autorenew: boolean("autorenew"),
-    renewalTermMonths: integer("renewal_term_months"),
-    noticeDeadline: text("notice_deadline"),
-    packageType: jsonb("package_type").default([]),
-    tags: jsonb("tags").default([]),
     riskScore: integer("risk_score"),
+    complianceStatus: text("compliance_status"),
+    riskIndicators: jsonb("risk_indicators").notNull().default([]),
+    // ─── Operational ──────────────────────────────────────────────────
+    priority: text("priority").notNull().default("medium"),
+    slackChannelId: text("slack_channel_id"),
+    slackMessageTs: text("slack_message_ts"),
+    tags: jsonb("tags").notNull().default([]),
+    amendmentReason: text("amendment_reason"),
+    metadata: jsonb("metadata").notNull().default({}),
+    // ─── Audit ────────────────────────────────────────────────────────
     createdById: text("created_by_id").references(() => fluxUsers.id),
     createdAt: timestamp("created_at", { withTimezone: true })
         .notNull()
@@ -4147,16 +4210,52 @@ export const fluxAgreements = pgTable("flux_agreements", {
     updatedAt: timestamp("updated_at", { withTimezone: true })
         .notNull()
         .defaultNow(),
-});
+    hubspotPropertySyncedAt: timestamp("hubspot_property_synced_at", {
+        withTimezone: true,
+    }),
+}, (table) => ({
+    idxTierLifecycle: index("idx_flux_agreements_tier_lifecycle")
+        .on(table.tier, table.lifecycleStatus)
+        .where(sql `${table.lifecycleStatus} IS NOT NULL`),
+    idxHubspotCompany: index("idx_flux_agreements_hubspot_company")
+        .on(table.hubspotCompanyId)
+        .where(sql `${table.hubspotCompanyId} IS NOT NULL`),
+    idxParent: index("idx_flux_agreements_parent")
+        .on(table.parentAgreementId)
+        .where(sql `${table.parentAgreementId} IS NOT NULL`),
+    idxCompassContract: index("idx_flux_agreements_compass_contract")
+        .on(table.compassContractId)
+        .where(sql `${table.compassContractId} IS NOT NULL`),
+    idxCompassOrder: index("idx_flux_agreements_compass_order")
+        .on(table.compassOrderId)
+        .where(sql `${table.compassOrderId} IS NOT NULL`),
+    idxSigningPending: index("idx_flux_agreements_signing_pending")
+        .on(table.signingStatus)
+        .where(sql `${table.signingStatus} IN ('pending_internal', 'pending_client', 'pending_countersign')`),
+    idxExpiring: index("idx_flux_agreements_expiring")
+        .on(table.expirationDate)
+        .where(sql `${table.lifecycleStatus} IN ('active', 'expiring_soon')`),
+    idxVersionChain: index("idx_flux_agreements_version_chain")
+        .on(table.previousVersionId)
+        .where(sql `${table.previousVersionId} IS NOT NULL`),
+    idxUnlinkedIos: index("idx_flux_agreements_unlinked_ios")
+        .on(table.tier, table.signingStatus, table.createdAt)
+        .where(sql `${table.tier} = 'io' AND ${table.parentAgreementId} IS NULL AND ${table.standaloneConfirmedAt} IS NULL`),
+    idxPendingHint: index("idx_flux_agreements_pending_hint")
+        .on(table.pendingCompassContractIdHint)
+        .where(sql `${table.pendingCompassContractIdHint} IS NOT NULL`),
+    uqCompassContract: uniqueIndex("uq_flux_agreements_compass_contract")
+        .on(table.compassContractId)
+        .where(sql `${table.compassContractId} IS NOT NULL`),
+    uqCompassOrder: uniqueIndex("uq_flux_agreements_compass_order")
+        .on(table.compassOrderId)
+        .where(sql `${table.compassOrderId} IS NOT NULL`),
+}));
 export const fluxAgreementsRelations = relations(fluxAgreements, ({ one, many }) => ({
     project: one(fluxProjects, {
         fields: [fluxAgreements.projectId],
         references: [fluxProjects.id],
     }),
-    deal: one(fluxDealPipeline, {
-        fields: [fluxAgreements.dealId],
-        references: [fluxDealPipeline.id],
-    }),
     fulfillmentTicket: one(fluxFulfillmentTickets, {
         fields: [fluxAgreements.fulfillmentTicketId],
         references: [fluxFulfillmentTickets.id],
@@ -4164,15 +4263,24 @@ export const fluxAgreementsRelations = relations(fluxAgreements, ({ one, many })
     previousVersion: one(fluxAgreements, {
         fields: [fluxAgreements.previousVersionId],
         references: [fluxAgreements.id],
+        relationName: "versionChain",
+    }),
+    parentAgreement: one(fluxAgreements, {
+        fields: [fluxAgreements.parentAgreementId],
+        references: [fluxAgreements.id],
+        relationName: "parentChild",
     }),
-    parentContract: one(fluxMasterContracts, {
-        fields: [fluxAgreements.parentContractId],
-        references: [fluxMasterContracts.id],
+    childAgreements: many(fluxAgreements, {
+        relationName: "parentChild",
     }),
     createdBy: one(fluxUsers, {
         fields: [fluxAgreements.createdById],
         references: [fluxUsers.id],
     }),
+    standaloneConfirmedBy: one(fluxUsers, {
+        fields: [fluxAgreements.standaloneConfirmedByUserId],
+        references: [fluxUsers.id],
+    }),
     signers: many(fluxAgreementSigners),
     activity: many(fluxAgreementActivity),
     comments: many(fluxAgreementComments),
@@ -4181,6 +4289,7 @@ export const fluxAgreementsRelations = relations(fluxAgreements, ({ one, many })
     approvalRuns: many(fluxAgreementApprovalRuns),
     esignRuns: many(fluxAgreementEsignRuns),
     lifecycleEvents: many(fluxAgreementLifecycleEvents),
+    agreementEvents: many(fluxAgreementEvents),
 }));
 /**
  * Agreement signers — tracks each signer in the signing workflow.
@@ -4266,7 +4375,7 @@ export const fluxAgreementActivityRelations = relations(fluxAgreementActivity, (
  */
 export const fluxEsignConfig = pgTable("flux_esign_config", {
     id: text("id").primaryKey().default(sql `gen_random_uuid()::text`),
-    tier: fluxAgreementTierEnum("tier").notNull().unique(),
+    tier: fluxAgreementTier("tier").notNull().unique(),
     firmaTemplateId: text("firma_template_id"),
     defaultVpSignerIds: text("default_vp_signer_ids")
         .array()
@@ -4762,118 +4871,114 @@ export const fluxSimplifiPacing = pgTable("flux_simplifi_pacing", {
     endDateIdx: index("flux_simplifi_pacing_end_date_idx").on(table.endDate),
 }));
 // ============================================================================
-// CONTRACT VAULT — Master Contracts, Versioning, Search, Pacing
+// AGREEMENT SUPPORTING TABLES — Events, Inbound Dedupe, Versions, Chunks
 // ============================================================================
 /**
- * Master contract type classification
+ * flux_agreement_events — Internal audit log of every state change on a
+ * flux_agreements row. Written within the same transaction as the
+ * mutation via the agreement repository. Consumed by P4 risk scoring
+ * and P5 alerting.
  */
-export const fluxMasterContractTypeEnum = pgEnum("flux_master_contract_type", [
-    "msa",
-    "nda",
-    "sow",
-    "vendor",
-    "partnership",
-    "other",
-]);
-/**
- * Master contract lifecycle status — simpler than the 8-status agreement machine
- */
-export const fluxMasterContractStatusEnum = pgEnum("flux_master_contract_status", ["draft", "active", "expiring", "expired", "renewed", "terminated"]);
+export const fluxAgreementEvents = pgTable("flux_agreement_events", {
+    id: bigserial("id", { mode: "number" }).primaryKey(),
+    agreementId: text("agreement_id")
+        .notNull()
+        .references(() => fluxAgreements.id),
+    eventType: text("event_type").notNull(),
+    previousValue: text("previous_value"),
+    newValue: text("new_value"),
+    actorUserId: text("actor_user_id").references(() => fluxUsers.id),
+    reason: text("reason"),
+    emittedAt: timestamp("emitted_at", { withTimezone: true })
+        .notNull()
+        .defaultNow(),
+}, (table) => ({
+    byAgreementIdx: index("idx_flux_agreement_events_by_agreement").on(table.agreementId, table.emittedAt),
+    byTypeIdx: index("idx_flux_agreement_events_by_type").on(table.eventType, table.emittedAt),
+}));
+export const fluxAgreementEventsRelations = relations(fluxAgreementEvents, ({ one }) => ({
+    agreement: one(fluxAgreements, {
+        fields: [fluxAgreementEvents.agreementId],
+        references: [fluxAgreements.id],
+    }),
+    actor: one(fluxUsers, {
+        fields: [fluxAgreementEvents.actorUserId],
+        references: [fluxUsers.id],
+    }),
+}));
 /**
- * Contract version source type — polymorphic link to master contract or agreement
+ * flux_inbound_events — Dedupe log for events received from external
+ * sources (Compass). Used by the legacy-event-ingest handlers to
+ * gracefully skip retried events without double-processing. 30-day
+ * retention via a prune cron (not in this schema; lives in fn-flux).
  */
-export const fluxContractSourceTypeEnum = pgEnum("flux_contract_source_type", [
-    "master",
-    "agreement",
-]);
+export const fluxInboundEvents = pgTable("flux_inbound_events", {
+    eventId: text("event_id").primaryKey(),
+    source: text("source").notNull(),
+    eventType: text("event_type").notNull(),
+    receivedAt: timestamp("received_at", { withTimezone: true })
+        .notNull()
+        .defaultNow(),
+    processingResult: text("processing_result").notNull().default("pending"),
+    processingError: text("processing_error"),
+});
 /**
- * flux_master_contracts — Governing umbrella contracts.
- * Child agreements (IOs, approvals) link via flux_agreements.parent_contract_id.
+ * flux_outbound_events — Outbox for events Flux sends to external systems
+ * (currently only Compass at POST /flux-contract-events). The agreement
+ * repository enqueues rows in the same transaction as the state mutation,
+ * and a cron worker delivers them with exponential backoff + HMAC signing.
+ *
+ * Design goals:
+ * - At-least-once delivery (cron retries until success or max attempts)
+ * - Transactional consistency with the underlying mutation (if the tx rolls
+ *   back, the outbox row rolls back too — no phantom events)
+ * - Idempotent on the receiver side via the stable event_id
+ * - Observable: last_error + attempts for operator debugging
+ *
+ * Retention: delivered rows older than 7 days are pruned by a cron;
+ * failed rows are kept indefinitely for forensic investigation.
  */
-export const fluxMasterContracts = pgTable("flux_master_contracts", {
+export const fluxOutboundEvents = pgTable("flux_outbound_events", {
     id: text("id").primaryKey().default(sql `gen_random_uuid()::text`),
-    title: text("title").notNull(),
-    counterparty: text("counterparty").notNull(),
-    contractType: fluxMasterContractTypeEnum("contract_type"),
-    contractValue: numeric("contract_value", { precision: 14, scale: 2 }),
-    currency: text("currency").default("USD"),
-    effectiveDate: date("effective_date"),
-    expirationDate: date("expiration_date"),
-    terminationDate: date("termination_date"),
-    autoRenewal: boolean("auto_renewal").default(false),
-    renewalTermMonths: integer("renewal_term_months"),
-    renewalNoticeDays: integer("renewal_notice_days"),
-    status: fluxMasterContractStatusEnum("status").notNull().default("draft"),
-    tags: text("tags")
-        .array()
-        .default(sql `'{}'::text[]`),
-    customFields: jsonb("custom_fields").default({}),
-    notes: text("notes"),
-    documentUrl: text("document_url"),
-    documentFileName: text("document_file_name"),
-    documentStorageKey: text("document_storage_key"),
-    riskScore: integer("risk_score"),
-    riskIndicators: jsonb("risk_indicators").default([]),
-    // Financial fields — Phase: Contract Financial Alignment
-    tierCode: text("tier_code"), // tier_1 | tier_2 | tier_3 | open
-    rateCard: jsonb("rate_card"), // [{ stribProductId?, familyCode?, categoryCode?, rate, rateNotes? }]
-    productAllocations: jsonb("product_allocations"), // [{ familyCode, familyName, planned, notes? }]
-    billingCadence: text("billing_cadence"), // monthly | quarterly | annual
-    termsUrl: text("terms_url"),
-    termsAddendum: text("terms_addendum"),
-    allocatedAmount: numeric("allocated_amount", { precision: 14, scale: 2 }),
-    remainingAmount: numeric("remaining_amount", { precision: 14, scale: 2 }),
-    projectedMarginPct: real("projected_margin_pct"),
-    projectedMarginDollars: numeric("projected_margin_dollars", { precision: 14, scale: 2 }),
-    actualMarginPct: real("actual_margin_pct"),
-    actualMarginDollars: numeric("actual_margin_dollars", { precision: 14, scale: 2 }),
-    valueAddTotal: numeric("value_add_total", { precision: 14, scale: 2 }),
-    fluxVelocityProfileId: text("flux_velocity_profile_id"),
-    customSlaDays: integer("custom_sla_days"),
-    customWarnDays: integer("custom_warn_days"),
-    customBlockDays: integer("custom_block_days"),
-    orderCount: integer("order_count"),
-    createdById: text("created_by_id").references(() => fluxUsers.id),
-    projectId: text("project_id").references(() => fluxProjects.id),
-    hubspotCompanyId: text("hubspot_company_id"),
+    /** Stable event identifier used by the receiver for dedupe */
+    eventId: text("event_id").notNull().unique(),
+    /** 'compass' | 'hubspot' | future destinations */
+    destination: text("destination").notNull(),
+    /** Event type (e.g. 'contract.created', 'contract.updated') */
+    eventType: text("event_type").notNull(),
+    /** Optional FK-ish link to the agreement that triggered the event */
+    fluxAgreementId: text("flux_agreement_id"),
+    /** Full JSON payload posted to the receiver */
+    payload: jsonb("payload").notNull(),
+    /** When the row was created (same tx as the state mutation) */
     createdAt: timestamp("created_at", { withTimezone: true })
         .notNull()
         .defaultNow(),
-    updatedAt: timestamp("updated_at", { withTimezone: true })
-        .notNull()
-        .defaultNow(),
+    /** When the event was successfully delivered (NULL until confirmed 2xx) */
+    deliveredAt: timestamp("delivered_at", { withTimezone: true }),
+    /** Delivery attempt count — used for exponential backoff */
+    attempts: integer("attempts").notNull().default(0),
+    /** Last error string from a failed delivery attempt */
+    lastError: text("last_error"),
+    /** When the next retry should fire (NULL = ready now, past = retry overdue) */
+    nextRetryAt: timestamp("next_retry_at", { withTimezone: true }),
 }, (table) => ({
-    statusIdx: index("flux_master_contracts_status_idx").on(table.status),
-    counterpartyIdx: index("flux_master_contracts_counterparty_idx").on(table.counterparty),
-    expirationIdx: index("flux_master_contracts_expiration_idx").on(table.expirationDate),
-    projectIdx: index("flux_master_contracts_project_idx").on(table.projectId),
-    hubspotCompanyIdx: index("flux_master_contracts_hubspot_company_idx").on(table.hubspotCompanyId),
-}));
-export const fluxMasterContractsRelations = relations(fluxMasterContracts, ({ one, many }) => ({
-    createdBy: one(fluxUsers, {
-        fields: [fluxMasterContracts.createdById],
-        references: [fluxUsers.id],
-    }),
-    project: one(fluxProjects, {
-        fields: [fluxMasterContracts.projectId],
-        references: [fluxProjects.id],
-    }),
-    childAgreements: many(fluxAgreements),
-    versions: many(fluxContractVersions),
-    pacing: many(fluxContractPacing),
-    comments: many(fluxAgreementComments),
+    pendingIdx: index("idx_flux_outbound_events_pending")
+        .on(table.destination, table.nextRetryAt)
+        .where(sql `${table.deliveredAt} IS NULL`),
+    agreementIdx: index("idx_flux_outbound_events_agreement")
+        .on(table.fluxAgreementId)
+        .where(sql `${table.fluxAgreementId} IS NOT NULL`),
 }));
 /**
- * flux_contract_versions — Document version history for master contracts and agreements.
+ * flux_contract_versions — Document version history for agreements.
  * Each revision stored as a separate R2 key with version number.
  */
 export const fluxContractVersions = pgTable("flux_contract_versions", {
     id: text("id").primaryKey().default(sql `gen_random_uuid()::text`),
-    // Polymorphic: references flux_master_contracts.id or flux_agreements.id
-    // depending on contractType. No FK constraint due to polymorphism —
-    // application-level enforcement in master-contract-lifecycle.ts.
-    contractId: text("contract_id").notNull(),
-    contractType: fluxContractSourceTypeEnum("contract_type").notNull(),
+    agreementId: text("agreement_id")
+        .notNull()
+        .references(() => fluxAgreements.id, { onDelete: "cascade" }),
     version: integer("version").notNull(),
     storageKey: text("storage_key").notNull(),
     fileName: text("file_name").notNull(),
@@ -4883,25 +4988,28 @@ export const fluxContractVersions = pgTable("flux_contract_versions", {
         .notNull()
         .defaultNow(),
 }, (table) => ({
-    contractIdx: index("flux_contract_versions_contract_idx").on(table.contractId, table.contractType),
-    versionIdx: uniqueIndex("flux_contract_versions_unique_idx").on(table.contractId, table.contractType, table.version),
+    contractIdx: index("flux_contract_versions_contract_idx").on(table.agreementId),
+    versionIdx: uniqueIndex("flux_contract_versions_unique_idx").on(table.agreementId, table.version),
 }));
 export const fluxContractVersionsRelations = relations(fluxContractVersions, ({ one }) => ({
+    agreement: one(fluxAgreements, {
+        fields: [fluxContractVersions.agreementId],
+        references: [fluxAgreements.id],
+    }),
     uploadedBy: one(fluxUsers, {
         fields: [fluxContractVersions.uploadedById],
         references: [fluxUsers.id],
     }),
 }));
 /**
- * flux_agreement_comments — Threaded comments on agreements or master contracts.
+ * flux_agreement_comments — Threaded comments on agreements.
  * Supports clause references (page, paragraph, quote) for negotiation tracking.
  */
 export const fluxAgreementComments = pgTable("flux_agreement_comments", {
     id: text("id").primaryKey().default(sql `gen_random_uuid()::text`),
-    agreementId: text("agreement_id").references(() => fluxAgreements.id, {
-        onDelete: "cascade",
-    }),
-    contractId: text("contract_id").references(() => fluxMasterContracts.id, {
+    agreementId: text("agreement_id")
+        .notNull()
+        .references(() => fluxAgreements.id, {
         onDelete: "cascade",
     }),
     authorId: text("author_id").references(() => fluxUsers.id),
@@ -4914,7 +5022,6 @@ export const fluxAgreementComments = pgTable("flux_agreement_comments", {
         .defaultNow(),
 }, (table) => ({
     agreementIdx: index("flux_agreement_comments_agreement_idx").on(table.agreementId),
-    contractIdx: index("flux_agreement_comments_contract_idx").on(table.contractId),
     parentIdx: index("flux_agreement_comments_parent_idx").on(table.parentCommentId),
 }));
 export const fluxAgreementCommentsRelations = relations(fluxAgreementComments, ({ one, many }) => ({
@@ -4922,10 +5029,6 @@ export const fluxAgreementCommentsRelations = relations(fluxAgreementComments, (
         fields: [fluxAgreementComments.agreementId],
         references: [fluxAgreements.id],
     }),
-    contract: one(fluxMasterContracts, {
-        fields: [fluxAgreementComments.contractId],
-        references: [fluxMasterContracts.id],
-    }),
     author: one(fluxUsers, {
         fields: [fluxAgreementComments.authorId],
         references: [fluxUsers.id],
@@ -4940,14 +5043,15 @@ export const fluxAgreementCommentsRelations = relations(fluxAgreementComments, (
     }),
 }));
 /**
- * flux_contract_chunks — pgvector-indexed contract content for AI search.
+ * flux_contract_chunks — pgvector-indexed agreement content for AI search.
  * Embeddings via OpenAI text-embedding-3-large (1536 dimensions).
  * Hybrid search: vector cosine + FTS via websearch_to_tsquery.
  */
 export const fluxContractChunks = pgTable("flux_contract_chunks", {
     id: text("id").primaryKey().default(sql `gen_random_uuid()::text`),
-    contractId: text("contract_id").notNull(),
-    contractType: fluxContractSourceTypeEnum("contract_type").notNull(),
+    agreementId: text("agreement_id")
+        .notNull()
+        .references(() => fluxAgreements.id, { onDelete: "cascade" }),
     chunkIndex: integer("chunk_index").notNull(),
     chunkText: text("chunk_text").notNull(),
     embedding: vector("embedding", { dimensions: 1536 }),
@@ -4956,7 +5060,7 @@ export const fluxContractChunks = pgTable("flux_contract_chunks", {
         .notNull()
         .defaultNow(),
 }, (table) => ({
-    contractIdx: index("flux_contract_chunks_contract_idx").on(table.contractId, table.contractType),
+    contractIdx: index("flux_contract_chunks_contract_idx").on(table.agreementId),
     metadataIdx: index("flux_contract_chunks_metadata_idx")
         .using("gin", table.metadata),
 }));
@@ -4978,68 +5082,6 @@ export const fluxContractPolicyChunks = pgTable("flux_contract_policy_chunks", {
 }, (table) => ({
     policyIdx: index("flux_contract_policy_chunks_policy_idx").on(table.policyName),
 }));
-/**
- * flux_contract_pacing — Computed drawdown pacing per active master contract.
- * Mirrors flux_tapclicks_pacing pattern: velocity, trend, anomaly, status.
- */
-export const fluxContractPacing = pgTable("flux_contract_pacing", {
-    id: text("id").primaryKey().default(sql `gen_random_uuid()::text`),
-    contractId: text("contract_id")
-        .notNull()
-        .references(() => fluxMasterContracts.id),
-    pacingStatus: text("pacing_status").notNull(),
-    pacingPercent: numeric("pacing_percent", { precision: 8, scale: 2 }),
-    dailyVelocity: numeric("daily_velocity", { precision: 14, scale: 2 }),
-    velocityTrend: text("velocity_trend"),
-    totalDrawnDown: numeric("total_drawn_down", { precision: 14, scale: 2 }),
-    remainingCapacity: numeric("remaining_capacity", {
-        precision: 14,
-        scale: 2,
-    }),
-    projectedEndSpend: numeric("projected_end_spend", {
-        precision: 14,
-        scale: 2,
-    }),
-    runwayDays: integer("runway_days"),
-    anomalies: jsonb("anomalies").default([]),
-    // ── Contract remainder forecast columns (populated by pacing cron) ──
-    /** Extrapolated margin for unordered remainder (actualMargin - decay) */
-    extrapolatedMarginPct: real("extrapolated_margin_pct"),
-    /** Contract-level confidence score for remainder */
-    forecastConfidence: real("forecast_confidence"),
-    /** Confidence tier for remainder: commit/likely/upside/longshot */
-    forecastConfidenceTier: text("forecast_confidence_tier"),
-    /** Remainder revenue forecasts by window */
-    remainderForecast30d: numeric("remainder_forecast_30d", { precision: 14, scale: 2 }),
-    remainderForecast60d: numeric("remainder_forecast_60d", { precision: 14, scale: 2 }),
-    remainderForecast90d: numeric("remainder_forecast_90d", { precision: 14, scale: 2 }),
-    /** Remainder margin forecasts by window */
-    remainderMarginForecast30d: numeric("remainder_margin_forecast_30d", { precision: 14, scale: 2 }),
-    remainderMarginForecast60d: numeric("remainder_margin_forecast_60d", { precision: 14, scale: 2 }),
-    remainderMarginForecast90d: numeric("remainder_margin_forecast_90d", { precision: 14, scale: 2 }),
-    /** Periods until next expected IO */
-    periodDistance: integer("period_distance"),
-    /** Periods remaining on contract */
-    periodsRemaining: integer("periods_remaining"),
-    computedAt: timestamp("computed_at", { withTimezone: true })
-        .notNull()
-        .defaultNow(),
-    createdAt: timestamp("created_at", { withTimezone: true })
-        .notNull()
-        .defaultNow(),
-    updatedAt: timestamp("updated_at", { withTimezone: true })
-        .notNull()
-        .defaultNow(),
-}, (table) => ({
-    contractIdx: uniqueIndex("flux_contract_pacing_contract_idx").on(table.contractId),
-    statusIdx: index("flux_contract_pacing_status_idx").on(table.pacingStatus),
-}));
-export const fluxContractPacingRelations = relations(fluxContractPacing, ({ one }) => ({
-    contract: one(fluxMasterContracts, {
-        fields: [fluxContractPacing.contractId],
-        references: [fluxMasterContracts.id],
-    }),
-}));
 // ---------------------------------------------------------------------------
 // Agreement Workspace Tables — graduated from metadata JSONB
 // ---------------------------------------------------------------------------