fix: resolve duplicate type definitions and add textToCopy prop to

CopyIconButton

Author: brandonkachen

cli/src/commands/router.ts

@@ -142,10 +142,7 @@ export async function routeUserPrompt(
       filename,
     })
 
-    setMessages((prev) => [
-      ...prev,
-      getSystemMessage(`📎 Image attached: ${filename}`),
-    ])
+    // Note: No system message added here - the PendingImagesBanner shows attached images
     saveToHistory(trimmed)
     setInputValue({ text: '', cursorPosition: 0, lastEditDueToNav: false })
     setInputMode('default')

cli/src/components/copy-icon-button.tsx

@@ -11,6 +11,7 @@ import type { ContentBlock } from '../types/chat'
 interface CopyIconButtonProps {
   blocks?: ContentBlock[]
   content?: string
+  textToCopy?: string
 }
 
 const BULLET_CHAR = '•'
@@ -63,18 +64,20 @@ const extractTextFromBlocks = (blocks?: ContentBlock[]): string => {
 export const CopyIconButton: React.FC<CopyIconButtonProps> = ({
   blocks,
   content,
+  textToCopy: textToCopyProp,
 }) => {
   const theme = useTheme()
   const hover = useHoverToggle()
   const { setTimeout } = useTimeout()
   const [isCopied, setIsCopied] = useState(false)
 
-  // Compute text to copy from blocks or content
+  // Compute text to copy from blocks or content (or use provided textToCopy)
   const textToCopy = useMemo(() => {
+    if (textToCopyProp) return textToCopyProp
     return blocks && blocks.length > 0
       ? extractTextFromBlocks(blocks) || content || ''
       : content || ''
-  }, [blocks, content])
+  }, [blocks, content, textToCopyProp])
 
   const handleClick = async () => {
     try {

cli/src/types/chat.ts

@@ -65,18 +65,6 @@ export type PlanContentBlock = {
   content: string
 }
 
-export type ImageContentBlock = {
-  type: 'image'
-  image: string // base64 encoded image data
-  mediaType: string
-  filename?: string
-  size?: number
-  width?: number
-  height?: number
-  isCollapsed?: boolean
-  userOpened?: boolean
-}
-
 export type AskUserContentBlock = {
   type: 'ask-user'
   toolCallId: string
@@ -110,11 +98,16 @@ export type ImageContentBlock = {
   mediaType: string
   filename?: string
   size?: number
+  width?: number
+  height?: number
+  isCollapsed?: boolean
+  userOpened?: boolean
 }
 
 export type ImageAttachment = {
-  path: string
   filename: string
+  path: string
+  size?: number
 }
 
 export type ContentBlock =
@@ -136,12 +129,6 @@ export type AgentMessage = {
   subAgentCount?: number
 }
 
-export type ImageAttachment = {
-  filename: string
-  path: string  // Full path for opening the file
-  size?: number
-}
-
 export type ChatMessage = {
   id: string
   variant: ChatVariant