fix(mcp): include factory workspace metadata

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

Author: phernandez

src/basic_memory/mcp/project_context.py

@@ -439,9 +439,10 @@ async def _fetch_workspace_project_entries(
     )
     entries: list[WorkspaceProjectEntry] = []
     for project in project_list.projects:
-        if default_permalink and project.permalink == default_permalink:
-            project.is_default = True
-        entries.append(WorkspaceProjectEntry(workspace=workspace, project=project))
+        entry_project = project
+        if default_permalink and project.permalink == default_permalink and not project.is_default:
+            entry_project = project.model_copy(update={"is_default": True})
+        entries.append(WorkspaceProjectEntry(workspace=workspace, project=entry_project))
 
     if context:  # pragma: no cover
         await context.info(
@@ -483,6 +484,13 @@ async def _ensure_workspace_project_index(
     return index
 
 
+async def ensure_workspace_project_index(
+    context: Optional[Context] = None,
+) -> WorkspaceProjectIndex:
+    """Public wrapper for loading the session-local workspace/project lookup index."""
+    return await _ensure_workspace_project_index(context=context)
+
+
 async def resolve_workspace_project_identifier(
     project: str,
     context: Optional[Context] = None,

src/basic_memory/mcp/tools/project_management.py

@@ -14,7 +14,7 @@
 from basic_memory.mcp.async_client import get_client, get_cloud_proxy_client, is_factory_mode
 from basic_memory.mcp.project_context import (
     WorkspaceProjectEntry,
-    _ensure_workspace_project_index,
+    ensure_workspace_project_index,
     resolve_workspace_parameter,
 )
 from basic_memory.mcp.server import mcp
@@ -317,6 +317,8 @@ async def list_memory_projects(
         cloud_ws_name: str | None = None
         cloud_ws_type: str | None = None
         cloud_ws_tenant_id: str | None = None
+        cloud_ws_slug: str | None = None
+        cloud_ws_is_default = False
         try:
             from basic_memory.mcp.project_context import get_available_workspaces
 
@@ -332,6 +334,8 @@ async def list_memory_projects(
                 cloud_ws_name = matched.name
                 cloud_ws_type = matched.workspace_type
                 cloud_ws_tenant_id = matched.tenant_id
+                cloud_ws_slug = matched.slug
+                cloud_ws_is_default = matched.is_default
         except Exception:
             pass  # workspace lookup is best-effort
 
@@ -341,6 +345,8 @@ async def list_memory_projects(
             cloud_workspace_name=cloud_ws_name,
             cloud_workspace_type=cloud_ws_type,
             cloud_workspace_tenant_id=cloud_ws_tenant_id,
+            cloud_workspace_slug=cloud_ws_slug,
+            cloud_workspace_is_default=cloud_ws_is_default,
         )
         if output_format == "json":
             return _format_project_list_json(
@@ -376,7 +382,7 @@ async def list_memory_projects(
             cloud_ws_is_default = active_workspace.is_default
         else:
             try:
-                workspace_index = await _ensure_workspace_project_index(context=context)
+                workspace_index = await ensure_workspace_project_index(context=context)
                 cloud_entries = workspace_index.entries
             except Exception as exc:
                 logger.warning(

tests/mcp/test_project_context.py

@@ -6,6 +6,7 @@
 
 from __future__ import annotations
 
+from contextlib import asynccontextmanager
 from typing import Any, AsyncIterator, cast
 
 import pytest
@@ -424,6 +425,44 @@ async def fake_fetch_workspace_project_entries(workspace, context=None):
     assert calls == ["personal", "acme", "personal", "acme"]
 
 
+@pytest.mark.asyncio
+async def test_fetch_workspace_project_entries_copies_default_project(monkeypatch):
+    import basic_memory.mcp.async_client as async_client
+    from basic_memory.mcp.project_context import _fetch_workspace_project_entries
+    from basic_memory.schemas.project_info import ProjectList
+
+    workspace = _workspace(
+        tenant_id="personal-tenant",
+        workspace_type="personal",
+        slug="personal",
+        name="Personal",
+        role="owner",
+        is_default=True,
+    )
+    project = _project("Default Notes", id=3, external_id="default-notes-id")
+    project_list = ProjectList(projects=[project], default_project="Default Notes")
+
+    @asynccontextmanager
+    async def fake_get_client(*args, **kwargs) -> AsyncIterator[object]:
+        yield object()
+
+    async def fake_list_projects(self):
+        return project_list
+
+    monkeypatch.setattr(async_client, "is_factory_mode", lambda: True)
+    monkeypatch.setattr(async_client, "get_client", fake_get_client)
+    monkeypatch.setattr(
+        "basic_memory.mcp.clients.project.ProjectClient.list_projects",
+        fake_list_projects,
+    )
+
+    entries = await _fetch_workspace_project_entries(workspace)
+
+    assert project.is_default is False
+    assert entries[0].project is not project
+    assert entries[0].project.is_default is True
+
+
 @pytest.mark.asyncio
 async def test_resolve_workspace_project_identifier_handles_qualified_and_collisions(monkeypatch):
     import basic_memory.mcp.project_context as project_context

tests/mcp/test_tool_project_management.py

@@ -168,7 +168,7 @@ async def test_list_memory_projects_local_and_cloud_merge(app, test_project):
             return_value=True,
         ),
         patch(
-            "basic_memory.mcp.tools.project_management._ensure_workspace_project_index",
+            "basic_memory.mcp.tools.project_management.ensure_workspace_project_index",
             new_callable=AsyncMock,
             return_value=workspace_index,
         ),
@@ -207,7 +207,7 @@ async def test_list_memory_projects_cloud_failure_graceful(app, test_project):
             return_value=True,
         ),
         patch(
-            "basic_memory.mcp.tools.project_management._ensure_workspace_project_index",
+            "basic_memory.mcp.tools.project_management.ensure_workspace_project_index",
             new_callable=AsyncMock,
             side_effect=RuntimeError("cloud unavailable"),
         ),
@@ -283,6 +283,9 @@ async def test_list_memory_projects_factory_mode_json_includes_workspace(app, te
     assert proj["workspace_name"] == "My Org"
     assert proj["workspace_type"] == "organization"
     assert proj["workspace_tenant_id"] == "tenant-abc"
+    assert proj["workspace_slug"] == "my-org"
+    assert proj["workspace_is_default"] is False
+    assert proj["qualified_name"] == "my-org/cloud-proj"
 
 
 @pytest.mark.asyncio
@@ -374,7 +377,7 @@ async def test_list_memory_projects_json_with_cloud(app, test_project):
             return_value=True,
         ),
         patch(
-            "basic_memory.mcp.tools.project_management._ensure_workspace_project_index",
+            "basic_memory.mcp.tools.project_management.ensure_workspace_project_index",
             new_callable=AsyncMock,
             return_value=workspace_index,
         ),
@@ -566,7 +569,7 @@ async def test_list_memory_projects_aggregates_without_config_workspace(app, tes
             return_value=True,
         ),
         patch(
-            "basic_memory.mcp.tools.project_management._ensure_workspace_project_index",
+            "basic_memory.mcp.tools.project_management.ensure_workspace_project_index",
             new_callable=AsyncMock,
             return_value=workspace_index,
         ) as mock_index,