ummaya 0.2.0 → 0.2.2

package/src/ummaya/tools/executor.py

@@ -90,6 +90,44 @@ def _classify_adapter_exception(exc: Exception) -> tuple[LookupErrorReason, bool
     return (LookupErrorReason.upstream_unavailable, True)
 
 
+def _adapter_validation_recovery_hint(tool_id: str) -> str:
+    """Return adapter-specific recovery text for model-visible validation errors."""
+    if tool_id == "kma_current_observation":
+        return (
+            " LOCATE FIRST: use a coordinate-producing locate adapter that returns"
+            " KMA nx/ny, then call kma_current_observation with params"
+            " {base_date, base_time, nx, ny}. Use the current KST session context"
+            " for base_date (YYYYMMDD) and the latest available observation hour"
+            " for base_time (HH00). Copy nx/ny exactly from the locate result."
+        )
+    if tool_id == "kma_forecast_fetch":
+        return (
+            " LOCATE FIRST: use a coordinate-producing locate adapter that returns"
+            " WGS-84 lat/lon, then call kma_forecast_fetch with params"
+            " {lat, lon, base_date, base_time}. Do NOT pass nx/ny, x/y, or"
+            " administrative code; this adapter converts lat/lon to the KMA grid"
+            " internally. Use the current KST session context and the nearest"
+            " valid KMA forecast base slot for base_date/base_time."
+        )
+    if tool_id == "hira_hospital_search":
+        return (
+            " LOCATE FIRST: use a coordinate-producing locate adapter, then call"
+            " hira_hospital_search with params {xPos:<exact lon>, yPos:<exact lat>,"
+            " radius:<meters>}. Copy decimal WGS-84 coordinates exactly from the"
+            " locate result; do NOT round to whole degrees. For 응급실/야간 응급실,"
+            " prefer nmc_emergency_search when authenticated, or a location POI"
+            " search when no authenticated NMC session is present."
+        )
+    if tool_id in {"kakao_coord_to_region", "sgis_adm_cd_lookup"}:
+        return (
+            " COPY EXACT COORDINATES: call this reverse-geocode adapter with"
+            " {lat:<exact decimal lat>, lon:<exact decimal lon>} copied from the"
+            " previous locate result. Do NOT round decimal WGS-84 coordinates"
+            " to whole degrees."
+        )
+    return ""
+
+
 def _is_lookup_envelope_dict(value: dict[str, Any]) -> bool:
     """Return True when an adapter already emitted a LookupOutput-shaped envelope."""
     kind = value.get("kind")
@@ -218,14 +256,20 @@ class ToolExecutor:
         except ValidationError as exc:
             field_paths = [".".join(str(p) for p in e["loc"]) for e in exc.errors()]
             field_summary = ", ".join(field_paths) if field_paths else "(no field info)"
+            error_messages = "; ".join(str(e.get("msg", "")) for e in exc.errors() if e.get("msg"))
+            recovery_hint = _adapter_validation_recovery_hint(tool_id)
+            fallback_hint = (
+                "Read this adapter's input_schema in <available_adapters> and retry "
+                "with the exact field names."
+            )
             return make_error_envelope(
                 tool_id=tool_id,
                 reason=LookupErrorReason.invalid_params,
                 message=(
                     f"Invalid parameters for tool {tool_id!r}. "
                     f"Missing or invalid fields: {field_summary}. "
-                    "Read this adapter's input_schema in <available_adapters> and retry "
-                    "with the exact field names."
+                    f"{error_messages}. "
+                    f"{recovery_hint or fallback_hint}"
                 ),
                 request_id=request_id,
                 elapsed_ms=_elapsed(),
@@ -433,8 +477,8 @@ class ToolExecutor:
                 fp.split(".")[-1] in coord_fields or fp.split(".")[-1] in admcd_fields
                 for fp in field_paths
             )
-            recovery_hint = ""
-            if tool_id == "nmc_emergency_search":
+            recovery_hint = _adapter_validation_recovery_hint(tool_id)
+            if not recovery_hint and tool_id == "nmc_emergency_search":
                 recovery_hint = (
                     " LOCATE FIRST: call locate with a locate adapter from"
                     " <available_adapters>. For a named place use"
@@ -443,9 +487,11 @@ class ToolExecutor:
                     " params:{lat:<lat>, lon:<lon>}}). Re-invoke this tool with"
                     " params {mode:'region', q0:region.region_1depth_name,"
                     " q1:region.region_2depth_name, origin_lat:<lat>, origin_lon:<lon>,"
-                    " limit:<N>}. Do NOT guess coordinates or invent NMC filters such as QZ."
+                    " limit:<N>}. Copy decimal WGS-84 coordinates exactly from locate;"
+                    " do NOT round, guess coordinates, or set QN unless the citizen"
+                    " gave a specific institution name."
                 )
-            elif need_resolve:
+            elif not recovery_hint and need_resolve:
                 recovery_hint = (
                     " LOCATE FIRST: call locate with the appropriate locate adapter"
                     " from <available_adapters> to obtain the missing coordinates /"

package/src/ummaya/tools/hira/hospital_search.py

@@ -39,7 +39,7 @@ from datetime import UTC, datetime
 from typing import Any
 
 import httpx
-from pydantic import BaseModel, ConfigDict, Field, RootModel, field_validator
+from pydantic import BaseModel, ConfigDict, Field, RootModel, field_validator, model_validator
 
 from ummaya.tools._description_template import build_description_v4
 from ummaya.tools._outbound_trace import traced_async_client
@@ -481,6 +481,16 @@ class HiraHospitalSearchInput(BaseModel):
             f"(e.g. {valid_examples}) or a 2-digit clCd."
         )
 
+    @model_validator(mode="after")
+    def _reject_rounded_coordinate_pair(self) -> HiraHospitalSearchInput:
+        """Reject whole-degree coordinate pairs that lost locate precision."""
+        if float(self.xPos).is_integer() and float(self.yPos).is_integer():
+            raise ValueError(
+                "xPos/yPos must preserve decimal WGS84 precision from locate; "
+                "do not round both coordinates to whole degrees."
+            )
+        return self
+
 
 # ---------------------------------------------------------------------------
 # Async adapter handler
@@ -727,7 +737,10 @@ _HIRA_DESCRIPTION = build_description_v4(
         "JSON requires '_type=json' (underscore prefix). 'type=json' silently "
         "returns XML. Response coord fields uppercase: XPos/YPos. "
         "HIRA does NOT sort — UMMAYA sorts client-side by distance ASC, so the "
-        "first item is the closest. Response does NOT echo dgsbjtCd back."
+        "first item is the closest. Response does NOT echo dgsbjtCd back. "
+        "This is not an emergency-room locator; for 응급실/야간 응급실 prefer "
+        "nmc_emergency_search when an authenticated citizen session exists, "
+        "or a location POI search when no authenticated NMC session is present."
     ),
     self_contained_decl=(
         "REQUIRED: xPos/yPos. Citizen location text needs "

package/src/ummaya/tools/location_adapters.py

@@ -17,7 +17,7 @@ import re
 from datetime import UTC, datetime
 from typing import Any
 
-from pydantic import BaseModel, ConfigDict, Field, RootModel
+from pydantic import BaseModel, ConfigDict, Field, RootModel, model_validator
 
 from ummaya.settings import settings
 from ummaya.tools.kma.projection import KMADomainError, latlon_to_lcc
@@ -41,6 +41,12 @@ _POI_HINT_RE = re.compile(
     r"(대학교|캠퍼스|초등학교|중학교|고등학교|학교|역|터미널|공항|해수욕장|해변|시장|"
     r"공원|병원|의원|약국|주민센터|보건소|도서관|박물관|카페|마트|백화점)"
 )
+
+
+def _is_whole_degree_pair(lat: float, lon: float) -> bool:
+    return float(lat).is_integer() and float(lon).is_integer()
+
+
 _TRAILING_LOCATION_WORDS = (
     "근처",
     "주변",
@@ -97,6 +103,15 @@ class KakaoCoordToRegionInput(BaseModel):
     lat: float = Field(ge=-90, le=90, description="Latitude returned by a prior locate adapter.")
     lon: float = Field(ge=-180, le=180, description="Longitude returned by a prior locate adapter.")
 
+    @model_validator(mode="after")
+    def _reject_rounded_coordinate_pair(self) -> KakaoCoordToRegionInput:
+        if _is_whole_degree_pair(self.lat, self.lon):
+            raise ValueError(
+                "lat/lon must preserve decimal WGS84 precision from the prior locate result; "
+                "do not round both coordinates to whole degrees."
+            )
+        return self
+
 
 class JusoAdmCdLookupInput(BaseModel):
     """JUSO address-link administrative code lookup input."""
@@ -118,6 +133,15 @@ class SgisAdmCdLookupInput(BaseModel):
     lat: float = Field(ge=-90, le=90, description="Latitude returned by a prior locate adapter.")
     lon: float = Field(ge=-180, le=180, description="Longitude returned by a prior locate adapter.")
 
+    @model_validator(mode="after")
+    def _reject_rounded_coordinate_pair(self) -> SgisAdmCdLookupInput:
+        if _is_whole_degree_pair(self.lat, self.lon):
+            raise ValueError(
+                "lat/lon must preserve decimal WGS84 precision from the prior locate result; "
+                "do not round both coordinates to whole degrees."
+            )
+        return self
+
 
 def _provider_policy(provider: str, url: str) -> AdapterRealDomainPolicy:
     return AdapterRealDomainPolicy(

package/src/ummaya/tools/mvp_surface.py

@@ -19,9 +19,10 @@ values (10 active families per Epic ε #2296). The dispatcher's
 of Spec 031). This is the same pattern find uses — permissive ``tool_id: str``
 where the prompt + BM25 search hint tells the LLM what's valid.
 
-FR-001 (Epic η updated): The LLM sees exactly four tools: locate,
-find, check, send. Subscribe is deferred until UMMAYA has a real
-app/push-notification runtime rather than a CLI-only subscription surface.
+2026 migration note: these root primitives are high-level categories and legacy
+transcript compatibility wrappers. The normal model-facing surface is a small
+turn-local set of concrete adapter functions selected by ToolSearch or backend
+retrieval.
 """
 
 from __future__ import annotations
@@ -136,11 +137,13 @@ RESOLVE_LOCATION_TOOL = GovAPITool(
     input_schema=_LocateInputForLLM,
     output_schema=_ResolveLocationOutput,
     llm_description=(
-        "Location primitive. Choose a locate adapter from the dynamic "
-        "<available_adapters> block and call locate({tool_id, params}). "
-        "Provider endpoints are separate adapters: Kakao address search, Kakao "
-        "keyword/POI search, Kakao coordinate-to-region, JUSO admCd lookup, and "
-        "SGIS coordinate-to-adm_cd lookup.\n\n"
+        "Location primitive category and legacy wrapper. Prefer concrete locate "
+        "adapter functions selected by ToolSearch or backend retrieval, and call "
+        "them directly with their schema arguments. Use locate({tool_id, params}) "
+        "only for old transcripts or compatibility paths. Provider endpoints are "
+        "separate adapters: Kakao address search, Kakao keyword/POI search, Kakao "
+        "coordinate-to-region, JUSO admCd lookup, and SGIS coordinate-to-adm_cd "
+        "lookup.\n\n"
         "Do not invent coordinates or administrative codes. If the citizen gives "
         "a named place/campus/station/landmark, prefer kakao_keyword_search. If "
         "the citizen gives a structured road/jibun address or district text, "
@@ -148,8 +151,8 @@ RESOLVE_LOCATION_TOOL = GovAPITool(
         "adapter needs q0/q1 region names after you have lat/lon, call "
         "kakao_coord_to_region with those coordinates.\n\n"
         "Examples:\n"
-        "  locate({tool_id:'kakao_keyword_search', params:{query:'동아대학교 승학캠퍼스'}})\n"
-        "  locate({tool_id:'kakao_coord_to_region', params:{lat:35.115446, lon:128.967669}})"
+        "  kakao_keyword_search({query:'동아대학교 승학캠퍼스'})\n"
+        "  kakao_coord_to_region({lat:35.115446, lon:128.967669})"
     ),
     search_hint=(
         "위치 조회 주소 변환 행정동 코드 좌표 지오코딩 POI 장소 검색 "
@@ -190,26 +193,21 @@ LOOKUP_SEARCH_TOOL = GovAPITool(
     input_schema=_LookupInputForLLM,
     output_schema=_LookupOutput,
     llm_description=(
-        "외부 도메인 API (기상청 단기예보, HIRA 병원 검색, KOROAD 사고 데이터, "
-        "KMA 현재 관측 등) 를 조회하는 추상 도구. 시스템 프롬프트의 "
-        "<available_adapters> 블록에 백엔드가 매 사용자 발화마다 후보 어댑터를 "
-        "자동으로 inject 합니다 — LLM 은 그 목록의 tool_id 중 하나를 선택해 "
-        "이 find 도구를 호출하면 됩니다.\n\n"
-        "사용법:\n"
-        "  Call the root function named find, but set tool_id to a concrete "
-        "adapter id from <available_adapters>.\n"
-        '  {"tool_id": "<후보 목록의 adapter tool_id>", "params": {...}}\n'
-        "  Never use root primitive names as tool_id values: find, locate, "
+        "Lookup primitive category and legacy wrapper for external-domain "
+        "public-service data such as KMA forecasts, KMA current observations, "
+        "HIRA hospital search, and KOROAD accident data. Prefer concrete adapter "
+        "functions selected by ToolSearch or backend retrieval, and call them "
+        "directly with their schema arguments.\n\n"
+        "Use find({tool_id, params}) only for old transcripts or compatibility "
+        "paths. Do not use root primitive names as tool_id values: find, locate, "
         "check, send.\n\n"
-        "예시 (시민: '오늘 부산 날씨'):\n"
-        "  {\n"
-        '    "tool_id": "kma_forecast_fetch",\n'
-        '    "params": {"lat": 35.18, "lon": 129.08,\n'
-        '               "base_date": "20260501", "base_time": "1400"}\n'
-        "  }\n\n"
-        "ORDERING RULE: <available_adapters> 에서 tool_id 선택 → 호출 → 결과 "
-        "분석 → 다음 도구 또는 답변. 동일 tool_id 를 한 turn 안에서 반복 호출하지 "
-        "않습니다 — 결과를 바탕으로 답변하거나, 필요하면 다른 tool_id 로 보완 호출."
+        "Example for a selected weather adapter:\n"
+        "  kma_forecast_fetch({lat:35.18, lon:129.08, base_date:'20260501', "
+        "base_time:'1400'})\n\n"
+        "Ordering rule: select a concrete adapter, call it once with valid schema "
+        "arguments, analyze the result, then answer or choose a different adapter "
+        "if another official data source is needed. Do not repeat the same "
+        "adapter in a turn unless validation feedback requires corrected args."
     ),
     search_hint=(
         "데이터 조회 도구 호출 검색 패치 find search fetch invoke tool adapter data query"
@@ -470,17 +468,18 @@ VERIFY_TOOL = GovAPITool(
     input_schema=_VerifyInputForLLM,
     output_schema=_LookupOutput,  # opaque envelope wrapper (RootModel[object])
     llm_description=(
-        "Authentication-ceremony primitive that issues a scope-bound "
-        "DelegationContext (or IdentityAssertion for any_id_sso). Call this "
-        "FIRST when the citizen requests any OPAQUE-domain send-class action "
-        "(홈택스 신고 / 정부24 민원 / 마이데이터 액션). Pass the scope_list "
-        "covering ALL downstream find + send calls in a single check "
-        "invocation. The returned DelegationContext is then passed as a "
-        "param into the subsequent find(mode='fetch', params={'delegation_"
-        "context': ctx}) and send(delegation_context=ctx) calls.\n\n"
-        "family_hint values + canonical AAL hints are documented in the "
-        "system prompt's <check_families> table. The LLM defaults to the "
-        "lowest AAL satisfying the citizen's stated purpose.\n\n"
+        "Authentication-ceremony primitive category and legacy wrapper. Prefer "
+        "concrete check adapter functions selected by ToolSearch or backend "
+        "retrieval, and call them directly with their schema arguments. A check "
+        "adapter issues a scope-bound DelegationContext or IdentityAssertion. "
+        "Call an appropriate check adapter first when the citizen requests an "
+        "OPAQUE-domain send-class action (홈택스 신고 / 정부24 민원 / 마이데이터 액션). "
+        "Pass the scope_list covering all downstream lookup and send adapters in "
+        "one check invocation. The returned DelegationContext is then passed as a "
+        "param into subsequent concrete lookup/send adapter calls.\n\n"
+        "Use check({tool_id, params}) only for old transcripts or compatibility "
+        "paths. The LLM defaults to the lowest AAL satisfying the citizen's "
+        "stated purpose.\n\n"
         "Exception: family_hint='any_id_sso' returns an IdentityAssertion "
         "with no DelegationToken — do NOT chain a send after this check."
     ),
@@ -521,12 +520,14 @@ SUBMIT_TOOL = GovAPITool(
     input_schema=_SubmitInputForLLM,
     output_schema=_LookupOutput,
     llm_description=(
-        "send primitive — invokes a write-transaction adapter (홈택스 신고, "
-        "정부24 민원, mydata 액션 등). REQUIRES a valid DelegationContext "
-        "from a prior check call with matching scope. tool_id MUST be one of "
-        "the registered send adapters (e.g. mock_submit_module_hometax_"
-        "taxreturn). params MUST include 'delegation_context' (the value "
-        "returned by check) and the adapter-specific payload.\n\n"
+        "Send primitive category and legacy wrapper for write-transaction "
+        "adapters (홈택스 신고, 정부24 민원, mydata 액션 등). Prefer concrete send "
+        "adapter functions selected by ToolSearch or backend retrieval, and call "
+        "them directly with their schema arguments. A send adapter requires a "
+        "valid DelegationContext from a prior check adapter with matching scope. "
+        "Use send({tool_id, params}) only for old transcripts or compatibility "
+        "paths. params must include the returned DelegationContext and the "
+        "adapter-specific payload.\n\n"
         "On success: returns transaction_id (deterministic URN) + adapter_"
         "receipt with the agency's 접수번호 (e.g. 'hometax-2026-MM-DD-RX-XXXXX'). "
         "Cite the receipt in the citizen-facing Korean response.\n\n"

package/src/ummaya/tools/nmc/emergency_search.py

@@ -53,6 +53,33 @@ logger = logging.getLogger(__name__)
 # is left for a follow-up adapter once region resolution lands.
 _BASE_URL = "https://apis.data.go.kr/B552657/ErmctInfoInqireService/getEgytLcinfoInqire"
 _LIST_URL = "https://apis.data.go.kr/B552657/ErmctInfoInqireService/getEgytListInfoInqire"
+_GENERIC_QN_FILTERS = frozenset(
+    {
+        "응급실",
+        "야간응급실",
+        "야간 응급실",
+        "응급의료",
+        "응급의료기관",
+        "응급의료센터",
+        "응급센터",
+        "응급 병원",
+        "emergency",
+        "emergency room",
+        "er",
+    }
+)
+
+
+def _invalid_qn_filter(qn: str | None) -> bool:
+    if qn is None:
+        return False
+    stripped = qn.strip()
+    if not stripped:
+        return True
+    if stripped.lower() in _GENERIC_QN_FILTERS:
+        return True
+    return "," in stripped or "，" in stripped
+
 
 # ---------------------------------------------------------------------------
 # Input schema (T032 — lat/lon/limit, Pydantic v2 strict)
@@ -118,7 +145,6 @@ class NmcEmergencySearchInput(BaseModel):
     )
     qn: str | None = Field(
         default=None,
-        min_length=1,
         max_length=80,
         description=(
             "Optional NMC QN institution-name filter. Leave unset for general "
@@ -157,10 +183,36 @@ class NmcEmergencySearchInput(BaseModel):
     def _validate_operation_params(self) -> NmcEmergencySearchInput:
         if self.mode == "coordinate" and (self.lat is None or self.lon is None):
             raise ValueError("mode='coordinate' requires lat and lon")
+        if (
+            self.mode == "coordinate"
+            and self.lat is not None
+            and self.lon is not None
+            and float(self.lat).is_integer()
+            and float(self.lon).is_integer()
+        ):
+            raise ValueError(
+                "mode='coordinate' requires decimal WGS84 lat/lon copied exactly "
+                "from locate; do not round both coordinates to whole degrees"
+            )
         if self.mode == "region" and (not self.q0 or not self.q1):
             raise ValueError("mode='region' requires q0 and q1 from locate region")
+        if _invalid_qn_filter(self.qn):
+            raise ValueError(
+                "qn is an institution-name filter; leave qn unset for generic "
+                "emergency-room searches"
+            )
         if (self.origin_lat is None) ^ (self.origin_lon is None):
             raise ValueError("origin_lat and origin_lon must be supplied together")
+        if (
+            self.origin_lat is not None
+            and self.origin_lon is not None
+            and float(self.origin_lat).is_integer()
+            and float(self.origin_lon).is_integer()
+        ):
+            raise ValueError(
+                "origin_lat/origin_lon must preserve decimal WGS84 precision from locate; "
+                "do not round both coordinates to whole degrees"
+            )
         return self
 
 

package/src/ummaya/tools/search.py

@@ -15,6 +15,7 @@ Public API (for external callers):
 from __future__ import annotations
 
 import logging
+import re
 from typing import TYPE_CHECKING
 
 from ummaya.tools.bm25_index import BM25Index
@@ -32,6 +33,61 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
+_POI_LOCATION_RE = re.compile(
+    r"(근처|주변|인근|가까운|역|터미널|공항|캠퍼스|대학교|대학|해수욕장|시장|공원|랜드마크)"
+)
+_ADMIN_LOCATION_RE = re.compile(
+    r"(?:[가-힣]{2,}(?:시|군|구|동|읍|면)\b|[가-힣0-9]{2,}(?<!으)(?:로|길)\b)"
+)
+_EMERGENCY_RE = re.compile(r"(응급|응급실|응급의료|\bemergency\b|\ber\b)", re.IGNORECASE)
+_TRAFFIC_HAZARD_RE = re.compile(
+    r"(교통사고|사고\s*위험|사고다발|위험\s*(?:구간|도로|지점)|어린이보호구역|보호구역|"
+    r"도로\s*구간|accident|hazard|hotspot)",
+    re.IGNORECASE,
+)
+_TRAFFIC_HAZARD_SPECIFIC_RE = re.compile(
+    r"(사고\s*위험|위험\s*(?:구간|도로|지점)|어린이보호구역|보호구역|스쿨존|"
+    r"도로\s*구간|행정동코드|adm_cd|hazard|hotspot)",
+    re.IGNORECASE,
+)
+
+
+def _expand_query_for_adapter_retrieval(query: str) -> str:
+    """Add domain-neutral retrieval hints that Korean spacing can hide.
+
+    The retriever indexes adapter search hints, not a Korean morphological
+    parse.  A station query such as "하단역 근처 응급실" contains a POI suffix,
+    but does not literally contain the "키워드/POI/랜드마크" terms in
+    ``kakao_keyword_search``.  Expanding only the retrieval query keeps the
+    adapter contract unchanged while letting the concrete locate adapter stay
+    visible to the model.
+    """
+    additions: list[str] = []
+    if _POI_LOCATION_RE.search(query):
+        additions.extend(["장소", "키워드", "POI", "랜드마크", "역", "keyword"])
+    if _ADMIN_LOCATION_RE.search(query):
+        additions.extend(["주소", "행정동", "법정동", "도로명", "지번", "address"])
+    if _EMERGENCY_RE.search(query):
+        additions.extend(["응급실", "응급의료", "NMC", "emergency"])
+    if _TRAFFIC_HAZARD_RE.search(query):
+        additions.extend(
+            [
+                "교통사고",
+                "사고다발구역",
+                "위험지점",
+                "도로위험구역",
+                "어린이보호구역",
+                "행정동코드",
+                "KOROAD",
+                "accident",
+                "hazard",
+            ]
+        )
+    if not additions:
+        return query
+    return f"{query} {' '.join(additions)}"
+
+
 def search(
     query: str,
     bm25_index: BM25Index,
@@ -72,7 +128,7 @@ def search(
 
     retriever = registry._retriever
     try:
-        scored = retriever.score(query)
+        scored = retriever.score(_expand_query_for_adapter_retrieval(query))
     except Exception as exc:
         # FR-002 fail-open: a mid-session retriever failure (dense OOM,
         # tokenizer crash, encoder corruption) must not surface as a 5xx
@@ -96,7 +152,7 @@ def search(
             )
             return []
         try:
-            scored = bm25_companion.score(query)
+            scored = bm25_companion.score(_expand_query_for_adapter_retrieval(query))
         except Exception as bm25_exc:
             logger.warning(
                 "search: BM25 companion also failed (%s: %s) — returning empty ranking",
@@ -105,6 +161,11 @@ def search(
             )
             return []
 
+    if _TRAFFIC_HAZARD_SPECIFIC_RE.search(query):
+        scored = [
+            (tool_id, score) for tool_id, score in scored if tool_id != "koroad_accident_search"
+        ]
+
     # Enforce the deterministic tie-break once, here. Backend-internal
     # orderings are not trusted (HybridBackend returns unordered union).
     scored = sorted(scored, key=lambda pair: (-pair[1], pair[0]))

package/tui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ummaya",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "private": true,
   "type": "module",
   "engines": {

package/tui/src/query.ts

@@ -284,7 +284,7 @@ async function* queryLoop(
     params.deps === undefined &&
     process.env.UMMAYA_SKIP_ADAPTER_MANIFEST_BOOTSTRAP !== 'true'
   ) {
-    const manifestSynced = await ensureUmmayaAdapterManifest()
+    const manifestSynced = await ensureUmmayaAdapterManifest(10_000)
     if (manifestSynced && state.toolUseContext.options.refreshTools) {
       const refreshedTools = state.toolUseContext.options.refreshTools()
       if (refreshedTools !== state.toolUseContext.options.tools) {

package/tui/src/services/api/claude.ts

@@ -215,6 +215,10 @@ import {
   isDeferredTool,
   TOOL_SEARCH_TOOL_NAME,
 } from '../../tools/ToolSearchTool/prompt.js'
+import {
+  isRootPrimitiveToolName,
+  selectTopKAdapterToolNamesForQuery,
+} from '../../tools/AdapterTool/AdapterTool.js'
 import { count } from '../../utils/array.js'
 import { insertBlockAfterToolResults } from '../../utils/contentArray.js'
 import { validateBoundedIntEnvVar } from '../../utils/envValidation.js'
@@ -820,6 +824,32 @@ function shouldDeferLspTool(tool: Tool): boolean {
   return status.status === 'pending' || status.status === 'not-started'
 }
 
+function latestUserTextForToolRetrieval(messages: Message[]): string {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const message = messages[i] as {
+      type?: string
+      message?: { content?: unknown }
+    }
+    if (message?.type !== 'user') continue
+    const content = message.message?.content
+    if (typeof content === 'string') {
+      if (content.trim().length > 0) return content
+      continue
+    }
+    if (Array.isArray(content)) {
+      const text = content
+        .filter(
+          (block): block is { type: string; text: string } =>
+            block?.type === 'text' && typeof block.text === 'string',
+        )
+        .map(block => block.text)
+        .join('')
+      if (text.trim().length > 0) return text
+    }
+  }
+  return ''
+}
+
 /**
  * Per-attempt timeout for non-streaming fallback requests, in milliseconds.
  * Reads API_TIMEOUT_MS when set so slow backends and the streaming path
@@ -1175,6 +1205,17 @@ async function* queryModel(
     useToolSearch = false
   }
 
+  const turnLocalAdapterToolNames = new Set(
+    selectTopKAdapterToolNamesForQuery(
+      latestUserTextForToolRetrieval(messages),
+    ),
+  )
+  if (turnLocalAdapterToolNames.size > 0) {
+    logForDebugging(
+      `UMMAYA turn-local adapter schemas: ${[...turnLocalAdapterToolNames].join(', ')}`,
+    )
+  }
+
   // Filter out ToolSearchTool if tool search is not enabled for this model
   // ToolSearchTool returns tool_reference blocks which unsupported models can't handle
   let filteredTools: Tools
@@ -1186,6 +1227,10 @@ async function* queryModel(
     const discoveredToolNames = extractDiscoveredToolNames(messages)
 
     filteredTools = tools.filter(tool => {
+      if (turnLocalAdapterToolNames.size > 0 && isRootPrimitiveToolName(tool.name)) {
+        return false
+      }
+      if (turnLocalAdapterToolNames.has(tool.name)) return true
       // Always include non-deferred tools
       if (!deferredToolNames.has(tool.name)) return true
       // Always include ToolSearchTool (so it can discover more tools)
@@ -1194,9 +1239,14 @@ async function* queryModel(
       return discoveredToolNames.has(tool.name)
     })
   } else {
-    filteredTools = tools.filter(
-      t => !toolMatchesName(t, TOOL_SEARCH_TOOL_NAME),
-    )
+    filteredTools = tools.filter(t => {
+      if (toolMatchesName(t, TOOL_SEARCH_TOOL_NAME)) return false
+      if (turnLocalAdapterToolNames.size > 0 && isRootPrimitiveToolName(t.name)) {
+        return false
+      }
+      if (isDeferredTool(t)) return turnLocalAdapterToolNames.has(t.name)
+      return true
+    })
   }
 
   // Add tool search beta header if enabled - required for defer_loading to be accepted