ummaya 0.2.4 → 0.2.6

package/tui/src/services/tools/toolExecution.ts

@@ -51,7 +51,9 @@ import {
 import {
   getAdapterToolByName,
   isAdapterToolName,
+  isRootPrimitiveToolName,
 } from '../../tools/AdapterTool/AdapterTool.js'
+import { appendRouteDiagnostic } from '../../tools/AdapterTool/routeDiagnostics.js'
 import { getAllBaseTools } from '../../tools.js'
 import type { HookProgress } from '../../types/hooks.js'
 import type {
@@ -356,7 +358,15 @@ export async function* runToolUse(
     // Only use fallback if the tool was found via alias (deprecated name)
     if (
       fallbackTool &&
-      (fallbackTool.aliases?.includes(toolName) || isAdapterToolName(toolName))
+      (fallbackTool.aliases?.includes(toolName) ||
+        isAdapterToolName(toolName) ||
+        (
+          isDeferredTool(fallbackTool) &&
+          isToolSearchToolAvailable(toolUseContext.options.tools) &&
+          extractDiscoveredToolNames(toolUseContext.messages ?? []).has(
+            fallbackTool.name,
+          )
+        ))
     ) {
       tool = fallbackTool
     }
@@ -366,6 +376,21 @@ export async function* runToolUse(
   }
   const messageId = assistantMessage.message.id
   const requestId = assistantMessage.requestId
+  const isAdapterTool = isAdapterToolName(toolName)
+  const isRouteTool = isAdapterTool || isRootPrimitiveToolName(toolName)
+  const routeTargetToolId = extractRouteTargetToolId(toolUse.input)
+  if (isRouteTool) {
+    appendRouteDiagnostic('route_tool_dispatch', {
+      tool_name: toolName,
+      tool_surface: isAdapterTool ? 'concrete_adapter' : 'root_primitive',
+      target_tool_id: routeTargetToolId,
+      tool_use_id: toolUse.id,
+      message_id: messageId,
+      request_id: requestId ?? null,
+      query_chain_id: toolUseContext.queryTracking?.chainId ?? null,
+      query_depth: toolUseContext.queryTracking?.depth ?? null,
+    })
+  }
   const mcpServerType = getMcpServerType(
     toolName,
     toolUseContext.options.mcpClients,
@@ -762,6 +787,9 @@ async function checkPermissionsAndCallTool(
   }
 
   const resultingMessages = []
+  const isAdapterTool = isAdapterToolName(tool.name)
+  const isRouteTool = isAdapterTool || isRootPrimitiveToolName(tool.name)
+  const toolSurface = isAdapterTool ? 'concrete_adapter' : 'root_primitive'
 
   // Defense-in-depth: strip _simulatedSedEdit from model-provided Bash input.
   // This field is internal-only — it must only be injected by the permission
@@ -1003,6 +1031,21 @@ async function checkPermissionsAndCallTool(
   }
 
   if (permissionDecision.behavior !== 'allow') {
+    if (isRouteTool) {
+      appendRouteDiagnostic('route_tool_permission', {
+        tool_name: tool.name,
+        tool_surface: toolSurface,
+        target_tool_id: extractRouteTargetToolId(processedInput),
+        tool_use_id: toolUseID,
+        message_id: messageId,
+        request_id: requestId ?? null,
+        query_chain_id: toolUseContext.queryTracking?.chainId ?? null,
+        query_depth: toolUseContext.queryTracking?.depth ?? null,
+        permission_mode: permissionMode,
+        permission_behavior: permissionDecision.behavior,
+        result_status: 'blocked',
+      })
+    }
     logForDebugging(`${tool.name} tool permission denied`)
     const decisionInfo = toolUseContext.toolDecisions?.get(toolUseID)
     endToolBlockedOnUserSpan('reject', decisionInfo?.source || 'unknown')
@@ -1214,6 +1257,20 @@ async function checkPermissionsAndCallTool(
     callInput = processedInput
   }
   try {
+    if (isRouteTool) {
+      appendRouteDiagnostic('route_tool_call_start', {
+        tool_name: tool.name,
+        tool_surface: toolSurface,
+        target_tool_id: extractRouteTargetToolId(callInput),
+        tool_use_id: toolUseID,
+        message_id: messageId,
+        request_id: requestId ?? null,
+        query_chain_id: toolUseContext.queryTracking?.chainId ?? null,
+        query_depth: toolUseContext.queryTracking?.depth ?? null,
+        permission_mode: permissionMode,
+        permission_behavior: permissionDecision.behavior,
+      })
+    }
     const result = await tool.call(
       callInput,
       {
@@ -1309,6 +1366,21 @@ async function checkPermissionsAndCallTool(
       : typeof mappedContent === 'string'
         ? mappedContent.length
         : jsonStringify(mappedContent).length
+    if (isRouteTool) {
+      appendRouteDiagnostic('route_tool_result', {
+        tool_name: tool.name,
+        tool_surface: toolSurface,
+        target_tool_id: extractRouteTargetToolId(callInput),
+        tool_use_id: toolUseID,
+        message_id: messageId,
+        request_id: requestId ?? null,
+        query_chain_id: toolUseContext.queryTracking?.chainId ?? null,
+        query_depth: toolUseContext.queryTracking?.depth ?? null,
+        duration_ms: durationMs,
+        result_status: 'success',
+        tool_result_size_bytes: toolResultSizeBytes,
+      })
+    }
 
     // Extract file extension for file-related tools
     let fileExtension: ReturnType<typeof getFileExtensionForAnalytics>
@@ -1605,6 +1677,21 @@ async function checkPermissionsAndCallTool(
       error: errorMessage(error),
     })
     endToolSpan()
+    if (isRouteTool) {
+      appendRouteDiagnostic('route_tool_result', {
+        tool_name: tool.name,
+        tool_surface: toolSurface,
+        target_tool_id: extractRouteTargetToolId(callInput),
+        tool_use_id: toolUseID,
+        message_id: messageId,
+        request_id: requestId ?? null,
+        query_chain_id: toolUseContext.queryTracking?.chainId ?? null,
+        query_depth: toolUseContext.queryTracking?.depth ?? null,
+        duration_ms: durationMs,
+        result_status: 'error',
+        error_kind: classifyToolError(error),
+      })
+    }
 
     // Handle MCP auth errors by updating the client status to 'needs-auth'
     // This updates the /mcp display to show the server needs re-authorization
@@ -1753,3 +1840,9 @@ async function checkPermissionsAndCallTool(
     }
   }
 }
+
+function extractRouteTargetToolId(input: unknown): string | null {
+  if (!input || typeof input !== 'object') return null
+  const value = (input as { tool_id?: unknown }).tool_id
+  return typeof value === 'string' ? value : null
+}

package/tui/src/store/pendingPermissionSlot.ts

@@ -26,7 +26,7 @@ import type { PermissionDecision } from '../ipc/codec.js'
 /** The shape exposed to PermissionGauntletModal (no resolver, no enqueued_at) */
 export interface PendingPermissionRequest {
   request_id: string
-  primitive_kind: 'find' | 'locate' | 'check' | 'send'
+  primitive_kind: 'find' | 'locate' | 'check' | 'send' | 'document'
   description_ko: string
   description_en: string
   risk_level: 'low' | 'medium' | 'high'

package/tui/src/store/session-store.ts

@@ -219,7 +219,7 @@ function sessionReducer(
       }
       const messages = new Map(state.messages)
       messages.set(action.message_id, updated)
-      return { ...state, messages }
+      return { ...state, messages, message_order: state.messages.has(action.message_id) ? state.message_order : [...state.message_order, action.message_id] }
     }
 
     case 'TOOL_RESULT': {
@@ -454,32 +454,9 @@ export const resolvePermissionDecision = _resolvePermissionDecision
 export const getActivePermission = _getActivePermission
 
 // ---------------------------------------------------------------------------
-// Derived agent-loop probes — Spec 288 Codex P1 regression fix.
-//
-// The `message_order` array is only appended to by `USER_INPUT`, the first
-// `ASSISTANT_CHUNK` for a given message_id, and `ERROR`.  `TOOL_CALL` reaches
-// the reducer with its own `msg-${call_id}` message_id and creates a synthetic
-// assistant message via `getOrCreateAssistantMessage()` — but the reducer does
-// NOT push that id onto `message_order` (see lines 206-215).  That means a
-// tool call that arrives before any assistant chunk lives in `messages` but
-// not in `message_order`, so a probe that only peeks the last entry of
-// `message_order` misreports the loop as idle.
-//
-// The previous in-tree probes in `tui.tsx` had exactly this bug:
-//   - `isAgentLoopActive` returned false when the in-flight work was a
-//     tool-call-only message (no streamed delta yet).  Downstream consumers
-//     read idle:
-//       * `session-exit` (ctrl+d) skipped its FR-015 active-loop confirmation.
-//       * `agent-interrupt` (ctrl+c) armed exit instead of cancelling.
-//   - `currentToolCallId` had the same iteration bug and returned null even
-//     when a tool call was genuinely in flight.
-//
-// The fix below derives both values from the full `messages` map so a message
-// that only exists in the map (not yet in `message_order`) still participates.
-// These helpers are pure functions — callers memoise them with
-// `React.useCallback` against the map reference, which the reducer already
-// rebuilds on every relevant mutation.  They are exported so unit tests can
-// exercise the probes without mounting the full provider tree.
+// Derived agent-loop probes — keep liveness tied to actual message state, not
+// only render order, so cancellation/exit checks keep working if ordering and
+// execution state ever diverge again.
 // ---------------------------------------------------------------------------
 
 /**
@@ -490,10 +467,9 @@ export const getActivePermission = _getActivePermission
  * visible to this probe even when no `ASSISTANT_CHUNK` has pushed its id into
  * the order array.
  *
- * Intentionally scans the full map (O(n) in message count).  Session size is
- * bounded in practice by the ring buffer Spec 032 caps on the IPC layer, and
- * each call site (`agent-interrupt`, `session-exit`) only runs on a citizen
- * keystroke — not on every render.
+ * Intentionally scans the full map (O(n) in message count). Session size is
+ * bounded in practice, and each call site runs on a citizen keystroke rather
+ * than every render.
  */
 export function computeIsAgentLoopActive(
   messages: ReadonlyMap<string, Message>,
@@ -518,11 +494,9 @@ export function computeIsAgentLoopActive(
  * Returns the `call_id` of the most recently registered tool call that has no
  * matching `tool_result`, or null when no tool call is in flight.
  *
- * Uses `messages` map insertion order — the reducer inserts a new assistant
- * message for `TOOL_CALL` via `messages.set(id, ...)`, which appends for a
- * fresh key and preserves position for an existing key (JS `Map` contract).
- * That matches the intent of "most recent" without relying on
- * `message_order`, which `TOOL_CALL` does not update.
+ * Uses `messages` map insertion order, which appends for a fresh key and
+ * preserves position for an existing key (JS `Map` contract). That matches the
+ * intent of "most recent" without depending on render ordering.
  */
 export function computeCurrentToolCallId(
   messages: ReadonlyMap<string, Message>,

package/tui/src/stubs/any-stub.ts

@@ -2,14 +2,18 @@
 // Stage-1 NO-OP stub — resolves unreachable CC-only module imports so the
 // runtime bundle loads. Real implementations are tracked in the CC TUI
 // Fidelity Meta-Epic (Epic #1633).
-/* eslint-disable @typescript-eslint/no-explicit-any */
 
-const __noop = (..._args: unknown[]): any => undefined as any
+export type StubFunction = (..._args: readonly unknown[]) => unknown
+
+const __noop = (..._args: readonly unknown[]): undefined => undefined
 
 // Smart Proxy that cooperates with primitive coercion / iteration / JSON
-const makeStub = (): any => {
-  const target = function () {} as any
-  return new Proxy(target, {
+export function createStub(): StubFunction {
+  let stub: StubFunction
+  const target = function stubTarget(..._args: readonly unknown[]): unknown {
+    return stub
+  }
+  stub = new Proxy(target, {
     get(_t, p) {
       // Well-known symbols used by JS engine during coercion
       if (p === Symbol.toPrimitive) return () => ''
@@ -28,19 +32,20 @@ const makeStub = (): any => {
       if (p === 'message') return ''
       if (p === 'stack') return ''
       if (p === 'constructor') return Object
-      return __stub
+      return stub
     },
-    apply() { return __stub },
-    construct() { return __stub },
+    apply() { return stub },
+    construct() { return stub },
   })
+  return stub
 }
 
-const __stub: any = makeStub()
+const __stub = createStub()
 
 export default __stub
 
 // Common utility exports for lodash-es-style consumers
-export const memoize = <T extends (...args: any[]) => any>(fn: T): T => fn
+export const memoize = <T>(fn: T): T => fn
 export const sample = <T>(arr: readonly T[]): T | undefined =>
   arr[Math.floor(Math.random() * arr.length)]
 export const tokenize = (input: string): unknown[] => [input]

package/tui/src/stubs/color-diff-napi.ts

@@ -2,33 +2,47 @@
 // Anthropic's internal native module is not publicly available. UMMAYA disables
 // syntax highlighting at the source level (CLAUDE_CODE_SYNTAX_HIGHLIGHT=0 is
 // the documented gate); these exports keep consumer types honest.
-/* eslint-disable @typescript-eslint/no-explicit-any */
 
 export type SyntaxTheme = {
-  name: string;
-  colors: Record<string, string>;
-};
-
-export const ColorDiff: any = class {
-  constructor(..._args: unknown[]) {}
-  diff() { return []; }
-  // Audit-3 P0-1 fix: CC StructuredDiff (TrustDialog 의 CLAUDE.md preview)
-  // 가 `colorDiff.render(theme, width, dim)` 를 호출. stub 에 render 가
-  // 없어서 fresh-install boot 시 `undefined is not a function` → React
-  // render error → process crash. UMMAYA 는 syntax highlighting 비활성
-  // 이므로 빈 배열 반환 (StructuredDiff 가 raw text fallback 으로 그림).
-  render(..._args: unknown[]) { return []; }
-};
-
-export const ColorFile: any = class {
-  constructor(..._args: unknown[]) {}
-  read() { return ''; }
-  render(..._args: unknown[]) { return []; }
-};
+  readonly name: string
+  readonly colors: Record<string, string>
+}
+
+export class ColorDiff {
+  constructor(
+    _hunk: unknown,
+    _firstLine: string | null,
+    _filePath: string,
+    _prefixContent?: string | null,
+  ) {}
+
+  diff(): string[] {
+    return []
+  }
+
+  render(_themeName: string, _width: number, _dim: boolean): string[] | null {
+    return []
+  }
+}
+
+export class ColorFile {
+  constructor(
+    _code: string,
+    _filePath: string,
+  ) {}
+
+  read(): string {
+    return ''
+  }
+
+  render(_themeName: string, _width: number, _dim: boolean): string[] | null {
+    return []
+  }
+}
 
 export const getSyntaxTheme = (..._args: unknown[]): SyntaxTheme => ({
   name: 'no-op',
   colors: {},
-});
+})
 
-export default { ColorDiff, ColorFile, getSyntaxTheme };
+export default { ColorDiff, ColorFile, getSyntaxTheme }

package/tui/src/stubs/globals.d.ts

@@ -3,8 +3,6 @@
 // TypeScript needs these to type-check the bare `MACRO.VERSION` references
 // throughout the CC 2.1.88 source.
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 declare const MACRO: {
   VERSION: string
   VERSION_CHANGELOG: string
@@ -30,7 +28,9 @@ declare type PromiseWithResolvers<T> = ReturnType<PromiseConstructor['withResolv
 
 // lodash-es sub-path modules don't ship their own .d.ts files — declare them.
 declare module 'lodash-es/memoize.js' {
-  const memoize: <T extends (...args: any[]) => any>(fn: T) => T
+  const memoize: <Args extends unknown[], Result>(
+    fn: (...args: Args) => Result,
+  ) => (...args: Args) => Result
   export default memoize
 }
 declare module 'lodash-es/mapValues.js' {

package/tui/src/stubs/macro-preload.ts

@@ -7,7 +7,16 @@
 // succeeds and the splash renders.
 //
 // Referenced from `bunfig.toml` `preload = ["./src/stubs/macro-preload.ts"]`.
-/* eslint-disable @typescript-eslint/no-explicit-any */
+
+type ProcessExit = typeof process.exit
+
+declare global {
+  namespace NodeJS {
+    interface Process {
+      _origExit?: ProcessExit
+    }
+  }
+}
 
 // ═══════════════════════════════════════════════════════════════════════
 // bun:bundle virtual module plugin
@@ -17,10 +26,8 @@
 // implementation when the bundler path supports plugin-time resolution.
 // ═══════════════════════════════════════════════════════════════════════
 try {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const bunGlobal = (globalThis as any).Bun
-  if (bunGlobal && typeof bunGlobal.plugin === 'function') {
-    bunGlobal.plugin({
+  if (typeof Bun !== 'undefined' && typeof Bun.plugin === 'function') {
+    Bun.plugin({
       name: 'ummaya-bun-bundle-shim',
       setup(build: {
         onResolve: (
@@ -56,7 +63,7 @@ try {
 // byte-stable across machines.
 import pkg from '../../package.json' with { type: 'json' }
 
-;(globalThis as any).MACRO = {
+const runtimeMacro = {
   VERSION: pkg.version,
   VERSION_CHANGELOG: 'https://github.com/umyunsang/UMMAYA/releases',
   BUILD_TIME: process.env.UMMAYA_BUILD_TIME ?? new Date(0).toISOString(),
@@ -65,7 +72,9 @@ import pkg from '../../package.json' with { type: 'json' }
     'Please open a GitHub issue at https://github.com/umyunsang/UMMAYA/issues',
   PACKAGE_URL: 'https://github.com/umyunsang/UMMAYA',
   NATIVE_PACKAGE_URL: 'https://github.com/umyunsang/UMMAYA',
-}
+} satisfies typeof MACRO
+
+Reflect.set(globalThis, 'MACRO', runtimeMacro)
 
 // ═══════════════════════════════════════════════════════════════════════
 // TTY detection shim
@@ -147,9 +156,10 @@ if (process.env.UMMAYA_DEBUG_PRELOAD === '1') {
   // the documented isTTY exit but a downstream caller is still firing
   // process.exit(1) without a stack trace). Wraps once per process; the
   // original is preserved on `process._origExit`.
-  if (!(process as any)._origExit) {
-    ;(process as any)._origExit = process.exit.bind(process)
-    process.exit = ((code?: number) => {
+  if (!process._origExit) {
+    const originalExit: ProcessExit = process.exit.bind(process)
+    process._origExit = originalExit
+    const patchedExit: ProcessExit = code => {
       try {
         const stack = new Error('process.exit caller').stack ?? ''
         require('fs').writeSync(
@@ -159,7 +169,8 @@ if (process.env.UMMAYA_DEBUG_PRELOAD === '1') {
       } catch {
         /* stderr torn down */
       }
-      return (process as any)._origExit(code)
-    }) as typeof process.exit
+      return originalExit(code)
+    }
+    process.exit = patchedExit
   }
 }