chore: fix conflicts

Author: adithyaakrishna

.claude/settings.local.json

@@ -0,0 +1,16 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(docker compose:*)",
+      "Bash(docker system df:*)",
+      "Bash(docker image:*)",
+      "Bash(docker builder:*)",
+      "Bash(bun run:*)",
+      "Bash(DATABASE_URL=\"postgresql://postgres:postgres@localhost:5432/simstudio\" bunx drizzle-kit migrate --config=./drizzle.config.ts)",
+      "Bash(docker exec sim-db-1:*)",
+      "Bash(DATABASE_URL=\"postgresql://postgres:postgres@localhost:5432/simstudio\" bun run db:push)",
+      "Bash(POSTGRES_PORT=5433 docker compose:*)",
+      "Bash(DATABASE_URL=\"postgresql://postgres:postgres@localhost:5433/simstudio\" bun run db:migrate)"
+    ]
+  }
+}

apps/sim/app/_styles/globals.css

@@ -677,17 +677,26 @@ input[type="search"]::-ms-clear {
    * Panel tab visibility and styling to prevent hydration flash
    */
   html[data-panel-active-tab="copilot"] .panel-container [data-tab-content="toolbar"],
-  html[data-panel-active-tab="copilot"] .panel-container [data-tab-content="editor"] {
+  html[data-panel-active-tab="copilot"] .panel-container [data-tab-content="editor"],
+  html[data-panel-active-tab="copilot"] .panel-container [data-tab-content="logs"] {
     display: none !important;
   }
 
   html[data-panel-active-tab="toolbar"] .panel-container [data-tab-content="copilot"],
-  html[data-panel-active-tab="toolbar"] .panel-container [data-tab-content="editor"] {
+  html[data-panel-active-tab="toolbar"] .panel-container [data-tab-content="editor"],
+  html[data-panel-active-tab="toolbar"] .panel-container [data-tab-content="logs"] {
     display: none !important;
   }
 
   html[data-panel-active-tab="editor"] .panel-container [data-tab-content="copilot"],
-  html[data-panel-active-tab="editor"] .panel-container [data-tab-content="toolbar"] {
+  html[data-panel-active-tab="editor"] .panel-container [data-tab-content="toolbar"],
+  html[data-panel-active-tab="editor"] .panel-container [data-tab-content="logs"] {
+    display: none !important;
+  }
+
+  html[data-panel-active-tab="logs"] .panel-container [data-tab-content="copilot"],
+  html[data-panel-active-tab="logs"] .panel-container [data-tab-content="toolbar"],
+  html[data-panel-active-tab="logs"] .panel-container [data-tab-content="editor"] {
     display: none !important;
   }
 
@@ -696,7 +705,8 @@ input[type="search"]::-ms-clear {
     color: var(--text-primary) !important;
   }
   html[data-panel-active-tab="copilot"] .panel-container [data-tab-button="toolbar"],
-  html[data-panel-active-tab="copilot"] .panel-container [data-tab-button="editor"] {
+  html[data-panel-active-tab="copilot"] .panel-container [data-tab-button="editor"],
+  html[data-panel-active-tab="copilot"] .panel-container [data-tab-button="logs"] {
     background-color: transparent !important;
     color: var(--text-tertiary) !important;
   }
@@ -706,7 +716,8 @@ input[type="search"]::-ms-clear {
     color: var(--text-primary) !important;
   }
   html[data-panel-active-tab="toolbar"] .panel-container [data-tab-button="copilot"],
-  html[data-panel-active-tab="toolbar"] .panel-container [data-tab-button="editor"] {
+  html[data-panel-active-tab="toolbar"] .panel-container [data-tab-button="editor"],
+  html[data-panel-active-tab="toolbar"] .panel-container [data-tab-button="logs"] {
     background-color: transparent !important;
     color: var(--text-tertiary) !important;
   }
@@ -716,7 +727,19 @@ input[type="search"]::-ms-clear {
     color: var(--text-primary) !important;
   }
   html[data-panel-active-tab="editor"] .panel-container [data-tab-button="copilot"],
-  html[data-panel-active-tab="editor"] .panel-container [data-tab-button="toolbar"] {
+  html[data-panel-active-tab="editor"] .panel-container [data-tab-button="toolbar"],
+  html[data-panel-active-tab="editor"] .panel-container [data-tab-button="logs"] {
+    background-color: transparent !important;
+    color: var(--text-tertiary) !important;
+  }
+
+  html[data-panel-active-tab="logs"] .panel-container [data-tab-button="logs"] {
+    background-color: var(--border-1) !important;
+    color: var(--text-primary) !important;
+  }
+  html[data-panel-active-tab="logs"] .panel-container [data-tab-button="copilot"],
+  html[data-panel-active-tab="logs"] .panel-container [data-tab-button="toolbar"],
+  html[data-panel-active-tab="logs"] .panel-container [data-tab-button="editor"] {
     background-color: transparent !important;
     color: var(--text-tertiary) !important;
   }

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/index.ts

@@ -9,6 +9,8 @@ export { Panel } from './panel/panel'
 export { SubflowNodeComponent } from './subflows/subflow-node'
 export { Terminal } from './terminal/terminal'
 export { WandPromptBar } from './wand-prompt-bar/wand-prompt-bar'
+export { WorkflowActions } from './workflow-actions'
 export { WorkflowBlock } from './workflow-block/workflow-block'
 export { WorkflowControls } from './workflow-controls'
 export { WorkflowEdge } from './workflow-edge/workflow-edge'
+export { WorkflowToolbar } from './workflow-toolbar'