diff --git a/apps/ai-game-creator-shell/src/features/agent-runtime/model.ts b/apps/ai-game-creator-shell/src/features/agent-runtime/model.ts
index d1c3be699..1bc02ad56 100644
--- a/apps/ai-game-creator-shell/src/features/agent-runtime/model.ts
+++ b/apps/ai-game-creator-shell/src/features/agent-runtime/model.ts
@@ -2138,6 +2138,14 @@ export function projectSupervisorVisibleConversationText(
   );
 }
 
+export function projectSupervisorChatMessageText(
+  message: Pick<ChatMessage, 'text' | 'role'>,
+) {
+  return message.role === 'assistant'
+    ? projectSupervisorVisibleConversationText(message.text, message.role)
+    : message.text;
+}
+
 export function projectRuntimeVisibleToolSummary(summary: string) {
   return summary
     .split('·')
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx
index de45d73d9..ec2e6a30f 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx
@@ -20,8 +20,8 @@ import { ChatMarkdownMessage } from '../../components/ChatMarkdownMessage';
 import {
   projectProfessionalAgentLabel,
   projectRuntimeVisibleError,
+  projectSupervisorChatMessageText,
   ProjectSupervisorRuntimePanel,
-  projectSupervisorVisibleConversationText,
   projectWorkspaceStatusForDisplay,
 } from '../agent-runtime';
 import { formatAgentCardRuntimeStatus } from '../project-summary/agentPresentation';
@@ -149,14 +149,7 @@ export function ProjectSupervisorView({
             >
               <ChatMarkdownMessage
                 role={message.role}
-                text={
-                  message.role === 'assistant'
-                    ? projectSupervisorVisibleConversationText(
-                        message.text,
-                        message.role,
-                      )
-                    : message.text
-                }
+                text={projectSupervisorChatMessageText(message)}
               />
             </div>
           ))}
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ProjectWorkspaceChatPane.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectWorkspaceChatPane.tsx
index 60b9b11ba..4d7b5c8ea 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ProjectWorkspaceChatPane.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectWorkspaceChatPane.tsx
@@ -31,8 +31,8 @@ import type { ProjectAgentResultSummary } from '../../view/project-development';
 import {
   formatAgentRecentRuntimeTask,
   formatAgentRuntimeTaskQueue,
+  projectSupervisorChatMessageText,
   ProjectSupervisorRuntimePanel,
-  projectSupervisorVisibleConversationText,
   projectWorkspaceStatusForDisplay,
 } from '../agent-runtime';
 import {
@@ -808,14 +808,7 @@ export function ProjectWorkspaceChatPane({
               <div className={`message message--${message.role}`}>
                 <ChatMarkdownMessage
                   role={message.role}
-                  text={
-                    message.role === 'assistant'
-                      ? projectSupervisorVisibleConversationText(
-                          message.text,
-                          message.role,
-                        )
-                      : message.text
-                  }
+                  text={projectSupervisorChatMessageText(message)}
                 />
               </div>
               {message.draftCommand ? (
diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/SupervisorChatOnlyView.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/SupervisorChatOnlyView.tsx
index f5b59ab38..799035449 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/SupervisorChatOnlyView.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/SupervisorChatOnlyView.tsx
@@ -20,9 +20,9 @@ import { ChatMarkdownMessage } from '../../components/ChatMarkdownMessage';
 import {
   isAgentRuntimeTerminalState,
   projectRuntimeVisibleError,
+  projectSupervisorChatMessageText,
   projectSupervisorChatRuntimeStatus,
   ProjectSupervisorRuntimeControls,
-  projectSupervisorVisibleConversationText,
   projectWorkspaceStatusForDisplay,
 } from '../agent-runtime';
 import { RuntimeConfigDialog } from '../runtime-config/RuntimeConfigDialog';
@@ -188,14 +188,7 @@ export function SupervisorChatOnlyView({
             >
               <ChatMarkdownMessage
                 role={message.role}
-                text={
-                  message.role === 'assistant'
-                    ? projectSupervisorVisibleConversationText(
-                        message.text,
-                        message.role,
-                      )
-                    : message.text
-                }
+                text={projectSupervisorChatMessageText(message)}
               />
             </div>
           ))}