CAMEL-23720: Harden MoreTab invariants and strengthen TUI icon tests

Add a compact constructor to MoreTab that validates the '&' mnemonic
marker so a malformed label fails loudly at construction instead of
throwing StringIndexOutOfBounds from shortcut() at startup. Replace the
last hardcoded More index (selectMoreTab(12)) with a name lookup via
moreTabIndex("SQL Query"). Make PRIMARY_TAB_ICONS an unmodifiable List
and drop TuiIcons to package-private to match its members.

Tests: replace the tautological shortcut test with a literal historical
sequence oracle, add shortcut-uniqueness, constructor-validation,
moreTabIndex, allTabEntries, and PRIMARY_TAB_ICONS ordering coverage.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: ammachado

dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/TabRegistry.java

@@ -135,7 +135,7 @@ void initTabs(MonitorContext ctx, DataRefreshService dataService, Runnable reset
                 resetIntegrationTabState);
 
         sqlTraceTab.setEditSqlAction(sql -> {
-            selectMoreTab(12); // switch to SQL Query tab
+            selectMoreTab(moreTabIndex("SQL Query"));
             sqlQueryTab.setInputValue("sql", sql);
         });
 
@@ -333,6 +333,14 @@ record TabEntry(String icon, String name, String description, String shortcut, i
      */
     record MoreTab(String icon, String name, String label, MonitorTab tab) {
 
+        MoreTab {
+            int i = TuiIcons.mnemonicIndex(label);
+            if (i < 0 || i >= TuiIcons.stripMnemonic(label).length()) {
+                throw new IllegalArgumentException(
+                        "label must contain a '" + TuiIcons.MNEMONIC_MARKER + "' marker before a letter: " + label);
+            }
+        }
+
         String displayName() {
             return TuiIcons.stripMnemonic(label);
         }
@@ -350,6 +358,16 @@ List<MoreTab> moreTabs() {
         return moreTabs;
     }
 
+    /** Position of the More tab with the given programmatic {@link MoreTab#name() name}, or -1 when absent. */
+    int moreTabIndex(String name) {
+        for (int i = 0; i < moreTabs.size(); i++) {
+            if (moreTabs.get(i).name().equals(name)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
     List<TabEntry> allTabEntries() {
         List<TabEntry> entries = new ArrayList<>();
         entries.add(new TabEntry(icon(TAB_OVERVIEW), "Overview", overviewTab.description(), "1", TAB_OVERVIEW, -1));
@@ -371,6 +389,6 @@ List<TabEntry> allTabEntries() {
     }
 
     private static String icon(int primaryTabIndex) {
-        return TuiIcons.PRIMARY_TAB_ICONS[primaryTabIndex];
+        return TuiIcons.PRIMARY_TAB_ICONS.get(primaryTabIndex);
     }
 }

dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/TuiIcons.java

@@ -16,13 +16,15 @@
  */
 package org.apache.camel.dsl.jbang.core.commands.tui;
 
+import java.util.List;
+
 /**
  * Single source of truth for emoji and symbolic icons used across the Camel TUI.
  * <p/>
  * Tab/menu icons use plain 2-column-wide emoji without VS16 variation selectors (see CAMEL-23818). Doctor and legacy
  * status glyphs may still use mixed-width symbols until migrated.
  */
-public final class TuiIcons {
+final class TuiIcons {
 
     // ---- Brand & runtime ----
     static final String CAMEL = "🐪";
@@ -139,10 +141,9 @@ public final class TuiIcons {
     static final String TAB_THREADS = "🧵";
 
     /** Icons for {@link TabRegistry#TAB_OVERVIEW}..{@link TabRegistry#TAB_MORE} (in order). */
-    static final String[] PRIMARY_TAB_ICONS = {
+    static final List<String> PRIMARY_TAB_ICONS = List.of(
             TAB_OVERVIEW, TAB_LOG, TAB_DIAGRAM, TAB_ROUTES, TAB_ENDPOINTS,
-            TAB_HTTP, TAB_HEALTH, TAB_INSPECT, TAB_ERRORS, TAB_MORE
-    };
+            TAB_HTTP, TAB_HEALTH, TAB_INSPECT, TAB_ERRORS, TAB_MORE);
 
     /** Marker placed immediately before a label's keyboard-shortcut letter (Windows-style mnemonic). */
     static final char MNEMONIC_MARKER = '&';

dsl/camel-jbang/camel-jbang-plugin-tui/src/test/java/org/apache/camel/dsl/jbang/core/commands/tui/TabBarRenderTest.java

@@ -35,8 +35,8 @@ class TabBarRenderTest {
     void primaryTabHeadersStartWithIconAndTwoSpaces() {
         String[] names = { "Overview", "Log", "Diagram", "Route", "Endpoint", "HTTP", "Health", "Inspect", "Errors" };
         for (int i = 0; i < names.length; i++) {
-            String header = TuiIcons.primaryTabHeader(TuiIcons.PRIMARY_TAB_ICONS[i], String.valueOf(i + 1), names[i]);
-            assertTrue(header.startsWith(TuiIcons.PRIMARY_TAB_ICONS[i] + "  " + (i + 1)),
+            String header = TuiIcons.primaryTabHeader(TuiIcons.PRIMARY_TAB_ICONS.get(i), String.valueOf(i + 1), names[i]);
+            assertTrue(header.startsWith(TuiIcons.PRIMARY_TAB_ICONS.get(i) + "  " + (i + 1)),
                     "Tab header should be '<icon>  <key> <name>': " + header);
         }
     }

dsl/camel-jbang/camel-jbang-plugin-tui/src/test/java/org/apache/camel/dsl/jbang/core/commands/tui/TabRegistryTest.java

@@ -18,6 +18,7 @@
 
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
 import dev.tamboui.text.CharWidth;
@@ -27,6 +28,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -102,10 +104,63 @@ void moreTabIconsAreTwoColumnsWideWithoutVariationSelector() {
     }
 
     @Test
-    void shortcutIsDerivedFromMnemonicLabelForEveryTab() {
-        for (TabRegistry.MoreTab mt : registry.moreTabs()) {
-            char expected = Character.toUpperCase(mt.displayName().charAt(mt.mnemonicIndex()));
-            assertEquals(expected, mt.shortcut(), "Shortcut for '" + mt.name() + "' must be its highlighted letter");
+    void moreTabShortcutsMatchHistoricalSequence() {
+        // Independent oracle (not a re-derivation of shortcut()): these are the exact letters the hand-maintained
+        // MORE_SHORTCUTS array carried before the MoreTab refactor. A label edit that repoints a key must fail here.
+        List<Character> shortcuts = registry.moreTabs().stream().map(TabRegistry.MoreTab::shortcut).toList();
+        assertEquals(
+                List.of('B', 'W', 'C', 'A', 'G', 'N', 'D', 'H', 'I', 'M', 'K', 'E', 'Q', 'R', 'O', 'P', 'S', 'T'),
+                shortcuts, "More tab shortcut letters must match the historical sequence");
+    }
+
+    @Test
+    void moreTabShortcutsAreUnique() {
+        // morePopupShortcut() returns the first matching tab, so a duplicated letter would silently shadow a later tab.
+        List<Character> shortcuts = registry.moreTabs().stream().map(TabRegistry.MoreTab::shortcut).toList();
+        assertEquals(shortcuts.size(), Set.copyOf(shortcuts).size(),
+                "More tab shortcut letters must be unique: " + shortcuts);
+    }
+
+    @Test
+    void moreTabRejectsLabelWithoutUsableMnemonicMarker() {
+        // The record's compact constructor enforces the '&'-before-a-letter invariant that shortcut() relies on,
+        // so a mistyped literal fails loudly at construction instead of throwing StringIndexOutOfBounds later.
+        assertThrows(IllegalArgumentException.class,
+                () -> new TabRegistry.MoreTab(TuiIcons.TAB_BEANS, "Beans", "Beans", null));
+        assertThrows(IllegalArgumentException.class,
+                () -> new TabRegistry.MoreTab(TuiIcons.TAB_BEANS, "Beans", "Beans&", null));
+    }
+
+    @Test
+    void moreTabIndexResolvesSqlQueryByNameForEditSqlJump() {
+        // Guards the selectMoreTab(moreTabIndex("SQL Query")) wiring that replaced a hardcoded index.
+        int idx = registry.moreTabIndex("SQL Query");
+        assertEquals("SQL Query", registry.moreTabs().get(idx).name());
+        assertEquals(-1, registry.moreTabIndex("Nonexistent"), "Unknown name resolves to -1");
+    }
+
+    @Test
+    void allTabEntriesExposeDigitsIconsAndMoreShortcuts() {
+        List<TabRegistry.TabEntry> entries = registry.allTabEntries();
+        assertEquals(9 + registry.moreTabs().size(), entries.size());
+
+        // Primary tabs: digit shortcuts 1-9, moreIndex -1, icon indexed by tabIndex.
+        for (int i = 0; i < 9; i++) {
+            TabRegistry.TabEntry e = entries.get(i);
+            assertEquals(String.valueOf(i + 1), e.shortcut(), "Primary tab " + e.name() + " digit shortcut");
+            assertEquals(-1, e.moreIndex(), "Primary tab " + e.name() + " has no More index");
+            assertEquals(TuiIcons.PRIMARY_TAB_ICONS.get(e.tabIndex()), e.icon());
+        }
+
+        // More tabs: tabIndex TAB_MORE, ascending moreIndex, shortcut/name/icon carried from the owning MoreTab.
+        for (int i = 0; i < registry.moreTabs().size(); i++) {
+            TabRegistry.TabEntry e = entries.get(9 + i);
+            TabRegistry.MoreTab mt = registry.moreTabs().get(i);
+            assertEquals(TabRegistry.TAB_MORE, e.tabIndex());
+            assertEquals(i, e.moreIndex());
+            assertEquals(String.valueOf(mt.shortcut()), e.shortcut());
+            assertEquals(mt.name(), e.name());
+            assertEquals(mt.icon(), e.icon());
         }
     }
 

dsl/camel-jbang/camel-jbang-plugin-tui/src/test/java/org/apache/camel/dsl/jbang/core/commands/tui/TuiIconsTest.java

@@ -32,7 +32,23 @@ class TuiIconsTest {
 
     @Test
     void primaryTabIconCountMatchesTabRegistry() {
-        assertEquals(TabRegistry.NUM_TABS, TuiIcons.PRIMARY_TAB_ICONS.length);
+        assertEquals(TabRegistry.NUM_TABS, TuiIcons.PRIMARY_TAB_ICONS.size());
+    }
+
+    @Test
+    void primaryTabIconsAreOrderedByTabIndex() {
+        // Guards that PRIMARY_TAB_ICONS is indexed by the TAB_* constants: reordering the list must break this,
+        // otherwise TabRegistry.icon(index) would attach the wrong emoji to Go-to entries.
+        assertEquals(TuiIcons.TAB_OVERVIEW, TuiIcons.PRIMARY_TAB_ICONS.get(TabRegistry.TAB_OVERVIEW));
+        assertEquals(TuiIcons.TAB_LOG, TuiIcons.PRIMARY_TAB_ICONS.get(TabRegistry.TAB_LOG));
+        assertEquals(TuiIcons.TAB_DIAGRAM, TuiIcons.PRIMARY_TAB_ICONS.get(TabRegistry.TAB_DIAGRAM));
+        assertEquals(TuiIcons.TAB_ROUTES, TuiIcons.PRIMARY_TAB_ICONS.get(TabRegistry.TAB_ROUTES));
+        assertEquals(TuiIcons.TAB_ENDPOINTS, TuiIcons.PRIMARY_TAB_ICONS.get(TabRegistry.TAB_ENDPOINTS));
+        assertEquals(TuiIcons.TAB_HTTP, TuiIcons.PRIMARY_TAB_ICONS.get(TabRegistry.TAB_HTTP));
+        assertEquals(TuiIcons.TAB_HEALTH, TuiIcons.PRIMARY_TAB_ICONS.get(TabRegistry.TAB_HEALTH));
+        assertEquals(TuiIcons.TAB_INSPECT, TuiIcons.PRIMARY_TAB_ICONS.get(TabRegistry.TAB_HISTORY));
+        assertEquals(TuiIcons.TAB_ERRORS, TuiIcons.PRIMARY_TAB_ICONS.get(TabRegistry.TAB_ERRORS));
+        assertEquals(TuiIcons.TAB_MORE, TuiIcons.PRIMARY_TAB_ICONS.get(TabRegistry.TAB_MORE));
     }
 
     @Test