From d682dad7e8db1c55c12ce4fa2f9cda833fe13ab2 Mon Sep 17 00:00:00 2001
From: David Prevost <david.prevost@goto.com>
Date: Sat, 18 Oct 2025 11:07:11 -0400
Subject: [PATCH 1/3] Add description in target debugs to distinguish RN Bridge
 and reanimated

---
 .../src/commands/start/OpenDebuggerKeyboardHandler.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/community-cli-plugin/src/commands/start/OpenDebuggerKeyboardHandler.js b/packages/community-cli-plugin/src/commands/start/OpenDebuggerKeyboardHandler.js
index bee5295cf1b101..05eeec73b637f3 100644
--- a/packages/community-cli-plugin/src/commands/start/OpenDebuggerKeyboardHandler.js
+++ b/packages/community-cli-plugin/src/commands/start/OpenDebuggerKeyboardHandler.js
@@ -107,8 +107,8 @@ export default class OpenDebuggerKeyboardHandler {
           `Multiple debug targets available, please select:\n  ${targets
             .slice(0, 9)
             .map(
-              ({title}, i) =>
-                `${styleText(['white', 'inverse'], ` ${i + 1} `)} - "${title}"`,
+              ({title, description}, i) =>
+                `${styleText(['white', 'inverse'], ` ${i + 1} `)} - "${title} (${description})"`,
             )
             .join('\n  ')}`,
         );

From 8a910f8e035c22130789f417ab801ee64bc7857f Mon Sep 17 00:00:00 2001
From: David Prevost <david.prevost@goto.com>
Date: Sat, 25 Oct 2025 13:42:28 -0400
Subject: [PATCH 2/3] fix: add description only if first 9 has duplicates to
 not pollute for nothing

fix: prettier changes
---
 .../start/OpenDebuggerKeyboardHandler.js        | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/community-cli-plugin/src/commands/start/OpenDebuggerKeyboardHandler.js b/packages/community-cli-plugin/src/commands/start/OpenDebuggerKeyboardHandler.js
index 05eeec73b637f3..4c91524fa78bc1 100644
--- a/packages/community-cli-plugin/src/commands/start/OpenDebuggerKeyboardHandler.js
+++ b/packages/community-cli-plugin/src/commands/start/OpenDebuggerKeyboardHandler.js
@@ -102,14 +102,19 @@ export default class OpenDebuggerKeyboardHandler {
             '10 or more debug targets available, showing the first 9.',
           );
         }
+        const firstNineTargets = targets.slice(0, 9);
+        const hasDuplicateTitles =
+          new Set(firstNineTargets.map(target => target.title)).size <
+          firstNineTargets.length;
 
         this.#setTerminalMenu(
-          `Multiple debug targets available, please select:\n  ${targets
-            .slice(0, 9)
-            .map(
-              ({title, description}, i) =>
-                `${styleText(['white', 'inverse'], ` ${i + 1} `)} - "${title} (${description})"`,
-            )
+          `Multiple debug targets available, please select:\n  ${firstNineTargets
+            .map(({title, description}, i) => {
+              const descriptionSuffix = hasDuplicateTitles
+                ? ` (${description})`
+                : '';
+              return `${styleText(['white', 'inverse'], ` ${i + 1} `)} - "${title}${descriptionSuffix}"`;
+            })
             .join('\n  ')}`,
         );
       }

From 9d4ba7d97444d9187760c32bc5000f8d020a8979 Mon Sep 17 00:00:00 2001
From: David Prevost <david.prevost@goto.com>
Date: Tue, 28 Oct 2025 18:28:23 -0400
Subject: [PATCH 3/3] fix: final requested nit

---
 .../src/commands/start/OpenDebuggerKeyboardHandler.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/community-cli-plugin/src/commands/start/OpenDebuggerKeyboardHandler.js b/packages/community-cli-plugin/src/commands/start/OpenDebuggerKeyboardHandler.js
index 4c91524fa78bc1..42c1a7f73b8650 100644
--- a/packages/community-cli-plugin/src/commands/start/OpenDebuggerKeyboardHandler.js
+++ b/packages/community-cli-plugin/src/commands/start/OpenDebuggerKeyboardHandler.js
@@ -94,21 +94,20 @@ export default class OpenDebuggerKeyboardHandler {
         const target = targets[0];
         void this.#tryOpenDebuggerForTarget(target);
       } else {
-        this.#targetsShownForSelection = targets;
-
         if (targets.length > 9) {
           this.#log(
             'warn',
             '10 or more debug targets available, showing the first 9.',
           );
         }
-        const firstNineTargets = targets.slice(0, 9);
+        const targetsShown = targets.slice(0, 9);
         const hasDuplicateTitles =
-          new Set(firstNineTargets.map(target => target.title)).size <
-          firstNineTargets.length;
+          new Set(targetsShown.map(target => target.title)).size <
+          targetsShown.length;
+        this.#targetsShownForSelection = targetsShown;
 
         this.#setTerminalMenu(
-          `Multiple debug targets available, please select:\n  ${firstNineTargets
+          `Multiple debug targets available, please select:\n  ${targetsShown
             .map(({title, description}, i) => {
               const descriptionSuffix = hasDuplicateTitles
                 ? ` (${description})`