Upstream sync 86c0ef210b — 206 behind #55

⚠️ Upstream sync — manual rebase needed

Upstream BasedHardware/omi main is 206 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):

git fetch upstream && git checkout selfhost && git rebase 86c0ef210b71c26dac15eb0119771811e85def36   # 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):

• 53d0389 chore: consolidate changelog for v0.12.215
• 0d22722 fix(ci): fail closed when Codemagic desktop preview dies after dispatch (Desktop preview lane: dispatched Codemagic builds die silently, previews never publish BasedHardware/omi#10145) (fix(ci): fail closed when Codemagic desktop preview dies after dispatch (#10145) BasedHardware/omi#11171)
• 63c9d57 fix(ci): ratchet long-lived GCP SA key paths (Security: Replace long-lived google-credentials.json service-account keys with keyless authentication (Workload Identity / ADC) BasedHardware/omi#6800) (fix(ci): ratchet long-lived GCP SA key paths (#6800) BasedHardware/omi#11125)
• f831056 fix(ci): ensure the release-gate-failure label exists before filing audit issue (fix: create release-gate-failure label (break-glass audit job fails without it) BasedHardware/omi#10389) (fix(ci): ensure the release-gate-failure label exists before filing audit issue (#10389) BasedHardware/omi#10966)
• 5fdb803 fix(ci): resolve PR diff bases live instead of the stale payload SHA (Other workflows still diff against the stale event-payload base SHA (FC-stale-event-payload-diff-base) BasedHardware/omi#10785) (fix(ci): resolve PR diff bases live instead of the stale payload SHA (#10785) BasedHardware/omi#10964)
• a703a83 fix(ci): run checks and regular-merge the sync-docs PR (sync-docs.yml auto-merges to main with --admin --squash on a PR that ran zero checks BasedHardware/omi#10535) (fix(ci): run checks and regular-merge the sync-docs PR (#10535) BasedHardware/omi#10959)
• eb6b233 feat(app): find spoken moments in search + play on open (feat(app): find spoken moments in search + play on open BasedHardware/omi#11400)
• 0c9cf73 feat(dev-api): add /v1/dev/user/ask and omi ask CLI (feat(dev-api): add /v1/dev/user/ask and omi ask CLI BasedHardware/omi#11452)
• 0fbaa21 feat(listen): deliver cloud-generated proactive messages to desktop over listen websocket (feat(listen): deliver cloud-generated proactive messages to desktop over listen websocket BasedHardware/omi#11807)
• 009132d feat(chat): hard-scope Ask to a conversation or timeframe (AI Chat with a specific conversation or timeframe BasedHardware/omi#4515) (feat(chat): hard-scope Ask to a conversation or timeframe (#4515) BasedHardware/omi#11206)
• a441068 fix(app): survive [core/duplicate-app] instead of failing to start (fix(app): survive [core/duplicate-app] instead of failing to start BasedHardware/omi#12128)
• 16f6f02 fix(app): give a client-synthesized cutover fence a way out (fix(app): give a client-synthesized cutover fence a way out BasedHardware/omi#12130)
• 43f7457 feat: PostHog referral funnel and admin grants tile (feat: PostHog referral funnel and admin grants tile BasedHardware/omi#12170)
• 36c467f fix(deploy): treat a Cloud Run literal env var with no value key as empty (fix(deploy): treat a Cloud Run literal env var with no value key as empty BasedHardware/omi#12165)
• d1d04a2 feat: add Prometheus instrumentation for Stripe subscription lifecycle events (feat: add Prometheus instrumentation for Stripe subscription lifecycle events BasedHardware/omi#12158)
• ee92868 fix(deploy): select desktop-backend's runtime image by container name (fix(deploy): select desktop-backend's runtime image by container name BasedHardware/omi#12156)
• 0e54a86 fix(stt): scope and bound speaker identity (fix(stt): scope and bound speaker identity BasedHardware/omi#12097)
• 7dbfe0f chore: consolidate changelog for v0.12.214
• 085f303 fix(desktop): bound database init with a timeout so startup can't hang forever (Desktop app hangs indefinitely on "Preparing your data..." — survives reinstall, permission reset, and full OS reboot BasedHardware/omi#12145) (fix(desktop): bound database init with a timeout so startup can't hang forever (#12145) BasedHardware/omi#12148)
• e862f1b fix(backend): desktop quota display reads dev Firestore while chat enforcement reads prod, so the two disagree (fix(backend): desktop quota display reads dev Firestore while chat enforcement reads prod BasedHardware/omi#12151)
• 4b8636e fix(deploy): render the desktop-backend expected env state its sidecar requires (fix(deploy): render the desktop-backend expected env state its sidecar requires BasedHardware/omi#12147)
• 3872687 fix(monitoring): drop the exporter probe block the chart never reads (fix(monitoring): drop the exporter probe block the chart never reads BasedHardware/omi#12150)
• 528d540 fix(monitoring): size the Cloud Run metrics exporter for a real collection (fix(monitoring): size the Cloud Run metrics exporter for a real collection BasedHardware/omi#12146)
• 0939cf2 fix(backend): usage counters written with set(merge=True) never nest,… (fix(backend): usage counters written with set(merge=True) never nest,… BasedHardware/omi#12065)
• 26ba415 fix(backend): add local harness storage (fix(backend): add local harness storage BasedHardware/omi#11992)
• 7bb3971 fix(app): stamp Gemini Live transcript segments with real audio time (fix(app): stamp Gemini Live transcript segments with real audio time BasedHardware/omi#12116)
• 9c83dc4 fix(backend): stop the async scanner flagging coroutines handed to asyncio (fix(backend): stop the async scanner flagging coroutines handed to asyncio BasedHardware/omi#12115)
• 339662e fix(deploy): keep Cloud Run jobs in the rendered runtime-env state (fix(deploy): keep Cloud Run jobs in the rendered runtime-env state BasedHardware/omi#12114)
• a902867 fix(backend): back a failed deletion wipe off instead of re-selecting it every tick (fix(backend): back a failed deletion wipe off instead of re-selecting it every tick BasedHardware/omi#12095)
• 38d15d1 fix(agent): stop sharing one callback_data dict across every call (fix(agent): stop sharing one callback_data dict across every call BasedHardware/omi#12094)
• f8b7b59 fix(web): point the app-store page's store buttons at the real listings (fix(web): point the app-store page's store buttons at the real listings BasedHardware/omi#12092)
• a980dfc docs(desktop-windows): add AGENTS.md, index it from root, fix a stale release-pipeline.md claim (docs(desktop-windows): add AGENTS.md, index it from root, fix a stale release-pipeline.md claim BasedHardware/omi#12034)
• da3591b fix(app): warn when setup.sh ios targets a physical device with OMI_DEV_HOST unset (fix(app): warn when setup.sh ios targets a physical device with OMI_DEV_HOST unset BasedHardware/omi#12091)
• 7ecf21c fix(web): Enter mid-IME-composition must not send the chat message (fix(web): Enter mid-IME-composition must not send the chat message BasedHardware/omi#12090)
• 706a161 fix(app): stop a socket reconnect from restarting the in-progress poll cycle (fix(app): stop a socket reconnect from restarting the in-progress poll cycle BasedHardware/omi#12127)
• 24ede53 fix(backend): name the exception behind a dead-lettered finalization (fix(backend): name the exception behind a dead-lettered finalization BasedHardware/omi#12123)
• 5e6a63d fix(backend): stop a lapsed suggestion from swallowing the next one (fix(backend): stop a lapsed suggestion from swallowing the next one BasedHardware/omi#12121)
• c31c74e fix(backend): stop recommending a suggestion that already expired (fix(backend): stop recommending a suggestion that already expired BasedHardware/omi#12120)
• 5415085 fix(ci): count a landed change once in the failure-class guard ratchet (fix(ci): count a landed change once in the failure-class guard ratchet BasedHardware/omi#12119)
• 6a23340 fix(backend): keep mentor past context when one source fails (fix(backend): keep mentor past context when one source fails BasedHardware/omi#12118)