diff --git a/frontend/src/app/pages/AgentChat/CompactMcpBubble.tsx b/frontend/src/app/pages/AgentChat/CompactMcpBubble.tsx
index 01bbd64b..a3433ee3 100644
--- a/frontend/src/app/pages/AgentChat/CompactMcpBubble.tsx
+++ b/frontend/src/app/pages/AgentChat/CompactMcpBubble.tsx
@@ -15,7 +15,7 @@ import { GoogleServiceIcon } from './GoogleServiceIcon';
 import { ElapsedTimer, formatElapsed } from './toolBubbleChrome';
 import { useTermColors } from './toolColorize';
 import { ParsedResult } from './toolResultParsing';
-import { McpToolInfo, getMcpShortAction } from './mcpToolName';
+import { McpToolInfo, getMcpShortAction } from '@/shared/mcpToolMeta';
 import { McpResultCard } from './McpResultCard';
 
 interface CompactMcpBubbleProps {
diff --git a/frontend/src/app/pages/AgentChat/DefaultToolBubble.tsx b/frontend/src/app/pages/AgentChat/DefaultToolBubble.tsx
index 2bd44ed8..ea925909 100644
--- a/frontend/src/app/pages/AgentChat/DefaultToolBubble.tsx
+++ b/frontend/src/app/pages/AgentChat/DefaultToolBubble.tsx
@@ -17,7 +17,7 @@ import { GoogleServiceIcon } from './GoogleServiceIcon';
 import { ElapsedTimer, formatElapsed } from './toolBubbleChrome';
 import { useTermColors, colorizeInput, colorizeOutput } from './toolColorize';
 import { ParsedResult } from './toolResultParsing';
-import { McpToolInfo } from './mcpToolName';
+import { McpToolInfo } from '@/shared/mcpToolMeta';
 import { McpResultCard } from './McpResultCard';
 
 interface DefaultToolBubbleProps {
diff --git a/frontend/src/app/pages/AgentChat/ToolCallBubble.tsx b/frontend/src/app/pages/AgentChat/ToolCallBubble.tsx
index 8f6aca70..c1b947ae 100644
--- a/frontend/src/app/pages/AgentChat/ToolCallBubble.tsx
+++ b/frontend/src/app/pages/AgentChat/ToolCallBubble.tsx
@@ -12,7 +12,7 @@ import {
   getResultSummary,
   getPromptPrefix,
 } from './toolResultParsing';
-import { parseMcpToolName } from './mcpToolName';
+import { parseMcpToolName } from '@/shared/mcpToolMeta';
 import {
   isBrowserAgentTool,
   isInvokeAgentTool,
@@ -26,8 +26,8 @@ import { CreateAgentBubble } from './CreateAgentBubble';
 import { CompactMcpBubble } from './CompactMcpBubble';
 import { DefaultToolBubble } from './DefaultToolBubble';
 
-export { parseMcpToolName, getMcpShortAction } from './mcpToolName';
-export type { McpToolInfo } from './mcpToolName';
+export { parseMcpToolName, getMcpShortAction } from '@/shared/mcpToolMeta';
+export type { McpToolInfo } from '@/shared/mcpToolMeta';
 
 export interface ToolPair {
   type: 'tool_pair';
diff --git a/frontend/src/app/pages/AgentChat/agentToolParsing.ts b/frontend/src/app/pages/AgentChat/agentToolParsing.ts
index 1bec7fdc..ca0fe803 100644
--- a/frontend/src/app/pages/AgentChat/agentToolParsing.ts
+++ b/frontend/src/app/pages/AgentChat/agentToolParsing.ts
@@ -1,4 +1,4 @@
-import { parseMcpToolName } from './mcpToolName';
+import { parseMcpToolName } from '@/shared/mcpToolMeta';
 
 export function isBrowserAgentTool(name: string): boolean {
   if (name === 'CreateBrowserAgent' || name === 'BrowserAgent' || name === 'BrowserAgents') return true;
diff --git a/frontend/src/app/pages/AgentChat/mcpCardHelpers.ts b/frontend/src/app/pages/AgentChat/mcpCardHelpers.ts
index cbcae2e6..ef1e511a 100644
--- a/frontend/src/app/pages/AgentChat/mcpCardHelpers.ts
+++ b/frontend/src/app/pages/AgentChat/mcpCardHelpers.ts
@@ -1,4 +1,4 @@
-import { getGmailHeader } from './mcpToolName';
+import { getGmailHeader } from '@/shared/mcpToolMeta';
 
 export function formatTimestamp(ts: string | number | undefined): string {
   if (!ts) return '';
diff --git a/frontend/src/app/pages/AgentChat/toolColorize.tsx b/frontend/src/app/pages/AgentChat/toolColorize.tsx
index d3efdf8d..c3ae3b69 100644
--- a/frontend/src/app/pages/AgentChat/toolColorize.tsx
+++ b/frontend/src/app/pages/AgentChat/toolColorize.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useThemeMode } from '@/shared/styles/ThemeContext';
-import { parseMcpToolName } from './mcpToolName';
+import { parseMcpToolName } from '@/shared/mcpToolMeta';
 import { isBashTool } from './toolResultParsing';
 
 export interface TermColors {
diff --git a/frontend/src/app/pages/AgentChat/toolResultParsing.ts b/frontend/src/app/pages/AgentChat/toolResultParsing.ts
index 784d4a62..8413c5cf 100644
--- a/frontend/src/app/pages/AgentChat/toolResultParsing.ts
+++ b/frontend/src/app/pages/AgentChat/toolResultParsing.ts
@@ -1,6 +1,6 @@
 import { AgentMessage } from '@/shared/state/agentsSlice';
 import { prettyPath, prettyUrl, quoteQuery, bashCommandDetail } from './toolLabels';
-import { parseMcpToolName, getMcpInputSummary, getGmailHeader } from './mcpToolName';
+import { parseMcpToolName, getMcpInputSummary, getGmailHeader } from '@/shared/mcpToolMeta';
 
 export function getToolData(call: AgentMessage) {
   const content = typeof call.content === 'object' ? call.content : {};
diff --git a/frontend/src/app/pages/Dashboard/AgentCard.tsx b/frontend/src/app/pages/Dashboard/AgentCard.tsx
index 2507f7f9..47ca14b2 100644
--- a/frontend/src/app/pages/Dashboard/AgentCard.tsx
+++ b/frontend/src/app/pages/Dashboard/AgentCard.tsx
@@ -28,7 +28,7 @@ import {
 import { useAppDispatch, useAppSelector } from '@/shared/hooks';
 import { QuestionForm } from '@/app/pages/AgentChat/ApprovalBar';
 import AgentChat from '@/app/pages/AgentChat/AgentChat';
-import { parseMcpToolName, getMcpShortAction } from '@/app/pages/AgentChat/ToolCallBubble';
+import { parseMcpToolName, getMcpShortAction } from '@/shared/mcpToolMeta';
 import { useClaudeTokens } from '@/shared/styles/ThemeContext';
 import { useDashboardActive } from '@/shared/hooks/useDashboardActive';
 import { useOverlayScrollPassthrough } from './useOverlayScrollPassthrough';
diff --git a/frontend/src/app/pages/AgentChat/mcpToolName.ts b/frontend/src/shared/mcpToolMeta.ts
similarity index 100%
rename from frontend/src/app/pages/AgentChat/mcpToolName.ts
rename to frontend/src/shared/mcpToolMeta.ts