ummaya 0.2.3 → 0.2.5

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

@@ -27,6 +27,11 @@ import {
   resolveAdapter,
 } from '../../services/api/adapterManifest.js'
 import { dispatchPrimitive } from '../_shared/dispatchPrimitive.js'
+import {
+  applyDocumentVisualRenderGateToOutput,
+  isDocumentVisualRenderFailedOutput,
+  renderDocumentToolResultIfPresent,
+} from '../_shared/documentToolResultRender.js'
 import {
   renderVerboseInputJson,
   renderVerboseOutputJson,
@@ -37,6 +42,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 +62,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 adapter identifier for a send adapter from <available_adapters>'),
+      params: z
+        .record(z.string(), z.unknown())
+        .describe('Adapter-defined Pydantic-validated parameter body'),
+    }),
+  ),
 )
 type InputSchema = ReturnType<typeof inputSchema>
 
@@ -245,19 +258,21 @@ export const SubmitPrimitive = buildTool({
   },
 
   mapToolResultToToolResultBlockParam(output, toolUseID) {
+    const gatedOutput = applyDocumentVisualRenderGateToOutput(output)
     // Spec 2521 (2026-05-02) — outbound_traces is UI-only (see Lookup).
     const llmContent =
-      typeof output === 'object' && output !== null
+      typeof gatedOutput === 'object' && gatedOutput !== null
         ? Object.fromEntries(
-            Object.entries(output as Record<string, unknown>).filter(
+            Object.entries(gatedOutput as Record<string, unknown>).filter(
               ([k]) => k !== 'outbound_traces',
             ),
           )
-        : output
+        : gatedOutput
     return {
       tool_use_id: toolUseID,
       type: 'tool_result',
       content: JSON.stringify(llmContent),
+      ...(isDocumentVisualRenderFailedOutput(gatedOutput) ? { is_error: true } : {}),
     }
   },
 
@@ -285,6 +300,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)
@@ -352,11 +375,16 @@ export const SubmitPrimitive = buildTool({
     _progress: unknown,
     options: { verbose: boolean; isTranscriptMode?: boolean } = { verbose: false },
   ) {
+    const gatedOutput = applyDocumentVisualRenderGateToOutput(output) as Output
+    const documentResult = renderDocumentToolResultIfPresent(gatedOutput, options)
+    if (documentResult !== null) {
+      return documentResult
+    }
     // Spec 2521 (2026-05-01 evening) — verbose / transcript mode surface
     // the full envelope JSON. CC BashTool/UI.tsx:renderToolResultMessage
     // pattern.
     if (options.verbose || options.isTranscriptMode) {
-      return renderVerboseOutputJson(output)
+      return renderVerboseOutputJson(gatedOutput)
     }
     // NOTE: This file is `.ts` (not `.tsx`); Bun runtime cannot parse JSX in
     // `.ts`. Use `React.createElement` for parity with the other 3 primitives.
@@ -365,11 +393,11 @@ export const SubmitPrimitive = buildTool({
     // rewrite, output.result is the actual send primitive output
     // (transaction_id / ministry / status / agency_handoff_url) unwrapped
     // from ToolResultEnvelope.result.
-    if (output.ok) {
-      return renderCompactPrimitiveResult(buildSubmitSuccessRows(output))
+    if (gatedOutput.ok) {
+      return renderCompactPrimitiveResult(buildSubmitSuccessRows(gatedOutput))
     }
 
-    return renderCompactPrimitiveResult(buildSubmitErrorRows(output))
+    return renderCompactPrimitiveResult(buildSubmitErrorRows(gatedOutput))
   },
 
   isResultTruncated(output: Output): boolean {
@@ -389,7 +417,8 @@ export const SubmitPrimitive = buildTool({
   async checkPermissions(_input) {
     return {
       behavior: 'ask' as const,
-      message: 'Permission delegation required: send a submission request to the agency. Continue?',
+      message:
+        '권한 위임 필요: 제출 요청을 기관에 전송합니다. 계속할까요? / Permission delegation required: send a submission request to the agency.',
     }
   },
 
@@ -397,12 +426,16 @@ export const SubmitPrimitive = buildTool({
    * Dispatch send call via real IPC bridge (T011 — stub replaced).
    */
   async call(input, context) {
-    return dispatchPrimitive<Output>({
+    const result = await dispatchPrimitive<Output>({
       primitive: 'send',
       args: input as Record<string, unknown>,
       context,
       registry: getOrCreatePendingCallRegistry(),
       bridge: getOrCreateUmmayaBridge(),
     })
+    return {
+      ...result,
+      data: applyDocumentVisualRenderGateToOutput(result.data) as Output,
+    }
   },
 } satisfies ToolDef<InputSchema, Output>)

package/tui/src/tools/TaskCreateTool/TaskCreateTool.ts

@@ -12,6 +12,7 @@ import {
   isTodoV2Enabled,
 } from '../../utils/tasks.js'
 import { getAgentName, getTeamName } from '../../utils/teammate.js'
+import { buildAgentSupportMetadata } from '../AgentTool/orchestrationSupport.js'
 import { TASK_CREATE_TOOL_NAME } from './constants.js'
 import { DESCRIPTION, getPrompt } from './prompt.js'
 
@@ -39,6 +40,10 @@ const outputSchema = lazySchema(() =>
       id: z.string(),
       subject: z.string(),
     }),
+    evidenceJoinKey: z.string(),
+    parentToolUseId: z.string(),
+    resumeToken: z.string(),
+    permissionFlow: z.literal('coordinator_parent_round_trip'),
   }),
 )
 type OutputSchema = ReturnType<typeof outputSchema>
@@ -124,15 +129,24 @@ export const TaskCreateTool = buildTool({
           id: taskId,
           subject,
         },
+        ...buildAgentSupportMetadata({
+          taskId,
+          parentToolUseId: context.toolUseId,
+        }),
       },
     }
   },
   mapToolResultToToolResultBlockParam(content, toolUseID) {
-    const { task } = content as Output
+    const { task, evidenceJoinKey, parentToolUseId, resumeToken, permissionFlow } =
+      outputSchema().parse(content)
     return {
       tool_use_id: toolUseID,
       type: 'tool_result',
-      content: `Task #${task.id} created successfully: ${task.subject}`,
+      content: `Task #${task.id} created successfully: ${task.subject}
+evidence_join_key: ${evidenceJoinKey}
+parent_tool_use_id: ${parentToolUseId}
+resume_token: ${resumeToken}
+permission_flow: ${permissionFlow}`,
     }
   },
 } satisfies ToolDef<InputSchema, Output>)

package/tui/src/tools/TaskGetTool/TaskGetTool.ts

@@ -7,6 +7,7 @@ import {
   isTodoV2Enabled,
   TaskStatusSchema,
 } from '../../utils/tasks.js'
+import { buildAgentSupportMetadata } from '../AgentTool/orchestrationSupport.js'
 import { TASK_GET_TOOL_NAME } from './constants.js'
 import { DESCRIPTION, PROMPT } from './prompt.js'
 
@@ -29,6 +30,10 @@ const outputSchema = lazySchema(() =>
         blockedBy: z.array(z.string()),
       })
       .nullable(),
+    evidenceJoinKey: z.string(),
+    parentToolUseId: z.string(),
+    resumeToken: z.string(),
+    permissionFlow: z.literal('coordinator_parent_round_trip'),
   }),
 )
 type OutputSchema = ReturnType<typeof outputSchema>
