@open-mercato/core 0.6.2-develop.3439.1.94b9d9733c → 0.6.2-develop.3446.1.bd060c6017

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.2-develop.3439.1.94b9d9733c",
+  "version": "0.6.2-develop.3446.1.bd060c6017",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -232,7 +232,7 @@
     "@mikro-orm/postgresql": "^7.0.15",
     "@xyflow/react": "^12.10.2",
     "ai": "^6.0.177",
-    "date-fns": "^4.1.0",
+    "date-fns": "4.1.0",
     "date-fns-tz": "^3.2.0",
     "html-to-text": "^9.0.5",
     "mammoth": "^1.9.0",
@@ -242,16 +242,16 @@
     "zod": "^4.3.6"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.2-develop.3439.1.94b9d9733c",
-    "@open-mercato/shared": "0.6.2-develop.3439.1.94b9d9733c",
-    "@open-mercato/ui": "0.6.2-develop.3439.1.94b9d9733c",
+    "@open-mercato/ai-assistant": "0.6.2-develop.3446.1.bd060c6017",
+    "@open-mercato/shared": "0.6.2-develop.3446.1.bd060c6017",
+    "@open-mercato/ui": "0.6.2-develop.3446.1.bd060c6017",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.2-develop.3439.1.94b9d9733c",
-    "@open-mercato/shared": "0.6.2-develop.3439.1.94b9d9733c",
-    "@open-mercato/ui": "0.6.2-develop.3439.1.94b9d9733c",
+    "@open-mercato/ai-assistant": "0.6.2-develop.3446.1.bd060c6017",
+    "@open-mercato/shared": "0.6.2-develop.3446.1.bd060c6017",
+    "@open-mercato/ui": "0.6.2-develop.3446.1.bd060c6017",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/helpers/integration/queue-runner.ts

@@ -0,0 +1,72 @@
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { bootstrapFromAppRoot } from '@open-mercato/shared/lib/bootstrap/dynamicLoader'
+import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
+import { createQueue } from '@open-mercato/queue'
+
+export type QueueDrainRunnerOptions = {
+  appRoot: string
+  jobLimit: number
+}
+
+export async function drainQueueFromAppRoot(
+  queueName: string,
+  options: QueueDrainRunnerOptions,
+): Promise<number> {
+  const data = await bootstrapFromAppRoot(options.appRoot)
+  const worker = data.modules
+    .flatMap((module) => module.workers ?? [])
+    .find((entry) => entry.queue === queueName)
+  if (!worker) return 0
+
+  const container = await createRequestContainer()
+  const queue = createQueue(queueName, 'local', {
+    baseDir: path.resolve(options.appRoot, '.mercato/queue'),
+    concurrency: 1,
+  })
+  const resolve = <T = unknown>(name: string): T => container.resolve(name) as T
+
+  try {
+    let processedJobs = 0
+    while (true) {
+      const result = await queue.process(
+        async (job, ctx) => {
+          await Promise.resolve(worker.handler(job, { ...ctx, resolve }))
+        },
+        { limit: options.jobLimit },
+      )
+      const handled = result.processed + result.failed
+      processedJobs += handled
+      if (handled === 0) return processedJobs
+    }
+  } finally {
+    await queue.close()
+  }
+}
+
+export async function runQueueDrainFromEnv(): Promise<void> {
+  const queueName = process.env.OM_INTEGRATION_QUEUE_NAME?.trim()
+  const appRoot = process.env.OM_INTEGRATION_APP_ROOT?.trim()
+  const jobLimit = Number.parseInt(process.env.OM_INTEGRATION_QUEUE_JOB_LIMIT || '100', 10) || 100
+  if (!queueName || !appRoot) throw new Error('Missing queue drain environment')
+
+  const processed = await drainQueueFromAppRoot(queueName, {
+    appRoot: path.resolve(appRoot),
+    jobLimit,
+  })
+  console.log(JSON.stringify({ processed }))
+}
+
+const currentFile = fileURLToPath(import.meta.url)
+const invokedFile = process.argv[1] ? path.resolve(process.argv[1]) : null
+
+if (invokedFile === currentFile) {
+  runQueueDrainFromEnv()
+    .then(() => {
+      process.exit(0)
+    })
+    .catch((error) => {
+      console.error(error)
+      process.exit(1)
+    })
+}

package/src/helpers/integration/queue.ts

