regcode 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

regcode/__init__.py

@@ -2,4 +2,4 @@ from regcode.config import Config
 from regcode.main import Agent, AgentStatus, ToolCall
 
 __all__ = ["Agent", "Config", "AgentStatus", "ToolCall"]
-__version__ = "0.6.0"
+__version__ = "0.6.2"

regcode/main.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import json
 import warnings
+from datetime import datetime, timezone
 from enum import Enum
 from pathlib import Path
 from typing import Any, Callable
@@ -444,11 +445,48 @@ class Agent:
         self._history = [m for m in messages if m.get("role") != "system"]
         return final_text or response_message.get("content", "") or ""
 
+    @staticmethod
+    def _read_agents_md(directory: str | None = None) -> str:
+        """Read AGENTS.md from the given directory if it exists.
+
+        Returns the file contents with a header, or an empty string if
+        the file is not found.
+        """
+        search_dirs: list[Path] = []
+        if directory:
+            search_dirs.append(Path(directory))
+        search_dirs.append(Path.cwd())
+        for candidate in search_dirs:
+            for name in ("AGENTS.md", "agents.md", "Agents.md"):
+                p = candidate / name
+                if p.exists():
+                    try:
+                        return p.read_text(encoding="utf-8")
+                    except OSError:
+                        continue
+        return ""
+
     def _build_system_prompt(self) -> str:
         """Build the full system prompt including tool definitions."""
+        now = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S UTC")
+        date_section = f"\n\nCurrent time: {now}\n"
+        agents_md = self._read_agents_md(self._allowed_dir)
+        agents_md_section = ""
+        if agents_md:
+            agents_md_section = (
+                f"\n\n{'=' * 60}\n"
+                "AGENT INSTRUCTIONS (injected from AGENTS.md):\n"
+                f"{'=' * 60}\n\n{agents_md}"
+            )
         tool_descriptions = self._format_tool_descriptions()
         notes_section = self._format_review_notes()
-        return f"{self.system_prompt}{tool_descriptions}{notes_section}"
+        return (
+            f"{self.system_prompt}"
+            f"{date_section}"
+            f"{agents_md_section}"
+            f"{tool_descriptions}"
+            f"{notes_section}"
+        )
 
     def _build_system_prompt_no_tools(self) -> str:
         """Build the system prompt WITHOUT tool definitions.
@@ -460,7 +498,19 @@ class Agent:
         stripped, because the accumulated review findings remain relevant
         context for the LLM's final response.
         """
-        return f"{self.system_prompt}{self._format_review_notes()}"
+        now = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S UTC")
+        date_section = f"\n\nCurrent time: {now}\n"
+        agents_md = self._read_agents_md(self._allowed_dir)
+        agents_md_section = ""
+        if agents_md:
+            agents_md_section = (
+                f"\n\n{'=' * 60}\n"
+                "AGENT INSTRUCTIONS (injected from AGENTS.md):\n"
+                f"{'=' * 60}\n\n{agents_md}"
+            )
+        parts = [self.system_prompt, date_section, agents_md_section]
+        parts.append(self._format_review_notes())
+        return "".join(parts)
 
     def _stream(
         self,

regcode/tracing.py

@@ -39,9 +39,17 @@ def _initialize_tracing(config: Config | None = None) -> None:
     if not _tracing_config.tracing_enabled():
         return
 
-    if _tracing_config.mlflow_requires_auth and _tracing_config.mlflow_username and _tracing_config.mlflow_password:
-        MLFLOW_TRACKING_USERNAME.set(_tracing_config.mlflow_username)
-        MLFLOW_TRACKING_PASSWORD.set(_tracing_config.mlflow_password)
+    if (
+        _tracing_config.mlflow_requires_auth
+        and _tracing_config.mlflow_username
+        and _tracing_config.mlflow_password
+    ):
+        MLFLOW_TRACKING_USERNAME.set(
+            _tracing_config.mlflow_username
+        )
+        MLFLOW_TRACKING_PASSWORD.set(
+            _tracing_config.mlflow_password
+        )
 
     _logger.info(f"Setting up MLflow tracing with URL: {_tracing_config.mlflow_url}")
 
@@ -76,14 +84,16 @@ def agent_trace(user_message: str, tool_calls_count: int = 0) -> Iterator[None]:
         with agent_trace("Fix the bug", 3):
             result = agent.chat("Fix the bug")
     """
-    if not _tracing_initialized or not _tracing_config or not _tracing_config.tracing_enabled():
+    if (
+        not _tracing_initialized
+        or not _tracing_config
+        or not _tracing_config.tracing_enabled()
+    ):
         yield
         return
 
-    trace_name = f"agent.turn.{tool_calls_count}tools"
-
     try:
-        with mlflow.start_trace() as trace:
+        with mlflow.start_trace():
             # Log input attributes for better trace UI
             mlflow.set_tag("user_message", user_message[:200])
             mlflow.set_tag("tool_calls", tool_calls_count)

regcode/tui.py

@@ -1,9 +1,9 @@
 """Terminal UI for the RegCode agent CLI using Textual.
 
 Three-zone layout:
-  Zone 1: Status bar  — [RegCode 0.1.0]  [model]  [$cost]  [tokens]
-  Zone 2: Chat area   — scrollable conversation with clear separation
-  Zone 3: Input bar   — text input with progress indicator
+  Zone 1: Top status bar — version | model | cost | tokens
+  Zone 2: Chat history   — scrollable RichLog with colored messages
+  Zone 3: Bottom input   — text input with progress indicator
 """
 
 from __future__ import annotations
@@ -11,14 +11,15 @@ from __future__ import annotations
 import logging
 import re
 import threading
-from dataclasses import dataclass
 from typing import Any
 
+from rich.console import Console
 from rich.markup import escape as rich_escape
+from rich.text import Text
 from textual.app import App, ComposeResult
 from textual.binding import Binding
 from textual.containers import Container
-from textual.widgets import Input, RichLog
+from textual.widgets import Input, Label, RichLog
 
 from regcode import __version__
 from regcode.main import Agent, AgentStatus, ToolCall
@@ -26,24 +27,11 @@ from regcode.main import Agent, AgentStatus, ToolCall
 _logger = logging.getLogger(__name__)
 
 
-# ---------------------------------------------------------------------------
-# Message data structure
-# ---------------------------------------------------------------------------
-
-
-@dataclass
-class ChatMessage:
-    """A single message block in the chat history."""
-    role: str          # "user", "agent", "tool", "system", "separator"
-    content: str = ""
-    markup: str = ""   # pre-rendered Rich markup string
-    is_markdown: bool = False
-
-
 # ---------------------------------------------------------------------------
 # ChatApp — main Textual application
 # ---------------------------------------------------------------------------
 
+
 class ChatApp(App):
     """Clean modern TUI for RegCode agent."""
 
@@ -51,67 +39,67 @@ class ChatApp(App):
 
     CSS = """
     Screen {
-        background: $boost;
+        background: #1e1e2e;
     }
 
-    /* ── Zone 1: Top status bar (single line) ─────────────────── */
+    /* ── Zone 1: Status bar ───────────────────────────────────── */
     #top-bar {
         dock: top;
         height: 1;
-        padding: 0 3;
-        background: $primary;
+        padding: 0 4;
+        background: #313244;
+        color: #cdd6f4;
         content-align: center middle;
     }
 
