use execution_error field

Author: ric-yu

src/components/queue/job/JobDetailsPopover.vue

@@ -107,7 +107,6 @@ import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
 import { t } from '@/i18n'
 import { isCloud } from '@/platform/distribution/types'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
-import { api } from '@/scripts/api'
 import { useDialogService } from '@/services/dialogService'
 import { useExecutionStore } from '@/stores/executionStore'
 import { useQueueStore } from '@/stores/queueStore'
@@ -355,7 +354,6 @@ const { errorMessageValue, copyErrorMessage, reportJobError } =
   useJobErrorReporting({
     taskForJob,
     copyToClipboard,
-    dialog,
-    fetchApi: (url) => api.fetchApi(url)
+    dialog
   })
 </script>

src/components/queue/job/useJobErrorReporting.ts

@@ -1,37 +1,32 @@
 import { computed } from 'vue'
 import type { ComputedRef } from 'vue'
 
-import { fetchJobDetail } from '@/platform/remote/comfyui/jobs'
 import type { ExecutionErrorWsMessage } from '@/schemas/apiSchema'
 import type { TaskItemImpl } from '@/stores/queueStore'
 
 type CopyHandler = (value: string) => void | Promise<void>
-type FetchApi = (url: string) => Promise<Response>
 
 export type JobErrorDialogService = {
+  showExecutionErrorDialog: (executionError: ExecutionErrorWsMessage) => void
   showErrorDialog: (
     error: Error,
     options?: {
       reportType?: string
       [key: string]: unknown
     }
   ) => void
-  showExecutionErrorDialog?: (executionError: ExecutionErrorWsMessage) => void
 }
 
 type UseJobErrorReportingOptions = {
   taskForJob: ComputedRef<TaskItemImpl | null>
   copyToClipboard: CopyHandler
   dialog: JobErrorDialogService
-  /** Optional fetch function to enable rich error dialogs with traceback */
-  fetchApi?: FetchApi
 }
 
 export const useJobErrorReporting = ({
   taskForJob,
   copyToClipboard,
-  dialog,
-  fetchApi
+  dialog
 }: UseJobErrorReportingOptions) => {
   const errorMessageValue = computed(() => taskForJob.value?.errorMessage ?? '')
 
@@ -41,23 +36,15 @@ export const useJobErrorReporting = ({
     }
   }
 
-  const reportJobError = async () => {
+  const reportJobError = () => {
     const task = taskForJob.value
     if (!task) return
 
-    // Try to fetch rich error details if fetchApi is provided
-    if (fetchApi && dialog.showExecutionErrorDialog) {
-      const jobDetail = await fetchJobDetail(fetchApi, task.promptId)
-      const executionError = jobDetail?.execution_error
-
-      if (executionError) {
-        dialog.showExecutionErrorDialog({
-          prompt_id: task.promptId,
-          timestamp: jobDetail?.create_time ?? Date.now(),
-          ...executionError
-        })
-        return
-      }
+    // Use execution_error from list response if available (includes prompt_id, timestamp)
+    const executionError = task.executionError
+    if (executionError) {
+      dialog.showExecutionErrorDialog(executionError as ExecutionErrorWsMessage)
+      return
     }
 
     // Fall back to simple error dialog

src/composables/queue/useJobMenu.ts

@@ -93,21 +93,15 @@ export function useJobMenu(
     if (message) await copyToClipboard(message)
   }
 
-  const reportError = async () => {
+  const reportError = () => {
     const item = currentMenuItem()
     if (!item) return
 
-    // Try to fetch rich error details from job detail
-    const jobDetail = await fetchJobDetail((url) => api.fetchApi(url), item.id)
-    const executionError = jobDetail?.execution_error
+    // Use execution_error from list response if available
+    const executionError = item.taskRef?.executionError
 
     if (executionError) {
-      // Use rich error dialog with traceback, node info, etc.
-      useDialogService().showExecutionErrorDialog({
-        prompt_id: item.id,
-        timestamp: jobDetail?.create_time ?? Date.now(),
-        ...executionError
-      })
+      useDialogService().showExecutionErrorDialog(executionError)
       return
     }
 

src/platform/remote/comfyui/jobs/fetchers/fetchJobs.ts

@@ -46,7 +46,7 @@ async function fetchJobsRaw(
       return { jobs: [], total: 0, offset: 0 }
     }
     const data = zJobsListResponse.parse(await res.json())
-    return { jobs: data.jobs, total: data.total, offset }
+    return { jobs: data.jobs, total: data.pagination.total, offset }
   } catch (error) {
     console.error('[Jobs API] Error fetching jobs:', error)
     return { jobs: [], total: 0, offset: 0 }
@@ -135,14 +135,17 @@ export async function fetchJobDetail(
 }
 
 /**
- * Extracts workflow from job detail response
+ * Extracts workflow from job detail response.
+ * The workflow is nested at: workflow.extra_data.extra_pnginfo.workflow
  */
 export function extractWorkflow(
   job: JobDetail | undefined
 ): ComfyWorkflowJSON | undefined {
   // Cast is safe - workflow will be validated by loadGraphData -> validateComfyWorkflow
-  // Path: extra_data.extra_pnginfo.workflow (at top level of job detail)
-  return job?.extra_data?.extra_pnginfo?.workflow as
+  const workflowData = job?.workflow as
+    | { extra_data?: { extra_pnginfo?: { workflow?: unknown } } }
+    | undefined
+  return workflowData?.extra_data?.extra_pnginfo?.workflow as
     | ComfyWorkflowJSON
     | undefined
 }

src/platform/remote/comfyui/jobs/types/jobTypes.ts

@@ -30,6 +30,25 @@ const zPreviewOutput = z
   })
   .passthrough() // Allow extra fields like nodeId, mediaType
 
+/**
+ * Execution error details for error jobs.
+ * Contains the same structure as ExecutionErrorWsMessage from WebSocket.
+ */
+const zExecutionError = z
+  .object({
+    node_id: z.string(),
+    node_type: z.string(),
+    executed: z.array(z.string()).optional(),
+    exception_message: z.string(),
+    exception_type: z.string(),
+    traceback: z.array(z.string()),
+    current_inputs: z.unknown(),
+    current_outputs: z.unknown()
+  })
+  .passthrough()
+
+export type ExecutionError = z.infer<typeof zExecutionError>
+
 /**
  * Raw job from API - uses passthrough to allow extra fields
  */
@@ -41,9 +60,11 @@ const zRawJobListItem = z
     preview_output: zPreviewOutput.nullable().optional(),
     outputs_count: z.number().optional(),
     error_message: z.string().nullable().optional(),
+    execution_error: zExecutionError.nullable().optional(),
+    workflow_id: z.string().nullable().optional(),
     priority: z.number().optional()
   })
-  .passthrough() // Allow extra fields like execution_time, workflow_id, update_time
+  .passthrough()
 
 /**
  * Job list item with priority always set (either from server or synthetic)
@@ -52,61 +73,41 @@ const zJobListItem = zRawJobListItem.extend({
   priority: z.number() // Always set: server-provided or synthetic (total - offset - index)
 })
 
-/**
- * Extra data structure containing workflow
- * Note: workflow is z.unknown() because it goes through validateComfyWorkflow separately
- */
-const zExtraData = z
-  .object({
-    extra_pnginfo: z
-      .object({
-        workflow: z.unknown()
-      })
-      .optional()
-  })
-  .passthrough()
-
-/**
- * Execution error details for failed jobs.
- * Contains the same structure as ExecutionErrorWsMessage from WebSocket.
- */
-const zExecutionError = z.object({
-  node_id: z.string(),
-  node_type: z.string(),
-  executed: z.array(z.string()),
-  exception_message: z.string(),
-  exception_type: z.string(),
-  traceback: z.array(z.string()),
-  current_inputs: z.unknown(),
-  current_outputs: z.unknown()
-})
-
 /**
  * Job detail - returned by GET /api/jobs/{job_id} (detail endpoint)
  * Includes full workflow and outputs for re-execution and downloads
- *
- * Note: workflow is at extra_data.extra_pnginfo.workflow (not in a separate workflow object)
  */
 export const zJobDetail = zRawJobListItem
   .extend({
-    extra_data: zExtraData.optional(),
-    prompt: z.record(z.string(), z.unknown()).optional(),
+    workflow: z.unknown().optional(),
     outputs: zTaskOutput.optional(),
-    execution_time: z.number().optional(),
-    workflow_id: z.string().nullable().optional(),
-    execution_error: zExecutionError.nullable().optional()
+    update_time: z.number().optional(),
+    execution_status: z.unknown().optional(),
+    execution_meta: z.unknown().optional()
   })
   .passthrough()
 
 /**
- * Jobs list response structure - raw from API (before synthetic priority)
+ * Pagination info from API
+ */
+const zPaginationInfo = z
+  .object({
+    offset: z.number(),
+    limit: z.number(),
+    total: z.number(),
+    has_more: z.boolean()
+  })
+  .passthrough()
+
+/**
+ * Jobs list response structure
  */
 export const zJobsListResponse = z
   .object({
     jobs: z.array(zRawJobListItem),
-    total: z.number()
+    pagination: zPaginationInfo
   })
-  .passthrough() // Allow extra fields like has_more, offset, limit
+  .passthrough()
 
 // ============================================================================
 // TypeScript Types (derived from Zod schemas)

src/stores/queueStore.ts

@@ -287,6 +287,13 @@ export class TaskItemImpl {
     return this.job.error_message ?? undefined
   }
 
+  /**
+   * Execution error details if job failed with traceback
+   */
+  get executionError() {
+    return this.job.execution_error ?? undefined
+  }
+
   get workflow(): ComfyWorkflowJSON | undefined {
     // Workflow is only available after lazy loading via getWorkflowFromHistory
     return undefined