watson-16056-20260428073350-concise

[anduimagui]

Merge conflict detected

Original PR title: feat(app): add copy rich text option for message content

Detected: 2026-04-28T06:34:35.048Z

Watson Guidance

• packages/app/src/components/settings-general.tsx, packages/app/src/context/settings.tsx, packages/app/src/i18n/en.ts, packages/app/src/pages/session/message-timeline.tsx, and packages/ui/src/components/markdown.tsx all have a same-file content conflict (changed in both).
• Base adds/uses existing settings UI/context pieces such as usePermission, useGlobalSync, DisplayBackend, decode64, playSoundById, showSessionProgressBar, and matching settings.general.row.showSessionProgressBar.* strings, while the provided excerpts do not show enough of each full file to explain more.
• Head adds assistant copy support by importing AssistantCopyFormat, useSettings, playSound, and serializeMarkdownClipboardHTML, adding assistantCopyFormat to Settings.general, renaming the settings section label to Feed & copy, computing/passing assistantCopyMode in message-timeline.tsx, and wiring selection-copy handling in packages/ui/src/components/markdown.tsx.
• Safest resolution is to keep both non-overlapping changes where they coexist in the same file and then verify after pushing that settings-general.tsx still builds with the final import/API names, settings.tsx exposes both showSessionProgressBar and assistantCopyFormat if both are still needed, the new i18n keys compile, message-timeline.tsx passes a defined assistantCopyMode, and markdown copy still works with the chosen checksum import path.

Resolve locally

git fetch origin
git checkout feature-branch
git merge origin/main
# resolve conflicts
git push