ummaya 0.2.3 → 0.2.5

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/tests/fixtures/documents/public_forms/baselines.yaml

@@ -0,0 +1,113 @@
+version: 1
+catalog_id: public-form-conformance-baselines-v1
+source_policy: offline_fixtures_only
+live_network_allowed: false
+baselines:
+  - template_id: birth-benefit-application-hwpx
+    schema_id: birth-benefit-application-v1
+    format: hwpx
+    authoritative_standard: KS X 6101 OWPML/HWPX
+    authority_refs:
+      - specs/2803-document-production-hardening/spec.md#FR-002
+      - specs/2803-document-production-hardening/spec.md#FR-012
+    supports_conformance: true
+    expected_page_count: 2
+    required_fields:
+      - field_id: applicant_name
+        label: Applicant name
+        path: /body/section[1]/field[applicant_name]
+      - field_id: child_birth_date
+        label: Child birth date
+        path: /body/section[1]/field[child_birth_date]
+    protected_text:
+      - text: Birth benefit application
+        anchor: /body/section[1]/p[1]
+      - text: Required attachments
+        anchor: /body/section[2]/p[1]
+    required_labels:
+      - text: Applicant
+        anchor: /body/section[1]/table[1]/cell[1,1]
+      - text: Name
+        anchor: /body/section[1]/table[1]/cell[1,2]
+      - text: Child
+        anchor: /body/section[1]/table[1]/cell[2,1]
+      - text: Date of birth
+        anchor: /body/section[1]/table[1]/cell[2,2]
+    table_geometries:
+      - table_id: applicant-table
+        anchor: /body/section[1]/table[1]
+        rows: 2
+        columns: 2
+    signature_regions:
+      - text: Applicant signature or seal
+        anchor: /body/section[1]/p[2]
+    metadata_exact_matches:
+      page_count: 2
+      margin_top_mm: 20
+      margin_bottom_mm: 15
+  - template_id: civil-form-docx
+    schema_id: civil-form-ooxml-v1
+    format: docx
+    authoritative_standard: ECMA-376 Office Open XML
+    authority_refs:
+      - specs/2803-document-production-hardening/spec.md#FR-012
+    supports_conformance: true
+    required_fields: []
+    protected_text: []
+    required_labels: []
+    table_geometries: []
+    signature_regions: []
+    metadata_exact_matches: {}
+  - template_id: civil-ledger-xlsx
+    schema_id: civil-ledger-ooxml-v1
+    format: xlsx
+    authoritative_standard: ECMA-376 Office Open XML
+    authority_refs:
+      - specs/2803-document-production-hardening/spec.md#FR-012
+    supports_conformance: true
+    required_fields: []
+    protected_text: []
+    required_labels: []
+    table_geometries: []
+    signature_regions: []
+    metadata_exact_matches: {}
+  - template_id: civil-briefing-pptx
+    schema_id: civil-briefing-ooxml-v1
+    format: pptx
+    authoritative_standard: ECMA-376 Office Open XML
+    authority_refs:
+      - specs/2803-document-production-hardening/spec.md#FR-012
+    supports_conformance: true
+    required_fields: []
+    protected_text: []
+    required_labels: []
+    table_geometries: []
+    signature_regions: []
+    metadata_exact_matches: {}
+  - template_id: fillable-permit-pdf
+    schema_id: fillable-permit-pdf-v1
+    format: pdf
+    authoritative_standard: PDF AcroForm and rendered appearance
+    authority_refs:
+      - specs/2803-document-production-hardening/spec.md#FR-014
+    supports_conformance: true
+    required_fields: []
+    protected_text: []
+    required_labels: []
+    table_geometries: []
+    signature_regions: []
+    metadata_exact_matches: {}
+  - template_id: legacy-hwp-readonly
+    schema_id: legacy-hwp-readonly-v1
+    format: hwp
+    authoritative_standard: HWP binary read-only boundary
+    authority_refs:
+      - specs/2803-document-production-hardening/spec.md#FR-017
+    supports_conformance: false
+    unsupported_reason: HWP binary write is blocked in this epic; conformance-ready output requires HWPX or another promoted editable derivative.
+    required_fields: []
+    protected_text: []
+    required_labels: []
+    table_geometries: []
+    signature_regions: []
+    metadata_exact_matches: {}

