unique-sdk 2026.44.0.dev2__tar.gz → 2026.44.0.dev3__tar.gz

{unique_sdk-2026.44.0.dev2 → unique_sdk-2026.44.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-sdk
-Version: 2026.44.0.dev2
+Version: 2026.44.0.dev3
 Summary: 
 Author: Martin Fadler, Konstantin Krauss, Andreas Hauri
 Author-email: Martin Fadler <martin.fadler@unique.ch>, Konstantin Krauss <konstantin@unique.ch>, Andreas Hauri <andreas@unique.ch>

{unique_sdk-2026.44.0.dev2 → unique_sdk-2026.44.0.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique_sdk"
-version = "2026.44.0.dev2"
+version = "2026.44.0.dev3"
 description = ""
 readme = "README.md"
 license = { text = "MIT" }

{unique_sdk-2026.44.0.dev2 → unique_sdk-2026.44.0.dev3}/unique_sdk/cli/cli.py

@@ -63,6 +63,9 @@ from unique_sdk.cli.commands.folders import (
     is_mkdir_error_output as _is_mkdir_error_output,
 )
 from unique_sdk.cli.commands.mcp import cmd_mcp
+from unique_sdk.cli.commands.mcp import (
+    is_error_output as _is_mcp_error_output,
+)
 from unique_sdk.cli.commands.navigation import cmd_cd, cmd_ls, cmd_pwd
 from unique_sdk.cli.commands.read import cmd_read
 from unique_sdk.cli.commands.read import (
@@ -844,7 +847,7 @@ def mcp(
     """
     resolved_message_id = _resolve_cli_message_id(ctx, message_id, required=True)
     resolved_chat_id = _resolve_cli_chat_id(ctx, chat_id, required=True)
-    click.echo(
+    emit(
         cmd_mcp(
             LazyState.get(ctx),
             chat_id=resolved_chat_id or "",
@@ -852,7 +855,8 @@ def mcp(
             payload=payload,
             file=file_path,
             stdin=use_stdin,
-        )
+        ),
+        is_error=_is_mcp_error_output,
     )
 
 

{unique_sdk-2026.44.0.dev2 → unique_sdk-2026.44.0.dev3}/unique_sdk/cli/commands/mcp.py

@@ -26,6 +26,9 @@ from unique_sdk.cli.workspace import unique_dir as workspace_unique_dir
 
 _LOGGER = logging.getLogger(__name__)
 
+MCP_ERROR_PREFIX = "mcp:"
+_FORMATTER_ERROR_PREFIX = "mcp: formatter error"
+
 # Per-turn manifest of MCP tool output text, consumed by the Swappable
 # Intelligence runner to ground the hallucination check against MCP-retrieved
 # information (UN-21951). Carries *text only* — no source numbers/markers
@@ -1058,6 +1061,58 @@ def _parse_and_validate(raw: str) -> tuple[str, dict[str, Any]]:
     return name, arguments
 
 
+class McpCommandResult(str):
+    """Text returned by ``cmd_mcp``, with whether that call failed.
+
+    Subclasses ``str`` so callers can print and search the text. ``failed``
+    is set when the process should exit 1: a payload error, any
+    ``UniqueError``, or a tool result with ``isError`` set.
+    """
+
+    failed: bool
+
+    def __new__(cls, text: str, *, failed: bool) -> McpCommandResult:
+        result = str.__new__(cls, text)
+        result.failed = failed
+        return result
+
+
+def _response_is_error(response: Any) -> bool:
+    """Return whether the tool result itself is marked ``isError``.
+
+    Args:
+        response (Any): Raw MCP tool response.
+
+    Returns:
+        bool: True when ``isError`` is set. False when it is absent, false,
+        or unreadable, so a formatter failure on a successful result still
+        exits 0.
+    """
+    try:
+        return bool(getattr(response, "isError", False))
+    except Exception:
+        return False
+
+
+def is_error_output(output: str) -> bool:
+    """Return whether an MCP command result should exit non-zero.
+
+    Args:
+        output (str): Text returned by ``cmd_mcp``.
+
+    Returns:
+        bool: True for payload errors, SDK errors, and ``isError`` tool
+        results. False when the call succeeded, including when formatting
+        that successful result failed and the fallback text was returned.
+    """
+    failed = getattr(output, "failed", None)
+    if isinstance(failed, bool):
+        return failed
+    if output.startswith(_FORMATTER_ERROR_PREFIX):
+        return False
+    return output.startswith(MCP_ERROR_PREFIX)
+
+
 def cmd_mcp(
     state: ShellState,
     chat_id: str,
@@ -1065,8 +1120,21 @@ def cmd_mcp(
     payload: str | None = None,
     file: str | None = None,
     stdin: bool = False,
-) -> str:
-    """Call an MCP tool with a JSON payload containing name and arguments."""
+) -> McpCommandResult:
+    """Call an MCP tool with a JSON payload containing name and arguments.
+
+    Args:
+        state (ShellState): CLI session holding the user and company ids.
+        chat_id (str): Chat the tool call is attributed to.
+        message_id (str): Message the tool call is attributed to.
+        payload (str | None): Inline JSON payload.
+        file (str | None): Path to a JSON payload file.
+        stdin (bool): Read the JSON payload from stdin.
+
+    Returns:
+        McpCommandResult: Formatted tool output, or an ``mcp:`` error line.
+        ``failed`` is true when the call itself failed.
+    """
     try:
         raw = _read_payload(payload, file, stdin)
         name, arguments = _parse_and_validate(raw)
@@ -1080,8 +1148,8 @@ def cmd_mcp(
             arguments=arguments,
         )
 
-    except (ValueError, OSError, unique_sdk.APIError) as e:
-        return f"mcp: {e}"
+    except (ValueError, OSError, unique_sdk.UniqueError) as e:
+        return McpCommandResult(f"{MCP_ERROR_PREFIX} {e}", failed=True)
 
     try:
         formatted = format_mcp_response(response, tool_name=name)
@@ -1090,7 +1158,8 @@ def cmd_mcp(
             fallback = json.dumps(dict(response), indent=2, default=str)
         except Exception:
             fallback = repr(response)
-        formatted = f"mcp: formatter error ({fmt_exc}); raw response:\n{fallback}"
+        formatted = f"{_FORMATTER_ERROR_PREFIX} ({fmt_exc}); raw response:\n{fallback}"
+    call_failed = _response_is_error(response)
 
     server_name = _server_name_from_tool(name) or getattr(response, "mcpServerId", None)
     sources_block = record_mcp_citations(
@@ -1104,5 +1173,5 @@ def cmd_mcp(
     # Sources block FIRST: large outputs get spilled/truncated tail-first by
     # the agent harness, and a trailing block is what partial reads miss.
     if sources_block:
-        return sources_block + "\n\n" + formatted
-    return formatted
+        formatted = sources_block + "\n\n" + formatted
+    return McpCommandResult(formatted, failed=call_failed)