merge-prep: Live conversation signposts (supersedes #497)#574
Conversation
Harden the new signposting coordination and test paths so the validated review findings no longer block merge. Made-with: Cursor
Apply the ruff import and dead-code cleanups from the backend lint pass so the branch stays green. Made-with: Cursor
Resolves conflicts for PR #497 against current main: - echo/frontend/src/components/conversation/hooks/index.ts: main migrated useConversationById to the v2 BFF; PR #497 needs the `signposts` relation which the BFF does not yet expose. Kept the feature's direct-Directus call and left a NOTE flagging the follow-up. - echo/frontend/src/components/project/ProjectPortalEditor.tsx: Union of additions — language enum gains 'uk' (from main) and the schema gains signposting_focus_terms (from feature). - echo/server/dembrane/scheduler.py: Both branches added a new scheduler.add_job(); kept both jobs (task_catch_up_pending_signposts + task_check_scheduled_reports). - echo/frontend/src/locales/*.po: union of new msgids, then re-ran lingui extract to canonicalize source paths. - echo/frontend/src/locales/*.ts: regenerated via lingui compile. Prep for review/merge; supersedes #497.
|
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 #497 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 #497
Nothing in @dtrn2048's commits. The tip is a merge commit (
merge: bring main into feat/signposts-main) that resolves three real-code conflicts and twelve mechanical locale conflicts.Real-code conflicts
echo/frontend/src/components/conversation/hooks/index.ts— JUDGMENT CALL, please review.Main migrated
useConversationByIdto call the v2 BFF (bff.get('/conversations/{id}', {include_chunks, include_tags})). PR Add live conversation signposts #497 adds thesignpostsrelation to the existing direct-Directus query.The BFF's
/conversations/{id}endpoint does not currently exposesignposts. I had three options:signpostsfrom the response → breaks the feature.include_signpoststo the BFF endpoint → real feature work, out of scope for a merge.I chose (2). Left a
NOTEcomment in the file flagging that (3) is the right long-term fix. If you'd prefer (1) or want me to do (3) before merge, say so.echo/frontend/src/components/project/ProjectPortalEditor.tsx: union — language enum gains"uk"(from main) and the schema gainssignposting_focus_terms(from feature). Both clean adds.echo/server/dembrane/scheduler.py: both branches added a newscheduler.add_job(...)in the same spot. Kept both jobs.Mechanical conflicts
echo/frontend/src/locales/*.po— 12 files, new msgids on both sides. Took union, re-ranlingui extractto canonicalize#:paths.echo/frontend/src/locales/*.ts— regenerated vialingui compile --typescript.tsc --noEmitandpython -m py_compileboth pass locally.Footprint vs the
workspacesepicOverlap: 12 files (6 locales + the BFF-related hook +
tasks.py+ a couple of routes). Real rebase friction points if workspaces lands after this:echo/server/dembrane/tasks.py(workspaces +190 lines there; this PR adds +95)echo/frontend/src/components/conversation/hooks/index.ts(workspaces did a -399 line refactor)The hook conflict above is exactly the kind of thing workspaces will need to revisit anyway — once
include_signpostslands on the BFF, the local revert goes away.Deploy notes (unchanged from #497)
conversation_signpost+ fields — schema sync needed on deploy.Confidence
Medium. The locale + scheduler resolutions are confident. The hook resolution is a real architectural call that I'd like a second pair of eyes on before merge.
What I did not do
include_signpoststo the BFF endpoint. That's a follow-up if you want option (3) above.Original PR: #497