[macos] restore addTabbedWindowSafely to fix tab crash#13
Merged
nicosuave merged 2 commits intosidequery:mainfrom Mar 1, 2026
Merged
[macos] restore addTabbedWindowSafely to fix tab crash#13nicosuave merged 2 commits intosidequery:mainfrom
nicosuave merged 2 commits intosidequery:mainfrom
Conversation
Port upstream Ghostty's ObjCExceptionCatcher that wraps addTabbedWindow:ordered: in @try/@catch. AppKit can throw NSExceptions during tab operations on recent macOS (2025/2026), and Swift cannot catch those natively. Made-with: Cursor
Member
|
I really appreciate you hunting this down @bvolpato-dd |
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
2 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.
Summary
ObjCExceptionCatcherthat safely wrapsaddTabbedWindow:ordered:in an Objective-C@try/@catchblock. AppKit can throw NSExceptions during tab operations on recent macOS versions (2025/2026), and Swift cannot catch those natively — causing hard crashes.TerminalController.swiftand 3 inFullscreen.swiftfrom rawaddTabbedWindowback toaddTabbedWindowSafely.Changes
ObjCExceptionCatcher.h/.m— Objective-C wrapper that catches NSExceptions fromaddTabbedWindow:ordered:and converts them to NSError.ghostty-bridging-header.h— Added#import "ObjCExceptionCatcher.h"so Swift can call the wrapper.NSWindow+Extension.swift— AddedaddTabbedWindowSafely(_:ordered:)extension method that calls through the ObjC wrapper.TerminalController.swift— Replaced all 11 rawaddTabbedWindowcalls withaddTabbedWindowSafely.Fullscreen.swift— Replaced all 3 rawaddTabbedWindowcalls withaddTabbedWindowSafely.project.pbxproj— AddedObjCExceptionCatcher.mto the Xcode file group.Testing
zig buildsucceeds.zig build testpasses (2476 tests, 6 skipped).Did this cause any problems?
Rollback/revert this commit and redeploy the service.
Made with Cursor