@@ -0,0 +1,70 @@
+import { spawn } from 'node:child_process'
+import { createRequire } from 'node:module'
+import path from 'node:path'
+import { drainQueueFromAppRoot } from './queue-runner'
+
+type DrainQueueOptions = {
+  appRoot?: string
+  jobLimit?: number
+}
+
+const DEFAULT_JOB_LIMIT = 100
+
+function resolveAppRoot(input?: string): string {
+  return path.resolve(input?.trim() || process.env.OM_TEST_APP_ROOT?.trim() || path.resolve(process.cwd(), 'apps/mercato'))
+}
+
+async function drainQueueInCurrentProcess(queueName: string, options: Required<DrainQueueOptions>): Promise<number> {
+  return drainQueueFromAppRoot(queueName, options)
+}
+
+function resolveAppRunnerPath(appRoot: string): string {
+  const requireFromApp = createRequire(path.join(appRoot, 'package.json'))
+  return requireFromApp.resolve('@open-mercato/core/helpers/integration/queue-runner')
+}
+
+function drainQueueInAppProcess(queueName: string, options: Required<DrainQueueOptions>): Promise<number> {
+  return new Promise((resolve, reject) => {
+    const child = spawn(process.execPath, [resolveAppRunnerPath(options.appRoot)], {
+      cwd: options.appRoot,
+      env: {
+        ...process.env,
+        OM_INTEGRATION_APP_ROOT: options.appRoot,
+        OM_INTEGRATION_QUEUE_NAME: queueName,
+        OM_INTEGRATION_QUEUE_JOB_LIMIT: String(options.jobLimit),
+        QUEUE_BASE_DIR: path.resolve(options.appRoot, '.mercato/queue'),
+      },
+      stdio: ['ignore', 'pipe', 'pipe'],
+    })
+
+    let stdout = ''
+    let stderr = ''
+    child.stdout.on('data', (chunk) => { stdout += chunk.toString() })
+    child.stderr.on('data', (chunk) => { stderr += chunk.toString() })
+    child.on('error', reject)
+    child.on('close', (code) => {
+      if (code !== 0) {
+        reject(new Error(`Queue drain failed for "${queueName}" in ${options.appRoot} (exit ${code}).\n${stderr || stdout}`))
+        return
+      }
+      const lastLine = stdout.trim().split(/\r?\n/).reverse().find((line) => line.trim().startsWith('{')) ?? '{}'
+      try {
+        const parsed = JSON.parse(lastLine) as { processed?: unknown }
+        resolve(Number(parsed.processed ?? 0))
+      } catch {
+        resolve(0)
+      }
+    })
+  })
+}
+
+export async function drainIntegrationQueue(queueName: string, options: DrainQueueOptions = {}): Promise<number> {
+  const resolved = {
+    appRoot: resolveAppRoot(options.appRoot),
+    jobLimit: options.jobLimit ?? DEFAULT_JOB_LIMIT,
+  }
+  if (process.env.OM_TEST_APP_ROOT?.trim()) {
+    return drainQueueInAppProcess(queueName, resolved)
+  }
+  return drainQueueInCurrentProcess(queueName, resolved)
+}

package/src/helpers/integration/salesUi.ts

@@ -1011,16 +1011,22 @@ export async function addCustomLine(page: Page, options: AddLineOptions): Promis
   await dialog.getByRole('textbox', { name: '1' }).fill(String(options.quantity));
 
   if (options.taxClassName) {
-    // Radix Select inside Dialog — force click on option to bypass overlay
-    const taxClassTrigger = dialog
-      .locator('[role="combobox"]')
-      .filter({ hasText: /No tax class selected/i })
-      .first();
+    const taxClassTrigger = dialog.locator('[data-crud-field-id="taxRateId"] [role="combobox"]').first();
     if ((await taxClassTrigger.count()) > 0) {
-      await taxClassTrigger.click();
-      const opt = page.getByRole('option', { name: options.taxClassName, exact: true });
-      await opt.first().waitFor({ state: 'visible', timeout: 3_000 });
-      await opt.first().click({ force: true });
+      await expect(taxClassTrigger).toBeEnabled({ timeout: TEST_WAIT_TIMEOUT_MS });
+      const selectedLabel = options.taxClassName.split('•')[0].trim();
+      for (let attempt = 0; attempt < 3; attempt += 1) {
+        await taxClassTrigger.click();
+        const opt = page.getByRole('option', { name: options.taxClassName, exact: true }).first();
+        await opt.waitFor({ state: 'visible', timeout: 3_000 });
+        await opt.click();
+        const selected = await taxClassTrigger
+          .filter({ hasText: new RegExp(escapeRegExp(selectedLabel), 'i') })
+          .waitFor({ state: 'visible', timeout: 1_500 })
+          .then(() => true, () => false);
+        if (selected) break;
+      }
+      await expect(taxClassTrigger).toContainText(selectedLabel, { timeout: TEST_WAIT_TIMEOUT_MS });
     }
   }
 
