Fix machine selection bug in web container #253
+314
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When using happy-web to start a new session, clicking the machine name to change it and then selecting a different machine would cause the selection to revert back to the original machine. Root cause: Module-level callback pattern had race conditions in web environments where router.back() could complete before state updates propagated. Fix: Pass selectedMachineId explicitly via route params when navigating back from machine picker. This ensures the selection is guaranteed to be available when the component mounts. Also exclude test files from metro bundler to prevent vitest from being bundled into the web app. Tests: Added machineSelection.spec.ts with 9 tests covering the bug reproduction, callback race conditions, and route param solution. 🤖 Generated with [Claude Code](https://claude.com/claude-code) via [Happy](https://happy.engineering) Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: Happy <yesreply@happy.engineering>
|
Nice, I've done a scan of the code but haven't tested the patch yet myself. When we get to monorepo + e2e testing it will be nice to have an e2e test for this kind of thing. |
bra1nDump
requested changes
Dec 7, 2025
Contributor
bra1nDump
left a comment
bra1nDump
left a comment
There was a problem hiding this comment.
These tests don't seem to be testing the actual code they appear to be more as demonstrations of the bug. Can we remove all these tests, and maybe just add a extended comment describing the previous race condition briefly next to the use effect you've added?
| // Navigate back with the selected machine ID as a param (fixes web bug) | ||
| router.push({ | ||
| pathname: '/new', | ||
| params: { selectedMachineId: machineId } |
Contributor
There was a problem hiding this comment.
Won't this erase the prompt and data id parameters?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
When using happy-web to start a new session, clicking the machine name to change it and then selecting a different machine would cause the selection to revert back to the original machine.
Root Cause
Module-level callback pattern had race conditions in web environments where
router.back()could complete before state updates propagated.Solution
Pass
selectedMachineIdexplicitly via route params when navigating back from machine picker. This ensures the selection is guaranteed to be available when the component mounts.Changes
sources/app/(app)/new/index.tsxto read machine selection from route paramssources/app/(app)/new/pick/machine.tsxto pass machine ID via route paramsmetro.config.jsto exclude test files from web bundle (prevents vitest error)machineSelection.spec.tswith 9 tests covering bug reproduction and fix validationTesting