@open-mercato/core 0.10.1-develop.7972.1.03f813eaaf → 0.10.1-develop.7974.1.c98f9304d9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.10.1-develop.7972.1.03f813eaaf",
+  "version": "0.10.1-develop.7974.1.c98f9304d9",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -266,16 +266,16 @@
     "zod": "^4.6.6"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.10.1-develop.7972.1.03f813eaaf",
-    "@open-mercato/shared": "0.10.1-develop.7972.1.03f813eaaf",
-    "@open-mercato/ui": "0.10.1-develop.7972.1.03f813eaaf",
+    "@open-mercato/ai-assistant": "0.10.1-develop.7974.1.c98f9304d9",
+    "@open-mercato/shared": "0.10.1-develop.7974.1.c98f9304d9",
+    "@open-mercato/ui": "0.10.1-develop.7974.1.c98f9304d9",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.10.1-develop.7972.1.03f813eaaf",
-    "@open-mercato/shared": "0.10.1-develop.7972.1.03f813eaaf",
-    "@open-mercato/ui": "0.10.1-develop.7972.1.03f813eaaf",
+    "@open-mercato/ai-assistant": "0.10.1-develop.7974.1.c98f9304d9",
+    "@open-mercato/shared": "0.10.1-develop.7974.1.c98f9304d9",
+    "@open-mercato/ui": "0.10.1-develop.7974.1.c98f9304d9",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^7.0.1",
     "@testing-library/react": "^16.3.3",

package/src/helpers/integration/communicationChannelsFixtures.ts

@@ -111,6 +111,25 @@ export async function seedConnectedChannel(
   return expectId(body?.channelId, 'connect-channel response should include channelId');
 }
 
+/**
+ * Disconnect a channel the caller owns through the real disconnect command. The
+ * row stays listed with `status: 'disconnected'` (a UI disconnect deletes it).
+ */
+export async function disconnectSeededChannel(
+  request: APIRequestContext,
+  token: string,
+  channelId: string,
+): Promise<void> {
+  const response = await apiRequest(request, 'POST', TEST_SEED_PATH, {
+    token,
+    data: { action: 'disconnect-channel', channelId },
+  });
+  expect(
+    response.status(),
+    'POST /api/communication_channels/test-seed (disconnect-channel) should return 200',
+  ).toBe(200);
+}
+
 export async function seedSystemEmailChannel(
   request: APIRequestContext,
   token: string,

package/src/modules/communication_channels/api/post/channels/[id]/set-primary/route.ts

@@ -1,6 +1,7 @@
 import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
+import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import type { CommandBus } from '@open-mercato/shared/lib/commands'
 import {
@@ -82,6 +83,19 @@ export async function POST(req: Request, context: RouteContext): Promise<Respons
   if (result.status === 'not_owner') {
     return NextResponse.json({ error: 'Channel not found' }, { status: 404 })
   }
+  if (result.status === 'disconnected') {
+    const { translate } = await resolveTranslations()
+    return NextResponse.json(
+      {
+        error: translate(
+          'communication_channels.errors.setPrimaryDisconnected',
+          'This channel is disconnected. Reconnect it before setting it as primary.',
+        ),
+        code: 'channel_disconnected',
+      },
+      { status: 409 },
+    )
+  }
   if (result.status === 'noop') {
     return NextResponse.json({ channelId: id, isPrimary: true, unchanged: true }, { status: 200 })
   }
@@ -107,6 +121,7 @@ export const openApi = {
         { status: 400, description: 'Invalid channel id' },
         { status: 401, description: 'Unauthorized' },
         { status: 404, description: 'Channel not found or not owned by current user' },
+        { status: 409, description: 'Channel is disconnected and cannot be set as primary' },
       ],
     },
   },

package/src/modules/communication_channels/api/post/test-seed/route.ts

@@ -22,6 +22,11 @@ import {
   type ConnectCredentialChannelInput,
   type ConnectCredentialChannelResult,
 } from '../../../commands/connect-credential-channel'
