@open-mercato/core 0.6.1-develop.3246.1.dbef9d7392 → 0.6.1-develop.3260.1.dc719cac84

package/src/modules/entities/components/EncryptionManager.tsx

@@ -3,6 +3,7 @@
 import * as React from 'react'
 import { useQuery, useMutation } from '@tanstack/react-query'
 import { Button } from '@open-mercato/ui/primitives/button'
+import { Checkbox } from '@open-mercato/ui/primitives/checkbox'
 import {
   Select,
   SelectContent,
@@ -14,13 +15,14 @@ import { LoadingMessage, ErrorMessage } from '@open-mercato/ui/backend/detail'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { apiCall, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
-import { useCustomFieldDefs } from '@open-mercato/ui/backend/utils/customFieldDefs'
+import { useCustomFieldDefs, type CustomFieldDefDto } from '@open-mercato/ui/backend/utils/customFieldDefs'
 import { Plus, Save, Trash2 } from 'lucide-react'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { getEntityFields } from '#generated/entity-fields-registry'
 
 type EntityOption = { entityId: string; label?: string; source?: string }
+type FieldOption = { value: string; label: string }
 
 type EncryptionFieldRow = {
   id: string
@@ -36,6 +38,8 @@ type EncryptionMapResponse = {
 
 type CanonicalOption = { value: string; label?: string }
 
+const EMPTY_FIELD_DEFS: CustomFieldDefDto[] = []
+
 function normalizeToken(value: string): string {
   return value
     .replace(/([a-z0-9])([A-Z])/g, '$1_$2')
@@ -64,6 +68,24 @@ function normalizeFieldRows(raw: EncryptionMapResponse | undefined, options: Can
   }))
 }
 
+function areFieldRowsEqual(a: EncryptionFieldRow[], b: EncryptionFieldRow[]): boolean {
+  if (a === b) return true
+  if (a.length !== b.length) return false
+  return a.every((row, idx) => {
+    const other = b[idx]
+    return !!other && row.id === other.id && row.field === other.field && (row.hashField ?? null) === (other.hashField ?? null)
+  })
+}
+
+function areFieldOptionsEqual(a: FieldOption[], b: FieldOption[]): boolean {
+  if (a === b) return true
+  if (a.length !== b.length) return false
+  return a.every((option, idx) => {
+    const other = b[idx]
+    return !!other && option.value === other.value && option.label === other.label
+  })
+}
+
 function buildRowId(): string {
   if (typeof crypto !== 'undefined' && crypto.randomUUID) return crypto.randomUUID()
   return `row-${Math.random().toString(36).slice(2)}`
@@ -75,11 +97,12 @@ export function EncryptionManager() {
   const [selectedEntityId, setSelectedEntityId] = React.useState('')
   const [fields, setFields] = React.useState<EncryptionFieldRow[]>([])
   const [isActive, setIsActive] = React.useState(true)
-  const [baseFieldOptions, setBaseFieldOptions] = React.useState<Array<{ value: string; label: string }>>([])
+  const [baseFieldOptions, setBaseFieldOptions] = React.useState<FieldOption[]>([])
   const [hasUserEdited, setHasUserEdited] = React.useState(false)
-  const { data: fieldDefs = [], isLoading: loadingFieldDefs } = useCustomFieldDefs(selectedEntityId ? [selectedEntityId] : [], {
+  const { data: rawFieldDefs, isLoading: loadingFieldDefs } = useCustomFieldDefs(selectedEntityId ? [selectedEntityId] : [], {
     enabled: !!selectedEntityId,
   })
+  const fieldDefs = rawFieldDefs ?? EMPTY_FIELD_DEFS
   const canonicalOptions = React.useMemo<CanonicalOption[]>(() => {
     const options: CanonicalOption[] = []
     for (const option of baseFieldOptions) {
@@ -133,13 +156,13 @@ export function EncryptionManager() {
 
   React.useEffect(() => {
     if (!selectedEntityId) {
-      setBaseFieldOptions([])
+      setBaseFieldOptions((prev) => (prev.length ? [] : prev))
       return
     }
     const parts = selectedEntityId.split(':')
     const entitySlug = parts[1]
     if (!entitySlug) {
-      setBaseFieldOptions([])
+      setBaseFieldOptions((prev) => (prev.length ? [] : prev))
       return
     }
 
@@ -147,11 +170,11 @@ export function EncryptionManager() {
     const mod = getEntityFields(entitySlug)
     if (!mod) {
       console.warn('[encryption] No fields found for entity', entitySlug)
-      setBaseFieldOptions([])
+      setBaseFieldOptions((prev) => (prev.length ? [] : prev))
       return
     }
 
-    const options: Array<{ value: string; label: string }> = []
+    const options: FieldOption[] = []
     for (const raw of Object.values(mod)) {
       if (typeof raw !== 'string' || !raw.trim()) continue
       const value = raw.trim()
@@ -163,7 +186,7 @@ export function EncryptionManager() {
         .trim() || value
       options.push({ value, label })
     }
-    setBaseFieldOptions(options)
+    setBaseFieldOptions((prev) => (areFieldOptionsEqual(prev, options) ? prev : options))
   }, [selectedEntityId])
 
   const {
@@ -188,14 +211,16 @@ export function EncryptionManager() {
     const isSameMap = signature === lastMapSignatureRef.current
     if (isSameMap && hasUserEdited) return
     if (!map) {
-      setFields([])
-      setIsActive(true)
+      setFields((prev) => (prev.length ? [] : prev))
+      setIsActive((prev) => (prev === true ? prev : true))
       setHasUserEdited(false)
       lastMapSignatureRef.current = signature
       return
     }
-    setFields(normalizeFieldRows(map, canonicalOptions))
-    setIsActive(map?.isActive !== false)
+    const nextFields = normalizeFieldRows(map, canonicalOptions)
+    setFields((prev) => (areFieldRowsEqual(prev, nextFields) ? prev : nextFields))
+    const nextIsActive = map?.isActive !== false
+    setIsActive((prev) => (prev === nextIsActive ? prev : nextIsActive))
     setHasUserEdited(false)
     lastMapSignatureRef.current = signature
   }, [mapSignature, map, canonicalOptions, hasUserEdited])
@@ -267,7 +292,7 @@ export function EncryptionManager() {
         <ErrorMessage
           label={t('entities.encryption.errors.loadMap', 'Failed to load encryption map')}
           action={(
-            <Button variant="outline" size="sm" onClick={() => void refetchMap()}>
+            <Button type="button" variant="outline" size="sm" onClick={() => void refetchMap()}>
               {t('entities.encryption.actions.retry', 'Retry')}
             </Button>
           )}
@@ -348,6 +373,7 @@ export function EncryptionManager() {
                   </td>
                   <td className="px-3 py-2 align-top text-right">
                     <Button
+                      type="button"
                       variant="ghost"
                       size="sm"
                       className="h-9 w-9 px-0"
@@ -398,7 +424,7 @@ export function EncryptionManager() {
                 </SelectContent>
               </Select>
               {entitiesError ? (
-                <p className="mt-1 text-xs text-red-600">
+                <p className="mt-1 text-xs text-status-error-text">
                   {t('entities.encryption.errors.loadEntities', 'Failed to load entities')}
                 </p>
               ) : (
@@ -407,14 +433,16 @@ export function EncryptionManager() {
                 </p>
               )}
             </div>
-            <label className="inline-flex items-center gap-2 text-sm">
-              <input
-                type="checkbox"
+            <div className="inline-flex items-center gap-2 text-sm">
+              <Checkbox
+                id="entities-encryption-active"
                 checked={isActive}
-                onChange={(event) => setIsActive(event.target.checked)}
+                onCheckedChange={(checked) => setIsActive(checked === true)}
               />
-              {t('entities.encryption.active', 'Encryption enabled for this entity')}
-            </label>
+              <label htmlFor="entities-encryption-active">
+                {t('entities.encryption.active', 'Encryption enabled for this entity')}
+              </label>
+            </div>
           </div>
         </div>
         <div className="rounded-lg border bg-background/80 p-4">
@@ -425,7 +453,7 @@ export function EncryptionManager() {
                 {t('entities.encryption.fields.subtitle', 'List the attributes that should be encrypted with the tenant key.')}
               </p>
             </div>
-            <Button variant="outline" size="sm" onClick={addField}>
+            <Button type="button" variant="outline" size="sm" onClick={addField}>
               <Plus className="mr-2 h-4 w-4" />
               {t('entities.encryption.actions.add', 'Add field')}
             </Button>
@@ -434,6 +462,7 @@ export function EncryptionManager() {
         </div>
         <div className="flex justify-end">
           <Button
+            type="button"
             onClick={() => mutation.mutate()}
             disabled={mutation.isPending || loadingEntities || !!entitiesError || !selectedEntityId}
           >

package/src/modules/inbox_ops/lib/llmProvider.ts

@@ -163,6 +163,16 @@ export async function runExtractionWithConfiguredProvider(input: {
     model = factoryResolution.model
     modelWithProvider = `${factoryResolution.providerId}/${factoryResolution.modelId}`
   } else {
+    // BC: Legacy OPENCODE_PROVIDER / OPENCODE_MODEL path. This branch only
+    // runs when createModelFactory throws AiModelFactoryError('no_provider_configured'),
+    // meaning none of the new-style provider env vars (ANTHROPIC_API_KEY,
+    // OPENAI_API_KEY, GOOGLE_GENERATIVE_AI_API_KEY, OM_AI_PROVIDER, ...) is
+    // set. The OPENCODE_* envs are deliberately kept as BC fallbacks instead
+    // of being treated as canonical OM_AI_* values because they are scoped to
+    // the OpenCode Code Mode stack (spec
+    // 2026-04-27-ai-agents-provider-model-baseurl-overrides, R1 mitigation).
+    // Keeping this fallback alive preserves backward compatibility for existing
+    // inbox_ops deployments that have not yet migrated to the new env vars.
     const providerId = resolveExtractionProviderId()
     const apiKey = requireOpenCodeProviderApiKey(providerId)
     const modelConfig = resolveOpenCodeModel(providerId, {

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

@@ -35,7 +35,9 @@ import {
   type IntegrationDetailBuiltInTab,
 } from '@open-mercato/shared/modules/integrations/types'
 import { LoadingMessage, ErrorMessage } from '@open-mercato/ui/backend/detail'
-import { Activity, AlertTriangle, Bell, Calendar, CheckCircle2, ChevronDown, ChevronRight, CreditCard, FileText, HardDrive, Key, MessageSquare, RefreshCw, Settings, Truck, Webhook, XCircle, Zap } from 'lucide-react'
+import { LogList, type LogListEntry } from '@open-mercato/ui/backend/LogList'
+import { Activity, AlertTriangle, Bell, Calendar, CheckCircle2, CreditCard, FileText, FileX, HardDrive, Key, MessageSquare, RefreshCw, Settings, Truck, Webhook, XCircle, Zap } from 'lucide-react'
+import { EmptyState } from '@open-mercato/ui/primitives/empty-state'
 import { IntegrationScheduleTab } from '../../../../data_sync/components/IntegrationScheduleTab'
 import {
   buildIntegrationDetailInjectedTabs,
@@ -129,12 +131,6 @@ type HealthCheckResponse = {
   latencyMs: number | null
 }
 
-const LOG_LEVEL_STYLES: Record<string, string> = {
-  info: 'bg-blue-100 text-blue-800',
-  warn: 'bg-yellow-100 text-yellow-800',
-  error: 'bg-red-100 text-red-800',
-}
-
 const HEALTH_STATUS_STYLES: Record<string, string> = {
   healthy: 'bg-green-100 text-green-800',
   degraded: 'bg-yellow-100 text-yellow-800',
@@ -337,7 +333,6 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
   const [logs, setLogs] = React.useState<LogEntry[]>([])
   const [logLevel, setLogLevel] = React.useState<string>('')
   const [isLoadingLogs, setIsLoadingLogs] = React.useState(false)
-  const [expandedLogId, setExpandedLogId] = React.useState<string | null>(null)
 
   const [isCheckingHealth, setIsCheckingHealth] = React.useState(false)
   const [isTogglingState, setIsTogglingState] = React.useState(false)
@@ -522,9 +517,6 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
   React.useEffect(() => { void loadDetail() }, [loadDetail])
   React.useEffect(() => { void loadCredentials() }, [loadCredentials])
   React.useEffect(() => { void loadLogs() }, [loadLogs])
-  React.useEffect(() => {
-    setExpandedLogId((current) => (current && logs.some((log) => log.id === current) ? current : null))
-  }, [logs])
 
   const handleToggleState = React.useCallback(async (enabled: boolean) => {
     const currentIntegrationId = resolveCurrentIntegrationId()
@@ -1210,144 +1202,107 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
             </div>
             {isLoadingLogs ? (
               <div className="flex justify-center py-8"><Spinner /></div>
-            ) : logs.length === 0 ? (
-              <p className="py-4 text-sm text-muted-foreground">{t('integrations.detail.logs.empty')}</p>
             ) : (
-              <div className="rounded-lg border">
-                <table className="w-full text-sm">
-                  <thead>
-                    <tr className="border-b bg-muted/50">
-                      <th className="px-4 py-2 text-left font-medium">{t('integrations.detail.logs.columns.time')}</th>
-                      <th className="px-4 py-2 text-left font-medium">{t('integrations.detail.logs.columns.level')}</th>
-                      <th className="px-4 py-2 text-left font-medium">{t('integrations.detail.logs.columns.message')}</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    {logs.map((log) => {
-                      const isExpanded = expandedLogId === log.id
-                      const metadataEntries = [
-                        ['Time', new Date(log.createdAt).toLocaleString()],
-                        ['Level', log.level],
-                        ['Code', log.code ?? null],
-                        ['Run ID', log.runId ?? null],
-                        ['Entity Type', log.scopeEntityType ?? null],
-                        ['Entity ID', log.scopeEntityId ?? null],
-                      ].filter((entry): entry is [string, string] => typeof entry[1] === 'string' && entry[1].trim().length > 0)
-                      const { inlineEntries, nestedEntries } = splitLogPayload(log.payload)
-
-                      return (
-                        <React.Fragment key={log.id}>
-                          <tr className="border-b last:border-0">
-                            <td className="whitespace-nowrap px-4 py-2 text-muted-foreground">
-                              {new Date(log.createdAt).toLocaleString()}
-                            </td>
-                            <td className="px-4 py-2">
-                              <Badge variant="secondary" className={LOG_LEVEL_STYLES[log.level] ?? ''}>
-                                {log.level}
-                              </Badge>
-                            </td>
-                            <td className="px-4 py-2">
-                              <Button
-                                type="button"
-                                variant="ghost"
-                                size="sm"
-                                className="h-auto w-full justify-start gap-2 px-0 py-0 text-left hover:bg-transparent"
-                                onClick={() => setExpandedLogId((current) => (current === log.id ? null : log.id))}
-                              >
-                                {isExpanded ? <ChevronDown className="h-4 w-4 shrink-0" /> : <ChevronRight className="h-4 w-4 shrink-0" />}
-                                <span className="truncate">{log.message}</span>
-                              </Button>
-                            </td>
-                          </tr>
-                          {isExpanded ? (
-                            <tr className="border-b bg-muted/30 last:border-0">
-                              <td colSpan={3} className="px-4 py-4">
-                                <div className="space-y-4 rounded-lg border bg-card p-4">
-                                  <div className="grid gap-4 lg:grid-cols-[minmax(0,1.1fr)_minmax(0,0.9fr)]">
-                                    <div className="space-y-4">
-                                      <section className="space-y-3">
-                                        <div>
-                                          <p className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
-                                            {t('integrations.detail.logs.details.summary', 'Summary')}
-                                          </p>
-                                          <p className="mt-1 text-sm font-medium">{log.message}</p>
-                                        </div>
-                                        {metadataEntries.length > 0 ? (
-                                          <dl className="grid gap-3 sm:grid-cols-2">
-                                            {metadataEntries.map(([label, value]) => (
-                                              <div key={label} className="rounded-md border bg-muted/30 px-3 py-2">
-                                                <dt className="text-overline font-medium uppercase tracking-wide text-muted-foreground">
-                                                  {label}
-                                                </dt>
-                                                <dd className="mt-1 break-all text-sm">{value}</dd>
-                                              </div>
-                                            ))}
-                                          </dl>
-                                        ) : null}
-                                      </section>
-
-                                      {inlineEntries.length > 0 ? (
-                                        <section className="space-y-3">
-                                          <p className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
-                                            {t('integrations.detail.logs.details.fields', 'Fields')}
-                                          </p>
-                                          <dl className="grid gap-3 sm:grid-cols-2">
-                                            {inlineEntries.map(([key, value]) => (
-                                              <div key={key} className="rounded-md border bg-muted/30 px-3 py-2">
-                                                <dt className="text-overline font-medium uppercase tracking-wide text-muted-foreground">
-                                                  {formatLogDetailLabel(key)}
-                                                </dt>
-                                                <dd className="mt-1 break-words text-sm">
-                                                  {formatLogPrimitiveValue(value)}
-                                                </dd>
-                                              </div>
-                                            ))}
-                                          </dl>
-                                        </section>
-                                      ) : null}
-                                    </div>
-
-                                    <div className="space-y-3">
-                                      {nestedEntries.map(([key, value]) => (
-                                        <JsonDisplay
-                                          key={key}
-                                          data={value}
-                                          title={formatLogDetailLabel(key)}
-                                          defaultExpanded
-                                          maxInitialDepth={1}
-                                          theme="dark"
-                                          maxHeight="16rem"
-                                          className="p-4"
-                                        />
-                                      ))}
-                                      {log.payload && nestedEntries.length === 0 ? (
-                                        <JsonDisplay
-                                          data={log.payload}
-                                          title={t('integrations.detail.logs.details.payload', 'Payload')}
-                                          defaultExpanded
-                                          maxInitialDepth={1}
-                                          theme="dark"
-                                          maxHeight="16rem"
-                                          className="p-4"
-                                        />
-                                      ) : null}
-                                      {!log.payload ? (
-                                        <div className="rounded-lg border border-dashed px-4 py-6 text-sm text-muted-foreground">
-                                          {t('integrations.detail.logs.details.noPayload', 'No structured payload was stored for this log entry.')}
-                                        </div>
-                                      ) : null}
-                                    </div>
+              <LogList
+                entries={logs.map<LogListEntry>((log) => {
+                  const metadataEntries = [
+                    ['Time', new Date(log.createdAt).toLocaleString()],
+                    ['Level', log.level],
+                    ['Code', log.code ?? null],
+                    ['Run ID', log.runId ?? null],
+                    ['Entity Type', log.scopeEntityType ?? null],
+                    ['Entity ID', log.scopeEntityId ?? null],
+                  ].filter((entry): entry is [string, string] => typeof entry[1] === 'string' && entry[1].trim().length > 0)
+                  const { inlineEntries, nestedEntries } = splitLogPayload(log.payload)
+
+                  return {
+                    id: log.id,
+                    time: new Date(log.createdAt).toLocaleString(),
+                    level: log.level,
+                    message: log.message,
+                    body: (
+                      <div className="grid gap-4 lg:grid-cols-[minmax(0,1.1fr)_minmax(0,0.9fr)]">
+                        <div className="space-y-4">
+                          <section className="space-y-3">
+                            <div>
+                              <p className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
+                                {t('integrations.detail.logs.details.summary', 'Summary')}
+                              </p>
+                              <p className="mt-1 text-sm font-medium">{log.message}</p>
+                            </div>
+                            {metadataEntries.length > 0 ? (
+                              <dl className="grid gap-3 sm:grid-cols-2">
+                                {metadataEntries.map(([label, value]) => (
+                                  <div key={label} className="rounded-md border bg-muted/30 px-3 py-2">
+                                    <dt className="text-overline font-medium uppercase tracking-wide text-muted-foreground">
+                                      {label}
+                                    </dt>
+                                    <dd className="mt-1 break-all text-sm">{value}</dd>
+                                  </div>
+                                ))}
+                              </dl>
+                            ) : null}
+                          </section>
+
+                          {inlineEntries.length > 0 ? (
+                            <section className="space-y-3">
+                              <p className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
+                                {t('integrations.detail.logs.details.fields', 'Fields')}
+                              </p>
+                              <dl className="grid gap-3 sm:grid-cols-2">
+                                {inlineEntries.map(([key, value]) => (
+                                  <div key={key} className="rounded-md border bg-muted/30 px-3 py-2">
+                                    <dt className="text-overline font-medium uppercase tracking-wide text-muted-foreground">
+                                      {formatLogDetailLabel(key)}
+                                    </dt>
+                                    <dd className="mt-1 break-words text-sm">
+                                      {formatLogPrimitiveValue(value)}
+                                    </dd>
                                   </div>
-                                </div>
-                              </td>
-                            </tr>
+                                ))}
+                              </dl>
+                            </section>
                           ) : null}
-                        </React.Fragment>
-                      )
-                    })}
-                  </tbody>
-                </table>
-              </div>
+                        </div>
+
+                        <div className="space-y-3">
+                          {nestedEntries.map(([key, value]) => (
+                            <JsonDisplay
+                              key={key}
+                              data={value}
+                              title={formatLogDetailLabel(key)}
+                              defaultExpanded
+                              maxInitialDepth={1}
+                              theme="dark"
+                              maxHeight="16rem"
+                              className="p-4"
+                            />
+                          ))}
+                          {log.payload && nestedEntries.length === 0 ? (
+                            <JsonDisplay
+                              data={log.payload}
+                              title={t('integrations.detail.logs.details.payload', 'Payload')}
+                              defaultExpanded
+                              maxInitialDepth={1}
+                              theme="dark"
+                              maxHeight="16rem"
+                              className="p-4"
+                            />
+                          ) : null}
+                          {!log.payload ? (
+                            <EmptyState
+                              size="sm"
+                              icon={<FileX className="h-8 w-8" aria-hidden="true" />}
+                              title={t('integrations.detail.logs.details.noPayload', 'No structured payload was stored for this log entry.')}
+                            />
+                          ) : null}
+                        </div>
+                      </div>
+                    ),
+                  }
+                })}
+                emptyMessage={t('integrations.detail.logs.empty')}
+              />
             )}
             </TabsContent>
           ) : null}