Skip to content

Stabilize keybindings toast stream setup#1860

Merged
juliusmarminge merged 1 commit intomainfrom
t3code/fix-keybindings-toast-flake
Apr 9, 2026
Merged

Stabilize keybindings toast stream setup#1860
juliusmarminge merged 1 commit intomainfrom
t3code/fix-keybindings-toast-flake

Conversation

@juliusmarminge
Copy link
Copy Markdown
Member

@juliusmarminge juliusmarminge commented Apr 9, 2026

Summary

  • Stabilizes the keybindings toast test by waiting for the server config update stream to be ready before asserting toast behavior.
  • Replaces the previous warm-up helper with an explicit stream readiness check keyed off server config update notifications.
  • Reduces flakiness by ensuring the subscription is actually delivering updates before the toast-triggering push is sent.

Testing

  • Not run (PR content only).
  • Existing test coverage updated in KeybindingsToast.browser.tsx to wait for stream readiness before exercising the toast flow.

Note

Low Risk
Low risk: changes only affect a browser-based Vitest test harness by adding an explicit readiness wait for the server config update stream, reducing flakiness without altering production behavior.

Overview
Stabilizes the KeybindingsToast.browser.tsx test setup by replacing the previous “warm up” push with an explicit waitForServerConfigStreamReady() gate.

The new helper repeatedly emits a settingsUpdated stream event and waits until getServerConfigUpdatedNotification() advances, ensuring the server-config subscription is actively delivering updates before sending keybindingsUpdated events and asserting toast counts.

Reviewed by Cursor Bugbot for commit 8a8f0d1. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Stabilize keybindings toast stream setup by polling server-config stream readiness

  • Replaces warmServerConfigUpdateStream (which sent a push and waited 50ms) with waitForServerConfigStreamReady, which polls the server-config stream by emitting synthetic settingsUpdated events and verifying a new notification with a greater id is observed.
  • mountApp now calls waitForServerConfigStreamReady after the server config snapshot, ensuring the stream can deliver updates before tests proceed.
  • The keybinding update test no longer warms the stream explicitly, relying on mountApp's readiness check instead.
  • Risk: waitForServerConfigStreamReady retries up to 20 times and throws on timeout, so flaky stream initialization will now cause an explicit test failure rather than a silent race.

Macroscope summarized 8a8f0d1.

- Wait for the server config subscription to deliver an update before asserting the toast
- Remove the ad hoc stream warmup from the test
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 9, 2026

Important

Review skipped

Auto reviews are disabled on this repository. 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: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 55b16861-e730-4fc7-8f97-dfd672b9e87c

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 t3code/fix-keybindings-toast-flake

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

@github-actions github-actions bot added size:M 30-99 changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Apr 9, 2026
@macroscopeapp
Copy link
Copy Markdown
Contributor

macroscopeapp bot commented Apr 9, 2026

Approvability

Verdict: Approved

This is a test-only change that improves test stability by replacing a simple timeout-based warmup with a more robust retry-based verification that the server config stream is ready. No production runtime behavior is affected.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge juliusmarminge merged commit 70f5dfc into main Apr 9, 2026
12 checks passed
@juliusmarminge juliusmarminge deleted the t3code/fix-keybindings-toast-flake branch April 9, 2026 21:26
rororowyourboat added a commit to rororowyourboat/t3code that referenced this pull request Apr 9, 2026
…threadId (#2)

* Raise slow RPC ack warning threshold to 15s (pingdotgg#1760)

* Use active worktree path for workspace saves (pingdotgg#1762)

* Stream git status updates over WebSocket (pingdotgg#1763)

Co-authored-by: codex <codex@users.noreply.github.com>

* fix(web): unwrap windows shell command wrappers (pingdotgg#1719)

* Rename "Chat" to "Build" in interaction mode toggle (pingdotgg#1769)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

* Assign default capabilities to Codex custom models (pingdotgg#1793)

* Add project rename support in the sidebar (pingdotgg#1798)

* Support multi-select pending user inputs (pingdotgg#1797)

* Add Zed support to Open actions via editor command aliases (pingdotgg#1303)

Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>

* Closes pingdotgg#1795 - Support building and developing in a devcontainer (pingdotgg#1791)

* Add explicit timeouts to CI and release workflows (pingdotgg#1825)

* fix(web): distinguish singular/plural in pending action submit label (pingdotgg#1826)

* Refactor web stores into atomic slices ready to split ChatView (pingdotgg#1708)

* Add VSCode Insiders and VSCodium icons (pingdotgg#1847)

* Prepare datamodel for multi-environment (pingdotgg#1765)

Co-authored-by: justsomelegs <145564979+justsomelegs@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>

* Implement server auth bootstrap and pairing flow (pingdotgg#1768)

Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@macmini.local>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>

* Use dev proxy for loopback auth and environment requests (pingdotgg#1853)

* Refresh local git status on turn completion (pingdotgg#1821)

Co-authored-by: codex <codex@users.noreply.github.com>

* fix(desktop): add Copy Link action for chat links (pingdotgg#1835)

* fix: map runtime modes to correct permission levels (pingdotgg#1587)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>

* Fix persisted composer image hydration typo (pingdotgg#1831)

* Clarify environment and workspace picker labels (pingdotgg#1854)

* Scope git toast state by thread ref (pingdotgg#1855)

* fix build (pingdotgg#1859)

* Stabilize keybindings toast stream setup (pingdotgg#1860)

Co-authored-by: Julius Marminge <julius@macmini.local>

* feat(web): add embeddable thread route for canvas tile hosts

Adds /embed/thread/:environmentId/:threadId — a standalone route that
renders the existing ChatView without the app sidebar chrome. This is the
iframe target for t3-canvas agent shapes (see rororowyourboat/t3-canvas#3).

- New file-based route embed.thread.\$environmentId.\$threadId.tsx
- __root.tsx bypasses AppSidebarLayout for any /embed/* pathname so the
  environment connection + websocket surface + toasts still initialize
  but the sidebar/diff/plan chrome does not render
- minimal=1 search param is parsed and wired to a data attribute on the
  container for future targeted CSS; chrome hiding (BranchToolbar,
  PlanSidebar, ThreadTerminalDrawer) stays as a follow-up pass
- routeTree.gen.ts regenerated by the @tanstack/router-plugin

---------

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: legs <145564979+justsomelegs@users.noreply.github.com>
Co-authored-by: sonder <168988030+heysonder@users.noreply.github.com>
Co-authored-by: Adem Ben Abdallah <96244394+AdemBenAbdallah@users.noreply.github.com>
Co-authored-by: Kyle Gottfried <6462596+Spitfire1900@users.noreply.github.com>
Co-authored-by: Jacob <589761+jvzijp@users.noreply.github.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@macmini.local>
Co-authored-by: Klemencina <56873773+Klemencina@users.noreply.github.com>
Co-authored-by: Oskar Sekutowicz <me.oski646@gmail.com>
Co-authored-by: Noxire <59626436+noxire-dev@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M 30-99 changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant