@open-mercato/core 0.6.8-develop.7100.1.fbf66fca35 → 0.7.0

package/src/modules/eudr/commands/statements.ts

@@ -43,9 +43,11 @@ import {
 } from '../data/validators'
 import {
   EUDR_AMEND_GUARDED_FIELDS,
+  canDeleteStatement,
   canTransition,
   evaluateSubmissionGate,
   isAmendWindowOpen,
+  isStatementReadOnly,
   type GateAssessmentView,
   type GateSubmissionView,
 } from '../lib/statement-lifecycle'
@@ -495,7 +497,7 @@ async function validateStatementUpdate(
   }
 
   const hasBaseChanges = hasStatementFieldChanges(record, parsed)
-  if (record.status === 'archived' && (hasBaseChanges || Object.keys(custom).length > 0)) {
+  if (isStatementReadOnly(record.status) && (hasBaseChanges || Object.keys(custom).length > 0)) {
     throw new CrudHttpError(400, { error: 'eudr.errors.archivedReadOnly' })
   }
 
@@ -580,6 +582,9 @@ const createStatementCommand: CommandHandler<ScopedStatementCreateInput, Stateme
     if (parsed.status !== undefined && parsed.status !== 'draft') {
       throw new CrudHttpError(400, { error: 'eudr.errors.invalidTransition' })
     }
+    if (parsed.referenceIssuedAt !== undefined) {
+      throw new CrudHttpError(400, { error: 'eudr.errors.referenceIssuedAtImmutable' })
+    }
 
     const entityManager = (ctx.container.resolve('em') as EntityManager).fork()
     let record!: EudrDueDiligenceStatement
@@ -841,7 +846,7 @@ const deleteStatementCommand: CommandHandler<{ body?: Record<string, unknown>; q
     if (!record) throw new CrudHttpError(404, { error: 'EUDR due diligence statement not found' })
     ensureTenantScope(ctx, record.tenantId)
     ensureOrganizationScope(ctx, record.organizationId)
-    if (record.status === 'archived') {
+    if (isStatementStatus(record.status) && !canDeleteStatement(record.status)) {
       throw new CrudHttpError(400, { error: 'eudr.errors.archivedReadOnly' })
     }
     if (record.status === 'available') {

package/src/modules/eudr/components/crudErrorI18n.ts

@@ -15,6 +15,37 @@ function translateEudrErrorToken(token: string, translate: Translator): string {
   return translated === trimmed ? token : translated
 }
 
+function readEudrErrorToken(err: unknown): string | null {
+  if (err == null || typeof err !== 'object') return null
+  const candidates = [
+    (err as { error?: unknown }).error,
+    (err as { message?: unknown }).message,
+  ]
+  for (const candidate of candidates) {
+    if (typeof candidate !== 'string') continue
+    const trimmed = candidate.trim()
+    if (EUDR_ERROR_KEY_PATTERN.test(trimmed)) return trimmed
+  }
+  return null
+}
+
+/**
+ * Resolves the user-facing message for a rejected EUDR mutation, preferring the
+ * server's `eudr.errors.*` token over the caller's generic copy so the reason
+ * survives to the user. Falls back to `fallbackMessage` when the rejection
+ * carries no known token (network errors, 5xx, unmapped tokens).
+ */
+export function translateEudrErrorMessage(
+  err: unknown,
+  translate: Translator,
+  fallbackMessage: string,
+): string {
+  const token = readEudrErrorToken(err)
+  if (!token) return fallbackMessage
+  const translated = translate(token)
+  return translated === token ? fallbackMessage : translated
+}
+
 export function translateEudrCrudError(err: unknown, translate: Translator): unknown {
   if (!(err instanceof Error)) return err
   const rawMessage = typeof err.message === 'string' ? err.message : ''

package/src/modules/eudr/components/formConfig.tsx

@@ -247,8 +247,16 @@ export function LookupSelectField<Snapshot extends Record<string, unknown>>({
     }
   }, [loadSelectedOption, selectedOption, selectedValue, translate])
 
+  // A snapshot is a denormalization captured when the user picks a record, so resolving the
+  // value an edit form was hydrated with must not re-emit it. Doing so overwrites the stored
+  // snapshot with a freshly fetched one, which makes an untouched CrudForm look dirty and
+  // raises the "You have unsaved changes" prompt on the way out.
+  const hydratedValueRef = React.useRef<string | null>(selectedValue)
+
   React.useEffect(() => {
     if (!onSnapshot || !selectedOption || selectedOption.unavailable) return
+    if (hydratedValueRef.current === selectedOption.value) return
+    hydratedValueRef.current = null
     onSnapshot(selectedOption.snapshot ?? null)
   }, [onSnapshot, selectedOption])
 
@@ -592,7 +600,7 @@ export function parseGeolocationInput(raw: string, translate: Translator): Recor
   return parsed
 }
 
-export { translateEudrCrudError } from './crudErrorI18n'
+export { translateEudrCrudError, translateEudrErrorMessage } from './crudErrorI18n'
 
 let referencedStatementRowKeySeq = 0
 

package/src/modules/eudr/data/validators.ts

@@ -46,11 +46,6 @@ export const GEOJSON_TYPES = ['Feature', 'FeatureCollection', 'Point', 'Polygon'
 
 const uuid = () => z.string().uuid()
 const geoJsonSizeLimit = 1_048_576
-// Two conventions for server-managed fields on these entities: fields listed below
-// are never advertised as create inputs, so a client sending a real value is rejected
-// (`rejectServerComputedFields` tolerates a null/undefined no-op echo). A field that
-// WAS advertised in the create schema — statements' `referenceIssuedAt` — is instead
-// dropped from the create schema, so it is stripped rather than rejected (#5508).
 const serverComputedSubmissionFields = ['completenessScore', 'missingFields'] as const
 const serverComputedPlotFields = ['validationWarnings', 'computedArea'] as const
 const serverComputedRiskAssessmentFields = ['countryRisks', 'overallTier', 'isSimplified', 'assessedByName'] as const
@@ -69,16 +64,12 @@ const orderSnapshotSchema = z.object({
   orderNumber: z.string().max(255).optional().nullable(),
 })
 
-// A whole-object POST echoes server-computed fields back with their no-op value
-// (a fresh draft's `submittedAt` is null), so tolerate a null/undefined echo and
-// reject only a meaningful attempt to set server-owned state (#5508).
 function rejectServerComputedFields(fields: readonly string[]): z.ZodType<unknown> {
   return z.unknown().superRefine((input, context) => {
     if (input === null || typeof input !== 'object' || Array.isArray(input)) return
     const record = input as Record<string, unknown>
     for (const field of fields) {
       if (!(field in record)) continue
-      if (record[field] === null || record[field] === undefined) continue
       context.addIssue({
         code: z.ZodIssueCode.custom,
         path: [field],
@@ -342,13 +333,7 @@ const statementBaseSchema = z.object({
   notes: z.string().max(5000).optional().nullable(),
 })
 
-// referenceIssuedAt is server-managed (only set at the submitted->available
-// transition) and is never a create input, so it is dropped from the create
-// schema. A whole-object POST that echoes it (null or a value) is accepted and
-// the field ignored, instead of a self-contradictory 400 (#5508).
-export const statementCreateSchema = rejectServerComputedFields(serverComputedStatementFields).pipe(
-  statementBaseSchema.omit({ referenceIssuedAt: true }),
-)
+export const statementCreateSchema = rejectServerComputedFields(serverComputedStatementFields).pipe(statementBaseSchema)
 
 export const statementUpdateSchema = rejectServerComputedFields(serverComputedStatementFields).pipe(
   z

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

@@ -239,7 +239,7 @@
   "eudr.lifecycle.amendWindowClosed": "Änderungsfenster geschlossen",
   "eudr.lifecycle.amendWindowRemaining": "Verbleibendes Änderungsfenster: {hours} Std. {minutes} Min.",
   "eudr.lifecycle.confirmArchive": "Erklärung archivieren?",
-  "eudr.lifecycle.confirmArchiveBody": "Die Erklärung wird archiviert.",
+  "eudr.lifecycle.confirmArchiveBody": "Die Erklärung wird archiviert. Archivierte Erklärungen sind schreibgeschützt und können nicht bearbeitet, wiederhergestellt oder gelöscht werden.",
   "eudr.lifecycle.confirmMarkAvailable": "Erklärung als verfügbar markieren?",
   "eudr.lifecycle.confirmMarkAvailableBody": "Referenzdetails sind erforderlich, bevor die Erklärung verfügbar wird.",
   "eudr.lifecycle.confirmReturnToDraft": "Erklärung in Entwurf zurücksetzen?",
@@ -313,7 +313,8 @@
   "eudr.mitigation_actions.update": "EUDR-Minderungsmaßnahme aktualisieren",
   "eudr.nav.group": "Compliance",
   "eudr.nav.mappings": "Produktzuordnungen",
-  "eudr.nav.overview": "Übersicht",
+  "eudr.nav.module": "EUDR",
+  "eudr.nav.overview": "EUDR-Übersicht",
   "eudr.nav.plots": "Parzellen",
   "eudr.nav.riskAssessments": "Risikobewertungen",
   "eudr.nav.statements": "Erklärungen",

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

@@ -239,7 +239,7 @@
   "eudr.lifecycle.amendWindowClosed": "Amend window closed",
   "eudr.lifecycle.amendWindowRemaining": "Amend window remaining: {hours} h {minutes} min",
   "eudr.lifecycle.confirmArchive": "Archive statement?",
-  "eudr.lifecycle.confirmArchiveBody": "The statement will be archived.",
+  "eudr.lifecycle.confirmArchiveBody": "The statement will be archived. Archived statements are read-only and cannot be edited, restored, or deleted.",
   "eudr.lifecycle.confirmMarkAvailable": "Mark statement available?",
   "eudr.lifecycle.confirmMarkAvailableBody": "Reference details are required before the statement becomes available.",
   "eudr.lifecycle.confirmReturnToDraft": "Return statement to draft?",
@@ -313,7 +313,8 @@
   "eudr.mitigation_actions.update": "Update EUDR mitigation action",
   "eudr.nav.group": "Compliance",
   "eudr.nav.mappings": "Product mappings",
-  "eudr.nav.overview": "Overview",
+  "eudr.nav.module": "EUDR",
+  "eudr.nav.overview": "EUDR Overview",
   "eudr.nav.plots": "Plots",
   "eudr.nav.riskAssessments": "Risk assessments",
   "eudr.nav.statements": "Statements",

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

@@ -239,7 +239,7 @@
   "eudr.lifecycle.amendWindowClosed": "Ventana de modificación cerrada",
   "eudr.lifecycle.amendWindowRemaining": "Ventana de modificación restante: {hours} h {minutes} min",
   "eudr.lifecycle.confirmArchive": "¿Archivar declaración?",
-  "eudr.lifecycle.confirmArchiveBody": "La declaración se archivará.",
+  "eudr.lifecycle.confirmArchiveBody": "La declaración se archivará. Las declaraciones archivadas son de solo lectura y no se pueden editar, restaurar ni eliminar.",
   "eudr.lifecycle.confirmMarkAvailable": "¿Marcar declaración como disponible?",
   "eudr.lifecycle.confirmMarkAvailableBody": "Los detalles de referencia son obligatorios antes de que la declaración esté disponible.",
   "eudr.lifecycle.confirmReturnToDraft": "¿Volver la declaración a borrador?",
@@ -313,7 +313,8 @@
   "eudr.mitigation_actions.update": "Actualizar acción de mitigación EUDR",
   "eudr.nav.group": "Cumplimiento",
   "eudr.nav.mappings": "Asignaciones de producto",
-  "eudr.nav.overview": "Resumen",
+  "eudr.nav.module": "EUDR",
+  "eudr.nav.overview": "Resumen EUDR",
   "eudr.nav.plots": "Parcelas",
   "eudr.nav.riskAssessments": "Evaluaciones de riesgo",
   "eudr.nav.statements": "Declaraciones",

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

@@ -239,7 +239,7 @@
   "eudr.lifecycle.amendWindowClosed": "수정 기간 종료",
   "eudr.lifecycle.amendWindowRemaining": "남은 수정 기간: {hours}시간 {minutes}분",
   "eudr.lifecycle.confirmArchive": "진술서를 보관하시겠습니까?",
-  "eudr.lifecycle.confirmArchiveBody": "진술서가 보관됩니다.",
+  "eudr.lifecycle.confirmArchiveBody": "진술서가 보관됩니다. 보관된 진술서는 읽기 전용이며 수정, 복원 또는 삭제할 수 없습니다.",
   "eudr.lifecycle.confirmMarkAvailable": "진술서를 사용 가능으로 표시하시겠습니까?",
   "eudr.lifecycle.confirmMarkAvailableBody": "진술서가 사용 가능해지기 전에 참조 세부 정보가 필요합니다.",
   "eudr.lifecycle.confirmReturnToDraft": "진술서를 초안으로 되돌리시겠습니까?",
@@ -313,7 +313,8 @@
   "eudr.mitigation_actions.update": "EUDR 완화 조치 업데이트",
   "eudr.nav.group": "준수",
   "eudr.nav.mappings": "제품 매핑",
-  "eudr.nav.overview": "개요",
+  "eudr.nav.module": "EUDR",
+  "eudr.nav.overview": "EUDR 개요",
   "eudr.nav.plots": "구획",
   "eudr.nav.riskAssessments": "위험 평가",
   "eudr.nav.statements": "진술서",

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

@@ -239,7 +239,7 @@
   "eudr.lifecycle.amendWindowClosed": "Okno zmiany zamknięte",
   "eudr.lifecycle.amendWindowRemaining": "Pozostały czas okna zmiany: {hours} godz. {minutes} min",
   "eudr.lifecycle.confirmArchive": "Zarchiwizować oświadczenie?",
-  "eudr.lifecycle.confirmArchiveBody": "Oświadczenie zostanie zarchiwizowane.",
+  "eudr.lifecycle.confirmArchiveBody": "Oświadczenie zostanie zarchiwizowane. Zarchiwizowane oświadczenia są tylko do odczytu i nie można ich edytować, przywrócić ani usunąć.",
   "eudr.lifecycle.confirmMarkAvailable": "Oznaczyć oświadczenie jako dostępne?",
   "eudr.lifecycle.confirmMarkAvailableBody": "Szczegóły referencji są wymagane, zanim oświadczenie stanie się dostępne.",
   "eudr.lifecycle.confirmReturnToDraft": "Przywrócić oświadczenie do wersji roboczej?",
@@ -313,7 +313,8 @@
   "eudr.mitigation_actions.update": "Zaktualizuj działanie ograniczające ryzyko EUDR",
   "eudr.nav.group": "Zgodność",
   "eudr.nav.mappings": "Mapowania produktów",
-  "eudr.nav.overview": "Przegląd",
+  "eudr.nav.module": "EUDR",
+  "eudr.nav.overview": "Przegląd EUDR",
   "eudr.nav.plots": "Działki",
   "eudr.nav.riskAssessments": "Oceny ryzyka",
   "eudr.nav.statements": "Oświadczenia",

package/src/modules/eudr/lib/statement-lifecycle.ts

@@ -13,6 +13,14 @@ export function canTransition(from: EudrStatementStatus, to: EudrStatementStatus
   return EUDR_STATEMENT_TRANSITIONS[from].includes(to)
 }
 
+export function isStatementReadOnly(status: EudrStatementStatus): boolean {
+  return status === 'archived'
+}
+
+export function canDeleteStatement(status: EudrStatementStatus): boolean {
+  return !isStatementReadOnly(status)
+}
+
 export const EUDR_AMEND_GUARDED_FIELDS = [
   'commodity',
   'quantityKg',

package/src/modules/feature_toggles/components/FeatureTogglesTable.tsx

@@ -81,7 +81,7 @@ export function FeatureTogglesTable() {
   const { data: featureTogglesData, isLoading } = useQuery({
     queryKey: ['feature_toggles', queryParams],
     queryFn: async () => {
-      const call = await apiCall<{ items: Row[]; total: number; totalPages: number; totalIsCapped?: boolean; page: number; pageSize: number; isSuperAdmin?: boolean }>(
+      const call = await apiCall<{ items: Row[]; total: number; totalPages: number; page: number; pageSize: number; isSuperAdmin?: boolean }>(
         `/api/feature_toggles/global${queryParams ? `?${queryParams}` : ''}`,
       )
       if (!call.ok) {
@@ -222,7 +222,6 @@ export function FeatureTogglesTable() {
         pageSize: featureTogglesData?.pageSize ?? 25,
         total: featureTogglesData?.total ?? 0,
         totalPages: featureTogglesData?.totalPages ?? 0,
-        totalIsCapped: featureTogglesData?.totalIsCapped === true,
         onPageChange: handlePageChange,
       }}
       rowActions={(row) => (

package/src/modules/feature_toggles/components/OverridesTable.tsx

@@ -45,7 +45,7 @@ export default function OverridesTable() {
             const call = await apiCall<{
                 items: OverrideListResponse[];
                 total: number;
-                totalPages: number; totalIsCapped?: boolean;
+                totalPages: number;
                 page: number;
                 pageSize: number;
                 isSuperAdmin?: boolean
@@ -153,7 +153,6 @@ export default function OverridesTable() {
                 pageSize: featureTogglesData?.pageSize ?? 25,
                 total: featureTogglesData?.total ?? 0,
                 totalPages: featureTogglesData?.totalPages ?? 0,
-                totalIsCapped: featureTogglesData?.totalIsCapped === true,
                 onPageChange: handlePageChange,
             }}
             refreshButton={{

package/src/modules/feature_toggles/defaults.json

@@ -16,6 +16,14 @@
       "type": "string",
       "defaultValue": "Free shipping on orders over $50"
     },
+    {
+      "identifier": "sales_channels_enabled",
+      "name": "Sales Channels",
+      "description": "Show sales channel pickers, filters, and management UI. Disable for tenants that do not use sales channels.",
+      "category": "sales",
+      "type": "boolean",
+      "defaultValue": true
+    },
     {
       "identifier": "order_review_threshold",
       "name": "Order Review Threshold",

package/src/modules/inbox_ops/backend/inbox-ops/log/page.tsx

@@ -28,7 +28,6 @@ type EmailListResponse = {
   total?: number
   page?: number
   totalPages?: number
-  totalIsCapped?: boolean
 }
 
 const STATUS_COLORS: Record<string, string> = {
@@ -43,7 +42,6 @@ export default function ProcessingLogPage() {
   const t = useT()
   const [items, setItems] = React.useState<EmailRow[]>([])
   const [total, setTotal] = React.useState(0)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [page, setPage] = React.useState(1)
   const [pageSize] = React.useState(25)
   const [statusFilter, setStatusFilter] = React.useState<string | undefined>()
@@ -67,7 +65,6 @@ export default function ProcessingLogPage() {
       if (result?.ok && result.result?.items) {
         setItems(result.result.items)
         setTotal(result.result.total || 0)
-        setTotalIsCapped(result.result.totalIsCapped === true)
       } else {
         setError(t('inbox_ops.log.load_failed', 'Failed to load processing log'))
       }
@@ -223,7 +220,6 @@ export default function ProcessingLogPage() {
                 pageSize,
                 total,
                 totalPages: Math.ceil(total / pageSize),
-                totalIsCapped,
                 onPageChange: setPage,
               }}
             />

package/src/modules/inbox_ops/backend/inbox-ops/page.tsx

@@ -41,7 +41,6 @@ type ProposalListResponse = {
   total?: number
   page?: number
   totalPages?: number
-  totalIsCapped?: boolean
 }
 
 type StatusCounts = {
@@ -91,7 +90,6 @@ export default function InboxOpsProposalsPage() {
 
   const [items, setItems] = React.useState<ProposalRow[]>([])
   const [total, setTotal] = React.useState(0)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [page, setPage] = React.useState(1)
   const [pageSize] = React.useState(25)
   const [filterValues, setFilterValues] = React.useState<FilterValues>({})
@@ -121,7 +119,6 @@ export default function InboxOpsProposalsPage() {
       if (result?.ok && result.result?.items) {
         setItems(result.result.items)
         setTotal(result.result.total || 0)
-        setTotalIsCapped(result.result.totalIsCapped === true)
       } else {
         setError(t('inbox_ops.flash.load_failed', 'Failed to load proposals'))
       }
@@ -387,7 +384,6 @@ export default function InboxOpsProposalsPage() {
             pageSize,
             total,
             totalPages: Math.ceil(total / pageSize),
-            totalIsCapped,
             onPageChange: setPage,
           }}
           isLoading={isLoading}

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

@@ -1 +1,17 @@
-export { htmlToPlainText } from '@open-mercato/shared/lib/html/htmlToPlainText'
+import { convert } from 'html-to-text'
+
+export function htmlToPlainText(html: string): string {
+  if (!html) return ''
+  return convert(html, {
+    wordwrap: false,
+    preserveNewlines: true,
+    selectors: [
+      { selector: 'script', format: 'skip' },
+      { selector: 'style', format: 'skip' },
+    ],
+  })
+    .replace(/\r\n/g, '\n')
+    .replace(/\r/g, '\n')
+    .replace(/\n{3,}/g, '\n\n')
+    .trim()
+}

package/src/modules/integrations/api/[id]/credentials/route.ts

@@ -183,13 +183,11 @@ export async function PUT(req: Request, ctx: { params?: Promise<{ id?: string }>
   }
 
   try {
+    // Secret fields are returned masked on GET; when the client round-trips the
+    // mask sentinel it means "unchanged", so restore the existing stored secret
+    // instead of overwriting it with the placeholder.
     const existing = await credentialsService.resolve(integration.id, scope)
-    const credentialsToSave = mergeMaskedSecretCredentials(
-      schema,
-      payloadData.credentials,
-      existing ?? {},
-      payloadData.unchangedSecretFields,
-    )
+    const credentialsToSave = mergeMaskedSecretCredentials(schema, payloadData.credentials, existing ?? {})
     await credentialsService.save(integration.id, credentialsToSave, scope)
   } catch (error) {
     if (isCredentialsEncryptionUnavailableError(error)) {

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

@@ -52,11 +52,6 @@ import {
   refreshIntegrationDetailPanels,
   refreshIntegrationRunActivityPanels,
 } from '../detail-page-refresh'
-import {
-  buildCredentialEditValues,
-  buildIntegrationCredentialSavePayload,
-  type SecretFieldsConfigured,
-} from '../credential-secret-fields'
 import { isValidCredentialUrl } from '../../../lib/credentials-field-validation'
 
 type CredentialField = IntegrationCredentialField
@@ -295,32 +290,19 @@ function resolvePathnameId(pathname: string): string | undefined {
   return decodeURIComponent(integrationId)
 }
 
-function buildCredentialFields(
-  credFields: CredentialField[],
-  secretFieldsConfigured: SecretFieldsConfigured,
-  t: ReturnType<typeof useT>,
-): CrudField[] {
+function buildCredentialFields(credFields: CredentialField[]): CrudField[] {
   return credFields.map((field) => {
-    const baseDescription = field.helpDetails ? (
-      <div className="space-y-1">
-        {field.helpText ? <div>{field.helpText}</div> : null}
-        <WebhookSetupGuide guide={field.helpDetails} />
-      </div>
-    ) : field.helpText
-    const description = field.type === 'secret' && secretFieldsConfigured[field.key] ? (
-      <div className="space-y-1">
-        {baseDescription ? <div>{baseDescription}</div> : null}
-        <p className="text-xs text-muted-foreground">
-          {t('integrations.detail.credentials.secretConfigured')}
-        </p>
-      </div>
-    ) : baseDescription
     const shared = {
       id: field.key,
       label: field.label,
-      description,
+      description: field.helpDetails ? (
+        <div className="space-y-1">
+          {field.helpText ? <div>{field.helpText}</div> : null}
+          <WebhookSetupGuide guide={field.helpDetails} buttonLabel="Show details" />
+        </div>
+      ) : field.helpText,
       placeholder: field.placeholder,
-      required: field.required && !(field.type === 'secret' && secretFieldsConfigured[field.key]),
+      required: field.required,
       visibleWhen: field.visibleWhen,
     }
 
@@ -335,7 +317,6 @@ function buildCredentialFields(
             value={typeof value === 'string' ? value : ''}
             onChange={(event) => setValue(event.target.value)}
             disabled={disabled}
-            autoComplete="new-password"
           />
         ),
       }
@@ -445,7 +426,6 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
   const [isNotFound, setIsNotFound] = React.useState(false)
 
   const [credValues, setCredValues] = React.useState<Record<string, unknown>>({})
-  const [secretFieldsConfigured, setSecretFieldsConfigured] = React.useState<SecretFieldsConfigured>({})
   const [credentialsUpdatedAt, setCredentialsUpdatedAt] = React.useState<string | null>(null)
   const [credentialsFormKey, setCredentialsFormKey] = React.useState(0)
   const [isSavingCredentials, setIsSavingCredentials] = React.useState(false)
@@ -510,18 +490,13 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
   const loadCredentials = React.useCallback(async () => {
     const currentIntegrationId = resolveCurrentIntegrationId()
     if (!currentIntegrationId) return
-    const call = await apiCall<{
-      credentials: Record<string, unknown>
-      secretFieldsConfigured?: SecretFieldsConfigured
-      updatedAt?: string | null
-    }>(
+    const call = await apiCall<{ credentials: Record<string, unknown>; updatedAt?: string | null }>(
       `/api/integrations/${encodeURIComponent(currentIntegrationId)}/credentials`,
       undefined,
       { fallback: null },
     )
     if (call.ok && call.result) {
       setCredentialsUpdatedAt(call.result.updatedAt ?? null)
-      setSecretFieldsConfigured(call.result.secretFieldsConfigured ?? {})
     }
     if (call.ok && call.result?.credentials) {
       const next = { ...call.result.credentials }
@@ -738,32 +713,35 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
     if (!currentIntegrationId) return
     setIsSavingCredentials(true)
     try {
-      const credentialFields = (
-        detail?.integration.credentials?.fields
-        ?? detail?.bundle?.credentials?.fields
-        ?? []
-      )
-      const savePayload = buildIntegrationCredentialSavePayload(
-        currentIntegrationId,
-        values,
-        credentialFields,
-        secretFieldsConfigured,
-      )
+      const sanitizedValues = { ...values }
+      if (currentIntegrationId === 'storage_s3') {
+        const authMode = sanitizedValues.authMode
+        if (authMode !== 'access_keys' && authMode !== 'ambient') {
+          const hasKeys = Boolean(sanitizedValues.accessKeyId || sanitizedValues.secretAccessKey)
+          sanitizedValues.authMode = hasKeys ? 'access_keys' : 'ambient'
+        }
+        if (sanitizedValues.authMode === 'ambient') {
+          delete sanitizedValues.accessKeyId
+          delete sanitizedValues.secretAccessKey
+          delete sanitizedValues.sessionToken
+        }
+      }
       const call = await runMutationWithContext({
         actionId: 'save-credentials',
         tabId: 'credentials',
-        mutationPayload: { integrationId: currentIntegrationId, ...savePayload },
+        mutationPayload: { integrationId: currentIntegrationId, credentials: sanitizedValues },
         operation: () => withScopedApiRequestHeaders(
           buildOptimisticLockHeader(credentialsUpdatedAt),
           () => apiCall(`/api/integrations/${encodeURIComponent(currentIntegrationId)}/credentials`, {
             method: 'PUT',
             headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(savePayload),
+            body: JSON.stringify({ credentials: sanitizedValues }),
           }, { fallback: null }),
         ),
       })
 
       if (call.ok) {
+        setCredValues(sanitizedValues)
         setCredentialsFormKey((current) => current + 1)
         flash(t('integrations.detail.credentials.saved'), 'success')
         void loadCredentials()
@@ -781,7 +759,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
     } finally {
       setIsSavingCredentials(false)
     }
-  }, [credentialsUpdatedAt, detail, loadCredentials, resolveCurrentIntegrationId, runMutationWithContext, secretFieldsConfigured, t])
+  }, [credentialsUpdatedAt, loadCredentials, resolveCurrentIntegrationId, runMutationWithContext, t])
 
   const handleVersionChange = React.useCallback(async (version: string) => {
     const currentIntegrationId = resolveCurrentIntegrationId()
@@ -859,12 +837,8 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
     [detail?.bundle?.credentials?.fields, detail?.integration.credentials?.fields],
   )
   const credentialFormFields = React.useMemo(
-    () => buildCredentialFields(editableCredentialFields, secretFieldsConfigured, t),
-    [editableCredentialFields, secretFieldsConfigured, t],
-  )
-  const credentialFormValues = React.useMemo(
-    () => buildCredentialEditValues(credValues, secretFieldsConfigured),
-    [credValues, secretFieldsConfigured],
+    () => buildCredentialFields(editableCredentialFields),
+    [editableCredentialFields],
   )
   const credentialSchema = React.useMemo(() => (
     z.object({}).passthrough().superRefine((rawValues, ctx) => {
@@ -906,11 +880,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
 
         const normalizedValue = typeof value === 'string' ? value : ''
 
-        if (
-          field.required
-          && normalizedValue.trim().length === 0
-          && !(field.type === 'secret' && secretFieldsConfigured[field.key])
-        ) {
+        if (field.required && normalizedValue.trim().length === 0) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
             path: [field.key],
@@ -952,7 +922,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
         }
       })
     })
-  ) as z.ZodType<Record<string, unknown>>, [editableCredentialFields, secretFieldsConfigured, t])
+  ) as z.ZodType<Record<string, unknown>>, [editableCredentialFields, t])
   const latestHealthLog = React.useMemo(() => logs.find(isHealthLog) ?? null, [logs])
   const latestOperationalLog = React.useMemo(
     () => logs.find((log) => (
@@ -1287,7 +1257,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
                     entityId="integrations.integration"
                     schema={credentialSchema}
                     fields={credentialFormFields}
-                    initialValues={credentialFormValues}
+                    initialValues={credValues}
                     onSubmit={handleSaveCredentials}
                     embedded
                     hideFooterActions