@elevasis/core 0.26.0 → 0.28.0

package/src/business/acquisition/crm-next-action.test.ts

@@ -1,6 +1,9 @@
-import { describe, it, expect } from 'vitest'
-import { evaluateCrmDealNextAction, resolveCrmNextActionRuleConfig } from './crm-next-action'
-import { DEFAULT_CRM_NEXT_ACTION_RULE_CONFIG } from '../../organization-model/domains/sales'
+import { describe, it, expect } from 'vitest'
+import {
+  evaluateCrmDealNextAction as evaluateCrmDealNextActionCore,
+  resolveCrmNextActionRuleConfig
+} from './crm-next-action'
+import type { CrmNextActionRuleConfig } from '../../organization-model/domains/sales'
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -10,8 +13,26 @@ function makeEvent(type: string, timestamp: string): Record<string, unknown> {
   return { type, timestamp }
 }
 
-const INBOUND = 'reply_received'
-const OUTBOUND = 'reply_sent_to_lead'
+const INBOUND = 'reply_received'
+const OUTBOUND = 'reply_sent_to_lead'
+const ELEVASIS_CRM_NEXT_ACTION_RULE_CONFIG: CrmNextActionRuleConfig = {
+  mappings: [
+    { stateKey: 'discovery_link_sent', ownership: 'them', actionKey: 'send_nudge', requiresStale: true },
+    { stateKey: 'discovery_replied', ownership: 'us', actionKey: 'send_reply' },
+    { stateKey: 'discovery_nudging', ownership: 'them', actionKey: 'send_nudge' }
+  ],
+  ownershipUsFallback: 'send_reply'
+}
+
+function evaluateCrmDealNextAction(
+  input: Parameters<typeof evaluateCrmDealNextActionCore>[0],
+  options: Parameters<typeof evaluateCrmDealNextActionCore>[1] = {}
+): string | null {
+  return evaluateCrmDealNextActionCore(input, {
+    config: ELEVASIS_CRM_NEXT_ACTION_RULE_CONFIG,
+    ...options
+  })
+}
 
 // ---------------------------------------------------------------------------
 // Closed deals → null
