fix: address PR review — fix broken test and add workspace coverage

- Fix fake_project_exists and fake_get_client signatures in upload routing test
- Add config_manager fixture to upload routing test
- Add tests for get_cloud_control_plane_client with workspace header
- Add tests for get_client auto-resolving workspace from project config and default_workspace
- Add tests for explicit workspace overriding config
- Add tests for _workspace_headers helper and cloud_utils workspace passing
- Add missing docstring for workspace param in fetch_cloud_projects

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Drew Cain <groksrc@gmail.com>

Author: groksrc

src/basic_memory/cli/commands/cloud/cloud_utils.py

@@ -30,6 +30,9 @@ async def fetch_cloud_projects(
 ) -> CloudProjectList:
     """Fetch list of projects from cloud API.
 
+    Args:
+        workspace: Cloud workspace tenant_id to list projects from
+
     Returns:
         CloudProjectList with projects from cloud
     """

tests/cli/cloud/test_cloud_api_client_and_utils.py

@@ -10,6 +10,7 @@
     make_api_request,
 )
 from basic_memory.cli.commands.cloud.cloud_utils import (
+    _workspace_headers,
     create_cloud_project,
     fetch_cloud_projects,
     project_exists,
@@ -165,6 +166,81 @@ async def api_request(**kwargs):
     assert seen["create_payload"]["path"] == "my-project"
 
 
+def test_workspace_headers_with_workspace():
+    """_workspace_headers returns X-Workspace-ID when workspace is provided."""
+    assert _workspace_headers("tenant-123") == {"X-Workspace-ID": "tenant-123"}
+
+
+def test_workspace_headers_without_workspace():
+    """_workspace_headers returns empty dict when no workspace."""
+    assert _workspace_headers(None) == {}
+    assert _workspace_headers() == {}
+
+
+@pytest.mark.asyncio
+async def test_cloud_utils_pass_workspace_header(config_home, config_manager):
+    """fetch_cloud_projects, project_exists, and create_cloud_project pass workspace header."""
+    config = config_manager.load_config()
+    config.cloud_host = "https://cloud.example.test"
+    config_manager.save_config(config)
+
+    auth = CLIAuth(client_id="cid", authkit_domain="https://auth.example.test")
+    auth.token_file.parent.mkdir(parents=True, exist_ok=True)
+    auth.token_file.write_text(
+        '{"access_token":"token-123","refresh_token":null,"expires_at":9999999999,"token_type":"Bearer"}',
+        encoding="utf-8",
+    )
+
+    seen_headers: list[dict] = []
+
+    async def handler(request: httpx.Request) -> httpx.Response:
+        seen_headers.append(dict(request.headers))
+        if request.method == "GET":
+            return httpx.Response(200, json={"projects": []})
+        if request.method == "POST":
+            payload = json.loads(request.content.decode("utf-8"))
+            return httpx.Response(
+                200,
+                json={
+                    "message": "created",
+                    "status": "success",
+                    "default": False,
+                    "old_project": None,
+                    "new_project": {"name": payload["name"], "path": payload["path"]},
+                },
+            )
+        raise AssertionError(f"Unexpected: {request.method}")
+
+    transport = httpx.MockTransport(handler)
+
+    @asynccontextmanager
+    async def http_client_factory():
+        async with httpx.AsyncClient(
+            transport=transport, base_url="https://cloud.example.test"
+        ) as client:
+            yield client
+
+    async def api_request(**kwargs):
+        return await make_api_request(auth=auth, http_client_factory=http_client_factory, **kwargs)
+
+    # fetch with workspace
+    await fetch_cloud_projects(workspace="tenant-abc", api_request=api_request)
+    assert seen_headers[-1].get("x-workspace-id") == "tenant-abc"
+
+    # project_exists with workspace
+    await project_exists("test", workspace="tenant-abc", api_request=api_request)
+    assert seen_headers[-1].get("x-workspace-id") == "tenant-abc"
+
+    # create with workspace
+    await create_cloud_project("new-proj", workspace="tenant-abc", api_request=api_request)
+    assert seen_headers[-1].get("x-workspace-id") == "tenant-abc"
+
+    # Without workspace — header should not be present
+    seen_headers.clear()
+    await fetch_cloud_projects(api_request=api_request)
+    assert "x-workspace-id" not in seen_headers[-1]
+
+
 @pytest.mark.asyncio
 async def test_make_api_request_prefers_api_key_over_oauth(config_home, config_manager):
     """API key in config should be used without needing an OAuth token on disk."""

tests/cli/cloud/test_upload_command_routing.py

@@ -10,7 +10,7 @@
 runner = CliRunner()
 
 
-def test_cloud_upload_uses_control_plane_client(monkeypatch, tmp_path):
+def test_cloud_upload_uses_control_plane_client(monkeypatch, tmp_path, config_manager):
     """Upload command should use control-plane cloud client for WebDAV PUT operations."""
     import basic_memory.cli.commands.cloud.upload_command as upload_command
 
@@ -20,11 +20,11 @@ def test_cloud_upload_uses_control_plane_client(monkeypatch, tmp_path):
 
     seen: dict[str, str] = {}
 
-    async def fake_project_exists(_project_name: str) -> bool:
+    async def fake_project_exists(_project_name: str, workspace: str | None = None) -> bool:
         return True
 
     @asynccontextmanager
-    async def fake_get_client():
+    async def fake_get_client(workspace=None):
         async with httpx.AsyncClient(base_url="https://cloud.example.test") as client:
             yield client
 

tests/mcp/test_async_client_modes.py

@@ -274,6 +274,64 @@ async def test_get_cloud_control_plane_client_uses_oauth_token(config_manager):
         assert client.headers.get("Authorization") == "Bearer oauth-control-123"
 
 
+@pytest.mark.asyncio
+async def test_get_cloud_control_plane_client_with_workspace(config_manager):
+    """Control plane client passes X-Workspace-ID header when workspace is provided."""
+    cfg = config_manager.load_config()
+    cfg.cloud_host = "https://cloud.example.test"
+    cfg.cloud_api_key = "bmc_test_key_123"
+    config_manager.save_config(cfg)
+
+    async with get_cloud_control_plane_client(workspace="tenant-abc") as client:
+        assert client.headers.get("X-Workspace-ID") == "tenant-abc"
+
+    # Without workspace, header should not be present
+    async with get_cloud_control_plane_client() as client:
+        assert "X-Workspace-ID" not in client.headers
+
+
+@pytest.mark.asyncio
+async def test_get_client_auto_resolves_workspace_from_project_config(config_manager):
+    """get_client resolves workspace from project entry when not explicitly passed."""
+    cfg = config_manager.load_config()
+    cfg.cloud_host = "https://cloud.example.test"
+    cfg.cloud_api_key = "bmc_test_key_123"
+    cfg.set_project_mode("research", ProjectMode.CLOUD)
+    cfg.projects["research"].workspace_id = "tenant-from-config"
+    config_manager.save_config(cfg)
+
+    async with get_client(project_name="research") as client:
+        assert client.headers.get("X-Workspace-ID") == "tenant-from-config"
+
+
+@pytest.mark.asyncio
+async def test_get_client_auto_resolves_workspace_from_default(config_manager):
+    """get_client falls back to default_workspace when project has no workspace_id."""
+    cfg = config_manager.load_config()
+    cfg.cloud_host = "https://cloud.example.test"
+    cfg.cloud_api_key = "bmc_test_key_123"
+    cfg.set_project_mode("research", ProjectMode.CLOUD)
+    cfg.default_workspace = "default-tenant-456"
+    config_manager.save_config(cfg)
+
+    async with get_client(project_name="research") as client:
+        assert client.headers.get("X-Workspace-ID") == "default-tenant-456"
+
+
+@pytest.mark.asyncio
+async def test_get_client_explicit_workspace_overrides_config(config_manager):
+    """Explicit workspace param takes priority over project config."""
+    cfg = config_manager.load_config()
+    cfg.cloud_host = "https://cloud.example.test"
+    cfg.cloud_api_key = "bmc_test_key_123"
+    cfg.set_project_mode("research", ProjectMode.CLOUD)
+    cfg.projects["research"].workspace_id = "tenant-from-config"
+    config_manager.save_config(cfg)
+
+    async with get_client(project_name="research", workspace="explicit-tenant") as client:
+        assert client.headers.get("X-Workspace-ID") == "explicit-tenant"
+
+
 @pytest.mark.asyncio
 async def test_get_cloud_control_plane_client_raises_without_credentials(config_manager):
     cfg = config_manager.load_config()