ummaya 0.2.3 → 0.2.5

package/tui/src/tools/_shared/toolChoiceRepair/supportRepair.ts

@@ -0,0 +1,135 @@
+import type { BetaToolChoiceTool } from '../../../sdk-compat.js'
+import type { Tools } from '../../../Tool.js'
+import type { Message } from '../../../types/message.js'
+import { selectRecoveredSupportToolNamesForQuery } from '../../ToolSearchTool/supportIntentHints.js'
+import { shouldSuppressDocumentToolCallsForAnswerSynthesis } from './documentRepair.js'
+import { latestUserText, textFromContent, toolUseNames } from './messageAccess.js'
+
+const AGENT_TOOL_NAME = 'Agent'
+const LIST_MCP_RESOURCES_TOOL_NAME = 'ListMcpResourcesTool'
+const WORKSPACE_BASH_TOOL_NAME = 'workspace_bash'
+const WORKSPACE_WRITE_TOOL_NAME = 'workspace_write'
+const FORCED_SUPPORT_TOOL_NAMES = new Set([
+  AGENT_TOOL_NAME,
+  LIST_MCP_RESOURCES_TOOL_NAME,
+  WORKSPACE_BASH_TOOL_NAME,
+])
+const SENSITIVE_CONTEXT_RE =
+  /(AGENTS\.md|CLAUDE\.md|system prompt|prompt-context|project instructions|\/Users\/um-yunsang\/\.claude)/iu
+
+function toolAvailable(tools: Tools, toolName: string): boolean {
+  return tools.some(tool => tool.name === toolName)
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function supportCandidateText(candidate: unknown): string {
+  if (typeof candidate === 'string') return candidate
+  if (!isRecord(candidate)) return ''
+  const message = isRecord(candidate.message) ? candidate.message : candidate
+  return textFromContent(message.content)
+}
+
+export function selectRecoveredSupportToolChoiceNameForMessages(
+  messages: readonly Message[],
+): string | undefined {
+  return selectRecoveredSupportToolNamesForQuery(latestUserText(messages)).find(
+    toolName => FORCED_SUPPORT_TOOL_NAMES.has(toolName),
+  )
+}
+
+export function shouldWithholdIgnoredSupportToolChoiceText({
+  toolChoiceName,
+  candidate,
+}: {
+  readonly toolChoiceName: string
+  readonly candidate: unknown
+}): boolean {
+  const candidateText = supportCandidateText(candidate)
+  if (candidateText.trim().length === 0) return false
+  if (toolChoiceName === LIST_MCP_RESOURCES_TOOL_NAME) return true
+  if (toolChoiceName === AGENT_TOOL_NAME) return true
+  if (toolChoiceName === WORKSPACE_BASH_TOOL_NAME) return true
+  return SENSITIVE_CONTEXT_RE.test(candidateText)
+}
+
+export function scrubIgnoredSupportToolChoiceMessage({
+  toolChoiceName,
+  candidate,
+}: {
+  readonly toolChoiceName: string
+  readonly candidate: unknown
+}): string | undefined {
+  return shouldWithholdIgnoredSupportToolChoiceText({ toolChoiceName, candidate })
+    ? ''
+    : undefined
+}
+
+export function buildIgnoredSupportToolChoiceBlockedText(
+  toolChoiceName: string,
+  toolChoiceAvailable = true,
+): string {
+  if (toolChoiceName === WORKSPACE_BASH_TOOL_NAME) {
+    const reason = toolChoiceAvailable
+      ? 'provider ignored forced workspace_bash tool_choice.'
+      : 'workspace_bash 도구가 현재 TUI 도구 풀에 없어 셸 권한 경계를 실행할 수 없습니다.'
+    return [
+      '셸 실행 차단: workspace_bash 호출을 강제했지만 모델 응답에 셸 도구 경계가 포함되지 않았습니다.',
+      `이유: ${reason}`,
+      'git 상태 확인이나 삭제 명령은 텍스트 안내로 대체하지 않습니다.',
+    ].join(' ')
+  }
+  if (toolChoiceName === WORKSPACE_WRITE_TOOL_NAME) {
+    const reason = toolChoiceAvailable
+      ? 'provider ignored forced workspace_write tool_choice.'
+      : 'workspace_write 도구가 현재 TUI 도구 풀에 없어 파일 쓰기 권한 경계를 실행할 수 없습니다.'
+    return [
+      '작업공간 쓰기 차단: workspace_write 호출을 강제했지만 모델 응답에 파일 쓰기 도구 경계가 포함되지 않았습니다.',
+      `이유: ${reason}`,
+      '파일 변경은 텍스트 안내로 대체하지 않습니다.',
+    ].join(' ')
+  }
+  if (toolChoiceName === LIST_MCP_RESOURCES_TOOL_NAME) {
+    const reason = toolChoiceAvailable
+      ? 'provider ignored forced ListMcpResourcesTool tool_choice.'
+      : 'ListMcpResourcesTool 도구가 현재 TUI 도구 풀에 없어 MCP 리소스 목록을 실행할 수 없습니다.'
+    return [
+      'MCP 리소스 조회 차단: ListMcpResourcesTool 호출을 강제했지만 모델 응답에 MCP 도구 경계가 포함되지 않았습니다.',
+      `이유: ${reason}`,
+      '민감한 프로젝트 지침이나 system prompt 내용은 표시하지 않습니다.',
+    ].join(' ')
+  }
+  const reason = toolChoiceAvailable
+    ? 'provider ignored forced Agent tool_choice.'
+    : 'Agent 도구가 기본 TUI 도구 풀에 없어 provider/query-loop support choice를 실행할 수 없습니다.'
+  return [
+    '에이전트 위임 차단: Agent 도구 호출을 강제했지만 모델 응답에 Agent/Task 도구 경계가 포함되지 않았습니다.',
+    `이유: ${reason}`,
+    '진행/취소 상태를 표시할 수 없어 차단했습니다.',
+    '구체적인 조사 주제를 주시면 Agent 진행/취소 경계가 보이는 상태로 다시 시도하겠습니다.',
+  ].join(' ')
+}
+
+export function shouldSuppressUmmayaToolCallsForAnswerSynthesis({
+  messages,
+  tools,
+}: {
+  readonly messages: readonly Message[]
+  readonly tools: Tools
+}): boolean {
+  if (shouldSuppressDocumentToolCallsForAnswerSynthesis({ messages })) {
+    return true
+  }
+  const recovered = selectRecoveredSupportToolNamesForQuery(latestUserText(messages))
+  return recovered.some(toolName => toolAvailable(tools, toolName)) &&
+    !recovered.some(toolName => toolUseNames(messages).has(toolName))
+}
+
+export function selectUmmayaToolChoiceOverride(_params: {
+  readonly messages: readonly Message[]
+  readonly tools: Tools
+}): BetaToolChoiceTool | undefined {
+  return undefined
+}

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

@@ -0,0 +1,61 @@
+import type { Tools } from '../../Tool.js'
+import type { Message } from '../../types/message.js'
+import type { BetaToolChoiceTool } from '../../sdk-compat.js'
+
+export interface UmmayaTuiRepairPolicy {
+  readonly id: string
+  readonly kind: 'display_or_answer_repair'
+  readonly owner: string
+  readonly evidenceEvent: string
+  readonly removalCondition: string
+}
+
+export interface UmmayaBackendRepairReceipt {
+  readonly source: 'backend_route_decision' | 'backend_validation'
+  readonly reason: string
+  readonly evidenceEvent: string
+  readonly toolName?: string
+}
+
+export interface ForcedUmmayaToolUse {
+  readonly name: string
+  readonly input: Record<string, unknown>
+}
+
+export const UMMAYA_TUI_REPAIR_POLICIES: readonly UmmayaTuiRepairPolicy[] = []
+
+export {
+  backfillUmmayaObservableToolInputFromUserQuery,
+  buildDocumentCompletionPromptIfNeeded,
+  buildIgnoredDocumentToolChoiceBlockedText,
+  repairUmmayaDocumentToolInputForDispatch,
+  repairUmmayaExplicitDocumentToolUseFromUserQuery,
+  selectRecoveredDocumentToolChoiceNameForMessages,
+  selectUmmayaClientForcedToolUse,
+  shouldSuppressDocumentToolCallsForAnswerSynthesis,
+  shouldWithholdIgnoredDocumentToolChoiceText,
+} from './toolChoiceRepair/documentRepair.js'
+export {
+  buildIgnoredSupportToolChoiceBlockedText,
+  scrubIgnoredSupportToolChoiceMessage,
+  selectRecoveredSupportToolChoiceNameForMessages,
+  shouldSuppressUmmayaToolCallsForAnswerSynthesis,
+  shouldWithholdIgnoredSupportToolChoiceText,
+} from './toolChoiceRepair/supportRepair.js'
+export {
+  buildGenericPendingFinalAnswerRepairPromptIfNeeded,
+  buildGenericPendingFinalAnswerToolUseBlockedText,
+  selectUmmayaClientForcedToolUseForPublicData,
+  shouldBlockToolUseAfterGenericPendingFinalAnswerRepair,
+  shouldWithholdGenericPendingFinalAnswer,
+} from './toolChoiceRepair/publicDataRepair.js'
+export {
+  selectRecoveredSupportToolChoiceNameForMessages as selectRecoveredSupportToolChoiceNameForMessagesFromSupportRepair,
+} from './toolChoiceRepair/supportRepair.js'
+
+export function selectUmmayaToolChoiceOverride(_params: {
+  readonly messages: readonly Message[]
+  readonly tools: Tools
+}): BetaToolChoiceTool | undefined {
+  return undefined
+}

package/tui/src/tools/shared/mockDisclaimer.ts

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // UMMAYA-original — Audit-2 P0 fix · mock disclaimer helpers.
 //
-// Citizen-safety directive: any tool result whose payload contains
+// Citizen-safety directive: each tool result whose payload contains
 // ``_mode === "mock"`` MUST display a prominent disclaimer so citizens
 // immediately recognise that no real administrative action was taken.
 //

package/tui/src/tools.ts

@@ -6,163 +6,36 @@ import { LookupPrimitive } from './tools/LookupPrimitive/LookupPrimitive.js'
 import { ResolveLocationPrimitive } from './tools/ResolveLocationPrimitive/ResolveLocationPrimitive.js'
 import { SubmitPrimitive } from './tools/SubmitPrimitive/SubmitPrimitive.js'
 import { VerifyPrimitive } from './tools/VerifyPrimitive/VerifyPrimitive.js'
+import { DocumentPrimitive } from './tools/DocumentPrimitive/DocumentPrimitive.js'
 import { getAdapterTools } from './tools/AdapterTool/AdapterTool.js'
-import { TranslateTool } from './tools/TranslateTool/TranslateTool.js'
-import { CalculatorTool } from './tools/CalculatorTool/CalculatorTool.js'
-import { DateParserTool } from './tools/DateParserTool/DateParserTool.js'
-import { ExportPDFTool } from './tools/ExportPDFTool/ExportPDFTool.js'
-import { BashTool } from './tools/BashTool/BashTool.js'
-import { FileEditTool } from './tools/FileEditTool/FileEditTool.js'
-import { FileReadTool } from './tools/FileReadTool/FileReadTool.js'
-import { FileWriteTool } from './tools/FileWriteTool/FileWriteTool.js'
-import { GlobTool } from './tools/GlobTool/GlobTool.js'
-import { NotebookEditTool } from './tools/NotebookEditTool/NotebookEditTool.js'
-import { WebFetchTool } from './tools/WebFetchTool/WebFetchTool.js'
-import { TaskStopTool } from './tools/TaskStopTool/TaskStopTool.js'
-import { BriefTool } from './tools/BriefTool/BriefTool.js'
-// Dead code elimination: conditional import for ant-only tools
-/* eslint-disable custom-rules/no-process-env-top-level, @typescript-eslint/no-require-imports */
-const REPLTool =
-  process.env.USER_TYPE === 'ant'
-    ? require('./tools/REPLTool/REPLTool.js').REPLTool
-    : null
-const SuggestBackgroundPRTool =
-  process.env.USER_TYPE === 'ant'
-    ? require('./tools/SuggestBackgroundPRTool/SuggestBackgroundPRTool.js')
-        .SuggestBackgroundPRTool
-    : null
-const SleepTool =
-  feature('PROACTIVE') || feature('KAIROS')
-    ? require('./tools/SleepTool/SleepTool.js').SleepTool
-    : null
-const cronTools = feature('AGENT_TRIGGERS')
-  ? [
-      require('./tools/ScheduleCronTool/CronCreateTool.js').CronCreateTool,
-      require('./tools/ScheduleCronTool/CronDeleteTool.js').CronDeleteTool,
-      require('./tools/ScheduleCronTool/CronListTool.js').CronListTool,
-    ]
-  : []
-const RemoteTriggerTool = feature('AGENT_TRIGGERS_REMOTE')
-  ? require('./tools/RemoteTriggerTool/RemoteTriggerTool.js').RemoteTriggerTool
-  : null
-const MonitorTool = feature('MONITOR_TOOL')
-  ? require('./tools/MonitorTool/MonitorTool.js').MonitorTool
-  : null
-const SendUserFileTool = feature('KAIROS')
-  ? require('./tools/SendUserFileTool/SendUserFileTool.js').SendUserFileTool
-  : null
-const PushNotificationTool =
-  feature('KAIROS') || feature('KAIROS_PUSH_NOTIFICATION')
-    ? require('./tools/PushNotificationTool/PushNotificationTool.js')
-        .PushNotificationTool
-    : null
-const SubscribePRTool = feature('KAIROS_GITHUB_WEBHOOKS')
-  ? require('./tools/SubscribePRTool/SubscribePRTool.js').SubscribePRTool
-  : null
-/* eslint-enable custom-rules/no-process-env-top-level, @typescript-eslint/no-require-imports */
-import { TaskOutputTool } from './tools/TaskOutputTool/TaskOutputTool.js'
-import { WebSearchTool } from './tools/WebSearchTool/WebSearchTool.js'
-import { TodoWriteTool } from './tools/TodoWriteTool/TodoWriteTool.js'
-import { ExitPlanModeV2Tool } from './tools/ExitPlanModeTool/ExitPlanModeV2Tool.js'
-import { TestingPermissionTool } from './tools/testing/TestingPermissionTool.js'
-import { GrepTool } from './tools/GrepTool/GrepTool.js'
-import { TungstenTool } from './tools/TungstenTool/TungstenTool.js'
-// Lazy require to break circular dependency: tools.ts -> TeamCreateTool/TeamDeleteTool -> ... -> tools.ts
-/* eslint-disable @typescript-eslint/no-require-imports */
-const getTeamCreateTool = () =>
-  require('./tools/TeamCreateTool/TeamCreateTool.js')
-    .TeamCreateTool as typeof import('./tools/TeamCreateTool/TeamCreateTool.js').TeamCreateTool
-const getTeamDeleteTool = () =>
-  require('./tools/TeamDeleteTool/TeamDeleteTool.js')
-    .TeamDeleteTool as typeof import('./tools/TeamDeleteTool/TeamDeleteTool.js').TeamDeleteTool
-const getSendMessageTool = () =>
-  require('./tools/SendMessageTool/SendMessageTool.js')
-    .SendMessageTool as typeof import('./tools/SendMessageTool/SendMessageTool.js').SendMessageTool
-/* eslint-enable @typescript-eslint/no-require-imports */
-import { AskUserQuestionTool } from './tools/AskUserQuestionTool/AskUserQuestionTool.js'
-import { LSPTool } from './tools/LSPTool/LSPTool.js'
-import { ListMcpResourcesTool } from './tools/ListMcpResourcesTool/ListMcpResourcesTool.js'
-import { ReadMcpResourceTool } from './tools/ReadMcpResourceTool/ReadMcpResourceTool.js'
 import { ToolSearchTool } from './tools/ToolSearchTool/ToolSearchTool.js'
-import { EnterPlanModeTool } from './tools/EnterPlanModeTool/EnterPlanModeTool.js'
-import { EnterWorktreeTool } from './tools/EnterWorktreeTool/EnterWorktreeTool.js'
-import { ExitWorktreeTool } from './tools/ExitWorktreeTool/ExitWorktreeTool.js'
-import { ConfigTool } from './tools/ConfigTool/ConfigTool.js'
-import { TaskCreateTool } from './tools/TaskCreateTool/TaskCreateTool.js'
-import { TaskGetTool } from './tools/TaskGetTool/TaskGetTool.js'
-import { TaskUpdateTool } from './tools/TaskUpdateTool/TaskUpdateTool.js'
-import { TaskListTool } from './tools/TaskListTool/TaskListTool.js'
+import { getWorkspaceTools } from './tools/WorkspaceToolAdapter/WorkspaceToolAdapter.js'
 import uniqBy from 'lodash-es/uniqBy.js'
-import { isToolSearchEnabledOptimistic } from './utils/toolSearch.js'
-import { isTodoV2Enabled } from './utils/tasks.js'
-// Dead code elimination: conditional import for CLAUDE_CODE_VERIFY_PLAN
-/* eslint-disable custom-rules/no-process-env-top-level, @typescript-eslint/no-require-imports */
-const VerifyPlanExecutionTool =
-  process.env.CLAUDE_CODE_VERIFY_PLAN === 'true'
-    ? require('./tools/VerifyPlanExecutionTool/VerifyPlanExecutionTool.js')
-        .VerifyPlanExecutionTool
-    : null
-/* eslint-enable custom-rules/no-process-env-top-level, @typescript-eslint/no-require-imports */
-import { SYNTHETIC_OUTPUT_TOOL_NAME } from './tools/SyntheticOutputTool/SyntheticOutputTool.js'
 export {
   ALL_AGENT_DISALLOWED_TOOLS,
   CUSTOM_AGENT_DISALLOWED_TOOLS,
   ASYNC_AGENT_ALLOWED_TOOLS,
   COORDINATOR_MODE_ALLOWED_TOOLS,
 } from './constants/tools.js'
-import { feature } from 'bun:bundle'
-// Dead code elimination: conditional import for OVERFLOW_TEST_TOOL
-/* eslint-disable custom-rules/no-process-env-top-level, @typescript-eslint/no-require-imports */
-const OverflowTestTool = feature('OVERFLOW_TEST_TOOL')
-  ? require('./tools/OverflowTestTool/OverflowTestTool.js').OverflowTestTool
-  : null
-const CtxInspectTool = feature('CONTEXT_COLLAPSE')
-  ? require('./tools/CtxInspectTool/CtxInspectTool.js').CtxInspectTool
-  : null
-const TerminalCaptureTool = feature('TERMINAL_PANEL')
-  ? require('./tools/TerminalCaptureTool/TerminalCaptureTool.js')
-      .TerminalCaptureTool
-  : null
-const WebBrowserTool = feature('WEB_BROWSER_TOOL')
-  ? require('./tools/WebBrowserTool/WebBrowserTool.js').WebBrowserTool
-  : null
-const coordinatorModeModule = feature('COORDINATOR_MODE')
-  ? (require('./coordinator/coordinatorMode.js') as typeof import('./coordinator/coordinatorMode.js'))
-  : null
-const SnipTool = feature('HISTORY_SNIP')
-  ? require('./tools/SnipTool/SnipTool.js').SnipTool
-  : null
-const ListPeersTool = feature('UDS_INBOX')
-  ? require('./tools/ListPeersTool/ListPeersTool.js').ListPeersTool
-  : null
-const WorkflowTool = feature('WORKFLOW_SCRIPTS')
-  ? (() => {
-      require('./tools/WorkflowTool/bundled/index.js').initBundledWorkflows()
-      return require('./tools/WorkflowTool/WorkflowTool.js').WorkflowTool
-    })()
-  : null
-/* eslint-enable custom-rules/no-process-env-top-level, @typescript-eslint/no-require-imports */
 import type { ToolPermissionContext } from './Tool.js'
 import { getDenyRuleForTool } from './utils/permissions/permissions.js'
-import { hasEmbeddedSearchTools } from './utils/embeddedTools.js'
 import { isEnvTruthy } from './utils/envUtils.js'
-import { isPowerShellToolEnabled } from './utils/shell/shellToolUtils.js'
-import { isAgentSwarmsEnabled } from './utils/agentSwarmsEnabled.js'
-import { isWorktreeModeEnabled } from './utils/worktreeModeEnabled.js'
 import {
+  areCcSupportToolsEnabled,
+  getCcSupportCapabilityTools,
+  getSupportSimpleModeTools,
   REPL_TOOL_NAME,
   REPL_ONLY_TOOLS,
   isReplModeEnabled,
-} from './tools/REPLTool/constants.js'
-export { REPL_ONLY_TOOLS }
-/* eslint-disable @typescript-eslint/no-require-imports */
-const getPowerShellTool = () => {
-  if (!isPowerShellToolEnabled()) return null
-  return (
-    require('./tools/PowerShellTool/PowerShellTool.js') as typeof import('./tools/PowerShellTool/PowerShellTool.js')
-  ).PowerShellTool
-}
-/* eslint-enable @typescript-eslint/no-require-imports */
+} from './tools/ToolSearchTool/ccSupportTools.js'
+import { isModelFacingMcpTool } from './tools/WorkspaceToolAdapter/mcpExposurePolicy.js'
+
+export { REPL_ONLY_TOOLS, areCcSupportToolsEnabled }
+export {
+  MCP_MODEL_EXPOSURE_SERVER_CLASSES,
+  classifyMcpServerForModelExposure,
+  type McpModelExposureServerClass,
+} from './tools/WorkspaceToolAdapter/mcpExposurePolicy.js'
 
 /**
  * Predefined tool presets that can be used with --tools flag
@@ -186,7 +59,7 @@ export function parseToolPreset(preset: string): ToolPreset | null {
  * @returns Array of tool names
  */
 export function getToolsForDefaultPreset(): string[] {
-  const tools = getAllBaseTools()
+  const tools = getModelFacingBaseTools()
   const isEnabled = tools.map(tool => tool.isEnabled())
   return tools.filter((_, i) => isEnabled[i]).map(tool => tool.name)
 }
