fix(mcp): use workspace provider for permalink context

Signed-off-by: phernandez <paul@basicmachines.co>

Author: phernandez

src/basic_memory/mcp/project_context.py

@@ -833,7 +833,7 @@ async def _workspace_metadata_by_tenant_id(
     tenant_id: str,
     context: Optional[Context] = None,
 ) -> WorkspaceInfo | None:
-    """Return cached workspace metadata for a configured tenant id."""
+    """Return non-index workspace metadata for a configured tenant id."""
     cached_workspace = await _get_cached_active_workspace(context)
     if cached_workspace and cached_workspace.tenant_id == tenant_id:
         return cached_workspace
@@ -845,6 +845,37 @@ async def _workspace_metadata_by_tenant_id(
         # Outcome: drop stale metadata and route without permalink decoration.
         await context.set_state("active_workspace", None)
 
+    if context:
+        cached_raw = await context.get_state("available_workspaces")
+        if isinstance(cached_raw, list):
+            for item in cached_raw:
+                if not isinstance(item, dict):
+                    continue
+                workspace = WorkspaceInfo.model_validate(item)
+                if workspace.tenant_id == tenant_id:
+                    return workspace
+
+    if _workspace_provider is not None:
+        # Trigger: the hosting runtime can provide workspace metadata directly.
+        # Why: configured workspace_id is already sufficient for tenant routing, but
+        #   canonical organization permalinks also need slug/type context.
+        # Outcome: use the injected runtime seam without loading the workspace project index.
+        workspace = next(
+            (
+                workspace
+                for workspace in await get_available_workspaces(context=context)
+                if workspace.tenant_id == tenant_id
+            ),
+            None,
+        )
+        if workspace is None:
+            raise ValueError(
+                f"Configured workspace_id '{tenant_id}' was not returned by the workspace "
+                "metadata provider. Reconfigure the project workspace or retry after "
+                "workspace metadata recovers."
+            )
+        return workspace
+
     return None
 
 

tests/mcp/test_project_context.py

@@ -1640,6 +1640,83 @@ async def fake_get_active_project(client, project_name, context=None, headers=No
         assert permalink_context.workspace_slug == "team-paul"
         assert permalink_context.workspace_type == "organization"
 
+    @pytest.mark.asyncio
+    async def test_cloud_project_workspace_id_uses_workspace_provider_for_permalink_context(
+        self, config_manager, monkeypatch
+    ):
+        """Injected workspace metadata supplies slug/type without project index discovery."""
+        from contextlib import asynccontextmanager
+
+        import basic_memory.mcp.project_context as project_context
+        from basic_memory.mcp.project_context import get_project_client
+        from basic_memory.config import ProjectEntry, ProjectMode
+        from basic_memory.schemas.project_info import ProjectItem
+        from basic_memory.workspace_context import (
+            WorkspacePermalinkContext,
+            current_workspace_permalink_context,
+        )
+
+        config = config_manager.load_config()
+        config.projects["cloud-proj"] = ProjectEntry(
+            path=str(config_manager.config_dir.parent / "cloud-proj"),
+            mode=ProjectMode.CLOUD,
+            workspace_id="per-project-tenant-id",
+        )
+        config.cloud_api_key = "bmc_test123"
+        config_manager.save_config(config)
+
+        workspace = _workspace(
+            tenant_id="per-project-tenant-id",
+            workspace_type="organization",
+            slug="team-paul",
+            name="Team Paul",
+            role="editor",
+        )
+
+        async def fake_workspace_provider():
+            return [workspace]
+
+        async def fail_ensure_workspace_project_index(context=None):  # pragma: no cover
+            raise AssertionError("Configured workspace_id should not require project discovery")
+
+        monkeypatch.setattr(project_context, "_workspace_provider", fake_workspace_provider)
+        monkeypatch.setattr(
+            project_context,
+            "_ensure_workspace_project_index",
+            fail_ensure_workspace_project_index,
+        )
+
+        seen: dict[str, object] = {}
+
+        @asynccontextmanager
+        async def fake_get_client(project_name=None, workspace=None):
+            seen["project_name"] = project_name
+            seen["workspace"] = workspace
+            seen["permalink_context"] = current_workspace_permalink_context()
+            yield object()
+
+        async def fake_get_active_project(client, project_name, context=None, headers=None):
+            return ProjectItem(
+                id=1,
+                external_id="cloud-project-id",
+                name=project_name,
+                path="/cloud-proj",
+                is_default=False,
+            )
+
+        monkeypatch.setattr("basic_memory.mcp.async_client.get_client", fake_get_client)
+        monkeypatch.setattr(project_context, "get_active_project", fake_get_active_project)
+
+        async with get_project_client(project="cloud-proj") as (_client, active_project):
+            assert active_project.external_id == "cloud-project-id"
+
+        assert seen["project_name"] == "cloud-proj"
+        assert seen["workspace"] == "per-project-tenant-id"
+        permalink_context = cast(WorkspacePermalinkContext | None, seen["permalink_context"])
+        assert permalink_context is not None
+        assert permalink_context.workspace_slug == "team-paul"
+        assert permalink_context.workspace_type == "organization"
+
     @pytest.mark.asyncio
     async def test_cloud_project_workspace_id_routes_without_discovery(
         self, config_manager, monkeypatch