fix: stop plan regex from bleeding across TUI lines (#1636)

* fix: stop plan regex from bleeding across TUI lines

* fix: keep provider plans on rendered lines

* docs: note provider plan parsing fix

---------

Co-authored-by: Peter Steinberger <steipete@gmail.com>

Author: elijahfriedman

CHANGELOG.md

@@ -22,6 +22,7 @@
 ### Fixed
 - Memory: release idle OpenAI WebViews under system pressure without blocking the main thread. Thanks @ProspectOre!
 - Memory: trim rebuildable menu and OpenAI debug caches under system pressure. Thanks @ProspectOre!
+- Provider plans: keep Claude and Kiro plan matching on one rendered line to avoid bogus labels from adjacent usage hints. Thanks @elijahfriedman!
 - Codex web: keep cookie-import deadlines responsive when browser cookie work blocks the shared worker pool.
 - Codex pace: extrapolate historically exhausted weeks for run-out forecasts and avoid contradictory reset headlines. Thanks @Yuxin-Qiao!
 - Localization: correct the German in-progress refresh label. Thanks @ChrisLauinger77!

Sources/CodexBarCore/Providers/Claude/ClaudeStatusProbe.swift

@@ -697,7 +697,10 @@ public struct ClaudeStatusProbe: Sendable {
         }
         // Capture any "Claude <...>" phrase (e.g., Max/Pro/Ultra/Team) to avoid future plan-name churn.
         // Strip any leading ANSI that may have survived (rare) before matching.
-        let planPattern = #"(?i)(claude\s+[a-z0-9][a-z0-9\s._-]{0,24})"#
+        // Use horizontal whitespace ([ \t]) rather than \s so the match stays on a single rendered line:
+        // \s spans newlines, which let "…use Claude" bridge into the /usage panel's "d → today" hint and
+        // produced a bogus "Dtoday" plan label after ANSI stripping glued the lines together.
+        let planPattern = #"(?i)(claude[ \t]+[a-z0-9][a-z0-9 \t._-]{0,24})"#
         var candidates: [String] = []
         if let regex = try? NSRegularExpression(pattern: planPattern, options: []) {
             let nsrange = NSRange(text.startIndex..<text.endIndex, in: text)

Sources/CodexBarCore/Providers/Kiro/KiroStatusProbe.swift

@@ -686,14 +686,15 @@ public struct KiroStatusProbe: Sendable {
         var matchedNewFormat = false
 
         // Parse plan name from "| KIRO FREE" or similar (legacy format)
-        if let planMatch = text.range(of: #"\|\s*(KIRO\s+\w+)"#, options: .regularExpression) {
+        // Horizontal whitespace only ([ \t]) so the match cannot bridge a newline into the next line.
+        if let planMatch = text.range(of: #"\|[ \t]*(KIRO[ \t]+\w+)"#, options: .regularExpression) {
             let raw = String(text[planMatch]).replacingOccurrences(of: "|", with: "")
             planName = raw.trimmingCharacters(in: .whitespaces)
         }
 
         // Parse plan name from "Estimated Usage | resets on 2026-06-01 | KIRO FREE" (kiro-cli 2.x)
         if let estimatedMatch = text.range(
-            of: #"Estimated Usage\s*\|[^\n|]*\|\s*([A-Z][A-Z0-9 ]+)"#,
+            of: #"Estimated Usage[ \t]*\|[^\n|]*\|[ \t]*([A-Z][A-Z0-9 ]+)"#,
             options: .regularExpression)
         {
             let line = String(text[estimatedMatch])
@@ -705,7 +706,7 @@ public struct KiroStatusProbe: Sendable {
         }
 
         // Parse plan name from "Plan: Q Developer Pro" (new format, kiro-cli 1.24+)
-        if let newPlanMatch = text.range(of: #"Plan:\s*(.+)"#, options: .regularExpression) {
+        if let newPlanMatch = text.range(of: #"Plan:[ \t]*(.+)"#, options: .regularExpression) {
             let line = String(text[newPlanMatch])
             let planLine = line.replacingOccurrences(of: "Plan:", with: "").trimmingCharacters(in: .whitespaces)
             if let firstLine = planLine.split(separator: "\n").first {

Tests/CodexBarTests/ProviderPlanLineParsingTests.swift

@@ -0,0 +1,72 @@
+import Testing
+@testable import CodexBarCore
+
+struct ProviderPlanLineParsingTests {
+    @Test
+    func `Claude plan matching does not bridge usage lines`() {
+        let usageText = """
+        Skills, subagents, plugins, and MCP servers
+        Noattributiondatayet·accumulatesasyouuseClaude
+
+        dtoday·wtoweek
+
+        Usagecredits
+        Usagecreditsareoff·/usage-creditstoturnthemon
+        """
+
+        let identity = ClaudeStatusProbe.parseIdentity(usageText: usageText, statusText: nil)
+
+        #expect(identity.loginMethod == nil)
+    }
+
+    @Test
+    func `Claude plan matching keeps single line phrases`() {
+        let identity = ClaudeStatusProbe.parseIdentity(
+            usageText: nil,
+            statusText: "Sonnet 4.6 · Claude Max · you@example.com")
+
+        #expect(identity.loginMethod == "Max")
+    }
+
+    @Test
+    func `Kiro legacy plan matching does not bridge lines`() throws {
+        let output = """
+        |
+        KIRO FREE
+        ████████████████████████████████████████████████████ 25%
+        (12.50 of 50 covered in plan), resets on 01/15
+        """
+
+        let snapshot = try KiroStatusProbe().parse(output: output)
+
+        #expect(snapshot.planName == "Kiro")
+    }
+
+    @Test
+    func `Kiro estimated usage plan matching does not bridge lines`() throws {
+        let output = """
+        Estimated Usage | resets on 2026-06-01 |
+        KIRO FREE
+        ████████████████████████████████████████████████████ 25%
+        (12.50 of 50 covered in plan), resets on 01/15
+        """
+
+        let snapshot = try KiroStatusProbe().parse(output: output)
+
+        #expect(snapshot.planName == "Kiro")
+    }
+
+    @Test
+    func `Kiro labeled plan matching does not bridge lines`() throws {
+        let output = """
+        Plan:
+        Q Developer Pro
+        ████████████████████████████████████████████████████ 25%
+        (12.50 of 50 covered in plan), resets on 01/15
+        """
+
+        let snapshot = try KiroStatusProbe().parse(output: output)
+
+        #expect(snapshot.planName == "Kiro")
+    }
+}