fix typing

Author: ric-yu

src/components/queue/job/useJobErrorReporting.ts

@@ -25,19 +25,34 @@ type JobExecutionError = {
 export const extractExecutionError = (
   task: TaskItemImpl | null
 ): JobExecutionError | null => {
-  const status = (task as TaskItemImpl | null)?.status
-  const messages = (status as { messages?: unknown[] } | undefined)?.messages
-  if (!Array.isArray(messages) || !messages.length) return null
-  const record = messages.find((entry: unknown) => {
-    return Array.isArray(entry) && entry[0] === 'execution_error'
-  }) as [string, ExecutionErrorWsMessage?] | undefined
-  if (!record) return null
-  const detail = record[1]
-  const message = String(detail?.exception_message ?? '')
-  return {
-    detail,
-    message
+  if (!task) return null
+
+  // Try detailed executionStatus.messages first (from job detail API)
+  const messages = task.executionStatus?.messages
+  if (Array.isArray(messages) && messages.length > 0) {
+    const record = messages.find(
+      (entry): entry is [string, ExecutionErrorWsMessage] =>
+        Array.isArray(entry) && entry[0] === 'execution_error'
+    )
+    if (record) {
+      const detail = record[1]
+      return {
+        detail,
+        message: detail?.exception_message ?? ''
+      }
+    }
   }
+
+  // Fall back to simple errorMessage (from jobs list API)
+  const errorMessage = task.errorMessage
+  if (errorMessage) {
+    return {
+      detail: undefined,
+      message: errorMessage
+    }
+  }
+
+  return null
 }
 
 type UseJobErrorReportingOptions = {

src/composables/queue/useJobMenu.ts

@@ -91,24 +91,31 @@ export function useJobMenu(
     await queueStore.update()
   }
 
+  const getExecutionError = (
+    item: JobListItem | null
+  ): ExecutionErrorWsMessage | undefined => {
+    const messages = item?.taskRef?.executionStatus?.messages
+    if (!Array.isArray(messages)) return undefined
+    const record = messages.find(
+      (entry): entry is [string, ExecutionErrorWsMessage] =>
+        Array.isArray(entry) && entry[0] === 'execution_error'
+    )
+    return record?.[1]
+  }
+
   const copyErrorMessage = async () => {
     const item = currentMenuItem()
     if (!item) return
-    const msgs = item.taskRef?.status?.messages as any[] | undefined
-    const err = msgs?.find((m: any) => m?.[0] === 'execution_error')?.[1] as
-      | ExecutionErrorWsMessage
-      | undefined
-    const message = err?.exception_message
+    // Try detailed error from executionStatus, fall back to errorMessage
+    const err = getExecutionError(item)
+    const message = err?.exception_message ?? item.taskRef?.errorMessage
     if (message) await copyToClipboard(String(message))
   }
 
   const reportError = () => {
     const item = currentMenuItem()
     if (!item) return
-    const msgs = item.taskRef?.status?.messages as any[] | undefined
-    const err = msgs?.find((m: any) => m?.[0] === 'execution_error')?.[1] as
-      | ExecutionErrorWsMessage
-      | undefined
+    const err = getExecutionError(item)
     if (err) useDialogService().showExecutionErrorDialog(err)
   }
 

src/composables/queue/useResultGallery.ts

@@ -1,10 +1,23 @@
 import { ref, shallowRef } from 'vue'
 
 import type { JobListItem } from '@/composables/queue/useJobList'
-import type { ResultItemImpl, TaskItemImpl } from '@/stores/queueStore'
+import type { ResultItemImpl } from '@/stores/queueStore'
 
 type FetchApi = (url: string) => Promise<Response>
 
+/**
+ * Minimal interface for tasks used by the result gallery.
+ * This allows the gallery to work with any object that provides these properties,
+ * without coupling to the full TaskItemImpl class.
+ */
+interface GalleryTask {
+  readonly promptId: string
+  readonly outputsCount?: number
+  readonly flatOutputs: readonly ResultItemImpl[]
+  readonly previewOutput?: ResultItemImpl
+  loadFullOutputs(fetchApi: FetchApi): Promise<GalleryTask>
+}
+
 const getPreviewableOutputs = (outputs?: readonly ResultItemImpl[]) =>
   outputs?.filter((o) => o.supportsPreview) ?? []
 
@@ -18,17 +31,17 @@ const findActiveIndex = (items: ResultItemImpl[], url?: string): number => {
  * Manages result gallery state and activation for queue items.
  */
 export function useResultGallery(
-  getFilteredTasks: () => TaskItemImpl[],
+  getFilteredTasks: () => GalleryTask[],
   fetchApi?: FetchApi
 ) {
   const galleryActiveIndex = ref(-1)
   const galleryItems = shallowRef<ResultItemImpl[]>([])
 
-  const loadedTasksCache = new Map<string, TaskItemImpl>()
+  const loadedTasksCache = new Map<string, GalleryTask>()
   let currentRequestId = 0
 
   const getOutputsForTask = async (
-    task: TaskItemImpl
+    task: GalleryTask
   ): Promise<ResultItemImpl[]> => {
     const outputsCount = task.outputsCount ?? 0
     const needsLazyLoad = outputsCount > 1 && fetchApi
@@ -54,7 +67,7 @@ export function useResultGallery(
 
     const requestId = ++currentRequestId
 
-    const targetTask = item.taskRef as TaskItemImpl | undefined
+    const targetTask = item.taskRef as GalleryTask | undefined
     let targetOutputs: ResultItemImpl[] = []
 
     if (targetTask) {

src/platform/remote/comfyui/jobs/index.ts

@@ -11,4 +11,4 @@ export {
   fetchJobDetail,
   fetchQueue
 } from './fetchers/fetchJobs'
-export type { JobDetail, JobListItem } from './types/jobTypes'
+export type { ExecutionStatus, JobDetail, JobListItem } from './types/jobTypes'

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

@@ -124,3 +124,4 @@ export type JobStatus = z.infer<typeof zJobStatus>
 export type RawJobListItem = z.infer<typeof zRawJobListItem>
 export type JobListItem = z.infer<typeof zJobListItem>
 export type JobDetail = z.infer<typeof zJobDetail>
+export type ExecutionStatus = z.infer<typeof zExecutionStatus>

src/stores/queueStore.ts

@@ -4,7 +4,10 @@ import { computed, ref, shallowRef, toRaw, toValue } from 'vue'
 
 import { reconcileJobs } from '@/platform/remote/comfyui/history/reconciliation'
 import { extractWorkflow, fetchJobDetail } from '@/platform/remote/comfyui/jobs'
-import type { JobListItem } from '@/platform/remote/comfyui/jobs/types/jobTypes'
+import type {
+  ExecutionStatus,
+  JobListItem
+} from '@/platform/remote/comfyui/jobs'
 import type {
   ComfyWorkflowJSON,
   NodeId
@@ -188,13 +191,16 @@ export class TaskItemImpl {
   readonly job: JobListItem
   readonly outputs: TaskOutput
   readonly flatOutputs: ReadonlyArray<ResultItemImpl>
+  readonly executionStatus?: ExecutionStatus
 
   constructor(
     job: JobListItem,
     outputs?: TaskOutput,
-    flatOutputs?: ReadonlyArray<ResultItemImpl>
+    flatOutputs?: ReadonlyArray<ResultItemImpl>,
+    executionStatus?: ExecutionStatus
   ) {
     this.job = job
+    this.executionStatus = executionStatus
     // If no outputs provided but job has preview_output, create synthetic outputs
     const effectiveOutputs =
       outputs ??
@@ -371,7 +377,7 @@ export class TaskItemImpl {
 
   /**
    * Loads full outputs for tasks that only have preview data
-   * Returns a new TaskItemImpl with full outputs loaded
+   * Returns a new TaskItemImpl with full outputs and execution status
    */
   public async loadFullOutputs(
     fetchApi: (url: string) => Promise<Response>
@@ -386,8 +392,13 @@ export class TaskItemImpl {
       return this
     }
 
-    // Create new TaskItemImpl with full outputs
-    return new TaskItemImpl(this.job, jobDetail.outputs)
+    // Create new TaskItemImpl with full outputs and execution status
+    return new TaskItemImpl(
+      this.job,
+      jobDetail.outputs,
+      undefined,
+      jobDetail.execution_status
+    )
   }
 
   public async loadWorkflow(app: ComfyApp) {