@open-mercato/core 0.10.1-develop.7672.1.c2e4c0b5df → 0.10.1-develop.7676.1.e75439fc4f

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
-[build:core] found 5993 entry points
+[build:core] found 5996 entry points
 [build:core] built successfully
 [build:core:generated] found 266 entry points
 [build:core:generated] built successfully

package/dist/helpers/integration/queue.js

@@ -1,12 +1,15 @@
 import { spawn } from "node:child_process";
 import { createRequire } from "node:module";
 import path from "node:path";
-import { drainQueueFromAppRoot } from "./queue-runner.js";
+import { expect } from "@playwright/test";
+import { createQueue, getQueuePendingProbe } from "@open-mercato/queue";
+import { parseBooleanToken } from "@open-mercato/shared/lib/boolean";
 const DEFAULT_JOB_LIMIT = 100;
 function resolveAppRoot(input) {
   return path.resolve(input?.trim() || process.env.OM_TEST_APP_ROOT?.trim() || path.resolve(process.cwd(), "apps/mercato"));
 }
 async function drainQueueInCurrentProcess(queueName, options) {
+  const { drainQueueFromAppRoot } = await import("./queue-runner.js");
   return drainQueueFromAppRoot(queueName, options);
 }
 function resolveAppRunnerPath(appRoot) {
@@ -62,6 +65,22 @@ ${stderr || stdout}`));
     });
   });
 }
+async function waitForManagedQueue(queueName, options) {
+  const baseDir = process.env.QUEUE_BASE_DIR?.trim() || path.resolve(options.appRoot, ".mercato/queue");
+  const queue = createQueue(queueName, "local", { baseDir });
+  try {
+    const initial = await queue.getJobCounts();
+    await expect.poll(async () => {
+      const pending = await getQueuePendingProbe(queueName, "local", { baseDir });
+      if (pending.error) throw new Error(`[internal] Cannot observe integration queue ${queueName}: ${pending.errorMessage}`);
+      return pending.ready + pending.active;
+    }, { message: `Integration queue ${queueName} should finish processing` }).toBe(0);
+    const final = await queue.getJobCounts();
+    return final.completed + final.failed - initial.completed - initial.failed;
+  } finally {
+    await queue.close();
+  }
+}
 async function drainIntegrationQueue(queueName, options = {}) {
   const resolved = {
     appRoot: resolveAppRoot(options.appRoot),
@@ -70,6 +89,8 @@ async function drainIntegrationQueue(queueName, options = {}) {
   if (process.env.OM_TEST_APP_ROOT?.trim()) {
     return drainQueueInAppProcess(queueName, resolved);
   }
+  const managed = parseBooleanToken(process.env.AUTO_SPAWN_WORKERS) ?? parseBooleanToken(process.env.OM_AUTO_SPAWN_WORKERS) ?? true;
+  if (managed) return waitForManagedQueue(queueName, resolved);
   return drainQueueInCurrentProcess(queueName, resolved);
 }
 export {

package/dist/helpers/integration/queue.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/integration/queue.ts"],
-  "sourcesContent": ["import { spawn } from 'node:child_process'\nimport { createRequire } from 'node:module'\nimport path from 'node:path'\nimport { drainQueueFromAppRoot } from './queue-runner'\n\ntype DrainQueueOptions = {\n  appRoot?: string\n  jobLimit?: number\n}\n\nconst DEFAULT_JOB_LIMIT = 100\n\nfunction resolveAppRoot(input?: string): string {\n  return path.resolve(input?.trim() || process.env.OM_TEST_APP_ROOT?.trim() || path.resolve(process.cwd(), 'apps/mercato'))\n}\n\nasync function drainQueueInCurrentProcess(queueName: string, options: Required<DrainQueueOptions>): Promise<number> {\n  return drainQueueFromAppRoot(queueName, options)\n}\n\nfunction resolveAppRunnerPath(appRoot: string): string {\n  const requireFromApp = createRequire(path.join(appRoot, 'package.json'))\n  return requireFromApp.resolve('@open-mercato/core/helpers/integration/queue-runner')\n}\n\nfunction drainQueueInAppProcess(queueName: string, options: Required<DrainQueueOptions>): Promise<number> {\n  return new Promise((resolve, reject) => {\n    const child = spawn(process.execPath, [resolveAppRunnerPath(options.appRoot)], {\n      cwd: options.appRoot,\n      env: {\n        ...process.env,\n        OM_INTEGRATION_APP_ROOT: options.appRoot,\n        OM_INTEGRATION_QUEUE_NAME: queueName,\n        OM_INTEGRATION_QUEUE_JOB_LIMIT: String(options.jobLimit),\n        QUEUE_BASE_DIR: process.env.QUEUE_BASE_DIR?.trim() || path.resolve(options.appRoot, '.mercato/queue'),\n      },\n      stdio: ['ignore', 'pipe', 'pipe'],\n    })\n\n    let stdout = ''\n    let stderr = ''\n    child.stdout.on('data', (chunk) => { stdout += chunk.toString() })\n    child.stderr.on('data', (chunk) => { stderr += chunk.toString() })\n    child.on('error', reject)\n    child.on('close', (code) => {\n      // The child's diagnostics (pino job logs on stdout, cache-fallback\n      // console.warn on stderr) are otherwise discarded on exit 0, which makes\n      // silently-failing jobs and silent memory-cache fallbacks in the drain\n      // child undebuggable from CI logs. OM_DRAIN_DEBUG=1 forwards everything;\n      // a non-empty stderr is forwarded unconditionally because it only carries\n      // warning/error-class output.\n      if (process.env.OM_DRAIN_DEBUG === '1') {\n        process.stderr.write(`[drain-child ${queueName} exit=${code}] STDOUT:\\n${stdout}\\nSTDERR:\\n${stderr}\\n`)\n      } else if (stderr.trim().length > 0) {\n        process.stderr.write(`[drain-child ${queueName} exit=${code}] STDERR:\\n${stderr}\\n`)\n      }\n      if (code !== 0) {\n        reject(new Error(`Queue drain failed for \"${queueName}\" in ${options.appRoot} (exit ${code}).\\n${stderr || stdout}`))\n        return\n      }\n      const lastLine = stdout.trim().split(/\\r?\\n/).reverse().find((line) => line.trim().startsWith('{')) ?? '{}'\n      try {\n        const parsed = JSON.parse(lastLine) as { processed?: unknown }\n        resolve(Number(parsed.processed ?? 0))\n      } catch {\n        resolve(0)\n      }\n    })\n  })\n}\n\nexport async function drainIntegrationQueue(queueName: string, options: DrainQueueOptions = {}): Promise<number> {\n  const resolved = {\n    appRoot: resolveAppRoot(options.appRoot),\n    jobLimit: options.jobLimit ?? DEFAULT_JOB_LIMIT,\n  }\n  if (process.env.OM_TEST_APP_ROOT?.trim()) {\n    return drainQueueInAppProcess(queueName, resolved)\n  }\n  return drainQueueInCurrentProcess(queueName, resolved)\n}\n"],
-  "mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,qBAAqB;AAC9B,OAAO,UAAU;AACjB,SAAS,6BAA6B;AAOtC,MAAM,oBAAoB;AAE1B,SAAS,eAAe,OAAwB;AAC9C,SAAO,KAAK,QAAQ,OAAO,KAAK,KAAK,QAAQ,IAAI,kBAAkB,KAAK,KAAK,KAAK,QAAQ,QAAQ,IAAI,GAAG,cAAc,CAAC;AAC1H;AAEA,eAAe,2BAA2B,WAAmB,SAAuD;AAClH,SAAO,sBAAsB,WAAW,OAAO;AACjD;AAEA,SAAS,qBAAqB,SAAyB;AACrD,QAAM,iBAAiB,cAAc,KAAK,KAAK,SAAS,cAAc,CAAC;AACvE,SAAO,eAAe,QAAQ,qDAAqD;AACrF;AAEA,SAAS,uBAAuB,WAAmB,SAAuD;AACxG,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,UAAM,QAAQ,MAAM,QAAQ,UAAU,CAAC,qBAAqB,QAAQ,OAAO,CAAC,GAAG;AAAA,MAC7E,KAAK,QAAQ;AAAA,MACb,KAAK;AAAA,QACH,GAAG,QAAQ;AAAA,QACX,yBAAyB,QAAQ;AAAA,QACjC,2BAA2B;AAAA,QAC3B,gCAAgC,OAAO,QAAQ,QAAQ;AAAA,QACvD,gBAAgB,QAAQ,IAAI,gBAAgB,KAAK,KAAK,KAAK,QAAQ,QAAQ,SAAS,gBAAgB;AAAA,MACtG;AAAA,MACA,OAAO,CAAC,UAAU,QAAQ,MAAM;AAAA,IAClC,CAAC;AAED,QAAI,SAAS;AACb,QAAI,SAAS;AACb,UAAM,OAAO,GAAG,QAAQ,CAAC,UAAU;AAAE,gBAAU,MAAM,SAAS;AAAA,IAAE,CAAC;AACjE,UAAM,OAAO,GAAG,QAAQ,CAAC,UAAU;AAAE,gBAAU,MAAM,SAAS;AAAA,IAAE,CAAC;AACjE,UAAM,GAAG,SAAS,MAAM;AACxB,UAAM,GAAG,SAAS,CAAC,SAAS;AAO1B,UAAI,QAAQ,IAAI,mBAAmB,KAAK;AACtC,gBAAQ,OAAO,MAAM,gBAAgB,SAAS,SAAS,IAAI;AAAA,EAAc,MAAM;AAAA;AAAA,EAAc,MAAM;AAAA,CAAI;AAAA,MACzG,WAAW,OAAO,KAAK,EAAE,SAAS,GAAG;AACnC,gBAAQ,OAAO,MAAM,gBAAgB,SAAS,SAAS,IAAI;AAAA,EAAc,MAAM;AAAA,CAAI;AAAA,MACrF;AACA,UAAI,SAAS,GAAG;AACd,eAAO,IAAI,MAAM,2BAA2B,SAAS,QAAQ,QAAQ,OAAO,UAAU,IAAI;AAAA,EAAO,UAAU,MAAM,EAAE,CAAC;AACpH;AAAA,MACF;AACA,YAAM,WAAW,OAAO,KAAK,EAAE,MAAM,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,KAAK,KAAK,EAAE,WAAW,GAAG,CAAC,KAAK;AACvG,UAAI;AACF,cAAM,SAAS,KAAK,MAAM,QAAQ;AAClC,gBAAQ,OAAO,OAAO,aAAa,CAAC,CAAC;AAAA,MACvC,QAAQ;AACN,gBAAQ,CAAC;AAAA,MACX;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AACH;AAEA,eAAsB,sBAAsB,WAAmB,UAA6B,CAAC,GAAoB;AAC/G,QAAM,WAAW;AAAA,IACf,SAAS,eAAe,QAAQ,OAAO;AAAA,IACvC,UAAU,QAAQ,YAAY;AAAA,EAChC;AACA,MAAI,QAAQ,IAAI,kBAAkB,KAAK,GAAG;AACxC,WAAO,uBAAuB,WAAW,QAAQ;AAAA,EACnD;AACA,SAAO,2BAA2B,WAAW,QAAQ;AACvD;",
+  "sourcesContent": ["import { spawn } from 'node:child_process'\nimport { createRequire } from 'node:module'\nimport path from 'node:path'\nimport { expect } from '@playwright/test'\nimport { createQueue, getQueuePendingProbe } from '@open-mercato/queue'\nimport { parseBooleanToken } from '@open-mercato/shared/lib/boolean'\n\ntype DrainQueueOptions = {\n  appRoot?: string\n  jobLimit?: number\n}\n\nconst DEFAULT_JOB_LIMIT = 100\n\nfunction resolveAppRoot(input?: string): string {\n  return path.resolve(input?.trim() || process.env.OM_TEST_APP_ROOT?.trim() || path.resolve(process.cwd(), 'apps/mercato'))\n}\n\nasync function drainQueueInCurrentProcess(queueName: string, options: Required<DrainQueueOptions>): Promise<number> {\n  const { drainQueueFromAppRoot } = await import('./queue-runner')\n  return drainQueueFromAppRoot(queueName, options)\n}\n\nfunction resolveAppRunnerPath(appRoot: string): string {\n  const requireFromApp = createRequire(path.join(appRoot, 'package.json'))\n  return requireFromApp.resolve('@open-mercato/core/helpers/integration/queue-runner')\n}\n\nfunction drainQueueInAppProcess(queueName: string, options: Required<DrainQueueOptions>): Promise<number> {\n  return new Promise((resolve, reject) => {\n    const child = spawn(process.execPath, [resolveAppRunnerPath(options.appRoot)], {\n      cwd: options.appRoot,\n      env: {\n        ...process.env,\n        OM_INTEGRATION_APP_ROOT: options.appRoot,\n        OM_INTEGRATION_QUEUE_NAME: queueName,\n        OM_INTEGRATION_QUEUE_JOB_LIMIT: String(options.jobLimit),\n        QUEUE_BASE_DIR: process.env.QUEUE_BASE_DIR?.trim() || path.resolve(options.appRoot, '.mercato/queue'),\n      },\n      stdio: ['ignore', 'pipe', 'pipe'],\n    })\n\n    let stdout = ''\n    let stderr = ''\n    child.stdout.on('data', (chunk) => { stdout += chunk.toString() })\n    child.stderr.on('data', (chunk) => { stderr += chunk.toString() })\n    child.on('error', reject)\n    child.on('close', (code) => {\n      // The child's diagnostics (pino job logs on stdout, cache-fallback\n      // console.warn on stderr) are otherwise discarded on exit 0, which makes\n      // silently-failing jobs and silent memory-cache fallbacks in the drain\n      // child undebuggable from CI logs. OM_DRAIN_DEBUG=1 forwards everything;\n      // a non-empty stderr is forwarded unconditionally because it only carries\n      // warning/error-class output.\n      if (process.env.OM_DRAIN_DEBUG === '1') {\n        process.stderr.write(`[drain-child ${queueName} exit=${code}] STDOUT:\\n${stdout}\\nSTDERR:\\n${stderr}\\n`)\n      } else if (stderr.trim().length > 0) {\n        process.stderr.write(`[drain-child ${queueName} exit=${code}] STDERR:\\n${stderr}\\n`)\n      }\n      if (code !== 0) {\n        reject(new Error(`Queue drain failed for \"${queueName}\" in ${options.appRoot} (exit ${code}).\\n${stderr || stdout}`))\n        return\n      }\n      const lastLine = stdout.trim().split(/\\r?\\n/).reverse().find((line) => line.trim().startsWith('{')) ?? '{}'\n      try {\n        const parsed = JSON.parse(lastLine) as { processed?: unknown }\n        resolve(Number(parsed.processed ?? 0))\n      } catch {\n        resolve(0)\n      }\n    })\n  })\n}\n\nasync function waitForManagedQueue(queueName: string, options: Required<DrainQueueOptions>): Promise<number> {\n  const baseDir = process.env.QUEUE_BASE_DIR?.trim() || path.resolve(options.appRoot, '.mercato/queue')\n  const queue = createQueue(queueName, 'local', { baseDir })\n  try {\n    const initial = await queue.getJobCounts()\n    await expect.poll(async () => {\n      const pending = await getQueuePendingProbe(queueName, 'local', { baseDir })\n      if (pending.error) throw new Error(`[internal] Cannot observe integration queue ${queueName}: ${pending.errorMessage}`)\n      return pending.ready + pending.active\n    }, { message: `Integration queue ${queueName} should finish processing` }).toBe(0)\n    const final = await queue.getJobCounts()\n    return final.completed + final.failed - initial.completed - initial.failed\n  } finally {\n    await queue.close()\n  }\n}\n\nexport async function drainIntegrationQueue(queueName: string, options: DrainQueueOptions = {}): Promise<number> {\n  const resolved = {\n    appRoot: resolveAppRoot(options.appRoot),\n    jobLimit: options.jobLimit ?? DEFAULT_JOB_LIMIT,\n  }\n  if (process.env.OM_TEST_APP_ROOT?.trim()) {\n    return drainQueueInAppProcess(queueName, resolved)\n  }\n  const managed = parseBooleanToken(process.env.AUTO_SPAWN_WORKERS)\n    ?? parseBooleanToken(process.env.OM_AUTO_SPAWN_WORKERS)\n    ?? true\n  if (managed) return waitForManagedQueue(queueName, resolved)\n  return drainQueueInCurrentProcess(queueName, resolved)\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/customers/ai-tools/activities-tasks-pack.js

@@ -3,9 +3,12 @@ import {
   createAiApiOperationRunner
 } from "@open-mercato/ai-assistant/modules/ai_assistant/lib/ai-api-operation-runner";
 import { findOneWithDecryption, findWithDecryption } from "@open-mercato/shared/lib/encryption/find";
+import { authorizeFeatures } from "@open-mercato/shared/security/featurePolicy";
 import { TERMINAL_INTERACTION_STATUS_LIST } from "../lib/interactionStatus.js";
+import { resolveCustomerInteractionFeatureFlags } from "../lib/interactionFeatureFlags.js";
+import { CUSTOMER_INTERACTION_ACTIVITY_ADAPTER_SOURCE } from "../lib/interactionCompatibility.js";
+import { listActivitiesForScope, loadActivityForScope } from "./activity-read-model.js";
 import {
-  CustomerActivity,
   CustomerComment,
   CustomerDeal,
   CustomerDealCompanyLink,
@@ -93,28 +96,49 @@ async function loadCommentForScope(em, ctx, tenantId, commentId) {
   if (ctx.organizationId && row.organizationId !== ctx.organizationId) return null;
   return row;
 }
-async function loadActivityForScope(em, ctx, tenantId, activityId) {
-  const where = { id: activityId, tenantId };
-  if (ctx.organizationId) where.organizationId = ctx.organizationId;
-  const row = await findOneWithDecryption(
-    em,
-    CustomerActivity,
-    where,
-    void 0,
-    buildScope(ctx, tenantId)
-  );
-  if (!row || row.tenantId !== tenantId) return null;
-  if (ctx.organizationId && row.organizationId !== ctx.organizationId) return null;
-  return row;
+async function runActivityOperation(ctx, request) {
+  const { tenantId } = assertTenantScope(ctx);
+  const flags = await resolveCustomerInteractionFeatureFlags(ctx.container, tenantId);
+  const executionContext = ctx;
+  if (flags.legacyAdapters) {
+    return createAiApiOperationRunner(executionContext).run(request);
+  }
+  const requiredFeatures = ["customers.interactions.manage"];
+  if (!authorizeFeatures(requiredFeatures, {
+    grantedFeatures: ctx.userFeatures,
+    unrestricted: ctx.isSuperAdmin
+  })) {
+    throw new Error("[internal] Canonical interaction management permission is required");
+  }
+  const { activityType, subject, ...body } = request.body ?? {};
+  const runner = createAiApiOperationRunner({
+    ...executionContext,
+    tool: { ...executionContext.tool, requiredFeatures }
+  });
+  return runner.run({
+    ...request,
+    path: "/customers/interactions",
+    body: {
+      ...body,
+      ...activityType !== void 0 ? { interactionType: activityType } : {},
+      ...subject !== void 0 ? { title: subject } : {},
+      ...request.method === "POST" ? {
+        source: CUSTOMER_INTERACTION_ACTIVITY_ADAPTER_SOURCE,
+        status: body.occurredAt ? "done" : "planned"
+      } : {},
+      ...request.method === "PUT" && body.occurredAt ? { status: "done" } : {}
+    }
+  });
 }
-function commentEntityIdOf(row) {
-  const ent = row.entity;
-  if (!ent) return null;
-  if (typeof ent === "string") return ent;
-  if (typeof ent === "object" && typeof ent.id === "string") return ent.id;
-  return null;
+function activitySnapshot(activity) {
+  return activity ? {
+    activityType: activity.activityType,
+    subject: activity.subject,
+    body: activity.body,
+    occurredAt: activity.occurredAt?.toISOString() ?? null
+  } : null;
 }
-function activityEntityIdOf(row) {
+function commentEntityIdOf(row) {
   const ent = row.entity;
   if (!ent) return null;
   if (typeof ent === "string") return ent;
@@ -142,33 +166,17 @@ const listActivitiesTool = {
     const em = resolveEm(ctx);
     const limit = input.limit ?? 50;
     const offset = input.offset ?? 0;
-    const where = { tenantId };
-    if (ctx.organizationId) where.organizationId = ctx.organizationId;
-    const entityId = input.personId ?? input.companyId ?? null;
-    if (entityId) where.entity = entityId;
-    if (input.dealId) where.deal = input.dealId;
-    if (input.activityType) where.activityType = input.activityType;
-    const [rows, total] = await Promise.all([
-      findWithDecryption(
-        em,
-        CustomerActivity,
-        where,
-        { limit, offset, orderBy: { occurredAt: "desc", createdAt: "desc" } },
-        buildScope(ctx, tenantId)
-      ),
-      em.count(CustomerActivity, where)
-    ]);
-    const filtered = rows.filter((row) => row.tenantId === tenantId);
+    const { items: rows, total } = await listActivitiesForScope(em, ctx, tenantId, { ...input, limit, offset });
     return {
-      items: filtered.map((row) => ({
+      items: rows.map((row) => ({
         id: row.id,
         activityType: row.activityType,
         subject: row.subject ?? null,
         body: row.body ?? null,
         occurredAt: row.occurredAt ? new Date(row.occurredAt).toISOString() : null,
         authorUserId: row.authorUserId ?? null,
-        entityId: activityEntityIdOf(row),
-        dealId: row.deal && typeof row.deal === "object" ? row.deal.id : row.deal ?? null,
+        entityId: row.entityId,
+        dealId: row.dealId,
         organizationId: row.organizationId ?? null,
         tenantId: row.tenantId ?? null,
         createdAt: row.createdAt ? new Date(row.createdAt).toISOString() : null
@@ -503,14 +511,14 @@ const manageDealActivityTool = {
     if (!existing) return null;
     return {
       recordId: existing.id,
-      entityType: "customers.customer_activity",
+      entityType: existing.entityType,
       recordVersion: recordVersionFromUpdatedAt(existing.updatedAt),
       before: {
         activityType: existing.activityType,
         subject: existing.subject ?? null,
         body: existing.body ?? null,
         occurredAt: existing.occurredAt ? new Date(existing.occurredAt).toISOString() : null,
-        dealId: existing.deal && typeof existing.deal === "object" ? existing.deal.id : existing.deal ?? null
+        dealId: existing.dealId
       }
     };
   },
@@ -518,7 +526,6 @@ const manageDealActivityTool = {
     const { tenantId } = assertTenantScope(ctx);
     const input = manageDealActivityInput.parse(rawInput);
     const em = resolveEm(ctx);
-    const runner = createAiApiOperationRunner(ctx);
     if (input.operation === "create") {
       const deal = await loadDealForScope(em, ctx, tenantId, input.dealId);
       if (!deal) throw new Error(`Deal "${input.dealId}" is not accessible to the caller.`);
@@ -538,23 +545,19 @@ const manageDealActivityTool = {
       if (input.subject) body2.subject = input.subject;
       if (input.body) body2.body = input.body;
       if (input.occurredAt) body2.occurredAt = input.occurredAt;
-      const response2 = await runner.run({ method: "POST", path: "/customers/activities", body: body2 });
+      const response2 = await runActivityOperation(ctx, { method: "POST", path: "/customers/activities", body: body2 });
       if (!response2.success) {
         throw new Error(response2.error ?? "Failed to create activity");
       }
       const result = response2.data ?? {};
+      const created = result.id ? await loadActivityForScope(em, ctx, tenantId, result.id) : null;
       return {
         operation: "create",
         activityId: result.id ?? null,
         dealId: deal.id,
         commandName: "customers.activities.create",
         before: null,
-        after: {
-          activityType: input.activityType ?? null,
-          subject: input.subject ?? null,
-          body: input.body ?? null,
-          occurredAt: input.occurredAt ?? null
-        }
+        after: activitySnapshot(created)
       };
     }
     if (input.operation === "update") {
@@ -567,7 +570,7 @@ const manageDealActivityTool = {
       if (input.subject !== void 0) body2.subject = input.subject;
       if (input.body !== void 0) body2.body = input.body;
       if (input.occurredAt !== void 0) body2.occurredAt = input.occurredAt;
-      const response2 = await runner.run({ method: "PUT", path: "/customers/activities", body: body2 });
+      const response2 = await runActivityOperation(ctx, { method: "PUT", path: "/customers/activities", body: body2 });
       if (!response2.success) {
         throw new Error(response2.error ?? `Failed to update activity "${existing2.id}"`);
       }
@@ -593,7 +596,7 @@ const manageDealActivityTool = {
     const existing = await loadActivityForScope(em, ctx, tenantId, input.activityId);
     if (!existing) throw new Error(`Activity "${input.activityId}" is not accessible to the caller.`);
     const body = { id: existing.id };
-    const response = await runner.run({ method: "DELETE", path: "/customers/activities", body });
+    const response = await runActivityOperation(ctx, { method: "DELETE", path: "/customers/activities", body });
     if (!response.success) {
       throw new Error(response.error ?? `Failed to delete activity "${existing.id}"`);
     }
@@ -897,15 +900,15 @@ const manageRecordActivityTool = {
     if (!existing) return null;
     return {
       recordId: existing.id,
-      entityType: "customers.customer_activity",
+      entityType: existing.entityType,
       recordVersion: recordVersionFromUpdatedAt(existing.updatedAt),
       before: {
         activityType: existing.activityType,
         subject: existing.subject ?? null,
         body: existing.body ?? null,
         occurredAt: existing.occurredAt ? new Date(existing.occurredAt).toISOString() : null,
-        entityId: activityEntityIdOf(existing),
-        dealId: existing.deal && typeof existing.deal === "object" ? existing.deal.id : existing.deal ?? null
+        entityId: existing.entityId,
+        dealId: existing.dealId
       }
     };
   },
@@ -913,7 +916,6 @@ const manageRecordActivityTool = {
     const { tenantId } = assertTenantScope(ctx);
     const input = manageRecordActivityInput.parse(rawInput);
     const em = resolveEm(ctx);
-    const runner = createAiApiOperationRunner(ctx);
     if (input.operation === "create") {
       const entityId = input.personId ?? input.companyId;
       let organizationId = ctx.organizationId;
@@ -937,11 +939,12 @@ const manageRecordActivityTool = {
       if (input.subject) body2.subject = input.subject;
       if (input.body) body2.body = input.body;
       if (input.occurredAt) body2.occurredAt = input.occurredAt;
-      const response2 = await runner.run({ method: "POST", path: "/customers/activities", body: body2 });
+      const response2 = await runActivityOperation(ctx, { method: "POST", path: "/customers/activities", body: body2 });
       if (!response2.success) {
         throw new Error(response2.error ?? "Failed to create activity");
       }
       const result = response2.data ?? {};
+      const created = result.id ? await loadActivityForScope(em, ctx, tenantId, result.id) : null;
       return {
         operation: "create",
         activityId: result.id ?? null,
@@ -949,12 +952,7 @@ const manageRecordActivityTool = {
         dealId,
         commandName: "customers.activities.create",
         before: null,
-        after: {
-          activityType: input.activityType ?? null,
-          subject: input.subject ?? null,
-          body: input.body ?? null,
-          occurredAt: input.occurredAt ?? null
-        }
+        after: activitySnapshot(created)
       };
     }
     if (input.operation === "update") {
@@ -967,7 +965,7 @@ const manageRecordActivityTool = {
       if (input.subject !== void 0) body2.subject = input.subject;
       if (input.body !== void 0) body2.body = input.body;
       if (input.occurredAt !== void 0) body2.occurredAt = input.occurredAt;
-      const response2 = await runner.run({ method: "PUT", path: "/customers/activities", body: body2 });
+      const response2 = await runActivityOperation(ctx, { method: "PUT", path: "/customers/activities", body: body2 });
       if (!response2.success) {
         throw new Error(response2.error ?? `Failed to update activity "${existing2.id}"`);
       }
@@ -993,7 +991,7 @@ const manageRecordActivityTool = {
     const existing = await loadActivityForScope(em, ctx, tenantId, input.activityId);
     if (!existing) throw new Error(`Activity "${input.activityId}" is not accessible to the caller.`);
     const body = { id: existing.id };
-    const response = await runner.run({ method: "DELETE", path: "/customers/activities", body });
+    const response = await runActivityOperation(ctx, { method: "DELETE", path: "/customers/activities", body });
     if (!response.success) {
       throw new Error(response.error ?? `Failed to delete activity "${existing.id}"`);
     }