@open-mercato/core 0.6.6-develop.6314.1.c7b8291aa2 → 0.6.6-develop.6330.1.a261878aa8

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

@@ -19,6 +19,12 @@ import {
   type AiToolExecutionContext,
 } from '@open-mercato/ai-assistant/modules/ai_assistant/lib/ai-api-operation-runner'
 import { assertTenantScope, type CustomersAiToolDefinition, type CustomersToolContext } from './types'
+import {
+  buildRelatedRecords,
+  toCustomerListSummary,
+  toIso,
+  type CustomerRelatedRecords,
+} from './_shared'
 
 const listCompaniesInput = z
   .object({
@@ -108,27 +114,13 @@ const listCompaniesTool = defineApiBackedAiTool<
     const data = (response.data ?? {}) as ListCompaniesApiResponse
     const rawItems: ListCompaniesApiItem[] = Array.isArray(data.items) ? data.items : []
     return {
-      items: rawItems.map((row) => {
-        const createdAtRaw = row.created_at ?? row.createdAt ?? null
-        const createdAt = createdAtRaw ? new Date(String(createdAtRaw)).toISOString() : null
-        return {
-          id: row.id,
-          displayName: row.display_name ?? row.displayName ?? null,
-          primaryEmail: row.primary_email ?? row.primaryEmail ?? null,
-          primaryPhone: row.primary_phone ?? row.primaryPhone ?? null,
-          status: row.status ?? null,
-          lifecycleStage: row.lifecycle_stage ?? row.lifecycleStage ?? null,
-          source: row.source ?? null,
-          ownerUserId: row.owner_user_id ?? row.ownerUserId ?? null,
-          organizationId: row.organization_id ?? row.organizationId ?? null,
-          tenantId: row.tenant_id ?? row.tenantId ?? null,
-          domain: row.domain ?? null,
-          websiteUrl: row.website_url ?? row.websiteUrl ?? null,
-          industry: row.industry ?? null,
-          sizeBucket: row.size_bucket ?? row.sizeBucket ?? null,
-          createdAt,
-        }
-      }),
+      items: rawItems.map((row) => ({
+        ...toCustomerListSummary(row),
+        domain: row.domain ?? null,
+        websiteUrl: row.website_url ?? row.websiteUrl ?? null,
+        industry: row.industry ?? null,
+        sizeBucket: row.size_bucket ?? row.sizeBucket ?? null,
+      })),
       total: typeof data.total === 'number' ? data.total : 0,
       limit,
       offset,
@@ -146,13 +138,6 @@ const getCompanyInput = z.object({
 
 type GetCompanyInput = z.infer<typeof getCompanyInput>
 
-function toIsoCompany(value: unknown): string | null {
-  if (!value) return null
-  const dt = value instanceof Date ? value : new Date(String(value))
-  if (Number.isNaN(dt.getTime())) return null
-  return dt.toISOString()
-}
-
 const getCompanyTool: CustomersAiToolDefinition = {
   name: 'customers.get_company',
   displayName: 'Get company',
@@ -193,134 +178,9 @@ const getCompanyTool: CustomersAiToolDefinition = {
     const profileRow = (data.profile ?? null) as Record<string, unknown> | null
     const customFields = (data.customFields ?? {}) as Record<string, unknown>
 
-    let related: Record<string, unknown> | null = null
+    let related: CustomerRelatedRecords | null = null
     if (includeRelated) {
-      const addresses = Array.isArray(data.addresses) ? (data.addresses as Array<Record<string, unknown>>) : []
-      const activities = Array.isArray(data.activities) ? (data.activities as Array<Record<string, unknown>>) : []
-      const notes = Array.isArray(data.comments) ? (data.comments as Array<Record<string, unknown>>) : []
-      const todos = Array.isArray(data.todos) ? (data.todos as Array<Record<string, unknown>>) : []
-      const interactions = Array.isArray(data.interactions) ? (data.interactions as Array<Record<string, unknown>>) : []
-      const tagsRows = Array.isArray(data.tags) ? (data.tags as Array<Record<string, unknown>>) : []
-      const dealsRows = Array.isArray(data.deals) ? (data.deals as Array<Record<string, unknown>>) : []
-      const peopleRows = Array.isArray(data.people) ? (data.people as Array<Record<string, unknown>>) : []
-      related = {
-        addresses: addresses.map((address) => ({
-          id: address.id,
-          name: address.name ?? null,
-          purpose: address.purpose ?? null,
-          addressLine1: address.addressLine1 ?? null,
-          addressLine2: address.addressLine2 ?? null,
-          city: address.city ?? null,
-          region: address.region ?? null,
-          postalCode: address.postalCode ?? null,
-          country: address.country ?? null,
-          isPrimary: !!address.isPrimary,
-        })),
-        activities: activities.map((activity) => ({
-          id: activity.id,
-          activityType: activity.activityType,
-          subject: activity.subject ?? null,
-          body: activity.body ?? null,
-          occurredAt: toIsoCompany(activity.occurredAt),
-          createdAt: toIsoCompany(activity.createdAt),
-        })),
-        notes: notes.map((comment) => ({
-          id: comment.id,
-          body: comment.body,
-          authorUserId: comment.authorUserId ?? null,
-          createdAt: toIsoCompany(comment.createdAt),
-        })),
-        tasks: todos.map((task) => ({
-          id: task.id,
-          todoId: task.todoId ?? task.id,
-          todoSource: task.todoSource ?? null,
-          createdAt: toIsoCompany(task.createdAt),
-        })),
-        interactions: interactions.map((interaction) => ({
-          id: interaction.id,
-          interactionType: interaction.interactionType,
-          title: interaction.title ?? null,
-          status: interaction.status,
-          scheduledAt: toIsoCompany(interaction.scheduledAt),
-          occurredAt: toIsoCompany(interaction.occurredAt),
-        })),
-        tags: tagsRows
-          .map((tag) => {
-            if (!tag || typeof tag !== 'object') return null
-            const id = typeof tag.id === 'string' ? tag.id : null
-            const label = typeof tag.label === 'string' ? tag.label : null
-            if (!id || !label) return null
-            const slug = typeof tag.slug === 'string' ? tag.slug : label
-            const color = typeof tag.color === 'string' ? tag.color : null
-            return { id, slug, label, color }
-          })
-          .filter(
-            (entry): entry is { id: string; slug: string; label: string; color: string | null } =>
-              entry !== null,
-          ),
-        deals: dealsRows
-          .map((deal) => {
-            if (!deal || typeof deal !== 'object') return null
-            const id = typeof deal.id === 'string' ? deal.id : null
-            if (!id) return null
-            return {
-              id,
-              title: typeof deal.title === 'string' ? deal.title : '',
-              status: typeof deal.status === 'string' ? deal.status : null,
-              pipelineStageId:
-                typeof deal.pipelineStageId === 'string' ? deal.pipelineStageId : null,
-              valueAmount:
-                typeof deal.valueAmount === 'string'
-                  ? deal.valueAmount
-                  : deal.valueAmount === null || deal.valueAmount === undefined
-                    ? null
-                    : String(deal.valueAmount),
-              valueCurrency:
-                typeof deal.valueCurrency === 'string' ? deal.valueCurrency : null,
-            }
-          })
-          .filter(
-            (
-              value,
-            ): value is {
-              id: string
-              title: string
-              status: string | null
-              pipelineStageId: string | null
-              valueAmount: string | null
-              valueCurrency: string | null
-            } => value !== null,
-          ),
-        people: peopleRows
-          .map((person) => {
-            if (!person || typeof person !== 'object') return null
-            const id = typeof person.id === 'string' ? person.id : null
-            const displayName = typeof person.displayName === 'string' ? person.displayName : null
-            if (!id || !displayName) return null
-            return {
-              id,
-              displayName,
-              primaryEmail:
-                typeof person.primaryEmail === 'string' ? person.primaryEmail : null,
-              primaryPhone:
-                typeof person.primaryPhone === 'string' ? person.primaryPhone : null,
-              jobTitle: typeof person.jobTitle === 'string' ? person.jobTitle : null,
-              department: typeof person.department === 'string' ? person.department : null,
-            }
-          })
-          .filter(
-            (
-              value,
-            ): value is {
-              id: string
-              displayName: string
-              primaryEmail: string | null
-              primaryPhone: string | null
-              jobTitle: string | null
-              department: string | null
-            } => value !== null,
-          ),
-      }
+      related = buildRelatedRecords(data, { includePeople: true })
     }
     return {
       found: true as const,
@@ -336,8 +196,8 @@ const getCompanyTool: CustomersAiToolDefinition = {
         ownerUserId: companyRow.ownerUserId ?? null,
         organizationId: companyRow.organizationId ?? null,
         tenantId: companyRow.tenantId ?? null,
-        createdAt: toIsoCompany(companyRow.createdAt),
-        updatedAt: toIsoCompany(companyRow.updatedAt),
+        createdAt: toIso(companyRow.createdAt),
+        updatedAt: toIso(companyRow.updatedAt),
       },
       profile: profileRow
         ? {

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

@@ -17,7 +17,6 @@
  * documented aggregate detail route). Tool name, schema, requiredFeatures,
  * and output shape are unchanged.
  */
-import type { EntityManager } from '@mikro-orm/postgresql'
 import { z } from 'zod'
 import { defineApiBackedAiTool } from '@open-mercato/ai-assistant/modules/ai_assistant/lib/api-backed-tool'
 import {
@@ -30,20 +29,17 @@ import {
   CustomerPersonProfile,
 } from '../data/entities'
 import { assertTenantScope, type CustomersAiToolDefinition, type CustomersToolContext } from './types'
+import {
+  buildRelatedRecords,
+  buildScope,
+  resolveEm,
+  toCustomerListSummary,
+  toIso,
+  type CustomerRelatedRecords,
+} from './_shared'
 
 const NIL_UUID = '00000000-0000-0000-0000-000000000000'
 
-function resolveEm(ctx: CustomersToolContext | AiToolExecutionContext): EntityManager {
-  return ctx.container.resolve<EntityManager>('em')
-}
-
-function buildScope(ctx: CustomersToolContext | AiToolExecutionContext, tenantId: string) {
-  return {
-    tenantId,
-    organizationId: ctx.organizationId,
-  }
-}
-
 const listPeopleInput = z
   .object({
     q: z.string().trim().optional().describe('Optional search text matched against display name / email / phone. Omit or leave empty to list all.'),
@@ -146,23 +142,7 @@ const listPeopleTool = defineApiBackedAiTool<ListPeopleInput, ListPeopleApiRespo
     const data = (response.data ?? {}) as ListPeopleApiResponse
     const rawItems: ListPeopleApiItem[] = Array.isArray(data.items) ? data.items : []
     return {
-      items: rawItems.map((row) => {
-        const createdAtRaw = row.created_at ?? row.createdAt ?? null
-        const createdAt = createdAtRaw ? new Date(String(createdAtRaw)).toISOString() : null
-        return {
-          id: row.id,
-          displayName: row.display_name ?? row.displayName ?? null,
-          primaryEmail: row.primary_email ?? row.primaryEmail ?? null,
-          primaryPhone: row.primary_phone ?? row.primaryPhone ?? null,
-          status: row.status ?? null,
-          lifecycleStage: row.lifecycle_stage ?? row.lifecycleStage ?? null,
-          source: row.source ?? null,
-          ownerUserId: row.owner_user_id ?? row.ownerUserId ?? null,
-          organizationId: row.organization_id ?? row.organizationId ?? null,
-          tenantId: row.tenant_id ?? row.tenantId ?? null,
-          createdAt,
-        }
-      }),
+      items: rawItems.map((row) => toCustomerListSummary(row)),
       total: typeof data.total === 'number' ? data.total : 0,
       limit,
       offset,
@@ -182,13 +162,6 @@ type GetPersonInput = z.infer<typeof getPersonInput>
 
 type ApiPersonDetailRow = Record<string, unknown> | null | undefined
 
-function toIso(value: unknown): string | null {
-  if (!value) return null
-  const dt = value instanceof Date ? value : new Date(String(value))
-  if (Number.isNaN(dt.getTime())) return null
-  return dt.toISOString()
-}
-
 const getPersonTool: CustomersAiToolDefinition = {
   name: 'customers.get_person',
   displayName: 'Get person',
@@ -226,104 +199,9 @@ const getPersonTool: CustomersAiToolDefinition = {
     const profileRow = (data.profile ?? null) as ApiPersonDetailRow
     const customFields = (data.customFields ?? {}) as Record<string, unknown>
 
-    let related: Record<string, unknown> | null = null
+    let related: CustomerRelatedRecords | null = null
     if (includeRelated) {
-      const addresses = Array.isArray(data.addresses) ? (data.addresses as Array<Record<string, unknown>>) : []
-      const activities = Array.isArray(data.activities) ? (data.activities as Array<Record<string, unknown>>) : []
-      const notes = Array.isArray(data.comments) ? (data.comments as Array<Record<string, unknown>>) : []
-      const todos = Array.isArray(data.todos) ? (data.todos as Array<Record<string, unknown>>) : []
-      const interactions = Array.isArray(data.interactions) ? (data.interactions as Array<Record<string, unknown>>) : []
-      const tagsRows = Array.isArray(data.tags) ? (data.tags as Array<Record<string, unknown>>) : []
-      const dealsRows = Array.isArray(data.deals) ? (data.deals as Array<Record<string, unknown>>) : []
-      related = {
-        addresses: addresses.map((address) => ({
-          id: address.id,
-          name: address.name ?? null,
-          purpose: address.purpose ?? null,
-          addressLine1: address.addressLine1 ?? null,
-          addressLine2: address.addressLine2 ?? null,
-          city: address.city ?? null,
-          region: address.region ?? null,
-          postalCode: address.postalCode ?? null,
-          country: address.country ?? null,
-          isPrimary: !!address.isPrimary,
-        })),
-        activities: activities.map((activity) => ({
-          id: activity.id,
-          activityType: activity.activityType,
-          subject: activity.subject ?? null,
-          body: activity.body ?? null,
-          occurredAt: toIso(activity.occurredAt),
-          createdAt: toIso(activity.createdAt),
-        })),
-        notes: notes.map((comment) => ({
-          id: comment.id,
-          body: comment.body,
-          authorUserId: comment.authorUserId ?? null,
-          createdAt: toIso(comment.createdAt),
-        })),
-        tasks: todos.map((task) => ({
-          id: task.id,
-          todoId: task.todoId ?? task.id,
-          todoSource: task.todoSource ?? null,
-          createdAt: toIso(task.createdAt),
-        })),
-        interactions: interactions.map((interaction) => ({
-          id: interaction.id,
-          interactionType: interaction.interactionType,
-          title: interaction.title ?? null,
-          status: interaction.status,
-          scheduledAt: toIso(interaction.scheduledAt),
-          occurredAt: toIso(interaction.occurredAt),
-        })),
-        tags: tagsRows
-          .map((tag) => {
-            if (!tag || typeof tag !== 'object') return null
-            const id = typeof tag.id === 'string' ? tag.id : null
-            const label = typeof tag.label === 'string' ? tag.label : null
-            if (!id || !label) return null
-            const slug = typeof tag.slug === 'string' ? tag.slug : label
-            const color = typeof tag.color === 'string' ? tag.color : null
-            return { id, slug, label, color }
-          })
-          .filter(
-            (entry): entry is { id: string; slug: string; label: string; color: string | null } =>
-              entry !== null,
-          ),
-        deals: dealsRows
-          .map((deal) => {
-            if (!deal || typeof deal !== 'object') return null
-            const id = typeof deal.id === 'string' ? deal.id : null
-            if (!id) return null
-            return {
-              id,
-              title: typeof deal.title === 'string' ? deal.title : '',
-              status: typeof deal.status === 'string' ? deal.status : null,
-              pipelineStageId:
-                typeof deal.pipelineStageId === 'string' ? deal.pipelineStageId : null,
-              valueAmount:
-                typeof deal.valueAmount === 'string'
-                  ? deal.valueAmount
-                  : deal.valueAmount === null || deal.valueAmount === undefined
-                    ? null
-                    : String(deal.valueAmount),
-              valueCurrency:
-                typeof deal.valueCurrency === 'string' ? deal.valueCurrency : null,
-            }
-          })
-          .filter(
-            (
-              value,
-            ): value is {
-              id: string
-              title: string
-              status: string | null
-              pipelineStageId: string | null
-              valueAmount: string | null
-              valueCurrency: string | null
-            } => value !== null,
-          ),
-      }
+      related = buildRelatedRecords(data)
     }
 
     return {

package/src/modules/customers/components/calendar/CalendarScreen.tsx

@@ -499,6 +499,7 @@ export function CalendarScreen() {
         showWeekends={preferences.showWeekends}
         showConflicts={preferences.conflictWarnings}
         aiSummaries={preferences.aiSummaries}
+        canManage={canManage}
         highlightItemId={highlightItemId}
         onItemClick={openEditEditor}
         onJoin={handleJoin}

package/src/modules/customers/components/calendar/EventPeekPopover.tsx

@@ -5,6 +5,7 @@ import { Sparkles } from 'lucide-react'
 import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Popover, PopoverContent, PopoverTrigger } from '@open-mercato/ui/primitives/popover'
+import { SimpleTooltip } from '@open-mercato/ui/primitives/tooltip'
 import { formatTimeRange } from './EventBlock'
 import type { CalendarItem, CalendarPlatform } from './types'
 
@@ -20,6 +21,7 @@ export type EventPeekPopoverProps = {
   open: boolean
   joinUrl: string | null
   aiSummaries: boolean
+  canManage?: boolean
   onOpenChange(open: boolean): void
   onJoin(item: CalendarItem): void
   onEdit(item: CalendarItem): void
@@ -31,6 +33,7 @@ export function EventPeekPopover({
   open,
   joinUrl,
   aiSummaries,
+  canManage = true,
   onOpenChange,
   onJoin,
   onEdit,
@@ -81,17 +84,32 @@ export function EventPeekPopover({
                 {t('customers.calendar.peek.join', 'Join')}
               </Button>
             ) : null}
-            <Button
-              type="button"
-              size="sm"
-              variant="secondary"
-              onClick={() => {
-                onOpenChange(false)
-                onEdit(item)
-              }}
-            >
-              {t('customers.calendar.peek.edit', 'Edit')}
-            </Button>
+            {canManage ? (
+              <Button
+                type="button"
+                size="sm"
+                variant="secondary"
+                onClick={() => {
+                  onOpenChange(false)
+                  onEdit(item)
+                }}
+              >
+                {t('customers.calendar.peek.edit', 'Edit')}
+              </Button>
+            ) : (
+              <SimpleTooltip
+                content={t(
+                  'customers.calendar.peek.editForbidden',
+                  "You don't have permission to edit events",
+                )}
+              >
+                <span className="inline-flex">
+                  <Button type="button" size="sm" variant="secondary" disabled className="pointer-events-none">
+                    {t('customers.calendar.peek.edit', 'Edit')}
+                  </Button>
+                </span>
+              </SimpleTooltip>
+            )}
           </div>
         </div>
       </PopoverContent>

package/src/modules/customers/components/calendar/TimeGrid.tsx

@@ -160,6 +160,7 @@ export function TimeGrid({
   showWeekends,
   showConflicts,
   aiSummaries,
+  canManage = true,
   highlightItemId,
   onItemClick,
   onJoin,
@@ -351,6 +352,7 @@ export function TimeGrid({
                       open={selectedId === item.id}
                       joinUrl={resolveJoinUrl(item.location)}
                       aiSummaries={aiSummaries}
+                      canManage={canManage}
                       onOpenChange={(open) => setSelectedId(open ? item.id : null)}
                       onJoin={onJoin}
                       onEdit={onItemClick}
@@ -462,6 +464,7 @@ export function TimeGrid({
                       open={selectedId === block.item.id}
                       joinUrl={resolveJoinUrl(block.item.location)}
                       aiSummaries={aiSummaries}
+                      canManage={canManage}
                       onOpenChange={(open) => setSelectedId(open ? block.item.id : null)}
                       onJoin={onJoin}
                       onEdit={onItemClick}

package/src/modules/customers/components/calendar/types.ts

@@ -87,6 +87,7 @@ export interface TimeGridProps {
   showWeekends: boolean
   showConflicts: boolean
   aiSummaries: boolean
+  canManage?: boolean
   highlightItemId?: string | null
   onItemClick(item: CalendarItem): void
   onJoin(item: CalendarItem): void