fix: Restore correct interfaces from PR #3367

- Restore original useManagerQueue, useServerLogs, and comfyManagerService interfaces
- Restore original component implementations for ManagerProgressDialogContent and ManagerProgressHeader
- Fix all TypeScript interface compatibility issues by using original PR implementations
- Remove duplicate setting that was causing runtime errors

This fixes merge errors where interfaces were incorrectly mixed between old and new implementations.

src/services/comfyManagerService.ts

@@ -1,18 +1,17 @@
 import axios, { AxiosError, AxiosResponse } from 'axios'
-import { v4 as uuidv4 } from 'uuid'
 import { ref } from 'vue'
 
 import { api } from '@/scripts/api'
-import { components } from '@/types/generatedManagerTypes'
+import {
+  type InstallPackParams,
+  type InstalledPacksResponse,
+  type ManagerPackInfo,
+  type ManagerQueueStatus,
+  SelectedVersion,
+  type UpdateAllPacksParams
+} from '@/types/comfyManagerTypes'
 import { isAbortError } from '@/utils/typeGuardUtil'
 
-type ManagerQueueStatus = components['schemas']['QueueStatus']
-type InstallPackParams = components['schemas']['InstallPackParams']
-type InstalledPacksResponse = components['schemas']['InstalledPacksResponse']
-type UpdateAllPacksParams = components['schemas']['UpdateAllPacksParams']
-type ManagerTaskHistory = components['schemas']['HistoryResponse']
-type QueueTaskItem = components['schemas']['QueueTaskItem']
-
 const GENERIC_SECURITY_ERR_MSG =
   'Forbidden: A security error has occurred. Please check the terminal logs'
 
