Skip to content

merge-prep: Polish agentic chat + Vertex (supersedes #490)#573

Draft
spashii wants to merge 9 commits into
mainfrom
sam/rebase-feat-agentic-chat-main
Draft

merge-prep: Polish agentic chat + Vertex (supersedes #490)#573
spashii wants to merge 9 commits into
mainfrom
sam/rebase-feat-agentic-chat-main

Conversation

@spashii
Copy link
Copy Markdown
Member

@spashii spashii commented May 13, 2026

Supersedes #490 by @dtrn2048 — same commits, plus a merge commit that resolves conflicts against current main so 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-ran lingui extract to canonicalize #: paths.
  • echo/frontend/src/locales/*.ts — regenerated with lingui compile --typescript.

tsc --noEmit passes 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 workspaces epic

Overlap with the workspaces branch: 9 files (7 locales). Real overlap on api.ts (+60 on workspaces) and agentic.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.tsx import union — sanity-check that both ActionIcon and the tabler icons should coexist in the merged version.

What I did not do

  • Did not merge. Human call.
  • Did not run anything Vertex/GCP-side. Schema/config changes are in @dtrn2048's PR description; deploy-time concerns unchanged.

Original PR: #490

dtrn2048 and others added 9 commits March 19, 2026 15:20
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.
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 13, 2026

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro

Run ID: aefc609b-414c-4fe1-8548-7113d5b243f7

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch sam/rebase-feat-agentic-chat-main

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions
Copy link
Copy Markdown

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!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants