Skip to content

fix(desktop): hold-to-quit no longer strands the quit - #11016

Merged
maria-rcks merged 2 commits into
pingdotgg:mainfrom
maria-rcks:fix/quit-hold-tap-9259
Sep 11, 2026
Merged

fix(desktop): hold-to-quit no longer strands the quit#11016
maria-rcks merged 2 commits into
pingdotgg:mainfrom
maria-rcks:fix/quit-hold-tap-9259

Conversation

@maria-rcks

@maria-rcks maria-rcks commented Sep 10, 2026

Copy link
Copy Markdown
Collaborator

On macOS, holding Cmd+Q past the hold threshold concealed the window but never quit, and a lone Cmd tap some time later quit the app instantly. Once the hold completed, a Q auto-repeat arriving after the modifier keyUp ran clearWatchdog() and left the handler waiting for a Q keyUp that macOS does not reliably deliver, so the quit sat armed indefinitely with no timer behind it — and the next modifier keyUp, from any unrelated Cmd press, revived it.

A Q keydown proves the key is still physically down whether or not the modifier is still held, so it now pushes the quiet period back instead of disarming it. Continued repeats keep the app alive exactly as before; when they stop, the quiet period commits the quit, and quitOnRelease can no longer outlive the gesture.

Verified: vp test run on apps/desktop/src/window/QuitHold.test.ts — 31 passed, and the new case fails against the pre-fix module (expected quit to be called 1 times, but got 0). vp run --filter @t3tools/desktop typecheck — exit 0, no new diagnostics. vp lint and vp fmt --check on both changed files — clean. Note: vite-plus/test resolves to a second vitest instance on this Linux sandbox, so every suite in the repo fails to load with Cannot read properties of undefined (reading 'config') on origin/main too; the runs above used an equivalent copy importing vitest directly, discarded afterwards.

Desktop-only: the quit accelerator is intercepted in the Electron main process before-input-event handler, so there is no web or mobile equivalent to fix.

Fixes #9259

Done by Claude Opus 5 (1M context) in Claude Code.

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Bug Fixes
    • Improved quit shortcut handling when key-release events are missed.
    • Repeated key presses now keep the pending quit active until the final release.
    • Prevented an additional quit from being triggered by a subsequent modifier-key tap.

Once a hold completed, a Q auto-repeat that arrived after the modifier was
released cleared the pending quit timer and left the handler waiting for a Q
keyUp that macOS does not always deliver. The window stayed concealed, the app
never quit, and the next lone Cmd release revived the stale request and quit
instantly. Q repeats now push the quiet period back instead of disarming it, so
the quit lands when the repeats stop.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:S 10-29 changed lines (additions + deletions). labels Sep 10, 2026
@coderabbitai

coderabbitai Bot commented Sep 10, 2026

Copy link
Copy Markdown

Review Change StackReview Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Advanced

Run ID: a44e52d7-6a22-48fc-8287-cc1cb5bfd8d7

📥 Commits

Reviewing files that changed from the base of the PR and between 78a4c88 and 176d804.

📒 Files selected for processing (1)
  • apps/desktop/src/window/QuitHold.ts
🚧 Files skipped from review as they are similar to previous changes (1)
  • apps/desktop/src/window/QuitHold.ts

Included review availability: Your plan provides up to 10 included reviews per hour; 0 remain after this review.


📝 Walkthrough

Walkthrough

The quit hold handler now keeps the quiet-period watchdog active after modifier release. Tests cover delayed quitting, a missing final Q release, and prevention of a later standalone Cmd tap from quitting again.

Changes

Quit hold behavior

Layer / File(s) Summary
Preserve pending quit after modifier release
apps/desktop/src/window/QuitHold.ts, apps/desktop/src/window/QuitHold.test.ts
Repeated Q keydown events always restart the quiet period. Tests verify quitting after Q release or after a missing final Q release, and verify that a later standalone Cmd tap does not trigger another quit.

Estimated code review effort: 2 (Simple) | ~10 minutes

Severity of issue fixed: Low

Merge Risk: ⚪ Minimal · up to 176d8

The macOS Cmd+Q hold behavior now preserves the pending quit through modifier release and avoids stale quits on a later Cmd press. No concrete merge-blocking risk remains.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 2 files. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and concisely describes the main fix: preventing macOS hold-to-quit from becoming stranded.
Description check ✅ Passed The description clearly explains the failure, the fix, affected scope, validation results, and linked issue. It does not use the template headings or checklist, but it contains the required informatio…
Linked Issues check ✅ Passed The implementation and regression tests address issue #9259. Repeated Q keydowns after Cmd release now preserve the pending quit, the quit completes when repeats stop, and a later standalone Cmd press…
Out of Scope Changes check ✅ Passed The changes are limited to the desktop quit handler and its regression tests. They directly support the linked issue and stated objectives, with no unrelated code changes identified.
  • Fix all pre-merge checks with AI
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

macroscopeapp[bot]
macroscopeapp Bot previously approved these changes Sep 10, 2026
@macroscopeapp

macroscopeapp Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at 176d804

Macroscope's review found this PR approvable — This is a narrowly scoped desktop quit-gesture bug fix: Q repeats now keep the committed quit timer alive after modifier release, while a missing final key-up still leads to an eventual quit. The production change is small and accompanied by focused regression tests.

You can add or adjust custom eligibility rules. Learn more.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@macroscopeapp
macroscopeapp Bot dismissed their stale review September 10, 2026 00:44

Dismissing prior approval to re-evaluate 176d804

@maria-rcks
maria-rcks merged commit 095d575 into pingdotgg:main Sep 11, 2026
32 of 33 checks passed
aorwall added a commit to aorwall/t3code that referenced this pull request Sep 12, 2026
Merges `upstream/main` at `e81606494` into the fork, from merge base
`02297e3db` — 47 upstream commits.

The theme of this range is scopable settings: upstream made every server
setting addressable at a scope (global / environment / project) with
per-project overrides, which is why 11 of the 15 conflicts are settings
files. The rest is conversation rewind, floating device streams, and a
large batch of message-sync and markdown-streaming perf work.

## Merge stats

- Landed (`HEAD^1..HEAD`): 277 files, 17243+/4783−
- Upstream range (base..`HEAD^2`): 275 files, 17011+/4749−
- Fork delta (`HEAD^2..HEAD`): 756 files, 76559+/2096−

The two file lists reconcile: the 3 extra landed files are
`docs/fork/inventory.json`, `docs/fork/upstream-merge-log.md` and
`docs/fork/gaps.md`; the 1 file in the range that did not land is
`apps/web/src/routes/settings.integrations.tsx`, resolved `ours` per the
`moatless-admin-integrations-route` inventory entry (that route is a
Moatless admin page here, and upstream's embedded-surface settings live
at `/settings/browser`).

All 15 conflicts were resolved by the verdict `preflight.mjs` printed.
No `decide` conflict was left unresolved. Details, including the
owned-concern sweep (no keyword hits) and the unsupported-method
reconciliation (0 ADD, 0 DROP, 2 KEEP, 4 known exceptions), are in the
dated entry in `docs/fork/upstream-merge-log.md`.

Two findings worth naming here:

- **A silent auto-merge failure.** pingdotgg#11285 changed the mini-player target
from a tab id to a source union. Git updated upstream's own assertion in
`PreviewView.test.tsx` and left the fork-only "under the frame
capability" case next to it still asserting the old string. No conflict
marker, no `resolution-check.mjs` finding — only the fork's own test
suite caught it.
- **Stale inventory anchors.** Upstream moved the project Actions
section out of `ProjectSettingsPanel.tsx` into a new
`ProjectActionsSettings.tsx`, which is where `scriptsEditable` is now
derived and where upstream's new writing Reset button is gated. Four
inventory entries were re-pointed in this merge rather than silently
dropping their deltas.

