minion-code 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

minion_code/components/Message.py

@@ -10,14 +10,112 @@ from rich.text import Text
 from rich.console import Console
 from rich.markdown import Markdown
 from rich.syntax import Syntax
-from typing import List, Dict, Any, Optional, Set
+from rich.panel import Panel
+from typing import List, Dict, Any, Optional, Set, Tuple
 import json
-import logging
+import re
 
 # Import shared types
-from ..types import Message as MessageType, MessageContent, InputMode
+from ..type_defs import Message as MessageType, MessageContent, InputMode
 
-logger = logging.getLogger(__name__)
+
+def parse_agent_response(text: str) -> List[Tuple[str, str]]:
+    """
+    Parse agent response to extract different sections.
+    Returns a list of (section_type, content) tuples.
+
+    Section types: 'thought', 'code', 'output', 'text'
+    """
+    sections = []
+
+    # Pattern to match **Thought:** or **Code:** sections
+    thought_pattern = r"\*\*Thought:\*\*\s*(.*?)(?=\*\*Code:\*\*|\*\*Output:\*\*|```|$)"
+    code_block_pattern = r"```(\w*)\n(.*?)```"
+
+    remaining = text
+    last_end = 0
+
+    # First, find all **Thought:** sections
+    thought_match = re.search(r"\*\*Thought:\*\*\s*", text)
+    code_marker_match = re.search(r"\*\*Code:\*\*\s*", text)
+
+    if thought_match or code_marker_match:
+        # This looks like a structured agent response
+
+        # Extract thought section
+        if thought_match:
+            thought_start = thought_match.end()
+            # Find where thought ends (at **Code:** or code block)
+            thought_end = len(text)
+            if code_marker_match and code_marker_match.start() > thought_match.start():
+                thought_end = code_marker_match.start()
+            else:
+                # Look for code block
+                code_block = re.search(r"```", text[thought_start:])
+                if code_block:
+                    thought_end = thought_start + code_block.start()
+
+            thought_content = text[thought_start:thought_end].strip()
+            if thought_content:
+                sections.append(("thought", thought_content))
+            last_end = thought_end
+
+        # Extract code section
+        if code_marker_match:
+            code_start = code_marker_match.end()
+            # Find the code block after **Code:**
+            code_block_match = re.search(
+                r"```(\w*)\n(.*?)```", text[code_start:], re.DOTALL
+            )
+            if code_block_match:
+                lang = code_block_match.group(1) or "python"
+                code_content = code_block_match.group(2).strip()
+                sections.append(("code", f"{lang}:{code_content}"))
+                last_end = code_start + code_block_match.end()
+        elif not code_marker_match and thought_match:
+            # No **Code:** marker, look for code block directly
+            code_block_match = re.search(
+                r"```(\w*)\n(.*?)```", text[last_end:], re.DOTALL
+            )
+            if code_block_match:
+                lang = code_block_match.group(1) or "python"
+                code_content = code_block_match.group(2).strip()
+                sections.append(("code", f"{lang}:{code_content}"))
+                last_end = last_end + code_block_match.end()
+
+        # Everything after the code block is output
+        output_content = text[last_end:].strip()
+        if output_content:
+            sections.append(("output", output_content))
+
+    else:
+        # Not a structured response, check for just code blocks
+        code_blocks = list(re.finditer(r"```(\w*)\n(.*?)```", text, re.DOTALL))
+
+        if code_blocks:
+            current_pos = 0
+            for match in code_blocks:
+                # Text before code block
+                before_text = text[current_pos : match.start()].strip()
+                if before_text:
+                    sections.append(("text", before_text))
+
+                # Code block
+                lang = match.group(1) or "python"
+                code_content = match.group(2).strip()
+                sections.append(("code", f"{lang}:{code_content}"))
+
+                current_pos = match.end()
+
+            # Text after last code block
+            after_text = text[current_pos:].strip()
+            if after_text:
+                sections.append(("output", after_text))
+        else:
+            # Plain text
+            sections.append(("text", text))
+
+    return sections if sections else [("text", text)]
 
 
 class Message(Container):
@@ -25,69 +123,123 @@ class Message(Container):
     Main message component equivalent to React Message
     Handles rendering of both user and assistant messages
     """
-    
+
     DEFAULT_CSS = """
     Message {
         width: 80%;
         height: auto;
         margin-bottom: 1;
     }
-    
+
     .user-message {
         border-left: thick blue;
         padding-left: 1;
         height: auto;
     }
-    
+
     .assistant-message {
         border-left: thick green;
         padding-left: 1;
         height: auto;
     }