@@ -1104,21 +1110,30 @@ export async function addAdjustment(page: Page, options: AddAdjustmentOptions):
         TEST_WAIT_TIMEOUT_MS,
       );
       await expect(kindTrigger).toBeEnabled({ timeout: TEST_WAIT_TIMEOUT_MS });
-      await kindTrigger.click();
-      const kindOption = page.getByRole('option', { name: new RegExp(`^${escapeRegExp(kindLabel)}$`, 'i') }).first();
-      const optionVisible = await kindOption
-        .waitFor({ state: 'visible', timeout: TEST_WAIT_TIMEOUT_MS })
-        .then(() => true, () => false);
-      if (optionVisible) {
-        await kindOption.click({ force: true });
-      } else {
-        // Fallback: drive selection via keyboard when modal-backdrop click interception
-        // hides the rendered option. Brought forward from develop.
-        await page.keyboard.type(kindLabel.charAt(0));
-        await page.waitForTimeout(150);
-        await page.keyboard.press('Enter');
+      for (let attempt = 0; attempt < 3; attempt += 1) {
+        const currentLabel = await kindTrigger.textContent().catch(() => '');
+        if (currentLabel?.includes(kindLabel)) return;
+        const expanded = await kindTrigger.getAttribute('aria-expanded').catch(() => null);
+        if (expanded === 'true') {
+          await page.keyboard.press('Escape').catch(() => {});
+        }
+        await kindTrigger.click();
+        const kindOption = page.getByRole('option', { name: new RegExp(`^${escapeRegExp(kindLabel)}$`, 'i') }).first();
+        const optionVisible = await kindOption
+          .waitFor({ state: 'visible', timeout: TEST_WAIT_TIMEOUT_MS })
+          .then(() => true, () => false);
+        if (optionVisible) {
+          await kindOption.click({ force: true });
+        } else {
+          // Fallback: drive selection via keyboard when modal-backdrop click interception
+          // hides the rendered option. Brought forward from develop.
+          await page.keyboard.type(kindLabel.charAt(0));
+          await page.waitForTimeout(150);
+          await page.keyboard.press('Enter');
+        }
+        await expect(kindTrigger).toContainText(kindLabel, { timeout: 2_000 }).catch(() => {});
       }
-      await expect(kindTrigger).toContainText(kindLabel, { timeout: 2_000 });
+      await expect(kindTrigger).toContainText(kindLabel, { timeout: 5_000 });
     };
 
     // Select kind first — the Radix Select interaction can trigger CrudForm re-renders that

package/src/modules/attachments/i18n/de.json

@@ -122,6 +122,18 @@
   "attachments.partitions.form.ocrModelOptions.gpt-4o": "GPT-4o (Empfohlen)",
   "attachments.partitions.form.ocrModelOptions.gpt-4o-mini": "GPT-4o Mini (Schneller, günstiger)",
   "attachments.partitions.form.publicLabel": "Öffentlich zugänglich",
+  "attachments.partitions.form.s3BucketLabel": "Bucket",
+  "attachments.partitions.form.s3BucketOverrideLabel": "Bucket überschreiben (optional)",
+  "attachments.partitions.form.s3ConfigTitle": "S3-Konfiguration",
+  "attachments.partitions.form.s3CredsPrefixLabel": "Präfix für Zugangsdaten-Umgebungsvariablen",
+  "attachments.partitions.form.s3CredsSourceLabel": "Quelle der Zugangsdaten",
+  "attachments.partitions.form.s3EndpointHelp": "Für AWS S3 leer lassen. Erforderlich für MinIO, DigitalOcean Spaces usw.",
+  "attachments.partitions.form.s3EndpointLabel": "Benutzerdefinierter Endpoint",
+  "attachments.partitions.form.s3EndpointOverrideLabel": "Benutzerdefinierten Endpoint überschreiben (optional)",
+  "attachments.partitions.form.s3ForcePathStyleLabel": "Path-Style erzwingen (für MinIO erforderlich)",
+  "attachments.partitions.form.s3RegionLabel": "Region",
+  "attachments.partitions.form.s3RegionOverrideLabel": "Region überschreiben (optional)",
+  "attachments.partitions.form.storageDriverLabel": "Speichertreiber",
   "attachments.partitions.form.titleLabel": "Titel",
   "attachments.partitions.form.titlePlaceholder": "z. B. Marketing-Assets",
   "attachments.partitions.locked.description": "Anhang-Partitionen werden durch Umgebungsstandardwerte verwaltet, solange der Demo- oder Onboarding-Modus aktiv ist.",
