2 files changed, 19 insertions, 9 deletions
diff --git a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
index 8bcde3bb..280b4321 100644
--- a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
@@ -72,6 +72,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
                       ? 'low'
                       : 'medium'
                 }
+                renderOutputAsMarkdown={tool.renderOutputAsMarkdown}
               />
             </Box>
             {tool.status === ToolCallStatus.Confirming &&
diff --git a/packages/cli/src/ui/components/messages/ToolMessage.tsx b/packages/cli/src/ui/components/messages/ToolMessage.tsx
index 51d3dffb..0cb5a101 100644
--- a/packages/cli/src/ui/components/messages/ToolMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolMessage.tsx
@@ -21,6 +21,7 @@ export type TextEmphasis = 'high' | 'medium' | 'low';
 export interface ToolMessageProps extends IndividualToolCallDisplay {
   availableTerminalHeight: number;
   emphasis?: TextEmphasis;
+  renderOutputAsMarkdown?: boolean;
 }
 
 export const ToolMessage: React.FC<ToolMessageProps> = ({
@@ -30,6 +31,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
   status,
   availableTerminalHeight,
   emphasis = 'medium',
+  renderOutputAsMarkdown = true,
 }) => {
   const contentHeightEstimate =
     availableTerminalHeight - STATIC_HEIGHT - RESERVED_LINE_COUNT;
@@ -76,15 +78,22 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
                 </Text>
               </Box>
             )}
-            {typeof displayableResult === 'string' && (
-              <Box flexDirection="column">
-                <MarkdownDisplay
-                  text={displayableResult}
-                  isPending={false}
-                  availableTerminalHeight={availableTerminalHeight}
-                />
-              </Box>
-            )}
+            {typeof displayableResult === 'string' &&
+              renderOutputAsMarkdown && (
+                <Box flexDirection="column">
+                  <MarkdownDisplay
+                    text={displayableResult}
+                    isPending={false}
+                    availableTerminalHeight={availableTerminalHeight}
+                  />
+                </Box>
+              )}
+            {typeof displayableResult === 'string' &&
+              !renderOutputAsMarkdown && (
+                <Box flexDirection="column">
+                  <Text>{displayableResult}</Text>
+                </Box>
+              )}
             {typeof displayableResult !== 'string' && (
               <DiffRenderer
                 diffContent={displayableResult.fileDiff}