Skip to content

Commit 61c405a

Browse files
j15zj15z
authored
fix(chat): copy orchestrator responses as markdown (#6903)
1 parent e406b8a commit 61c405a

7 files changed

Lines changed: 167 additions & 44 deletions

File tree

‎apps/sim/app/workspace/[workspaceId]/components/message-actions/message-actions.tsx‎

Lines changed: 17 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
ThumbsUp,
1616
Tooltip,
1717
toast,
18+
useCopyToClipboard,
1819
} from '@sim/emcn'
1920
import { useParams, useRouter } from 'next/navigation'
2021
import { isLiveAssistantMessageId } from '@/lib/copilot/chat/effective-transcript'
@@ -23,82 +24,54 @@ import { useSubmitCopilotFeedback } from '@/hooks/queries/copilot-feedback'
2324
import { useForkMothershipChat } from '@/hooks/queries/mothership-chats'
2425
import { useFolderStore } from '@/stores/folders/store'
2526

26-
const SPECIAL_TAGS = 'thinking|options|usage_upgrade|credential|mothership-error|file|question'
27-
28-
function toPlainText(raw: string): string {
29-
return (
30-
raw
31-
// Strip special tags and their contents
32-
.replace(new RegExp(`<\\/?(${SPECIAL_TAGS})(?:>[\\s\\S]*?<\\/(${SPECIAL_TAGS})>|>)`, 'g'), '')
33-
// Strip markdown
34-
.replace(/^#{1,6}\s+/gm, '')
35-
.replace(/\*\*(.+?)\*\*/g, '$1')
36-
.replace(/\*(.+?)\*/g, '$1')
37-
.replace(/`{3}[\s\S]*?`{3}/g, '')
38-
.replace(/`(.+?)`/g, '$1')
39-
.replace(/\[([^\]]+)\]\([^)]+\)/g, '$1')
40-
.replace(/^[>\-*]\s+/gm, '')
41-
.replace(/!\[[^\]]*\]\([^)]+\)/g, '')
42-
// Normalize whitespace
43-
.replace(/\n{3,}/g, '\n\n')
44-
.trim()
45-
)
46-
}
47-
4827
const ICON_CLASS = 'size-[14px]'
4928
const BUTTON_CLASS =
5029
'flex size-[26px] items-center justify-center rounded-[6px] text-[var(--text-icon)] transition-colors hover-hover:bg-[var(--surface-hover)] focus-visible:outline-none'
5130

5231
interface MessageActionsProps {
5332
content: string
33+
getCopyContent?: () => string
34+
hasCopyContent?: boolean
35+
prepareContentForCopy?: (content: string) => string
5436
userQuery?: string
5537
requestId?: string
5638
messageId?: string
5739
}
5840