-    /* ── Zone 2: Chat history area (takes all remaining space) ── */
+    /* ── Zone 2: Chat history ──────────────────────────────────── */
     #chat-area {
         width: 100%;
         height: 1fr;
-        padding: 0 3;
-        margin: 0;
-        border: none;
+        margin: 0 2;
         overflow-y: auto;
-        background: $boost;
+        background: #1e1e2e;
+        color: #cdd6f4;
+        scrollbar-color: #585b70;
+        scrollbar-background: #181825;
+        scrollbar-gutter: auto;
     }
 
-    #chat-area RichLog {
-        color: $text;
-        background: transparent;
+    RichLog#chat-area {
+        padding: 0 2;
     }
 
-    /* ── Zone 3: Bottom input bar ─────────────────────────────── */
+    /* ── Zone 3: Bottom input bar ──────────────────────────────── */
     #bottom-bar {
         dock: bottom;
         layout: horizontal;
         height: 3;
         padding: 0 1;
-        background: $surface;
-        border: none;
+        background: #313244;
     }
 
-    #progress-bar {
+    #progress-label {
         dock: left;
         width: 30;
         content-align: center middle;
-        padding: 0 1;
+        color: #a6adc8;
     }
 
     #input-box {
         width: 1fr;
         height: 3;
-        min-height: 3;
         padding: 0 2;
-        background: $surface;
-        color: $text;
-        border: round $warning;
+        background: #45475a;
+        color: #cdd6f4;
+        border: round #89b4fa;
+        align: center middle;
     }
 
     Input:focus {
-        border: round $success;
-        text-style: bold;
+        border: round #a6e3a1;
     }
 
-    /* ── Hide defaults ────────────────────────────────────────── */
+    /* ── Hide defaults ─────────────────────────────────────────── */
     Footer {
         display: none;
     }
@@ -137,48 +125,115 @@ class ChatApp(App):
 
         # Streaming state
         self._streaming = False
-        self._streaming_started = False
         self._current_response: list[str] = []
-        self._stream_pending = ""
-        self._stream_has_label = False
-        self._stream_line_open = False
-        self._stream_trim_leading = True
 
         # Cost / token display
         self._model_name: str = "unknown"
         self._cumulative_cost: float = 0.0
         self._total_tokens: int = 0
-        self._context_window: int = 128000
+        self._context_window: int = 0
         self._pending_tool_line: str = ""
 
-    # ── Compose ───────────────────────────────────────────────────
+    # ── Helpers ───────────────────────────────────────────────────
 
