From ef523f69b76e3d97df7cb87e9d86f93c7016b92a Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Fri, 7 Aug 2026 10:56:12 -0700
Subject: [PATCH 1/2] improvement(forking): widen the fork mapping target
 picker and make it searchable

---
 .../components/fork-sync/fork-sync-view.tsx            | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/sim/ee/workspace-forking/components/fork-sync/fork-sync-view.tsx b/apps/sim/ee/workspace-forking/components/fork-sync/fork-sync-view.tsx
index 266a1a993be..6024ae1deb2 100644
--- a/apps/sim/ee/workspace-forking/components/fork-sync/fork-sync-view.tsx
+++ b/apps/sim/ee/workspace-forking/components/fork-sync/fork-sync-view.tsx
@@ -78,8 +78,12 @@ const NEW_COPY_VALUE = '__new_copy__'
  */
 const NEW_TRIGGER_URL_VALUE = '__new_trigger_url__'
 
-/** Fixed target-picker width so every mapping row's control lines up as one column (mirrors General). */
-const MAPPING_TARGET_TRIGGER_CLASS = 'w-[240px] flex-shrink-0'
+/**
+ * Fixed target-picker width so every mapping row's control lines up as one column (mirrors
+ * General). Wide enough to hold a full-length secret key - these are the longest labels the
+ * picker shows, and clipping them is what makes two same-prefixed keys indistinguishable.
+ */
+const MAPPING_TARGET_TRIGGER_CLASS = 'w-[320px] flex-shrink-0'
 
 interface DependentBlock {
   targetBlockId: string
@@ -400,6 +404,8 @@ function MappingEntry({ controller, group, entry }: MappingEntryProps) {
               value={copying ? NEW_COPY_VALUE : target || undefined}
               onChange={(value) => controller.setTarget(entry, value)}
               placeholder='Select target'
+              searchable
+              searchPlaceholder='Search targets'
             />
           </div>
         </div>

From f3158e1259e73c6e718437e3d1d29b2b9ce9be60 Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Fri, 7 Aug 2026 11:01:35 -0700
Subject: [PATCH 2/2] fix(forking): stop the truncated-candidates hint
 promising a search that cannot reach past the cap

---
 .../workspace-forking/components/fork-sync/fork-sync-view.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/sim/ee/workspace-forking/components/fork-sync/fork-sync-view.tsx b/apps/sim/ee/workspace-forking/components/fork-sync/fork-sync-view.tsx
index 6024ae1deb2..e6cf1687ead 100644
--- a/apps/sim/ee/workspace-forking/components/fork-sync/fork-sync-view.tsx
+++ b/apps/sim/ee/workspace-forking/components/fork-sync/fork-sync-view.tsx
@@ -418,7 +418,7 @@ function MappingEntry({ controller, group, entry }: MappingEntryProps) {
         ) : null}
         {entry.candidatesTruncated ? (
           <p className='text-[var(--text-muted)] text-small'>
-            More options than shown — search by name.
+            Too many targets to list them all — search covers only the ones shown.
           </p>
         ) : null}
       </div>