diff --git a/apps/sim/lib/copilot/tools/client/knowledge/knowledge-base.ts b/apps/sim/lib/copilot/tools/client/knowledge/knowledge-base.ts
index 7918872c9e..41afc2e853 100644
--- a/apps/sim/lib/copilot/tools/client/knowledge/knowledge-base.ts
+++ b/apps/sim/lib/copilot/tools/client/knowledge/knowledge-base.ts
@@ -9,7 +9,7 @@ import {
   ExecuteResponseSuccessSchema,
   type KnowledgeBaseArgs,
 } from '@/lib/copilot/tools/shared/schemas'
-import { useCopilotStore } from '@/stores/panel'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
 
 /**
  * Client tool for knowledge base operations
diff --git a/apps/sim/lib/copilot/tools/client/navigation/navigate-ui.ts b/apps/sim/lib/copilot/tools/client/navigation/navigate-ui.ts
index fff7833ff8..5b9d30c067 100644
--- a/apps/sim/lib/copilot/tools/client/navigation/navigate-ui.ts
+++ b/apps/sim/lib/copilot/tools/client/navigation/navigate-ui.ts
@@ -5,7 +5,7 @@ import {
   type BaseClientToolMetadata,
   ClientToolCallState,
 } from '@/lib/copilot/tools/client/base-tool'
-import { useCopilotStore } from '@/stores/panel'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
 type NavigationDestination = 'workflow' | 'logs' | 'templates' | 'vector_db' | 'settings'
diff --git a/apps/sim/lib/copilot/tools/client/workflow/block-output-utils.ts b/apps/sim/lib/copilot/tools/client/workflow/block-output-utils.ts
index 729fd80baa..4916cb7700 100644
--- a/apps/sim/lib/copilot/tools/client/workflow/block-output-utils.ts
+++ b/apps/sim/lib/copilot/tools/client/workflow/block-output-utils.ts
@@ -5,8 +5,8 @@ import {
 import { getBlockOutputPaths } from '@/lib/workflows/blocks/block-outputs'
 import { getBlock } from '@/blocks'
 import { normalizeName } from '@/executor/constants'
-import type { Variable } from '@/stores/panel'
-import { useVariablesStore } from '@/stores/panel'
+import { useVariablesStore } from '@/stores/panel/variables/store'
+import type { Variable } from '@/stores/panel/variables/types'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import type { BlockState, Loop, Parallel } from '@/stores/workflows/workflow/types'
 
diff --git a/apps/sim/lib/copilot/tools/client/workflow/deploy-workflow.ts b/apps/sim/lib/copilot/tools/client/workflow/deploy-workflow.ts
index cdcdac3b24..dda9d7844b 100644
--- a/apps/sim/lib/copilot/tools/client/workflow/deploy-workflow.ts
+++ b/apps/sim/lib/copilot/tools/client/workflow/deploy-workflow.ts
@@ -6,7 +6,7 @@ import {
   ClientToolCallState,
 } from '@/lib/copilot/tools/client/base-tool'
 import { getInputFormatExample } from '@/lib/workflows/operations/deployment-utils'
-import { useCopilotStore } from '@/stores/panel'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
 interface DeployWorkflowArgs {
diff --git a/apps/sim/lib/copilot/tools/client/workflow/manage-custom-tool.ts b/apps/sim/lib/copilot/tools/client/workflow/manage-custom-tool.ts
index 821eaf1fa5..5fecb00112 100644
--- a/apps/sim/lib/copilot/tools/client/workflow/manage-custom-tool.ts
+++ b/apps/sim/lib/copilot/tools/client/workflow/manage-custom-tool.ts
@@ -7,7 +7,7 @@ import {
   ClientToolCallState,
 } from '@/lib/copilot/tools/client/base-tool'
 import { useCustomToolsStore } from '@/stores/custom-tools'
-import { useCopilotStore } from '@/stores/panel'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
 interface CustomToolSchema {
diff --git a/apps/sim/lib/copilot/tools/client/workflow/manage-mcp-tool.ts b/apps/sim/lib/copilot/tools/client/workflow/manage-mcp-tool.ts
index 3fb2ce39f5..796574dc1b 100644
--- a/apps/sim/lib/copilot/tools/client/workflow/manage-mcp-tool.ts
+++ b/apps/sim/lib/copilot/tools/client/workflow/manage-mcp-tool.ts
@@ -6,7 +6,7 @@ import {
   type BaseClientToolMetadata,
   ClientToolCallState,
 } from '@/lib/copilot/tools/client/base-tool'
-import { useCopilotStore } from '@/stores/panel'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
 interface McpServerConfig {
diff --git a/apps/sim/lib/copilot/tools/client/workflow/set-global-workflow-variables.ts b/apps/sim/lib/copilot/tools/client/workflow/set-global-workflow-variables.ts
index 1cbbbe065a..8762865f8d 100644
--- a/apps/sim/lib/copilot/tools/client/workflow/set-global-workflow-variables.ts
+++ b/apps/sim/lib/copilot/tools/client/workflow/set-global-workflow-variables.ts
@@ -5,7 +5,7 @@ import {
   type BaseClientToolMetadata,
   ClientToolCallState,
 } from '@/lib/copilot/tools/client/base-tool'
-import { useVariablesStore } from '@/stores/panel'
+import { useVariablesStore } from '@/stores/panel/variables/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
 interface OperationItem {
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 9782b5582e..6ba54ec1fa 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -4,7 +4,7 @@ import { devtools } from 'zustand/middleware'
 import { withOptimisticUpdate } from '@/lib/core/utils/optimistic-update'
 import { DEFAULT_DUPLICATE_OFFSET } from '@/lib/workflows/autolayout/constants'
 import { buildDefaultWorkflowArtifacts } from '@/lib/workflows/defaults'
-import { useVariablesStore } from '@/stores/panel'
+import { useVariablesStore } from '@/stores/panel/variables/store'
 import type {
   DeploymentStatus,
   HydrationState,