Skip to content

feat(desktop): close Buzz window with Cmd+W - #6314

Merged
klopez4212 merged 2 commits into
block:mainfrom
kursmark-sq:agent/cmd-w-close
Aug 20, 2026
Merged

feat(desktop): close Buzz window with Cmd+W#6314
klopez4212 merged 2 commits into
block:mainfrom
kursmark-sq:agent/cmd-w-close

Conversation

@kursmark-sq

@kursmark-sq kursmark-sq commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

Summary

  • close the current Buzz window with Cmd-W on macOS
  • keep Buzz Term's existing Cmd-W behavior when the terminal owns input, where it closes the active terminal tab
  • cover the close-window chord and its modifier/composition guards with unit tests

Why

Buzz removes macOS's native Close Window menu accelerator so the webview can conditionally route Cmd-W to Buzz Term. That also left normal Buzz mode without the standard close-window shortcut. The new app-level bubble-phase handler restores window closing while allowing the terminal's capture-phase handler to retain priority.

For the main window, the existing Rust close-request handler keeps the webview alive and hides it to the tray, matching the titlebar close button.

Validation

  • desktop unit tests: 5,093 passed
  • focused close-window and terminal shortcut tests: 28 passed at 71a2cce42013440e297c7b237d45b20e9638078d
  • desktop TypeScript: passed
  • desktop checks: passed (pre-existing warnings only)
  • workspace Rust clippy: passed
  • Tauri Rust clippy/check: passed
  • desktop build: passed
  • mobile format/analyze: passed
  • Tauri tests: 2,592 desktop tests and 26/27 terminal tests passed; the existing default_prog_child_observes_the_login_argv0 PTY fixture repeatedly timed out waiting for /bin/sh, including when run alone, and is unrelated to this TypeScript shortcut change

@kursmark-sq @codex
feat(desktop): close Buzz window with Cmd+W
71a2cce 
Co-authored-by: Matt Kursmark <kursmark@squareup.com>
Signed-off-by: Matt Kursmark <kursmark@squareup.com>
Co-authored-by: Codex <noreply@openai.com>
@kursmark-sq
kursmark-sq marked this pull request as ready for review August 19, 2026 15:09
@kursmark-sq
kursmark-sq requested a review from a team as a code owner August 19, 2026 15:09
@kursmark-sq @codex
ci: retry after package mirror timeout
0a08561 
Co-authored-by: Matt Kursmark <kursmark@squareup.com>
Signed-off-by: Matt Kursmark <kursmark@squareup.com>
Co-authored-by: Codex <noreply@openai.com>
@klopez4212
klopez4212 merged commit e5d1dfe into block:main Aug 20, 2026
25 checks passed
wpfleger96 added a commit that referenced this pull request Aug 20, 2026
@wpfleger96
Merge remote-tracking branch 'origin/main' into duncan/guard-public-r…
419cb99 
…elay-skills

