fix cli mode

Author: taylorwilsdon

.beads/issues.jsonl

@@ -12,6 +12,7 @@
 {"id":"google_workspace_mcp-ic8","title":"enh: support writing hyperlink URLs in modify_sheet_values","description":"Issue #434 also requested hyperlink creation/writes. Current implementation reads hyperlinks in read_sheet_values but modify_sheet_values does not expose first-class hyperlink writes.","status":"open","priority":3,"issue_type":"task","owner":"tbarrettwilsdon@gmail.com","created_at":"2026-02-08T17:42:10.590658-05:00","created_by":"Taylor Wilsdon","updated_at":"2026-02-08T17:42:10.590658-05:00"}
 {"id":"google_workspace_mcp-jf2","title":"ci: make PyPI publish step rerun-safe with skip-existing","description":"GitHub Actions reruns on same tag fail because PyPI rejects duplicate file uploads. Add skip-existing=true to pypa/gh-action-pypi-publish so reruns proceed to MCP publish.","status":"closed","priority":2,"issue_type":"bug","owner":"tbarrettwilsdon@gmail.com","created_at":"2026-02-08T20:59:58.461102-05:00","created_by":"Taylor Wilsdon","updated_at":"2026-02-08T21:00:32.121469-05:00","closed_at":"2026-02-08T21:00:32.121469-05:00","close_reason":"Closed"}
 {"id":"google_workspace_mcp-qfl","title":"Fix stdio multi-account session binding","status":"in_progress","priority":1,"issue_type":"task","owner":"tbarrettwilsdon@gmail.com","created_at":"2026-02-07T13:27:09.466282-05:00","created_by":"Taylor Wilsdon","updated_at":"2026-02-07T13:27:22.857227-05:00"}
+{"id":"google_workspace_mcp-xia","title":"fix: CLI should unwrap FastAPI Body defaults when invoking tools","description":"CLI mode invokes tool functions directly and currently passes FastAPI Body marker objects as defaults for omitted args. This breaks gmail send/draft with errors like Body has no attribute lower/len. Update CLI invocation to normalize Param defaults and return clear missing-required errors.","status":"closed","priority":1,"issue_type":"bug","owner":"tbarrettwilsdon@gmail.com","created_at":"2026-02-10T12:33:06.83139-05:00","created_by":"Taylor Wilsdon","updated_at":"2026-02-10T12:36:35.051947-05:00","closed_at":"2026-02-10T12:36:35.051947-05:00","close_reason":"Implemented CLI FastAPI default normalization + regression tests","labels":["cli","gmail"]}
 {"id":"google_workspace_mcp-xt2","title":"Implement CLI mode for Workspace MCP","description":"Create a CLI mode for the Workspace MCP server, activated via --cli flag, that allows all tools to be used directly from the command line without running as an MCP server.\n\n**Goals:**\n- Add --cli startup flag to enable CLI mode\n- Expose all existing tools as CLI subcommands\n- No changes to individual tool implementations - reuse existing code\n- Lightweight and flexible design\n- Enable usage by coding agents (Codex, Claude Code) without MCP server overhead\n\n**Requirements:**\n- Parse tool name and arguments from command line\n- Route to existing tool handlers\n- Output results to stdout (JSON or human-readable)\n- Maintain same authentication/credential flow\n- Support all current tools without modification","status":"in_progress","priority":0,"issue_type":"task","owner":"tbarrettwilsdon@gmail.com","created_at":"2026-02-01T10:57:29.920078-05:00","created_by":"Taylor Wilsdon","updated_at":"2026-02-01T11:02:26.818109-05:00"}
 {"id":"google_workspace_mcp-y3j","title":"docs: add MCP registry publishing guidance for this server","status":"closed","priority":2,"issue_type":"task","owner":"tbarrettwilsdon@gmail.com","created_at":"2026-02-08T19:56:42.74673-05:00","created_by":"Taylor Wilsdon","updated_at":"2026-02-08T20:00:56.253918-05:00","closed_at":"2026-02-08T20:00:56.253918-05:00","close_reason":"Closed"}
 {"id":"google_workspace_mcp-z0a","title":"Remove deprecated create_list alias from update_paragraph_style","status":"closed","priority":2,"issue_type":"task","owner":"tbarrettwilsdon@gmail.com","created_at":"2026-02-08T18:12:22.714628-05:00","created_by":"Taylor Wilsdon","updated_at":"2026-02-08T18:13:12.931513-05:00","closed_at":"2026-02-08T18:13:12.931513-05:00","close_reason":"Closed"}

core/cli_handler.py

@@ -14,6 +14,7 @@
 """
 
 import asyncio
+import inspect
 import json
 import logging
 import sys
@@ -24,6 +25,88 @@
 logger = logging.getLogger(__name__)
 
 
+def _is_fastapi_param_marker(default: Any) -> bool:
+    """
+    Check if a default value is a FastAPI parameter marker (Body, Query, etc.).
+
+    These markers are metadata for HTTP request parsing and should not be passed
+    directly to tool functions in CLI mode.
+    """
+    default_type = type(default)
+    return default_type.__module__ == "fastapi.params" and hasattr(
+        default, "get_default"
+    )
+
+
+def _is_required_marker_default(value: Any) -> bool:
+    """Check whether a FastAPI/Pydantic default represents a required field."""
+    return value is Ellipsis or type(value).__name__ == "PydanticUndefinedType"
+
+
+def _extract_fastapi_default(default_marker: Any) -> tuple[bool, Any]:
+    """
+    Resolve the runtime default from a FastAPI marker.
+
+    Returns:
+        Tuple of (is_required, resolved_default)
+    """
+    try:
+        resolved_default = default_marker.get_default(call_default_factory=True)
+    except TypeError:
+        # Compatibility path for implementations without call_default_factory kwarg
+        resolved_default = default_marker.get_default()
+    except Exception:
+        resolved_default = getattr(default_marker, "default", inspect.Parameter.empty)
+
+    return _is_required_marker_default(resolved_default), resolved_default
+
+
+def _normalize_cli_args_for_tool(fn, args: Dict[str, Any]) -> Dict[str, Any]:
+    """
+    Fill omitted CLI args for FastAPI markers with their real defaults.
+
+    When tools are invoked via HTTP, FastAPI resolves Body/Query/... defaults.
+    In CLI mode we invoke functions directly, so we need to do that resolution.
+    """
+    normalized_args = dict(args)
+    signature = inspect.signature(fn)
+    missing_required = []
+
+    for param in signature.parameters.values():
+        if param.kind in (
+            inspect.Parameter.VAR_POSITIONAL,
+            inspect.Parameter.VAR_KEYWORD,
+        ):
+            continue
+
+        if param.name in normalized_args:
+            continue
+
+        if param.default is inspect.Parameter.empty:
+            continue
+
+        if not _is_fastapi_param_marker(param.default):
+            continue
+
+        is_required, resolved_default = _extract_fastapi_default(param.default)
+        if is_required:
+            missing_required.append(param.name)
+        else:
+            normalized_args[param.name] = resolved_default
+
+    if missing_required:
+        if len(missing_required) == 1:
+            missing = missing_required[0]
+            raise TypeError(f"{fn.__name__}() missing 1 required argument: '{missing}'")
+
+        missing = ", ".join(f"'{name}'" for name in missing_required)
+        raise TypeError(
+            f"{fn.__name__}() missing {len(missing_required)} required arguments: {missing}"
+        )
+
+    return normalized_args
+
+
 def get_registered_tools(server) -> Dict[str, Any]:
     """
     Get all registered tools from the FastMCP server.
@@ -233,14 +316,19 @@ async def run_tool(server, tool_name: str, args: Dict[str, Any]) -> str:
     if fn is None:
         raise ValueError(f"Tool '{tool_name}' has no callable function")
 
-    logger.debug(f"[CLI] Executing tool: {tool_name} with args: {list(args.keys())}")
+    call_args = dict(args)
 
     try:
+        call_args = _normalize_cli_args_for_tool(fn, args)
+        logger.debug(
+            f"[CLI] Executing tool: {tool_name} with args: {list(call_args.keys())}"
+        )
+
         # Call the tool function
         if asyncio.iscoroutinefunction(fn):
-            result = await fn(**args)
+            result = await fn(**call_args)
         else:
-            result = fn(**args)
+            result = fn(**call_args)
 
         # Convert result to string if needed
         if isinstance(result, str):
@@ -257,7 +345,7 @@ async def run_tool(server, tool_name: str, args: Dict[str, Any]) -> str:
         return (
             f"Error calling {tool_name}: {error_msg}\n\n"
             f"Required parameters: {required}\n"
-            f"Provided parameters: {list(args.keys())}"
+            f"Provided parameters: {list(call_args.keys())}"
         )
     except Exception as e:
         logger.error(f"[CLI] Error executing {tool_name}: {e}", exc_info=True)

gmail/gmail_tools.py

@@ -19,7 +19,7 @@
 from email import encoders
 from email.utils import formataddr
 
-from fastapi import Body
+from fastapi import Body as BodyParam
 from pydantic import Field
 
 from auth.service_decorator import require_google_service