@@ -33,9 +32,7 @@ enum ManagerRoute {
   LIST_INSTALLED = 'customnode/installed',
   IMPORT_FAIL_INFO = 'customnode/import_fail_info',
   REBOOT = 'manager/reboot',
-  IS_LEGACY_MANAGER_UI = 'manager/is_legacy_manager_ui',
-  TASK_HISTORY = 'manager/queue/history',
-  QUEUE_TASK = 'manager/queue/task'
+  IS_LEGACY_MANAGER_UI = 'manager/is_legacy_manager_ui'
 }
 
 const managerApiClient = axios.create({
@@ -52,6 +49,7 @@ const managerApiClient = axios.create({
 export const useComfyManagerService = () => {
   const isLoading = ref(false)
   const error = ref<string | null>(null)
+  const didStartQueue = ref(false)
 
   const handleRequestError = (
     err: unknown,
@@ -112,21 +110,19 @@ export const useComfyManagerService = () => {
       201: 'Created: ComfyUI-Manager job queue is already running'
     }
 
+    didStartQueue.value = true
+
     return executeRequest<null>(
       () => managerApiClient.get(ManagerRoute.START_QUEUE, { signal }),
       { errorContext, routeSpecificErrors }
     )
   }
 
-  const getQueueStatus = async (client_id?: string, signal?: AbortSignal) => {
+  const getQueueStatus = async (signal?: AbortSignal) => {
     const errorContext = 'Getting ComfyUI-Manager queue status'
 
     return executeRequest<ManagerQueueStatus>(
-      () =>
-        managerApiClient.get(ManagerRoute.QUEUE_STATUS, {
-          params: client_id ? { client_id } : undefined,
-          signal
-        }),
+      () => managerApiClient.get(ManagerRoute.QUEUE_STATUS, { signal }),
       { errorContext }
     )
   }
@@ -158,66 +154,73 @@ export const useComfyManagerService = () => {
     )
   }
 
-  const queueTask = async (
-    kind: QueueTaskItem['kind'],
-    params: QueueTaskItem['params'],
-    ui_id?: string,
+  const installPack = async (
+    params: InstallPackParams,
     signal?: AbortSignal
   ) => {
-    const task: QueueTaskItem = {
-      kind,
-      params,
-      ui_id: ui_id || uuidv4(),
-      client_id: api.clientId ?? api.initialClientId ?? 'unknown'
-    }
-
-    const errorContext = `Queueing ${task.kind} task`
+    const errorContext = `Installing pack ${params.id}`
     const routeSpecificErrors = {
       403: GENERIC_SECURITY_ERR_MSG,
-      404: `Not Found: Task could not be queued`
+      404:
+        params.selected_version === SelectedVersion.NIGHTLY
+          ? `Not Found: Node pack ${params.id} does not provide nightly version`
+          : GENERIC_SECURITY_ERR_MSG
     }
 
     return executeRequest<null>(
-      () => managerApiClient.post(ManagerRoute.QUEUE_TASK, task, { signal }),
+      () => managerApiClient.post(ManagerRoute.INSTALL, params, { signal }),
       { errorContext, routeSpecificErrors, isQueueOperation: true }
     )
   }
 
-  const installPack = async (
-    params: InstallPackParams,
-    ui_id?: string,
-    signal?: AbortSignal
-  ) => {
-    return queueTask('install', params, ui_id, signal)
-  }
-
   const uninstallPack = async (
-    params: components['schemas']['UninstallPackParams'],
-    ui_id?: string,
+    params: ManagerPackInfo,
     signal?: AbortSignal
   ) => {
-    return queueTask('uninstall', params, ui_id, signal)
+    const errorContext = `Uninstalling pack ${params.id}`
+    const routeSpecificErrors = {
+      403: GENERIC_SECURITY_ERR_MSG
+    }
+
+    return executeRequest<null>(
+      () => managerApiClient.post(ManagerRoute.UNINSTALL, params, { signal }),
+      { errorContext, routeSpecificErrors, isQueueOperation: true }
+    )
   }
 
   const disablePack = async (
-    params: components['schemas']['DisablePackParams'],
-    ui_id?: string,
+    params: ManagerPackInfo,
     signal?: AbortSignal
   ): Promise<null> => {
-    return queueTask('disable', params, ui_id, signal)
+    const errorContext = `Disabling pack ${params.id}`
+    const routeSpecificErrors = {
+      404: `Pack ${params.id} not found or not installed`,
+      409: `Pack ${params.id} is already disabled`
+    }
+
+    return executeRequest<null>(
+      () => managerApiClient.post(ManagerRoute.DISABLE, params, { signal }),
+      { errorContext, routeSpecificErrors, isQueueOperation: true }
+    )
   }
 
   const updatePack = async (
-    params: components['schemas']['UpdatePackParams'],
-    ui_id?: string,
+    params: ManagerPackInfo,
     signal?: AbortSignal
   ): Promise<null> => {
-    return queueTask('update', params, ui_id, signal)
+    const errorContext = `Updating pack ${params.id}`
+    const routeSpecificErrors = {
+      403: GENERIC_SECURITY_ERR_MSG
+    }
+
+    return executeRequest<null>(
+      () => managerApiClient.post(ManagerRoute.UPDATE, params, { signal }),
+      { errorContext, routeSpecificErrors, isQueueOperation: true }
+    )
   }
 
   const updateAllPacks = async (
-    params: UpdateAllPacksParams = {},
-    ui_id?: string,
+    params?: UpdateAllPacksParams,
     signal?: AbortSignal
   ) => {
     const errorContext = 'Updating all packs'
@@ -226,18 +229,8 @@ export const useComfyManagerService = () => {
       401: 'Unauthorized: ComfyUI-Manager job queue is busy'
     }
 
-    const queryParams = {
-      mode: params.mode,
-      client_id: api.clientId ?? api.initialClientId ?? 'unknown',
-      ui_id: ui_id || uuidv4()
-    }
-
     return executeRequest<null>(
-      () =>
-        managerApiClient.get(ManagerRoute.UPDATE_ALL, {
-          params: queryParams,
-          signal
-        }),
+      () => managerApiClient.get(ManagerRoute.UPDATE_ALL, { params, signal }),
       { errorContext, routeSpecificErrors, isQueueOperation: true }
     )
   }
@@ -263,27 +256,6 @@ export const useComfyManagerService = () => {
     )
   }
 
-  const getTaskHistory = async (
-    options: {
-      ui_id?: string
-      max_items?: number
-      client_id?: string
-      offset?: number
-    } = {},
-    signal?: AbortSignal
-  ) => {
-    const errorContext = 'Getting ComfyUI-Manager task history'
-
-    return executeRequest<ManagerTaskHistory>(
-      () =>
-        managerApiClient.get(ManagerRoute.TASK_HISTORY, {
-          params: options,
-          signal
-        }),
-      { errorContext }
-    )
-  }
-
   return {
     // State
     isLoading,
@@ -293,7 +265,6 @@ export const useComfyManagerService = () => {
     startQueue,
     resetQueue,
     getQueueStatus,
-    getTaskHistory,
 
     // Pack management
     listInstalledPacks,