fix tool input scenarios and add dependsOn UI handling

Author: icecrasher321

apps/sim/app/api/workspaces/[id]/fork/diff/route.ts

@@ -6,6 +6,7 @@ import { getSession } from '@/lib/auth'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { loadSourceDeployedStates } from '@/lib/workspaces/fork/copy/deploy-bridge'
 import { assertCanPromote } from '@/lib/workspaces/fork/lineage/authz'
+import { collectForkDependentReconfigs } from '@/lib/workspaces/fork/mapping/dependent-reconfigs'
 import { computeForkPromotePlan } from '@/lib/workspaces/fork/promote/promote-plan'
 
 export const GET = withRouteHandler(
@@ -80,6 +81,7 @@ export const GET = withRouteHandler(
       unmappedOptional: plan.unmappedOptional.map(toRef),
       mcpReauthServerIds: plan.mcpReauthServerIds,
       inlineSecretSources: plan.inlineSecretSources,
+      dependentReconfigs: collectForkDependentReconfigs(plan.items, sourceStates),
       drift: plan.drift,
     })
   }

apps/sim/app/api/workspaces/[id]/fork/promote/route.ts

@@ -25,7 +25,7 @@ export const POST = withRouteHandler(
     const parsed = await parseRequest(promoteForkContract, req, context)
     if (!parsed.success) return parsed.response
     const { id } = parsed.data.params
-    const { otherWorkspaceId, direction, force } = parsed.data.body
+    const { otherWorkspaceId, direction, force, dependentOverrides } = parsed.data.body
 
     const auth = await assertCanPromote(id, otherWorkspaceId, direction, session.user.id)
 
@@ -36,6 +36,7 @@ export const POST = withRouteHandler(
       direction,
       force,
       userId: session.user.id,
+      dependentOverrides,
       requestId,
     })
 
@@ -47,6 +48,8 @@ export const POST = withRouteHandler(
       redeployed: result.redeployed,
       deployFailed: result.deployFailed,
       unmappedRequired: result.unmappedRequired,
+      needsConfiguration: result.needsConfiguration,
+      clearedOptional: result.clearedOptional,
       drift: result.drift,
     }
 
