@classytic/crm 1.0.0 → 1.1.0

package/CHANGELOG.md

@@ -2,7 +2,14 @@
 
 All notable changes to `@classytic/crm` are documented here.
 
-## 1.0.0 - 2026-07-29 (unpublished — last published is 0.9.0)
+## 1.1.0 - 2026-08-17
+
+### Changed
+- `tenant` config key replaces `tenantFieldType` across all models and engine (`assertNoLegacyTenantKeys` guard applied)
+- `OpportunityRepository` gains new query methods
+- Model schemas standardised (consistent field ordering, injected tenant field)
+
+## 1.0.0 - 2026-07-29
 
 ### Fixed — Lead and Contact forked one mailbox into two rows (BEHAVIOURAL, 2026-08-08)
 

package/README.md

@@ -99,7 +99,7 @@ import { createCrm, LeadService } from '@classytic/crm';
 
 const crm = await createCrm({
   connection: mongoose.connection,
-  tenantFieldType: 'objectId', // matches Better Auth orgs; 'string' for UUID hosts
+  tenant: { fieldType: 'objectId' }, // matches Better Auth orgs; 'string' for UUID hosts
 });
 
 const ctx = { organizationId: orgId };

package/dist/events.d.ts

@@ -5,6 +5,7 @@ import "mongoose";
 import "@classytic/mongokit";
 import { OperationContext } from "@classytic/primitives/context";
 import "@classytic/primitives/outbox";
