fix(files): scope the picker from either half of the folder pair

Author: mzxchandra

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

@@ -52,7 +52,7 @@ interface FileUploadProps {
    * A sibling folder field that narrows what this picker offers, and the switch
    * saying whether that scope descends. See `SubBlockConfig.folderScope`.
    */
-  folderScope?: { fieldId: string; recursiveFieldId?: string }
+  folderScope?: { fieldId: string; manualFieldId?: string; recursiveFieldId?: string }
   /**
    * Controlled value. When `onValueChange` is provided the component reads from
    * this prop and writes through `onValueChange` instead of the subblock store,
@@ -338,6 +338,16 @@ export function FileUpload({
    * scope reads as absent.
    */
   const [folderScopeValue] = useSubBlockValue<unknown>(blockId, folderScope?.fieldId ?? subBlockId)
+  /*
+   * The advanced half of the same canonical pair. Values are stored per
+   * sub-block id, so a scope typed into the advanced field lives under a
+   * different key and reading only the basic one left the picker unscoped
+   * while looking configured.
+   */
+  const [manualFolderScopeValue] = useSubBlockValue<unknown>(
+    blockId,
+    folderScope?.manualFieldId ?? folderScope?.fieldId ?? subBlockId
+  )
   const [folderScopeRecursive] = useSubBlockValue<unknown>(
     blockId,
     folderScope?.recursiveFieldId ?? subBlockId
@@ -348,7 +358,9 @@ export function FileUpload({
    * its literal text passes a string check and then matches no folder, so every
    * file is filtered out of a picker that looks correctly configured.
    */
-  const folderScopePath = folderScope ? readFolderPath(folderScopeValue) : ''
+  const folderScopePath = folderScope
+    ? readFolderPath(folderScopeValue) || readFolderPath(manualFolderScopeValue)
+    : ''
   const folderScopeIncludesSubfolders =
     !folderScope?.recursiveFieldId ||
     folderScopeRecursive === undefined ||

apps/sim/blocks/blocks.test.ts

@@ -197,6 +197,7 @@ describe.concurrent('Blocks Module', () => {
        */
       expect(block?.subBlocks.find((subBlock) => subBlock.id === 'readFile')?.folderScope).toEqual({
         fieldId: 'folderSelection',
+        manualFieldId: 'manualFolderSelection',
         recursiveFieldId: 'folderIncludeSubfolders',
       })
       expect(

apps/sim/blocks/blocks/file-folders.test.ts

@@ -374,6 +374,7 @@ describe('file_v5 folder operations produce contract-valid tool input', () => {
 
         expect(picker?.folderScope).toEqual({
           fieldId: 'folderSelection',
+          manualFieldId: 'manualFolderSelection',
           recursiveFieldId: 'folderIncludeSubfolders',
         })
       }
@@ -392,6 +393,21 @@ describe('file_v5 folder operations produce contract-valid tool input', () => {
       }
     )
 
+    /*
+     * Sub-block values are stored per sub-block id, so a picker that reads only
+     * the basic half is unscoped whenever the scope was typed into the advanced
+     * one - configured-looking and silently wrong.
+     */
+    it('names both halves of the folder pair so either can scope a picker', () => {
+      const picker = FileV5Block.subBlocks.find((subBlock) => subBlock.id === 'readFile')
+
+      expect(picker?.folderScope).toEqual({
+        fieldId: 'folderSelection',
+        manualFieldId: 'manualFolderSelection',
+        recursiveFieldId: 'folderIncludeSubfolders',
+      })
+    })
+
     it('offers the folder on every operation whose picker it narrows', () => {
       const folder = FileV5Block.subBlocks.find((subBlock) => subBlock.id === 'folderSelection')
 

apps/sim/blocks/blocks/file.ts

@@ -108,6 +108,7 @@ const MOVE_TARGET_FIELD = ['moveTargetFolderPath', 'manualMoveTargetFolderPath']
  */
 const FOLDER_SCOPE = {
   fieldId: 'folderSelection',
+  manualFieldId: 'manualFolderSelection',
   recursiveFieldId: 'folderIncludeSubfolders',
 } as const
 

apps/sim/blocks/types.ts

@@ -299,7 +299,15 @@ export interface SubBlockConfig {
    * whether the scope descends, so the picker and the run agree on how deep the
    * folder reaches.
    */
-  folderScope?: { fieldId: string; recursiveFieldId?: string }
+  /**
+   * Narrows this control's options to a folder chosen elsewhere on the block.
+   *
+   * `manualFieldId` is the advanced half of the same canonical pair. Sub-block
+   * values are stored per sub-block id, not per canonical id, so reading only
+   * `fieldId` leaves a scope typed into the advanced field invisible here and
+   * the picker silently unscoped.
+   */
+  folderScope?: { fieldId: string; manualFieldId?: string; recursiveFieldId?: string }
   /** Controls parameter visibility in agent/tool-input context */
   paramVisibility?: 'user-or-llm' | 'user-only' | 'llm-only' | 'hidden'
   /**