DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.
Python ai-agentsai-tutorclawbotcli-tooldeepresearchinteractive-learninglearningmulti-agent-systemsrag
fix(workspace): preserve shared subagent access
XZH1240d5e29454
diff --git a/deeptutor/api/routers/knowledge.py b/deeptutor/api/routers/knowledge.pyindex 10907877e..1c5f3073b 100644--- a/deeptutor/api/routers/knowledge.py+++ b/deeptutor/api/routers/knowledge.py@@ -2765,10 +2765,15 @@ def _resource_knowledge_bases() -> list[KnowledgeBaseInfo]:@router.get("/knowledge-bases", response_model=list[KnowledgeBaseInfo])async def list_knowledge_bases():"""List all available knowledge bases with their details."""+ from deeptutor.services.workspace.context import current_workspace_idfrom deeptutor.services.workspace.knowledge import library_requestfrom deeptutor.services.workspace.resources import current_resources- if library_request.get() or current_resources().knowledge_bases is not None:+ if (+ library_request.get()+ or current_resources().knowledge_bases is not None+ or current_workspace_id()+ ):return _resource_knowledge_bases()try:manager = get_kb_manager()diff --git a/deeptutor/api/routers/subagents.py b/deeptutor/api/routers/subagents.pyindex 2c61c7883..1b631be1b 100644--- a/deeptutor/api/routers/subagents.py+++ b/deeptutor/api/routers/subagents.py@@ -24,7 +24,7 @@ from pydantic import BaseModel, Fieldfrom deeptutor.api.routers.auth import require_adminfrom deeptutor.knowledge.kb_types import SUBAGENT_KB_TYPE-from deeptutor.multi_user.knowledge_access import current_kb_manager+from deeptutor.multi_user.knowledge_access import account_kb_managerfrom deeptutor.services.rag.linked_kb import assert_path_allowedfrom deeptutor.services.subagent import (detect_all,@@ -91,7 +91,7 @@ async def sync_backend(kind: str):@router.get("/connections")async def list_connections():"""List the current user's connected subagents."""- manager = current_kb_manager()+ manager = account_kb_manager()connections = []for name in manager.list_knowledge_bases():meta = manager.get_metadata(name)@@ -135,7 +135,7 @@ async def create_connection(payload: ConnectSubagentRequest):raise HTTPException(status_code=400, detail=str(exc)) from exctry:- manager = current_kb_manager()+ manager = account_kb_manager()entry = manager.register_subagent_connection(name, agent_kind, cwd=resolved_cwd)except ValueError as exc:raise HTTPException(status_code=400, detail=str(exc)) from exc@@ -155,7 +155,7 @@ async def create_connection(payload: ConnectSubagentRequest):@router.delete("/connections/{name}")async def delete_connection(name: str):"""Disconnect a subagent (removes the pointer KB; touches no files)."""- manager = current_kb_manager()+ manager = account_kb_manager()meta = manager.get_metadata(name)if not isinstance(meta, dict) or meta.get("type") != SUBAGENT_KB_TYPE:raise HTTPException(status_code=404, detail=f"No connected subagent named {name!r}.")@@ -189,7 +189,7 @@ async def message_connection(name: str, payload: SubagentMessageRequest):if not message:raise HTTPException(status_code=400, detail="A non-empty 'message' is required.")- manager = current_kb_manager()+ manager = account_kb_manager()meta = manager.get_metadata(name)if not isinstance(meta, dict) or meta.get("type") != SUBAGENT_KB_TYPE:raise HTTPException(status_code=404, detail=f"No connected subagent named {name!r}.")diff --git a/deeptutor/multi_user/knowledge_access.py b/deeptutor/multi_user/knowledge_access.pyindex 9bdb34b7b..35b930f6c 100644--- a/deeptutor/multi_user/knowledge_access.py+++ b/deeptutor/multi_user/knowledge_access.py@@ -8,6 +8,7 @@ from typing import Anyfrom fastapi import HTTPException+from deeptutor.knowledge.kb_types import SUBAGENT_KB_TYPEfrom deeptutor.knowledge.manager import KnowledgeBaseManagerfrom deeptutor.knowledge.manifest import (MANIFEST_NOTE_LIMIT,@@ -19,7 +20,7 @@ from deeptutor.knowledge.manifest import (from .context import get_current_userfrom .grants import load_grantfrom .models import KnowledgeResource-from .paths import get_admin_path_service, get_current_path_service+from .paths import get_account_path_service, get_admin_path_service, get_current_path_serviceADMIN_PREFIX = "admin:kb:"USER_PREFIX = "user:kb:"@@ -48,6 +49,12 @@ def current_kb_manager() -> KnowledgeBaseManager:return _manager_for(str(current_kb_base_dir().resolve()))+def account_kb_manager() -> KnowledgeBaseManager:+ """The account library, even when the request is workspace-scoped."""+ paths = get_account_path_service()+ return _manager_for(str(paths.get_knowledge_bases_root().resolve()))++def admin_kb_manager() -> KnowledgeBaseManager:return _manager_for(str(admin_kb_base_dir().resolve()))@@ -228,10 +235,13 @@ def list_visible_knowledge_bases() -> list[dict[str, Any]]:if (parsed := parse_kb_id(old_id)) is not None and parsed[0] == origin}if not moved_refs:- return own+ return _with_account_subagents(own, origin=origin)catalog = {item["id"]: item for item in knowledge_catalog()}existing = {item["id"] for item in own}- return own + [catalog[rid] for rid in sorted(moved_refs - existing) if rid in catalog]+ return _with_account_subagents(+ own + [catalog[rid] for rid in sorted(moved_refs - existing) if rid in catalog],+ origin=origin,+ )catalog = {item["id"]: item for item in knowledge_catalog()}return [catalog[rid]@@ -240,6 +250,38 @@ def list_visible_knowledge_bases() -> list[dict[str, Any]]:]+def _with_account_subagents(items: list[dict[str, Any]], *, origin: str) -> list[dict[str, Any]]:+ """Add account-level agent connectors while preserving KB isolation.++ Connected agents are live delegates rather than document catalogs. They are+ shared with every workspace in inherit mode, while an explicit workspace KB+ selection remains authoritative.+ """+ if not origin:+ return items+ existing = {item["id"] for item in items}+ result = list(items)+ manager = account_kb_manager()+ for name in manager.list_knowledge_bases():+ meta = manager.get_metadata(name)+ if not isinstance(meta, dict) or meta.get("type") != SUBAGENT_KB_TYPE:+ continue+ rid = f"account:kb:{name}"+ if rid in existing:+ continue+ result.append(+ {+ "id": rid,+ "name": name,+ "source": "admin" if get_current_user().is_admin else "user",+ "assigned": False,+ "read_only": False,+ "provenance_label": "Account library",+ }+ )+ return result++def _list_visible_knowledge_bases() -> list[dict[str, Any]]:user = get_current_user()manager = current_kb_manager()diff --git a/tests/api/test_subagents_router.py b/tests/api/test_subagents_router.pyindex be9d2ad1c..29fc8e1ed 100644--- a/tests/api/test_subagents_router.py+++ b/tests/api/test_subagents_router.py@@ -64,7 +64,7 @@ class _FakeKBManager:@pytest.fixturedef client(monkeypatch, tmp_path):manager = _FakeKBManager()- monkeypatch.setattr(subagents_module, "current_kb_manager", lambda: manager)+ monkeypatch.setattr(subagents_module, "account_kb_manager", lambda: manager)monkeypatch.setattr(subagents_module,"list_backend_kinds",@@ -122,6 +122,25 @@ def test_connect_list_and_disconnect_roundtrip(client):assert client.get("/api/subagents/connections").json()["connections"] == []+def test_connections_stay_in_account_library_inside_workspace(client, monkeypatch, tmp_path):+ def fail_current_manager():+ raise AssertionError("connected agents must not use the workspace KB store")++ monkeypatch.setattr(subagents_module, "current_kb_manager", fail_current_manager, raising=False)+ from deeptutor.services.workspace.context import WorkspaceScope, workspace_context++ scope = WorkspaceScope("ws-research", tmp_path, tmp_path / "workspace")+ with workspace_context(scope):+ created = client.post(+ "/api/subagents/connections",+ json={"name": "WorkspaceClaude", "agent_kind": "claude_code"},+ )++ assert created.status_code == 200+ listed = client.get("/api/subagents/connections").json()["connections"]+ assert [item["name"] for item in listed] == ["WorkspaceClaude"]++def test_connect_rejects_unknown_kind(client):res = client.post("/api/subagents/connections",diff --git a/tests/multi_user/test_workspace_resources.py b/tests/multi_user/test_workspace_resources.pyindex e51ab0f52..21de5405c 100644--- a/tests/multi_user/test_workspace_resources.py+++ b/tests/multi_user/test_workspace_resources.py@@ -109,6 +109,30 @@ def test_knowledge_origins_selection_and_grants(as_user):)+def test_inherited_workspace_keeps_account_subagents_without_sharing_kbs(as_user):+ with as_user("alice"):+ account_manager = current_kb_manager()+ account_manager.register_connected_entry(+ "notes", {"type": "obsidian", "vault_path": "/unused"}+ )+ account_manager.register_subagent_connection("my-agent", "codex")++ workspace = ContentWorkspaceService().create_workspace("Research")+ with workspace_context(workspace["workspace_id"]):+ assert [item["id"] for item in list_visible_knowledge_bases()] == [+ "account:kb:my-agent"+ ]+ assert resolve_kb("account:kb:my-agent").name == "my-agent"++ ContentWorkspaceService().update_workspace(+ workspace["workspace_id"], resources={"knowledge_bases": []}+ )+ with workspace_context(workspace["workspace_id"]):+ assert list_visible_knowledge_bases() == []+ with pytest.raises(HTTPException):+ resolve_kb("account:kb:my-agent")++def test_explicit_learning_sources_allow_reads_without_changing_workspace_or_write_access(as_user):from deeptutor.services.workspace.context import current_workspace_idfrom deeptutor.services.workspace.knowledge import learning_source_access