diff --git a/backend/internal/handler/admin/ops_handler.go b/backend/internal/handler/admin/ops_handler.go
index c76b6a60..822f7d62 100644
--- a/backend/internal/handler/admin/ops_handler.go
+++ b/backend/internal/handler/admin/ops_handler.go
@@ -19,6 +19,34 @@ type OpsHandler struct {
 	opsService *service.OpsService
 }
 
+// GetErrorLogByID returns ops error log detail.
+// GET /api/v1/admin/ops/errors/:id
+func (h *OpsHandler) GetErrorLogByID(c *gin.Context) {
+	if h.opsService == nil {
+		response.Error(c, http.StatusServiceUnavailable, "Ops service not available")
+		return
+	}
+	if err := h.opsService.RequireMonitoringEnabled(c.Request.Context()); err != nil {
+		response.ErrorFrom(c, err)
+		return
+	}
+
+	idStr := strings.TrimSpace(c.Param("id"))
+	id, err := strconv.ParseInt(idStr, 10, 64)
+	if err != nil || id <= 0 {
+		response.BadRequest(c, "Invalid error id")
+		return
+	}
+
+	detail, err := h.opsService.GetErrorLogByID(c.Request.Context(), id)
+	if err != nil {
+		response.ErrorFrom(c, err)
+		return
+	}
+
+	response.Success(c, detail)
+}
+
 const (
 	opsListViewErrors   = "errors"
 	opsListViewExcluded = "excluded"
@@ -70,16 +98,25 @@ func (h *OpsHandler) GetErrorLogs(c *gin.Context) {
 		return
 	}
 
-	filter := &service.OpsErrorLogFilter{
-		Page:     page,
-		PageSize: pageSize,
-	}
+	filter := &service.OpsErrorLogFilter{Page: page, PageSize: pageSize}
+
 	if !startTime.IsZero() {
 		filter.StartTime = &startTime
 	}
 	if !endTime.IsZero() {
 		filter.EndTime = &endTime
 	}
+	filter.View = parseOpsViewParam(c)
+	filter.Phase = strings.TrimSpace(c.Query("phase"))
+	filter.Owner = strings.TrimSpace(c.Query("error_owner"))
+	filter.Source = strings.TrimSpace(c.Query("error_source"))
+	filter.Query = strings.TrimSpace(c.Query("q"))
+
+	// Force request errors: client-visible status >= 400.
+	// buildOpsErrorLogsWhere already applies this for non-upstream phase.
+	if strings.EqualFold(strings.TrimSpace(filter.Phase), "upstream") {
+		filter.Phase = ""
+	}
 
 	if platform := strings.TrimSpace(c.Query("platform")); platform != "" {
 		filter.Platform = platform
@@ -100,22 +137,7 @@ func (h *OpsHandler) GetErrorLogs(c *gin.Context) {
 		}
 		filter.AccountID = &id
 	}
-	if phase := strings.TrimSpace(c.Query("phase")); phase != "" {
-		filter.Phase = phase
-	}
-	if owner := strings.TrimSpace(c.Query("error_owner")); owner != "" {
-		filter.Owner = owner
-	}
-	if source := strings.TrimSpace(c.Query("error_source")); source != "" {
-		filter.Source = source
-	}
-	filter.View = parseOpsViewParam(c)
 
-	// Legacy endpoint default: unresolved only (backward-compatible).
-	{
-		b := false
-		filter.Resolved = &b
-	}
 	if v := strings.TrimSpace(c.Query("resolved")); v != "" {
 		switch strings.ToLower(v) {
 		case "1", "true", "yes":
@@ -129,9 +151,6 @@ func (h *OpsHandler) GetErrorLogs(c *gin.Context) {
 			return
 		}
 	}
-	if q := strings.TrimSpace(c.Query("q")); q != "" {
-		filter.Query = q
-	}
 	if statusCodesStr := strings.TrimSpace(c.Query("status_codes")); statusCodesStr != "" {
 		parts := strings.Split(statusCodesStr, ",")
 		out := make([]int, 0, len(parts))
@@ -149,57 +168,15 @@ func (h *OpsHandler) GetErrorLogs(c *gin.Context) {
 		}
 		filter.StatusCodes = out
 	}
-	if v := strings.TrimSpace(c.Query("status_codes_other")); v != "" {
-		switch strings.ToLower(v) {
-		case "1", "true", "yes":
-			filter.StatusCodesOther = true
-		case "0", "false", "no":
-			filter.StatusCodesOther = false
-		default:
-			response.BadRequest(c, "Invalid status_codes_other")
-			return
-		}
-	}
 
 	result, err := h.opsService.GetErrorLogs(c.Request.Context(), filter)
 	if err != nil {
 		response.ErrorFrom(c, err)
 		return
 	}
-
 	response.Paginated(c, result.Errors, int64(result.Total), result.Page, result.PageSize)
 }
 
-// GetErrorLogByID returns a single error log detail.
-// GET /api/v1/admin/ops/errors/:id
-func (h *OpsHandler) GetErrorLogByID(c *gin.Context) {
-	if h.opsService == nil {
-		response.Error(c, http.StatusServiceUnavailable, "Ops service not available")
-		return
-	}
-	if err := h.opsService.RequireMonitoringEnabled(c.Request.Context()); err != nil {
-		response.ErrorFrom(c, err)
-		return
-	}
-
-	idStr := strings.TrimSpace(c.Param("id"))
-	id, err := strconv.ParseInt(idStr, 10, 64)
-	if err != nil || id <= 0 {
-		response.BadRequest(c, "Invalid error id")
-		return
-	}
-
-	detail, err := h.opsService.GetErrorLogByID(c.Request.Context(), id)
-	if err != nil {
-		response.ErrorFrom(c, err)
-		return
-	}
-
-	response.Success(c, detail)
-}
-
-// ==================== New split endpoints ====================
-
 // ListRequestErrors lists client-visible request errors.
 // GET /api/v1/admin/ops/request-errors
 func (h *OpsHandler) ListRequestErrors(c *gin.Context) {
@@ -307,6 +284,104 @@ func (h *OpsHandler) GetRequestError(c *gin.Context) {
 	h.GetErrorLogByID(c)
 }
 
+// ListRequestErrorUpstreamErrors lists upstream error logs correlated to a request error.
+// GET /api/v1/admin/ops/request-errors/:id/upstream-errors
+func (h *OpsHandler) ListRequestErrorUpstreamErrors(c *gin.Context) {
+	if h.opsService == nil {
+		response.Error(c, http.StatusServiceUnavailable, "Ops service not available")
+		return
+	}
+	if err := h.opsService.RequireMonitoringEnabled(c.Request.Context()); err != nil {
+		response.ErrorFrom(c, err)
+		return
+	}
+
+	idStr := strings.TrimSpace(c.Param("id"))
+	id, err := strconv.ParseInt(idStr, 10, 64)
+	if err != nil || id <= 0 {
+		response.BadRequest(c, "Invalid error id")
+		return
+	}
+
+	// Load request error to get correlation keys.
+	detail, err := h.opsService.GetErrorLogByID(c.Request.Context(), id)
+	if err != nil {
+		response.ErrorFrom(c, err)
+		return
+	}
+
+	// Correlate by request_id/client_request_id.
+	requestID := strings.TrimSpace(detail.RequestID)
+	clientRequestID := strings.TrimSpace(detail.ClientRequestID)
+	if requestID == "" && clientRequestID == "" {
+		response.Paginated(c, []*service.OpsErrorLog{}, 0, 1, 10)
+		return
+	}
+
+	page, pageSize := response.ParsePagination(c)
+	if pageSize > 500 {
+		pageSize = 500
+	}
+
+	// Keep correlation window wide enough so linked upstream errors
+	// are discoverable even when UI defaults to 1h elsewhere.
+	startTime, endTime, err := parseOpsTimeRange(c, "30d")
+	if err != nil {
+		response.BadRequest(c, err.Error())
+		return
+	}
+
+	filter := &service.OpsErrorLogFilter{Page: page, PageSize: pageSize}
+	if !startTime.IsZero() {
+		filter.StartTime = &startTime
+	}
+	if !endTime.IsZero() {
+		filter.EndTime = &endTime
+	}
+	filter.View = "all"
+	filter.Phase = "upstream"
+	filter.Owner = "provider"
+	filter.Source = strings.TrimSpace(c.Query("error_source"))
+	filter.Query = strings.TrimSpace(c.Query("q"))
+
+	if platform := strings.TrimSpace(c.Query("platform")); platform != "" {
+		filter.Platform = platform
+	}
+
+	// Prefer exact match on request_id; if missing, fall back to client_request_id.
+	if requestID != "" {
+		filter.RequestID = requestID
+	} else {
+		filter.ClientRequestID = clientRequestID
+	}
+
+	result, err := h.opsService.GetErrorLogs(c.Request.Context(), filter)
+	if err != nil {
+		response.ErrorFrom(c, err)
+		return
+	}
+
+	// If client asks for details, expand each upstream error log to include upstream response fields.
+	includeDetail := strings.TrimSpace(c.Query("include_detail"))
+	if includeDetail == "1" || strings.EqualFold(includeDetail, "true") || strings.EqualFold(includeDetail, "yes") {
+		details := make([]*service.OpsErrorLogDetail, 0, len(result.Errors))
+		for _, item := range result.Errors {
+			if item == nil {
+				continue
+			}
+			d, err := h.opsService.GetErrorLogByID(c.Request.Context(), item.ID)
+			if err != nil || d == nil {
+				continue
+			}
+			details = append(details, d)
+		}
+		response.Paginated(c, details, int64(result.Total), result.Page, result.PageSize)
+		return
+	}
+
+	response.Paginated(c, result.Errors, int64(result.Total), result.Page, result.PageSize)
+}
+
 // RetryRequestErrorClient retries the client request based on stored request body.
 // POST /api/v1/admin/ops/request-errors/:id/retry-client
 func (h *OpsHandler) RetryRequestErrorClient(c *gin.Context) {
diff --git a/backend/internal/repository/ops_repo.go b/backend/internal/repository/ops_repo.go
index 0535547d..ef03dc8e 100644
--- a/backend/internal/repository/ops_repo.go
+++ b/backend/internal/repository/ops_repo.go
@@ -1008,6 +1008,16 @@ func buildOpsErrorLogsWhere(filter *service.OpsErrorLogFilter) (string, []any) {
 		args = append(args, pq.Array(known))
 		clauses = append(clauses, "NOT (COALESCE(upstream_status_code, status_code, 0) = ANY($"+itoa(len(args))+"))")
 	}
+	// Exact correlation keys (preferred for request↔upstream linkage).
+	if rid := strings.TrimSpace(filter.RequestID); rid != "" {
+		args = append(args, rid)
+		clauses = append(clauses, "COALESCE(request_id,'') = $"+itoa(len(args)))
+	}
+	if crid := strings.TrimSpace(filter.ClientRequestID); crid != "" {
+		args = append(args, crid)
+		clauses = append(clauses, "COALESCE(client_request_id,'') = $"+itoa(len(args)))
+	}
+
 	if q := strings.TrimSpace(filter.Query); q != "" {
 		like := "%" + q + "%"
 		args = append(args, like)
diff --git a/backend/internal/server/routes/admin.go b/backend/internal/server/routes/admin.go
index 53702766..ae4a6681 100644
--- a/backend/internal/server/routes/admin.go
+++ b/backend/internal/server/routes/admin.go
@@ -123,6 +123,7 @@ func registerOpsRoutes(admin *gin.RouterGroup, h *handler.Handlers) {
 		// Request errors (client-visible failures)
 		ops.GET("/request-errors", h.Admin.Ops.ListRequestErrors)
 		ops.GET("/request-errors/:id", h.Admin.Ops.GetRequestError)
+		ops.GET("/request-errors/:id/upstream-errors", h.Admin.Ops.ListRequestErrorUpstreamErrors)
 		ops.POST("/request-errors/:id/retry-client", h.Admin.Ops.RetryRequestErrorClient)
 		ops.POST("/request-errors/:id/upstream-errors/:idx/retry", h.Admin.Ops.RetryRequestErrorUpstreamEvent)
 		ops.PUT("/request-errors/:id/resolve", h.Admin.Ops.ResolveRequestError)
diff --git a/backend/internal/service/ops_models.go b/backend/internal/service/ops_models.go
index ebdf148f..c7666e92 100644
--- a/backend/internal/service/ops_models.go
+++ b/backend/internal/service/ops_models.go
@@ -94,6 +94,10 @@ type OpsErrorLogFilter struct {
 	Resolved         *bool
 	Query            string
 
+	// Optional correlation keys for exact matching.
+	RequestID       string
+	ClientRequestID string
+
 	// View controls error categorization for list endpoints.
 	// - errors: show actionable errors (exclude business-limited / 429 / 529)
 	// - excluded: only show excluded errors
diff --git a/frontend/src/api/admin/ops.ts b/frontend/src/api/admin/ops.ts
index 0ac54db6..83258a08 100644
--- a/frontend/src/api/admin/ops.ts
+++ b/frontend/src/api/admin/ops.ts
@@ -1037,6 +1037,17 @@ export async function updateUpstreamErrorResolved(errorId: number, resolved: boo
   await apiClient.put(`/admin/ops/upstream-errors/${errorId}/resolve`, { resolved })
 }
 
+export async function listRequestErrorUpstreamErrors(
+  id: number,
+  params: OpsErrorListQueryParams = {},
+  options: { include_detail?: boolean } = {}
+): Promise<PaginatedResponse<OpsErrorDetail>> {
+  const query: Record<string, any> = { ...params }
+  if (options.include_detail) query.include_detail = '1'
+  const { data } = await apiClient.get<PaginatedResponse<OpsErrorDetail>>(`/admin/ops/request-errors/${id}/upstream-errors`, { params: query })
+  return data
+}
+
 export async function listRequestDetails(params: OpsRequestDetailsParams): Promise<OpsRequestDetailsResponse> {
   const { data } = await apiClient.get<OpsRequestDetailsResponse>('/admin/ops/requests', { params })
   return data
@@ -1173,6 +1184,7 @@ export const opsAPI = {
   retryUpstreamError,
   updateRequestErrorResolved,
   updateUpstreamErrorResolved,
+  listRequestErrorUpstreamErrors,
 
   listRequestDetails,
   listAlertRules,
diff --git a/frontend/src/i18n/locales/en.ts b/frontend/src/i18n/locales/en.ts
index 06fb95e9..e06b658a 100644
--- a/frontend/src/i18n/locales/en.ts
+++ b/frontend/src/i18n/locales/en.ts
@@ -129,6 +129,8 @@ export default {
     all: 'All',
     none: 'None',
     noData: 'No data',
+    expand: 'Expand',
+    collapse: 'Collapse',
     success: 'Success',
     error: 'Error',
     critical: 'Critical',
@@ -2094,6 +2096,10 @@ export default {
           status: 'Status',
           requestId: 'Request ID'
         },
+        responsePreview: {
+          expand: 'Response (click to expand)',
+          collapse: 'Response (click to collapse)'
+        },
         retryMeta: {
           used: 'Used',
           success: 'Success',
diff --git a/frontend/src/i18n/locales/zh.ts b/frontend/src/i18n/locales/zh.ts
index 71864498..d445058d 100644
--- a/frontend/src/i18n/locales/zh.ts
+++ b/frontend/src/i18n/locales/zh.ts
@@ -126,6 +126,8 @@ export default {
     all: '全部',
     none: '无',
     noData: '暂无数据',
+    expand: '展开',
+    collapse: '收起',
     success: '成功',
     error: '错误',
     critical: '严重',
@@ -2238,6 +2240,10 @@ export default {
           status: '状态码',
           requestId: '请求ID'
         },
+        responsePreview: {
+          expand: '响应内容（点击展开）',
+          collapse: '响应内容（点击收起）'
+        },
         retryMeta: {
           used: '使用账号',
           success: '成功',
diff --git a/frontend/src/views/admin/ops/OpsDashboard.vue b/frontend/src/views/admin/ops/OpsDashboard.vue
index f6f18f3d..58f7fa23 100644
--- a/frontend/src/views/admin/ops/OpsDashboard.vue
+++ b/frontend/src/views/admin/ops/OpsDashboard.vue
@@ -400,11 +400,17 @@ function handleOpenRequestDetails(preset?: OpsRequestDetailsPreset) {
 
   requestDetailsPreset.value = { ...basePreset, ...(preset ?? {}) }
   if (!requestDetailsPreset.value.title) requestDetailsPreset.value.title = basePreset.title
+  // Ensure only one modal visible at a time.
+  showErrorDetails.value = false
+  showErrorModal.value = false
   showRequestDetails.value = true
 }
 
 function openErrorDetails(kind: 'request' | 'upstream') {
   errorDetailsType.value = kind
+  // Ensure only one modal visible at a time.
+  showRequestDetails.value = false
+  showErrorModal.value = false
   showErrorDetails.value = true
 }
 
@@ -446,6 +452,9 @@ function onQueryModeChange(v: string | number | boolean | null) {
 
 function openError(id: number) {
   selectedErrorId.value = id
+  // Ensure only one modal visible at a time.
+  showErrorDetails.value = false
+  showRequestDetails.value = false
   showErrorModal.value = true
 }
 
diff --git a/frontend/src/views/admin/ops/components/OpsErrorDetailModal.vue b/frontend/src/views/admin/ops/components/OpsErrorDetailModal.vue
index d2f185d5..9490790e 100644
--- a/frontend/src/views/admin/ops/components/OpsErrorDetailModal.vue
+++ b/frontend/src/views/admin/ops/components/OpsErrorDetailModal.vue
@@ -12,526 +12,154 @@
     </div>
 
     <div v-else class="space-y-6 p-6">
-      <!-- Header actions -->
-      <div class="flex flex-wrap items-center justify-between gap-3">
-        <div class="flex items-center gap-2 text-xs">
-          <span class="font-semibold text-gray-600 dark:text-gray-300">{{ t('admin.ops.errorDetail.resolution') }}</span>
-          <span :class="(detail as any).resolved ? 'text-green-700 dark:text-green-400' : 'text-amber-700 dark:text-amber-300'">
-            {{ (detail as any).resolved ? t('admin.ops.errorDetails.resolved') : t('admin.ops.errorDetails.unresolved') }}
-          </span>
-        </div>
-        <div class="flex flex-wrap gap-2">
-          <button
-            v-if="!(detail as any).resolved"
-            type="button"
-            class="btn btn-secondary btn-sm"
-            :disabled="loading"
-            @click="markResolved(true)"
-          >
-            {{ t('admin.ops.errorDetail.markResolved') }}
-          </button>
-          <button v-else type="button" class="btn btn-secondary btn-sm" :disabled="loading" @click="markResolved(false)">
-            {{ t('admin.ops.errorDetail.markUnresolved') }}
-          </button>
-        </div>
-      </div>
-
-      <!-- Tabs -->
-      <div class="flex flex-wrap items-center gap-2 border-b border-gray-200 pb-3 dark:border-dark-700">
-        <button
-          type="button"
-          class="btn btn-secondary btn-sm"
-          :class="activeTab === 'overview' ? 'opacity-100' : 'opacity-70'"
-          @click="activeTab = 'overview'"
-        >
-          {{ t('admin.ops.errorDetail.tabOverview') }}
-        </button>
-        <button
-          type="button"
-          class="btn btn-secondary btn-sm"
-          :class="activeTab === 'retries' ? 'opacity-100' : 'opacity-70'"
-          @click="activeTab = 'retries'"
-        >
-          {{ t('admin.ops.errorDetail.tabRetries') }}
-        </button>
-        <button
-          type="button"
-          class="btn btn-secondary btn-sm"
-          :class="activeTab === 'request' ? 'opacity-100' : 'opacity-70'"
-          @click="activeTab = 'request'"
-        >
-          {{ t('admin.ops.errorDetail.tabRequest') }}
-        </button>
-        <button
-          type="button"
-          class="btn btn-secondary btn-sm"
-          :class="activeTab === 'response' ? 'opacity-100' : 'opacity-70'"
-          @click="activeTab = 'response'"
-        >
-          {{ t('admin.ops.errorDetail.tabResponse') }}
-        </button>
-        <button
-          v-if="hasUpstreamErrorContent"
-          type="button"
-          class="btn btn-secondary btn-sm"
-          :class="activeTab === 'upstreamErrors' ? 'opacity-100' : 'opacity-70'"
-          @click="activeTab = 'upstreamErrors'"
-        >
-          {{ t('admin.ops.errorDetails.upstreamErrors') }}
-        </button>
-      </div>
-
-      <!-- Overview -->
-      <div v-if="activeTab === 'overview'" class="space-y-6">
-        <div class="grid grid-cols-1 gap-4 sm:grid-cols-4">
-          <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
-            <div class="text-xs font-bold uppercase tracking-wider text-gray-400">{{ t('admin.ops.errorDetail.requestId') }}</div>
-            <div class="mt-1 break-all font-mono text-sm font-medium text-gray-900 dark:text-white">
-              {{ detail.request_id || detail.client_request_id || '—' }}
-            </div>
-          </div>
-
-          <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
-            <div class="text-xs font-bold uppercase tracking-wider text-gray-400">{{ t('admin.ops.errorDetail.time') }}</div>
-            <div class="mt-1 text-sm font-medium text-gray-900 dark:text-white">
-              {{ formatDateTime(detail.created_at) }}
-            </div>
-          </div>
-
-          <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
-            <div class="text-xs font-bold uppercase tracking-wider text-gray-400">{{ t('admin.ops.errorDetail.phase') }}</div>
-            <div class="mt-1 text-sm font-bold uppercase text-gray-900 dark:text-white">
-              {{ detail.phase || '—' }}
-            </div>
-            <div class="mt-1 text-xs text-gray-500 dark:text-gray-400">
-              {{ detail.type || '—' }}
-            </div>
-          </div>
-
-          <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
-            <div class="text-xs font-bold uppercase tracking-wider text-gray-400">{{ t('admin.ops.errorDetail.status') }}</div>
-            <div class="mt-1 flex flex-wrap items-center gap-2">
-              <span :class="['inline-flex items-center rounded-lg px-2 py-1 text-xs font-black ring-1 ring-inset shadow-sm', statusClass]">
-                {{ detail.status_code }}
-              </span>
-              <span v-if="detail.severity" :class="['rounded-md px-2 py-0.5 text-[10px] font-black shadow-sm', severityClass]">
-                {{ detail.severity }}
-              </span>
-            </div>
+      <!-- Summary -->
+      <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4">
+        <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
+          <div class="text-xs font-bold uppercase tracking-wider text-gray-400">{{ t('admin.ops.errorDetail.requestId') }}</div>
+          <div class="mt-1 break-all font-mono text-sm font-medium text-gray-900 dark:text-white">
+            {{ requestId || '—' }}
           </div>
         </div>
 
-        <!-- Message + retry (right aligned) -->
-        <div class="rounded-xl bg-gray-50 p-6 dark:bg-dark-900">
-          <div class="flex items-start justify-between gap-4">
-            <h3 class="text-sm font-black uppercase tracking-wider text-gray-900 dark:text-white">
-              {{ t('admin.ops.errorDetail.message') }}
-            </h3>
-
-            <div class="flex flex-wrap justify-end gap-2">
-              <template v-if="(detail as any).is_retryable">
-                <button type="button" class="btn btn-secondary btn-sm" :disabled="retrying" @click="openRetryConfirm('client')">
-                  {{ t('admin.ops.errorDetail.retryClient') }}
-                </button>
-                <button
-                  v-if="props.errorType === 'upstream'"
-                  type="button"
-                  class="btn btn-secondary btn-sm"
-                  :disabled="retrying"
-                  @click="openRetryConfirm('upstream')"
-                >
-                  {{ t('admin.ops.errorDetail.retryUpstream') }}
-                </button>
-              </template>
-              <template v-else>
-                <span class="text-xs font-semibold text-amber-700 dark:text-amber-300">{{ t('admin.ops.errorDetail.notRetryable') }}</span>
-              </template>
-            </div>
+        <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
+          <div class="text-xs font-bold uppercase tracking-wider text-gray-400">{{ t('admin.ops.errorDetail.time') }}</div>
+          <div class="mt-1 text-sm font-medium text-gray-900 dark:text-white">
+            {{ formatDateTime(detail.created_at) }}
           </div>
+        </div>
 
-          <div class="mt-3 break-words text-sm font-medium text-gray-800 dark:text-gray-200">
+        <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
+          <div class="text-xs font-bold uppercase tracking-wider text-gray-400">{{ t('admin.ops.errorDetail.account') }}</div>
+          <div class="mt-1 text-sm font-medium text-gray-900 dark:text-white">
+            {{ detail.account_name || (detail.account_id != null ? String(detail.account_id) : '—') }}
+          </div>
+        </div>
+
+        <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
+          <div class="text-xs font-bold uppercase tracking-wider text-gray-400">{{ t('admin.ops.errorDetail.platform') }}</div>
+          <div class="mt-1 text-sm font-medium text-gray-900 dark:text-white">
+            {{ detail.platform || '—' }}
+          </div>
+        </div>
+
+        <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
+          <div class="text-xs font-bold uppercase tracking-wider text-gray-400">{{ t('admin.ops.errorDetail.group') }}</div>
+          <div class="mt-1 text-sm font-medium text-gray-900 dark:text-white">
+            {{ detail.group_name || (detail.group_id != null ? String(detail.group_id) : '—') }}
+          </div>
+        </div>
+
+        <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
+          <div class="text-xs font-bold uppercase tracking-wider text-gray-400">{{ t('admin.ops.errorDetail.model') }}</div>
+          <div class="mt-1 text-sm font-medium text-gray-900 dark:text-white">
+            {{ detail.model || '—' }}
+          </div>
+        </div>
+
+        <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
+          <div class="text-xs font-bold uppercase tracking-wider text-gray-400">{{ t('admin.ops.errorDetail.status') }}</div>
+          <div class="mt-1">
+            <span :class="['inline-flex items-center rounded-lg px-2 py-1 text-xs font-black ring-1 ring-inset shadow-sm', statusClass]">
+              {{ detail.status_code }}
+            </span>
+          </div>
+        </div>
+
+        <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
+          <div class="text-xs font-bold uppercase tracking-wider text-gray-400">{{ t('admin.ops.errorDetail.message') }}</div>
+          <div class="mt-1 truncate text-sm font-medium text-gray-900 dark:text-white" :title="detail.message">
             {{ detail.message || '—' }}
           </div>
         </div>
-
-        <!-- Tags (classification) -->
-        <div class="rounded-xl bg-gray-50 p-6 dark:bg-dark-900">
-          <h3 class="mb-4 text-sm font-black uppercase tracking-wider text-gray-900 dark:text-white">
-            {{ t('admin.ops.errorDetail.classification') }}
-          </h3>
-          <div class="flex flex-wrap gap-2">
-            <span class="inline-flex items-center rounded-full bg-white px-3 py-1 text-xs font-bold text-gray-700 ring-1 ring-gray-200 dark:bg-dark-800 dark:text-gray-200 dark:ring-dark-700">
-              {{ t('admin.ops.errorDetail.classificationKeys.phase') }}:
-              <span class="ml-1 font-mono">{{ phaseLabel }}</span>
-            </span>
-            <span class="inline-flex items-center rounded-full bg-white px-3 py-1 text-xs font-bold text-gray-700 ring-1 ring-gray-200 dark:bg-dark-800 dark:text-gray-200 dark:ring-dark-700">
-              {{ t('admin.ops.errorDetail.classificationKeys.owner') }}:
-              <span class="ml-1 font-mono">{{ ownerLabel }}</span>
-            </span>
-            <span class="inline-flex items-center rounded-full bg-white px-3 py-1 text-xs font-bold text-gray-700 ring-1 ring-gray-200 dark:bg-dark-800 dark:text-gray-200 dark:ring-dark-700">
-              {{ t('admin.ops.errorDetail.classificationKeys.source') }}:
-              <span class="ml-1 font-mono">{{ sourceLabel }}</span>
-            </span>
-            <span class="inline-flex items-center rounded-full bg-white px-3 py-1 text-xs font-bold text-gray-700 ring-1 ring-gray-200 dark:bg-dark-800 dark:text-gray-200 dark:ring-dark-700">
-              {{ t('admin.ops.errorDetail.classificationKeys.retryable') }}:
-              <span class="ml-1 font-mono">{{ (detail as any).is_retryable ? t('common.yes') : t('common.no') }}</span>
-            </span>
-            <span
-              v-if="(detail as any).resolved_at"
-              class="inline-flex items-center rounded-full bg-white px-3 py-1 text-xs font-bold text-gray-700 ring-1 ring-gray-200 dark:bg-dark-800 dark:text-gray-200 dark:ring-dark-700"
-            >
-              {{ t('admin.ops.errorDetail.classificationKeys.resolvedAt') }}: <span class="ml-1 font-mono">{{ (detail as any).resolved_at }}</span>
-            </span>
-            <span
-              v-if="(detail as any).resolved_by_user_id != null"
-              class="inline-flex items-center rounded-full bg-white px-3 py-1 text-xs font-bold text-gray-700 ring-1 ring-gray-200 dark:bg-dark-800 dark:text-gray-200 dark:ring-dark-700"
-            >
-              {{ t('admin.ops.errorDetail.classificationKeys.resolvedBy') }}:
-              <span class="ml-1 font-mono">{{ (detail as any).resolved_by_user_id }}</span>
-            </span>
-            <span
-              v-if="(detail as any).resolved_retry_id != null"
-              class="inline-flex items-center rounded-full bg-white px-3 py-1 text-xs font-bold text-gray-700 ring-1 ring-gray-200 dark:bg-dark-800 dark:text-gray-200 dark:ring-dark-700"
-            >
-              {{ t('admin.ops.errorDetail.classificationKeys.resolvedRetryId') }}:
-              <span class="ml-1 font-mono">{{ (detail as any).resolved_retry_id }}</span>
-            </span>
-            <span
-              v-if="(detail as any).retry_count != null"
-              class="inline-flex items-center rounded-full bg-white px-3 py-1 text-xs font-bold text-gray-700 ring-1 ring-gray-200 dark:bg-dark-800 dark:text-gray-200 dark:ring-dark-700"
-            >
-              {{ t('admin.ops.errorDetail.classificationKeys.retryCount') }}: <span class="ml-1 font-mono">{{ (detail as any).retry_count }}</span>
-            </span>
-          </div>
-        </div>
-
-        <!-- Basic Info -->
-        <div class="rounded-xl bg-gray-50 p-6 dark:bg-dark-900">
-          <h3 class="mb-4 text-sm font-black uppercase tracking-wider text-gray-900 dark:text-white">{{ t('admin.ops.errorDetail.basicInfo') }}</h3>
-          <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3">
-            <div>
-              <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.platform') }}</div>
-              <div class="mt-1 text-sm font-medium text-gray-900 dark:text-white">{{ detail.platform || '—' }}</div>
-            </div>
-            <div>
-              <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.model') }}</div>
-              <div class="mt-1 text-sm font-medium text-gray-900 dark:text-white">{{ detail.model || '—' }}</div>
-            </div>
-            <div>
-              <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.group') }}</div>
-              <div class="mt-1 text-sm font-medium text-gray-900 dark:text-white">
-                <el-tooltip v-if="detail.group_id" :content="t('admin.ops.errorLog.id') + ' ' + detail.group_id" placement="top">
-                  <span>{{ detail.group_name || detail.group_id }}</span>
-                </el-tooltip>
-                <span v-else>—</span>
-              </div>
-            </div>
-            <div>
-              <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.account') }}</div>
-              <div class="mt-1 text-sm font-medium text-gray-900 dark:text-white">
-                <el-tooltip v-if="detail.account_id" :content="t('admin.ops.errorLog.id') + ' ' + detail.account_id" placement="top">
-                  <span>{{ detail.account_name || detail.account_id }}</span>
-                </el-tooltip>
-                <span v-else>—</span>
-              </div>
-            </div>
-            <div>
-              <div class="text-xs font-bold uppercase text-gray-400">TTFT</div>
-              <div class="mt-1 font-mono text-sm font-bold text-gray-900 dark:text-white">
-                {{ detail.time_to_first_token_ms != null ? `${detail.time_to_first_token_ms}ms` : '—' }}
-              </div>
-            </div>
-            <div>
-              <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.businessLimited') }}</div>
-              <div class="mt-1 text-sm font-medium text-gray-900 dark:text-white">
-                {{ detail.is_business_limited ? 'true' : 'false' }}
-              </div>
-            </div>
-            <div class="lg:col-span-2">
-              <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.requestPath') }}</div>
-              <div class="mt-1 break-all font-mono text-xs text-gray-700 dark:text-gray-200">
-                {{ detail.request_path || '—' }}
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- Timings -->
-        <div class="rounded-xl bg-gray-50 p-6 dark:bg-dark-900">
-          <h3 class="mb-4 text-sm font-black uppercase tracking-wider text-gray-900 dark:text-white">{{ t('admin.ops.errorDetail.timings') }}</h3>
-          <div class="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-4">
-            <div class="rounded-lg bg-white p-4 shadow-sm dark:bg-dark-800">
-              <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.auth') }}</div>
-              <div class="mt-1 font-mono text-sm font-bold text-gray-900 dark:text-white">
-                {{ detail.auth_latency_ms != null ? `${detail.auth_latency_ms}ms` : '—' }}
-              </div>
-            </div>
-            <div class="rounded-lg bg-white p-4 shadow-sm dark:bg-dark-800">
-              <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.routing') }}</div>
-              <div class="mt-1 font-mono text-sm font-bold text-gray-900 dark:text-white">
-                {{ detail.routing_latency_ms != null ? `${detail.routing_latency_ms}ms` : '—' }}
-              </div>
-            </div>
-            <div class="rounded-lg bg-white p-4 shadow-sm dark:bg-dark-800">
-              <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.upstream') }}</div>
-              <div class="mt-1 font-mono text-sm font-bold text-gray-900 dark:text-white">
-                {{ detail.upstream_latency_ms != null ? `${detail.upstream_latency_ms}ms` : '—' }}
-              </div>
-            </div>
-            <div class="rounded-lg bg-white p-4 shadow-sm dark:bg-dark-800">
-              <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.response') }}</div>
-              <div class="mt-1 font-mono text-sm font-bold text-gray-900 dark:text-white">
-                {{ detail.response_latency_ms != null ? `${detail.response_latency_ms}ms` : '—' }}
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div v-if="props.errorType === 'upstream'" class="rounded-xl bg-gray-50 p-6 dark:bg-dark-900">
-          <label class="mb-1 block text-xs font-bold uppercase tracking-wider text-gray-400">{{ t('admin.ops.errorDetail.pinnedAccountId') }}</label>
-          <input v-model="pinnedAccountIdInput" type="text" class="input font-mono text-sm" disabled />
-          <div class="mt-1 text-xs text-gray-500 dark:text-gray-400">{{ t('admin.ops.errorDetail.pinnedToOriginalAccountId') }}</div>
-        </div>
       </div>
 
-      <!-- Upstream Errors Tab -->
-      <div v-else-if="activeTab === 'upstreamErrors'" class="space-y-6">
-        <div class="rounded-xl bg-gray-50 p-6 dark:bg-dark-900">
-          <h3 class="mb-4 text-sm font-black uppercase tracking-wider text-gray-900 dark:text-white">
-            {{ t('admin.ops.errorDetails.upstreamErrors') }}
-          </h3>
-
-          <div class="grid grid-cols-1 gap-4 sm:grid-cols-3">
-            <div>
-              <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.upstreamKeys.status') }}</div>
-              <div class="mt-1 font-mono text-sm font-bold text-gray-900 dark:text-white">
-                {{ detail.upstream_status_code != null ? detail.upstream_status_code : '—' }}
-              </div>
-            </div>
-            <div class="sm:col-span-2">
-              <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.upstreamKeys.message') }}</div>
-              <div class="mt-1 break-words text-sm font-medium text-gray-900 dark:text-white">
-                {{ detail.upstream_error_message || '—' }}
-              </div>
-            </div>
-          </div>
-
-          <div v-if="detail.upstream_error_detail" class="mt-4">
-            <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.upstreamKeys.detail') }}</div>
-            <pre
-              class="mt-2 max-h-[240px] overflow-auto rounded-xl border border-gray-200 bg-white p-4 text-xs text-gray-800 dark:border-dark-700 dark:bg-dark-800 dark:text-gray-100"
-            ><code>{{ prettyJSON(detail.upstream_error_detail) }}</code></pre>
-          </div>
-
-          <div v-if="detail.upstream_errors" class="mt-5">
-            <div class="mb-2 text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.upstreamKeys.upstreamErrors') }}</div>
-
-            <div v-if="upstreamErrors.length" class="space-y-3">
-              <div
-                v-for="(ev, idx) in upstreamErrors"
-                :key="idx"
-                class="rounded-xl border border-gray-200 bg-white p-4 shadow-sm dark:border-dark-700 dark:bg-dark-800"
-              >
-                <div class="flex flex-wrap items-center justify-between gap-2">
-                  <div class="text-xs font-black text-gray-800 dark:text-gray-100">#{{ idx + 1 }} <span v-if="ev.kind" class="font-mono">{{ ev.kind }}</span></div>
-                  <div class="flex items-center gap-2">
-                    <button
-                      v-if="props.errorType !== 'upstream'"
-                      type="button"
-                      class="rounded-md bg-gray-100 px-2 py-1 text-[10px] font-bold text-gray-700 hover:bg-gray-200 dark:bg-dark-700 dark:text-gray-200 dark:hover:bg-dark-600"
-                      :disabled="retrying || !ev.upstream_request_body"
-                      :title="ev.upstream_request_body ? '' : t('admin.ops.errorDetail.missingUpstreamRequestBody')"
-                      @click.stop="retryUpstreamEvent(idx)"
-                    >
-                      {{ t('admin.ops.errorDetail.retryUpstream') }} #{{ idx + 1 }}
-                    </button>
-                    <div class="font-mono text-xs text-gray-500 dark:text-gray-400">
-                      {{ ev.at_unix_ms ? formatDateTime(new Date(ev.at_unix_ms)) : '' }}
-                    </div>
-                  </div>
-                </div>
-
-                <div class="mt-2 grid grid-cols-1 gap-2 text-xs text-gray-600 dark:text-gray-300 sm:grid-cols-2">
-                  <div>
-                    <span class="text-gray-400">{{ t('admin.ops.errorDetail.upstreamEvent.account') }}:</span>
-                    <el-tooltip v-if="ev.account_id" :content="t('admin.ops.errorLog.id') + ' ' + ev.account_id" placement="top">
-                      <span class="ml-1 font-medium text-gray-900 dark:text-white">{{ ev.account_name || ev.account_id }}</span>
-                    </el-tooltip>
-                    <span v-else class="ml-1">—</span>
-                  </div>
-                  <div>
-                    <span class="text-gray-400">{{ t('admin.ops.errorDetail.upstreamEvent.status') }}:</span>
-                    <span class="ml-1 font-mono">{{ ev.upstream_status_code ?? '—' }}</span>
-                  </div>
-                  <div class="sm:col-span-2 break-all">
-                    <span class="text-gray-400">{{ t('admin.ops.errorDetail.upstreamEvent.requestId') }}:</span>
-                    <span class="ml-1 font-mono">{{ ev.upstream_request_id || '—' }}</span>
-                  </div>
-                </div>
-
-                <div v-if="ev.message" class="mt-2 break-words text-sm font-medium text-gray-900 dark:text-white">
-                  {{ ev.message }}
-                </div>
-
-                <pre
-                  v-if="ev.detail"
-                  class="mt-3 max-h-[240px] overflow-auto rounded-xl border border-gray-200 bg-gray-50 p-3 text-xs text-gray-800 dark:border-dark-700 dark:bg-dark-900 dark:text-gray-100"
-                ><code>{{ prettyJSON(ev.detail) }}</code></pre>
-              </div>
-            </div>
-
-            <pre
-              v-else
-              class="max-h-[420px] overflow-auto rounded-xl border border-gray-200 bg-white p-4 text-xs text-gray-800 dark:border-dark-700 dark:bg-dark-800 dark:text-gray-100"
-            ><code>{{ prettyJSON(detail.upstream_errors) }}</code></pre>
-          </div>
-        </div>
+      <!-- Response content (client request -> error_body; upstream -> upstream_error_detail/message) -->
+      <div class="rounded-xl bg-gray-50 p-6 dark:bg-dark-900">
+        <h3 class="text-sm font-black uppercase tracking-wider text-gray-900 dark:text-white">{{ t('admin.ops.errorDetail.responseBody') }}</h3>
+        <pre class="mt-4 max-h-[520px] overflow-auto rounded-xl border border-gray-200 bg-white p-4 text-xs text-gray-800 dark:border-dark-700 dark:bg-dark-800 dark:text-gray-100"><code>{{ prettyJSON(primaryResponseBody || '') }}</code></pre>
       </div>
 
-      <!-- Retries -->
-      <div v-else-if="activeTab === 'retries'">
+      <!-- Upstream errors list (only for request errors) -->
+      <div v-if="showUpstreamList" class="rounded-xl bg-gray-50 p-6 dark:bg-dark-900">
         <div class="flex flex-wrap items-center justify-between gap-2">
-          <div class="text-xs text-gray-500 dark:text-gray-400">{{ t('admin.ops.errorDetail.retryHistory') }}</div>
-          <div class="flex flex-wrap gap-2">
-            <button type="button" class="btn btn-secondary btn-sm" @click="loadRetryHistory">{{ t('common.refresh') }}</button>
-          </div>
+          <h3 class="text-sm font-black uppercase tracking-wider text-gray-900 dark:text-white">{{ t('admin.ops.errorDetails.upstreamErrors') }}</h3>
+          <div class="text-xs text-gray-500 dark:text-gray-400" v-if="correlatedUpstreamLoading">{{ t('common.loading') }}</div>
         </div>
 
-        <div class="mt-4">
-          <div v-if="retryHistoryLoading" class="text-sm text-gray-500 dark:text-gray-400">{{ t('common.loading') }}</div>
-          <div v-else-if="!retryHistory.length" class="text-sm text-gray-500 dark:text-gray-400">{{ t('common.noData') }}</div>
-          <div v-else>
-            <div class="mb-4 grid grid-cols-1 gap-3 md:grid-cols-2">
-              <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
-                <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.compareA') }}</div>
-                <select v-model.number="compareA" class="input mt-2 w-full font-mono text-xs">
-                  <option :value="null">—</option>
-                  <option v-for="a in retryHistory" :key="a.id" :value="a.id">#{{ a.id }} · {{ a.mode }} · {{ a.status }}</option>
-                </select>
-              </div>
-              <div class="rounded-xl bg-gray-50 p-4 dark:bg-dark-900">
-                <div class="text-xs font-bold uppercase text-gray-400">{{ t('admin.ops.errorDetail.compareB') }}</div>
-                <select v-model.number="compareB" class="input mt-2 w-full font-mono text-xs">
-                  <option :value="null">—</option>
-                  <option v-for="b in retryHistory" :key="b.id" :value="b.id">#{{ b.id }} · {{ b.mode }} · {{ b.status }}</option>
-                </select>
-              </div>
-            </div>
+        <div v-if="!correlatedUpstreamLoading && !correlatedUpstreamErrors.length" class="mt-3 text-sm text-gray-500 dark:text-gray-400">
+          {{ t('common.noData') }}
+        </div>
 
-            <div v-if="selectedA || selectedB" class="grid grid-cols-1 gap-3 md:grid-cols-2">
-              <div class="rounded-xl border border-gray-200 bg-white p-4 dark:border-dark-700 dark:bg-dark-800">
-                <div class="text-xs font-black text-gray-900 dark:text-white">{{ selectedA ? `#${selectedA.id} · ${selectedA.mode} · ${selectedA.status}` : '—' }}</div>
-                <div class="mt-2 text-xs text-gray-600 dark:text-gray-300">
-                  HTTP: <span class="font-mono">{{ selectedA?.http_status_code ?? '—' }}</span> · {{ t('admin.ops.errorDetail.retryMeta.used') }}:
-                  <span class="font-mono">
-                    <el-tooltip v-if="selectedA?.used_account_id" :content="'ID: ' + selectedA.used_account_id" placement="top">
-                      <span class="font-medium">{{ selectedA.used_account_name || selectedA.used_account_id }}</span>
-                    </el-tooltip>
-                    <span v-else>—</span>
+        <div v-else class="mt-4 space-y-3">
+          <div
+            v-for="(ev, idx) in correlatedUpstreamErrors"
+            :key="ev.id"
+            class="rounded-xl border border-gray-200 bg-white p-4 dark:border-dark-700 dark:bg-dark-800"
+          >
+            <div class="flex flex-wrap items-center justify-between gap-2">
+              <div class="text-xs font-black text-gray-900 dark:text-white">
+                #{{ idx + 1 }}
+                <span v-if="ev.type" class="ml-2 rounded-md bg-gray-100 px-2 py-0.5 font-mono text-[10px] font-bold text-gray-700 dark:bg-dark-700 dark:text-gray-200">{{ ev.type }}</span>
+              </div>
+              <div class="flex items-center gap-2">
+                <div class="font-mono text-xs text-gray-500 dark:text-gray-400">
+                  {{ ev.status_code ?? '—' }}
+                </div>
+                <button
+                  type="button"
+                  class="inline-flex items-center gap-1.5 rounded-md px-1.5 py-1 text-[10px] font-bold text-primary-700 hover:bg-primary-50 disabled:cursor-not-allowed disabled:opacity-60 dark:text-primary-200 dark:hover:bg-dark-700"
+                  :disabled="!getUpstreamResponsePreview(ev)"
+                  :title="getUpstreamResponsePreview(ev) ? '' : t('common.noData')"
+                  @click="toggleUpstreamDetail(ev.id)"
+                >
+                  <Icon
+                    :name="expandedUpstreamDetailIds.has(ev.id) ? 'chevronDown' : 'chevronRight'"
+                    size="xs"
+                    :stroke-width="2"
+                  />
+                  <span>
+                    {{
+                      expandedUpstreamDetailIds.has(ev.id)
+                        ? t('admin.ops.errorDetail.responsePreview.collapse')
+                        : t('admin.ops.errorDetail.responsePreview.expand')
+                    }}
                   </span>
-                </div>
-                <pre class="mt-3 max-h-[320px] overflow-auto rounded-lg bg-gray-50 p-3 text-xs text-gray-800 dark:bg-dark-900 dark:text-gray-100"><code>{{ selectedA?.response_preview || '' }}</code></pre>
-                <div v-if="selectedA?.error_message" class="mt-2 text-xs text-red-600 dark:text-red-400">{{ selectedA.error_message }}</div>
-              </div>
-
-              <div class="rounded-xl border border-gray-200 bg-white p-4 dark:border-dark-700 dark:bg-dark-800">
-                <div class="text-xs font-black text-gray-900 dark:text-white">{{ selectedB ? `#${selectedB.id} · ${selectedB.mode} · ${selectedB.status}` : '—' }}</div>
-                <div class="mt-2 text-xs text-gray-600 dark:text-gray-300">
-                  HTTP: <span class="font-mono">{{ selectedB?.http_status_code ?? '—' }}</span> · {{ t('admin.ops.errorDetail.retryMeta.used') }}:
-                  <span class="font-mono">
-                    <el-tooltip v-if="selectedB?.used_account_id" :content="'ID: ' + selectedB.used_account_id" placement="top">
-                      <span class="font-medium">{{ selectedB.used_account_name || selectedB.used_account_id }}</span>
-                    </el-tooltip>
-                    <span v-else>—</span>
-                  </span>
-                </div>
-                <pre class="mt-3 max-h-[320px] overflow-auto rounded-lg bg-gray-50 p-3 text-xs text-gray-800 dark:bg-dark-900 dark:text-gray-100"><code>{{ selectedB?.response_preview || '' }}</code></pre>
-                <div v-if="selectedB?.error_message" class="mt-2 text-xs text-red-600 dark:text-red-400">{{ selectedB.error_message }}</div>
+                </button>
               </div>
             </div>
 
-            <div v-else class="space-y-3">
-              <div v-for="a in retryHistory" :key="a.id" class="rounded-xl border border-gray-200 bg-white p-4 dark:border-dark-700 dark:bg-dark-800">
-                <div class="flex flex-wrap items-center justify-between gap-2">
-                  <div class="text-xs font-black text-gray-900 dark:text-white">#{{ a.id }} · {{ a.mode }} · {{ a.status }}</div>
-                  <div class="font-mono text-xs text-gray-500 dark:text-gray-400">{{ a.created_at }}</div>
-                </div>
-                <div class="mt-2 grid grid-cols-1 gap-2 text-xs text-gray-600 dark:text-gray-300 sm:grid-cols-4">
-                  <div>
-                    <span class="text-gray-400">{{ t('admin.ops.errorDetail.retryMeta.success') }}:</span> <span class="font-mono">{{ a.success ?? '—' }}</span>
-                  </div>
-                  <div><span class="text-gray-400">HTTP:</span> <span class="font-mono">{{ a.http_status_code ?? '—' }}</span></div>
-                  <div>
-                    <span class="text-gray-400">{{ t('admin.ops.errorDetail.retryMeta.pinned') }}:</span>
-                    <el-tooltip v-if="a.pinned_account_id" :content="'ID: ' + a.pinned_account_id" placement="top">
-                      <span class="font-mono ml-1">{{ a.pinned_account_name || a.pinned_account_id }}</span>
-                    </el-tooltip>
-                    <span v-else class="font-mono ml-1">—</span>
-                  </div>
-                  <div>
-                    <span class="text-gray-400">{{ t('admin.ops.errorDetail.retryMeta.used') }}:</span>
-                    <el-tooltip v-if="a.used_account_id" :content="'ID: ' + a.used_account_id" placement="top">
-                      <span class="font-mono ml-1">{{ a.used_account_name || a.used_account_id }}</span>
-                    </el-tooltip>
-                    <span v-else class="font-mono ml-1">—</span>
-                  </div>
-                </div>
-                <pre v-if="a.response_preview" class="mt-3 max-h-[240px] overflow-auto rounded-lg bg-gray-50 p-3 text-xs text-gray-800 dark:bg-dark-900 dark:text-gray-100"><code>{{ a.response_preview }}</code></pre>
-                <div v-if="a.error_message" class="mt-2 text-xs text-red-600 dark:text-red-400">{{ a.error_message }}</div>
+            <div class="mt-3 grid grid-cols-1 gap-2 text-xs text-gray-600 dark:text-gray-300 sm:grid-cols-2">
+              <div>
+                <span class="text-gray-400">{{ t('admin.ops.errorDetail.upstreamEvent.status') }}:</span>
+                <span class="ml-1 font-mono">{{ ev.status_code ?? '—' }}</span>
+              </div>
+              <div>
+                <span class="text-gray-400">{{ t('admin.ops.errorDetail.upstreamEvent.requestId') }}:</span>
+                <span class="ml-1 font-mono">{{ ev.request_id || ev.client_request_id || '—' }}</span>
               </div>
             </div>
-          </div>
-        </div>
-      </div>
 
-      <!-- Request tab -->
-      <div v-else-if="activeTab === 'request'">
-        <div class="rounded-xl bg-gray-50 p-6 dark:bg-dark-900">
-          <h3 class="text-sm font-black uppercase tracking-wider text-gray-900 dark:text-white">{{ t('admin.ops.errorDetail.requestBody') }}</h3>
-          <pre class="mt-4 max-h-[520px] overflow-auto rounded-xl border border-gray-200 bg-white p-4 text-xs text-gray-800 dark:border-dark-700 dark:bg-dark-800 dark:text-gray-100"><code>{{ prettyJSON(detail.request_body || '') }}</code></pre>
-        </div>
-      </div>
+            <div v-if="ev.message" class="mt-3 break-words text-sm font-medium text-gray-900 dark:text-white">{{ ev.message }}</div>
 
-      <!-- Response tab -->
-      <div v-else-if="activeTab === 'response'">
-        <div class="rounded-xl bg-gray-50 p-6 dark:bg-dark-900">
-          <h3 class="text-sm font-black uppercase tracking-wider text-gray-900 dark:text-white">{{ t('admin.ops.errorDetail.responseBody') }}</h3>
-          <div class="mt-2 text-xs text-gray-500 dark:text-gray-400">
-            {{ responseTabHint }}
+            <pre
+              v-if="expandedUpstreamDetailIds.has(ev.id)"
+              class="mt-3 max-h-[240px] overflow-auto rounded-xl border border-gray-200 bg-gray-50 p-3 text-xs text-gray-800 dark:border-dark-700 dark:bg-dark-900 dark:text-gray-100"
+            ><code>{{ prettyJSON(getUpstreamResponsePreview(ev)) }}</code></pre>
           </div>
-          <pre class="mt-4 max-h-[520px] overflow-auto rounded-xl border border-gray-200 bg-white p-4 text-xs text-gray-800 dark:border-dark-700 dark:bg-dark-800 dark:text-gray-100"><code>{{ prettyJSON(responseTabBody || '') }}</code></pre>
         </div>
       </div>
     </div>
   </BaseDialog>
-
-  <ConfirmDialog
-    :show="showRetryConfirm"
-    :title="t('admin.ops.errorDetail.confirmRetry')"
-    :message="retryConfirmMessage"
-    @confirm="runConfirmedRetry"
-    @cancel="cancelRetry"
-  />
-
-  <div v-if="showRetryConfirm && !(detail as any)?.is_retryable" class="fixed inset-0 z-[60] flex items-end justify-center p-4 pointer-events-none">
-    <div class="pointer-events-auto w-full max-w-xl rounded-2xl border border-amber-200 bg-amber-50 p-3 text-xs text-amber-800 dark:border-amber-900/40 dark:bg-amber-900/20 dark:text-amber-200">
-      <label class="flex items-center gap-2">
-        <input v-model="forceRetryAck" type="checkbox" class="h-4 w-4" />
-        <span>{{ t('admin.ops.errorDetail.forceRetry') }}</span>
-      </label>
-    </div>
-  </div>
 </template>
 
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import BaseDialog from '@/components/common/BaseDialog.vue'
-import ConfirmDialog from '@/components/common/ConfirmDialog.vue'
+import Icon from '@/components/icons/Icon.vue'
 import { useAppStore } from '@/stores'
-import { opsAPI, type OpsErrorDetail, type OpsRetryAttempt } from '@/api/admin/ops'
+import { opsAPI, type OpsErrorDetail } from '@/api/admin/ops'
 import { formatDateTime } from '@/utils/format'
-import { getSeverityClass } from '../utils/opsFormatters'
 
 interface Props {
   show: boolean
@@ -552,55 +180,20 @@ const appStore = useAppStore()
 const loading = ref(false)
 const detail = ref<OpsErrorDetail | null>(null)
 
-const activeTab = ref<'overview' | 'retries' | 'request' | 'response' | 'upstreamErrors'>('overview')
+const showUpstreamList = computed(() => props.errorType === 'request')
 
-const hasUpstreamErrorContent = computed(() => {
-  const d = detail.value as any
-  return !!(d?.upstream_status_code || d?.upstream_error_message || d?.upstream_error_detail || d?.upstream_errors)
+const requestId = computed(() => detail.value?.request_id || detail.value?.client_request_id || '')
+
+const primaryResponseBody = computed(() => {
+  if (!detail.value) return ''
+  if (props.errorType === 'upstream') {
+    return detail.value.upstream_error_detail || detail.value.upstream_errors || detail.value.upstream_error_message || detail.value.error_body || ''
+  }
+  return detail.value.error_body || ''
 })
 
-function normalizeEnum(value: unknown): string {
-  return String(value || '')
-    .trim()
-    .toLowerCase()
-}
 
-const phaseLabel = computed(() => {
-  const phase = normalizeEnum(detail.value?.phase)
-  if (!phase) return '—'
-  const key = `admin.ops.errorDetails.phase.${phase}`
-  const translated = t(key)
-  return translated === key ? phase : translated
-})
 
-const ownerLabel = computed(() => {
-  const owner = normalizeEnum((detail.value as any)?.error_owner)
-  if (!owner) return '—'
-  const key = `admin.ops.errorDetails.owner.${owner}`
-  const translated = t(key)
-  return translated === key ? owner : translated
-})
-
-const sourceLabel = computed(() => {
-  const source = normalizeEnum((detail.value as any)?.error_source)
-  if (!source) return '—'
-  const key = `admin.ops.errorDetail.source.${source}`
-  const translated = t(key)
-  return translated === key ? source : translated
-})
-
-const retrying = ref(false)
-const showRetryConfirm = ref(false)
-const pendingRetryMode = ref<'client' | 'upstream' | 'upstream_event'>('client')
-
-const forceRetryAck = ref(false)
-const retryHistory = ref<OpsRetryAttempt[]>([])
-const retryHistoryLoading = ref(false)
-
-const compareA = ref<number | null>(null)
-const compareB = ref<number | null>(null)
-
-const pinnedAccountIdInput = ref('')
 
 const title = computed(() => {
   if (!props.errorId) return t('admin.ops.errorDetail.title')
@@ -609,29 +202,40 @@ const title = computed(() => {
 
 const emptyText = computed(() => t('admin.ops.errorDetail.noErrorSelected'))
 
-type UpstreamErrorEvent = {
-  at_unix_ms?: number
-  platform?: string
-  account_id?: number
-  account_name?: string
-  upstream_status_code?: number
-  upstream_request_id?: string
-  upstream_request_body?: string
-  kind?: string
-  message?: string
-  detail?: string
+const correlatedUpstream = ref<OpsErrorDetail[]>([])
+const correlatedUpstreamLoading = ref(false)
+
+const correlatedUpstreamErrors = computed<OpsErrorDetail[]>(() => correlatedUpstream.value)
+
+const expandedUpstreamDetailIds = ref(new Set<number>())
+
+function getUpstreamResponsePreview(ev: OpsErrorDetail): string {
+  return String(ev.upstream_error_detail || ev.error_body || ev.upstream_error_message || '').trim()
 }
 
-const upstreamErrors = computed<UpstreamErrorEvent[]>(() => {
-  const raw = detail.value?.upstream_errors
-  if (!raw) return []
+function toggleUpstreamDetail(id: number) {
+  const next = new Set(expandedUpstreamDetailIds.value)
+  if (next.has(id)) next.delete(id)
+  else next.add(id)
+  expandedUpstreamDetailIds.value = next
+}
+
+async function fetchCorrelatedUpstreamErrors(requestErrorId: number) {
+  correlatedUpstreamLoading.value = true
   try {
-    const parsed = JSON.parse(raw)
-    return Array.isArray(parsed) ? (parsed as UpstreamErrorEvent[]) : []
-  } catch {
-    return []
+    const res = await opsAPI.listRequestErrorUpstreamErrors(
+      requestErrorId,
+      { page: 1, page_size: 100, view: 'all' },
+      { include_detail: true }
+    )
+    correlatedUpstream.value = res.items || []
+  } catch (err) {
+    console.error('[OpsErrorDetailModal] Failed to load correlated upstream errors', err)
+    correlatedUpstream.value = []
+  } finally {
+    correlatedUpstreamLoading.value = false
   }
-})
+}
 
 function close() {
   emit('update:show', false)
@@ -652,9 +256,6 @@ async function fetchDetail(id: number) {
     const kind = props.errorType || (detail.value?.phase === 'upstream' ? 'upstream' : 'request')
     const d = kind === 'upstream' ? await opsAPI.getUpstreamErrorDetail(id) : await opsAPI.getRequestErrorDetail(id)
     detail.value = d
-
-    // Keep showing original account_id (read-only hint for upstream retries).
-    pinnedAccountIdInput.value = d.account_id && d.account_id > 0 ? String(d.account_id) : ''
   } catch (err: any) {
     detail.value = null
     appStore.showError(err?.message || t('admin.ops.failedToLoadErrorDetail'))
@@ -668,105 +269,21 @@ watch(
   ([show, id]) => {
     if (!show) {
       detail.value = null
-      retryHistory.value = []
-      retryHistoryLoading.value = false
-      activeTab.value = 'overview'
       return
     }
     if (typeof id === 'number' && id > 0) {
-      activeTab.value = 'overview'
-      fetchDetail(id).then(() => {
-        loadRetryHistory()
-      })
+      expandedUpstreamDetailIds.value = new Set()
+      fetchDetail(id)
+      if (props.errorType === 'request') {
+        fetchCorrelatedUpstreamErrors(id)
+      } else {
+        correlatedUpstream.value = []
+      }
     }
   },
   { immediate: true }
 )
 
-function openRetryConfirm(mode: 'client' | 'upstream' | 'upstream_event') {
-  pendingRetryMode.value = mode
-  // Force-ack required only when backend says not retryable.
-  forceRetryAck.value = false
-  showRetryConfirm.value = true
-}
-
-async function loadRetryHistory() {
-  if (!props.errorId) return
-  retryHistoryLoading.value = true
-  try {
-    const items = await opsAPI.listRetryAttempts(props.errorId, 50)
-    retryHistory.value = items || []
-
-    // Default compare selections: newest succeeded vs newest failed.
-    if (retryHistory.value.length) {
-      const succeeded = retryHistory.value.find((a) => a.success === true)
-      const failed = retryHistory.value.find((a) => a.success === false)
-      compareA.value = succeeded?.id ?? retryHistory.value[0].id
-      compareB.value = failed?.id ?? (retryHistory.value[1]?.id ?? null)
-    }
-  } catch (err: any) {
-    retryHistory.value = []
-    compareA.value = null
-    compareB.value = null
-    appStore.showError(err?.message || t('admin.ops.errorDetail.failedToLoadRetryHistory'))
-  } finally {
-    retryHistoryLoading.value = false
-  }
-}
-
-const selectedA = computed(() => retryHistory.value.find((a) => a.id === compareA.value) || null)
-const selectedB = computed(() => retryHistory.value.find((a) => a.id === compareB.value) || null)
-
-const bestSucceededAttempt = computed(() => retryHistory.value.find((a) => a.success === true) || null)
-
-const responseTabBody = computed(() => {
-  // Prefer any succeeded attempt preview; fall back to stored error body.
-  const succeeded = bestSucceededAttempt.value
-  if (succeeded?.response_preview) return succeeded.response_preview
-  return detail.value?.error_body || ''
-})
-
-const responseTabHint = computed(() => {
-  const succeeded = bestSucceededAttempt.value
-  if (succeeded?.response_preview) {
-    return t('admin.ops.errorDetail.responseHintSucceeded', { id: String(succeeded.id) })
-  }
-  return t('admin.ops.errorDetail.responseHintFallback')
-})
-
-async function markResolved(resolved: boolean) {
-  if (!props.errorId) return
-  try {
-    const kind = props.errorType || (detail.value?.phase === 'upstream' ? 'upstream' : 'request')
-    if (kind === 'upstream') {
-      await opsAPI.updateUpstreamErrorResolved(props.errorId, resolved)
-    } else {
-      await opsAPI.updateRequestErrorResolved(props.errorId, resolved)
-    }
-    await fetchDetail(props.errorId)
-    appStore.showSuccess(resolved ? t('admin.ops.errorDetails.resolved') : t('admin.ops.errorDetails.unresolved'))
-  } catch (err: any) {
-    appStore.showError(err?.message || t('admin.ops.errorDetail.failedToUpdateResolvedStatus'))
-  }
-}
-
-const retryConfirmMessage = computed(() => {
-  const mode = pendingRetryMode.value
-  const retryable = !!(detail.value as any)?.is_retryable
-  if (!retryable) {
-    return t('admin.ops.errorDetail.forceRetryHint')
-  }
-  if (mode === 'upstream') {
-    return t('admin.ops.errorDetail.confirmRetryMessage')
-  }
-  return t('admin.ops.errorDetail.confirmRetryHint')
-})
-
-const severityClass = computed(() => {
-  if (!detail.value?.severity) return 'bg-gray-100 text-gray-700 dark:bg-dark-700 dark:text-gray-300'
-  return getSeverityClass(detail.value.severity)
-})
-
 const statusClass = computed(() => {
   const code = detail.value?.status_code ?? 0
   if (code >= 500) return 'bg-red-50 text-red-700 ring-red-600/20 dark:bg-red-900/30 dark:text-red-400 dark:ring-red-500/30'
@@ -775,63 +292,4 @@ const statusClass = computed(() => {
   return 'bg-gray-50 text-gray-700 ring-gray-600/20 dark:bg-gray-900/30 dark:text-gray-400 dark:ring-gray-500/30'
 })
 
-async function runConfirmedRetry() {
-  if (!props.errorId) return
-  const mode = pendingRetryMode.value
-  const retryable = !!(detail.value as any)?.is_retryable
-  if (!retryable && !forceRetryAck.value) {
-    appStore.showError(t('admin.ops.errorDetail.forceRetryNeedAck'))
-    return
-  }
-
-  showRetryConfirm.value = false
-
-  retrying.value = true
-  try {
-    const kind = props.errorType || (detail.value?.phase === 'upstream' ? 'upstream' : 'request')
-
-    let res
-    if (kind === 'upstream') {
-      // Upstream error retries always pin the original account_id.
-      res = await opsAPI.retryUpstreamError(props.errorId)
-    } else {
-      if (mode === 'client') {
-        res = await opsAPI.retryRequestErrorClient(props.errorId)
-      } else {
-        throw new Error(t('admin.ops.errorDetail.unsupportedRetryMode'))
-      }
-    }
-
-    const summary = res.status === 'succeeded' ? t('admin.ops.errorDetail.retrySuccess') : t('admin.ops.errorDetail.retryFailed')
-    appStore.showSuccess(summary)
-
-    // Refresh detail + history so resolved reflects auto resolution
-    await fetchDetail(props.errorId)
-    await loadRetryHistory()
-  } catch (err: any) {
-    appStore.showError(err?.message || t('admin.ops.retryFailed'))
-  } finally {
-    retrying.value = false
-  }
-}
-
-async function retryUpstreamEvent(idx: number) {
-  if (!props.errorId) return
-  try {
-    retrying.value = true
-    const res = await opsAPI.retryRequestErrorUpstreamEvent(props.errorId, idx)
-    const summary = res.status === 'succeeded' ? t('admin.ops.errorDetail.retrySuccess') : t('admin.ops.errorDetail.retryFailed')
-    appStore.showSuccess(summary)
-    await fetchDetail(props.errorId)
-    await loadRetryHistory()
-  } catch (err: any) {
-    appStore.showError(err?.message || t('admin.ops.retryFailed'))
-  } finally {
-    retrying.value = false
-  }
-}
-
-function cancelRetry() {
-  showRetryConfirm.value = false
-}
 </script>
diff --git a/frontend/src/views/admin/ops/components/OpsErrorDetailsModal.vue b/frontend/src/views/admin/ops/components/OpsErrorDetailsModal.vue
index acf9254a..e9e44010 100644
--- a/frontend/src/views/admin/ops/components/OpsErrorDetailsModal.vue
+++ b/frontend/src/views/admin/ops/components/OpsErrorDetailsModal.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useAppStore } from '@/stores'
 import BaseDialog from '@/components/common/BaseDialog.vue'
 import Select from '@/components/common/Select.vue'
 import OpsErrorLogTable from './OpsErrorLogTable.vue'
@@ -22,23 +21,7 @@ const emit = defineEmits<{
 }>()
 
 const { t } = useI18n()
-const appStore = useAppStore()
 
-const retryingUpstream = ref<number | null>(null)
-async function retryUpstreamError(id: number) {
-  try {
-    retryingUpstream.value = id
-    const res = await opsAPI.retryUpstreamError(id)
-    const summary = res.status === 'succeeded' ? t('admin.ops.errorDetail.retrySuccess') : t('admin.ops.errorDetail.retryFailed')
-    appStore.showSuccess(summary)
-    page.value = 1
-    await fetchErrorLogs()
-  } catch (err: any) {
-    appStore.showError(err?.message || t('admin.ops.retryFailed'))
-  } finally {
-    retryingUpstream.value = null
-  }
-}
 
 const loading = ref(false)
 const rows = ref<OpsErrorLog[]>([])
@@ -50,7 +33,6 @@ const q = ref('')
 const statusCode = ref<number | 'other' | null>(null)
 const phase = ref<string>('')
 const errorOwner = ref<string>('')
-const resolvedStatus = ref<string>('unresolved')
 const viewMode = ref<'errors' | 'excluded' | 'all'>('errors')
 
 
@@ -76,13 +58,6 @@ const ownerSelectOptions = computed(() => {
   ]
 })
 
-const resolvedSelectOptions = computed(() => {
-  return [
-    { value: 'unresolved', label: t('admin.ops.errorDetails.unresolved') || 'unresolved' },
-    { value: 'all', label: t('common.all') },
-    { value: 'resolved', label: t('admin.ops.errorDetails.resolved') || 'resolved' }
-  ]
-})
 
 const viewModeSelectOptions = computed(() => {
   return [
@@ -135,10 +110,6 @@ async function fetchErrorLogs() {
     const ownerVal = String(errorOwner.value || '').trim()
     if (ownerVal) params.error_owner = ownerVal
 
-    const resolvedVal = String(resolvedStatus.value || '').trim()
-    if (resolvedVal === 'resolved') params.resolved = 'true'
-    else if (resolvedVal === 'unresolved') params.resolved = 'false'
-    // 'all' -> omit
 
     const res = props.errorType === 'upstream'
       ? await opsAPI.listUpstreamErrors(params)
@@ -159,7 +130,6 @@ async function fetchErrorLogs() {
     statusCode.value = null
     phase.value = props.errorType === 'upstream' ? 'upstream' : ''
     errorOwner.value = ''
-    resolvedStatus.value = 'unresolved'
     viewMode.value = 'errors'
     page.value = 1
     fetchErrorLogs()
@@ -207,7 +177,7 @@ watch(
 )
 
 watch(
-  () => [statusCode.value, phase.value, errorOwner.value, resolvedStatus.value, viewMode.value] as const,
+  () => [statusCode.value, phase.value, errorOwner.value, viewMode.value] as const,
   () => {
     if (!props.show) return
     page.value = 1
@@ -255,9 +225,7 @@ watch(
             <Select :model-value="errorOwner" :options="ownerSelectOptions" @update:model-value="errorOwner = String($event ?? '')" />
           </div>
 
-          <div class="compact-select">
-            <Select :model-value="resolvedStatus" :options="resolvedSelectOptions" @update:model-value="resolvedStatus = String($event ?? 'unresolved')" />
-          </div>
+
 
           <div class="compact-select">
             <Select :model-value="viewMode" :options="viewModeSelectOptions" @update:model-value="viewMode = $event as any" />
@@ -285,7 +253,7 @@ watch(
             :page="page"
             :page-size="pageSize"
             @openErrorDetail="emit('openErrorDetail', $event)"
-            @retryUpstream="retryUpstreamError"
+
             @update:page="page = $event"
             @update:pageSize="pageSize = $event"
           />