fix(kiro): handle Kiro CLI 2.0 Credits-before-separator layout (#188)

Kiro 2.0 renders Credits via ANSI cursor-up, placing it before the
separator in raw tmux scrollback. Add forward scan from credits_idx+1
as fallback when pre-credits scan finds no separator. When separator
is after credits_idx, extract content from prev_credits_idx+1 to
credits_idx.

🤖 Assisted by AI

Author: anilkmr-a2z

src/cli_agent_orchestrator/providers/kiro_cli.py

@@ -393,11 +393,28 @@ def _extract_tui_message(self, clean_output: str) -> str:
                 separator_idx = i
                 break
 
+        # Kiro 2.0: separator is AFTER credits_idx. Scan forward to find it.
         if separator_idx is None:
-            raise ValueError("No Kiro CLI response found - no separator before Credits marker")
+            next_credits_idx = len(lines)
+            for i in range(credits_idx + 1, len(lines)):
+                if re.search(TUI_CREDITS_PATTERN, lines[i]):
+                    next_credits_idx = i
+                    break
+            for i in range(credits_idx + 1, next_credits_idx):
+                if re.search(TUI_SEPARATOR_PATTERN, lines[i].strip()):
+                    separator_idx = i
+                    break
+
+        if separator_idx is None:
+            raise ValueError("No Kiro CLI response found - no separator found near Credits marker")
 
         # Extract content between separator and Credits
-        content_lines = lines[separator_idx + 1 : credits_idx]
+        if separator_idx > credits_idx:
+            # Kiro 2.0: separator after Credits. Content precedes credits_idx.
+            content_lines = lines[prev_credits_idx + 1 : credits_idx]
+        else:
+            # Pre-2.0: separator before Credits (existing behavior)
+            content_lines = lines[separator_idx + 1 : credits_idx]
 
         # Skip the first paragraph (user message echo).
         # The user message is the first block of non-empty lines after the separator.

test/providers/test_kiro_cli_unit.py

@@ -943,9 +943,35 @@ def test_tui_extraction_no_separator(self, mock_tmux):
 
         provider = KiroCliProvider("test1234", "test-session", "window-0", "developer")
 
-        with pytest.raises(ValueError, match="no separator before Credits"):
+        with pytest.raises(ValueError, match="no separator found near Credits"):
             provider.extract_last_message_from_script(output)
 
+    @patch("cli_agent_orchestrator.providers.kiro_cli.tmux_client")
+    def test_tui_extraction_kiro2_forward_scan(self, mock_tmux):
+        """Test extraction exercises the Kiro 2.0 forward scan path.
+
+        Layout: two Credits lines (prev turn + current turn), separator ONLY after
+        the second Credits line. The forward scan from prev_credits_idx+1 to
+        credits_idx finds no separator (separator_idx stays None), then the
+        forward scan from credits_idx+1 finds the separator, triggering the
+        separator_idx > credits_idx branch which extracts prev_credits_idx+1:credits_idx.
+        """
+        output = (
+            "▸ Credits: 0.10 • Time: 1s\n"  # prev turn Credits (prev_credits_idx=0)
+            "  Content between turns\n"  # content for current turn
+            "\n"
+            "  Agent response here.\n"
+            "\n"
+            "▸ Credits: 0.24 • Time: 3s\n"  # current turn Credits (credits_idx=5)
+            "────────────────────────────────────────────────────\n"  # separator AFTER credits
+            "developer · auto · 3%\n"
+            " Ask a question or describe a task ↵"
+        )
+        provider = KiroCliProvider("test1234", "test-session", "window-0", "developer")
+        message = provider.extract_last_message_from_script(output)
+        assert "Agent response here." in message
+        assert "Content between turns" not in message
+
     def test_tui_credits_pattern(self):
         """Test TUI Credits pattern matches expected formats."""
         from cli_agent_orchestrator.providers.kiro_cli import TUI_CREDITS_PATTERN