+import "@classytic/repo-core/tenant";
 //#region src/events/event-constants.d.ts
 /** PACKAGE_RULES rule 12: `package:resource.verb`. */
 declare const CRM_EVENTS: {

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import { ModelBlueprint, PaginationConfig, PluginType, Repository } from "@class
 import { Connection, Model, Schema, SchemaDefinitionProperty } from "mongoose";
 import { DomainEvent, EventHandler, EventMeta, EventTransport } from "@classytic/primitives/events";
 import { InProcessEventBus } from "@classytic/primitives/event-infra";
+import { ResolvedTenantConfig, TenantConfig } from "@classytic/repo-core/tenant";
 import { z } from "zod";
 import { StatusChangeEntry, StatusHistory, appendStatus, lastTransitionTo, latestEntry, timeInStatus } from "@classytic/primitives/status-history";
 import { OperationContext } from "@classytic/primitives/context";
@@ -83,10 +84,9 @@ declare const ALL_CRM_MODULES: ResolvedCrmModules;
 declare function resolveCrmModules(modules: CrmModulesConfig | undefined): ResolvedCrmModules;
 //#endregion
 //#region src/models/tenant-field.d.ts
-type TenantFieldType = 'objectId' | 'string';
 interface SchemaBuildConfig {
-  /** Schema type for the tenant column. Engine plumbs this everywhere. */
-  tenantFieldType: TenantFieldType;
+  /** Canonical resolved tenant config. Engine plumbs this everywhere. */
+  tenant: ResolvedTenantConfig;
   /** Optional Mongoose model namespace for hosts with generic model names. */
   modelPrefix?: string | undefined;
 }
@@ -1515,19 +1515,13 @@ interface CrmShape {
    * Threaded into both schemas and `multiTenantPlugin` so they stay in
    * sync (PACKAGE_RULES §9.2).
    */
-  tenantFieldType?: TenantFieldType | undefined;
+  tenant?: boolean | TenantConfig | undefined;
   /**
    * Prefix for Mongoose model registry names (for example `Crm` produces
    * `CrmAccount`). Use in large hosts where generic names such as `Account`
    * are already owned by accounting or identity modules.
    */
   modelPrefix?: string | undefined;
-  /**
-   * When `true` (default), wire `multiTenantPlugin` on every repository
-   * with `required: true`. Set `false` only for fixtures / smoke tests
-   * that intentionally drop the scope.
-   */
-  multiTenant?: boolean | undefined;
   /**
    * Progressive feature bundles (PACKAGE_RULES §22). Omit for the
    * all-enabled engine. When provided, unspecified modules are disabled;
@@ -1578,8 +1572,7 @@ interface CrmRuntime {
 }
 interface ResolvedCrmConfig extends SchemaBuildConfig {
   connection: Connection;
-  tenantFieldType: TenantFieldType;
-  multiTenant: boolean;
+  tenant: ResolvedTenantConfig;
   forceRecreate: boolean;
   autoIndex: boolean;
   modules: ResolvedCrmModules;
@@ -3203,4 +3196,4 @@ declare namespace index_d_exports {
   export { AddNoteDto, CancelActivityDto, CloseLossDto, CloseWinDto, CompleteCampaignDto, ConfirmSubscriptionDto, ConvertLeadDto, CreateAccountDto, CreateCampaignDto, CreateContactDto, CreateLeadDto, CreateLossReasonDto, CreatePipelineDto, CreateSequenceInput, LeadFilterDto, MoveStageDto, OpenOpportunityDto, OpportunityFilterDto, PlanActivityDto, RecordEmailEventDto, SequenceFilterInput, StageInputDto, SubscribeDto, SuppressDto, UnsubscribeDto, UnsuppressDto, UpdateAccountDto, UpdateCampaignDto, UpdateContactDto, UpdateLeadDto, UpdateLossReasonDto, UpdateNoteDto, UpdatePipelineDto, UpdateSequenceInput, accountFilterSchema, activityFilterSchema, addNoteSchema, campaignFilterSchema, cancelActivitySchema, closeLossSchema, closeWinSchema, completeCampaignSchema, confirmSubscriptionSchema, contactFilterSchema, convertLeadSchema, createAccountSchema, createCampaignSchema, createContactSchema, createLeadSchema, createLossReasonSchema, createPipelineSchema, createSequenceSchema, currencyCodeSchema, emailEventFilterSchema, leadFilterSchema, lossReasonFilterSchema, metadataSchema, moneyAmountSchema, moveStageSchema, noteFilterSchema, objectIdLike, openOpportunitySchema, opportunityFilterSchema, pipelineFilterSchema, planActivitySchema, recordEmailEventSchema, sequenceFilterSchema, sequenceStepSchema, stageInputSchemaExport, subscribeSchema, subscriptionFilterSchema, suppressSchema, suppressionFilterSchema, tagsSchema, unsubscribeSchema, unsuppressSchema, updateAccountSchema, updateActivitySchema, updateCampaignSchema, updateContactSchema, updateLeadSchema, updateLossReasonSchema, updateNoteSchema, updatePipelineSchema, updateSequenceSchema };
 }
 //#endregion
-export { ACTIVITY_MACHINE, ACTIVITY_STATUSES, ACTIVITY_TRANSITIONS, ACTIVITY_TYPES, ALL_CRM_MODULES, AccountAssigned, AccountCreated, AccountEnriched, AccountMerged, AccountRepository, AccountRepositoryDeps, AccountUpdated, ActivityCancelled, ActivityCompleted, ActivityOutcomeRecorded, ActivityPlanned, ActivityRepository, ActivityRepositoryDeps, ActivityRescheduled, type ActivityStatus, type ActivityType, AlreadyEnrolledError, AutomationCrmModels, AutomationCrmRepositories, CAMPAIGN_MACHINE, CAMPAIGN_STATUSES, CAMPAIGN_TRANSITIONS, CONVERSATION_CHANNELS, CONVERSATION_PARTICIPANT_KINDS, CONVERSATION_STATUSES, CRM_EVENTS, CRM_MODEL_NAMES, CampaignActivated, CampaignArchived, CampaignCompleted, CampaignCreated, CampaignPaused, CampaignRepository, CampaignRepositoryDeps, CampaignResumed, type CampaignStatus, CloseInput, ContactAnonymized, ContactAssigned, ContactCreated, ContactEmailFormatError, ContactEnriched, ContactMergeRepoint, ContactMerged, ContactRepository, ContactRepositoryDeps, ContactUpdated, ConversationAssigned, type ConversationChannel, ConversationCreated, type ConversationParticipantKind, ConversationReopened, ConversationRepository, ConversationRepositoryDeps, ConversationResolved, type ConversationStatus, ConversionRow, ConvertLeadInput, ConvertResult, CreateCrmRepositoriesDeps, CrmBlueprint, CrmContext, CrmEngine, CrmEngineBase, CrmError, CrmEventDefinition, CrmEventDispatcher, type CrmEventDispatcherOptions, CrmEventName, CrmEventSchema, CrmLogger, CrmModels, CrmModuleView, CrmModulesConfig, CrmRepositories, CrmRuntime, CrmShape, DefineCrmModelsConfig, DuplicateCampaignError, DuplicateContactError, DuplicateLeadError, DuplicateSubscriptionError, EMAIL_EVENT_KINDS, EMAIL_EVENT_SUBJECT_KINDS, ENROLLMENT_MACHINE, ENROLLMENT_STATUSES, ENROLLMENT_SUBJECT_KINDS, ENROLLMENT_TRANSITIONS, EVENT_DERIVED_SUPPRESSION_REASONS, EmailEventBounced, EmailEventClicked, EmailEventComplained, type EmailEventKind, EmailEventOpened, EmailEventRepository, EmailEventRepositoryDeps, EmailEventSubjectKind, EmailEventUnsubscribed, EmptyPipelineError, EngagementCrmModels, EngagementCrmRepositories, EnrollInput, EnrollmentCompleted, EnrollmentCreated, EnrollmentExitReason, EnrollmentExited, EnrollmentPaused, EnrollmentRepository, EnrollmentRepositoryDeps, EnrollmentResumed, type EnrollmentStatus, EnrollmentStepSent, EnrollmentSubjectKind, ForecastOptions, ForecastRow, FullCrmModuleViews, IAccountDocument, IActivityDocument, ICampaignDocument, ICampaignStatusEntry, IContactDocument, IContactInfoEmbedded, IContactName, IConversationDocument, IDelayStep, IEmailEventDocument, IEnrollmentDocument, IEnrollmentStatusEntry, ILeadDocument, ILeadEngagement, ILeadStatusEntry, ILossReasonDocument, IMessageAttachment, IMessageDocument, INoteDocument, IOpportunityDocument, IOpportunityStatusEntry, IPipelineDocument, ISendEmailStep, ISequenceDocument, ISequenceStatusEntry, IStageDocument, IStepResult, ISubscriptionDocument, ISubscriptionStatusEntry, ISuppressionDocument, InProcessCrmBus, type InternalCrmContext, InvalidActivityTransitionError, InvalidCampaignTransitionError, InvalidConfirmationTokenError, InvalidEnrollmentTransitionError, InvalidLeadTransitionError, InvalidOpportunityTransitionError, InvalidSequenceTransitionError, InvalidSubscriptionTransitionError, InvalidUnsubscribeTokenError, LEAD_MACHINE, LEAD_STATUSES, LEAD_TRANSITIONS, LeadAlreadyConvertedError, LeadAnonymized, LeadAssigned, LeadConverted, LeadCreated, LeadDisqualified, LeadEmailFormatError, LeadEngagementSignal, LeadEnriched, LeadInput, LeadRepository, LeadRepositoryDeps, LeadScored, LeadScorer, LeadService, LeadServiceDeps, type LeadStatus, LeadStatusChanged, LossReasonRepository, LossReasonRepositoryDeps, MESSAGE_DELIVERY_STATUSES, MESSAGE_DIRECTIONS, MergeAccountInput, MergeContactInput, type MessageDeliveryStatus, type MessageDirection, MessageReceived, MessageRepository, MessageRepositoryDeps, MessageSent, ModularCrmEngine, ModularCrmModels, ModularCrmModuleViews, ModularCrmRepositories, MoveStageInput, NotFoundError, NoteAdded, NoteRepository, NoteRepositoryDeps, OPPORTUNITY_MACHINE, OPPORTUNITY_STATUSES, OPPORTUNITY_TRANSITIONS, OpenConversationInput, OpenOpportunityInput, OpportunityAbandoned, OpportunityAmountChanged, OpportunityAssigned, OpportunityCreated, OpportunityExtended, OpportunityForecast, OpportunityLost, OpportunityRepository, OpportunityRepositoryDeps, OpportunityStageAdvanced, OpportunityStageRegressed, type OpportunityStatus, OpportunityWon, PENDING_EVENTS, PipelineArchived, PipelineCreated, PipelineRepository, PipelineRepositoryDeps, RecordEmailEventInput, RecordMessageInput, ReplySubject, ResolvedCrmConfig, ResolvedCrmModules, type RunUnitConfig, SEQUENCE_MACHINE, SEQUENCE_STATUSES, SEQUENCE_TRANSITIONS, SUBJECT_KINDS, SUBSCRIPTION_MACHINE, SUBSCRIPTION_STATUSES, SUBSCRIPTION_TRANSITIONS, SUPPRESSION_REASONS, SalesCrmModels, SalesCrmRepositories, SchemaBuildConfig, SequenceActivated, SequenceArchived, SequenceCreated, SequencePaused, SequenceRepository, SequenceRepositoryDeps, type SequenceStatus, SequenceStep, StageNotInPipelineError, type StatusChangeEntry, type StatusHistory, StepResultStatus, type SubjectKind, SubscribeInput, SubscriptionBounced, SubscriptionComplained, SubscriptionConfirmed, SubscriptionCreated, SubscriptionRepository, SubscriptionRepositoryDeps, type SubscriptionStatus, SubscriptionUnsubscribed, SuppressInput, SuppressionAdded, SuppressionEmailFormatError, type SuppressionReason, SuppressionRemoved, SuppressionRepository, SuppressionRepositoryDeps, TenantFieldType, UnmanagedSessionError, _ModelTypes, appendStatus, buildAccountSchema, buildActivitySchema, buildCampaignSchema, buildContactSchema, buildConversationSchema, buildEmailEventSchema, buildEnrollmentSchema, buildLeadSchema, buildLossReasonSchema, buildMessageSchema, buildNoteSchema, buildOpportunitySchema, buildPipelineSchema, buildSequenceSchema, buildSubscriptionSchema, buildSuppressionSchema, canTransitionActivity, canTransitionCampaign, canTransitionEnrollment, canTransitionLead, canTransitionOpportunity, canTransitionSequence, canTransitionSubscription, composeScorers, createAccountModel, createActivityModel, createCampaignModel, createContactModel, createConversationModel, createCrmRepositories, createEmailEventModel, createEvent, createLeadModel, createLossReasonModel, createMessageModel, createNoteModel, createOpportunityModel, createPipelineModel, createSubscriptionModel, crmEmailKey, crmEventDefinitions, crmModelName, defaultLeadScorer, defineCrm, defineCrmModels, flushPending, forecast, lastTransitionTo, latestEntry, pipelineConversion, resolveCrmModules, runUnit, suppressionEmailKey, tenantFieldDef, timeInStatus, index_d_exports as validators };
+export { ACTIVITY_MACHINE, ACTIVITY_STATUSES, ACTIVITY_TRANSITIONS, ACTIVITY_TYPES, ALL_CRM_MODULES, AccountAssigned, AccountCreated, AccountEnriched, AccountMerged, AccountRepository, AccountRepositoryDeps, AccountUpdated, ActivityCancelled, ActivityCompleted, ActivityOutcomeRecorded, ActivityPlanned, ActivityRepository, ActivityRepositoryDeps, ActivityRescheduled, type ActivityStatus, type ActivityType, AlreadyEnrolledError, AutomationCrmModels, AutomationCrmRepositories, CAMPAIGN_MACHINE, CAMPAIGN_STATUSES, CAMPAIGN_TRANSITIONS, CONVERSATION_CHANNELS, CONVERSATION_PARTICIPANT_KINDS, CONVERSATION_STATUSES, CRM_EVENTS, CRM_MODEL_NAMES, CampaignActivated, CampaignArchived, CampaignCompleted, CampaignCreated, CampaignPaused, CampaignRepository, CampaignRepositoryDeps, CampaignResumed, type CampaignStatus, CloseInput, ContactAnonymized, ContactAssigned, ContactCreated, ContactEmailFormatError, ContactEnriched, ContactMergeRepoint, ContactMerged, ContactRepository, ContactRepositoryDeps, ContactUpdated, ConversationAssigned, type ConversationChannel, ConversationCreated, type ConversationParticipantKind, ConversationReopened, ConversationRepository, ConversationRepositoryDeps, ConversationResolved, type ConversationStatus, ConversionRow, ConvertLeadInput, ConvertResult, CreateCrmRepositoriesDeps, CrmBlueprint, CrmContext, CrmEngine, CrmEngineBase, CrmError, CrmEventDefinition, CrmEventDispatcher, type CrmEventDispatcherOptions, CrmEventName, CrmEventSchema, CrmLogger, CrmModels, CrmModuleView, CrmModulesConfig, CrmRepositories, CrmRuntime, CrmShape, DefineCrmModelsConfig, DuplicateCampaignError, DuplicateContactError, DuplicateLeadError, DuplicateSubscriptionError, EMAIL_EVENT_KINDS, EMAIL_EVENT_SUBJECT_KINDS, ENROLLMENT_MACHINE, ENROLLMENT_STATUSES, ENROLLMENT_SUBJECT_KINDS, ENROLLMENT_TRANSITIONS, EVENT_DERIVED_SUPPRESSION_REASONS, EmailEventBounced, EmailEventClicked, EmailEventComplained, type EmailEventKind, EmailEventOpened, EmailEventRepository, EmailEventRepositoryDeps, EmailEventSubjectKind, EmailEventUnsubscribed, EmptyPipelineError, EngagementCrmModels, EngagementCrmRepositories, EnrollInput, EnrollmentCompleted, EnrollmentCreated, EnrollmentExitReason, EnrollmentExited, EnrollmentPaused, EnrollmentRepository, EnrollmentRepositoryDeps, EnrollmentResumed, type EnrollmentStatus, EnrollmentStepSent, EnrollmentSubjectKind, ForecastOptions, ForecastRow, FullCrmModuleViews, IAccountDocument, IActivityDocument, ICampaignDocument, ICampaignStatusEntry, IContactDocument, IContactInfoEmbedded, IContactName, IConversationDocument, IDelayStep, IEmailEventDocument, IEnrollmentDocument, IEnrollmentStatusEntry, ILeadDocument, ILeadEngagement, ILeadStatusEntry, ILossReasonDocument, IMessageAttachment, IMessageDocument, INoteDocument, IOpportunityDocument, IOpportunityStatusEntry, IPipelineDocument, ISendEmailStep, ISequenceDocument, ISequenceStatusEntry, IStageDocument, IStepResult, ISubscriptionDocument, ISubscriptionStatusEntry, ISuppressionDocument, InProcessCrmBus, type InternalCrmContext, InvalidActivityTransitionError, InvalidCampaignTransitionError, InvalidConfirmationTokenError, InvalidEnrollmentTransitionError, InvalidLeadTransitionError, InvalidOpportunityTransitionError, InvalidSequenceTransitionError, InvalidSubscriptionTransitionError, InvalidUnsubscribeTokenError, LEAD_MACHINE, LEAD_STATUSES, LEAD_TRANSITIONS, LeadAlreadyConvertedError, LeadAnonymized, LeadAssigned, LeadConverted, LeadCreated, LeadDisqualified, LeadEmailFormatError, LeadEngagementSignal, LeadEnriched, LeadInput, LeadRepository, LeadRepositoryDeps, LeadScored, LeadScorer, LeadService, LeadServiceDeps, type LeadStatus, LeadStatusChanged, LossReasonRepository, LossReasonRepositoryDeps, MESSAGE_DELIVERY_STATUSES, MESSAGE_DIRECTIONS, MergeAccountInput, MergeContactInput, type MessageDeliveryStatus, type MessageDirection, MessageReceived, MessageRepository, MessageRepositoryDeps, MessageSent, ModularCrmEngine, ModularCrmModels, ModularCrmModuleViews, ModularCrmRepositories, MoveStageInput, NotFoundError, NoteAdded, NoteRepository, NoteRepositoryDeps, OPPORTUNITY_MACHINE, OPPORTUNITY_STATUSES, OPPORTUNITY_TRANSITIONS, OpenConversationInput, OpenOpportunityInput, OpportunityAbandoned, OpportunityAmountChanged, OpportunityAssigned, OpportunityCreated, OpportunityExtended, OpportunityForecast, OpportunityLost, OpportunityRepository, OpportunityRepositoryDeps, OpportunityStageAdvanced, OpportunityStageRegressed, type OpportunityStatus, OpportunityWon, PENDING_EVENTS, PipelineArchived, PipelineCreated, PipelineRepository, PipelineRepositoryDeps, RecordEmailEventInput, RecordMessageInput, ReplySubject, ResolvedCrmConfig, ResolvedCrmModules, type RunUnitConfig, SEQUENCE_MACHINE, SEQUENCE_STATUSES, SEQUENCE_TRANSITIONS, SUBJECT_KINDS, SUBSCRIPTION_MACHINE, SUBSCRIPTION_STATUSES, SUBSCRIPTION_TRANSITIONS, SUPPRESSION_REASONS, SalesCrmModels, SalesCrmRepositories, SchemaBuildConfig, SequenceActivated, SequenceArchived, SequenceCreated, SequencePaused, SequenceRepository, SequenceRepositoryDeps, type SequenceStatus, SequenceStep, StageNotInPipelineError, type StatusChangeEntry, type StatusHistory, StepResultStatus, type SubjectKind, SubscribeInput, SubscriptionBounced, SubscriptionComplained, SubscriptionConfirmed, SubscriptionCreated, SubscriptionRepository, SubscriptionRepositoryDeps, type SubscriptionStatus, SubscriptionUnsubscribed, SuppressInput, SuppressionAdded, SuppressionEmailFormatError, type SuppressionReason, SuppressionRemoved, SuppressionRepository, SuppressionRepositoryDeps, UnmanagedSessionError, _ModelTypes, appendStatus, buildAccountSchema, buildActivitySchema, buildCampaignSchema, buildContactSchema, buildConversationSchema, buildEmailEventSchema, buildEnrollmentSchema, buildLeadSchema, buildLossReasonSchema, buildMessageSchema, buildNoteSchema, buildOpportunitySchema, buildPipelineSchema, buildSequenceSchema, buildSubscriptionSchema, buildSuppressionSchema, canTransitionActivity, canTransitionCampaign, canTransitionEnrollment, canTransitionLead, canTransitionOpportunity, canTransitionSequence, canTransitionSubscription, composeScorers, createAccountModel, createActivityModel, createCampaignModel, createContactModel, createConversationModel, createCrmRepositories, createEmailEventModel, createEvent, createLeadModel, createLossReasonModel, createMessageModel, createNoteModel, createOpportunityModel, createPipelineModel, createSubscriptionModel, crmEmailKey, crmEventDefinitions, crmModelName, defaultLeadScorer, defineCrm, defineCrmModels, flushPending, forecast, lastTransitionTo, latestEntry, pipelineConversion, resolveCrmModules, runUnit, suppressionEmailKey, tenantFieldDef, timeInStatus, index_d_exports as validators };

package/dist/index.js

@@ -6,6 +6,7 @@ import { createEvent as createEvent$1 } from "@classytic/primitives/events";
 import { IllegalTransitionError, defineStateMachine } from "@classytic/primitives/state-machine";
 import { randomUUID } from "node:crypto";
 import { InProcessEventBus } from "@classytic/primitives/event-infra";
+import { assertNoLegacyTenantKeys, resolveTenantConfig } from "@classytic/repo-core/tenant";
 import { z } from "zod";
 import { civilDateOf } from "@classytic/primitives/timezone";
 import { CURRENCY_PATTERN } from "@classytic/primitives/currency";
@@ -51,15 +52,14 @@ function crmModelName(config, base) {
 * `organizationId` — never write the raw type in a schema file.
 */
 function tenantFieldDef(config) {
-	return config.tenantFieldType === "objectId" ? {
+	const { tenant } = config;
+	return tenant.fieldType === "objectId" ? {
 		type: Schema.Types.ObjectId,
-		required: true,
-		ref: "organization",
-		index: true
+		...tenant.enabled && tenant.required ? { required: true } : {},
+		...tenant.ref ? { ref: tenant.ref } : {}
 	} : {
 		type: String,
-		required: true,
-		index: true
+		...tenant.enabled && tenant.required ? { required: true } : {}
 	};
 }
 //#endregion
@@ -105,7 +105,7 @@ const stageSubSchema = new Schema({
 }, { _id: true });
 function buildPipelineSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		name: {
 			type: String,
 			required: true,
@@ -129,11 +129,11 @@ function buildPipelineSchema(config) {
 		metadata: { type: Schema.Types.Mixed }
 	}, { timestamps: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		isArchived: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		name: 1
 	});
 	return schema;
@@ -539,7 +539,7 @@ const engagementSchema = new Schema({
 }, { _id: false });
 function buildLeadSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		fullName: {
 			type: String,
 			required: true,
@@ -634,18 +634,18 @@ function buildLeadSchema(config) {
 		metadata: { type: Schema.Types.Mixed }
 	}, { timestamps: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		email: 1
 	}, {
 		unique: true,
 		partialFilterExpression: { email: { $type: "string" } }
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		createdAt: -1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		score: -1
 	});
 	return schema;
@@ -705,7 +705,7 @@ const statusEntrySchema$4 = new Schema({
 }, { _id: false });
 function buildOpportunitySchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		name: {
 			type: String,
 			required: true,
@@ -775,17 +775,17 @@ function buildOpportunitySchema(config) {
 		metadata: { type: Schema.Types.Mixed }
 	}, { timestamps: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		pipelineId: 1,
 		stageId: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		status: 1,
 		expectedCloseAt: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		ownerId: 1,
 		status: 1
 	});
@@ -884,7 +884,7 @@ const contactInfoSchema$1 = new Schema({
 }, { _id: false });
 function buildContactSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		name: {
 			type: nameSchema,
 			required: true
@@ -918,22 +918,22 @@ function buildContactSchema(config) {
 		toObject: { virtuals: true }
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		"contact.email": 1
 	}, {
 		unique: true,
 		partialFilterExpression: { "contact.email": { $type: "string" } }
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		accountId: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		createdAt: -1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		tags: 1
 	});
 	schema.virtual("fullName").get(function() {
@@ -954,7 +954,7 @@ function createContactModel(connection, config) {
 */
 function buildAccountSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		name: {
 			type: String,
 			required: true,
@@ -993,15 +993,15 @@ function buildAccountSchema(config) {
 		metadata: { type: Schema.Types.Mixed }
 	}, { timestamps: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		domain: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		createdAt: -1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		tags: 1
 	});
 	return schema;
@@ -1067,7 +1067,7 @@ const statusEntrySchema$3 = new Schema({
 }, { _id: false });
 function buildCampaignSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		name: {
 			type: String,
 			required: true,
@@ -1124,23 +1124,23 @@ function buildCampaignSchema(config) {
 		metadata: { type: Schema.Types.Mixed }
 	}, { timestamps: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		name: 1
 	}, { unique: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		status: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		startDate: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		createdAt: -1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		tags: 1
 	});
 	return schema;
@@ -1216,7 +1216,7 @@ const statusEntrySchema$2 = new Schema({
 }, { _id: false });
 function buildSubscriptionSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		contactId: {
 			type: Schema.Types.ObjectId,
 			ref: crmModelName(config, "Contact"),
@@ -1285,12 +1285,12 @@ function buildSubscriptionSchema(config) {
 		collection: "email_subscriptions"
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		campaignId: 1,
 		status: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		contactId: 1,
 		campaignId: 1
 	}, {
@@ -1298,7 +1298,7 @@ function buildSubscriptionSchema(config) {
 		partialFilterExpression: { status: { $in: ["pending", "confirmed"] } }
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		createdAt: -1
 	});
 	return schema;
@@ -1335,7 +1335,7 @@ const SUPPRESSION_REASONS = [...EVENT_DERIVED_SUPPRESSION_REASONS, "manual"];
 */
 function buildSuppressionSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		email: {
 			type: String,
 			required: true,
@@ -1371,16 +1371,16 @@ function buildSuppressionSchema(config) {
 		metadata: { type: Schema.Types.Mixed }
 	}, { timestamps: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		email: 1
 	}, { unique: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		reason: 1,
 		suppressedAt: -1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		suppressedAt: -1
 	});
 	return schema;
@@ -1441,7 +1441,7 @@ const SUBJECT_KINDS = [
 */
 function buildActivitySchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		type: {
 			type: String,
 			enum: ACTIVITY_TYPES,
@@ -1496,26 +1496,26 @@ function buildActivitySchema(config) {
 		metadata: { type: Schema.Types.Mixed }
 	}, { timestamps: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		subjectKind: 1,
 		subjectId: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		status: 1,
 		dueDate: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		ownerId: 1,
 		status: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		type: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		createdAt: -1
 	});
 	return schema;
@@ -1533,7 +1533,7 @@ function createActivityModel(connection, config) {
 */
 function buildNoteSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		subjectKind: {
 			type: String,
 			enum: SUBJECT_KINDS,
@@ -1562,7 +1562,7 @@ function buildNoteSchema(config) {
 		metadata: { type: Schema.Types.Mixed }
 	}, { timestamps: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		subjectKind: 1,
 		subjectId: 1,
 		pinned: -1,
@@ -1583,7 +1583,7 @@ function createNoteModel(connection, config) {
 */
 function buildLossReasonSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		name: {
 			type: String,
 			required: true,
@@ -1607,7 +1607,7 @@ function buildLossReasonSchema(config) {
 		metadata: { type: Schema.Types.Mixed }
 	}, { timestamps: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		isActive: 1,
 		sequence: 1
 	});
@@ -1664,7 +1664,7 @@ const EMAIL_EVENT_KINDS = [
 const EMAIL_EVENT_SUBJECT_KINDS = ["contact", "subscription"];
 function buildEmailEventSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		kind: {
 			type: String,
 			enum: EMAIL_EVENT_KINDS,
@@ -1712,23 +1712,23 @@ function buildEmailEventSchema(config) {
 		updatedAt: false
 	} });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		createdAt: -1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		subjectKind: 1,
 		subjectId: 1,
 		createdAt: -1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		campaignId: 1,
 		kind: 1,
 		createdAt: -1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		messageId: 1
 	});
 	return schema;
@@ -1783,7 +1783,7 @@ const MESSAGE_DELIVERY_STATUSES = [
 */
 function buildConversationSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		channel: {
 			type: String,
 			enum: CONVERSATION_CHANNELS,
@@ -1827,22 +1827,22 @@ function buildConversationSchema(config) {
 		metadata: { type: Schema.Types.Mixed }
 	}, { timestamps: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		participantKind: 1,
 		participantId: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		status: 1,
 		lastMessageAt: -1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		assigneeId: 1,
 		status: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		channel: 1,
 		channelUserId: 1
 	});
@@ -1890,7 +1890,7 @@ const attachmentSchema = new Schema({
 }, { _id: false });
 function buildMessageSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		conversationId: {
 			type: Schema.Types.ObjectId,
 			ref: crmModelName(config, "Conversation"),
@@ -1935,12 +1935,12 @@ function buildMessageSchema(config) {
 		metadata: { type: Schema.Types.Mixed }
 	}, { timestamps: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		conversationId: 1,
 		createdAt: -1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		externalMessageId: 1
 	}, {
 		unique: true,
@@ -2005,7 +2005,7 @@ const statusEntrySchema$1 = new Schema({
 }, { _id: false });
 function buildSequenceSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		name: {
 			type: String,
 			required: true,
@@ -2053,11 +2053,11 @@ function buildSequenceSchema(config) {
 		}
 	}, { timestamps: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		status: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		createdAt: -1
 	});
 	return schema;
@@ -2137,9 +2137,9 @@ const statusEntrySchema = new Schema({
 }, { _id: false });
 function buildEnrollmentSchema(config) {
 	const schema = new Schema({
-		organizationId: tenantFieldDef(config),
+		[config.tenant.tenantField]: tenantFieldDef(config),
 		sequenceId: {
-			type: config.tenantFieldType === "objectId" ? Schema.Types.ObjectId : String,
+			type: config.tenant.fieldType === "objectId" ? Schema.Types.ObjectId : String,
 			required: true,
 			ref: crmModelName(config, "Sequence")
 		},
@@ -2149,7 +2149,7 @@ function buildEnrollmentSchema(config) {
 			required: true
 		},
 		subjectId: {
-			type: config.tenantFieldType === "objectId" ? Schema.Types.ObjectId : String,
+			type: config.tenant.fieldType === "objectId" ? Schema.Types.ObjectId : String,
 			required: true
 		},
 		status: {
@@ -2193,23 +2193,23 @@ function buildEnrollmentSchema(config) {
 		}
 	}, { timestamps: true });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		sequenceId: 1,
 		subjectId: 1,
 		status: 1
 	}, { unique: false });
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		sequenceId: 1,
 		status: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		subjectKind: 1,
 		subjectId: 1
 	});
 	schema.index({
-		organizationId: 1,
+		[config.tenant.tenantField]: 1,
 		createdAt: -1
 	});
 	return schema;
@@ -3089,8 +3089,33 @@ var OpportunityRepository = class extends Repository {
 			opportunityId: id
 		});
 		if (amount === existing.amount) return existing;
-		const updated = await this.update(id, { amount }, ctx);
-		if (!updated) throw new NotFoundError("Opportunity", id);
+		/**
+		* `claim` with from === to — the status predicate rides the WRITE's filter.
+		*
+		* The `status === 'open'` check above is read-then-write: an opportunity closed
+		* between the two still had its amount changed, so the figure that fed closed-won
+		* reporting depended on scheduling. Not money movement, but the forecast is what
+		* pipeline decisions are made against, and a closed deal whose amount silently
+		* moves after the close is unauditable. The miss disambiguates below: a genuine
+		* status change gets the SAME transition error the pre-check throws, so callers
+		* see one contract whether they lost a race or arrived late.
+		*/
+		const updated = await this.claim(id, {
+			from: "open",
+			to: "open"
+		}, { $set: { amount } }, ctx);
+		if (!updated) {
+			const current = await this.getById(id, {
+				...ctx,
+				throwOnNotFound: false
+			});
+			if (!current) throw new NotFoundError("Opportunity", id);
+			throw new InvalidOpportunityTransitionError({
+				from: current.status,
+				to: current.status,
+				opportunityId: id
+			});
+		}
 		await this.events.dispatch(ctx, createEvent(CRM_EVENTS.OPPORTUNITY_AMOUNT_CHANGED, {
 			opportunityId: id,
 			amount,
@@ -4497,11 +4522,11 @@ function createCrmRepositories(models, deps) {
 	const { events, config } = deps;
 	const pagination = config.pagination;
 	const plugins = [methodRegistryPlugin()];
-	if (config.multiTenant) plugins.push(multiTenantPlugin({
-		tenantField: "organizationId",
-		contextKey: "organizationId",
-		required: true,
-		fieldType: config.tenantFieldType
+	if (config.tenant.enabled) plugins.push(multiTenantPlugin({
+		tenantField: config.tenant.tenantField,
+		contextKey: config.tenant.contextKey,
+		required: config.tenant.required,
+		fieldType: config.tenant.fieldType
 	}));
 	plugins.push(aggregateHelpersPlugin());
 	if (config.plugins.length > 0) plugins.push(...config.plugins);
@@ -4703,13 +4728,29 @@ async function runUnit(config, ctx, body) {
 //#endregion
 //#region src/engine/define-crm.ts
 function defineCrm(shape = {}) {
-	const tenantFieldType = shape.tenantFieldType ?? "objectId";
-	const multiTenant = shape.multiTenant ?? true;
+	/**
+	* The pre-consolidation tenant keys are REFUSED, never absorbed.
+	*
+	* This entry reads `shape.tenant`, so a leftover `multiTenant` is invisible and
+	* the `?? true` default applies repo-core's defaults instead. Both outcomes
+	* return plausible data:
+	*   - `multiTenant: false` -> tenancy ON, and the host loses its company-wide reads;
+	*   - `multiTenant: { tenantField: 'business' }` -> scoping on `organizationId`,
+	*     a field those documents do not carry.
+	*
+	* tsc cannot cover this: excess-property checking does not fire for a typed
+	* variable, a spread, or a shape handed over from a dependency's dist — which is
+	* how every real host composes one. Hence a describe-time check, shared from
+	* repo-core so the nine kernels making this same rename cannot each forget it.
+	*/
+	assertNoLegacyTenantKeys(shape, "defineCrm", [["tenantFieldType", "tenant.fieldType"]]);
+	const tenant = resolveTenantConfig(shape.tenant ?? true);
+	if (tenant.strategy === "custom") throw new Error("[crm] tenant.strategy 'custom' is unsupported: CRM repositories require one concrete tenant field");
 	const forceRecreate = shape.forceRecreate ?? false;
 	const autoIndex = shape.autoIndex ?? true;
 	const modules = resolveCrmModules(shape.modules);
 	const modelBlueprint = defineCrmModels({
-		tenantFieldType,
+		tenant,
 		...shape.modelPrefix !== void 0 ? { modelPrefix: shape.modelPrefix } : {},
 		modules,
 		forceRecreate,
@@ -4754,9 +4795,8 @@ function defineCrm(shape = {}) {
 			if (runtime.outbox && runtime.outbox.transactionalSave !== true) throw new Error("[crm] the configured OutboxStore does not declare `outbox.transactionalSave` — crm events would not commit atomically with the writes that emit them. See OutboxStore.transactionalSave in @classytic/primitives/outbox; arc's `repositoryAsOutboxStore` declares it. This is a property of the STORE, not of the database, and `allowNonTransactional` does not waive it.");
 			const resolved = {
 				connection,
-				tenantFieldType,
+				tenant,
 				...shape.modelPrefix !== void 0 ? { modelPrefix: shape.modelPrefix } : {},
-				multiTenant,
 				forceRecreate,
 				autoIndex,
 				modules,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@classytic/crm",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Engine-factory CRM package — leads, accounts, contacts, opportunities, pipelines, campaigns, subscriptions, activities, notes, email engagement. PACKAGE_RULES compliant; built on Mongoose + mongokit + arc primitives.",
   "author": "Classytic",
   "license": "SEE LICENSE IN LICENSE",
@@ -55,18 +55,18 @@
   },
   "peerDependencies": {
     "@classytic/contact": ">=0.1.0",
-    "@classytic/mongokit": ">=3.32.0",
-    "@classytic/primitives": ">=0.14.0",
-    "@classytic/repo-core": ">=0.13.0",
+    "@classytic/mongokit": ">=3.33.0",
+    "@classytic/primitives": ">=0.23.0",
+    "@classytic/repo-core": ">=0.24.0",
     "mongoose": ">=9.4.1",
     "zod": ">=4.0.0"
   },
   "devDependencies": {
     "@classytic/contact": ">=0.1.0",
     "@classytic/dev-tools": "^0.2.0",
-    "@classytic/mongokit": "^3.25.0",
-    "@classytic/primitives": ">=0.20.0",
-    "@classytic/repo-core": ">=0.20.0",
+    "@classytic/mongokit": "^3.33.0",
+    "@classytic/primitives": ">=0.23.0",
+    "@classytic/repo-core": ">=0.24.0",
     "@types/node": "^25.5.0",
     "mongodb-memory-server": "^10.1.4",
     "mongoose": "^9.4.1",