package/tui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ummaya",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "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/.cc-byte-identical-whitelist.yaml

@@ -377,3 +377,269 @@ entries:
     cause: W13
     spec_ref: "Epic #2639 D1 (TeleportResumeWrapper DROP)"
     notes: "launchTeleportResumeWrapper export removed; underlying TeleportResumeWrapper.tsx is in NEVER-PORT registry (tui/src/components/.never-port.md row 7)."
+  - path: tui/src/components/AutoModeOptInDialog.tsx
+    cause: W2,W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; specs/2639-s3-ui-guard/spec.md"
+    notes: "Visible opt-in copy and brand surface align with UMMAYA while preserving CC dialog semantics."
+  - path: tui/src/components/BypassPermissionsModeDialog.tsx
+    cause: W2,W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; specs/2639-s3-ui-guard/spec.md"
+    notes: "Permission-bypass warning copy is UMMAYA-branded without changing the underlying approval contract."
+  - path: tui/src/components/ClaudeInChromeOnboarding.tsx
+    cause: W2,W7
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; specs/cc-migration-audit/scope-S3-components-screens.md § 7"
+    notes: "Claude 1P browser onboarding surface is rewritten or inert for the UMMAYA public-service client."
+  - path: tui/src/components/ClaudeMdExternalIncludesDialog.tsx
+    cause: W2,W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; specs/2639-s3-ui-guard/spec.md"
+    notes: "External include warning copy uses UMMAYA terms while preserving CC trust semantics."
+  - path: tui/src/components/CostThresholdDialog.tsx
+    cause: W7,W14
+    spec_ref: "#1633; docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Claude billing threshold language is removed or neutralized for the single-provider UMMAYA harness."
+  - path: tui/src/components/DesktopHandoff.tsx
+    cause: W7,W13
+    spec_ref: "#1633; specs/cc-migration-audit/scope-S3-components-screens.md § 7"
+    notes: "Anthropic desktop handoff surface is retained only where needed for unreachable compatibility."
+  - path: tui/src/components/DesktopUpsell/DesktopUpsellStartup.tsx
+    cause: W7,W13
+    spec_ref: "#1633; specs/cc-migration-audit/scope-S3-components-screens.md § 7"
+    notes: "Claude desktop upsell is removed from the UMMAYA runtime surface."
+  - path: tui/src/components/Feedback.tsx
+    cause: W7,W13
+    spec_ref: "#1633; tui/src/components/.never-port.md"
+    notes: "Anthropic feedback endpoint surface is never-port for UMMAYA."
+  - path: tui/src/components/FeedbackSurvey/FeedbackSurveyView.tsx
+    cause: W7,W13
+    spec_ref: "#1633; specs/cc-migration-audit/scope-S3-components-screens.md § 7"
+    notes: "Anthropic survey copy and endpoint behavior are removed from the citizen harness."
+  - path: tui/src/components/FeedbackSurvey/TranscriptSharePrompt.tsx
+    cause: W7,W13
+    spec_ref: "#1633; specs/cc-migration-audit/scope-S3-components-screens.md § 7"
+    notes: "Transcript-sharing prompt no longer routes to Anthropic 1P survey infrastructure."
+  - path: tui/src/components/HelpV2/General.tsx
+    cause: W2,W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; specs/2639-s3-ui-guard/spec.md"
+    notes: "Help text is UMMAYA-branded and adjusted for public-service workflows."
+  - path: tui/src/components/InterruptedByUser.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Interruption wording follows the UMMAYA TUI copy audit without changing control flow."
+  - path: tui/src/components/LogSelector.tsx
+    cause: W2,W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Log selection labels are UMMAYA-facing while preserving the CC selector behavior."
+  - path: tui/src/components/ScrollKeybindingHandler.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; specs/2639-s3-ui-guard/spec.md"
+    notes: "Comment-only terminal selection and scroll wording cleanup from the real-use TUI audit; runtime behavior is unchanged."
+    expected_sha256: 2d751caa56cdc06adfdd727221219ef027b5f6211a7a2a69b2bbfcfa0427c57b
+  - path: tui/src/components/LogoV2/ChannelsNotice.tsx
+    cause: W2,W7
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § 마스코트 · 브랜딩 확정; specs/cc-migration-audit/scope-S3-components-screens.md § 7"
+    notes: "Claude channels notice is replaced by UMMAYA channel language."
+  - path: tui/src/components/LogoV2/EmergencyTip.tsx
+    cause: W2,W7
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § 마스코트 · 브랜딩 확정; specs/cc-migration-audit/scope-S3-components-screens.md § 7"
+    notes: "Dynamic top-of-feed notices are sanitized so upstream provider or SaaS copy cannot surface in the UMMAYA terminal."
+    expected_sha256: 03e6b435d81d7019fb4f0ee960514b100b59bba17959754fa2a0e803c5ab7e27
+  - path: tui/src/components/LogoV2/GuestPassesUpsell.tsx
+    cause: W7,W13
+    spec_ref: "tui/src/components/.never-port.md; specs/cc-migration-audit/scope-S3-components-screens.md § 7"
+    notes: "Guest-pass upsell is an Anthropic 1P business surface and is never-port for UMMAYA."
+  - path: tui/src/components/MCPServerDesktopImportDialog.tsx
+    cause: W2,W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; specs/2639-s3-ui-guard/spec.md"
+    notes: "Desktop import copy is UMMAYA-facing while retaining MCP import semantics."
+  - path: tui/src/components/MCPServerDialogCopy.tsx
+    cause: W2,W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; specs/2639-s3-ui-guard/spec.md"
+    notes: "MCP server dialog copy is adjusted for UMMAYA terminology."
+  - path: tui/src/components/ManagedSettingsSecurityDialog/ManagedSettingsSecurityDialog.tsx
+    cause: W2,W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Managed-settings security text is UMMAYA-branded without changing policy enforcement."
+  - path: tui/src/components/ModelPicker.tsx
+    cause: W2,W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § L1-A; docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Model picker reflects the fixed K-EXAONE provider surface instead of Claude model selection."
+  - path: tui/src/components/OutputStylePicker.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Output-style picker copy follows the UMMAYA TUI copy audit."
+  - path: tui/src/components/PackageManagerAutoUpdater.tsx
+    cause: W2,W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Package-manager updater visible copy uses UMMAYA package identity."
+  - path: tui/src/components/Passes/Passes.tsx
+    cause: W7,W13
+    spec_ref: "tui/src/components/.never-port.md; specs/cc-migration-audit/scope-S3-components-screens.md § 7"
+    notes: "Claude subscription pass UI is never-port for the UMMAYA public-service harness."
+  - path: tui/src/components/RemoteCallout.tsx
+    cause: W7,W13
+    spec_ref: "#1633; specs/cc-migration-audit/scope-S3-components-screens.md § 7"
+    notes: "Anthropic remote-session callout is kept only as an unreachable compatibility surface."
+  - path: tui/src/components/Settings/Config.tsx
+    cause: W2,W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Settings configuration copy uses UMMAYA terms while preserving setting keys."
+  - path: tui/src/components/Stats.tsx
+    cause: W2,W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Stats display text follows UMMAYA terminology without altering metrics aggregation."
+  - path: tui/src/components/TeleportError.tsx
+    cause: W7,W13
+    spec_ref: "#1633; #1978 T011"
+    notes: "Teleport error surface remains stubbed after Anthropic teleport module deletion."
+  - path: tui/src/components/TeleportRepoMismatchDialog.tsx
+    cause: W7,W13
+    spec_ref: "#1633; #1978 T011"
+    notes: "Teleport repository mismatch dialog is retained only for compile compatibility."
+  - path: tui/src/components/ThemePicker.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Theme picker text and defaults follow UMMAYA TUI audit output."
+  - path: tui/src/components/ThinkingToggle.tsx
+    cause: W2,W9
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § L1-A; #2521"
+    notes: "Thinking toggle reflects K-EXAONE reasoning behavior rather than Claude thinking copy."
+  - path: tui/src/components/WorkflowMultiselectDialog.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Workflow selector copy follows UMMAYA workflow terminology."
+  - path: tui/src/components/agents/AgentDetail.tsx
+    cause: W14,W15
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; .github/workflows/tui-boot-smoke.yml"
+    notes: "Agent detail surface uses UMMAYA copy with stable runtime imports."
+  - path: tui/src/components/agents/AgentsList.tsx
+    cause: W14,W15
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; .github/workflows/tui-boot-smoke.yml"
+    notes: "Agent list surface uses UMMAYA copy with stable runtime imports."
+  - path: tui/src/components/agents/new-agent-creation/wizard-steps/ConfirmStep.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Agent wizard confirmation copy follows UMMAYA terminology."
+  - path: tui/src/components/agents/new-agent-creation/wizard-steps/DescriptionStep.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Agent wizard description copy follows UMMAYA terminology."
+  - path: tui/src/components/agents/new-agent-creation/wizard-steps/MethodStep.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Agent wizard method copy follows UMMAYA terminology."
+  - path: tui/src/components/design-system/LoadingState.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Loading state copy and layout are adjusted by the UMMAYA TUI audit."
+  - path: tui/src/components/grove/Grove.tsx
+    cause: W7,W13
+    spec_ref: "tui/src/components/.never-port.md; specs/cc-migration-audit/scope-S3-components-screens.md § 7"
+    notes: "Anthropic Grove surface is never-port for UMMAYA."
+  - path: tui/src/components/hooks/HooksConfigMenu.tsx
+    cause: W14,W15
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; .github/workflows/tui-boot-smoke.yml"
+    notes: "Hooks config menu copy and imports are adjusted for the UMMAYA runtime."
+  - path: tui/src/components/hooks/SelectEventMode.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Hook event selector copy follows UMMAYA terminology."
+  - path: tui/src/components/hooks/SelectHookMode.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Hook selector copy follows UMMAYA terminology."
+  - path: tui/src/components/hooks/SelectMatcherMode.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Hook matcher selector copy follows UMMAYA terminology."
+  - path: tui/src/components/hooks/ViewHookMode.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Hook view mode copy follows UMMAYA terminology."
+  - path: tui/src/components/mcp/ElicitationDialog.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "MCP elicitation dialog copy is adjusted for UMMAYA."
+  - path: tui/src/components/mcp/MCPListPanel.tsx
+    cause: W14,W15
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; .github/workflows/tui-boot-smoke.yml"
+    notes: "MCP list panel copy and imports are stabilized for the UMMAYA runtime."
+  - path: tui/src/components/mcp/MCPSettings.tsx
+    cause: W14,W15
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; .github/workflows/tui-boot-smoke.yml"
+    notes: "MCP settings copy and imports are stabilized for the UMMAYA runtime."
+  - path: tui/src/components/mcp/McpParsingWarnings.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "MCP warning copy follows UMMAYA terminology."
+  - path: tui/src/components/messages/UserToolResultMessage/RejectedPlanMessage.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Rejected-plan message copy follows the UMMAYA terminal audit."
+  - path: tui/src/components/permissions/BashPermissionRequest/bashToolUseOptions.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Bash permission option copy follows UMMAYA permission UX wording."
+  - path: tui/src/components/permissions/ComputerUseApproval/ComputerUseApproval.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Computer-use approval copy follows UMMAYA permission UX wording."
+  - path: tui/src/components/permissions/EnterPlanModePermissionRequest/EnterPlanModePermissionRequest.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Plan-mode permission copy follows UMMAYA permission UX wording."
+  - path: tui/src/components/permissions/FilePermissionDialog/permissionOptions.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "File permission option copy follows UMMAYA permission UX wording."
+  - path: tui/src/components/permissions/PermissionPrompt.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Permission prompt copy follows UMMAYA permission UX wording."
+  - path: tui/src/components/permissions/PowerShellPermissionRequest/powershellToolUseOptions.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "PowerShell permission option copy follows UMMAYA permission UX wording."
+  - path: tui/src/components/permissions/SandboxPermissionRequest.tsx
+    cause: W11,W14
+    spec_ref: "specs/cc-migration-audit/scope-S3-components-screens.md § 5.2; docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Sandbox permission surface removes Anthropic runtime hints and uses UMMAYA permission wording."
+  - path: tui/src/components/permissions/SkillPermissionRequest/SkillPermissionRequest.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Skill permission copy follows UMMAYA permission UX wording."
+  - path: tui/src/components/permissions/WebFetchPermissionRequest/WebFetchPermissionRequest.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Web fetch permission copy follows UMMAYA permission UX wording."
+  - path: tui/src/components/permissions/rules/AddPermissionRules.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Permission-rule authoring copy follows UMMAYA permission UX wording."
+  - path: tui/src/components/permissions/rules/AddWorkspaceDirectory.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Workspace-directory permission copy follows UMMAYA permission UX wording."
+  - path: tui/src/components/permissions/rules/PermissionRuleList.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Permission-rule list copy follows UMMAYA permission UX wording."
+  - path: tui/src/components/permissions/rules/RemoveWorkspaceDirectory.tsx
+    cause: W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Workspace-directory removal copy follows UMMAYA permission UX wording."
+  - path: tui/src/components/sandbox/SandboxOverridesTab.tsx
+    cause: W11,W14
+    spec_ref: "specs/cc-migration-audit/scope-S3-components-screens.md § 5.2; docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Sandbox override copy removes Anthropic runtime assumptions."
+  - path: tui/src/components/sandbox/SandboxSettings.tsx
+    cause: W11,W14
+    spec_ref: "specs/cc-migration-audit/scope-S3-components-screens.md § 5.2; docs/requirements/ummaya-migration-tree.md § UI L2"
+    notes: "Sandbox settings copy removes Anthropic runtime assumptions."
+  - path: tui/src/components/skills/SkillsMenu.tsx
+    cause: W14,W15
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; .github/workflows/tui-boot-smoke.yml"
+    notes: "Skills menu copy and imports are stabilized for the UMMAYA runtime."
+  - path: tui/src/screens/Doctor.tsx
+    cause: W2,W14
+    spec_ref: "docs/requirements/ummaya-migration-tree.md § UI L2; specs/2639-s3-ui-guard/spec.md"
+    notes: "Doctor screen output is UMMAYA-branded while preserving diagnostic flow."

