ummaya 0.2.3 → 0.2.4

package/src/ummaya/tools/verified_data_go_kr/pps_bid_public_info.py

@@ -3,9 +3,10 @@
 
 from __future__ import annotations
 
+from datetime import datetime, timedelta
 from typing import Literal
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field, model_validator
 
 from ummaya.tools.executor import ToolExecutor
 from ummaya.tools.models import GovAPITool
@@ -17,27 +18,113 @@ from ummaya.tools.verified_data_go_kr._factory import (
 )
 from ummaya.tools.verified_data_go_kr._manifest import require_spec
 
+_PPS_DATETIME_FORMAT = "%Y%m%d%H%M"
+_PPS_MAX_SEARCH_WINDOW = timedelta(days=31)
+
 
 class PpsBidPublicInfoInput(BaseModel):
     """Input for PPS bid public information."""
 
     model_config = ConfigDict(extra="forbid")
 
-    inqry_div: Literal["2"] = Field(
-        default="2",
+    inqry_div: Literal["1", "2"] = Field(
+        default="1",
+        description=(
+            "Official PPS inqryDiv. Use '1' for bid notice publication datetime "
+            "(pblancDate) searches such as 'this week posted notices'; use '2' "
+            "for bid opening datetime (opengDt) searches."
+        ),
+    )
+    inqry_bgn_dt: str = Field(
+        ...,
+        pattern=r"^\d{12}$",
         description=(
-            "PPS inquiry division. This adapter wraps the verified "
-            "inqryDiv=2 bid-notice-number lookup path."
+            "Official PPS inqryBgnDt search start datetime in YYYYMMDDHHMM. "
+            "Required when inqry_div is '1' or '2'. Keep each PPS request window "
+            "within 31 days."
         ),
     )
-    bid_ntce_no: str = Field(
+    inqry_end_dt: str = Field(
         ...,
-        min_length=1,
-        description="Bid notice number required by the verified inqryDiv=2 lookup path.",
+        pattern=r"^\d{12}$",
+        description=(
+            "Official PPS inqryEndDt search end datetime in YYYYMMDDHHMM. "
+            "Required when inqry_div is '1' or '2'. Keep each PPS request window "
+            "within 31 days."
+        ),
+    )
+    bid_ntce_nm: str | None = Field(
+        default=None,
+        max_length=1000,
+        description=(
+            "Official PPS bidNtceNm notice-name keyword. Partial names are allowed; "
+            "use this for citizen keywords such as 전기공사."
+        ),
+    )
+    ntce_instt_nm: str | None = Field(
+        default=None,
+        max_length=400,
+        description=(
+            "Official PPS ntceInsttNm public notice agency name filter. "
+            "Partial agency names are allowed."
+        ),
+    )
+    dminstt_nm: str | None = Field(
+        default=None,
+        max_length=400,
+        description=(
+            "Official PPS dminsttNm demand agency name filter. Partial agency names are allowed."
+        ),
+    )
+    region_name: str | None = Field(
+        default=None,
+        max_length=100,
+        description=(
+            "UMMAYA client-side region relevance filter copied from citizen wording. "
+            "This is not sent to PPS upstream; after the official response, UMMAYA "
+            "keeps rows whose documented region/agency fields such as cnstrtsiteRgnNm, "
+            "prtcptLmtRgnNm, ntceInsttNm, or dminsttNm match this value."
+        ),
+    )
+    prtcpt_lmt_rgn_nm: str | None = Field(
+        default=None,
+        max_length=100,
+        description=(
+            "Official PPS prtcptLmtRgnNm participation-limit region name. "
+            "For Busan-region notices use 부산광역시 when the citizen says 부산시."
+        ),
+    )
+    indstryty_nm: str | None = Field(
+        default=None,
+        max_length=100,
+        description=(
+            "Official PPS indstrytyNm industry/license name. Use 전기공사업 "
+            "for electrical-construction qualification searches when requested."
+        ),
     )
     page_no: int = Field(default=1, ge=1, description="Page number.")
     num_of_rows: int = Field(default=10, ge=1, le=100, description="Rows per page.")
 
+    @model_validator(mode="after")
+    def validate_official_search_window(self) -> PpsBidPublicInfoInput:
+        """Keep PPS searches inside the observed upstream contract window."""
+
+        try:
+            start = datetime.strptime(self.inqry_bgn_dt, _PPS_DATETIME_FORMAT)
+            end = datetime.strptime(self.inqry_end_dt, _PPS_DATETIME_FORMAT)
+        except ValueError as exc:
+            raise ValueError(
+                "PPS inqry_bgn_dt and inqry_end_dt must be valid YYYYMMDDHHMM datetimes."
+            ) from exc
+        if end < start:
+            raise ValueError("PPS inqry_end_dt must be greater than or equal to inqry_bgn_dt.")
+        if end - start > _PPS_MAX_SEARCH_WINDOW:
+            raise ValueError(
+                "PPS Nara Market bid searches must be split into 31-day-or-smaller "
+                "inqry_bgn_dt/inqry_end_dt windows before calling the upstream API."
+            )
+        return self
+
 
 SPEC = require_spec("pps_bid_public_info")
 INPUT_SCHEMA = PpsBidPublicInfoInput
@@ -51,7 +138,85 @@ async def handle(
 ) -> dict[str, object]:
     """Fetch or replay PPS bid public information rows."""
 
-    return await handle_verified_input(input_model, SPEC, fixture_body=fixture_body)
+    output = await handle_verified_input(input_model, SPEC, fixture_body=fixture_body)
+    return _filter_output_by_region_name(output, input_model.region_name)
+
+
+_REGION_RELEVANCE_FIELDS: tuple[str, ...] = (
+    "cnstrtsiteRgnNm",
+    "prtcptLmtRgnNm",
+    "ntceInsttNm",
+    "dminsttNm",
+    "jntcontrctDutyRgnNm1",
+    "jntcontrctDutyRgnNm2",
+    "jntcontrctDutyRgnNm3",
+)
+
+
+def _filter_output_by_region_name(
+    output: dict[str, object],
+    region_name: str | None,
+) -> dict[str, object]:
+    """Filter PPS rows by documented region-bearing response fields."""
+
+    terms = _region_terms(region_name)
+    if not terms:
+        return output
+
+    raw_items = output.get("items")
+    if not isinstance(raw_items, list):
+        return output
+
+    filtered: list[dict[str, object]] = []
+    for raw_item in raw_items:
+        if not isinstance(raw_item, dict):
+            continue
+        if _item_matches_region(raw_item, terms):
+            filtered.append(raw_item)
+
+    next_output = dict(output)
+    next_output["items"] = filtered
+    next_output["total_count"] = len(filtered)
+    raw_meta = output.get("meta")
+    meta = dict(raw_meta) if isinstance(raw_meta, dict) else {}
+    meta["upstream_total_count"] = output.get("total_count")
+    meta["client_filter"] = {
+        "field": "region_name",
+        "value": region_name,
+        "matched_count": len(filtered),
+    }
+    next_output["meta"] = meta
+    return next_output
+
+
+def _region_terms(region_name: str | None) -> tuple[str, ...]:
+    if region_name is None:
+        return ()
+    normalized = " ".join(region_name.split())
+    if not normalized:
+        return ()
+    terms = [normalized]
+    for suffix in ("특별자치시", "특별자치도", "특별시", "광역시", "도"):
+        if normalized.endswith(suffix):
+            short = normalized[: -len(suffix)]
+            if short:
+                terms.append(short)
+            break
+    return tuple(dict.fromkeys(terms))
+
+
+def _item_matches_region(item: dict[str, object], terms: tuple[str, ...]) -> bool:
+    raw_record = item.get("record")
+    record = raw_record if isinstance(raw_record, dict) else item
+    for field_name in _REGION_RELEVANCE_FIELDS:
+        value = record.get(field_name)
+        if not isinstance(value, str):
+            continue
+        compact_value = value.replace(" ", "")
+        for term in terms:
+            if term in value or term.replace(" ", "") in compact_value:
+                return True
+    return False
 
 
 def register(registry: ToolRegistry, executor: ToolExecutor) -> None:

package/src/ummaya/tools/verified_data_go_kr/tago_bus_arrival.py

@@ -3,6 +3,8 @@
 
 from __future__ import annotations
 
+from typing import cast
+
 from pydantic import BaseModel, ConfigDict, Field
 
 from ummaya.tools.executor import ToolExecutor
@@ -15,14 +17,41 @@ from ummaya.tools.verified_data_go_kr._factory import (
 )
 from ummaya.tools.verified_data_go_kr._manifest import require_spec
 
+_TAGO_CITY_CODE_DESCRIPTION = (
+    "Official TAGO cityCode from the provider getCtyCodeList contract. "
+    "Common metropolitan examples: Busan=21, Daegu=22, Incheon=23, "
+    "Gwangju=24, Daejeon=25, Ulsan=26."
+)
+
 
 class TagoBusArrivalInput(BaseModel):
     """Input for TAGO bus arrival search."""
 
     model_config = ConfigDict(extra="forbid")
 
-    city_code: str = Field(..., min_length=1, description="TAGO city code.")
-    node_id: str = Field(..., min_length=1, description="TAGO bus station ID.")
+    city_code: str = Field(..., min_length=1, description=_TAGO_CITY_CODE_DESCRIPTION)
+    node_id: str = Field(
+        ...,
+        min_length=1,
+        description="Official TAGO nodeId returned by tago_bus_station_search.",
+    )
+    route_no: str | None = Field(
+        default=None,
+        min_length=1,
+        description=(
+            "Optional client-side filter against the official TAGO response field routeno. "
+            "It is not sent upstream; use it when the citizen names a visible bus route "
+            "such as 1001."
+        ),
+    )
+    route_id: str | None = Field(
+        default=None,
+        min_length=1,
+        description=(
+            "Optional client-side filter against the official TAGO response field routeid. "
+            "Get it from tago_bus_route_search when route_no alone is ambiguous."
+        ),
+    )
     page_no: int = Field(default=1, ge=1, description="Page number.")
     num_of_rows: int = Field(default=10, ge=1, le=100, description="Rows per page.")
 
@@ -39,7 +68,41 @@ async def handle(
 ) -> dict[str, object]:
     """Fetch or replay TAGO bus arrival rows."""
 
-    return await handle_verified_input(input_model, SPEC, fixture_body=fixture_body)
+    output = await handle_verified_input(input_model, SPEC, fixture_body=fixture_body)
+    if input_model.route_no is None and input_model.route_id is None:
+        return output
+    return _filter_arrivals(output, route_no=input_model.route_no, route_id=input_model.route_id)
+
+
+def _filter_arrivals(
+    output: dict[str, object],
+    *,
+    route_no: str | None,
+    route_id: str | None,
+) -> dict[str, object]:
+    items = output.get("items")
+    if not isinstance(items, list):
+        return output
+
+    filtered: list[dict[str, object]] = []
+    for item in items:
+        if not isinstance(item, dict):
+            continue
+        record = item.get("record")
+        if not isinstance(record, dict):
+            continue
+        typed_record = cast(dict[str, object], record)
+        if route_no is not None and str(typed_record.get("routeno", "")) != route_no:
+            continue
+        if route_id is not None and str(typed_record.get("routeid", "")) != route_id:
+            continue
+        filtered.append(cast(dict[str, object], item))
+
+    filtered_output = dict(output)
+    filtered_output["items"] = filtered
+    filtered_output["total_count"] = len(filtered)
+    filtered_output["next_cursor"] = None
+    return filtered_output
 
 
 def register(registry: ToolRegistry, executor: ToolExecutor) -> None:

package/src/ummaya/tools/verified_data_go_kr/tago_bus_location.py

@@ -15,14 +15,24 @@ from ummaya.tools.verified_data_go_kr._factory import (
 )
 from ummaya.tools.verified_data_go_kr._manifest import require_spec
 
+_TAGO_CITY_CODE_DESCRIPTION = (
+    "Official TAGO cityCode from the provider getCtyCodeList contract. "
+    "Common metropolitan examples: Busan=21, Daegu=22, Incheon=23, "
+    "Gwangju=24, Daejeon=25, Ulsan=26."
+)
+
 
 class TagoBusLocationInput(BaseModel):
     """Input for TAGO bus location search."""
 
     model_config = ConfigDict(extra="forbid")
 
-    city_code: str = Field(..., min_length=1, description="TAGO city code.")
-    route_id: str = Field(..., min_length=1, description="TAGO route ID.")
+    city_code: str = Field(..., min_length=1, description=_TAGO_CITY_CODE_DESCRIPTION)
+    route_id: str = Field(
+        ...,
+        min_length=1,
+        description="Official TAGO routeId returned by tago_bus_route_search.",
+    )
     page_no: int = Field(default=1, ge=1, description="Page number.")
     num_of_rows: int = Field(default=10, ge=1, le=100, description="Rows per page.")
 

package/src/ummaya/tools/verified_data_go_kr/tago_bus_route.py

@@ -15,14 +15,20 @@ from ummaya.tools.verified_data_go_kr._factory import (
 )
 from ummaya.tools.verified_data_go_kr._manifest import require_spec
 
+_TAGO_CITY_CODE_DESCRIPTION = (
+    "Official TAGO cityCode from the provider getCtyCodeList contract. "
+    "Common metropolitan examples: Busan=21, Daegu=22, Incheon=23, "
+    "Gwangju=24, Daejeon=25, Ulsan=26."
+)
+
 
 class TagoBusRouteInput(BaseModel):
     """Input for TAGO bus route search."""
 
     model_config = ConfigDict(extra="forbid")
 
-    city_code: str = Field(..., min_length=1, description="TAGO city code.")
-    route_no: str = Field(..., min_length=1, description="Bus route number.")
+    city_code: str = Field(..., min_length=1, description=_TAGO_CITY_CODE_DESCRIPTION)
+    route_no: str = Field(..., min_length=1, description="Bus route number visible to citizens.")
     page_no: int = Field(default=1, ge=1, description="Page number.")
     num_of_rows: int = Field(default=10, ge=1, le=100, description="Rows per page.")
 

package/src/ummaya/tools/verified_data_go_kr/tago_bus_route_station.py

@@ -0,0 +1,114 @@
+# SPDX-License-Identifier: Apache-2.0
+"""TAGO bus route-station search adapter."""
+
+from __future__ import annotations
+
+from typing import cast
+
+from pydantic import BaseModel, ConfigDict, Field
+
+from ummaya.tools.executor import ToolExecutor
+from ummaya.tools.models import GovAPITool
+from ummaya.tools.registry import ToolRegistry
+from ummaya.tools.verified_data_go_kr._factory import (
+    build_tool,
+    handle_verified_input,
+    register_module,
+)
+from ummaya.tools.verified_data_go_kr._manifest import require_spec
+
+_TAGO_CITY_CODE_DESCRIPTION = (
+    "Official TAGO cityCode from the provider getCtyCodeList contract. "
+    "Common metropolitan examples: Busan=21, Daegu=22, Incheon=23, "
+    "Gwangju=24, Daejeon=25, Ulsan=26."
+)
+
+
+class TagoBusRouteStationInput(BaseModel):
+    """Input for TAGO route-station search."""
+
+    model_config = ConfigDict(extra="forbid")
+
+    city_code: str = Field(..., min_length=1, description=_TAGO_CITY_CODE_DESCRIPTION)
+    route_id: str = Field(
+        ...,
+        min_length=1,
+        description="Official TAGO routeId returned by tago_bus_route_search.",
+    )
+    node_nm: str | None = Field(
+        default=None,
+        min_length=1,
+        description=(
+            "Optional client-side filter against the official TAGO response field nodenm. "
+            "Use it to narrow a route's passing stops to a citizen-named place such as 부산역."
+        ),
+    )
+    updown_cd: str | None = Field(
+        default=None,
+        min_length=1,
+        description=(
+            "Optional client-side filter against the official TAGO response field updowncd "
+            "when a direction is already known."
+        ),
+    )
+    page_no: int = Field(default=1, ge=1, description="Page number.")
+    num_of_rows: int = Field(default=100, ge=1, le=100, description="Rows per page.")
+
+
+SPEC = require_spec("tago_bus_route_station_search")
+INPUT_SCHEMA = TagoBusRouteStationInput
+TOOL: GovAPITool = build_tool(SPEC, INPUT_SCHEMA)
+
+
+async def handle(
+    input_model: TagoBusRouteStationInput,
+    *,
+    fixture_body: bytes | None = None,
+) -> dict[str, object]:
+    """Fetch or replay TAGO route-station rows."""
+
+    output = await handle_verified_input(input_model, SPEC, fixture_body=fixture_body)
+    if input_model.node_nm is None and input_model.updown_cd is None:
+        return output
+    return _filter_route_stations(
+        output,
+        node_nm=input_model.node_nm,
+        updown_cd=input_model.updown_cd,
+    )
+
+
+def _filter_route_stations(
+    output: dict[str, object],
+    *,
+    node_nm: str | None,
+    updown_cd: str | None,
+) -> dict[str, object]:
+    items = output.get("items")
+    if not isinstance(items, list):
+        return output
+
+    filtered: list[dict[str, object]] = []
+    for item in items:
+        if not isinstance(item, dict):
+            continue
+        record = item.get("record")
+        if not isinstance(record, dict):
+            continue
+        typed_record = cast(dict[str, object], record)
+        if node_nm is not None and node_nm not in str(typed_record.get("nodenm", "")):
+            continue
+        if updown_cd is not None and str(typed_record.get("updowncd", "")) != updown_cd:
+            continue
+        filtered.append(cast(dict[str, object], item))
+
+    filtered_output = dict(output)
+    filtered_output["items"] = filtered
+    filtered_output["total_count"] = len(filtered)
+    filtered_output["next_cursor"] = None
+    return filtered_output
+
+
+def register(registry: ToolRegistry, executor: ToolExecutor) -> None:
+    """Register this adapter."""
+
+    register_module(registry, executor, tool=TOOL, input_schema=INPUT_SCHEMA, handler=handle)

package/src/ummaya/tools/verified_data_go_kr/tago_bus_station.py

@@ -15,15 +15,26 @@ from ummaya.tools.verified_data_go_kr._factory import (
 )
 from ummaya.tools.verified_data_go_kr._manifest import require_spec
 
+_TAGO_CITY_CODE_DESCRIPTION = (
+    "Official TAGO cityCode from the provider getCtyCodeList contract. "
+    "Common metropolitan examples: Busan=21, Daegu=22, Incheon=23, "
+    "Gwangju=24, Daejeon=25, Ulsan=26."
+)
+
 
 class TagoBusStationInput(BaseModel):
     """Input for TAGO bus station search."""
 
     model_config = ConfigDict(extra="forbid")
 
-    city_code: str = Field(..., min_length=1, description="TAGO city code.")
-    node_nm: str | None = Field(default=None, description="Bus station name.")
-    node_no: str | None = Field(default=None, description="Bus station number.")
+    city_code: str = Field(..., min_length=1, description=_TAGO_CITY_CODE_DESCRIPTION)
+    node_nm: str | None = Field(
+        default=None,
+        description=(
+            "Bus stop name fragment, for example 부산역 when the citizen asks near Busan Station."
+        ),
+    )
+    node_no: str | None = Field(default=None, description="Bus stop number printed at the stop.")
     page_no: int = Field(default=1, ge=1, description="Page number.")
     num_of_rows: int = Field(default=10, ge=1, le=100, description="Rows per page.")
 

package/src/ummaya/tools/verify_canonical_map.py

@@ -11,6 +11,11 @@ Public API
     Return the ``family_hint`` string for the given check tool_id, or ``None``
     if the tool_id is not recognised.
 
+``resolve_tool_id(identifier)``  → ``str | None``
+    Return the canonical ``mock_verify_*`` tool_id when *identifier* is either a
+    canonical check tool_id or an internal family_hint alias such as
+    ``mobile_id`` / ``simple_auth_module``.
+
 ``get_canonical_map()``  → ``Mapping[str, str]``
     Return the full frozen ``{tool_id: family_hint}`` mapping.
 
@@ -99,6 +104,22 @@ def resolve_family(tool_id: str) -> str | None:
     return _load_map().get(tool_id)
 
 
+def resolve_tool_id(identifier: str) -> str | None:
+    """Return the canonical check tool_id for *identifier*.
+
+    This is the runtime guard for model-facing alias drift.  The manifest can
+    include internal verify-family entries for backward compatibility, but
+    adapter dispatch is owned by canonical ``mock_verify_*`` tool ids.
+    """
+    mapping = _load_map()
+    if identifier in mapping:
+        return identifier
+    for tool_id, family in mapping.items():
+        if family == identifier:
+            return tool_id
+    return None
+
+
 def get_canonical_map() -> Mapping[str, str]:
     """Return the full ``{tool_id: family_hint}`` frozen mapping (read-only)."""
     return _load_map()

package/tui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ummaya",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "private": true,
   "type": "module",
   "engines": {
@@ -11,7 +11,6 @@
     "gen:ipc": "bun run scripts/gen-ipc-types.ts",
     "gen:pipa-hash": "bun run scripts/gen-pipa-hash.ts",
     "diff:upstream": "bun run scripts/diff-upstream.ts",
-    "tui:smoke": "bun run scripts/tui-smoke.ts",
     "test:soak": "bun test --timeout 600000 tests/soak",
     "test": "bun test --max-concurrency=1 tests/entrypoints tests/hooks tests/i18n tests/ink tests/ipc tests/memdir tests/permissions tests/primitive tests/store tests/theme tests/unit",
     "typecheck": "tsc --noEmit -p tsconfig.typecheck.json",

package/tui/src/QueryEngine.ts

@@ -53,6 +53,10 @@ import type { AppState } from './state/AppState.js'
 import { type Tools, type ToolUseContext, toolMatchesName } from './Tool.js'
 import type { AgentDefinition } from './tools/AgentTool/loadAgentsDir.js'
 import { SYNTHETIC_OUTPUT_TOOL_NAME } from './tools/SyntheticOutputTool/SyntheticOutputTool.js'
+import {
+  stripTextToolCallBlocks,
+  textContainsToolCall,
+} from './tools/_shared/textToolCallGuard.js'
 import type { Message } from './types/message.js'
 import type { OrphanedPermission } from './types/textInputTypes.js'
 import { createAbortController } from './utils/abortController.js'

package/tui/src/cli/handlers/auth.ts

@@ -326,6 +326,6 @@ export async function authLogout(): Promise<void> {
     process.stderr.write('Failed to log out.\n')
     process.exit(1)
   }
-  process.stdout.write('Successfully logged out from your Anthropic account.\n')
+  process.stdout.write('Successfully logged out from FriendliAI.\n')
   process.exit(0)
 }