@open-mercato/core 0.6.7-develop.6863.1.61001cf9a8 → 0.6.7

package/src/modules/customer_accounts/migrations/.snapshot-open-mercato.json

@@ -923,22 +923,6 @@
           "enumItems": [],
           "mappedType": "uuid"
         },
-        "person_entity_id": {
-          "name": "person_entity_id",
-          "type": "uuid",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": true,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": null,
-          "comment": null,
-          "enumItems": [],
-          "mappedType": "uuid"
-        },
         "role_ids_json": {
           "name": "role_ids_json",
           "type": "jsonb",

package/src/modules/customer_accounts/services/customerInvitationService.ts

@@ -13,18 +13,6 @@ import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/
 const BCRYPT_COST = 10
 const INVITATION_TTL_MS = 72 * 60 * 60 * 1000 // 72 hours
 
-export type CustomerInvitationRollbackState = {
-  email: string
-  token: string
-  customerEntityId: string | null
-  personEntityId: string | null
-  roleIdsJson: string[]
-  invitedByUserId: string | null
-  invitedByCustomerUserId: string | null
-  displayName: string | null
-  expiresAt: Date
-}
-
 export class CustomerInvitationService {
   constructor(private em: EntityManager) {}
 
@@ -33,18 +21,12 @@ export class CustomerInvitationService {
     scope: { tenantId: string; organizationId: string },
     options: {
       customerEntityId?: string | null
-      personEntityId?: string | null
       roleIds: string[]
       invitedByUserId?: string | null
       invitedByCustomerUserId?: string | null
       displayName?: string | null
     },
-  ): Promise<{
-    invitation: CustomerUserInvitation
-    rawToken: string
-    reused: boolean
-    rollbackState: CustomerInvitationRollbackState | null
-  }> {
+  ): Promise<{ invitation: CustomerUserInvitation; rawToken: string }> {
     const token = generateSecureToken()
     const emailHash = hashForLookup(email)
     const normalizedEmail = email.toLowerCase().trim()
@@ -71,28 +53,16 @@ export class CustomerInvitationService {
     )
 
     if (existing) {
-      const rollbackState: CustomerInvitationRollbackState = {
-        email: existing.email,
-        token: existing.token,
-        customerEntityId: existing.customerEntityId ?? null,
-        personEntityId: existing.personEntityId ?? null,
-        roleIdsJson: [...(existing.roleIdsJson ?? [])],
-        invitedByUserId: existing.invitedByUserId ?? null,
-        invitedByCustomerUserId: existing.invitedByCustomerUserId ?? null,
-        displayName: existing.displayName ?? null,
-        expiresAt: new Date(existing.expiresAt),
-      }
       existing.email = normalizedEmail
       existing.token = tokenHashed
       existing.customerEntityId = options.customerEntityId || null
-      existing.personEntityId = options.personEntityId || null
       existing.roleIdsJson = options.roleIds
       existing.invitedByUserId = options.invitedByUserId || null
       existing.invitedByCustomerUserId = options.invitedByCustomerUserId || null
       existing.displayName = options.displayName || null
       existing.expiresAt = expiresAt
       await this.em.flush()
-      return { invitation: existing, rawToken: token, reused: true, rollbackState }
+      return { invitation: existing, rawToken: token }
     }
 
     const invitation = this.em.create(CustomerUserInvitation, {
@@ -102,7 +72,6 @@ export class CustomerInvitationService {
       emailHash,
       token: tokenHashed,
       customerEntityId: options.customerEntityId || null,
-      personEntityId: options.personEntityId || null,
       roleIdsJson: options.roleIds,
       invitedByUserId: options.invitedByUserId || null,
       invitedByCustomerUserId: options.invitedByCustomerUserId || null,
@@ -111,28 +80,7 @@ export class CustomerInvitationService {
       createdAt: new Date(),
     } as any) as CustomerUserInvitation
     await this.em.persist(invitation).flush()
-    return { invitation, rawToken: token, reused: false, rollbackState: null }
-  }
-
-  async rollbackInvitation(
-    invitation: CustomerUserInvitation,
-    rollbackState: CustomerInvitationRollbackState | null,
-  ): Promise<void> {
-    if (!rollbackState) {
-      await this.em.remove(invitation).flush()
-      return
-    }
-
-    invitation.email = rollbackState.email
-    invitation.token = rollbackState.token
-    invitation.customerEntityId = rollbackState.customerEntityId
-    invitation.personEntityId = rollbackState.personEntityId
-    invitation.roleIdsJson = [...rollbackState.roleIdsJson]
-    invitation.invitedByUserId = rollbackState.invitedByUserId
-    invitation.invitedByCustomerUserId = rollbackState.invitedByCustomerUserId
-    invitation.displayName = rollbackState.displayName
-    invitation.expiresAt = new Date(rollbackState.expiresAt)
-    await this.em.flush()
+    return { invitation, rawToken: token }
   }
 
   async findByToken(token: string): Promise<CustomerUserInvitation | null> {
@@ -169,7 +117,6 @@ export class CustomerInvitationService {
       tenantId: invitation.tenantId,
       organizationId: invitation.organizationId,
       customerEntityId: invitation.customerEntityId || null,
-      personEntityId: invitation.personEntityId || null,
       isActive: true,
       emailVerifiedAt: new Date(), // Invitation implicitly verifies email
       failedLoginAttempts: 0,

package/src/modules/customer_accounts/services/customerRbacService.ts

@@ -5,10 +5,7 @@ import {
   CustomerRoleAcl,
   CustomerUserRole,
 } from '@open-mercato/core/modules/customer_accounts/data/entities'
-import {
-  authorizeFeatures,
-  resolveEffectiveFeatures,
-} from '@open-mercato/shared/security/featurePolicy'
+import { hasAllFeatures } from '@open-mercato/shared/lib/auth/featureMatch'
 
 interface CustomerAclData {
   isPortalAdmin: boolean
@@ -132,18 +129,8 @@ export class CustomerRbacService {
   ): Promise<boolean> {
     if (!required.length) return true
     const acl = await this.loadAcl(userId, scope)
-    return authorizeFeatures(required, {
-      grantedFeatures: acl.features,
-      unrestricted: acl.isPortalAdmin,
-    })
-  }
-
-  async getEffectiveFeatures(
-    userId: string,
-    scope: { tenantId: string; organizationId: string },
-  ): Promise<string[]> {
-    const acl = await this.loadAcl(userId, scope)
-    return resolveEffectiveFeatures(acl.isPortalAdmin ? ['portal.*'] : acl.features)
+    if (acl.isPortalAdmin) return true
+    return hasAllFeatures(required, acl.features)
   }
 
   async invalidateUserCache(userId: string): Promise<void> {

package/src/modules/customer_accounts/setup.ts

@@ -137,10 +137,6 @@ const DEFAULT_ROLES = [
   },
 ]
 
-const DEFAULT_CUSTOMER_ROLE_FEATURES = Object.fromEntries(
-  DEFAULT_ROLES.map((role) => [role.slug, [...role.acl.features]]),
-)
-
 /**
  * Collect defaultCustomerRoleFeatures from all enabled modules and merge
  * them into the corresponding CustomerRoleAcl records.
@@ -224,9 +220,6 @@ export const setup: ModuleSetupConfig = {
     superadmin: ['customer_accounts.*'],
     admin: ['customer_accounts.*'],
   },
-  // Keep the portal feature catalog declarative so the shared feature policy
-  // can project portal.* into concrete capabilities without importing core.
-  defaultCustomerRoleFeatures: DEFAULT_CUSTOMER_ROLE_FEATURES,
 
   async onTenantCreated({ em, tenantId, organizationId }) {
     await seedDefaultRoles(em, { tenantId, organizationId })

package/src/modules/customer_accounts/subscribers/autoLinkCrm.ts

@@ -1,7 +1,6 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { CustomerUser } from '@open-mercato/core/modules/customer_accounts/data/entities'
 import { findWithDecryption, findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
-import { resolveOwnedCompanyForPerson } from '@open-mercato/core/modules/customer_accounts/lib/customerEntityOwnership'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('customer_accounts').child({ component: 'auto-link-crm' })
@@ -27,81 +26,17 @@ export default async function handle(
   try {
     const user = await findOneWithDecryption(em, CustomerUser, { id: userId, tenantId, deletedAt: null }, undefined, { tenantId, organizationId })
     if (!user) return
-
-    const { CustomerEntity } = await import('@open-mercato/core/modules/customers/data/entities')
-
-    // Every lookup and write below normalizes against the user's OWN org, not just
-    // the tenant: customerEntityId is the portal's company scope key (portal user
-    // and invite routes filter on it), so adopting an entity from another org would
-    // widen the user's portal access instead of repairing it.
-    const ownScope = { tenantId, organizationId: user.organizationId }
-
-    // Defensive normalization for NEW users only — this subscriber runs on
-    // `customer_accounts.user.created`, which is never re-emitted for an existing
-    // row. customerEntityId is the CRM company FK, and earlier invite flows (#4362)
-    // could poison it with a person entity id, which then breaks every later user
-    // edit ("Company not found"). If the linked entity is a person (not a company)
-    // or sits outside the user's org, drop it — or recover the person's real company
-    // from their profile. Correct company links are left untouched. Rows created
-    // before this change keep their bad FK; see #4473 for the backfill.
-    if (user.customerEntityId) {
-      const linked = await findOneWithDecryption(
-        em,
-        CustomerEntity,
-        { id: user.customerEntityId, tenantId, organizationId: user.organizationId, deletedAt: null } as any,
-        undefined,
-        { tenantId, organizationId },
-      ) as any
-      if (!linked) {
-        // Not resolvable inside the user's own org — a cross-org (or deleted)
-        // entity. Clear it rather than leave it: this FK is the portal scope key.
-        await em.nativeUpdate(
-          CustomerUser,
-          { id: userId, tenantId, organizationId: user.organizationId },
-          { customerEntityId: null },
-        )
-        user.customerEntityId = null
-      } else if (linked.kind === 'person') {
-        // Only adopt a recovered company that is itself in the user's org.
-        const replacement = await resolveOwnedCompanyForPerson(em, user.customerEntityId, ownScope)
-        await em.nativeUpdate(
-          CustomerUser,
-          { id: userId, tenantId, organizationId: user.organizationId },
-          { customerEntityId: replacement },
-        )
-        user.customerEntityId = replacement
-      }
-    }
-
-    // A user invited from a CRM person card arrives with personEntityId already
-    // set, so the email-matching path below never runs for it. Derive the company
-    // FK from that person's own profile instead of leaving it null forever — the
-    // portal Users page, portal invitations, and the company detail "Portal users"
-    // group all key off customerEntityId (#4362).
-    if (user.personEntityId) {
-      if (user.customerEntityId) return
-      const recovered = await resolveOwnedCompanyForPerson(em, user.personEntityId, ownScope)
-      if (recovered) {
-        await em.nativeUpdate(
-          CustomerUser,
-          { id: userId, tenantId, organizationId: user.organizationId },
-          { customerEntityId: recovered },
-        )
-      }
-      return
-    }
+    if (user.personEntityId) return
 
     const email = (data?.email ? (data.email as string) : user.email)?.toLowerCase().trim()
     if (!email) return
 
-    // Scope the candidate lookup to the user's own org. The fifth argument is a
-    // decryption scope, not a filter, so without organizationId in the `where`
-    // this matches people across every org in the tenant and writes a cross-org
-    // link that the normalization block above just cleared.
+    const { CustomerEntity } = await import('@open-mercato/core/modules/customers/data/entities')
+
     const personEntities = await findWithDecryption(
       em,
       CustomerEntity,
-      { tenantId, organizationId: user.organizationId, kind: 'person', deletedAt: null } as any,
+      { tenantId, kind: 'person', deletedAt: null } as any,
       { limit: 500 } as any,
       { tenantId, organizationId },
     )
@@ -112,18 +47,16 @@ export default async function handle(
 
     if (!matchingEntity) return
 
-    const companyEntityId = await resolveOwnedCompanyForPerson(em, matchingEntity.id, ownScope)
+    const { CustomerPersonProfile } = await import('@open-mercato/core/modules/customers/data/entities')
+    const profile = await em.findOne(CustomerPersonProfile as any, { entity: matchingEntity.id } as any) as any
+    const companyEntityId = profile?.companyEntityId as string | undefined
 
     const updates: Record<string, unknown> = { personEntityId: matchingEntity.id }
     if (companyEntityId) {
       updates.customerEntityId = companyEntityId
     }
 
-    await em.nativeUpdate(
-      CustomerUser,
-      { id: userId, tenantId, organizationId: user.organizationId },
-      updates,
-    )
+    await em.nativeUpdate(CustomerUser, { id: userId }, updates)
   } catch (err) {
     logger.error('Failed to link customer user to CRM person', { err })
   }

package/src/modules/customer_accounts/widgets/injection/account-status/widget.client.tsx

@@ -130,7 +130,7 @@ function InviteForm({ personEntityId, onSuccess }: { personEntityId: string; onS
     try {
       await runMutation({
         context: { entityType: 'customer_accounts:user' },
-        mutationPayload: { personEntityId, roleIds: selectedRoleIds },
+        mutationPayload: { customerEntityId: personEntityId, roleIds: selectedRoleIds },
         operation: async () => {
           // optimistic-lock-exempt: creates a new portal invitation, not a concurrent record edit
           const call = await apiCall<{ ok: boolean; error?: string }>(
@@ -142,7 +142,7 @@ function InviteForm({ personEntityId, onSuccess }: { personEntityId: string; onS
                 email: trimmedEmail,
                 roleIds: selectedRoleIds,
                 displayName: displayName.trim() || undefined,
-                personEntityId,
+                customerEntityId: personEntityId,
               }),
             },
           )

package/src/modules/customer_accounts/widgets/injection/portal-ai-assistant-trigger/widget.client.tsx

@@ -69,7 +69,9 @@ export default function PortalAiAssistantTriggerWidget({ context }: PortalAiAssi
   const resolvedFeatures = Array.isArray(context?.resolvedFeatures)
     ? (context?.resolvedFeatures as string[])
     : []
-  const featureAllowed = hasFeature(resolvedFeatures, PORTAL_AI_INJECT_REQUIRED_FEATURE)
+  const featureAllowed =
+    context?.isPortalAdmin === true ||
+    hasFeature(resolvedFeatures, PORTAL_AI_INJECT_REQUIRED_FEATURE)
 
   const pageContext = React.useMemo<PortalAiInjectPageContext>(() => ({
     view: 'portal.profile',

package/src/modules/customer_accounts/widgets/injection-table.ts

@@ -8,13 +8,10 @@ const accountStatusWidget = {
   priority: 200,
 } as const
 
-// Column 1 on purpose (#4400): any column-2 group makes CrudForm switch the
-// company detail page to the narrow 7fr/3fr two-column layout, compressing the
-// left-side groups. Portal users belongs in the left stack as a full-width row.
 const companyUsersWidget = {
   widgetId: 'customer_accounts.injection.company-users',
   kind: 'group',
-  column: 1,
+  column: 2,
   groupLabel: 'customer_accounts.widgets.portalUsers',
   priority: 200,
 } as const

package/src/modules/customers/analytics.ts

@@ -26,14 +26,11 @@ export const analyticsConfig: AnalyticsModuleConfig = {
         tableName: 'customer_deals',
         dateField: 'created_at',
         defaultScopeFields: ['tenant_id', 'organization_id'],
-        currencyField: 'valueCurrency',
       },
       fieldMappings: {
         id: { dbColumn: 'id', type: 'uuid' },
         valueAmount: { dbColumn: 'value_amount', type: 'numeric' },
-        valueCurrency: { dbColumn: 'value_currency', type: 'text' },
         status: { dbColumn: 'status', type: 'text' },
-        closureOutcome: { dbColumn: 'closure_outcome', type: 'text' },
         pipelineStage: { dbColumn: 'pipeline_stage', type: 'text' },
         probability: { dbColumn: 'probability', type: 'numeric' },
         createdAt: { dbColumn: 'created_at', type: 'timestamp' },

package/src/modules/customers/api/companies/[id]/route.ts

@@ -29,7 +29,6 @@ import {
   mergeCompanyCustomFieldValues,
 } from '../../../lib/customFieldRouting'
 import { isOpenInteractionStatus, TERMINAL_INTERACTION_STATUS_LIST } from '../../../lib/interactionStatus'
-import { isOpenDealStatus, isWonDealStatus } from '../../../lib/dealStatus'
 import {
   CUSTOMER_INTERACTION_ACTIVITY_ADAPTER_SOURCE,
   EXAMPLE_TODO_SOURCE,
@@ -1016,8 +1015,10 @@ export async function GET(_req: Request, ctx: { params?: { id?: string } }) {
       .map((value) => (value instanceof Date ? value.toISOString() : typeof value === 'string' ? value : ''))
       .filter((value) => value.length > 0),
   )
-  const activeDeals = dealLinksForMetrics.filter((deal) => isOpenDealStatus(deal.status))
-  const wonDeals = dealLinksForMetrics.filter((deal) => isWonDealStatus(deal.status))
+  const activeDeals = dealLinksForMetrics.filter(
+    (deal) => deal.status !== 'won' && deal.status !== 'lost' && deal.status !== 'closed',
+  )
+  const wonDeals = dealLinksForMetrics.filter((deal) => deal.status === 'won')
   const activeDealsValue = activeDeals.reduce((sum, deal) => sum + (parseDealAmount(deal.valueAmount) ?? 0), 0)
   const ltvValue = wonDeals.length
     ? wonDeals.reduce((sum, deal) => sum + (parseDealAmount(deal.valueAmount) ?? 0), 0)

package/src/modules/customers/api/deals/[id]/people/route.ts

@@ -39,7 +39,6 @@ type DealPersonItem = {
   subtitle: string | null
   kind: 'person'
   linkedAt: string
-  isPrimary: boolean
 }
 
 function matchesSearch(item: DealPersonItem, query: string): boolean {
@@ -125,7 +124,6 @@ export async function GET(req: Request, ctx: { params?: { id?: string } }) {
           subtitle: person.primaryEmail ?? person.primaryPhone ?? null,
           kind: 'person',
           linkedAt: link.createdAt.toISOString(),
-          isPrimary: link.isPrimary === true,
         } satisfies DealPersonItem
       })
       .filter((item): item is DealPersonItem => item !== null)
@@ -171,7 +169,6 @@ export const openApi: OpenApiRouteDoc = {
                 subtitle: z.string().nullable(),
                 kind: z.literal('person'),
                 linkedAt: z.string(),
-                isPrimary: z.boolean(),
               }),
             ),
             total: z.number().int().nonnegative(),

package/src/modules/customers/api/deals/[id]/route.ts

@@ -56,7 +56,6 @@ type DealAssociation = {
   label: string
   subtitle: string | null
   kind: 'person' | 'company'
-  isPrimary?: boolean
 }
 
 function normalizePersonAssociation(entity: CustomerEntity): { label: string; subtitle: string | null } {
@@ -603,19 +602,13 @@ export async function GET(request: Request, context: { params?: Record<string, u
             )
           : [],
       ])
-      const primaryPersonIds = new Set(
-        personLinkRows
-          .filter((link) => link.isPrimary === true)
-          .map((link) => (typeof link.person === 'string' ? link.person : link.person?.id))
-          .filter((value): value is string => typeof value === 'string'),
-      )
       const previewPeopleMap = new Map(previewPeople.map((entity) => [entity.id, entity]))
       const previewCompaniesMap = new Map(previewCompanies.map((entity) => [entity.id, entity]))
       const people = linkedPersonIds.slice(0, 3).reduce<DealAssociation[]>((acc, personId) => {
         const entity = previewPeopleMap.get(personId) ?? null
         if (!entity || entity.deletedAt) return acc
         const { label, subtitle } = normalizePersonAssociation(entity)
-        acc.push({ id: entity.id, label, subtitle, kind: 'person', isPrimary: primaryPersonIds.has(entity.id) })
+        acc.push({ id: entity.id, label, subtitle, kind: 'person' })
         return acc
       }, [])
       const companies = linkedCompanyIds.slice(0, 3).reduce<DealAssociation[]>((acc, companyId) => {
@@ -661,7 +654,7 @@ export async function GET(request: Request, context: { params?: Record<string, u
       const entity = link.person as CustomerEntity | null
       if (!entity || entity.deletedAt) return acc
       const { label, subtitle } = normalizePersonAssociation(entity)
-      acc.push({ id: entity.id, label, subtitle, kind: 'person', isPrimary: link.isPrimary === true })
+      acc.push({ id: entity.id, label, subtitle, kind: 'person' })
       return acc
     }, [])
 
@@ -934,7 +927,6 @@ const dealDetailResponseSchema = z.object({
       label: z.string(),
       subtitle: z.string().nullable().optional(),
       kind: z.literal('person'),
-      isPrimary: z.boolean().optional(),
     }),
   ),
   companies: z.array(

package/src/modules/customers/api/deals/aggregate/route.ts

@@ -6,7 +6,6 @@ import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import { resolveDealsOrganizationIds } from '../../../lib/dealsOrganizationScope'
-import { resolveOptionalBaseCurrencyCode } from '../../../lib/optionalBaseCurrency'
 import type { ExchangeRateService } from '@open-mercato/core/modules/currencies/services/exchangeRateService'
 import { parseBooleanFromUnknown } from '@open-mercato/shared/lib/boolean'
 import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
@@ -182,11 +181,11 @@ export async function GET(req: Request) {
   // avoids the per-row decryption cost that would be paid by `findWithDecryption` for an
   // aggregate that never reads `title`/`description`. The search path still relies on
   // the token index above to find matching deals when encrypted columns are involved.
-  const baseCurrencyCode = await resolveOptionalBaseCurrencyCode(
-    container,
-    effectiveTenantId,
-    orgFilterIds[0],
+  const baseCurrency = await em.getConnection().execute<Array<{ code: string }>>(
+    `SELECT code FROM currencies WHERE tenant_id = ? AND organization_id = ? AND is_base = true AND deleted_at IS NULL LIMIT 1`,
+    [effectiveTenantId, orgFilterIds[0]],
   )
+  const baseCurrencyCode = baseCurrency[0]?.code ?? null
 
   // Build WHERE clause shared between count + sum queries
   const orgPlaceholders = orgFilterIds.map(() => '?').join(',')