fast-agent-mcp 0.3.12__py3-none-any.whl → 0.3.14__py3-none-any.whl

fast_agent/ui/console_display.py

@@ -1,11 +1,12 @@
 from enum import Enum
 from json import JSONDecodeError
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, Set, Tuple, Union
 
 from mcp.types import CallToolResult
 from rich.panel import Panel
 from rich.text import Text
 
+from fast_agent.constants import REASONING
 from fast_agent.ui import console
 from fast_agent.ui.mcp_ui_utils import UILink
 from fast_agent.ui.mermaid_utils import (
@@ -17,6 +18,7 @@ from fast_agent.ui.mermaid_utils import (
 
 if TYPE_CHECKING:
     from fast_agent.mcp.prompt_message_extended import PromptMessageExtended
+    from fast_agent.mcp.skybridge import SkybridgeServerConfig
 
 CODE_STYLE = "native"
 
@@ -144,6 +146,25 @@ class ConsoleDisplay:
         self._markup = config.logger.enable_markup if config else True
         self._escape_xml = True
 
+    @staticmethod
+    def _format_elapsed(elapsed: float) -> str:
+        """Format elapsed seconds for display."""
+        if elapsed < 0:
+            elapsed = 0.0
+        if elapsed < 0.001:
+            return "<1ms"
+        if elapsed < 1:
+            return f"{elapsed * 1000:.0f}ms"
+        if elapsed < 10:
+            return f"{elapsed:.2f}s"
+        if elapsed < 60:
+            return f"{elapsed:.1f}s"
+        minutes, seconds = divmod(elapsed, 60)
+        if minutes < 60:
+            return f"{int(minutes)}m {seconds:02.0f}s"
+        hours, minutes = divmod(int(minutes), 60)
+        return f"{hours}h {minutes:02d}m"
+
     def display_message(
         self,
         content: Any,
@@ -156,6 +177,7 @@ class ConsoleDisplay:
         is_error: bool = False,
         truncate_content: bool = True,
         additional_message: Text | None = None,
+        pre_content: Text | None = None,
     ) -> None:
         """
         Unified method to display formatted messages to the console.
@@ -170,6 +192,8 @@ class ConsoleDisplay:
             max_item_length: Optional max length for bottom metadata items (with ellipsis)
             is_error: For tool results, whether this is an error (uses red color)
             truncate_content: Whether to truncate long content
+            additional_message: Optional Rich Text appended after the main content
+            pre_content: Optional Rich Text shown before the main content
         """
         # Get configuration for this message type
         config = MESSAGE_CONFIGS[message_type]
@@ -191,6 +215,8 @@ class ConsoleDisplay:
         self._create_combined_separator_status(left, right_info)
 
         # Display the content
+        if pre_content and pre_content.plain:
+            console.console.print(pre_content, markup=self._markup)
         self._display_content(
             content, truncate_content, is_error, message_type, check_markdown_markers=False
         )
@@ -513,8 +539,21 @@ class ConsoleDisplay:
 
         return formatted
 
-    def show_tool_result(self, result: CallToolResult, name: str | None = None) -> None:
-        """Display a tool result in the new visual style."""
+    def show_tool_result(
+        self,
+        result: CallToolResult,
+        name: str | None = None,
+        tool_name: str | None = None,
+        skybridge_config: "SkybridgeServerConfig | None" = None,
+    ) -> None:
+        """Display a tool result in the new visual style.
+
+        Args:
+            result: The tool result to display
+            name: Optional agent name
+            tool_name: Optional tool name for skybridge detection
+            skybridge_config: Optional skybridge configuration for the server
+        """
         if not self.config or not self.config.logger.show_tools:
             return
 
@@ -523,6 +562,20 @@ class ConsoleDisplay:
 
         # Analyze content to determine display format and status
         content = result.content
+        structured_content = getattr(result, "structuredContent", None)
+        has_structured = structured_content is not None
+
+        # Determine if this is a skybridge tool
+        is_skybridge_tool = False
+        skybridge_resource_uri = None
+        if has_structured and tool_name and skybridge_config:
+            # Check if this tool is a valid skybridge tool
+            for tool_cfg in skybridge_config.tools:
+                if tool_cfg.tool_name == tool_name and tool_cfg.is_valid:
+                    is_skybridge_tool = True
+                    skybridge_resource_uri = tool_cfg.resource_uri
+                    break
+
         if result.isError:
             status = "ERROR"
         else:
@@ -544,15 +597,15 @@ class ConsoleDisplay:
 
         # Build transport channel info for bottom bar
         channel = getattr(result, "transport_channel", None)
-        bottom_metadata = None
+        bottom_metadata_items: List[str] = []
         if channel:
             # Format channel info for bottom bar
             if channel == "post-json":
                 transport_info = "HTTP (JSON-RPC)"
             elif channel == "post-sse":
-                transport_info = "HTTP (SSE)"
+                transport_info = "Legacy SSE"
             elif channel == "get":
-                transport_info = "HTTP (SSE)"
+                transport_info = "Legacy SSE"
             elif channel == "resumption":
                 transport_info = "Resumption"
             elif channel == "stdio":
@@ -560,21 +613,144 @@ class ConsoleDisplay:
             else:
                 transport_info = channel.upper()
 
-            bottom_metadata = [transport_info]
+            bottom_metadata_items.append(transport_info)
+
+        elapsed = getattr(result, "transport_elapsed", None)
+        if isinstance(elapsed, (int, float)):
+            bottom_metadata_items.append(self._format_elapsed(float(elapsed)))
+
+        # Add structured content indicator if present
+        if has_structured:
+            bottom_metadata_items.append("Structured ■")
+
+        bottom_metadata = bottom_metadata_items or None
 
         # Build right info (without channel info)
         right_info = f"[dim]tool result - {status}[/dim]"
 
-        # Display using unified method
-        self.display_message(
-            content=content,
-            message_type=MessageType.TOOL_RESULT,
-            name=name,
-            right_info=right_info,
-            bottom_metadata=bottom_metadata,
-            is_error=result.isError,
-            truncate_content=True,
-        )
+        if has_structured:
+            # Handle structured content display manually to insert it before bottom separator
+            # Display main content without bottom separator
+            config = MESSAGE_CONFIGS[MessageType.TOOL_RESULT]
+            block_color = "red" if result.isError else config["block_color"]
+            arrow = config["arrow"]
+            arrow_style = config["arrow_style"]
+            left = f"[{block_color}]▎[/{block_color}][{arrow_style}]{arrow}[/{arrow_style}]"
+            if name:
+                left += f" [{block_color if not result.isError else 'red'}]{name}[/{block_color if not result.isError else 'red'}]"
+
+            # Top separator
+            self._create_combined_separator_status(left, right_info)
+
+            # Main content
+            self._display_content(
+                content, True, result.isError, MessageType.TOOL_RESULT, check_markdown_markers=False
+            )
+
+            # Structured content separator and display
+            console.console.print()
+            total_width = console.console.size.width
+
+            if is_skybridge_tool:
+                # Skybridge: magenta separator with resource URI
+                resource_label = (
+                    f"skybridge resource: {skybridge_resource_uri}"
+                    if skybridge_resource_uri
+                    else "skybridge resource"
+                )
+                prefix = Text("─| ")
+                prefix.stylize("dim")
+                resource_text = Text(resource_label, style="magenta")
+                suffix = Text(" |")
+                suffix.stylize("dim")
+
+                separator_line = Text()
+                separator_line.append_text(prefix)
+                separator_line.append_text(resource_text)
+                separator_line.append_text(suffix)
+                remaining = total_width - separator_line.cell_len
+                if remaining > 0:
+                    separator_line.append("─" * remaining, style="dim")
+                console.console.print(separator_line, markup=self._markup)
+                console.console.print()
+
+                # Display with bright syntax highlighting
+                import json
+
+                from rich.syntax import Syntax
+
+                json_str = json.dumps(structured_content, indent=2)
+                syntax_obj = Syntax(json_str, "json", theme=CODE_STYLE, background_color="default")
+                console.console.print(syntax_obj, markup=self._markup)
+            else:
+                # Regular tool: dim separator
+                prefix = Text("─| ")
+                prefix.stylize("dim")
+                label_text = Text("Structured Content", style="dim")
+                suffix = Text(" |")
+                suffix.stylize("dim")
+
+                separator_line = Text()
+                separator_line.append_text(prefix)
+                separator_line.append_text(label_text)
+                separator_line.append_text(suffix)
+                remaining = total_width - separator_line.cell_len
+                if remaining > 0:
+                    separator_line.append("─" * remaining, style="dim")
+                console.console.print(separator_line, markup=self._markup)
+                console.console.print()
+
+                # Display truncated content in dim
+                from rich.pretty import Pretty
+
+                if self.config and self.config.logger.truncate_tools:
+                    pretty_obj = Pretty(structured_content, max_length=10, max_string=50)
+                else:
+                    pretty_obj = Pretty(structured_content)
+                console.console.print(pretty_obj, style="dim", markup=self._markup)
+
+            # Bottom separator with metadata
+            console.console.print()
+            if bottom_metadata:
+                display_items = (
+                    self._shorten_items(bottom_metadata, 12) if True else bottom_metadata
+                )
+                prefix = Text("─| ")
+                prefix.stylize("dim")
+                suffix = Text(" |")
+                suffix.stylize("dim")
+                available = max(0, total_width - prefix.cell_len - suffix.cell_len)
+
+                metadata_text = self._format_bottom_metadata(
+                    display_items,
+                    None,
+                    config["highlight_color"],
+                    max_width=available,
+                )
+
+                line = Text()
+                line.append_text(prefix)
+                line.append_text(metadata_text)
+                line.append_text(suffix)
+                remaining = total_width - line.cell_len
+                if remaining > 0:
+                    line.append("─" * remaining, style="dim")
+                console.console.print(line, markup=self._markup)
+            else:
+                console.console.print("─" * total_width, style="dim")
+            console.console.print()
+
+        else:
+            # No structured content - use standard display
+            self.display_message(
+                content=content,
+                message_type=MessageType.TOOL_RESULT,
+                name=name,
+                right_info=right_info,
+                bottom_metadata=bottom_metadata,
+                is_error=result.isError,
+                truncate_content=True,
+            )
 
     def show_tool_call(
         self,
@@ -638,9 +814,7 @@ class ConsoleDisplay:
             # No active prompt_toolkit session - display with rich as before
             # Combined separator and status line
             if agent_name:
-                left = (
-                    f"[magenta]▎[/magenta][dim magenta]▶[/dim magenta] [magenta]{agent_name}[/magenta]"
-                )
+                left = f"[magenta]▎[/magenta][dim magenta]▶[/dim magenta] [magenta]{agent_name}[/magenta]"
             else:
                 left = "[magenta]▎[/magenta][dim magenta]▶[/dim magenta]"
 
@@ -696,6 +870,140 @@ class ConsoleDisplay:
         console.console.print(combined, markup=self._markup)
         console.console.print()
 
+    @staticmethod
+    def summarize_skybridge_configs(
+        configs: Mapping[str, "SkybridgeServerConfig"] | None,
+    ) -> Tuple[List[Dict[str, Any]], List[str]]:
+        """Convert raw Skybridge configs into display-friendly summary data."""
+        server_rows: List[Dict[str, Any]] = []
+        warnings: List[str] = []
+        warning_seen: Set[str] = set()
+
+        if not configs:
+            return server_rows, warnings
+
+        def add_warning(message: str) -> None:
+            formatted = message.strip()
+            if not formatted:
+                return
+            if formatted not in warning_seen:
+                warnings.append(formatted)
+                warning_seen.add(formatted)
+
+        for server_name in sorted(configs.keys()):
+            config = configs.get(server_name)
+            if not config:
+                continue
+            resources = list(config.ui_resources or [])
+            has_skybridge_signal = bool(
+                config.enabled or resources or config.tools or config.warnings
+            )
+            if not has_skybridge_signal:
+                continue
+
+            valid_resource_count = sum(1 for resource in resources if resource.is_skybridge)
+
+            server_rows.append(
+                {
+                    "server_name": server_name,
+                    "config": config,
+                    "resources": resources,
+                    "valid_resource_count": valid_resource_count,
+                    "total_resource_count": len(resources),
+                    "active_tools": [
+                        {
+                            "name": tool.display_name,
+                            "template": str(tool.template_uri) if tool.template_uri else None,
+                        }
+                        for tool in config.tools
+                        if tool.is_valid
+                    ],
+                    "enabled": config.enabled,
+                }
+            )
+
+            for warning in config.warnings:
+                message = warning.strip()
+                if not message:
+                    continue
+                if not message.startswith(server_name):
+                    message = f"{server_name} {message}"
+                add_warning(message)
+
+        return server_rows, warnings
+
+    def show_skybridge_summary(
+        self,
+        agent_name: str,
+        configs: Mapping[str, "SkybridgeServerConfig"] | None,
+    ) -> None:
+        """Display Skybridge availability and warnings."""
+        server_rows, warnings = self.summarize_skybridge_configs(configs)
+
+        if not server_rows and not warnings:
+            return
+
+        heading = "[dim]OpenAI Apps SDK ([/dim][cyan]skybridge[/cyan][dim]) detected:[/dim]"
+        console.console.print()
+        console.console.print(heading, markup=self._markup)
+
+        if not server_rows:
+            console.console.print("[dim]  ● none detected[/dim]", markup=self._markup)
+        else:
+            for row in server_rows:
+                server_name = row["server_name"]
+                resource_count = row["valid_resource_count"]
+                total_resource_count = row["total_resource_count"]
+                tool_infos = row["active_tools"]
+                enabled = row["enabled"]
+
+                tool_count = len(tool_infos)
+                tool_word = "tool" if tool_count == 1 else "tools"
+                resource_word = (
+                    "skybridge resource" if resource_count == 1 else "skybridge resources"
+                )
+                tool_segment = f"[cyan]{tool_count}[/cyan][dim] {tool_word}[/dim]"
+                resource_segment = f"[cyan]{resource_count}[/cyan][dim] {resource_word}[/dim]"
+                name_style = "cyan" if enabled else "yellow"
+                status_suffix = "" if enabled else "[dim] (issues detected)[/dim]"
+
+                console.console.print(
+                    f"[dim]  ● [/dim][{name_style}]{server_name}[/{name_style}]{status_suffix}"
+                    f"[dim] — [/dim]{tool_segment}[dim], [/dim]{resource_segment}",
+                    markup=self._markup,
+                )
+
+                for tool_info in tool_infos:
+                    template_text = (
+                        f"[dim] ({tool_info['template']})[/dim]" if tool_info["template"] else ""
+                    )
+                    console.console.print(
+                        f"[dim]    ▶ [/dim][white]{tool_info['name']}[/white]{template_text}",
+                        markup=self._markup,
+                    )
+
+                if tool_count == 0 and resource_count > 0:
+                    console.console.print(
+                        "[dim]     ▶ tools not linked[/dim]",
+                        markup=self._markup,
+                    )
+                if not enabled and total_resource_count > resource_count:
+                    invalid_count = total_resource_count - resource_count
+                    invalid_word = "resource" if invalid_count == 1 else "resources"
+                    console.console.print(
+                        (
+                            "[dim]     ▶ "
+                            f"[/dim][cyan]{invalid_count}[/cyan][dim] {invalid_word} detected with non-skybridge MIME type[/dim]"
+                        ),
+                        markup=self._markup,
+                    )
+
+        for warning_entry in warnings:
+            console.console.print(
+                f"[dim red]  ▶ [/dim red][red]warning[/red] [dim]{warning_entry}[/dim]",
+                markup=self._markup,
+            )
+
     async def show_assistant_message(
         self,
         message_text: Union[str, Text, "PromptMessageExtended"],
@@ -724,8 +1032,26 @@ class ConsoleDisplay:
         # Extract text from PromptMessageExtended if needed
         from fast_agent.types import PromptMessageExtended
 
+        pre_content: Text | None = None
+
         if isinstance(message_text, PromptMessageExtended):
             display_text = message_text.last_text() or ""
+
+            channels = message_text.channels or {}
+            reasoning_blocks = channels.get(REASONING) or []
+            if reasoning_blocks:
+                from fast_agent.mcp.helpers.content_helpers import get_text
+
+                reasoning_segments = []
+                for block in reasoning_blocks:
+                    text = get_text(block)
+                    if text:
+                        reasoning_segments.append(text)
+
+                if reasoning_segments:
+                    joined = "\n".join(reasoning_segments)
+                    if joined.strip():
+                        pre_content = Text(joined, style="dim default")
         else:
             display_text = message_text
 
@@ -743,6 +1069,7 @@ class ConsoleDisplay:
             max_item_length=max_item_length,
             truncate_content=False,  # Assistant messages shouldn't be truncated
             additional_message=additional_message,
+            pre_content=pre_content,
         )
 
         # Handle mermaid diagrams separately (after the main message)