diff --git a/workspace/mcp_cli.py b/workspace/mcp_cli.py
index ccae2d4a..feea0b83 100644
--- a/workspace/mcp_cli.py
+++ b/workspace/mcp_cli.py
@@ -521,7 +521,10 @@ def main() -> None:
         for wsid, tok in workspaces:
             register_workspace_token(wsid, tok)
     except ImportError:
-        pass
+        # Older installs that don't yet ship register_workspace_token —
+        # multi-workspace resolution silently degrades to the legacy
+        # single-token path; single-workspace operators see no change.
+        logger.debug("platform_auth.register_workspace_token unavailable; skipping registry populate")
 
     # Standalone-mode register + heartbeat. Skipped via env var so an
     # in-container caller (which has its own heartbeat loop) can reuse
diff --git a/workspace/tests/test_mcp_cli_multi_workspace.py b/workspace/tests/test_mcp_cli_multi_workspace.py
index fbef22df..9ca4f434 100644
--- a/workspace/tests/test_mcp_cli_multi_workspace.py
+++ b/workspace/tests/test_mcp_cli_multi_workspace.py
@@ -8,10 +8,8 @@ breaks multi-workspace doesn't get hidden in a 1000-line test file.
 from __future__ import annotations
 
 import json
-import os
 import sys
 from pathlib import Path
-from unittest.mock import patch
 
 import pytest