@@ -139,6 +151,7 @@
   "attachments.partitions.table.private": "Privat",
   "attachments.partitions.table.public": "Öffentlich",
   "attachments.partitions.table.search": "Partitionen suchen…",
+  "attachments.partitions.table.storageDriver": "Speicher",
   "attachments.partitions.table.title": "Titel",
   "attachments.partitions.table.visibility": "Sichtbarkeit",
   "attachments.partitions.title": "Anhang-Partitionen",

package/src/modules/attachments/i18n/en.json

@@ -122,6 +122,18 @@
   "attachments.partitions.form.ocrModelOptions.gpt-4o": "GPT-4o (Recommended)",
   "attachments.partitions.form.ocrModelOptions.gpt-4o-mini": "GPT-4o Mini (Faster, Lower Cost)",
   "attachments.partitions.form.publicLabel": "Publicly accessible",
+  "attachments.partitions.form.s3BucketLabel": "Bucket",
+  "attachments.partitions.form.s3BucketOverrideLabel": "Bucket override (optional)",
+  "attachments.partitions.form.s3ConfigTitle": "S3 Configuration",
+  "attachments.partitions.form.s3CredsPrefixLabel": "Credentials Env Prefix",
+  "attachments.partitions.form.s3CredsSourceLabel": "Credentials source",
+  "attachments.partitions.form.s3EndpointHelp": "Leave empty for AWS S3. Required for MinIO, DigitalOcean Spaces, etc.",
+  "attachments.partitions.form.s3EndpointLabel": "Custom Endpoint",
+  "attachments.partitions.form.s3EndpointOverrideLabel": "Custom endpoint override (optional)",
+  "attachments.partitions.form.s3ForcePathStyleLabel": "Force Path Style (required for MinIO)",
+  "attachments.partitions.form.s3RegionLabel": "Region",
+  "attachments.partitions.form.s3RegionOverrideLabel": "Region override (optional)",
+  "attachments.partitions.form.storageDriverLabel": "Storage Driver",
   "attachments.partitions.form.titleLabel": "Title",
   "attachments.partitions.form.titlePlaceholder": "e.g. Marketing assets",
   "attachments.partitions.locked.description": "Attachment partitions are managed by environment defaults while demo or onboarding mode is enabled.",
@@ -139,6 +151,7 @@
   "attachments.partitions.table.private": "Private",
   "attachments.partitions.table.public": "Public",
   "attachments.partitions.table.search": "Search partitions…",
+  "attachments.partitions.table.storageDriver": "Storage",
   "attachments.partitions.table.title": "Title",
   "attachments.partitions.table.visibility": "Visibility",
   "attachments.partitions.title": "Attachment partitions",

package/src/modules/attachments/i18n/es.json

@@ -122,6 +122,18 @@
   "attachments.partitions.form.ocrModelOptions.gpt-4o": "GPT-4o (Recomendado)",
   "attachments.partitions.form.ocrModelOptions.gpt-4o-mini": "GPT-4o Mini (Más rápido, menor costo)",
   "attachments.partitions.form.publicLabel": "Acceso público",
