glaip-sdk 0.0.9__py3-none-any.whl → 0.0.11__py3-none-any.whl

glaip_sdk/cli/commands/mcps.py

@@ -5,6 +5,7 @@ Authors:
 """
 
 import json
+import sys
 from pathlib import Path
 from typing import Any
 
@@ -21,9 +22,6 @@ from glaip_sdk.cli.display import (
     handle_json_output,
     handle_rich_output,
 )
-from glaip_sdk.cli.io import (
-    export_resource_to_file_with_validation as export_resource_to_file,
-)
 from glaip_sdk.cli.io import (
     fetch_raw_resource_details,
 )
@@ -40,20 +38,41 @@ from glaip_sdk.cli.utils import (
 )
 from glaip_sdk.rich_components import AIPPanel
 from glaip_sdk.utils import format_datetime
+from glaip_sdk.utils.serialization import (
+    build_mcp_export_payload,
+    write_resource_export,
+)
 
 console = Console()
 
 
 @click.group(name="mcps", no_args_is_help=True)
 def mcps_group() -> None:
-    """MCP management operations."""
+    """MCP management operations.
+
+    Provides commands for creating, listing, updating, deleting, and managing
+    Model Context Protocol (MCP) configurations.
+    """
     pass
 
 
 def _resolve_mcp(
     ctx: Any, client: Any, ref: str, select: int | None = None
 ) -> Any | None:
-    """Resolve MCP reference (ID or name) with ambiguity handling."""
+    """Resolve MCP reference (ID or name) with ambiguity handling.
+
+    Args:
+        ctx: Click context object
+        client: API client instance
+        ref: MCP reference (ID or name)
+        select: Index to select when multiple matches found
+
+    Returns:
+        MCP object if found, None otherwise
+
+    Raises:
+        ClickException: If MCP not found or selection invalid
+    """
     return resolve_resource_reference(
         ctx,
         client,
@@ -70,7 +89,14 @@ def _resolve_mcp(
 @output_flags()
 @click.pass_context
 def list_mcps(ctx: Any) -> None:
-    """List all MCPs."""
+    """List all MCPs in a formatted table.
+
+    Args:
+        ctx: Click context containing output format preferences
+
+    Raises:
+        ClickException: If API request fails
+    """
     try:
         client = get_client(ctx)
         with spinner_context(
@@ -117,7 +143,18 @@ def list_mcps(ctx: Any) -> None:
 def create(
     ctx: Any, name: str, transport: str, description: str | None, config: str | None
 ) -> None:
-    """Create a new MCP."""
+    """Create a new MCP with specified configuration.
+
+    Args:
+        ctx: Click context containing output format preferences
+        name: MCP name (required)
+        transport: MCP transport protocol (required)
+        description: Optional MCP description
+        config: JSON configuration string for MCP settings
+
+    Raises:
+        ClickException: If JSON parsing fails or API request fails
+    """
     try:
         client = get_client(ctx)
 
@@ -163,22 +200,191 @@ def create(
         raise click.ClickException(str(e))
 
 
+def _handle_mcp_export(
+    ctx: Any,
+    client: Any,
+    mcp: Any,
+    export_path: Path,
+    no_auth_prompt: bool,
+    auth_placeholder: str,
+) -> None:
+    """Handle MCP export to file with format detection and auth handling.
+
+    Args:
+        ctx: Click context for spinner management
+        client: API client for fetching MCP details
+        mcp: MCP object to export
+        export_path: Target file path (format detected from extension)
+        no_auth_prompt: Skip interactive secret prompts if True
+        auth_placeholder: Placeholder text for missing secrets
+
+    Note:
+        Supports JSON (.json) and YAML (.yaml/.yml) export formats.
+        In interactive mode, prompts for secret values.
+        In non-interactive mode, uses placeholder values.
+    """
+    # Auto-detect format from file extension
+    detected_format = detect_export_format(export_path)
+
+    # Always export comprehensive data - re-fetch with full details
+    try:
+        with spinner_context(
+            ctx,
+            "[bold blue]Fetching complete MCP details…[/bold blue]",
+            console_override=console,
+        ):
+            mcp = client.mcps.get_mcp_by_id(mcp.id)
+    except Exception as e:
+        console.print(
+            Text(f"[yellow]⚠️  Could not fetch full MCP details: {e}[/yellow]")
+        )
+        console.print(Text("[yellow]⚠️  Proceeding with available data[/yellow]"))
+
+    # Determine if we should prompt for secrets
+    prompt_for_secrets = not no_auth_prompt and sys.stdin.isatty()
+
+    # Warn user if non-interactive mode forces placeholder usage
+    if not no_auth_prompt and not sys.stdin.isatty():
+        console.print(
+            Text(
+                "[yellow]⚠️  Non-interactive mode detected. "
+                "Using placeholder values for secrets.[/yellow]"
+            )
+        )
+
+    # Build and write export payload
+    if prompt_for_secrets:
+        # Interactive mode: no spinner during prompts
+        export_payload = build_mcp_export_payload(
+            mcp,
+            prompt_for_secrets=prompt_for_secrets,
+            placeholder=auth_placeholder,
+            console=console,
+        )
+        with spinner_context(
+            ctx,
+            "[bold blue]Writing export file…[/bold blue]",
+            console_override=console,
+        ):
+            write_resource_export(export_path, export_payload, detected_format)
+    else:
+        # Non-interactive mode: spinner for entire export process
+        with spinner_context(
+            ctx,
+            "[bold blue]Exporting MCP configuration…[/bold blue]",
+            console_override=console,
+        ):
+            export_payload = build_mcp_export_payload(
+                mcp,
+                prompt_for_secrets=prompt_for_secrets,
+                placeholder=auth_placeholder,
+                console=console,
+            )
+            write_resource_export(export_path, export_payload, detected_format)
+
+    console.print(
+        Text(
+            f"[green]✅ Complete MCP configuration exported to: "
+            f"{export_path} (format: {detected_format})[/green]"
+        )
+    )
+
+
+def _display_mcp_details(ctx: Any, client: Any, mcp: Any) -> None:
+    """Display MCP details using raw API data or fallback to Pydantic model.
+
+    Args:
+        ctx: Click context containing output format preferences
+        client: API client for fetching raw MCP data
+        mcp: MCP object to display details for
+
+    Note:
+        Attempts to fetch raw API data first to preserve all fields.
+        Falls back to Pydantic model data if raw data unavailable.
+        Formats datetime fields for better readability.
+    """
+    # Try to fetch raw API data first to preserve ALL fields
+    with spinner_context(
+        ctx,
+        "[bold blue]Fetching detailed MCP data…[/bold blue]",
+        console_override=console,
+    ):
+        raw_mcp_data = fetch_raw_resource_details(client, mcp, "mcps")
+
+    if raw_mcp_data:
+        # Use raw API data - this preserves ALL fields
+        formatted_data = raw_mcp_data.copy()
+        if "created_at" in formatted_data:
+            formatted_data["created_at"] = format_datetime(formatted_data["created_at"])
+        if "updated_at" in formatted_data:
+            formatted_data["updated_at"] = format_datetime(formatted_data["updated_at"])
+
+        output_result(
+            ctx,
+            formatted_data,
+            title="MCP Details",
+            panel_title=f"🔌 {raw_mcp_data.get('name', 'Unknown')}",
+        )
+    else:
+        # Fall back to Pydantic model data
+        console.print("[yellow]Falling back to Pydantic model data[/yellow]")
+        result_data = {
+            "id": str(getattr(mcp, "id", "N/A")),
+            "name": getattr(mcp, "name", "N/A"),
+            "type": getattr(mcp, "type", "N/A"),
+            "config": getattr(mcp, "config", "N/A"),
+            "status": getattr(mcp, "status", "N/A"),
+            "connection_status": getattr(mcp, "connection_status", "N/A"),
+        }
+        output_result(
+            ctx, result_data, title="MCP Details", panel_title=f"🔌 {mcp.name}"
+        )
+
+
 @mcps_group.command()
 @click.argument("mcp_ref")
 @click.option(
     "--export",
     type=click.Path(dir_okay=False, writable=True),
-    help="Export complete MCP configuration to file (format auto-detected from .json/.yaml extension)",
+    help="Export complete MCP configuration to file "
+    "(format auto-detected from .json/.yaml extension)",
+)
+@click.option(
+    "--no-auth-prompt",
+    is_flag=True,
+    help="Skip interactive secret prompts and use placeholder values.",
+)
+@click.option(
+    "--auth-placeholder",
+    default="<INSERT VALUE>",
+    show_default=True,
+    help="Placeholder text used when secrets are unavailable.",
 )
 @output_flags()
 @click.pass_context
-def get(ctx: Any, mcp_ref: str, export: str | None) -> None:
-    """Get MCP details.
+def get(
+    ctx: Any,
+    mcp_ref: str,
+    export: str | None,
+    no_auth_prompt: bool,
+    auth_placeholder: str,
+) -> None:
+    """Get MCP details and optionally export configuration to file.
+
+    Args:
+        ctx: Click context containing output format preferences
+        mcp_ref: MCP reference (ID or name)
+        export: Optional file path to export MCP configuration
+        no_auth_prompt: Skip interactive secret prompts if True
+        auth_placeholder: Placeholder text for missing secrets
+
+    Raises:
+        ClickException: If MCP not found or export fails
 
     Examples:
         aip mcps get my-mcp
-        aip mcps get my-mcp --export mcp.json    # Exports complete configuration as JSON
-        aip mcps get my-mcp --export mcp.yaml    # Exports complete configuration as YAML
+        aip mcps get my-mcp --export mcp.json    # Export as JSON
+        aip mcps get my-mcp --export mcp.yaml    # Export as YAML
     """
     try:
         client = get_client(ctx)
