@open-mercato/core 0.4.8-develop-15259be22b → 0.4.8-develop-280c02b529

package/src/modules/inbox_ops/message-objects.ts

@@ -0,0 +1,34 @@
+import type { MessageObjectTypeDefinition } from '@open-mercato/shared/modules/messages/types'
+import { InboxEmailPreview } from './components/messages/InboxEmailPreview'
+
+export const messageObjectTypes: MessageObjectTypeDefinition[] = [
+  {
+    module: 'inbox_ops',
+    entityType: 'inbox_email',
+    messageTypes: ['inbox_ops.email', 'inbox_ops.reply'],
+    labelKey: 'inbox_ops.title',
+    icon: 'mail-open',
+    PreviewComponent: InboxEmailPreview,
+    actions: [
+      {
+        id: 'view',
+        labelKey: 'inbox_ops.view_in_messages',
+        variant: 'outline',
+        href: '/backend/inbox-ops',
+      },
+    ],
+    loadPreview: async (entityId, ctx) => {
+      try {
+        if (typeof window !== 'undefined') {
+          return { title: 'Inbox Email', subtitle: entityId }
+        }
+        const { loadInboxEmailPreview } = await import('./lib/messageObjectPreviews')
+        return loadInboxEmailPreview(entityId, ctx)
+      } catch {
+        return { title: 'Inbox Email', subtitle: entityId }
+      }
+    },
+  },
+]
+
+export default messageObjectTypes

package/src/modules/inbox_ops/message-types.ts

@@ -0,0 +1,36 @@
+import type { MessageTypeDefinition } from '@open-mercato/shared/modules/messages/types'
+import { InboxEmailContent } from './components/messages/InboxEmailContent'
+
+export const messageTypes: MessageTypeDefinition[] = [
+  {
+    type: 'inbox_ops.email',
+    module: 'inbox_ops',
+    labelKey: 'inbox_ops.title',
+    icon: 'mail-open',
+    color: 'blue',
+    ui: {
+      listItemComponent: 'messages.default.listItem',
+      contentComponent: 'inbox_ops.email.content',
+      actionsComponent: 'messages.default.actions',
+    },
+    ContentComponent: InboxEmailContent,
+    allowReply: false,
+    allowForward: true,
+  },
+  {
+    type: 'inbox_ops.reply',
+    module: 'inbox_ops',
+    labelKey: 'inbox_ops.action_type.draft_reply',
+    icon: 'reply',
+    color: 'green',
+    ui: {
+      listItemComponent: 'messages.default.listItem',
+      contentComponent: 'messages.default.content',
+      actionsComponent: 'messages.default.actions',
+    },
+    allowReply: true,
+    allowForward: true,
+  },
+]
+
+export default messageTypes

package/src/modules/inbox_ops/migrations/Migration20260303173020.ts