+  "attachments.partitions.form.s3BucketLabel": "Bucket",
+  "attachments.partitions.form.s3BucketOverrideLabel": "Sobrescribir bucket (opcional)",
+  "attachments.partitions.form.s3ConfigTitle": "Configuración S3",
+  "attachments.partitions.form.s3CredsPrefixLabel": "Prefijo de variables de entorno de credenciales",
+  "attachments.partitions.form.s3CredsSourceLabel": "Origen de credenciales",
+  "attachments.partitions.form.s3EndpointHelp": "Déjelo vacío para AWS S3. Es obligatorio para MinIO, DigitalOcean Spaces, etc.",
+  "attachments.partitions.form.s3EndpointLabel": "Endpoint personalizado",
+  "attachments.partitions.form.s3EndpointOverrideLabel": "Sobrescribir endpoint personalizado (opcional)",
+  "attachments.partitions.form.s3ForcePathStyleLabel": "Forzar Path Style (obligatorio para MinIO)",
+  "attachments.partitions.form.s3RegionLabel": "Región",
+  "attachments.partitions.form.s3RegionOverrideLabel": "Sobrescribir región (opcional)",
+  "attachments.partitions.form.storageDriverLabel": "Controlador de almacenamiento",
   "attachments.partitions.form.titleLabel": "Título",
   "attachments.partitions.form.titlePlaceholder": "ej. Recursos de marketing",
   "attachments.partitions.locked.description": "Las particiones de archivos adjuntos están administradas por valores predeterminados del entorno mientras el modo demo o de incorporación está activo.",
@@ -139,6 +151,7 @@
   "attachments.partitions.table.private": "Privado",
   "attachments.partitions.table.public": "Público",
   "attachments.partitions.table.search": "Buscar particiones…",
+  "attachments.partitions.table.storageDriver": "Almacenamiento",
   "attachments.partitions.table.title": "Título",
   "attachments.partitions.table.visibility": "Visibilidad",
   "attachments.partitions.title": "Particiones de archivos adjuntos",

package/src/modules/attachments/i18n/pl.json

@@ -122,6 +122,18 @@
   "attachments.partitions.form.ocrModelOptions.gpt-4o": "GPT-4o (zalecany)",
   "attachments.partitions.form.ocrModelOptions.gpt-4o-mini": "GPT-4o Mini (szybszy, niższy koszt)",
   "attachments.partitions.form.publicLabel": "Publicznie dostępna",
+  "attachments.partitions.form.s3BucketLabel": "Bucket",
+  "attachments.partitions.form.s3BucketOverrideLabel": "Nadpisanie bucketu (opcjonalne)",
+  "attachments.partitions.form.s3ConfigTitle": "Konfiguracja S3",
+  "attachments.partitions.form.s3CredsPrefixLabel": "Prefiks zmiennych środowiskowych poświadczeń",
+  "attachments.partitions.form.s3CredsSourceLabel": "Źródło poświadczeń",
+  "attachments.partitions.form.s3EndpointHelp": "Pozostaw puste dla AWS S3. Wymagane dla MinIO, DigitalOcean Spaces itp.",
+  "attachments.partitions.form.s3EndpointLabel": "Niestandardowy endpoint",
+  "attachments.partitions.form.s3EndpointOverrideLabel": "Nadpisanie niestandardowego endpointu (opcjonalne)",
+  "attachments.partitions.form.s3ForcePathStyleLabel": "Wymuś Path Style (wymagane dla MinIO)",
+  "attachments.partitions.form.s3RegionLabel": "Region",
+  "attachments.partitions.form.s3RegionOverrideLabel": "Nadpisanie regionu (opcjonalne)",
+  "attachments.partitions.form.storageDriverLabel": "Sterownik magazynu",
   "attachments.partitions.form.titleLabel": "Tytuł",
   "attachments.partitions.form.titlePlaceholder": "np. Zasoby marketingowe",
   "attachments.partitions.locked.description": "Partycje załączników są zarządzane przez domyślne zmienne środowiskowe, gdy włączony jest tryb demonstracyjny lub onboardingowy.",
@@ -139,6 +151,7 @@
   "attachments.partitions.table.private": "Prywatna",
   "attachments.partitions.table.public": "Publiczna",
   "attachments.partitions.table.search": "Szukaj partycji…",
+  "attachments.partitions.table.storageDriver": "Magazyn",
   "attachments.partitions.table.title": "Tytuł",
   "attachments.partitions.table.visibility": "Widoczność",
   "attachments.partitions.title": "Partycje załączników",

package/src/modules/customers/ai-agents.ts

