@open-mercato/core 0.6.6-develop.6229.1.ebe6706732 → 0.6.6-develop.6241.1.47c01ad4ed

package/dist/modules/integrations/api/route.js

@@ -97,6 +97,7 @@ async function GET(req) {
         lastHealthCheckedAt: state.lastHealthCheckedAt?.toISOString() ?? null,
         lastHealthLatencyMs: state.lastHealthLatencyMs,
         enabledAt: state.enabledAt?.toISOString() ?? null,
+        stateUpdatedAt: state.updatedAt?.toISOString() ?? null,
         sortEnabledAtMs: enabledAtMs,
         sortTitle: integration.title.toLowerCase(),
         sortCategory: (integration.category ?? "").toLowerCase()
@@ -170,6 +171,7 @@ async function GET(req) {
       lastHealthCheckedAt: row.lastHealthCheckedAt,
       lastHealthLatencyMs: row.lastHealthLatencyMs,
       enabledAt: row.enabledAt,
+      stateUpdatedAt: row.stateUpdatedAt,
       analytics: analytics ?? {
         lastActivityAt: null,
         totalCount: 0,

package/dist/modules/integrations/api/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/integrations/api/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { CredentialsEncryptionUnavailableError, type CredentialsService } from '../lib/credentials-service'\nimport type { IntegrationStateService } from '../lib/state-service'\nimport type { IntegrationLogService } from '../lib/log-service'\nimport { deriveIntegrationHealthStatus, getEffectiveHealthCheckConfig } from '../lib/health-service'\nimport type { IntegrationHealthDisplayStatus } from '../lib/health-service'\nimport { getAllBundles, getAllIntegrations } from '@open-mercato/shared/modules/integrations/types'\nimport { listIntegrationsQuerySchema } from '../data/validators'\nimport { buildIntegrationsCrudOpenApi, integrationsListResponseSchema } from './openapi'\nimport {\n  finalizeIntegrationsReadResponse,\n  integrationApiRoutePaths,\n  runIntegrationsReadBeforeInterceptors,\n} from './umes-read'\n\nexport const metadata = {\n  GET: { requireAuth: true, requireFeatures: ['integrations.view'] },\n}\n\nexport const openApi = buildIntegrationsCrudOpenApi({\n  resourceName: 'Integration',\n  pluralName: 'Integrations',\n  listResponseSchema: integrationsListResponseSchema,\n  querySchema: listIntegrationsQuerySchema,\n})\n\nconst HEALTH_SORT_RANK: Record<IntegrationHealthDisplayStatus, number> = {\n  healthy: 0,\n  degraded: 1,\n  unhealthy: 2,\n  unconfigured: 3,\n}\n\nfunction matchesSearchQuery(\n  integration: { title: string; description?: string; tags?: string[] },\n  queryNormalized: string,\n): boolean {\n  if (!queryNormalized) return true\n  if (integration.title.toLowerCase().includes(queryNormalized)) return true\n  if (integration.description?.toLowerCase().includes(queryNormalized)) return true\n  const tags = integration.tags ?? []\n  return tags.some((tag) => tag.toLowerCase().includes(queryNormalized))\n}\n\nexport async function GET(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n\n  const url = new URL(req.url)\n  const parsedQuery = listIntegrationsQuerySchema.safeParse(Object.fromEntries(url.searchParams.entries()))\n  if (!parsedQuery.success) {\n    return NextResponse.json({ error: 'Invalid query', details: parsedQuery.error.flatten() }, { status: 400 })\n  }\n  const query = parsedQuery.data\n\n  const container = await createRequestContainer()\n  const beforeInterceptors = await runIntegrationsReadBeforeInterceptors({\n    routePath: integrationApiRoutePaths.list,\n    request: req,\n    auth,\n    container,\n  })\n  if (!beforeInterceptors.ok) {\n    return NextResponse.json(beforeInterceptors.body, { status: beforeInterceptors.statusCode })\n  }\n  const credentialsService = container.resolve('integrationCredentialsService') as CredentialsService\n  const stateService = container.resolve('integrationStateService') as IntegrationStateService\n  const logService = container.resolve('integrationLogService') as IntegrationLogService\n\n  const scope = { organizationId: auth.orgId as string, tenantId: auth.tenantId as string }\n  const searchNeedle = query.q?.trim().toLowerCase() ?? ''\n\n  type ListRow = {\n    id: string\n    title: string\n    description: string | null\n    category: string | null\n    tags: string[]\n    hub: string | null\n    providerKey: string | null\n    bundleId: string | null\n    author: string | null\n    company: string | null\n    version: string | null\n    hasCredentials: boolean\n    isEnabled: boolean\n    apiVersion: string | null\n    healthStatus: IntegrationHealthDisplayStatus\n    lastHealthCheckedAt: string | null\n    lastHealthLatencyMs: number | null\n    enabledAt: string | null\n    sortEnabledAtMs: number\n    sortTitle: string\n    sortCategory: string\n  }\n\n  const baseRows: ListRow[] = await Promise.all(\n    getAllIntegrations().map(async (integration) => {\n      const [resolvedCredentials, state] = await Promise.all([\n        credentialsService.resolve(integration.id, scope).catch((err) => {\n          if (err instanceof CredentialsEncryptionUnavailableError) return null\n          throw err\n        }),\n        stateService.resolveState(integration.id, scope),\n      ])\n\n      const hasCredentials =\n        resolvedCredentials != null && Object.keys(resolvedCredentials).length > 0\n      const healthConfig = getEffectiveHealthCheckConfig(integration.id)\n      const hasHealthCheck = Boolean(healthConfig?.service)\n      const healthStatus = deriveIntegrationHealthStatus({\n        hasHealthCheck,\n        hasCredentials,\n        lastHealthStatus: state.lastHealthStatus,\n        lastHealthCheckedAt: state.lastHealthCheckedAt,\n      })\n\n      const enabledAtMs = state.enabledAt?.getTime() ?? 0\n\n      return {\n        id: integration.id,\n        title: integration.title,\n        description: integration.description ?? null,\n        category: integration.category ?? null,\n        tags: integration.tags ?? [],\n        hub: integration.hub ?? null,\n        providerKey: integration.providerKey ?? null,\n        bundleId: integration.bundleId ?? null,\n        author: integration.author ?? null,\n        company: integration.company ?? null,\n        version: integration.version ?? null,\n        hasCredentials,\n        isEnabled: state.isEnabled,\n        apiVersion: state.apiVersion,\n        healthStatus,\n        lastHealthCheckedAt: state.lastHealthCheckedAt?.toISOString() ?? null,\n        lastHealthLatencyMs: state.lastHealthLatencyMs,\n        enabledAt: state.enabledAt?.toISOString() ?? null,\n        sortEnabledAtMs: enabledAtMs,\n        sortTitle: integration.title.toLowerCase(),\n        sortCategory: (integration.category ?? '').toLowerCase(),\n      }\n    }),\n  )\n\n  let filtered = baseRows.filter((row) => matchesSearchQuery(\n    { title: row.title, description: row.description ?? undefined, tags: row.tags },\n    searchNeedle,\n  ))\n\n  if (query.category) {\n    filtered = filtered.filter((row) => row.category === query.category)\n  }\n  if (query.bundleId) {\n    filtered = filtered.filter((row) => row.bundleId === query.bundleId)\n  }\n  if (query.isEnabled !== undefined) {\n    filtered = filtered.filter((row) => row.isEnabled === query.isEnabled)\n  }\n  if (query.healthStatus) {\n    filtered = filtered.filter((row) => row.healthStatus === query.healthStatus)\n  }\n\n  const sortKey = query.sort ?? 'title'\n  const orderSign = query.order === 'desc' ? -1 : 1\n\n  const sorted = [...filtered].sort((rowA, rowB) => {\n    let cmp = 0\n    if (sortKey === 'title') {\n      cmp = rowA.sortTitle.localeCompare(rowB.sortTitle)\n    } else if (sortKey === 'category') {\n      cmp = rowA.sortCategory.localeCompare(rowB.sortCategory)\n      if (cmp === 0) cmp = rowA.sortTitle.localeCompare(rowB.sortTitle)\n    } else if (sortKey === 'enabledAt') {\n      cmp = rowA.sortEnabledAtMs - rowB.sortEnabledAtMs\n      if (cmp === 0) cmp = rowA.sortTitle.localeCompare(rowB.sortTitle)\n    } else if (sortKey === 'healthStatus') {\n      cmp = HEALTH_SORT_RANK[rowA.healthStatus] - HEALTH_SORT_RANK[rowB.healthStatus]\n      if (cmp === 0) cmp = rowA.sortTitle.localeCompare(rowB.sortTitle)\n    }\n    return cmp * orderSign\n  })\n\n  const total = sorted.length\n  const pageSize = query.pageSize\n  const page = query.page\n  const totalPages = Math.max(1, Math.ceil(total / pageSize) || 1)\n  const safePage = Math.min(page, totalPages)\n  const offset = (safePage - 1) * pageSize\n  const pageSlice = sorted.slice(offset, offset + pageSize)\n\n  const analyticsMap = await logService.aggregateAnalytics(\n    pageSlice.map((row) => row.id),\n    scope,\n    30,\n  )\n\n  const items = pageSlice.map((row) => {\n    const analytics = analyticsMap.get(row.id)\n    return {\n      id: row.id,\n      title: row.title,\n      description: row.description,\n      category: row.category,\n      tags: row.tags,\n      hub: row.hub,\n      providerKey: row.providerKey,\n      bundleId: row.bundleId,\n      author: row.author,\n      company: row.company,\n      version: row.version,\n      hasCredentials: row.hasCredentials,\n      isEnabled: row.isEnabled,\n      apiVersion: row.apiVersion,\n      healthStatus: row.healthStatus,\n      lastHealthCheckedAt: row.lastHealthCheckedAt,\n      lastHealthLatencyMs: row.lastHealthLatencyMs,\n      enabledAt: row.enabledAt,\n      analytics: analytics ?? {\n        lastActivityAt: null,\n        totalCount: 0,\n        errorCount: 0,\n        errorRate: 0,\n        dailyCounts: Array.from({ length: 30 }, () => 0),\n      },\n    }\n  })\n\n  const bundles = getAllBundles().map((bundle) => {\n    const bundleIntegrations = filtered.filter((row) => row.bundleId === bundle.id)\n    const enabledCount = bundleIntegrations.reduce((count, integration) => count + (integration.isEnabled ? 1 : 0), 0)\n\n    return {\n      id: bundle.id,\n      title: bundle.title,\n      description: bundle.description,\n      icon: bundle.icon ?? null,\n      integrationCount: bundleIntegrations.length,\n      enabledCount,\n    }\n  })\n\n  return finalizeIntegrationsReadResponse({\n    routePath: integrationApiRoutePaths.list,\n    request: req,\n    auth,\n    container,\n    interceptorRequest: beforeInterceptors.request,\n    beforeMetadata: beforeInterceptors.metadataByInterceptor,\n    enrich: {\n      targetEntity: 'integrations.integration',\n      listKeys: ['items'],\n    },\n    body: {\n      items,\n      bundles,\n      total,\n      page: safePage,\n      pageSize,\n      totalPages,\n    },\n  })\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { CredentialsEncryptionUnavailableError, type CredentialsService } from '../lib/credentials-service'\nimport type { IntegrationStateService } from '../lib/state-service'\nimport type { IntegrationLogService } from '../lib/log-service'\nimport { deriveIntegrationHealthStatus, getEffectiveHealthCheckConfig } from '../lib/health-service'\nimport type { IntegrationHealthDisplayStatus } from '../lib/health-service'\nimport { getAllBundles, getAllIntegrations } from '@open-mercato/shared/modules/integrations/types'\nimport { listIntegrationsQuerySchema } from '../data/validators'\nimport { buildIntegrationsCrudOpenApi, integrationsListResponseSchema } from './openapi'\nimport {\n  finalizeIntegrationsReadResponse,\n  integrationApiRoutePaths,\n  runIntegrationsReadBeforeInterceptors,\n} from './umes-read'\n\nexport const metadata = {\n  GET: { requireAuth: true, requireFeatures: ['integrations.view'] },\n}\n\nexport const openApi = buildIntegrationsCrudOpenApi({\n  resourceName: 'Integration',\n  pluralName: 'Integrations',\n  listResponseSchema: integrationsListResponseSchema,\n  querySchema: listIntegrationsQuerySchema,\n})\n\nconst HEALTH_SORT_RANK: Record<IntegrationHealthDisplayStatus, number> = {\n  healthy: 0,\n  degraded: 1,\n  unhealthy: 2,\n  unconfigured: 3,\n}\n\nfunction matchesSearchQuery(\n  integration: { title: string; description?: string; tags?: string[] },\n  queryNormalized: string,\n): boolean {\n  if (!queryNormalized) return true\n  if (integration.title.toLowerCase().includes(queryNormalized)) return true\n  if (integration.description?.toLowerCase().includes(queryNormalized)) return true\n  const tags = integration.tags ?? []\n  return tags.some((tag) => tag.toLowerCase().includes(queryNormalized))\n}\n\nexport async function GET(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n\n  const url = new URL(req.url)\n  const parsedQuery = listIntegrationsQuerySchema.safeParse(Object.fromEntries(url.searchParams.entries()))\n  if (!parsedQuery.success) {\n    return NextResponse.json({ error: 'Invalid query', details: parsedQuery.error.flatten() }, { status: 400 })\n  }\n  const query = parsedQuery.data\n\n  const container = await createRequestContainer()\n  const beforeInterceptors = await runIntegrationsReadBeforeInterceptors({\n    routePath: integrationApiRoutePaths.list,\n    request: req,\n    auth,\n    container,\n  })\n  if (!beforeInterceptors.ok) {\n    return NextResponse.json(beforeInterceptors.body, { status: beforeInterceptors.statusCode })\n  }\n  const credentialsService = container.resolve('integrationCredentialsService') as CredentialsService\n  const stateService = container.resolve('integrationStateService') as IntegrationStateService\n  const logService = container.resolve('integrationLogService') as IntegrationLogService\n\n  const scope = { organizationId: auth.orgId as string, tenantId: auth.tenantId as string }\n  const searchNeedle = query.q?.trim().toLowerCase() ?? ''\n\n  type ListRow = {\n    id: string\n    title: string\n    description: string | null\n    category: string | null\n    tags: string[]\n    hub: string | null\n    providerKey: string | null\n    bundleId: string | null\n    author: string | null\n    company: string | null\n    version: string | null\n    hasCredentials: boolean\n    isEnabled: boolean\n    apiVersion: string | null\n    healthStatus: IntegrationHealthDisplayStatus\n    lastHealthCheckedAt: string | null\n    lastHealthLatencyMs: number | null\n    enabledAt: string | null\n    stateUpdatedAt: string | null\n    sortEnabledAtMs: number\n    sortTitle: string\n    sortCategory: string\n  }\n\n  const baseRows: ListRow[] = await Promise.all(\n    getAllIntegrations().map(async (integration) => {\n      const [resolvedCredentials, state] = await Promise.all([\n        credentialsService.resolve(integration.id, scope).catch((err) => {\n          if (err instanceof CredentialsEncryptionUnavailableError) return null\n          throw err\n        }),\n        stateService.resolveState(integration.id, scope),\n      ])\n\n      const hasCredentials =\n        resolvedCredentials != null && Object.keys(resolvedCredentials).length > 0\n      const healthConfig = getEffectiveHealthCheckConfig(integration.id)\n      const hasHealthCheck = Boolean(healthConfig?.service)\n      const healthStatus = deriveIntegrationHealthStatus({\n        hasHealthCheck,\n        hasCredentials,\n        lastHealthStatus: state.lastHealthStatus,\n        lastHealthCheckedAt: state.lastHealthCheckedAt,\n      })\n\n      const enabledAtMs = state.enabledAt?.getTime() ?? 0\n\n      return {\n        id: integration.id,\n        title: integration.title,\n        description: integration.description ?? null,\n        category: integration.category ?? null,\n        tags: integration.tags ?? [],\n        hub: integration.hub ?? null,\n        providerKey: integration.providerKey ?? null,\n        bundleId: integration.bundleId ?? null,\n        author: integration.author ?? null,\n        company: integration.company ?? null,\n        version: integration.version ?? null,\n        hasCredentials,\n        isEnabled: state.isEnabled,\n        apiVersion: state.apiVersion,\n        healthStatus,\n        lastHealthCheckedAt: state.lastHealthCheckedAt?.toISOString() ?? null,\n        lastHealthLatencyMs: state.lastHealthLatencyMs,\n        enabledAt: state.enabledAt?.toISOString() ?? null,\n        stateUpdatedAt: state.updatedAt?.toISOString() ?? null,\n        sortEnabledAtMs: enabledAtMs,\n        sortTitle: integration.title.toLowerCase(),\n        sortCategory: (integration.category ?? '').toLowerCase(),\n      }\n    }),\n  )\n\n  let filtered = baseRows.filter((row) => matchesSearchQuery(\n    { title: row.title, description: row.description ?? undefined, tags: row.tags },\n    searchNeedle,\n  ))\n\n  if (query.category) {\n    filtered = filtered.filter((row) => row.category === query.category)\n  }\n  if (query.bundleId) {\n    filtered = filtered.filter((row) => row.bundleId === query.bundleId)\n  }\n  if (query.isEnabled !== undefined) {\n    filtered = filtered.filter((row) => row.isEnabled === query.isEnabled)\n  }\n  if (query.healthStatus) {\n    filtered = filtered.filter((row) => row.healthStatus === query.healthStatus)\n  }\n\n  const sortKey = query.sort ?? 'title'\n  const orderSign = query.order === 'desc' ? -1 : 1\n\n  const sorted = [...filtered].sort((rowA, rowB) => {\n    let cmp = 0\n    if (sortKey === 'title') {\n      cmp = rowA.sortTitle.localeCompare(rowB.sortTitle)\n    } else if (sortKey === 'category') {\n      cmp = rowA.sortCategory.localeCompare(rowB.sortCategory)\n      if (cmp === 0) cmp = rowA.sortTitle.localeCompare(rowB.sortTitle)\n    } else if (sortKey === 'enabledAt') {\n      cmp = rowA.sortEnabledAtMs - rowB.sortEnabledAtMs\n      if (cmp === 0) cmp = rowA.sortTitle.localeCompare(rowB.sortTitle)\n    } else if (sortKey === 'healthStatus') {\n      cmp = HEALTH_SORT_RANK[rowA.healthStatus] - HEALTH_SORT_RANK[rowB.healthStatus]\n      if (cmp === 0) cmp = rowA.sortTitle.localeCompare(rowB.sortTitle)\n    }\n    return cmp * orderSign\n  })\n\n  const total = sorted.length\n  const pageSize = query.pageSize\n  const page = query.page\n  const totalPages = Math.max(1, Math.ceil(total / pageSize) || 1)\n  const safePage = Math.min(page, totalPages)\n  const offset = (safePage - 1) * pageSize\n  const pageSlice = sorted.slice(offset, offset + pageSize)\n\n  const analyticsMap = await logService.aggregateAnalytics(\n    pageSlice.map((row) => row.id),\n    scope,\n    30,\n  )\n\n  const items = pageSlice.map((row) => {\n    const analytics = analyticsMap.get(row.id)\n    return {\n      id: row.id,\n      title: row.title,\n      description: row.description,\n      category: row.category,\n      tags: row.tags,\n      hub: row.hub,\n      providerKey: row.providerKey,\n      bundleId: row.bundleId,\n      author: row.author,\n      company: row.company,\n      version: row.version,\n      hasCredentials: row.hasCredentials,\n      isEnabled: row.isEnabled,\n      apiVersion: row.apiVersion,\n      healthStatus: row.healthStatus,\n      lastHealthCheckedAt: row.lastHealthCheckedAt,\n      lastHealthLatencyMs: row.lastHealthLatencyMs,\n      enabledAt: row.enabledAt,\n      stateUpdatedAt: row.stateUpdatedAt,\n      analytics: analytics ?? {\n        lastActivityAt: null,\n        totalCount: 0,\n        errorCount: 0,\n        errorRate: 0,\n        dailyCounts: Array.from({ length: 30 }, () => 0),\n      },\n    }\n  })\n\n  const bundles = getAllBundles().map((bundle) => {\n    const bundleIntegrations = filtered.filter((row) => row.bundleId === bundle.id)\n    const enabledCount = bundleIntegrations.reduce((count, integration) => count + (integration.isEnabled ? 1 : 0), 0)\n\n    return {\n      id: bundle.id,\n      title: bundle.title,\n      description: bundle.description,\n      icon: bundle.icon ?? null,\n      integrationCount: bundleIntegrations.length,\n      enabledCount,\n    }\n  })\n\n  return finalizeIntegrationsReadResponse({\n    routePath: integrationApiRoutePaths.list,\n    request: req,\n    auth,\n    container,\n    interceptorRequest: beforeInterceptors.request,\n    beforeMetadata: beforeInterceptors.metadataByInterceptor,\n    enrich: {\n      targetEntity: 'integrations.integration',\n      listKeys: ['items'],\n    },\n    body: {\n      items,\n      bundles,\n      total,\n      page: safePage,\n      pageSize,\n      totalPages,\n    },\n  })\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/integrations/backend/integrations/[id]/page.js

@@ -24,7 +24,8 @@ 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";
-import { apiCall } from "@open-mercato/ui/backend/utils/apiCall";
+import { apiCall, withScopedApiRequestHeaders } from "@open-mercato/ui/backend/utils/apiCall";
+import { buildOptimisticLockHeader } from "@open-mercato/ui/backend/utils/optimisticLock";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
 import { createCrudFormError } from "@open-mercato/ui/backend/utils/serverErrors";
 import { useT } from "@open-mercato/shared/lib/i18n/context";
@@ -281,6 +282,7 @@ function IntegrationDetailPage({ params }) {
   const [error, setError] = React.useState(null);
   const [isNotFound, setIsNotFound] = React.useState(false);
   const [credValues, setCredValues] = React.useState({});
+  const [credentialsUpdatedAt, setCredentialsUpdatedAt] = React.useState(null);
   const [credentialsFormKey, setCredentialsFormKey] = React.useState(0);
   const [isSavingCredentials, setIsSavingCredentials] = React.useState(false);
   const [logs, setLogs] = React.useState([]);
@@ -339,6 +341,9 @@ function IntegrationDetailPage({ params }) {
       void 0,
       { fallback: null }
     );
+    if (call.ok && call.result) {
+      setCredentialsUpdatedAt(call.result.updatedAt ?? null);
+    }
     if (call.ok && call.result?.credentials) {
       const next = { ...call.result.credentials };
       if (currentIntegrationId === "storage_s3") {
@@ -509,11 +514,14 @@ function IntegrationDetailPage({ params }) {
       const call = await runMutationWithContext({
         actionId: "toggle-state",
         mutationPayload: { integrationId: currentIntegrationId, isEnabled: enabled },
-        operation: () => apiCall(`/api/integrations/${encodeURIComponent(currentIntegrationId)}/state`, {
-          method: "PUT",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ isEnabled: enabled })
-        }, { fallback: null })
+        operation: () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(detail?.state.updatedAt),
+          () => apiCall(`/api/integrations/${encodeURIComponent(currentIntegrationId)}/state`, {
+            method: "PUT",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ isEnabled: enabled })
+          }, { fallback: null })
+        )
       });
       if (call.ok) {
         setDetail((prev) => prev ? {
@@ -525,6 +533,7 @@ function IntegrationDetailPage({ params }) {
           }
         } : prev);
         flash(t("integrations.detail.stateUpdated"), "success");
+        void refreshDetail();
       } else {
         flash(t("integrations.detail.stateError"), "error");
       }
@@ -533,7 +542,7 @@ function IntegrationDetailPage({ params }) {
     } finally {
       setIsTogglingState(false);
     }
-  }, [resolveCurrentIntegrationId, runMutationWithContext, t]);
+  }, [detail?.state.updatedAt, refreshDetail, resolveCurrentIntegrationId, runMutationWithContext, t]);
   const handleSaveCredentials = React.useCallback(async (values) => {
     const currentIntegrationId = resolveCurrentIntegrationId();
     if (!currentIntegrationId) return;
@@ -556,16 +565,20 @@ function IntegrationDetailPage({ params }) {
         actionId: "save-credentials",
         tabId: "credentials",
         mutationPayload: { integrationId: currentIntegrationId, credentials: sanitizedValues },
-        operation: () => apiCall(`/api/integrations/${encodeURIComponent(currentIntegrationId)}/credentials`, {
-          method: "PUT",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ credentials: sanitizedValues })
-        }, { fallback: null })
+        operation: () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(credentialsUpdatedAt),
+          () => apiCall(`/api/integrations/${encodeURIComponent(currentIntegrationId)}/credentials`, {
+            method: "PUT",
+            headers: { "Content-Type": "application/json" },
+            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();
         return;
       }
       const result = call.result;
@@ -577,7 +590,7 @@ function IntegrationDetailPage({ params }) {
     } finally {
       setIsSavingCredentials(false);
     }
-  }, [resolveCurrentIntegrationId, runMutationWithContext, t]);
+  }, [credentialsUpdatedAt, loadCredentials, resolveCurrentIntegrationId, runMutationWithContext, t]);
   const handleVersionChange = React.useCallback(async (version) => {
     const currentIntegrationId = resolveCurrentIntegrationId();
     if (!currentIntegrationId) return;
@@ -586,22 +599,26 @@ function IntegrationDetailPage({ params }) {
         actionId: "change-version",
         tabId: "version",
         mutationPayload: { integrationId: currentIntegrationId, apiVersion: version },
-        operation: () => apiCall(`/api/integrations/${encodeURIComponent(currentIntegrationId)}/version`, {
-          method: "PUT",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ apiVersion: version })
-        }, { fallback: null })
+        operation: () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(detail?.state.updatedAt),
+          () => apiCall(`/api/integrations/${encodeURIComponent(currentIntegrationId)}/version`, {
+            method: "PUT",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ apiVersion: version })
+          }, { fallback: null })
+        )
       });
       if (call.ok) {
         setDetail((prev) => prev ? { ...prev, state: { ...prev.state, apiVersion: version } } : prev);
         flash(t("integrations.detail.version.saved"), "success");
+        void refreshDetail();
       } else {
         flash(t("integrations.detail.version.saveError"), "error");
       }
     } catch {
       flash(t("integrations.detail.version.saveError"), "error");
     }
-  }, [resolveCurrentIntegrationId, runMutationWithContext, t]);
+  }, [detail?.state.updatedAt, refreshDetail, resolveCurrentIntegrationId, runMutationWithContext, t]);
   const handleHealthCheck = React.useCallback(async () => {
     const currentIntegrationId = resolveCurrentIntegrationId();
     if (!currentIntegrationId) return;