code-puppy 0.0.348__py3-none-any.whl → 0.0.372__py3-none-any.whl

code_puppy/http_utils.py

@@ -9,11 +9,12 @@ import os
 import socket
 import time
 from dataclasses import dataclass
-from typing import Any, Dict, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 import httpx
-import requests
 
+if TYPE_CHECKING:
+    import requests
 from code_puppy.config import get_http2
 
 
@@ -246,7 +247,9 @@ def create_requests_session(
     timeout: float = 5.0,
     verify: Union[bool, str] = None,
     headers: Optional[Dict[str, str]] = None,
-) -> requests.Session:
+) -> "requests.Session":
+    import requests
+
     session = requests.Session()
 
     if verify is None:

code_puppy/messaging/__init__.py

@@ -113,6 +113,7 @@ from .messages import (  # Enums, Base, Text, File ops, Diff, Shell, Agent, etc.
     StatusPanelMessage,
     SubAgentInvocationMessage,
     SubAgentResponseMessage,
+    SubAgentStatusMessage,
     TextMessage,
     UserInputRequest,
     VersionCheckMessage,
@@ -120,6 +121,14 @@ from .messages import (  # Enums, Base, Text, File ops, Diff, Shell, Agent, etc.
 from .queue_console import QueueConsole, get_queue_console
 from .renderers import InteractiveRenderer, SynchronousInteractiveRenderer
 
+# Sub-agent console manager
+from .subagent_console import (
+    AgentState,
+    SubAgentConsoleManager,
+    get_subagent_console_manager,
+    STATUS_STYLES as SUBAGENT_STATUS_STYLES,
+)
+
 # Renderer
 from .rich_renderer import (
     DEFAULT_STYLES,
@@ -193,6 +202,7 @@ __all__ = [
     "AgentResponseMessage",
     "SubAgentInvocationMessage",
     "SubAgentResponseMessage",
+    "SubAgentStatusMessage",
     "UserInputRequest",
     "ConfirmationRequest",
     "SelectionRequest",
@@ -229,4 +239,9 @@ __all__ = [
     "DIFF_STYLES",
     # Markdown patches
     "patch_markdown_headings",
+    # Sub-agent console manager
+    "AgentState",
+    "SubAgentConsoleManager",
+    "get_subagent_console_manager",
+    "SUBAGENT_STATUS_STYLES",
 ]

code_puppy/messaging/messages.py

@@ -292,6 +292,31 @@ class SubAgentResponseMessage(BaseMessage):
     )
 
 
+class SubAgentStatusMessage(BaseMessage):
+    """Real-time status update for a running sub-agent."""
+
+    category: MessageCategory = MessageCategory.AGENT
+    session_id: str = Field(description="Unique session ID of the sub-agent")
+    agent_name: str = Field(description="Name of the agent (e.g., 'code-puppy')")
+    model_name: str = Field(description="Model being used by this agent")
+    status: Literal[
+        "starting", "running", "thinking", "tool_calling", "completed", "error"
+    ] = Field(description="Current status of the agent")
+    tool_call_count: int = Field(
+        default=0, ge=0, description="Number of tools called so far"
+    )
+    token_count: int = Field(default=0, ge=0, description="Estimated tokens in context")
+    current_tool: Optional[str] = Field(
+        default=None, description="Name of tool currently being called"
+    )
+    elapsed_seconds: float = Field(
+        default=0.0, ge=0, description="Time since agent started"
+    )
+    error_message: Optional[str] = Field(
+        default=None, description="Error message if status is 'error'"
+    )
+
+
 # =============================================================================
 # User Interaction Messages (Agent → User)
 # =============================================================================
@@ -417,6 +442,7 @@ AnyMessage = Union[
     AgentResponseMessage,
     SubAgentInvocationMessage,
     SubAgentResponseMessage,
+    SubAgentStatusMessage,
     UserInputRequest,
     ConfirmationRequest,
     SelectionRequest,
@@ -458,6 +484,7 @@ __all__ = [
     "AgentResponseMessage",
     "SubAgentInvocationMessage",
     "SubAgentResponseMessage",
+    "SubAgentStatusMessage",
     # User interaction
     "UserInputRequest",
     "ConfirmationRequest",

code_puppy/messaging/queue_console.py

@@ -239,7 +239,7 @@ class QueueConsole:
             # Show the user's response in the chat as well
             if user_response:
                 self.queue.emit_simple(
-                    MessageType.USER, f"User response: {user_response}"
+                    MessageType.INFO, f"User response: {user_response}"
                 )
 
             return user_response

code_puppy/messaging/rich_renderer.py

@@ -18,7 +18,9 @@ from rich.rule import Rule
 # Note: Syntax import removed - file content not displayed, only header
 from rich.table import Table
 
+from code_puppy.config import get_subagent_verbose
 from code_puppy.tools.common import format_diff_with_colors
+from code_puppy.tools.subagent_context import is_subagent
 
 from .bus import MessageBus
 from .commands import (
@@ -159,6 +161,14 @@ class RichConsoleRenderer:
         color = self._get_banner_color(banner_name)
         return f"[bold white on {color}] {text} [/bold white on {color}]"
 
+    def _should_suppress_subagent_output(self) -> bool:
+        """Check if sub-agent output should be suppressed.
+
+        Returns:
+            True if we're in a sub-agent context and verbose mode is disabled
+        """
+        return is_subagent() and not get_subagent_verbose()
+
     # =========================================================================
     # Lifecycle (Synchronous - for compatibility with main.py)
     # =========================================================================
@@ -275,7 +285,8 @@ class RichConsoleRenderer:
         elif isinstance(message, SubAgentInvocationMessage):
             self._render_subagent_invocation(message)
         elif isinstance(message, SubAgentResponseMessage):
-            self._render_subagent_response(message)
+            # Skip rendering - we now display sub-agent responses via display_non_streamed_result
+            pass
         elif isinstance(message, UserInputRequest):
             # Can't handle async user input in sync context - skip
             self._console.print("[dim]User input requested (requires async)[/dim]")
@@ -356,6 +367,10 @@ class RichConsoleRenderer:
         - Total size
         - Number of subdirectories
         """
+        # Skip for sub-agents unless verbose mode
+        if self._should_suppress_subagent_output():
+            return
+
         import os
         from collections import defaultdict
 
@@ -478,6 +493,10 @@ class RichConsoleRenderer:
 
         The file content is for the LLM only, not for display in the UI.
         """
+        # Skip for sub-agents unless verbose mode
+        if self._should_suppress_subagent_output():
+            return
+
         # Build line info
         line_info = ""
         if msg.start_line is not None and msg.num_lines is not None:
@@ -492,6 +511,10 @@ class RichConsoleRenderer:
 
     def _render_grep_result(self, msg: GrepResultMessage) -> None:
         """Render grep results grouped by file matching old format."""
+        # Skip for sub-agents unless verbose mode
+        if self._should_suppress_subagent_output():
+            return
+
         import re
 
         # Header
@@ -572,6 +595,10 @@ class RichConsoleRenderer:
 
     def _render_diff(self, msg: DiffMessage) -> None:
         """Render a diff with beautiful syntax highlighting."""
+        # Skip for sub-agents unless verbose mode
+        if self._should_suppress_subagent_output():
+            return
+
         # Operation-specific styling
         op_icons = {"create": "✨", "modify": "✏️", "delete": "🗑️"}
         op_colors = {"create": "green", "modify": "yellow", "delete": "red"}
@@ -616,6 +643,10 @@ class RichConsoleRenderer:
 
     def _render_shell_start(self, msg: ShellStartMessage) -> None:
         """Render shell command start notification."""
+        # Skip for sub-agents unless verbose mode
+        if self._should_suppress_subagent_output():
+            return
+
         # Escape command to prevent Rich markup injection
         safe_command = escape_rich_markup(msg.command)
         # Header showing command is starting
@@ -700,6 +731,10 @@ class RichConsoleRenderer:
 
     def _render_subagent_invocation(self, msg: SubAgentInvocationMessage) -> None:
         """Render sub-agent invocation header with nice formatting."""
+        # Skip for sub-agents unless verbose mode (avoid nested invocation banners)
+        if self._should_suppress_subagent_output():
+            return
+
         # Header with agent name and session
         session_type = (
             "New session"

code_puppy/messaging/spinner/__init__.py

@@ -24,7 +24,16 @@ def unregister_spinner(spinner):
 
 
 def pause_all_spinners():
-    """Pause all active spinners."""
+    """Pause all active spinners.
+
+    No-op when called from a sub-agent context to prevent
+    parallel sub-agents from interfering with the main spinner.
+    """
+    # Lazy import to avoid circular dependency
+    from code_puppy.tools.subagent_context import is_subagent
+
+    if is_subagent():
+        return  # Sub-agents don't control the main spinner
     for spinner in _active_spinners:
         try:
             spinner.pause()
@@ -34,7 +43,16 @@ def pause_all_spinners():
 
 
 def resume_all_spinners():
-    """Resume all active spinners."""
+    """Resume all active spinners.
+
+    No-op when called from a sub-agent context to prevent
+    parallel sub-agents from interfering with the main spinner.
+    """
+    # Lazy import to avoid circular dependency
+    from code_puppy.tools.subagent_context import is_subagent
+
+    if is_subagent():
+        return  # Sub-agents don't control the main spinner
     for spinner in _active_spinners:
         try:
             spinner.resume()