@@ -281,6 +281,7 @@ const agent: AiAgentDefinition = {
   executionMode: 'chat',
   acceptedMediaTypes: ['image', 'pdf', 'file'],
   requiredFeatures: [...REQUIRED_FEATURES],
+  taskPlan: { enabled: true },
   readOnly: false,
   // Default for write-capable agents: every mutation must be confirmed by
   // the operator. Per-tenant override can downgrade to `read-only` to lock
@@ -339,7 +340,7 @@ const DEAL_ANALYZER_PROMPT_SECTIONS: DealAnalyzerPromptSection[] = [
     content: [
       'SCOPE',
       'Stay inside the customers module. Respect tenant and organization isolation.',
-      'ALWAYS call customers.analyze_deals as your FIRST tool call — do not skip this.',
+      'ALWAYS call customers.analyze_deals as your FIRST domain tool — do not skip this.',
       'Reason about stalled deals: any deal with no activity for more than 14 days',
       'is considered stalled. For each stalled deal with a value greater than $5,000',
       'propose a stage move via customers.update_deal_stage.',
@@ -448,6 +449,7 @@ function buildDealAnalyzerPrepareStep() {
           'customers.list_activities',
           'search.hybrid_search',
           'meta.describe_agent',
+          'meta.update_task_plan',
         ],
       }
     }
@@ -466,6 +468,7 @@ const dealAnalyzer: AiAgentDefinition = {
   executionMode: 'chat',
   executionEngine: 'stream-text',
   allowRuntimeOverride: true,
+  taskPlan: { enabled: true },
   readOnly: false,
   mutationPolicy: 'confirm-required',
   requiredFeatures: ['customers.deals.view'],

package/src/modules/customers/ai-tools/deals-pack.ts

@@ -14,7 +14,7 @@
  * the spec's residual N+1 budget; deeper aggregation can earn a first-class
  * API later without touching the AI surface.
  */
-import type { EntityManager } from '@mikro-orm/postgresql'
+import type { EntityManager, FilterQuery } from '@mikro-orm/postgresql'
 import { z } from 'zod'
 import { defineApiBackedAiTool } from '@open-mercato/ai-assistant/modules/ai_assistant/lib/api-backed-tool'
 import {
@@ -390,6 +390,15 @@ function recordVersionFromUpdatedAt(updatedAt: Date | null | undefined): string
   return value.toISOString()
 }
 
+function titleStatus(value: string | null | undefined): string | undefined {
+  if (!value) return undefined
+  return value
+    .split(/[_\s-]+/)
+    .filter(Boolean)
+    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+    .join(' ')
+}
+
 async function loadDealWithStage(
   em: EntityManager,
   ctx: CustomersToolContext,
@@ -401,7 +410,7 @@ async function loadDealWithStage(
   const deal = await findOneWithDecryption<CustomerDeal>(
     em,
     CustomerDeal,
-    where as any,
+    where as FilterQuery<CustomerDeal>,
     undefined,
     buildScope(ctx, tenantId),
   )
@@ -410,6 +419,26 @@ async function loadDealWithStage(
   return deal
 }
 
+async function loadPipelineStage(
+  em: EntityManager,
+  ctx: CustomersToolContext,
+  tenantId: string,
+  stageId: string,
+  organizationId: string,
+): Promise<CustomerPipelineStage | null> {
+  return findOneWithDecryption<CustomerPipelineStage>(
+    em,
+    CustomerPipelineStage,
+    {
+      id: stageId,
+      tenantId,
+      organizationId,
+    },
+    undefined,
+    buildScope(ctx, tenantId),
+  )
+}
+
 const updateDealStageTool: CustomersAiToolDefinition = {
   name: 'customers.update_deal_stage',
   displayName: 'Update deal stage',
@@ -425,14 +454,47 @@ const updateDealStageTool: CustomersAiToolDefinition = {
     const em = resolveEm(ctx)
     const deal = await loadDealWithStage(em, ctx, tenantId, input.dealId)
     if (!deal) return null
+    let afterStatus = deal.status ?? null
+    let afterPipelineStageId = deal.pipelineStageId ?? null
+    let afterPipelineStageLabel = deal.pipelineStage ?? null
+    if (input.toPipelineStageId) {
+      const organizationId = deal.organizationId ?? ctx.organizationId ?? null
+      const stage = organizationId
+        ? await loadPipelineStage(em, ctx, tenantId, input.toPipelineStageId, organizationId)
+        : null
+      afterPipelineStageId = input.toPipelineStageId
+      afterPipelineStageLabel = stage?.label ?? input.toPipelineStageId
+    } else if (input.toStage) {
+      afterStatus = input.toStage
+    }
+    const beforeStatus = deal.status ?? null
+    const beforePipelineStageId = deal.pipelineStageId ?? null
+    const beforePipelineStageLabel = deal.pipelineStage ?? beforePipelineStageId
     return {
       recordId: deal.id,
       entityType: 'customers.deal',
       recordVersion: recordVersionFromUpdatedAt(deal.updatedAt),
       before: {
-        status: deal.status ?? null,
-        pipelineStage: deal.pipelineStage ?? null,
-        pipelineStageId: deal.pipelineStageId ?? null,
+        status: beforeStatus,
+        pipelineStageId: beforePipelineStageId,
+      },
+      after: {
+        status: afterStatus,
+        pipelineStageId: afterPipelineStageId,
+      },
+      display: {
+        fieldLabels: {
+          status: 'Status',
+          pipelineStageId: 'Pipeline stage',
+        },
+        before: {
+          ...(beforeStatus ? { status: titleStatus(beforeStatus) } : {}),
+          ...(beforePipelineStageLabel ? { pipelineStageId: beforePipelineStageLabel } : {}),
+        },
+        after: {
+          ...(afterStatus ? { status: titleStatus(afterStatus) } : {}),
+          ...(afterPipelineStageLabel ? { pipelineStageId: afterPipelineStageLabel } : {}),
+        },
       },
     }
   },
@@ -461,11 +523,7 @@ const updateDealStageTool: CustomersAiToolDefinition = {
       organizationId,
     }
     if (input.toPipelineStageId) {
-      const stage = await em.findOne(CustomerPipelineStage, {
-        id: input.toPipelineStageId,
-        tenantId,
-        organizationId,
-      })
+      const stage = await loadPipelineStage(em, ctx, tenantId, input.toPipelineStageId, organizationId)
       if (!stage) {
         throw new Error('Pipeline stage not found.')
       }

package/src/modules/customers/ai-tools/types.ts

@@ -34,6 +34,12 @@ export interface CustomersToolLoadBeforeSingleRecord {
   entityType: string
   recordVersion: string | null
   before: Record<string, unknown>
+  after?: Record<string, unknown>
+  display?: {
+    fieldLabels?: Record<string, string>
+    before?: Record<string, unknown>
+    after?: Record<string, unknown>
+  }
 }
 
 export interface CustomersAiToolDefinition<TInput = unknown, TOutput = unknown> {

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

@@ -452,7 +452,16 @@ export async function GET(_req: Request, ctx: { params?: { id?: string } }) {
     })
     const em = (container.resolve('em') as EntityManager)
 
-    const person = await findOneWithDecryption(em, CustomerEntity, { id: parse.data.id, kind: 'person', deletedAt: null }, {}, { tenantId: auth.tenantId ?? null, organizationId: auth.orgId ?? null })
+    const person = await findOneWithDecryption(
+      em,
+      CustomerEntity,
+      { id: parse.data.id, kind: 'person', deletedAt: null },
+      {},
+      {
+        tenantId: scope?.tenantId ?? auth.tenantId ?? null,
+        organizationId: scope?.selectedId ?? auth.orgId ?? null,
+      },
+    )
     profiler.mark('person_loaded', { found: !!person })
     if (!person) {
       statusCode = 404

package/src/modules/query_index/data/entities.ts

@@ -33,6 +33,10 @@ import { Entity, Index, PrimaryKey, Property, Unique } from '@mikro-orm/decorato
     `create index "entity_indexes_customer_company_profile_tenant_doc_idx" on "entity_indexes" ("tenant_id", "entity_id") include ("doc") where deleted_at is null and entity_type = 'customers:customer_company_profile' and organization_id is null and tenant_id is not null`,
 })
 @Index({ name: 'entity_indexes_type_tenant_idx', properties: ['entityType', 'tenantId'] })
+@Unique({
+  name: 'entity_indexes_type_entity_org_coalesced_unique',
+  properties: ['entityType', 'entityId', 'organizationIdCoalesced'],
+})
 export class EntityIndexRow {
   @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
   id!: string
@@ -51,6 +55,14 @@ export class EntityIndexRow {
   @Index({ name: 'entity_indexes_org_idx' })
   organizationId?: string | null
 
+  @Property({
+    name: 'organization_id_coalesced',
+    type: 'uuid',
+    generated: (cols) => `(coalesce(${cols.organizationId}, '00000000-0000-0000-0000-000000000000'::uuid)) stored`,
+    hidden: true,
+  })
+  organizationIdCoalesced!: string
+
   @Property({ name: 'tenant_id', type: 'uuid', nullable: true })
   tenantId?: string | null