fix(copilot): targeted auto-layout for copilot edits + custom tool persistence (#1546)

* fix autolayout and custom tools persistence

* fix

* fix preserving positions within subflow

* more fixes

* fix resizing

* consolidate constants

Author: icecrasher321

apps/sim/app/api/workflows/[id]/state/route.ts

@@ -7,6 +7,7 @@ import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getUserEntityPermissions } from '@/lib/permissions/utils'
 import { generateRequestId } from '@/lib/utils'
+import { extractAndPersistCustomTools } from '@/lib/workflows/custom-tools-persistence'
 import { saveWorkflowToNormalizedTables } from '@/lib/workflows/db-helpers'
 import { sanitizeAgentToolsInBlocks } from '@/lib/workflows/validation'
 
@@ -207,6 +208,21 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
       )
     }
 
+    // Extract and persist custom tools to database
+    try {
+      const { saved, errors } = await extractAndPersistCustomTools(workflowState, userId)
+
+      if (saved > 0) {
+        logger.info(`[${requestId}] Persisted ${saved} custom tool(s) to database`, { workflowId })
+      }
+
+      if (errors.length > 0) {
+        logger.warn(`[${requestId}] Some custom tools failed to persist`, { errors, workflowId })
+      }
+    } catch (error) {
+      logger.error(`[${requestId}] Failed to persist custom tools`, { error, workflowId })
+    }
+
     // Update workflow's lastSynced timestamp
     await db
       .update(workflow)

apps/sim/lib/copilot/tools/server/workflow/edit-workflow.ts

@@ -5,6 +5,7 @@ import { eq } from 'drizzle-orm'
 import type { BaseServerTool } from '@/lib/copilot/tools/server/base-tool'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getBlockOutputs } from '@/lib/workflows/block-outputs'
+import { extractAndPersistCustomTools } from '@/lib/workflows/custom-tools-persistence'
 import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/db-helpers'
 import { validateWorkflowState } from '@/lib/workflows/validation'
 import { getAllBlocks } from '@/blocks/registry'
@@ -845,7 +846,7 @@ async function getCurrentWorkflowStateFromDb(
 
 export const editWorkflowServerTool: BaseServerTool<EditWorkflowParams, any> = {
   name: 'edit_workflow',
-  async execute(params: EditWorkflowParams): Promise<any> {
+  async execute(params: EditWorkflowParams, context?: { userId: string }): Promise<any> {
     const logger = createLogger('EditWorkflowServerTool')
     const { operations, workflowId, currentUserWorkflow } = params
     if (!operations || operations.length === 0) throw new Error('operations are required')
@@ -891,6 +892,29 @@ export const editWorkflowServerTool: BaseServerTool<EditWorkflowParams, any> = {
       })
     }
 
+    // Extract and persist custom tools to database
+    if (context?.userId) {
+      try {
+        const finalWorkflowState = validation.sanitizedState || modifiedWorkflowState
+        const { saved, errors } = await extractAndPersistCustomTools(
+          finalWorkflowState,
+          context.userId
+        )
+
+        if (saved > 0) {
+          logger.info(`Persisted ${saved} custom tool(s) to database`, { workflowId })
+        }
+
+        if (errors.length > 0) {
+          logger.warn('Some custom tools failed to persist', { errors, workflowId })
+        }
+      } catch (error) {
+        logger.error('Failed to persist custom tools', { error, workflowId })
+      }
+    } else {
+      logger.warn('No userId in context - skipping custom tools persistence', { workflowId })
+    }
+
     logger.info('edit_workflow successfully applied operations', {
       operationCount: operations.length,
       blocksCount: Object.keys(modifiedWorkflowState.blocks).length,

apps/sim/lib/workflows/autolayout/containers.ts

@@ -4,6 +4,9 @@ import { assignLayers, groupByLayer } from './layering'
 import { calculatePositions } from './positioning'
 import type { Edge, LayoutOptions } from './types'
 import {
+  CONTAINER_PADDING,
+  CONTAINER_PADDING_X,
+  CONTAINER_PADDING_Y,
   DEFAULT_CONTAINER_HEIGHT,
   DEFAULT_CONTAINER_WIDTH,
   getBlocksByParent,
@@ -12,10 +15,6 @@ import {
 
 const logger = createLogger('AutoLayout:Containers')
 
-const CONTAINER_PADDING = 150
-const CONTAINER_HORIZONTAL_PADDING = 180
-const CONTAINER_VERTICAL_PADDING = 100
-
 export function layoutContainers(
   blocks: Record<string, BlockState>,
   edges: Edge[],
@@ -26,7 +25,7 @@ export function layoutContainers(
   const containerOptions: LayoutOptions = {
     horizontalSpacing: options.horizontalSpacing ? options.horizontalSpacing * 0.85 : 400,
     verticalSpacing: options.verticalSpacing ? options.verticalSpacing : 200,
-    padding: { x: CONTAINER_HORIZONTAL_PADDING, y: CONTAINER_VERTICAL_PADDING },
+    padding: { x: CONTAINER_PADDING_X, y: CONTAINER_PADDING_Y },
     alignment: options.alignment,
   }
 
@@ -68,8 +67,8 @@ export function layoutContainers(
     }
 
     // Adjust all child positions to start at proper padding from container edges
-    const xOffset = CONTAINER_HORIZONTAL_PADDING - minX
-    const yOffset = CONTAINER_VERTICAL_PADDING - minY
+    const xOffset = CONTAINER_PADDING_X - minX
+    const yOffset = CONTAINER_PADDING_Y - minY
 
     for (const node of childNodes.values()) {
       childBlocks[node.id].position = {

apps/sim/lib/workflows/autolayout/index.ts

@@ -100,4 +100,6 @@ export function adjustForNewBlock(
 }
 
 export type { LayoutOptions, LayoutResult, AdjustmentOptions, Edge, Loop, Parallel }
+export type { TargetedLayoutOptions } from './targeted'
+export { applyTargetedLayout, transferBlockHeights } from './targeted'
 export { getBlockMetrics, isContainerType } from './utils'