## Usable as-is

Client work the fork can expose with no Moatless backend change:

- Scoped settings UI and the two-select scope picker (pingdotgg#10639, pingdotgg#10636) —
`SettingsScopeContext`, `ScopedSwitch`, `settingKeys`, the `mixed`
state. The reading half works against Moatless today.
- Float device streams over chat, as a source union rather than a tab id
(pingdotgg#11285); recording status on floating previews (pingdotgg#11312); floating
preview using composer margins (pingdotgg#11290).
- PR-page selections into new drafts (pingdotgg#11296);
projects-on-another-machine badge (pingdotgg#11323); Usage opening on Limits
(pingdotgg#11261).
- macOS permission onboarding (pingdotgg#11289); hold-to-quit fix (pingdotgg#11016);
preview keystrokes kept out of the composer (pingdotgg#11354).
- Message-sync and markdown-streaming perf: pingdotgg#11302, pingdotgg#11029, pingdotgg#11211,
pingdotgg#11198, pingdotgg#11196, pingdotgg#11193, pingdotgg#11181, pingdotgg#11206.
- Assorted web/mobile fixes: pingdotgg#11361, pingdotgg#10757, pingdotgg#11357, pingdotgg#10571, pingdotgg#11348,
pingdotgg#11349, pingdotgg#11281, pingdotgg#11188, pingdotgg#11283, pingdotgg#11292, pingdotgg#11187, pingdotgg#11228, pingdotgg#11103, pingdotgg#10612,
pingdotgg#11032, pingdotgg#11233, pingdotgg#11234, pingdotgg#11304, pingdotgg#11240.

## Unsupported in Moatless / needs implementation

- **Conversation rewind** — `thread.conversation.revert` (pingdotgg#11358). A new
member of `DispatchableClientOrchestrationCommand` in
`packages/contracts/src/orchestration.ts`, bringing the fork to 30
command types (28 upstream's, 2 fork-only). Moatless does not dispatch
it, and a client command cannot be refused per-type, so "Edit from here"
on `RevertUserMessageButton` is reachable whenever the turn is idle and
does nothing. Needs backend dispatch.
- **Per-project setting overrides** — the `projectSettingsOverrides`
capability and the 17-key `ProjectSettingsOverrides` record (pingdotgg#11176).
Two pieces are needed: the capability reported by
`/.well-known/t3/environment`, and `server.updateSettings` served at
project scope. Until both land, the capability filter in
`scopedSettings.ts:170` and `ProjectActionsSettings.tsx:72` drops the
write on the client — the control renders, the user toggles it, and
**the write never leaves the browser**. A silent no-op is worse than a
hidden control or an honest refusal; recorded in `docs/fork/gaps.md`.
- **Default thread permissions** — `defaultRuntimeMode` (pingdotgg#11346). Reads
fine, cannot be saved. Same `server.updateSettings` write path as above,
one level deeper, not a separate gap.

## Backend behavior to consider reproducing in Moatless

Upstream server-side work the fork cannot use directly, but that
Moatless would benefit from:

- **Queue messages during context compaction** (pingdotgg#11107,
`ProviderCommandReactor.ts`) — a message sent while compaction is in
flight is currently dropped rather than held.
- **Restore provider history and prompts when rewinding** (pingdotgg#11338,
`CheckpointReactor.ts`) — the counterpart to
`thread.conversation.revert` above; rewinding the thread without
rewinding provider state leaves the two out of sync.
- **Detect file renames in review diffs** (pingdotgg#8086,
`apps/server/src/vcs/GitVcsDriverCore.ts`) — a rename currently reads as
a whole-file delete plus a whole-file add.
- **Preserve qualified Codex model ids** (pingdotgg#9921, `ModelManifest.ts` +
`CodexTextGeneration.ts`).
- **Model defaults** astra-medium / fable-5.1-medium (pingdotgg#11347).

All five are recorded under the runtime-fixes entry in
`docs/fork/gaps.md`.

## Verification

`verify.mjs` (full pass): 7 of 8 checks green — `duplicate-adds`,
`tripwires`, `resolution-check`, `unsupported-methods`, `fmt:check`,
`lint`, `typecheck`.

`test` is red on **`@t3tools/desktop` only**, at
`scripts/browser-secret-native.test.mjs > bundled libsecret helper`:
`Command failed: pkg-config --cflags --libs libsecret-1`. This is the
standing sandbox gap, not a merge regression — the test file's last
commit is `498ab9c39` (pingdotgg#7261, before the merge base), `git diff
--name-only` against both merge parents is empty for it, and `pkg-config
--exists libsecret-1` fails in this environment. It is already an entry
in `docs/fork/gaps.md`. Every other package passes, including
`@t3tools/web` (5079 tests) after the `PreviewView.test.tsx` fix above.

Three typecheck failures the merge introduced were fixed in it:
`SETTINGS_CATEGORY_SCOPES` in `settingsSearch.ts` was missing all 9
fork-only settings paths, and two `filterAvailableSettingsSearchItems`
literals in `settingsSearch.test.ts` were missing the fork's
`forgejoEnabled` field.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---
Moatless task:
https://moatless.soaplabstest.com/tasks/e70b41b3-779d-43b8-8f34-7de516548e7c
github-actions Bot added a commit to omarcresp/t3code-flake that referenced this pull request Sep 12, 2026
## What's Changed
* feat(web): show recording status on floating previews by @maria-rcks in pingdotgg/t3code#11312
* fix(desktop): hold-to-quit no longer strands the quit by @maria-rcks in pingdotgg/t3code#11016
* feat(web): mark projects on another machine in project pickers by @maria-rcks in pingdotgg/t3code#11323
* fix(web): show pointer cursors on pull request controls by @shivamhwp in pingdotgg/t3code#11283
* fix(web): themed panel toggles show their disabled state by @flamboh in pingdotgg/t3code#11188
* fix(web): use branch wording in commit dialogs by @shivamhwp in pingdotgg/t3code#11281
* fix(mobile): keep Android file icons on the line with wrapped filenames by @SunkenInTime in pingdotgg/t3code#11234
* fix(codex): preserve qualified model ids in selection and generation by @maria-rcks in pingdotgg/t3code#9921
* feat(desktop): share macOS permission onboarding by @juliusmarminge in pingdotgg/t3code#11289
* fix(test): drain worker broadcasts before restoring browser globals by @maria-rcks in pingdotgg/t3code#11349
* fix(web): disable linked pull requests when none are linked by @maria-rcks in pingdotgg/t3code#11348
* fix(models): default to astra medium and fable 5.1 medium by @maria-rcks in pingdotgg/t3code#11347
* fix(web): align provider settings with shared settings rows by @maria-rcks in pingdotgg/t3code#10571
* feat(settings): configure default permissions for new threads by @maria-rcks in pingdotgg/t3code#11346
* fix: restore provider history and prompts when rewinding by @maria-rcks in pingdotgg/t3code#11338
* fix(web): keep comment actions visible when pr comments are folded by @maria-rcks in pingdotgg/t3code#11357
* feat: rewind conversations while keeping file changes by @maria-rcks in pingdotgg/t3code#11358
* fix(web): keep sidebar scroll position when pinning threads by @saphid in pingdotgg/t3code#10757
* fix(web): remove pr description reactions by @maria-rcks in pingdotgg/t3code#11361
* fix(desktop): keep preview keystrokes out of the composer by @maria-rcks in pingdotgg/t3code#11354


**Full Changelog**: pingdotgg/t3code@v0.0.41-nightly.20260911.1564...v0.0.41-nightly.20260912.1576

Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.0.41-nightly.20260912.1576
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:S 10-29 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.

[Bug]: Cmd + Q has weird closing behavior

1 participant