fix(memory_case): remove unused tenant_id/team_id from scope system

OpenDerisk is not a SaaS multi-tenant platform. tenant_id and team_id
were designed for multi-tenant isolation but have never been used in
practice—the ContextVar always injects "default", DB data shows zero
cases with meaningful tenant/team values, and LLM agents naturally use
tags/region/application_name in case_context instead.

Removing them simplifies scope to only app_code and environment (both
default=wildcard), eliminates dead SQL/vector filter code, and makes
room for future business-semantic scope dimensions (region, tags).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: nishenghao.nsh

packages/derisk-ext/src/derisk_ext/plugin/memory_case/__init__.py

@@ -11,9 +11,7 @@
     KEY_REGION,
     KEY_RELATED_SERVICES,
     KEY_TAGS,
-    KEY_TEAM_ID,
     KEY_TELEMETRY_CHANNELS,
-    KEY_TENANT_ID,
     case_context_from_metadata,
     is_memory_search_scope_app_wildcard,
     is_memory_search_scope_env_wildcard,
@@ -69,9 +67,7 @@
     "KEY_REGION",
     "KEY_RELATED_SERVICES",
     "KEY_TAGS",
-    "KEY_TEAM_ID",
     "KEY_TELEMETRY_CHANNELS",
-    "KEY_TENANT_ID",
     "MEMORY_CASE_VECTOR_NAME",
     "MemoryCaseDao",
     "MemoryCaseEntity",

packages/derisk-ext/src/derisk_ext/plugin/memory_case/case_context.py