-    
+
     .tool-use-message {
         border-left: thick yellow;
         padding-left: 1;
         background: $surface-lighten-1;
         height: auto;
     }
-    
+
     .error-message {
         border-left: thick red;
         padding-left: 1;
         background: $error 10%;
         height: auto;
     }
-    
+
     .message-content {
         width: 100%;
         height: auto;
         padding: 1;
     }
-    
+
     .message-meta {
         color: $text-muted;
         text-style: dim;
         height: 1;
     }
+
+    .streaming-message {
+        color: $primary;
+        text-style: italic;
+        background: $primary 10%;
+    }
+
+    /* Section-specific styles */
+    .thought-section {
+        background: $primary 15%;
+        border-left: thick $primary;
+        padding: 1;
+        margin-bottom: 1;
+    }
+
+    .thought-label {
+        color: $primary;
+        text-style: bold;
+        margin-bottom: 0;
+    }
+
+    .code-section {
+        background: $surface-darken-1;
+        border-left: thick yellow;
+        padding: 1;
+        margin-bottom: 1;
+    }
+
+    .code-label {
+        color: yellow;
+        text-style: bold;
+        margin-bottom: 0;
+    }
+
+    .output-section {
+        background: green 20%;
+        border-left: thick green;
+        padding: 1;
+        margin-top: 1;
+    }
+
+    .output-label {
+        color: green;
+        text-style: bold;
+        margin-bottom: 0;
+    }
+
+    .section-divider {
+        color: $text-muted;
+        text-style: dim;
+        margin: 1 0;
+    }
     """
-    
-    def __init__(self,
-                 message: MessageType,
-                 messages: List[MessageType] = None,
-                 add_margin: bool = True,
-                 tools: List[Any] = None,
-                 verbose: bool = False,
-                 debug: bool = False,
-                 errored_tool_use_ids: Set[str] = None,
-                 in_progress_tool_use_ids: Set[str] = None,
-                 unresolved_tool_use_ids: Set[str] = None,
-                 should_animate: bool = False,
-                 should_show_dot: bool = False,
-                 width: Optional[int] = None,
-                 **kwargs):
+
+    def __init__(
+        self,
+        message: MessageType,
+        messages: List[MessageType] = None,
+        add_margin: bool = True,
+        tools: List[Any] = None,
+        verbose: bool = False,
+        debug: bool = False,
+        errored_tool_use_ids: Set[str] = None,
+        in_progress_tool_use_ids: Set[str] = None,
+        unresolved_tool_use_ids: Set[str] = None,
+        should_animate: bool = False,
+        should_show_dot: bool = False,
+        width: Optional[int] = None,
+        **kwargs,
+    ):
         super().__init__(**kwargs)
-        
+
         self.message = message
         self.messages = messages or []
         self.add_margin = add_margin
@@ -100,24 +252,23 @@ class Message(Container):
         self.should_animate = should_animate
         self.should_show_dot = should_show_dot
         self.width = width
-    
+
     def compose(self):
         """Compose the message interface"""
         if self.message.type.value == "assistant":
             yield from self._render_assistant_message()
         else:
             yield from self._render_user_message()
-    
+
     def _render_user_message(self):
         """Render user message - equivalent to UserMessage component"""
         with Vertical(classes="user-message"):
             # Message metadata
             if self.verbose or self.debug:
                 yield Static(
-                    f"User • {self._format_timestamp()}",
-                    classes="message-meta"
+                    f"User • {self._format_timestamp()}", classes="message-meta"
                 )
-            
+
             # Message content
             content = self.message.message.content
             if isinstance(content, str):
@@ -125,20 +276,20 @@ class Message(Container):
             elif isinstance(content, list):
                 for item in content:
                     yield from self._render_content_block(item)
-    
+
     def _render_assistant_message(self):
         """Render assistant message - equivalent to AssistantMessage component"""
         with Vertical(classes="assistant-message"):
             # Message metadata
             if self.verbose or self.debug:
                 meta_text = f"Assistant • {self._format_timestamp()}"
-                if hasattr(self.message, 'cost_usd') and self.message.cost_usd:
+                if hasattr(self.message, "cost_usd") and self.message.cost_usd:
                     meta_text += f" • ${self.message.cost_usd:.4f}"
-                if hasattr(self.message, 'duration_ms') and self.message.duration_ms:
+                if hasattr(self.message, "duration_ms") and self.message.duration_ms:
                     meta_text += f" • {self.message.duration_ms}ms"
-                
+
                 yield Static(meta_text, classes="message-meta")
-            
+
             # Message content
             content = self.message.message.content
             if isinstance(content, str):
@@ -146,44 +297,119 @@ class Message(Container):
             elif isinstance(content, list):
                 for item in content:
                     yield from self._render_content_block(item)
-    
+
     def _render_content_block(self, block: Dict[str, Any]):
         """Render individual content blocks based on type"""
-        block_type = block.get('type', 'text')
-        
-        if block_type == 'text':
-            yield from self._render_text_content(block.get('text', ''))
-        elif block_type == 'tool_use':
+        block_type = block.get("type", "text")
+
+        if block_type == "text":
+            yield from self._render_text_content(block.get("text", ""))
+        elif block_type == "tool_use":
             yield from self._render_tool_use_block(block)
-        elif block_type == 'tool_result':
+        elif block_type == "tool_result":
             yield from self._render_tool_result_block(block)
-        elif block_type == 'thinking':
+        elif block_type == "thinking":
             yield from self._render_thinking_block(block)
-        elif block_type == 'redacted_thinking':
+        elif block_type == "redacted_thinking":
             yield from self._render_redacted_thinking_block()
         else:
             # Unknown block type
-            yield Static(f"[Unknown content type: {block_type}]", classes="error-message")
-    
+            yield Static(
+                f"[Unknown content type: {block_type}]", classes="error-message"
+            )
+
     def _render_text_content(self, text: str):
-        """Render text content with markdown support"""
+        """Render text content with markdown support and streaming indicators"""
         if not text.strip():
             return
-        
-        try:
-            # For now, just render as plain text to avoid compose-time issues
-            # TODO: Implement proper markdown rendering with RichLog after mount
-            yield Static(text, classes="message-content")
-        except Exception as e:
-            logger.warning(f"Error rendering text: {e}")
+
+        # Check if this is a streaming or temporary message
+        is_streaming = (
+            self.message.options.get("streaming", False)
+            if self.message.options
+            else False
+        )
+        is_temporary = (
+            self.message.options.get("temporary", False)
+            if self.message.options
+            else False
+        )
+        is_error = (
+            self.message.options.get("error", False) if self.message.options else False
+        )
+
+        # For streaming/temporary/error messages, render simply
+        if is_streaming or is_temporary or is_error:
+            prefix = ""
+            if is_streaming:
+                prefix = "⠋ "
+            elif is_temporary:
+                prefix = "🤔 "
+            elif is_error:
+                prefix = "❌ "
+
+            classes = "message-content"
+            if is_error:
+                classes += " error-message"
+            elif is_streaming or is_temporary:
+                classes += " streaming-message"
+
+            yield Static(f"{prefix}{text}", classes=classes)
+            return
+
+        # Parse the response into sections for non-streaming messages
+        sections = parse_agent_response(text)
+
+        # If only one plain text section, render normally
+        if len(sections) == 1 and sections[0][0] == "text":
             yield Static(text, classes="message-content")
-    
+            return
+
+        # Render each section with appropriate styling
+        for section_type, content in sections:
+            yield from self._render_section(section_type, content)
+
+    def _render_section(self, section_type: str, content: str):
+        """Render a specific section with appropriate styling"""
+        if section_type == "thought":
+            with Vertical(classes="thought-section"):
+                yield Static("💭 Thought:", classes="thought-label")
+                yield Static(content, classes="message-content")
+
+        elif section_type == "code":
+            # Parse language and code content
+            if ":" in content:
+                lang, code_content = content.split(":", 1)
+            else:
+                lang, code_content = "python", content
+
+            with Vertical(classes="code-section"):
+                yield Static(f"📝 Code ({lang}):", classes="code-label")
+                # Try to use syntax highlighting
+                try:
+                    syntax = Syntax(
+                        code_content, lang, theme="monokai", line_numbers=True
+                    )
+                    yield Static(syntax, classes="message-content")
+                except Exception:
+                    yield Static(
+                        f"```{lang}\n{code_content}\n```", classes="message-content"
+                    )
+
+        elif section_type == "output":
+            with Vertical(classes="output-section"):
+                yield Static("📤 Output:", classes="output-label")
+                yield Static(content, classes="message-content")
+
+        else:  # 'text' or unknown
+            yield Static(content, classes="message-content")
+
     def _render_tool_use_block(self, block: Dict[str, Any]):
         """Render tool use block - equivalent to AssistantToolUseMessage"""
-        tool_name = block.get('name', 'unknown')
-        tool_id = block.get('id', '')
-        parameters = block.get('input', {})
-        
+        tool_name = block.get("name", "unknown")
+        tool_id = block.get("id", "")
+        parameters = block.get("input", {})
+
         # Determine status
         status = "completed"
         if tool_id in self.in_progress_tool_use_ids:
@@ -192,21 +418,18 @@ class Message(Container):
             status = "error"
         elif tool_id in self.unresolved_tool_use_ids:
             status = "unresolved"
-        
+
         with Vertical(classes="tool-use-message"):
             # Tool header
             status_icon = {
                 "completed": "✅",
                 "in_progress": "⏳",
                 "error": "❌",
-                "unresolved": "⏸️"
+                "unresolved": "⏸️",
             }.get(status, "🔧")
-            
-            yield Static(
-                f"{status_icon} Tool: {tool_name}",
-                classes="message-meta"
-            )
-            
+
+            yield Static(f"{status_icon} Tool: {tool_name}", classes="message-meta")
+
             # Tool parameters (if verbose)
             if self.verbose and parameters:
                 try:
@@ -215,64 +438,62 @@ class Message(Container):
                     yield Static(params_json, classes="message-content")
                 except Exception:
                     yield Static(str(parameters), classes="message-content")
-    
+
     def _render_tool_result_block(self, block: Dict[str, Any]):
         """Render tool result block - equivalent to UserToolResultMessage"""
-        tool_use_id = block.get('tool_use_id', '')
-        content = block.get('content', '')
-        is_error = block.get('is_error', False)
-        
+        tool_use_id = block.get("tool_use_id", "")
+        content = block.get("content", "")
+        is_error = block.get("is_error", False)
+
         classes = "error-message" if is_error else "message-content"
-        
+
         with Vertical():
             # Result header
             icon = "❌" if is_error else "📤"
-            yield Static(
-                f"{icon} Tool Result",
-                classes="message-meta"
-            )
-            
+            yield Static(f"{icon} Tool Result", classes="message-meta")
+
             # Result content
             if isinstance(content, str):
                 yield Static(content, classes=classes)
             elif isinstance(content, list):
                 for item in content:
-                    if isinstance(item, dict) and item.get('type') == 'text':
-                        yield Static(item.get('text', ''), classes=classes)
+                    if isinstance(item, dict) and item.get("type") == "text":
+                        yield Static(item.get("text", ""), classes=classes)
                     else:
                         yield Static(str(item), classes=classes)
-    
+
     def _render_thinking_block(self, block: Dict[str, Any]):
         """Render thinking block - equivalent to AssistantThinkingMessage"""
         if not self.debug:
             return  # Only show in debug mode
-        
-        thinking_content = block.get('content', '')
-        
+
+        thinking_content = block.get("content", "")
+
         with Vertical():
             yield Static("🤔 Thinking...", classes="message-meta")
             yield Static(thinking_content, classes="message-content")
-    
+
     def _render_redacted_thinking_block(self):
         """Render redacted thinking block"""
         if not self.debug:
             return
-        
+
         yield Static("🤔 [Thinking content redacted]", classes="message-meta")
-    
+
     def _format_timestamp(self) -> str:
         """Format message timestamp"""
         import datetime
+
         dt = datetime.datetime.fromtimestamp(self.message.timestamp)
         return dt.strftime("%H:%M:%S")
 
 
 class UserMessage(Message):
     """Specialized component for user messages"""
-    
+
     def __init__(self, message: MessageType, **kwargs):
         super().__init__(message, **kwargs)
-    
+
     def compose(self):
         """Compose user message with specific styling"""
         yield from self._render_user_message()
@@ -280,10 +501,10 @@ class UserMessage(Message):
 
 class AssistantMessage(Message):
     """Specialized component for assistant messages"""
-    
+
     def __init__(self, message: MessageType, **kwargs):
         super().__init__(message, **kwargs)
-    
+
     def compose(self):
         """Compose assistant message with specific styling"""
         yield from self._render_assistant_message()
@@ -291,14 +512,14 @@ class AssistantMessage(Message):
 
 class ToolUseMessage(Message):
     """Specialized component for tool use messages"""
-    
+
     def __init__(self, message: MessageType, **kwargs):
         super().__init__(message, **kwargs)
-    
+
     def compose(self):
         """Compose tool use message with specific styling"""
         content = self.message.message.content
         if isinstance(content, list):
             for item in content:
-                if item.get('type') == 'tool_use':
-                    yield from self._render_tool_use_block(item)
+                if item.get("type") == "tool_use":
+                    yield from self._render_tool_use_block(item)