@@ -199,7 +72,7 @@ export function getToolsForDefaultPreset(): string[] {
 /**
  * NOTE: This MUST stay in sync with https://console.statsig.com/4aF3Ewatb6xPVpCwxb5nA3/dynamic_configs/claude_code_global_system_caching, in order to cache the system prompt across users.
  */
-export function getAllBaseTools(): Tools {
+export function getModelFacingBaseTools(): Tools {
   return [
     // UMMAYA tool-surface swap: keep Claude Code's registry shape, but make
     // the built-in model-facing catalog the Korean public-service primitives.
@@ -208,9 +81,18 @@ export function getAllBaseTools(): Tools {
     ResolveLocationPrimitive,
     SubmitPrimitive,
     VerifyPrimitive,
+    DocumentPrimitive,
+    ...getWorkspaceTools(),
   ]
 }
 
+export function getAllBaseTools(): Tools {
+  return uniqBy(
+    [...getModelFacingBaseTools(), ...getCcSupportCapabilityTools()],
+    'name',
+  )
+}
+
 /**
  * Filters out tools that are blanket-denied by the permission context.
  * A tool is filtered out if there's a deny rule matching its name with no
@@ -229,56 +111,19 @@ export function filterToolsByDenyRules<
   return tools.filter(tool => !getDenyRuleForTool(permissionContext, tool))
 }
 
-function isUmmayaModelFacingMcpTool(tool: {
-  name: string
-  mcpInfo?: { serverName: string; toolName: string }
-}): boolean {
-  return (
-    tool.mcpInfo?.serverName === 'ummaya' ||
-    tool.name.startsWith('mcp__ummaya__')
-  )
-}
-
 export const getTools = (permissionContext: ToolPermissionContext): Tools => {
-  // Simple mode: only Bash, Read, and Edit tools
   if (isEnvTruthy(process.env.CLAUDE_CODE_SIMPLE)) {
-    // --bare + REPL mode: REPL wraps Bash/Read/Edit/etc inside the VM, so
-    // return REPL instead of the raw primitives. Matches the non-bare path
-    // below which also hides REPL_ONLY_TOOLS when REPL is enabled.
-    if (isReplModeEnabled() && REPLTool) {
-      const replSimple: Tool[] = getAllBaseTools()
-      if (
-        feature('COORDINATOR_MODE') &&
-        coordinatorModeModule?.isCoordinatorMode()
-      ) {
-        replSimple.push(TaskStopTool, getSendMessageTool())
-      }
-      return filterToolsByDenyRules(replSimple, permissionContext)
-    }
-    const simpleTools: Tool[] = getAllBaseTools()
-    // When coordinator mode is also active, include AgentTool and TaskStopTool
-    // so the coordinator gets Task+TaskStop (via useMergedTools filtering) and
-    // workers get Bash/Read/Edit (via filterToolsForAgent filtering).
-    if (
-      feature('COORDINATOR_MODE') &&
-      coordinatorModeModule?.isCoordinatorMode()
-    ) {
-      simpleTools.push(AgentTool, TaskStopTool, getSendMessageTool())
-    }
-    return filterToolsByDenyRules(simpleTools, permissionContext)
+    return filterToolsByDenyRules(
+      getSupportSimpleModeTools(getModelFacingBaseTools()),
+      permissionContext,
+    )
   }
 
-  // Get all base tools and filter out special tools that get added conditionally
-  const specialTools = new Set([
-    ListMcpResourcesTool.name,
-    ReadMcpResourceTool.name,
-    SYNTHETIC_OUTPUT_TOOL_NAME,
-  ])
-
-  const tools = getAllBaseTools().filter(tool => !specialTools.has(tool.name))
-
   // Filter out tools that are denied by the deny rules
-  let allowedTools = filterToolsByDenyRules(tools, permissionContext)
+  let allowedTools = filterToolsByDenyRules(
+    getModelFacingBaseTools(),
+    permissionContext,
+  )
 
   // When REPL mode is enabled, hide primitive tools from direct use.
   // They're still accessible inside REPL via the VM context.
@@ -323,7 +168,7 @@ export function assembleToolPool(
   const allowedMcpTools = filterToolsByDenyRules(
     mcpTools,
     permissionContext,
-  ).filter(isUmmayaModelFacingMcpTool)
+  ).filter(tool => isModelFacingMcpTool(tool, permissionContext))
 
   // Sort each partition for prompt-cache stability, keeping built-ins as a
   // contiguous prefix. The server's claude_code_system_cache_policy places a
@@ -359,5 +204,9 @@ export function getMergedTools(
   mcpTools: Tools,
 ): Tools {
   const builtInTools = getTools(permissionContext)
-  return [...builtInTools, ...mcpTools.filter(isUmmayaModelFacingMcpTool)]
+  const allowedMcpTools = filterToolsByDenyRules(
+    mcpTools,
+    permissionContext,
+  ).filter(tool => isModelFacingMcpTool(tool, permissionContext))
+  return [...builtInTools, ...allowedMcpTools]
 }

package/tui/src/types/fileSuggestion.ts

@@ -1,32 +1,10 @@
 // [P0 reconstructed · rebuild-stubs.ts · symbol-complete stub]
 // Aggregated from every consumer import across src/.
-/* eslint-disable @typescript-eslint/no-explicit-any */
+import { createStub } from '../stubs/any-stub'
 
-const __noop = (..._args: unknown[]): any => undefined as any;
-const __stub: any = new Proxy(function () {} as any, {
-  get(_t, p) {
-    if (p === Symbol.toPrimitive) return () => ""
-    if (p === Symbol.iterator) return function* () {}
-    if (p === Symbol.asyncIterator) return async function* () {}
-    if (p === Symbol.toStringTag) return "Stub"
-    if (p === Symbol.for("nodejs.util.inspect.custom")) return () => "<Stub>"
-    if (p === "inspect") return () => "<Stub>"
-    if (p === "then") return undefined
-    if (p === "toString") return () => ""
-    if (p === "valueOf") return () => undefined
-    if (p === "toJSON") return () => null
-    if (p === "length") return 0
-    if (p === "name") return "Stub"
-    if (p === "message") return ""
-    if (p === "stack") return ""
-    if (p === "constructor") return Object
-    return __stub
-  },
-  apply() { return __stub },
-  construct() { return __stub },
-});
+const __stub = createStub()
 
-export type FileSuggestionCommandInput = any;
-export const FileSuggestionCommandInput: any = __stub;
+export type FileSuggestionCommandInput = unknown;
+export const FileSuggestionCommandInput = __stub;
 
 export default __stub;