@@ -0,0 +1,13 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260303173020 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`create index "inbox_discrepancies_organization_id_tenant_id_index" on "inbox_discrepancies" ("organization_id", "tenant_id");`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop index "inbox_discrepancies_organization_id_tenant_id_index";`);
+  }
+
+}

package/src/modules/inbox_ops/migrations/Migration20260303173215.ts

@@ -0,0 +1,15 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260303173215 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "inbox_proposals" add column "category" text null;`);
+    this.addSql(`create index "inbox_proposals_organization_id_tenant_id_category_index" on "inbox_proposals" ("organization_id", "tenant_id", "category");`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop index "inbox_proposals_organization_id_tenant_id_category_index";`);
+    this.addSql(`alter table "inbox_proposals" drop column "category";`);
+  }
+
+}

package/src/modules/inbox_ops/search.ts

@@ -22,7 +22,7 @@ export const searchConfig: SearchModuleConfig = {
       enabled: true,
       priority: 6,
       fieldPolicy: {
-        searchable: ['summary'],
+        searchable: ['summary', 'category'],
         excluded: ['metadata', 'participants'],
       },
       buildSource: async (ctx: SearchBuildContext): Promise<SearchIndexSource | null> => {
@@ -35,17 +35,19 @@ export const searchConfig: SearchModuleConfig = {
           fields: {
             status: record.status,
             confidence: record.confidence,
+            category: record.category,
             detected_language: record.detected_language,
           },
           presenter: {
             title: String(record.summary || 'Inbox Proposal').slice(0, 80),
-            subtitle: `Confidence: ${record.confidence} - Status: ${record.status}`,
+            subtitle: `Confidence: ${record.confidence} - Status: ${record.status}${record.category ? ` - Category: ${record.category}` : ''}`,
             icon: 'inbox',
           },
           checksumSource: {
             summary: record.summary,
             status: record.status,
             confidence: record.confidence,
+            category: record.category,
             detectedLanguage: record.detected_language,
           },
         }
@@ -53,7 +55,7 @@ export const searchConfig: SearchModuleConfig = {
       formatResult: async (ctx: SearchBuildContext): Promise<SearchResultPresenter | null> => {
         return {
           title: String(ctx.record.summary || 'Inbox Proposal').slice(0, 80),
-          subtitle: `Confidence: ${ctx.record.confidence} - Status: ${ctx.record.status}`,
+          subtitle: `Confidence: ${ctx.record.confidence} - Status: ${ctx.record.status}${ctx.record.category ? ` - Category: ${ctx.record.category}` : ''}`,
           icon: 'inbox',
         }
       },

package/src/modules/inbox_ops/subscribers/extractionWorker.ts

@@ -15,7 +15,12 @@ import { extractParticipantsFromThread } from '../lib/emailParser'
 import { runExtractionWithConfiguredProvider } from '../lib/llmProvider'
 import { safeParsePayloadJson } from '../lib/validation'
 import { htmlToPlainText } from '../lib/htmlToPlainText'
+import { runWithCacheTenant } from '@open-mercato/cache'
 import { emitInboxOpsEvent } from '../events'
+import { createMessageRecordForEmail } from '../lib/messagesIntegration'
+import { resolveCache, invalidateCountsCache } from '../lib/cache'
+
+const SYSTEM_USER_ID = '00000000-0000-0000-0000-000000000000'
 
 export const metadata = {
   event: 'inbox_ops.email.received',
@@ -348,6 +353,7 @@ export default async function handle(payload: EmailReceivedPayload, ctx: Resolve
       id: proposalId,
       inboxEmailId: email.id,
       summary: extractionResult.summary,
+      category: extractionResult.category || null,
       participants: enrichedParticipants,
       confidence: String(extractionResult.confidence.toFixed(2)),
       detectedLanguage: extractionResult.detectedLanguage || email.detectedLanguage,
@@ -366,6 +372,7 @@ export default async function handle(payload: EmailReceivedPayload, ctx: Resolve
       contactMatches,
       extractionResult.proposedActions,
       email.toAddress,
+      email.forwardedByAddress,
     )
 
     // Step 6d-2: Also generate create_contact for LLM-discovered unmatched participants
@@ -385,8 +392,15 @@ export default async function handle(payload: EmailReceivedPayload, ctx: Resolve
       email.toAddress,
     )
 
+    // Step 6f: Deduplicate — remove company create_contact actions when a person
+    // action with the same companyName already exists (person creation auto-creates
+    // the company, so the separate company action would be redundant).
+    const dedupedProposedActions = deduplicateCompanyActions([
+      ...autoContactActions, ...autoLinkActions, ...autoProductActions, ...extractionResult.proposedActions,
+    ])
+
     // Create actions — contact & product creation actions go first so they're executed before orders
-    const combinedProposedActions = [...autoContactActions, ...autoLinkActions, ...autoProductActions, ...extractionResult.proposedActions]
+    const combinedProposedActions = dedupedProposedActions
     const allActions = [
       ...combinedProposedActions.map((action, index) => {
         const parsedPayload = safeParsePayloadJson(action.payloadJson)
@@ -518,6 +532,39 @@ export default async function handle(payload: EmailReceivedPayload, ctx: Resolve
 
     await em.flush()
 
+    // Step 8b: Invalidate counts cache (new proposal affects counts)
+    try {
+      const cache = resolveCache(ctx)
+      await runWithCacheTenant(email.tenantId, () => invalidateCountsCache(cache, email.tenantId))
+    } catch (cacheErr) {
+      console.warn('[inbox_ops:extraction-worker] Cache invalidation failed (non-fatal):', cacheErr)
+    }
+
+    // Step 8c: Register email as a message record (graceful degradation)
+    try {
+      await createMessageRecordForEmail(
+        {
+          id: email.id,
+          subject: email.subject,
+          cleanedText: email.cleanedText,
+          rawText: email.rawText,
+          forwardedByAddress: email.forwardedByAddress,
+          forwardedByName: email.forwardedByName,
+          status: email.status,
+        },
+        {
+          container: ctx,
+          scope: {
+            tenantId: email.tenantId,
+            organizationId: email.organizationId,
+            userId: SYSTEM_USER_ID,
+          },
+        },
+      )
+    } catch (msgErr) {
+      console.error('[inbox_ops:extraction-worker] Messages integration failed (non-fatal):', msgErr)
+    }
+
     // Step 9: Emit events
     try {
       await emitInboxOpsEvent('inbox_ops.email.processed', {
@@ -580,6 +627,7 @@ function buildContactActionsForUnmatchedParticipants(
   contactMatches: { participant: { name: string; email: string }; match?: { contactId: string } | null }[],
   existingActions: { actionType: string; payloadJson: string }[],
   inboxAddress: string,
+  forwardedByAddress?: string,
 ): { actionType: 'create_contact'; description: string; confidence: number; requiredFeature: string; payloadJson: string }[] {
   const alreadyProposed = new Set(
     existingActions
@@ -592,14 +640,17 @@ function buildContactActionsForUnmatchedParticipants(
   )
 
   const inboxLower = (inboxAddress || '').toLowerCase()
+  const forwardedByLower = (forwardedByAddress || '').toLowerCase()
   const systemPatterns = ['noreply', 'no-reply', 'donotreply', 'mailer-daemon', 'postmaster']
 
   return contactMatches
     .filter((m) => {
       if (m.match?.contactId) return false
       const emailLower = m.participant.email.toLowerCase()
+      if (!emailLower || !emailLower.includes('@')) return false
       if (alreadyProposed.has(emailLower)) return false
       if (emailLower === inboxLower) return false
+      if (forwardedByLower && emailLower === forwardedByLower) return false
       return !systemPatterns.some((p) => emailLower.includes(p))
     })
     .map((m) => ({
@@ -844,6 +895,29 @@ function buildFullTextForExtraction(email: InboxEmail): string {
     .trim()
 }
 
+function deduplicateCompanyActions<T extends { actionType: string; payloadJson: string }>(
+  actions: T[],
+): T[] {
+  // Collect company names that will be auto-created by person actions via companyName field
+  const personCompanyNames = new Set<string>()
+  for (const action of actions) {
+    if (action.actionType !== 'create_contact') continue
+    const payload = safeParsePayloadJson(action.payloadJson)
+    if (payload.type === 'person' && typeof payload.companyName === 'string' && payload.companyName.trim()) {
+      personCompanyNames.add(payload.companyName.trim().toLowerCase())
+    }
+  }
+  if (personCompanyNames.size === 0) return actions
+
+  return actions.filter((action) => {
+    if (action.actionType !== 'create_contact') return true
+    const payload = safeParsePayloadJson(action.payloadJson)
+    if (payload.type !== 'company') return true
+    const companyName = typeof payload.name === 'string' ? payload.name.trim().toLowerCase() : ''
+    return !companyName || !personCompanyNames.has(companyName)
+  })
+}
+
 function findPartialNameMatch(name: string, map: Map<string, string>): string | undefined {
   const lower = name.toLowerCase()
   // Split on common separators (e.g. "Marco Rossi / Rossi Imports S.r.l.")