@open-mercato/core 0.6.7-develop.6696.1.4236709f7e → 0.6.7-develop.6725.1.07a748cfc2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.7-develop.6696.1.4236709f7e",
+  "version": "0.6.7-develop.6725.1.07a748cfc2",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -254,16 +254,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.7-develop.6696.1.4236709f7e",
-    "@open-mercato/shared": "0.6.7-develop.6696.1.4236709f7e",
-    "@open-mercato/ui": "0.6.7-develop.6696.1.4236709f7e",
+    "@open-mercato/ai-assistant": "0.6.7-develop.6725.1.07a748cfc2",
+    "@open-mercato/shared": "0.6.7-develop.6725.1.07a748cfc2",
+    "@open-mercato/ui": "0.6.7-develop.6725.1.07a748cfc2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.7-develop.6696.1.4236709f7e",
-    "@open-mercato/shared": "0.6.7-develop.6696.1.4236709f7e",
-    "@open-mercato/ui": "0.6.7-develop.6696.1.4236709f7e",
+    "@open-mercato/ai-assistant": "0.6.7-develop.6725.1.07a748cfc2",
+    "@open-mercato/shared": "0.6.7-develop.6725.1.07a748cfc2",
+    "@open-mercato/ui": "0.6.7-develop.6725.1.07a748cfc2",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/modules/auth/api/admin/nav.ts

@@ -5,6 +5,7 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getBackendRouteManifests } from '@open-mercato/shared/modules/registry'
+import { getModuleSurfaceFingerprint } from '@open-mercato/shared/lib/modules/surfaceFingerprint'
 import { resolveFeatureCheckContext } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import { groupBackendRoutesByModule, resolveBackendChromePayload } from '../../lib/backendChrome'
 
@@ -12,6 +13,13 @@ export const metadata = {
   GET: { requireAuth: true },
 }
 
