## ⚠️ Upstream sync — manual rebase needed Upstream **BasedHardware/omi** `main` is **1600** commit(s) ahead; the automatic rebase **hit conflicts**. **Conflicting files:** ``` backend/utils/other/storage.py ``` ### Land it (rebase model — force-updates `selfhost`, per RUNBOOK §4a) Run locally (your credentials carry the `workflow` scope the CI token lacks): ```bash git fetch upstream && git checkout selfhost && git rebase fce316fc98a251e01abc8a1c54f870ece317fac7 # resolve conflicts if any git push --force-with-lease origin selfhost ``` That push triggers build-backend + build-app; the VM image + app-feed reconcilers then converge automatically. **Upstream commits (newest first, up to 40):** - fce316fc98 ⚡ Resolve N+1 Query in Data Export for Conversation Photos (#12491) - 2ebb8808f2 🧹 refactor: use device connection directly to fetch codec in speech profile (#12495) - f31b004408 🧹 Remove legacy uid branch for wipe job (#12490) - 3f0ff853b3 fix(backend): drop the last two references to a file deleted in WS-G cleanup (#12748) - 941028279f fix(backend): defer the client_processing import in projection_payload (#12785) - 9af5092ac3 fix(backend): pin pyarrow 19.0.1 for GCP buildpack manylinux2014 (#12758) (#12776) - 79bdffef04 🧹 [Code Health] Remove unused variable in memory summary rating router (#12478) - c32df46806 🧪 [Add PortabilityExportIncomplete edge case tests] (#12482) - 32c128b154 chore: consolidate changelog for v0.12.293 - 8234c835fe One chat shell: every content block renders everywhere, plus chat ergonomics (#12607) - bd945adb3f test(desktop): add a leak-proof seam for the effective-owner revocation (#12664) - f29d15fe4c fix(deps): bump mistune to 3.3.3 in plugins (#12769) - 7b61973686 fix(ci): exclude gitignored files from the dead-code ratchet (#12756) - 10fd19a7aa fix(desktop): omi-type follow-ups (review fixes, red ease-out, no empty pastes) (#12778) - 00be51b5c0 Supersedes #8445: Fix Windows dev startup when ELECTRON_RUN_AS_NODE is set (#12753) - 7b2b20477a fix(backend): gate app generate-prompts on the free chat quota (#12749) - 5358d12f91 feat(web-app): liquid-gooey FAB and transitions.dev chrome motion (#12543) - e8ab103883 🧪 [testing improvement] Add tests for _export_photo_manifest (#12488) - 0b3b1d44a5 feat: Map plugin_data by persona_name (#12481) - 604e2f6e5d 🧹 [Code Health] Remove tracking of legacy long press toggle (#12477) - d8d6a73c98 🧪 test: add test for personaLaneForIdentity (#12475) - 2cdb89f53b fix(backend): rate-limit GET /v1/personas/twitter/initial-message (#12781) (#12784) - a8c8a85a26 chore: consolidate changelog for v0.12.292 - 09ff17e4e5 fix(backend): fill chat message pages past reported rows (#12712) - 6e53bbd2ec fix(desktop): put attached spine rows on the same leading grid as loose ones (#12773) - bf36209c79 fix(app): keep live-transcript follow interrupt bound to the owning pointer - c431aa6461 chore: consolidate changelog for v0.12.291 - 79441c42e6 fix(app): stop the live transcript follow from stealing reader drags - 5b2d0835c0 test(desktop): stop AuthorizedToolOwnerBoundAuth 60s hang - c7d490cb6a fix(desktop): tighten voice-typing review follow-ups - 344e2160eb chore: consolidate changelog for v0.12.290 - 65157edada refactor(backend): hoist the §1.8 producer gate into free_tier_memory_policy - 800ba5186e fix(backend): gate the connector memory-formation doors behind the §1.8 policy - b1421783ed refactor(backend): hoist managed_compute_decision_for to utils/managed_compute - 41cd5c275f fix: count action items and events as summary body content in the recap gate - bc4362af6a Warn at 90% and 100% of the chat quota above the composer (#12599) - dd4d13de76 test: make the F-1 red-proof exercise the real payload builder - 70c01144d1 fix(backend): keep the null processing_state default off every conversation persist - 7141e10b06 fix(backend): decline the daily recap when the day renders as titles only - fae8058728 feat(desktop): accuracy-first voice typing — transcribe the whole hold and paste
Upstream BasedHardware/omi
mainis 1600 commit(s) ahead; the automatic rebase hit conflicts.Conflicting files:
Land it (rebase model — force-updates
selfhost, per RUNBOOK §4a)Run locally (your credentials carry the
workflowscope the CI token lacks):That push triggers build-backend + build-app; the VM image + app-feed reconcilers then converge automatically.
Upstream commits (newest first, up to 40):