@open-mercato/core 0.6.1-develop.3276.1.1fcd145078 → 0.6.1-develop.3287.1.450f4ffb56

package/src/modules/customers/widgets/injection/ai-assistant-trigger/widget.client.tsx

@@ -37,7 +37,10 @@ import { cn } from '@open-mercato/shared/lib/utils'
 
 export const CUSTOMERS_AI_INJECT_AGENT_ID = 'customers.account_assistant'
 
-export type CustomersAiInjectView = 'customers.people.list' | 'customers.companies.list'
+export type CustomersAiInjectView =
+  | 'customers.people.list'
+  | 'customers.companies.list'
+  | 'customers.deals.list'
 
 export interface CustomersAiInjectPageContext {
   view: CustomersAiInjectView
@@ -83,8 +86,9 @@ function readNumber(value: unknown): number {
 }
 
 function resolveView(tableId: string | null | undefined): CustomersAiInjectView {
-  if (typeof tableId === 'string' && tableId.includes('companies')) {
-    return 'customers.companies.list'
+  if (typeof tableId === 'string') {
+    if (tableId.includes('deals')) return 'customers.deals.list'
+    if (tableId.includes('companies')) return 'customers.companies.list'
   }
   return 'customers.people.list'
 }
@@ -115,6 +119,78 @@ function useCustomerSuggestions(
 ): AiChatSuggestion[] {
   const t = useT()
   return React.useMemo(() => {
+    if (view === 'customers.deals.list') {
+      if (hasSelection) {
+        return [
+          {
+            label: t(
+              'customers.ai_assistant.suggestions.summarizeSelectedDeals',
+              'Summarize selected deals',
+            ),
+            prompt: `Give me a summary of my ${selectedCount} selected deals — stage, value, and close date`,
+            icon: <Handshake className="size-4" />,
+          },
+          {
+            label: t(
+              'customers.ai_assistant.suggestions.atRiskSelectedDeals',
+              'Selected deals at risk',
+            ),
+            prompt: `Of my ${selectedCount} selected deals, which look at risk of slipping their close date?`,
+            icon: <Handshake className="size-4" />,
+          },
+          {
+            label: t(
+              'customers.ai_assistant.suggestions.companiesForSelectedDeals',
+              'Companies on selected deals',
+            ),
+            prompt: `List the companies associated with my ${selectedCount} selected deals`,
+            icon: <Building2 className="size-4" />,
+          },
+        ]
+      }
+      return [
+        {
+          label: t(
+            'customers.ai_assistant.suggestions.dealsClosingThisMonth',
+            'Deals closing this month',
+          ),
+          prompt: 'Which deals are closing this month?',
+          icon: <Handshake className="size-4" />,
+        },
+        {
+          label: t(
+            'customers.ai_assistant.suggestions.dealsAtRisk',
+            'Deals at risk of slipping',
+          ),
+          prompt: 'Show me deals at risk of slipping their close date',
+          icon: <Handshake className="size-4" />,
+        },
+        {
+          label: t(
+            'customers.ai_assistant.suggestions.totalOpenDealValue',
+            'Total open deal value',
+          ),
+          prompt: "What's the total value of open deals across the pipeline?",
+          icon: <Handshake className="size-4" />,
+        },
+        {
+          label: t(
+            'customers.ai_assistant.suggestions.topDealsByValue',
+            'Top deals by value',
+          ),
+          prompt: 'Show me the top 5 deals by value',
+          icon: <Handshake className="size-4" />,
+        },
+        {
+          label: t(
+            'customers.ai_assistant.suggestions.searchDeals',
+            'Search for a deal',
+          ),
+          prompt: 'Search for deals by title, company, or stage',
+          icon: <Search className="size-4" />,
+        },
+      ]
+    }
     if (view === 'customers.companies.list') {
       if (hasSelection) {
         return [
@@ -228,24 +304,115 @@ function useCustomerContextItems(pageContext: CustomersAiInjectPageContext): AiC
   return React.useMemo(() => {
     const items: AiChatContextItem[] = []
     const { selectedCount, totalMatching } = pageContext.extra
-    const isCompanies = pageContext.view === 'customers.companies.list'
+    const view = pageContext.view
+    let selectedKey = 'customers.ai_assistant.context.selectedPeople'
+    let selectedFallback = '{count} contacts selected'
+    let matchingKey = 'customers.ai_assistant.context.matchingPeople'
+    let matchingFallback = '{count} contacts in view'
+    if (view === 'customers.companies.list') {
+      selectedKey = 'customers.ai_assistant.context.selectedCompanies'
+      selectedFallback = '{count} companies selected'
+      matchingKey = 'customers.ai_assistant.context.matchingCompanies'
+      matchingFallback = '{count} companies in view'
+    } else if (view === 'customers.deals.list') {
+      selectedKey = 'customers.ai_assistant.context.selectedDeals'
+      selectedFallback = '{count} deals selected'
+      matchingKey = 'customers.ai_assistant.context.matchingDeals'
+      matchingFallback = '{count} deals in view'
+    }
     if (selectedCount > 0) {
-      const key = isCompanies
-        ? 'customers.ai_assistant.context.selectedCompanies'
-        : 'customers.ai_assistant.context.selectedPeople'
-      const fallback = isCompanies ? '{count} companies selected' : '{count} contacts selected'
-      items.push({ label: t(key, fallback).replace('{count}', String(selectedCount)) })
+      items.push({ label: t(selectedKey, selectedFallback).replace('{count}', String(selectedCount)) })
     } else if (totalMatching > 0) {
-      const key = isCompanies
-        ? 'customers.ai_assistant.context.matchingCompanies'
-        : 'customers.ai_assistant.context.matchingPeople'
-      const fallback = isCompanies ? '{count} companies in view' : '{count} contacts in view'
-      items.push({ label: t(key, fallback).replace('{count}', String(totalMatching)) })
+      items.push({ label: t(matchingKey, matchingFallback).replace('{count}', String(totalMatching)) })
     }
     return items
   }, [pageContext, t])
 }
 
+interface ViewCopy {
+  welcomeDescriptionAll: string
+  welcomeDescriptionSelection: string
+  descriptionWithSelection: string
+  triggerAriaLabel: string
+}
+
+function useViewCopy(view: CustomersAiInjectView, selectedCount: number): ViewCopy {
+  const t = useT()
+  return React.useMemo(() => {
+    const replaceCount = (s: string) => s.replace('{count}', String(selectedCount))
+    if (view === 'customers.deals.list') {
+      return {
+        welcomeDescriptionAll: t(
+          'customers.ai_assistant.sheet.welcomeDescriptionAllDeals',
+          'Ask about deals, pipeline, or close dates:',
+        ),
+        welcomeDescriptionSelection: replaceCount(
+          t(
+            'customers.ai_assistant.sheet.welcomeDescriptionSelectionDeals',
+            'Ready to explore your {count} selected deals:',
+          ),
+        ),
+        descriptionWithSelection: replaceCount(
+          t(
+            'customers.ai_assistant.sheet.descriptionWithSelectionDeals',
+            'Working with {count} selected deals. Ask about their stage, value, and close dates.',
+          ),
+        ),
+        triggerAriaLabel: t(
+          'customers.ai_assistant.trigger.ariaLabelDeals',
+          'Open AI assistant for deals',
+        ),
+      }
+    }
+    if (view === 'customers.companies.list') {
+      return {
+        welcomeDescriptionAll: t(
+          'customers.ai_assistant.sheet.welcomeDescriptionAllCompanies',
+          'Ask me anything about your companies, deals, and activities:',
+        ),
+        welcomeDescriptionSelection: replaceCount(
+          t(
+            'customers.ai_assistant.sheet.welcomeDescriptionSelectionCompanies',
+            'Ready to explore your {count} selected companies:',
+          ),
+        ),
+        descriptionWithSelection: replaceCount(
+          t(
+            'customers.ai_assistant.sheet.descriptionWithSelectionCompanies',
+            'Working with {count} selected companies. Ask about their deals, contacts, and activities.',
+          ),
+        ),
+        triggerAriaLabel: t(
+          'customers.ai_assistant.trigger.ariaLabelCompanies',
+          'Open AI assistant for companies',
+        ),
+      }
+    }
+    return {
+      welcomeDescriptionAll: t(
+        'customers.ai_assistant.sheet.welcomeDescriptionAll',
+        'Ask me anything about your customers, companies, and deals:',
+      ),
+      welcomeDescriptionSelection: replaceCount(
+        t(
+          'customers.ai_assistant.sheet.welcomeDescriptionSelection',
+          'Ready to explore your {count} selected contacts:',
+        ),
+      ),
+      descriptionWithSelection: replaceCount(
+        t(
+          'customers.ai_assistant.sheet.descriptionWithSelection',
+          'Working with {count} selected contacts. Ask about their details, deals, companies, and activities.',
+        ),
+      ),
+      triggerAriaLabel: t(
+        'customers.ai_assistant.trigger.ariaLabel',
+        'Open AI assistant for people',
+      ),
+    }
+  }, [view, selectedCount, t])
+}
+
 interface CustomerAgentDescriptor {
   id: string
   label: string
@@ -285,6 +452,7 @@ export default function AiAssistantTriggerWidget({ context }: AiAssistantTrigger
   const hasSelection = selectedCount > 0
   const suggestions = useCustomerSuggestions(pageContext.view, hasSelection, selectedCount)
   const contextItems = useCustomerContextItems(pageContext)
+  const viewCopy = useViewCopy(pageContext.view, selectedCount)
 
   const openAgent = React.useCallback((agentId: string) => {
     setActiveAgent(agentId)
@@ -330,14 +498,8 @@ export default function AiAssistantTriggerWidget({ context }: AiAssistantTrigger
       contextItems,
       welcomeTitle: t('customers.ai_assistant.sheet.welcomeTitle', 'CRM Assistant'),
       welcomeDescription: hasSelection
-        ? t(
-            'customers.ai_assistant.sheet.welcomeDescriptionSelection',
-            'Ready to explore your {count} selected contacts:',
-          ).replace('{count}', String(selectedCount))
-        : t(
-            'customers.ai_assistant.sheet.welcomeDescriptionAll',
-            'Ask me anything about your customers, companies, and deals:',
-          ),
+        ? viewCopy.welcomeDescriptionSelection
+        : viewCopy.welcomeDescriptionAll,
     })
     setOpen(false)
   }, [
@@ -347,15 +509,12 @@ export default function AiAssistantTriggerWidget({ context }: AiAssistantTrigger
     dock,
     hasSelection,
     pageContext,
-    selectedCount,
     suggestions,
     t,
+    viewCopy,
   ])
 
-  const triggerLabel = t(
-    'customers.ai_assistant.trigger.ariaLabel',
-    'Open AI assistant for people',
-  )
+  const triggerLabel = viewCopy.triggerAriaLabel
 
   const labelText = t('customers.ai_assistant.trigger.label', 'AI')
   const moreAgentsLabel = t(
@@ -375,10 +534,14 @@ export default function AiAssistantTriggerWidget({ context }: AiAssistantTrigger
           title={triggerLabel}
           className={cn(
             'relative',
+            'hover:bg-brand-violet/10',
             agents.length > 1 && 'rounded-r-none border-r-0',
           )}
         >
-          <Sparkles className="size-4" aria-hidden />
+          <Sparkles
+            className="size-4 text-brand-violet"
+            aria-hidden
+          />
           <span>{labelText}</span>
           {hasSelection ? (
             <span
@@ -487,10 +650,7 @@ export default function AiAssistantTriggerWidget({ context }: AiAssistantTrigger
             </div>
             <DialogDescription>
               {hasSelection
-                ? t(
-                    'customers.ai_assistant.sheet.descriptionWithSelection',
-                    'Working with {count} selected contacts. Ask about their details, deals, companies, and activities.',
-                  ).replace('{count}', String(selectedCount))
+                ? viewCopy.descriptionWithSelection
                 : t(
                     'customers.ai_assistant.sheet.description',
                     'Your CRM assistant. Ask about people, companies, deals, and activities.',
@@ -504,6 +664,7 @@ export default function AiAssistantTriggerWidget({ context }: AiAssistantTrigger
             contextItems={contextItems}
             hasSelection={hasSelection}
             selectedCount={selectedCount}
+            viewCopy={viewCopy}
           />
         </DialogContent>
       </Dialog>
@@ -518,6 +679,7 @@ interface CustomersChatBodyProps {
   contextItems: AiChatContextItem[]
   hasSelection: boolean
   selectedCount: number
+  viewCopy: ViewCopy
 }
 
 function CustomersChatBody({
@@ -527,6 +689,7 @@ function CustomersChatBody({
   contextItems,
   hasSelection,
   selectedCount,
+  viewCopy,
 }: CustomersChatBodyProps) {
   const t = useT()
   const sessions = useAiChatSessions()
@@ -563,14 +726,8 @@ function CustomersChatBody({
             welcomeTitle={t('customers.ai_assistant.sheet.welcomeTitle', 'CRM Assistant')}
             welcomeDescription={
               hasSelection
-                ? t(
-                    'customers.ai_assistant.sheet.welcomeDescriptionSelection',
-                    'Ready to explore your {count} selected contacts:',
-                  ).replace('{count}', String(selectedCount))
-                : t(
-                    'customers.ai_assistant.sheet.welcomeDescriptionAll',
-                    'Ask me anything about your customers, companies, and deals:',
-                  )
+                ? viewCopy.welcomeDescriptionSelection
+                : viewCopy.welcomeDescriptionAll
             }
           />
         ) : null}

package/src/modules/customers/widgets/injection/ai-assistant-trigger/widget.ts

@@ -5,28 +5,34 @@ import AiAssistantTriggerWidget from './widget.client'
  * Step 4.10 — Backend AiChat injection example.
  *
  * Demonstrates how a third-party module can drop `<AiChat>` onto a page
- * it does NOT own (the customers People list) via the existing widget
- * injection system. Targets spot `data-table:customers.people.list:header`,
- * which is owned by the `DataTable` primitive in `packages/ui`.
+ * it does NOT own (the customers People / Companies / Deals lists) via
+ * the existing widget injection system. Targets DataTable header /
+ * search-trailing spots owned by the `DataTable` primitive in
+ * `packages/ui`.
  *
  * The trigger button opens a right-side sheet embedding
  * `<AiChat agent="customers.account_assistant" pageContext={...} />`.
  * `pageContext` follows the spec §10.1 shape:
  *
- *   { view: 'customers.people.list',
+ *   { view: 'customers.people.list' | 'customers.companies.list' | 'customers.deals.list',
  *     recordType: null,
  *     recordId: string,                    // "" or comma-separated UUIDs
  *     extra: { selectedCount, totalMatching } }
  *
- * Feature-gated behind `customers.people.view` + `ai_assistant.view`.
+ * Feature-gated behind `ai_assistant.view` only — the host CRM page
+ * already enforces its own `customers.people.view`/`companies.view`/
+ * `deals.view` guard, so the widget gate just needs to ensure the user
+ * has AI assistant access. (Earlier versions also listed
+ * `customers.people.view`, which is AND-evaluated by the registry and
+ * hid the trigger from companies-only or deals-only viewers.)
  */
 const widget: InjectionWidgetModule<Record<string, unknown>, Record<string, unknown>> = {
   metadata: {
     id: 'customers.injection.ai-assistant-trigger',
     title: 'Customers AI Assistant Trigger',
     description:
-      'Renders an "Ask AI" button in the people list header that opens a sheet embedding the customers account assistant.',
-    features: ['customers.people.view', 'ai_assistant.view'],
+      'Renders an "Ask AI" button in the people / companies / deals list headers that opens a sheet embedding the customers account assistant.',
+    features: ['ai_assistant.view'],
     requiredModules: ['ai_assistant'],
     priority: 100,
     enabled: true,

package/src/modules/customers/widgets/injection-table.ts

@@ -30,6 +30,12 @@ export const injectionTable: ModuleInjectionTable = {
       priority: 100,
     },
   ],
+  'data-table:customers.deals.list:search-trailing': [
+    {
+      widgetId: 'customers.injection.ai-assistant-trigger',
+      priority: 100,
+    },
+  ],
   'detail:customers.deal:header': [
     {
       widgetId: 'customers.injection.ai-deal-detail-trigger',

package/src/modules/integrations/backend/integrations/[id]/page.tsx

@@ -20,6 +20,7 @@ import {
 } from '@open-mercato/ui/primitives/select'
 import { Switch } from '@open-mercato/ui/primitives/switch'
 import { Input } from '@open-mercato/ui/primitives/input'
+import { PasswordInput } from '@open-mercato/ui/primitives/password-input'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
 import { JsonDisplay } from '@open-mercato/ui/backend/JsonDisplay'
@@ -212,9 +213,8 @@ function buildCredentialFields(credFields: CredentialField[]): CrudField[] {
         ...shared,
         type: 'custom' as const,
         component: ({ id, value, setValue, disabled }) => (
-          <Input
+          <PasswordInput
             id={id}
-            type="password"
             placeholder={field.placeholder}
             value={typeof value === 'string' ? value : ''}
             onChange={(event) => setValue(event.target.value)}

package/src/modules/perspectives/services/perspectiveService.ts

@@ -95,26 +95,54 @@ function isPerspectivesState(value: unknown): value is PerspectivesState {
   return true
 }
 
+/**
+ * Defensive migration for legacy filter state shapes captured before the
+ * advanced-filter tree (SPEC-048). Existing perspectives only store either
+ * advanced-filter URL params (tree shape with `v:2` or a `root` key) or
+ * undefined — this helper is a safety net for legacy `FilterValues`-shaped
+ * records (flat key/value records of column filters) that could only appear
+ * if old saved-view JSON were imported.
+ *
+ * - Tree-shaped state (`v:2` or `root` key) is passed through unchanged.
+ * - Undefined / null filters are passed through unchanged.
+ * - Legacy `FilterValues`-shaped records are dropped (set to `undefined`)
+ *   because there is no reliable mapping back to the new operator model;
+ *   the user sees an empty tree and can recreate.
+ */
+export function maybeMigrateLegacyFilterValues(settings: PerspectiveSettings): PerspectiveSettings {
+  const filters = settings.filters
+  if (!filters || typeof filters !== 'object') return settings
+  const record = filters as Record<string, unknown>
+  if ('v' in record && record.v === 2) return settings
+  if ('root' in record) return settings
+  if (typeof console !== 'undefined') {
+    console.warn('[perspectives] Dropping legacy filterValues shape; please re-create the perspective with the new filter UI.')
+  }
+  return { ...settings, filters: undefined }
+}
+
 function toResolvedPerspective(entity: Perspective): ResolvedPerspective {
+  const settings = maybeMigrateLegacyFilterValues((entity.settingsJson ?? {}) as PerspectiveSettings)
   return {
     id: entity.id,
     name: entity.name,
     tableId: entity.tableId,
     isDefault: !!entity.isDefault,
-    settings: (entity.settingsJson ?? {}) as PerspectiveSettings,
+    settings,
     createdAt: entity.createdAt.toISOString(),
     updatedAt: entity.updatedAt ? entity.updatedAt.toISOString() : null,
   }
 }
 
 function toResolvedRolePerspective(entity: RolePerspective): ResolvedRolePerspective {
+  const settings = maybeMigrateLegacyFilterValues((entity.settingsJson ?? {}) as PerspectiveSettings)
   return {
     id: entity.id,
     roleId: entity.roleId,
     tableId: entity.tableId,
     name: entity.name,
     isDefault: !!entity.isDefault,
-    settings: (entity.settingsJson ?? {}) as PerspectiveSettings,
+    settings,
     tenantId: nullish(entity.tenantId),
     organizationId: nullish(entity.organizationId),
     createdAt: entity.createdAt.toISOString(),

package/src/modules/portal/frontend/[orgSlug]/portal/login/page.tsx

@@ -2,7 +2,8 @@
 import { useCallback, useMemo, useState } from 'react'
 import Link from 'next/link'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
-import { Input } from '@open-mercato/ui/primitives/input'
+import { EmailInput } from '@open-mercato/ui/primitives/email-input'
+import { PasswordInput } from '@open-mercato/ui/primitives/password-input'
 import { Label } from '@open-mercato/ui/primitives/label'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Alert, AlertDescription } from '@open-mercato/ui/primitives/alert'
@@ -39,6 +40,7 @@ export default function PortalLoginPage({ params }: Props) {
         const result = await apiCall<{ ok: boolean; error?: string }>('/api/customer_accounts/login', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
+          credentials: 'include',
           body: JSON.stringify({ email, password, tenantId: tenant.tenantId }),
         })
 
@@ -107,12 +109,12 @@ export default function PortalLoginPage({ params }: Props) {
 
         <div className="flex flex-col gap-1.5">
           <Label htmlFor="login-email" className="text-overline font-semibold uppercase tracking-wider text-muted-foreground/70">{t('portal.login.email', 'Email')}</Label>
-          <Input id="login-email" type="email" autoComplete="email" required placeholder={t('portal.login.email.placeholder', 'you@example.com')} value={email} onChange={(e) => setEmail(e.target.value)} disabled={submitting} className="rounded-lg" />
+          <EmailInput id="login-email" required placeholder={t('portal.login.email.placeholder', 'you@example.com')} value={email} onChange={(e) => setEmail(e.target.value)} disabled={submitting} className="rounded-lg" />
         </div>
 
         <div className="flex flex-col gap-1.5">
           <Label htmlFor="login-password" className="text-overline font-semibold uppercase tracking-wider text-muted-foreground/70">{t('portal.login.password', 'Password')}</Label>
-          <Input id="login-password" type="password" autoComplete="current-password" required placeholder={t('portal.login.password.placeholder', '\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022')} value={password} onChange={(e) => setPassword(e.target.value)} disabled={submitting} className="rounded-lg" />
+          <PasswordInput id="login-password" autoComplete="current-password" required placeholder={t('portal.login.password.placeholder', '\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022')} value={password} onChange={(e) => setPassword(e.target.value)} disabled={submitting} className="rounded-lg" />
         </div>
 
         <Button type="submit" disabled={submitting} className="mt-1 w-full rounded-lg">

package/src/modules/portal/frontend/[orgSlug]/portal/reset-password/page.tsx

@@ -3,7 +3,7 @@ import { useCallback, useMemo, useState, useEffect } from 'react'
 import { useSearchParams } from 'next/navigation'
 import Link from 'next/link'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
-import { Input } from '@open-mercato/ui/primitives/input'
+import { PasswordInput } from '@open-mercato/ui/primitives/password-input'
 import { Label } from '@open-mercato/ui/primitives/label'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Alert, AlertDescription } from '@open-mercato/ui/primitives/alert'
@@ -142,12 +142,12 @@ export default function PortalResetPasswordPage({ params }: Props) {
 
         <div className="flex flex-col gap-1.5">
           <Label htmlFor="reset-password" className="text-overline font-semibold uppercase tracking-wider text-muted-foreground/70">{t('portal.resetPassword.password', 'New Password')}</Label>
-          <Input id="reset-password" type="password" autoComplete="new-password" required placeholder={t('portal.resetPassword.password.placeholder', '••••••••')} value={password} onChange={(e) => setPassword(e.target.value)} disabled={submitting || !token} className="rounded-lg" />
+          <PasswordInput id="reset-password" autoComplete="new-password" required placeholder={t('portal.resetPassword.password.placeholder', '••••••••')} value={password} onChange={(e) => setPassword(e.target.value)} disabled={submitting || !token} className="rounded-lg" />
         </div>
 
         <div className="flex flex-col gap-1.5">
           <Label htmlFor="confirm-password" className="text-overline font-semibold uppercase tracking-wider text-muted-foreground/70">{t('portal.resetPassword.confirmPassword', 'Confirm New Password')}</Label>
-          <Input id="confirm-password" type="password" autoComplete="new-password" required placeholder={t('portal.resetPassword.confirmPassword.placeholder', '••••••••')} value={confirmPassword} onChange={(e) => setConfirmPassword(e.target.value)} disabled={submitting || !token} className="rounded-lg" />
+          <PasswordInput id="confirm-password" autoComplete="new-password" required placeholder={t('portal.resetPassword.confirmPassword.placeholder', '••••••••')} value={confirmPassword} onChange={(e) => setConfirmPassword(e.target.value)} disabled={submitting || !token} className="rounded-lg" />
         </div>
 
         <Button type="submit" disabled={submitting || !token} className="mt-1 w-full rounded-lg">

package/src/modules/portal/frontend/[orgSlug]/portal/signup/page.tsx

@@ -3,6 +3,8 @@ import { useCallback, useMemo, useState } from 'react'
 import Link from 'next/link'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { Input } from '@open-mercato/ui/primitives/input'
+import { EmailInput } from '@open-mercato/ui/primitives/email-input'
+import { PasswordInput } from '@open-mercato/ui/primitives/password-input'
 import { Label } from '@open-mercato/ui/primitives/label'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Alert, AlertDescription } from '@open-mercato/ui/primitives/alert'
@@ -122,12 +124,12 @@ export default function PortalSignupPage({ params }: Props) {
 
         <div className="flex flex-col gap-1.5">
           <Label htmlFor="signup-email" className="text-overline font-semibold uppercase tracking-wider text-muted-foreground/70">{t('portal.signup.email', 'Email')}</Label>
-          <Input id="signup-email" type="email" autoComplete="email" required placeholder={t('portal.signup.email.placeholder', 'you@example.com')} value={email} onChange={(e) => setEmail(e.target.value)} disabled={submitting} className="rounded-lg" />
+          <EmailInput id="signup-email" required placeholder={t('portal.signup.email.placeholder', 'you@example.com')} value={email} onChange={(e) => setEmail(e.target.value)} disabled={submitting} className="rounded-lg" />
         </div>
 
         <div className="flex flex-col gap-1.5">
           <Label htmlFor="signup-password" className="text-overline font-semibold uppercase tracking-wider text-muted-foreground/70">{t('portal.signup.password', 'Password')}</Label>
-          <Input id="signup-password" type="password" autoComplete="new-password" required placeholder={t('portal.signup.password.placeholder', '\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022')} value={password} onChange={(e) => setPassword(e.target.value)} disabled={submitting} className="rounded-lg" />
+          <PasswordInput id="signup-password" autoComplete="new-password" required placeholder={t('portal.signup.password.placeholder', '\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022')} value={password} onChange={(e) => setPassword(e.target.value)} disabled={submitting} className="rounded-lg" />
         </div>
 
         <Button type="submit" disabled={submitting} className="mt-1 w-full rounded-lg">

package/src/modules/query_index/lib/engine.ts

@@ -625,14 +625,19 @@ export class HybridQueryEngine implements QueryEngine {
           existing.push(filter)
           groups.set(filter.orGroup, existing)
         }
-        let next = q
-        for (const [, groupFilters] of groups) {
-          if (!groupFilters.length) continue
-          next = next.where((eb: any) => eb.or(
-            groupFilters.map((filter) => this.buildBaseFilterExpression(eb, filter, resolveBaseColumn, qualify, entity, searchRuntime))
-          ))
-        }
-        return next
+        const groupList = Array.from(groups.values()).filter((g) => g.length > 0)
+        if (groupList.length === 0) return q
+        // Combine all groups in a single WHERE: disjuncts are OR'd together; within
+        // each disjunct, fields are AND'd. Building this as separate `.where()` calls
+        // would AND the disjuncts (wrong semantics).
+        return q.where((eb: any) => eb.or(
+          groupList.map((groupFilters) => {
+            const parts = groupFilters.map((filter) =>
+              this.buildBaseFilterExpression(eb, filter, resolveBaseColumn, qualify, entity, searchRuntime),
+            )
+            return parts.length === 1 ? parts[0] : eb.and(parts)
+          }),
+        ))
       }
 
       const applyAliasScopes = async (target: AnyBuilder, aliasName: string): Promise<AnyBuilder> => {
@@ -1341,6 +1346,39 @@ export class HybridQueryEngine implements QueryEngine {
       // Doc-based filter via `ei` alias — returned as EXISTS where possible
       return this.buildIndexDocFilterExpression(eb, 'ei', entity, fieldName, filter.op, filter.value, 'b.id', searchRuntime)
     }
+    // For like/ilike with active search-tokens, route through hashed-token EXISTS subquery
+    // so encrypted-at-rest columns can still be searched.
+    if (
+      (filter.op === 'like' || filter.op === 'ilike') &&
+      searchRuntime?.enabled &&
+      typeof filter.value === 'string'
+    ) {
+      const tokens = tokenizeText(String(filter.value), searchRuntime.config)
+      if (tokens.hashes.length) {
+        const sources: SearchTokenSource[] = (searchRuntime.searchSources && searchRuntime.searchSources.length
+          ? searchRuntime.searchSources
+          : [{ entity: String(entity), recordIdColumn: 'b.id' }]
+        ).filter((src) => src.recordIdColumn && src.entity)
+        if (sources.length) {
+          return eb.or(
+            sources.map((src) =>
+              eb.exists(this.buildSearchTokensSub(eb, {
+                entity: src.entity,
+                field: fieldName,
+                hashes: tokens.hashes,
+                recordIdColumn: src.recordIdColumn,
+                tenantId: searchRuntime.tenantId ?? null,
+                organizationScope: searchRuntime.organizationScope ?? null,
+              })),
+            ),
+          )
+        }
+      }
+      // Tokenizer produced no hashes (e.g. value too short). Match the regular-base-filter
+      // path's behavior of skipping the predicate (no filter), which is preferable to
+      // silently turning into a plain `ilike` against an encrypted column.
+      return sql<boolean>`true`
+    }
     return this.buildColumnFilterExpression(eb, qualify(baseField), filter.op, filter.value)
   }
 

package/src/modules/sales/backend/sales/documents/[id]/page.tsx

@@ -20,6 +20,7 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { Input } from '@open-mercato/ui/primitives/input'
+import { EmailInput } from '@open-mercato/ui/primitives/email-input'
 import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@open-mercato/ui/primitives/dialog'
 import { ArrowRightLeft, Building2, CreditCard, Mail, Pencil, Plus, Send, Store, Truck, UserRound, Wand2, X } from 'lucide-react'
 import { FormHeader, type ActionItem } from '@open-mercato/ui/backend/forms'
@@ -663,8 +664,7 @@ function CustomerInlineEditor({
               <label className="text-sm font-medium text-foreground">
                 {t('customers.people.detail.highlights.primaryEmail', 'Primary email')}
               </label>
-              <Input
-                type="email"
+              <EmailInput
                 value={snapshotDraft.primaryEmail}
                 onChange={(event) => setSnapshotDraft((prev) => ({ ...prev, primaryEmail: event.target.value }))}
                 placeholder={t('customers.people.form.primaryEmailPlaceholder', 'name@example.com')}
@@ -1139,15 +1139,13 @@ function ContactEmailInlineEditor({
                 }
               }}
             >
-              <Input
-                leftIcon={<Mail />}
+              <EmailInput
                 value={draft}
                 onChange={(event) => {
                   if (error) setError(null)
                   setDraft(event.target.value)
                 }}
                 placeholder={placeholder}
-                type="email"
                 autoFocus
                 spellCheck={false}
               />