From 6525ae7cf4ab87bcbcd0374800786916c9f912c9 Mon Sep 17 00:00:00 2001
From: Chenlei Hu <huchenlei@proton.me>
Date: Wed, 5 Feb 2025 15:05:56 -0500
Subject: [PATCH] [Refactor] Rename hooks/ to composables/ (#2437)

---
 .cursorrules                                              | 2 +-
 src/components/bottomPanel/tabs/terminal/BaseTerminal.vue | 2 +-
 .../bottomPanel/tabs/terminal/CommandTerminal.vue         | 2 +-
 src/components/bottomPanel/tabs/terminal/LogsTerminal.vue | 2 +-
 src/components/common/ElectronFileDownload.vue            | 2 +-
 src/components/common/FileDownload.vue                    | 2 +-
 src/components/common/TreeExplorer.vue                    | 2 +-
 src/components/common/TreeExplorerTreeNode.vue            | 7 +++++--
 .../dialog/content/ExecutionErrorDialogContent.vue        | 2 +-
 .../dialog/content/setting/ServerConfigPanel.vue          | 2 +-
 src/components/graph/GraphCanvas.vue                      | 8 ++++----
 src/components/sidebar/tabs/ModelLibrarySidebarTab.vue    | 2 +-
 src/components/sidebar/tabs/NodeLibrarySidebarTab.vue     | 2 +-
 src/components/sidebar/tabs/WorkflowsSidebarTab.vue       | 2 +-
 .../sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue | 2 +-
 src/components/topbar/WorkflowTab.vue                     | 5 ++++-
 src/{hooks => composables}/bottomPanelTabs/useTerminal.ts | 0
 .../bottomPanelTabs/useTerminalBuffer.ts                  | 0
 .../bottomPanelTabs/useTerminalTabs.ts}                   | 0
 .../sidebarTabs/useModelLibrarySidebarTab.ts}             | 0
 .../sidebarTabs/useNodeLibrarySidebarTab.ts}              | 0
 .../sidebarTabs/useQueueSidebarTab.ts}                    | 0
 .../sidebarTabs/useWorkflowsSidebarTab.ts}                | 0
 .../canvasDropHooks.ts => composables/useCanvasDrop.ts}   | 2 +-
 .../useContextMenuTranslation.ts}                         | 0
 .../useCopyToClipboard.ts}                                | 0
 .../useCoreCommands.ts}                                   | 0
 .../downloadHooks.ts => composables/useDownload.ts}       | 0
 .../errorHooks.ts => composables/useErrorHandling.ts}     | 0
 .../useGlobalLitegraph.ts}                                | 0
 .../dndHooks.ts => composables/usePragmaticDroppable.ts}  | 0
 .../treeHooks.ts => composables/useTreeExpansion.ts}      | 0
 .../useWorkflowPersistence.ts}                            | 0
 src/services/colorPaletteService.ts                       | 2 +-
 src/services/extensionService.ts                          | 2 +-
 src/stores/commandStore.ts                                | 2 +-
 src/stores/workspace/bottomPanelStore.ts                  | 2 +-
 src/stores/workspace/sidebarTabStore.ts                   | 8 ++++----
 src/views/GraphView.vue                                   | 4 ++--
 src/views/MaintenanceView.vue                             | 4 ++--
 src/views/ServerStartView.vue                             | 2 +-
 41 files changed, 40 insertions(+), 34 deletions(-)
 rename src/{hooks => composables}/bottomPanelTabs/useTerminal.ts (100%)
 rename src/{hooks => composables}/bottomPanelTabs/useTerminalBuffer.ts (100%)
 rename src/{hooks/bottomPanelTabs/terminalTabs.ts => composables/bottomPanelTabs/useTerminalTabs.ts} (100%)
 rename src/{hooks/sidebarTabs/modelLibrarySidebarTab.ts => composables/sidebarTabs/useModelLibrarySidebarTab.ts} (100%)
 rename src/{hooks/sidebarTabs/nodeLibrarySidebarTab.ts => composables/sidebarTabs/useNodeLibrarySidebarTab.ts} (100%)
 rename src/{hooks/sidebarTabs/queueSidebarTab.ts => composables/sidebarTabs/useQueueSidebarTab.ts} (100%)
 rename src/{hooks/sidebarTabs/workflowsSidebarTab.ts => composables/sidebarTabs/useWorkflowsSidebarTab.ts} (100%)
 rename src/{hooks/canvasDropHooks.ts => composables/useCanvasDrop.ts} (97%)
 rename src/{hooks/translationHooks.ts => composables/useContextMenuTranslation.ts} (100%)
 rename src/{hooks/clipboardHooks.ts => composables/useCopyToClipboard.ts} (100%)
 rename src/{hooks/coreCommandHooks.ts => composables/useCoreCommands.ts} (100%)
 rename src/{hooks/downloadHooks.ts => composables/useDownload.ts} (100%)
 rename src/{hooks/errorHooks.ts => composables/useErrorHandling.ts} (100%)
 rename src/{hooks/litegraphHooks.ts => composables/useGlobalLitegraph.ts} (100%)
 rename src/{hooks/dndHooks.ts => composables/usePragmaticDroppable.ts} (100%)
 rename src/{hooks/treeHooks.ts => composables/useTreeExpansion.ts} (100%)
 rename src/{hooks/workflowPersistenceHooks.ts => composables/useWorkflowPersistence.ts} (100%)