-    def compose(self) -> ComposeResult:
-        # Zone 1: Status bar — RichLog renders Rich markup
-        yield RichLog(
-            id="top-bar",
-            markup=True,
-            max_lines=1,
-            auto_scroll=False,
+    def _get_chat_area(self) -> RichLog:
+        """Get the chat area RichLog, initializing on first access."""
+        return self.query_one("#chat-area", RichLog)
+
+    @staticmethod
+    def _format_model_name(model: str) -> str:
+        """Extract short model name: split on '/', take last segment."""
+        if "/" in model:
+            return model.rsplit("/", 1)[-1]
+        return model
+
+    def _get_input_placeholder(self) -> str:
+        """Generate input placeholder from current model + context window."""
+        short = self._format_model_name(self._model_name)
+        ctx_k = round(self._context_window / 1000) if self._context_window > 0 else 128
+        return f"{short} ({ctx_k}k context)"
+
+    def _append_rich(self, text: str) -> None:
+        """Append Rich-markup or Markdown text to the chat area."""
+        if not text:
+            return
+        ta = self._get_chat_area()
+        rich_text = self._markdown_to_rich(text)
+        ta.write(rich_text)
+        ta.scroll_end(animate=False)
+
+    def _insert_rich(self, text: str) -> None:
+        """Insert Rich-markup or Markdown text into the chat area (no auto-scroll)."""
+        if not text:
+            return
+        ta = self._get_chat_area()
+        rich_text = self._markdown_to_rich(text)
+        ta.write(rich_text)
+
+    # ── Markdown → Rich markup conversion ─────────────────────────
+
+    @staticmethod
+    def _markdown_to_rich(text: str) -> Text:
+        """Convert Markdown syntax to Rich markup for RichLog rendering."""
+        result = text
+
+        # Code blocks (fenced with triple backticks) — keep as-is, they'll be plain
+        # Inline code: `code` → [dim]code[/dim]
+        result = re.sub(
+            r"`([^`]+)`", r"[dim]\1[/dim]", result
+        )
+
+        # Bold: **text** → [bold]text[/bold]
+        result = re.sub(r"\*\*([^*]+)\*\*", r"[bold]\1[/bold]", result)
+
+        # Italic: *text* → [italic]text[/italic]
+        result = re.sub(r"\*([^*]+)\*", r"[italic]\1[/italic]", result)
+
+        # Strikethrough: ~~text~~ → [dim]text[/dim]
+        result = re.sub(r"~~([^~]+)~~", r"[dim]\1[/dim]", result)
+
+        # Headers: ### text → [bold]text[/bold]
+        result = re.sub(
+            r"^#{1,6}\s+(.+)$", r"[bold]\1[/bold]", result, flags=re.MULTILINE
         )
 
-        # Zone 2: Chat history
-        yield RichLog(
-            id="chat-area",
-            markup=True,
-            max_lines=1000,
-            auto_scroll=True,
-            wrap=True,
+        # Blockquotes: > text → [dim]> text[/dim]
+        result = re.sub(
+            r"^>\s+(.+)$", r"[dim]> \1[/dim]", result, flags=re.MULTILINE
         )
 
-        # Zone 3: Input bar
+        # Unordered list items: - item or * item → [yellow]- item[/yellow]
+        result = re.sub(
+            r"^[\-\*]\s+(.+)$", r"[yellow]• \1[/yellow]", result, flags=re.MULTILINE
+        )
+
+        # Ordered list items: 1. item → [yellow]1. item[/yellow]
+        result = re.sub(
+            r"^\d+\.\s+(.+)$", r"[yellow]\1[/yellow]", result, flags=re.MULTILINE
+        )
+
+        # Horizontal rules: --- or ***
+        result = re.sub(
+            r"^[-]{3,}$", r"[dim]" + "─" * 40 + "[/dim]", result, flags=re.MULTILINE
+        )
+        result = re.sub(
+            r"^\*{3,}$", r"[dim]" + "─" * 40 + "[/dim]", result, flags=re.MULTILINE
+        )
+
+        return Text.from_markup(result.rstrip("\n"))
+
+    # ── Compose ───────────────────────────────────────────────────
+
+    def compose(self) -> ComposeResult:
+        # Zone 1: Status bar
+        yield Label(id="top-bar")
+
+        # Zone 2: Chat history — RichLog natively renders Rich markup
+        yield RichLog(id="chat-area", wrap=True, highlight=True)
+
+        # Zone 3: Bottom input bar
         yield Container(
-            RichLog(
-                id="progress-bar",
-                markup=True,
-                max_lines=1,
-                auto_scroll=False,
-            ),
+            Label(id="progress-label"),
             Input(
                 id="input-box",
                 placeholder="Type message... (Q to quit)",
@@ -192,24 +247,24 @@ class ChatApp(App):
         self._update_top_bar()
         self._update_progress(0, 0)
 
-        log = self.query_one("#chat-area", RichLog)
-        log.write(
-            "[dim]Type a message and press Enter to start chatting.[/]\n"
+        ta = self._get_chat_area()
+        ta.clear()
+        self._append_rich(
+            f"[dim]RegCode v{__version__}[/]"
+            " — Minimalistic Coding Agent\n",
         )
-        log.write(
-            "[dim]  q          Quit the application[/]\n"
-        )
-        log.write(
-            "[dim]  c          Clear the chat history[/]\n"
+        self._append_rich(
+            "[dim]Type a message and press Enter to start chatting.[/]\n"
         )
-        log.write(
+        self._append_rich("[dim]  q          Quit the application[/]\n")
+        self._append_rich("[dim]  c          Clear the chat history[/]\n")
+        self._append_rich(
             "[dim]  e          Reset session (clear history & tools)[/]\n"
         )
-        log.write(
-            "[dim]" + "─" * 60 + "[/]\n"
-        )
+        self._append_rich("[dim]" + "\u2500" * 60 + "[/]\n")
 
         self.set_timer(0.1, self._focus_input)
+        self.set_timer(0.15, self._set_input_placeholder)
 
     # ── Focus management ──────────────────────────────────────────
 
@@ -217,6 +272,14 @@ class ChatApp(App):
         input_widget = self.query_one("#input-box", Input)
         input_widget.focus()
 
+    def _set_input_placeholder(self) -> None:
+        """Set the input box placeholder to show model + context info."""
+        try:
+            input_widget = self.query_one("#input-box", Input)
+            input_widget.placeholder = self._get_input_placeholder()
+        except Exception:
+            pass
+
     # ── Status bar ────────────────────────────────────────────────
 
     def _update_top_bar(self) -> None:
@@ -228,14 +291,18 @@ class ChatApp(App):
             display_name = display_name.rsplit("\\", 1)[-1]
 
         cost_str = f"${self._cumulative_cost:.6f}"
+        tokens_str = f"{self._total_tokens} tok"
 
-        bar = self.query_one("#top-bar", RichLog)
-        bar.clear()
-        bar.write(
-            "[cyan]RegCode " + __version__
-            + "[/]  [dim]"
-            + display_name + "[/]  "
-            + cost_str
+        # Guard: only query DOM when the app is actually mounted
+        try:
+            label = self.query_one("#top-bar", Label)
+        except Exception:
+            return
+        label.value = (
+            f"[cyan]RegCode {__version__}[/]  "
+            f"[dim]{display_name}[/]  "
+            f"[yellow]{cost_str}[/]  "
+            f"[dim]{tokens_str}[/]"
         )
 
     # ── Key handling ──────────────────────────────────────────────
@@ -244,17 +311,17 @@ class ChatApp(App):
         if event.key == "q":
             self.exit()
         elif event.key == "c":
-            self.query_one("#chat-area", RichLog).clear()
+            self._get_chat_area().clear()
         elif event.key == "e":
             self._handle_reset_session()
 
     def _handle_reset_session(self) -> None:
-        log = self.query_one("#chat-area", RichLog)
-        log.clear()
-        log.write("[bold cyan]RegCode v" + __version__
-                  + " — Minimalistic Coding Agent[/]\n")
-        log.write("[dim]Session reset. Type a message to begin.[/]\n")
-        log.write("[dim]" + "─" * 60 + "[/]\n")
+        ta = self._get_chat_area()
+        ta.clear()
+        self._append_rich(f"[bold cyan]RegCode v{__version__}[/]\n")
+        self._append_rich("[dim]— Minimalistic Coding Agent[/]\n")
+        self._append_rich("[dim]Session reset. Type a message to begin.[/]\n")
+        self._append_rich("[dim]" + "\u2500" * 60 + "[/]\n")
 
         self._reset_streaming_state()
 
@@ -275,9 +342,13 @@ class ChatApp(App):
             try:
                 provider = agent.config.provider
                 self._model_name = getattr(provider, "model", "unknown")
+                # Sync context window from config if available
+                self._context_window = getattr(
+                    agent.config.agent, "context_window", 0
+                )
             except Exception:
                 self._model_name = "unknown"
-        # _update_cost_display() is called in on_mount() after the app starts
+        self._update_cost_display()
 
     # ── Input handling ────────────────────────────────────────────
 
@@ -296,7 +367,7 @@ class ChatApp(App):
             return
 
         if message == "/clear":
-            self.query_one("#chat-area", RichLog).clear()
+            self._get_chat_area().clear()
             return
 
         if message == "/reset":
@@ -317,12 +388,8 @@ class ChatApp(App):
         self._reset_streaming_state()
 
         # Mark user message in chat
-        log = self.query_one("#chat-area", RichLog)
-        log.write(
-            "[bold green][USER][/bold green] "
-            + rich_escape(message) + "\n"
-        )
-        log.write("[dim]" + "─" * 60 + "[/dim]\n")
+        self._append_rich(f"[bold green][USER][/bold green] {rich_escape(message)}")
+        self._append_rich("[dim]" + "─" * 40 + "[/dim]\n")
 
         # Update input placeholder
         input_widget = self.query_one("#input-box", Input)
@@ -338,9 +405,7 @@ class ChatApp(App):
 
     def _run_agent_sync(self, message: str) -> None:
         """Run agent.chat synchronously in a background thread."""
-        # Suppress noise from litellm, mlflow, crawl4ai, and other
-        # library loggers during agent execution — they spew logging
-        # lines to stdout/stderr which corrupt the TUI display.
+        # Suppress noise from library loggers during agent execution
         _noisy_loggers = (
             "LiteLLM",
             "mlflow",
@@ -373,7 +438,7 @@ class ChatApp(App):
                     on_text_chunk=self.on_text_chunk,
                 )
 
-                # Fallback: if no chunks were emitted, render final text.
+                # Fallback: if no chunks were emitted, render final text
                 if result and not self._current_response:
                     self.call_from_thread(
                         self._set_fallback_response, result
@@ -385,7 +450,7 @@ class ChatApp(App):
             )
         finally:
             self.call_from_thread(self._finish_message)
-            # Restore logger levels in the same thread (background thread, not main)
+            # Restore logger levels in the same thread
             for name, level in _old_levels.items():
                 logging.getLogger(name).setLevel(level)
 
@@ -401,47 +466,38 @@ class ChatApp(App):
         self, status: AgentStatus, tool_call_info=None
     ) -> None:
         """Render status updates on the main thread."""
-        log = self.query_one("#chat-area", RichLog)
-
-        # Flush any pending stream text BEFORE status output (pitfall #9)
+        # Flush any pending stream text BEFORE status output
         self._flush_stream_for_status()
 
         if status == AgentStatus.TOOL_CALL and tool_call_info is not None:
-            # Buffer the tool call text — RichLog always starts a new line
-            # per write(), so we can't append the ✓ on the same line until
-            # TOOL_RESULT arrives.
             tool_name = rich_escape(str(tool_call_info.tool_name))
-            parts = [f"[dim]  [dim]⚙[/dim] {tool_name}[/dim]"]
+            parts = [f"[dim]  \u2699\uFE0F {tool_name}[/dim]"]
             if tool_call_info.tool_args:
                 for k, v in tool_call_info.tool_args.items():
                     val = rich_escape(str(v))
                     parts.append(
-                        f"  [dim]{rich_escape(str(k))}=[/dim]{val}"
+                        f"[dim]  {rich_escape(str(k))}=[/dim] {val}"
                     )
             self._pending_tool_line = " ".join(parts)
 
         elif status == AgentStatus.TOOL_RESULT \
                 and tool_call_info is not None:
-            # Emit the complete tool line with ✓ appended
-            log.write(self._pending_tool_line + "  [dim]✓[/dim]\n")
+            self._insert_rich(self._pending_tool_line + "  [dim]✓[/]\n")
             self._pending_tool_line = ""
 
         elif status == AgentStatus.COMPACTION_START:
-            log.write(
-                "[dim]  ~ Compacting context window...[/dim]\n"
-            )
-            log.write("[dim]  " + "─" * 60 + "[/dim]\n")
+            self._insert_rich("  ~ Compacting context window...\n")
+            self._insert_rich("  " + "─" * 60 + "\n")
 
         elif status == AgentStatus.BUDGET_EXHAUSTED:
-            log.write(
-                "[dim]  [yellow]Tool budget exhausted. "
-                "Agent responding.[/yellow][/dim]\n"
+            self._insert_rich(
+                "  [yellow]Tool budget exhausted. Agent responding."
+                "[/yellow]\n",
             )
 
         elif status == AgentStatus.IDLE:
-            log.write(
-                "[dim]  Agent is idle. "
-                "Waiting for your input.[/dim]\n"
+            self._insert_rich(
+                "  Agent is idle. Waiting for your input.\n",
             )
 
     def on_result(
@@ -473,64 +529,23 @@ class ChatApp(App):
     def on_text_chunk(self, chunk: str) -> None:
         """Handle streaming text chunks — buffer for final rendering."""
         self._current_response.append(chunk)
-        self._streaming_started = True
         if not self._streaming:
             self._streaming = True
             self.call_from_thread(self._start_streaming_label)
 
     def _start_streaming_label(self) -> None:
         """Write the agent label once at the start of streaming."""
-        log = self.query_one("#chat-area", RichLog)
-        log.write("[bold blue][AGENT][/bold blue]\n")
+        self._insert_rich("[bold blue][AGENT][/bold blue]\n")
 
     # ── Stream flushing ───────────────────────────────────────────
 
     def _flush_stream_for_status(self) -> None:
-        """Flush stream text before status/tool output (pitfall #9)."""
-        if self._stream_pending:
-            pending = self._stream_pending.rstrip("\n")
-            self._stream_pending = ""
-            if pending:
-                self._emit_stream_text(pending)
-        self._ensure_stream_line_break()
-
-    def _flush_stream_buffer(self, flush_partial: bool) -> None:
-        """Flush buffered stream text by line; optionally flush remainder."""
-        while "\n" in self._stream_pending:
-            line, self._stream_pending = (
-                self._stream_pending.split("\n", 1)
-            )
-            self._emit_stream_text(line + "\n")
-
-        if flush_partial and self._stream_pending:
-            self._emit_stream_text(self._stream_pending)
-            self._stream_pending = ""
-        elif len(self._stream_pending) >= 120:
-            self._emit_stream_text(self._stream_pending)
-            self._stream_pending = ""
-
-    def _emit_stream_text(self, text: str) -> None:
-        """Emit a streamed text segment to history."""
-        if not text:
-            return
-        if self._stream_trim_leading:
-            text = text.lstrip("\n")
-            self._stream_trim_leading = False
-            if not text:
-                return
-        log = self.query_one("#chat-area", RichLog)
-        if not self._stream_has_label:
-            log.write(rich_escape(text))
-            self._stream_has_label = True
-        else:
-            log.write(rich_escape(text))
-        self._stream_line_open = not text.endswith("\n")
-
-    def _ensure_stream_line_break(self) -> None:
-        """Ensure subsequent non-stream lines start on a fresh line."""
-        if self._stream_has_label and self._stream_line_open:
-            self.query_one("#chat-area", RichLog).write("\n")
-            self._stream_line_open = False
+        """Flush accumulated stream text before status/tool output."""
+        if self._current_response:
+            text = "".join(self._current_response)
+            self._current_response.clear()
+            if text.strip():
+                self._insert_rich(text)
 
     # ── Progress & cost display ───────────────────────────────────
 
@@ -538,6 +553,8 @@ class ChatApp(App):
         """Update the progress bar on the bottom bar."""
         if total <= 0:
             total = self._context_window
+        if total <= 0 and self._agent is not None:
+            total = self._agent.config.agent.context_window
         if total <= 0:
             total = 128000
         pct = min(100, int(current / max(total, 1) * 100))
@@ -546,46 +563,24 @@ class ChatApp(App):
         empty = bar_width - filled
         bar = "\u2588" * filled + "\u2591" * empty
 
-        if pct >= 90:
-            color = "red"
-        elif pct >= 70:
-            color = "yellow"
-        elif pct >= 40:
-            color = "blue"
+        # Format tokens as e.g. "12.3k"
+        if current >= 1000:
+            tokens_str = f"{current / 1000:.1f}k"
         else:
-            color = "green"
+            tokens_str = str(current)
 
-        pct_str = f"  {pct}%"
-        tokens_str = f" {current}/{total}"
-        label = (
-            f"[bold {color}]{bar}[/] {pct_str} "
-            f"[dim]{tokens_str}[/dim]"
-        )
+        label_text = f"{bar} {tokens_str}"
 
-        progress_widget = self.query_one("#progress-bar", RichLog)
-        progress_widget.clear()
-        progress_widget.write(label)
+        widget = self.query_one("#progress-label", Label)
+        try:
+            widget.update(label_text)
+        except Exception:
+            pass
 
     def _update_cost_display(self) -> None:
         """Update the top bar with cost and model info."""
         self._update_top_bar()
 
-    # ── Markdown rendering helper ─────────────────────────────────
-
-    def _render_markdown_to_string(self, md_text: str) -> str:
-        """Render Markdown to a Rich-compatible string for RichLog."""
-        from io import StringIO
-
-        from rich.console import Console
-        from rich.markdown import Markdown
-
-        buf = StringIO()
-        console = Console(
-            file=buf, force_terminal=True, width=200
-        )
-        console.print(Markdown(md_text), soft_wrap=True)
-        return buf.getvalue()
-
     # ── Finish message / response rendering ───────────────────────
 
     def _finish_message(self) -> None:
@@ -596,23 +591,13 @@ class ChatApp(App):
 
         try:
             if self._current_response:
-                response = "".join(
-                    self._current_response
-                ).lstrip("\n")
+                response = "".join(self._current_response).lstrip("\n")
                 response = re.sub(r"\n{3,}", "\n\n", response)
                 if response:
-                    log = self.query_one("#chat-area", RichLog)
                     if not streaming:
-                        log.write(
-                            "[bold blue][AGENT][/bold blue]\n"
-                        )
-                    # Render Markdown for the final formatted output.
-                    log.write(
-                        self._render_markdown_to_string(response)
-                    )
-                    log.write(
-                        "[dim]" + "─" * 60 + "[/dim]\n"
-                    )
+                        self._insert_rich("[bold blue][AGENT][/bold blue]\n")
+                    self._insert_rich(response)
+                    self._insert_rich("\n[dim]" + "─" * 40 + "[/dim]\n")
         except Exception:
             self._write_error_line(
                 "Failed to render agent response."
@@ -622,10 +607,10 @@ class ChatApp(App):
             self._reset_streaming_state()
 
             input_widget = self.query_one("#input-box", Input)
-            input_widget.placeholder = "Type message... (Q to quit)"
+            input_widget.placeholder = self._get_input_placeholder()
             input_widget.focus()
 
-            # Process next queued message if any.
+            # Process next queued message if any
             self._process_next_queued()
 
     def _set_fallback_response(self, response: str) -> None:
@@ -647,12 +632,8 @@ class ChatApp(App):
     def _write_error_line(self, message: str) -> None:
         """Write an error line safely on the UI thread."""
         try:
-            log = self.query_one("#chat-area", RichLog)
-            log.write(
-                "[red][ERROR][/red] "
-                + rich_escape(message) + "\n"
-            )
-            log.write("[dim]" + "─" * 60 + "[/dim]\n")
+            self._insert_rich("[red][ERROR][/red] " + rich_escape(message) + "\n")
+            self._insert_rich("─" * 60 + "\n")
         except Exception:
             pass
         finally:
@@ -661,22 +642,22 @@ class ChatApp(App):
 
     # ── Utility ───────────────────────────────────────────────────
 
-    def _write_system_message(self, text: str) -> None:
-        """Write a system message to the history log (backward compat)."""
-        try:
-            log = self.query_one("#chat-area", RichLog)
-            log.write(text + "\n")
-        except Exception:
-            pass
-
     def _reset_streaming_state(self) -> None:
-        """Reset all streaming-related state for a new turn."""
+        """Reset streaming-related state for a new turn."""
         self._streaming = False
-        self._streaming_started = False
-        self._stream_pending = ""
-        self._stream_has_label = False
-        self._stream_line_open = False
-        self._stream_trim_leading = True
+        self._current_response.clear()
+
+    # ── Test-friendly helpers (mirrors ChatUI methods) ────────────
+
+    def _add_user_message(self, message: str) -> None:
+        """Add a user message to the chat area (for tests)."""
+        self._append_rich(
+            f"[bold green][USER][/bold green] {rich_escape(message)}\n"
+        )
+
+    def _add_separator(self) -> None:
+        """Add a separator line to the chat area (for tests)."""
+        self._append_rich("[dim]" + "\u2500" * 60 + "[/dim]\n")
 
     # ── Backward-compatible API (for cli.py integration) ──────────
 
@@ -690,48 +671,35 @@ class ChatApp(App):
         return self._agent_running
 
     def print_welcome(self, version: str = "0.1.0") -> None:
-        log = self.query_one("#chat-area", RichLog)
-        log.write(
-            "[bold cyan]"
-            f"RegCode - Minimalistic Coding Agent v{version}[/]\n"
+        self._insert_rich(
+            f"[bold cyan]RegCode - Minimalistic Coding Agent v{version}[/]\n"
         )
-        log.write("[dim]Type your message and press Enter.[/]\n")
+        self._insert_rich("[dim]Type your message and press Enter.[/]\n")
 
     def print_separator(self) -> None:
-        self.query_one("#chat-area", RichLog).write(
-            "[dim]" + "─" * 60 + "[/dim]\n"
-        )
+        self._insert_rich("─" * 60 + "\n")
 
     def print_user_message(self, message: str) -> None:
-        self.query_one("#chat-area", RichLog).write(
-            "[bold green]"
-            f"[USER][/bold green] {rich_escape(message)}\n"
+        self._insert_rich(
+            f"[bold green][USER][/bold green] {rich_escape(message)}\n",
         )
 
     def print_assistant_message(self, message: str) -> None:
-        log = self.query_one("#chat-area", RichLog)
-        log.write("[bold blue][AGENT][/bold blue]\n")
-        log.write(self._render_markdown_to_string(message))
+        self._insert_rich("[bold blue][AGENT][/bold blue]\n")
+        self._insert_rich(message)
 
     def print_tool_call(
         self, tool_name: str,
         tool_args: dict | None = None
     ) -> None:
-        parts = [
-            f"[dim]  [dim]⚙[/dim] "
-            f"{rich_escape(str(tool_name))}[/dim]"
-        ]
+        parts = [f"[dim]  ⚙ {rich_escape(str(tool_name))}[/dim]"]
         if tool_args:
             for k, v in tool_args.items():
                 val = rich_escape(str(v))
                 parts.append(
-                    f"  [dim]"
-                    f"{rich_escape(str(k))}=[/dim]"
-                    f"{val}"
+                    f"[dim]  {rich_escape(str(k))}=[/dim] {val}"
                 )
-        self.query_one("#chat-area", RichLog).write(
-            " ".join(parts) + "\n"
-        )
+        self._insert_rich(" ".join(parts) + "\n")
 
     def print_tool_result(
         self, tool_name, result, error: bool = False
@@ -760,33 +728,25 @@ class ChatApp(App):
         return None
 
     def print_exit(self) -> None:
-        self.query_one("#chat-area", RichLog).write(
-            "[dim]Goodbye![/]\n"
-        )
+        self._insert_rich("[dim]Goodbye![/]\n")
 
     def print_round_complete(self) -> None:
-        self.query_one("#chat-area", RichLog).write(
-            "[dim]" + "─" * 60 + "[/dim]\n"
-        )
+        self._insert_rich("─" * 60 + "\n")
 
     def print_interrupted(self) -> None:
-        self.query_one("#chat-area", RichLog).write(
-            "[bold red]"
-            "Interrupted by user. Goodbye![/]\n"
-        )
+        self._insert_rich("[bold red]Interrupted by user. Goodbye![/]\n")
 
     def start_streaming(self) -> None:
-        log = self.query_one("#chat-area", RichLog)
-        log.write("[dim]...[/]\n")
+        self._insert_rich("[dim]...[/]\n")
 
     def end_streaming(self) -> None:
-        self.query_one("#chat-area", RichLog).write("\n")
+        self._insert_rich("\n")
 
     def print_prompt(self) -> None:
         pass
 
     def clear(self) -> None:
-        self.query_one("#chat-area", RichLog).clear()
+        self._get_chat_area().clear()
         self._current_response.clear()
 
     def set_context_progress(
@@ -817,11 +777,40 @@ class ChatApp(App):
     def stop_input_thread(self) -> None:
         pass
 
+    def _rich_to_ansi(self, text: str) -> str:
+        """Convert Rich markup to ANSI escape codes for display.
+
+        Uses a cached Console instance to avoid per-call overhead.
+        """
+        from io import StringIO
+
+        try:
+            rendered = self._rich_console.render_str(text)
+            buf = StringIO()
+            self._rich_console.print(rendered, file=buf, end="")
+            return buf.getvalue()
+        except Exception:
+            return text
+
     def run_app(self) -> None:
         """Run the Textual application."""
         self.run()
 
 
+# ---------------------------------------------------------------------------
+# Cached Rich console singleton — created once, reused by all instances
+# ---------------------------------------------------------------------------
+
+_rich_console = Console(
+    force_terminal=True,
+    width=200,
+    color_system="standard",
+)
+
+# Make it accessible on ChatApp for _rich_to_ansi
+ChatApp._rich_console = _rich_console  # type: ignore[attr-defined]
+
+
 # ---------------------------------------------------------------------------
 # Legacy _ColorFormatter for backward compatibility
 # ---------------------------------------------------------------------------

{regcode-0.6.0.dist-info → regcode-0.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: regcode
-Version: 0.6.0
+Version: 0.6.2
 Summary: Minimalistic coding agent with Python API and CLI
 Requires-Python: >=3.10
 Requires-Dist: click>=8.0
@@ -12,7 +12,7 @@ Requires-Dist: pydantic-settings>=2.14.2
 Requires-Dist: pytest>=8.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: ruff>=0.8
-Requires-Dist: textual>=8.2.7
+Requires-Dist: textual>=2.0.0
 Provides-Extra: dev
 Description-Content-Type: text/markdown
 

{regcode-0.6.0.dist-info → regcode-0.6.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
-regcode/__init__.py,sha256=vvjAdeKm7uyNzSuJ8lZwRXTdbR4cXh82GoqzzPvUvwQ,168
+regcode/__init__.py,sha256=PDGu5z3A9XTW8PUPY3nSTva-m21BiTnKIowZ0j_sdC0,168
 regcode/cli.py,sha256=jygDB1u_T5_sXm3TxvUPe9VZpC3-42A4pEMwW4PVLcc,5432
 regcode/config.py,sha256=b0_uyquT2zVUa14cMG0NE-0zJJnsP6Pc73uu3gXf84Y,6664
 regcode/conversation_manager.py,sha256=7b1hB7881ydPkCvePJIZ-HgtUi95FglJ7MyFAYw2H1o,5636
 regcode/dependencies.py,sha256=xi6_XuL4xOqk3ORIe7a92q5oHidiECeefVTjevHiIwU,2357
-regcode/main.py,sha256=bpHUL__qXv7cN3Kf1C-NBzo4h6Oz_bhQnLdFrRaAn5Y,42190
+regcode/main.py,sha256=vNqKd_Mbhj00ybtlduBYBI4NwwwiQ90AWNsNT-sJfqM,44054
 regcode/monty_sandbox.py,sha256=UxTFmczQr5F4nlDe1gJ5Ul6GX_5KJkVYekVia-JKKvw,12930
 regcode/permissions.py,sha256=9R1dz6ypxBq_tNj-l4ixq_KJ-kAbXHarOey5EmnZzgU,784
 regcode/sandbox.py,sha256=v7oyl4PZVs4uMGGJRQC7YdQNLf7pbtRpVMXuNfnslJI,11414
-regcode/tracing.py,sha256=sN3hB9BJZY8CQedDkS7z4K1JAuN8-8rFTd9NnOiKN3U,3525
-regcode/tui.py,sha256=GFmXXTQNpJ3N6TgwQtUL-DFIQ0WlxUFwlPTNkoR4u8Q,32586
+regcode/tracing.py,sha256=Uq6h_fT8k2_oVY5cJgM88IFaqN4hSjYyD7xnG1gJuy0,3568
+regcode/tui.py,sha256=Zc_3JdpvtuAuvJFDVd1v7wxDIfc2sK4W3xMy8gNosxo,33036
 regcode/tools/__init__.py,sha256=VG2pxPkVSRUaLZ-tgNTcvcJSXUOuVLeCT0yx7k1g2pQ,325
 regcode/tools/base.py,sha256=D4oalxZb-cKvCMFeghyKSoLy_M7LUVPMeFTUPmrcuyY,3538
 regcode/tools/builtins.py,sha256=FhyXiyriV35HKrEsVLGa25eqBhEBHDAVpfXN08DgG3M,46330
@@ -16,7 +16,7 @@ regcode/tools/registry.py,sha256=jrGtKLlRPgfFQFGlCAaxEfoR0ZXForQUmZexM5-HnEo,263
 regcode/tools/review_notes.py,sha256=zdbKTKv2hlnfd7Q-F0xlg8n2IHt7h0KssS0OyyY2gcM,3743
 regcode/tools/web_crawl.py,sha256=7weNwU6RAJNiyc04vcPD64ODh5_oqoFlec5vyMRKh90,5594
 regcode/tools/web_search.py,sha256=g9na3CrlPvefYIIfopdMN1H3Xh5K8DonqeRuf1-ucWk,5010
-regcode-0.6.0.dist-info/METADATA,sha256=qoSstrrZQmXzSn5KBpJGSX_3mq0XfcbAqWbCDarIYCc,9091
-regcode-0.6.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-regcode-0.6.0.dist-info/entry_points.txt,sha256=DzSdoP-DefYTNnnuwctq7neSx19XjfB78Jzk-c1UcsQ,44
-regcode-0.6.0.dist-info/RECORD,,
+regcode-0.6.2.dist-info/METADATA,sha256=uSxfmg3H0vGSibzpYpHIBL_aA89EUSM9pRMDdqGlIMU,9091
+regcode-0.6.2.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+regcode-0.6.2.dist-info/entry_points.txt,sha256=DzSdoP-DefYTNnnuwctq7neSx19XjfB78Jzk-c1UcsQ,44
+regcode-0.6.2.dist-info/RECORD,,