Fixed model name detection for new CLI format with long label and spaced names

CHANGELOG.md

@@ -1,3 +1,4 @@
+- Fixed model name detection for new Claude CLI format where the default item has a long label ("Default (recommended)") with only 2-space alignment, and for model names that include a space (e.g. "Sonnet 4")
 - Fixed model combo not becoming active when a session starts with a blocking dialog (e.g. "Resuming session" prompt on --continue/--resume startup)
 - Improved keyboard navigation in choice menus: arrow keys, Tab, Shift+Tab
 - Added terminal font and font size settings (Tools → Options → Claude Code → General); defaults to auto-detection preferring Adwaita Mono for full Unicode coverage of Claude Code TUI symbols (https://github.com/nbclaudecodegui/NetbeansClaudeCodeGui/issues/18)

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.nbclaudecodegui</groupId>
     <artifactId>netbeans-claude-code-gui</artifactId>
-    <version>0.22.32-SNAPSHOT</version>
+    <version>0.22.33-SNAPSHOT</version>
     <packaging>nbm</packaging>
     <name>Netbeans Claude Code GUI</name>
     <description>NetBeans plugin that provides a GUI for Claude Code CLI — run claude code sessions directly inside the IDE.</description>

src/main/java/io/github/nbclaudecodegui/controller/ClaudeSessionController.java

@@ -808,7 +808,7 @@ void discoverModels() {
                 // Scan the rolling PTY line buffer for the /model hint line, which is
                 // shorter and never truncated (e.g. "/model  … (currently anthropic/claude-sonnet-4.6)").
                 String hintCurrentModel = null;
-                Pattern hintPat = Pattern.compile("\\(currently\\s+([\\w/.-]+)\\)");
+                Pattern hintPat = Pattern.compile("\\(currently\\s+([^)]+?)\\s*\\)");
                 synchronized (recentPtyLines) {
                     for (String ptyLine : recentPtyLines) {
                         Matcher hm = hintPat.matcher(ptyLine);
@@ -820,8 +820,8 @@ void discoverModels() {
                 int selIdx;
                 if (menuOpt.isPresent() && !menuOpt.get().options().isEmpty()) {
                     List<ChoiceMenuModel.Option> opts = menuOpt.get().options();
-                    Pattern descPat = Pattern.compile("(?:\u2714\\s+|\\s{3,})(.+?)(?:\\s*[·\u00b7].*)?$");
-                    Pattern currentlyPat = Pattern.compile("\\(currently\\s+([\\w/.-]+)\\)");
+                    Pattern descPat = Pattern.compile("(?:\u2714\\s+|\\s{2,})(.+?)(?:\\s*[·\u00b7].*)?$");
+                    Pattern currentlyPat = Pattern.compile("\\(currently\\s+([^)]+?)\\s*\\)");
                     models = new ArrayList<>();
                     selIdx = -1;
                     for (int i = 0; i < opts.size(); i++) {

src/main/java/io/github/nbclaudecodegui/process/ModelMenuParser.java

@@ -39,13 +39,13 @@ public class ModelMenuParser {
      */
     public record ModelDiscovery(List<String> models, int currentIndex) {}
 
-    /** Extracts the description part after ✔ or 3+ spaces. */
+    /** Extracts the description part after ✔ or 2+ spaces. */
     private static final Pattern DESC_PAT =
-            Pattern.compile("(?:\u2714\\s+|\\s{3,})(.+)$");
+            Pattern.compile("(?:\u2714\\s+|\\s{2,})(.+)$");
 
     /** Extracts the model id from "(currently X)" in description. */
     private static final Pattern CURRENTLY_PAT =
-            Pattern.compile("\\(currently\\s+([\\w/.-]+)\\)");
+            Pattern.compile("\\(currently\\s+([^)]+?)\\s*\\)");
 
     /** Fallback: "Title Case Word N.M" at the tail of the left part. */
     private static final Pattern VERSION_TAIL_PAT =

src/test/resources/io/github/nbclaudecodegui/process/model-menu-parser/format1-long-label.expected.json

@@ -0,0 +1 @@
+{"models": ["Opus 4.7 with 1M context", "Sonnet 4.6", "Haiku 4.5"], "currentIndex": 2}

src/test/resources/io/github/nbclaudecodegui/process/model-menu-parser/format1-long-label.src.txt

@@ -0,0 +1,3 @@
+    1. Default (recommended)  Opus 4.7 with 1M context · Most capable for complex work
+    2. Sonnet                 Sonnet 4.6 · Best for everyday tasks
+  ❯ 3. Haiku ✔                Haiku 4.5 · Fastest for quick answers

src/test/resources/io/github/nbclaudecodegui/process/model-menu-parser/format2-currently-with-space.expected.json

@@ -0,0 +1 @@
+{"models": ["Sonnet 4", "Sonnet 4.6", "Haiku 4.5"], "currentIndex": 0}

src/test/resources/io/github/nbclaudecodegui/process/model-menu-parser/format2-currently-with-space.src.txt

@@ -0,0 +1,3 @@
+❯ 1. Default (recommended) ✔  Use the default model (currently Sonnet 4) · $3/$15 per Mtok
+  2. Sonnet                   Sonnet 4.6 · Best for everyday tasks
+  3. Haiku                    Haiku 4.5 · Fastest for quick answers