@@ -179,16 +200,17 @@ describe('evaluateCrmDealNextAction — ageDays option', () => {
 // ---------------------------------------------------------------------------
 
 describe('resolveCrmNextActionRuleConfig — defaults', () => {
-  it('returns default config when called with no input', () => {
-    const config = resolveCrmNextActionRuleConfig()
-    expect(config.ownershipUsFallback).toBe(DEFAULT_CRM_NEXT_ACTION_RULE_CONFIG.ownershipUsFallback)
-    expect(config.mappings).toHaveLength(DEFAULT_CRM_NEXT_ACTION_RULE_CONFIG.mappings.length)
-  })
-
-  it('returns default config for invalid input', () => {
-    const config = resolveCrmNextActionRuleConfig('not-an-object')
-    expect(config.ownershipUsFallback).toBe(DEFAULT_CRM_NEXT_ACTION_RULE_CONFIG.ownershipUsFallback)
-  })
+  it('returns generic empty config when called with no input', () => {
+    const config = resolveCrmNextActionRuleConfig()
+    expect(config.ownershipUsFallback).toBeNull()
+    expect(config.mappings).toEqual([])
+  })
+
+  it('returns generic empty config for invalid input', () => {
+    const config = resolveCrmNextActionRuleConfig('not-an-object')
+    expect(config.ownershipUsFallback).toBeNull()
+    expect(config.mappings).toEqual([])
+  })
 
   it('accepts a full CrmNextActionRuleConfig directly', () => {
     const full = {
@@ -206,7 +228,7 @@ describe('resolveCrmNextActionRuleConfig — defaults', () => {
 // ---------------------------------------------------------------------------
 
 describe('resolveCrmNextActionRuleConfig — per-org override', () => {
-  it('prepends org mappings before defaults (org rules win on first-match)', () => {
+  it('uses org mappings without merging tenant defaults from core', () => {
     const orgConfig = {
       crm: {
         next_actions: {
@@ -215,10 +237,8 @@ describe('resolveCrmNextActionRuleConfig — per-org override', () => {
       }
     }
     const config = resolveCrmNextActionRuleConfig(orgConfig)
-    // Org mapping should appear first
-    expect(config.mappings[0].actionKey).toBe('custom_action')
-    // Default mappings still present after org ones
-    expect(config.mappings.length).toBeGreaterThan(1)
+    expect(config.mappings[0].actionKey).toBe('custom_action')
+    expect(config.mappings).toHaveLength(1)
   })
 
   it('overrides ownershipUsFallback when supplied', () => {
@@ -254,9 +274,9 @@ describe('resolveCrmNextActionRuleConfig — per-org override', () => {
     expect(result).toBe('org_reply')
   })
 
-  it('falls back to defaults when org override is empty object', () => {
-    const config = resolveCrmNextActionRuleConfig({ crm: { next_actions: {} } })
-    expect(config.mappings).toHaveLength(DEFAULT_CRM_NEXT_ACTION_RULE_CONFIG.mappings.length)
-    expect(config.ownershipUsFallback).toBe(DEFAULT_CRM_NEXT_ACTION_RULE_CONFIG.ownershipUsFallback)
-  })
+  it('falls back to generic empty config when org override is empty object', () => {
+    const config = resolveCrmNextActionRuleConfig({ crm: { next_actions: {} } })
+    expect(config.mappings).toEqual([])
+    expect(config.ownershipUsFallback).toBeNull()
+  })
 })

package/src/business/acquisition/crm-next-action.ts

@@ -1,220 +1,227 @@
-// ---------------------------------------------------------------------------
-// CRM Next-Action evaluator — mirrors the crm-priority.ts resolver/evaluator
-// pattern. Maps (state_key, ownership) → suggested action key string.
-//
-// Per-org overrides live at organizations.config.crm.next_actions and are
-// merged at evaluator read time via resolveCrmNextActionRuleConfig.
-// ---------------------------------------------------------------------------
-
-import { z } from 'zod'
-import {
-  DEFAULT_CRM_NEXT_ACTION_RULE_CONFIG,
-  type CrmNextActionRuleConfig,
-  type CrmNextActionMapping
-} from '../../organization-model/domains/sales'
-import { getDealOwnership } from './deal-ownership'
-import type { DealOwnership } from './deal-ownership'
-
-export interface CrmNextActionInput {
-  stage_key: string | null
-  state_key: string | null
-  activity_log: unknown
-}
-
-export interface EvaluateCrmDealNextActionOptions {
-  config?: CrmNextActionRuleConfig | unknown
-  now?: Date | string
-  /** Current age in days — computed from activity_log if not supplied. */
-  ageDays?: number
-}
-
-// ---------------------------------------------------------------------------
-// Zod schemas for the rule config (used by the resolver)
-// ---------------------------------------------------------------------------
-
-const CrmNextActionMappingSchema = z
-  .object({
-    stateKey: z.string().trim().min(1).max(120),
-    ownership: z.enum(['us', 'them', '*']),
-    actionKey: z.string().trim().min(1).max(120),
-    requiresStale: z.boolean().optional()
-  })
-  .strict()
-
-const CrmNextActionRuleConfigSchema = z
-  .object({
-    mappings: z.array(CrmNextActionMappingSchema),
-    ownershipUsFallback: z.string().trim().min(1).max(120)
-  })
-  .strict()
-
-// Partial override shape accepted from organizations.config.crm.next_actions
-export const CrmNextActionOverrideSchema = z
-  .object({
-    mappings: z.array(CrmNextActionMappingSchema).optional(),
-    ownershipUsFallback: z.string().trim().min(1).max(120).optional()
-  })
-  .strict()
-
-export type CrmNextActionOverride = z.infer<typeof CrmNextActionOverrideSchema>
-
-/**
- * Resolved next-action config. Always has all required fields populated.
- * `mappings` is the merged list: org overrides prepended before defaults so
- * org-specific rules win on first-match evaluation.
- */
-export type ResolvedCrmNextActionRuleConfig = CrmNextActionRuleConfig
-
-const MS_PER_DAY = 24 * 60 * 60 * 1000
-
-// ---------------------------------------------------------------------------
-// Public API
-// ---------------------------------------------------------------------------
-
-/**
- * Evaluates the suggested next action for a deal.
- *
- * Returns the action key string (matching a key in DEFAULT_CRM_ACTIONS), or
- * null for closed deals or when no mapping matches.
- *
- * Closed deals (ownership === null due to closed stage_key) return null
- * immediately — ownership derivation short-circuits on closed_won/closed_lost.
- */
-export function evaluateCrmDealNextAction(
-  input: CrmNextActionInput,
-  options: EvaluateCrmDealNextActionOptions = {}
-): string | null {
-  if (isClosedDeal(input)) return null
-
-  const config = resolveCrmNextActionRuleConfig(options.config)
-  const ownership = getDealOwnership(input)
-
-  // No ownership signal: staleAfterDays fallback is intentionally not applied here.
-  if (ownership === null) return null
-
-  const ageDays = options.ageDays ?? computeAgeDays(input, options.now)
-
-  return (
-    evaluateMappings(config.mappings, input.state_key, ownership, ageDays, 14) ??
-    (ownership === 'us' ? config.ownershipUsFallback : null)
-  )
-}
-
-/**
- * Resolves the next-action rule config from an org config input.
- *
- * Accepts:
- * - Full CrmNextActionRuleConfig (used directly after validation)
- * - Partial CrmNextActionOverride (merged on top of defaults)
- * - Nested org config: { crm: { next_actions: ... } }
- * - Any other value → falls back to defaults
- */
-export function resolveCrmNextActionRuleConfig(input?: unknown): ResolvedCrmNextActionRuleConfig {
-  const candidate = extractNextActionOverride(input)
-  const fullResult = CrmNextActionRuleConfigSchema.safeParse(candidate)
-
-  if (fullResult.success) return fullResult.data
-
-  const overrideResult = CrmNextActionOverrideSchema.safeParse(candidate)
-
-  if (!overrideResult.success) return { ...DEFAULT_CRM_NEXT_ACTION_RULE_CONFIG }
-
-  return mergeNextActionOverride(overrideResult.data)
-}
-
-// ---------------------------------------------------------------------------
-// Internal helpers
-// ---------------------------------------------------------------------------
-
-function evaluateMappings(
-  mappings: CrmNextActionMapping[],
-  stateKey: string | null,
-  ownership: Exclude<DealOwnership, null>,
-  ageDays: number,
-  staleAfterDays: number
-): string | null {
-  for (const mapping of mappings) {
-    const stateMatches = mapping.stateKey === '*' || mapping.stateKey === stateKey
-    const ownershipMatches = mapping.ownership === '*' || mapping.ownership === ownership
-    const staleOk = !mapping.requiresStale || ageDays >= staleAfterDays
-
-    if (stateMatches && ownershipMatches && staleOk) {
-      return mapping.actionKey
-    }
-  }
-
-  return null
-}
-
-function isClosedDeal(input: CrmNextActionInput): boolean {
-  return (
-    input.stage_key === 'closed_won' ||
-    input.stage_key === 'closed_lost' ||
-    input.state_key === 'closed_won' ||
-    input.state_key === 'closed_lost'
-  )
-}
-
-function mergeNextActionOverride(override: CrmNextActionOverride): ResolvedCrmNextActionRuleConfig {
-  // Org mappings are prepended so they win on first-match evaluation.
-  const mappings = [...(override.mappings ?? []), ...DEFAULT_CRM_NEXT_ACTION_RULE_CONFIG.mappings]
-
-  return {
-    mappings,
-    ownershipUsFallback: override.ownershipUsFallback ?? DEFAULT_CRM_NEXT_ACTION_RULE_CONFIG.ownershipUsFallback
-  }
-}
-
-function extractNextActionOverride(input: unknown): unknown {
-  if (!isPlainRecord(input)) return input
-
-  const crm = input.crm
-  if (isPlainRecord(crm) && Object.prototype.hasOwnProperty.call(crm, 'next_actions')) {
-    return crm.next_actions
-  }
-
-  return input
-}
-
-function isPlainRecord(value: unknown): value is Record<string, unknown> {
-  return Boolean(value) && typeof value === 'object' && !Array.isArray(value)
-}
-
-function computeAgeDays(input: CrmNextActionInput, now?: Date | string): number {
-  const nowMs = parseMs(now ?? new Date())
-  if (nowMs === null) return 0
-
-  if (!Array.isArray(input.activity_log) || input.activity_log.length === 0) return 0
-
-  let latestMs: number | null = null
-
-  for (const entry of input.activity_log) {
-    if (!entry || typeof entry !== 'object' || Array.isArray(entry)) continue
-
-    const record = entry as Record<string, unknown>
-    const ms =
-      parseMs(record.timestamp) ??
-      parseMs(record.occurredAt) ??
-      parseMs(record.createdAt) ??
-      parseMs(record.updatedAt) ??
-      parseMs(record.sentAt)
-
-    if (ms !== null && (latestMs === null || ms > latestMs)) {
-      latestMs = ms
-    }
-  }
-
-  if (latestMs === null) return 0
-
-  return Math.max(0, (nowMs - latestMs) / MS_PER_DAY)
-}
-
-function parseMs(value: unknown): number | null {
-  if (value instanceof Date) {
-    const ms = value.getTime()
-    return Number.isNaN(ms) ? null : ms
-  }
-  if (typeof value !== 'string') return null
-  const ms = new Date(value).getTime()
-  return Number.isNaN(ms) ? null : ms
-}
+// ---------------------------------------------------------------------------
+// CRM Next-Action evaluator — mirrors the crm-priority.ts resolver/evaluator
+// pattern. Maps (state_key, ownership) → suggested action key string.
+//
+// Per-org overrides live at organizations.config.crm.next_actions and are
+// merged at evaluator read time via resolveCrmNextActionRuleConfig.
+// ---------------------------------------------------------------------------
+
+import { z } from 'zod'
+import { type CrmNextActionRuleConfig, type CrmNextActionMapping } from '../../organization-model/domains/sales'
+import { getDealOwnership } from './deal-ownership'
+import type { DealOwnership } from './deal-ownership'
+
+export interface CrmNextActionInput {
+  stage_key: string | null
+  state_key: string | null
+  activity_log: unknown
+}
+
+export interface EvaluateCrmDealNextActionOptions {
+  config?: CrmNextActionRuleConfig | unknown
+  now?: Date | string
+  /** Current age in days — computed from activity_log if not supplied. */
+  ageDays?: number
+}
+
+// ---------------------------------------------------------------------------
+// Zod schemas for the rule config (used by the resolver)
+// ---------------------------------------------------------------------------
+
+const CrmNextActionMappingSchema = z
+  .object({
+    stateKey: z.string().trim().min(1).max(120),
+    ownership: z.enum(['us', 'them', '*']),
+    actionKey: z.string().trim().min(1).max(120),
+    requiresStale: z.boolean().optional()
+  })
+  .strict()
+
+const CrmNextActionRuleConfigSchema = z
+  .object({
+    mappings: z.array(CrmNextActionMappingSchema),
+    ownershipUsFallback: z.string().trim().min(1).max(120).nullable().optional()
+  })
+  .strict()
+
+// Partial override shape accepted from organizations.config.crm.next_actions
+export const CrmNextActionOverrideSchema = z
+  .object({
+    mappings: z.array(CrmNextActionMappingSchema).optional(),
+    ownershipUsFallback: z.string().trim().min(1).max(120).nullable().optional()
+  })
+  .strict()
+
+export type CrmNextActionOverride = z.infer<typeof CrmNextActionOverrideSchema>
+
+/**
+ * Resolved next-action config. Always has all required fields populated.
+ * `mappings` is the merged list: org overrides prepended before defaults so
+ * org-specific rules win on first-match evaluation.
+ */
+export type ResolvedCrmNextActionRuleConfig = CrmNextActionRuleConfig
+
+const MS_PER_DAY = 24 * 60 * 60 * 1000
+
+const GENERIC_CRM_NEXT_ACTION_RULE_CONFIG: CrmNextActionRuleConfig = {
+  mappings: [],
+  ownershipUsFallback: null
+}
+
+// ---------------------------------------------------------------------------
+// Public API
+// ---------------------------------------------------------------------------
+
+/**
+ * Evaluates the suggested next action for a deal.
+ *
+ * Returns the action key string (matching a key in the caller's action catalog), or
+ * null for closed deals or when no mapping matches.
+ *
+ * Closed deals (ownership === null due to closed stage_key) return null
+ * immediately — ownership derivation short-circuits on closed_won/closed_lost.
+ */
+export function evaluateCrmDealNextAction(
+  input: CrmNextActionInput,
+  options: EvaluateCrmDealNextActionOptions = {}
+): string | null {
+  if (isClosedDeal(input)) return null
+
+  const config = resolveCrmNextActionRuleConfig(options.config)
+  const ownership = getDealOwnership(input)
+
+  // No ownership signal: staleAfterDays fallback is intentionally not applied here.
+  if (ownership === null) return null
+
+  const ageDays = options.ageDays ?? computeAgeDays(input, options.now)
+
+  return (
+    evaluateMappings(config.mappings, input.state_key, ownership, ageDays, 14) ??
+    (ownership === 'us' ? (config.ownershipUsFallback ?? null) : null)
+  )
+}
+
+/**
+ * Resolves the next-action rule config from an org config input.
+ *
+ * Accepts:
+ * - Full CrmNextActionRuleConfig (used directly after validation)
+ * - Partial CrmNextActionOverride (merged on top of defaults)
+ * - Nested org config: { crm: { next_actions: ... } }
+ * - Any other value → falls back to defaults
+ */
+export function resolveCrmNextActionRuleConfig(
+  input?: unknown,
+  base: CrmNextActionRuleConfig = GENERIC_CRM_NEXT_ACTION_RULE_CONFIG
+): ResolvedCrmNextActionRuleConfig {
+  const candidate = extractNextActionOverride(input)
+  const fullResult = CrmNextActionRuleConfigSchema.safeParse(candidate)
+
+  if (fullResult.success) return fullResult.data
+
+  const overrideResult = CrmNextActionOverrideSchema.safeParse(candidate)
+
+  if (!overrideResult.success) return { mappings: [...base.mappings], ownershipUsFallback: base.ownershipUsFallback }
+
+  return mergeNextActionOverride(overrideResult.data, base)
+}
+
+// ---------------------------------------------------------------------------
+// Internal helpers
+// ---------------------------------------------------------------------------
+
+function evaluateMappings(
+  mappings: CrmNextActionMapping[],
+  stateKey: string | null,
+  ownership: Exclude<DealOwnership, null>,
+  ageDays: number,
+  staleAfterDays: number
+): string | null {
+  for (const mapping of mappings) {
+    const stateMatches = mapping.stateKey === '*' || mapping.stateKey === stateKey
+    const ownershipMatches = mapping.ownership === '*' || mapping.ownership === ownership
+    const staleOk = !mapping.requiresStale || ageDays >= staleAfterDays
+
+    if (stateMatches && ownershipMatches && staleOk) {
+      return mapping.actionKey
+    }
+  }
+
+  return null
+}
+
+function isClosedDeal(input: CrmNextActionInput): boolean {
+  return (
+    input.stage_key === 'closed_won' ||
+    input.stage_key === 'closed_lost' ||
+    input.state_key === 'closed_won' ||
+    input.state_key === 'closed_lost'
+  )
+}
+
+function mergeNextActionOverride(
+  override: CrmNextActionOverride,
+  base: CrmNextActionRuleConfig = GENERIC_CRM_NEXT_ACTION_RULE_CONFIG
+): ResolvedCrmNextActionRuleConfig {
+  // Org mappings are prepended so they win on first-match evaluation.
+  const mappings = [...(override.mappings ?? []), ...base.mappings]
+
+  return {
+    mappings,
+    ownershipUsFallback: override.ownershipUsFallback ?? base.ownershipUsFallback
+  }
+}
+
+function extractNextActionOverride(input: unknown): unknown {
+  if (!isPlainRecord(input)) return input
+
+  const crm = input.crm
+  if (isPlainRecord(crm) && Object.prototype.hasOwnProperty.call(crm, 'next_actions')) {
+    return crm.next_actions
+  }
+
+  return input
+}
+
+function isPlainRecord(value: unknown): value is Record<string, unknown> {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value)
+}
+
+function computeAgeDays(input: CrmNextActionInput, now?: Date | string): number {
+  const nowMs = parseMs(now ?? new Date())
+  if (nowMs === null) return 0
+
+  if (!Array.isArray(input.activity_log) || input.activity_log.length === 0) return 0
+
+  let latestMs: number | null = null
+
+  for (const entry of input.activity_log) {
+    if (!entry || typeof entry !== 'object' || Array.isArray(entry)) continue
+
+    const record = entry as Record<string, unknown>
+    const ms =
+      parseMs(record.timestamp) ??
+      parseMs(record.occurredAt) ??
+      parseMs(record.createdAt) ??
+      parseMs(record.updatedAt) ??
+      parseMs(record.sentAt)
+
+    if (ms !== null && (latestMs === null || ms > latestMs)) {
+      latestMs = ms
+    }
+  }
+
+  if (latestMs === null) return 0
+
+  return Math.max(0, (nowMs - latestMs) / MS_PER_DAY)
+}
+
+function parseMs(value: unknown): number | null {
+  if (value instanceof Date) {
+    const ms = value.getTime()
+    return Number.isNaN(ms) ? null : ms
+  }
+  if (typeof value !== 'string') return null
+  const ms = new Date(value).getTime()
+  return Number.isNaN(ms) ? null : ms
+}

package/src/business/acquisition/crm-priority.test.ts

@@ -1,5 +1,9 @@
-import { describe, it, expect } from 'vitest'
-import { evaluateCrmDealPriority, resolveCrmPriorityRuleConfig } from './crm-priority'
+import { describe, it, expect } from 'vitest'
+import {
+  evaluateCrmDealPriority as evaluateCrmDealPriorityCore,
+  resolveCrmPriorityRuleConfig
+} from './crm-priority'
+import type { CrmPriorityRuleConfig } from '../../organization-model/domains/sales'
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -9,11 +13,30 @@ function makeEvent(type: string, timestamp: string): Record<string, unknown> {
   return { type, timestamp }
 }
 
-const INBOUND = 'reply_received'
-const OUTBOUND = 'reply_sent_to_lead'
-const NOW = '2026-04-30T12:00:00.000Z'
-
-function makeDeal(
+const INBOUND = 'reply_received'
+const OUTBOUND = 'reply_sent_to_lead'
+const NOW = '2026-04-30T12:00:00.000Z'
+const ELEVASIS_CRM_PRIORITY_RULE_CONFIG: CrmPriorityRuleConfig = {
+  buckets: [
+    { bucketKey: 'needs_response', label: 'Needs Response', rank: 10, color: 'red' },
+    { bucketKey: 'follow_up_due', label: 'Follow-up Due', rank: 20, color: 'orange' },
+    { bucketKey: 'waiting', label: 'Waiting', rank: 30, color: 'blue' },
+    { bucketKey: 'stale', label: 'Stale', rank: 40, color: 'gray' },
+    { bucketKey: 'closed_low', label: 'Closed', rank: 50, color: 'dark' }
+  ],
+  closedStageKeys: ['closed_won', 'closed_lost'],
+  followUpAfterDaysByStateKey: {
+    discovery_link_sent: 3,
+    discovery_nudging: 2,
+    reply_sent: 3,
+    followup_1_sent: 3,
+    followup_2_sent: 5,
+    followup_3_sent: 7
+  },
+  staleAfterDays: 14
+}
+
+function makeDeal(
   overrides: Partial<{
     stage_key: string | null
     state_key: string | null
@@ -29,7 +52,17 @@ function makeDeal(
     updated_at: overrides.updated_at ?? NOW,
     created_at: overrides.created_at ?? NOW
   }
-}
+}
+
+function evaluateCrmDealPriority(
+  input: Parameters<typeof evaluateCrmDealPriorityCore>[0],
+  options: Parameters<typeof evaluateCrmDealPriorityCore>[1] = {}
+) {
+  return evaluateCrmDealPriorityCore(input, {
+    config: ELEVASIS_CRM_PRIORITY_RULE_CONFIG,
+    ...options
+  })
+}
 
 // ---------------------------------------------------------------------------
 // Closed deals → closed_low