glaip-sdk 0.3.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

glaip_sdk/cli/auth.py

@@ -18,7 +18,8 @@ import click
 from rich.console import Console
 
 from glaip_sdk.branding import HINT_PREFIX_STYLE, WARNING_STYLE
-from glaip_sdk.cli.utils import command_hint, format_command_hint
+from glaip_sdk.cli.hints import format_command_hint
+from glaip_sdk.cli.utils import command_hint
 
 
 def prepare_authentication_export(

glaip_sdk/cli/commands/agents.py

@@ -59,13 +59,13 @@ from glaip_sdk.cli.transcript import (
     maybe_launch_post_run_viewer,
     store_transcript_for_session,
 )
+from glaip_sdk.cli.hints import in_slash_mode
 from glaip_sdk.cli.utils import (
     _fuzzy_pick_for_resources,
     build_renderer,
     coerce_to_row,
     get_client,
     handle_resource_export,
-    in_slash_mode,
     output_list,
     output_result,
     spinner_context,

glaip_sdk/cli/commands/configure.py

@@ -23,7 +23,8 @@ from glaip_sdk.branding import (
 )
 from glaip_sdk.cli.config import CONFIG_FILE, load_config, save_config
 from glaip_sdk.cli.rich_helpers import markup_text
-from glaip_sdk.cli.utils import command_hint, format_command_hint, sdk_version
+from glaip_sdk.cli.hints import format_command_hint
+from glaip_sdk.cli.utils import command_hint, sdk_version
 from glaip_sdk.icons import ICON_TOOL
 from glaip_sdk.rich_components import AIPTable
 

glaip_sdk/cli/commands/mcps.py

@@ -63,6 +63,7 @@ from glaip_sdk.utils.serialization import (
 )
 
 console = Console()
+MAX_DESCRIPTION_LEN = 50
 
 
 def _is_sensitive_data(val: Any) -> bool:
@@ -879,64 +880,210 @@ def get(
         raise click.ClickException(str(e)) from e
 
 
+def _get_tools_from_config(ctx: Any, client: Any, config_file: str) -> tuple[list[dict[str, Any]], str]:
+    """Get tools from MCP config file.
+
+    Args:
+        ctx: Click context
+        client: GlaIP client instance
+        config_file: Path to config file
+
+    Returns:
+        Tuple of (tools list, title string)
+    """
+    config_data = load_resource_from_file_with_validation(Path(config_file), "MCP config")
+
+    # Validate config structure
+    transport = config_data.get("transport")
+    if "config" not in config_data:
+        raise click.ClickException("Invalid MCP config: missing 'config' section in the file.")
+    config_data["config"] = validate_mcp_config_structure(
+        config_data["config"],
+        transport=transport,
+        source=config_file,
+    )
+
+    # Get tools from config without saving
+    with spinner_context(
+        ctx,
+        "[bold blue]Fetching tools from config…[/bold blue]",
+        console_override=console,
+    ):
+        tools = client.mcps.get_mcp_tools_from_config(config_data)
+
+    title = f"{ICON_TOOL} Tools from config: {Path(config_file).name}"
+    return tools, title
+
+
+def _get_tools_from_mcp(ctx: Any, client: Any, mcp_ref: str | None) -> tuple[list[dict[str, Any]], str]:
+    """Get tools from saved MCP.
+
+    Args:
+        ctx: Click context
+        client: GlaIP client instance
+        mcp_ref: MCP reference (ID or name)
+
+    Returns:
+        Tuple of (tools list, title string)
+    """
+    mcp = _resolve_mcp(ctx, client, mcp_ref)
+
+    with spinner_context(
+        ctx,
+        "[bold blue]Fetching MCP tools…[/bold blue]",
+        console_override=console,
+    ):
+        tools = client.mcps.get_mcp_tools(mcp.id)
+
+    title = f"{ICON_TOOL} Tools from MCP: {mcp.name}"
+    return tools, title
+
+
+def _output_tool_names(ctx: Any, tools: list[dict[str, Any]]) -> None:
+    """Output only tool names.
+
+    Args:
+        ctx: Click context
+        tools: List of tool dictionaries
+    """
+    view = get_ctx_value(ctx, "view", "rich")
+    tool_names = [tool.get("name", "N/A") for tool in tools]
+
+    if view == "json":
+        handle_json_output(ctx, tool_names)
+    elif view == "plain":
+        if tool_names:
+            for name in tool_names:
+                console.print(name, markup=False)
+            console.print(f"Total: {len(tool_names)} tools", markup=False)
+        else:
+            console.print("No tools found", markup=False)
+    else:
+        if tool_names:
+            for name in tool_names:
+                console.print(name)
+            console.print(f"[dim]Total: {len(tool_names)} tools[/dim]")
+        else:
+            console.print("[yellow]No tools found[/yellow]")
+
+
+def _transform_tool(tool: dict[str, Any]) -> dict[str, Any]:
+    """Transform a tool dictionary to a display row dictionary.
+
+    Args:
+        tool: Tool dictionary to transform.
+
+    Returns:
+        Dictionary with name and description fields.
+    """
+    description = tool.get("description", "N/A")
+    if len(description) > MAX_DESCRIPTION_LEN:
+        description = description[: MAX_DESCRIPTION_LEN - 3] + "..."
+    return {
+        "name": tool.get("name", "N/A"),
+        "description": description,
+    }
+
+
+def _output_tools_table(ctx: Any, tools: list[dict[str, Any]], title: str) -> None:
+    """Output tools in table format.
+
+    Args:
+        ctx: Click context
+        tools: List of tool dictionaries
+        title: Table title
+    """
+    columns = [
+        ("name", "Name", ACCENT_STYLE, None),
+        ("description", "Description", INFO, 50),
+    ]
+
+    output_list(
+        ctx,
+        tools,
+        title,
+        columns,
+        _transform_tool,
+    )
+
+
+def _validate_tool_command_args(mcp_ref: str | None, config_file: str | None) -> None:
+    """Validate that exactly one of mcp_ref or config_file is provided.
+
+    Args:
+        mcp_ref: MCP reference (ID or name)
+        config_file: Path to config file
+
+    Raises:
+        ClickException: If validation fails
+    """
+    if not mcp_ref and not config_file:
+        raise click.ClickException(
+            "Either MCP_REF or --from-config must be provided.\n"
+            "Examples:\n"
+            "  aip mcps tools <MCP_ID>\n"
+            "  aip mcps tools --from-config mcp-config.json"
+        )
+    if mcp_ref and config_file:
+        raise click.ClickException(
+            "Cannot use both MCP_REF and --from-config at the same time.\n"
+            "Use either:\n"
+            "  aip mcps tools <MCP_ID>\n"
+            "  aip mcps tools --from-config mcp-config.json"
+        )
+
+
 @mcps_group.command("tools")
-@click.argument("mcp_ref")
+@click.argument("mcp_ref", required=False)
+@click.option(
+    "--from-config",
+    "--config",
+    "config_file",
+    type=click.Path(exists=True, dir_okay=False),
+    help="Get tools from MCP config file without saving to DB (JSON or YAML)",
+)
+@click.option(
+    "--names-only",
+    is_flag=True,
+    help="Show only tool names (useful for allowed_tools config)",
+)
 @output_flags()
 @click.pass_context
-def list_tools(ctx: Any, mcp_ref: str) -> None:
-    """List tools available from a specific MCP.
+def list_tools(ctx: Any, mcp_ref: str | None, config_file: str | None, names_only: bool) -> None:
+    """List tools available from a specific MCP or config file.
 
     Args:
         ctx: Click context containing output format preferences
-        mcp_ref: MCP reference (ID or name)
+        mcp_ref: MCP reference (ID or name) - required if --from-config not used
+        config_file: Path to MCP config file - alternative to mcp_ref
+        names_only: Show only tool names instead of full table
 
     Raises:
         ClickException: If MCP not found or tools fetch fails
-    """
-    try:
-        client = get_client(ctx)
 
-        # Resolve MCP using helper function
-        mcp = _resolve_mcp(ctx, client, mcp_ref)
-
-        # Get tools from MCP
-        with spinner_context(
-            ctx,
-            "[bold blue]Fetching MCP tools…[/bold blue]",
-            console_override=console,
-        ):
-            tools = client.mcps.get_mcp_tools(mcp.id)
-
-        # Define table columns: (data_key, header, style, width)
-        columns = [
-            ("name", "Name", ACCENT_STYLE, None),
-            ("description", "Description", INFO, 50),
-        ]
+    Examples:
+        Get tools from saved MCP:
+            aip mcps tools <MCP_ID>
 
-        # Transform function for safe dictionary access
-        def transform_tool(tool: dict[str, Any]) -> dict[str, Any]:
-            """Transform a tool dictionary to a display row dictionary.
+        Get tools from config file (without saving to DB):
+            aip mcps tools --from-config mcp-config.json
 
-            Args:
-                tool: Tool dictionary to transform.
+        Get just tool names for allowed_tools config:
+            aip mcps tools <MCP_ID> --names-only
+    """
+    try:
+        _validate_tool_command_args(mcp_ref, config_file)
+        client = get_client(ctx)
 
-            Returns:
-                Dictionary with name and description fields.
-            """
-            return {
-                "name": tool.get("name", "N/A"),
-                "description": tool.get("description", "N/A")[:47] + "..."
-                if len(tool.get("description", "")) > 47
-                else tool.get("description", "N/A"),
-            }
+        if config_file:
+            tools, title = _get_tools_from_config(ctx, client, config_file)
+        else:
+            tools, title = _get_tools_from_mcp(ctx, client, mcp_ref)
 
-        output_list(
-            ctx,
-            tools,
-            f"{ICON_TOOL} Tools from MCP: {mcp.name}",
-            columns,
-            transform_tool,
-        )
+        if names_only:
+            _output_tool_names(ctx, tools)
+        else:
+            _output_tools_table(ctx, tools, title)
 
     except Exception as e:
         raise click.ClickException(str(e)) from e

glaip_sdk/cli/commands/transcripts.py

@@ -37,7 +37,7 @@ from glaip_sdk.cli.transcript.viewer import ViewerContext, run_viewer_session
 from glaip_sdk.cli.utils import format_size, get_ctx_value, parse_json_line
 from glaip_sdk.rich_components import AIPTable
 from glaip_sdk.utils.rendering.renderer.debug import render_debug_event
-from glaip_sdk.utils.rendering.renderer.panels import create_final_panel
+from glaip_sdk.utils.rendering.layout.panels import create_final_panel
 
 console = Console()
 

glaip_sdk/cli/display.py

@@ -17,7 +17,7 @@ from rich.text import Text
 
 from glaip_sdk.branding import ERROR_STYLE, SUCCESS, SUCCESS_STYLE, WARNING_STYLE
 from glaip_sdk.cli.rich_helpers import markup_text
-from glaip_sdk.cli.utils import command_hint, format_command_hint, in_slash_mode
+from glaip_sdk.cli.hints import command_hint, format_command_hint, in_slash_mode
 from glaip_sdk.icons import ICON_AGENT, ICON_TOOL
 from glaip_sdk.rich_components import AIPPanel
 

glaip_sdk/cli/hints.py

@@ -0,0 +1,58 @@
+"""Helpers for formatting CLI/slash command hints.
+
+Authors:
+    Raymond Christopher (raymond.christopher@gdplabs.id)
+"""
+
+from __future__ import annotations
+
+
+import click
+
+from glaip_sdk.branding import HINT_COMMAND_STYLE, HINT_DESCRIPTION_COLOR
+
+
+def in_slash_mode(ctx: click.Context | None = None) -> bool:
+    """Return True when running inside the slash command palette."""
+    if ctx is None:
+        try:
+            ctx = click.get_current_context(silent=True)
+        except RuntimeError:
+            ctx = None
+
+    if ctx is None:
+        return False
+
+    obj = getattr(ctx, "obj", None)
+    if isinstance(obj, dict):
+        return bool(obj.get("_slash_session"))
+
+    return bool(getattr(obj, "_slash_session", False))
+
+
+def command_hint(
+    cli_command: str | None,
+    slash_command: str | None = None,
+    *,
+    ctx: click.Context | None = None,
+) -> str | None:
+    """Return the appropriate command string for the current mode."""
+    if in_slash_mode(ctx):
+        if not slash_command:
+            return None
+        return slash_command if slash_command.startswith("/") else f"/{slash_command}"
+
+    if not cli_command:
+        return None
+    return f"aip {cli_command}"
+
+
+def format_command_hint(command: str | None, description: str | None = None) -> str | None:
+    """Return a Rich markup string that highlights a command hint."""
+    if not command:
+        return None
+
+    highlighted = f"[{HINT_COMMAND_STYLE}]{command}[/]"
+    if description:
+        highlighted += f"  [{HINT_DESCRIPTION_COLOR}]{description}[/{HINT_DESCRIPTION_COLOR}]"
+    return highlighted

glaip_sdk/cli/io.py

@@ -7,6 +7,7 @@ Authors:
     Raymond Christopher (raymond.christopher@gdplabs.id)
 """
 
+from importlib import import_module
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
@@ -25,9 +26,11 @@ if TYPE_CHECKING:  # pragma: no cover - typing-only imports
 
 def _create_console() -> "Console":
     """Return a Console instance (lazy import for easier testing)."""
-    from rich.console import Console  # Local import for test patching
-
-    return Console()
+    try:
+        console_module = import_module("rich.console")
+    except ImportError as exc:  # pragma: no cover - optional dependency missing
+        raise RuntimeError("Rich Console is not available") from exc
+    return console_module.Console()
 
 
 def load_resource_from_file_with_validation(file_path: Path, resource_type: str) -> dict[str, Any]:

glaip_sdk/cli/main.py

@@ -38,7 +38,8 @@ from glaip_sdk.cli.commands.update import _build_upgrade_command, update_command
 from glaip_sdk.cli.config import load_config
 from glaip_sdk.cli.transcript import get_transcript_cache_stats
 from glaip_sdk.cli.update_notifier import maybe_notify_update
-from glaip_sdk.cli.utils import format_size, in_slash_mode, sdk_version, spinner_context, update_spinner
+from glaip_sdk.cli.hints import in_slash_mode
+from glaip_sdk.cli.utils import format_size, sdk_version, spinner_context, update_spinner
 from glaip_sdk.config.constants import (
     DEFAULT_AGENT_RUN_TIMEOUT,
 )

glaip_sdk/cli/slash/agent_session.py

@@ -16,7 +16,8 @@ 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.constants import DEFAULT_AGENT_INSTRUCTION_PREVIEW_LIMIT
 from glaip_sdk.cli.slash.prompt import _HAS_PROMPT_TOOLKIT, FormattedText
-from glaip_sdk.cli.utils import bind_slash_session_context, format_command_hint
+from glaip_sdk.cli.hints import format_command_hint
+from glaip_sdk.cli.utils import bind_slash_session_context
 
 if TYPE_CHECKING:  # pragma: no cover - type checking only
     from glaip_sdk.cli.slash.session import SlashSession

glaip_sdk/cli/slash/session.py

@@ -52,10 +52,10 @@ from glaip_sdk.cli.transcript import (
 )
 from glaip_sdk.cli.transcript.viewer import ViewerContext, run_viewer_session
 from glaip_sdk.cli.update_notifier import maybe_notify_update
+from glaip_sdk.cli.hints import format_command_hint
 from glaip_sdk.cli.utils import (
     _fuzzy_pick_for_resources,
     command_hint,
-    format_command_hint,
     format_size,
     get_client,
     restore_slash_session_context,

glaip_sdk/cli/transcript/capture.py

@@ -24,7 +24,7 @@ from glaip_sdk.cli.transcript.cache import (
 from glaip_sdk.cli.transcript.cache import (
     build_payload as build_transcript_payload,
 )
-from glaip_sdk.utils.rendering.renderer.progress import format_tool_title
+from glaip_sdk.utils.rendering.layout.progress import format_tool_title
 
 
 @dataclass(slots=True)