+// The fingerprint covers the module set, each module's declared features and
+// the serializable route manifest, so the TTL only has to bound what it cannot
+// see — chiefly a route `icon` swap, which serializes identically. Rebuilding
+// this payload is expensive (a `renderToStaticMarkup` per nav icon plus several
+// scoped queries), so the bound is generous rather than aggressive.
+const NAV_CACHE_TTL_MS = 30 * 60 * 1000
+
 const sidebarNavItemSchema: z.ZodType<{
   id?: string
   href: string
@@ -90,6 +98,13 @@ const adminNavResponseSchema = z.object({
   profilePathPrefixes: z.array(z.string()),
   grantedFeatures: z.array(z.string()),
   roles: z.array(z.string()),
+  // Present when a single organization is in scope; `null` under an all-organizations selection or
+  // when the lookup fails. Declared optional so the response contract stays additive for clients
+  // generated against an older schema.
+  currentOrganization: z.object({
+    id: z.string(),
+    name: z.string(),
+  }).nullable().optional(),
 })
 
 const adminNavErrorSchema = z.object({
@@ -104,7 +119,7 @@ export async function GET(req: Request) {
   const container = await createRequestContainer()
   const cache = container.resolve('cache') as {
     get?: (key: string) => Promise<unknown>
-    set?: (key: string, value: unknown, options?: { tags?: string[] }) => Promise<void>
+    set?: (key: string, value: unknown, options?: { tags?: string[]; ttl?: number }) => Promise<void>
   } | null
   let selectedOrganizationId: string | null | undefined
   let selectedTenantId: string | null | undefined
@@ -138,8 +153,13 @@ export async function GET(req: Request) {
     selectedTenantId = auth.tenantId ?? null
   }
 
-  const cacheVersion = 'v4'
-  const cacheKey = `nav:sidebar:${cacheVersion}:${locale}:${auth.sub}:${cacheScopeTenantId || 'null'}:${cacheScopeOrganizationId || 'null'}`
+  // v6: the payload gained `currentOrganization`, and the payload also embeds the enabled-module set,
+  // its declared features, and the backend route manifest. The selection is part of the key because
+  // the resolved organization cannot distinguish "all organizations" from "my own organization".
+  // The fingerprint invalidates module-surface changes; the TTL bounds anything it cannot observe.
+  const cacheVersion = `v6:${getModuleSurfaceFingerprint()}`
+  const cacheSelection = selectedOrganizationId === undefined ? 'default' : (selectedOrganizationId ?? 'null')
+  const cacheKey = `nav:sidebar:${cacheVersion}:${locale}:${auth.sub}:${cacheScopeTenantId || 'null'}:${cacheScopeOrganizationId || 'null'}:${cacheSelection}`
   try {
     if (cache?.get) {
       const cached = await cache.get(cacheKey)
@@ -172,7 +192,7 @@ export async function GET(req: Request) {
         `nav:sidebar:scope:${auth.sub}:${cacheScopeTenantId || 'null'}:${cacheScopeOrganizationId || 'null'}:${locale}`,
         ...((Array.isArray(auth.roles) ? auth.roles : []).map((role) => `nav:sidebar:role:${role}`)),
       ].filter(Boolean) as string[]
-      await cache.set(cacheKey, payload, { tags })
+      await cache.set(cacheKey, payload, { tags, ttl: NAV_CACHE_TTL_MS })
     }
   } catch {
     // ignore cache write failures

package/src/modules/auth/api/users/route.ts

@@ -23,9 +23,7 @@ import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/
 import { buildPasswordSchema } from '@open-mercato/shared/lib/auth/passwordPolicy'
 import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 import { parseBooleanFlag } from '@open-mercato/shared/lib/boolean'
-import { resolveSearchConfig } from '@open-mercato/shared/lib/search/config'
-import { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'
-import { sql } from 'kysely'
+import { findEntityIdsBySearchTokensCompat, type SearchTokenDatabase } from '@open-mercato/shared/lib/search/tokenLookup'
 import { normalizeDisplayNameInput } from '@open-mercato/core/modules/auth/lib/displayName'
 import {
   getSelectedTenantFromRequest,
@@ -504,31 +502,13 @@ async function findUserIdsBySearchTokens(
   tenantScope: string | null | undefined,
   field?: string,
 ): Promise<string[] | null> {
-  const trimmed = search.trim()
-  if (!trimmed) return null
-  const searchConfig = resolveSearchConfig()
-  if (!searchConfig.enabled) return []
-  const { hashes } = tokenizeText(trimmed, searchConfig)
-  if (!hashes.length) return []
-
-  const db = (em as any).getKysely() as any
-  let query = db
-    .selectFrom('search_tokens')
-    .select('entity_id')
-    .where('entity_type', '=', entityType)
-    .where('token_hash', 'in', hashes)
-    .groupBy('entity_id')
-    .having(sql<boolean>`count(distinct token_hash) >= ${hashes.length}`)
-  if (field) {
-    query = query.where('field', '=', field)
-  }
-  if (tenantScope !== undefined) {
-    query = query.where(sql<boolean>`tenant_id is not distinct from ${tenantScope}`)
-  }
-  const rows = (await query.execute()) as Array<{ entity_id?: unknown }>
-  return rows
-    .map((row) => (typeof row.entity_id === 'string' ? row.entity_id : null))
-    .filter((id): id is string => typeof id === 'string' && id.length > 0)
+  return findEntityIdsBySearchTokensCompat({
+    db: em.getKysely<SearchTokenDatabase>(),
+    entityType,
+    query: search,
+    fields: field ? [field] : undefined,
+    scope: { tenantId: tenantScope },
+  })
 }
 
 async function assertCanModifySuperAdminTarget(req: Request, targetUserId: string) {

package/src/modules/auth/frontend/login.tsx

@@ -135,7 +135,10 @@ export default function LoginPage() {
       try {
         const res = await apiCall<{ userId?: string }>('/api/auth/feature-check', {
           method: 'POST',
-          headers: { 'content-type': 'application/json' },
+          headers: {
+            'content-type': 'application/json',
+            'x-om-unauthorized-redirect': '0',
+          },
           body: JSON.stringify({ features: [] }),
           cache: 'no-store',
         })

package/src/modules/auth/lib/backendChrome.tsx

@@ -22,6 +22,7 @@ import { resolveRegisteredLucideIconNode } from '@open-mercato/ui/backend/icons/
 import { profilePathPrefixes, profileSections } from './profile-sections'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { filterGrantsByEnabledModules } from '@open-mercato/shared/security/enabledModulesRegistry'
+import { getNavGroupOrderOverride } from '@open-mercato/shared/modules/overrides'
 import {
   getSelectedOrganizationFromRequest,
   resolveFeatureCheckContext,
@@ -147,19 +148,35 @@ async function serializeNavItem(item: AdminNavItem): Promise<ResolvedNavItem> {
   }
 }
 
+const defaultGroupOrder = [
+  'customers.nav.group',
+  'catalog.nav.group',
+  'customers~sales.nav.group',
+  'wms.nav.group',
+  'resources.nav.group',
+  'staff.nav.group',
+  'entities.nav.group',
+  'directory.nav.group',
+  'attachments.nav.group',
+]
+
+/**
+ * Group ids ranked ahead of everything else, most significant first.
+ *
+ * An app may prepend its own ids via `overrides.nav.groupOrder` in `modules.ts`; ids it does not name
+ * keep the ordering they have today. With no override configured this returns `defaultGroupOrder`
+ * itself, so ordering is unchanged for every existing install.
+ */
+function resolveGroupOrder(): string[] {
+  const override = getNavGroupOrderOverride()
+  if (!override || override.length === 0) return defaultGroupOrder
+  const overridden = new Set(override)
+  return [...override, ...defaultGroupOrder.filter((id) => !overridden.has(id))]
+}
+
 function normalizeGroupWeights(groups: NavGroupWithWeight[]): NavGroupWithWeight[] {
-  const defaultGroupOrder = [
-    'customers.nav.group',
-    'catalog.nav.group',
-    'customers~sales.nav.group',
-    'wms.nav.group',
-    'resources.nav.group',
-    'staff.nav.group',
-    'entities.nav.group',
-    'directory.nav.group',
-    'attachments.nav.group',
-  ]
-  const groupOrderIndex = new Map(defaultGroupOrder.map((id, index) => [id, index]))
+  const groupOrder = resolveGroupOrder()
+  const groupOrderIndex = new Map(groupOrder.map((id, index) => [id, index]))
   groups.sort((a, b) => {
     const aIndex = groupOrderIndex.get(a.id)
     const bIndex = groupOrderIndex.get(b.id)
@@ -171,7 +188,7 @@ function normalizeGroupWeights(groups: NavGroupWithWeight[]): NavGroupWithWeight
     if (a.weight !== b.weight) return a.weight - b.weight
     return a.name.localeCompare(b.name)
   })
-  const defaultGroupCount = defaultGroupOrder.length
+  const defaultGroupCount = groupOrder.length
   groups.forEach((group, index) => {
     const rank = groupOrderIndex.get(group.id)
     const fallbackWeight = typeof group.weight === 'number' ? group.weight : 10_000
@@ -275,6 +292,11 @@ export async function resolveBackendChromePayload({
 
   let scopedOrganizationId: string | null = auth.orgId ?? null
   let scopedTenantId: string | null = auth.tenantId ?? null
+  // The organization the caller actually *selected*, as distinct from the one the scope resolver fell
+  // back to. `resolveFeatureCheckContext` resolves `organizationId` to `auth.orgId` when no concrete
+  // organization is selected — which is precisely what an all-organizations view produces — so the
+  // resolved id cannot answer "which organization am I viewing".
+  let concretelySelectedOrganizationId: string | null = null
   let allowNavigation = true
 
   try {
@@ -287,12 +309,14 @@ export async function resolveBackendChromePayload({
     })
     scopedOrganizationId = organizationId
     scopedTenantId = scope.tenantId ?? auth.tenantId ?? null
+    concretelySelectedOrganizationId = scope.selectedId ?? null
     if (Array.isArray(allowedOrganizationIds) && allowedOrganizationIds.length === 0) {
       allowNavigation = false
     }
   } catch {
     scopedOrganizationId = auth.orgId ?? null
     scopedTenantId = auth.tenantId ?? null
+    concretelySelectedOrganizationId = null
   }
 
   const acl = allowNavigation
@@ -411,6 +435,11 @@ export async function resolveBackendChromePayload({
     ?? (fallbackOrganizationId && !isAllOrganizationsSelection(fallbackOrganizationId) ? fallbackOrganizationId : null)
 
   let brand: BackendChromePayload['brand'] = null
+  // Resolved here rather than left to callers. `brand` only populates when the organization has a
+  // logo, so it is a branding channel, not a dependable "which organization am I viewing" source.
+  // Without this field every downstream app has to fetch `/api/directory/organization-switcher` and
+  // walk its tree for the selected id. The row is already loaded below, so the name costs nothing.
+  let currentOrganization: BackendChromePayload['currentOrganization'] = null
   if (brandOrganizationId && scopedTenantId) {
     try {
       const organization = await findOneWithDecryption(
@@ -420,6 +449,12 @@ export async function resolveBackendChromePayload({
         undefined,
         { tenantId: scopedTenantId, organizationId: brandOrganizationId },
       )
+      // Only when a concrete organization was selected. Under an all-organizations view
+      // `brandOrganizationId` still resolves (to the caller's own organization, which is what keeps
+      // branding working), so gating on the loaded row alone would misreport the scope.
+      if (organization && concretelySelectedOrganizationId === brandOrganizationId) {
+        currentOrganization = { id: String(organization.id), name: organization.name }
+      }
       if (organization?.logoUrl) {
         brand = {
           name: organization.name,
@@ -430,7 +465,9 @@ export async function resolveBackendChromePayload({
         }
       }
     } catch {
+      // Fail soft, as before: a failed organization lookup must not take down the nav payload.
       brand = null
+      currentOrganization = null
     }
   }
 
@@ -443,5 +480,6 @@ export async function resolveBackendChromePayload({
     grantedFeatures,
     roles: Array.isArray(auth.roles) ? auth.roles : [],
     brand,
+    currentOrganization,
   }
 }

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

@@ -29,6 +29,7 @@ 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,
@@ -1015,10 +1016,8 @@ 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) => deal.status !== 'won' && deal.status !== 'lost' && deal.status !== 'closed',
-  )
-  const wonDeals = dealLinksForMetrics.filter((deal) => deal.status === 'won')
+  const activeDeals = dealLinksForMetrics.filter((deal) => isOpenDealStatus(deal.status))
+  const wonDeals = dealLinksForMetrics.filter((deal) => isWonDealStatus(deal.status))
   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/people/[id]/companies/enriched/route.ts

@@ -25,6 +25,7 @@ import {
   filterActivePersonCompanyLinks,
   withActiveCustomerPersonCompanyLinkFilter,
 } from '../../../../../lib/personCompanyLinkTable'
+import { isOpenDealStatus, isWonDealStatus } from '../../../../../lib/dealStatus'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('customers')
@@ -280,13 +281,13 @@ export async function GET(req: Request, ctx: { params?: { id?: string } }) {
 
       const activeDeals = companyDealLinks
         .map((dcl) => dcl.deal as CustomerDeal)
-        .filter((deal) => deal.status !== 'win' && deal.status !== 'loose' && !deal.deletedAt)
+        .filter((deal) => isOpenDealStatus(deal.status) && !deal.deletedAt)
         .sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())
       const activeDeal = activeDeals.length > 0 ? activeDeals[0] : null
 
       const wonDeals = companyDealLinks
         .map((dcl) => dcl.deal as CustomerDeal)
-        .filter((deal) => deal.status === 'win' && !deal.deletedAt)
+        .filter((deal) => isWonDealStatus(deal.status) && !deal.deletedAt)
       let clv: { amount: number; currency: string } | null = null
       if (wonDeals.length > 0) {
         const currencies = new Map<string, number>()

package/src/modules/customers/api/utils.ts

@@ -4,8 +4,7 @@ import { sql } from 'kysely'
 import type { CrudCtx } from '@open-mercato/shared/lib/crud/factory'
 import type { EntityId } from '@open-mercato/shared/modules/entities'
 import type { QueryCustomFieldSource, QueryJoinEdge, QueryEngine } from '@open-mercato/shared/lib/query/types'
-import { resolveSearchConfig } from '@open-mercato/shared/lib/search/config'
-import { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'
+import { findEntityIdsBySearchTokensCompat, type SearchTokenDatabase } from '@open-mercato/shared/lib/search/tokenLookup'
 import { SortDir } from '@open-mercato/shared/lib/query/types'
 
 const { withScopedPayload, parseScopedCommandInput } = createScopedApiHelpers({
@@ -106,36 +105,18 @@ async function findSearchTokenEntityIds({
   fields,
   query,
 }: SearchTokenMatchInput): Promise<string[] | null> {
-  const trimmed = query.trim()
-  if (!trimmed) return null
-
-  const tokens = tokenizeText(trimmed, resolveSearchConfig())
-  if (!tokens.hashes.length) return []
-
   const em = ctx.container.resolve('em') as EntityManager
-  const db = em.getKysely<any>() as any
-  let searchQuery = db
-    .selectFrom('search_tokens')
-    .select('entity_id')
-    .where('entity_type', '=', entityType)
-    .where('field', 'in', fields)
-    .where('token_hash', 'in', tokens.hashes)
-    .groupBy('entity_id')
-    .having(sql<boolean>`count(distinct token_hash) >= ${tokens.hashes.length}`)
-
-  if (ctx.auth?.tenantId !== undefined) {
-    searchQuery = searchQuery.where(sql<boolean>`tenant_id is not distinct from ${ctx.auth?.tenantId ?? null}`)
-  }
-  if (ctx.selectedOrganizationId) {
-    searchQuery = searchQuery.where('organization_id', '=', ctx.selectedOrganizationId)
-  } else if (Array.isArray(ctx.organizationIds) && ctx.organizationIds.length > 0) {
-    searchQuery = searchQuery.where('organization_id', 'in', ctx.organizationIds)
-  }
-
-  const rows = await searchQuery.execute() as Array<{ entity_id?: unknown }>
-  return rows
-    .map((row) => (typeof row.entity_id === 'string' ? row.entity_id : null))
-    .filter((id): id is string => typeof id === 'string' && id.length > 0)
+  return findEntityIdsBySearchTokensCompat({
+    db: em.getKysely<SearchTokenDatabase>(),
+    entityType,
+    query,
+    fields,
+    scope: {
+      tenantId: ctx.auth?.tenantId !== undefined ? ctx.auth?.tenantId ?? null : undefined,
+      organizationId: ctx.selectedOrganizationId ?? undefined,
+      organizationIds: ctx.organizationIds,
+    },
+  })
 }
 
 async function mapScopedEntityIds({

package/src/modules/customers/cli.ts

@@ -12,6 +12,7 @@ import { E as CoreEntities } from '#generated/entities.ids.generated'
 import { createProgressBar } from '@open-mercato/shared/lib/cli/progress'
 import { buildIndexDocument, type IndexCustomFieldValue } from '@open-mercato/core/modules/query_index/lib/document'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
+import { resolveSearchConfig } from '@open-mercato/shared/lib/search/config'
 import type { QueryEngine } from '@open-mercato/shared/lib/query/types'
 import type { EntityId } from '@open-mercato/shared/modules/entities'
 import {
@@ -1994,6 +1995,7 @@ async function seedCustomerStressTest(
       updated_at: Date
       deleted_at: null
     }> = []
+    const searchConfig = resolveSearchConfig()
     for (const [entityType, bucket] of pendingIndexDocs.entries()) {
       for (const entry of bucket.values()) {
         if (!entry.baseRow || Object.keys(entry.baseRow).length === 0) continue
@@ -2002,10 +2004,15 @@ async function seedCustomerStressTest(
           entity_id: entry.recordId,
           organization_id: entry.organizationId,
           tenant_id: entry.tenantId,
-          doc: buildIndexDocument(entry.baseRow, entry.customFields, {
-            organizationId: entry.organizationId,
-            tenantId: entry.tenantId,
-          }),
+          doc: buildIndexDocument(
+            entry.baseRow,
+            entry.customFields,
+            {
+              organizationId: entry.organizationId,
+              tenantId: entry.tenantId,
+            },
+            { entityType, config: searchConfig },
+          ),
           index_version: 1,
           created_at: entry.createdAt,
           updated_at: entry.updatedAt,

package/src/modules/customers/components/detail/ActiveDealCard.tsx

@@ -7,6 +7,7 @@ import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { IconButton } from '@open-mercato/ui/primitives/icon-button'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { isOpenDealStatus } from '../../lib/dealStatus'
 import type { DealSummary } from '../formConfig'
 import { formatCurrency } from './utils'
 
@@ -25,7 +26,7 @@ export function ActiveDealCard({ deals, onHide }: ActiveDealCardProps) {
   const [pipelineStages, setPipelineStages] = React.useState<PipelineStageOption[]>([])
 
   const activeDeals = React.useMemo(
-    () => deals.filter((d) => d.status !== 'won' && d.status !== 'lost' && d.status !== 'closed'),
+    () => deals.filter((d) => isOpenDealStatus(d.status)),
     [deals],
   )
 

package/src/modules/customers/components/detail/CompanyKpiBar.tsx

@@ -11,6 +11,7 @@ import {
   writeVersionedIdSet,
   clearVersionedPreference,
 } from '@open-mercato/shared/lib/browser/versionedPreference'
+import { isOpenDealStatus, isWonDealStatus } from '../../lib/dealStatus'
 import type { CompanyOverview, DealSummary, InteractionSummary } from '../formConfig'
 import { formatCurrency } from './utils'
 
@@ -19,7 +20,7 @@ const STORAGE_VERSION = 1
 
 function sumActiveDeals(deals: DealSummary[]): number {
   return deals
-    .filter((d) => d.status !== 'won' && d.status !== 'lost' && d.status !== 'closed')
+    .filter((d) => isOpenDealStatus(d.status))
     .reduce((sum, d) => {
       const amount = typeof d.valueAmount === 'number' ? d.valueAmount : parseFloat(String(d.valueAmount ?? '0'))
       return sum + (Number.isFinite(amount) ? amount : 0)
@@ -27,7 +28,7 @@ function sumActiveDeals(deals: DealSummary[]): number {
 }
 
 function getActiveDeals(deals: DealSummary[]): DealSummary[] {
-  return deals.filter((d) => d.status !== 'won' && d.status !== 'lost' && d.status !== 'closed')
+  return deals.filter((d) => isOpenDealStatus(d.status))
 }
 
 function computeActivityTrend(interactions: InteractionSummary[]): KpiTrend | undefined {
@@ -51,7 +52,7 @@ function computeActivityTrend(interactions: InteractionSummary[]): KpiTrend | un
 }
 
 function computeDealTrend(deals: DealSummary[]): KpiTrend | undefined {
-  const active = deals.filter((d) => d.status !== 'won' && d.status !== 'lost' && d.status !== 'closed')
+  const active = deals.filter((d) => isOpenDealStatus(d.status))
   if (active.length === 0) return undefined
   const now = Date.now()
   const monthMs = 30 * 86_400_000
@@ -81,7 +82,7 @@ export function CompanyKpiBar({ data }: CompanyKpiBarProps) {
 
   const ltvValue = React.useMemo(() => {
     if (data.kpis?.ltvValue !== undefined) return data.kpis.ltvValue
-    const wonDeals = data.deals.filter((d) => d.status === 'won')
+    const wonDeals = data.deals.filter((d) => isWonDealStatus(d.status))
     if (wonDeals.length === 0) return null
     return wonDeals.reduce((sum, d) => {
       const amt = typeof d.valueAmount === 'number' ? d.valueAmount : parseFloat(String(d.valueAmount ?? '0'))
@@ -154,7 +155,7 @@ export function CompanyKpiBar({ data }: CompanyKpiBarProps) {
           : `${v} ${v === 1 ? t('customers.companies.dashboard.kpi.year', 'year') : t('customers.companies.dashboard.kpi.years', 'years')}`
         : undefined,
       comparisonLabel: clientTenureYears !== null
-        ? `${data.kpis?.completedDealsCount ?? data.deals.filter((d) => d.status === 'won').length} ${t('customers.companies.dashboard.kpi.completedDeals', 'completed deals')}`
+        ? `${data.kpis?.completedDealsCount ?? data.deals.filter((d) => isWonDealStatus(d.status)).length} ${t('customers.companies.dashboard.kpi.completedDeals', 'completed deals')}`
         : t('customers.companies.dashboard.kpi.noInteractions', 'No interactions yet'),
     },
   ], [t, activeDealsValue, dealTrend, dealCurrency, activeDeals.length, activityTrend, ltvValue, clientTenureYears, data.deals, data.interactions.length, data.kpis])

package/src/modules/customers/components/detail/ScheduleActivityDialog.tsx

@@ -99,6 +99,8 @@ interface ScheduleActivityDialogProps {
   onActivityCreated?: () => void
   /** When provided, dialog opens in edit mode with pre-filled data */
   editData?: ScheduleActivityEditData | null
+  /** Default country ISO2 code for phone number input when value is empty/unparsed */
+  defaultCountryIso2?: string
 }
 
 export function ScheduleActivityDialog({
@@ -111,6 +113,7 @@ export function ScheduleActivityDialog({
   entityType,
   onActivityCreated,
   editData,
+  defaultCountryIso2,
 }: ScheduleActivityDialogProps) {
   const t = useT()
   const state = useScheduleFormState({ open, editData: editData ?? null })
@@ -689,6 +692,7 @@ export function ScheduleActivityDialog({
               externalError={callPhoneError}
               invalidLabel={callPhoneInvalidMessage}
               minDigits={7}
+              defaultCountryIso2={defaultCountryIso2}
             />
           </div>
         ) : (

package/src/modules/customers/components/detail/dashboard/helpers.ts

@@ -1,9 +1,10 @@
 import type { KpiTrend } from '@open-mercato/ui/backend/charts/KpiCard'
+import { isOpenDealStatus } from '../../../lib/dealStatus'
 import type { DealSummary, InteractionSummary, TodoLinkSummary } from '../../formConfig'
 
 export function sumActiveDeals(deals: DealSummary[]): number {
   return deals
-    .filter((d) => d.status !== 'won' && d.status !== 'lost' && d.status !== 'closed')
+    .filter((d) => isOpenDealStatus(d.status))
     .reduce((sum, d) => {
       const amount = typeof d.valueAmount === 'number' ? d.valueAmount : parseFloat(String(d.valueAmount ?? '0'))
       return sum + (Number.isFinite(amount) ? amount : 0)
@@ -11,7 +12,7 @@ export function sumActiveDeals(deals: DealSummary[]): number {
 }
 
 export function getActiveDeals(deals: DealSummary[]): DealSummary[] {
-  return deals.filter((d) => d.status !== 'won' && d.status !== 'lost' && d.status !== 'closed')
+  return deals.filter((d) => isOpenDealStatus(d.status))
 }
 
 export function getOpenTasks(todos: TodoLinkSummary[]): TodoLinkSummary[] {
@@ -68,7 +69,7 @@ export function computeActivityTrend(interactions: InteractionSummary[]): KpiTre
 }
 
 export function computeDealTrend(deals: DealSummary[]): KpiTrend | undefined {
-  const active = deals.filter((d) => d.status !== 'won' && d.status !== 'lost' && d.status !== 'closed')
+  const active = deals.filter((d) => isOpenDealStatus(d.status))
   if (active.length === 0) return undefined
   const now = Date.now()
   const monthMs = 30 * 86_400_000

package/src/modules/customers/components/formConfig.tsx

@@ -418,7 +418,7 @@ const companyDictionaryFieldDefinitions: DictionaryFieldDefinition[] = [
   },
 ]
 
-const createPrimaryPhoneField = (t: Translator): CrudField => ({
+const createPrimaryPhoneField = (t: Translator, defaultCountryIso2?: string): CrudField => ({
   id: 'primaryPhone',
   label: t('customers.people.form.primaryPhone'),
   type: 'custom',
@@ -447,6 +447,7 @@ const createPrimaryPhoneField = (t: Translator): CrudField => ({
         invalidLabel={t('customers.people.form.primaryPhone.invalid', 'Enter a valid phone number with country code (e.g. +1 212 555 1234)')}
         minDigits={7}
         onDuplicateLookup={!disabled && !error ? duplicateLookup : undefined}
+        defaultCountryIso2={defaultCountryIso2}
       />
     )
   },
@@ -869,7 +870,8 @@ export const createDisplayNameSection = (t: Translator) =>
     )
   }
 
-export const createPersonFormFields = (t: Translator): CrudField[] => {
+export const createPersonFormFields = (t: Translator, options?: { defaultCountryIso2?: string }): CrudField[] => {
+  const defaultCountryIso2 = options?.defaultCountryIso2
   const contactSection = createSectionHeadingField('__contactInformationSection', t('customers.people.form.sections.contactInformation'))
   const companySection = createSectionHeadingField('__companyInformationSection', t('customers.people.form.sections.companyInformation'))
   const dictionaryFields: CrudField[] = dictionaryFieldDefinitions.map((definition) => ({
@@ -930,7 +932,7 @@ export const createPersonFormFields = (t: Translator): CrudField[] => {
     },
     contactSection,
     createPrimaryEmailField(t),
-    createPrimaryPhoneField(t),
+    createPrimaryPhoneField(t, defaultCountryIso2),
     companySection,
     {
       id: 'companyEntityId',
@@ -1225,7 +1227,8 @@ export const createCompanyFormSchema = () =>
     })
     .passthrough()
 
-export const createCompanyFormFields = (t: Translator): CrudField[] => {
+export const createCompanyFormFields = (t: Translator, options?: { defaultCountryIso2?: string }): CrudField[] => {
+  const defaultCountryIso2 = options?.defaultCountryIso2
   const dictionaryFields: CrudField[] = companyDictionaryFieldDefinitions.map((definition) => ({
     id: definition.id,
     label: t(definition.labelKey),
@@ -1270,6 +1273,7 @@ export const createCompanyFormFields = (t: Translator): CrudField[] => {
           placeholder={t('customers.companies.form.primaryPhonePlaceholder', '+1 555 123 4567')}
           invalidLabel={t('customers.people.form.primaryPhone.invalid', 'Enter a valid phone number with country code (e.g. +1 212 555 1234)')}
           minDigits={7}
+          defaultCountryIso2={defaultCountryIso2}
         />
       ),
     } as CrudField,
@@ -1651,8 +1655,8 @@ const buildIndustryLabels = (t: Translator): DictionarySelectLabels => ({
   manageTitle: t('customers.people.form.dictionary.manage'),
 })
 
-export const createCompanyEditFields = (t: Translator): CrudField[] => {
-  const baseFields = createCompanyFormFields(t)
+export const createCompanyEditFields = (t: Translator, options?: { defaultCountryIso2?: string }): CrudField[] => {
+  const baseFields = createCompanyFormFields(t, options)
   const industryLabels = buildIndustryLabels(t)
 
   return baseFields.map((field) => {
@@ -1676,8 +1680,8 @@ export const createCompanyEditFields = (t: Translator): CrudField[] => {
   })
 }
 
-export const createPersonEditFields = (t: Translator): CrudField[] => {
-  const baseFields = createPersonFormFields(t)
+export const createPersonEditFields = (t: Translator, options?: { defaultCountryIso2?: string }): CrudField[] => {
+  const baseFields = createPersonFormFields(t, options)
   return [
     ...baseFields,
     {