merge-prep: Polish agentic chat + Vertex (supersedes #490)#573
Conversation
Resolves conflicts for PR #490 against current main: - echo/frontend/src/components/chat/ChatHistoryMessage.tsx: union of imports (ActionIcon from main + IconArrowUpRight/IconNotes from feature) - echo/frontend/src/locales/*.po: union of new msgids, then re-extracted - echo/frontend/src/locales/*.ts: regenerated via lingui compile Prep for review/merge; supersedes #490.
|
Important Review skippedDraft detected. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
Hi ! Thank you for contributing to Dembrane ECHO! Before we consider your Pull Request, we ask that you sign our Contributor License Agreement (CLA). This is only required for your first Pull Request. Please review the CLA, and sign it by adding your GitHub username to the contributors.yml file. Thanks! |
Supersedes #490 by @dtrn2048 — same commits, plus a merge commit that resolves conflicts against current
mainso it can be merged without a dirty state.What changed vs #490
Nothing in @dtrn2048's commits. The tip of this branch is a merge commit (
merge: bring main into feat/agentic-chat-main) that resolves:echo/frontend/src/components/chat/ChatHistoryMessage.tsx— only real code conflict. Union of imports:ActionIcon(from main) +IconArrowUpRight/IconNotes(from feature). Both are referenced in the file body.echo/frontend/src/locales/*.po— 12 mechanical conflicts across 6 languages (new msgids on both sides + shifted source line numbers). Took union, then re-ranlingui extractto canonicalize#:paths.echo/frontend/src/locales/*.ts— regenerated withlingui compile --typescript.tsc --noEmitpasses locally.Why a fresh PR
PR #490 has been open since 2026-03-19; main is +27 commits ahead and the original PR shows
dirty. Rather than force-push to @dtrn2048's branch, this is a fresh branch that supersedes it. @dtrn2048's authorship on the original commits is preserved.Footprint vs the
workspacesepicOverlap with the
workspacesbranch: 9 files (7 locales). Real overlap onapi.ts(+60 onworkspaces) andagentic.py(+14). Bounded — should not block the workspaces rebase later.Confidence
Medium-high. Conflict resolution is small and reviewable. CI will run lint/types/tests. The one judgment call worth a second look is the
ChatHistoryMessage.tsximport union — sanity-check that bothActionIconand the tabler icons should coexist in the merged version.What I did not do
Original PR: #490