fix(cli): stop workspace-cli from silently stripping quotes on string args

auth/oauth_callback_server.py

@@ -299,6 +299,10 @@ def run_server():
                     port=self.port,
                     log_level="warning",
                     access_log=False,
+                    # Match FastMCP's own uvicorn config: uvicorn's "auto"
+                    # default resolves to the deprecated legacy-websockets
+                    # implementation whenever `websockets` is installed.
+                    ws="websockets-sansio",
                 )
                 self.server = uvicorn.Server(config)
                 asyncio.run(self.server.serve())

core/cli.py

@@ -68,6 +68,20 @@ def _build_oauth() -> OAuth:
     return OAuth(token_storage=storage)
 
 
+def _coerce_cli_value(value: str) -> Any:
+    """Parse a CLI value as JSON, but keep the raw text whenever it is a string.
+
+    ``max_results=5`` still becomes ``int(5)``, while a quoted value such as
+    ``query='"grow therapy"'`` keeps its quotes instead of being unwrapped into
+    ``grow therapy``, which would break Gmail phrase matching.
+    """
+    try:
+        parsed = json.loads(value)
+    except json.JSONDecodeError:
+        return value
+    return value if isinstance(parsed, str) else parsed
+
+
 async def _list_tools(url: str) -> None:
     """Connect, authenticate once, and print available tools."""
     try:
@@ -97,10 +111,7 @@ async def _call_tool(url: str, tool_name: str, raw_args: list[str]) -> None:
             print(f"Error: argument '{arg}' must be in key=value form", file=sys.stderr)
             sys.exit(1)
         k, v = arg.split("=", 1)
-        try:
-            kwargs[k] = json.loads(v)
-        except json.JSONDecodeError:
-            kwargs[k] = v
+        kwargs[k] = _coerce_cli_value(v)
 
     async with Client(url, auth=_build_oauth()) as client:
         result = await client.call_tool(tool_name, kwargs)

main.py

@@ -926,7 +926,14 @@ async def _run_dual() -> None:
                     if http_available:
                         app = server.http_app(path="/mcp")
                         config = uvicorn.Config(
-                            app, host=http_host, port=http_port, log_level="warning"
+                            app,
+                            host=http_host,
+                            port=http_port,
+                            log_level="warning",
+                            # Match FastMCP's own uvicorn config: uvicorn's "auto"
+                            # default resolves to the deprecated legacy-websockets
+                            # implementation whenever `websockets` is installed.
+                            ws="websockets-sansio",
                         )
                         http_srv = uvicorn.Server(config)
                         http_task = asyncio.create_task(http_srv.serve())

pyproject.toml

@@ -84,6 +84,7 @@ test = [
     "opentelemetry-sdk>=1.20.0",
     "opentelemetry-exporter-otlp>=1.20.0",
     "requests>=2.32.3",
+    "httpx2>=2.0.0",
 ]
 release = [
     "tomlkit>=0.13.3",
@@ -96,6 +97,7 @@ dev = [
     "opentelemetry-sdk>=1.20.0",
     "opentelemetry-exporter-otlp>=1.20.0",
     "requests>=2.32.3",
+    "httpx2>=2.0.0",
     "ruff>=0.15.22,<0.16",
     "tomlkit>=0.13.3",
     "twine>=5.0.0",
@@ -115,6 +117,7 @@ test = [
     "opentelemetry-sdk>=1.20.0",
     "opentelemetry-exporter-otlp>=1.20.0",
     "requests>=2.32.3",
+    "httpx2>=2.0.0",
 ]
 release = [
     "tomlkit>=0.13.3",
@@ -127,6 +130,7 @@ dev = [
     "opentelemetry-sdk>=1.20.0",
     "opentelemetry-exporter-otlp>=1.20.0",
     "requests>=2.32.3",
+    "httpx2>=2.0.0",
     "ruff>=0.15.22,<0.16",
     "tomlkit>=0.13.3",
     "twine>=5.0.0",

tests/core/test_cli_value_coercion.py

@@ -0,0 +1,39 @@
+"""Tests for workspace-cli key=value argument coercion."""
+
+import pytest
+
+from core.cli import _coerce_cli_value
+
+
+@pytest.mark.parametrize(
+    "raw, expected",
+    [
+        ("is:unread", "is:unread"),
+        ("gmail drive calendar", "gmail drive calendar"),
+        # Quotes must survive for Gmail phrase queries.
+        ('"grow therapy"', '"grow therapy"'),
+        ('"grow therapy" newer_than:15mo', '"grow therapy" newer_than:15mo'),
+        ("2026/04/16", "2026/04/16"),
+        ("", ""),
+    ],
+)
+def test_strings_are_preserved_verbatim(raw, expected):
+    assert _coerce_cli_value(raw) == expected
+
+
+@pytest.mark.parametrize(
+    "raw, expected",
+    [
+        ("3", 3),
+        ("-2", -2),
+        ("3.5", 3.5),
+        ("true", True),
+        ("false", False),
+        ("null", None),
+        ('["a", "b"]', ["a", "b"]),
+        ('[["a", "b"]]', [["a", "b"]]),
+        ('{"k": 1}', {"k": 1}),
+    ],
+)
+def test_json_like_values_are_coerced(raw, expected):
+    assert _coerce_cli_value(raw) == expected