@@ -84,7 +87,12 @@ export const POST = withRouteHandler(
     await recordBackgroundWork(db, {
       workspaceId: id,
       kind: 'fork_sync',
-      status: result.deployFailed > 0 ? 'completed_with_warnings' : 'completed',
+      status:
+        result.deployFailed > 0 ||
+        result.needsConfiguration.length > 0 ||
+        result.clearedOptional.length > 0
+          ? 'completed_with_warnings'
+          : 'completed',
       message: direction === 'pull' ? `Pulled from "${otherName}"` : `Pushed to "${otherName}"`,
       metadata: {
         actorName: session.user.name ?? undefined,
@@ -98,6 +106,8 @@ export const POST = withRouteHandler(
         updatedNames: result.updatedNames,
         createdNames: result.createdNames,
         archivedNames: result.archivedNames,
+        needsConfiguration: result.needsConfiguration,
+        clearedOptional: result.clearedOptional,
       },
     }).catch((error) =>
       logger.error(`[${requestId}] Failed to record sync activity`, {

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tools/sub-block-renderer.tsx

@@ -6,6 +6,7 @@ import {
   resolveToolParamSync,
 } from '@/lib/workflows/tool-input/synthetic-subblocks'
 import { parseStoredToolInputValue } from '@/lib/workflows/tool-input/types'
+import { DependencyBlockTypeProvider } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-dependency-block-type'
 import { SubBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block'
 import type { SubBlockConfig as BlockSubBlockConfig } from '@/blocks/types'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
@@ -17,6 +18,8 @@ interface ToolSubBlockRendererProps {
   toolIndex: number
   subBlock: BlockSubBlockConfig
   effectiveParamId: string
+  /** The tool's block type (e.g. `gmail`), so its params' selectors resolve dependencies. */
+  toolType: string
   toolParams: Record<string, string> | undefined
   onParamChange: (toolIndex: number, paramId: string, value: string) => void
   disabled: boolean
@@ -44,6 +47,7 @@ export function ToolSubBlockRenderer({
   toolIndex,
   subBlock,
   effectiveParamId,
+  toolType,
   toolParams,
   onParamChange,
   disabled,
@@ -118,13 +122,15 @@ export function ToolSubBlockRenderer({
   }
 
   return (
-    <SubBlock
-      blockId={blockId}
-      config={config}
-      isPreview={false}
-      disabled={disabled}
-      canonicalToggle={canonicalToggle}
-      dependencyContext={toolParams}
-    />
+    <DependencyBlockTypeProvider value={toolType}>
+      <SubBlock
+        blockId={blockId}
+        config={config}
+        isPreview={false}
+        disabled={disabled}
+        canonicalToggle={canonicalToggle}
+        dependencyContext={toolParams}
+      />
+    </DependencyBlockTypeProvider>
   )
 }

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx

@@ -2111,6 +2111,7 @@ export const ToolInput = memo(function ToolInput({
                             toolIndex={toolIndex}
                             subBlock={sbWithTitle}
                             effectiveParamId={effectiveParamId}
+                            toolType={tool.type}
                             toolParams={tool.params}
                             onParamChange={handleParamChange}
                             disabled={disabled}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-dependency-block-type.ts

@@ -0,0 +1,19 @@
+'use client'
+
+import { createContext, useContext } from 'react'
+
+const DependencyBlockTypeContext = createContext<string | null>(null)
+
+/**
+ * Provider set by tool-input param rendering (value = the tool's block type, e.g. `gmail`).
+ */
+export const DependencyBlockTypeProvider = DependencyBlockTypeContext.Provider
+
+/**
+ * The block type whose config should drive dependency (`dependsOn`) canonical resolution
+ * for the current subblock. Null for normal blocks (resolve against the host block). Set
+ * to the tool's type for tool-input params, so a nested tool's selector resolves its
+ * parents against the TOOL's config (e.g. a Gmail tool's `credential` -> `oauthCredential`,
+ * which the host Agent block's subblocks don't define) and can fetch its options.
+ */
+export const useDependencyBlockType = () => useContext(DependencyBlockTypeContext)

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate.ts

@@ -15,6 +15,7 @@ import type { SubBlockConfig } from '@/blocks/types'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
+import { useDependencyBlockType } from './use-dependency-block-type'
 
 /**
  * Centralized dependsOn gating for sub-block components.
@@ -33,7 +34,13 @@ export function useDependsOnGate(
 
   const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId)
   const blockState = useWorkflowStore((state) => state.blocks[blockId])
-  const blockConfig = blockState?.type ? getBlock(blockState.type) : null
+
+  const dependencyBlockType = useDependencyBlockType()
+  const blockConfig = dependencyBlockType
+    ? getBlock(dependencyBlockType)
+    : blockState?.type
+      ? getBlock(blockState.type)
+      : null
   const canonicalIndex = useMemo(
     () => buildCanonicalIndex(blockConfig?.subBlocks || []),
     [blockConfig?.subBlocks]

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/fork-activity-panel/fork-activity-panel.tsx

@@ -84,6 +84,21 @@ function jobReport(job: BackgroundWorkItem): JobReport {
       ])
       if (counts) notes.push({ value: counts })
     }
+    if (m.needsConfiguration && m.needsConfiguration.length > 0) {
+      for (const item of m.needsConfiguration) {
+        notes.push({
+          value: `${item.workflowName} — re-check ${item.blocks.join(', ')}`,
+          warning: true,
+        })
+      }
+    }
+    if (m.clearedOptional && m.clearedOptional.length > 0) {
+      for (const item of m.clearedOptional) {
+        notes.push({
+          value: `${item.workflowName} — optional cleared in ${item.blocks.join(', ')}`,
+        })
+      }
+    }
     if (m.deployFailed && m.deployFailed > 0) {
       notes.push({ value: `${plural(m.deployFailed, 'workflow')} failed to deploy`, warning: true })
     }

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/promote-workspace-modal/components/dependent-field-selector.tsx

@@ -0,0 +1,71 @@
+'use client'
+
+import { useMemo } from 'react'
+import { ChipCombobox, type ComboboxOption, Loader } from '@/components/emcn'
+import type { SelectorContext, SelectorKey } from '@/hooks/selectors/types'
+import { useSelectorOptions } from '@/hooks/selectors/use-selector-query'
+
+interface DependentFieldSelectorProps {
+  selectorKey: SelectorKey
+  /** Full selector context, including the newly-chosen parent value. */
+  context: Record<string, string>
+  /** False until the parent (credential/KB) target is chosen. */
+  enabled: boolean
+  value: string
+  onChange: (value: string) => void
+  title: string
+}
+
+/**
+ * A controlled, standalone selector for the sync modal's pre-sync reconfigure: fetches
+ * options via the shared selector data layer (the same `useSelectorOptions` registry the
+ * canvas selectors use) without the canvas store/blockId coupling. Mirrors
+ * {@link ConnectorSelectorField}.
+ */
+export function DependentFieldSelector({
+  selectorKey,
+  context,
+  enabled,
+  value,
+  onChange,
+  title,
+}: DependentFieldSelectorProps) {
+  const selectorContext = useMemo<SelectorContext>(() => {
+    const ctx: SelectorContext = {}
+    Object.assign(ctx, context)
+    return ctx
+  }, [context])
+
+  const { data: options = [], isLoading } = useSelectorOptions(selectorKey, {
+    context: selectorContext,
+    enabled,
+  })
+
+  const comboboxOptions = useMemo<ComboboxOption[]>(
+    () => options.map((option) => ({ label: option.label, value: option.id })),
+    [options]
+  )
+
+  if (isLoading && enabled) {
+    return (
+      <div className='flex h-[30px] items-center gap-2 rounded-lg border border-[var(--border-1)] bg-[var(--surface-5)] px-2 font-medium text-[var(--text-muted)] text-small dark:bg-[var(--surface-4)]'>
+        <Loader className='size-3.5' animate />
+        Loading…
+      </div>
+    )
+  }
+
+  return (
+    <ChipCombobox
+      className='w-full'
+      options={comboboxOptions}
+      value={value || undefined}
+      onChange={(next) => onChange(next)}
+      searchable
+      searchPlaceholder={`Search ${title.toLowerCase()}...`}
+      placeholder={`Select ${title.toLowerCase()}`}
+      disabled={!enabled}
+      emptyMessage={`No ${title.toLowerCase()} found`}
+    />
+  )
+}