Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions web/src/components/AssistantChat/messages/AssistantMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import { MarkdownText } from '@/components/assistant-ui/markdown-text'
import { Reasoning, ReasoningGroup } from '@/components/assistant-ui/reasoning'
import { HappyToolMessage } from '@/components/AssistantChat/messages/ToolMessage'
import { CliOutputBlock } from '@/components/CliOutputBlock'
import { CopyIcon, CheckIcon } from '@/components/icons'
import { useCopyToClipboard } from '@/hooks/useCopyToClipboard'
import type { HappyChatMessageMetadata } from '@/lib/assistant-runtime'
import { getAssistantCopyText } from '@/components/AssistantChat/messages/assistantCopyText'

const TOOL_COMPONENTS = {
Fallback: HappyToolMessage
Expand All @@ -17,6 +20,7 @@ const MESSAGE_PART_COMPONENTS = {
} as const

export function HappyAssistantMessage() {
const { copied, copy } = useCopyToClipboard()
const isCliOutput = useAssistantState(({ message }) => {
const custom = message.metadata.custom as Partial<HappyChatMessageMetadata> | undefined
return custom?.kind === 'cli-output'
Expand All @@ -31,6 +35,10 @@ export function HappyAssistantMessage() {
const parts = message.content
return parts.length > 0 && parts.every((part) => part.type === 'tool-call')
})
const copyText = useAssistantState(({ message }) => {
if (message.role !== 'assistant') return ''
return getAssistantCopyText(message.content)
})
const rootClass = toolOnly
? 'py-1 min-w-0 max-w-full overflow-x-hidden'
: 'px-1 min-w-0 max-w-full overflow-x-hidden'
Expand All @@ -44,8 +52,22 @@ export function HappyAssistantMessage() {
}

return (
<MessagePrimitive.Root className={rootClass}>
<MessagePrimitive.Content components={MESSAGE_PART_COMPONENTS} />
<MessagePrimitive.Root className={`${rootClass} ${copyText ? 'group/msg' : ''}`}>
<div className={`relative min-w-0 ${copyText ? 'pr-8' : ''}`}>
{copyText && (
<button
type="button"
title="Copy"
className="absolute right-0 top-0 opacity-60 sm:opacity-0 sm:group-hover/msg:opacity-100 transition-[opacity,background-color] p-0.5 rounded hover:bg-[var(--app-subtle-bg)]"
onClick={() => copy(copyText)}
>
{copied
? <CheckIcon className="h-3.5 w-3.5 text-green-500" />
: <CopyIcon className="h-3.5 w-3.5 text-[var(--app-hint)]" />}
</button>
)}
<MessagePrimitive.Content components={MESSAGE_PART_COMPONENTS} />
</div>
</MessagePrimitive.Root>
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { describe, expect, it } from 'vitest'
import type { ThreadAssistantMessagePart } from '@assistant-ui/react'
import { getAssistantCopyText } from '@/components/AssistantChat/messages/assistantCopyText'

describe('getAssistantCopyText', () => {
it('joins assistant text parts and ignores non-text parts', () => {
const parts = [
{ type: 'text', text: 'First paragraph.' },
{ type: 'reasoning', text: 'Hidden chain of thought' },
{ type: 'tool-call', toolCallId: 'tool-1', toolName: 'search', args: {}, argsText: '{}' },
{ type: 'text', text: 'Second paragraph.' }
] satisfies ThreadAssistantMessagePart[]

expect(getAssistantCopyText(parts)).toBe('First paragraph.\n\nSecond paragraph.')
})

it('returns empty string when no assistant text exists', () => {
const parts = [
{ type: 'reasoning', text: 'Thinking' },
{ type: 'tool-call', toolCallId: 'tool-1', toolName: 'search', args: {}, argsText: '{}' }
] satisfies ThreadAssistantMessagePart[]

expect(getAssistantCopyText(parts)).toBe('')
})
})
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import type { ThreadAssistantMessagePart } from '@assistant-ui/react'

export function getAssistantCopyText(parts: readonly ThreadAssistantMessagePart[]): string {
return parts
.filter((part) => part.type === 'text')
.map((part) => part.text.trim())
.filter((text) => text.length > 0)
.join('\n\n')
}
Loading