Skip to content
Closed
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0719fca
Add sidebar status and scrim style settings
austinywang Jun 25, 2026
a8b3fde
Use lifecycle state for sidebar status dots
austinywang Jun 25, 2026
ebd592f
Refresh Swift file length budget
austinywang Jun 25, 2026
3c7b523
Avoid repeated sidebar lifecycle scans
austinywang Jun 25, 2026
5699590
Fix sidebar status dot refresh and subtitles
austinywang Jun 25, 2026
db4c047
Address sidebar status review feedback
austinywang Jun 25, 2026
2487f73
Fix sidebar schema localization
austinywang Jun 25, 2026
1d323a7
Merge remote-tracking branch 'origin/main' into issue-6760-sidebar-ta…
austinywang Jun 25, 2026
0e1d61b
Split sidebar status indicator priority
austinywang Jun 25, 2026
9ecbe11
Fix Korean sidebar schema copy
austinywang Jun 25, 2026
ff1f8a5
Respect live push rate limit env in tests
austinywang Jun 25, 2026
2a963fa
Fix sidebar status dot subtitle replacement
austinywang Jun 25, 2026
cbcd8cd
Preserve sidebar provider subtitles in dot mode
austinywang Jun 25, 2026
34a0bbb
Separate sidebar status subtitles from provider metadata
austinywang Jun 25, 2026
6f6b2a8
Address sidebar status review feedback
austinywang Jun 25, 2026
8af7bef
Prioritize needs-input sidebar status dots
austinywang Jun 25, 2026
55291c8
Keep generic sidebar notifications visible
austinywang Jun 25, 2026
e7a4735
Keep status dot accessibility current
austinywang Jun 25, 2026
f1eeda0
Keep sidebar enum mapping local
austinywang Jun 25, 2026
b885540
Surface status dot setting in Settings
austinywang Jun 26, 2026
702a45a
Localize status dot setting across app locales
austinywang Jun 26, 2026
91192c3
Complete sidebar settings localization
austinywang Jun 26, 2026
9fe3eba
Avoid Foundation dependency in attention sidebar
austinywang Jun 26, 2026
7efd987
Use structured sidebar agent status text
austinywang Jun 26, 2026
7417463
Pair sidebar agent status text with lifecycle
austinywang Jun 26, 2026
41f38f1
Keep needs-input rows in attention queue
austinywang Jun 26, 2026
0f7ebfd
Merge remote-tracking branch 'origin/main' into issue-6760-sidebar-ta…
austinywang Jun 27, 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
20 changes: 11 additions & 9 deletions .github/swift-file-length-budget.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# Format: max_lines<TAB>relative path
# Reduce counts as files shrink. CI fails if tracked files exceed this budget.
34629 CLI/cmux.swift
17827 Sources/AppDelegate.swift
16128 Sources/ContentView.swift
17826 Sources/AppDelegate.swift
16164 Sources/ContentView.swift
13832 Sources/TerminalController.swift
12878 Sources/Workspace.swift
12877 Sources/Workspace.swift
12237 Sources/GhosttyTerminalView.swift
12144 cmuxTests/AppDelegateShortcutRoutingTests.swift
11578 Sources/Panels/BrowserPanel.swift
Expand All @@ -14,7 +14,7 @@
7986 Sources/Panels/BrowserPanelView.swift
7366 cmuxTests/WorkspaceUnitTests.swift
7218 cmuxTests/WorkspaceRemoteConnectionTests.swift
6916 Packages/iOS/CmuxMobileShell/Sources/CmuxMobileShell/MobileShellComposite.swift
6876 Packages/iOS/CmuxMobileShell/Sources/CmuxMobileShell/MobileShellComposite.swift
6317 cmuxTests/SessionPersistenceTests.swift
6217 cmuxTests/GhosttyConfigTests.swift
6183 Sources/TabManager.swift
Expand Down Expand Up @@ -46,10 +46,10 @@
2126 cmuxTests/CmuxConfigTests.swift
2091 cmuxTests/ShortcutAndCommandPaletteTests.swift
2078 Sources/SessionPersistence.swift
1952 Sources/KeyboardShortcutSettingsFileStore.swift
1949 Sources/Panels/BrowserWebAuthnSupport.swift
1963 Sources/KeyboardShortcutSettingsFileStore.swift
1945 Sources/RestorableAgentSession.swift
1900 cmuxTests/NotificationAndMenuBarTests.swift
1866 Sources/Panels/BrowserWebAuthnSupport.swift
1810 Sources/SessionIndexStore.swift
1748 Sources/WindowDragHandleView.swift
1732 cmuxTests/WorkspacePullRequestSidebarTests.swift
Expand Down Expand Up @@ -127,7 +127,7 @@
752 cmuxUITests/CloseWorkspaceCmdDUITests.swift
739 cmuxTests/CLICodexHookTimeoutRegressionTests.swift
738 Packages/macOS/CMUXProjectModel/Sources/CMUXProjectModel/XcodeProjectAdapter.swift
725 Sources/Panels/BrowserPopupWindowController.swift
724 Sources/Panels/BrowserPopupWindowController.swift
722 Packages/Shared/CmuxAgentChat/Sources/CmuxAgentChat/Store/ChatConversationStore.swift
718 Packages/Shared/CmuxAuthRuntime/Sources/CmuxAuthRuntime/Coordinator/AuthCoordinator.swift
716 Sources/TaskManagerSnapshot.swift
Expand Down Expand Up @@ -164,8 +164,8 @@
620 cmuxTests/FinderFileDropRegressionTests.swift
620 cmuxTests/TerminalNotificationQueueTests.swift
612 cmuxUITests/FeedSidebarUITests.swift
610 Sources/SettingsNavigation.swift
608 Packages/macOS/CmuxWorkspaces/Sources/CmuxWorkspaces/Coordinators/WorkspaceGroupCoordinator.swift
606 Sources/SettingsNavigation.swift
604 Packages/macOS/CmuxCommandPalette/Tests/CmuxCommandPaletteTests/CommandPaletteNucleoFFITests.swift
601 Packages/macOS/CMUXAgentLaunch/Sources/CMUXAgentLaunch/AgentLaunchSanitizerPrimaryPolicies.swift
599 Packages/macOS/CMUXAgentLaunch/Sources/CMUXAgentLaunch/AgentLaunchSanitizer.swift
Expand All @@ -192,6 +192,7 @@
558 Packages/macOS/CmuxGit/Sources/CmuxGit/Parsing/GitMetadataService+Config.swift
552 Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/BrowserSection.swift
549 Sources/Panels/BrowserAutomation.swift
549 cmuxTests/SidebarWidthPolicyTests.swift
547 Packages/iOS/CmuxMobileShell/Sources/CmuxMobileShell/BackingUpPairedMacStore.swift
541 Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Pane/ControlCommandCoordinator+Pane.swift
540 Packages/macOS/CmuxWorkspaces/Sources/CmuxWorkspaces/Coordinators/WorkspaceReorderCoordinator.swift
Expand All @@ -200,6 +201,7 @@
538 Packages/macOS/CmuxRemoteWorkspace/Sources/CmuxRemoteWorkspace/PTYBridge/RemotePTYBridgeSession.swift
536 cmuxTests/CmuxConfigContextMenuTests.swift
534 Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Surface/ControlCommandCoordinator+Surface.swift
534 Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/SidebarSection.swift
531 Sources/App/WorkspaceRuntimeSettings.swift
530 Packages/iOS/CmuxMobileTerminal/Sources/CmuxMobileTerminal/GhosttyRuntime.swift
529 Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Scene/SettingsWindowScene.swift
Expand Down Expand Up @@ -228,5 +230,5 @@
503 Sources/Settings/ConfigSource.swift
502 Sources/CmuxEventPublishing.swift
502 Sources/RemoteTmuxSessionMirror.swift
501 Packages/macOS/CmuxControlSocket/Tests/CmuxControlSocketTests/ControlCommandContextTestStubs.swift
500 Packages/macOS/CmuxControlSocket/Tests/CmuxControlSocketTests/ControlCommandContextTestStubs.swift
500 Sources/KeyboardShortcutRecorder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,31 +30,31 @@ public struct AttentionQueueSidebar: CmuxSidebarProvider {
projectRootPath: nil,
workspaces: active
)
.render(subtitle: rowSubtitle),
.render(subtitle: rowSubtitle, subtitleRole: rowSubtitleRole),
ExampleSidebarSection(
id: "pinned",
title: localized("example.sidebar.group.pinned", "Pinned"),
systemImageName: "pin",
projectRootPath: nil,
workspaces: pinned
)
.render(subtitle: rowSubtitle),
.render(subtitle: rowSubtitle, subtitleRole: rowSubtitleRole),
ExampleSidebarSection(
id: "attention",
title: localized("example.sidebar.group.needsAttention", "Needs Attention"),
systemImageName: "bell",
projectRootPath: nil,
workspaces: attention
)
.render(subtitle: rowSubtitle),
.render(subtitle: rowSubtitle, subtitleRole: rowSubtitleRole),
ExampleSidebarSection(
id: "quiet",
title: localized("example.sidebar.group.quiet", "Quiet"),
systemImageName: "checkmark.circle",
projectRootPath: nil,
workspaces: quiet
)
.render(subtitle: rowSubtitle),
.render(subtitle: rowSubtitle, subtitleRole: rowSubtitleRole),
]

return renderModel(providerId: descriptor.id, snapshot: snapshot, sections: sections)
Expand Down Expand Up @@ -82,6 +82,10 @@ public struct AttentionQueueSidebar: CmuxSidebarProvider {
return trimmed(workspace.customDescription).map(CmuxSidebarProviderText.plain)
}

private func rowSubtitleRole(_ workspace: CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderRowSubtitleRole? {
trimmed(workspace.latestNotificationText) == nil ? nil : .agentStatus
}
Comment thread
austinywang marked this conversation as resolved.
Resolved

private func hasRemoteTarget(_ workspace: CmuxSidebarProviderWorkspace) -> Bool {
trimmed(workspace.remoteDisplayTarget) != nil
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ struct ExampleSidebarSection {
rowTitle: (CmuxSidebarProviderWorkspace) -> String = { $0.title },
accessory: CmuxSidebarProviderRowAccessory? = .inspector,
subtitle: (CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderText? = { _ in nil },
subtitleRole: (CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderRowSubtitleRole? = { _ in nil },
Comment thread
austinywang marked this conversation as resolved.
Resolved
trailingText: (CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderText? = { _ in nil },
leadingIcon: (CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderIcon? = { _ in nil }
) -> CmuxSidebarProviderSection {
Expand All @@ -46,6 +47,7 @@ struct ExampleSidebarSection {
workspaceId: workspace.id,
accessory: accessory,
subtitle: subtitle(workspace),
subtitleRole: subtitleRole(workspace),
trailingText: trailingText(workspace),
leadingIcon: leadingIcon(workspace)
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import CmuxSidebarProviderKit
import Foundation
@testable import CmuxExtensionSidebarExamples
import XCTest
import Testing

final class AttentionQueueSidebarTests: XCTestCase {
func testLocalDisconnectedWorkspaceRemainsQuiet() throws {
@Suite("Attention queue sidebar")
struct AttentionQueueSidebarTests {
@Test
func localDisconnectedWorkspaceRemainsQuiet() throws {
let local = workspace(
title: "Local",
customDescription: "Local project",
Expand All @@ -18,13 +21,15 @@ final class AttentionQueueSidebarTests: XCTestCase {

let model = AttentionQueueSidebar().render(snapshot: snapshot)

XCTAssertNil(model.sections.first { $0.id == "attention" })
let quiet = try XCTUnwrap(model.sections.first { $0.id == "quiet" })
XCTAssertEqual(quiet.rows.map(\.workspaceId), [local.id])
XCTAssertEqual(quiet.rows.first?.subtitle, .plain("Local project"))
#expect(model.sections.first { $0.id == "attention" } == nil)
let quiet = try #require(model.sections.first { $0.id == "quiet" })
#expect(quiet.rows.map(\.workspaceId) == [local.id])
#expect(quiet.rows.first?.subtitle == .plain("Local project"))
#expect(quiet.rows.first?.subtitleRole == nil)
}

func testRemoteDisconnectedWorkspaceNeedsAttention() throws {
@Test
func remoteDisconnectedWorkspaceNeedsAttention() throws {
let remote = workspace(
title: "Remote",
customDescription: "Remote project",
Expand All @@ -39,17 +44,42 @@ final class AttentionQueueSidebarTests: XCTestCase {

let model = AttentionQueueSidebar().render(snapshot: snapshot)

let attention = try XCTUnwrap(model.sections.first { $0.id == "attention" })
XCTAssertEqual(attention.rows.map(\.workspaceId), [remote.id])
XCTAssertEqual(attention.rows.first?.subtitle, .plain("disconnected"))
XCTAssertNil(model.sections.first { $0.id == "quiet" })
let attention = try #require(model.sections.first { $0.id == "attention" })
#expect(attention.rows.map(\.workspaceId) == [remote.id])
#expect(attention.rows.first?.subtitle == .plain("disconnected"))
#expect(attention.rows.first?.subtitleRole == nil)
#expect(model.sections.first { $0.id == "quiet" } == nil)
}

@Test
func latestNotificationSubtitleIsAgentStatus() throws {
let waiting = workspace(
title: "Waiting",
customDescription: "Agent workspace",
remoteDisplayTarget: nil,
remoteConnectionState: nil,
latestNotificationText: "Claude is waiting for your input"
)
let snapshot = CmuxSidebarProviderSnapshot(
sequence: 1,
selectedWorkspaceId: nil,
workspaces: [waiting]
)

let model = AttentionQueueSidebar().render(snapshot: snapshot)

let attention = try #require(model.sections.first { $0.id == "attention" })
#expect(attention.rows.map(\.workspaceId) == [waiting.id])
#expect(attention.rows.first?.subtitle == .plain("Claude is waiting for your input"))
#expect(attention.rows.first?.subtitleRole == .agentStatus)
}

private func workspace(
title: String,
customDescription: String?,
remoteDisplayTarget: String?,
remoteConnectionState: String?
remoteConnectionState: String?,
latestNotificationText: String? = nil
) -> CmuxSidebarProviderWorkspace {
CmuxSidebarProviderWorkspace(
id: UUID(),
Expand All @@ -62,7 +92,7 @@ final class AttentionQueueSidebarTests: XCTestCase {
remoteDisplayTarget: remoteDisplayTarget,
remoteConnectionState: remoteConnectionState,
unreadCount: 0,
latestNotificationText: nil,
latestNotificationText: latestNotificationText,
listeningPorts: []
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,20 @@ public struct SidebarCatalogSection: SettingCatalogSection {
userDefaultsKey: "sidebarShowWorkspaceDescription"
)

/// Stores how agent status subtitles are presented in workspace rows.
public let workspaceStatusStyle = DefaultsKey<SidebarWorkspaceStatusStyle>(
id: "sidebar.workspaceStatusStyle",
defaultValue: .sentence,
userDefaultsKey: "sidebarWorkspaceStatusStyle"
)

/// Stores how strongly the sidebar workspace list fades at scroll edges.
public let scrollEdgeFade = DefaultsKey<SidebarScrollEdgeFadeStyle>(
id: "sidebar.scrollEdgeFade",
defaultValue: .full,
userDefaultsKey: "sidebarScrollEdgeFade"
)

/// Bool-backed to match the legacy in-app store. The on-disk key
/// `sidebarBranchVerticalLayout` is written as a Bool by every
/// shipped cmux build; using an enum here would silently revert
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import Foundation

/// Strength of the tab-list scroll-edge fade mask in the left sidebar.
public enum SidebarScrollEdgeFadeStyle: String, CaseIterable, Sendable, SettingCodable {
/// The default fade height and opacity ramp.
case full

/// A shorter, lighter fade that keeps more row content visible near edges.
case subtle

/// No top or bottom scroll-edge fade.
case off
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import Foundation

/// How extension-sidebar workspace rows present their agent status.
public enum SidebarWorkspaceStatusStyle: String, CaseIterable, Sendable, SettingCodable {
/// The default presentation: render the status sentence below the title.
case sentence

/// Compact presentation: render a status dot on the title line.
case dot
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ struct UserDefaultsSettingsClientTests {
#expect(client.value(for: catalog.app.reorderOnNotification) == true)
#expect(client.value(for: catalog.sidebar.hideAllDetails) == false)
#expect(client.value(for: catalog.sidebar.showWorkspaceDescription) == true)
#expect(client.value(for: catalog.sidebar.workspaceStatusStyle) == .sentence)
#expect(client.value(for: catalog.sidebar.scrollEdgeFade) == .full)
#expect(client.value(for: catalog.sidebar.showNotificationMessage) == true)
#expect(client.value(for: catalog.sidebar.branchVerticalLayout) == true)
#expect(client.value(for: catalog.sidebar.stackBranchDirectory) == false)
Expand Down Expand Up @@ -58,6 +60,14 @@ struct UserDefaultsSettingsClientTests {
client.set(.solidFill, for: catalog.workspaceColors.indicatorStyle)
#expect(defaults.string(forKey: "sidebarActiveTabIndicatorStyle") == "solidFill")

client.set(.dot, for: catalog.sidebar.workspaceStatusStyle)
#expect(defaults.string(forKey: "sidebarWorkspaceStatusStyle") == "dot")
#expect(client.value(for: catalog.sidebar.workspaceStatusStyle) == .dot)

client.set(.subtle, for: catalog.sidebar.scrollEdgeFade)
#expect(defaults.string(forKey: "sidebarScrollEdgeFade") == "subtle")
#expect(client.value(for: catalog.sidebar.scrollEdgeFade) == .subtle)

client.set(.end, for: catalog.workspaceGroups.newWorkspacePlacement)
#expect(defaults.string(forKey: "workspaceGroup.newWorkspacePlacement") == "end")
#expect(client.value(for: catalog.workspaceGroups.newWorkspacePlacement) == .end)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ extension Array where Element == CuratedSettingEntry {
.init(section: .sidebarAppearance, id: "hide-sidebar-details", title: "Hide All Sidebar Details", synonyms: "sidebar.hideAllDetails compact sidebar hide details only title minimal left rail"),
.init(section: .sidebarAppearance, id: "wrap-workspace-titles", title: "Wrap Workspace Titles in Sidebar", synonyms: "sidebar.wrapWorkspaceTitles workspace title wrap multiline pr pull request"),
.init(section: .sidebarAppearance, id: "show-workspace-description", title: "Show Workspace Description in Sidebar", synonyms: "sidebar.showWorkspaceDescription workspace description notes markdown sidebar"),
.init(section: .sidebarAppearance, id: "workspace-status-style", title: String(localized: "settings.sidebar.workspaceStatusStyle", defaultValue: "Workspace Status Style"), synonyms: "sidebar.workspaceStatusStyle agent status subtitle sentence dot compact one line tab row"),
.init(section: .sidebarAppearance, id: "scroll-edge-fade", title: String(localized: "settings.sidebar.scrollEdgeFade", defaultValue: "Tab List Edge Fade"), synonyms: "sidebar.scrollEdgeFade sidebar tab list fade shadow scrim edge top bottom off subtle"),
.init(section: .sidebarAppearance, id: "sidebar-branch-layout", title: "Sidebar Branch Layout", synonyms: "sidebar.branchLayout sidebar.branchVerticalLayout git branch layout vertical inline cwd directory"),
.init(section: .sidebarAppearance, id: "stack-branch-directory", title: "Stack Branch and Directory", synonyms: "sidebar.stackBranchDirectory git branch directory cwd path stack stacked separate lines two rows"),
.init(section: .sidebarAppearance, id: "path-last-segment-only", title: "Truncate Path From Start", synonyms: "sidebar.pathLastSegmentOnly cwd path directory last segment basename short truncate folder repo"),
Expand Down
Loading
Loading