5941
export const MessageActions = memo(function MessageActions({
6042
content,
43+
getCopyContent,
44+
hasCopyContent,
45+
prepareContentForCopy,
6146
userQuery,
6247
requestId,
6348
messageId,
6449
}: MessageActionsProps) {
6550
const router = useRouter()
6651
const params = useParams<{ workspaceId: string }>()
6752
const { chatId } = useChatSurface()
68-
const [copied, setCopied] = useState(false)
53+
const { copied, copy: copyMessage } = useCopyToClipboard({ resetMs: 1500 })
6954
const [copiedRequestId, setCopiedRequestId] = useState(false)
7055
const [pendingFeedback, setPendingFeedback] = useState<'up' | 'down' | null>(null)
7156
const [feedbackText, setFeedbackText] = useState('')
72-
const resetTimeoutRef = useRef<number | null>(null)
7357
const requestIdTimeoutRef = useRef<number | null>(null)
7458
const submitFeedback = useSubmitCopilotFeedback()
7559
const forkChat = useForkMothershipChat(params.workspaceId)
7660

7761
useEffect(() => {
7862
return () => {
79-
if (resetTimeoutRef.current !== null) {
80-
window.clearTimeout(resetTimeoutRef.current)
81-
}
8263
if (requestIdTimeoutRef.current !== null) {
8364
window.clearTimeout(requestIdTimeoutRef.current)
8465
}
8566
}
8667
}, [])
8768

88-
const copyToClipboard = async () => {
89-
if (!content) return
90-
const text = toPlainText(content)
91-
if (!text) return
92-
try {
93-
await navigator.clipboard.writeText(text)
94-
setCopied(true)
95-
if (resetTimeoutRef.current !== null) {
96-
window.clearTimeout(resetTimeoutRef.current)
97-
}
98-
resetTimeoutRef.current = window.setTimeout(() => setCopied(false), 1500)
99-
} catch {
100-
/* clipboard unavailable */
101-
}
69+
const copyToClipboard = () => {
70+
const contentToCopy = getCopyContent?.() ?? content
71+
if (!contentToCopy) return
72+
const markdown = prepareContentForCopy?.(contentToCopy) ?? contentToCopy
73+
if (!markdown) return
74+
void copyMessage(markdown)
10275
}
10376

10477
const copyRequestId = async () => {
@@ -166,18 +139,18 @@ export const MessageActions = memo(function MessageActions({
166139
}
167140
}
168141

169-
const hasContent = Boolean(content)
142+
const canCopyContent = hasCopyContent ?? Boolean(content)
170143
const canSubmitFeedback = Boolean(chatId && userQuery)
171144
// A live (just-streamed) assistant message carries a synthetic id that the
172145
// persisted transcript doesn't know — forking it would 400. The button
173146
// appears once the transcript refetch swaps in the persisted message id.
174147
const canFork = Boolean(chatId && messageId && !isLiveAssistantMessageId(messageId))
175-
if (!hasContent && !canSubmitFeedback && !canFork) return null
148+
if (!canCopyContent && !canSubmitFeedback && !canFork) return null
176149

177150
return (
178151
<>
179152
<div className='flex items-center gap-0.5'>
180-
{hasContent && (
153+
{canCopyContent && (
181154
<Tooltip.Root>
182155
<Tooltip.Trigger asChild>
183156
<button

‎apps/sim/app/workspace/[workspaceId]/home/components/message-content/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export {
22
assistantMessageHasRenderableContent,
3+
getOrchestratorMessageText,
34
MessageContent,
45
} from './message-content'
56
export type { MessagePhase } from './utils'

‎apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.test.ts‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import type { ContentBlock } from '../../types'
2727
import {
2828
assistantMessageHasVisibleExecutingTool,
2929
deriveThinkingLabel,
30+
getOrchestratorMessageText,
3031
parseBlocks,
3132
shouldSmoothTextSegment,
3233
} from './message-content'
@@ -100,6 +101,66 @@ function toolEnvelope(
100101
} as PersistedStreamEventEnvelope
101102
}
102103

104+
describe('getOrchestratorMessageText', () => {
105+
it('copies only orchestrator text from span-based messages', () => {
106+
const blocks: ContentBlock[] = [
107+
subagentStart('research', 'span-visible', 'main'),
108+
{
109+
type: 'subagent_text',
110+
content: 'Visible research. ',
111+
spanId: 'span-visible',
112+
timestamp: 2,
113+
},
114+
{
115+
type: 'subagent_text',
116+
content: 'Hidden orphan. ',
117+
spanId: 'span-orphan',
118+
timestamp: 3,
119+
},
120+
mainText('Main answer.'),
121+
]
122+
123+
expect(getOrchestratorMessageText(blocks, 'Fallback.')).toBe('Main answer.')
124+
})
125+
126+
it('copies only orchestrator text from legacy messages', () => {
127+
const blocks: ContentBlock[] = [
128+
{ type: 'subagent_text', content: 'Hidden orphan. ', timestamp: 1 },
129+
{
130+
type: 'subagent',
131+
content: 'research',
132+
parentToolCallId: 'dispatch-visible',
133+
timestamp: 2,
134+
},
135+
{
136+
type: 'subagent_text',
137+
content: 'Visible research. ',
138+
parentToolCallId: 'dispatch-visible',
139+
timestamp: 3,
140+
},
141+
mainText('Main answer.'),
142+
]
143+
144+
expect(getOrchestratorMessageText(blocks, 'Fallback.')).toBe('Main answer.')
145+
})
146+
147+
it('separates orchestrator text blocks around excluded subagent output', () => {
148+
const blocks: ContentBlock[] = [
149+
mainText('Starting answer.'),
150+
subagentStart('research', 'span-visible', 'main'),
151+
{
152+
type: 'subagent_text',
153+
content: 'Visible research.',
154+
spanId: 'span-visible',
155+
timestamp: 2,
156+
},
157+
mainText('Main answer.'),
158+
]
159+
160+
expect(getOrchestratorMessageText(blocks, 'Fallback.')).toBe('Starting answer.\n\nMain answer.')
161+
})
162+
})
163+
103164
describe('parseBlocks span-identity tree', () => {
104165
it('refines a completed credential rename with its previous and new names', () => {
105166
const segments = parseBlocks([

‎apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.tsx‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,23 @@ export function parseBlocks(blocks: ContentBlock[]): MessageSegment[] {
492492
return parseBlocksLegacy(blocks)
493493
}
494494

495+
function joinRenderableText(parts: string[]): string {
496+
return parts.filter(Boolean).join('\n\n')
497+
}
498+
499+
/** Returns only top-level orchestrator text, excluding agent groups and other UI segments. */
500+
export function getOrchestratorMessageText(
501+
blocks: ContentBlock[],
502+
fallbackContent: string
503+
): string {
504+
const parsed = blocks.length > 0 ? parseBlocks(blocks) : []
505+
if (parsed.length === 0) return fallbackContent
506+
507+
return joinRenderableText(
508+
parsed.map((segment) => (segment.type === 'text' ? segment.content : ''))
509+
)
510+
}
511+
495512
function parseBlocksLegacy(blocks: ContentBlock[]): MessageSegment[] {
496513
const segments: MessageSegment[] = []
497514
const groupsByKey = new Map<string, AgentGroupSegment>()

‎apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown.test.ts‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
import { describe, expect, it } from 'vitest'
2+
import { toCopyableMarkdown } from '@/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown'
3+
4+
describe('toCopyableMarkdown', () => {
5+
it('preserves message Markdown, including fenced code and its language', () => {
6+
const message = [
7+
'# Elevator diagnosis',
8+
'',
9+
'The bug is in `dispatch_legacy.py`:',
10+
'',
11+
'```python',
12+
'def next_stop(requests, current):',
13+
' ranked = sorted(requests)',
14+
' return ranked[1:]',
15+
'```',
16+
'',
17+
'**Result:** the closest request *was not* always selected.',
18+
].join('\n')
19+
20+
expect(toCopyableMarkdown(message)).toBe(message)
21+
})
22+
23+
it('removes internal structured tags without flattening surrounding Markdown', () => {
24+
const message = [
25+
'Before **formatted text**.',
26+
'<credential>{"type":"service_account","provider":"gmail"}</credential>',
27+
'After [a link](https://example.com).',
28+
].join('\n')
29+
30+
expect(toCopyableMarkdown(message)).toBe(
31+
['Before **formatted text**.', '', 'After [a link](https://example.com).'].join('\n')
32+
)
33+
})
34+
35+
it('preserves tag-shaped text that the chat renders literally', () => {
36+
const message = [
37+
'Document `<credential>example</credential>`.',
38+
'',
39+
'```html',
40+
'<file>example</file>',
41+
'<question>example</question>',
42+
'```',
43+
].join('\n')
44+
45+
expect(toCopyableMarkdown(message)).toBe(message)
46+
})
47+
})

‎apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { sanitizeChatDisplayContent } from '@/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-sanitize'
2+
import { parseSpecialTags } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags'
3+
4+
export function toCopyableMarkdown(raw: string): string {
5+
const displayContent = sanitizeChatDisplayContent(raw)
6+
const { segments } = parseSpecialTags(displayContent, false)
7+
8+
return segments
9+
.reduce((markdown, segment) => {
10+
return segment.type === 'text' ? markdown + segment.content : markdown
11+
}, '')
12+
.trim()
13+
}

‎apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { ChatMessageAttachments } from '@/app/workspace/[workspaceId]/home/compo
1818
import { ChatSurfaceProvider } from '@/app/workspace/[workspaceId]/home/components/chat-surface-context'
1919
import {
2020
assistantMessageHasRenderableContent,
21+
getOrchestratorMessageText,
2122
MessageContent,
2223
type MessagePhase,
2324
} from '@/app/workspace/[workspaceId]/home/components/message-content'
@@ -29,6 +30,7 @@ import {
2930
parseLastCredentialTag,
3031
parseLastQuestionTag,
3132
} from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags'
33+
import { toCopyableMarkdown } from '@/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown'
3234
import { nextSizerFloor } from '@/app/workspace/[workspaceId]/home/components/mothership-chat/sizer-floor'
3335
import { QueuedMessages } from '@/app/workspace/[workspaceId]/home/components/queued-messages'
3436
import {
@@ -225,6 +227,12 @@ const AssistantMessageRow = memo(function AssistantMessageRow({
225227
onAnimatingChangeRef.current?.(phase !== 'settled')
226228
}, [phase])
227229

230+
const getCopyContent = useCallback(
231+
() => getOrchestratorMessageText(blocks, message.content),
232+
[blocks, message.content]
233+
)
234+
const prepareContentForCopy = useCallback((content: string) => toCopyableMarkdown(content), [])
235+
228236
const hasRenderableAssistant = assistantMessageHasRenderableContent(blocks, message.content ?? '')
229237
if (!hasRenderableAssistant && !trimmedContent && !isStreaming) {
230238
return null
@@ -281,6 +289,9 @@ const AssistantMessageRow = memo(function AssistantMessageRow({
281289
actionsEligible ? (
282290
<MessageActions
283291
content={message.content}
292+
getCopyContent={getCopyContent}
293+
hasCopyContent={Boolean(getOrchestratorMessageText(blocks, message.content).trim())}
294+
prepareContentForCopy={prepareContentForCopy}
284295
userQuery={precedingUserContent}
285296
requestId={message.requestId}
286297
messageId={message.id}

0 commit comments

Comments
 (0)