diff --git a/.cursorrules b/.cursorrules
index 4769bb43a..912921e62 100644
--- a/.cursorrules
+++ b/.cursorrules
@@ -15,7 +15,7 @@ const folderStructure = `
 src/
   components/
   constants/
-  hooks/
+  composables/
   views/
   stores/
   services/
diff --git a/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue b/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
index bb5606e92..0dd2b5985 100644
--- a/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
+++ b/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
@@ -9,7 +9,7 @@
 <script setup lang="ts">
 import { Ref, onUnmounted, ref } from 'vue'
 
-import { useTerminal } from '@/hooks/bottomPanelTabs/useTerminal'
+import { useTerminal } from '@/composables/bottomPanelTabs/useTerminal'
 
 const emit = defineEmits<{
   created: [ReturnType<typeof useTerminal>, Ref<HTMLElement>]
diff --git a/src/components/bottomPanel/tabs/terminal/CommandTerminal.vue b/src/components/bottomPanel/tabs/terminal/CommandTerminal.vue
index bc4ba4ace..527c5d40b 100644
--- a/src/components/bottomPanel/tabs/terminal/CommandTerminal.vue
+++ b/src/components/bottomPanel/tabs/terminal/CommandTerminal.vue
@@ -6,7 +6,7 @@
 import { IDisposable } from '@xterm/xterm'
 import { Ref, onMounted, onUnmounted } from 'vue'
 
-import type { useTerminal } from '@/hooks/bottomPanelTabs/useTerminal'
+import type { useTerminal } from '@/composables/bottomPanelTabs/useTerminal'
 import { electronAPI } from '@/utils/envUtil'
 
 import BaseTerminal from './BaseTerminal.vue'
diff --git a/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue b/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
index b298208a2..ab1c5516a 100644
--- a/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
+++ b/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
@@ -15,7 +15,7 @@ import { storeToRefs } from 'pinia'
 import ProgressSpinner from 'primevue/progressspinner'
 import { Ref, onMounted, onUnmounted, ref } from 'vue'
 
-import type { useTerminal } from '@/hooks/bottomPanelTabs/useTerminal'
+import type { useTerminal } from '@/composables/bottomPanelTabs/useTerminal'
 import { api } from '@/scripts/api'
 import { useExecutionStore } from '@/stores/executionStore'
 import { LogEntry, LogsWsMessage, TerminalSize } from '@/types/apiTypes'
diff --git a/src/components/common/ElectronFileDownload.vue b/src/components/common/ElectronFileDownload.vue
index acf21211d..73b2336c7 100644
--- a/src/components/common/ElectronFileDownload.vue
+++ b/src/components/common/ElectronFileDownload.vue
@@ -80,7 +80,7 @@ import ProgressBar from 'primevue/progressbar'
 import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { useDownload } from '@/hooks/downloadHooks'
+import { useDownload } from '@/composables/useDownload'
 import { useElectronDownloadStore } from '@/stores/electronDownloadStore'
 import { formatSize } from '@/utils/formatUtil'
 
diff --git a/src/components/common/FileDownload.vue b/src/components/common/FileDownload.vue
index 4b1f04df1..688771f7e 100644
--- a/src/components/common/FileDownload.vue
+++ b/src/components/common/FileDownload.vue
@@ -27,7 +27,7 @@
 import Button from 'primevue/button'
 import { computed } from 'vue'
 
-import { useDownload } from '@/hooks/downloadHooks'
+import { useDownload } from '@/composables/useDownload'
 import { formatSize } from '@/utils/formatUtil'
 
 const props = defineProps<{
diff --git a/src/components/common/TreeExplorer.vue b/src/components/common/TreeExplorer.vue
index 710fa07f7..ba13efba8 100644
--- a/src/components/common/TreeExplorer.vue
+++ b/src/components/common/TreeExplorer.vue
@@ -43,7 +43,7 @@ import { computed, provide, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
-import { useErrorHandling } from '@/hooks/errorHooks'
+import { useErrorHandling } from '@/composables/useErrorHandling'
 import type {
   RenderedTreeExplorerNode,
   TreeExplorerNode
diff --git a/src/components/common/TreeExplorerTreeNode.vue b/src/components/common/TreeExplorerTreeNode.vue
index bbb86e413..16e141401 100644
--- a/src/components/common/TreeExplorerTreeNode.vue
+++ b/src/components/common/TreeExplorerTreeNode.vue
@@ -41,8 +41,11 @@ import Badge from 'primevue/badge'
 import { Ref, computed, inject, ref } from 'vue'
 
 import EditableText from '@/components/common/EditableText.vue'
-import { usePragmaticDraggable, usePragmaticDroppable } from '@/hooks/dndHooks'
-import { useErrorHandling } from '@/hooks/errorHooks'
+import { useErrorHandling } from '@/composables/useErrorHandling'
+import {
+  usePragmaticDraggable,
+  usePragmaticDroppable
+} from '@/composables/usePragmaticDroppable'
 import type {
   RenderedTreeExplorerNode,
   TreeExplorerDragAndDropData,
diff --git a/src/components/dialog/content/ExecutionErrorDialogContent.vue b/src/components/dialog/content/ExecutionErrorDialogContent.vue
index 37d9bb253..991c1efd2 100644
--- a/src/components/dialog/content/ExecutionErrorDialogContent.vue
+++ b/src/components/dialog/content/ExecutionErrorDialogContent.vue
@@ -59,7 +59,7 @@ import { useI18n } from 'vue-i18n'
 
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
 import FindIssueButton from '@/components/dialog/content/error/FindIssueButton.vue'
-import { useCopyToClipboard } from '@/hooks/clipboardHooks'
+import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import type { ExecutionErrorWsMessage, SystemStats } from '@/types/apiTypes'
diff --git a/src/components/dialog/content/setting/ServerConfigPanel.vue b/src/components/dialog/content/setting/ServerConfigPanel.vue
index 5ced9df41..19067d60c 100644
--- a/src/components/dialog/content/setting/ServerConfigPanel.vue
+++ b/src/components/dialog/content/setting/ServerConfigPanel.vue
@@ -74,8 +74,8 @@ import { watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import FormItem from '@/components/common/FormItem.vue'
+import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
 import type { ServerConfig } from '@/constants/serverConfig'
-import { useCopyToClipboard } from '@/hooks/clipboardHooks'
 import { useServerConfigStore } from '@/stores/serverConfigStore'
 import { useSettingStore } from '@/stores/settingStore'
 import type { FormItem as FormItemType } from '@/types/settingTypes'
diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue
index d5eac8244..4d62b785f 100644
--- a/src/components/graph/GraphCanvas.vue
+++ b/src/components/graph/GraphCanvas.vue
@@ -41,11 +41,11 @@ import TitleEditor from '@/components/graph/TitleEditor.vue'
 import NodeSearchboxPopover from '@/components/searchbox/NodeSearchBoxPopover.vue'
 import SideToolbar from '@/components/sidebar/SideToolbar.vue'
 import SecondRowWorkflowTabs from '@/components/topbar/SecondRowWorkflowTabs.vue'
+import { useCanvasDrop } from '@/composables/useCanvasDrop'
+import { useContextMenuTranslation } from '@/composables/useContextMenuTranslation'
+import { useGlobalLitegraph } from '@/composables/useGlobalLitegraph'
+import { useWorkflowPersistence } from '@/composables/useWorkflowPersistence'
 import { CORE_SETTINGS } from '@/constants/coreSettings'
-import { useCanvasDrop } from '@/hooks/canvasDropHooks'
-import { useGlobalLitegraph } from '@/hooks/litegraphHooks'
-import { useContextMenuTranslation } from '@/hooks/translationHooks'
-import { useWorkflowPersistence } from '@/hooks/workflowPersistenceHooks'
 import { i18n } from '@/i18n'
 import { api } from '@/scripts/api'
 import { app as comfyApp } from '@/scripts/app'
diff --git a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
index ef33f8156..3f0baf0fa 100644
--- a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
+++ b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
@@ -54,7 +54,7 @@ import TreeExplorer from '@/components/common/TreeExplorer.vue'
 import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
 import ElectronDownloadItems from '@/components/sidebar/tabs/modelLibrary/ElectronDownloadItems.vue'
 import ModelTreeLeaf from '@/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue'
-import { useTreeExpansion } from '@/hooks/treeHooks'
+import { useTreeExpansion } from '@/composables/useTreeExpansion'
 import { useLitegraphService } from '@/services/litegraphService'
 import {
   ComfyModelDef,
diff --git a/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue b/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
index c182ae4f4..a99485941 100644
--- a/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
+++ b/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
@@ -75,7 +75,7 @@ import NodePreview from '@/components/node/NodePreview.vue'
 import NodeSearchFilter from '@/components/searchbox/NodeSearchFilter.vue'
 import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
 import NodeTreeLeaf from '@/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue'
-import { useTreeExpansion } from '@/hooks/treeHooks'
+import { useTreeExpansion } from '@/composables/useTreeExpansion'
 import { useLitegraphService } from '@/services/litegraphService'
 import { FilterAndValue } from '@/services/nodeSearchService'
 import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
diff --git a/src/components/sidebar/tabs/WorkflowsSidebarTab.vue b/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
index 999660f3d..6ef2bc7f8 100644
--- a/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
+++ b/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
@@ -155,7 +155,7 @@ import TreeExplorer from '@/components/common/TreeExplorer.vue'
 import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
 import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
 import WorkflowTreeLeaf from '@/components/sidebar/tabs/workflows/WorkflowTreeLeaf.vue'
-import { useTreeExpansion } from '@/hooks/treeHooks'
+import { useTreeExpansion } from '@/composables/useTreeExpansion'
 import { useWorkflowService } from '@/services/workflowService'
 import { useCommandStore } from '@/stores/commandStore'
 import { useSettingStore } from '@/stores/settingStore'
diff --git a/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue b/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue
index ea797e1d9..a793334df 100644
--- a/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue
+++ b/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue
@@ -30,7 +30,7 @@ import FolderCustomizationDialog from '@/components/common/CustomizationDialog.v
 import TreeExplorer from '@/components/common/TreeExplorer.vue'
 import NodeTreeFolder from '@/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue'
 import NodeTreeLeaf from '@/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue'
-import { useTreeExpansion } from '@/hooks/treeHooks'
+import { useTreeExpansion } from '@/composables/useTreeExpansion'
 import { useLitegraphService } from '@/services/litegraphService'
 import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
 import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
diff --git a/src/components/topbar/WorkflowTab.vue b/src/components/topbar/WorkflowTab.vue
index e431efa92..7e36cbd3b 100644
--- a/src/components/topbar/WorkflowTab.vue
+++ b/src/components/topbar/WorkflowTab.vue
@@ -32,7 +32,10 @@
 import Button from 'primevue/button'
 import { ref } from 'vue'
 
-import { usePragmaticDraggable, usePragmaticDroppable } from '@/hooks/dndHooks'
+import {
+  usePragmaticDraggable,
+  usePragmaticDroppable
+} from '@/composables/usePragmaticDroppable'
 import { useWorkflowService } from '@/services/workflowService'
 import { ComfyWorkflow } from '@/stores/workflowStore'
 import { useWorkflowStore } from '@/stores/workflowStore'
diff --git a/src/hooks/bottomPanelTabs/useTerminal.ts b/src/composables/bottomPanelTabs/useTerminal.ts
similarity index 100%
rename from src/hooks/bottomPanelTabs/useTerminal.ts
rename to src/composables/bottomPanelTabs/useTerminal.ts
diff --git a/src/hooks/bottomPanelTabs/useTerminalBuffer.ts b/src/composables/bottomPanelTabs/useTerminalBuffer.ts
similarity index 100%
rename from src/hooks/bottomPanelTabs/useTerminalBuffer.ts
rename to src/composables/bottomPanelTabs/useTerminalBuffer.ts
diff --git a/src/hooks/bottomPanelTabs/terminalTabs.ts b/src/composables/bottomPanelTabs/useTerminalTabs.ts
similarity index 100%
rename from src/hooks/bottomPanelTabs/terminalTabs.ts
rename to src/composables/bottomPanelTabs/useTerminalTabs.ts
diff --git a/src/hooks/sidebarTabs/modelLibrarySidebarTab.ts b/src/composables/sidebarTabs/useModelLibrarySidebarTab.ts
similarity index 100%
rename from src/hooks/sidebarTabs/modelLibrarySidebarTab.ts
rename to src/composables/sidebarTabs/useModelLibrarySidebarTab.ts
diff --git a/src/hooks/sidebarTabs/nodeLibrarySidebarTab.ts b/src/composables/sidebarTabs/useNodeLibrarySidebarTab.ts
similarity index 100%
rename from src/hooks/sidebarTabs/nodeLibrarySidebarTab.ts
rename to src/composables/sidebarTabs/useNodeLibrarySidebarTab.ts
diff --git a/src/hooks/sidebarTabs/queueSidebarTab.ts b/src/composables/sidebarTabs/useQueueSidebarTab.ts
similarity index 100%
rename from src/hooks/sidebarTabs/queueSidebarTab.ts
rename to src/composables/sidebarTabs/useQueueSidebarTab.ts
diff --git a/src/hooks/sidebarTabs/workflowsSidebarTab.ts b/src/composables/sidebarTabs/useWorkflowsSidebarTab.ts
similarity index 100%
rename from src/hooks/sidebarTabs/workflowsSidebarTab.ts
rename to src/composables/sidebarTabs/useWorkflowsSidebarTab.ts
diff --git a/src/hooks/canvasDropHooks.ts b/src/composables/useCanvasDrop.ts
similarity index 97%
rename from src/hooks/canvasDropHooks.ts
rename to src/composables/useCanvasDrop.ts
index d31d15c19..d5ea8e0b9 100644
--- a/src/hooks/canvasDropHooks.ts
+++ b/src/composables/useCanvasDrop.ts
@@ -2,7 +2,7 @@ import { LGraphNode } from '@comfyorg/litegraph'
 import { LiteGraph } from '@comfyorg/litegraph'
 import { Ref } from 'vue'
 
-import { usePragmaticDroppable } from '@/hooks/dndHooks'
+import { usePragmaticDroppable } from '@/composables/usePragmaticDroppable'
 import { app as comfyApp } from '@/scripts/app'
 import { useLitegraphService } from '@/services/litegraphService'
 import { ComfyModelDef } from '@/stores/modelStore'
diff --git a/src/hooks/translationHooks.ts b/src/composables/useContextMenuTranslation.ts
similarity index 100%
rename from src/hooks/translationHooks.ts
rename to src/composables/useContextMenuTranslation.ts
diff --git a/src/hooks/clipboardHooks.ts b/src/composables/useCopyToClipboard.ts
similarity index 100%
rename from src/hooks/clipboardHooks.ts
rename to src/composables/useCopyToClipboard.ts
diff --git a/src/hooks/coreCommandHooks.ts b/src/composables/useCoreCommands.ts
similarity index 100%
rename from src/hooks/coreCommandHooks.ts
rename to src/composables/useCoreCommands.ts
diff --git a/src/hooks/downloadHooks.ts b/src/composables/useDownload.ts
similarity index 100%
rename from src/hooks/downloadHooks.ts
rename to src/composables/useDownload.ts
diff --git a/src/hooks/errorHooks.ts b/src/composables/useErrorHandling.ts
similarity index 100%
rename from src/hooks/errorHooks.ts
rename to src/composables/useErrorHandling.ts
diff --git a/src/hooks/litegraphHooks.ts b/src/composables/useGlobalLitegraph.ts
similarity index 100%
rename from src/hooks/litegraphHooks.ts
rename to src/composables/useGlobalLitegraph.ts
diff --git a/src/hooks/dndHooks.ts b/src/composables/usePragmaticDroppable.ts
similarity index 100%
rename from src/hooks/dndHooks.ts
rename to src/composables/usePragmaticDroppable.ts
diff --git a/src/hooks/treeHooks.ts b/src/composables/useTreeExpansion.ts
similarity index 100%
rename from src/hooks/treeHooks.ts
rename to src/composables/useTreeExpansion.ts
diff --git a/src/hooks/workflowPersistenceHooks.ts b/src/composables/useWorkflowPersistence.ts
similarity index 100%
rename from src/hooks/workflowPersistenceHooks.ts
rename to src/composables/useWorkflowPersistence.ts
diff --git a/src/services/colorPaletteService.ts b/src/services/colorPaletteService.ts
index 8c5babf60..9531d12f5 100644
--- a/src/services/colorPaletteService.ts
+++ b/src/services/colorPaletteService.ts
@@ -3,7 +3,7 @@ import { LiteGraph } from '@comfyorg/litegraph'
 import { toRaw } from 'vue'
 import { fromZodError } from 'zod-validation-error'
 
-import { useErrorHandling } from '@/hooks/errorHooks'
+import { useErrorHandling } from '@/composables/useErrorHandling'
 import { app } from '@/scripts/app'
 import { downloadBlob, uploadFile } from '@/scripts/utils'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
diff --git a/src/services/extensionService.ts b/src/services/extensionService.ts
index 0b425142d..33c0b688c 100644
--- a/src/services/extensionService.ts
+++ b/src/services/extensionService.ts
@@ -1,4 +1,4 @@
-import { useErrorHandling } from '@/hooks/errorHooks'
+import { useErrorHandling } from '@/composables/useErrorHandling'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import { useCommandStore } from '@/stores/commandStore'
diff --git a/src/stores/commandStore.ts b/src/stores/commandStore.ts
index f498fa20d..4a51a0737 100644
--- a/src/stores/commandStore.ts
+++ b/src/stores/commandStore.ts
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
-import { useErrorHandling } from '@/hooks/errorHooks'
+import { useErrorHandling } from '@/composables/useErrorHandling'
 import type { ComfyExtension } from '@/types/comfy'
 
 import { type KeybindingImpl, useKeybindingStore } from './keybindingStore'
diff --git a/src/stores/workspace/bottomPanelStore.ts b/src/stores/workspace/bottomPanelStore.ts
index eeb4eb0d6..66bbfc7c4 100644
--- a/src/stores/workspace/bottomPanelStore.ts
+++ b/src/stores/workspace/bottomPanelStore.ts
@@ -4,7 +4,7 @@ import { computed, ref } from 'vue'
 import {
   useCommandTerminalTab,
   useLogsTerminalTab
-} from '@/hooks/bottomPanelTabs/terminalTabs'
+} from '@/composables/bottomPanelTabs/useTerminalTabs'
 import { useCommandStore } from '@/stores/commandStore'
 import { ComfyExtension } from '@/types/comfy'
 import type { BottomPanelExtension } from '@/types/extensionTypes'
diff --git a/src/stores/workspace/sidebarTabStore.ts b/src/stores/workspace/sidebarTabStore.ts
index 9f7b2d9f6..a4e3a9771 100644
--- a/src/stores/workspace/sidebarTabStore.ts
+++ b/src/stores/workspace/sidebarTabStore.ts
@@ -1,10 +1,10 @@
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
-import { useModelLibrarySidebarTab } from '@/hooks/sidebarTabs/modelLibrarySidebarTab'
-import { useNodeLibrarySidebarTab } from '@/hooks/sidebarTabs/nodeLibrarySidebarTab'
-import { useQueueSidebarTab } from '@/hooks/sidebarTabs/queueSidebarTab'
-import { useWorkflowsSidebarTab } from '@/hooks/sidebarTabs/workflowsSidebarTab'
+import { useModelLibrarySidebarTab } from '@/composables/sidebarTabs/useModelLibrarySidebarTab'
+import { useNodeLibrarySidebarTab } from '@/composables/sidebarTabs/useNodeLibrarySidebarTab'
+import { useQueueSidebarTab } from '@/composables/sidebarTabs/useQueueSidebarTab'
+import { useWorkflowsSidebarTab } from '@/composables/sidebarTabs/useWorkflowsSidebarTab'
 import { useCommandStore } from '@/stores/commandStore'
 import { SidebarTabExtension } from '@/types/extensionTypes'
 
diff --git a/src/views/GraphView.vue b/src/views/GraphView.vue
index eafce3022..1b66ca663 100644
--- a/src/views/GraphView.vue
+++ b/src/views/GraphView.vue
@@ -22,9 +22,9 @@ import UnloadWindowConfirmDialog from '@/components/dialog/UnloadWindowConfirmDi
 import GraphCanvas from '@/components/graph/GraphCanvas.vue'
 import GlobalToast from '@/components/toast/GlobalToast.vue'
 import TopMenubar from '@/components/topbar/TopMenubar.vue'
+import { useCoreCommands } from '@/composables/useCoreCommands'
+import { useErrorHandling } from '@/composables/useErrorHandling'
 import { SERVER_CONFIG_ITEMS } from '@/constants/serverConfig'
-import { useCoreCommands } from '@/hooks/coreCommandHooks'
-import { useErrorHandling } from '@/hooks/errorHooks'
 import { i18n } from '@/i18n'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
diff --git a/src/views/MaintenanceView.vue b/src/views/MaintenanceView.vue
index 3867b7aa6..ab17d3318 100644
--- a/src/views/MaintenanceView.vue
+++ b/src/views/MaintenanceView.vue
@@ -104,8 +104,8 @@ import BaseTerminal from '@/components/bottomPanel/tabs/terminal/BaseTerminal.vu
 import RefreshButton from '@/components/common/RefreshButton.vue'
 import StatusTag from '@/components/maintenance/StatusTag.vue'
 import TaskListPanel from '@/components/maintenance/TaskListPanel.vue'
-import type { useTerminal } from '@/hooks/bottomPanelTabs/useTerminal'
-import { useTerminalBuffer } from '@/hooks/bottomPanelTabs/useTerminalBuffer'
+import type { useTerminal } from '@/composables/bottomPanelTabs/useTerminal'
+import { useTerminalBuffer } from '@/composables/bottomPanelTabs/useTerminalBuffer'
 import { t } from '@/i18n'
 import { useMaintenanceTaskStore } from '@/stores/maintenanceTaskStore'
 import { MaintenanceFilter } from '@/types/desktop/maintenanceTypes'
diff --git a/src/views/ServerStartView.vue b/src/views/ServerStartView.vue
index 46ae292ba..e04b7c691 100644
--- a/src/views/ServerStartView.vue
+++ b/src/views/ServerStartView.vue
@@ -51,7 +51,7 @@ import { Ref, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import BaseTerminal from '@/components/bottomPanel/tabs/terminal/BaseTerminal.vue'
-import type { useTerminal } from '@/hooks/bottomPanelTabs/useTerminal'
+import type { useTerminal } from '@/composables/bottomPanelTabs/useTerminal'
 import { electronAPI } from '@/utils/envUtil'
 import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'