+import {
+  COMMUNICATION_CHANNELS_DISCONNECT_CHANNEL_COMMAND_ID,
+  type DisconnectChannelInput,
+  type DisconnectChannelResult,
+} from '../../../commands/disconnect-channel'
 import { emitCommunicationChannelsEvent } from '../../../events'
 import {
   TEST_SEED_CHAT_PROVIDER_KEY,
@@ -67,6 +72,9 @@ import {
  *     the hub accepts a message, only that downstream subscribers fire.
  *   - `purge-inbound`: hard-delete the rows one test-seeded or test-ingested
  *     inbound message created, for integration teardown.
+ *   - `disconnect-channel`: run the REAL disconnect command on a channel the
+ *     caller owns. No HTTP route disconnects without deleting the row, so this is
+ *     the only way a test can reach a listed `disconnected` channel.
  */
 type RbacServiceLike = {
   loadAcl: (
@@ -158,6 +166,11 @@ const seedSystemChannelSchema = z.object({
   externalIdentifier: z.string().min(1).max(255).optional(),
 })
 
+const disconnectChannelSchema = z.object({
+  action: z.literal('disconnect-channel'),
+  channelId: z.string().uuid(),
+})
+
 const clearCaptureSchema = z.object({
   action: z.literal('clear-capture'),
   systemRecipient: z.string().email().max(320).optional(),
@@ -237,6 +250,7 @@ const bodySchema = z.discriminatedUnion('action', [
   emitInboundSchema,
   purgeInboundSchema,
   seedSystemChannelSchema,
+  disconnectChannelSchema,
   clearCaptureSchema,
   listCaptureSchema,
 ])
@@ -408,6 +422,30 @@ export async function POST(req: Request): Promise<Response> {
     return NextResponse.json({ channelId: channel.id }, { status: 201 })
   }
 
+  if (body.action === 'disconnect-channel') {
+    const commandBus = container.resolve('commandBus') as CommandBus
+    const { result } = await commandBus.execute<DisconnectChannelInput, DisconnectChannelResult>(
+      COMMUNICATION_CHANNELS_DISCONNECT_CHANNEL_COMMAND_ID,
+      {
+        input: { channelId: body.channelId, userId, scope: { tenantId, organizationId } },
+        ctx: {
+          container,
+          auth: auth as never,
+          organizationScope: null,
+          selectedOrganizationId: organizationId,
+          organizationIds: organizationId ? [organizationId] : null,
+        },
+      },
+    )
+    if (result.status !== 'disconnected') {
+      return NextResponse.json(
+        { error: '[internal] test-seed disconnect failed', detail: { status: result.status } },
+        { status: 500 },
+      )
+    }
+    return NextResponse.json({ channelId: result.channelId, status: result.status }, { status: 200 })
+  }
+
   if (body.action === 'connect-channel') {
     const stamp = Date.now()
     const commandBus = container.resolve('commandBus') as CommandBus

package/src/modules/communication_channels/backend/profile/communication-channels/page.tsx

@@ -537,7 +537,7 @@ export default function ProfileCommunicationChannelsPage() {
     (channel: ChannelRow) => {
       const items: RowActionItem[] = []
 
-      if (!channel.isPrimary) {
+      if (!channel.isPrimary && channel.status !== 'disconnected') {
         items.push({
           id: 'set-primary',
           label: t('communication_channels.profile.actions.setPrimary', 'Set as primary'),

package/src/modules/communication_channels/commands/set-primary-channel.ts

@@ -22,6 +22,7 @@ export type SetPrimaryChannelResult =
   | { status: 'set'; channelId: string; previousPrimaryChannelId: string | null }
   | { status: 'noop'; reason: string }
   | { status: 'not_owner'; reason: string }
+  | { status: 'disconnected'; reason: string }
 
 export const COMMUNICATION_CHANNELS_SET_PRIMARY_COMMAND_ID =
   'communication_channels.channel.set_primary'
@@ -32,6 +33,9 @@ export const COMMUNICATION_CHANNELS_SET_PRIMARY_COMMAND_ID =
  * partial unique index `communication_channels_one_primary_per_user_uq`.
  *
  * Ownership-checked: refuses to set a primary on someone else's channel.
+ * Refuses a disconnected channel: every path that disconnects a channel also
+ * clears its primary flag, so promoting one would hand the user a primary that
+ * cannot send.
  */
 const setPrimaryChannelCommand: CommandHandler<
   SetPrimaryChannelInput,
@@ -75,6 +79,9 @@ const setPrimaryChannelCommand: CommandHandler<
     if (channel.userId !== input.userId) {
       return { status: 'not_owner', reason: 'channel is not owned by the current user' }
     }
+    if (channel.status === 'disconnected') {
+      return { status: 'disconnected', reason: 'channel is disconnected' }
+    }
     if (channel.isPrimary) {
       return { status: 'noop', reason: 'channel is already primary' }
     }

package/src/modules/communication_channels/i18n/de.json

@@ -30,6 +30,7 @@
   "communication_channels.errors.pollNowPushDriven": "Der Kanal ist Push-gesteuert — Abrufen ist nicht anwendbar. Eingehende Nachrichten kommen über die Push-Verbindung des Anbieters.",
   "communication_channels.errors.reactionFailed": "Reaktion fehlgeschlagen",
   "communication_channels.errors.reactionNotFound": "Reaktion nicht gefunden",
+  "communication_channels.errors.setPrimaryDisconnected": "Dieser Kanal ist getrennt. Verbinde ihn erneut, bevor du ihn als primär festlegst.",
   "communication_channels.errors.threadNotFound": "Thread nicht gefunden",
   "communication_channels.errors.undoBlockedPrimaryConflict": "Ein anderer Kanal ist jetzt für diesen Benutzer als primär festgelegt. Setze ihn auf nicht-primär, bevor du den getrennten Kanal wieder als primär festlegst.",
   "communication_channels.infoPanel.aria": "Kanalinfo",

package/src/modules/communication_channels/i18n/en.json

@@ -30,6 +30,7 @@
   "communication_channels.errors.pollNowPushDriven": "Channel is push-driven — polling does not apply. Inbound messages arrive through the provider push connection.",
   "communication_channels.errors.reactionFailed": "Reaction failed",
   "communication_channels.errors.reactionNotFound": "Reaction not found",
+  "communication_channels.errors.setPrimaryDisconnected": "This channel is disconnected. Reconnect it before setting it as primary.",
   "communication_channels.errors.threadNotFound": "Thread not found",
   "communication_channels.errors.undoBlockedPrimaryConflict": "Another channel is now primary for this user. Set it as non-primary before restoring the disconnected channel as primary.",
   "communication_channels.infoPanel.aria": "Channel info",

package/src/modules/communication_channels/i18n/es.json

@@ -30,6 +30,7 @@
   "communication_channels.errors.pollNowPushDriven": "El canal funciona con push — el sondeo no aplica. Los mensajes entrantes llegan por la conexión push del proveedor.",
   "communication_channels.errors.reactionFailed": "La reacción falló",
   "communication_channels.errors.reactionNotFound": "Reacción no encontrada",
+  "communication_channels.errors.setPrimaryDisconnected": "Este canal está desconectado. Vuelve a conectarlo antes de establecerlo como principal.",
   "communication_channels.errors.threadNotFound": "Hilo no encontrado",
   "communication_channels.errors.undoBlockedPrimaryConflict": "Otro canal es ahora el principal para este usuario. Configúralo como no principal antes de restaurar el canal desconectado como principal.",
   "communication_channels.infoPanel.aria": "Información del canal",

package/src/modules/communication_channels/i18n/ko.json

@@ -30,6 +30,7 @@
   "communication_channels.errors.pollNowPushDriven": "이 채널은 푸시 기반입니다 — 폴링은 적용되지 않습니다. 수신 메시지는 공급자의 푸시 연결로 전달됩니다.",
   "communication_channels.errors.reactionFailed": "반응 처리에 실패했습니다",
   "communication_channels.errors.reactionNotFound": "반응을 찾을 수 없습니다",
+  "communication_channels.errors.setPrimaryDisconnected": "이 채널은 연결이 끊겼습니다. 기본으로 설정하기 전에 다시 연결하세요.",
   "communication_channels.errors.threadNotFound": "스레드를 찾을 수 없습니다",
   "communication_channels.errors.undoBlockedPrimaryConflict": "다른 채널이 현재 이 사용자의 기본 채널로 설정되어 있습니다. 연결이 끊어진 채널을 기본으로 복원하기 전에 해당 채널을 기본이 아닌 채널로 설정하세요.",
   "communication_channels.infoPanel.aria": "채널 정보",

package/src/modules/communication_channels/i18n/pl.json

@@ -30,6 +30,7 @@
   "communication_channels.errors.pollNowPushDriven": "Kanał działa w trybie push — odpytywanie go nie dotyczy. Wiadomości przychodzące docierają połączeniem push dostawcy.",
   "communication_channels.errors.reactionFailed": "Reakcja nie powiodła się",
   "communication_channels.errors.reactionNotFound": "Nie znaleziono reakcji",
+  "communication_channels.errors.setPrimaryDisconnected": "Ten kanał jest rozłączony. Połącz go ponownie, zanim ustawisz go jako główny.",
   "communication_channels.errors.threadNotFound": "Nie znaleziono wątku",
   "communication_channels.errors.undoBlockedPrimaryConflict": "Inny kanał jest teraz głównym dla tego użytkownika. Ustaw go jako niegłówny, zanim przywrócisz rozłączony kanał jako główny.",
   "communication_channels.infoPanel.aria": "Informacje o kanale",

package/src/modules/dictionaries/api/[dictionaryId]/route.ts

@@ -2,7 +2,7 @@ import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import { Dictionary } from '@open-mercato/core/modules/dictionaries/data/entities'
 import { resolveDictionariesRouteContext, resolveDictionaryActorId } from '@open-mercato/core/modules/dictionaries/api/context'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, isUniqueViolation } from '@open-mercato/shared/lib/crud/errors'
 import { enforceCommandOptimisticLockWithGuards } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import {
   runCrudMutationGuardAfterSuccess,
@@ -191,7 +191,14 @@ export async function PATCH(req: Request, ctx: { params?: { dictionaryId?: strin
     }
 
     dictionary.updatedAt = new Date()
-    await context.em.flush()
+    try {
+      await context.em.flush()
+    } catch (err) {
+      if (isUniqueViolation(err, 'dictionaries_scope_key_unique')) {
+        throw new CrudHttpError(409, { error: context.translate('dictionaries.errors.duplicate', 'A dictionary with this key already exists') })
+      }
+      throw err
+    }
 
     if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {
       await runCrudMutationGuardAfterSuccess(context.container, {

package/src/modules/dictionaries/api/route.ts

@@ -2,7 +2,7 @@ import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import { Dictionary } from '@open-mercato/core/modules/dictionaries/data/entities'
 import { resolveDictionariesRouteContext, resolveDictionaryActorId } from '@open-mercato/core/modules/dictionaries/api/context'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, isUniqueViolation } from '@open-mercato/shared/lib/crud/errors'
 import {
   runCrudMutationGuardAfterSuccess,
   validateCrudMutationGuard,
@@ -126,7 +126,14 @@ export async function POST(req: Request) {
     }
 
     context.em.persist(dictionary)
-    await context.em.flush()
+    try {
+      await context.em.flush()
+    } catch (err) {
+      if (isUniqueViolation(err, 'dictionaries_scope_key_unique')) {
+        throw new CrudHttpError(409, { error: context.translate('dictionaries.errors.duplicate', 'A dictionary with this key already exists') })
+      }
+      throw err
+    }
 
     if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {
       await runCrudMutationGuardAfterSuccess(context.container, {

package/src/modules/dictionaries/components/AppearanceSelector.tsx

@@ -2,6 +2,7 @@
 
 import * as React from 'react'
 import { Ellipsis } from 'lucide-react'
+import { useOptionalT } from '@open-mercato/shared/lib/i18n/context'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { ColorPicker } from '@open-mercato/ui/primitives/color-picker'
 import { Input } from '@open-mercato/ui/primitives/input'
@@ -52,6 +53,8 @@ export function AppearanceSelector({
   className,
   previewLabel,
 }: AppearanceSelectorProps) {
+  const translate = useOptionalT()
+  const previewHeading = translate ? translate('dictionaries.appearance.preview', 'Preview') : 'Preview'
   const normalizedIcon = icon ?? ''
   const normalizedColor = color ?? '#000000'
   const hasAppearance = Boolean(icon) || Boolean(color)
@@ -246,7 +249,7 @@ export function AppearanceSelector({
       </div>
 
       <div>
-        <label className="text-sm font-medium">Preview</label>
+        <label className="text-sm font-medium">{previewHeading}</label>
         <div className="flex items-center gap-3 rounded border border-dashed border-border px-3 py-2">
           {hasPreviewContent ? (
             <>

package/src/modules/dictionaries/components/DictionariesManager.tsx

@@ -392,7 +392,7 @@ export function DictionariesManager() {
 
   return (
     <div className="grid gap-6 lg:grid-cols-[320px_1fr]">
-      <div className="rounded-lg border bg-card p-4 shadow-sm">
+      <div className="min-w-0 rounded-lg border bg-card p-4 shadow-sm">
         <div className="flex items-center justify-between">
           <h2 className="text-base font-semibold">
             {t('dictionaries.config.list.title', 'Dictionaries')}
@@ -477,7 +477,7 @@ export function DictionariesManager() {
           )}
         </div>
       </div>
-      <div>
+      <div className="min-w-0">
         {selectedDictionary ? (
           <DictionaryEntriesEditor
             dictionaryId={selectedDictionary.id}

package/src/modules/dictionaries/components/DictionaryEntriesEditor.tsx

@@ -409,7 +409,7 @@ export function DictionaryEntriesEditor({ dictionaryId, dictionaryName, readOnly
         </div>
       </div>
 
-      <div className="overflow-hidden rounded-md border">
+      <div className="overflow-x-auto rounded-md border">
         <Table>
           <TableHeader>
             <TableRow>

package/src/modules/dictionaries/i18n/de.json

@@ -1,4 +1,5 @@
 {
+  "dictionaries.appearance.preview": "Vorschau",
   "dictionaries.config.delete.confirm": "Wörterbuch \"{{name}}\" löschen?",
   "dictionaries.config.dialog.cancel": "Abbrechen",
   "dictionaries.config.dialog.createTitle": "Wörterbuch erstellen",

package/src/modules/dictionaries/i18n/en.json

@@ -1,4 +1,5 @@
 {
+  "dictionaries.appearance.preview": "Preview",
   "dictionaries.config.delete.confirm": "Delete dictionary \"{{name}}\"?",
   "dictionaries.config.dialog.cancel": "Cancel",
   "dictionaries.config.dialog.createTitle": "Create dictionary",

package/src/modules/dictionaries/i18n/es.json

@@ -1,4 +1,5 @@
 {
+  "dictionaries.appearance.preview": "Vista previa",
   "dictionaries.config.delete.confirm": "¿Eliminar el diccionario \"{{name}}\"?",
   "dictionaries.config.dialog.cancel": "Cancelar",
   "dictionaries.config.dialog.createTitle": "Crear diccionario",

package/src/modules/dictionaries/i18n/ko.json

@@ -1,4 +1,5 @@
 {
+  "dictionaries.appearance.preview": "미리보기",
   "dictionaries.config.delete.confirm": "사전 \"{{name}}\"을(를) 삭제하시겠습니까?",
   "dictionaries.config.dialog.cancel": "취소",
   "dictionaries.config.dialog.createTitle": "사전 생성",

package/src/modules/dictionaries/i18n/pl.json

@@ -1,4 +1,5 @@
 {
+  "dictionaries.appearance.preview": "Podgląd",
   "dictionaries.config.delete.confirm": "Usunąć słownik \"{{name}}\"?",
   "dictionaries.config.dialog.cancel": "Anuluj",
   "dictionaries.config.dialog.createTitle": "Utwórz słownik",