fix: do not persist a deleted speech model as the active selection#468
Open
postoso wants to merge 1 commit into
Open
fix: do not persist a deleted speech model as the active selection#468postoso wants to merge 1 commit into
postoso wants to merge 1 commit into
Conversation
Deleting a non-active speech model temporarily wrote the deleted model to selectedSpeechModel and restored the real selection through an un-awaited defer/Task that was never awaited. If the app quit, crashed, or relaunched for an update during that window, the user was left with a model they never chose. Delete the target model's cache via the existing ASRService.clearModelCache(for:) primitive, which clears the specific model and never mutates the selection, and drop the now-unneeded suppressSpeechProviderSync / skipNextSpeechModelSync scaffolding. Refresh installed-model state after the delete so the model cards reflect the removal for non-active models too, matching the onboarding uninstall path. Add a regression test that fails if the deleted model is ever persisted as the selection, even transiently.
postoso
force-pushed
the
fix/delete-speech-model-race
branch
from
bf50e0d to
acf638e
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Description
Deleting a non-active speech model used to briefly persist the model being deleted as
selectedSpeechModel, then restore the real selection through an un-awaited async restore. If the app quit, crashed, or relaunched during that window, the deleted model could become the saved active model.This routes per-model deletion through an awaitable
ASRService.clearModelCache(for:)call, which clears the target model without changing the saved selection. It also refreshes installed-model state after deletion so the model cards update without relying on a temporary selection change.The removed
suppressSpeechProviderSyncandskipNextSpeechModelSyncflags were only needed for the old selection bounce. With the bounce removed, the speech provider and preview state can stay directly synced to the actual selected model. The view-model method is now awaitable, so the regression test does not rely on a fixed sleep.Type of Change
Related Issue or Discussion
Related to #467. This fixes the delete-non-active-model persistence path only; it does not claim to close every possible path that could reset the active speech model.
Testing
swiftlint --strict --config .swiftlint.yml Sources Tests/FluidDictationIntegrationTests/DictationE2ETests.swiftswiftformat --config .swiftformat Sourcesxcodebuild build-for-testing -project Fluid.xcodeproj -scheme Fluid -destination 'platform=macOS,arch=arm64' CODE_SIGN_IDENTITY='' CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NOAdded
DictationE2ETests.testDeleteNonActiveSpeechModel_doesNotBounceSelectionThroughDeletedModel. The test records every write toSelectedSpeechModeland fails if deleting.appleSpeechwhile.whisperTinyis active ever persists the deleted value, even transiently.The test intentionally uses a built-in no-cache model so it can catch the selection-bounce regression without deleting a real downloaded speech model from the developer's machine.
Notes
This is intentionally narrow. It removes one concrete race in model deletion without changing model activation, update behavior, or broader speech-model fallback logic.
Full hosted test execution was not run locally because the installed FluidVoice app was open; the hosted test runner can hang in that state.
build-for-testingcompiled the app and test target, and CI should run the full hosted suite after the branch update.Screenshots / Video