package/tui/src/QueryEngine.ts

@@ -29,6 +29,11 @@ const updateUsage = (current: _NNU, delta: _NNU): _NNU => {
   return out
 }
 const accumulateUsage = (total: _NNU, current: _NNU): _NNU => updateUsage(total, current)
+export function getMessageStartUsageDelta(event: {
+  readonly message?: { readonly usage?: NonNullableUsage }
+}): NonNullableUsage | undefined {
+  return event.message?.usage
+}
 import stripAnsi from 'strip-ansi'
 import type { Command } from './commands.js'
 import { getSlashCommandToolSkills } from './commands.js'
@@ -804,10 +809,13 @@ export class QueryEngine {
           if (message.event.type === 'message_start') {
             // Reset current message usage for new message
             currentMessageUsage = EMPTY_USAGE
-            currentMessageUsage = updateUsage(
-              currentMessageUsage,
-              message.event.message.usage,
-            )
+            const messageStartUsage = getMessageStartUsageDelta(message.event)
+            if (messageStartUsage !== undefined) {
+              currentMessageUsage = updateUsage(
+                currentMessageUsage,
+                messageStartUsage,
+              )
+            }
           }
           if (message.event.type === 'message_delta') {
             currentMessageUsage = updateUsage(

package/tui/src/bridge/inboundAttachments.ts

@@ -6,7 +6,7 @@
  * (oauth-authed, same store), write to ~/.claude/uploads/{sessionId}/, and
  * return @path refs to prepend. Claude's Read tool takes it from there.
  *
- * Best-effort: any failure (no token, network, non-2xx, disk) logs debug and
+ * Best-effort: each failure (no token, network, non-2xx, disk) logs debug and
  * skips that attachment. The message still reaches Claude, just without @path.
  */
 
@@ -63,7 +63,7 @@ function uploadsDir(): string {
 
 /**
  * Fetch + write one attachment. Returns the absolute path on success,
- * undefined on any failure.
+ * undefined when resolution fails.
  */
 async function resolveOne(att: InboundAttachment): Promise<string | undefined> {
   const token = getBridgeAccessToken()
@@ -129,7 +129,7 @@ export async function resolveInboundAttachments(
   const ok = paths.filter((p): p is string => p !== undefined)
   if (ok.length === 0) return ''
   // Quoted form — extractAtMentionedFiles truncates unquoted @refs at the
-  // first space, which breaks any home dir with spaces (/Users/John Smith/).
+  // first space, which breaks home dirs with spaces (/Users/John Smith/).
   return ok.map(p => `@"${p}"`).join(' ') + ' '
 }