@@ -70,8 +75,12 @@ export const TaskGetTool = buildTool({
   renderToolUseMessage() {
     return null
   },
-  async call({ taskId }) {
+  async call({ taskId }, context) {
     const taskListId = getTaskListId()
+    const supportMetadata = buildAgentSupportMetadata({
+      taskId,
+      parentToolUseId: context.toolUseId,
+    })
 
     const task = await getTask(taskListId, taskId)
 
@@ -79,6 +88,7 @@ export const TaskGetTool = buildTool({
       return {
         data: {
           task: null,
+          ...supportMetadata,
         },
       }
     }
@@ -93,16 +103,22 @@ export const TaskGetTool = buildTool({
           blocks: task.blocks,
           blockedBy: task.blockedBy,
         },
+        ...supportMetadata,
       },
     }
   },
   mapToolResultToToolResultBlockParam(content, toolUseID) {
-    const { task } = content as Output
+    const { task, evidenceJoinKey, parentToolUseId, resumeToken, permissionFlow } =
+      outputSchema().parse(content)
     if (!task) {
       return {
         tool_use_id: toolUseID,
         type: 'tool_result',
-        content: 'Task not found',
+        content: `Task not found
+evidence_join_key: ${evidenceJoinKey}
+parent_tool_use_id: ${parentToolUseId}
+resume_token: ${resumeToken}
+permission_flow: ${permissionFlow}`,
       }
     }
 
@@ -110,6 +126,10 @@ export const TaskGetTool = buildTool({
       `Task #${task.id}: ${task.subject}`,
       `Status: ${task.status}`,
       `Description: ${task.description}`,
+      `Evidence join key: ${evidenceJoinKey}`,
+      `Parent tool use ID: ${parentToolUseId}`,
+      `Resume token: ${resumeToken}`,
+      `Permission flow: ${permissionFlow}`,
     ]
 
     if (task.blockedBy.length > 0) {

package/tui/src/tools/TaskListTool/TaskListTool.ts

@@ -7,6 +7,7 @@ import {
   listTasks,
   TaskStatusSchema,
 } from '../../utils/tasks.js'
+import { buildAgentSupportMetadata } from '../AgentTool/orchestrationSupport.js'
 import { TASK_LIST_TOOL_NAME } from './constants.js'
 import { DESCRIPTION, getPrompt } from './prompt.js'
 
@@ -24,6 +25,10 @@ const outputSchema = lazySchema(() =>
         blockedBy: z.array(z.string()),
       }),
     ),
+    evidenceJoinKey: z.string(),
+    parentToolUseId: z.string(),
+    resumeToken: z.string(),
+    permissionFlow: z.literal('coordinator_parent_round_trip'),
   }),
 )
 type OutputSchema = ReturnType<typeof outputSchema>
@@ -62,7 +67,7 @@ export const TaskListTool = buildTool({
   renderToolUseMessage() {
     return null
   },
-  async call() {
+  async call(_input, context) {
     const taskListId = getTaskListId()
 
     const allTasks = (await listTasks(taskListId)).filter(
@@ -85,16 +90,25 @@ export const TaskListTool = buildTool({
     return {
       data: {
         tasks,
+        ...buildAgentSupportMetadata({
+          taskId: taskListId,
+          parentToolUseId: context.toolUseId,
+        }),
       },
     }
   },
   mapToolResultToToolResultBlockParam(content, toolUseID) {
-    const { tasks } = content as Output
+    const { tasks, evidenceJoinKey, parentToolUseId, resumeToken, permissionFlow } =
+      outputSchema().parse(content)
     if (tasks.length === 0) {
       return {
         tool_use_id: toolUseID,
         type: 'tool_result',
-        content: 'No tasks found',
+        content: `No tasks found
+evidence_join_key: ${evidenceJoinKey}
+parent_tool_use_id: ${parentToolUseId}
+resume_token: ${resumeToken}
+permission_flow: ${permissionFlow}`,
       }
     }
 
@@ -110,7 +124,11 @@ export const TaskListTool = buildTool({
     return {
       tool_use_id: toolUseID,
       type: 'tool_result',
-      content: lines.join('\n'),
+      content: `${lines.join('\n')}
+evidence_join_key: ${evidenceJoinKey}
+parent_tool_use_id: ${parentToolUseId}
+resume_token: ${resumeToken}
+permission_flow: ${permissionFlow}`,
     }
   },
 } satisfies ToolDef<InputSchema, Output>)