@@ -989,33 +989,33 @@ async def get_gmail_attachment_content(
 async def send_gmail_message(
     service,
     user_google_email: str,
-    to: str = Body(..., description="Recipient email address."),
-    subject: str = Body(..., description="Email subject."),
-    body: str = Body(..., description="Email body content (plain text or HTML)."),
-    body_format: Literal["plain", "html"] = Body(
+    to: str = BodyParam(..., description="Recipient email address."),
+    subject: str = BodyParam(..., description="Email subject."),
+    body: str = BodyParam(..., description="Email body content (plain text or HTML)."),
+    body_format: Literal["plain", "html"] = BodyParam(
         "plain",
         description="Email body format. Use 'plain' for plaintext or 'html' for HTML content.",
     ),
-    cc: Optional[str] = Body(None, description="Optional CC email address."),
-    bcc: Optional[str] = Body(None, description="Optional BCC email address."),
-    from_name: Optional[str] = Body(
+    cc: Optional[str] = BodyParam(None, description="Optional CC email address."),
+    bcc: Optional[str] = BodyParam(None, description="Optional BCC email address."),
+    from_name: Optional[str] = BodyParam(
         None,
         description="Optional sender display name (e.g., 'Peter Hartree'). If provided, the From header will be formatted as 'Name <email>'.",
     ),
-    from_email: Optional[str] = Body(
+    from_email: Optional[str] = BodyParam(
         None,
         description="Optional 'Send As' alias email address. Must be configured in Gmail settings (Settings > Accounts > Send mail as). If not provided, uses the authenticated user's email.",
     ),
-    thread_id: Optional[str] = Body(
+    thread_id: Optional[str] = BodyParam(
         None, description="Optional Gmail thread ID to reply within."
     ),
-    in_reply_to: Optional[str] = Body(
+    in_reply_to: Optional[str] = BodyParam(
         None, description="Optional Message-ID of the message being replied to."
     ),
-    references: Optional[str] = Body(
+    references: Optional[str] = BodyParam(
         None, description="Optional chain of Message-IDs for proper threading."
     ),
-    attachments: Optional[List[Dict[str, str]]] = Body(
+    attachments: Optional[List[Dict[str, str]]] = BodyParam(
         None,
         description='Optional list of attachments. Each can have: "path" (file path, auto-encodes), OR "content" (standard base64, not urlsafe) + "filename". Optional "mime_type". Example: [{"path": "/path/to/file.pdf"}] or [{"filename": "doc.pdf", "content": "base64data", "mime_type": "application/pdf"}]',
     ),
@@ -1161,33 +1161,35 @@ async def send_gmail_message(
 async def draft_gmail_message(
     service,
     user_google_email: str,
-    subject: str = Body(..., description="Email subject."),
-    body: str = Body(..., description="Email body (plain text)."),
-    body_format: Literal["plain", "html"] = Body(
+    subject: str = BodyParam(..., description="Email subject."),
+    body: str = BodyParam(..., description="Email body (plain text)."),
+    body_format: Literal["plain", "html"] = BodyParam(
         "plain",
         description="Email body format. Use 'plain' for plaintext or 'html' for HTML content.",
     ),
-    to: Optional[str] = Body(None, description="Optional recipient email address."),
-    cc: Optional[str] = Body(None, description="Optional CC email address."),
-    bcc: Optional[str] = Body(None, description="Optional BCC email address."),
-    from_name: Optional[str] = Body(
+    to: Optional[str] = BodyParam(
+        None, description="Optional recipient email address."
+    ),
+    cc: Optional[str] = BodyParam(None, description="Optional CC email address."),
+    bcc: Optional[str] = BodyParam(None, description="Optional BCC email address."),
+    from_name: Optional[str] = BodyParam(
         None,
         description="Optional sender display name (e.g., 'Peter Hartree'). If provided, the From header will be formatted as 'Name <email>'.",
     ),
-    from_email: Optional[str] = Body(
+    from_email: Optional[str] = BodyParam(
         None,
         description="Optional 'Send As' alias email address. Must be configured in Gmail settings (Settings > Accounts > Send mail as). If not provided, uses the authenticated user's email.",
     ),
-    thread_id: Optional[str] = Body(
+    thread_id: Optional[str] = BodyParam(
         None, description="Optional Gmail thread ID to reply within."
     ),
-    in_reply_to: Optional[str] = Body(
+    in_reply_to: Optional[str] = BodyParam(
         None, description="Optional Message-ID of the message being replied to."
     ),
-    references: Optional[str] = Body(
+    references: Optional[str] = BodyParam(
         None, description="Optional chain of Message-IDs for proper threading."
     ),
-    attachments: Optional[List[Dict[str, str]]] = Body(
+    attachments: Optional[List[Dict[str, str]]] = BodyParam(
         None,
         description="Optional list of attachments. Each can have: 'path' (file path, auto-encodes), OR 'content' (standard base64, not urlsafe) + 'filename'. Optional 'mime_type' (auto-detected from path if not provided).",
     ),
@@ -1737,10 +1739,10 @@ async def list_gmail_filters(service, user_google_email: str) -> str:
 async def create_gmail_filter(
     service,
     user_google_email: str,
-    criteria: Dict[str, Any] = Body(
+    criteria: Dict[str, Any] = BodyParam(
         ..., description="Filter criteria object as defined in the Gmail API."
     ),
-    action: Dict[str, Any] = Body(
+    action: Dict[str, Any] = BodyParam(
         ..., description="Filter action object as defined in the Gmail API."
     ),
 ) -> str: