Repository navigation
fix(chat): lock queued prompt actions until admission completes - #806
Merged
Merged
Conversation
Ignore composition key events before edit shortcuts and the search Escape handler. Otherwise canceling an IME composition can discard an edit or close search through event bubbling.
Check the effective binding before saving any individual shortcut change. Restoring a default must preserve both mappings when another action uses it. Cover disable, reassign, reset, recovery and global reset with the mounted production component, and clarify the existing conflict-safe contract.
Pending queue rows do not yet have an actionable Host id. Removing or editing them only changed the renderer, so admission brought the message back and could retain work the user believed had been cancelled. Disable pending row actions and guard the store entry points until the Host acknowledges the queue entry. Cover the delayed-admission user path and preserve editing and removal of acknowledged drafts.
Background run updates rerender Settings with a new error callback. Keep that callback fresh without treating its identity as a reason to reload the project and overwrite unsaved name and folder edits.
Preserve both IME regression coverage and the scheduled-task scenarios added on main when resolving the English and Chinese test-plan conflict.
…r-thinking-levels Merge the verified plugin provider thinking-level preservation fix.
`config_json.models` was decoded as one `Vec<ModelBinding>`, so a single entry that no longer matched the schema discarded every sibling and the provider read back as the one legacy default model derived from `defaultModelId`. The report reproduced it by deleting one binding's `maxTokens`: 12 stored bindings read back as 1, with nothing said about why (issue vastsa#784). `contextWindow` and `maxTokens` are therefore optional on the wire: an absent key, or an explicit `0`, reads as zero and is seeded with the generic default by the normalisation that already existed for the explicit zero. That is the same value a record carrying only `defaultModelId` is materialized with and the same value a plugin manifest declaring no limits already produces, so the stored array and the manifest now agree instead of one rejecting what the other accepts. Each entry is then decoded on its own, so an entry that still fails to decode costs itself rather than the array: the readable entries survive in their stored order and the failure is reported on the host log with the provider id, the entry's index and the reason, which makes it locatable instead of silent. An absent `models` key, an empty array, and an array whose every entry was unreadable all still read as the legacy binding, so a provider stays selectable whatever its stored shape; only the third is reported, because an empty array is a legal state and an absent one predates bindings. No write path changes and nothing is rewritten on disk: `providers.update` still persists exactly the bindings the client sends. Spec §2, decisions-log D610 and the E2E scenario are updated in both maintained locales.
Report malformed stored provider configuration explicitly and reject model-array replacements while the stored value is degraded. This prevents a partial settings view from erasing unreadable bindings and keeps unrelated provider updates safe.
fix(host-core): protect degraded model binding updates
Fragment and History API navigation does not emit will-navigate, so the browser kept its previous URL and loading state. Accept current main-frame in-page events while preserving invalidated-session and stale-event guards.
Allow explicit file previews without requiring a project. Copy referenced pasted inputs into each fork so its transcript remains readable independently of the source task. Keep scratch access scoped to the current session and remove copied inputs if fork publication fails. Cover preview navigation, bounded forks, retained context, source deletion and rollback.
…nflict fix(shortcuts): reject conflicting individual resets
fix(projects): preserve editor drafts during background updates
fix(chat): preserve editing and search during IME Escape
…avigation fix(browser): update chrome after same-document navigation
fix(session): keep temporary-task attachments readable after branching
Owner
|
Verified on my side — the race is real and this fixes it at the root:
Landing blocker: conflict with current Two follow-ups that are not blockers: the pending row's Send now is still a plain button with the normal label and no saving tooltip (the other four actions explain themselves), and there is no timeout escape if the host never acknowledges the push. Once the branch is rebased I'll run the integration candidate (typecheck + desktop suite + the new pending-action tests) and land it. |
Contributor
Author
|
Thanks for the review and suggestions! I’ll follow up and update the fix accordingly (´▽`ʃ♡ƪ) |
Integrate the reviewed queue fix with current main while retaining both sets of E2E scenarios. Give Send now the same saving feedback as the other locked actions, and cover admission failure followed by retry.
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
4 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.
Removing a queued prompt before the Host finishes saving it hides its temporary row, but the message returns when saving completes. Editing during that window also restores a draft while leaving the original message queued.
Keep queue actions disabled while a prompt is being saved, with a Saving tooltip, and guard pending edits/removals in the store. Once the Host acknowledges the prompt, the existing edit, remove, reorder, and send actions become available.
queue-before-after-english-hd.mp4
The before/after recording uses the real English desktop app and Rust Host, with a controlled delay at the queue-save boundary and a local model fixture. It is 2624 × 1824; idle waits are cut and routine actions are accelerated. This demonstrates the race under controlled timing, rather than claiming it reliably occurs at normal speed.
Regression coverage exercises the real queue slice and composer: pending actions stay locked, then acknowledged removal/editing survives a queue refresh, including draft attachments. The new tests fail on the original behavior and pass with the fix. English and Chinese component, interaction, and E2E specs are synchronized. No protocol, persistence format, or migration changes.
The review follow-up integrates current main without rewriting the original commits, retains both sides of the Chinese E2E additions, and gives Send now the same Saving tooltip and accessible label as the other pending actions. Admission rejection/retry now has regression coverage. The existing 130-second Host RPC timeout already releases pending state and restores the draft; no new timeout or protocol change was needed.
Validation and candidate details
pnpm build:js, desktop typecheck,pnpm lint, and the complete desktop suite (2,531 passed). The 15 targeted queue/composer tests also passed; new Saving-label assertions failed on the original PR before the follow-up fix.cargo build -p host-core --locked, docs locale check (79 pairs, 499 pages),git diff --check, and PR base checks against both configured origin/main and actual upstream main.6c1d5e5e47c1c270575a2f85bc222211d4c13cb9; base main:46d4ee4ee3b608d103c5dacab2fbb754bacd6eca; executable tree:ae3ae4cb4f7e581414fd7132c70ff7608e8e49ae.7b2ad9f86895b9e319e0e108f44f998ec5894efehas the identical tree. All four checks passed for the new head: JS build/typecheck/lint/architecture/tests, Rust format/lint/tests, Docs check, and PR base. Maintainer vastsa merged the PR as128aa50442c2be197ab27c4bc6f156d3e9308703, whose tree also matches the validated candidate.