address bugbot comments

Author: icecrasher321

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

@@ -2,7 +2,11 @@ import crypto from 'crypto'
 import { createLogger } from '@sim/logger'
 import type { PermissionGroupConfig } from '@/lib/permission-groups/types'
 import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
-import { buildCanonicalIndex, isCanonicalPair } from '@/lib/workflows/subblocks/visibility'
+import {
+  buildCanonicalIndex,
+  buildDefaultCanonicalModes,
+  isCanonicalPair,
+} from '@/lib/workflows/subblocks/visibility'
 import { hasTriggerCapability } from '@/lib/workflows/triggers/trigger-utils'
 import { getAllBlocks } from '@/blocks/registry'
 import type { BlockConfig } from '@/blocks/types'
@@ -130,13 +134,7 @@ export function createBlockFromParams(
       }
     })
 
-    const canonicalIndex = buildCanonicalIndex(blockConfig.subBlocks)
-    const defaultModes: Record<string, 'basic' | 'advanced'> = {}
-    for (const group of Object.values(canonicalIndex.groupsById)) {
-      if (isCanonicalPair(group)) {
-        defaultModes[group.canonicalId] = 'basic'
-      }
-    }
+    const defaultModes = buildDefaultCanonicalModes(blockConfig.subBlocks)
     if (Object.keys(defaultModes).length > 0) {
       if (!blockState.data) blockState.data = {}
       blockState.data.canonicalModes = defaultModes

apps/sim/lib/workflows/subblocks/visibility.ts

@@ -75,6 +75,23 @@ export function isCanonicalPair(group?: CanonicalGroup): boolean {
   return Boolean(group?.basicId && group?.advancedIds?.length)
 }
 
+/**
+ * Builds default canonical mode overrides for a block's subblocks.
+ * All canonical pairs default to `'basic'`.
+ */
+export function buildDefaultCanonicalModes(
+  subBlocks: SubBlockConfig[]
+): Record<string, 'basic' | 'advanced'> {
+  const index = buildCanonicalIndex(subBlocks)
+  const modes: Record<string, 'basic' | 'advanced'> = {}
+  for (const group of Object.values(index.groupsById)) {
+    if (isCanonicalPair(group)) {
+      modes[group.canonicalId] = 'basic'
+    }
+  }
+  return modes
+}
+
 /**
  * Determine the active mode for a canonical group.
  */

apps/sim/serializer/index.ts

@@ -378,11 +378,7 @@ export class Serializer {
       const hasExplicitOverride = canonicalModeOverrides?.[group.canonicalId] != null
       const pairMode =
         hasExplicitOverride || !legacyAdvancedMode
-          ? resolveCanonicalMode(
-              group,
-              buildSubBlockValues(block.subBlocks),
-              canonicalModeOverrides
-            )
+          ? resolveCanonicalMode(group, allValues, canonicalModeOverrides)
           : 'advanced'
       const chosen = pairMode === 'advanced' ? advancedValue : basicValue
 

apps/sim/stores/workflows/utils.ts

@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from 'uuid'
 import { DEFAULT_DUPLICATE_OFFSET } from '@/lib/workflows/autolayout/constants'
 import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
 import { mergeSubblockStateWithValues } from '@/lib/workflows/subblocks'
-import { buildCanonicalIndex, isCanonicalPair } from '@/lib/workflows/subblocks/visibility'
+import { buildDefaultCanonicalModes } from '@/lib/workflows/subblocks/visibility'
 import { hasTriggerCapability } from '@/lib/workflows/triggers/trigger-utils'
 import { TriggerUtils } from '@/lib/workflows/triggers/triggers'
 import { getBlock } from '@/blocks'
@@ -198,13 +198,7 @@ export function prepareBlockState(options: PrepareBlockStateOptions): BlockState
   })
 
   if (blockConfig.subBlocks) {
-    const canonicalIndex = buildCanonicalIndex(blockConfig.subBlocks)
-    const canonicalModes: Record<string, 'basic' | 'advanced'> = {}
-    for (const group of Object.values(canonicalIndex.groupsById)) {
-      if (isCanonicalPair(group)) {
-        canonicalModes[group.canonicalId] = 'basic'
-      }
-    }
+    const canonicalModes = buildDefaultCanonicalModes(blockConfig.subBlocks)
     if (Object.keys(canonicalModes).length > 0) {
       blockData.canonicalModes = canonicalModes
     }