@@ -188,83 +394,12 @@ def get(ctx: Any, mcp_ref: str, export: str | None) -> None:
 
         # Handle export option
         if export:
-            export_path = Path(export)
-            # Auto-detect format from file extension
-            detected_format = detect_export_format(export_path)
-
-            # Always export comprehensive data - re-fetch MCP with full details if needed
-            try:
-                with spinner_context(
-                    ctx,
-                    "[bold blue]Fetching complete MCP details…[/bold blue]",
-                    console_override=console,
-                ):
-                    mcp = client.mcps.get_mcp_by_id(mcp.id)
-            except Exception as e:
-                console.print(
-                    Text(f"[yellow]⚠️  Could not fetch full MCP details: {e}[/yellow]")
-                )
-                console.print(
-                    Text("[yellow]⚠️  Proceeding with available data[/yellow]")
-                )
-
-            with spinner_context(
-                ctx,
-                "[bold blue]Exporting MCP configuration…[/bold blue]",
-                console_override=console,
-            ):
-                export_resource_to_file(mcp, export_path, detected_format)
-            console.print(
-                Text(
-                    f"[green]✅ Complete MCP configuration exported to: {export_path} (format: {detected_format})[/green]"
-                )
+            _handle_mcp_export(
+                ctx, client, mcp, Path(export), no_auth_prompt, auth_placeholder
             )
 
-        # Try to fetch raw API data first to preserve ALL fields
-        with spinner_context(
-            ctx,
-            "[bold blue]Fetching detailed MCP data…[/bold blue]",
-            console_override=console,
-        ):
-            raw_mcp_data = fetch_raw_resource_details(client, mcp, "mcps")
-
-        if raw_mcp_data:
-            # Use raw API data - this preserves ALL fields
-            # Format dates for better display (minimal postprocessing)
-            formatted_data = raw_mcp_data.copy()
-            if "created_at" in formatted_data:
-                formatted_data["created_at"] = format_datetime(
-                    formatted_data["created_at"]
-                )
-            if "updated_at" in formatted_data:
-                formatted_data["updated_at"] = format_datetime(
-                    formatted_data["updated_at"]
-                )
-
-            # Display using output_result with raw data
-            output_result(
-                ctx,
-                formatted_data,
-                title="MCP Details",
-                panel_title=f"🔌 {raw_mcp_data.get('name', 'Unknown')}",
-            )
-        else:
-            # Fall back to original method if raw fetch fails
-            console.print("[yellow]Falling back to Pydantic model data[/yellow]")
-
-            # Create result data with actual available fields
-            result_data = {
-                "id": str(getattr(mcp, "id", "N/A")),
-                "name": getattr(mcp, "name", "N/A"),
-                "type": getattr(mcp, "type", "N/A"),
-                "config": getattr(mcp, "config", "N/A"),
-                "status": getattr(mcp, "status", "N/A"),
-                "connection_status": getattr(mcp, "connection_status", "N/A"),
-            }
-
-            output_result(
-                ctx, result_data, title="MCP Details", panel_title=f"🔌 {mcp.name}"
-            )
+        # Display MCP details
+        _display_mcp_details(ctx, client, mcp)
 
     except Exception as e:
         raise click.ClickException(str(e))
@@ -275,7 +410,15 @@ def get(ctx: Any, mcp_ref: str, export: str | None) -> None:
 @output_flags()
 @click.pass_context
 def list_tools(ctx: Any, mcp_ref: str) -> None:
-    """List tools from MCP."""
+    """List tools available from a specific MCP.
+
+    Args:
+        ctx: Click context containing output format preferences
+        mcp_ref: MCP reference (ID or name)
+
+    Raises:
+        ClickException: If MCP not found or tools fetch fails
+    """
     try:
         client = get_client(ctx)
 
@@ -325,7 +468,19 @@ def list_tools(ctx: Any, mcp_ref: str) -> None:
 @output_flags()
 @click.pass_context
 def connect(ctx: Any, config_file: str) -> None:
-    """Connect to MCP using config file."""
+    """Test MCP connection using a configuration file.
+
+    Args:
+        ctx: Click context containing output format preferences
+        config_file: Path to MCP configuration JSON file
+
+    Raises:
+        ClickException: If config file invalid or connection test fails
+
+    Note:
+        Loads MCP configuration from JSON file and tests connectivity.
+        Displays success or failure with connection details.
+    """
     try:
         client = get_client(ctx)
 
@@ -337,7 +492,8 @@ def connect(ctx: Any, config_file: str) -> None:
         if view != "json":
             console.print(
                 Text(
-                    f"[yellow]Connecting to MCP with config from {config_file}...[/yellow]"
+                    f"[yellow]Connecting to MCP with config from "
+                    f"{config_file}...[/yellow]"
                 )
             )
 
@@ -379,7 +535,22 @@ def update(
     description: str | None,
     config: str | None,
 ) -> None:
-    """Update an existing MCP."""
+    """Update an existing MCP with new configuration values.
+
+    Args:
+        ctx: Click context containing output format preferences
+        mcp_ref: MCP reference (ID or name)
+        name: New MCP name (optional)
+        description: New description (optional)
+        config: New JSON configuration string (optional)
+
+    Raises:
+        ClickException: If MCP not found, JSON invalid, or no fields specified
+
+    Note:
+        At least one field must be specified for update.
+        Uses PUT for complete updates or PATCH for partial updates.
+    """
     try:
         client = get_client(ctx)
 
@@ -425,7 +596,20 @@ def update(
 @output_flags()
 @click.pass_context
 def delete(ctx: Any, mcp_ref: str, yes: bool) -> None:
-    """Delete an MCP."""
+    """Delete an MCP after confirmation.
+
+    Args:
+        ctx: Click context containing output format preferences
+        mcp_ref: MCP reference (ID or name)
+        yes: Skip confirmation prompt if True
+
+    Raises:
+        ClickException: If MCP not found or deletion fails
+
+    Note:
+        Requires confirmation unless --yes flag is provided.
+        Deletion is permanent and cannot be undone.
+    """
     try:
         client = get_client(ctx)
 

glaip_sdk/cli/main.py

@@ -24,6 +24,7 @@ from glaip_sdk.cli.commands.configure import (
 from glaip_sdk.cli.commands.mcps import mcps_group
 from glaip_sdk.cli.commands.models import models_group
 from glaip_sdk.cli.commands.tools import tools_group
+from glaip_sdk.cli.update_notifier import maybe_notify_update
 from glaip_sdk.cli.utils import spinner_context, update_spinner
 from glaip_sdk.config.constants import (
     DEFAULT_AGENT_RUN_TIMEOUT,
@@ -82,6 +83,13 @@ def main(
 
     ctx.obj["tty"] = not no_tty
 
+    if not ctx.resilient_parsing and ctx.obj["tty"]:
+        console = Console()
+        maybe_notify_update(
+            _SDK_VERSION,
+            console=console,
+        )
+
     if ctx.invoked_subcommand is None and not ctx.resilient_parsing:
         if _should_launch_slash(ctx) and SlashSession is not None:
             session = SlashSession(ctx)

glaip_sdk/cli/slash/agent_session.py

@@ -12,6 +12,7 @@ import click
 
 from glaip_sdk.cli.commands.agents import get as agents_get_command
 from glaip_sdk.cli.commands.agents import run as agents_run_command
+from glaip_sdk.cli.slash.prompt import _HAS_PROMPT_TOOLKIT, FormattedText
 
 if TYPE_CHECKING:  # pragma: no cover - type checking only
     from .session import SlashSession
@@ -34,6 +35,7 @@ class AgentRunSession:
             "help": "Display this context-aware menu.",
             "exit": "Return to the command palette.",
             "q": "Return to the command palette.",
+            "verbose": "Toggle verbose streaming output.",
         }
 
     def run(self) -> None:
@@ -71,8 +73,30 @@ class AgentRunSession:
     def _get_user_input(self) -> str | None:
         """Get user input with proper error handling."""
         try:
+
+            def _prompt_message() -> Any:
+                verbose_enabled = self.session.verbose_enabled
+                verbose_tag = "[verbose:on]" if verbose_enabled else "[verbose:off]"
+                prompt_prefix = f"{self._agent_name} ({self._agent_id}) "
+
+                # Use FormattedText if prompt_toolkit is available, otherwise use simple string
+                if _HAS_PROMPT_TOOLKIT and FormattedText is not None:
+                    segments = [
+                        ("class:prompt", prompt_prefix),
+                        (
+                            "class:prompt-verbose-on"
+                            if verbose_enabled
+                            else "class:prompt-verbose-off",
+                            verbose_tag,
+                        ),
+                        ("class:prompt", "\n› "),
+                    ]
+                    return FormattedText(segments)
+
+                return f"{prompt_prefix}{verbose_tag}\n› "
+
             raw = self.session._prompt(
-                f"{self._agent_name} ({self._agent_id})\n› ",
+                _prompt_message,
                 placeholder=self._prompt_placeholder,
             )
             if self._prompt_placeholder:
@@ -138,9 +162,29 @@ class AgentRunSession:
             return
 
         try:
+            ctx = self.session.ctx
+            ctx_obj = getattr(ctx, "obj", None)
+            previous_session = None
+            if isinstance(ctx_obj, dict):
+                previous_session = ctx_obj.get("_slash_session")
+                ctx_obj["_slash_session"] = self.session
+
+            self.session.notify_agent_run_started()
             self.session.ctx.invoke(
-                agents_run_command, agent_ref=agent_id, input_text=message
+                agents_run_command,
+                agent_ref=agent_id,
+                input_text=message,
+                verbose=self.session.verbose_enabled,
             )
             self.session.last_run_input = message
         except click.ClickException as exc:
             self.console.print(f"[red]{exc}[/red]")
+        finally:
+            try:
+                self.session.notify_agent_run_finished()
+            finally:
+                if isinstance(ctx_obj, dict):
+                    if previous_session is None:
+                        ctx_obj.pop("_slash_session", None)
+                    else:
+                        ctx_obj["_slash_session"] = previous_session

glaip_sdk/cli/slash/prompt.py

@@ -14,20 +14,27 @@ _HAS_PROMPT_TOOLKIT = False
 try:  # pragma: no cover - optional dependency
     from prompt_toolkit import PromptSession
     from prompt_toolkit.completion import Completer, Completion
-    from prompt_toolkit.formatted_text import FormattedText
+    from prompt_toolkit.formatted_text import FormattedText, to_formatted_text
     from prompt_toolkit.key_binding import KeyBindings
     from prompt_toolkit.patch_stdout import patch_stdout
     from prompt_toolkit.styles import Style
 
+    try:
+        from prompt_toolkit.application import run_in_terminal as ptk_run_in_terminal
+    except Exception:  # pragma: no cover - compatibility fallback
+        ptk_run_in_terminal = None
+
     _HAS_PROMPT_TOOLKIT = True
 except Exception:  # pragma: no cover - optional dependency
     PromptSession = None  # type: ignore[assignment]
     Completer = None  # type: ignore[assignment]
     Completion = None  # type: ignore[assignment]
     FormattedText = None  # type: ignore[assignment]
+    to_formatted_text = None  # type: ignore[assignment]
     KeyBindings = None  # type: ignore[assignment]
     Style = None  # type: ignore[assignment]
     patch_stdout = None  # type: ignore[assignment]
+    ptk_run_in_terminal = None
 
 if TYPE_CHECKING:  # pragma: no cover - typing only
     from .session import SlashSession
@@ -76,7 +83,7 @@ def setup_prompt_toolkit(
     if PromptSession is None or Style is None:
         return None, None
 
-    bindings = _create_key_bindings()
+    bindings = _create_key_bindings(session)
 
     prompt_session = PromptSession(
         completer=SlashCompleter(session),
@@ -86,6 +93,8 @@ def setup_prompt_toolkit(
     prompt_style = Style.from_dict(
         {
             "prompt": "bg:#0f172a #facc15 bold",
+            "prompt-verbose-on": "bg:#0f172a #34d399 bold",
+            "prompt-verbose-off": "bg:#0f172a #f87171 bold",
             "": "bg:#0f172a #e2e8f0",
             "placeholder": "bg:#0f172a #94a3b8 italic",
         }
@@ -94,7 +103,7 @@ def setup_prompt_toolkit(
     return prompt_session, prompt_style
 
 
-def _create_key_bindings() -> Any:
+def _create_key_bindings(session: SlashSession) -> Any:
     """Create prompt_toolkit key bindings for the command palette."""
 
     if KeyBindings is None:
@@ -109,29 +118,57 @@ def _create_key_bindings() -> Any:
         elif buffer.complete_state is not None:
             buffer.cancel_completion()
 
-    @bindings.add("/")  # type: ignore[misc]
     def _trigger_slash_completion(event: Any) -> None:  # pragma: no cover - UI
         buffer = event.app.current_buffer
         buffer.insert_text("/")
         _refresh_completions(buffer)
 
-    @bindings.add("backspace")  # type: ignore[misc]
     def _handle_backspace(event: Any) -> None:  # pragma: no cover - UI
         buffer = event.app.current_buffer
         if buffer.document.cursor_position > 0:
             buffer.delete_before_cursor()
         _refresh_completions(buffer)
 
+    def _toggle_verbose(event: Any) -> None:  # pragma: no cover - UI
+        _execute_toggle_verbose(session, event.app)
+
+    @bindings.add("/")  # type: ignore[misc]
+    def _add_trigger_slash_completion(event: Any) -> None:
+        _trigger_slash_completion(event)
+
+    @bindings.add("backspace")  # type: ignore[misc]
+    def _add_handle_backspace(event: Any) -> None:
+        _handle_backspace(event)
+
     @bindings.add("c-h")  # type: ignore[misc]
-    def _handle_ctrl_h(event: Any) -> None:  # pragma: no cover - UI
-        buffer = event.app.current_buffer
-        if buffer.document.cursor_position > 0:
-            buffer.delete_before_cursor()
-        _refresh_completions(buffer)
+    def _add_handle_ctrl_h(event: Any) -> None:
+        _handle_backspace(event)  # Reuse backspace handler
+
+    @bindings.add("c-t")  # type: ignore[misc]
+    def _add_toggle_verbose(event: Any) -> None:
+        _toggle_verbose(event)
 
     return bindings
 
 
+def _execute_toggle_verbose(
+    session: SlashSession, app: Any
+) -> None:  # pragma: no cover - UI
+    """Execute verbose toggle with proper terminal handling."""
+
+    def _announce() -> None:
+        session.toggle_verbose(announce=False)
+
+    run_in_terminal = getattr(app, "run_in_terminal", None)
+    if callable(run_in_terminal):
+        run_in_terminal(_announce)
+    elif ptk_run_in_terminal is not None:
+        ptk_run_in_terminal(_announce)
+    else:
+        _announce()
+    app.invalidate()
+
+
 def _iter_command_completions(
     session: SlashSession, text: str
 ) -> Iterable[Completion]:  # pragma: no cover - thin wrapper
@@ -191,6 +228,7 @@ __all__ = [
     "SlashCompleter",
     "setup_prompt_toolkit",
     "FormattedText",
+    "to_formatted_text",
     "patch_stdout",
     "PromptSession",
     "Style",