Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
260717a
test: cover manual unread jump flash
lawrencecchen May 20, 2026
6bef7b4
fix: flash workspace unread jumps
lawrencecchen May 20, 2026
a44762f
Merge remote-tracking branch 'origin/main' into issue-unread-flash-wo…
lawrencecchen May 22, 2026
724be18
test: cover workspace switch overlay flash
lawrencecchen May 22, 2026
b3a0b56
fix: animate unread flash after workspace switch
lawrencecchen May 22, 2026
1a8bb51
test: cover restored unread jump flash count
lawrencecchen May 22, 2026
d78ee42
fix: avoid duplicate restored unread jump flash
lawrencecchen May 22, 2026
19b08e4
test: cover cmd-ctrl-u manual workspace jump
lawrencecchen May 22, 2026
5b71491
fix: keep cmd-ctrl-u manual unread excluded
lawrencecchen May 22, 2026
f57e724
test: cover deferred unread flash rect
lawrencecchen May 22, 2026
d1c0edd
fix: defer unread flash token consumption
lawrencecchen May 22, 2026
a2e082e
test: cover first observed unread flash token
lawrencecchen May 22, 2026
c06fab0
fix: animate first observed unread flash token
lawrencecchen May 22, 2026
cfe1a93
test: cover excluded workspace notifications
lawrencecchen May 22, 2026
17b4aa8
fix: exclude workspace notifications during unread jump
lawrencecchen May 22, 2026
b71645f
fix: include restored unread jump flash fallback
lawrencecchen May 22, 2026
ded6549
fix: prefer printable shortcut characters over physical fallback
lawrencecchen May 26, 2026
8b36dc9
merge: sync with origin main
lawrencecchen May 26, 2026
cfe7898
test: cover focused panel unread markers
lawrencecchen May 26, 2026
beae6d6
fix: keep manual unread marker on focused panel
lawrencecchen May 26, 2026
777d363
Merge remote-tracking branch 'origin/main' into issue-unread-flash-wo…
lawrencecchen May 26, 2026
e655991
fix: preserve command control shortcut fallback
lawrencecchen May 26, 2026
ad754ff
fix: handle workspace unread and control fallback
lawrencecchen May 26, 2026
86a10ac
fix: clear focused read indicator on panel read
lawrencecchen May 26, 2026
96edc79
fix: detect visible notification indicators correctly
lawrencecchen May 26, 2026
f7c8dc4
fix: clear restored workspace unread from panel toggle
lawrencecchen May 26, 2026
4e45da2
fix: distinguish restored unread ownership
lawrencecchen May 26, 2026
e4ab404
fix: avoid duplicate workspace and panel unread
lawrencecchen May 26, 2026
40b4861
fix: scope unread duplicate checks to focused target
lawrencecchen May 26, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Sources/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10977,6 +10977,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
}

private func clearWorkspaceUnreadAfterJump(workspace: Workspace, panelId: UUID?) {
if let panelId {
workspace.triggerUnreadIndicatorDismissFlash(panelId: panelId)
}
Comment thread
cursor[bot] marked this conversation as resolved.
Resolved
workspace.clearUnreadAfterJump(panelId: panelId)
}

Expand Down
56 changes: 56 additions & 0 deletions cmuxTests/WorkspaceManualUnreadTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,62 @@ final class WorkspaceManualUnreadTests: XCTestCase {
XCTAssertTrue(store.workspaceIsUnread(forTabId: laterWorkspace.id))
}

func testJumpToLatestManualWorkspaceUnreadFlashesAfterSwitchingAway() throws {
let appDelegate = AppDelegate.shared ?? AppDelegate()
let store = TerminalNotificationStore.shared
let defaults = UserDefaults.standard

let originalNotificationStore = appDelegate.notificationStore
let originalAppFocusOverride = AppFocusState.overrideIsFocused
let originalExperimentEnabled = defaults.object(forKey: TmuxOverlayExperimentSettings.enabledKey)
let originalExperimentTarget = defaults.object(forKey: TmuxOverlayExperimentSettings.targetKey)

store.replaceNotificationsForTesting([])
appDelegate.notificationStore = store
AppFocusState.overrideIsFocused = true
defaults.set(true, forKey: TmuxOverlayExperimentSettings.enabledKey)
defaults.set(TmuxOverlayExperimentTarget.bonsplitPane.rawValue, forKey: TmuxOverlayExperimentSettings.targetKey)
let windowId = appDelegate.createMainWindow(shouldActivate: false)

defer {
appDelegate.windowForMainWindowId(windowId)?.performClose(nil)
RunLoop.main.run(until: Date(timeIntervalSinceNow: 0.05))
store.replaceNotificationsForTesting([])
appDelegate.notificationStore = originalNotificationStore
AppFocusState.overrideIsFocused = originalAppFocusOverride
if let originalExperimentEnabled {
defaults.set(originalExperimentEnabled, forKey: TmuxOverlayExperimentSettings.enabledKey)
} else {
defaults.removeObject(forKey: TmuxOverlayExperimentSettings.enabledKey)
}
if let originalExperimentTarget {
defaults.set(originalExperimentTarget, forKey: TmuxOverlayExperimentSettings.targetKey)
} else {
defaults.removeObject(forKey: TmuxOverlayExperimentSettings.targetKey)
}
}

let window = try XCTUnwrap(appDelegate.windowForMainWindowId(windowId))
let manager = try XCTUnwrap(appDelegate.tabManagerFor(windowId: windowId))
let unreadWorkspace = try XCTUnwrap(manager.selectedWorkspace)
let unreadPanelId = try XCTUnwrap(unreadWorkspace.focusedPanelId)

XCTAssertTrue(appDelegate.toggleFocusedNotificationUnread(preferredWindow: window))
XCTAssertTrue(store.workspaceIsUnread(forTabId: unreadWorkspace.id))

let otherWorkspace = manager.addWorkspace(select: true, eagerLoadTerminal: false)
XCTAssertEqual(manager.selectedTabId, otherWorkspace.id)
XCTAssertEqual(unreadWorkspace.tmuxWorkspaceFlashToken, 0)

_ = appDelegate.jumpToLatestUnread()

XCTAssertEqual(manager.selectedTabId, unreadWorkspace.id)
XCTAssertFalse(store.workspaceIsUnread(forTabId: unreadWorkspace.id))
XCTAssertEqual(unreadWorkspace.tmuxWorkspaceFlashToken, 1)
XCTAssertEqual(unreadWorkspace.tmuxWorkspaceFlashPanelId, unreadPanelId)
XCTAssertEqual(unreadWorkspace.tmuxWorkspaceFlashReason, .unreadIndicatorDismiss)
}

func testMarkLatestNotificationAsOldestUnreadAppendsWhenNoOtherUnreadNotificationsRemain() {
let store = TerminalNotificationStore.shared
let currentWorkspaceId = UUID()
Expand Down
Loading