diff --git a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
index 059815ad..6cf14c06 100644
--- a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
@@ -106,6 +106,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
                       : 'medium'
                 }
                 renderOutputAsMarkdown={tool.renderOutputAsMarkdown}
+                config={config}
               />
             </Box>
             {tool.status === ToolCallStatus.Confirming &&
diff --git a/packages/cli/src/ui/components/messages/ToolMessage.test.tsx b/packages/cli/src/ui/components/messages/ToolMessage.test.tsx
index a3f75ef4..0ae1d3a3 100644
--- a/packages/cli/src/ui/components/messages/ToolMessage.test.tsx
+++ b/packages/cli/src/ui/components/messages/ToolMessage.test.tsx
@@ -68,6 +68,8 @@ const renderWithContext = (
 };
 
 describe('<ToolMessage />', () => {
+  const mockConfig = {} as any; // Mock config for tests
+
   const baseProps: ToolMessageProps = {
     callId: 'tool-123',
     name: 'test-tool',
@@ -77,6 +79,7 @@ describe('<ToolMessage />', () => {
     terminalWidth: 80,
     confirmationDetails: undefined,
     emphasis: 'medium',
+    config: mockConfig,
   };
 
   it('renders basic tool information', () => {
@@ -212,6 +215,7 @@ describe('<ToolMessage />', () => {
       terminalWidth: 80,
       callId: 'test-call-id-2',
       confirmationDetails: undefined,
+      config: mockConfig,
     };
 
     const { lastFrame } = renderWithContext(
diff --git a/packages/cli/src/ui/components/messages/ToolMessage.tsx b/packages/cli/src/ui/components/messages/ToolMessage.tsx
index daedbef4..c2eab256 100644
--- a/packages/cli/src/ui/components/messages/ToolMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolMessage.tsx
@@ -18,6 +18,7 @@ import { TOOL_STATUS } from '../../constants.js';
 import type {
   TodoResultDisplay,
   TaskResultDisplay,
+  Config,
 } from '@qwen-code/qwen-code-core';
 import { AgentExecutionDisplay } from '../subagents/index.js';
 
@@ -108,11 +109,13 @@ const SubagentExecutionRenderer: React.FC<{
   data: TaskResultDisplay;
   availableHeight?: number;
   childWidth: number;
-}> = ({ data, availableHeight, childWidth }) => (
+  config: Config;
+}> = ({ data, availableHeight, childWidth, config }) => (
   <AgentExecutionDisplay
     data={data}
     availableHeight={availableHeight}
     childWidth={childWidth}
+    config={config}
   />
 );
 
@@ -175,6 +178,7 @@ export interface ToolMessageProps extends IndividualToolCallDisplay {
   terminalWidth: number;
   emphasis?: TextEmphasis;
   renderOutputAsMarkdown?: boolean;
+  config: Config;
 }
 
 export const ToolMessage: React.FC<ToolMessageProps> = ({
@@ -186,6 +190,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
   terminalWidth,
   emphasis = 'medium',
   renderOutputAsMarkdown = true,
+  config,
 }) => {
   const availableHeight = availableTerminalHeight
     ? Math.max(
@@ -229,6 +234,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
                 data={displayRenderer.data}
                 availableHeight={availableHeight}
                 childWidth={childWidth}
+                config={config}
               />
             )}
             {displayRenderer.type === 'string' && (
diff --git a/packages/cli/src/ui/components/subagents/runtime/AgentExecutionDisplay.tsx b/packages/cli/src/ui/components/subagents/runtime/AgentExecutionDisplay.tsx
index 03acdaf9..d8113dd6 100644
--- a/packages/cli/src/ui/components/subagents/runtime/AgentExecutionDisplay.tsx
+++ b/packages/cli/src/ui/components/subagents/runtime/AgentExecutionDisplay.tsx
@@ -10,6 +10,7 @@ import { Colors } from '../../../colors.js';
 import type {
   TaskResultDisplay,
   SubagentStatsSummary,
+  Config,
 } from '@qwen-code/qwen-code-core';
 import { theme } from '../../../semantic-colors.js';
 import { useKeypress } from '../../../hooks/useKeypress.js';
@@ -23,6 +24,7 @@ export interface AgentExecutionDisplayProps {
   data: TaskResultDisplay;
   availableHeight?: number;
   childWidth?: number;
+  config: Config;
 }
 
 const getStatusColor = (
@@ -76,6 +78,7 @@ export const AgentExecutionDisplay: React.FC<AgentExecutionDisplayProps> = ({
   data,
   availableHeight,
   childWidth,
+  config,
 }) => {
   const [displayMode, setDisplayMode] = React.useState<DisplayMode>('default');
 
@@ -152,6 +155,7 @@ export const AgentExecutionDisplay: React.FC<AgentExecutionDisplayProps> = ({
         <Box flexDirection="column">
           <ToolConfirmationMessage
             confirmationDetails={data.pendingConfirmation}
+            config={config}
             isFocused={true}
             availableTerminalHeight={availableHeight}
             terminalWidth={childWidth ?? 80}