ummaya 0.2.2 → 0.2.4

package/tui/src/tools/LookupPrimitive/LookupPrimitive.ts

@@ -28,6 +28,11 @@ import {
 } from '../../services/api/adapterManifest.js'
 import { FIND_TOOL_NAME, DESCRIPTION, FIND_TOOL_PROMPT } from './prompt.js'
 import { dispatchPrimitive } from '../_shared/dispatchPrimitive.js'
+import { validateKmaAviationToolChoice } from '../_shared/kmaAviationGuard.js'
+import { validateKmaAnalysisToolChoice } from '../_shared/kmaAnalysisGuard.js'
+import { validateNmcAedToolChoice } from '../_shared/nmcAedGuard.js'
+import { validateProtectedCheckToolChoice } from '../_shared/protectedCheckGuard.js'
+import { validateDirectPublicDataToolChoice } from '../_shared/directPublicDataGuard.js'
 import {
   renderVerboseInputJson,
   renderVerboseOutputJson,
@@ -38,6 +43,11 @@ import {
 } from '../_shared/compactPrimitiveResult.js'
 import { getOrCreateUmmayaBridge } from '../../ipc/bridgeSingleton.js'
 import { getOrCreatePendingCallRegistry } from '../../ipc/pendingCallSingleton.js'
+import {
+  isRootPrimitiveToolId,
+  normalizeRootPrimitiveAdapterEnvelope,
+  rootPrimitiveSelfTargetMessage,
+} from '../_shared/rootPrimitiveInput.js'
 
 // ---------------------------------------------------------------------------
 // UMMAYA citation extension — attaches resolved citation to the context so the
@@ -48,8 +58,6 @@ type ContextWithCitation = ToolUseContext & {
   ummayaCitations?: AdapterCitation[]
 }
 
-const ROOT_PRIMITIVE_TOOL_IDS = new Set(['find', 'locate', 'check', 'send'])
-
 function asRecord(value: unknown): Record<string, unknown> | null {
   return value !== null && typeof value === 'object'
     ? value as Record<string, unknown>
@@ -531,19 +539,22 @@ function buildFindResultRows(output: Output): React.ReactNode[] {
 // ---------------------------------------------------------------------------
 
 const inputSchema = lazySchema(() =>
-  z.object({
-    tool_id: z
-      .string()
-      .min(1)
-      .describe(
-        'Concrete adapter identifier picked from <available_adapters>. ' +
-          'This is not the function name. Never use "find", "locate", "check", or "send". ' +
-          'Examples: "kma_forecast_fetch", "hira_hospital_search".',
-      ),
-    params: z
-      .record(z.string(), z.unknown())
-      .describe('Adapter-defined Pydantic-validated parameter body'),
-  }),
+  z.preprocess(
+    value => normalizeRootPrimitiveAdapterEnvelope(FIND_TOOL_NAME, value),
+    z.object({
+      tool_id: z
+        .string()
+        .min(1)
+        .describe(
+          'Concrete adapter identifier picked from <available_adapters>. ' +
+            'This is not the function name. Never use "find", "locate", "check", or "send". ' +
+            'Examples: "kma_forecast_fetch", "hira_hospital_search".',
+        ),
+      params: z
+        .record(z.string(), z.unknown())
+        .describe('Adapter-defined Pydantic-validated parameter body'),
+    }),
+  ),
 )
 type InputSchema = ReturnType<typeof inputSchema>
 
@@ -678,14 +689,29 @@ export const LookupPrimitive = buildTool({
     // policy URL) is enforced at the primitive surface, not just at the
     // permission gauntlet.
 
-    if (ROOT_PRIMITIVE_TOOL_IDS.has(input.tool_id)) {
+    if (isRootPrimitiveToolId(input.tool_id)) {
       return {
         result: false,
-        message: `Root primitive '${input.tool_id}' is not an adapter tool_id. Pick a concrete adapter from <available_adapters>.`,
+        message: rootPrimitiveSelfTargetMessage(input.tool_id, 'find'),
         errorCode: PrimitiveErrorCode.AdapterNotFound,
       }
     }
 
+    const protectedChoice = validateProtectedCheckToolChoice(input.tool_id, context)
+    if (protectedChoice) return protectedChoice
+    const directPublicDataChoice = validateDirectPublicDataToolChoice(
+      input.tool_id,
+      context,
+      input.params,
+    )
+    if (directPublicDataChoice) return directPublicDataChoice
+    const kmaAviationChoice = validateKmaAviationToolChoice(input.tool_id, context)
+    if (kmaAviationChoice) return kmaAviationChoice
+    const kmaAnalysisChoice = validateKmaAnalysisToolChoice(input.tool_id, context)
+    if (kmaAnalysisChoice) return kmaAnalysisChoice
+    const nmcAedChoice = validateNmcAedToolChoice(input.tool_id, context)
+    if (nmcAedChoice) return nmcAedChoice
+
     // Tier 1 — synced backend manifest (FR-017).
     if (isManifestSynced()) {
       const backendEntry = resolveAdapter(input.tool_id)

package/tui/src/tools/LookupPrimitive/prompt.ts

@@ -1,16 +1,16 @@
 // SPDX-License-Identifier: Apache-2.0
 // UMMAYA-original — Epic #1634 P3 · FindPrimitive prompt strings.
 // 2026 migration note: root primitives are lightweight category descriptors
-// and legacy transcript compatibility wrappers. Concrete adapter functions are
-// loaded through CC ToolSearch/deferred schema expansion or backend top-K
-// retrieval, then called directly with adapter schema arguments.
+// and legacy transcript compatibility wrappers. Concrete adapter ids are
+// selected through CC ToolSearch/deferred schema expansion or backend top-K
+// retrieval, then exposed as concrete model-facing tool functions.
 // Contract: specs/1634-tool-system-wiring/contracts/primitive-envelope.md § 2
 
 export const FIND_TOOL_NAME = 'find'
 
 /** Citizen-facing English description shown to the LLM (<= 240 chars). */
 export const DESCRIPTION =
-  'Discover Korean public-service lookup adapters. Prefer concrete adapter functions loaded by ToolSearch or backend retrieval; find is a legacy wrapper only.'
+  'Discover Korean public-service lookup adapters. Prefer concrete lookup adapter functions loaded by ToolSearch or backend retrieval; find is a legacy wrapper.'
 
 /** Extended prompt included in the system-prompt tool-use section. */
 export const FIND_TOOL_PROMPT = `Discover Korean public-service lookup adapters registered in the UMMAYA tool registry.
@@ -18,14 +18,15 @@ export const FIND_TOOL_PROMPT = `Discover Korean public-service lookup adapters
 Preferred path:
 - Call concrete adapter functions directly after their schemas are loaded.
 - Example: kma_current_observation({ base_date: "YYYYMMDD", base_time: "HH00", nx: 97, ny: 74 })
-- Adapter schemas are progressively disclosed by ToolSearch or by backend top-K retrieval for the current citizen request.
+- Adapter ids and schemas are progressively disclosed by ToolSearch, adapter_manifest, or backend top-K retrieval for the current citizen request.
 - Only top candidates should be loaded; do not expect every adapter schema in the prompt.
+- A concrete adapter id may be valid even when it is not listed in <available-deferred-tools>; if it appears in <available_adapters> or adapter_manifest and its function is loaded, call that function directly with its schema fields.
 
 Legacy root wrapper:
 - If a concrete adapter function is not loaded and only the root primitive is available, find accepts { tool_id, params } for old transcripts and compatibility paths.
 - tool_id must be a concrete adapter id from <available_adapters>, never "find", "locate", "check", or "send".
 - Invalid: find({ tool_id: "find", params: {...} })
-- Compatibility-only: find({ tool_id: "kma_current_observation", params: { base_date: "YYYYMMDD", base_time: "HH00", nx: 97, ny: 74 } })
+- Compatibility-only: find({ tool_id: "kma_apihub_url_air_metar_decoded", params: { org: "K", help: 1 } })
 
 Rules:
 - Do not call find with mode='search' or query; discovery is handled outside the primitive call.

package/tui/src/tools/ResolveLocationPrimitive/ResolveLocationPrimitive.ts

@@ -8,7 +8,7 @@ import React from 'react'
 import { z } from 'zod/v4'
 import { Text } from '../../ink.js'
 import { MessageResponse } from '../../components/MessageResponse.js'
-import { buildTool, type ToolDef } from '../../Tool.js'
+import { buildTool, type ToolDef, type ToolUseContext } from '../../Tool.js'
 import { lazySchema } from '../../utils/lazySchema.js'
 import {
   LOCATE_TOOL_NAME,
@@ -16,6 +16,8 @@ import {
   LOCATE_TOOL_PROMPT,
 } from './prompt.js'
 import { dispatchPrimitive } from '../_shared/dispatchPrimitive.js'
+import { validateKmaAviationToolChoice } from '../_shared/kmaAviationGuard.js'
+import { validateDirectPublicDataToolChoice } from '../_shared/directPublicDataGuard.js'
 import {
   renderVerboseInputJson,
   renderVerboseOutputJson,
@@ -26,22 +28,29 @@ import {
 } from '../_shared/compactPrimitiveResult.js'
 import { getOrCreateUmmayaBridge } from '../../ipc/bridgeSingleton.js'
 import { getOrCreatePendingCallRegistry } from '../../ipc/pendingCallSingleton.js'
-
-const ROOT_PRIMITIVE_TOOL_IDS = new Set(['find', 'locate', 'check', 'send'])
+import {
+  isRootPrimitiveToolId,
+  normalizeRootPrimitiveAdapterEnvelope,
+  rootPrimitiveSelfTargetMessage,
+} from '../_shared/rootPrimitiveInput.js'
+import { repairLocateQueryParamsFromConversation } from '../_shared/locationInputRepair.js'
 
 const inputSchema = lazySchema(() =>
-  z.strictObject({
-    tool_id: z
-      .string()
-      .min(1)
-      .describe(
-        'Concrete locate adapter identifier from <available_adapters>. ' +
-          'This is not the function name. Never use "locate", "find", "check", or "send".',
-      ),
-    params: z
-      .record(z.string(), z.unknown())
-      .describe('Adapter-defined Pydantic-validated parameter body.'),
-  }),
+  z.preprocess(
+    value => normalizeRootPrimitiveAdapterEnvelope(LOCATE_TOOL_NAME, value),
+    z.strictObject({
+      tool_id: z
+        .string()
+        .min(1)
+        .describe(
+          'Concrete locate adapter identifier from <available_adapters>. ' +
+            'This is not the function name. Never use "locate", "find", "check", or "send".',
+        ),
+      params: z
+        .record(z.string(), z.unknown())
+        .describe('Adapter-defined Pydantic-validated parameter body.'),
+    }),
+  ),
 )
 type InputSchema = ReturnType<typeof inputSchema>
 
@@ -260,14 +269,22 @@ export const ResolveLocationPrimitive = buildTool({
 
   isMcp: false,
 
-  async validateInput(input: z.infer<InputSchema>) {
-    if (ROOT_PRIMITIVE_TOOL_IDS.has(input.tool_id)) {
+  async validateInput(input: z.infer<InputSchema>, context: ToolUseContext) {
+    if (isRootPrimitiveToolId(input.tool_id)) {
       return {
         result: false as const,
-        message: `Root primitive '${input.tool_id}' is not a locate adapter tool_id. Pick a concrete locate adapter from <available_adapters>.`,
+        message: rootPrimitiveSelfTargetMessage(input.tool_id, 'locate'),
         errorCode: 1,
       }
     }
+    const kmaAviationChoice = validateKmaAviationToolChoice(input.tool_id, context)
+    if (kmaAviationChoice) return kmaAviationChoice
+    const directPublicDataChoice = validateDirectPublicDataToolChoice(
+      input.tool_id,
+      context,
+      input.params,
+    )
+    if (directPublicDataChoice) return directPublicDataChoice
     return { result: true as const }
   },
 
@@ -307,9 +324,13 @@ export const ResolveLocationPrimitive = buildTool({
   },
 
   async call(input, context) {
+    const repairedInput = repairLocateQueryParamsFromConversation(
+      input as Record<string, unknown>,
+      context.messages,
+    )
     return dispatchPrimitive<Output>({
       primitive: 'locate',
-      args: input as Record<string, unknown>,
+      args: repairedInput,
       context,
       registry: getOrCreatePendingCallRegistry(),
       bridge: getOrCreateUmmayaBridge(),

package/tui/src/tools/SubmitPrimitive/SubmitPrimitive.ts

@@ -37,6 +37,11 @@ import {
 } from '../_shared/compactPrimitiveResult.js'
 import { getOrCreateUmmayaBridge } from '../../ipc/bridgeSingleton.js'
 import { getOrCreatePendingCallRegistry } from '../../ipc/pendingCallSingleton.js'
+import {
+  isRootPrimitiveToolId,
+  normalizeRootPrimitiveAdapterEnvelope,
+  rootPrimitiveSelfTargetMessage,
+} from '../_shared/rootPrimitiveInput.js'
 
 // ---------------------------------------------------------------------------
 // UMMAYA citation extension — augments context at runtime for permission UI.
@@ -52,15 +57,18 @@ type ContextWithCitation = ToolUseContext & {
 // ---------------------------------------------------------------------------
 
 const inputSchema = lazySchema(() =>
-  z.strictObject({
-    tool_id: z
-      .string()
-      .min(1)
-      .describe('Registered adapter identifier (obtain via find mode=search)'),
-    params: z
-      .record(z.string(), z.unknown())
-      .describe('Adapter-defined Pydantic-validated parameter body'),
-  }),
+  z.preprocess(
+    value => normalizeRootPrimitiveAdapterEnvelope(SEND_TOOL_NAME, value),
+    z.strictObject({
+      tool_id: z
+        .string()
+        .min(1)
+        .describe('Registered send adapter identifier from <available_adapters>'),
+      params: z
+        .record(z.string(), z.unknown())
+        .describe('Adapter-defined Pydantic-validated parameter body'),
+    }),
+  ),
 )
 type InputSchema = ReturnType<typeof inputSchema>
 
@@ -285,6 +293,14 @@ export const SubmitPrimitive = buildTool({
     // 1002 contract (Spec 024 invariant: every adapter cites the agency
     // policy URL) is enforced at the primitive surface.
 
+    if (isRootPrimitiveToolId(input.tool_id)) {
+      return {
+        result: false as const,
+        message: rootPrimitiveSelfTargetMessage(input.tool_id, 'send'),
+        errorCode: PrimitiveErrorCode.AdapterNotFound,
+      }
+    }
+
     // Tier 1 — synced backend manifest (FR-017).
     if (isManifestSynced()) {
       const backendEntry = resolveAdapter(input.tool_id)

package/tui/src/tools/VerifyPrimitive/VerifyPrimitive.ts

@@ -37,6 +37,11 @@ import {
 } from '../_shared/compactPrimitiveResult.js'
 import { getOrCreateUmmayaBridge } from '../../ipc/bridgeSingleton.js'
 import { getOrCreatePendingCallRegistry } from '../../ipc/pendingCallSingleton.js'
+import {
+  isRootPrimitiveToolId,
+  normalizeRootPrimitiveAdapterEnvelope,
+  rootPrimitiveSelfTargetMessage,
+} from '../_shared/rootPrimitiveInput.js'
 
 // ---------------------------------------------------------------------------
 // UMMAYA citation extension — augments context at runtime for permission UI.
@@ -52,15 +57,18 @@ type ContextWithCitation = ToolUseContext & {
 // ---------------------------------------------------------------------------
 
 const inputSchema = lazySchema(() =>
-  z.strictObject({
-    tool_id: z
-      .string()
-      .min(1)
-      .describe('Auth adapter identifier, e.g. "gongdong_injeungseo", "mobile_id"'),
-    params: z
-      .record(z.string(), z.unknown())
-      .describe('Adapter-defined credential parameter body'),
-  }),
+  z.preprocess(
+    value => normalizeRootPrimitiveAdapterEnvelope(CHECK_TOOL_NAME, value),
+    z.strictObject({
+      tool_id: z
+        .string()
+        .min(1)
+        .describe('Auth adapter identifier, e.g. "mock_verify_mobile_id"'),
+      params: z
+        .record(z.string(), z.unknown())
+        .describe('Adapter-defined credential parameter body'),
+    }),
+  ),
 )
 type InputSchema = ReturnType<typeof inputSchema>
 
@@ -276,6 +284,14 @@ export const VerifyPrimitive = buildTool({
     // Epic ε #2296 T013 — two-tier resolution (FR-017 / FR-018 / FR-019 / FR-020).
     // Spec 2521 (2026-05-01) — citation-missing branch added (1002).
 
+    if (isRootPrimitiveToolId(input.tool_id)) {
+      return {
+        result: false as const,
+        message: rootPrimitiveSelfTargetMessage(input.tool_id, 'check'),
+        errorCode: PrimitiveErrorCode.AdapterNotFound,
+      }
+    }
+
     // Tier 1 — synced backend manifest (FR-017).
     if (isManifestSynced()) {
       const backendEntry = resolveAdapter(input.tool_id)

package/tui/src/tools/_shared/citizenUserText.ts

@@ -0,0 +1,49 @@
+const SYNTHETIC_USER_CONTEXT_RE =
+  /<available_adapters\b|<\/available_adapters>|<available-deferred-tools\b|<\/available-deferred-tools>|##\s*Available tools|Current session context|Concrete UMMAYA|Pick a concrete adapter from <available_adapters>|Prefer concrete adapter function calls|<tool_use_error\b|<\/tool_use_error>|AdapterNotFound:|Permission delegation required:|tool-choice mismatch|Required follow-up for this tool chain|Emergency evidence chain complete|KMA analyzed weather-chart|Protected-domain/iu
+
+function asRecord(value: unknown): Record<string, unknown> | undefined {
+  return typeof value === 'object' && value !== null
+    ? (value as Record<string, unknown>)
+    : undefined
+}
+
+function messageContent(message: unknown): unknown {
+  const outer = asRecord(message)
+  const inner = asRecord(outer?.message)
+  return inner?.content ?? outer?.content
+}
+
+function contentHasToolResult(content: unknown): boolean {
+  if (!Array.isArray(content)) return false
+  return content.some(block => asRecord(block)?.type === 'tool_result')
+}
+
+export function isSyntheticUserMessage(message: unknown): boolean {
+  const outer = asRecord(message)
+  const inner = asRecord(outer?.message)
+  return (
+    outer?.isMeta === true ||
+    inner?.isMeta === true ||
+    outer?.isCompactSummary === true ||
+    outer?.isVisibleInTranscriptOnly === true ||
+    outer?.toolUseResult !== undefined ||
+    outer?.sourceToolAssistantUUID !== undefined ||
+    contentHasToolResult(messageContent(message))
+  )
+}
+
+export function isSyntheticUserText(text: string): boolean {
+  const trimmed = text.trim()
+  return trimmed.length > 0 && SYNTHETIC_USER_CONTEXT_RE.test(trimmed)
+}
+
+export function isNonSyntheticUserText(text: string): boolean {
+  return text.trim().length > 0 && !isSyntheticUserText(text)
+}
+
+export function isNonSyntheticUserMessageText(
+  message: unknown,
+  text: string,
+): boolean {
+  return !isSyntheticUserMessage(message) && isNonSyntheticUserText(text)
+}