@@ -1,15 +1,14 @@
 """Case routing and descriptive context stored only in ``metadata_json``.
 
 **Table model:** ``derisk_plugin_memory_case`` has **no** ``app_code`` / ``environment``
-columns (nor tenant/team). Those values exist only under
+columns. Those values exist only under
 ``metadata["case_context"]`` (JSON inside ``metadata_json``).
 
 **Search narrowing (``memory_case_search``):**
-- Optional ``scope`` keys ``app_code``, ``environment``, ``tenant_id``, ``team_id`` filter
+- Optional ``scope`` keys ``app_code``, ``environment`` filter
   via ``JSON_EXTRACT(metadata_json, '$.case_context.*')`` only.
 - For ``app_code`` / ``environment``: value missing, empty, or literal ``default`` → **no**
   filter on that key (wildcard). Non-default → equality on stored ``case_context``.
-- For ``tenant_id`` / ``team_id``: only filter when present and non-empty in ``scope``.
 
 **Lexical ``query``:** FULLTEXT / LIKE over ``FULLTEXT_LEXICAL_COLUMNS`` (must match DB index).
 
@@ -37,9 +36,6 @@
 # Routing hints (optional; defaults align with tool_pack / MemoryRequestContext)
 KEY_APP_CODE = "app_code"
 KEY_ENVIRONMENT = "environment"
-KEY_TENANT_ID = "tenant_id"
-KEY_TEAM_ID = "team_id"
-
 # Descriptive / operational context (extend as needed)
 KEY_APPLICATION_NAME = "application_name"
 KEY_REGION = "region"
@@ -86,12 +82,6 @@ def scope_filters_match(metadata: Optional[Dict[str, Any]], scope: Dict[str, Any
         got_env = str(ctx.get(KEY_ENVIRONMENT) or "default").strip().lower()
         if got_env != want_env:
             return False
-    if scope.get(KEY_TENANT_ID):
-        if str(ctx.get(KEY_TENANT_ID) or "") != str(scope[KEY_TENANT_ID]):
-            return False
-    if scope.get(KEY_TEAM_ID):
-        if str(ctx.get(KEY_TEAM_ID) or "") != str(scope[KEY_TEAM_ID]):
-            return False
     return True
 
 
@@ -128,15 +118,8 @@ def is_memory_search_scope_env_wildcard(scope: Optional[Dict[str, Any]]) -> bool
 def vector_metadata_from_case(case_id: str, metadata: Optional[Dict[str, Any]]) -> Dict[str, Any]:
     """Flatten ``case_context`` for Chroma metadata filters."""
     ctx = case_context_from_metadata(metadata)
-    out: Dict[str, Any] = {
+    return {
         "case_id": case_id,
         KEY_APP_CODE: ctx.get(KEY_APP_CODE) or "default",
         KEY_ENVIRONMENT: ctx.get(KEY_ENVIRONMENT) or "default",
     }
-    tid = ctx.get(KEY_TENANT_ID)
-    if tid is not None:
-        out[KEY_TENANT_ID] = tid
-    tm = ctx.get(KEY_TEAM_ID)
-    if tm is not None:
-        out[KEY_TEAM_ID] = tm
-    return out

packages/derisk-ext/src/derisk_ext/plugin/memory_case/markdown.py

@@ -17,8 +17,6 @@ def _format_case_context(case: CandidateCase) -> str:
         "app_code",
         "environment",
         "region",
-        "tenant_id",
-        "team_id",
         "data_sources",
         "telemetry_channels",
         "related_services",

packages/derisk-ext/src/derisk_ext/plugin/memory_case/models.py

@@ -27,9 +27,7 @@ def default_case_fingerprint(data: dict) -> str:
     ctx = ctx if isinstance(ctx, dict) else {}
     env = str(ctx.get("environment") or "default").strip().lower()
     app = str(ctx.get("app_code") or "default").strip().lower()
-    tenant = str(ctx.get("tenant_id") or "").strip().lower()
-    team = str(ctx.get("team_id") or "").strip().lower()
-    blob = "|".join([tenant, team, app, env, case_id, symptom[:4000]])
+    blob = "|".join([app, env, case_id, symptom[:4000]])
     return hashlib.sha256(blob.encode("utf-8")).hexdigest()
 
 
@@ -52,7 +50,7 @@ def _normalize_metadata_scope_and_fingerprint(cls, data: Any) -> Any:
         meta = dict(d.get("metadata") or {})
         raw_ctx = meta.get(CASE_CONTEXT_KEY)
         ctx = dict(raw_ctx) if isinstance(raw_ctx, dict) else {}
-        for key in ("tenant_id", "team_id", "app_code", "environment"):
+        for key in ("app_code", "environment"):
             if key in d and d[key] is not None:
                 ctx.setdefault(key, d[key])
                 del d[key]
@@ -113,7 +111,7 @@ def _coerce_handling_path(cls, v: Any) -> str:
         default_factory=dict,
         description=(
             "Case meta: routing hints and context live under metadata['case_context'] "
-            "(app_code, environment, tenant_id, team_id, application_name, data_sources, …)."
+            "(app_code, environment, application_name, data_sources, …)."
         ),
     )
     created_at: Optional[datetime] = None
@@ -128,12 +126,6 @@ class MemoryRequestContext(BaseModel):
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
-    tenant_id: Optional[str] = Field(
-        None, description="Optional; if set, rows must match case_context.tenant_id"
-    )
-    team_id: Optional[str] = Field(
-        None, description="Optional; if set, rows must match case_context.team_id"
-    )
     app_code: str = Field(
         "default",
         description=(
@@ -156,8 +148,6 @@ class MemoryRequestContext(BaseModel):
 
     def scope_dict(self) -> Dict[str, Any]:
         return {
-            "tenant_id": self.tenant_id,
-            "team_id": self.team_id,
             "app_code": self.app_code,
             "environment": self.environment,
         }

packages/derisk-ext/src/derisk_ext/plugin/memory_case/service.py

@@ -75,8 +75,8 @@ def list_tools(self) -> List[MemoryToolSpec]:
                         "scope": {
                             "type": "object",
                             "description": (
-                                "Routing isolation ONLY (app_code/tenant_id/team_id for "
-                                "multi-tenant; environment for deploy env prod/staging). "
+                                "Routing isolation ONLY (app_code for app scope; "
+                                "environment for deploy env prod/staging). "
                                 "Cloud-vendor or region info belongs in case metadata "
                                 "(region/tags), NOT in scope. "
                                 "Omit or set to 'default' for wildcard (recommended)."
@@ -376,8 +376,6 @@ async def _find_similar_cases(
         scope = {
             "app_code": ctx.get("app_code") or "default",
             "environment": ctx.get("environment") or "default",
-            "tenant_id": ctx.get("tenant_id"),
-            "team_id": ctx.get("team_id"),
         }
         query_text = case.markdown_summary or case.symptom_summary
         if not query_text:

packages/derisk-ext/src/derisk_ext/plugin/memory_case/sqlalchemy_dao.py

@@ -94,20 +94,6 @@ def _apply_scope_sql_filters(q, scope: Dict[str, Any], dialect: str):
                     "'$.case_context.environment')),'default')) = LOWER(:__mem_env)"
                 ).bindparams(__mem_env=env),
             )
-        if scope.get("tenant_id"):
-            q = q.filter(
-                text(
-                    "JSON_UNQUOTE(JSON_EXTRACT(COALESCE(metadata_json, '{}'), "
-                    "'$.case_context.tenant_id')) = :__mem_tenant"
-                ).bindparams(__mem_tenant=scope["tenant_id"])
-            )
-        if scope.get("team_id"):
-            q = q.filter(
-                text(
-                    "JSON_UNQUOTE(JSON_EXTRACT(COALESCE(metadata_json, '{}'), "
-                    "'$.case_context.team_id')) = :__mem_team"
-                ).bindparams(__mem_team=scope["team_id"])
-            )
         return q, False
     if dialect == "sqlite":
         if not wild_app:
@@ -124,16 +110,6 @@ def _apply_scope_sql_filters(q, scope: Dict[str, Any], dialect: str):
                 )
                 == str(env).lower(),
             )
-        if scope.get("tenant_id"):
-            q = q.filter(
-                func.coalesce(func.json_extract(m, "$.case_context.tenant_id"), "")
-                == str(scope["tenant_id"])
-            )
-        if scope.get("team_id"):
-            q = q.filter(
-                func.coalesce(func.json_extract(m, "$.case_context.team_id"), "")
-                == str(scope["team_id"])
-            )
         return q, False
     logger.warning(
         "memory_case DAO: dialect %r has no JSON scope SQL; applying in-Python filter",

packages/derisk-ext/src/derisk_ext/plugin/memory_case/tests/test_vector_search.py

@@ -131,8 +131,6 @@ def _case(
     summary: str,
     env: str = "default",
     app: str = "default",
-    tenant: str = "",
-    team: str = "",
 ) -> CandidateCase:
     return CandidateCase(
         case_id=cid,
@@ -142,8 +140,6 @@ def _case(
             "case_context": {
                 "app_code": app,
                 "environment": env,
-                "tenant_id": tenant,
-                "team_id": team,
             }
         },
     )

packages/derisk-ext/src/derisk_ext/plugin/memory_case/tool_pack.py

@@ -12,8 +12,6 @@
 from .case_context import (
     KEY_APP_CODE,
     KEY_ENVIRONMENT,
-    KEY_TEAM_ID,
-    KEY_TENANT_ID,
     merge_case_context,
 )
 from .plugin_resolver import resolve_memory_case_plugin
@@ -75,10 +73,6 @@ def inject_memory_scope(
             KEY_APP_CODE: scope.get(KEY_APP_CODE, "default"),
             KEY_ENVIRONMENT: scope.get(KEY_ENVIRONMENT, "default"),
         }
-        if scope.get(KEY_TENANT_ID):
-            patch[KEY_TENANT_ID] = scope[KEY_TENANT_ID]
-        if scope.get(KEY_TEAM_ID):
-            patch[KEY_TEAM_ID] = scope[KEY_TEAM_ID]
         case_data["metadata"] = merge_case_context(
             case_data.get("metadata"), patch
         )

packages/derisk-ext/src/derisk_ext/plugin/memory_case/vector_index.py

@@ -11,8 +11,6 @@
 from .case_context import (
     KEY_APP_CODE,
     KEY_ENVIRONMENT,
-    KEY_TEAM_ID,
-    KEY_TENANT_ID,
     is_memory_search_scope_app_wildcard,
     is_memory_search_scope_env_wildcard,
     vector_metadata_from_case,
@@ -129,14 +127,6 @@ async def search(self, query: str, case_scope: dict, top_k: int) -> List[str]:
                     key=KEY_ENVIRONMENT, value=case_scope.get(KEY_ENVIRONMENT),
                 ),
             )
-        if case_scope.get(KEY_TENANT_ID):
-            fl.append(
-                MetadataFilter(key=KEY_TENANT_ID, value=case_scope.get(KEY_TENANT_ID))
-            )
-        if case_scope.get(KEY_TEAM_ID):
-            fl.append(
-                MetadataFilter(key=KEY_TEAM_ID, value=case_scope.get(KEY_TEAM_ID))
-            )
         filters = MetadataFilters(filters=fl) if fl else None
         chunks = self._vector_store.similar_search_with_scores(
             text=query, topk=top_k, score_threshold=0.0, filters=filters
@@ -159,14 +149,6 @@ async def search_with_scores(
                     key=KEY_ENVIRONMENT, value=case_scope.get(KEY_ENVIRONMENT),
                 ),
             )
-        if case_scope.get(KEY_TENANT_ID):
-            fl.append(
-                MetadataFilter(key=KEY_TENANT_ID, value=case_scope.get(KEY_TENANT_ID))
-            )
-        if case_scope.get(KEY_TEAM_ID):
-            fl.append(
-                MetadataFilter(key=KEY_TEAM_ID, value=case_scope.get(KEY_TEAM_ID))
-            )
         filters = MetadataFilters(filters=fl) if fl else None
         chunks = self._vector_store.similar_search_with_scores(
             text=query, topk=top_k, score_threshold=0.0, filters=filters