* origin/main:
  feat(desktop): close Buzz window with Cmd+W (#6314)
  refactor(prompt): simplify Buzz agent guidance (#6340)

Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
tellaho added a commit that referenced this pull request Aug 20, 2026
@tellaho
Merge remote-tracking branch 'origin/main' into tho/composer-auto-add…
60e3abe 
…ress

* origin/main:
  fix(desktop): distinguish duplicate agent devices (#6337)
  feat(desktop): close Buzz window with Cmd+W (#6314)
  refactor(prompt): simplify Buzz agent guidance (#6340)
  feat(desktop): make Projects workspaces selectable (#6368)
  Add Buzz-native collaboration benchmarks (#6264)
  Polish mobile timeline and emoji interactions (#6297)
  feat(desktop): make the Projects overview follow the selected section (#6335)
  refactor(desktop): coordinate TTS playback (#6341)
  fix(desktop): show complete repository trees (#5102)
  Add appearance preference previews (#6193)
  fix(desktop): restore emoji recents (#6263)
  chore: serialize mobile pre-push checks (#6322)
  fix(buzz-acp): loosen workspace-scan guardrail to allow named paths (#6261)
  fix(buzz-dev-mcp): expand leading ~ in read_file/str_replace paths (#6271)
  perf(desktop): move five hot renderer paths from JS into Rust (#6024)
  fix(media): accept portrait video resolutions (#6058)
  fix(desktop): hide archived channels from #/Tab autocomplete (#6156)
  Unify mobile channel details (#6113)
  Revert "fix(acp): gate relay-signed workflow messages on their attributed author" (#6311)

Signed-off-by: Taylor Ho <taylorkmho@gmail.com>

# Conflicts:
#	desktop/src/features/messages/ui/MentionAutocomplete.test.mjs
morgmart added a commit that referenced this pull request Aug 20, 2026
@morgmart
Merge remote-tracking branch 'origin/main' into investigate-buzz-cli-…
ba41398 
…handoff

* origin/main:
  feat(desktop): refine context-aware Projects collaboration (#6396)
  fix(desktop): distinguish duplicate agent devices (#6337)
  feat(desktop): close Buzz window with Cmd+W (#6314)
  refactor(prompt): simplify Buzz agent guidance (#6340)
  feat(desktop): make Projects workspaces selectable (#6368)
  Add Buzz-native collaboration benchmarks (#6264)
  Polish mobile timeline and emoji interactions (#6297)
  feat(desktop): make the Projects overview follow the selected section (#6335)
  refactor(desktop): coordinate TTS playback (#6341)
  fix(desktop): show complete repository trees (#5102)
  Add appearance preference previews (#6193)
  fix(desktop): restore emoji recents (#6263)
  chore: serialize mobile pre-push checks (#6322)

Signed-off-by: morgmart <98432065+morgmart@users.noreply.github.com>
wpfleger96 pushed a commit that referenced this pull request Aug 20, 2026
Hayt
Merge remote-tracking branch 'origin/main' into hayt/split-open-chann…
c883fcb 
…el-directory

* origin/main:
  feat(desktop): refine context-aware Projects collaboration (#6396)
  fix(desktop): distinguish duplicate agent devices (#6337)
  feat(desktop): close Buzz window with Cmd+W (#6314)
  refactor(prompt): simplify Buzz agent guidance (#6340)
  feat(desktop): make Projects workspaces selectable (#6368)
  Add Buzz-native collaboration benchmarks (#6264)
  Polish mobile timeline and emoji interactions (#6297)
  feat(desktop): make the Projects overview follow the selected section (#6335)
  refactor(desktop): coordinate TTS playback (#6341)

Signed-off-by: Hayt <9e1c23a3fd83f61da34420e4e88ff1b16e45cafcc0cd9019eb07d4ecfa8ca9b0@buzz.block.builderlab.xyz>
wpfleger96 added a commit that referenced this pull request Aug 20, 2026
Hayt @wpfleger96
Merge remote-tracking branch 'origin/main' into hayt/split-open-chann…
bdc1873 
…el-directory

* origin/main:
  feat(desktop): refine context-aware Projects collaboration (#6396)
  fix(desktop): distinguish duplicate agent devices (#6337)
  feat(desktop): close Buzz window with Cmd+W (#6314)
  refactor(prompt): simplify Buzz agent guidance (#6340)
  feat(desktop): make Projects workspaces selectable (#6368)
  Add Buzz-native collaboration benchmarks (#6264)
  Polish mobile timeline and emoji interactions (#6297)
  feat(desktop): make the Projects overview follow the selected section (#6335)
  refactor(desktop): coordinate TTS playback (#6341)

Co-authored-by: Will Pfleger <pfleger.will@gmail.com>
Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
Signed-off-by: Hayt <9e1c23a3fd83f61da34420e4e88ff1b16e45cafcc0cd9019eb07d4ecfa8ca9b0@buzz.block.builderlab.xyz>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wesbillman wesbillman wesbillman approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kursmark-sq @wesbillman @klopez4212