Skip to content

Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.

fix(retrieval): preserve explicit session search context scope (#5549)

Evoee2bb95e7525
diff --git a/openviking/server/mcp_endpoint.py b/openviking/server/mcp_endpoint.py
index 4d4eb8c9d..c9a8b377b 100644
--- a/openviking/server/mcp_endpoint.py
+++ b/openviking/server/mcp_endpoint.py
@@ -648,6 +648,7 @@ async def search(
limit=limit,
score_threshold=0.35 if min_score is None else min_score,
filter=context_filter,
+ context_types=[ContextType(value) for value in resolve_context_types(context_type)],
level=level,
events_time_decay_protection=events_time_decay_protection,
)
diff --git a/openviking/server/routers/search.py b/openviking/server/routers/search.py
index 49d448f3a..6f292907c 100644
--- a/openviking/server/routers/search.py
+++ b/openviking/server/routers/search.py
@@ -42,10 +42,12 @@ from openviking.utils.search_filters import (
SearchContextTypeInput,
_resolve_levels,
merge_search_filter,
+ resolve_context_types,
)
from openviking.utils.tags import build_search_tags_filter
from openviking.utils.time_decay import validate_event_time_decay_request
from openviking_cli.exceptions import InvalidArgumentError, NotFoundError
+from openviking_cli.retrieve import ContextType
def _sanitize_floats(obj: Any) -> Any:
@@ -516,6 +518,9 @@ async def search(
limit=actual_limit,
score_threshold=request.score_threshold,
filter=effective_filter,
+ context_types=[
+ ContextType(value) for value in resolve_context_types(request.context_type)
+ ],
level=_resolve_levels(request.level) or None,
image_url=resolved_image_url,
events_time_decay_protection=request.events_time_decay_protection,
diff --git a/openviking/service/search_service.py b/openviking/service/search_service.py
index 1d8acb96f..8d7c8cb70 100644
--- a/openviking/service/search_service.py
+++ b/openviking/service/search_service.py
@@ -18,6 +18,7 @@ from openviking.utils.image_search import (
is_viking_uri,
)
from openviking_cli.exceptions import InvalidArgumentError, NotInitializedError
+from openviking_cli.retrieve import ContextType
from openviking_cli.utils import get_logger
if TYPE_CHECKING:
@@ -117,6 +118,7 @@ class SearchService:
image_url: Optional[str] = None,
events_time_decay_protection: Optional[str] = None,
search_type: SearchType = "semantic",
+ context_types: Optional[List[ContextType]] = None,
) -> Any:
"""Search with session context.
@@ -157,6 +159,7 @@ class SearchService:
image_url=resolved_image_url,
events_time_decay_protection=events_time_decay_protection,
search_type=search_type,
+ context_types=context_types,
)
return result
diff --git a/openviking/storage/viking_fs/_semantic.py b/openviking/storage/viking_fs/_semantic.py
index 77a97cde7..f6cb87159 100644
--- a/openviking/storage/viking_fs/_semantic.py
+++ b/openviking/storage/viking_fs/_semantic.py
@@ -28,6 +28,7 @@ from openviking.telemetry import get_current_telemetry
from openviking.utils.image_search import build_multimodal_embedding_input
from openviking.utils.time_decay import parse_duration_ms
from openviking_cli.exceptions import InvalidArgumentError, NotFoundError
+from openviking_cli.retrieve import ContextType
class _SemanticMixin:
@@ -402,6 +403,7 @@ class _SemanticMixin:
image_url: Optional[str] = None,
events_time_decay_protection: Optional[str] = None,
search_type: SearchType = "semantic",
+ context_types: Optional[List[ContextType]] = None,
):
"""Complex search with session context.
@@ -427,7 +429,6 @@ class _SemanticMixin:
from openviking.retrieve.hierarchical_retriever import HierarchicalRetriever
from openviking.retrieve.intent_analyzer import IntentAnalyzer
from openviking_cli.retrieve import (
- ContextType,
FindResult,
QueryPlan,
TypedQuery,
@@ -479,20 +480,27 @@ class _SemanticMixin:
)
analyzer = IntentAnalyzer(
max_recent_messages=5,
- query_planner=await self._vlm_resolver.get_query_planner(
- real_ctx.account_id
- ),
+ query_planner=await self._vlm_resolver.get_query_planner(real_ctx.account_id),
)
with telemetry.measure("search.intent_analysis"):
query_plan = await analyzer.analyze(
compression_summary=session_summary or "",
messages=current_messages or [],
current_message=query,
+ context_type=context_types[0]
+ if context_types and len(context_types) == 1
+ else None,
target_abstract=target_abstract,
)
typed_queries = query_plan.queries
for tq in typed_queries:
tq.target_directories = retrieval_targets.target_directories
+ # Caller scope is authoritative even when the planner ignores its prompt.
+ if context_types and len(context_types) == 1:
+ tq.context_type = context_types[0]
+ elif context_types and tq.context_type not in context_types:
+ # The existing scope filter searches only the caller's allowed types.
+ tq.context_type = None
else:
# No session context, or intent disabled: search with the raw query.
typed_queries = [
diff --git a/tests/misc/test_retrieval_enable_intent.py b/tests/misc/test_retrieval_enable_intent.py
index 03317a878..0d7c3639f 100644
--- a/tests/misc/test_retrieval_enable_intent.py
+++ b/tests/misc/test_retrieval_enable_intent.py
@@ -2,6 +2,8 @@
# SPDX-License-Identifier: AGPL-3.0
import contextvars
+import json
+from types import SimpleNamespace
from unittest.mock import AsyncMock, MagicMock
import pytest
@@ -108,9 +110,7 @@ async def test_search_service_skips_session_context_when_intent_disabled():
from openviking.service.search_service import SearchService
fs = _make_viking_fs(enable_intent=False)
- fs.search = AsyncMock(
- return_value=MagicMock(name="find_result", query_plan=None, total=0)
- )
+ fs.search = AsyncMock(return_value=MagicMock(name="find_result", query_plan=None, total=0))
session = MagicMock()
session.get_context_for_search = AsyncMock(
side_effect=AssertionError("must not scan session when intent disabled")
@@ -128,9 +128,7 @@ async def test_search_service_loads_session_context_when_intent_enabled():
from openviking.service.search_service import SearchService
fs = _make_viking_fs(enable_intent=True)
- fs.search = AsyncMock(
- return_value=MagicMock(name="find_result", query_plan=None, total=0)
- )
+ fs.search = AsyncMock(return_value=MagicMock(name="find_result", query_plan=None, total=0))
session_info = {"latest_archive_overview": "ov", "current_messages": []}
session = MagicMock()
session.get_context_for_search = AsyncMock(return_value=session_info)
@@ -140,3 +138,65 @@ async def test_search_service_loads_session_context_when_intent_enabled():
session.get_context_for_search.assert_awaited_once()
assert fs.search.await_args.kwargs.get("session_info") is session_info
+
+
+ ("scope", "planned", "expected"),
+ [
+ ("memory", "resource", "memory"),
+ (["memory"], "skill", "memory"),
+ ("resource", "memory", "resource"),
+ (["memory", "resource"], "memory", "memory"),
+ (["memory", "resource"], "skill", None),
+ (None, "skill", "skill"),
+ ],
+)
+async def test_session_search_plan_respects_explicit_context_scope(
+ monkeypatch, scope, planned, expected
+):
+ # #5544: planner classification must not contradict the caller's REST scope.
+ from starlette.requests import Request
+
+ from openviking.server.routers import search as search_router
+ from openviking.service.search_service import SearchService
+
+ fs = _make_viking_fs(enable_intent=True)
+ planner = SimpleNamespace(
+ get_completion_async=AsyncMock(
+ return_value=json.dumps(
+ {"queries": [{"query": "known record", "context_type": planned}]}
+ )
+ )
+ )
+ fs._vlm_resolver = SimpleNamespace(get_query_planner=AsyncMock(return_value=planner))
+ session = SimpleNamespace(
+ load=AsyncMock(),
+ get_context_for_search=AsyncMock(
+ return_value={"latest_archive_overview": "previous discussion"}
+ ),
+ )
+ service = SimpleNamespace(
+ search=SearchService(fs),
+ sessions=SimpleNamespace(session=lambda *args: session),
+ )
+
+ class FakeRetriever:
+ def __init__(self, **kwargs):
+ pass
+
+ async def retrieve(self, typed_query, **kwargs):
+ return QueryResult(query=typed_query, matched_contexts=[], searched_directories=[])
+
+ monkeypatch.setattr(search_router, "get_service", lambda: service)
+ monkeypatch.setattr(
+ "openviking.retrieve.hierarchical_retriever.HierarchicalRetriever", FakeRetriever
+ )
+ response = await search_router.search(
+ search_router.SearchRequest(query="known record", session_id="fixture", context_type=scope),
+ Request({"type": "http"}),
+ _ctx(),
+ )
+
+ assert response["status"] == "ok"
+ assert response["result"]["query_plan"]["queries"][0]["context_type"] == expected